Changeset 6424800 in mainline

Timestamp:

2012-07-13T08:38:20Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ab07cf0

Parents:

1c33539

Message:

hound: Implement client removal

Location:

uspace/srv/audio/hound

Files:

• hound.c (modified) (1 diff)
• hound.h (modified) (1 diff)
• main.c (modified) (3 diffs)

uspace/srv/audio/hound/hound.c

@@ -201 +201 @@
 }
 
+int hound_remove_source(hound_t *hound, audio_source_t *source)
+{
+        assert(hound);
+        if (!source)
+                return EINVAL;
+        log_verbose("Removing source '%s'.", source->name);
+        fibril_mutex_lock(&hound->list_guard);
+        if (!list_member(&source->link, &hound->sources)) {
+                fibril_mutex_unlock(&hound->list_guard);
+                return EBUSY;
+        }
+        list_remove(&source->link);
+        fibril_mutex_unlock(&hound->list_guard);
+        return EOK;
+}
+
+int hound_remove_sink(hound_t *hound, audio_sink_t *sink)
+{
+        assert(hound);
+        if (!sink)
+                return EINVAL;
+        log_verbose("Removing sink '%s'.", sink->name);
+        fibril_mutex_lock(&hound->list_guard);
+        if (!list_empty(&sink->sources)) {
+                fibril_mutex_unlock(&hound->list_guard);
+                return EBUSY;
+        }
+        list_remove(&sink->link);
+        fibril_mutex_unlock(&hound->list_guard);
+        return EOK;
+}
+
 int hound_connect(hound_t *hound, const char* source_name, const char* sink_name)
 {

uspace/srv/audio/hound/hound.h

@@ -59 +59 @@
 int hound_add_source(hound_t *hound, audio_source_t *source);
 int hound_add_sink(hound_t *hound, audio_sink_t *sink);
+int hound_remove_source(hound_t *hound, audio_source_t *source);
+int hound_remove_sink(hound_t *hound, audio_sink_t *sink);
 int hound_connect(hound_t *hound, const char* source_name, const char* sink_name);
 int hound_disconnect(hound_t *hound, const char* source_name, const char* sink_name);

uspace/srv/audio/hound/main.c

@@ -178 +178 @@
                         audio_client_t * client =
                             audio_client_get_recording(name, &format, sess);
+                        free(name);
                         if (!client) {
                                 log_error("Failed to create recording client");
@@ -196 +197 @@
                 }
                 case HOUND_UNREGISTER_PLAYBACK: {
-                        //const char *name = get_name();
-                        //TODO unregister in hound
-                        //TODO remove from local
+                        const char *name = get_name();
+                        int ret = ENOENT;
+                        list_foreach(local_playback, it) {
+                                audio_client_t *client =
+                                    audio_client_list_instance(it);
+                                if (str_cmp(client->name, name) == 0) {
+                                        ret = hound_remove_source(&hound,
+                                            &client->source);
+                                        if (ret == EOK) {
+                                                list_remove(&client->link);
+                                                audio_client_destroy(client);
+                                        }
+                                        break;
+                                }
+                        }
+                        free(name);
+                        async_answer_0(callid, ret);
                         break;
                 }
                 case HOUND_UNREGISTER_RECORDING: {
-                        //TODO Get Name
-                        //TODO unregister in hound
-                        //TODO remove from local
+                        const char *name = get_name();
+                        int ret = ENOENT;
+                        list_foreach(local_recording, it) {
+                                audio_client_t *client =
+                                    audio_client_list_instance(it);
+                                if (str_cmp(client->name, name) == 0) {
+                                        ret = hound_remove_sink(&hound,
+                                            &client->sink);
+                                        if (ret == EOK) {
+                                                list_remove(&client->link);
+                                                audio_client_destroy(client);
+                                        }
+                                        break;
+                                }
+                        }
+                        free(name);
+                        async_answer_0(callid, ret);
                         break;
                 }
@@ -237 +266 @@
                         break;
                 case 0:
+                        while(!list_empty(&local_recording)) {
+                                audio_client_t *client =
+                                    audio_client_list_instance(
+                                        list_first(&local_recording));
+                                list_remove(&client->link);
+                                hound_remove_sink(&hound, &client->sink);
+                                audio_client_destroy(client);
+                        }
+                        while(!list_empty(&local_playback)) {
+                                audio_client_t *client =
+                                    audio_client_list_instance(
+                                        list_first(&local_playback));
+                                list_remove(&client->link);
+                                hound_remove_source(&hound, &client->source);
+                                audio_client_destroy(client);
+                        }
                         //TODO remove all clients
                         return;