Changeset 1df3018a in mainline for uspace/srv/audio/hound/audio_source.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_source.h (modified) (2 diffs)

uspace/srv/audio/hound/audio_source.h

@@ -41 +41 @@
 #include <pcm_sample_format.h>
 
+
 #include "audio_format.h"
 
+struct audio_sink;
+typedef struct audio_source audio_source_t;
 
-typedef struct {
+struct audio_source {
         link_t link;
-        char *name;
-        struct {
-                int (*hook)(void* arg, const audio_format_t *f);
-                void *arg;
-        } connected_change;
-        struct {
-                int (*hook)(void* arg);
-                void *arg;
-        } get_data;
+        const char *name;
+        audio_format_t format;
+        void *private_data;
+        int (*connection_change)(audio_source_t *source);
+        int (*update_available_data)(audio_source_t *source, size_t size);
+        struct audio_sink *connected_sink;
         struct {
                 void *base;
                 size_t size;
-        } available;
-        audio_format_t format;
-} audio_source_t;
+        } available_data;
+};
 
 static inline audio_source_t * audio_source_list_instance(link_t *l)
@@ -67 +66 @@
 }
 
-int audio_source_init(audio_source_t *source, const char *name);
-static inline void audio_source_set_connected_callback(audio_source_t *source,
-    int (*hook)(void* arg, const audio_format_t *f), void* arg)
-{
-        assert(source);
-        source->connected_change.arg = arg;
-        source->connected_change.hook = hook;
-}
-int audio_source_connected(audio_source_t *source, const audio_format_t *f);
+int audio_source_init(audio_source_t *source, const char *name, void *data,
+    int (*connection_change)(audio_source_t *),
+    int (*update_available_data)(audio_source_t *, size_t),
+    const audio_format_t *f);
+void audio_source_fini(audio_source_t *source);
+int audio_source_connected(audio_source_t *source, struct audio_sink *sink);
 int audio_source_add_self(audio_source_t *source, void *buffer, size_t size,
     const audio_format_t *f);