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

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.
@@ -52 +68 @@
  * @return Pointer to the found device, NULL on failure.
  */
-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;
+static audio_device_t * find_device_by_name(list_t *list, const char *name)
+{
+        FIND_BY_NAME(device);
 }
 
@@ -73 +78 @@
  * @return Pointer to the found source, NULL on failure.
  */
-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;
+static audio_source_t * find_source_by_name(list_t *list, const char *name)
+{
+        FIND_BY_NAME(source);
 }
 
@@ -94 +88 @@
  * @return Pointer to the found sink, NULL on failure.
  */
-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;
+static audio_sink_t * find_sink_by_name(list_t *list, const char *name)
+{
+        FIND_BY_NAME(sink);
 }
 
@@ -128 +111 @@
                 log_warning("Removing sink '%s' while still connected.", sink->name);
         while (!list_empty(&sink->connections)) {
-                connection_t *conn = list_get_instance(
-                    list_first(&sink->connections), connection_t, sink_link);
+                connection_t *conn =
+                    connection_from_sink_list(list_first(&sink->connections));
                 list_remove(&conn->hound_link);
                 connection_destroy(conn);
@@ -145 +128 @@
 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 = list_get_instance(
-                    list_first(&source->connections), connection_t, source_link);
+                connection_t *conn =
+                    connection_from_source_list(list_first(&source->connections));
+                assert(conn);
                 list_remove(&conn->hound_link);
                 connection_destroy(conn);
@@ -237 +223 @@
         fibril_mutex_lock(&hound->list_guard);
         hound_ctx_t *res = NULL;
-        list_foreach(hound->contexts, link, hound_ctx_t, ctx) {
+        list_foreach(hound->contexts, it) {
+                hound_ctx_t *ctx = hound_ctx_from_link(it);
                 if (hound_ctx_get_id(ctx) == id) {
                         res = ctx;
@@ -264 +251 @@
         }
 
-        list_foreach(hound->devices, link, audio_device_t, dev) {
+        list_foreach(hound->devices, it) {
+                audio_device_t *dev = audio_device_list_instance(it);
                 if (dev->id == id) {
                         log_debug("Device with id %zu is already present", id);