[Freeswitch-trunk] [commit] r6172 - in freeswitch/trunk/src: . mod/formats/mod_shout

[Freeswitch SVN]

Author: anthm
Date: Tue Nov  6 21:14:57 2007
New Revision: 6172

Modified:
   freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c
   freeswitch/trunk/src/switch_channel.c

Log:
fix nested brackets

Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c
==============================================================================
--- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c	(original)
+++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c	Tue Nov  6 21:14:57 2007
@@ -37,9 +37,9 @@
 #include <lame.h>
 #include <curl/curl.h>
 
-#define OUTSCALE 8192
-#define MP3_SCACHE 16384
-#define MP3_DCACHE 8192
+#define OUTSCALE 8192 * 2
+#define MP3_SCACHE 16384 * 2
+#define MP3_DCACHE 8192 *2
 
 SWITCH_MODULE_LOAD_FUNCTION(mod_shout_load);
 SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_shout_shutdown);

Modified: freeswitch/trunk/src/switch_channel.c
==============================================================================
--- freeswitch/trunk/src/switch_channel.c	(original)
+++ freeswitch/trunk/src/switch_channel.c	Tue Nov  6 21:14:57 2007
@@ -1355,6 +1355,15 @@
 						*e++ = '\0';
 						break;
 					}
+
+					if (br > 0) {
+						if (e != s && *e == '{') {
+							br++;
+						} else if (br > 1 && *e == '}') {
+							br--;
+						}
+					}
+					
 					e++;
 				}
 				p = e;
@@ -1380,7 +1389,7 @@
 
 					if (stream.data) {
 						char *expanded = NULL;
-						
+
 						if ((expanded = switch_channel_expand_variables(channel, vval)) == vval) {
 							expanded = NULL;
 						} else {