summaryrefslogtreecommitdiffstats
path: root/src/modules/module-stream-restore.c
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2011-03-27 23:00:26 +0300
committerColin Guthrie <colin@mageia.org>2011-03-29 21:18:06 +0100
commite72e75570c97ee9dd1cbce6480d7de8637d470fe (patch)
treeb5672949bd2e92df2b7559855f19642d1eb44aa8 /src/modules/module-stream-restore.c
parentb358f1c71d633adcbef02b583120d9ab1a8ac69e (diff)
sink-input: Add volume_writable to pa_sink_input.
This is pretty cosmetic change; there's no actual functionality added. Previously the volume_writable information was available through the pa_sink_input_is_volume_writable() function, but I find it cleaner to have a real variable. The sink input introspection variable name was also changed from read_only_volume to volume_writable for consistency.
Diffstat (limited to 'src/modules/module-stream-restore.c')
-rw-r--r--src/modules/module-stream-restore.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/module-stream-restore.c b/src/modules/module-stream-restore.c
index df48dce2..8edfee0c 100644
--- a/src/modules/module-stream-restore.c
+++ b/src/modules/module-stream-restore.c
@@ -1168,7 +1168,7 @@ static void subscribe_callback(pa_core *c, pa_subscription_event_type_t t, uint3
}
if (sink_input->save_volume) {
- pa_assert(pa_sink_input_is_volume_writable(sink_input));
+ pa_assert(sink_input->volume_writable);
entry.channel_map = sink_input->channel_map;
pa_sink_input_get_volume(sink_input, &entry.volume, FALSE);
@@ -1329,7 +1329,7 @@ static pa_hook_result_t sink_input_fixate_hook_callback(pa_core *c, pa_sink_inpu
if ((e = read_entry(u, name))) {
if (u->restore_volume && e->volume_valid) {
- if (!pa_sink_input_new_data_is_volume_writable(new_data))
+ if (!new_data->volume_writable)
pa_log_debug("Not restoring volume for sink input %s, because its volume can't be changed.", name);
else if (new_data->volume_is_set)
pa_log_debug("Not restoring volume for sink input %s, because already set.", name);
@@ -1619,7 +1619,7 @@ static void apply_entry(struct userdata *u, const char *name, struct entry *e) {
}
pa_xfree(n);
- if (u->restore_volume && e->volume_valid && pa_sink_input_is_volume_writable(si)) {
+ if (u->restore_volume && e->volume_valid && si->volume_writable) {
pa_cvolume v;
v = e->volume;