summaryrefslogtreecommitdiffstats
path: root/src/pulse/ext-device-manager.c
diff options
context:
space:
mode:
authorColin Guthrie <cguthrie@mandriva.org>2009-09-20 12:44:02 +0100
committerColin Guthrie <cguthrie@mandriva.org>2009-11-11 17:44:23 +0000
commit6d4afac194ad19fa58e2e49f289da24e5852022f (patch)
tree3ecbc278b715e5f6bcecfb52b24b7381555d7bc4 /src/pulse/ext-device-manager.c
parent4981268738cca80a2104575d5844167346a0dcfb (diff)
device-manager: Change the write function to a rename function.
The structure itself will contain various bits of info so exposing this fully to the client is a bad idea. By keeping to a rename operation we keep what we do store abstracted from the clients. Also fix some doxy comments.
Diffstat (limited to 'src/pulse/ext-device-manager.c')
-rw-r--r--src/pulse/ext-device-manager.c40
1 files changed, 9 insertions, 31 deletions
diff --git a/src/pulse/ext-device-manager.c b/src/pulse/ext-device-manager.c
index a634e212..bc6301ca 100644
--- a/src/pulse/ext-device-manager.c
+++ b/src/pulse/ext-device-manager.c
@@ -39,7 +39,7 @@
enum {
SUBCOMMAND_TEST,
SUBCOMMAND_READ,
- SUBCOMMAND_WRITE,
+ SUBCOMMAND_RENAME,
SUBCOMMAND_DELETE,
SUBCOMMAND_ROLE_DEVICE_PRIORITY_ROUTING,
SUBCOMMAND_PREFER_DEVICE,
@@ -183,12 +183,10 @@ pa_operation *pa_ext_device_manager_read(
return o;
}
-pa_operation *pa_ext_device_manager_write(
+pa_operation *pa_ext_device_manager_set_device_description(
pa_context *c,
- pa_update_mode_t mode,
- const pa_ext_device_manager_info data[],
- unsigned n,
- int apply_immediately,
+ const char* device,
+ const char* description,
pa_context_success_cb_t cb,
void *userdata) {
@@ -198,8 +196,8 @@ pa_operation *pa_ext_device_manager_write(
pa_assert(c);
pa_assert(PA_REFCNT_VALUE(c) >= 1);
- pa_assert(mode == PA_UPDATE_MERGE || mode == PA_UPDATE_REPLACE || mode == PA_UPDATE_SET);
- pa_assert(data);
+ pa_assert(device);
+ pa_assert(description);
PA_CHECK_VALIDITY_RETURN_NULL(c, !pa_detect_fork(), PA_ERR_FORKED);
PA_CHECK_VALIDITY_RETURN_NULL(c, c->state == PA_CONTEXT_READY, PA_ERR_BADSTATE);
@@ -210,35 +208,15 @@ pa_operation *pa_ext_device_manager_write(
t = pa_tagstruct_command(c, PA_COMMAND_EXTENSION, &tag);
pa_tagstruct_putu32(t, PA_INVALID_INDEX);
pa_tagstruct_puts(t, "module-device-manager");
- pa_tagstruct_putu32(t, SUBCOMMAND_WRITE);
-
- pa_tagstruct_putu32(t, mode);
- pa_tagstruct_put_boolean(t, apply_immediately);
-
- for (; n > 0; n--, data++) {
- if (!data->name || !*data->name)
- goto fail;
+ pa_tagstruct_putu32(t, SUBCOMMAND_RENAME);
- pa_tagstruct_puts(t, data->name);
- pa_tagstruct_puts(t, data->description);
- }
+ pa_tagstruct_puts(t, device);
+ pa_tagstruct_puts(t, description);
pa_pstream_send_tagstruct(c->pstream, t);
pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, pa_context_simple_ack_callback, pa_operation_ref(o), (pa_free_cb_t) pa_operation_unref);
return o;
-
-fail:
- if (o) {
- pa_operation_cancel(o);
- pa_operation_unref(o);
- }
-
- if (t)
- pa_tagstruct_free(t);
-
- pa_context_set_error(c, PA_ERR_INVALID);
- return NULL;
}
pa_operation *pa_ext_device_manager_delete(