mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

device-manager: Change the write function to a rename function.

Browse source 
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.
This commit is contained in:
Colin Guthrie 2009-09-20 12:44:02 +01:00
parent aebe4787f2
commit f8ec8f382f
3 changed files with 44 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

63
src/modules/module-device-manager.c
View file

@ -109,7 +109,7 @@ struct entry {
enum { enum {
SUBCOMMAND_TEST, SUBCOMMAND_TEST,
SUBCOMMAND_READ, SUBCOMMAND_READ,
SUBCOMMAND_WRITE, SUBCOMMAND_RENAME,
SUBCOMMAND_DELETE, SUBCOMMAND_DELETE,
SUBCOMMAND_ROLE_DEVICE_PRIORITY_ROUTING, SUBCOMMAND_ROLE_DEVICE_PRIORITY_ROUTING,
SUBCOMMAND_PREFER_DEVICE, SUBCOMMAND_PREFER_DEVICE,
@ -451,51 +451,41 @@ static int extension_cb(pa_native_protocol *p, pa_module *m, pa_native_connectio
break; break;
} }
case SUBCOMMAND_WRITE: { case SUBCOMMAND_RENAME: {
uint32_t mode;
pa_bool_t apply_immediately = FALSE;
if (pa_tagstruct_getu32(t, &mode) < 0 || struct entry *e;
pa_tagstruct_get_boolean(t, &apply_immediately) < 0) const char *device, *description;
goto fail;
if (mode != PA_UPDATE_MERGE && if (pa_tagstruct_gets(t, &device) < 0 ||
mode != PA_UPDATE_REPLACE &&
mode != PA_UPDATE_SET)
goto fail;
if (mode == PA_UPDATE_SET)
pa_database_clear(u->database);
while (!pa_tagstruct_eof(t)) {
const char *name, *description;
struct entry entry;
pa_datum key, data;
pa_zero(entry);
entry.version = ENTRY_VERSION;
if (pa_tagstruct_gets(t, &name) < 0 ||
pa_tagstruct_gets(t, &description) < 0) pa_tagstruct_gets(t, &description) < 0)
goto fail; goto fail;
if (!name || !*name) if (!device || !*device || !description || !*description)
goto fail; goto fail;
pa_strlcpy(entry.description, description, sizeof(entry.description)); if ((e = read_entry(u, device)) && ENTRY_VERSION == e->version) {
pa_datum key, data;
key.data = (char*) name; pa_strlcpy(e->description, description, sizeof(e->description));
key.size = strlen(name);
data.data = &entry; key.data = (char *) device;
data.size = sizeof(entry); key.size = strlen(device);
if (pa_database_set(u->database, &key, &data, mode == PA_UPDATE_REPLACE) == 0) data.data = e;
if (apply_immediately) data.size = sizeof(*e);
apply_entry(u, name, &entry);
}
trigger_save(u); if (pa_database_set(u->database, &key, &data, FALSE) == 0) {
apply_entry(u, device, e);
trigger_save(u);
}
else
pa_log_warn("Could not save device");
pa_xfree(e);
}
else
pa_log_warn("Could not rename device %s, no entry in database", device);
break; break;
} }
@ -671,6 +661,9 @@ static int extension_cb(pa_native_protocol *p, pa_module *m, pa_native_connectio
pa_xfree(prefix); pa_xfree(prefix);
} }
else
pa_log_warn("Could not reorder device %s, no entry in database", device);
break; break;
} }

40
src/pulse/ext-device-manager.c
View file

@ -39,7 +39,7 @@
enum { enum {
SUBCOMMAND_TEST, SUBCOMMAND_TEST,
SUBCOMMAND_READ, SUBCOMMAND_READ,
SUBCOMMAND_WRITE, SUBCOMMAND_RENAME,
SUBCOMMAND_DELETE, SUBCOMMAND_DELETE,
SUBCOMMAND_ROLE_DEVICE_PRIORITY_ROUTING, SUBCOMMAND_ROLE_DEVICE_PRIORITY_ROUTING,
SUBCOMMAND_PREFER_DEVICE, SUBCOMMAND_PREFER_DEVICE,
@ -183,12 +183,10 @@ pa_operation *pa_ext_device_manager_read(
return o; return o;
} }
pa_operation *pa_ext_device_manager_write( pa_operation *pa_ext_device_manager_set_device_description(
pa_context *c, pa_context *c,
pa_update_mode_t mode, const char* device,
const pa_ext_device_manager_info data[], const char* description,
unsigned n,
int apply_immediately,
pa_context_success_cb_t cb, pa_context_success_cb_t cb,
void *userdata) { void *userdata) {
@ -198,8 +196,8 @@ pa_operation *pa_ext_device_manager_write(
pa_assert(c); pa_assert(c);
pa_assert(PA_REFCNT_VALUE(c) >= 1); pa_assert(PA_REFCNT_VALUE(c) >= 1);
pa_assert(mode == PA_UPDATE_MERGE || mode == PA_UPDATE_REPLACE || mode == PA_UPDATE_SET); pa_assert(device);
pa_assert(data); pa_assert(description);
PA_CHECK_VALIDITY_RETURN_NULL(c, !pa_detect_fork(), PA_ERR_FORKED); 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); 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); t = pa_tagstruct_command(c, PA_COMMAND_EXTENSION, &tag);
pa_tagstruct_putu32(t, PA_INVALID_INDEX); pa_tagstruct_putu32(t, PA_INVALID_INDEX);
pa_tagstruct_puts(t, "module-device-manager"); pa_tagstruct_puts(t, "module-device-manager");
pa_tagstruct_putu32(t, SUBCOMMAND_WRITE); pa_tagstruct_putu32(t, SUBCOMMAND_RENAME);
pa_tagstruct_putu32(t, mode); pa_tagstruct_puts(t, device);
pa_tagstruct_put_boolean(t, apply_immediately); pa_tagstruct_puts(t, description);
for (; n > 0; n--, data++) {
if (!data->name || !*data->name)
goto fail;
pa_tagstruct_puts(t, data->name);
pa_tagstruct_puts(t, data->description);
}
pa_pstream_send_tagstruct(c->pstream, t); 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); 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; 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( pa_operation *pa_ext_device_manager_delete(

16
src/pulse/ext-device-manager.h
View file

@ -65,13 +65,11 @@ pa_operation *pa_ext_device_manager_read(
pa_ext_device_manager_read_cb_t cb, pa_ext_device_manager_read_cb_t cb,
void *userdata); void *userdata);
/** Store entries in the device database. \since 0.9.19 */ /** Sets the description for a device. \since 0.9.19 */
pa_operation *pa_ext_device_manager_write( pa_operation *pa_ext_device_manager_set_device_description(
pa_context *c, pa_context *c,
pa_update_mode_t mode, const char* device,
const pa_ext_device_manager_info data[], const char* description,
unsigned n,
int apply_immediately,
pa_context_success_cb_t cb, pa_context_success_cb_t cb,
void *userdata); void *userdata);
@ -82,14 +80,14 @@ pa_operation *pa_ext_device_manager_delete(
pa_context_success_cb_t cb, pa_context_success_cb_t cb,
void *userdata); void *userdata);
/** Subscribe to changes in the device database. \since 0.9.19 */ /** Enable the role-based device-priority routing mode. \since 0.9.19 */
pa_operation *pa_ext_device_manager_enable_role_device_priority_routing( pa_operation *pa_ext_device_manager_enable_role_device_priority_routing(
pa_context *c, pa_context *c,
int enable, int enable,
pa_context_success_cb_t cb, pa_context_success_cb_t cb,
void *userdata); void *userdata);
/** Subscribe to changes in the device database. \since 0.9.19 */ /** Prefer a given device in the priority list. \since 0.9.19 */
pa_operation *pa_ext_device_manager_prefer_device( pa_operation *pa_ext_device_manager_prefer_device(
pa_context *c, pa_context *c,
const char* role, const char* role,
@ -97,7 +95,7 @@ pa_operation *pa_ext_device_manager_prefer_device(
pa_context_success_cb_t cb, pa_context_success_cb_t cb,
void *userdata); void *userdata);
/** Subscribe to changes in the device database. \since 0.9.19 */ /** Defer a given device in the priority list. \since 0.9.19 */
pa_operation *pa_ext_device_manager_defer_device( pa_operation *pa_ext_device_manager_defer_device(
pa_context *c, pa_context *c,
const char* role, const char* role,