<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][16241] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=16241">16241</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2010-01-11 10:32:35 -0600 (Mon, 11 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>add soundsdir configure var and sounds_dir global freeswitch var</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkMakefileam">freeswitch/trunk/Makefile.am</a></li>
<li><a href="#freeswitchtrunkconfautoload_configsconferenceconfxml">freeswitch/trunk/conf/autoload_configs/conference.conf.xml</a></li>
<li><a href="#freeswitchtrunkconfautoload_configslocal_streamconfxml">freeswitch/trunk/conf/autoload_configs/local_stream.conf.xml</a></li>
<li><a href="#freeswitchtrunkconflangenenxml">freeswitch/trunk/conf/lang/en/en.xml</a></li>
<li><a href="#freeswitchtrunkconflangruruxml">freeswitch/trunk/conf/lang/ru/ru.xml</a></li>
<li><a href="#freeswitchtrunkconfvarsxml">freeswitch/trunk/conf/vars.xml</a></li>
<li><a href="#freeswitchtrunkconfigurein">freeswitch/trunk/configure.in</a></li>
<li><a href="#freeswitchtrunksrcincludeswitch_typesh">freeswitch/trunk/src/include/switch_types.h</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_snapshotmod_snapshotc">freeswitch/trunk/src/mod/applications/mod_snapshot/mod_snapshot.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_corec">freeswitch/trunk/src/switch_core.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_ivrc">freeswitch/trunk/src/switch_ivr.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkMakefileam"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/Makefile.am (16240 => 16241)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/Makefile.am 2010-01-11 15:48:28 UTC (rev 16240)
+++ freeswitch/trunk/Makefile.am 2010-01-11 16:32:35 UTC (rev 16241)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> echo $$full_sound_dir | grep music >/dev/null || soundfile=`echo freeswitch-sounds-$$full_sound_dir-$$sounds_version.tar.gz`; \
</span><span class="cx"> if test "$$target" = "install"; then $(MAKE) $(AM_MAKEFLAGS) core_install; else $(MAKE) $(AM_MAKEFLAGS) core ; fi; \
</span><span class="cx"> if test "$$target_prefix" = "sounds"; then \
</span><del>- if test "$$target" = "install"; then $(GETSOUNDS) $$soundfile $(DESTDIR)$(PREFIX)/sounds/; else $(GETSOUNDS) $$soundfile ; fi; \
</del><ins>+ if test "$$target" = "install"; then $(GETSOUNDS) $$soundfile $(DESTDIR)@soundsdir@/; else $(GETSOUNDS) $$soundfile ; fi; \
</ins><span class="cx"> else \
</span><span class="cx"> cd src/mod && $(MAKE) $(AM_MAKEFLAGS) $@ ;\
</span><span class="cx"> fi
</span></span></pre></div>
<a id="freeswitchtrunkconfautoload_configsconferenceconfxml"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml (16240 => 16241)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/conf/autoload_configs/conference.conf.xml 2010-01-11 15:48:28 UTC (rev 16240)
+++ freeswitch/trunk/conf/autoload_configs/conference.conf.xml 2010-01-11 16:32:35 UTC (rev 16241)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> <!-- If TTS is enabled all audio-file params beginning with -->
</span><span class="cx"> <!-- 'say:' will be considered text to say with TTS -->
</span><span class="cx"> <!-- Set a default path here so you can use relative paths in the other sound params-->
</span><del>- <param name="sound-prefix" value="$${base_dir}/sounds/en/us/callie"/>
</del><ins>+ <param name="sound-prefix" value="$${sounds_dir}/en/us/callie"/>
</ins><span class="cx"> <!-- File to play to acknowledge succees -->
</span><span class="cx"> <!--<param name="ack-sound" value="beep.wav"/>-->
</span><span class="cx"> <!-- File to play to acknowledge failure -->
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> <param name="rate" value="16000"/>
</span><span class="cx"> <param name="interval" value="20"/>
</span><span class="cx"> <param name="energy-level" value="300"/>
</span><del>- <param name="sound-prefix" value="$${base_dir}/sounds/en/us/callie"/>
</del><ins>+ <param name="sound-prefix" value="$${sounds_dir}/en/us/callie"/>
</ins><span class="cx"> <param name="muted-sound" value="conference/conf-muted.wav"/>
</span><span class="cx"> <param name="unmuted-sound" value="conference/conf-unmuted.wav"/>
</span><span class="cx"> <param name="alone-sound" value="conference/conf-alone.wav"/>
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> <param name="rate" value="32000"/>
</span><span class="cx"> <param name="interval" value="20"/>
</span><span class="cx"> <param name="energy-level" value="300"/>
</span><del>- <param name="sound-prefix" value="$${base_dir}/sounds/en/us/callie"/>
</del><ins>+ <param name="sound-prefix" value="$${sounds_dir}/en/us/callie"/>
</ins><span class="cx"> <param name="muted-sound" value="conference/conf-muted.wav"/>
</span><span class="cx"> <param name="unmuted-sound" value="conference/conf-unmuted.wav"/>
</span><span class="cx"> <param name="alone-sound" value="conference/conf-alone.wav"/>
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> <param name="rate" value="48000"/>
</span><span class="cx"> <param name="interval" value="10"/>
</span><span class="cx"> <param name="energy-level" value="300"/>
</span><del>- <param name="sound-prefix" value="$${base_dir}/sounds/en/us/callie"/>
</del><ins>+ <param name="sound-prefix" value="$${sounds_dir}/en/us/callie"/>
</ins><span class="cx"> <param name="muted-sound" value="conference/conf-muted.wav"/>
</span><span class="cx"> <param name="unmuted-sound" value="conference/conf-unmuted.wav"/>
</span><span class="cx"> <param name="alone-sound" value="conference/conf-alone.wav"/>
</span></span></pre></div>
<a id="freeswitchtrunkconfautoload_configslocal_streamconfxml"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/conf/autoload_configs/local_stream.conf.xml (16240 => 16241)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/conf/autoload_configs/local_stream.conf.xml 2010-01-11 15:48:28 UTC (rev 16240)
+++ freeswitch/trunk/conf/autoload_configs/local_stream.conf.xml 2010-01-11 16:32:35 UTC (rev 16241)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <configuration name="local_stream.conf" description="stream files from local dir">
</span><span class="cx"> <!-- fallback to default if requested moh class isn't found -->
</span><del>- <directory name="default" path="$${base_dir}/sounds/music/8000">
</del><ins>+ <directory name="default" path="$${sounds_dir}/music/8000">
</ins><span class="cx"> <param name="rate" value="8000"/>
</span><span class="cx"> <param name="shuffle" value="true"/>
</span><span class="cx"> <param name="channels" value="1"/>
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> <!--<param name="chime-max" value="500"/>-->
</span><span class="cx"> </directory>
</span><span class="cx">
</span><del>- <directory name="moh/8000" path="$${base_dir}/sounds/music/8000">
</del><ins>+ <directory name="moh/8000" path="$${sounds_dir}/music/8000">
</ins><span class="cx"> <param name="rate" value="8000"/>
</span><span class="cx"> <param name="shuffle" value="true"/>
</span><span class="cx"> <param name="channels" value="1"/>
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> <param name="timer-name" value="soft"/>
</span><span class="cx"> </directory>
</span><span class="cx">
</span><del>- <directory name="moh/16000" path="$${base_dir}/sounds/music/16000">
</del><ins>+ <directory name="moh/16000" path="$${sounds_dir}/music/16000">
</ins><span class="cx"> <param name="rate" value="16000"/>
</span><span class="cx"> <param name="shuffle" value="true"/>
</span><span class="cx"> <param name="channels" value="1"/>
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> <param name="timer-name" value="soft"/>
</span><span class="cx"> </directory>
</span><span class="cx">
</span><del>- <directory name="moh/32000" path="$${base_dir}/sounds/music/32000">
</del><ins>+ <directory name="moh/32000" path="$${sounds_dir}/music/32000">
</ins><span class="cx"> <param name="rate" value="32000"/>
</span><span class="cx"> <param name="shuffle" value="true"/>
</span><span class="cx"> <param name="channels" value="1"/>
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> <param name="timer-name" value="soft"/>
</span><span class="cx"> </directory>
</span><span class="cx"> <!--
</span><del>- <directory name="moh/48000" path="$${base_dir}/sounds/music/48000">
</del><ins>+ <directory name="moh/48000" path="$${sounds_dir}/music/48000">
</ins><span class="cx"> <param name="rate" value="48000"/>
</span><span class="cx"> <param name="shuffle" value="true"/>
</span><span class="cx"> <param name="channels" value="1"/>
</span></span></pre></div>
<a id="freeswitchtrunkconflangenenxml"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/conf/lang/en/en.xml (16240 => 16241)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/conf/lang/en/en.xml 2010-01-11 15:48:28 UTC (rev 16240)
+++ freeswitch/trunk/conf/lang/en/en.xml 2010-01-11 16:32:35 UTC (rev 16241)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> <include>
</span><del>- <language name="en" sound-path="$${base_dir}/sounds/en/us/callie" tts-engine="cepstral" tts-voice="callie">
</del><ins>+ <language name="en" sound-path="$${sounds_dir}/en/us/callie" tts-engine="cepstral" tts-voice="callie">
</ins><span class="cx"> <X-PRE-PROCESS cmd="include" data="demo/*.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
</span><span class="cx"> <!--voicemail_en_tts is purely implemented with tts, we have the files based one that is the default. -->
</span><span class="cx"> <X-PRE-PROCESS cmd="include" data="vm/sounds.xml"/> <!-- vm/tts.xml if you want to use tts and have cepstral -->
</span></span></pre></div>
<a id="freeswitchtrunkconflangruruxml"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/conf/lang/ru/ru.xml (16240 => 16241)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/conf/lang/ru/ru.xml 2010-01-11 15:48:28 UTC (rev 16240)
+++ freeswitch/trunk/conf/lang/ru/ru.xml 2010-01-11 16:32:35 UTC (rev 16241)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> <?xml version="1.0" encoding="utf-8"?>
</span><span class="cx"> <!--тестовые файлы Вы звуковые файлы можно взять тут svn co http://svn.freeswitch.ru/bbv/mod_say_ru/ru/ -->
</span><span class="cx"> <include>
</span><del>- <language name="ru" sound-path="$${base_dir}/sounds/ru/RU/elena" tts-engine="cepstral" tts-voice="elena">
</del><ins>+ <language name="ru" sound-path="$${sounds_dir}/ru/RU/elena" tts-engine="cepstral" tts-voice="elena">
</ins><span class="cx"> <X-PRE-PROCESS cmd="include" data="demo/*.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
</span><span class="cx"> <!--voicemail_en_tts is purely implemented with tts, we have the files based one that is the default. -->
</span><span class="cx"> <X-PRE-PROCESS cmd="include" data="vm/sounds.xml"/> <!-- vm/tts.xml if you want to use tts and have cepstral -->
</span></span></pre></div>
<a id="freeswitchtrunkconfvarsxml"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/conf/vars.xml (16240 => 16241)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/conf/vars.xml 2010-01-11 15:48:28 UTC (rev 16240)
+++ freeswitch/trunk/conf/vars.xml 2010-01-11 16:32:35 UTC (rev 16241)
</span><span class="lines">@@ -15,7 +15,6 @@
</span><span class="cx"> <X-PRE-PROCESS cmd="set" data="default_password=1234"/>
</span><span class="cx"> <!-- Did you change it yet? -->
</span><span class="cx">
</span><del>- <X-PRE-PROCESS cmd="set" data="sound_prefix=$${base_dir}/sounds/en/us/callie"/>
</del><span class="cx"> <!--
</span><span class="cx"> This setting is what sets the default domain FreeSWITCH will use if all else fails.
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunkconfigurein"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/configure.in (16240 => 16241)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/configure.in 2010-01-11 15:48:28 UTC (rev 16240)
+++ freeswitch/trunk/configure.in 2010-01-11 16:32:35 UTC (rev 16241)
</span><span class="lines">@@ -56,6 +56,10 @@
</span><span class="cx"> AC_SUBST(htdocsdir)
</span><span class="cx"> AC_DEFINE_UNQUOTED([SWITCH_HTDOCS_DIR],"${htdocsdir}",[where to put htdocs files])
</span><span class="cx">
</span><ins>+soundsdir="${prefix}/sounds"
+AC_SUBST(soundsdir)
+AC_DEFINE_UNQUOTED([SWITCH_SOUNDS_DIR],"${soundsdir}",[where to put sounds files])
+
</ins><span class="cx"> grammardir="${prefix}/grammar"
</span><span class="cx"> AC_SUBST(grammardir)
</span><span class="cx"> AC_DEFINE_UNQUOTED([SWITCH_GRAMMAR_DIR],"${grammardir}",[where to put grammar files])
</span></span></pre></div>
<a id="freeswitchtrunksrcincludeswitch_typesh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_types.h (16240 => 16241)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_types.h 2010-01-11 15:48:28 UTC (rev 16240)
+++ freeswitch/trunk/src/include/switch_types.h 2010-01-11 16:32:35 UTC (rev 16241)
</span><span class="lines">@@ -377,6 +377,7 @@
</span><span class="cx"> char *grammar_dir;
</span><span class="cx"> char *storage_dir;
</span><span class="cx"> char *recordings_dir;
</span><ins>+ char *sounds_dir;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef struct switch_directories switch_directories;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_snapshotmod_snapshotc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_snapshot/mod_snapshot.c (16240 => 16241)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_snapshot/mod_snapshot.c 2010-01-11 15:48:28 UTC (rev 16240)
+++ freeswitch/trunk/src/mod/applications/mod_snapshot/mod_snapshot.c 2010-01-11 16:32:35 UTC (rev 16241)
</span><span class="lines">@@ -159,8 +159,8 @@
</span><span class="cx"> switch_time_exp_lt(&tm, switch_time_make(switch_epoch_time_now(NULL), 0));
</span><span class="cx"> switch_strftime(date, &retsize, sizeof(date), "%Y_%m_%d_%H_%M_%S", &tm);
</span><span class="cx">
</span><del>- file = switch_core_session_sprintf(session, "%s%ssounds%s%s_%s.wav", SWITCH_GLOBAL_dirs.base_dir,
- SWITCH_PATH_SEPARATOR, SWITCH_PATH_SEPARATOR, cb->base, date);
</del><ins>+ file = switch_core_session_sprintf(session, "%s%s%s_%s.wav", SWITCH_GLOBAL_dirs.sounds_dir,
+ SWITCH_PATH_SEPARATOR, cb->base, date);
</ins><span class="cx">
</span><span class="cx"> switch_core_session_get_read_impl(session, &read_impl);
</span><span class="cx"> fh.channels = 0;
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_corec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core.c (16240 => 16241)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core.c 2010-01-11 15:48:28 UTC (rev 16240)
+++ freeswitch/trunk/src/switch_core.c 2010-01-11 16:32:35 UTC (rev 16241)
</span><span class="lines">@@ -466,6 +466,14 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (!SWITCH_GLOBAL_dirs.sounds_dir && (SWITCH_GLOBAL_dirs.sounds_dir = (char *) malloc(BUFSIZE))) {
+#ifdef SWITCH_SOUNDS_DIR
+ switch_snprintf(SWITCH_GLOBAL_dirs.sounds_dir, BUFSIZE, "%s", SWITCH_SOUNDS_DIR);
+#else
+ switch_snprintf(SWITCH_GLOBAL_dirs.sounds_dir, BUFSIZE, "%s%ssounds", base_dir, SWITCH_PATH_SEPARATOR);
+#endif
+ }
+
</ins><span class="cx"> if (!SWITCH_GLOBAL_dirs.storage_dir && (SWITCH_GLOBAL_dirs.storage_dir = (char *) malloc(BUFSIZE))) {
</span><span class="cx"> #ifdef SWITCH_STORAGE_DIR
</span><span class="cx"> switch_snprintf(SWITCH_GLOBAL_dirs.storage_dir, BUFSIZE, "%s", SWITCH_STORAGE_DIR);
</span><span class="lines">@@ -529,6 +537,7 @@
</span><span class="cx"> switch_assert(SWITCH_GLOBAL_dirs.htdocs_dir);
</span><span class="cx"> switch_assert(SWITCH_GLOBAL_dirs.grammar_dir);
</span><span class="cx"> switch_assert(SWITCH_GLOBAL_dirs.recordings_dir);
</span><ins>+ switch_assert(SWITCH_GLOBAL_dirs.sounds_dir);
</ins><span class="cx"> switch_assert(SWITCH_GLOBAL_dirs.temp_dir);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1178,7 +1187,6 @@
</span><span class="cx"> {
</span><span class="cx"> switch_uuid_t uuid;
</span><span class="cx"> char guess_ip[256];
</span><del>- char *dir_path;
</del><span class="cx"> int mask = 0;
</span><span class="cx"> struct in_addr in;
</span><span class="cx"> char hostname[256] = "";
</span><span class="lines">@@ -1215,10 +1223,6 @@
</span><span class="cx"> }
</span><span class="cx"> switch_assert(runtime.memory_pool != NULL);
</span><span class="cx">
</span><del>-
- dir_path = switch_mprintf("%s%ssounds", SWITCH_GLOBAL_dirs.base_dir, SWITCH_PATH_SEPARATOR);
- switch_dir_make_recursive(dir_path, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
- switch_safe_free(dir_path);
</del><span class="cx"> switch_dir_make_recursive(SWITCH_GLOBAL_dirs.base_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
</span><span class="cx"> switch_dir_make_recursive(SWITCH_GLOBAL_dirs.mod_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
</span><span class="cx"> switch_dir_make_recursive(SWITCH_GLOBAL_dirs.conf_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
</span><span class="lines">@@ -1229,6 +1233,7 @@
</span><span class="cx"> switch_dir_make_recursive(SWITCH_GLOBAL_dirs.htdocs_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
</span><span class="cx"> switch_dir_make_recursive(SWITCH_GLOBAL_dirs.grammar_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
</span><span class="cx"> switch_dir_make_recursive(SWITCH_GLOBAL_dirs.recordings_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
</span><ins>+ switch_dir_make_recursive(SWITCH_GLOBAL_dirs.sounds_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
</ins><span class="cx"> switch_dir_make_recursive(SWITCH_GLOBAL_dirs.temp_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
</span><span class="cx">
</span><span class="cx"> switch_mutex_init(&runtime.uuid_mutex, SWITCH_MUTEX_NESTED, runtime.memory_pool);
</span><span class="lines">@@ -1264,6 +1269,8 @@
</span><span class="cx"> switch_core_set_variable("local_ip_v6", guess_ip);
</span><span class="cx"> switch_core_set_variable("base_dir", SWITCH_GLOBAL_dirs.base_dir);
</span><span class="cx"> switch_core_set_variable("recordings_dir", SWITCH_GLOBAL_dirs.recordings_dir);
</span><ins>+ switch_core_set_variable("sound_prefix", SWITCH_GLOBAL_dirs.sounds_dir);
+ switch_core_set_variable("sounds_dir", SWITCH_GLOBAL_dirs.sounds_dir);
</ins><span class="cx"> switch_core_set_serial();
</span><span class="cx">
</span><span class="cx"> switch_console_init(runtime.memory_pool);
</span><span class="lines">@@ -1803,6 +1810,7 @@
</span><span class="cx"> switch_safe_free(SWITCH_GLOBAL_dirs.htdocs_dir);
</span><span class="cx"> switch_safe_free(SWITCH_GLOBAL_dirs.grammar_dir);
</span><span class="cx"> switch_safe_free(SWITCH_GLOBAL_dirs.recordings_dir);
</span><ins>+ switch_safe_free(SWITCH_GLOBAL_dirs.sounds_dir);
</ins><span class="cx"> switch_safe_free(SWITCH_GLOBAL_dirs.temp_dir);
</span><span class="cx">
</span><span class="cx"> switch_core_hash_destroy(&runtime.global_vars);
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_ivrc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr.c (16240 => 16241)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr.c 2010-01-11 15:48:28 UTC (rev 16240)
+++ freeswitch/trunk/src/switch_ivr.c 2010-01-11 16:32:35 UTC (rev 16241)
</span><span class="lines">@@ -2136,12 +2136,6 @@
</span><span class="cx">
</span><span class="cx"> if (sound_path) {
</span><span class="cx"> switch_channel_set_variable(channel, "sound_prefix", sound_path);
</span><del>- } else {
- switch_channel_set_variable_printf(channel, "sound_prefix", "%s%ssounds%s%s",
- SWITCH_GLOBAL_dirs.base_dir,
- SWITCH_PATH_SEPARATOR,
- SWITCH_PATH_SEPARATOR,
- chan_lang);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ((si = switch_loadable_module_get_say_interface(module_name))) {
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>