Changeset aab8e3d3 in mainline

Timestamp:

2013-04-03T19:02:48Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

8f8ec69

Parents:

b893cd6

Message:

hound: initialize ctx source/sink

Location:

uspace/srv/audio/hound

Files:

• hound_ctx.c (modified) (3 diffs)
• hound_ctx.h (modified) (1 diff)

uspace/srv/audio/hound/hound_ctx.c

@@ -39 +39 @@
 #include "hound_ctx.h"
 
-static void hound_ctx_init_common(hound_ctx_t *ctx)
-{
-        if (!ctx)
-                return;
-        link_initialize(&ctx->link);
-}
-
 hound_ctx_t *hound_record_ctx_get(const char *name)
 {
@@ -54 +47 @@
 {
         hound_ctx_t *ctx = malloc(sizeof(hound_ctx_t));
-        hound_ctx_init_common(ctx);
+        if (ctx) {
+                link_initialize(&ctx->link);
+                ctx->sink = NULL;
+                ctx->source = malloc(sizeof(audio_source_t));
+                if (!ctx->source) {
+                        free(ctx);
+                        return NULL;
+                }
+                const int ret = audio_source_init(ctx->source, name, ctx, NULL,
+                    NULL, &AUDIO_FORMAT_ANY);
+                if (ret != EOK) {
+                        free(ctx->source);
+                        free(ctx);
+                        return NULL;
+                }
+        }
         return ctx;
 }
@@ -62 +70 @@
         assert(ctx);
         assert(!link_in_use(&ctx->link));
+        if (ctx->source)
+                audio_source_fini(ctx->source);
+        if (ctx->sink)
+                audio_sink_fini(ctx->sink);
+        free(ctx->source);
+        free(ctx->sink);
         free(ctx);
 }

uspace/srv/audio/hound/hound_ctx.h

@@ -39 +39 @@
 #include <adt/list.h>
 #include <hound/protocol.h>
+#include "audio_source.h"
+#include "audio_sink.h"
 
 typedef struct {
         link_t link;
+        list_t streams;
+        audio_source_t *source;
+        audio_sink_t *sink;
 } hound_ctx_t;
 
 static inline hound_ctx_t *hound_ctx_from_link(link_t *l)
 {
-        return list_get_instance(l, hound_ctx_t, link);
+        return l ? list_get_instance(l, hound_ctx_t, link) : NULL;
 }