[pulseaudio-commits] 6 commits - bootstrap.sh src/modules src/pulse src/pulsecore
Tanu Kaskinen
tanuk at kemper.freedesktop.org
Fri Sep 25 05:08:54 PDT 2015
bootstrap.sh | 4 ++--
src/modules/alsa/mixer/paths/analog-input.conf | 6 ++++++
src/modules/alsa/mixer/paths/analog-output-lineout.conf | 8 ++++++++
src/modules/alsa/mixer/paths/analog-output-speaker-always.conf | 4 ++++
src/modules/alsa/mixer/paths/analog-output-speaker.conf | 4 ++++
src/modules/bluetooth/module-bluez4-device.c | 9 ---------
src/pulse/pulseaudio.h | 3 ++-
src/pulsecore/log.c | 2 ++
8 files changed, 28 insertions(+), 12 deletions(-)
New commits:
commit 08959f83d0816fa890452550ea2f0dbd7ebf1205
Author: Ahmed S. Darwish <darwish.07 at gmail.com>
Date: Sat Sep 19 01:59:02 2015 +0200
build-sys: bootstrap.sh: Do a make only if configure has succeeded
Otherwise the important configure script error messages get buried
by the "make clean" output.
Signed-off-by: Ahmed S. Darwish <darwish.07 at gmail.com>
diff --git a/bootstrap.sh b/bootstrap.sh
index c9a083c..187abaa 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -50,6 +50,6 @@ autopoint --force
AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose
if test "x$NOCONFIGURE" = "x"; then
- CFLAGS="$CFLAGS -g -O0" ./configure --sysconfdir=/etc --localstatedir=/var --enable-force-preopen "$@"
- make clean
+ CFLAGS="$CFLAGS -g -O0" ./configure --sysconfdir=/etc --localstatedir=/var --enable-force-preopen "$@" && \
+ make clean
fi
commit e061f9afd2ee1a798d71b3d078725bfcea214202
Author: Tanu Kaskinen <tanuk at iki.fi>
Date: Fri Sep 18 09:59:45 2015 +0300
alsa-mixer: Add "Dock Line Out" jack handling to analog-output-speaker-always
The jack is already in analog-output-speaker, so let's have the same
handling in analog-output-speaker-always too.
diff --git a/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf b/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
index 599cfc8..71f356d 100644
--- a/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
@@ -49,6 +49,10 @@ state.unplugged = unknown
state.plugged = no
state.unplugged = unknown
+[Jack Dock Line Out]
+state.plugged = no
+state.unplugged = unknown
+
[Element Hardware Master]
switch = mute
volume = merge
commit 4a9916ba15c953c426dbc21ff1b8a156e0c200cb
Author: Takashi Iwai <tiwai at suse.de>
Date: Mon Jun 15 17:06:41 2015 +0200
alsa-mixer: Recognize "Dock Line Out" jack
Some machines provide "Dock Line Out Jack" control that should be
handled like a normal line out.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
diff --git a/src/modules/alsa/mixer/paths/analog-output-lineout.conf b/src/modules/alsa/mixer/paths/analog-output-lineout.conf
index 454810d..4add78d 100644
--- a/src/modules/alsa/mixer/paths/analog-output-lineout.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-lineout.conf
@@ -87,6 +87,14 @@ state.plugged = unknown
state.unplugged = unknown
required-any = any
+[Jack Dock Line Out]
+required-any = any
+
+[Jack Dock Line Out Phantom]
+state.plugged = unknown
+state.unplugged = unknown
+required-any = any
+
[Element Hardware Master]
switch = mute
volume = merge
diff --git a/src/modules/alsa/mixer/paths/analog-output-speaker.conf b/src/modules/alsa/mixer/paths/analog-output-speaker.conf
index ab02ad0..9f4dac4 100644
--- a/src/modules/alsa/mixer/paths/analog-output-speaker.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-speaker.conf
@@ -52,6 +52,10 @@ state.unplugged = unknown
state.plugged = no
state.unplugged = unknown
+[Jack Dock Line Out]
+state.plugged = no
+state.unplugged = unknown
+
[Jack Speaker Phantom]
required-any = any
state.plugged = unknown
commit ff24ea7695a426195aa2c5390fa2f82b74313ef6
Author: Manish Sogi <manish.sogi at samsung.com>
Date: Mon Jun 15 17:46:05 2015 +0530
bluetooth: bluez4: Remove the unused "auto_connect" parameter as it is not used in bluez4
<EP-F69A421D31544C56BDE97C590307C014>
Signed-off-by: Manish Sogi <manish.sogi at samsung.com>
diff --git a/src/modules/bluetooth/module-bluez4-device.c b/src/modules/bluetooth/module-bluez4-device.c
index db69d34..a23c2a9 100644
--- a/src/modules/bluetooth/module-bluez4-device.c
+++ b/src/modules/bluetooth/module-bluez4-device.c
@@ -75,7 +75,6 @@ PA_MODULE_USAGE(
"rate=<sample rate> "
"channels=<number of channels> "
"path=<device object path> "
- "auto_connect=<automatically connect?> "
"sco_sink=<SCO over PCM sink name> "
"sco_source=<SCO over PCM source name>");
@@ -94,7 +93,6 @@ static const char* const valid_modargs[] = {
"rate",
"channels",
"path",
- "auto_connect",
"sco_sink",
"sco_source",
NULL
@@ -148,7 +146,6 @@ struct userdata {
pa_hook_slot *transport_speaker_changed_slot;
pa_bluez4_discovery *discovery;
- bool auto_connect;
char *output_port_name;
char *input_port_name;
@@ -2460,12 +2457,6 @@ int pa__init(pa_module *m) {
goto fail;
}
- u->auto_connect = true;
- if (pa_modargs_get_value_boolean(ma, "auto_connect", &u->auto_connect)) {
- pa_log("Failed to parse auto_connect= argument");
- goto fail;
- }
-
channels = u->sample_spec.channels;
if (pa_modargs_get_value_u32(ma, "channels", &channels) < 0 ||
!pa_channels_valid(channels)) {
commit 4a8bf9ab30d86f135a3ac0d1d500b968b14a3f44
Author: David Henningsson <david.henningsson at canonical.com>
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 <david.henningsson at canonical.com>
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 5d4905ec3145cb62eb27ab7fdefba083196c1178
Author: Ahmed S. Darwish <darwish.07 at gmail.com>
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 <david.henningsson at canonical.com>
Signed-off-by: Ahmed S. Darwish <darwish.07 at gmail.com>
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);
More information about the pulseaudio-commits
mailing list