I have made the following changes intended for : CE:Adaptation:N9xx-common / pulseaudio-modules-n900
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/7420 Thank You, Juho Hämäläinen [This message was auto-generated] --- Request # 7420: Messages from BOSS: State: review at 2012-11-19T22:34:17 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:jhamalai:branches:CE:Adaptation:N9xx-common / pulseaudio-modules-n900 -> CE:Adaptation:N9xx-common / pulseaudio-modules-n900 changes files: -------------- --- pulseaudio-modules-n900.changes +++ pulseaudio-modules-n900.changes @@ -0,0 +1,3 @@ +* Mon Nov 19 2012 Juho Hamalainen <[email protected]> - 2.1.1 +- Fix stream-restore-nemo DBus interface argument list. + old: ---- pulseaudio-modules-n900-2.1.0.tar.gz new: ---- pulseaudio-modules-n900-2.1.1.tar.gz spec files: ----------- --- pulseaudio-modules-n900.spec +++ pulseaudio-modules-n900.spec @@ -10,7 +10,7 @@ # << macros Summary: PulseAudio modules for Nemo -Version: 2.1.0 +Version: 2.1.1 Release: 0 Group: Multimedia/PulseAudio License: LGPLv2.1+ other changes: -------------- ++++++ pulseaudio-modules-n900-2.1.0.tar.gz -> pulseaudio-modules-n900-2.1.1.tar.gz --- .gitignore +++ .gitignore @@ -1,21 +0,0 @@ -.*.swp -Makefile.in -aclocal.m4 -autom4te.cache -compile -config.guess -config.h.in -config.log -config.sub -configure -depcomp -install-sh -ltmain.sh -missing -Makefile -config.h -*~ -config.status -libtool -*.pc -stamp-* --- m4/.gitignore +++ m4/.gitignore @@ -1,5 +0,0 @@ -libtool.m4 -ltoptions.m4 -ltsugar.m4 -ltversion.m4 -lt~obsolete.m4 --- src/.gitignore +++ src/.gitignore @@ -1,5 +0,0 @@ -.deps -.libs -*.la -*.lo -*.o --- src/stream-restore-nemo/module-stream-restore-nemo.c +++ src/stream-restore-nemo/module-stream-restore-nemo.c @@ -501,11 +501,12 @@ ENTRY_METHOD_HANDLER_MAX }; -static pa_dbus_arg_info add_entry_args[] = { { "name", "s", "in" }, - { "device", "s", "in" }, - { "volume", "a(uu)", "in" }, - { "mute", "b", "in" }, - { "entry", "o", "out" } }; +static pa_dbus_arg_info add_entry_args[] = { { "name", "s", "in" }, + { "device", "s", "in" }, + { "volume", "a(uu)", "in" }, + { "mute", "b", "in" }, + { "apply_immediately", "b", "in" }, + { "entry", "o", "out" } }; static pa_dbus_arg_info get_entry_by_name_args[] = { { "name", "s", "in" }, { "entry", "o", "out" } }; static pa_dbus_method_handler method_handlers[METHOD_HANDLER_MAX] = { @@ -2014,15 +2015,16 @@ else if (new_data->volume_is_set) pa_log_debug("Not restoring volume for sink input %s, because already set.", name); else { + char buf[PA_CVOLUME_SNPRINT_MAX]; + /* If we are in sink-volume mode and our route role streams appear, we set them to * PA_VOLUME_NORM */ if (u->use_sink_volume && (get_route_volume_by_name(u, name) != NULL)) pa_cvolume_set(&e->volume, e->volume.channels, PA_VOLUME_NORM); pa_log_info("Restoring volume for sink input %s.", name); - pa_sink_input_new_data_set_volume(new_data, pa_cvolume_remap(&e->volume, &e->channel_map, &new_data->channel_map)); - + pa_log_info("Restored volume: %s", pa_cvolume_snprint(buf, PA_CVOLUME_SNPRINT_MAX, &new_data->volume)); } } ++++++ pulseaudio-modules-n900.yaml --- pulseaudio-modules-n900.yaml +++ pulseaudio-modules-n900.yaml @@ -1,6 +1,6 @@ Name: pulseaudio-modules-n900 Summary: PulseAudio modules for Nemo -Version: 2.1.0 +Version: 2.1.1 Release: 0 Group: Multimedia/PulseAudio License: LGPLv2.1+
