Changeset 8e77b60e in mainline

Timestamp:

2013-08-19T16:36:54Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ff03f79

Parents:

f7b36bc

Message:

hound: Release buffers on terminated events.

Don't forget to unregister callback.

File:

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

uspace/srv/audio/hound/audio_device.c

@@ -197 +197 @@
                         return ret;
                 }
-                dev->sink.format = AUDIO_FORMAT_ANY;
-                ret = release_buffer(dev);
-                if (ret != EOK) {
-                        log_error("Failed to release buffer: %s",
-                            str_error(ret));
-                        return ret;
-                }
         }
         return EOK;
@@ -252 +245 @@
                         return ret;
                 }
-                source->format = AUDIO_FORMAT_ANY;
-                ret = release_buffer(dev);
-                if (ret != EOK) {
-                        log_error("Failed to release buffer: %s",
-                            str_error(ret));
-                        return ret;
-                }
-                audio_pcm_unregister_event_callback(dev->sess);
         }
 
@@ -296 +281 @@
                         break;
                 }
-                case PCM_EVENT_PLAYBACK_TERMINATED:
-                        log_verbose("Playback terminated!");
+                case PCM_EVENT_CAPTURE_TERMINATED: {
+                        log_verbose("Capture terminated");
+                        dev->source.format = AUDIO_FORMAT_ANY;
+                        const int ret = release_buffer(dev);
+                        if (ret != EOK) {
+                                log_error("Failed to release buffer: %s",
+                                    str_error(ret));
+                        }
+                        audio_pcm_unregister_event_callback(dev->sess);
                         break;
+                }
+                case PCM_EVENT_PLAYBACK_TERMINATED: {
+                        log_verbose("Playback Terminated");
+                        dev->sink.format = AUDIO_FORMAT_ANY;
+                        const int ret = release_buffer(dev);
+                        if (ret != EOK) {
+                                log_error("Failed to release buffer: %s",
+                                    str_error(ret));
+                        }
+                        audio_pcm_unregister_event_callback(dev->sess);
+                        break;
+                }
                 case PCM_EVENT_FRAMES_CAPTURED: {
                         const int ret = audio_source_push_data(&dev->source,
@@ -307 +311 @@
                         break;
                 }
-                case PCM_EVENT_CAPTURE_TERMINATED:
-                        log_verbose("Recording terminated!");
-                        break;
                 case 0:
-                        log_info("Device event call back hangup");
+                        log_info("Device event callback hangup");
                         return;
                 }