Changeset 338d54a7 in mainline for uspace/srv/audio

Timestamp:

2018-03-10T22:55:07Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

850fd32

Parents:

5ef16903

Message:

Gratuitous nested block makes ccheck sad.

File:

• uspace/srv/audio/hound/audio_device.c (modified) (6 diffs)

uspace/srv/audio/hound/audio_device.c

@@ -263 +263 @@
 static void device_event_callback(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
+        struct timeval time1;
+        errno_t ret;
+
         /* Answer initial request */
         async_answer_0(iid, EOK);
@@ -272 +275 @@
                 async_answer_0(callid, EOK);
                 switch(IPC_GET_IMETHOD(call)) {
-                case PCM_EVENT_FRAMES_PLAYED: {
-                        struct timeval time1;
+                case PCM_EVENT_FRAMES_PLAYED:
                         getuptime(&time1);
                         //TODO add underrun detection.
@@ -285 +287 @@
                             tv_sub_diff(&time2, &time1));
                         break;
-                }
-                case PCM_EVENT_CAPTURE_TERMINATED: {
+                case PCM_EVENT_CAPTURE_TERMINATED:
                         log_verbose("Capture terminated");
                         dev->source.format = AUDIO_FORMAT_ANY;
-                        const errno_t ret = release_buffer(dev);
+                        ret = release_buffer(dev);
                         if (ret != EOK) {
                                 log_error("Failed to release buffer: %s",
@@ -296 +297 @@
                         audio_pcm_unregister_event_callback(dev->sess);
                         break;
-                }
-                case PCM_EVENT_PLAYBACK_TERMINATED: {
+                case PCM_EVENT_PLAYBACK_TERMINATED:
                         log_verbose("Playback Terminated");
                         dev->sink.format = AUDIO_FORMAT_ANY;
-                        const errno_t ret = release_buffer(dev);
+                        ret = release_buffer(dev);
                         if (ret != EOK) {
                                 log_error("Failed to release buffer: %s",
@@ -307 +307 @@
                         audio_pcm_unregister_event_callback(dev->sess);
                         break;
-                }
-                case PCM_EVENT_FRAMES_CAPTURED: {
-                        const errno_t ret = audio_source_push_data(&dev->source,
+                case PCM_EVENT_FRAMES_CAPTURED:
+                        ret = audio_source_push_data(&dev->source,
                             dev->buffer.position, dev->buffer.fragment_size);
                         advance_buffer(dev, dev->buffer.fragment_size);
@@ -315 +314 @@
                                 log_warning("Failed to push recorded data");
                         break;
-                }
                 case 0:
                         log_info("Device event callback hangup");
                         return;
                 }
-
         }
 }