Changeset 2cc5c835 in mainline for uspace/srv/audio/hound/audio_device.c

Timestamp:

2012-07-15T15:14:10Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

57e8b3b

Parents:

b497018

Message:

Cleanup audio_pcm interface.

File:

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

uspace/srv/audio/hound/audio_device.c

@@ -42 +42 @@
 #include <str_error.h>
 
-#include <audio_pcm_iface.h>
 
 #include "audio_device.h"
@@ -54 +53 @@
 static int get_buffer(audio_device_t *dev);
 static int release_buffer(audio_device_t *dev);
-static int start_playback(audio_device_t *dev);
-static int stop_playback(audio_device_t *dev);
-static int start_recording(audio_device_t *dev);
-static int stop_recording(audio_device_t *dev);
 
 
@@ -66 +61 @@
         dev->id = id;
         dev->name = str_dup(name);
-        dev->sess = loc_service_connect(EXCHANGE_SERIALIZE, id, 0);
+        dev->sess = audio_pcm_open_service(id);
         if (!dev->sess) {
                 log_debug("Failed to connect to device \"%s\"", name);
@@ -108 +103 @@
                 }
 
-                ret = start_playback(dev);
+                /* Fill the buffer first */
+                audio_sink_mix_inputs(&dev->sink,
+                    dev->buffer.base, dev->buffer.size);
+
+                ret = audio_pcm_start_playback(dev->sess, BUFFER_BLOCKS,
+                    dev->sink.format.channels, dev->sink.format.sampling_rate,
+                    dev->sink.format.sample_format);
                 if (ret != EOK) {
                         log_error("Failed to start playback: %s",
@@ -119 +120 @@
                 assert(!new);
                 log_verbose("No connections on device sink '%s'", sink->name);
-                int ret = stop_playback(dev);
+                int ret = audio_pcm_stop_playback(dev->sess);
                 if (ret != EOK) {
                         log_error("Failed to start playback: %s",
@@ -147 +148 @@
                         return ret;
                 }
-                ret = start_recording(dev);
+                ret = audio_pcm_start_record(dev->sess, BUFFER_BLOCKS,
+                    dev->sink.format.channels, dev->sink.format.sampling_rate,
+                    dev->sink.format.sample_format);
                 if (ret != EOK) {
                         log_error("Failed to start recording: %s",
@@ -155 +158 @@
                 }
         } else { /* Disconnected */
-                int ret = stop_recording(dev);
+                int ret = audio_pcm_stop_record(dev->sess);
                 if (ret != EOK) {
                         log_error("Failed to start recording: %s",
@@ -229 +232 @@
         dev->buffer.size = 0;
 
-        async_exch_t *exch = async_exchange_begin(dev->sess);
-        const int ret = audio_pcm_get_buffer(exch, &dev->buffer.base,
+        return audio_pcm_get_buffer(dev->sess, &dev->buffer.base,
             &dev->buffer.size, device_event_callback, dev);
-        async_exchange_end(exch);
-        return ret;
-}
-
-#define CHECK_BUFFER_AND_CONNECTION() \
-do { \
-        assert(dev); \
-        if (!dev->sess) { \
-                log_debug("No connection to device"); \
-                return EIO; \
-        } \
-        if (!dev->buffer.base) { \
-                log_debug("We don't have a buffer"); \
-                return ENOENT; \
-        } \
-} while (0)
-
+}
 
 static int release_buffer(audio_device_t *dev)
 {
-        CHECK_BUFFER_AND_CONNECTION();
-
-        async_exch_t *exch = async_exchange_begin(dev->sess);
-        const int ret = audio_pcm_release_buffer(exch);
-        async_exchange_end(exch);
+        assert(dev);
+        assert(dev->buffer.base);
+
+        const int ret = audio_pcm_release_buffer(dev->sess);
         if (ret == EOK) {
                 dev->buffer.base = NULL;
                 dev->buffer.size = 0;
                 dev->buffer.position = NULL;
+        } else {
+                log_debug("Failed to release buffer: %s", str_error(ret));
         }
         return ret;
 }
-
-static int start_playback(audio_device_t *dev)
-{
-        CHECK_BUFFER_AND_CONNECTION();
-
-        /* Fill the buffer first */
-        audio_sink_mix_inputs(&dev->sink, dev->buffer.base, dev->buffer.size);
-
-        async_exch_t *exch = async_exchange_begin(dev->sess);
-        const int ret = audio_pcm_start_playback(exch,
-            BUFFER_BLOCKS, dev->sink.format.channels,
-            dev->sink.format.sampling_rate, dev->sink.format.sample_format);
-        async_exchange_end(exch);
-        return ret;
-}
-
-static int stop_playback(audio_device_t *dev)
-{
-        CHECK_BUFFER_AND_CONNECTION();
-
-        async_exch_t *exch = async_exchange_begin(dev->sess);
-        const int ret = audio_pcm_stop_playback(exch);
-        async_exchange_end(exch);
-        return ret;
-}
-
-static int start_recording(audio_device_t *dev)
-{
-        CHECK_BUFFER_AND_CONNECTION();
-
-        async_exch_t *exch = async_exchange_begin(dev->sess);
-        const int ret = audio_pcm_start_record(exch,
-            BUFFER_BLOCKS, dev->sink.format.channels,
-            dev->sink.format.sampling_rate, dev->sink.format.sample_format);
-        async_exchange_end(exch);
-        return ret;
-}
-
-static int stop_recording(audio_device_t *dev)
-{
-        CHECK_BUFFER_AND_CONNECTION();
-
-        async_exch_t *exch = async_exchange_begin(dev->sess);
-        const int ret = audio_pcm_stop_record(exch);
-        async_exchange_end(exch);
-        return ret;
-}
-
 /**
  * @}