mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-08 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

device-restore: Various fixes for the protocol extension.

Browse source 
* Fix extension API function export list.
 * Ensure we trigger a subscription event when things change.
 * Send the index with our subscription events.
 * Clear out any existing formats when saving.
 * Call the correct extension command for subscriptions.
This commit is contained in:
Colin Guthrie 2011-08-08 23:29:47 +02:00
parent 738cea3cc3
commit fc0a6ee239
5 changed files with 39 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/pulse/context.c
View file

@ -1424,7 +1424,7 @@ void pa_command_extension(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_t
if (pa_streq(name, "module-device-manager"))
pa_ext_device_manager_command(c, tag, t);
else if (pa_streq(name, "module-device-restore"))
pa_ext_device_manager_command(c, tag, t);
pa_ext_device_restore_command(c, tag, t);
else if (pa_streq(name, "module-stream-restore"))
pa_ext_stream_restore_command(c, tag, t);
else

9
src/pulse/ext-device-restore.c
View file

@ -324,12 +324,14 @@ pa_operation *pa_ext_device_restore_save_sink_formats(
/* Command function defined in internal.h */
void pa_ext_device_restore_command(pa_context *c, uint32_t tag, pa_tagstruct *t) {
uint32_t subcommand;
uint32_t idx;
pa_assert(c);
pa_assert(PA_REFCNT_VALUE(c) >= 1);
pa_assert(t);
if (pa_tagstruct_getu32(t, &subcommand) < 0 ||
pa_tagstruct_getu32(t, &idx) < 0 ||
!pa_tagstruct_eof(t)) {
pa_context_fail(c, PA_ERR_PROTOCOL);
@ -341,6 +343,11 @@ void pa_ext_device_restore_command(pa_context *c, uint32_t tag, pa_tagstruct *t)
return;
}
if (idx == PA_INVALID_INDEX) {
pa_context_fail(c, PA_ERR_PROTOCOL);
return;
}
if (c->ext_device_restore.callback)
c->ext_device_restore.callback(c, c->ext_device_restore.userdata);
c->ext_device_restore.callback(c, idx, c->ext_device_restore.userdata);
}

1
src/pulse/ext-device-restore.h
View file

@ -63,6 +63,7 @@ pa_operation *pa_ext_device_restore_subscribe(
/** Callback prototype for pa_ext_device_restore_set_subscribe_cb(). \since 1.0 */
typedef void (*pa_ext_device_restore_subscribe_cb_t)(
pa_context *c,
uint32_t idx,
void *userdata);
/** Set the subscription callback that is called when