[Freeswitch-svn] [commit] r11470 - in freeswitch/trunk: conf/autoload_configs src/mod/endpoints/mod_portaudio

[FreeSWITCH SVN]

Author: brian
Date: Fri Jan 23 15:34:43 2009
New Revision: 11470

Log:
make this param optional in the config on all platforms but solaris since it doesn't like it anyway

Modified:
   freeswitch/trunk/conf/autoload_configs/portaudio.conf.xml
   freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c

Modified: freeswitch/trunk/conf/autoload_configs/portaudio.conf.xml
==============================================================================
--- freeswitch/trunk/conf/autoload_configs/portaudio.conf.xml	(original)
+++ freeswitch/trunk/conf/autoload_configs/portaudio.conf.xml	Fri Jan 23 15:34:43 2009
@@ -15,6 +15,8 @@
     <!--<param name="ring-file" value="/sounds/ring.wav"/>-->
     <!--Number of seconds to pause between rings -->
     <!--<param name="ring-interval" value="5"/>-->
+    <!--Enable or Disable dual_streams-->
+    <!--<param name="dual-streams" value="true"/>-->
 
     <!--file to play when calls are on hold-->
     <param name="hold-file" value="$${hold_music}"/>

Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c	Fri Jan 23 15:34:43 2009
@@ -782,8 +782,6 @@
 	/* 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 @@
 				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")) {