Changeset 3bacee1 in mainline for uspace/app/wavplay

Timestamp:

2018-04-12T16:27:17Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

3cf22f9

Parents:

76d0981d

git-author:

Jiri Svoboda <jiri@…> (2018-04-11 19:25:33)

git-committer:

Jiri Svoboda <jiri@…> (2018-04-12 16:27:17)

Message:

Make ccheck-fix again and commit more good files.

Location:

uspace/app/wavplay

Files:

• dplay.c (modified) (6 diffs)
• drec.c (modified) (5 diffs)

uspace/app/wavplay/dplay.c

@@ -58 +58 @@
                 void *base;
                 size_t size;
-                void* write_ptr;
+                void *write_ptr;
         } buffer;
         pcm_format_t f;
-        FILE* source;
+        FILE *source;
         volatile bool playing;
         fibril_mutex_t mutex;
@@ -104 +104 @@
                 ipc_call_t call;
                 cap_call_handle_t chandle = async_get_call(&call);
-                switch(IPC_GET_IMETHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case PCM_EVENT_PLAYBACK_STARTED:
                 case PCM_EVENT_FRAMES_PLAYED:
@@ -125 +125 @@
                 }
                 const size_t bytes = fread(pb->buffer.write_ptr,
-                   sizeof(uint8_t), fragment_size, pb->source);
+                    sizeof(uint8_t), fragment_size, pb->source);
                 printf("Copied from position %p size %zu/%zu\n",
                     pb->buffer.write_ptr, bytes, fragment_size);
@@ -297 +297 @@
                         if (ret != EOK) {
                                 printf("Failed to update position indicator "
-                                   "%s\n", str_error(ret));
+                                    "%s\n", str_error(ret));
                         }
                 }
@@ -305 +305 @@
 
                 /* Compute delay time */
-                const useconds_t real_delay = (usecs > work_time)
-                    ? usecs - work_time : 0;
+                const useconds_t real_delay = (usecs > work_time) ?
+                    usecs - work_time : 0;
                 DPRINTF("POS %zu: %u usecs (%u) to play %zu bytes.\n",
                     pos, usecs, real_delay, to_play);
@@ -356 +356 @@
         }
 
-        char* info = NULL;
+        char *info = NULL;
         ret = audio_pcm_get_info_str(session, &info);
         if (ret != EOK) {

uspace/app/wavplay/drec.c

@@ -63 +63 @@
                 size_t size;
                 unsigned id;
-                void* position;
+                void *position;
         } buffer;
-        FILE* file;
+        FILE *file;
         audio_pcm_sess_t *device;
 } record_t;
@@ -104 +104 @@
                 ipc_call_t call;
                 cap_call_handle_t chandle = async_get_call(&call);
-                switch(IPC_GET_IMETHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case PCM_EVENT_CAPTURE_TERMINATED:
                         printf("Recording terminated\n");
@@ -125 +125 @@
                 /* Write directly from device buffer to file */
                 const size_t bytes = fwrite(rec->buffer.position,
-                   sizeof(uint8_t), buffer_part, rec->file);
+                    sizeof(uint8_t), buffer_part, rec->file);
                 printf("%zu ", bytes);
                 rec->buffer.position += buffer_part;
@@ -154 +154 @@
             pcm_sample_format_str(f.sample_format), f.channels);
         const unsigned frames =
-                pcm_format_size_to_frames(rec->buffer.size / BUFFER_PARTS, &f);
+            pcm_format_size_to_frames(rec->buffer.size / BUFFER_PARTS, &f);
         ret = audio_pcm_start_capture_fragment(rec->device,
             frames, f.channels, f.sampling_rate, f.sample_format);
@@ -199 +199 @@
         }
 
-        char* info = NULL;
+        char *info = NULL;
         ret = audio_pcm_get_info_str(session, &info);
         if (ret != EOK) {