Changeset 50179b63 in mainline

Timestamp:

2013-04-05T12:23:58Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c5b8548

Parents:

f1438e5

Message:

hound: switch connection to audio pipe

Location:

uspace/srv/audio/hound

Files:

• connection.c (modified) (3 diffs)
• connection.h (modified) (2 diffs)

uspace/srv/audio/hound/connection.c

@@ -46 +46 @@
         connection_t *conn = malloc(sizeof(connection_t));
         if (conn) {
-                list_initialize(&conn->fifo);
+                audio_pipe_init(&conn->fifo);
                 link_initialize(&conn->source_link);
                 link_initialize(&conn->sink_link);
@@ -74 +74 @@
         if (connection->source && connection->source->connection_change)
                 connection->source->connection_change(connection->source, false);
-        while (!list_empty(&connection->fifo)) {
-                link_t *l = list_first(&connection->fifo);
-                audio_data_link_t *data = audio_data_link_list_instance(l);
-                list_remove(&data->link);
-                audio_data_link_destroy(data);
-        }
+        audio_pipe_fini(&connection->fifo);
         log_debug("DISCONNECTED: %s -> %s",
             connection->source->name, connection->sink->name);
@@ -94 +89 @@
 }
 
-int connection_push_data(connection_t *connection, audio_data_t *adata)
-{
-        assert(connection);
-        assert(adata);
-        audio_data_link_t *alink = audio_data_link_create(adata);
-        if (!alink) {
-                log_warning("Failed to buffer %zu bytes of data.", adata->size);
-                return ENOMEM;
-        }
-        log_fatal("Pushed new data to connection fifo");
-        list_append(&alink->link, &connection->fifo);
-        return EOK;
-}
-
-
 /**
  * @}

uspace/srv/audio/hound/connection.h

@@ -49 +49 @@
         link_t sink_link;
         link_t hound_link;
-        list_t fifo;
+        audio_pipe_t fifo;
         audio_sink_t *sink;
         audio_source_t *source;
@@ -75 +75 @@
     size_t size, pcm_format_t format);
 
-int connection_push_data(connection_t *connection, audio_data_t *adata);
+static inline int connection_push_data(connection_t *connection,
+    audio_data_t *adata)
+{
+        assert(connection);
+        assert(adata);
+        return audio_pipe_push(&connection->fifo, adata);
+}
 
 static inline const char *connection_source_name(connection_t *connection)