January 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r11580 - freeswitch/trunk/src
by FreeSWITCH SVN 31 Jan '09

31 Jan '09

Author: brian Date: Sat Jan 31 13:42:40 2009 New Revision: 11580 Log: doh Modified: freeswitch/trunk/src/switch_channel.c Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Sat Jan 31 13:42:40 2009 @@ -593,7 +593,6 @@ if (ok) { switch_event_add_header_string(channel->variables, SWITCH_STACK_BOTTOM, varname, value); } else { - abort(); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Invalid data (${%s} contains a variable)\n", varname); } }

1 0

[commit] r11575 - freeswitch/trunk/src/include
by FreeSWITCH SVN 31 Jan '09

31 Jan '09

Author: mrene Date: Fri Jan 30 20:48:35 2009 New Revision: 11575 Log: add \remark to switch_ivr_uuid_bridge Modified: freeswitch/trunk/src/include/switch_ivr.h Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Fri Jan 30 20:48:35 2009 @@ -466,6 +466,7 @@ \brief Bridge two existing sessions \param originator_uuid the uuid of the originator \param originatee_uuid the uuid of the originator + \remark Any custom state handlers on both channels will be deleted \return SWITCH_STATUS_SUCCESS if all is well */ SWITCH_DECLARE(switch_status_t) switch_ivr_uuid_bridge(const char *originator_uuid, const char *originatee_uuid);

1 0

[commit] r11574 - freeswitch/trunk/src
by FreeSWITCH SVN 31 Jan '09

31 Jan '09

Author: brian Date: Fri Jan 30 18:16:27 2009 New Revision: 11574 Log: clean up arg vs expanded Modified: freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core_session.c Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Fri Jan 30 18:16:27 2009 @@ -1,3 +1,4 @@ + /* * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> @@ -592,7 +593,8 @@ if (ok) { switch_event_add_header_string(channel->variables, SWITCH_STACK_BOTTOM, varname, value); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Invalid data (contains a variable)\n"); + abort(); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Invalid data (${%s} contains a variable)\n", varname); } } switch_mutex_unlock(channel->profile_mutex); Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Fri Jan 30 18:16:27 2009 @@ -1299,7 +1299,7 @@ log = switch_core_session_alloc(session, sizeof(*log)); log->app = switch_core_session_strdup(session, application_interface->interface_name); - log->arg = switch_core_session_strdup(session, arg); + log->arg = switch_core_session_strdup(session, expanded); for (lp = session->app_log; lp && lp->next; lp = lp->next); @@ -1311,13 +1311,13 @@ } switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_VARIABLE, application_interface->interface_name); - switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_DATA_VARIABLE, arg); + switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_DATA_VARIABLE, expanded); switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, NULL); if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_EXECUTE) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(session->channel, event); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Application", application_interface->interface_name); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Application-Data", arg); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Application-Data", expanded); switch_event_fire(&event); } @@ -1333,7 +1333,7 @@ const char *resp = switch_channel_get_variable(session->channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE); switch_channel_event_set_data(session->channel, event); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Application", application_interface->interface_name); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Application-Data", arg); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Application-Data", expanded); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Application-Response", resp ? resp : "_none_"); switch_event_fire(&event); }

1 0

[commit] r11573 - freeswitch/trunk/src
by FreeSWITCH SVN 30 Jan '09

30 Jan '09

Author: anthm Date: Fri Jan 30 17:46:00 2009 New Revision: 11573 Log: doh Modified: freeswitch/trunk/src/switch_core_session.c Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Fri Jan 30 17:46:00 2009 @@ -1224,7 +1224,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_execute_application(switch_core_session_t *session, const char *app, const char *arg) { switch_application_interface_t *application_interface; - char *expanded = NULL; if ((application_interface = switch_loadable_module_get_application_interface(app)) == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Application %s\n", app); @@ -1252,7 +1251,7 @@ } } - switch_core_session_exec(session, application_interface, expanded); + switch_core_session_exec(session, application_interface, arg); UNPROTECT_INTERFACE(application_interface);

1 0

[commit] r11572 - freeswitch/trunk/src
by FreeSWITCH SVN 30 Jan '09

30 Jan '09

Author: anthm Date: Fri Jan 30 17:43:12 2009 New Revision: 11572 Log: revert silence gen code for comparison Modified: freeswitch/trunk/src/switch_resample.c Modified: freeswitch/trunk/src/switch_resample.c ============================================================================== --- freeswitch/trunk/src/switch_resample.c (original) +++ freeswitch/trunk/src/switch_resample.c Fri Jan 30 17:43:12 2009 @@ -201,6 +201,7 @@ } } +#if SILENCE_METHOD_ONE SWITCH_DECLARE(void) switch_generate_sln_silence(int16_t *data, uint32_t samples, uint32_t divisor) { int16_t x; @@ -223,6 +224,31 @@ data++; } } +#else + +SWITCH_DECLARE(void) switch_generate_sln_silence(int16_t *data, uint32_t samples, uint32_t divisor) +{ + int16_t rnd = 0, rnd2, x; + uint32_t i; + int sum_rnd = 0; + + assert(divisor); + + rnd2 = (int16_t) (intptr_t) &data + switch_epoch_time_now(NULL); + + for (i = 0; i < samples; i++, sum_rnd = 0) { + for (x = 0; x < 10; x++) { + rnd += ((x + i) * rnd2); + sum_rnd += rnd; + } + switch_normalize_to_16bit(sum_rnd); + *data = (int16_t) ((int16_t) sum_rnd / (int) divisor); + + data++; + } +} + +#endif SWITCH_DECLARE(uint32_t) switch_merge_sln(int16_t *data, uint32_t samples, int16_t *other_data, uint32_t other_samples) {

1 0

[commit] r11571 - freeswitch/trunk/conf/autoload_configs
by FreeSWITCH SVN 30 Jan '09

30 Jan '09

Author: brian Date: Fri Jan 30 17:33:53 2009 New Revision: 11571 Log: forgot to add sla conference profile Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/conference.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/conference.conf.xml Fri Jan 30 17:33:53 2009 @@ -174,5 +174,15 @@ <param name="comfort-noise" value="true"/> </profile> + <profile name="sla"> + <param name="domain" value="$${domain}"/> + <param name="rate" value="16000"/> + <param name="interval" value="20"/> + <param name="caller-controls" value="none"/> + <param name="energy-level" value="200"/> + <param name="moh-sound" value="silence"/> + <param name="comfort-noise" value="true"/> + </profile> + </profiles> </configuration>

1 0

[commit] r11570 - in freeswitch/trunk/src: . include mod/languages/mod_java mod/languages/mod_lua mod/languages/mod_managed mod/languages/mod_perl mod/languages/mod_python
by FreeSWITCH SVN 30 Jan '09

30 Jan '09

Author: anthm Date: Fri Jan 30 17:19:38 2009 New Revision: 11570 Log: FSCORE-282 Modified: freeswitch/trunk/src/include/switch_cpp.h freeswitch/trunk/src/mod/languages/mod_java/switch_swig_wrap.cpp freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp freeswitch/trunk/src/switch_cpp.cpp Modified: freeswitch/trunk/src/include/switch_cpp.h ============================================================================== --- freeswitch/trunk/src/include/switch_cpp.h (original) +++ freeswitch/trunk/src/include/switch_cpp.h Fri Jan 30 17:19:38 2009 @@ -337,7 +337,7 @@ SWITCH_DECLARE(void) waitForAnswer(CoreSession *calling_session); - SWITCH_DECLARE(void) execute(char *app, char *data = NULL); + SWITCH_DECLARE(void) execute(const char *app, const char *data = NULL); SWITCH_DECLARE(void) sendEvent(Event * sendME); Modified: freeswitch/trunk/src/mod/languages/mod_java/switch_swig_wrap.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_java/switch_swig_wrap.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_java/switch_swig_wrap.cpp Fri Jan 30 17:19:38 2009 @@ -2906,7 +2906,7 @@ arg3 = (char *)jenv->GetStringUTFChars(jarg3, 0); if (!arg3) return ; } - (arg1)->execute(arg2,arg3); + (arg1)->execute((char const *)arg2,(char const *)arg3); if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2); if (arg3) jenv->ReleaseStringUTFChars(jarg3, (const char *)arg3); } @@ -2925,7 +2925,7 @@ arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0); if (!arg2) return ; } - (arg1)->execute(arg2); + (arg1)->execute((char const *)arg2); if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2); } Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp Fri Jan 30 17:19:38 2009 @@ -6589,8 +6589,8 @@ SWIG_check_num_args("execute",3,3) if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("execute",1,"CoreSession *"); - if(!lua_isstring(L,2)) SWIG_fail_arg("execute",2,"char *"); - if(!lua_isstring(L,3)) SWIG_fail_arg("execute",3,"char *"); + if(!lua_isstring(L,2)) SWIG_fail_arg("execute",2,"char const *"); + if(!lua_isstring(L,3)) SWIG_fail_arg("execute",3,"char const *"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_CoreSession,0))){ SWIG_fail_ptr("CoreSession_execute",1,SWIGTYPE_p_CoreSession); @@ -6598,7 +6598,7 @@ arg2 = (char *)lua_tostring(L, 2); arg3 = (char *)lua_tostring(L, 3); - (arg1)->execute(arg2,arg3); + (arg1)->execute((char const *)arg2,(char const *)arg3); SWIG_arg=0; return SWIG_arg; @@ -6618,14 +6618,14 @@ SWIG_check_num_args("execute",2,2) if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("execute",1,"CoreSession *"); - if(!lua_isstring(L,2)) SWIG_fail_arg("execute",2,"char *"); + if(!lua_isstring(L,2)) SWIG_fail_arg("execute",2,"char const *"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_CoreSession,0))){ SWIG_fail_ptr("CoreSession_execute",1,SWIGTYPE_p_CoreSession); } arg2 = (char *)lua_tostring(L, 2); - (arg1)->execute(arg2); + (arg1)->execute((char const *)arg2); SWIG_arg=0; return SWIG_arg; Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx Fri Jan 30 17:19:38 2009 @@ -21517,7 +21517,7 @@ arg2 = (char *)jarg2; arg3 = (char *)jarg3; arg4 = (switch_media_flag_t)jarg4; - result = (uint32_t)switch_ivr_schedule_broadcast(arg1,arg2,arg3,arg4); + result = (uint32_t)switch_ivr_schedule_broadcast(arg1,(char const *)arg2,(char const *)arg3,arg4); jresult = (unsigned long)result; return jresult; } @@ -27643,7 +27643,7 @@ arg1 = (CoreSession *)jarg1; arg2 = (char *)jarg2; arg3 = (char *)jarg3; - (arg1)->execute(arg2,arg3); + (arg1)->execute((char const *)arg2,(char const *)arg3); } Modified: freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp Fri Jan 30 17:19:38 2009 @@ -8937,15 +8937,15 @@ arg1 = reinterpret_cast< CoreSession * >(argp1); res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_execute" "', argument " "2"" of type '" "char *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_execute" "', argument " "2"" of type '" "char const *""'"); } arg2 = reinterpret_cast< char * >(buf2); res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3); if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CoreSession_execute" "', argument " "3"" of type '" "char *""'"); + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CoreSession_execute" "', argument " "3"" of type '" "char const *""'"); } arg3 = reinterpret_cast< char * >(buf3); - (arg1)->execute(arg2,arg3); + (arg1)->execute((char const *)arg2,(char const *)arg3); if (alloc2 == SWIG_NEWOBJ) delete[] buf2; @@ -8982,10 +8982,10 @@ arg1 = reinterpret_cast< CoreSession * >(argp1); res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_execute" "', argument " "2"" of type '" "char *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_execute" "', argument " "2"" of type '" "char const *""'"); } arg2 = reinterpret_cast< char * >(buf2); - (arg1)->execute(arg2); + (arg1)->execute((char const *)arg2); if (alloc2 == SWIG_NEWOBJ) delete[] buf2; @@ -11483,17 +11483,17 @@ SWIG_TypeClientData(SWIGTYPE_p_IVRMenu, (void*) "freeswitch::IVRMenu"); SWIG_TypeClientData(SWIGTYPE_p_API, (void*) "freeswitch::API"); SWIG_TypeClientData(SWIGTYPE_p_input_callback_state, (void*) "freeswitch::input_callback_state_t"); - /*@SWIG:/usr/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "S_HUP", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_HUP))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "S_FREE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_FREE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "S_RDLOCK", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_RDLOCK))); SvREADONLY_on(sv); Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp Fri Jan 30 17:19:38 2009 @@ -8609,15 +8609,15 @@ arg1 = reinterpret_cast< CoreSession * >(argp1); res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_execute" "', argument " "2"" of type '" "char *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_execute" "', argument " "2"" of type '" "char const *""'"); } arg2 = reinterpret_cast< char * >(buf2); res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3); if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CoreSession_execute" "', argument " "3"" of type '" "char *""'"); + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CoreSession_execute" "', argument " "3"" of type '" "char const *""'"); } arg3 = reinterpret_cast< char * >(buf3); - (arg1)->execute(arg2,arg3); + (arg1)->execute((char const *)arg2,(char const *)arg3); resultobj = SWIG_Py_Void(); if (alloc2 == SWIG_NEWOBJ) delete[] buf2; if (alloc3 == SWIG_NEWOBJ) delete[] buf3; @@ -8649,10 +8649,10 @@ arg1 = reinterpret_cast< CoreSession * >(argp1); res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_execute" "', argument " "2"" of type '" "char *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_execute" "', argument " "2"" of type '" "char const *""'"); } arg2 = reinterpret_cast< char * >(buf2); - (arg1)->execute(arg2); + (arg1)->execute((char const *)arg2); resultobj = SWIG_Py_Void(); if (alloc2 == SWIG_NEWOBJ) delete[] buf2; return resultobj; @@ -8706,8 +8706,8 @@ fail: SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CoreSession_execute'.\n" " Possible C/C++ prototypes are:\n" - " execute(CoreSession *,char *,char *)\n" - " execute(CoreSession *,char *)\n"); + " execute(CoreSession *,char const *,char const *)\n" + " execute(CoreSession *,char const *)\n"); return NULL; } Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Fri Jan 30 17:19:38 2009 @@ -580,18 +580,15 @@ return switch_channel_get_variable(channel, var); } -SWITCH_DECLARE(void) CoreSession::execute(char *app, char *data) +SWITCH_DECLARE(void) CoreSession::execute(const char *app, const char *data) { const switch_application_interface_t *application_interface; this_check_void(); sanity_check_noreturn; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CoreSession::execute. app: %s data:%s\n", app, data); - if ((application_interface = switch_loadable_module_get_application_interface(app))) { - begin_allow_threads(); - switch_core_session_exec(session, application_interface, data); - end_allow_threads(); - } + begin_allow_threads(); + switch_core_session_execute_application(session, app, data); + end_allow_threads(); } SWITCH_DECLARE(void) CoreSession::setDTMFCallback(void *cbfunc, char *funcargs) {

1 0

[commit] r11569 - freeswitch/trunk/src
by FreeSWITCH SVN 30 Jan '09

30 Jan '09

Author: anthm Date: Fri Jan 30 17:08:55 2009 New Revision: 11569 Log: move var expansion deeper into the core for executing app Modified: freeswitch/trunk/src/switch_core_session.c Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Fri Jan 30 17:08:55 2009 @@ -1225,7 +1225,6 @@ { switch_application_interface_t *application_interface; char *expanded = NULL; - const char *var; if ((application_interface = switch_loadable_module_get_application_interface(app)) == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Application %s\n", app); @@ -1253,6 +1252,27 @@ } } + switch_core_session_exec(session, application_interface, expanded); + + UNPROTECT_INTERFACE(application_interface); + + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_DECLARE(switch_status_t) switch_core_session_exec(switch_core_session_t *session, + const switch_application_interface_t *application_interface, const char *arg) +{ + switch_app_log_t *log, *lp; + switch_event_t *event; + const char *var; + switch_channel_t *channel = switch_core_session_get_channel(session); + char *expanded = NULL; + const char *app; + + switch_assert(application_interface); + + app = application_interface->interface_name; + if (arg && (expanded = switch_channel_expand_variables(session->channel, arg)) != arg) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Expanded String %s(%s)\n", switch_channel_get_name(session->channel), app, expanded); } @@ -1272,25 +1292,6 @@ } } - switch_core_session_exec(session, application_interface, expanded); - - if (expanded != arg) { - switch_safe_free(expanded); - } - - UNPROTECT_INTERFACE(application_interface); - - return SWITCH_STATUS_SUCCESS; -} - -SWITCH_DECLARE(switch_status_t) switch_core_session_exec(switch_core_session_t *session, - const switch_application_interface_t *application_interface, const char *arg) -{ - switch_app_log_t *log, *lp; - switch_event_t *event; - const char *var; - switch_channel_t *channel = switch_core_session_get_channel(session); - if (!arg) { arg = ""; } @@ -1327,7 +1328,7 @@ switch_channel_set_variable(session->channel, SWITCH_CURRENT_APPLICATION_VARIABLE, application_interface->interface_name); - application_interface->application_function(session, arg); + application_interface->application_function(session, expanded); if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_EXECUTE_COMPLETE) == SWITCH_STATUS_SUCCESS) { const char *resp = switch_channel_get_variable(session->channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE); @@ -1338,6 +1339,10 @@ switch_event_fire(&event); } + if (expanded != arg) { + switch_safe_free(expanded); + } + return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r11568 - freeswitch/trunk/src
by FreeSWITCH SVN 30 Jan '09

30 Jan '09

Author: mrene Date: Fri Jan 30 16:48:44 2009 New Revision: 11568 Log: Don't double-clear state handlers when uuid_bridging Modified: freeswitch/trunk/src/switch_ivr_bridge.c Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Fri Jan 30 16:48:44 2009 @@ -523,6 +523,22 @@ /*.on_consume_media */ audio_bridge_on_consume_media, }; +static switch_status_t uuid_bridge_on_reset(switch_core_session_t *session); +static switch_status_t uuid_bridge_on_hibernate(switch_core_session_t *session); +static switch_status_t uuid_bridge_on_soft_execute(switch_core_session_t *session); + +static const switch_state_handler_table_t uuid_bridge_state_handlers = { + /*.on_init */ NULL, + /*.on_routing */ NULL, + /*.on_execute */ NULL, + /*.on_hangup */ NULL, + /*.on_exchange_media */ NULL, + /*.on_soft_execute */ uuid_bridge_on_soft_execute, + /*.on_consume_media */ uuid_bridge_on_hibernate, + /*.on_hibernate */ uuid_bridge_on_hibernate, + /*.on_reset */ uuid_bridge_on_reset +}; + static switch_status_t uuid_bridge_on_reset(switch_core_session_t *session) { switch_channel_t *channel = switch_core_session_get_channel(session); @@ -551,7 +567,7 @@ const char *other_uuid = NULL; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CUSTOM SOFT_EXECUTE\n", switch_channel_get_name(channel)); - switch_channel_clear_state_handler(channel, NULL); + switch_channel_clear_state_handler(channel, &uuid_bridge_state_handlers); if (!switch_channel_test_flag(channel, CF_ORIGINATOR)) { return SWITCH_STATUS_SUCCESS; @@ -637,18 +653,6 @@ return SWITCH_STATUS_FALSE; } -static const switch_state_handler_table_t uuid_bridge_state_handlers = { - /*.on_init */ NULL, - /*.on_routing */ NULL, - /*.on_execute */ NULL, - /*.on_hangup */ NULL, - /*.on_exchange_media */ NULL, - /*.on_soft_execute */ uuid_bridge_on_soft_execute, - /*.on_consume_media */ uuid_bridge_on_hibernate, - /*.on_hibernate */ uuid_bridge_on_hibernate, - /*.on_reset */ uuid_bridge_on_reset -}; - static switch_status_t signal_bridge_on_hibernate(switch_core_session_t *session) { switch_channel_t *channel = NULL;

1 0

[commit] r11567 - in freeswitch/trunk: . libs libs/spandsp/src libs/spandsp/src/msvc libs/win32 src/mod/applications/mod_fax
by FreeSWITCH SVN 30 Jan '09

30 Jan '09

Author: mikej Date: Fri Jan 30 13:15:06 2009 New Revision: 11567 Log: add mod_fax to the windows build Added: freeswitch/trunk/libs/spandsp/src/msvc/spandsp.h freeswitch/trunk/libs/win32/Download TIFF.2008.vcproj freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.2008.vcproj Modified: freeswitch/trunk/Freeswitch.2008.express.sln freeswitch/trunk/Freeswitch.2008.sln freeswitch/trunk/libs/ (props changed) freeswitch/trunk/libs/spandsp/src/ (props changed) freeswitch/trunk/libs/spandsp/src/libspandsp.vcproj freeswitch/trunk/libs/spandsp/src/libtiff.vcproj freeswitch/trunk/libs/spandsp/src/msvc/inttypes.h freeswitch/trunk/libs/spandsp/src/msvc/spandsp.def freeswitch/trunk/src/mod/applications/mod_fax/ (props changed) freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Modified: freeswitch/trunk/Freeswitch.2008.express.sln ============================================================================== --- freeswitch/trunk/Freeswitch.2008.express.sln (original) +++ freeswitch/trunk/Freeswitch.2008.express.sln Fri Jan 30 13:15:06 2009 @@ -575,6 +575,25 @@ {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download TIFF", "libs\win32\Download TIFF.2008.vcproj", "{2B8A45C9-FEB4-4734-AB37-8DB9DB899917}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspandsp", "libs\spandsp\src\libspandsp.vcproj", "{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}" + ProjectSection(ProjectDependencies) = postProject + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014} = {401A40CD-5DB4-4E34-AC68-FA99E9FAC014} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtiff", "libs\spandsp\src\libtiff.vcproj", "{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}" + ProjectSection(ProjectDependencies) = postProject + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917} = {2B8A45C9-FEB4-4734-AB37-8DB9DB899917} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_fax", "src\mod\applications\mod_fax\mod_fax.2008.vcproj", "{7877EFC8-4807-484B-B573-D7B7FD058FAA}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5} = {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5} + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014} = {401A40CD-5DB4-4E34-AC68-FA99E9FAC014} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -1290,6 +1309,30 @@ {1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}.Release|Win32.ActiveCfg = Release|Win32 {1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}.Release|Win32.Build.0 = Release|Win32 {1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}.Release|x64.ActiveCfg = Release|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.Debug|Win32.ActiveCfg = Debug|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.Debug|Win32.Build.0 = Debug|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.Debug|x64.ActiveCfg = Debug|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.Release|Win32.ActiveCfg = Release|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.Release|Win32.Build.0 = Release|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.Release|x64.ActiveCfg = Release|Win32 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Debug|Win32.ActiveCfg = Debug|Win32 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Debug|Win32.Build.0 = Debug|Win32 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Debug|x64.ActiveCfg = Debug|Win32 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|Win32.ActiveCfg = Release|Win32 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|Win32.Build.0 = Release|Win32 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|x64.ActiveCfg = Release|Win32 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|Win32.ActiveCfg = Debug|Win32 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|Win32.Build.0 = Debug|Win32 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|x64.ActiveCfg = Debug|Win32 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|Win32.ActiveCfg = Release|Win32 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|Win32.Build.0 = Release|Win32 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|x64.ActiveCfg = Release|Win32 + {7877EFC8-4807-484B-B573-D7B7FD058FAA}.Debug|Win32.ActiveCfg = Debug|Win32 + {7877EFC8-4807-484B-B573-D7B7FD058FAA}.Debug|Win32.Build.0 = Debug|Win32 + {7877EFC8-4807-484B-B573-D7B7FD058FAA}.Debug|x64.ActiveCfg = Debug|Win32 + {7877EFC8-4807-484B-B573-D7B7FD058FAA}.Release|Win32.ActiveCfg = Release|Win32 + {7877EFC8-4807-484B-B573-D7B7FD058FAA}.Release|Win32.Build.0 = Release|Win32 + {7877EFC8-4807-484B-B573-D7B7FD058FAA}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Modified: freeswitch/trunk/Freeswitch.2008.sln ============================================================================== --- freeswitch/trunk/Freeswitch.2008.sln (original) +++ freeswitch/trunk/Freeswitch.2008.sln Fri Jan 30 13:15:06 2009 @@ -953,6 +953,25 @@ {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download TIFF", "libs\win32\Download TIFF.2008.vcproj", "{2B8A45C9-FEB4-4734-AB37-8DB9DB899917}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtiff", "libs\spandsp\src\libtiff.vcproj", "{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}" + ProjectSection(ProjectDependencies) = postProject + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917} = {2B8A45C9-FEB4-4734-AB37-8DB9DB899917} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspandsp", "libs\spandsp\src\libspandsp.vcproj", "{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}" + ProjectSection(ProjectDependencies) = postProject + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014} = {401A40CD-5DB4-4E34-AC68-FA99E9FAC014} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_fax", "src\mod\applications\mod_fax\mod_fax.2008.vcproj", "{7877EFC8-4807-484B-B573-D7B7FD058FAA}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5} = {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5} + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014} = {401A40CD-5DB4-4E34-AC68-FA99E9FAC014} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -1674,6 +1693,30 @@ {1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}.Release|Win32.ActiveCfg = Release|Win32 {1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}.Release|Win32.Build.0 = Release|Win32 {1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}.Release|x64.ActiveCfg = Release|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.Debug|Win32.ActiveCfg = Debug|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.Debug|Win32.Build.0 = Debug|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.Debug|x64.ActiveCfg = Debug|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.Release|Win32.ActiveCfg = Release|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.Release|Win32.Build.0 = Release|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.Release|x64.ActiveCfg = Release|Win32 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|Win32.ActiveCfg = Debug|Win32 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|Win32.Build.0 = Debug|Win32 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|x64.ActiveCfg = Debug|Win32 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|Win32.ActiveCfg = Release|Win32 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|Win32.Build.0 = Release|Win32 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|x64.ActiveCfg = Release|Win32 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Debug|Win32.ActiveCfg = Debug|Win32 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Debug|Win32.Build.0 = Debug|Win32 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Debug|x64.ActiveCfg = Debug|Win32 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|Win32.ActiveCfg = Release|Win32 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|Win32.Build.0 = Release|Win32 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|x64.ActiveCfg = Release|Win32 + {7877EFC8-4807-484B-B573-D7B7FD058FAA}.Debug|Win32.ActiveCfg = Debug|Win32 + {7877EFC8-4807-484B-B573-D7B7FD058FAA}.Debug|Win32.Build.0 = Debug|Win32 + {7877EFC8-4807-484B-B573-D7B7FD058FAA}.Debug|x64.ActiveCfg = Debug|Win32 + {7877EFC8-4807-484B-B573-D7B7FD058FAA}.Release|Win32.ActiveCfg = Release|Win32 + {7877EFC8-4807-484B-B573-D7B7FD058FAA}.Release|Win32.Build.0 = Release|Win32 + {7877EFC8-4807-484B-B573-D7B7FD058FAA}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1707,6 +1750,7 @@ {14E4A972-9CFB-436D-B0A5-4943F3F80D47} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {329FD5B0-EF28-4606-86D0-F6EA21CF8E36} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {1A3793D1-05D1-4B57-9B0F-5AF3E79DC439} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} + {7877EFC8-4807-484B-B573-D7B7FD058FAA} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {07113B25-D3AF-4E04-BA77-4CD1171F022C} = {C5F182F9-754A-4EC5-B50F-76ED02BE13F4} {A27CCA23-1541-4337-81A4-F0A6413078A0} = {C5F182F9-754A-4EC5-B50F-76ED02BE13F4} {E7BC026C-7CC5-45A3-BC7C-3B88EEF01F24} = {C5F182F9-754A-4EC5-B50F-76ED02BE13F4} @@ -1773,6 +1817,8 @@ {419C8F80-D858-4B48-A25C-AF4007608137} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {1BC8A8EC-E03B-44DF-BCD9-088650F4D29C} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {CF405366-9558-4AE8-90EF-5E21B51CCB4E} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {5927104D-C14C-4AC8-925C-4AB681762E75} = {C120A020-773F-4EA3-923F-B67AF28B750D} {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} = {C120A020-773F-4EA3-923F-B67AF28B750D} {4F92B672-DADB-4047-8D6A-4BB3796733FD} = {C120A020-773F-4EA3-923F-B67AF28B750D} @@ -1786,6 +1832,7 @@ {D5D2BF72-29FE-4982-A9FA-82AB3086DB1B} = {C120A020-773F-4EA3-923F-B67AF28B750D} {D5D2BF72-29FE-4982-A9FA-82AB1086DB1B} = {C120A020-773F-4EA3-923F-B67AF28B750D} {E796E337-DE78-4303-8614-9A590862EE95} = {C120A020-773F-4EA3-923F-B67AF28B750D} + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917} = {C120A020-773F-4EA3-923F-B67AF28B750D} {988CACF7-3FCB-4992-BE69-77872AE67DC8} = {6CD61A1D-797C-470A-BE08-8C31B68BB336} {5BC072DB-3826-48EA-AF34-FE32AA01E83B} = {6CD61A1D-797C-470A-BE08-8C31B68BB336} {FA429E98-8B03-45E6-A096-A4BC5E821DE4} = {6CD61A1D-797C-470A-BE08-8C31B68BB336} Modified: freeswitch/trunk/libs/spandsp/src/libspandsp.vcproj ============================================================================== --- freeswitch/trunk/libs/spandsp/src/libspandsp.vcproj (original) +++ freeswitch/trunk/libs/spandsp/src/libspandsp.vcproj Fri Jan 30 13:15:06 2009 @@ -3,7 +3,7 @@ ProjectType="Visual C++" Version="9.00" Name="libspandsp" - ProjectGUID="{CF70F278-3364-4395-A2E1-23501C9B8AD2}" + ProjectGUID="{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}" RootNamespace="libspandsp" Keyword="Win32Proj" TargetFrameworkVersion="131072" @@ -41,7 +41,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff\libtiff;.\generated" + AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff;.\generated" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -118,7 +118,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff\libtiff;.\generated" + AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff;.\generated" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" UsePrecompiledHeader="0" Modified: freeswitch/trunk/libs/spandsp/src/libtiff.vcproj ============================================================================== --- freeswitch/trunk/libs/spandsp/src/libtiff.vcproj (original) +++ freeswitch/trunk/libs/spandsp/src/libtiff.vcproj Fri Jan 30 13:15:06 2009 @@ -25,7 +25,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="if not exist "$(ProjectDir)../../tiff/libtiff/tif_config.h" copy "$(ProjectDir)..\..\tiff\libtiff\tiffconf.h.vc" "$(ProjectDir)..\..\tiff\libtiff\tiffconf.h" /Y
if not exist "$(ProjectDir)../../tiff/libtiff/tif_config.h" copy "$(ProjectDir)..\..\tiff\libtiff\tif_config.h.vc" "$(ProjectDir)..\..\tiff\libtiff\tif_config.h" /Y" + CommandLine="if not exist "$(ProjectDir)../../tiff-3.8.2/libtiff/tif_config.h" copy "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tiffconf.h.vc" "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tiffconf.h" /Y
if not exist "$(ProjectDir)../../tiff-3.8.2/libtiff/tif_config.h" copy "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tif_config.h.vc" "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tif_config.h" /Y" /> <Tool Name="VCCustomBuildTool" @@ -90,7 +90,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="if not exist "$(ProjectDir)../../tiff/libtiff/tif_config.h" copy "$(ProjectDir)..\..\tiff\libtiff\tiffconf.h.vc" "$(ProjectDir)..\..\tiff\libtiff\tiffconf.h" /Y
if not exist "$(ProjectDir)../../tiff/libtiff/tif_config.h" copy "$(ProjectDir)..\..\tiff\libtiff\tif_config.h.vc" "$(ProjectDir)..\..\tiff\libtiff\tif_config.h" /Y" + CommandLine="if not exist "$(ProjectDir)../../tiff-3.8.2/libtiff/tif_config.h" copy "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tiffconf.h.vc" "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tiffconf.h" /Y
if not exist "$(ProjectDir)../../tiff-3.8.2/libtiff/tif_config.h" copy "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tif_config.h.vc" "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tif_config.h" /Y" /> <Tool Name="VCCustomBuildTool" @@ -151,11 +151,11 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > <File - RelativePath="..\..\tiff\libtiff\tif_aux.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_aux.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_close.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_close.c" > <FileConfiguration Name="Debug|Win32" @@ -166,83 +166,83 @@ </FileConfiguration> </File> <File - RelativePath="..\..\tiff\libtiff\tif_codec.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_codec.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_color.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_color.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_compress.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_compress.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_dir.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_dir.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_dirinfo.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_dirinfo.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_dirread.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_dirread.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_dirwrite.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_dirwrite.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_dumpmode.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_dumpmode.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_error.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_error.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_extension.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_extension.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_fax3.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_fax3.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_fax3sm.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_fax3sm.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_flush.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_flush.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_getimage.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_getimage.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_jpeg.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_jpeg.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_luv.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_luv.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_lzw.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_lzw.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_next.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_next.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_ojpeg.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_ojpeg.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_open.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_open.c" > <FileConfiguration Name="Debug|Win32" @@ -253,55 +253,55 @@ </FileConfiguration> </File> <File - RelativePath="..\..\tiff\libtiff\tif_packbits.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_packbits.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_pixarlog.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_pixarlog.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_predict.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_predict.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_print.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_print.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_read.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_read.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_strip.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_strip.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_swab.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_swab.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_thunder.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_thunder.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_tile.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_tile.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_unix.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_unix.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_version.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_version.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_warning.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_warning.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_write.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_write.c" > <FileConfiguration Name="Debug|Win32" @@ -312,7 +312,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\tiff\libtiff\tif_zip.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_zip.c" > </File> </Filter> @@ -320,47 +320,47 @@ Name="Header Files" > <File - RelativePath="..\..\tiff\libtiff\t4.h" + RelativePath="..\..\tiff-3.8.2\libtiff\t4.h" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_dir.h" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_dir.h" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_fax3.h" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_fax3.h" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_predict.h" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_predict.h" > </File> <File - RelativePath="..\..\tiff\libtiff\tiff.h" + RelativePath="..\..\tiff-3.8.2\libtiff\tiff.h" > </File> <File - RelativePath="..\..\tiff\libtiff\tiffconf.h" + RelativePath="..\..\tiff-3.8.2\libtiff\tiffconf.h" > </File> <File - RelativePath="..\..\tiff\libtiff\tiffio.h" + RelativePath="..\..\tiff-3.8.2\libtiff\tiffio.h" > </File> <File - RelativePath="..\..\tiff\libtiff\tiffio.hxx" + RelativePath="..\..\tiff-3.8.2\libtiff\tiffio.hxx" > </File> <File - RelativePath="..\..\tiff\libtiff\tiffiop.h" + RelativePath="..\..\tiff-3.8.2\libtiff\tiffiop.h" > </File> <File - RelativePath="..\..\tiff\libtiff\tiffvers.h" + RelativePath="..\..\tiff-3.8.2\libtiff\tiffvers.h" > </File> <File - RelativePath="..\..\tiff\libtiff\uvcode.h" + RelativePath="..\..\tiff-3.8.2\libtiff\uvcode.h" > </File> </Filter> Modified: freeswitch/trunk/libs/spandsp/src/msvc/inttypes.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/inttypes.h (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/inttypes.h Fri Jan 30 13:15:06 2009 @@ -55,9 +55,15 @@ #pragma comment(lib, "ws2_32.lib") +#ifndef strncasecmp #define strncasecmp _strnicmp +#endif +#ifndef strcasecmp #define strcasecmp _stricmp +#endif +#ifndef snprintf #define snprintf _snprintf +#endif #if !defined(INFINITY) #define INFINITY 0x7fffffff Modified: freeswitch/trunk/libs/spandsp/src/msvc/spandsp.def ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/spandsp.def (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/spandsp.def Fri Jan 30 13:15:06 2009 @@ -274,4 +274,23 @@ v8_tx v8_rx v8_log_supported_modulations +t30_set_ecm_capability +t30_set_supported_compressions +t30_set_supported_modems +t30_set_supported_resolutions +t30_set_supported_image_sizes +t30_set_tx_page_header_info +t30_set_tx_ident +span_log_set_level +span_log_set_message_handler +fax_set_transmit_on_idle +fax_get_t30_state +t30_get_rx_model +t30_get_rx_vendor +t30_get_rx_country +t30_get_rx_ident +t30_get_tx_ident +t38_terminal_release +t38_terminal_get_t30_state +t30_terminate Added: freeswitch/trunk/libs/spandsp/src/msvc/spandsp.h ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/spandsp/src/msvc/spandsp.h Fri Jan 30 13:15:06 2009 @@ -0,0 +1,123 @@ +/* + * SpanDSP - a series of DSP components for telephony + * + * spandsp.h - The head guy amongst the headers + * + * Written by Steve Underwood <steveu(a)coppice.org> + * + * Copyright (C) 2003 Steve Underwood + * + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 2.1, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * $Id: spandsp.h.in,v 1.14 2009/01/07 13:31:53 steveu Exp $ + */ + +/*! \file */ + +#if !defined(_SPANDSP_H_) +#define _SPANDSP_H_ + +#undef SPANDSP_USE_FIXED_POINT +#undef SPANDSP_MISALIGNED_ACCESS_FAILS + +#include <stdlib.h> +#include <inttypes.h> +#include <string.h> +#include <limits.h> +#include <time.h> +#include <math.h> +#include <tiffio.h> + +#include <spandsp/telephony.h> +#include <spandsp/logging.h> +#include <spandsp/complex.h> +#include <spandsp/bit_operations.h> +#include <spandsp/bitstream.h> +#include <spandsp/queue.h> +#include <spandsp/schedule.h> +#include <spandsp/g711.h> +#include <spandsp/timing.h> +#include <spandsp/vector_float.h> +#include <spandsp/complex_vector_float.h> +#include <spandsp/vector_int.h> +#include <spandsp/complex_vector_int.h> +#include <spandsp/arctan2.h> +#include <spandsp/biquad.h> +#include <spandsp/fir.h> +#include <spandsp/awgn.h> +#include <spandsp/bert.h> +#include <spandsp/power_meter.h> +#include <spandsp/complex_filters.h> +#include <spandsp/dc_restore.h> +#include <spandsp/dds.h> +#include <spandsp/echo.h> +#include <spandsp/modem_echo.h> +#include <spandsp/crc.h> +#include <spandsp/hdlc.h> +#include <spandsp/async.h> +#include <spandsp/noise.h> +#include <spandsp/saturated.h> +#include <spandsp/time_scale.h> +#include <spandsp/tone_detect.h> +#include <spandsp/tone_generate.h> +#include <spandsp/super_tone_rx.h> +#include <spandsp/super_tone_tx.h> +#include <spandsp/dtmf.h> +#include <spandsp/bell_r2_mf.h> +#include <spandsp/sig_tone.h> +#include <spandsp/fsk.h> +#include <spandsp/modem_connect_tones.h> +#include <spandsp/silence_gen.h> +#include <spandsp/v29rx.h> +#include <spandsp/v29tx.h> +#include <spandsp/v17rx.h> +#include <spandsp/v17tx.h> +#include <spandsp/v22bis.h> +#include <spandsp/v27ter_rx.h> +#include <spandsp/v27ter_tx.h> +#include <spandsp/v8.h> +#include <spandsp/v42.h> +#include <spandsp/v42bis.h> +#include <spandsp/t4.h> +#include <spandsp/t30.h> +#include <spandsp/t30_api.h> +#include <spandsp/t30_fcf.h> +#include <spandsp/t30_logging.h> +#include <spandsp/t35.h> +#include <spandsp/at_interpreter.h> +#include <spandsp/fax_modems.h> +#include <spandsp/fax.h> +#include <spandsp/t38_core.h> +#include <spandsp/t38_non_ecm_buffer.h> +#include <spandsp/t38_gateway.h> +#include <spandsp/t38_terminal.h> +#include <spandsp/t31.h> +#include <spandsp/adsi.h> +#include <spandsp/oki_adpcm.h> +#include <spandsp/ima_adpcm.h> +#include <spandsp/g722.h> +#include <spandsp/g726.h> +#include <spandsp/lpc10.h> +#include <spandsp/gsm0610.h> +#include <spandsp/plc.h> +#include <spandsp/playout.h> + +#endif + +#if defined(SPANDSP_EXPOSE_INTERNAL_STRUCTURES) +#include <spandsp/expose.h> +#endif +/*- End of file ------------------------------------------------------------*/ Added: freeswitch/trunk/libs/win32/Download TIFF.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/win32/Download TIFF.2008.vcproj Fri Jan 30 13:15:06 2009 @@ -0,0 +1,97 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="Download TIFF" + ProjectGUID="{2B8A45C9-FEB4-4734-AB37-8DB9DB899917}" + RootNamespace="Download TIFF" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="10" + CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + CommandLine="" + Outputs="" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="10" + CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\tiff\cleancount" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading Tiff." + CommandLine="if not exist "$(ProjectDir)..\tiff-3.8.2" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/tiff-3.8.2.tar.gz "$(ProjectDir).."
" + Outputs="$(ProjectDir)..\tiff-3.8.2" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading Lame." + CommandLine="if not exist "$(ProjectDir)..\tiff-3.8.2" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/tiff-3.8.2.tar.gz "$(ProjectDir).."
" + Outputs="$(ProjectDir)..\tiff-3.8.2" + /> + </FileConfiguration> + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.2008.vcproj Fri Jan 30 13:15:06 2009 @@ -0,0 +1,156 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_fax" + ProjectGUID="{7877EFC8-4807-484B-B573-D7B7FD058FAA}" + RootNamespace="mod_fax" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\spandsp\src\msvc";"$(InputDir)..\..\..\..\libs\spandsp\src";"$(InputDir)..\..\..\..\libs\tiff-3.8.2\libtiff"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\spandsp\src\msvc";"$(InputDir)..\..\..\..\libs\spandsp\src";"$(InputDir)..\..\..\..\libs\tiff-3.8.2\libtiff"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_fax.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Fri Jan 30 13:15:06 2009 @@ -34,6 +34,26 @@ #include <switch.h> +#ifdef WIN32 + __inline float rintf(float flt) + { + _asm + { fld flt + frndint + } + } + + __inline double rint(double dbl) + { + __asm + { + fld dbl + frndint + } + } + +#endif + #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES #include <spandsp.h> #include <spandsp/version.h>

1 0