I have made the following changes intended for : CE:MW:Shared / pulseaudio-policy-enforcement
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/6980 Thank You, Juho Hämäläinen [This message was auto-generated] --- Request # 6980: Messages from BOSS: State: review at 2012-10-12T10:12:55 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:MW:Shared / pulseaudio-policy-enforcement -> CE:MW:Shared / pulseaudio-policy-enforcement changes files: -------------- --- pulseaudio-policy-enforcement.changes +++ pulseaudio-policy-enforcement.changes @@ -0,0 +1,4 @@ +* Fri Oct 12 2012 Juho Hamalainen <[email protected]> - 2.1.2 +- Assign sink-input/source-output targets properly to support post-1.0 PulseAudio. +- Add configure check to compile module against pre-1.0 and post-1.0 PulseAudio. + old: ---- pulseaudio-policy-enforcement-2.1.1.tar.gz new: ---- pulseaudio-policy-enforcement-2.1.2.tar.gz spec files: ----------- --- pulseaudio-policy-enforcement.spec +++ pulseaudio-policy-enforcement.spec @@ -9,7 +9,7 @@ # << macros Summary: Pulseaudio module for enforcing policy decisions in the audio domain -Version: 2.1.1 +Version: 2.1.2 Release: 0 Group: System/Daemons License: LGPLv2.1 other changes: -------------- ++++++ pulseaudio-policy-enforcement-2.1.1.tar.gz -> pulseaudio-policy-enforcement-2.1.2.tar.gz --- configure.ac +++ configure.ac @@ -2,7 +2,7 @@ m4_define(PA_MAJOR, [2]) m4_define(PA_MINOR, [1]) -m4_define(NEMO_MICRO, [0]) +m4_define(NEMO_MICRO, [2]) AC_INIT([pulseaudio-policy-enforcement],[PA_MAJOR.PA_MINOR.NEMO_MICRO],[[email protected]]) AC_CONFIG_HEADER([config.h]) @@ -65,6 +65,10 @@ AC_SUBST(LIBPULSE_CFLAGS) AC_SUBST(LIBPULSE_LIBS) +PKG_CHECK_MODULES([LIBPULSE_VERSION_1], [libpulse >= 1.0.0],, + [AC_DEFINE([HAVE_OLD_LIBPULSE], [1], [Old libpulse (prior to 1.0).]) +]) + PKG_CHECK_MODULES(LIBPULSECORE, [pulsecore]) AC_SUBST(LIBPULSECORE_CFLAGS) AC_SUBST(LIBPULSECORE_LIBS) --- src/sink-input-ext.c +++ src/sink-input-ext.c @@ -275,7 +275,11 @@ pa_log_debug("force stream '%s'/'%s' to sink '%s' due to " "mute-by-route", group_name,sinp_name, sink_name); +#ifdef HAVE_OLD_LIBPULSE data->sink = u->nullsink->sink; +#else + pa_sink_input_new_data_set_sink(data, u->nullsink->sink, false); +#endif } else if (group->flags & route_flags) { sink_name = pa_sink_ext_get_name(group->sink); @@ -283,7 +287,11 @@ pa_log_debug("force stream '%s'/'%s' to sink '%s'", group_name, sinp_name, sink_name); +#ifdef HAVE_OLD_LIBPULSE data->sink = group->sink; +#else + pa_sink_input_new_data_set_sink(data, group->sink, false); +#endif } if (local_volume) { --- src/source-output-ext.c +++ src/source-output-ext.c @@ -154,7 +154,11 @@ pa_log_debug("force source output '%s' to source '%s'", sout_name ? sout_name : "<unknown>", source_name); +#ifdef HAVE_OLD_LIBPULSE data->source = group->source; +#else + pa_source_output_new_data_set_source(data, group->source, false); +#endif } } ++++++ pulseaudio-policy-enforcement.yaml --- pulseaudio-policy-enforcement.yaml +++ pulseaudio-policy-enforcement.yaml @@ -1,6 +1,6 @@ Name: pulseaudio-policy-enforcement Summary: Pulseaudio module for enforcing policy decisions in the audio domain -Version: 2.1.1 +Version: 2.1.2 Release: 0 Group: System/Daemons License: LGPLv2.1
