Changeset 3b6c1d4 in mainline

Timestamp:

2013-04-02T15:13:12Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

62beb4b

Parents:

2d1fdcad

Message:

hound: implement context manipulation

Location:

uspace/srv/audio/hound

Files:

• Makefile (modified) (1 diff)
• hound.c (modified) (2 diffs)
• hound.h (modified) (3 diffs)
• hound_ctx.c (added)
• hound_ctx.h (added)
• iface.c (modified) (4 diffs)

uspace/srv/audio/hound/Makefile

@@ -47 +47 @@
         audio_source.c \
         hound.c \
+        hound_ctx.c \
         iface.c \
         main.c

uspace/srv/audio/hound/hound.c

@@ -75 +75 @@
         FIND_BY_NAME(sink);
 }
+
 static int hound_disconnect_internal(hound_t *hound, const char* source_name, const char* sink_name);
 
@@ -82 +83 @@
         fibril_mutex_initialize(&hound->list_guard);
         list_initialize(&hound->devices);
+        list_initialize(&hound->contexts);
         list_initialize(&hound->sources);
         list_initialize(&hound->sinks);
         return EOK;
+}
+
+int hound_add_ctx(hound_t *hound, hound_ctx_t *ctx)
+{
+        log_info("Trying to add context %p", ctx);
+        assert(hound);
+        if (!ctx)
+                return EINVAL;
+        list_append(&ctx->link, &hound->contexts);
+        //TODO register sinks/sources
+        return EOK;
+}
+
+int hound_remove_ctx(hound_t *hound, hound_ctx_t *ctx)
+{
+        assert(hound);
+        if (!ctx)
+                return EINVAL;
+        list_remove(&ctx->link);
+        return EOK;
+}
+
+hound_ctx_t *hound_get_ctx_by_id(hound_t *hound, hound_context_id_t id)
+{
+        assert(hound);
+
+        //TODO locking
+
+        list_foreach(hound->contexts, it) {
+                hound_ctx_t *ctx = hound_ctx_from_link(it);
+                if (hound_ctx_get_id(ctx) == id)
+                        return ctx;
+        }
+        return NULL;
 }
 

uspace/srv/audio/hound/hound.h

@@ -43 +43 @@
 #include <fibril_synch.h>
 #include <pcm/format.h>
+#include <hound/protocol.h>
 
+#include "hound_ctx.h"
 #include "audio_source.h"
 #include "audio_sink.h"
@@ -51 +53 @@
         fibril_mutex_t list_guard;
         list_t devices;
+        list_t contexts;
         list_t sources;
         list_t sinks;
@@ -56 +59 @@
 
 int hound_init(hound_t *hound);
+int hound_add_ctx(hound_t *hound, hound_ctx_t *ctx);
+int hound_remove_ctx(hound_t *hound, hound_ctx_t *ctx);
+hound_ctx_t *hound_get_ctx_by_id(hound_t *hound, hound_context_id_t id);
+
 int hound_add_device(hound_t *hound, service_id_t id, const char* name);
 int hound_add_source(hound_t *hound, audio_source_t *source);

uspace/srv/audio/hound/iface.c

@@ -38 +38 @@
 #include <hound/protocol.h>
 #include <malloc.h>
+
+#include "hound.h"
+#include "hound_ctx.h"
 #include "log.h"
 
@@ -43 +46 @@
     const char *name, bool record)
 {
-        log_info("%s: %p, %s, %s", __FUNCTION__, server, name, record ? "REC" : "PLAY");
-        *id = 1;
-        return EOK;
+        assert(server);
+        assert(id);
+        assert(name);
+
+        hound_ctx_t *ctx = record ? hound_record_ctx_get(name) :
+            hound_playback_ctx_get(name);
+        if (!ctx)
+                return ENOMEM;
+
+        const int ret = hound_add_ctx(server, ctx);
+        if (ret != EOK)
+                hound_ctx_destroy(ctx);
+        else
+                *id = hound_ctx_get_id(ctx);
+        return ret;
 }
 
 static int iface_rem_context(void *server, hound_context_id_t id)
 {
+        assert(server);
+        hound_ctx_t *ctx = hound_get_ctx_by_id(server, id);
+        if (!ctx)
+                return EINVAL;
+        hound_remove_ctx(server, ctx);
+        hound_ctx_destroy(ctx);
         log_info("%s: %p, %d", __FUNCTION__, server, id);
-        return ENOTSUP;
+        return EOK;
 }
 
 static bool iface_is_record_context(void *server, hound_context_id_t id)
 {
+        assert(server);
+        hound_ctx_t *ctx = hound_get_ctx_by_id(server, id);
+        if (!ctx)
+                return false;
         log_info("%s: %p, %d", __FUNCTION__, server, id);
-        return false;
+        return hound_ctx_is_record(ctx);
 }
 
@@ -73 +98 @@
 {
         log_info("%s: %p, %s -> %s", __FUNCTION__, server, source, sink);
-        return EOK;
+        return ENOTSUP;
 }
 
@@ -89 +114 @@
             pcm_sample_format_str(format.sample_format));
         *data = (void*)"TEST_STREAM";
-        return EOK;
+        return ENOTSUP;
 }