Changes in uspace/srv/audio/hound/audio_device.c [b7fd2a0:7f9d97f3] in mainline

File:

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

uspace/srv/audio/hound/audio_device.c

@@ -51 +51 @@
 #define BUFFER_PARTS   16
 
-static errno_t device_sink_connection_callback(audio_sink_t *sink, bool new);
-static errno_t device_source_connection_callback(audio_source_t *source, bool new);
+static int device_sink_connection_callback(audio_sink_t *sink, bool new);
+static int device_source_connection_callback(audio_source_t *source, bool new);
 static void device_event_callback(ipc_callid_t iid, ipc_call_t *icall, void *arg);
-static errno_t device_check_format(audio_sink_t* sink);
-static errno_t get_buffer(audio_device_t *dev);
-static errno_t release_buffer(audio_device_t *dev);
+static int device_check_format(audio_sink_t* sink);
+static int get_buffer(audio_device_t *dev);
+static int release_buffer(audio_device_t *dev);
 static void advance_buffer(audio_device_t *dev, size_t size);
 static inline bool is_running(audio_device_t *dev)
@@ -62 +62 @@
         assert(dev);
         /* we release buffer on stop so this should be enough */
-        return dev->buffer.base != NULL;
+        return (bool)dev->buffer.base;
 }
 
@@ -72 +72 @@
  * @return Error code.
  */
-errno_t audio_device_init(audio_device_t *dev, service_id_t id, const char *name)
+int audio_device_init(audio_device_t *dev, service_id_t id, const char *name)
 {
         assert(dev);
@@ -121 +121 @@
 {
         assert(dev);
-        sysarg_t val;
-        errno_t rc = audio_pcm_query_cap(dev->sess, AUDIO_CAP_CAPTURE, &val);
-        if (rc == EOK && val)
+        if (audio_pcm_query_cap(dev->sess, AUDIO_CAP_CAPTURE))
                 return &dev->source;
         return NULL;
@@ -137 +135 @@
 {
         assert(dev);
-        sysarg_t val;
-        errno_t rc = audio_pcm_query_cap(dev->sess, AUDIO_CAP_PLAYBACK, &val);
-        if (rc == EOK && val)
+        if (audio_pcm_query_cap(dev->sess, AUDIO_CAP_PLAYBACK))
                 return &dev->sink;
         return NULL;
@@ -153 +149 @@
  * connections.
  */
-static errno_t device_sink_connection_callback(audio_sink_t* sink, bool new)
+static int device_sink_connection_callback(audio_sink_t* sink, bool new)
 {
         assert(sink);
@@ -160 +156 @@
                 log_verbose("First connection on device sink '%s'", sink->name);
 
-                errno_t ret = get_buffer(dev);
+                int ret = get_buffer(dev);
                 if (ret != EOK) {
                         log_error("Failed to get device buffer: %s",
@@ -196 +192 @@
                 log_verbose("Removed last connection on device sink '%s'",
                     sink->name);
-                errno_t ret = audio_pcm_stop_playback(dev->sess);
+                int ret = audio_pcm_stop_playback(dev->sess);
                 if (ret != EOK) {
                         log_error("Failed to stop playback: %s",
@@ -215 +211 @@
  * connections.
  */
-static errno_t device_source_connection_callback(audio_source_t *source, bool new)
+static int device_source_connection_callback(audio_source_t *source, bool new)
 {
         assert(source);
         audio_device_t *dev = source->private_data;
         if (new && list_count(&source->connections) == 1) {
-                errno_t ret = get_buffer(dev);
+                int ret = get_buffer(dev);
                 if (ret != EOK) {
                         log_error("Failed to get device buffer: %s",
@@ -244 +240 @@
         if (list_count(&source->connections) == 0) { /* Disconnected */
                 assert(!new);
-                errno_t ret = audio_pcm_stop_capture_immediate(dev->sess);
+                int ret = audio_pcm_stop_capture_immediate(dev->sess);
                 if (ret != EOK) {
                         log_error("Failed to start recording: %s",
@@ -289 +285 @@
                         log_verbose("Capture terminated");
                         dev->source.format = AUDIO_FORMAT_ANY;
-                        const errno_t ret = release_buffer(dev);
+                        const int ret = release_buffer(dev);
                         if (ret != EOK) {
                                 log_error("Failed to release buffer: %s",
@@ -300 +296 @@
                         log_verbose("Playback Terminated");
                         dev->sink.format = AUDIO_FORMAT_ANY;
-                        const errno_t ret = release_buffer(dev);
+                        const int ret = release_buffer(dev);
                         if (ret != EOK) {
                                 log_error("Failed to release buffer: %s",
@@ -309 +305 @@
                 }
                 case PCM_EVENT_FRAMES_CAPTURED: {
-                        const errno_t ret = audio_source_push_data(&dev->source,
+                        const int ret = audio_source_push_data(&dev->source,
                             dev->buffer.position, dev->buffer.fragment_size);
                         advance_buffer(dev, dev->buffer.fragment_size);
@@ -329 +325 @@
  * @return Error code.
  */
-static errno_t device_check_format(audio_sink_t* sink)
+static int device_check_format(audio_sink_t* sink)
 {
         assert(sink);
@@ -347 +343 @@
  * @return Error code.
  */
-static errno_t get_buffer(audio_device_t *dev)
+static int get_buffer(audio_device_t *dev)
 {
         assert(dev);
@@ -362 +358 @@
         size_t preferred_size = 0;
 
-        const errno_t ret = audio_pcm_get_buffer(dev->sess, &dev->buffer.base,
+        const int ret = audio_pcm_get_buffer(dev->sess, &dev->buffer.base,
             &preferred_size);
         if (ret == EOK) {
@@ -378 +374 @@
  * @return Error code.
  */
-static errno_t release_buffer(audio_device_t *dev)
+static int release_buffer(audio_device_t *dev)
 {
         assert(dev);
         assert(dev->buffer.base);
 
-        const errno_t ret = audio_pcm_release_buffer(dev->sess);
+        const int ret = audio_pcm_release_buffer(dev->sess);
         if (ret == EOK) {
                 as_area_destroy(dev->buffer.base);