Changeset 92b638c in mainline for uspace/lib/drv/generic/remote_audio_pcm.c

Timestamp:

2012-08-30T11:41:48Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

5eed99d

Parents:

ed3816d

Message:

audio, sb16: Add and implement API for playback/capture with or without fragments.

File:

• uspace/lib/drv/generic/remote_audio_pcm.c (modified) (8 diffs)

uspace/lib/drv/generic/remote_audio_pcm.c

@@ -342 +342 @@
  * 0 to turn off event generation.
  */
-int audio_pcm_start_playback(audio_pcm_sess_t *sess, unsigned frames,
+int audio_pcm_start_playback_fragment(audio_pcm_sess_t *sess, unsigned frames,
     unsigned channels, unsigned sample_rate, pcm_sample_format_t format)
 {
@@ -357 +357 @@
         return ret;
 }
-
-/**
- * Stop current playback.
+/**
+ * Stops playback after current fragment.
+ *
+ * @param sess Audio device session.
+ *
+ * @return Error code.
+ */
+int audio_pcm_last_playback_fragment(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, false);
+        async_exchange_end(exch);
+        return ret;
+}
+
+/**
+ * Start playback on buffer from the current position.
+ *
+ * @param sess Audio device session.
+ * @param channels Number of channels.
+ * @param sample_rate Sampling rate (for one channel).
+ * @param format Sample format.
+ *
+ * @return Error code.
+ */
+int audio_pcm_start_playback(audio_pcm_sess_t *sess,
+    unsigned channels, unsigned sample_rate, pcm_sample_format_t format)
+{
+        return audio_pcm_start_playback_fragment(
+            sess, 0, channels, sample_rate, format);
+}
+
+/**
+ * Immediately stops current playback.
  *
  * @param sess Audio device session.
@@ -368 +401 @@
 {
         async_exch_t *exch = async_exchange_begin(sess);
-        const int ret = async_req_1_0(exch,
-            DEV_IFACE_ID(AUDIO_PCM_BUFFER_IFACE),
-            IPC_M_AUDIO_PCM_STOP_PLAYBACK);
-        async_exchange_end(exch);
-        return ret;
-}
-
-/**
- * Start capture on buffer from position 0.
+        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;
+}
+
+/**
+ * Start capture on buffer from the current position.
  *
  * @param sess Audio device session.
@@ -389 +422 @@
  * 0 to turn off event generation.
  */
-int audio_pcm_start_capture(audio_pcm_sess_t *sess, unsigned frames,
+int audio_pcm_start_capture_fragment(audio_pcm_sess_t *sess, unsigned frames,
     unsigned channels, unsigned sample_rate, pcm_sample_format_t format)
 {
@@ -405 +438 @@
 
 /**
- * Stop current playback.
+ * Start capture on buffer from the current position.
+ *
+ * @param sess Audio device session.
+ * @param channels Number of channels.
+ * @param sample_rate Sampling rate (for one channel).
+ * @param format Sample format.
+ *
+ * @return Error code.
+ */
+int audio_pcm_start_capture(audio_pcm_sess_t *sess,
+    unsigned channels, unsigned sample_rate, pcm_sample_format_t format)
+{
+        return audio_pcm_start_capture_fragment(
+            sess, 0, channels, sample_rate, format);
+}
+
+/**
+ * Stops capture at the end of current fragment.
+ *
+ * Won't work if capture was started with fragment size 0.
+ * @param sess Audio device session.
+ *
+ * @return Error code.
+ */
+int audio_pcm_last_capture_fragment(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, false);
+        async_exchange_end(exch);
+        return ret;
+}
+
+/**
+ * Immediately stops current capture.
  *
  * @param sess Audio device session.
@@ -414 +482 @@
 {
         async_exch_t *exch = async_exchange_begin(sess);
-        const int ret = async_req_1_0(exch,
-            DEV_IFACE_ID(AUDIO_PCM_BUFFER_IFACE), IPC_M_AUDIO_PCM_STOP_CAPTURE);
+        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;
@@ -648 +717 @@
 {
         const audio_pcm_iface_t *pcm_iface = iface;
+        const bool immediate = DEV_IPC_GET_ARG1(*call);
 
         const int ret = pcm_iface->stop_playback ?
-            pcm_iface->stop_playback(fun) : ENOTSUP;
+            pcm_iface->stop_playback(fun, immediate) : ENOTSUP;
         async_answer_0(callid, ret);
 }
@@ -674 +744 @@
 {
         const audio_pcm_iface_t *pcm_iface = iface;
+        const bool immediate = DEV_IPC_GET_ARG1(*call);
 
         const int ret = pcm_iface->stop_capture ?
-            pcm_iface->stop_capture(fun) : ENOTSUP;
+            pcm_iface->stop_capture(fun, immediate) : ENOTSUP;
         async_answer_0(callid, ret);
 }