[pulseaudio-commits] 2 commits - src/modules src/pulsecore

[David Henningsson]

 src/modules/alsa/alsa-mixer.c                    |    1 -
 src/modules/alsa/mixer/profile-sets/default.conf |    9 ---------
 src/pulsecore/conf-parser.c                      |    1 +
 3 files changed, 1 insertion(+), 10 deletions(-)

New commits:
commit dc2299e96132789e822527f7cbe35e8ac198ce68
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Tue Aug 19 14:37:59 2014 +0200

    conf-parser: Add debug print of parsed files
    
    This is useful for debugging.
    
    Signed-off-by: David Henningsson <david.henningsson at canonical.com>

diff --git a/src/pulsecore/conf-parser.c b/src/pulsecore/conf-parser.c
index 200252b..1683d46 100644
--- a/src/pulsecore/conf-parser.c
+++ b/src/pulsecore/conf-parser.c
@@ -175,6 +175,7 @@ int pa_config_parse(const char *filename, FILE *f, const pa_config_item *t, pa_p
         pa_log_warn("Failed to open configuration file '%s': %s", filename, pa_cstrerror(errno));
         goto finish;
     }
+    pa_log_debug("Parsing configuration file '%s'", filename);
 
     state.filename = filename;
     state.item_table = t;

commit 2575b102b9f8f0ba6d604ff8014136a2e3241ca4
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Fri Aug 1 18:09:42 2014 +0200

    alsa: Remove four channel input profile
    
    With the new multichannel profile, we can remove this one and
    handle the four channel input as a generic multichannel fallback.
    
    Signed-off-by: David Henningsson <david.henningsson at canonical.com>

diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
index 4871523..ead601a 100644
--- a/src/modules/alsa/alsa-mixer.c
+++ b/src/modules/alsa/alsa-mixer.c
@@ -3871,7 +3871,6 @@ static int mapping_verify(pa_alsa_mapping *m, const pa_channel_map *bonus) {
         { "analog-surround-61",     N_("Analog Surround 6.1") },
         { "analog-surround-70",     N_("Analog Surround 7.0") },
         { "analog-surround-71",     N_("Analog Surround 7.1") },
-        { "analog-4-channel-input", N_("Analog 4-channel Input") },
         { "iec958-stereo",          N_("Digital Stereo (IEC958)") },
         { "iec958-passthrough",     N_("Digital Passthrough  (IEC958)") },
         { "iec958-ac3-surround-40", N_("Digital Surround 4.0 (IEC958/AC3)") },
diff --git a/src/modules/alsa/mixer/profile-sets/default.conf b/src/modules/alsa/mixer/profile-sets/default.conf
index 8b67e33..d0b2d48 100644
--- a/src/modules/alsa/mixer/profile-sets/default.conf
+++ b/src/modules/alsa/mixer/profile-sets/default.conf
@@ -159,15 +159,6 @@ paths-output = analog-output analog-output-lineout analog-output-speaker analog-
 priority = 7
 direction = output
 
-[Mapping analog-4-channel-input]
-# Alsa doesn't currently provide any better device name than "hw" for 4-channel
-# input. If this causes trouble at some point, then we will need to get a new
-# device name standardized in alsa.
-device-strings = hw:%f
-channel-map = aux0,aux1,aux2,aux3
-priority = 2
-direction = input
-
 [Mapping iec958-stereo]
 device-strings = iec958:%f
 channel-map = left,right