Changeset c5b8548 in mainline

Timestamp:

2013-04-05T12:24:43Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

704baed

Parents:

50179b63

Message:

hound: make audio data list element private

Location:

uspace/srv/audio/hound

Files:

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

uspace/srv/audio/hound/audio_data.c

@@ -69 +69 @@
 }
 
-audio_data_link_t *audio_data_link_create(audio_data_t *adata)
+/* Data link helpers */
+
+typedef struct {
+        link_t link;
+        audio_data_t *adata;
+        size_t position;
+} audio_data_link_t;
+
+static inline audio_data_link_t * audio_data_link_list_instance(link_t *l)
+{
+        return l ? list_get_instance(l, audio_data_link_t, link) : NULL;
+}
+
+static audio_data_link_t *audio_data_link_create(audio_data_t *adata)
 {
         assert(adata);
@@ -81 +94 @@
 }
 
-audio_data_link_t * audio_data_link_create_data(const void *data, size_t size,
-    pcm_format_t format)
-{
-        audio_data_link_t *link = NULL;
-        audio_data_t *adata = audio_data_create(data, size, format);
-        if (adata) {
-                link = audio_data_link_create(adata);
-                /* This will either return refcount to 1 or clean adata if
-                 * cloning failed */
-                audio_data_unref(adata);
-        }
-        return link;
-}
-
-void audio_data_link_destroy(audio_data_link_t *link)
+static void audio_data_link_destroy(audio_data_link_t *link)
 {
         assert(link);
@@ -103 +102 @@
 }
 
-size_t audio_data_link_available_frames(audio_data_link_t *alink)
+static inline const void * audio_data_link_start(audio_data_link_t *alink)
+{
+        assert(alink);
+        assert(alink->adata);
+        return alink->adata->data + alink->position;
+}
+
+static inline size_t audio_data_link_remain_size(audio_data_link_t *alink)
+{
+        assert(alink);
+        assert(alink->adata);
+        assert(alink->position <= alink->adata->size);
+        return alink->adata->size - alink->position;
+}
+
+
+static inline size_t audio_data_link_available_frames(audio_data_link_t *alink)
 {
         assert(alink);

uspace/srv/audio/hound/audio_data.h

@@ -51 +51 @@
 
 typedef struct {
-        link_t link;
-        audio_data_t *adata;
-        size_t position;
-} audio_data_link_t;
-
-typedef struct {
         list_t list;
         size_t bytes;
@@ -63 +57 @@
 } audio_pipe_t;
 
-static inline audio_data_link_t * audio_data_link_list_instance(link_t *l)
-{
-        return l ? list_get_instance(l, audio_data_link_t, link) : NULL;
-}
-
 audio_data_t * audio_data_create(const void *data, size_t size,
     pcm_format_t format);
 void audio_data_addref(audio_data_t *adata);
 void audio_data_unref(audio_data_t *adata);
-
-audio_data_link_t * audio_data_link_create_data(const void *data, size_t size,
-    pcm_format_t format);
-audio_data_link_t *audio_data_link_create(audio_data_t *adata);
-void audio_data_link_destroy(audio_data_link_t *link);
-
-size_t audio_data_link_available_frames(audio_data_link_t *alink);
-static inline const void * audio_data_link_start(audio_data_link_t *alink)
-{
-        assert(alink);
-        assert(alink->adata);
-        return alink->adata->data + alink->position;
-}
-
-static inline size_t audio_data_link_remain_size(audio_data_link_t *alink)
-{
-        assert(alink);
-        assert(alink->adata);
-        assert(alink->position <= alink->adata->size);
-        return alink->adata->size - alink->position;
-}
 
 void audio_pipe_init(audio_pipe_t *pipe);