Changeset cc3c27ad in mainline

Timestamp:

2013-03-24T19:29:09Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c6a7b3a

Parents:

03c2d5f

Message:

libhound: Destroy streams on stream_exit

Location:

uspace/lib/hound

Files:

• include/hound/client.h (modified) (1 diff)
• src/client.c (modified) (2 diffs)
• src/protocol.c (modified) (3 diffs)

uspace/lib/hound/include/hound/client.h

@@ -54 +54 @@
 void hound_context_destroy(hound_context_t *hound);
 
-int hound_context_enable(hound_context_t *hound);
-int hound_context_disable(hound_context_t *hound);
-
 int hound_context_set_main_stream_format(hound_context_t *hound,
     unsigned channels, unsigned rate, pcm_sample_format_t format);

uspace/lib/hound/src/client.c

@@ -55 +55 @@
         hound_context_t *context;
 } hound_stream_t;
+
+static inline hound_stream_t * hound_stream_from_link(link_t *l)
+{
+        return l ? list_get_instance(l, hound_stream_t, link) : NULL;
+}
 
 typedef struct hound_context {
@@ -120 +125 @@
 {
         assert(hound);
+
+        while (!list_empty(&hound->stream_list)) {
+                link_t *first = list_first(&hound->stream_list);
+                hound_stream_t *stream = hound_stream_from_link(first);
+                hound_stream_destroy(stream);
+        }
+
         hound_service_unregister_context(hound->session, hound->id);
         hound_service_disconnect(hound->session);
         free(hound->name);
         free(hound);
-}
-
-int hound_context_enable(hound_context_t *hound)
-{
-        assert(hound);
-        return ENOTSUP;
-}
-int hound_context_disable(hound_context_t *hound)
-{
-        assert(hound);
-        return ENOTSUP;
 }
 

uspace/lib/hound/src/protocol.c

@@ -412 +412 @@
                 }
                 case IPC_M_HOUND_STREAM_ENTER: {
-                        if (!server_iface || !server_iface->add_stream
-                            || !server_iface->is_record_context) {
+                        if (!server_iface || !server_iface->is_record_context
+                            || !server_iface->add_stream
+                            || !server_iface->rem_stream) {
                                 async_answer_0(callid, ENOTSUP);
                                 break;
@@ -438 +439 @@
                                         async_answer_0(callid, EOK);
                                         hound_server_write_data(stream);
+                                        server_iface->rem_stream(
+                                            server_iface->server, stream);
                                 } else {
                                         async_answer_0(callid, ENOTSUP);
@@ -445 +448 @@
                                         async_answer_0(callid, EOK);
                                         hound_server_read_data(stream);
+                                        server_iface->rem_stream(
+                                            server_iface->server, stream);
                                 } else {
                                         async_answer_0(callid, ENOTSUP);