[Freeswitch-svn] [commit] r2499 - freeswitch/trunk/src/mod/applications/mod_conference

[Freeswitch SVN]

Author: mikej
Date: Sun Sep  3 23:36:56 2006
New Revision: 2499

Modified:
   freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c

Log:
make conf use default profile if none specified, make it work with soundfiles on windows, must have full drive letter and path (i.e. C:\Windows\Media\blah.wav)

Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c	Sun Sep  3 23:36:56 2006
@@ -1017,7 +1017,11 @@
         return SWITCH_STATUS_FALSE;
     }
 
+#ifdef WIN32
+	if (file[1] != ':') {
+#else
 	if (*file != '/') {
+#endif
 		return conference_say(conference, file, leadin);
 	}
 
@@ -2173,19 +2177,23 @@
 		*dpin++ = '\0';
 	}
 
+	/* Open the config from the xml registry */
+	if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, NULL))) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", global_cf_name);
+		goto done;
+	}
+
 	if ((profile_name = strchr(conf_name, '@'))) {
 		*profile_name++ = '\0';
 
-		/* Open the config from the xml registry */
-		if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, NULL))) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", global_cf_name);
-			goto done;
-		}
-		
 		if ((profiles = switch_xml_child(cfg, "profiles"))) {
 			profile = switch_xml_find_child(profiles, "profile", "name", profile_name);
 		}
-	} 
+	} else {
+		if ((profiles = switch_xml_child(cfg, "profiles"))) {
+			profile = switch_xml_find_child(profiles, "profile", "name", "default");
+		}
+	}
 
 	if (isbr) {
 		char *uuid = switch_core_session_get_uuid(session);