This is an automated email from the git hooks/post-receive script. themuso-guest pushed a commit to branch ubuntu in repository pulseaudio.
commit 619ffb0c9819ee0275f05faa607545eacdac2b4b Author: Luke Yelavich <[email protected]> Date: Tue Jan 27 12:27:43 2015 +1100 Refresh patches --- .../0005-dont-load-cork-music-on-phone.patch | 2 +- debian/patches/0006-load-module-x11-bell.patch | 2 +- ...rapper-Quit-daemon-if-pid-file-is-removed.patch | 20 +++++++++--------- ...nd_mixer_poll_descriptors_count_when_zero.patch | 2 +- debian/patches/0202-dont-probe-ucm.patch | 2 +- ...0203-card-Add-hook-before-profile-changes.patch | 4 ++-- ...tooth-discover-adding-module-option-profi.patch | 10 ++++----- debian/patches/0207-Enable-pulseaudio-droid.patch | 10 ++++----- ...tooth-device-Allow-leaving-transport-runn.patch | 24 +++++++++++----------- ...ch-on-connect-adding-parameter-to-allow-s.patch | 12 +++++------ ...le-device-restore-adding-property-to-skip.patch | 12 +++++------ 11 files changed, 50 insertions(+), 50 deletions(-) diff --git a/debian/patches/0005-dont-load-cork-music-on-phone.patch b/debian/patches/0005-dont-load-cork-music-on-phone.patch index c5918f0..b625444 100644 --- a/debian/patches/0005-dont-load-cork-music-on-phone.patch +++ b/debian/patches/0005-dont-load-cork-music-on-phone.patch @@ -2,7 +2,7 @@ Index: pulseaudio/src/daemon/default.pa.in =================================================================== --- pulseaudio.orig/src/daemon/default.pa.in +++ pulseaudio/src/daemon/default.pa.in -@@ -161,7 +161,7 @@ load-module module-systemd-login +@@ -160,7 +160,7 @@ load-module module-systemd-login load-module module-position-event-sounds ### Cork music/video streams when a phone stream is active diff --git a/debian/patches/0006-load-module-x11-bell.patch b/debian/patches/0006-load-module-x11-bell.patch index a6b06ac..5b070a3 100644 --- a/debian/patches/0006-load-module-x11-bell.patch +++ b/debian/patches/0006-load-module-x11-bell.patch @@ -2,7 +2,7 @@ Index: pulseaudio/src/daemon/start-pulseaudio-x11.in =================================================================== --- pulseaudio.orig/src/daemon/start-pulseaudio-x11.in +++ pulseaudio/src/daemon/start-pulseaudio-x11.in -@@ -22,6 +22,7 @@ set -e +@@ -20,6 +20,7 @@ set -e if [ x"$DISPLAY" != x ] ; then @PACTL_BINARY@ load-module module-x11-publish "display=$DISPLAY" > /dev/null diff --git a/debian/patches/0022-inotify-wrapper-Quit-daemon-if-pid-file-is-removed.patch b/debian/patches/0022-inotify-wrapper-Quit-daemon-if-pid-file-is-removed.patch index 41ecf2d..5a9d5e6 100644 --- a/debian/patches/0022-inotify-wrapper-Quit-daemon-if-pid-file-is-removed.patch +++ b/debian/patches/0022-inotify-wrapper-Quit-daemon-if-pid-file-is-removed.patch @@ -29,7 +29,7 @@ Index: pulseaudio/src/Makefile.am =================================================================== --- pulseaudio.orig/src/Makefile.am +++ pulseaudio/src/Makefile.am -@@ -920,6 +920,7 @@ libpulsecore_@PA_MAJORMINOR@_la_SOURCES +@@ -922,6 +922,7 @@ libpulsecore_@PA_MAJORMINOR@_la_SOURCES pulsecore/core-subscribe.c pulsecore/core-subscribe.h \ pulsecore/core.c pulsecore/core.h \ pulsecore/hook-list.c pulsecore/hook-list.h \ @@ -41,7 +41,7 @@ Index: pulseaudio/src/daemon/main.c =================================================================== --- pulseaudio.orig/src/daemon/main.c +++ pulseaudio/src/daemon/main.c -@@ -75,6 +75,7 @@ +@@ -73,6 +73,7 @@ #include <pulsecore/core-rtclock.h> #include <pulsecore/core-scache.h> #include <pulsecore/core.h> @@ -49,7 +49,7 @@ Index: pulseaudio/src/daemon/main.c #include <pulsecore/module.h> #include <pulsecore/cli-command.h> #include <pulsecore/log.h> -@@ -334,6 +335,15 @@ static char *check_configured_address(vo +@@ -332,6 +333,15 @@ static char *check_configured_address(vo return default_server; } @@ -65,7 +65,7 @@ Index: pulseaudio/src/daemon/main.c #ifdef HAVE_DBUS static pa_dbus_connection *register_dbus_name(pa_core *c, DBusBusType bus, const char* name) { DBusError error; -@@ -376,7 +386,6 @@ int main(int argc, char *argv[]) { +@@ -374,7 +384,6 @@ int main(int argc, char *argv[]) { char *s; char *configured_address; int r = 0, retval = 1, d = 0; @@ -73,7 +73,7 @@ Index: pulseaudio/src/daemon/main.c bool ltdl_init = false; int n_fds = 0, *passed_fds = NULL; const char *e; -@@ -384,6 +393,7 @@ int main(int argc, char *argv[]) { +@@ -382,6 +391,7 @@ int main(int argc, char *argv[]) { int daemon_pipe[2] = { -1, -1 }; int daemon_pipe2[2] = { -1, -1 }; #endif @@ -81,7 +81,7 @@ Index: pulseaudio/src/daemon/main.c int autospawn_fd = -1; bool autospawn_locked = false; #ifdef HAVE_DBUS -@@ -1024,6 +1034,9 @@ int main(int argc, char *argv[]) { +@@ -1022,6 +1032,9 @@ int main(int argc, char *argv[]) { goto finish; } @@ -91,7 +91,7 @@ Index: pulseaudio/src/daemon/main.c c->default_sample_spec = conf->default_sample_spec; c->alternate_sample_rate = conf->alternate_sample_rate; c->default_channel_map = conf->default_channel_map; -@@ -1155,6 +1168,9 @@ finish: +@@ -1153,6 +1166,9 @@ finish: pa_autospawn_lock_done(false); } @@ -231,7 +231,7 @@ Index: pulseaudio/src/pulsecore/pid.c =================================================================== --- pulseaudio.orig/src/pulsecore/pid.c +++ pulseaudio/src/pulsecore/pid.c -@@ -183,6 +183,11 @@ static int proc_name_ours(pid_t pid, con +@@ -181,6 +181,11 @@ static int proc_name_ours(pid_t pid, con } @@ -247,8 +247,8 @@ Index: pulseaudio/src/pulsecore/pid.h =================================================================== --- pulseaudio.orig/src/pulsecore/pid.h +++ pulseaudio/src/pulsecore/pid.h -@@ -22,6 +22,7 @@ - USA. +@@ -20,6 +20,7 @@ + License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>. ***/ +char *pa_pid_file_name(void); diff --git a/debian/patches/0023-fixing_snd_mixer_poll_descriptors_count_when_zero.patch b/debian/patches/0023-fixing_snd_mixer_poll_descriptors_count_when_zero.patch index 4dce3f96..40480f4 100644 --- a/debian/patches/0023-fixing_snd_mixer_poll_descriptors_count_when_zero.patch +++ b/debian/patches/0023-fixing_snd_mixer_poll_descriptors_count_when_zero.patch @@ -4,7 +4,7 @@ Index: pulseaudio/src/modules/alsa/alsa-mixer.c =================================================================== --- pulseaudio.orig/src/modules/alsa/alsa-mixer.c +++ pulseaudio/src/modules/alsa/alsa-mixer.c -@@ -217,6 +217,9 @@ static void defer_cb(pa_mainloop_api *a, +@@ -215,6 +215,9 @@ static void defer_cb(pa_mainloop_api *a, if (n < 0) { pa_log("snd_mixer_poll_descriptors_count() failed: %s", pa_alsa_strerror(n)); return; diff --git a/debian/patches/0202-dont-probe-ucm.patch b/debian/patches/0202-dont-probe-ucm.patch index d669f4f..3fd6c6c 100644 --- a/debian/patches/0202-dont-probe-ucm.patch +++ b/debian/patches/0202-dont-probe-ucm.patch @@ -2,7 +2,7 @@ Index: pulseaudio/src/modules/alsa/alsa-ucm.c =================================================================== --- pulseaudio.orig/src/modules/alsa/alsa-ucm.c +++ pulseaudio/src/modules/alsa/alsa-ucm.c -@@ -1540,7 +1540,8 @@ pa_alsa_profile_set* pa_alsa_ucm_add_pro +@@ -1538,7 +1538,8 @@ pa_alsa_profile_set* pa_alsa_ucm_add_pro ucm_create_profile(ucm, ps, verb, verb_name, verb_desc); } diff --git a/debian/patches/0203-card-Add-hook-before-profile-changes.patch b/debian/patches/0203-card-Add-hook-before-profile-changes.patch index 500892b..c3800f7 100644 --- a/debian/patches/0203-card-Add-hook-before-profile-changes.patch +++ b/debian/patches/0203-card-Add-hook-before-profile-changes.patch @@ -14,7 +14,7 @@ Index: pulseaudio/src/pulsecore/card.c =================================================================== --- pulseaudio.orig/src/pulsecore/card.c +++ pulseaudio/src/pulsecore/card.c -@@ -278,6 +278,8 @@ int pa_card_set_profile(pa_card *c, pa_c +@@ -276,6 +276,8 @@ int pa_card_set_profile(pa_card *c, pa_c return 0; } @@ -27,7 +27,7 @@ Index: pulseaudio/src/pulsecore/core.h =================================================================== --- pulseaudio.orig/src/pulsecore/core.h +++ pulseaudio/src/pulsecore/core.h -@@ -124,6 +124,7 @@ typedef enum pa_core_hook { +@@ -122,6 +122,7 @@ typedef enum pa_core_hook { PA_CORE_HOOK_CARD_PUT, PA_CORE_HOOK_CARD_UNLINK, PA_CORE_HOOK_CARD_PROFILE_CHANGED, diff --git a/debian/patches/0206-module-bluetooth-discover-adding-module-option-profi.patch b/debian/patches/0206-module-bluetooth-discover-adding-module-option-profi.patch index afc17c6..dfd22d4 100644 --- a/debian/patches/0206-module-bluetooth-discover-adding-module-option-profi.patch +++ b/debian/patches/0206-module-bluetooth-discover-adding-module-option-profi.patch @@ -8,11 +8,11 @@ Signed-off-by: Ricardo Salveti de Araujo <[email protected]> src/modules/bluetooth/module-bluez4-discover.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) -Index: pulseaudio-5.0/src/modules/bluetooth/module-bluez4-discover.c +Index: pulseaudio/src/modules/bluetooth/module-bluez4-discover.c =================================================================== ---- pulseaudio-5.0.orig/src/modules/bluetooth/module-bluez4-discover.c -+++ pulseaudio-5.0/src/modules/bluetooth/module-bluez4-discover.c -@@ -40,11 +40,13 @@ +--- pulseaudio.orig/src/modules/bluetooth/module-bluez4-discover.c ++++ pulseaudio/src/modules/bluetooth/module-bluez4-discover.c +@@ -38,11 +38,13 @@ PA_MODULE_AUTHOR("João Paulo Rechi Vita"); PA_MODULE_DESCRIPTION("Detect available BlueZ 4 Bluetooth audio devices and load BlueZ 4 Bluetooth audio drivers"); PA_MODULE_VERSION(PACKAGE_VERSION); @@ -27,7 +27,7 @@ Index: pulseaudio-5.0/src/modules/bluetooth/module-bluez4-discover.c "sco_sink", "sco_source", "async", /* deprecated */ -@@ -83,6 +85,15 @@ static pa_hook_result_t load_module_for_ +@@ -81,6 +83,15 @@ static pa_hook_result_t load_module_for_ args = pa_sprintf_malloc("address=\"%s\" path=\"%s\"", d->address, d->path); diff --git a/debian/patches/0207-Enable-pulseaudio-droid.patch b/debian/patches/0207-Enable-pulseaudio-droid.patch index 56c64ec..e32c8c2 100644 --- a/debian/patches/0207-Enable-pulseaudio-droid.patch +++ b/debian/patches/0207-Enable-pulseaudio-droid.patch @@ -24,7 +24,7 @@ Index: pulseaudio/configure.ac #### EsounD support (optional) #### AC_ARG_ENABLE([esound], -@@ -1497,6 +1512,7 @@ AS_IF([test "x$HAVE_X11" = "x1"], ENABLE +@@ -1498,6 +1513,7 @@ AS_IF([test "x$HAVE_X11" = "x1"], ENABLE AS_IF([test "x$HAVE_OSS_OUTPUT" = "x1"], ENABLE_OSS_OUTPUT=yes, ENABLE_OSS_OUTPUT=no) AS_IF([test "x$HAVE_OSS_WRAPPER" = "x1"], ENABLE_OSS_WRAPPER=yes, ENABLE_OSS_WRAPPER=no) AS_IF([test "x$HAVE_ALSA" = "x1"], ENABLE_ALSA=yes, ENABLE_ALSA=no) @@ -32,7 +32,7 @@ Index: pulseaudio/configure.ac AS_IF([test "x$HAVE_COREAUDIO" = "x1"], ENABLE_COREAUDIO=yes, ENABLE_COREAUDIO=no) AS_IF([test "x$HAVE_SOLARIS" = "x1"], ENABLE_SOLARIS=yes, ENABLE_SOLARIS=no) AS_IF([test "x$HAVE_WAVEOUT" = "x1"], ENABLE_WAVEOUT=yes, ENABLE_WAVEOUT=no) -@@ -1557,6 +1573,7 @@ echo " +@@ -1558,6 +1574,7 @@ echo " Enable OSS Wrapper: ${ENABLE_OSS_WRAPPER} Enable EsounD: ${ENABLE_ESOUND} Enable Alsa: ${ENABLE_ALSA} @@ -44,7 +44,7 @@ Index: pulseaudio/src/Makefile.am =================================================================== --- pulseaudio.orig/src/Makefile.am +++ pulseaudio/src/Makefile.am -@@ -1249,6 +1249,16 @@ modlibexec_LTLIBRARIES += \ +@@ -1251,6 +1251,16 @@ modlibexec_LTLIBRARIES += \ module-alsa-source.la \ module-alsa-card.la @@ -61,7 +61,7 @@ Index: pulseaudio/src/Makefile.am dist_alsaprofilesets_DATA = \ modules/alsa/mixer/profile-sets/default.conf \ modules/alsa/mixer/profile-sets/force-speaker.conf \ -@@ -1518,6 +1528,13 @@ SYMDEF_FILES = \ +@@ -1520,6 +1530,13 @@ SYMDEF_FILES = \ module-filter-apply-symdef.h \ module-filter-heuristics-symdef.h @@ -75,7 +75,7 @@ Index: pulseaudio/src/Makefile.am if HAVE_ESOUND SYMDEF_FILES += \ module-esound-protocol-tcp-symdef.h \ -@@ -1827,6 +1844,44 @@ libalsa_util_la_LIBADD += $(DBUS_LIBS) +@@ -1829,6 +1846,44 @@ libalsa_util_la_LIBADD += $(DBUS_LIBS) libalsa_util_la_CFLAGS += $(DBUS_CFLAGS) endif diff --git a/debian/patches/0208-module-bluetooth-device-Allow-leaving-transport-runn.patch b/debian/patches/0208-module-bluetooth-device-Allow-leaving-transport-runn.patch index 8d9eaca..c7d2b29 100644 --- a/debian/patches/0208-module-bluetooth-device-Allow-leaving-transport-runn.patch +++ b/debian/patches/0208-module-bluetooth-device-Allow-leaving-transport-runn.patch @@ -22,7 +22,7 @@ Index: pulseaudio/src/modules/bluetooth/bluez4-util.c =================================================================== --- pulseaudio.orig/src/modules/bluetooth/bluez4-util.c +++ pulseaudio/src/modules/bluetooth/bluez4-util.c -@@ -28,6 +28,7 @@ +@@ -26,6 +26,7 @@ #include <pulsecore/core-util.h> #include <pulsecore/shared.h> #include <pulsecore/dbus-shared.h> @@ -30,7 +30,7 @@ Index: pulseaudio/src/modules/bluetooth/bluez4-util.c #include "bluez4-util.h" #include "a2dp-codecs.h" -@@ -61,6 +62,8 @@ +@@ -59,6 +60,8 @@ " </interface>" \ "</node>" @@ -39,7 +39,7 @@ Index: pulseaudio/src/modules/bluetooth/bluez4-util.c struct pa_bluez4_discovery { PA_REFCNT_DECLARE; -@@ -506,6 +509,9 @@ static int parse_audio_property(pa_bluez +@@ -504,6 +507,9 @@ static int parse_audio_property(pa_bluez DBusMessageIter variant_i; bool is_audio_interface; pa_bluez4_profile_t p = PA_BLUEZ4_PROFILE_OFF; @@ -49,7 +49,7 @@ Index: pulseaudio/src/modules/bluetooth/bluez4-util.c pa_assert(d); pa_assert(interface); -@@ -537,6 +543,23 @@ static int parse_audio_property(pa_bluez +@@ -535,6 +541,23 @@ static int parse_audio_property(pa_bluez pa_bluez4_transport_state_t old_state; pa_log_debug("Device %s interface %s property 'State' changed to value '%s'", d->path, interface, value); @@ -77,7 +77,7 @@ Index: pulseaudio/src/modules/bluetooth/module-bluez4-device.c =================================================================== --- pulseaudio.orig/src/modules/bluetooth/module-bluez4-device.c +++ pulseaudio/src/modules/bluetooth/module-bluez4-device.c -@@ -189,6 +189,9 @@ struct userdata { +@@ -187,6 +187,9 @@ struct userdata { pa_modargs *modargs; int stream_write_type; @@ -87,7 +87,7 @@ Index: pulseaudio/src/modules/bluetooth/module-bluez4-device.c }; enum { -@@ -382,6 +385,67 @@ static int bt_transport_acquire(struct u +@@ -380,6 +383,67 @@ static int bt_transport_acquire(struct u return 0; } @@ -155,7 +155,7 @@ Index: pulseaudio/src/modules/bluetooth/module-bluez4-device.c /* Run from IO thread */ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) { struct userdata *u = PA_SINK(o)->userdata; -@@ -1430,6 +1494,10 @@ static int sco_over_pcm_state_update(str +@@ -1428,6 +1492,10 @@ static int sco_over_pcm_state_update(str if (u->stream_fd < 0) return 0; @@ -166,7 +166,7 @@ Index: pulseaudio/src/modules/bluetooth/module-bluez4-device.c pa_log_debug("Closing SCO over PCM"); bt_transport_release(u); -@@ -1473,6 +1541,11 @@ static pa_hook_result_t transport_nrec_c +@@ -1471,6 +1539,11 @@ static pa_hook_result_t transport_nrec_c if (t != u->transport) return PA_HOOK_OK; @@ -178,7 +178,7 @@ Index: pulseaudio/src/modules/bluetooth/module-bluez4-device.c p = pa_proplist_new(); pa_proplist_sets(p, "bluetooth.nrec", t->nrec ? "1" : "0"); pa_source_update_proplist(u->source, PA_UPDATE_REPLACE, p); -@@ -1835,7 +1908,7 @@ static int setup_transport(struct userda +@@ -1833,7 +1906,7 @@ static int setup_transport(struct userda pa_bluez4_transport *t; pa_assert(u); @@ -187,7 +187,7 @@ Index: pulseaudio/src/modules/bluetooth/module-bluez4-device.c pa_assert(u->profile != PA_BLUEZ4_PROFILE_OFF); /* check if profile has a transport */ -@@ -1915,7 +1988,8 @@ static void stop_thread(struct userdata +@@ -1913,7 +1986,8 @@ static void stop_thread(struct userdata if (u->transport) { bt_transport_release(u); @@ -197,7 +197,7 @@ Index: pulseaudio/src/modules/bluetooth/module-bluez4-device.c } if (u->sink) { -@@ -2520,6 +2594,10 @@ int pa__init(pa_module *m) { +@@ -2518,6 +2592,10 @@ int pa__init(pa_module *m) { pa_hook_connect(pa_bluez4_discovery_hook(u->discovery, PA_BLUEZ4_HOOK_TRANSPORT_SPEAKER_GAIN_CHANGED), PA_HOOK_NORMAL, (pa_hook_cb_t) transport_speaker_gain_changed_cb, u); @@ -208,7 +208,7 @@ Index: pulseaudio/src/modules/bluetooth/module-bluez4-device.c /* Add the card structure. This will also initialize the default profile */ if (add_card(u) < 0) goto fail; -@@ -2599,6 +2677,9 @@ void pa__done(pa_module *m) { +@@ -2597,6 +2675,9 @@ void pa__done(pa_module *m) { if (u->transport_speaker_changed_slot) pa_hook_slot_free(u->transport_speaker_changed_slot); diff --git a/debian/patches/0209-module-switch-on-connect-adding-parameter-to-allow-s.patch b/debian/patches/0209-module-switch-on-connect-adding-parameter-to-allow-s.patch index f8a679e..a66a4e9 100644 --- a/debian/patches/0209-module-switch-on-connect-adding-parameter-to-allow-s.patch +++ b/debian/patches/0209-module-switch-on-connect-adding-parameter-to-allow-s.patch @@ -12,7 +12,7 @@ Index: pulseaudio/src/modules/module-switch-on-connect.c =================================================================== --- pulseaudio.orig/src/modules/module-switch-on-connect.c +++ pulseaudio/src/modules/module-switch-on-connect.c -@@ -43,6 +43,7 @@ PA_MODULE_VERSION(PACKAGE_VERSION); +@@ -41,6 +41,7 @@ PA_MODULE_VERSION(PACKAGE_VERSION); PA_MODULE_LOAD_ONCE(true); PA_MODULE_USAGE( "only_from_unavailable=<boolean, only switch from unavailable ports> " @@ -20,7 +20,7 @@ Index: pulseaudio/src/modules/module-switch-on-connect.c ); static const char* const valid_modargs[] = { -@@ -55,13 +56,14 @@ struct userdata { +@@ -53,13 +54,14 @@ struct userdata { *sink_put_slot, *source_put_slot; bool only_from_unavailable; @@ -36,7 +36,7 @@ Index: pulseaudio/src/modules/module-switch-on-connect.c struct userdata *u = userdata; pa_assert(c); -@@ -80,6 +82,12 @@ static pa_hook_result_t sink_put_hook_ca +@@ -78,6 +80,12 @@ static pa_hook_result_t sink_put_hook_ca return PA_HOOK_OK; } @@ -49,7 +49,7 @@ Index: pulseaudio/src/modules/module-switch-on-connect.c def = pa_namereg_get_default_sink(c); if (def == sink) return PA_HOOK_OK; -@@ -116,7 +124,7 @@ static pa_hook_result_t source_put_hook_ +@@ -114,7 +122,7 @@ static pa_hook_result_t source_put_hook_ pa_source_output *o; uint32_t idx; pa_source *def; @@ -58,7 +58,7 @@ Index: pulseaudio/src/modules/module-switch-on-connect.c struct userdata *u = userdata; pa_assert(c); -@@ -139,6 +147,12 @@ static pa_hook_result_t source_put_hook_ +@@ -137,6 +145,12 @@ static pa_hook_result_t source_put_hook_ return PA_HOOK_OK; } @@ -71,7 +71,7 @@ Index: pulseaudio/src/modules/module-switch-on-connect.c def = pa_namereg_get_default_source(c); if (def == source) return PA_HOOK_OK; -@@ -184,6 +198,11 @@ int pa__init(pa_module*m) { +@@ -182,6 +196,11 @@ int pa__init(pa_module*m) { m->userdata = u = pa_xnew0(struct userdata, 1); diff --git a/debian/patches/0210-module-device-restore-adding-property-to-skip.patch b/debian/patches/0210-module-device-restore-adding-property-to-skip.patch index b4a5566..6ff66e4 100644 --- a/debian/patches/0210-module-device-restore-adding-property-to-skip.patch +++ b/debian/patches/0210-module-device-restore-adding-property-to-skip.patch @@ -12,7 +12,7 @@ Index: pulseaudio/src/modules/module-device-restore.c =================================================================== --- pulseaudio.orig/src/modules/module-device-restore.c +++ pulseaudio/src/modules/module-device-restore.c -@@ -53,6 +53,7 @@ +@@ -51,6 +51,7 @@ #include <pulsecore/pstream-util.h> #include <pulsecore/database.h> #include <pulsecore/tagstruct.h> @@ -20,7 +20,7 @@ Index: pulseaudio/src/modules/module-device-restore.c #include "module-device-restore-symdef.h" -@@ -67,6 +68,7 @@ PA_MODULE_USAGE( +@@ -65,6 +66,7 @@ PA_MODULE_USAGE( "restore_formats=<Save/restore saved formats?>"); #define SAVE_INTERVAL (10 * PA_USEC_PER_SEC) @@ -28,7 +28,7 @@ Index: pulseaudio/src/modules/module-device-restore.c static const char* const valid_modargs[] = { "restore_volume", -@@ -613,6 +615,9 @@ static void subscribe_callback(pa_core * +@@ -611,6 +613,9 @@ static void subscribe_callback(pa_core * if (!(sink = pa_idxset_get_by_index(c->sinks, idx))) return; @@ -38,7 +38,7 @@ Index: pulseaudio/src/modules/module-device-restore.c type = PA_DEVICE_TYPE_SINK; name = pa_sprintf_malloc("sink:%s", sink->name); if (sink->active_port) -@@ -652,6 +657,9 @@ static void subscribe_callback(pa_core * +@@ -650,6 +655,9 @@ static void subscribe_callback(pa_core * if (!(source = pa_idxset_get_by_index(c->sources, idx))) return; @@ -48,7 +48,7 @@ Index: pulseaudio/src/modules/module-device-restore.c type = PA_DEVICE_TYPE_SOURCE; name = pa_sprintf_malloc("source:%s", source->name); if (source->active_port) -@@ -818,6 +826,9 @@ static pa_hook_result_t sink_port_hook_c +@@ -816,6 +824,9 @@ static pa_hook_result_t sink_port_hook_c pa_assert(u); pa_assert(u->restore_volume || u->restore_muted); @@ -58,7 +58,7 @@ Index: pulseaudio/src/modules/module-device-restore.c name = pa_sprintf_malloc("sink:%s", sink->name); if ((e = perportentry_read(u, name, (sink->active_port ? sink->active_port->name : NULL)))) { -@@ -960,6 +971,9 @@ static pa_hook_result_t source_port_hook +@@ -958,6 +969,9 @@ static pa_hook_result_t source_port_hook pa_assert(u); pa_assert(u->restore_volume || u->restore_muted); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git _______________________________________________ pkg-pulseaudio-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-pulseaudio-devel
