Changeset 62310d7 in mainline

Timestamp:

2013-08-19T12:28:21Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

d337f74

Parents:

b7dd149

Message:

libdrv, audio_pcm: Name immediate stop explicitly

Add fragment stop functions.

Location:

uspace

Files:

• lib/drv/generic/remote_audio_pcm.c (modified) (4 diffs)
• lib/drv/include/audio_pcm_iface.h (modified) (2 diffs)
• srv/audio/hound/audio_device.c (modified) (2 diffs)

uspace/lib/drv/generic/remote_audio_pcm.c

@@ -469 +469 @@
  * @return Error code.
  */
+int audio_pcm_stop_playback_immediate(audio_pcm_sess_t *sess)
+{
+        async_exch_t *exch = async_exchange_begin(sess);
+        const int ret = async_req_2_0(exch,
+            DEV_IFACE_ID(AUDIO_PCM_BUFFER_IFACE),
+            IPC_M_AUDIO_PCM_STOP_PLAYBACK, true);
+        async_exchange_end(exch);
+        return ret;
+}
+
+/**
+ * Stops playback at the end of the current fragment.
+ *
+ * @param sess Audio device session.
+ *
+ * @return Error code.
+ */
 int audio_pcm_stop_playback(audio_pcm_sess_t *sess)
 {
@@ -474 +491 @@
         const int ret = async_req_2_0(exch,
             DEV_IFACE_ID(AUDIO_PCM_BUFFER_IFACE),
-            IPC_M_AUDIO_PCM_STOP_PLAYBACK, true);
+            IPC_M_AUDIO_PCM_STOP_PLAYBACK, false);
         async_exchange_end(exch);
         return ret;
@@ -550 +567 @@
  * @return Error code.
  */
+int audio_pcm_stop_capture_immediate(audio_pcm_sess_t *sess)
+{
+        async_exch_t *exch = async_exchange_begin(sess);
+        const int ret = async_req_2_0(exch,
+            DEV_IFACE_ID(AUDIO_PCM_BUFFER_IFACE),
+            IPC_M_AUDIO_PCM_STOP_CAPTURE, true);
+        async_exchange_end(exch);
+        return ret;
+}
+
+/**
+ * Stops capture at the end of the current fragment.
+ *
+ * @param sess Audio device session.
+ *
+ * @return Error code.
+ */
 int audio_pcm_stop_capture(audio_pcm_sess_t *sess)
 {
@@ -555 +589 @@
         const int ret = async_req_2_0(exch,
             DEV_IFACE_ID(AUDIO_PCM_BUFFER_IFACE),
-            IPC_M_AUDIO_PCM_STOP_CAPTURE, true);
+            IPC_M_AUDIO_PCM_STOP_CAPTURE, false);
         async_exchange_end(exch);
         return ret;

uspace/lib/drv/include/audio_pcm_iface.h

@@ -98 +98 @@
 int audio_pcm_start_playback(audio_pcm_sess_t *,
     unsigned, unsigned, pcm_sample_format_t);
+int audio_pcm_stop_playback_immediate(audio_pcm_sess_t *);
 int audio_pcm_stop_playback(audio_pcm_sess_t *);
 
@@ -106 +107 @@
 int audio_pcm_start_capture(audio_pcm_sess_t *,
     unsigned, unsigned, pcm_sample_format_t);
+int audio_pcm_stop_capture_immediate(audio_pcm_sess_t *);
 int audio_pcm_stop_capture(audio_pcm_sess_t *);
 

uspace/srv/audio/hound/audio_device.c

@@ -191 +191 @@
                 log_verbose("Removed last connection on device sink '%s'",
                     sink->name);
-                int ret = audio_pcm_stop_playback(dev->sess);
+                int ret = audio_pcm_stop_playback_immediate(dev->sess);
                 if (ret != EOK) {
                         log_error("Failed to stop playback: %s",
@@ -246 +246 @@
         if (list_count(&source->connections) == 0) { /* Disconnected */
                 assert(!new);
-                int ret = audio_pcm_stop_capture(dev->sess);
+                int ret = audio_pcm_stop_capture_immediate(dev->sess);
                 if (ret != EOK) {
                         log_error("Failed to start recording: %s",