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/6876 Thank You, Juho Hämäläinen [This message was auto-generated] --- Request # 6876: Messages from BOSS: State: review at 2012-10-03T08:26:26 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,3 @@ +* Wed Oct 3 2012 Juho Hamalainen <[email protected]> - 2.1.1 +- Drop support for legacy before-ports PulseAudio. + old: ---- pulseaudio-policy-enforcement-2.1.0.tar.gz new: ---- pulseaudio-policy-enforcement-2.1.1.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.0 +Version: 2.1.1 Release: 0 Group: System/Daemons License: LGPLv2.1 other changes: -------------- ++++++ pulseaudio-policy-enforcement-2.1.0.tar.gz -> pulseaudio-policy-enforcement-2.1.1.tar.gz --- configure.ac +++ configure.ac @@ -80,11 +80,6 @@ AS_HELP_STRING([--with-module-dir],[Directory where to install the modules to (defaults to ${LIBDIR}/pulse-${PA_MAJORMINOR}/modules/]), [modlibexecdir=$withval], [modlibexecdir=${LIBDIR}/pulse-${PA_MAJORMINOR}/modules]) -PULSEAUDIO_HAS_PORTS=0 -echo -e "#define PACKAGE 1\n#include <pulsecore/sink.h>\nint main() {\nreturn pa_sink_set_port((struct pa_sink *)0,\"\",0);\n}" | ${CC} ${CFLAGS} ${LIBPULSECORE_CFLAGS} ${LIBPULSE_CFLAGS} ${AM_LIBADD} ${LIBPULSECORE_LIBS} ${LIBPULSE_LIBS} -Wmissing-declarations -Werror -x c -o /dev/null - && PULSEAUDIO_HAS_PORTS=1 -AC_SUBST(PULSEAUDIO_HAS_PORTS) - - AC_SUBST(modlibexecdir) AC_CONFIG_FILES([ @@ -109,7 +104,6 @@ LIBPULSECORE_CFLAGS: ${LIBPULSECORE_CFLAGS} LIBPULSECORE_LIBS: ${LIBPULSECORE_LIBS} MAJORMINOR: ${PA_MAJORMINOR} - PULSEAUDIO_HAS_PORTS: ${PULSEAUDIO_HAS_PORTS} DBUS_CFLAGS: ${DBUS_CFLAGS} DBUS_LIBS: ${DBUS_LIBS} PD_SUPPORT: ${doc_support} --- src/Makefile.am +++ src/Makefile.am @@ -17,4 +17,4 @@ dbusif.c module_policy_enforcement_la_LDFLAGS = -module -avoid-version module_policy_enforcement_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) $(LIBPULSECORE_LIBS) $(LIBPULSE_LIBS) -module_policy_enforcement_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) $(LIBPULSE_CFLAGS) $(LIBPULSECORE_CFLAGS) -DPULSEAUDIO_HAS_PORTS=$(PULSEAUDIO_HAS_PORTS) +module_policy_enforcement_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) $(LIBPULSE_CFLAGS) $(LIBPULSECORE_CFLAGS) --- src/classify.c +++ src/classify.c @@ -974,7 +974,6 @@ /* Copy the ports hashmap to d->data.ports. */ -#if PULSEAUDIO_HAS_PORTS d->data.ports = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func); PA_HASHMAP_FOREACH(port, ports, state) { @@ -993,9 +992,6 @@ pa_strbuf_printf(buf, "%s:%s", port->device_name, port->port_name); } -#else - d->data.ports = NULL; -#endif } d->data.flags = flags; --- src/config-file.c +++ src/config-file.c @@ -1066,7 +1066,6 @@ static int ports_parse(int lineno, const char *portsdef, struct devicedef *devdef) { -#if PULSEAUDIO_HAS_PORTS char **entries; if (devdef->ports) { @@ -1131,7 +1130,6 @@ } else pa_log_warn("Empty ports= definition in line %d", lineno); -#endif return 0; } --- src/sink-ext.c +++ src/sink-ext.c @@ -120,8 +120,6 @@ int pa_sink_ext_set_ports(struct userdata *u, const char *type) { int ret = 0; - -#if PULSEAUDIO_HAS_PORTS pa_sink *sink; struct pa_classify_device_data *data; struct pa_classify_port_entry *port_entry; @@ -167,7 +165,6 @@ } } } /* for */ -#endif return ret; } --- src/source-ext.c +++ src/source-ext.c @@ -113,14 +113,10 @@ else { pa_log_debug("%s() %smute source '%s' type '%s'", __FUNCTION__, mute ? "" : "un", name, type); - -#if PULSEAUDIO_HAS_PORTS + pa_source_set_mute(source, mute, TRUE); -#else - pa_source_set_mute(source, mute); -#endif } - + return 0; } } @@ -132,8 +128,6 @@ int pa_source_ext_set_ports(struct userdata *u, const char *type) { int ret = 0; - -#if PULSEAUDIO_HAS_PORTS pa_source *source; struct pa_classify_device_data *data; uint32_t idx; @@ -166,7 +160,6 @@ } } } -#endif return ret; } ++++++ 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.0 +Version: 2.1.1 Release: 0 Group: System/Daemons License: LGPLv2.1
