Changeset 1df3018a in mainline for uspace/srv/audio/hound/audio_sink.h

Timestamp:

2012-07-13T03:24:17Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

d93a5a6f

Parents:

d01e635

Message:

hound: Only few more TODOs left

File:

• uspace/srv/audio/hound/audio_sink.h (modified) (1 diff)

uspace/srv/audio/hound/audio_sink.h

@@ -37 +37 @@
 #define AUDIO_SINK_H_
 
+#include <adt/list.h>
+#include <async.h>
 #include <bool.h>
-#include <adt/list.h>
 #include <pcm_sample_format.h>
 #include <fibril.h>
 
+#include "audio_source.h"
 #include "audio_format.h"
-#include "audio_source.h"
 
-typedef struct audio_sink {
+typedef struct audio_sink audio_sink_t;
+
+struct audio_sink {
         link_t link;
         list_t sources;
-        char *name;
+        const char *name;
         audio_format_t format;
-        struct {
-                int (*hook)(void* arg);
-                void *arg;
-        } connected_change;
-} audio_sink_t;
+        void *private_data;
+        int (*connection_change)(audio_sink_t *sink);
+};
 
-static inline void audio_sink_set_connected_callback(audio_sink_t *sink,
-    int (*hook)(void* arg), void* arg)
+static inline audio_sink_t * audio_sink_list_instance(link_t *l)
 {
-        assert(sink);
-        sink->connected_change.arg = arg;
-        sink->connected_change.hook = hook;
-};
-int audio_sink_init(audio_sink_t *sink, const char* name);
+        return list_get_instance(l, audio_sink_t, link);
+}
+
+int audio_sink_init(audio_sink_t *sink, const char *name,
+    void *private_data, int (*connection_change)(audio_sink_t *sink),
+    const audio_format_t *f);
+void audio_sink_fini(audio_sink_t *sink);
+
 int audio_sink_add_source(audio_sink_t *sink, audio_source_t *source);
 int audio_sink_remove_source(audio_sink_t *sink, audio_source_t *source);