Changes in uspace/srv/audio/hound/hound_ctx.c [541eb67:df13836] in mainline

File:

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

uspace/srv/audio/hound/hound_ctx.c

@@ -35 +35 @@
  */
 
+#include <malloc.h>
 #include <macros.h>
 #include <errno.h>
-#include <stdlib.h>
 #include <str_error.h>
 
@@ -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);
@@ -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 */