Changeset feeac0d in mainline for uspace/srv/audio

Timestamp:

2013-09-10T16:32:35Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4982d87

Parents:

e8d6ce2

Message:

Simplify use of list_foreach.

Location:

uspace/srv/audio/hound

Files:

• audio_sink.c (modified) (1 diff)
• audio_source.c (modified) (1 diff)
• connection.h (modified) (1 diff)
• hound.c (modified) (8 diffs)
• hound_ctx.c (modified) (6 diffs)
• hound_ctx.h (modified) (1 diff)

uspace/srv/audio/hound/audio_sink.c

@@ -140 +140 @@
 
         pcm_format_silence(dest, size, &sink->format);
-        list_foreach(sink->connections, it) {
-                connection_t * conn = connection_from_sink_list(it);
+        list_foreach(sink->connections, sink_link, connection_t, conn) {
                 const int ret = connection_add_source_data(
                     conn, dest, size, sink->format);

uspace/srv/audio/hound/audio_source.c

@@ -106 +106 @@
                 return ENOMEM;
 
-        list_foreach(source->connections, it) {
-                connection_t *conn = connection_from_source_list(it);
+        list_foreach(source->connections, source_link, connection_t, conn) {
                 const int ret = connection_push_data(conn, adata);
                 if (ret != EOK) {

uspace/srv/audio/hound/connection.h

@@ -76 +76 @@
  * @return pointer to a connection structure, NULL on failure.
  */
-static inline connection_t * connection_from_sink_list(link_t *l)
-{
-        return l ? list_get_instance(l, connection_t, sink_link) : NULL;
-}
-
-/**
- * List instance helper.
- * @param l link
- * @return pointer to a connection structure, NULL on failure.
- */
 static inline connection_t * connection_from_hound_list(link_t *l)
 {

uspace/srv/audio/hound/hound.c

@@ -47 +47 @@
 #include "str_error.h"
 
-#define FIND_BY_NAME(type) \
-do { \
-        assert(list); \
-        assert(name); \
-        list_foreach(*list, it) { \
-                audio_ ## type ## _t *dev = \
-                    audio_ ## type ## _list_instance(it); \
-                if (str_cmp(name, dev->name) == 0) { \
-                        log_debug("%s with name '%s' is in the list", \
-                            #type, name); \
-                        return dev; \
-                } \
-        } \
-        return NULL; \
-} while (0)
-
 /**
  * Search devices by name.
@@ -68 +52 @@
  * @return Pointer to the found device, NULL on failure.
  */
-static audio_device_t * find_device_by_name(list_t *list, const char *name)
-{
-        FIND_BY_NAME(device);
+static audio_device_t *find_device_by_name(list_t *list, const char *name)
+{
+        assert(list);
+        assert(name);
+
+        list_foreach(*list, link, audio_device_t, dev) {
+                if (str_cmp(name, dev->name) == 0) {
+                        log_debug("device with name '%s' is in the list",
+                            name);
+                        return dev;
+                }
+        }
+
+        return NULL;
 }
 
@@ -78 +73 @@
  * @return Pointer to the found source, NULL on failure.
  */
-static audio_source_t * find_source_by_name(list_t *list, const char *name)
-{
-        FIND_BY_NAME(source);
+static audio_source_t *find_source_by_name(list_t *list, const char *name)
+{
+        assert(list);
+        assert(name);
+
+        list_foreach(*list, link, audio_source_t, dev) {
+                if (str_cmp(name, dev->name) == 0) {
+                        log_debug("source with name '%s' is in the list",
+                            name);
+                        return dev;
+                }
+        }
+
+        return NULL;
 }
 
@@ -88 +94 @@
  * @return Pointer to the found sink, NULL on failure.
  */
-static audio_sink_t * find_sink_by_name(list_t *list, const char *name)
-{
-        FIND_BY_NAME(sink);
+static audio_sink_t *find_sink_by_name(list_t *list, const char *name)
+{
+        assert(list);
+        assert(name);
+
+        list_foreach(*list, link, audio_sink_t, dev) {
+                if (str_cmp(name, dev->name) == 0) {
+                        log_debug("sink with name '%s' is in the list",
+                            name);
+                        return dev;
+                }
+        }
+
+        return NULL;
 }
 
@@ -111 +128 @@
                 log_warning("Removing sink '%s' while still connected.", sink->name);
         while (!list_empty(&sink->connections)) {
-                connection_t *conn =
-                    connection_from_sink_list(list_first(&sink->connections));
+                connection_t *conn = list_get_instance(
+                    list_first(&sink->connections), connection_t, sink_link);
                 list_remove(&conn->hound_link);
                 connection_destroy(conn);
@@ -128 +145 @@
 static void hound_remove_source_internal(hound_t *hound, audio_source_t *source)
 {
-        assert(hound);
-        assert(source);
         log_verbose("Removing source '%s'.", source->name);
         if (!list_empty(&source->connections))
                 log_warning("Removing source '%s' while still connected.", source->name);
         while (!list_empty(&source->connections)) {
-                connection_t *conn =
-                    connection_from_source_list(list_first(&source->connections));
-                assert(conn);
+                connection_t *conn = list_get_instance(
+                    list_first(&source->connections), connection_t, source_link);
                 list_remove(&conn->hound_link);
                 connection_destroy(conn);
@@ -223 +237 @@
         fibril_mutex_lock(&hound->list_guard);
         hound_ctx_t *res = NULL;
-        list_foreach(hound->contexts, it) {
-                hound_ctx_t *ctx = hound_ctx_from_link(it);
+        list_foreach(hound->contexts, link, hound_ctx_t, ctx) {
                 if (hound_ctx_get_id(ctx) == id) {
                         res = ctx;
@@ -251 +264 @@
         }
 
-        list_foreach(hound->devices, it) {
-                audio_device_t *dev = audio_device_list_instance(it);
+        list_foreach(hound->devices, link, audio_device_t, dev) {
                 if (dev->id == id) {
                         log_debug("Device with id %zu is already present", id);

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)

uspace/srv/audio/hound/hound_ctx.h

@@ -58 +58 @@
 } hound_ctx_t;
 
-/**
- * List instance helper.
- * @param l link
- * @return pointer to a hound context structure, NULL on failure.
- */
-static inline hound_ctx_t *hound_ctx_from_link(link_t *l)
-{
-        return l ? list_get_instance(l, hound_ctx_t, link) : NULL;
-}
-
 typedef struct hound_ctx_stream hound_ctx_stream_t;