src/modules/alsa/mixer/profile-sets/default.conf | 2 +- src/modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf | 2 +- src/modules/alsa/mixer/profile-sets/force-speaker.conf | 2 +- src/modules/module-device-restore.c | 1 + 4 files changed, 4 insertions(+), 3 deletions(-)
New commits: commit f75335f25c49b2d2ff26181902c4f6f90ae7cab6 Author: Tanu Kaskinen <[email protected]> Date: Thu Jan 29 13:53:08 2015 +0200 alsa-mixer: Add lineout to surround21 mappings This makes the analog-surround-21 mapping consistent with other surround mappings. I'm not sure if this makes any practical difference, though. diff --git a/src/modules/alsa/mixer/profile-sets/default.conf b/src/modules/alsa/mixer/profile-sets/default.conf index bfb54c9..2d6720e 100644 --- a/src/modules/alsa/mixer/profile-sets/default.conf +++ b/src/modules/alsa/mixer/profile-sets/default.conf @@ -118,7 +118,7 @@ priority = 10 [Mapping analog-surround-21] device-strings = surround21:%f channel-map = front-left,front-right,lfe -paths-output = analog-output analog-output-speaker +paths-output = analog-output analog-output-lineout analog-output-speaker priority = 8 direction = output diff --git a/src/modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf b/src/modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf index 9c57a20..41924f4 100644 --- a/src/modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf +++ b/src/modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf @@ -37,7 +37,7 @@ priority = 10 [Mapping analog-surround-21] device-strings = surround21:%f channel-map = front-left,front-right,lfe -paths-output = analog-output analog-output-speaker-always +paths-output = analog-output analog-output-lineout analog-output-speaker-always priority = 8 direction = output diff --git a/src/modules/alsa/mixer/profile-sets/force-speaker.conf b/src/modules/alsa/mixer/profile-sets/force-speaker.conf index 8e5d429..dec57d5 100644 --- a/src/modules/alsa/mixer/profile-sets/force-speaker.conf +++ b/src/modules/alsa/mixer/profile-sets/force-speaker.conf @@ -36,7 +36,7 @@ priority = 10 [Mapping analog-surround-21] device-strings = surround21:%f channel-map = front-left,front-right,lfe -paths-output = analog-output analog-output-speaker-always +paths-output = analog-output analog-output-lineout analog-output-speaker-always priority = 8 direction = output commit bf53143387d097bafa66a1c14ddcf6e35483f195 Author: David Henningsson <[email protected]> Date: Wed Jan 28 15:10:55 2015 -0500 module-device-restore: Fix memory leak in read_sink_format_reply This function could sometimes leak a perportentry. Signed-off-by: David Henningsson <[email protected]> diff --git a/src/modules/module-device-restore.c b/src/modules/module-device-restore.c index 09ba60a..70a6517 100644 --- a/src/modules/module-device-restore.c +++ b/src/modules/module-device-restore.c @@ -1021,6 +1021,7 @@ static void read_sink_format_reply(struct userdata *u, pa_tagstruct *reply, pa_s PA_IDXSET_FOREACH(f, e->formats, idx) { pa_tagstruct_put_format_info(reply, f); } + perportentry_free(e); } pa_xfree(name); } _______________________________________________ pulseaudio-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/pulseaudio-commits
