summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Henningsson <david.henningsson@canonical.com>2015-01-21 15:06:53 +0100
committerDavid Henningsson <david.henningsson@canonical.com>2015-01-21 15:06:53 +0100
commit34862dbd43079d19faff31fa9ba996acc874d586 (patch)
tree76676eee79e33dd6a2a53cb92ddad9192c1bfa98
parent5effc834790786c456952beb7aaea7df75053889 (diff)
protocol-native: Disable srbchannel by defaultv5.99.3
Recent testing has shown some srbchannel related bugs that indicates that the srbchannel feature is not ready to be enabled by default. Therefore, temporary disable it for the 6.0 release and re-enable it in git master once 6.0 is released. Bugs: https://bugs.freedesktop.org/show_bug.cgi?id=88452 https://bugs.freedesktop.org/show_bug.cgi?id=88167 Signed-off-by: David Henningsson <david.henningsson@canonical.com>
-rw-r--r--src/pulsecore/protocol-native.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
index 20598413d..f54f2a44a 100644
--- a/src/pulsecore/protocol-native.c
+++ b/src/pulsecore/protocol-native.c
@@ -2591,7 +2591,7 @@ static void setup_srbchannel(pa_native_connection *c) {
int fdlist[2];
if (!c->options->srbchannel) {
- pa_log_debug("Disabling srbchannel, reason: Disabled by module parameter");
+ pa_log_debug("Disabling srbchannel, reason: Must be enabled by module parameter");
return;
}
@@ -5325,7 +5325,7 @@ int pa_native_options_parse(pa_native_options *o, pa_core *c, pa_modargs *ma) {
pa_assert(PA_REFCNT_VALUE(o) >= 1);
pa_assert(ma);
- o->srbchannel = true;
+ o->srbchannel = false;
if (pa_modargs_get_value_boolean(ma, "srbchannel", &o->srbchannel) < 0) {
pa_log("srbchannel= expects a boolean argument.");
return -1;