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

move volume restore table from runtime to state dir, fix another compiler warning

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2477 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2008-05-21 22:45:52 +00:00
parent 2ed84edbae
commit 32c53f303a
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/modules/module-volume-restore.c
View file

@ -102,7 +102,7 @@ static pa_cvolume* parse_volume(const char *s, pa_cvolume *v) {
return NULL; return NULL;
k = strtol(s, &p, 0); k = strtol(s, &p, 0);
if (k <= 0 || k > PA_CHANNELS_MAX) if (k <= 0 || k > (long) PA_CHANNELS_MAX)
return NULL; return NULL;
v->channels = (unsigned) k; v->channels = (unsigned) k;
@ -488,7 +488,6 @@ int pa__init(pa_module*m) {
u = pa_xnew(struct userdata, 1); u = pa_xnew(struct userdata, 1);
u->core = m->core; u->core = m->core;
u->hashmap = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func); u->hashmap = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
u->table_file = pa_runtime_path(pa_modargs_get_value(ma, "table", DEFAULT_VOLUME_TABLE_FILE));
u->modified = FALSE; u->modified = FALSE;
u->subscription = NULL; u->subscription = NULL;
u->sink_input_new_hook_slot = u->sink_input_fixate_hook_slot = u->source_output_new_hook_slot = NULL; u->sink_input_new_hook_slot = u->sink_input_fixate_hook_slot = u->source_output_new_hook_slot = NULL;
@ -496,6 +495,9 @@ int pa__init(pa_module*m) {
m->userdata = u; m->userdata = u;
if (!(u->table_file = pa_state_path(pa_modargs_get_value(ma, "table", DEFAULT_VOLUME_TABLE_FILE))))
goto fail;
if (pa_modargs_get_value_boolean(ma, "restore_device", &restore_device) < 0 || if (pa_modargs_get_value_boolean(ma, "restore_device", &restore_device) < 0 ||
pa_modargs_get_value_boolean(ma, "restore_volume", &restore_volume) < 0) { pa_modargs_get_value_boolean(ma, "restore_volume", &restore_volume) < 0) {
pa_log("restore_volume= and restore_device= expect boolean arguments"); pa_log("restore_volume= and restore_device= expect boolean arguments");