Changeset 99c2c69e in mainline for uspace/srv/audio/hound/hound.c

Timestamp:

2013-09-13T00:36:30Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

67fbd5e

Parents:

7f84430 (diff), 11d41be5 (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:

mainline changes

File:

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

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);