pa_log_info("Synced.");
}
-static void trigger_save(struct userdata *u) {
+static void trigger_save(struct userdata *u, uint32_t sink_idx) {
+ pa_native_connection *c;
+ uint32_t idx;
+
+ if (sink_idx != PA_INVALID_INDEX) {
+ for (c = pa_idxset_first(u->subscribed, &idx); c; c = pa_idxset_next(u->subscribed, &idx)) {
+ pa_tagstruct *t;
+
+ t = pa_tagstruct_new(NULL, 0);
+ pa_tagstruct_putu32(t, PA_COMMAND_EXTENSION);
+ pa_tagstruct_putu32(t, 0);
+ pa_tagstruct_putu32(t, u->module->index);
+ pa_tagstruct_puts(t, u->module->name);
+ pa_tagstruct_putu32(t, SUBCOMMAND_EVENT);
+ pa_tagstruct_putu32(t, sink_idx);
+
+ pa_pstream_send_tagstruct(pa_native_connection_get_pstream(c), t);
+ }
+ }
+
if (u->save_time_event)
return;
if ((e = legacy_entry_read(u, &data))) {
pa_log_debug("Success. Saving new format for key: %s", name);
if (entry_write(u, name, e))
- trigger_save(u);
+ trigger_save(u, PA_INVALID_INDEX);
pa_datum_free(&data);
return e;
} else
pa_log_info("Storing volume/mute/port for device %s.", name);
if (entry_write(u, name, entry))
- trigger_save(u);
+ trigger_save(u, idx);
entry_free(entry);
pa_xfree(name);
name = pa_sprintf_malloc("sink:%s", sink->name);
if (!(e = entry_read(u, name)))
e = entry_new(FALSE);
+ else {
+ /* Clean out any saved formats */
+ pa_idxset_free(e->formats, (pa_free2_cb_t) pa_format_info_free2, NULL);
+ e->formats = pa_idxset_new(NULL, NULL);
+ }
/* Read all the formats from our tagstruct */
for (i = 0; i < n_formats; ++i) {
}
if (entry_write(u, name, e))
- trigger_save(u);
+ trigger_save(u, sink_index);
else
pa_log_warn("Could not save format info for sink %s", sink->name);
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
/* 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);
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);
}