[pulseaudio-commits] 2 commits - src/modules

[Arun Raghavan]

 src/modules/alsa/alsa-sink.c                     |    2 +-
 src/modules/alsa/alsa-source.c                   |    2 +-
 src/modules/alsa/mixer/profile-sets/default.conf |    2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit c5dcf5723b6ce63e0788148c683953a09448b483
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Tue Jan 17 09:28:30 2012 +0100

    alsa: Fix log message "synchronous volume" -> "deferred volume"
    
    Signed-off-by: David Henningsson <david.henningsson at canonical.com>

diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
index c4ed760..846fd45 100644
--- a/src/modules/alsa/alsa-sink.c
+++ b/src/modules/alsa/alsa-sink.c
@@ -1413,7 +1413,7 @@ static void mixer_volume_init(struct userdata *u) {
 
         if (u->mixer_path->has_dB && u->deferred_volume) {
             pa_sink_set_write_volume_callback(u->sink, sink_write_volume_cb);
-            pa_log_info("Successfully enabled synchronous volume.");
+            pa_log_info("Successfully enabled deferred volume.");
         } else
             pa_sink_set_write_volume_callback(u->sink, NULL);
 
diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
index b95cdd8..bc6d723 100644
--- a/src/modules/alsa/alsa-source.c
+++ b/src/modules/alsa/alsa-source.c
@@ -1316,7 +1316,7 @@ static void mixer_volume_init(struct userdata *u) {
 
         if (u->mixer_path->has_dB && u->deferred_volume) {
             pa_source_set_write_volume_callback(u->source, source_write_volume_cb);
-            pa_log_info("Successfully enabled synchronous volume.");
+            pa_log_info("Successfully enabled deferred volume.");
         } else
             pa_source_set_write_volume_callback(u->source, NULL);
 

commit 413adcf964cabb6b556cebfb947ade8eae9a2923
Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date:   Tue Jan 17 16:54:44 2012 +0530

    alsa-mixer: Fix mixer path for AC3 profiles
    
    The recent change to turn off the IEC958 element for analog paths
    exposed a bug in AC3 profiles. These were inheriting the analog output
    path instead of explicitly selecting the iec958 path.
    
    Thanks to David Henningsson for pointing this out.

diff --git a/src/modules/alsa/mixer/profile-sets/default.conf b/src/modules/alsa/mixer/profile-sets/default.conf
index 283edfb..fe51bc2 100644
--- a/src/modules/alsa/mixer/profile-sets/default.conf
+++ b/src/modules/alsa/mixer/profile-sets/default.conf
@@ -158,12 +158,14 @@ priority = 5
 [Mapping iec958-ac3-surround-40]
 device-strings = a52:%f
 channel-map = front-left,front-right,rear-left,rear-right
+paths-output = iec958-stereo-output
 priority = 2
 direction = output
 
 [Mapping iec958-ac3-surround-51]
 device-strings = a52:%f
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+paths-output = iec958-stereo-output
 priority = 3
 direction = output