src/modules/alsa/mixer/paths/analog-input.conf | 6 ++++++ src/pulse/pulseaudio.h | 3 ++- src/pulsecore/log.c | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-)
New commits: commit 24f26e05757f8893c7a956efca792017445a887a Author: David Henningsson <[email protected]> Date: Tue Sep 15 13:09:14 2015 +0200 alsa-mixer: Add "Mic Boost" and "Line Boost" to analog-input.conf I'm not sure how much they are needed nowadays with the latest changes to the subset elimination (I found this while researching a bug on an older PA version), but I guess they could be added for consistency at least. Signed-off-by: David Henningsson <[email protected]> diff --git a/src/modules/alsa/mixer/paths/analog-input.conf b/src/modules/alsa/mixer/paths/analog-input.conf index 27ca74c..c9db677 100644 --- a/src/modules/alsa/mixer/paths/analog-input.conf +++ b/src/modules/alsa/mixer/paths/analog-input.conf @@ -30,6 +30,9 @@ override-map.2 = all-left,all-right [Element Mic] required-absent = any +[Element Mic Boost] +required-absent = any + [Element Dock Mic] required-absent = any @@ -78,6 +81,9 @@ required-absent = any [Element Line] required-absent = any +[Element Line Boost] +required-absent = any + [Element Aux] required-absent = any commit cb295959d5a076f7992e6134b015af7f1bd6fa6a Author: Ahmed S. Darwish <[email protected]> Date: Wed Sep 16 23:38:38 2015 +0200 log: Fix compilation error on non-systemd systems Commit 262bdae0330e used symbols which are only available if systemd support was compiled in. Fix by using the appropriate #ifdef guards. Also document the resulting PULSE_LOG_JOURNAL environment variable behavior if systemd journal support was not compiled in. [Diwic: changed wording slightly.] Reported-by: David Henningsson <[email protected]> Signed-off-by: Ahmed S. Darwish <[email protected]> diff --git a/src/pulse/pulseaudio.h b/src/pulse/pulseaudio.h index 5077e3b..063d5e2 100644 --- a/src/pulse/pulseaudio.h +++ b/src/pulse/pulseaudio.h @@ -147,7 +147,8 @@ * and function are included by default through the journal fields * `CODE_FILE`, `CODE_FUNC`, and `CODE_LINE`. Any backtrace attached to * the logging message is sent through the PulseAudio-specific journal - * field `PULSE_BACKTRACE`. + * field `PULSE_BACKTRACE`. This environment variable has no effect if + * PulseAudio was compiled without systemd journal support. * - `PULSE_LOG_COLORS`: If defined, enables colored logging output. * - `PULSE_LOG_TIME`: If defined, include timestamps with each message. * - `PULSE_LOG_FILE`: If defined, include each message originating file diff --git a/src/pulsecore/log.c b/src/pulsecore/log.c index 34ed041..3c876f6 100644 --- a/src/pulsecore/log.c +++ b/src/pulsecore/log.c @@ -294,10 +294,12 @@ static void init_defaults(void) { target_override_set = true; } +#ifdef HAVE_SYSTEMD_JOURNAL if (getenv(ENV_LOG_JOURNAL)) { target_override = PA_LOG_JOURNAL; target_override_set = true; } +#endif if ((e = getenv(ENV_LOG_LEVEL))) { maximum_level_override = (pa_log_level_t) atoi(e); _______________________________________________ pulseaudio-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/pulseaudio-commits
