Changes in uspace/srv/audio/hound/hound_ctx.c [b7fd2a0:38d150e] in mainline

File:

• uspace/srv/audio/hound/hound_ctx.c (modified) (13 diffs)

uspace/srv/audio/hound/hound_ctx.c

@@ -45 +45 @@
 #include "log.h"
 
-static errno_t update_data(audio_source_t *source, size_t size);
-static errno_t new_data(audio_sink_t *sink);
+static int update_data(audio_source_t *source, size_t size);
+static int new_data(audio_sink_t *sink);
 
 /**
@@ -68 +68 @@
                         return NULL;
                 }
-                const errno_t ret = audio_sink_init(ctx->sink, name, ctx, NULL,
+                const int ret = audio_sink_init(ctx->sink, name, ctx, NULL,
                     NULL, new_data, &AUDIO_FORMAT_DEFAULT);
                 if (ret != EOK) {
@@ -99 +99 @@
                         return NULL;
                 }
-                const errno_t ret = audio_source_init(ctx->source, name, ctx, NULL,
+                const int ret = audio_source_init(ctx->source, name, ctx, NULL,
                     update_data, &AUDIO_FORMAT_DEFAULT);
                 if (ret != EOK) {
@@ -199 +199 @@
  * @return Error code.
  */
-static errno_t stream_push_data(hound_ctx_stream_t *stream, audio_data_t *adata)
+static int stream_push_data(hound_ctx_stream_t *stream, audio_data_t *adata)
 {
         assert(stream);
@@ -216 +216 @@
         }
 
-        const errno_t ret = audio_pipe_push(&stream->fifo, adata);
+        const int ret = audio_pipe_push(&stream->fifo, adata);
         fibril_mutex_unlock(&stream->guard);
         if (ret == EOK)
@@ -297 +297 @@
  * @return Error code.
  */
-errno_t hound_ctx_stream_write(hound_ctx_stream_t *stream, const void *data,
+int hound_ctx_stream_write(hound_ctx_stream_t *stream, const void *data,
     size_t size)
 {
@@ -312 +312 @@
         }
 
-        const errno_t ret =
+        const int ret =
             audio_pipe_push_data(&stream->fifo, data, size, stream->format);
         fibril_mutex_unlock(&stream->guard);
@@ -327 +327 @@
  * @return Error code.
  */
-errno_t hound_ctx_stream_read(hound_ctx_stream_t *stream, void *data, size_t size)
+int hound_ctx_stream_read(hound_ctx_stream_t *stream, void *data, size_t size)
 {
         assert(stream);
@@ -340 +340 @@
 
         pcm_format_silence(data, size, &stream->format);
-        const size_t ret =
+        const int ret =
             audio_pipe_mix_data(&stream->fifo, data, size, &stream->format);
         fibril_mutex_unlock(&stream->guard);
-        if (ret > 0) {
+        if (ret == EOK)
                 fibril_condvar_signal(&stream->change);
-                return EOK;
-        }
-        return EEMPTY;
+        return ret;
 }
 
@@ -356 +354 @@
  * @param size Size of the @p data buffer.
  * @param format Destination data format.
- * @return Size of the destination buffer touch with stream's data.
- */
-size_t hound_ctx_stream_add_self(hound_ctx_stream_t *stream, void *data,
+ * @return Size of the destination buffer touch with stream's data,
+ *         error code on failure.
+ */
+ssize_t hound_ctx_stream_add_self(hound_ctx_stream_t *stream, void *data,
     size_t size, const pcm_format_t *f)
 {
         assert(stream);
         fibril_mutex_lock(&stream->guard);
-        const size_t ret = audio_pipe_mix_data(&stream->fifo, data, size, f);
+        const int ret = audio_pipe_mix_data(&stream->fifo, data, size, f);
         fibril_condvar_signal(&stream->change);
         fibril_mutex_unlock(&stream->guard);
@@ -391 +390 @@
  * Mixes data from all streams and pushes it to all connections.
  */
-errno_t update_data(audio_source_t *source, size_t size)
+int update_data(audio_source_t *source, size_t size)
 {
         assert(source);
@@ -425 +424 @@
 }
 
-errno_t new_data(audio_sink_t *sink)
+int new_data(audio_sink_t *sink)
 {
         assert(sink);
@@ -458 +457 @@
         list_foreach(sink->connections, source_link, connection_t, conn) {
                 /* This should not trigger data update on the source */
-                connection_add_source_data(
+                const size_t copied = connection_add_source_data(
                     conn, buffer, bsize, sink->format);
+                if (copied != bsize)
+                        log_error("Copied less than advertised data, "
+                            "something is wrong");
         }
         /* push to all streams */
         list_foreach(ctx->streams, link, hound_ctx_stream_t, stream) {
-                const errno_t ret = stream_push_data(stream, adata);
+                const int ret = stream_push_data(stream, adata);
                 if (ret != EOK)
                         log_error("Failed to push data to stream: %s",