bootstrap.sh | 2 +- src/modules/alsa/alsa-mixer.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-)
New commits: commit fc6c9c8810c496bd260c796fb3c1ce22497cd34b Author: Tanu Kaskinen <[email protected]> Date: Mon Aug 10 17:44:53 2015 +0200 build-sys: make error message visible This helps figuring out why bootstrap.sh is failing... Directing the error message to /dev/null was very strange. I don't know what the original motivation might have been. My guess is that it was added unintentionally. diff --git a/bootstrap.sh b/bootstrap.sh index 644d014..c9a083c 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -38,7 +38,7 @@ fi # which will make PKG_PROG_PKG_CONFIG be undefined and the generated # configure file faulty. if ! pkg-config --version &>/dev/null; then - echo "pkg-config is required to bootstrap this program" &>/dev/null + echo "pkg-config is required to bootstrap this program" DIE=1 fi commit 74b0fb45e534fab226ed1597cada18e828e0cdeb Author: Tanu Kaskinen <[email protected]> Date: Thu Aug 6 12:19:12 2015 +0200 alsa-mixer: Add descriptions for analog-stereo-input and analog-stereo-output mappings These mapping names are used in sb-omni-surround-5.1.conf, which needs to use separate mappings for input and output, since they are associated with different alsa devices. diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c index 2314612..bbe1d0f 100644 --- a/src/modules/alsa/alsa-mixer.c +++ b/src/modules/alsa/alsa-mixer.c @@ -3899,8 +3899,13 @@ static int mapping_verify(pa_alsa_mapping *m, const pa_channel_map *bonus) { static const struct description_map well_known_descriptions[] = { { "analog-mono", N_("Analog Mono") }, { "analog-stereo", N_("Analog Stereo") }, - /* Note: Not translated to "Multichannel Input" - then the source name would be "Multichannel Input Input". - Same for multichannel-output. */ + /* Note: Not translated to "Analog Stereo Input", because the source + * name gets "Input" appended to it automatically, so adding "Input" + * here would lead to the source name to become "Analog Stereo Input + * Input". The same logic applies to analog-stereo-output, + * multichannel-input and multichannel-output. */ + { "analog-stereo-input", N_("Analog Stereo") }, + { "analog-stereo-output", N_("Analog Stereo") }, { "multichannel-input", N_("Multichannel") }, { "multichannel-output", N_("Multichannel") }, { "analog-surround-21", N_("Analog Surround 2.1") }, _______________________________________________ pulseaudio-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/pulseaudio-commits
