February 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r12052 - freeswitch/trunk/src
by FreeSWITCH SVN 16 Feb '09

16 Feb '09

Author: anthm Date: Mon Feb 16 10:28:27 2009 New Revision: 12052 Log: behaviour change, do not auto-export origination_caller_id_* to avoid confusion Modified: freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Mon Feb 16 10:28:27 2009 @@ -1037,10 +1037,6 @@ ok = 1; } else if (!strcasecmp((char *) hi->name, "originate_retry_sleep_ms")) { ok = 1; - } else if (!strcasecmp((char *) hi->name, "origination_caller_id_name")) { - ok = 1; - } else if (!strcasecmp((char *) hi->name, "origination_caller_id_number")) { - ok = 1; } if (ok) {

1 0

[commit] r12051 - freeswitch/trunk/src/mod/formats/mod_sndfile
by FreeSWITCH SVN 16 Feb '09

16 Feb '09

Author: anthm Date: Mon Feb 16 09:57:11 2009 New Revision: 12051 Log: MODFORM-23 Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c (original) +++ freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c Mon Feb 16 09:57:11 2009 @@ -67,11 +67,10 @@ int rates[4] = {8000, 16000, 32000, 48000}; int i; #ifdef WIN32 - char ps[2] = {'\\', '/'}; + char ps = '\\'; #else - char ps[2] = {'/', '\\'}; + char ps = '/'; #endif - int x; if ((ext = strrchr(path, '.')) == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Format\n"); @@ -158,24 +157,32 @@ switch_copy_string(alt_path, path, alt_len); - for (x = 0; x < 2; x++) { - if ((last = strrchr(alt_path, ps[x]))) { + /* This block attempts to add the sample rate to the path + if the sample rate is already present in the path it does nothing + and reverts to the original file name. + */ + if ((last = strrchr(alt_path, ps))) { + last++; +#ifdef WIN32 + if (strrchr(last, '/')) { + last = strrchr(alt_path, '/'); /* do not swallow a forward slash if they are intermixed under windows*/ last++; - ldup = strdup(last); - switch_assert(ldup); - switch_snprintf(last, alt_len - (last - alt_path), "%d%s%s", handle->samplerate, SWITCH_PATH_SEPARATOR, ldup); - if ((context->handle = sf_open(alt_path, mode, &context->sfinfo))) { - path = alt_path; - } else { - /* Try to find the file at the highest rate possible if we can't find one that matches the exact rate. - If we don't find any, we will default back to the original file name. - */ - for (i = 3; i > 0; i--) { - switch_snprintf(last, alt_len - (last - alt_path), "%d%s%s", rates[i], SWITCH_PATH_SEPARATOR, ldup); - if ((context->handle = sf_open(alt_path, mode, &context->sfinfo))) { - path = alt_path; - break; - } + } +#endif + ldup = strdup(last); + switch_assert(ldup); + switch_snprintf(last, alt_len - (last - alt_path), "%d%s%s", handle->samplerate, SWITCH_PATH_SEPARATOR, ldup); + if ((context->handle = sf_open(alt_path, mode, &context->sfinfo))) { + path = alt_path; + } else { + /* Try to find the file at the highest rate possible if we can't find one that matches the exact rate. + If we don't find any, we will default back to the original file name. + */ + for (i = 3; i > 0; i--) { + switch_snprintf(last, alt_len - (last - alt_path), "%d%s%s", rates[i], SWITCH_PATH_SEPARATOR, ldup); + if ((context->handle = sf_open(alt_path, mode, &context->sfinfo))) { + path = alt_path; + break; } } }

1 0

[commit] r12050 - freeswitch/trunk/debian
by FreeSWITCH SVN 16 Feb '09

16 Feb '09

Author: mikej Date: Mon Feb 16 09:34:39 2009 New Revision: 12050 Log: revert svn revision 11752 Modified: freeswitch/trunk/debian/dirs freeswitch/trunk/debian/freeswitch-lang-de.conffiles freeswitch/trunk/debian/freeswitch-lang-de.install freeswitch/trunk/debian/freeswitch-lang-en.conffiles freeswitch/trunk/debian/freeswitch-lang-en.install freeswitch/trunk/debian/freeswitch-lang-fr.conffiles freeswitch/trunk/debian/freeswitch-lang-fr.install freeswitch/trunk/debian/freeswitch-lua.conffiles freeswitch/trunk/debian/freeswitch-lua.install freeswitch/trunk/debian/freeswitch-perl.conffiles freeswitch/trunk/debian/freeswitch-perl.install freeswitch/trunk/debian/freeswitch-spidermonkey.conffiles freeswitch/trunk/debian/freeswitch-spidermonkey.install freeswitch/trunk/debian/freeswitch.conffiles freeswitch/trunk/debian/freeswitch.install freeswitch/trunk/debian/postinst freeswitch/trunk/debian/postrm freeswitch/trunk/debian/rules Modified: freeswitch/trunk/debian/dirs ============================================================================== --- freeswitch/trunk/debian/dirs (original) +++ freeswitch/trunk/debian/dirs Mon Feb 16 09:34:39 2009 @@ -1,11 +1,11 @@ -etc/freeswitch/dialplan/default -etc/freeswitch/dialplan/public -etc/freeswitch/sip_profiles/nat -etc/freeswitch/sip_profiles/default -etc/freeswitch/sip_profiles/outbound -etc/freeswitch/directory/default -etc/freeswitch/autoload_configs -etc/freeswitch/jingle_profiles +opt/freeswitch/conf/dialplan/default +opt/freeswitch/conf/dialplan/public +opt/freeswitch/conf/sip_profiles/nat +opt/freeswitch/conf/sip_profiles/default +opt/freeswitch/conf/sip_profiles/outbound +opt/freeswitch/conf/directory/default +opt/freeswitch/conf/autoload_configs +opt/freeswitch/conf/jingle_profiles opt/freeswitch/log opt/freeswitch/db opt/freeswitch/bin/scripts Modified: freeswitch/trunk/debian/freeswitch-lang-de.conffiles ============================================================================== --- freeswitch/trunk/debian/freeswitch-lang-de.conffiles (original) +++ freeswitch/trunk/debian/freeswitch-lang-de.conffiles Mon Feb 16 09:34:39 2009 @@ -1,3 +1,3 @@ -/etc/freeswitch/lang/de/de.xml -/etc/freeswitch/lang/de/demo/demo.xml -/etc/freeswitch/lang/de/vm/tts.xml +/opt/freeswitch/conf/lang/de/de.xml +/opt/freeswitch/conf/lang/de/demo/demo.xml +/opt/freeswitch/conf/lang/de/vm/tts.xml Modified: freeswitch/trunk/debian/freeswitch-lang-de.install ============================================================================== --- freeswitch/trunk/debian/freeswitch-lang-de.install (original) +++ freeswitch/trunk/debian/freeswitch-lang-de.install Mon Feb 16 09:34:39 2009 @@ -1,4 +1,4 @@ -etc/freeswitch/lang/de/*.xml -etc/freeswitch/lang/de/demo/*.xml -etc/freeswitch/lang/de/vm/*.xml +opt/freeswitch/conf/lang/de/*.xml +opt/freeswitch/conf/lang/de/demo/*.xml +opt/freeswitch/conf/lang/de/vm/*.xml opt/freeswitch/mod/mod_say_de.so* Modified: freeswitch/trunk/debian/freeswitch-lang-en.conffiles ============================================================================== --- freeswitch/trunk/debian/freeswitch-lang-en.conffiles (original) +++ freeswitch/trunk/debian/freeswitch-lang-en.conffiles Mon Feb 16 09:34:39 2009 @@ -1,4 +1,4 @@ -/etc/freeswitch/lang/en/en.xml -/etc/freeswitch/lang/en/demo/demo.xml -/etc/freeswitch/lang/en/vm/sounds.xml -/etc/freeswitch/lang/en/vm/tts.xml +/opt/freeswitch/conf/lang/en/en.xml +/opt/freeswitch/conf/lang/en/demo/demo.xml +/opt/freeswitch/conf/lang/en/vm/sounds.xml +/opt/freeswitch/conf/lang/en/vm/tts.xml Modified: freeswitch/trunk/debian/freeswitch-lang-en.install ============================================================================== --- freeswitch/trunk/debian/freeswitch-lang-en.install (original) +++ freeswitch/trunk/debian/freeswitch-lang-en.install Mon Feb 16 09:34:39 2009 @@ -1,4 +1,4 @@ -etc/freeswitch/lang/en/*.xml -etc/freeswitch/lang/en/demo/*.xml -etc/freeswitch/lang/en/vm/*.xml +opt/freeswitch/conf/lang/en/*.xml +opt/freeswitch/conf/lang/en/demo/*.xml +opt/freeswitch/conf/lang/en/vm/*.xml opt/freeswitch/mod/mod_say_en.so* Modified: freeswitch/trunk/debian/freeswitch-lang-fr.conffiles ============================================================================== --- freeswitch/trunk/debian/freeswitch-lang-fr.conffiles (original) +++ freeswitch/trunk/debian/freeswitch-lang-fr.conffiles Mon Feb 16 09:34:39 2009 @@ -1,3 +1,3 @@ -/etc/freeswitch/lang/fr/fr.xml -/etc/freeswitch/lang/fr/demo/demo.xml -/etc/freeswitch/lang/fr/vm/sounds.xml +/opt/freeswitch/conf/lang/fr/fr.xml +/opt/freeswitch/conf/lang/fr/demo/demo.xml +/opt/freeswitch/conf/lang/fr/vm/sounds.xml Modified: freeswitch/trunk/debian/freeswitch-lang-fr.install ============================================================================== --- freeswitch/trunk/debian/freeswitch-lang-fr.install (original) +++ freeswitch/trunk/debian/freeswitch-lang-fr.install Mon Feb 16 09:34:39 2009 @@ -1,4 +1,4 @@ -etc/freeswitch/lang/fr/*.xml -etc/freeswitch/lang/fr/demo/*.xml -etc/freeswitch/lang/fr/vm/*.xml +opt/freeswitch/conf/lang/fr/*.xml +opt/freeswitch/conf/lang/fr/demo/*.xml +opt/freeswitch/conf/lang/fr/vm/*.xml opt/freeswitch/mod/mod_say_fr.so* Modified: freeswitch/trunk/debian/freeswitch-lua.conffiles ============================================================================== --- freeswitch/trunk/debian/freeswitch-lua.conffiles (original) +++ freeswitch/trunk/debian/freeswitch-lua.conffiles Mon Feb 16 09:34:39 2009 @@ -1 +1 @@ -/etc/freeswitch/autoload_configs/lua.conf.xml +/opt/freeswitch/conf/autoload_configs/lua.conf.xml Modified: freeswitch/trunk/debian/freeswitch-lua.install ============================================================================== --- freeswitch/trunk/debian/freeswitch-lua.install (original) +++ freeswitch/trunk/debian/freeswitch-lua.install Mon Feb 16 09:34:39 2009 @@ -1,2 +1,2 @@ opt/freeswitch/mod/mod_lua* -etc/freeswitch/autoload_configs/lua.conf.xml +opt/freeswitch/conf/autoload_configs/lua.conf.xml Modified: freeswitch/trunk/debian/freeswitch-perl.conffiles ============================================================================== --- freeswitch/trunk/debian/freeswitch-perl.conffiles (original) +++ freeswitch/trunk/debian/freeswitch-perl.conffiles Mon Feb 16 09:34:39 2009 @@ -1 +1 @@ -/etc/freeswitch/autoload_configs/perl.conf.xml +/opt/freeswitch/conf/autoload_configs/perl.conf.xml Modified: freeswitch/trunk/debian/freeswitch-perl.install ============================================================================== --- freeswitch/trunk/debian/freeswitch-perl.install (original) +++ freeswitch/trunk/debian/freeswitch-perl.install Mon Feb 16 09:34:39 2009 @@ -1,3 +1,3 @@ opt/freeswitch/perl/* opt/freeswitch/mod/mod_perl* -etc/freeswitch/autoload_configs/perl.conf.xml +opt/freeswitch/conf/autoload_configs/perl.conf.xml Modified: freeswitch/trunk/debian/freeswitch-spidermonkey.conffiles ============================================================================== --- freeswitch/trunk/debian/freeswitch-spidermonkey.conffiles (original) +++ freeswitch/trunk/debian/freeswitch-spidermonkey.conffiles Mon Feb 16 09:34:39 2009 @@ -1 +1 @@ -/etc/freeswitch/autoload_configs/spidermonkey.conf.xml +/opt/freeswitch/conf/autoload_configs/spidermonkey.conf.xml Modified: freeswitch/trunk/debian/freeswitch-spidermonkey.install ============================================================================== --- freeswitch/trunk/debian/freeswitch-spidermonkey.install (original) +++ freeswitch/trunk/debian/freeswitch-spidermonkey.install Mon Feb 16 09:34:39 2009 @@ -3,4 +3,4 @@ opt/freeswitch/lib/libjs.so* opt/freeswitch/lib/libplds4.so* opt/freeswitch/lib/libplc4.so* -etc/freeswitch/autoload_configs/spidermonkey.conf.xml +opt/freeswitch/conf/autoload_configs/spidermonkey.conf.xml Modified: freeswitch/trunk/debian/freeswitch.conffiles ============================================================================== --- freeswitch/trunk/debian/freeswitch.conffiles (original) +++ freeswitch/trunk/debian/freeswitch.conffiles Mon Feb 16 09:34:39 2009 @@ -1,73 +1,73 @@ -/etc/freeswitch/vars.xml -/etc/freeswitch/mime.types -/etc/freeswitch/web-vm.tpl -/etc/freeswitch/tetris.ttml -/etc/freeswitch/fur_elise.ttml -/etc/freeswitch/voicemail.tpl -/etc/freeswitch/freeswitch.xml -/etc/freeswitch/extensions.conf -/etc/freeswitch/dialplan/public.xml -/etc/freeswitch/dialplan/default.xml -/etc/freeswitch/dialplan/features.xml -/etc/freeswitch/dialplan/default/00_pizza_demo.xml -/etc/freeswitch/dialplan/default/99999_enum.xml -/etc/freeswitch/dialplan/public/00_inbound_did.xml -/etc/freeswitch/sip_profiles/external.xml -/etc/freeswitch/sip_profiles/internal/example.xml -/etc/freeswitch/sip_profiles/internal.xml -/etc/freeswitch/sip_profiles/external/example.xml -/etc/freeswitch/directory/default/1007.xml -/etc/freeswitch/directory/default/1001.xml -/etc/freeswitch/directory/default/1008.xml -/etc/freeswitch/directory/default/1019.xml -/etc/freeswitch/directory/default/1002.xml -/etc/freeswitch/directory/default/1011.xml -/etc/freeswitch/directory/default/1014.xml -/etc/freeswitch/directory/default/1003.xml -/etc/freeswitch/directory/default/brian.xml -/etc/freeswitch/directory/default/1013.xml -/etc/freeswitch/directory/default/1000.xml -/etc/freeswitch/directory/default/1009.xml -/etc/freeswitch/directory/default/1005.xml -/etc/freeswitch/directory/default/1010.xml -/etc/freeswitch/directory/default/1015.xml -/etc/freeswitch/directory/default/1004.xml -/etc/freeswitch/directory/default/1017.xml -/etc/freeswitch/directory/default/default.xml -/etc/freeswitch/directory/default/1018.xml -/etc/freeswitch/directory/default/1006.xml -/etc/freeswitch/directory/default/1016.xml -/etc/freeswitch/directory/default/1012.xml -/etc/freeswitch/directory/default.xml -/etc/freeswitch/autoload_configs/ivr.conf.xml -/etc/freeswitch/autoload_configs/voicemail.conf.xml -/etc/freeswitch/autoload_configs/switch.conf.xml -/etc/freeswitch/autoload_configs/syslog.conf.xml -/etc/freeswitch/autoload_configs/zeroconf.conf.xml -/etc/freeswitch/autoload_configs/alsa.conf.xml -/etc/freeswitch/autoload_configs/portaudio.conf.xml -/etc/freeswitch/autoload_configs/xml_curl.conf.xml -/etc/freeswitch/autoload_configs/enum.conf.xml -/etc/freeswitch/autoload_configs/logfile.conf.xml -/etc/freeswitch/autoload_configs/limit.conf.xml -/etc/freeswitch/autoload_configs/java.conf.xml -/etc/freeswitch/autoload_configs/sofia.conf.xml -/etc/freeswitch/autoload_configs/event_multicast.conf.xml -/etc/freeswitch/autoload_configs/rss.conf.xml -/etc/freeswitch/autoload_configs/xml_rpc.conf.xml -/etc/freeswitch/autoload_configs/local_stream.conf.xml -/etc/freeswitch/autoload_configs/conference.conf.xml -/etc/freeswitch/autoload_configs/event_socket.conf.xml -/etc/freeswitch/autoload_configs/modules.conf.xml -/etc/freeswitch/autoload_configs/dingaling.conf.xml -/etc/freeswitch/autoload_configs/iax.conf.xml -/etc/freeswitch/autoload_configs/post_load_modules.conf.xml -/etc/freeswitch/autoload_configs/pocketsphinx.conf.xml -/etc/freeswitch/autoload_configs/xml_cdr.conf.xml -/etc/freeswitch/autoload_configs/cdr_csv.conf.xml -/etc/freeswitch/autoload_configs/dialplan_directory.conf.xml -/etc/freeswitch/autoload_configs/console.conf.xml -/etc/freeswitch/autoload_configs/timezones.conf.xml -/etc/freeswitch/autoload_configs/fax.conf.xml -/etc/freeswitch/jingle_profiles/server.xml -/etc/freeswitch/jingle_profiles/client.xml +/opt/freeswitch/conf/vars.xml +/opt/freeswitch/conf/mime.types +/opt/freeswitch/conf/web-vm.tpl +/opt/freeswitch/conf/tetris.ttml +/opt/freeswitch/conf/fur_elise.ttml +/opt/freeswitch/conf/voicemail.tpl +/opt/freeswitch/conf/freeswitch.xml +/opt/freeswitch/conf/extensions.conf +/opt/freeswitch/conf/dialplan/public.xml +/opt/freeswitch/conf/dialplan/default.xml +/opt/freeswitch/conf/dialplan/features.xml +/opt/freeswitch/conf/dialplan/default/00_pizza_demo.xml +/opt/freeswitch/conf/dialplan/default/99999_enum.xml +/opt/freeswitch/conf/dialplan/public/00_inbound_did.xml +/opt/freeswitch/conf/sip_profiles/external.xml +/opt/freeswitch/conf/sip_profiles/internal/example.xml +/opt/freeswitch/conf/sip_profiles/internal.xml +/opt/freeswitch/conf/sip_profiles/external/example.xml +/opt/freeswitch/conf/directory/default/1007.xml +/opt/freeswitch/conf/directory/default/1001.xml +/opt/freeswitch/conf/directory/default/1008.xml +/opt/freeswitch/conf/directory/default/1019.xml +/opt/freeswitch/conf/directory/default/1002.xml +/opt/freeswitch/conf/directory/default/1011.xml +/opt/freeswitch/conf/directory/default/1014.xml +/opt/freeswitch/conf/directory/default/1003.xml +/opt/freeswitch/conf/directory/default/brian.xml +/opt/freeswitch/conf/directory/default/1013.xml +/opt/freeswitch/conf/directory/default/1000.xml +/opt/freeswitch/conf/directory/default/1009.xml +/opt/freeswitch/conf/directory/default/1005.xml +/opt/freeswitch/conf/directory/default/1010.xml +/opt/freeswitch/conf/directory/default/1015.xml +/opt/freeswitch/conf/directory/default/1004.xml +/opt/freeswitch/conf/directory/default/1017.xml +/opt/freeswitch/conf/directory/default/default.xml +/opt/freeswitch/conf/directory/default/1018.xml +/opt/freeswitch/conf/directory/default/1006.xml +/opt/freeswitch/conf/directory/default/1016.xml +/opt/freeswitch/conf/directory/default/1012.xml +/opt/freeswitch/conf/directory/default.xml +/opt/freeswitch/conf/autoload_configs/ivr.conf.xml +/opt/freeswitch/conf/autoload_configs/voicemail.conf.xml +/opt/freeswitch/conf/autoload_configs/switch.conf.xml +/opt/freeswitch/conf/autoload_configs/syslog.conf.xml +/opt/freeswitch/conf/autoload_configs/zeroconf.conf.xml +/opt/freeswitch/conf/autoload_configs/alsa.conf.xml +/opt/freeswitch/conf/autoload_configs/portaudio.conf.xml +/opt/freeswitch/conf/autoload_configs/xml_curl.conf.xml +/opt/freeswitch/conf/autoload_configs/enum.conf.xml +/opt/freeswitch/conf/autoload_configs/logfile.conf.xml +/opt/freeswitch/conf/autoload_configs/limit.conf.xml +/opt/freeswitch/conf/autoload_configs/java.conf.xml +/opt/freeswitch/conf/autoload_configs/sofia.conf.xml +/opt/freeswitch/conf/autoload_configs/event_multicast.conf.xml +/opt/freeswitch/conf/autoload_configs/rss.conf.xml +/opt/freeswitch/conf/autoload_configs/xml_rpc.conf.xml +/opt/freeswitch/conf/autoload_configs/local_stream.conf.xml +/opt/freeswitch/conf/autoload_configs/conference.conf.xml +/opt/freeswitch/conf/autoload_configs/event_socket.conf.xml +/opt/freeswitch/conf/autoload_configs/modules.conf.xml +/opt/freeswitch/conf/autoload_configs/dingaling.conf.xml +/opt/freeswitch/conf/autoload_configs/iax.conf.xml +/opt/freeswitch/conf/autoload_configs/post_load_modules.conf.xml +/opt/freeswitch/conf/autoload_configs/pocketsphinx.conf.xml +/opt/freeswitch/conf/autoload_configs/xml_cdr.conf.xml +/opt/freeswitch/conf/autoload_configs/cdr_csv.conf.xml +/opt/freeswitch/conf/autoload_configs/dialplan_directory.conf.xml +/opt/freeswitch/conf/autoload_configs/console.conf.xml +/opt/freeswitch/conf/autoload_configs/timezones.conf.xml +/opt/freeswitch/conf/autoload_configs/fax.conf.xml +/opt/freeswitch/conf/jingle_profiles/server.xml +/opt/freeswitch/conf/jingle_profiles/client.xml Modified: freeswitch/trunk/debian/freeswitch.install ============================================================================== --- freeswitch/trunk/debian/freeswitch.install (original) +++ freeswitch/trunk/debian/freeswitch.install Mon Feb 16 09:34:39 2009 @@ -45,76 +45,76 @@ opt/freeswitch/mod/mod_tone_stream.so* opt/freeswitch/mod/mod_fax.so* opt/freeswitch/mod/mod_loopback.so* -etc/freeswitch/vars.xml -etc/freeswitch/mime.types -etc/freeswitch/web-vm.tpl -etc/freeswitch/tetris.ttml -etc/freeswitch/fur_elise.ttml -etc/freeswitch/dialplan/public.xml -etc/freeswitch/dialplan/default.xml -etc/freeswitch/dialplan/features.xml -etc/freeswitch/dialplan/default/00_pizza_demo.xml -etc/freeswitch/dialplan/default/99999_enum.xml -etc/freeswitch/dialplan/public/00_inbound_did.xml -etc/freeswitch/sip_profiles/external.xml -etc/freeswitch/sip_profiles/internal/example.xml -etc/freeswitch/sip_profiles/internal.xml -etc/freeswitch/sip_profiles/external/example.xml -etc/freeswitch/directory/default/1007.xml -etc/freeswitch/directory/default/1001.xml -etc/freeswitch/directory/default/1008.xml -etc/freeswitch/directory/default/1019.xml -etc/freeswitch/directory/default/1002.xml -etc/freeswitch/directory/default/1011.xml -etc/freeswitch/directory/default/1014.xml -etc/freeswitch/directory/default/1003.xml -etc/freeswitch/directory/default/brian.xml -etc/freeswitch/directory/default/1013.xml -etc/freeswitch/directory/default/1000.xml -etc/freeswitch/directory/default/1009.xml -etc/freeswitch/directory/default/1005.xml -etc/freeswitch/directory/default/1010.xml -etc/freeswitch/directory/default/1015.xml -etc/freeswitch/directory/default/1004.xml -etc/freeswitch/directory/default/1017.xml -etc/freeswitch/directory/default/default.xml -etc/freeswitch/directory/default/1018.xml -etc/freeswitch/directory/default/1006.xml -etc/freeswitch/directory/default/1016.xml -etc/freeswitch/directory/default/1012.xml -etc/freeswitch/directory/default.xml -etc/freeswitch/voicemail.tpl -etc/freeswitch/freeswitch.xml -etc/freeswitch/extensions.conf -etc/freeswitch/autoload_configs/ivr.conf.xml -etc/freeswitch/autoload_configs/voicemail.conf.xml -etc/freeswitch/autoload_configs/switch.conf.xml -etc/freeswitch/autoload_configs/syslog.conf.xml -etc/freeswitch/autoload_configs/zeroconf.conf.xml -etc/freeswitch/autoload_configs/alsa.conf.xml -etc/freeswitch/autoload_configs/portaudio.conf.xml -etc/freeswitch/autoload_configs/xml_curl.conf.xml -etc/freeswitch/autoload_configs/enum.conf.xml -etc/freeswitch/autoload_configs/logfile.conf.xml -etc/freeswitch/autoload_configs/limit.conf.xml -etc/freeswitch/autoload_configs/java.conf.xml -etc/freeswitch/autoload_configs/sofia.conf.xml -etc/freeswitch/autoload_configs/event_multicast.conf.xml -etc/freeswitch/autoload_configs/rss.conf.xml -etc/freeswitch/autoload_configs/xml_rpc.conf.xml -etc/freeswitch/autoload_configs/local_stream.conf.xml -etc/freeswitch/autoload_configs/conference.conf.xml -etc/freeswitch/autoload_configs/event_socket.conf.xml -etc/freeswitch/autoload_configs/modules.conf.xml -etc/freeswitch/autoload_configs/dingaling.conf.xml -etc/freeswitch/autoload_configs/iax.conf.xml -etc/freeswitch/autoload_configs/post_load_modules.conf.xml -etc/freeswitch/autoload_configs/pocketsphinx.conf.xml -etc/freeswitch/autoload_configs/xml_cdr.conf.xml -etc/freeswitch/autoload_configs/cdr_csv.conf.xml -etc/freeswitch/autoload_configs/dialplan_directory.conf.xml -etc/freeswitch/autoload_configs/console.conf.xml -etc/freeswitch/autoload_configs/timezones.conf.xml -etc/freeswitch/autoload_configs/fax.conf.xml -etc/freeswitch/jingle_profiles/server.xml -etc/freeswitch/jingle_profiles/client.xml +opt/freeswitch/conf/vars.xml +opt/freeswitch/conf/mime.types +opt/freeswitch/conf/web-vm.tpl +opt/freeswitch/conf/tetris.ttml +opt/freeswitch/conf/fur_elise.ttml +opt/freeswitch/conf/dialplan/public.xml +opt/freeswitch/conf/dialplan/default.xml +opt/freeswitch/conf/dialplan/features.xml +opt/freeswitch/conf/dialplan/default/00_pizza_demo.xml +opt/freeswitch/conf/dialplan/default/99999_enum.xml +opt/freeswitch/conf/dialplan/public/00_inbound_did.xml +opt/freeswitch/conf/sip_profiles/external.xml +opt/freeswitch/conf/sip_profiles/internal/example.xml +opt/freeswitch/conf/sip_profiles/internal.xml +opt/freeswitch/conf/sip_profiles/external/example.xml +opt/freeswitch/conf/directory/default/1007.xml +opt/freeswitch/conf/directory/default/1001.xml +opt/freeswitch/conf/directory/default/1008.xml +opt/freeswitch/conf/directory/default/1019.xml +opt/freeswitch/conf/directory/default/1002.xml +opt/freeswitch/conf/directory/default/1011.xml +opt/freeswitch/conf/directory/default/1014.xml +opt/freeswitch/conf/directory/default/1003.xml +opt/freeswitch/conf/directory/default/brian.xml +opt/freeswitch/conf/directory/default/1013.xml +opt/freeswitch/conf/directory/default/1000.xml +opt/freeswitch/conf/directory/default/1009.xml +opt/freeswitch/conf/directory/default/1005.xml +opt/freeswitch/conf/directory/default/1010.xml +opt/freeswitch/conf/directory/default/1015.xml +opt/freeswitch/conf/directory/default/1004.xml +opt/freeswitch/conf/directory/default/1017.xml +opt/freeswitch/conf/directory/default/default.xml +opt/freeswitch/conf/directory/default/1018.xml +opt/freeswitch/conf/directory/default/1006.xml +opt/freeswitch/conf/directory/default/1016.xml +opt/freeswitch/conf/directory/default/1012.xml +opt/freeswitch/conf/directory/default.xml +opt/freeswitch/conf/voicemail.tpl +opt/freeswitch/conf/freeswitch.xml +opt/freeswitch/conf/extensions.conf +opt/freeswitch/conf/autoload_configs/ivr.conf.xml +opt/freeswitch/conf/autoload_configs/voicemail.conf.xml +opt/freeswitch/conf/autoload_configs/switch.conf.xml +opt/freeswitch/conf/autoload_configs/syslog.conf.xml +opt/freeswitch/conf/autoload_configs/zeroconf.conf.xml +opt/freeswitch/conf/autoload_configs/alsa.conf.xml +opt/freeswitch/conf/autoload_configs/portaudio.conf.xml +opt/freeswitch/conf/autoload_configs/xml_curl.conf.xml +opt/freeswitch/conf/autoload_configs/enum.conf.xml +opt/freeswitch/conf/autoload_configs/logfile.conf.xml +opt/freeswitch/conf/autoload_configs/limit.conf.xml +opt/freeswitch/conf/autoload_configs/java.conf.xml +opt/freeswitch/conf/autoload_configs/sofia.conf.xml +opt/freeswitch/conf/autoload_configs/event_multicast.conf.xml +opt/freeswitch/conf/autoload_configs/rss.conf.xml +opt/freeswitch/conf/autoload_configs/xml_rpc.conf.xml +opt/freeswitch/conf/autoload_configs/local_stream.conf.xml +opt/freeswitch/conf/autoload_configs/conference.conf.xml +opt/freeswitch/conf/autoload_configs/event_socket.conf.xml +opt/freeswitch/conf/autoload_configs/modules.conf.xml +opt/freeswitch/conf/autoload_configs/dingaling.conf.xml +opt/freeswitch/conf/autoload_configs/iax.conf.xml +opt/freeswitch/conf/autoload_configs/post_load_modules.conf.xml +opt/freeswitch/conf/autoload_configs/pocketsphinx.conf.xml +opt/freeswitch/conf/autoload_configs/xml_cdr.conf.xml +opt/freeswitch/conf/autoload_configs/cdr_csv.conf.xml +opt/freeswitch/conf/autoload_configs/dialplan_directory.conf.xml +opt/freeswitch/conf/autoload_configs/console.conf.xml +opt/freeswitch/conf/autoload_configs/timezones.conf.xml +opt/freeswitch/conf/autoload_configs/fax.conf.xml +opt/freeswitch/conf/jingle_profiles/server.xml +opt/freeswitch/conf/jingle_profiles/client.xml Modified: freeswitch/trunk/debian/postinst ============================================================================== --- freeswitch/trunk/debian/postinst (original) +++ freeswitch/trunk/debian/postinst Mon Feb 16 09:34:39 2009 @@ -25,10 +25,10 @@ adduser --disabled-password --quiet --system \ --home /opt/freeswitch \ --gecos "FreeSwitch Voice Platform" --ingroup daemon \ + --add_extra_groups audio \ freeswitch fi - usermod -a -G audio freeswitch mkdir -p /opt/freeswitch chown -R freeswitch:daemon /opt/freeswitch chmod -R o-rwx /opt/freeswitch Modified: freeswitch/trunk/debian/postrm ============================================================================== --- freeswitch/trunk/debian/postrm (original) +++ freeswitch/trunk/debian/postrm Mon Feb 16 09:34:39 2009 @@ -20,7 +20,7 @@ case "$1" in purge) - rm -Rf /etc/freeswitch + rm -Rf /etc/opt/freeswitch rm -Rf /opt/freeswitch userdel freeswitch ;; Modified: freeswitch/trunk/debian/rules ============================================================================== --- freeswitch/trunk/debian/rules (original) +++ freeswitch/trunk/debian/rules Mon Feb 16 09:34:39 2009 @@ -61,7 +61,7 @@ touch modules.conf echo $(MODULES) for i in $(MODULES); do echo $$i >> modules.conf; done - ./configure --sysconfdir=/etc/freeswitch --prefix=/opt/freeswitch --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) ${FEATURES} + ./configure --prefix=/opt/freeswitch --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) ${FEATURES} configure: if test ! -f Makefile.in ; then \ @@ -123,7 +123,7 @@ dh_link dh_strip --dbg-package=freeswitch dh_compress - dh_fixperms --exclude /etc/freeswitch + dh_fixperms --exclude /opt/freeswitch/conf dh_installdeb dh_shlibdeps --exclude=/opt/freeswitch dh_gencontrol

1 0

[commit] r12049 - freeswitch/trunk/conf
by FreeSWITCH SVN 16 Feb '09

16 Feb '09

Author: brian Date: Mon Feb 16 09:14:05 2009 New Revision: 12049 Log: just to be sure that people know you can't comment them out. You have to remove them. Modified: freeswitch/trunk/conf/vars.xml Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Mon Feb 16 09:14:05 2009 @@ -1,5 +1,6 @@  <X-PRE-PROCESS cmd="set" data="sound_prefix=$${base_dir}/sounds/en/us/callie"/> <!--

1 0

[commit] r12048 - freeswitch/trunk/libs/apr-util
by FreeSWITCH SVN 16 Feb '09

16 Feb '09

Author: shaneb Date: Mon Feb 16 09:11:01 2009 New Revision: 12048 Log: Fixed missing iconv Modified: freeswitch/trunk/libs/apr-util/CMakeLists.txt Modified: freeswitch/trunk/libs/apr-util/CMakeLists.txt ============================================================================== --- freeswitch/trunk/libs/apr-util/CMakeLists.txt (original) +++ freeswitch/trunk/libs/apr-util/CMakeLists.txt Mon Feb 16 09:11:01 2009 @@ -24,6 +24,8 @@ xlate/xlate.c ) +LINK_LIBRARIES ("-liconv -ldl -lpthread") + ADD_LIBRARY(apr-util STATIC ${apr-util_SRCS})

1 0

[commit] r12047 - freeswitch/trunk/src
by FreeSWITCH SVN 16 Feb '09

16 Feb '09

Author: anthm Date: Mon Feb 16 08:15:38 2009 New Revision: 12047 Log: FSCORE-299 Modified: freeswitch/trunk/src/switch_core_media_bug.c Modified: freeswitch/trunk/src/switch_core_media_bug.c ============================================================================== --- freeswitch/trunk/src/switch_core_media_bug.c (original) +++ freeswitch/trunk/src/switch_core_media_bug.c Mon Feb 16 08:15:38 2009 @@ -212,6 +212,18 @@ { switch_media_bug_t *bug; //, *bp; switch_size_t bytes; + switch_codec_implementation_t read_impl = {0}; + switch_codec_implementation_t write_impl = {0}; + + + if (!switch_channel_media_ready(session->channel)) { + if (switch_channel_pre_answer(session->channel) != SWITCH_STATUS_SUCCESS) { + return SWITCH_STATUS_FALSE; + } + } + + switch_core_session_get_read_impl(session, &read_impl); + switch_core_session_get_write_impl(session, &write_impl); *new_bug = NULL; @@ -251,7 +263,7 @@ bug->flags = flags; bug->stop_time = stop_time; - bytes = session->read_codec->implementation->decoded_bytes_per_packet; + bytes = read_impl.decoded_bytes_per_packet; if (!bug->flags) { bug->flags = (SMBF_READ_STREAM | SMBF_WRITE_STREAM); @@ -262,7 +274,7 @@ switch_mutex_init(&bug->read_mutex, SWITCH_MUTEX_NESTED, session->pool); } - bytes = session->write_codec->implementation->decoded_bytes_per_packet; + bytes = write_impl.decoded_bytes_per_packet; if (switch_test_flag(bug, SMBF_WRITE_STREAM)) { switch_buffer_create_dynamic(&bug->raw_write_buffer, bytes * SWITCH_BUFFER_BLOCK_FRAMES, bytes * SWITCH_BUFFER_START_FRAMES, MAX_BUG_BUFFER);

1 0

[commit] r12046 - in freeswitch/trunk/src: . include
by FreeSWITCH SVN 16 Feb '09

16 Feb '09

Author: anthm Date: Mon Feb 16 07:59:13 2009 New Revision: 12046 Log: FSCORE-298 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/switch_loadable_module.c Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Mon Feb 16 07:59:13 2009 @@ -1669,7 +1669,7 @@ /*! \brief Launch a thread */ -SWITCH_DECLARE(void) switch_core_launch_thread(void *(*func) (switch_thread_t *, void *), void *obj, switch_memory_pool_t *pool); +SWITCH_DECLARE(void) switch_core_launch_thread(void *(SWITCH_THREAD_FUNC *func) (switch_thread_t *, void *), void *obj, switch_memory_pool_t *pool); /*! \brief Initiate Globals Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Mon Feb 16 07:59:13 2009 @@ -77,7 +77,7 @@ static switch_status_t do_shutdown(switch_loadable_module_t *module, switch_bool_t shutdown, switch_bool_t unload, switch_bool_t fail_if_busy, const char **err); static switch_status_t switch_loadable_module_load_module_ex(char *dir, char *fname, switch_bool_t runtime, switch_bool_t global, const char **err); -static void *switch_loadable_module_exec(switch_thread_t *thread, void *obj) +static void *SWITCH_THREAD_FUNC switch_loadable_module_exec(switch_thread_t *thread, void *obj) { @@ -99,7 +99,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Destroying Pool for %s\n", module->module_interface->module_name); switch_core_destroy_memory_pool(&pool); } - switch_yield(1000000); + switch_thread_exit(thread, 0); return NULL; }

1 0

[commit] r12045 - freeswitch/trunk/build
by FreeSWITCH SVN 16 Feb '09

16 Feb '09

Author: anthm Date: Mon Feb 16 07:57:25 2009 New Revision: 12045 Log: tweak Modified: freeswitch/trunk/build/turbo_build.sh Modified: freeswitch/trunk/build/turbo_build.sh ============================================================================== --- freeswitch/trunk/build/turbo_build.sh (original) +++ freeswitch/trunk/build/turbo_build.sh Mon Feb 16 07:57:25 2009 @@ -31,11 +31,8 @@ done if [ $x = 0 ] ; then echo Build finished. Making install - $MAKE install_core 2>&1 > /dev/null - mods=`find src/mod -name \*.so | grep .libs` - /bin/cp -fp $mods $prefix/mod - mods=`find $prefix/mod -name \*.so` - echo installed core and $mods + $MAKE -j install 2>&1 > /dev/null + echo done exit; fi sleep 1

1 0

[commit] r12044 - freeswitch/trunk/src
by FreeSWITCH SVN 16 Feb '09

16 Feb '09

Author: shaneb Date: Mon Feb 16 01:12:17 2009 New Revision: 12044 Log: apr cmake files Modified: freeswitch/trunk/src/CMakeLists.txt Modified: freeswitch/trunk/src/CMakeLists.txt ============================================================================== --- freeswitch/trunk/src/CMakeLists.txt (original) +++ freeswitch/trunk/src/CMakeLists.txt Mon Feb 16 01:12:17 2009 @@ -6,9 +6,7 @@ INCLUDE_DIRECTORIES(include/ ../libs/libresample/include/ ../libs/srtp/crypto/include/ ../libs/srtp/include/ ../libs/speex/include/) -if( HAVE_NETDB_H) - add_definitions( -DHAVE_NETDB_H) -endif( HAVE_NETDB_H) + SET ( freeswitch_la_SRCS

1 0

[commit] r12043 - freeswitch/trunk
by FreeSWITCH SVN 16 Feb '09

16 Feb '09

Author: shaneb Date: Mon Feb 16 01:11:29 2009 New Revision: 12043 Log: apr cmake files Modified: freeswitch/trunk/CMakeLists.txt Modified: freeswitch/trunk/CMakeLists.txt ============================================================================== --- freeswitch/trunk/CMakeLists.txt (original) +++ freeswitch/trunk/CMakeLists.txt Mon Feb 16 01:11:29 2009 @@ -45,10 +45,54 @@ MESSAGE( STATUS ) # Configuration checks + + + +## Check type sizes -------------------------------------- + + check_type_size ("int" SIZEOF_INT ) + check_type_size ("uint32_t" HAVE_UINT32_T ) + check_type_size ("int64_t" HAVE_INT64_T ) + check_type_size ("float" SIZEOF_FLOAT ) + check_type_size ("double" SIZEOF_DOUBLE ) + check_type_size ("long" SIZEOF_LONG ) + check_type_size ("long long" SIZEOF_LONG_LONG ) + check_type_size ("short" SIZEOF_SHORT ) + check_type_size ("off_t" SIZEOF_OFF_T ) + check_type_size ("pid_t" SIZEOF_PID_T ) + check_type_size ("size_t" SIZEOF_SIZE_T ) + check_type_size ("socklen_t" SIZEOF_SOCKLEN_T ) + check_type_size ("sig_atomic_t" SIZEOF_SIG_ATOMIC_T ) + check_type_size ("void *" SIZEOF_VOID_P ) + check_type_size ("uintptr_t" SIZEOF_UINTPTR_T ) + check_type_size ("_Bool" HAVE__BOOL ) + check_type_size ("intptr_t" SIZEOF_INTPTR_T ) + + check_type_size ("struct sockaddr_in6" SIZEOF_STRUCT_SOCKADDR_IN6 ) + check_type_size ("struct sockaddr_storage" SIZEOF_STRUCT_SOCKADDR_STORAGE ) + check_type_size ("struct utimbuf" SIZEOF_STRUCT_UTIMBUF ) + + + + + + check_symbol_exists (strncasecmp "string.h" HAVE_STRNCASECMP) check_symbol_exists (strcasecmp "string.h" HAVE_STRCASECMP) check_symbol_exists (iswspace "wctype.h" HAVE_ISWSPACE) check_symbol_exists (towlower "wctype.h" HAVE_TOWLOWER) +check_symbol_exists(getpagesize unistd.h HAVE_GETPAGESIZE) +check_symbol_exists(isinf cmath HAVE_ISINF_IN_CMATH) +check_symbol_exists(isinf math.h HAVE_ISINF_IN_MATH_H) +check_symbol_exists(isnan cmath HAVE_ISNAN_IN_CMATH) +check_symbol_exists(isnan math.h HAVE_ISNAN_IN_MATH_H) +check_symbol_exists(ceilf math.h HAVE_CEILF) +check_symbol_exists(floorf math.h HAVE_FLOORF) +check_symbol_exists(mallinfo malloc.h HAVE_MALLINFO) +check_symbol_exists(pthread_mutex_lock pthread.h HAVE_PTHREAD_MUTEX_LOCK) +check_symbol_exists(strtoll stdlib.h HAVE_STRTOLL) +check_symbol_exists(getrusage sys/resource.h HAVE_GETRUSAGE) +check_symbol_exists(setrlimit sys/resource.h HAVE_SETRLIMIT) check_include_file (dirent.h HAVE_DIRENT_H) check_include_file (dlfcn.h HAVE_DLFCN_H) @@ -61,7 +105,7 @@ check_include_file (sys/ndir.h HAVE_SYS_NDIR_H) CHECK_INCLUDE_FILE(netdb.h HAVE_NETDB_H) - +check_include_file(malloc.h HAVE_MALLOC_H) check_include_file (sys/ioctl.h HAVE_SYS_IOCTL_H) check_include_file (sys/utsname.h HAVE_SYS_UTSNAME_H) check_include_file (wchar.h HAVE_WCHAR_H) @@ -93,8 +137,9 @@ check_function_exists (setenv HAVE_SETENV) check_function_exists (setgroups HAVE_SETGROUPS) - +check_function_exists (clock_gettime HAVE_CLOCK_GETTIME) check_function_exists (pselect HAVE_PSELECT) +check_function_exists (malloc HAVE_MALLOC) check_function_exists (mlock HAVE_MLOCK) check_function_exists (mlockall HAVE_MLOCKALL) check_function_exists (asprintf HAVE_ASPRINTF) @@ -102,6 +147,24 @@ check_function_exists (gettimeofday HAVE_GETTIMEOFDAY) check_function_exists (gmtime_r HAVE_GMTIME_R) check_function_exists (initgroups HAVE_INITGROUPS) +check_function_exists (usleep HAVE_USLEEP) +check_function_exists (vasprintf HAVE_VASPRINTF) + + +MESSAGE( STATUS "BUILD APR--------------------------------------------------------------------------" ) + +#execute_process (WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/libs/apr/ COMMAND ./configure --prefix=/usr/local/freeswitch --enable-core-odbc-support --cache-file=/dev/null --srcdir=. --disable-shared --with-pic TIMEOUT 300 ERROR_VARIABLE error_configure ERROR_FILE error.log) + +#execute_process (WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/libs/apr/ COMMAND ./make TIMEOUT 300 ERROR_VARIABLE error_configure ERROR_FILE error.log) +MESSAGE( STATUS "-------------------------------------------------------------------------------" ) + +MESSAGE( STATUS "BUILD APR-UTIL--------------------------------------------------------------------------" ) + +#execute_process (WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/libs/apr-util/ COMMAND ./configure --prefix=/usr/local/freeswitch --enable-core-odbc-support --cache-file=/dev/null --srcdir=. --with-apr=../apr --disable-shared --with-pic --without-sqlite2 --without-sqlite3 TIMEOUT 300 ERROR_VARIABLE error_configure ERROR_FILE error.log) + +#execute_process (WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/libs/apr-util/ COMMAND ./make TIMEOUT 300 ERROR_VARIABLE error_configure ERROR_FILE error.log) + +MESSAGE( STATUS "-------------------------------------------------------------------------------" ) # OPTION( VARIABLE "Description" Initial state) @@ -132,10 +195,18 @@ FIND_PACKAGE(Threads) +#TESTING SECTION +add_definitions(-DMACOSX) +#add_definitions("-DSWITCH_PREFIX_DIR=/usr/local/freeswitch") + + + +INCLUDE_DIRECTORIES(BEFORE ${CMAKE_SOURCE_DIR}/libs/apr/include/ ${CMAKE_SOURCE_DIR}/libs/apr-util/include/ src/include/ libs/libteletone/src/ libs/stfu/) + # DO APR -INCLUDE_DIRECTORIES ( ${CMAKE_SOURCE_DIR}/libs/apr/include/ ${CMAKE_SOURCE_DIR}/libs/apr-util/include/) -LINK_LIBRARIES (${CMAKE_SOURCE_DIR}/libs/apr/.libs/libapr-1.a) -LINK_LIBRARIES (${CMAKE_SOURCE_DIR}/libs/apr-util/.libs/libaprutil-1.a) +#INCLUDE_DIRECTORIES ( ${CMAKE_SOURCE_DIR}/libs/apr/include/ ${CMAKE_SOURCE_DIR}/libs/apr-util/include/) +#LINK_LIBRARIES (${CMAKE_SOURCE_DIR}/libs/apr/.libs/libapr-1.a) +#LINK_LIBRARIES (${CMAKE_SOURCE_DIR}/libs/apr-util/.libs/libaprutil-1.a) # DO SNDFILE @@ -159,10 +230,6 @@ #endif( PATH_LIB_EDIT) -#TESTING SECTION -add_definitions(-DMACOSX) -#add_definitions("-DSWITCH_PREFIX_DIR=/usr/local/freeswitch") - # DO SRTP @@ -180,6 +247,7 @@ # libspeexdsp LINK_LIBRARIES (${CMAKE_SOURCE_DIR}/libs/speex/libspeex/.libs/libspeexdsp.a) +LINK_LIBRARIES (${CMAKE_SOURCE_DIR}/libs/speex/libspeex/.libs/libspeex.a) INCLUDE_DIRECTORIES ( ${CMAKE_SOURCE_DIR}/libs/speex/include/) @@ -201,7 +269,7 @@ -INCLUDE_DIRECTORIES(src/include/ libs/libteletone/src/ libs/stfu/ libs/apr/include/ libs/apr-util/include/) + ADD_SUBDIRECTORY(src) #ADD_SUBDIRECTORY(libs/libresample/) @@ -209,6 +277,8 @@ #ADD_SUBDIRECTORY(libs/sqlite/) ADD_SUBDIRECTORY(libs/pcre/) ADD_SUBDIRECTORY(libs/stfu/) +ADD_SUBDIRECTORY(libs/apr-util/) +ADD_SUBDIRECTORY(libs/apr/) #ADD_SUBDIRECTORY(libs/libedit/src/) ADD_SUBDIRECTORY(libs/srtp/) @@ -216,6 +286,6 @@ ADD_EXECUTABLE(freeswitch ${freeswitch_SRCS}) -TARGET_LINK_LIBRARIES(freeswitch teletone pcre freeswitch_la stfu ${optionalLibs}) +TARGET_LINK_LIBRARIES(freeswitch apr apr-util teletone pcre freeswitch_la stfu ${optionalLibs})

1 0