Changeset 0773396 in mainline for uspace/srv/audio/hound/hound_ctx.c

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

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.
@@ -417 +407 @@
         pcm_format_silence(buffer, size, &source->format);
         fibril_mutex_lock(&ctx->guard);
-        list_foreach(ctx->streams, it) {
-                hound_ctx_stream_t *stream = hound_ctx_stream_from_link(it);
+        list_foreach(ctx->streams, link, hound_ctx_stream_t, stream) {
                 ssize_t copied = hound_ctx_stream_add_self(
                     stream, buffer, size, &source->format);
@@ -426 +415 @@
         log_verbose("CTX: %p. Pushing audio to %u connections", ctx,
             list_count(&source->connections));
-        list_foreach(source->connections, it) {
-                connection_t *conn = connection_from_source_list(it);
+        list_foreach(source->connections, source_link, connection_t, conn) {
                 connection_push_data(conn, adata);
         }
@@ -444 +432 @@
         /* count available data */
         size_t available_frames = -1;  /* this is ugly.... */
-        list_foreach(sink->connections, it) {
-                connection_t *conn = connection_from_source_list(it);
+        list_foreach(sink->connections, source_link, connection_t, conn) {
                 available_frames = min(available_frames,
                     audio_pipe_frames(&conn->fifo));
@@ -466 +453 @@
         /* mix data */
         pcm_format_silence(buffer, bsize, &sink->format);
-        list_foreach(sink->connections, it) {
-                connection_t *conn = connection_from_source_list(it);
+        list_foreach(sink->connections, source_link, connection_t, conn) {
                 /* This should not trigger data update on the source */
                 const size_t copied = connection_add_source_data(
@@ -476 +462 @@
         }
         /* push to all streams */
-        list_foreach(ctx->streams, it) {
-                hound_ctx_stream_t *stream = hound_ctx_stream_from_link(it);
+        list_foreach(ctx->streams, link, hound_ctx_stream_t, stream) {
                 const int ret = stream_push_data(stream, adata);
                 if (ret != EOK)