From 963cbf4c3cf81bc8e4adb1b4b96ed0aa199e834f Mon Sep 17 00:00:00 2001 From: Brian West Date: Fri, 23 Jan 2009 21:34:43 +0000 Subject: [PATCH] make this param optional in the config on all platforms but solaris since it doesn't like it anyway git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11470 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- conf/autoload_configs/portaudio.conf.xml | 2 ++ src/mod/endpoints/mod_portaudio/mod_portaudio.c | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/conf/autoload_configs/portaudio.conf.xml b/conf/autoload_configs/portaudio.conf.xml index 9296a2d59c..92c9ec7188 100644 --- a/conf/autoload_configs/portaudio.conf.xml +++ b/conf/autoload_configs/portaudio.conf.xml @@ -15,6 +15,8 @@ + + diff --git a/src/mod/endpoints/mod_portaudio/mod_portaudio.c b/src/mod/endpoints/mod_portaudio/mod_portaudio.c index 628c9f6609..4719e5e1df 100644 --- a/src/mod/endpoints/mod_portaudio/mod_portaudio.c +++ b/src/mod/endpoints/mod_portaudio/mod_portaudio.c @@ -782,8 +782,6 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_portaudio_load) /* dual streams makes portaudio on solaris choke */ #if defined(sun) || defined(__sun) globals.dual_streams = 0; -#else - globals.dual_streams = 1; #endif if ((status = load_config()) != SWITCH_STATUS_SUCCESS) { @@ -863,6 +861,12 @@ static switch_status_t load_config(void) set_global_ring_file(val); } else if (!strcmp(var, "hold-file")) { set_global_hold_file(val); + } else if (!strcmp(var, "dual-streams")) { + if (switch_true(val)) { + globals.dual_streams = 1; + } else { + globals.dual_streams = 0; + } } else if (!strcmp(var, "timer-name")) { set_global_timer_name(val); } else if (!strcmp(var, "sample-rate")) {