Changeset bee5349 in mainline

Timestamp:

2013-04-11T21:32:28Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

4eff63c

Parents:

d1f144a

Message:

hound: add data available callback

Location:

uspace/srv/audio/hound

Files:

• audio_device.c (modified) (1 diff)
• audio_sink.c (modified) (2 diffs)
• audio_sink.h (modified) (2 diffs)
• connection.c (modified) (1 diff)
• connection.h (modified) (1 diff)
• hound_ctx.c (modified) (1 diff)

uspace/srv/audio/hound/audio_device.c

@@ -83 +83 @@
 
         audio_sink_init(&dev->sink, name, dev, device_sink_connection_callback,
-            device_check_format, &AUDIO_FORMAT_ANY);
+            device_check_format, NULL, &AUDIO_FORMAT_ANY);
         audio_source_init(&dev->source, name, dev,
             device_source_connection_callback, NULL, &AUDIO_FORMAT_ANY);

uspace/srv/audio/hound/audio_sink.c

@@ -49 +49 @@
  * @param sink The structure to initialize.
  * @param name string identifier
- * @param private_data backa
+ * @param private_data backend data
+ * @param connection_change connect/disconnect callback
+ * @param check_format format testing callback
+ * @param data_available trigger data prcoessing
+ * @param f sink format
+ * @return Error code.
  */
-int audio_sink_init(audio_sink_t *sink, const char *name,
-    void *private_data, int (*connection_change)(audio_sink_t *, bool),
-    int (*check_format)(audio_sink_t *sink), const pcm_format_t *f)
+int audio_sink_init(audio_sink_t *sink, const char *name, void *private_data,
+    int (*connection_change)(audio_sink_t *, bool),
+    int (*check_format)(audio_sink_t *), int (*data_available)(audio_sink_t *),
+    const pcm_format_t *f)
 {
         assert(sink);
@@ -67 +73 @@
         sink->connection_change = connection_change;
         sink->check_format = check_format;
+        sink->data_available = data_available;
         log_verbose("Initialized sink (%p) '%s'", sink, sink->name);
         return EOK;

uspace/srv/audio/hound/audio_sink.h

@@ -63 +63 @@
         /** Backend callback to check data */
         int (*check_format)(audio_sink_t *);
+        /** new data notifier */
+        int (*data_available)(audio_sink_t *);
 };
 
@@ -75 +77 @@
 }
 
-int audio_sink_init(audio_sink_t *sink, const char *name,
-    void *private_data, int (*connection_change)(audio_sink_t *, bool),
-    int (*check_format)(audio_sink_t *), const pcm_format_t *f);
+int audio_sink_init(audio_sink_t *sink, const char *name, void *private_data,
+    int (*connection_change)(audio_sink_t *, bool),
+    int (*check_format)(audio_sink_t *), int (*data_available)(audio_sink_t *),
+    const pcm_format_t *f);
 
 void audio_sink_fini(audio_sink_t *sink);

uspace/srv/audio/hound/connection.c

@@ -123 +123 @@
         return ret > 0 ? EOK : ret;
 }
+/**
+ * Add new data to the connection buffer.
+ * @param connection Target conneciton.
+ * @aparam adata Reference counted audio data buffer.
+ * @return Error code.
+ */
+int connection_push_data(connection_t *connection,
+    audio_data_t *adata)
+{
+        assert(connection);
+        assert(adata);
+        const int ret = audio_pipe_push(&connection->fifo, adata);
+        if (ret == EOK && connection->sink->data_available)
+                connection->sink->data_available(connection->sink);
+        return ret;
+}
 
 /**

uspace/srv/audio/hound/connection.h

@@ -97 +97 @@
     size_t size, pcm_format_t format);
 
-/**
- * Add new data to the connection buffer.
- * @param connection Target conneciton.
- * @aparam adata Reference counted audio data buffer.
- * @return Error code.
- */
-static inline int connection_push_data(connection_t *connection,
-    audio_data_t *adata)
-{
-        assert(connection);
-        assert(adata);
-        return audio_pipe_push(&connection->fifo, adata);
-}
+int connection_push_data(connection_t *connection, audio_data_t *adata);
 
 /**

uspace/srv/audio/hound/hound_ctx.c

@@ -67 +67 @@
                 // TODO provide sink functions
                 const int ret = audio_sink_init(ctx->sink, name, ctx, NULL,
-                    NULL, &AUDIO_FORMAT_DEFAULT);
+                    NULL, NULL, &AUDIO_FORMAT_DEFAULT);
                 if (ret != EOK) {
                         free(ctx->sink);