Changes in uspace/srv/audio/hound/hound_ctx.c [feeac0d:e5bc912] in mainline

File:

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

uspace/srv/audio/hound/hound_ctx.c

@@ -176 +176 @@
 
 /**
+ * List instance helper.
+ * @param l link
+ * @return pointer to a hound context structure, NULL on failure.
+ */
+static inline hound_ctx_stream_t *hound_ctx_stream_from_link(link_t *l)
+{
+        return l ? list_get_instance(l, hound_ctx_stream_t, link) : NULL;
+}
+
+/**
  * New stream append helper.
  * @param ctx hound context.
@@ -407 +417 @@
         pcm_format_silence(buffer, size, &source->format);
         fibril_mutex_lock(&ctx->guard);
-        list_foreach(ctx->streams, link, hound_ctx_stream_t, stream) {
+        list_foreach(ctx->streams, it) {
+                hound_ctx_stream_t *stream = hound_ctx_stream_from_link(it);
                 ssize_t copied = hound_ctx_stream_add_self(
                     stream, buffer, size, &source->format);
@@ -415 +426 @@
         log_verbose("CTX: %p. Pushing audio to %u connections", ctx,
             list_count(&source->connections));
-        list_foreach(source->connections, source_link, connection_t, conn) {
+        list_foreach(source->connections, it) {
+                connection_t *conn = connection_from_source_list(it);
                 connection_push_data(conn, adata);
         }
@@ -432 +444 @@
         /* count available data */
         size_t available_frames = -1;  /* this is ugly.... */
-        list_foreach(sink->connections, source_link, connection_t, conn) {
+        list_foreach(sink->connections, it) {
+                connection_t *conn = connection_from_source_list(it);
                 available_frames = min(available_frames,
                     audio_pipe_frames(&conn->fifo));
@@ -453 +466 @@
         /* mix data */
         pcm_format_silence(buffer, bsize, &sink->format);
-        list_foreach(sink->connections, source_link, connection_t, conn) {
+        list_foreach(sink->connections, it) {
+                connection_t *conn = connection_from_source_list(it);
                 /* This should not trigger data update on the source */
                 const size_t copied = connection_add_source_data(
@@ -462 +476 @@
         }
         /* push to all streams */
-        list_foreach(ctx->streams, link, hound_ctx_stream_t, stream) {
+        list_foreach(ctx->streams, it) {
+                hound_ctx_stream_t *stream = hound_ctx_stream_from_link(it);
                 const int ret = stream_push_data(stream, adata);
                 if (ret != EOK)