- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r12279 - freeswitch/trunk/scripts
by FreeSWITCH SVN 25 Feb '09

25 Feb '09

Author: brian Date: Wed Feb 25 11:14:44 2009 New Revision: 12279 Log: revert Modified: freeswitch/trunk/scripts/freeswitch-gcore Modified: freeswitch/trunk/scripts/freeswitch-gcore ============================================================================== --- freeswitch/trunk/scripts/freeswitch-gcore (original) +++ freeswitch/trunk/scripts/freeswitch-gcore Wed Feb 25 11:14:44 2009 @@ -1,12 +1,12 @@ #!/bin/bash -fspid=$(cat /opt/freeswitch/log/freeswitch.pid) -gcore -o /opt/freeswitch/log/freeswitch.gcore $fspid && \ - gdb /opt/freeswitch/bin/freeswitch \ - -c /opt/freeswitch/log/freeswitch.gcore.$fspid \ +fspid=$(cat /usr/local/freeswitch/log/freeswitch.pid) +gcore -o /usr/local/freeswitch/log/freeswitch.gcore $fspid && \ + gdb /usr/local/freeswitch/bin/freeswitch \ + -c /usr/local/freeswitch/log/freeswitch.gcore.$fspid \ --eval-command='set pagination off' \ --eval-command='bt' \ --eval-command='bt full' \ --eval-command='thread apply all bt' \ --eval-command='thread apply all bt full' \ --eval-command='quit' -#rm /opt/freeswitch/log/freeswitch.gcore.$fspid +#rm /usr/local/freeswitch/log/freeswitch.gcore.$fspid

1 0

[commit] r12278 - in freeswitch/trunk/src: . include mod/languages/mod_java mod/languages/mod_java/src/org/freeswitch/swig mod/languages/mod_lua mod/languages/mod_managed mod/languages/mod_managed/managed mod/languages/mod_perl mod/languages/mod_python
by FreeSWITCH SVN 25 Feb '09

25 Feb '09

Author: brian Date: Wed Feb 25 10:49:42 2009 New Revision: 12278 Log: make tts-engine and tts-voice valid attributes on the menu xml Modified: freeswitch/trunk/src/include/switch_cpp.h freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/IVRMenu.java freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java 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_managed/managed/swig.cs 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 freeswitch/trunk/src/switch_ivr_menu.c Modified: freeswitch/trunk/src/include/switch_cpp.h ============================================================================== --- freeswitch/trunk/src/include/switch_cpp.h (original) +++ freeswitch/trunk/src/include/switch_cpp.h Wed Feb 25 10:49:42 2009 @@ -93,6 +93,8 @@ const char *exit_sound, const char *confirm_macro, const char *confirm_key, + const char *tts_engine, + const char *tts_voice, int confirm_attempts, int inter_timeout, int digit_len, int timeout, int max_failures, int max_timeouts); virtual SWITCH_DECLARE_CONSTRUCTOR ~ IVRMenu(); Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Wed Feb 25 10:49:42 2009 @@ -671,6 +671,8 @@ *\param exit_sound Optional pointer to a sound to play upon exiting the menu. *\param confirm_macro phrase macro name to confirm input *\param confirm_key the dtmf key required for positive confirmation + *\param tts_engine the tts engine to use for this menu + *\param tts_voice the tts voice to use for this menu *\param confirm_attempts number of times to prompt to confirm input before failure *\param inter_timeout inter-digit timeout *\param digit_len max number of digits @@ -689,6 +691,8 @@ const char *exit_sound, const char *confirm_macro, const char *confirm_key, + const char *tts_engine, + const char *tts_voice, int confirm_attempts, int inter_timeout, int digit_len, int timeout, int max_failures, int max_timeouts, switch_memory_pool_t *pool); Modified: freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/IVRMenu.java ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/IVRMenu.java (original) +++ freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/IVRMenu.java Wed Feb 25 10:49:42 2009 @@ -33,8 +33,8 @@ swigCPtr = 0; } - public IVRMenu(IVRMenu main, String name, String greeting_sound, String short_greeting_sound, String invalid_sound, String exit_sound, String confirm_macro, String confirm_key, int confirm_attempts, int inter_timeout, int digit_len, int timeout, int max_failures, int max_timeouts) { - this(freeswitchJNI.new_IVRMenu(IVRMenu.getCPtr(main), main, name, greeting_sound, short_greeting_sound, invalid_sound, exit_sound, confirm_macro, confirm_key, confirm_attempts, inter_timeout, digit_len, timeout, max_failures, max_timeouts), true); + public IVRMenu(IVRMenu main, String name, String greeting_sound, String short_greeting_sound, String invalid_sound, String exit_sound, String confirm_macro, String confirm_key, String tts_engine, String tts_voice, int confirm_attempts, int inter_timeout, int digit_len, int timeout, int max_failures, int max_timeouts) { + this(freeswitchJNI.new_IVRMenu(IVRMenu.getCPtr(main), main, name, greeting_sound, short_greeting_sound, invalid_sound, exit_sound, confirm_macro, confirm_key, tts_engine, tts_voice, confirm_attempts, inter_timeout, digit_len, timeout, max_failures, max_timeouts), true); } public void bindAction(String action, String arg, String bind) { Modified: freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java (original) +++ freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java Wed Feb 25 10:49:42 2009 @@ -11,7 +11,7 @@ class freeswitchJNI { public final static native void consoleLog(String jarg1, String jarg2); public final static native void consoleCleanLog(String jarg1); - public final static native long new_IVRMenu(long jarg1, IVRMenu jarg1_, String jarg2, String jarg3, String jarg4, String jarg5, String jarg6, String jarg7, String jarg8, int jarg9, int jarg10, int jarg11, int jarg12, int jarg13, int jarg14); + public final static native long new_IVRMenu(long jarg1, IVRMenu jarg1_, String jarg2, String jarg3, String jarg4, String jarg5, String jarg6, String jarg7, String jarg8, String jarg9, String jarg10, int jarg11, int jarg12, int jarg13, int jarg14, int jarg15, int jarg16); public final static native void delete_IVRMenu(long jarg1); public final static native void IVRMenu_bindAction(long jarg1, IVRMenu jarg1_, String jarg2, String jarg3, String jarg4); public final static native void IVRMenu_execute(long jarg1, IVRMenu jarg1_, long jarg2, CoreSession jarg2_, String jarg3); 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 Wed Feb 25 10:49:42 2009 @@ -244,7 +244,7 @@ } -SWIGEXPORT jlong JNICALL Java_org_freeswitch_swig_freeswitchJNI_new_1IVRMenu(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2, jstring jarg3, jstring jarg4, jstring jarg5, jstring jarg6, jstring jarg7, jstring jarg8, jint jarg9, jint jarg10, jint jarg11, jint jarg12, jint jarg13, jint jarg14) { +SWIGEXPORT jlong JNICALL Java_org_freeswitch_swig_freeswitchJNI_new_1IVRMenu(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2, jstring jarg3, jstring jarg4, jstring jarg5, jstring jarg6, jstring jarg7, jstring jarg8, jstring jarg9, jstring jarg10, jint jarg11, jint jarg12, jint jarg13, jint jarg14, jint jarg15, jint jarg16) { jlong jresult = 0 ; IVRMenu *arg1 = (IVRMenu *) 0 ; char *arg2 = (char *) 0 ; @@ -254,12 +254,14 @@ char *arg6 = (char *) 0 ; char *arg7 = (char *) 0 ; char *arg8 = (char *) 0 ; - int arg9 ; - int arg10 ; + char *arg9 = (char *) 0 ; + char *arg10 = (char *) 0 ; int arg11 ; int arg12 ; int arg13 ; int arg14 ; + int arg15 ; + int arg16 ; IVRMenu *result = 0 ; (void)jenv; @@ -301,13 +303,23 @@ arg8 = (char *)jenv->GetStringUTFChars(jarg8, 0); if (!arg8) return 0; } - arg9 = (int)jarg9; - arg10 = (int)jarg10; + arg9 = 0; + if (jarg9) { + arg9 = (char *)jenv->GetStringUTFChars(jarg9, 0); + if (!arg9) return 0; + } + arg10 = 0; + if (jarg10) { + arg10 = (char *)jenv->GetStringUTFChars(jarg10, 0); + if (!arg10) return 0; + } arg11 = (int)jarg11; arg12 = (int)jarg12; arg13 = (int)jarg13; arg14 = (int)jarg14; - result = (IVRMenu *)new IVRMenu(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,arg9,arg10,arg11,arg12,arg13,arg14); + arg15 = (int)jarg15; + arg16 = (int)jarg16; + result = (IVRMenu *)new IVRMenu(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,(char const *)arg10,arg11,arg12,arg13,arg14,arg15,arg16); *(IVRMenu **)&jresult = result; if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2); if (arg3) jenv->ReleaseStringUTFChars(jarg3, (const char *)arg3); @@ -316,6 +328,8 @@ if (arg6) jenv->ReleaseStringUTFChars(jarg6, (const char *)arg6); if (arg7) jenv->ReleaseStringUTFChars(jarg7, (const char *)arg7); if (arg8) jenv->ReleaseStringUTFChars(jarg8, (const char *)arg8); + if (arg9) jenv->ReleaseStringUTFChars(jarg9, (const char *)arg9); + if (arg10) jenv->ReleaseStringUTFChars(jarg10, (const char *)arg10); return jresult; } 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 Wed Feb 25 10:49:42 2009 @@ -1588,15 +1588,17 @@ char *arg6 = (char *) 0 ; char *arg7 = (char *) 0 ; char *arg8 = (char *) 0 ; - int arg9 ; - int arg10 ; + char *arg9 = (char *) 0 ; + char *arg10 = (char *) 0 ; int arg11 ; int arg12 ; int arg13 ; int arg14 ; + int arg15 ; + int arg16 ; IVRMenu *result = 0 ; - SWIG_check_num_args("IVRMenu",14,14) + SWIG_check_num_args("IVRMenu",16,16) if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("IVRMenu",1,"IVRMenu *"); if(!lua_isstring(L,2)) SWIG_fail_arg("IVRMenu",2,"char const *"); if(!lua_isstring(L,3)) SWIG_fail_arg("IVRMenu",3,"char const *"); @@ -1605,12 +1607,14 @@ if(!lua_isstring(L,6)) SWIG_fail_arg("IVRMenu",6,"char const *"); if(!lua_isstring(L,7)) SWIG_fail_arg("IVRMenu",7,"char const *"); if(!lua_isstring(L,8)) SWIG_fail_arg("IVRMenu",8,"char const *"); - if(!lua_isnumber(L,9)) SWIG_fail_arg("IVRMenu",9,"int"); - if(!lua_isnumber(L,10)) SWIG_fail_arg("IVRMenu",10,"int"); + if(!lua_isstring(L,9)) SWIG_fail_arg("IVRMenu",9,"char const *"); + if(!lua_isstring(L,10)) SWIG_fail_arg("IVRMenu",10,"char const *"); if(!lua_isnumber(L,11)) SWIG_fail_arg("IVRMenu",11,"int"); if(!lua_isnumber(L,12)) SWIG_fail_arg("IVRMenu",12,"int"); if(!lua_isnumber(L,13)) SWIG_fail_arg("IVRMenu",13,"int"); if(!lua_isnumber(L,14)) SWIG_fail_arg("IVRMenu",14,"int"); + if(!lua_isnumber(L,15)) SWIG_fail_arg("IVRMenu",15,"int"); + if(!lua_isnumber(L,16)) SWIG_fail_arg("IVRMenu",16,"int"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_IVRMenu,0))){ SWIG_fail_ptr("new_IVRMenu",1,SWIGTYPE_p_IVRMenu); @@ -1623,13 +1627,15 @@ arg6 = (char *)lua_tostring(L, 6); arg7 = (char *)lua_tostring(L, 7); arg8 = (char *)lua_tostring(L, 8); - arg9 = (int)lua_tonumber(L, 9); - arg10 = (int)lua_tonumber(L, 10); + arg9 = (char *)lua_tostring(L, 9); + arg10 = (char *)lua_tostring(L, 10); arg11 = (int)lua_tonumber(L, 11); arg12 = (int)lua_tonumber(L, 12); arg13 = (int)lua_tonumber(L, 13); arg14 = (int)lua_tonumber(L, 14); - result = (IVRMenu *)new IVRMenu(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,arg9,arg10,arg11,arg12,arg13,arg14); + arg15 = (int)lua_tonumber(L, 15); + arg16 = (int)lua_tonumber(L, 16); + result = (IVRMenu *)new IVRMenu(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,(char const *)arg10,arg11,arg12,arg13,arg14,arg15,arg16); SWIG_arg=0; SWIG_NewPointerObj(L,result,SWIGTYPE_p_IVRMenu,1); SWIG_arg++; 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 Wed Feb 25 10:49:42 2009 @@ -13056,29 +13056,6 @@ } -SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_last_pos_set(void * jarg1, unsigned long jarg2) { - switch_file_handle *arg1 = (switch_file_handle *) 0 ; - uint32_t arg2 ; - - arg1 = (switch_file_handle *)jarg1; - arg2 = (uint32_t)jarg2; - if (arg1) (arg1)->last_pos = arg2; - -} - - -SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_file_handle_last_pos_get(void * jarg1) { - unsigned long jresult ; - switch_file_handle *arg1 = (switch_file_handle *) 0 ; - uint32_t result; - - arg1 = (switch_file_handle *)jarg1; - result = (uint32_t) ((arg1)->last_pos); - jresult = (unsigned long)result; - return jresult; -} - - SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_vol_set(void * jarg1, int jarg2) { switch_file_handle *arg1 = (switch_file_handle *) 0 ; int32_t arg2 ; @@ -21713,10 +21690,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_digit_stream_destroy(void * jarg1) { int jresult ; - switch_ivr_digit_stream_t *arg1 = (switch_ivr_digit_stream_t *) 0 ; + switch_ivr_digit_stream_t **arg1 = (switch_ivr_digit_stream_t **) 0 ; switch_status_t result; - arg1 = (switch_ivr_digit_stream_t *)jarg1; + arg1 = (switch_ivr_digit_stream_t **)jarg1; result = (switch_status_t)switch_ivr_digit_stream_destroy(arg1); jresult = result; return jresult; @@ -21795,7 +21772,7 @@ } -SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_menu_init(void * jarg1, void * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7, char * jarg8, char * jarg9, int jarg10, int jarg11, int jarg12, int jarg13, int jarg14, int jarg15, void * jarg16) { +SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_menu_init(void * jarg1, void * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7, char * jarg8, char * jarg9, char * jarg10, char * jarg11, int jarg12, int jarg13, int jarg14, int jarg15, int jarg16, int jarg17, void * jarg18) { int jresult ; switch_ivr_menu_t **arg1 = (switch_ivr_menu_t **) 0 ; switch_ivr_menu_t *arg2 = (switch_ivr_menu_t *) 0 ; @@ -21806,13 +21783,15 @@ char *arg7 = (char *) 0 ; char *arg8 = (char *) 0 ; char *arg9 = (char *) 0 ; - int arg10 ; - int arg11 ; + char *arg10 = (char *) 0 ; + char *arg11 = (char *) 0 ; int arg12 ; int arg13 ; int arg14 ; int arg15 ; - switch_memory_pool_t *arg16 = (switch_memory_pool_t *) 0 ; + int arg16 ; + int arg17 ; + switch_memory_pool_t *arg18 = (switch_memory_pool_t *) 0 ; switch_status_t result; arg1 = (switch_ivr_menu_t **)jarg1; @@ -21824,14 +21803,16 @@ arg7 = (char *)jarg7; arg8 = (char *)jarg8; arg9 = (char *)jarg9; - arg10 = (int)jarg10; - arg11 = (int)jarg11; + arg10 = (char *)jarg10; + arg11 = (char *)jarg11; arg12 = (int)jarg12; arg13 = (int)jarg13; arg14 = (int)jarg14; arg15 = (int)jarg15; - arg16 = (switch_memory_pool_t *)jarg16; - result = (switch_status_t)switch_ivr_menu_init(arg1,arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,arg10,arg11,arg12,arg13,arg14,arg15,arg16); + arg16 = (int)jarg16; + arg17 = (int)jarg17; + arg18 = (switch_memory_pool_t *)jarg18; + result = (switch_status_t)switch_ivr_menu_init(arg1,arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,(char const *)arg10,(char const *)arg11,arg12,arg13,arg14,arg15,arg16,arg17,arg18); jresult = result; return jresult; } @@ -26297,7 +26278,7 @@ } -SWIGEXPORT void * SWIGSTDCALL CSharp_new_IvrMenu(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7, char * jarg8, int jarg9, int jarg10, int jarg11, int jarg12, int jarg13, int jarg14) { +SWIGEXPORT void * SWIGSTDCALL CSharp_new_IvrMenu(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7, char * jarg8, char * jarg9, char * jarg10, int jarg11, int jarg12, int jarg13, int jarg14, int jarg15, int jarg16) { void * jresult ; IVRMenu *arg1 = (IVRMenu *) 0 ; char *arg2 = (char *) 0 ; @@ -26307,12 +26288,14 @@ char *arg6 = (char *) 0 ; char *arg7 = (char *) 0 ; char *arg8 = (char *) 0 ; - int arg9 ; - int arg10 ; + char *arg9 = (char *) 0 ; + char *arg10 = (char *) 0 ; int arg11 ; int arg12 ; int arg13 ; int arg14 ; + int arg15 ; + int arg16 ; IVRMenu *result = 0 ; arg1 = (IVRMenu *)jarg1; @@ -26323,13 +26306,15 @@ arg6 = (char *)jarg6; arg7 = (char *)jarg7; arg8 = (char *)jarg8; - arg9 = (int)jarg9; - arg10 = (int)jarg10; + arg9 = (char *)jarg9; + arg10 = (char *)jarg10; arg11 = (int)jarg11; arg12 = (int)jarg12; arg13 = (int)jarg13; arg14 = (int)jarg14; - result = (IVRMenu *)new IVRMenu(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,arg9,arg10,arg11,arg12,arg13,arg14); + arg15 = (int)jarg15; + arg16 = (int)jarg16; + result = (IVRMenu *)new IVRMenu(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,(char const *)arg10,arg11,arg12,arg13,arg14,arg15,arg16); jresult = (void *)result; return jresult; } Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs Wed Feb 25 10:49:42 2009 @@ -3221,8 +3221,8 @@ return ret; } - public static switch_status_t switch_ivr_digit_stream_destroy(SWIGTYPE_p_switch_ivr_digit_stream stream) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_digit_stream_destroy(SWIGTYPE_p_switch_ivr_digit_stream.getCPtr(stream)); + public static switch_status_t switch_ivr_digit_stream_destroy(SWIGTYPE_p_p_switch_ivr_digit_stream stream) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_digit_stream_destroy(SWIGTYPE_p_p_switch_ivr_digit_stream.getCPtr(stream)); return ret; } @@ -3252,8 +3252,8 @@ return ret; } - public static switch_status_t switch_ivr_menu_init(SWIGTYPE_p_p_switch_ivr_menu new_menu, SWIGTYPE_p_switch_ivr_menu main, string name, string greeting_sound, string short_greeting_sound, string invalid_sound, string exit_sound, string confirm_macro, string confirm_key, int confirm_attempts, int inter_timeout, int digit_len, int timeout, int max_failures, int max_timeouts, SWIGTYPE_p_apr_pool_t pool) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_menu_init(SWIGTYPE_p_p_switch_ivr_menu.getCPtr(new_menu), SWIGTYPE_p_switch_ivr_menu.getCPtr(main), name, greeting_sound, short_greeting_sound, invalid_sound, exit_sound, confirm_macro, confirm_key, confirm_attempts, inter_timeout, digit_len, timeout, max_failures, max_timeouts, SWIGTYPE_p_apr_pool_t.getCPtr(pool)); + public static switch_status_t switch_ivr_menu_init(SWIGTYPE_p_p_switch_ivr_menu new_menu, SWIGTYPE_p_switch_ivr_menu main, string name, string greeting_sound, string short_greeting_sound, string invalid_sound, string exit_sound, string confirm_macro, string confirm_key, string tts_engine, string tts_voice, int confirm_attempts, int inter_timeout, int digit_len, int timeout, int max_failures, int max_timeouts, SWIGTYPE_p_apr_pool_t pool) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_menu_init(SWIGTYPE_p_p_switch_ivr_menu.getCPtr(new_menu), SWIGTYPE_p_switch_ivr_menu.getCPtr(main), name, greeting_sound, short_greeting_sound, invalid_sound, exit_sound, confirm_macro, confirm_key, tts_engine, tts_voice, confirm_attempts, inter_timeout, digit_len, timeout, max_failures, max_timeouts, SWIGTYPE_p_apr_pool_t.getCPtr(pool)); return ret; } @@ -7497,12 +7497,6 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_file_handle_offset_pos_get")] public static extern uint switch_file_handle_offset_pos_get(HandleRef jarg1); - [DllImport("mod_managed", EntryPoint="CSharp_switch_file_handle_last_pos_set")] - public static extern void switch_file_handle_last_pos_set(HandleRef jarg1, uint jarg2); - - [DllImport("mod_managed", EntryPoint="CSharp_switch_file_handle_last_pos_get")] - public static extern uint switch_file_handle_last_pos_get(HandleRef jarg1); - [DllImport("mod_managed", EntryPoint="CSharp_switch_file_handle_vol_set")] public static extern void switch_file_handle_vol_set(HandleRef jarg1, int jarg2); @@ -9544,7 +9538,7 @@ public static extern int switch_ivr_digit_stream_parser_set_terminator(HandleRef jarg1, char jarg2); [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_menu_init")] - public static extern int switch_ivr_menu_init(HandleRef jarg1, HandleRef jarg2, string jarg3, string jarg4, string jarg5, string jarg6, string jarg7, string jarg8, string jarg9, int jarg10, int jarg11, int jarg12, int jarg13, int jarg14, int jarg15, HandleRef jarg16); + public static extern int switch_ivr_menu_init(HandleRef jarg1, HandleRef jarg2, string jarg3, string jarg4, string jarg5, string jarg6, string jarg7, string jarg8, string jarg9, string jarg10, string jarg11, int jarg12, int jarg13, int jarg14, int jarg15, int jarg16, int jarg17, HandleRef jarg18); [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_menu_bind_action")] public static extern int switch_ivr_menu_bind_action(HandleRef jarg1, int jarg2, string jarg3, string jarg4); @@ -10597,7 +10591,7 @@ public static extern void consoleCleanLog(string jarg1); [DllImport("mod_managed", EntryPoint="CSharp_new_IvrMenu")] - public static extern IntPtr new_IvrMenu(HandleRef jarg1, string jarg2, string jarg3, string jarg4, string jarg5, string jarg6, string jarg7, string jarg8, int jarg9, int jarg10, int jarg11, int jarg12, int jarg13, int jarg14); + public static extern IntPtr new_IvrMenu(HandleRef jarg1, string jarg2, string jarg3, string jarg4, string jarg5, string jarg6, string jarg7, string jarg8, string jarg9, string jarg10, int jarg11, int jarg12, int jarg13, int jarg14, int jarg15, int jarg16); [DllImport("mod_managed", EntryPoint="CSharp_delete_IvrMenu")] public static extern void delete_IvrMenu(HandleRef jarg1); @@ -11125,7 +11119,7 @@ } } - public IvrMenu(IvrMenu main, string name, string greeting_sound, string short_greeting_sound, string invalid_sound, string exit_sound, string confirm_macro, string confirm_key, int confirm_attempts, int inter_timeout, int digit_len, int timeout, int max_failures, int max_timeouts) : this(freeswitchPINVOKE.new_IvrMenu(IvrMenu.getCPtr(main), name, greeting_sound, short_greeting_sound, invalid_sound, exit_sound, confirm_macro, confirm_key, confirm_attempts, inter_timeout, digit_len, timeout, max_failures, max_timeouts), true) { + public IvrMenu(IvrMenu main, string name, string greeting_sound, string short_greeting_sound, string invalid_sound, string exit_sound, string confirm_macro, string confirm_key, string tts_engine, string tts_voice, int confirm_attempts, int inter_timeout, int digit_len, int timeout, int max_failures, int max_timeouts) : this(freeswitchPINVOKE.new_IvrMenu(IvrMenu.getCPtr(main), name, greeting_sound, short_greeting_sound, invalid_sound, exit_sound, confirm_macro, confirm_key, tts_engine, tts_voice, confirm_attempts, inter_timeout, digit_len, timeout, max_failures, max_timeouts), true) { } public void bindAction(string action, string arg, string bind) { @@ -20437,16 +20431,6 @@ } } - public uint last_pos { - set { - freeswitchPINVOKE.switch_file_handle_last_pos_set(swigCPtr, value); - } - get { - uint ret = freeswitchPINVOKE.switch_file_handle_last_pos_get(swigCPtr); - return ret; - } - } - public int vol { set { freeswitchPINVOKE.switch_file_handle_vol_set(swigCPtr, value); 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 Wed Feb 25 10:49:42 2009 @@ -1990,12 +1990,14 @@ char *arg6 = (char *) 0 ; char *arg7 = (char *) 0 ; char *arg8 = (char *) 0 ; - int arg9 ; - int arg10 ; + char *arg9 = (char *) 0 ; + char *arg10 = (char *) 0 ; int arg11 ; int arg12 ; int arg13 ; int arg14 ; + int arg15 ; + int arg16 ; IVRMenu *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; @@ -2020,10 +2022,12 @@ int res8 ; char *buf8 = 0 ; int alloc8 = 0 ; - int val9 ; - int ecode9 = 0 ; - int val10 ; - int ecode10 = 0 ; + int res9 ; + char *buf9 = 0 ; + int alloc9 = 0 ; + int res10 ; + char *buf10 = 0 ; + int alloc10 = 0 ; int val11 ; int ecode11 = 0 ; int val12 ; @@ -2032,11 +2036,15 @@ int ecode13 = 0 ; int val14 ; int ecode14 = 0 ; + int val15 ; + int ecode15 = 0 ; + int val16 ; + int ecode16 = 0 ; int argvi = 0; dXSARGS; - if ((items < 14) || (items > 14)) { - SWIG_croak("Usage: new_IVRMenu(main,name,greeting_sound,short_greeting_sound,invalid_sound,exit_sound,confirm_macro,confirm_key,confirm_attempts,inter_timeout,digit_len,timeout,max_failures,max_timeouts);"); + if ((items < 16) || (items > 16)) { + SWIG_croak("Usage: new_IVRMenu(main,name,greeting_sound,short_greeting_sound,invalid_sound,exit_sound,confirm_macro,confirm_key,tts_engine,tts_voice,confirm_attempts,inter_timeout,digit_len,timeout,max_failures,max_timeouts);"); } res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_IVRMenu, 0 | 0 ); if (!SWIG_IsOK(res1)) { @@ -2078,16 +2086,16 @@ SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "new_IVRMenu" "', argument " "8"" of type '" "char const *""'"); } arg8 = reinterpret_cast< char * >(buf8); - ecode9 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(8), &val9); - if (!SWIG_IsOK(ecode9)) { - SWIG_exception_fail(SWIG_ArgError(ecode9), "in method '" "new_IVRMenu" "', argument " "9"" of type '" "int""'"); - } - arg9 = static_cast< int >(val9); - ecode10 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(9), &val10); - if (!SWIG_IsOK(ecode10)) { - SWIG_exception_fail(SWIG_ArgError(ecode10), "in method '" "new_IVRMenu" "', argument " "10"" of type '" "int""'"); - } - arg10 = static_cast< int >(val10); + res9 = SWIG_AsCharPtrAndSize(ST(8), &buf9, NULL, &alloc9); + if (!SWIG_IsOK(res9)) { + SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "new_IVRMenu" "', argument " "9"" of type '" "char const *""'"); + } + arg9 = reinterpret_cast< char * >(buf9); + res10 = SWIG_AsCharPtrAndSize(ST(9), &buf10, NULL, &alloc10); + if (!SWIG_IsOK(res10)) { + SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "new_IVRMenu" "', argument " "10"" of type '" "char const *""'"); + } + arg10 = reinterpret_cast< char * >(buf10); ecode11 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(10), &val11); if (!SWIG_IsOK(ecode11)) { SWIG_exception_fail(SWIG_ArgError(ecode11), "in method '" "new_IVRMenu" "', argument " "11"" of type '" "int""'"); @@ -2108,7 +2116,17 @@ SWIG_exception_fail(SWIG_ArgError(ecode14), "in method '" "new_IVRMenu" "', argument " "14"" of type '" "int""'"); } arg14 = static_cast< int >(val14); - result = (IVRMenu *)new IVRMenu(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,arg9,arg10,arg11,arg12,arg13,arg14); + ecode15 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(14), &val15); + if (!SWIG_IsOK(ecode15)) { + SWIG_exception_fail(SWIG_ArgError(ecode15), "in method '" "new_IVRMenu" "', argument " "15"" of type '" "int""'"); + } + arg15 = static_cast< int >(val15); + ecode16 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(15), &val16); + if (!SWIG_IsOK(ecode16)) { + SWIG_exception_fail(SWIG_ArgError(ecode16), "in method '" "new_IVRMenu" "', argument " "16"" of type '" "int""'"); + } + arg16 = static_cast< int >(val16); + result = (IVRMenu *)new IVRMenu(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,(char const *)arg10,arg11,arg12,arg13,arg14,arg15,arg16); ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_IVRMenu, SWIG_OWNER | SWIG_SHADOW); argvi++ ; if (alloc2 == SWIG_NEWOBJ) delete[] buf2; @@ -2118,6 +2136,8 @@ if (alloc6 == SWIG_NEWOBJ) delete[] buf6; if (alloc7 == SWIG_NEWOBJ) delete[] buf7; if (alloc8 == SWIG_NEWOBJ) delete[] buf8; + if (alloc9 == SWIG_NEWOBJ) delete[] buf9; + if (alloc10 == SWIG_NEWOBJ) delete[] buf10; @@ -2134,6 +2154,8 @@ if (alloc6 == SWIG_NEWOBJ) delete[] buf6; if (alloc7 == SWIG_NEWOBJ) delete[] buf7; if (alloc8 == SWIG_NEWOBJ) delete[] buf8; + if (alloc9 == SWIG_NEWOBJ) delete[] buf9; + if (alloc10 == SWIG_NEWOBJ) delete[] buf10; 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 Wed Feb 25 10:49:42 2009 @@ -3079,12 +3079,14 @@ char *arg6 = (char *) 0 ; char *arg7 = (char *) 0 ; char *arg8 = (char *) 0 ; - int arg9 ; - int arg10 ; + char *arg9 = (char *) 0 ; + char *arg10 = (char *) 0 ; int arg11 ; int arg12 ; int arg13 ; int arg14 ; + int arg15 ; + int arg16 ; IVRMenu *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; @@ -3109,10 +3111,12 @@ int res8 ; char *buf8 = 0 ; int alloc8 = 0 ; - int val9 ; - int ecode9 = 0 ; - int val10 ; - int ecode10 = 0 ; + int res9 ; + char *buf9 = 0 ; + int alloc9 = 0 ; + int res10 ; + char *buf10 = 0 ; + int alloc10 = 0 ; int val11 ; int ecode11 = 0 ; int val12 ; @@ -3121,6 +3125,10 @@ int ecode13 = 0 ; int val14 ; int ecode14 = 0 ; + int val15 ; + int ecode15 = 0 ; + int val16 ; + int ecode16 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -3135,8 +3143,10 @@ PyObject * obj11 = 0 ; PyObject * obj12 = 0 ; PyObject * obj13 = 0 ; + PyObject * obj14 = 0 ; + PyObject * obj15 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOOOOOOO:new_IVRMenu",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOOOOOOOOO:new_IVRMenu",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13,&obj14,&obj15)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IVRMenu, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_IVRMenu" "', argument " "1"" of type '" "IVRMenu *""'"); @@ -3177,16 +3187,16 @@ SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "new_IVRMenu" "', argument " "8"" of type '" "char const *""'"); } arg8 = reinterpret_cast< char * >(buf8); - ecode9 = SWIG_AsVal_int(obj8, &val9); - if (!SWIG_IsOK(ecode9)) { - SWIG_exception_fail(SWIG_ArgError(ecode9), "in method '" "new_IVRMenu" "', argument " "9"" of type '" "int""'"); - } - arg9 = static_cast< int >(val9); - ecode10 = SWIG_AsVal_int(obj9, &val10); - if (!SWIG_IsOK(ecode10)) { - SWIG_exception_fail(SWIG_ArgError(ecode10), "in method '" "new_IVRMenu" "', argument " "10"" of type '" "int""'"); - } - arg10 = static_cast< int >(val10); + res9 = SWIG_AsCharPtrAndSize(obj8, &buf9, NULL, &alloc9); + if (!SWIG_IsOK(res9)) { + SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "new_IVRMenu" "', argument " "9"" of type '" "char const *""'"); + } + arg9 = reinterpret_cast< char * >(buf9); + res10 = SWIG_AsCharPtrAndSize(obj9, &buf10, NULL, &alloc10); + if (!SWIG_IsOK(res10)) { + SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "new_IVRMenu" "', argument " "10"" of type '" "char const *""'"); + } + arg10 = reinterpret_cast< char * >(buf10); ecode11 = SWIG_AsVal_int(obj10, &val11); if (!SWIG_IsOK(ecode11)) { SWIG_exception_fail(SWIG_ArgError(ecode11), "in method '" "new_IVRMenu" "', argument " "11"" of type '" "int""'"); @@ -3207,7 +3217,17 @@ SWIG_exception_fail(SWIG_ArgError(ecode14), "in method '" "new_IVRMenu" "', argument " "14"" of type '" "int""'"); } arg14 = static_cast< int >(val14); - result = (IVRMenu *)new IVRMenu(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,arg9,arg10,arg11,arg12,arg13,arg14); + ecode15 = SWIG_AsVal_int(obj14, &val15); + if (!SWIG_IsOK(ecode15)) { + SWIG_exception_fail(SWIG_ArgError(ecode15), "in method '" "new_IVRMenu" "', argument " "15"" of type '" "int""'"); + } + arg15 = static_cast< int >(val15); + ecode16 = SWIG_AsVal_int(obj15, &val16); + if (!SWIG_IsOK(ecode16)) { + SWIG_exception_fail(SWIG_ArgError(ecode16), "in method '" "new_IVRMenu" "', argument " "16"" of type '" "int""'"); + } + arg16 = static_cast< int >(val16); + result = (IVRMenu *)new IVRMenu(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,(char const *)arg10,arg11,arg12,arg13,arg14,arg15,arg16); resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_IVRMenu, SWIG_POINTER_NEW | 0 ); if (alloc2 == SWIG_NEWOBJ) delete[] buf2; if (alloc3 == SWIG_NEWOBJ) delete[] buf3; @@ -3216,6 +3236,8 @@ if (alloc6 == SWIG_NEWOBJ) delete[] buf6; if (alloc7 == SWIG_NEWOBJ) delete[] buf7; if (alloc8 == SWIG_NEWOBJ) delete[] buf8; + if (alloc9 == SWIG_NEWOBJ) delete[] buf9; + if (alloc10 == SWIG_NEWOBJ) delete[] buf10; return resultobj; fail: if (alloc2 == SWIG_NEWOBJ) delete[] buf2; @@ -3225,6 +3247,8 @@ if (alloc6 == SWIG_NEWOBJ) delete[] buf6; if (alloc7 == SWIG_NEWOBJ) delete[] buf7; if (alloc8 == SWIG_NEWOBJ) delete[] buf8; + if (alloc9 == SWIG_NEWOBJ) delete[] buf9; + if (alloc10 == SWIG_NEWOBJ) delete[] buf10; return NULL; } Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Wed Feb 25 10:49:42 2009 @@ -108,6 +108,8 @@ const char *exit_sound, const char *confirm_macro, const char *confirm_key, + const char *tts_engine, + const char *tts_voice, int confirm_attempts, int inter_timeout, int digit_len, @@ -123,7 +125,8 @@ } switch_ivr_menu_init(&menu, main ? main->menu : NULL, name, greeting_sound, short_greeting_sound, invalid_sound, - exit_sound, confirm_macro, confirm_key, confirm_attempts, inter_timeout, digit_len, timeout, max_failures, max_timeouts, pool); + exit_sound, confirm_macro, confirm_key, tts_engine, tts_voice, confirm_attempts, inter_timeout, + digit_len, timeout, max_failures, max_timeouts, pool); } Modified: freeswitch/trunk/src/switch_ivr_menu.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_menu.c (original) +++ freeswitch/trunk/src/switch_ivr_menu.c Wed Feb 25 10:49:42 2009 @@ -44,6 +44,8 @@ char *ptr; char *confirm_macro; char *confirm_key; + char *tts_engine; + char *tts_voice; int confirm_attempts; int digit_len; int max_failures; @@ -99,6 +101,8 @@ const char *exit_sound, const char *confirm_macro, const char *confirm_key, + const char *tts_engine, + const char *tts_voice, int confirm_attempts, int inter_timeout, int digit_len, @@ -159,8 +163,12 @@ menu->confirm_macro = switch_core_strdup(menu->pool, confirm_macro); } - if (!switch_strlen_zero(confirm_key)) { - menu->confirm_key = switch_core_strdup(menu->pool, confirm_key); + if (!switch_strlen_zero(tts_engine)) { + menu->tts_engine = switch_core_strdup(menu->pool, tts_engine); + } + + if (!switch_strlen_zero(tts_voice)) { + menu->tts_voice = switch_core_strdup(menu->pool, tts_voice); } menu->confirm_attempts = confirm_attempts; @@ -373,6 +381,7 @@ channel = switch_core_session_get_channel(session); + if (!(menu = switch_ivr_menu_find(stack, name))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Menu!\n"); return SWITCH_STATUS_FALSE; @@ -383,6 +392,11 @@ return SWITCH_STATUS_FALSE; } + if(!switch_strlen_zero(menu->tts_engine) && !switch_strlen_zero(menu->tts_voice)) { + switch_channel_set_variable(channel, "tts_engine", menu->tts_engine); + switch_channel_set_variable(channel, "tts_voice", menu->tts_voice); + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Executing IVR menu %s\n", menu->name); switch_channel_set_variable(channel, "ivr_menu_status", "success"); @@ -719,6 +733,8 @@ const char *max_timeouts = switch_xml_attr_soft(xml_menu, "max-timeouts"); const char *confirm_macro= switch_xml_attr(xml_menu, "confirm-macro"); const char *confirm_key= switch_xml_attr(xml_menu, "confirm-key"); + const char *tts_engine= switch_xml_attr(xml_menu, "tts-engine"); + const char *tts_voice= switch_xml_attr(xml_menu, "tts-voice"); const char *confirm_attempts = switch_xml_attr_soft(xml_menu, "confirm-attempts"); const char *digit_len = switch_xml_attr_soft(xml_menu, "digit-len"); const char *inter_timeout = switch_xml_attr_soft(xml_menu, "inter-digit-timeout"); @@ -740,6 +756,8 @@ exit_sound, confirm_macro, confirm_key, + tts_engine, + tts_voice, atoi(confirm_attempts), atoi(inter_timeout), atoi(digit_len),

1 0

[commit] r12277 - in freeswitch/trunk: scripts src/mod/applications/mod_commands
by FreeSWITCH SVN 25 Feb '09

25 Feb '09

Author: anthm Date: Wed Feb 25 10:37:00 2009 New Revision: 12277 Log: declinatio mortuus obfirmo! Modified: freeswitch/trunk/scripts/freeswitch-gcore freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Modified: freeswitch/trunk/scripts/freeswitch-gcore ============================================================================== --- freeswitch/trunk/scripts/freeswitch-gcore (original) +++ freeswitch/trunk/scripts/freeswitch-gcore Wed Feb 25 10:37:00 2009 @@ -1,12 +1,12 @@ #!/bin/bash -fspid=$(cat /usr/local/freeswitch/log/freeswitch.pid) -gcore -o /usr/local/freeswitch/log/freeswitch.gcore $fspid && \ - gdb /usr/local/freeswitch/bin/freeswitch \ - -c /usr/local/freeswitch/log/freeswitch.gcore.$fspid \ +fspid=$(cat /opt/freeswitch/log/freeswitch.pid) +gcore -o /opt/freeswitch/log/freeswitch.gcore $fspid && \ + gdb /opt/freeswitch/bin/freeswitch \ + -c /opt/freeswitch/log/freeswitch.gcore.$fspid \ --eval-command='set pagination off' \ --eval-command='bt' \ --eval-command='bt full' \ --eval-command='thread apply all bt' \ --eval-command='thread apply all bt full' \ --eval-command='quit' -#rm /usr/local/freeswitch/log/freeswitch.gcore.$fspid +#rm /opt/freeswitch/log/freeswitch.gcore.$fspid Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Wed Feb 25 10:37:00 2009 @@ -459,7 +459,6 @@ end: if (session || tf) { stream->write_function(stream, err ? "false" : "true"); - switch_xml_free(xml); } else { if (err) { if (host) {

1 0

[commit] r12276 - in freeswitch/trunk/libs/spandsp/src: . msvc
by FreeSWITCH SVN 25 Feb '09

25 Feb '09

Author: mikej Date: Wed Feb 25 01:08:57 2009 New Revision: 12276 Log: properly quote copy commands for spaces in directory names Modified: freeswitch/trunk/libs/spandsp/src/libspandsp.2005.vcproj freeswitch/trunk/libs/spandsp/src/libspandsp.2008.vcproj freeswitch/trunk/libs/spandsp/src/msvc/vc8proj.foot freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.foot Modified: freeswitch/trunk/libs/spandsp/src/libspandsp.2005.vcproj ============================================================================== --- freeswitch/trunk/libs/spandsp/src/libspandsp.2005.vcproj (original) +++ freeswitch/trunk/libs/spandsp/src/libspandsp.2005.vcproj Wed Feb 25 01:08:57 2009 @@ -306,7 +306,7 @@ <Tool Name="VCCustomBuildTool" Description="Copying $(InputPath) to $(ProjectDir)$(InputFileName)" - CommandLine="copy $(InputPath) $(ProjectDir)$(InputFileName)" + CommandLine="copy "$(InputPath)" "$(ProjectDir)$(InputFileName)"" Outputs="$(ProjectDir)$(InputFileName)" /> </FileConfiguration> @@ -316,7 +316,7 @@ <Tool Name="VCCustomBuildTool" Description="Copying $(InputPath) to $(ProjectDir)$(InputFileName)" - CommandLine="copy $(InputPath) $(ProjectDir)$(InputFileName)" + CommandLine="copy "$(InputPath)" "$(ProjectDir)$(InputFileName)"" Outputs="$(ProjectDir)$(InputFileName)" /> </FileConfiguration> Modified: freeswitch/trunk/libs/spandsp/src/libspandsp.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/spandsp/src/libspandsp.2008.vcproj (original) +++ freeswitch/trunk/libs/spandsp/src/libspandsp.2008.vcproj Wed Feb 25 01:08:57 2009 @@ -376,7 +376,7 @@ <Tool Name="VCCustomBuildTool" Description="Copying $(InputPath) to $(ProjectDir)$(InputFileName)" - CommandLine="copy $(InputPath) $(ProjectDir)$(InputFileName)" + CommandLine="copy "$(InputPath)" "$(ProjectDir)$(InputFileName)"" Outputs="$(ProjectDir)$(InputFileName)" /> </FileConfiguration> @@ -386,7 +386,7 @@ <Tool Name="VCCustomBuildTool" Description="Copying $(InputPath) to $(ProjectDir)$(InputFileName)" - CommandLine="copy $(InputPath) $(ProjectDir)$(InputFileName)" + CommandLine="copy "$(InputPath)" "$(ProjectDir)$(InputFileName)"" Outputs="$(ProjectDir)$(InputFileName)" /> </FileConfiguration> @@ -396,7 +396,7 @@ <Tool Name="VCCustomBuildTool" Description="Copying $(InputPath) to $(ProjectDir)$(InputFileName)" - CommandLine="copy $(InputPath) $(ProjectDir)$(InputFileName)" + CommandLine="copy "$(InputPath)" "$(ProjectDir)$(InputFileName)"" Outputs="$(ProjectDir)$(InputFileName)" /> </FileConfiguration> @@ -406,7 +406,7 @@ <Tool Name="VCCustomBuildTool" Description="Copying $(InputPath) to $(ProjectDir)$(InputFileName)" - CommandLine="copy $(InputPath) $(ProjectDir)$(InputFileName)" + CommandLine="copy "$(InputPath)" "$(ProjectDir)$(InputFileName)"" Outputs="$(ProjectDir)$(InputFileName)" /> </FileConfiguration> Modified: freeswitch/trunk/libs/spandsp/src/msvc/vc8proj.foot ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/vc8proj.foot (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/vc8proj.foot Wed Feb 25 01:08:57 2009 @@ -8,7 +8,7 @@ <Tool Name="VCCustomBuildTool" Description="Copying $(InputPath) to $(ProjectDir)$(InputFileName)" - CommandLine="copy $(InputPath) $(ProjectDir)$(InputFileName)" + CommandLine="copy "$(InputPath)" "$(ProjectDir)$(InputFileName)"" Outputs="$(ProjectDir)$(InputFileName)" /> </FileConfiguration> @@ -18,7 +18,7 @@ <Tool Name="VCCustomBuildTool" Description="Copying $(InputPath) to $(ProjectDir)$(InputFileName)" - CommandLine="copy $(InputPath) $(ProjectDir)$(InputFileName)" + CommandLine="copy "$(InputPath)" "$(ProjectDir)$(InputFileName)"" Outputs="$(ProjectDir)$(InputFileName)" /> </FileConfiguration> Modified: freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.foot ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.foot (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.foot Wed Feb 25 01:08:57 2009 @@ -8,7 +8,7 @@ <Tool Name="VCCustomBuildTool" Description="Copying $(InputPath) to $(ProjectDir)$(InputFileName)" - CommandLine="copy $(InputPath) $(ProjectDir)$(InputFileName)" + CommandLine="copy "$(InputPath)" "$(ProjectDir)$(InputFileName)"" Outputs="$(ProjectDir)$(InputFileName)" /> </FileConfiguration> @@ -18,7 +18,7 @@ <Tool Name="VCCustomBuildTool" Description="Copying $(InputPath) to $(ProjectDir)$(InputFileName)" - CommandLine="copy $(InputPath) $(ProjectDir)$(InputFileName)" + CommandLine="copy "$(InputPath)" "$(ProjectDir)$(InputFileName)"" Outputs="$(ProjectDir)$(InputFileName)" /> </FileConfiguration> @@ -28,7 +28,7 @@ <Tool Name="VCCustomBuildTool" Description="Copying $(InputPath) to $(ProjectDir)$(InputFileName)" - CommandLine="copy $(InputPath) $(ProjectDir)$(InputFileName)" + CommandLine="copy "$(InputPath)" "$(ProjectDir)$(InputFileName)"" Outputs="$(ProjectDir)$(InputFileName)" /> </FileConfiguration> @@ -38,7 +38,7 @@ <Tool Name="VCCustomBuildTool" Description="Copying $(InputPath) to $(ProjectDir)$(InputFileName)" - CommandLine="copy $(InputPath) $(ProjectDir)$(InputFileName)" + CommandLine="copy "$(InputPath)" "$(ProjectDir)$(InputFileName)"" Outputs="$(ProjectDir)$(InputFileName)" /> </FileConfiguration>

1 0

[commit] r12275 - in freeswitch/trunk/libs/spandsp/src: . msvc
by FreeSWITCH SVN 25 Feb '09

25 Feb '09

Author: mikej Date: Wed Feb 25 01:04:21 2009 New Revision: 12275 Log: generate header file into project directory not solution directory Modified: freeswitch/trunk/libs/spandsp/src/libspandsp.2005.vcproj freeswitch/trunk/libs/spandsp/src/libspandsp.2008.vcproj freeswitch/trunk/libs/spandsp/src/msvc/vc8proj.foot freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.foot Modified: freeswitch/trunk/libs/spandsp/src/libspandsp.2005.vcproj ============================================================================== --- freeswitch/trunk/libs/spandsp/src/libspandsp.2005.vcproj (original) +++ freeswitch/trunk/libs/spandsp/src/libspandsp.2005.vcproj Wed Feb 25 01:04:21 2009 @@ -305,9 +305,9 @@ > <Tool Name="VCCustomBuildTool" - Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" - CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" - Outputs="$(SolutionDir)$(InputFileName)" + Description="Copying $(InputPath) to $(ProjectDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(ProjectDir)$(InputFileName)" + Outputs="$(ProjectDir)$(InputFileName)" /> </FileConfiguration> <FileConfiguration @@ -315,9 +315,9 @@ > <Tool Name="VCCustomBuildTool" - Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" - CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" - Outputs="$(SolutionDir)$(InputFileName)" + Description="Copying $(InputPath) to $(ProjectDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(ProjectDir)$(InputFileName)" + Outputs="$(ProjectDir)$(InputFileName)" /> </FileConfiguration> </File> Modified: freeswitch/trunk/libs/spandsp/src/libspandsp.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/spandsp/src/libspandsp.2008.vcproj (original) +++ freeswitch/trunk/libs/spandsp/src/libspandsp.2008.vcproj Wed Feb 25 01:04:21 2009 @@ -375,9 +375,9 @@ > <Tool Name="VCCustomBuildTool" - Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" - CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" - Outputs="$(SolutionDir)$(InputFileName)" + Description="Copying $(InputPath) to $(ProjectDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(ProjectDir)$(InputFileName)" + Outputs="$(ProjectDir)$(InputFileName)" /> </FileConfiguration> <FileConfiguration @@ -385,9 +385,9 @@ > <Tool Name="VCCustomBuildTool" - Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" - CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" - Outputs="$(SolutionDir)$(InputFileName)" + Description="Copying $(InputPath) to $(ProjectDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(ProjectDir)$(InputFileName)" + Outputs="$(ProjectDir)$(InputFileName)" /> </FileConfiguration> <FileConfiguration @@ -395,9 +395,9 @@ > <Tool Name="VCCustomBuildTool" - Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" - CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" - Outputs="$(SolutionDir)$(InputFileName)" + Description="Copying $(InputPath) to $(ProjectDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(ProjectDir)$(InputFileName)" + Outputs="$(ProjectDir)$(InputFileName)" /> </FileConfiguration> <FileConfiguration @@ -405,9 +405,9 @@ > <Tool Name="VCCustomBuildTool" - Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" - CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" - Outputs="$(SolutionDir)$(InputFileName)" + Description="Copying $(InputPath) to $(ProjectDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(ProjectDir)$(InputFileName)" + Outputs="$(ProjectDir)$(InputFileName)" /> </FileConfiguration> </File> Modified: freeswitch/trunk/libs/spandsp/src/msvc/vc8proj.foot ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/vc8proj.foot (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/vc8proj.foot Wed Feb 25 01:04:21 2009 @@ -7,9 +7,9 @@ > <Tool Name="VCCustomBuildTool" - Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" - CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" - Outputs="$(SolutionDir)$(InputFileName)" + Description="Copying $(InputPath) to $(ProjectDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(ProjectDir)$(InputFileName)" + Outputs="$(ProjectDir)$(InputFileName)" /> </FileConfiguration> <FileConfiguration @@ -17,9 +17,9 @@ > <Tool Name="VCCustomBuildTool" - Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" - CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" - Outputs="$(SolutionDir)$(InputFileName)" + Description="Copying $(InputPath) to $(ProjectDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(ProjectDir)$(InputFileName)" + Outputs="$(ProjectDir)$(InputFileName)" /> </FileConfiguration> </File> Modified: freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.foot ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.foot (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.foot Wed Feb 25 01:04:21 2009 @@ -7,9 +7,9 @@ > <Tool Name="VCCustomBuildTool" - Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" - CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" - Outputs="$(SolutionDir)$(InputFileName)" + Description="Copying $(InputPath) to $(ProjectDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(ProjectDir)$(InputFileName)" + Outputs="$(ProjectDir)$(InputFileName)" /> </FileConfiguration> <FileConfiguration @@ -17,9 +17,9 @@ > <Tool Name="VCCustomBuildTool" - Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" - CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" - Outputs="$(SolutionDir)$(InputFileName)" + Description="Copying $(InputPath) to $(ProjectDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(ProjectDir)$(InputFileName)" + Outputs="$(ProjectDir)$(InputFileName)" /> </FileConfiguration> <FileConfiguration @@ -27,9 +27,9 @@ > <Tool Name="VCCustomBuildTool" - Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" - CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" - Outputs="$(SolutionDir)$(InputFileName)" + Description="Copying $(InputPath) to $(ProjectDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(ProjectDir)$(InputFileName)" + Outputs="$(ProjectDir)$(InputFileName)" /> </FileConfiguration> <FileConfiguration @@ -37,9 +37,9 @@ > <Tool Name="VCCustomBuildTool" - Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" - CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" - Outputs="$(SolutionDir)$(InputFileName)" + Description="Copying $(InputPath) to $(ProjectDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(ProjectDir)$(InputFileName)" + Outputs="$(ProjectDir)$(InputFileName)" /> </FileConfiguration> </File>

1 0

[commit] r12274 - in freeswitch/trunk/libs/spandsp/src: . msvc
by FreeSWITCH SVN 25 Feb '09

25 Feb '09

Author: mikej Date: Wed Feb 25 00:52:52 2009 New Revision: 12274 Log: update project file headers to match changes from previous commits Modified: freeswitch/trunk/libs/spandsp/src/libspandsp.2005.vcproj freeswitch/trunk/libs/spandsp/src/libspandsp.2008.vcproj freeswitch/trunk/libs/spandsp/src/msvc/vc8proj.head freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.head Modified: freeswitch/trunk/libs/spandsp/src/libspandsp.2005.vcproj ============================================================================== --- freeswitch/trunk/libs/spandsp/src/libspandsp.2005.vcproj (original) +++ freeswitch/trunk/libs/spandsp/src/libspandsp.2005.vcproj Wed Feb 25 00:52:52 2009 @@ -22,16 +22,18 @@ IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" CharacterSet="1" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff;.\generated" + AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" + ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb" WarningLevel="4" DebugInformationFormat="4" CompileAs="1" @@ -54,14 +56,16 @@ IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" CharacterSet="1" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" WholeProgramOptimization="1" > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff;.\generated" + AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" UsePrecompiledHeader="0" + ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb" WarningLevel="4" DebugInformationFormat="3" DisableSpecificWarnings="4127" Modified: freeswitch/trunk/libs/spandsp/src/libspandsp.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/spandsp/src/libspandsp.2008.vcproj (original) +++ freeswitch/trunk/libs/spandsp/src/libspandsp.2008.vcproj Wed Feb 25 00:52:52 2009 @@ -25,16 +25,18 @@ IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" CharacterSet="1" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff;.\generated" + AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" + ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb" WarningLevel="4" DebugInformationFormat="4" CompileAs="1" @@ -57,14 +59,16 @@ IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" CharacterSet="1" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" WholeProgramOptimization="1" > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff;.\generated" + AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" UsePrecompiledHeader="0" + ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb" WarningLevel="4" DebugInformationFormat="3" DisableSpecificWarnings="4127" @@ -88,16 +92,18 @@ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" CharacterSet="1" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff;.\generated" + AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" + ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb" WarningLevel="4" DebugInformationFormat="3" CompileAs="1" @@ -120,14 +126,16 @@ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" CharacterSet="1" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" WholeProgramOptimization="1" > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff;.\generated" + AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" UsePrecompiledHeader="0" + ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb" WarningLevel="4" DebugInformationFormat="3" DisableSpecificWarnings="4127" Modified: freeswitch/trunk/libs/spandsp/src/msvc/vc8proj.head ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/vc8proj.head (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/vc8proj.head Wed Feb 25 00:52:52 2009 @@ -22,16 +22,18 @@ IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" CharacterSet="1" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff;.\generated" + AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" + ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb" WarningLevel="4" DebugInformationFormat="4" CompileAs="1" @@ -54,14 +56,16 @@ IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" CharacterSet="1" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" WholeProgramOptimization="1" > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff;.\generated" + AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" UsePrecompiledHeader="0" + ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb" WarningLevel="4" DebugInformationFormat="3" DisableSpecificWarnings="4127" Modified: freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.head ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.head (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.head Wed Feb 25 00:52:52 2009 @@ -25,16 +25,18 @@ IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" CharacterSet="1" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff;.\generated" + AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" + ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb" WarningLevel="4" DebugInformationFormat="4" CompileAs="1" @@ -57,14 +59,16 @@ IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" CharacterSet="1" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" WholeProgramOptimization="1" > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff;.\generated" + AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" UsePrecompiledHeader="0" + ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb" WarningLevel="4" DebugInformationFormat="3" DisableSpecificWarnings="4127" @@ -88,16 +92,18 @@ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" CharacterSet="1" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff;.\generated" + AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" + ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb" WarningLevel="4" DebugInformationFormat="3" CompileAs="1" @@ -120,14 +126,16 @@ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" CharacterSet="1" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" WholeProgramOptimization="1" > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff;.\generated" + AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" UsePrecompiledHeader="0" + ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb" WarningLevel="4" DebugInformationFormat="3" DisableSpecificWarnings="4127"

1 0

[commit] r12273 - in freeswitch/trunk/libs/spandsp/src: . msvc
by FreeSWITCH SVN 25 Feb '09

25 Feb '09

Author: mikej Date: Wed Feb 25 00:26:03 2009 New Revision: 12273 Log: followup to svn rev12272 to fix x64 build Modified: freeswitch/trunk/libs/spandsp/src/libspandsp.2005.vcproj freeswitch/trunk/libs/spandsp/src/libspandsp.2008.vcproj freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.foot Modified: freeswitch/trunk/libs/spandsp/src/libspandsp.2005.vcproj ============================================================================== --- freeswitch/trunk/libs/spandsp/src/libspandsp.2005.vcproj (original) +++ freeswitch/trunk/libs/spandsp/src/libspandsp.2005.vcproj Wed Feb 25 00:26:03 2009 @@ -6,96 +6,49 @@ ProjectGUID="{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}" RootNamespace="libspandsp" Keyword="Win32Proj" + TargetFrameworkVersion="131072" > - <Platforms> - <Platform + <Platforms> + <Platform Name="Win32" /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)Debug" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" CharacterSet="1" - BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool + <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=".;.\spandsp;.\msvc;"..\..\tiff-3.8.2\libtiff"" + 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" RuntimeLibrary="3" UsePrecompiledHeader="0" - ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb" WarningLevel="4" DebugInformationFormat="4" CompileAs="1" - DisableSpecificWarnings="4127;4244" + DisableSpecificWarnings="4127" /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool + <Tool Name="VCLinkerTool" LinkIncremental="2" GenerateDebugInformation="true" SubSystem="2" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" ImportLibrary="./Debug\spandsp.lib" TargetMachine="1" /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration + </Configuration> + <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)Release" IntermediateDirectory="$(ConfigurationName)" @@ -103,909 +56,268 @@ CharacterSet="1" WholeProgramOptimization="1" > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool + <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=".;.\spandsp;.\msvc;"..\..\tiff-3.8.2\libtiff"" + 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" - ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb" WarningLevel="4" DebugInformationFormat="3" - DisableSpecificWarnings="4127;4244" - /> - <Tool - Name="VCManagedResourceCompilerTool" + DisableSpecificWarnings="4127" /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool + <Tool Name="VCLinkerTool" LinkIncremental="1" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" ImportLibrary="./Release\spandsp.lib" TargetMachine="1" /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter Name="Source Files" Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - <File - RelativePath="adsi.c" - > - </File> - <File - RelativePath="async.c" - > - </File> - <File - RelativePath="at_interpreter.c" - > - </File> - <File - RelativePath="awgn.c" - > - </File> - <File - RelativePath="bell_r2_mf.c" - > - </File> - <File - RelativePath="bert.c" - > - </File> - <File - RelativePath="bit_operations.c" - > - </File> - <File - RelativePath="bitstream.c" - > - </File> - <File - RelativePath="complex_filters.c" - > - </File> - <File - RelativePath="complex_vector_float.c" - > - </File> - <File - RelativePath="complex_vector_int.c" - > - </File> - <File - RelativePath="crc.c" - > - </File> - <File - RelativePath="dds_float.c" - > - </File> - <File - RelativePath="dds_int.c" - > - </File> - <File - RelativePath="dtmf.c" - > - </File> - <File - RelativePath="echo.c" - > - </File> - <File - RelativePath="fax.c" - > - </File> - <File - RelativePath="fax_modems.c" - > - </File> - <File - RelativePath="fsk.c" - > - </File> - <File - RelativePath="g711.c" - > - </File> - <File - RelativePath="g722.c" - > - </File> - <File - RelativePath="g726.c" - > - </File> - <File - RelativePath=".\msvc\gettimeofday.c" - > - </File> - <File - RelativePath="gsm0610_decode.c" - > - </File> - <File - RelativePath="gsm0610_encode.c" - > - </File> - <File - RelativePath="gsm0610_long_term.c" - > - </File> - <File - RelativePath="gsm0610_lpc.c" - > - </File> - <File - RelativePath="gsm0610_preprocess.c" - > - </File> - <File - RelativePath="gsm0610_rpe.c" - > - </File> - <File - RelativePath="gsm0610_short_term.c" - > - </File> - <File - RelativePath="hdlc.c" - > - </File> - <File - RelativePath="ima_adpcm.c" - > - </File> - <File - RelativePath="logging.c" - > - </File> - <File - RelativePath="lpc10_analyse.c" - > - </File> - <File - RelativePath="lpc10_decode.c" - > - </File> - <File - RelativePath="lpc10_encode.c" - > - </File> - <File - RelativePath="lpc10_placev.c" - > - </File> - <File - RelativePath="lpc10_voicing.c" - > - </File> - <File - RelativePath="modem_connect_tones.c" - > - </File> - <File - RelativePath="modem_echo.c" - > - </File> - <File - RelativePath="noise.c" - > - </File> - <File - RelativePath="oki_adpcm.c" - > - </File> - <File - RelativePath="playout.c" - > - </File> - <File - RelativePath="plc.c" - > - </File> - <File - RelativePath="power_meter.c" - > - </File> - <File - RelativePath="queue.c" - > - </File> - <File - RelativePath="schedule.c" - > - </File> - <File - RelativePath="sig_tone.c" - > - </File> - <File - RelativePath="silence_gen.c" - > - </File> - <File - RelativePath="super_tone_rx.c" - > - </File> - <File - RelativePath="super_tone_tx.c" - > - </File> - <File - RelativePath="t30.c" - > - </File> - <File - RelativePath="t30_api.c" - > - </File> - <File - RelativePath="t30_logging.c" - > - </File> - <File - RelativePath="t31.c" - > - </File> - <File - RelativePath="t35.c" - > - </File> - <File - RelativePath="t38_core.c" - > - </File> - <File - RelativePath="t38_gateway.c" - > - </File> - <File - RelativePath="t38_non_ecm_buffer.c" - > - </File> - <File - RelativePath="t38_terminal.c" - > - </File> - <File - RelativePath="t4.c" - > - </File> - <File - RelativePath="testcpuid.c" - > - </File> - <File - RelativePath="time_scale.c" - > - </File> - <File - RelativePath="tone_detect.c" - > - </File> - <File - RelativePath="tone_generate.c" - > - </File> - <File - RelativePath="v17rx.c" - > - </File> - <File - RelativePath="v17tx.c" - > - </File> - <File - RelativePath="v22bis_rx.c" - > - </File> - <File - RelativePath="v22bis_tx.c" - > - </File> - <File - RelativePath="v27ter_rx.c" - > - </File> - <File - RelativePath="v27ter_tx.c" - > - </File> - <File - RelativePath="v29rx.c" - > - </File> - <File - RelativePath="v29tx.c" - > - </File> - <File - RelativePath="v42.c" - > - </File> - <File - RelativePath="v42bis.c" - > - </File> - <File - RelativePath="v8.c" - > - </File> - <File - RelativePath="vector_float.c" - > - </File> - <File - RelativePath="vector_int.c" - > - </File> - </Filter> - <Filter - Name="Header Files" - > - <File - RelativePath="spandsp.h" - > - </File> - <File - RelativePath="spandsp/adsi.h" - > - </File> - <File - RelativePath="spandsp/arctan2.h" - > - </File> - <File - RelativePath="spandsp/async.h" - > - </File> - <File - RelativePath="spandsp/at_interpreter.h" - > - </File> - <File - RelativePath="spandsp/awgn.h" - > - </File> - <File - RelativePath="spandsp/bell_r2_mf.h" - > - </File> - <File - RelativePath="spandsp/bert.h" - > - </File> - <File - RelativePath="spandsp/biquad.h" - > - </File> - <File - RelativePath="spandsp/bit_operations.h" - > - </File> - <File - RelativePath="spandsp/bitstream.h" - > - </File> - <File - RelativePath="spandsp/complex.h" - > - </File> - <File - RelativePath="spandsp/complex_filters.h" - > - </File> - <File - RelativePath="spandsp/complex_vector_float.h" - > - </File> - <File - RelativePath="spandsp/complex_vector_int.h" - > - </File> - <File - RelativePath="spandsp/crc.h" - > - </File> - <File - RelativePath="spandsp/dc_restore.h" - > - </File> - <File - RelativePath="spandsp/dds.h" - > - </File> - <File - RelativePath="spandsp/dtmf.h" - > - </File> - <File - RelativePath="spandsp/echo.h" - > - </File> - <File - RelativePath="spandsp/expose.h" - > - </File> - <File - RelativePath="spandsp/fast_convert.h" - > - </File> - <File - RelativePath="spandsp/fax.h" - > - </File> - <File - RelativePath="spandsp/fax_modems.h" - > - </File> - <File - RelativePath="spandsp/fir.h" - > - </File> - <File - RelativePath="spandsp/fsk.h" - > - </File> - <File - RelativePath="spandsp/g168models.h" - > - </File> - <File - RelativePath="spandsp/g711.h" - > - </File> - <File - RelativePath="spandsp/g722.h" - > - </File> - <File - RelativePath="spandsp/g726.h" - > - </File> - <File - RelativePath="spandsp/gsm0610.h" - > - </File> - <File - RelativePath="spandsp/hdlc.h" - > - </File> - <File - RelativePath="spandsp/ima_adpcm.h" - > - </File> - <File - RelativePath="spandsp/logging.h" - > - </File> - <File - RelativePath="spandsp/lpc10.h" - > - </File> - <File - RelativePath="spandsp/modem_connect_tones.h" - > - </File> - <File - RelativePath="spandsp/modem_echo.h" - > - </File> - <File - RelativePath="spandsp/noise.h" - > - </File> - <File - RelativePath="spandsp/oki_adpcm.h" - > - </File> - <File - RelativePath="spandsp/playout.h" - > - </File> - <File - RelativePath="spandsp/plc.h" - > - </File> - <File - RelativePath="spandsp/power_meter.h" - > - </File> - <File - RelativePath="spandsp/private/adsi.h" - > - </File> - <File - RelativePath="spandsp/private/async.h" - > - </File> - <File - RelativePath="spandsp/private/at_interpreter.h" - > - </File> - <File - RelativePath="spandsp/private/awgn.h" - > - </File> - <File - RelativePath="spandsp/private/bell_r2_mf.h" - > - </File> - <File - RelativePath="spandsp/private/bert.h" - > - </File> - <File - RelativePath="spandsp/private/bitstream.h" - > - </File> - <File - RelativePath="spandsp/private/dtmf.h" - > - </File> - <File - RelativePath="spandsp/private/fax.h" - > - </File> - <File - RelativePath="spandsp/private/fax_modems.h" - > - </File> - <File - RelativePath="spandsp/private/fsk.h" - > - </File> - <File - RelativePath="spandsp/private/g711.h" - > - </File> - <File - RelativePath="spandsp/private/g722.h" - > - </File> - <File - RelativePath="spandsp/private/g726.h" - > - </File> - <File - RelativePath="spandsp/private/gsm0610.h" - > - </File> - <File - RelativePath="spandsp/private/hdlc.h" - > - </File> - <File - RelativePath="spandsp/private/ima_adpcm.h" - > - </File> - <File - RelativePath="spandsp/private/logging.h" - > - </File> - <File - RelativePath="spandsp/private/lpc10.h" - > - </File> - <File - RelativePath="spandsp/private/modem_connect_tones.h" - > - </File> - <File - RelativePath="spandsp/private/noise.h" - > - </File> - <File - RelativePath="spandsp/private/oki_adpcm.h" - > - </File> - <File - RelativePath="spandsp/private/queue.h" - > - </File> - <File - RelativePath="spandsp/private/schedule.h" - > - </File> - <File - RelativePath="spandsp/private/sig_tone.h" - > - </File> - <File - RelativePath="spandsp/private/super_tone_rx.h" - > - </File> - <File - RelativePath="spandsp/private/super_tone_tx.h" - > - </File> - <File - RelativePath="spandsp/private/t30.h" - > - </File> - <File - RelativePath="spandsp/private/t31.h" - > - </File> - <File - RelativePath="spandsp/private/t38_core.h" - > - </File> - <File - RelativePath="spandsp/private/t38_gateway.h" - > - </File> - <File - RelativePath="spandsp/private/t38_non_ecm_buffer.h" - > - </File> - <File - RelativePath="spandsp/private/t38_terminal.h" - > - </File> - <File - RelativePath="spandsp/private/t4.h" - > - </File> - <File - RelativePath="spandsp/private/time_scale.h" - > - </File> - <File - RelativePath="spandsp/private/tone_detect.h" - > - </File> - <File - RelativePath="spandsp/private/tone_generate.h" - > - </File> - <File - RelativePath="spandsp/private/v17rx.h" - > - </File> - <File - RelativePath="spandsp/private/v17tx.h" - > - </File> - <File - RelativePath="spandsp/private/v22bis.h" - > - </File> - <File - RelativePath="spandsp/private/v27ter_rx.h" - > - </File> - <File - RelativePath="spandsp/private/v27ter_tx.h" - > - </File> - <File - RelativePath="spandsp/private/v29rx.h" - > - </File> - <File - RelativePath="spandsp/private/v29tx.h" - > - </File> - <File - RelativePath="spandsp/private/v42.h" - > - </File> - <File - RelativePath="spandsp/private/v42bis.h" - > - </File> - <File - RelativePath="spandsp/private/v8.h" - > - </File> - <File - RelativePath="spandsp/queue.h" - > - </File> - <File - RelativePath="spandsp/saturated.h" - > - </File> - <File - RelativePath="spandsp/schedule.h" - > - </File> - <File - RelativePath="spandsp/sig_tone.h" - > - </File> - <File - RelativePath="spandsp/silence_gen.h" - > - </File> - <File - RelativePath="spandsp/super_tone_rx.h" - > - </File> - <File - RelativePath="spandsp/super_tone_tx.h" - > - </File> - <File - RelativePath="spandsp/t30.h" - > - </File> - <File - RelativePath="spandsp/t30_api.h" - > - </File> - <File - RelativePath="spandsp/t30_fcf.h" - > - </File> - <File - RelativePath="spandsp/t30_logging.h" - > - </File> - <File - RelativePath="spandsp/t31.h" - > - </File> - <File - RelativePath="spandsp/t35.h" - > - </File> - <File - RelativePath="spandsp/t38_core.h" - > - </File> - <File - RelativePath="spandsp/t38_gateway.h" - > - </File> - <File - RelativePath="spandsp/t38_non_ecm_buffer.h" - > - </File> - <File - RelativePath="spandsp/t38_terminal.h" - > - </File> - <File - RelativePath="spandsp/t4.h" - > - </File> - <File - RelativePath="spandsp/telephony.h" - > - </File> - <File - RelativePath="spandsp/time_scale.h" - > - </File> - <File - RelativePath="spandsp/timing.h" - > - </File> - <File - RelativePath="spandsp/tone_detect.h" - > - </File> - <File - RelativePath="spandsp/tone_generate.h" - > - </File> - <File - RelativePath="spandsp/v17rx.h" - > - </File> - <File - RelativePath="spandsp/v17tx.h" - > - </File> - <File - RelativePath="spandsp/v22bis.h" - > - </File> - <File - RelativePath="spandsp/v27ter_rx.h" - > - </File> - <File - RelativePath="spandsp/v27ter_tx.h" - > - </File> - <File - RelativePath="spandsp/v29rx.h" - > - </File> - <File - RelativePath="spandsp/v29tx.h" - > - </File> - <File - RelativePath="spandsp/v42.h" - > - </File> - <File - RelativePath="spandsp/v42bis.h" - > - </File> - <File - RelativePath="spandsp/v8.h" - > - </File> - <File - RelativePath="spandsp/vector_float.h" - > - </File> - <File - RelativePath="spandsp/vector_int.h" - > - </File> - <File - RelativePath="spandsp/version.h" - > - </File> - </Filter> - <Filter - Name="Resource Files" - Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" - UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" - > - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> +<File RelativePath="adsi.c"></File> +<File RelativePath="async.c"></File> +<File RelativePath="at_interpreter.c"></File> +<File RelativePath="awgn.c"></File> +<File RelativePath="bell_r2_mf.c"></File> +<File RelativePath="bert.c"></File> +<File RelativePath="bit_operations.c"></File> +<File RelativePath="bitstream.c"></File> +<File RelativePath="complex_filters.c"></File> +<File RelativePath="complex_vector_float.c"></File> +<File RelativePath="complex_vector_int.c"></File> +<File RelativePath="crc.c"></File> +<File RelativePath="dds_float.c"></File> +<File RelativePath="dds_int.c"></File> +<File RelativePath="dtmf.c"></File> +<File RelativePath="echo.c"></File> +<File RelativePath="fax.c"></File> +<File RelativePath="fax_modems.c"></File> +<File RelativePath="fsk.c"></File> +<File RelativePath="g711.c"></File> +<File RelativePath="g722.c"></File> +<File RelativePath="g726.c"></File> +<File RelativePath="gsm0610_decode.c"></File> +<File RelativePath="gsm0610_encode.c"></File> +<File RelativePath="gsm0610_long_term.c"></File> +<File RelativePath="gsm0610_lpc.c"></File> +<File RelativePath="gsm0610_preprocess.c"></File> +<File RelativePath="gsm0610_rpe.c"></File> +<File RelativePath="gsm0610_short_term.c"></File> +<File RelativePath="hdlc.c"></File> +<File RelativePath="ima_adpcm.c"></File> +<File RelativePath="logging.c"></File> +<File RelativePath="lpc10_analyse.c"></File> +<File RelativePath="lpc10_decode.c"></File> +<File RelativePath="lpc10_encode.c"></File> +<File RelativePath="lpc10_placev.c"></File> +<File RelativePath="lpc10_voicing.c"></File> +<File RelativePath="modem_echo.c"></File> +<File RelativePath="modem_connect_tones.c"></File> +<File RelativePath="noise.c"></File> +<File RelativePath="oki_adpcm.c"></File> +<File RelativePath="playout.c"></File> +<File RelativePath="plc.c"></File> +<File RelativePath="power_meter.c"></File> +<File RelativePath="queue.c"></File> +<File RelativePath="schedule.c"></File> +<File RelativePath="sig_tone.c"></File> +<File RelativePath="silence_gen.c"></File> +<File RelativePath="super_tone_rx.c"></File> +<File RelativePath="super_tone_tx.c"></File> +<File RelativePath="t4.c"></File> +<File RelativePath="t30.c"></File> +<File RelativePath="t30_api.c"></File> +<File RelativePath="t30_logging.c"></File> +<File RelativePath="t31.c"></File> +<File RelativePath="t35.c"></File> +<File RelativePath="t38_core.c"></File> +<File RelativePath="t38_gateway.c"></File> +<File RelativePath="t38_non_ecm_buffer.c"></File> +<File RelativePath="t38_terminal.c"></File> +<File RelativePath="testcpuid.c"></File> +<File RelativePath="time_scale.c"></File> +<File RelativePath="tone_detect.c"></File> +<File RelativePath="tone_generate.c"></File> +<File RelativePath="v17rx.c"></File> +<File RelativePath="v17tx.c"></File> +<File RelativePath="v22bis_rx.c"></File> +<File RelativePath="v22bis_tx.c"></File> +<File RelativePath="v27ter_rx.c"></File> +<File RelativePath="v27ter_tx.c"></File> +<File RelativePath="v29rx.c"></File> +<File RelativePath="v29tx.c"></File> +<File RelativePath="v42.c"></File> +<File RelativePath="v42bis.c"></File> +<File RelativePath="v8.c"></File> +<File RelativePath="vector_float.c"></File> +<File RelativePath="vector_int.c"></File> +<File RelativePath=".\msvc\gettimeofday.c"></File> +</Filter><Filter Name="Header Files"> +<File RelativePath="spandsp/adsi.h"></File> +<File RelativePath="spandsp/async.h"></File> +<File RelativePath="spandsp/arctan2.h"></File> +<File RelativePath="spandsp/at_interpreter.h"></File> +<File RelativePath="spandsp/awgn.h"></File> +<File RelativePath="spandsp/bell_r2_mf.h"></File> +<File RelativePath="spandsp/bert.h"></File> +<File RelativePath="spandsp/biquad.h"></File> +<File RelativePath="spandsp/bit_operations.h"></File> +<File RelativePath="spandsp/bitstream.h"></File> +<File RelativePath="spandsp/crc.h"></File> +<File RelativePath="spandsp/complex.h"></File> +<File RelativePath="spandsp/complex_filters.h"></File> +<File RelativePath="spandsp/complex_vector_float.h"></File> +<File RelativePath="spandsp/complex_vector_int.h"></File> +<File RelativePath="spandsp/dc_restore.h"></File> +<File RelativePath="spandsp/dds.h"></File> +<File RelativePath="spandsp/dtmf.h"></File> +<File RelativePath="spandsp/echo.h"></File> +<File RelativePath="spandsp/fast_convert.h"></File> +<File RelativePath="spandsp/fax.h"></File> +<File RelativePath="spandsp/fax_modems.h"></File> +<File RelativePath="spandsp/fir.h"></File> +<File RelativePath="spandsp/fsk.h"></File> +<File RelativePath="spandsp/g168models.h"></File> +<File RelativePath="spandsp/g711.h"></File> +<File RelativePath="spandsp/g722.h"></File> +<File RelativePath="spandsp/g726.h"></File> +<File RelativePath="spandsp/gsm0610.h"></File> +<File RelativePath="spandsp/hdlc.h"></File> +<File RelativePath="spandsp/ima_adpcm.h"></File> +<File RelativePath="spandsp/logging.h"></File> +<File RelativePath="spandsp/lpc10.h"></File> +<File RelativePath="spandsp/modem_echo.h"></File> +<File RelativePath="spandsp/modem_connect_tones.h"></File> +<File RelativePath="spandsp/noise.h"></File> +<File RelativePath="spandsp/oki_adpcm.h"></File> +<File RelativePath="spandsp/playout.h"></File> +<File RelativePath="spandsp/plc.h"></File> +<File RelativePath="spandsp/power_meter.h"></File> +<File RelativePath="spandsp/queue.h"></File> +<File RelativePath="spandsp/saturated.h"></File> +<File RelativePath="spandsp/schedule.h"></File> +<File RelativePath="spandsp/sig_tone.h"></File> +<File RelativePath="spandsp/silence_gen.h"></File> +<File RelativePath="spandsp/super_tone_rx.h"></File> +<File RelativePath="spandsp/super_tone_tx.h"></File> +<File RelativePath="spandsp/t4.h"></File> +<File RelativePath="spandsp/t30.h"></File> +<File RelativePath="spandsp/t30_api.h"></File> +<File RelativePath="spandsp/t30_fcf.h"></File> +<File RelativePath="spandsp/t30_logging.h"></File> +<File RelativePath="spandsp/t31.h"></File> +<File RelativePath="spandsp/t35.h"></File> +<File RelativePath="spandsp/t38_core.h"></File> +<File RelativePath="spandsp/t38_gateway.h"></File> +<File RelativePath="spandsp/t38_non_ecm_buffer.h"></File> +<File RelativePath="spandsp/t38_terminal.h"></File> +<File RelativePath="spandsp/telephony.h"></File> +<File RelativePath="spandsp/time_scale.h"></File> +<File RelativePath="spandsp/timing.h"></File> +<File RelativePath="spandsp/tone_detect.h"></File> +<File RelativePath="spandsp/tone_generate.h"></File> +<File RelativePath="spandsp/v17rx.h"></File> +<File RelativePath="spandsp/v17tx.h"></File> +<File RelativePath="spandsp/v22bis.h"></File> +<File RelativePath="spandsp/v27ter_rx.h"></File> +<File RelativePath="spandsp/v27ter_tx.h"></File> +<File RelativePath="spandsp/v29rx.h"></File> +<File RelativePath="spandsp/v29tx.h"></File> +<File RelativePath="spandsp/v42.h"></File> +<File RelativePath="spandsp/v42bis.h"></File> +<File RelativePath="spandsp/v8.h"></File> +<File RelativePath="spandsp/vector_float.h"></File> +<File RelativePath="spandsp/vector_int.h"></File> +<File RelativePath="spandsp/version.h"></File> +<File RelativePath="spandsp/private/adsi.h"></File> +<File RelativePath="spandsp/private/async.h"></File> +<File RelativePath="spandsp/private/at_interpreter.h"></File> +<File RelativePath="spandsp/private/awgn.h"></File> +<File RelativePath="spandsp/private/bell_r2_mf.h"></File> +<File RelativePath="spandsp/private/bert.h"></File> +<File RelativePath="spandsp/private/bitstream.h"></File> +<File RelativePath="spandsp/private/dtmf.h"></File> +<File RelativePath="spandsp/private/fax.h"></File> +<File RelativePath="spandsp/private/fax_modems.h"></File> +<File RelativePath="spandsp/private/fsk.h"></File> +<File RelativePath="spandsp/private/g711.h"></File> +<File RelativePath="spandsp/private/g722.h"></File> +<File RelativePath="spandsp/private/g726.h"></File> +<File RelativePath="spandsp/private/gsm0610.h"></File> +<File RelativePath="spandsp/private/hdlc.h"></File> +<File RelativePath="spandsp/private/ima_adpcm.h"></File> +<File RelativePath="spandsp/private/logging.h"></File> +<File RelativePath="spandsp/private/lpc10.h"></File> +<File RelativePath="spandsp/private/modem_connect_tones.h"></File> +<File RelativePath="spandsp/private/noise.h"></File> +<File RelativePath="spandsp/private/oki_adpcm.h"></File> +<File RelativePath="spandsp/private/queue.h"></File> +<File RelativePath="spandsp/private/schedule.h"></File> +<File RelativePath="spandsp/private/sig_tone.h"></File> +<File RelativePath="spandsp/private/super_tone_rx.h"></File> +<File RelativePath="spandsp/private/super_tone_tx.h"></File> +<File RelativePath="spandsp/private/t30.h"></File> +<File RelativePath="spandsp/private/t31.h"></File> +<File RelativePath="spandsp/private/t38_core.h"></File> +<File RelativePath="spandsp/private/t38_gateway.h"></File> +<File RelativePath="spandsp/private/t38_non_ecm_buffer.h"></File> +<File RelativePath="spandsp/private/t38_terminal.h"></File> +<File RelativePath="spandsp/private/t4.h"></File> +<File RelativePath="spandsp/private/time_scale.h"></File> +<File RelativePath="spandsp/private/tone_detect.h"></File> +<File RelativePath="spandsp/private/tone_generate.h"></File> +<File RelativePath="spandsp/private/v17rx.h"></File> +<File RelativePath="spandsp/private/v17tx.h"></File> +<File RelativePath="spandsp/private/v22bis.h"></File> +<File RelativePath="spandsp/private/v27ter_rx.h"></File> +<File RelativePath="spandsp/private/v27ter_tx.h"></File> +<File RelativePath="spandsp/private/v29rx.h"></File> +<File RelativePath="spandsp/private/v29tx.h"></File> +<File RelativePath="spandsp/private/v42.h"></File> +<File RelativePath="spandsp/private/v42bis.h"></File> +<File RelativePath="spandsp/private/v8.h"></File> +<File RelativePath="spandsp/expose.h"></File> +<File RelativePath="spandsp.h"></File> + </Filter> + <File + RelativePath=".\msvc\spandsp.h" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" + Outputs="$(SolutionDir)$(InputFileName)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" + Outputs="$(SolutionDir)$(InputFileName)" + /> + </FileConfiguration> + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/trunk/libs/spandsp/src/libspandsp.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/spandsp/src/libspandsp.2008.vcproj (original) +++ freeswitch/trunk/libs/spandsp/src/libspandsp.2008.vcproj Wed Feb 25 00:26:03 2009 @@ -8,65 +8,39 @@ Keyword="Win32Proj" TargetFrameworkVersion="131072" > - <Platforms> - <Platform + <Platforms> + <Platform Name="Win32" /> - <Platform + <Platform Name="x64" /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)Debug" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" CharacterSet="1" - BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool + <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=".;.\spandsp;.\msvc;"..\..\tiff-3.8.2\libtiff"" + 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" RuntimeLibrary="3" UsePrecompiledHeader="0" - ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb" WarningLevel="4" DebugInformationFormat="4" CompileAs="1" DisableSpecificWarnings="4127" /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool + <Tool Name="VCLinkerTool" LinkIncremental="2" GenerateDebugInformation="true" @@ -76,73 +50,26 @@ ImportLibrary="./Debug\spandsp.lib" TargetMachine="1" /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration + </Configuration> + <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)Release" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" CharacterSet="1" WholeProgramOptimization="1" - BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool + <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=".;.\spandsp;.\msvc;"..\..\tiff-3.8.2\libtiff"" + 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" - ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb" WarningLevel="4" DebugInformationFormat="3" DisableSpecificWarnings="4127" /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool + <Tool Name="VCLinkerTool" LinkIncremental="1" GenerateDebugInformation="true" @@ -154,51 +81,15 @@ ImportLibrary="./Release\spandsp.lib" TargetMachine="1" /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration + </Configuration> + <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" CharacterSet="1" > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool + <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff;.\generated" @@ -212,16 +103,7 @@ CompileAs="1" DisableSpecificWarnings="4127" /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool + <Tool Name="VCLinkerTool" LinkIncremental="2" GenerateDebugInformation="true" @@ -231,29 +113,8 @@ ImportLibrary="$(TargetDir)spandsp.lib" TargetMachine="17" /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration + </Configuration> + <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" @@ -261,22 +122,7 @@ CharacterSet="1" WholeProgramOptimization="1" > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool + <Tool Name="VCCLCompilerTool" 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" @@ -286,16 +132,7 @@ DebugInformationFormat="3" DisableSpecificWarnings="4127" /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool + <Tool Name="VCLinkerTool" LinkIncremental="1" GenerateDebugInformation="true" @@ -307,879 +144,266 @@ ImportLibrary="$(TargetDir)spandsp.lib" TargetMachine="17" /> - <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> - <Filter + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter Name="Source Files" Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - <File - RelativePath="adsi.c" - > - </File> - <File - RelativePath="async.c" - > - </File> - <File - RelativePath="at_interpreter.c" - > - </File> - <File - RelativePath="awgn.c" - > - </File> - <File - RelativePath="bell_r2_mf.c" - > - </File> - <File - RelativePath="bert.c" - > - </File> - <File - RelativePath="bit_operations.c" - > - </File> - <File - RelativePath="bitstream.c" - > - </File> - <File - RelativePath="complex_filters.c" - > - </File> - <File - RelativePath="complex_vector_float.c" - > - </File> - <File - RelativePath="complex_vector_int.c" - > - </File> - <File - RelativePath="crc.c" - > - </File> - <File - RelativePath="dds_float.c" - > - </File> - <File - RelativePath="dds_int.c" - > - </File> - <File - RelativePath="dtmf.c" - > - </File> - <File - RelativePath="echo.c" - > - </File> - <File - RelativePath="fax.c" - > - </File> - <File - RelativePath="fax_modems.c" - > - </File> - <File - RelativePath="fsk.c" - > - </File> - <File - RelativePath="g711.c" - > - </File> - <File - RelativePath="g722.c" - > - </File> - <File - RelativePath="g726.c" - > - </File> - <File - RelativePath=".\msvc\gettimeofday.c" - > - </File> - <File - RelativePath="gsm0610_decode.c" - > - </File> - <File - RelativePath="gsm0610_encode.c" - > - </File> - <File - RelativePath="gsm0610_long_term.c" - > - </File> - <File - RelativePath="gsm0610_lpc.c" - > - </File> - <File - RelativePath="gsm0610_preprocess.c" - > - </File> - <File - RelativePath="gsm0610_rpe.c" - > - </File> - <File - RelativePath="gsm0610_short_term.c" - > - </File> - <File - RelativePath="hdlc.c" - > - </File> - <File - RelativePath="ima_adpcm.c" - > - </File> - <File - RelativePath="logging.c" - > - </File> - <File - RelativePath="lpc10_analyse.c" - > - </File> - <File - RelativePath="lpc10_decode.c" - > - </File> - <File - RelativePath="lpc10_encode.c" - > - </File> - <File - RelativePath="lpc10_placev.c" - > - </File> - <File - RelativePath="lpc10_voicing.c" - > - </File> - <File - RelativePath="modem_connect_tones.c" - > - </File> - <File - RelativePath="modem_echo.c" - > - </File> - <File - RelativePath="noise.c" - > - </File> - <File - RelativePath="oki_adpcm.c" - > - </File> - <File - RelativePath="playout.c" - > - </File> - <File - RelativePath="plc.c" - > - </File> - <File - RelativePath="power_meter.c" - > - </File> - <File - RelativePath="queue.c" - > - </File> - <File - RelativePath="schedule.c" - > - </File> - <File - RelativePath="sig_tone.c" - > - </File> - <File - RelativePath="silence_gen.c" - > - </File> - <File - RelativePath="super_tone_rx.c" - > - </File> - <File - RelativePath="super_tone_tx.c" - > - </File> - <File - RelativePath="t30.c" - > - </File> - <File - RelativePath="t30_api.c" - > - </File> - <File - RelativePath="t30_logging.c" - > - </File> - <File - RelativePath="t31.c" - > - </File> - <File - RelativePath="t35.c" - > - </File> - <File - RelativePath="t38_core.c" - > - </File> - <File - RelativePath="t38_gateway.c" - > - </File> - <File - RelativePath="t38_non_ecm_buffer.c" - > - </File> - <File - RelativePath="t38_terminal.c" - > - </File> - <File - RelativePath="t4.c" - > - </File> - <File - RelativePath="testcpuid.c" - > - </File> - <File - RelativePath="time_scale.c" - > - </File> - <File - RelativePath="tone_detect.c" - > - </File> - <File - RelativePath="tone_generate.c" - > - </File> - <File - RelativePath="v17rx.c" - > - </File> - <File - RelativePath="v17tx.c" - > - </File> - <File - RelativePath="v22bis_rx.c" - > - </File> - <File - RelativePath="v22bis_tx.c" - > - </File> - <File - RelativePath="v27ter_rx.c" - > - </File> - <File - RelativePath="v27ter_tx.c" - > - </File> - <File - RelativePath="v29rx.c" - > - </File> - <File - RelativePath="v29tx.c" - > - </File> - <File - RelativePath="v42.c" - > - </File> - <File - RelativePath="v42bis.c" - > - </File> - <File - RelativePath="v8.c" - > - </File> - <File - RelativePath="vector_float.c" - > - </File> - <File - RelativePath="vector_int.c" - > - </File> - </Filter> - <Filter - Name="Header Files" - > - <File - RelativePath="spandsp.h" - > - </File> - <File - RelativePath="spandsp/adsi.h" - > - </File> - <File - RelativePath="spandsp/arctan2.h" - > - </File> - <File - RelativePath="spandsp/async.h" - > - </File> - <File - RelativePath="spandsp/at_interpreter.h" - > - </File> - <File - RelativePath="spandsp/awgn.h" - > - </File> - <File - RelativePath="spandsp/bell_r2_mf.h" - > - </File> - <File - RelativePath="spandsp/bert.h" - > - </File> - <File - RelativePath="spandsp/biquad.h" - > - </File> - <File - RelativePath="spandsp/bit_operations.h" - > - </File> - <File - RelativePath="spandsp/bitstream.h" - > - </File> - <File - RelativePath="spandsp/complex.h" - > - </File> - <File - RelativePath="spandsp/complex_filters.h" - > - </File> - <File - RelativePath="spandsp/complex_vector_float.h" - > - </File> - <File - RelativePath="spandsp/complex_vector_int.h" - > - </File> - <File - RelativePath="spandsp/crc.h" - > - </File> - <File - RelativePath="spandsp/dc_restore.h" - > - </File> - <File - RelativePath="spandsp/dds.h" - > - </File> - <File - RelativePath="spandsp/dtmf.h" - > - </File> - <File - RelativePath="spandsp/echo.h" - > - </File> - <File - RelativePath="spandsp/expose.h" - > - </File> - <File - RelativePath="spandsp/fast_convert.h" - > - </File> - <File - RelativePath="spandsp/fax.h" - > - </File> - <File - RelativePath="spandsp/fax_modems.h" - > - </File> - <File - RelativePath="spandsp/fir.h" - > - </File> - <File - RelativePath="spandsp/fsk.h" - > - </File> - <File - RelativePath="spandsp/g168models.h" - > - </File> - <File - RelativePath="spandsp/g711.h" - > - </File> - <File - RelativePath="spandsp/g722.h" - > - </File> - <File - RelativePath="spandsp/g726.h" - > - </File> - <File - RelativePath="spandsp/gsm0610.h" - > - </File> - <File - RelativePath="spandsp/hdlc.h" - > - </File> - <File - RelativePath="spandsp/ima_adpcm.h" - > - </File> - <File - RelativePath="spandsp/logging.h" - > - </File> - <File - RelativePath="spandsp/lpc10.h" - > - </File> - <File - RelativePath="spandsp/modem_connect_tones.h" - > - </File> - <File - RelativePath="spandsp/modem_echo.h" - > - </File> - <File - RelativePath="spandsp/noise.h" - > - </File> - <File - RelativePath="spandsp/oki_adpcm.h" - > - </File> - <File - RelativePath="spandsp/playout.h" - > - </File> - <File - RelativePath="spandsp/plc.h" - > - </File> - <File - RelativePath="spandsp/power_meter.h" - > - </File> - <File - RelativePath="spandsp/private/adsi.h" - > - </File> - <File - RelativePath="spandsp/private/async.h" - > - </File> - <File - RelativePath="spandsp/private/at_interpreter.h" - > - </File> - <File - RelativePath="spandsp/private/awgn.h" - > - </File> - <File - RelativePath="spandsp/private/bell_r2_mf.h" - > - </File> - <File - RelativePath="spandsp/private/bert.h" - > - </File> - <File - RelativePath="spandsp/private/bitstream.h" - > - </File> - <File - RelativePath="spandsp/private/dtmf.h" - > - </File> - <File - RelativePath="spandsp/private/fax.h" - > - </File> - <File - RelativePath="spandsp/private/fax_modems.h" - > - </File> - <File - RelativePath="spandsp/private/fsk.h" - > - </File> - <File - RelativePath="spandsp/private/g711.h" - > - </File> - <File - RelativePath="spandsp/private/g722.h" - > - </File> - <File - RelativePath="spandsp/private/g726.h" - > - </File> - <File - RelativePath="spandsp/private/gsm0610.h" - > - </File> - <File - RelativePath="spandsp/private/hdlc.h" - > - </File> - <File - RelativePath="spandsp/private/ima_adpcm.h" - > - </File> - <File - RelativePath="spandsp/private/logging.h" - > - </File> - <File - RelativePath="spandsp/private/lpc10.h" - > - </File> - <File - RelativePath="spandsp/private/modem_connect_tones.h" - > - </File> - <File - RelativePath="spandsp/private/noise.h" - > - </File> - <File - RelativePath="spandsp/private/oki_adpcm.h" - > - </File> - <File - RelativePath="spandsp/private/queue.h" - > - </File> - <File - RelativePath="spandsp/private/schedule.h" - > - </File> - <File - RelativePath="spandsp/private/sig_tone.h" - > - </File> - <File - RelativePath="spandsp/private/super_tone_rx.h" - > - </File> - <File - RelativePath="spandsp/private/super_tone_tx.h" - > - </File> - <File - RelativePath="spandsp/private/t30.h" - > - </File> - <File - RelativePath="spandsp/private/t31.h" - > - </File> - <File - RelativePath="spandsp/private/t38_core.h" - > - </File> - <File - RelativePath="spandsp/private/t38_gateway.h" - > - </File> - <File - RelativePath="spandsp/private/t38_non_ecm_buffer.h" - > - </File> - <File - RelativePath="spandsp/private/t38_terminal.h" - > - </File> - <File - RelativePath="spandsp/private/t4.h" - > - </File> - <File - RelativePath="spandsp/private/time_scale.h" - > - </File> - <File - RelativePath="spandsp/private/tone_detect.h" - > - </File> - <File - RelativePath="spandsp/private/tone_generate.h" - > - </File> - <File - RelativePath="spandsp/private/v17rx.h" - > - </File> - <File - RelativePath="spandsp/private/v17tx.h" - > - </File> - <File - RelativePath="spandsp/private/v22bis.h" - > - </File> - <File - RelativePath="spandsp/private/v27ter_rx.h" - > - </File> - <File - RelativePath="spandsp/private/v27ter_tx.h" - > - </File> - <File - RelativePath="spandsp/private/v29rx.h" - > - </File> - <File - RelativePath="spandsp/private/v29tx.h" - > - </File> - <File - RelativePath="spandsp/private/v42.h" - > - </File> - <File - RelativePath="spandsp/private/v42bis.h" - > - </File> - <File - RelativePath="spandsp/private/v8.h" - > - </File> - <File - RelativePath="spandsp/queue.h" - > - </File> - <File - RelativePath="spandsp/saturated.h" - > - </File> - <File - RelativePath="spandsp/schedule.h" - > - </File> - <File - RelativePath="spandsp/sig_tone.h" - > - </File> - <File - RelativePath="spandsp/silence_gen.h" - > - </File> - <File - RelativePath="spandsp/super_tone_rx.h" - > - </File> - <File - RelativePath="spandsp/super_tone_tx.h" - > - </File> - <File - RelativePath="spandsp/t30.h" - > - </File> - <File - RelativePath="spandsp/t30_api.h" - > - </File> - <File - RelativePath="spandsp/t30_fcf.h" - > - </File> - <File - RelativePath="spandsp/t30_logging.h" - > - </File> - <File - RelativePath="spandsp/t31.h" - > - </File> - <File - RelativePath="spandsp/t35.h" - > - </File> - <File - RelativePath="spandsp/t38_core.h" - > - </File> - <File - RelativePath="spandsp/t38_gateway.h" - > - </File> - <File - RelativePath="spandsp/t38_non_ecm_buffer.h" - > - </File> - <File - RelativePath="spandsp/t38_terminal.h" - > - </File> - <File - RelativePath="spandsp/t4.h" - > - </File> - <File - RelativePath="spandsp/telephony.h" - > - </File> - <File - RelativePath="spandsp/time_scale.h" - > - </File> - <File - RelativePath="spandsp/timing.h" - > - </File> - <File - RelativePath="spandsp/tone_detect.h" - > - </File> - <File - RelativePath="spandsp/tone_generate.h" - > - </File> - <File - RelativePath="spandsp/v17rx.h" - > - </File> - <File - RelativePath="spandsp/v17tx.h" - > - </File> - <File - RelativePath="spandsp/v22bis.h" - > - </File> - <File - RelativePath="spandsp/v27ter_rx.h" - > - </File> - <File - RelativePath="spandsp/v27ter_tx.h" - > - </File> - <File - RelativePath="spandsp/v29rx.h" - > - </File> - <File - RelativePath="spandsp/v29tx.h" - > - </File> - <File - RelativePath="spandsp/v42.h" - > - </File> - <File - RelativePath="spandsp/v42bis.h" - > - </File> - <File - RelativePath="spandsp/v8.h" - > - </File> - <File - RelativePath="spandsp/vector_float.h" - > - </File> - <File - RelativePath="spandsp/vector_int.h" - > - </File> - <File - RelativePath="spandsp/version.h" - > - </File> - </Filter> - <File - RelativePath=".\msvc\spandsp.h" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCustomBuildTool" - Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" - CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" - Outputs="$(SolutionDir)$(InputFileName)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCustomBuildTool" - Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" - CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" - Outputs="$(SolutionDir)$(InputFileName)" - /> - </FileConfiguration> - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> +<File RelativePath="adsi.c"></File> +<File RelativePath="async.c"></File> +<File RelativePath="at_interpreter.c"></File> +<File RelativePath="awgn.c"></File> +<File RelativePath="bell_r2_mf.c"></File> +<File RelativePath="bert.c"></File> +<File RelativePath="bit_operations.c"></File> +<File RelativePath="bitstream.c"></File> +<File RelativePath="complex_filters.c"></File> +<File RelativePath="complex_vector_float.c"></File> +<File RelativePath="complex_vector_int.c"></File> +<File RelativePath="crc.c"></File> +<File RelativePath="dds_float.c"></File> +<File RelativePath="dds_int.c"></File> +<File RelativePath="dtmf.c"></File> +<File RelativePath="echo.c"></File> +<File RelativePath="fax.c"></File> +<File RelativePath="fax_modems.c"></File> +<File RelativePath="fsk.c"></File> +<File RelativePath="g711.c"></File> +<File RelativePath="g722.c"></File> +<File RelativePath="g726.c"></File> +<File RelativePath="gsm0610_decode.c"></File> +<File RelativePath="gsm0610_encode.c"></File> +<File RelativePath="gsm0610_long_term.c"></File> +<File RelativePath="gsm0610_lpc.c"></File> +<File RelativePath="gsm0610_preprocess.c"></File> +<File RelativePath="gsm0610_rpe.c"></File> +<File RelativePath="gsm0610_short_term.c"></File> +<File RelativePath="hdlc.c"></File> +<File RelativePath="ima_adpcm.c"></File> +<File RelativePath="logging.c"></File> +<File RelativePath="lpc10_analyse.c"></File> +<File RelativePath="lpc10_decode.c"></File> +<File RelativePath="lpc10_encode.c"></File> +<File RelativePath="lpc10_placev.c"></File> +<File RelativePath="lpc10_voicing.c"></File> +<File RelativePath="modem_echo.c"></File> +<File RelativePath="modem_connect_tones.c"></File> +<File RelativePath="noise.c"></File> +<File RelativePath="oki_adpcm.c"></File> +<File RelativePath="playout.c"></File> +<File RelativePath="plc.c"></File> +<File RelativePath="power_meter.c"></File> +<File RelativePath="queue.c"></File> +<File RelativePath="schedule.c"></File> +<File RelativePath="sig_tone.c"></File> +<File RelativePath="silence_gen.c"></File> +<File RelativePath="super_tone_rx.c"></File> +<File RelativePath="super_tone_tx.c"></File> +<File RelativePath="t4.c"></File> +<File RelativePath="t30.c"></File> +<File RelativePath="t30_api.c"></File> +<File RelativePath="t30_logging.c"></File> +<File RelativePath="t31.c"></File> +<File RelativePath="t35.c"></File> +<File RelativePath="t38_core.c"></File> +<File RelativePath="t38_gateway.c"></File> +<File RelativePath="t38_non_ecm_buffer.c"></File> +<File RelativePath="t38_terminal.c"></File> +<File RelativePath="testcpuid.c"></File> +<File RelativePath="time_scale.c"></File> +<File RelativePath="tone_detect.c"></File> +<File RelativePath="tone_generate.c"></File> +<File RelativePath="v17rx.c"></File> +<File RelativePath="v17tx.c"></File> +<File RelativePath="v22bis_rx.c"></File> +<File RelativePath="v22bis_tx.c"></File> +<File RelativePath="v27ter_rx.c"></File> +<File RelativePath="v27ter_tx.c"></File> +<File RelativePath="v29rx.c"></File> +<File RelativePath="v29tx.c"></File> +<File RelativePath="v42.c"></File> +<File RelativePath="v42bis.c"></File> +<File RelativePath="v8.c"></File> +<File RelativePath="vector_float.c"></File> +<File RelativePath="vector_int.c"></File> +<File RelativePath=".\msvc\gettimeofday.c"></File> +</Filter><Filter Name="Header Files"> +<File RelativePath="spandsp/adsi.h"></File> +<File RelativePath="spandsp/async.h"></File> +<File RelativePath="spandsp/arctan2.h"></File> +<File RelativePath="spandsp/at_interpreter.h"></File> +<File RelativePath="spandsp/awgn.h"></File> +<File RelativePath="spandsp/bell_r2_mf.h"></File> +<File RelativePath="spandsp/bert.h"></File> +<File RelativePath="spandsp/biquad.h"></File> +<File RelativePath="spandsp/bit_operations.h"></File> +<File RelativePath="spandsp/bitstream.h"></File> +<File RelativePath="spandsp/crc.h"></File> +<File RelativePath="spandsp/complex.h"></File> +<File RelativePath="spandsp/complex_filters.h"></File> +<File RelativePath="spandsp/complex_vector_float.h"></File> +<File RelativePath="spandsp/complex_vector_int.h"></File> +<File RelativePath="spandsp/dc_restore.h"></File> +<File RelativePath="spandsp/dds.h"></File> +<File RelativePath="spandsp/dtmf.h"></File> +<File RelativePath="spandsp/echo.h"></File> +<File RelativePath="spandsp/fast_convert.h"></File> +<File RelativePath="spandsp/fax.h"></File> +<File RelativePath="spandsp/fax_modems.h"></File> +<File RelativePath="spandsp/fir.h"></File> +<File RelativePath="spandsp/fsk.h"></File> +<File RelativePath="spandsp/g168models.h"></File> +<File RelativePath="spandsp/g711.h"></File> +<File RelativePath="spandsp/g722.h"></File> +<File RelativePath="spandsp/g726.h"></File> +<File RelativePath="spandsp/gsm0610.h"></File> +<File RelativePath="spandsp/hdlc.h"></File> +<File RelativePath="spandsp/ima_adpcm.h"></File> +<File RelativePath="spandsp/logging.h"></File> +<File RelativePath="spandsp/lpc10.h"></File> +<File RelativePath="spandsp/modem_echo.h"></File> +<File RelativePath="spandsp/modem_connect_tones.h"></File> +<File RelativePath="spandsp/noise.h"></File> +<File RelativePath="spandsp/oki_adpcm.h"></File> +<File RelativePath="spandsp/playout.h"></File> +<File RelativePath="spandsp/plc.h"></File> +<File RelativePath="spandsp/power_meter.h"></File> +<File RelativePath="spandsp/queue.h"></File> +<File RelativePath="spandsp/saturated.h"></File> +<File RelativePath="spandsp/schedule.h"></File> +<File RelativePath="spandsp/sig_tone.h"></File> +<File RelativePath="spandsp/silence_gen.h"></File> +<File RelativePath="spandsp/super_tone_rx.h"></File> +<File RelativePath="spandsp/super_tone_tx.h"></File> +<File RelativePath="spandsp/t4.h"></File> +<File RelativePath="spandsp/t30.h"></File> +<File RelativePath="spandsp/t30_api.h"></File> +<File RelativePath="spandsp/t30_fcf.h"></File> +<File RelativePath="spandsp/t30_logging.h"></File> +<File RelativePath="spandsp/t31.h"></File> +<File RelativePath="spandsp/t35.h"></File> +<File RelativePath="spandsp/t38_core.h"></File> +<File RelativePath="spandsp/t38_gateway.h"></File> +<File RelativePath="spandsp/t38_non_ecm_buffer.h"></File> +<File RelativePath="spandsp/t38_terminal.h"></File> +<File RelativePath="spandsp/telephony.h"></File> +<File RelativePath="spandsp/time_scale.h"></File> +<File RelativePath="spandsp/timing.h"></File> +<File RelativePath="spandsp/tone_detect.h"></File> +<File RelativePath="spandsp/tone_generate.h"></File> +<File RelativePath="spandsp/v17rx.h"></File> +<File RelativePath="spandsp/v17tx.h"></File> +<File RelativePath="spandsp/v22bis.h"></File> +<File RelativePath="spandsp/v27ter_rx.h"></File> +<File RelativePath="spandsp/v27ter_tx.h"></File> +<File RelativePath="spandsp/v29rx.h"></File> +<File RelativePath="spandsp/v29tx.h"></File> +<File RelativePath="spandsp/v42.h"></File> +<File RelativePath="spandsp/v42bis.h"></File> +<File RelativePath="spandsp/v8.h"></File> +<File RelativePath="spandsp/vector_float.h"></File> +<File RelativePath="spandsp/vector_int.h"></File> +<File RelativePath="spandsp/version.h"></File> +<File RelativePath="spandsp/private/adsi.h"></File> +<File RelativePath="spandsp/private/async.h"></File> +<File RelativePath="spandsp/private/at_interpreter.h"></File> +<File RelativePath="spandsp/private/awgn.h"></File> +<File RelativePath="spandsp/private/bell_r2_mf.h"></File> +<File RelativePath="spandsp/private/bert.h"></File> +<File RelativePath="spandsp/private/bitstream.h"></File> +<File RelativePath="spandsp/private/dtmf.h"></File> +<File RelativePath="spandsp/private/fax.h"></File> +<File RelativePath="spandsp/private/fax_modems.h"></File> +<File RelativePath="spandsp/private/fsk.h"></File> +<File RelativePath="spandsp/private/g711.h"></File> +<File RelativePath="spandsp/private/g722.h"></File> +<File RelativePath="spandsp/private/g726.h"></File> +<File RelativePath="spandsp/private/gsm0610.h"></File> +<File RelativePath="spandsp/private/hdlc.h"></File> +<File RelativePath="spandsp/private/ima_adpcm.h"></File> +<File RelativePath="spandsp/private/logging.h"></File> +<File RelativePath="spandsp/private/lpc10.h"></File> +<File RelativePath="spandsp/private/modem_connect_tones.h"></File> +<File RelativePath="spandsp/private/noise.h"></File> +<File RelativePath="spandsp/private/oki_adpcm.h"></File> +<File RelativePath="spandsp/private/queue.h"></File> +<File RelativePath="spandsp/private/schedule.h"></File> +<File RelativePath="spandsp/private/sig_tone.h"></File> +<File RelativePath="spandsp/private/super_tone_rx.h"></File> +<File RelativePath="spandsp/private/super_tone_tx.h"></File> +<File RelativePath="spandsp/private/t30.h"></File> +<File RelativePath="spandsp/private/t31.h"></File> +<File RelativePath="spandsp/private/t38_core.h"></File> +<File RelativePath="spandsp/private/t38_gateway.h"></File> +<File RelativePath="spandsp/private/t38_non_ecm_buffer.h"></File> +<File RelativePath="spandsp/private/t38_terminal.h"></File> +<File RelativePath="spandsp/private/t4.h"></File> +<File RelativePath="spandsp/private/time_scale.h"></File> +<File RelativePath="spandsp/private/tone_detect.h"></File> +<File RelativePath="spandsp/private/tone_generate.h"></File> +<File RelativePath="spandsp/private/v17rx.h"></File> +<File RelativePath="spandsp/private/v17tx.h"></File> +<File RelativePath="spandsp/private/v22bis.h"></File> +<File RelativePath="spandsp/private/v27ter_rx.h"></File> +<File RelativePath="spandsp/private/v27ter_tx.h"></File> +<File RelativePath="spandsp/private/v29rx.h"></File> +<File RelativePath="spandsp/private/v29tx.h"></File> +<File RelativePath="spandsp/private/v42.h"></File> +<File RelativePath="spandsp/private/v42bis.h"></File> +<File RelativePath="spandsp/private/v8.h"></File> +<File RelativePath="spandsp/expose.h"></File> +<File RelativePath="spandsp.h"></File> + </Filter> + <File + RelativePath=".\msvc\spandsp.h" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" + Outputs="$(SolutionDir)$(InputFileName)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" + Outputs="$(SolutionDir)$(InputFileName)" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCustomBuildTool" + Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" + Outputs="$(SolutionDir)$(InputFileName)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCustomBuildTool" + Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" + Outputs="$(SolutionDir)$(InputFileName)" + /> + </FileConfiguration> + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.foot ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.foot (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.foot Wed Feb 25 00:26:03 2009 @@ -22,6 +22,26 @@ Outputs="$(SolutionDir)$(InputFileName)" /> </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCustomBuildTool" + Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" + Outputs="$(SolutionDir)$(InputFileName)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCustomBuildTool" + Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" + Outputs="$(SolutionDir)$(InputFileName)" + /> + </FileConfiguration> </File> </Files> <Globals>

1 0

[commit] r12272 - in freeswitch/trunk/libs/spandsp/src: . msvc msvc/sys
by FreeSWITCH SVN 25 Feb '09

25 Feb '09

Author: robertj Date: Tue Feb 24 23:45:36 2009 New Revision: 12272 Log: Added missing dependency on header file generator programs in 2005 solution file. Shuffled where various compatibility items of code are amongst the headers in msvc directory so: Not too many warnings are disabled in source file that includes spandsp.h A copy of the msvc/spandsp.h file to spandsp/src directory so project that uses it only needs to add one directory to search, or can even just explicitly put the path in for the spandsp.h file. Removal of need for windows.h to be implicitly included by user source file via spandsp.h, can cause conflicts. Some symbol conflicts with other libraries. Removed: freeswitch/trunk/libs/spandsp/src/msvc/spandsp.def Modified: freeswitch/trunk/libs/spandsp/src/Makefile.am freeswitch/trunk/libs/spandsp/src/libspandsp.2005.sln freeswitch/trunk/libs/spandsp/src/libspandsp.2008.vcproj freeswitch/trunk/libs/spandsp/src/libtiff.2005.vcproj freeswitch/trunk/libs/spandsp/src/libtiff.2008.vcproj freeswitch/trunk/libs/spandsp/src/msvc/config.h freeswitch/trunk/libs/spandsp/src/msvc/inttypes.h freeswitch/trunk/libs/spandsp/src/msvc/spandsp.h freeswitch/trunk/libs/spandsp/src/msvc/sys/time.h freeswitch/trunk/libs/spandsp/src/msvc/unistd.h freeswitch/trunk/libs/spandsp/src/msvc/vc8proj.foot freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.foot Modified: freeswitch/trunk/libs/spandsp/src/Makefile.am ============================================================================== --- freeswitch/trunk/libs/spandsp/src/Makefile.am (original) +++ freeswitch/trunk/libs/spandsp/src/Makefile.am Tue Feb 24 23:45:36 2009 @@ -467,12 +467,12 @@ $(srcdir)/msvc/spandsp.h: spandsp.h.in echo "creating $(srcdir)/msvc/spandsp.h" - @cp $(srcdir)/spandsp.h.in $(srcdir)/msvc/spandsp.h - @sed -i -e "s/\@SPANDSP_USE_FIXED_POINT\@/#undef SPANDSP_USE_FIXED_POINT/" $(srcdir)/msvc/spandsp.h - @sed -i -e "s/\@SPANDSP_MISALIGNED_ACCESS_FAILS\@/#undef SPANDSP_MISALIGNED_ACCESS_FAILS/" $(srcdir)/msvc/spandsp.h - @sed -i -e "s/\@SPANDSP_USE_EXPORT_CAPABILITY\@/#define SPANDSP_USE_EXPORT_CAPABILITY 1/" $(srcdir)/msvc/spandsp.h - @sed -i -e "s/\@INSERT_INTTYPES_HEADER\@/#include <inttypes.h>/" $(srcdir)/msvc/spandsp.h - @sed -i -e "s/\@INSERT_MATH_HEADER\@/#include <math.h>/" $(srcdir)/msvc/spandsp.h + @sed -e "s/#define _SPANDSP_H_/#define _SPANDSP_H_\n\n#define __inline__ __inline\n#pragma warning(disable:4200)/" \ + -e "s/\@SPANDSP_USE_FIXED_POINT\@/#undef SPANDSP_USE_FIXED_POINT/" \ + -e "s/\@SPANDSP_MISALIGNED_ACCESS_FAILS\@/#undef SPANDSP_MISALIGNED_ACCESS_FAILS/" \ + -e "s/\@SPANDSP_USE_EXPORT_CAPABILITY\@/#define SPANDSP_USE_EXPORT_CAPABILITY 1/" \ + -e "s/\@INSERT_INTTYPES_HEADER\@/#include <msvc\/inttypes.h>/" \ + -e "s/\@INSERT_MATH_HEADER\@/#include <math.h>/" $(srcdir)/spandsp.h.in > $(srcdir)/msvc/spandsp.h spandsp/version.h: NOWDATE=`date --utc +"%Y%m%d"` ; \ Modified: freeswitch/trunk/libs/spandsp/src/libspandsp.2005.sln ============================================================================== --- freeswitch/trunk/libs/spandsp/src/libspandsp.2005.sln (original) +++ freeswitch/trunk/libs/spandsp/src/libspandsp.2005.sln Tue Feb 24 23:45:36 2009 @@ -29,10 +29,12 @@ {DEE932AB-5911-4700-9EEB-8C7090A0A330}.All|Win32.ActiveCfg = All|Win32 {DEE932AB-5911-4700-9EEB-8C7090A0A330}.All|Win32.Build.0 = All|Win32 {DEE932AB-5911-4700-9EEB-8C7090A0A330}.Debug|Win32.ActiveCfg = All|Win32 + {DEE932AB-5911-4700-9EEB-8C7090A0A330}.Debug|Win32.Build.0 = All|Win32 {DEE932AB-5911-4700-9EEB-8C7090A0A330}.Release|Win32.ActiveCfg = All|Win32 {329A6FA0-0FCC-4435-A950-E670AEFA9838}.All|Win32.ActiveCfg = All|Win32 {329A6FA0-0FCC-4435-A950-E670AEFA9838}.All|Win32.Build.0 = All|Win32 {329A6FA0-0FCC-4435-A950-E670AEFA9838}.Debug|Win32.ActiveCfg = All|Win32 + {329A6FA0-0FCC-4435-A950-E670AEFA9838}.Debug|Win32.Build.0 = All|Win32 {329A6FA0-0FCC-4435-A950-E670AEFA9838}.Release|Win32.ActiveCfg = All|Win32 {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.All|Win32.ActiveCfg = Release|Win32 {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.All|Win32.Build.0 = Release|Win32 Modified: freeswitch/trunk/libs/spandsp/src/libspandsp.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/spandsp/src/libspandsp.2008.vcproj (original) +++ freeswitch/trunk/libs/spandsp/src/libspandsp.2008.vcproj Tue Feb 24 23:45:36 2009 @@ -99,11 +99,13 @@ /> </Configuration> <Configuration - Name="Debug|x64" - OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + Name="Release|Win32" + OutputDirectory="$(SolutionDir)Release" + IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" CharacterSet="1" + WholeProgramOptimization="1" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" @@ -122,16 +124,13 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" - 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" - RuntimeLibrary="3" + AdditionalIncludeDirectories=".;.\spandsp;.\msvc;"..\..\tiff-3.8.2\libtiff"" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" + RuntimeLibrary="2" UsePrecompiledHeader="0" + ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb" WarningLevel="4" DebugInformationFormat="3" - CompileAs="1" DisableSpecificWarnings="4127" /> <Tool @@ -145,13 +144,15 @@ /> <Tool Name="VCLinkerTool" - LinkIncremental="2" + LinkIncremental="1" GenerateDebugInformation="true" SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" - ImportLibrary="$(TargetDir)spandsp.lib" - TargetMachine="17" + ImportLibrary="./Release\spandsp.lib" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -176,13 +177,11 @@ /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)Release" - IntermediateDirectory="$(ConfigurationName)" + Name="Debug|x64" + OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" CharacterSet="1" - WholeProgramOptimization="1" - BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" @@ -201,13 +200,16 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=".;.\spandsp;.\msvc;"..\..\tiff-3.8.2\libtiff"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" - RuntimeLibrary="2" + Optimization="0" + 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" + RuntimeLibrary="3" UsePrecompiledHeader="0" - ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb" WarningLevel="4" DebugInformationFormat="3" + CompileAs="1" DisableSpecificWarnings="4127" /> <Tool @@ -221,15 +223,13 @@ /> <Tool Name="VCLinkerTool" - LinkIncremental="1" + LinkIncremental="2" GenerateDebugInformation="true" SubSystem="2" - OptimizeReferences="2" - EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" - ImportLibrary="./Release\spandsp.lib" - TargetMachine="1" + ImportLibrary="$(TargetDir)spandsp.lib" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -1155,12 +1155,30 @@ > </File> </Filter> - <Filter - Name="Resource Files" - Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" - UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + <File + RelativePath=".\msvc\spandsp.h" > - </Filter> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" + Outputs="$(SolutionDir)$(InputFileName)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" + Outputs="$(SolutionDir)$(InputFileName)" + /> + </FileConfiguration> + </File> </Files> <Globals> </Globals> Modified: freeswitch/trunk/libs/spandsp/src/libtiff.2005.vcproj ============================================================================== --- freeswitch/trunk/libs/spandsp/src/libtiff.2005.vcproj (original) +++ freeswitch/trunk/libs/spandsp/src/libtiff.2005.vcproj Tue Feb 24 23:45:36 2009 @@ -346,12 +346,6 @@ > </File> </Filter> - <Filter - Name="Resource Files" - Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" - UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" - > - </Filter> </Files> <Globals> </Globals> Modified: freeswitch/trunk/libs/spandsp/src/libtiff.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/spandsp/src/libtiff.2008.vcproj (original) +++ freeswitch/trunk/libs/spandsp/src/libtiff.2008.vcproj Tue Feb 24 23:45:36 2009 @@ -477,12 +477,6 @@ > </File> </Filter> - <Filter - Name="Resource Files" - Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" - UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" - > - </Filter> </Files> <Globals> </Globals> Modified: freeswitch/trunk/libs/spandsp/src/msvc/config.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/config.h (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/config.h Tue Feb 24 23:45:36 2009 @@ -37,12 +37,51 @@ #define SPANDSP_USE_EXPORT_CAPABILITY 1 -#ifdef __cplusplus -extern "C" { -#endif -#ifdef __cplusplus -} +#define PACKAGE "spandsp" +#define VERSION "0.0.6" + + + +// Win32/DevStudio compatibility stuff + +#ifdef _MSC_VER + + #if (_MSC_VER >= 1400) // VC8+ + #ifndef _CRT_SECURE_NO_DEPRECATE + #define _CRT_SECURE_NO_DEPRECATE + #endif + #ifndef _CRT_NONSTDC_NO_DEPRECATE + #define _CRT_NONSTDC_NO_DEPRECATE + #endif + #ifndef _CRT_SECURE_NO_WARNINGS + #define _CRT_SECURE_NO_WARNINGS + #endif + #endif // VC8+ + + // disable the following warnings + #pragma warning(disable:4100) // The formal parameter is not referenced in the body of the function. The unreferenced parameter is ignored. + #pragma warning(disable:4200) // Non standard extension C zero sized array + #pragma warning(disable:4706) // assignment within conditional expression + #pragma warning(disable:4244) // conversion from 'type1' to 'type2', possible loss of data + #pragma warning(disable:4295) // array is too small to include a terminating null character + #pragma warning(disable:4125) // decimal digit terminates octal escape sequence + #pragma warning(disable:4305) // 'function' : truncation from 'double' to 'float' + #pragma warning(disable:4018) // '<' : signed/unsigned mismatch + #pragma warning(disable:4389) // '==' : signed/unsigned mismatch + #pragma warning(disable:4245) // 'return' : conversion from 'int' to 'size_t', signed/unsigned mismatch + + #define strncasecmp _strnicmp + #define strcasecmp _stricmp + #define snprintf _snprintf + #define inline __inline + #define __inline__ __inline + + #define _MMX_H_ + + #include <malloc.h> // To get alloca + #endif + #endif 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 Tue Feb 24 23:45:36 2009 @@ -19,16 +19,7 @@ extern "C" { #endif -#ifdef _MSC_VER -#if (_MSC_VER >= 1400) // VC8+ -#ifndef _CRT_SECURE_NO_DEPRECATE -#define _CRT_SECURE_NO_DEPRECATE -#endif -#ifndef _CRT_NONSTDC_NO_DEPRECATE -#define _CRT_NONSTDC_NO_DEPRECATE -#endif -#endif // VC8+ -#include <windows.h> + typedef unsigned __int8 uint8_t; typedef unsigned __int16 uint16_t; typedef unsigned __int32 uint32_t; @@ -37,41 +28,12 @@ typedef __int16 int16_t; typedef __int32 int32_t; typedef __int64 int64_t; -#define inline __inline -#define __inline__ __inline #define INT16_MAX 0x7fff #define INT16_MIN (-INT16_MAX - 1) -#define _MMX_H_ - -/* disable the following warnings - * C4100: The formal parameter is not referenced in the body of the function. The unreferenced parameter is ignored. - * C4200: Non standard extension C zero sized array - * C4706: assignment within conditional expression - * C4244: conversion from 'type1' to 'type2', possible loss of data - * C4295: array is too small to include a terminating null character - * C4125: decimal digit terminates octal escape sequence - */ -#pragma warning(disable:4100 4200 4706 4295 4125) - -#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 #endif -#endif - -#define PACKAGE "spandsp" -#define VERSION "0.0.3andabit" #define INT32_MAX (2147483647) #define INT32_MIN (-2147483647 - 1) Modified: freeswitch/trunk/libs/spandsp/src/msvc/spandsp.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/spandsp.h (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/spandsp.h Tue Feb 24 23:45:36 2009 @@ -30,13 +30,17 @@ #if !defined(_SPANDSP_H_) #define _SPANDSP_H_ +#define __inline__ __inline +#pragma warning(disable:4200) + + #undef SPANDSP_USE_FIXED_POINT #undef SPANDSP_MISALIGNED_ACCESS_FAILS #define SPANDSP_USE_EXPORT_CAPABILITY 1 #include <stdlib.h> -#include <inttypes.h> +#include <msvc\inttypes.h> #include <string.h> #include <limits.h> #include <time.h> Modified: freeswitch/trunk/libs/spandsp/src/msvc/sys/time.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/sys/time.h (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/sys/time.h Tue Feb 24 23:45:36 2009 @@ -1 +1,20 @@ +/* + * SpanDSP - a series of DSP components for telephony + * + * sys/time.h - a fudge for MSVC, which lacks this header + * + * Written by Steve Underwood <steveu(a)coppice.org> + * + * Copyright (C) 2006 Michael Jerris + * + * + * This file is released in the public domain. + * + */ + +struct timeval { + long tv_sec; + long tv_usec; +}; + extern void gettimeofday(struct timeval *tv, void *tz); Modified: freeswitch/trunk/libs/spandsp/src/msvc/unistd.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/unistd.h (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/unistd.h Tue Feb 24 23:45:36 2009 @@ -1,7 +1,7 @@ /* * SpanDSP - a series of DSP components for telephony * - * inttypes.h - a fudge for MSVC, which lacks this header + * unistd.h - a fudge for MSVC, which lacks this header * * Written by Steve Underwood <steveu(a)coppice.org> * @@ -19,8 +19,9 @@ extern "C" { #endif -#define open _open -#define write _write +// Declare this so we don't have to include winsock.h, it causes numerous conflicts. +extern int __stdcall gethostname(char * name, int namelen); +#pragma comment(lib, "ws2_32.lib") extern int getopt(int argc, char *argv[], char *opstring); Modified: freeswitch/trunk/libs/spandsp/src/msvc/vc8proj.foot ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/vc8proj.foot (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/vc8proj.foot Tue Feb 24 23:45:36 2009 @@ -1,10 +1,28 @@ </Filter> - <Filter - Name="Resource Files" - Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" - UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + <File + RelativePath=".\msvc\spandsp.h" > - </Filter> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" + Outputs="$(SolutionDir)$(InputFileName)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" + Outputs="$(SolutionDir)$(InputFileName)" + /> + </FileConfiguration> + </File> </Files> <Globals> </Globals> Modified: freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.foot ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.foot (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.foot Tue Feb 24 23:45:36 2009 @@ -1,10 +1,28 @@ </Filter> - <Filter - Name="Resource Files" - Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" - UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + <File + RelativePath=".\msvc\spandsp.h" > - </Filter> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" + Outputs="$(SolutionDir)$(InputFileName)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" + Outputs="$(SolutionDir)$(InputFileName)" + /> + </FileConfiguration> + </File> </Files> <Globals> </Globals>

1 0

[commit] r12271 - in freeswitch/trunk/src: . include mod/applications/mod_dptools mod/endpoints/mod_dingaling mod/endpoints/mod_iax mod/endpoints/mod_sofia mod/event_handlers/mod_erlang_event mod/event_handlers/mod_event_socket mod/languages/mod_spidermonkey
by FreeSWITCH SVN 25 Feb '09

25 Feb '09

Author: anthm Date: Tue Feb 24 21:41:18 2009 New Revision: 12271 Log: fix issue in monitor_early_media_fail issue Modified: freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core_io.c freeswitch/trunk/src/switch_core_rwlock.c freeswitch/trunk/src/switch_core_session.c freeswitch/trunk/src/switch_core_state_machine.c freeswitch/trunk/src/switch_ivr_async.c freeswitch/trunk/src/switch_ivr_bridge.c freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Tue Feb 24 21:41:18 2009 @@ -78,7 +78,8 @@ #define switch_channel_ready(_channel) switch_channel_test_ready(_channel, SWITCH_FALSE) #define switch_channel_media_ready(_channel) switch_channel_test_ready(_channel, SWITCH_TRUE) - +#define switch_channel_up(_channel) (switch_channel_get_state(_channel) < CS_HANGUP) +#define switch_channel_down(_channel) (switch_channel_get_state(_channel) >= CS_HANGUP) SWITCH_DECLARE(void) switch_channel_wait_for_state(switch_channel_t *channel, switch_channel_t *other_channel, switch_channel_state_t want_state); SWITCH_DECLARE(switch_status_t) switch_channel_wait_for_flag(switch_channel_t *channel, Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Tue Feb 24 21:41:18 2009 @@ -1532,7 +1532,7 @@ switch_channel_clear_flag(peer_channel, CF_INNER_BRIDGE); switch_channel_clear_flag(channel, CF_INNER_BRIDGE); - if (!switch_channel_get_state(peer_channel) >= CS_HANGUP) { + if (!switch_channel_down(peer_channel)) { switch_core_session_rwunlock(peer_session); goto end; } Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Tue Feb 24 21:41:18 2009 @@ -1091,7 +1091,7 @@ now = switch_micro_time_now(); elapsed = (unsigned int) ((now - started) / 1000); - if (switch_channel_get_state(channel) >= CS_HANGUP || switch_test_flag(tech_pvt, TFLAG_BYE)) { + if (switch_channel_down(channel) || switch_test_flag(tech_pvt, TFLAG_BYE)) { goto out; } @@ -1119,7 +1119,7 @@ switch_cond_next(); } - if (switch_channel_get_state(channel) >= CS_HANGUP || switch_test_flag(tech_pvt, TFLAG_BYE)) { + if (switch_channel_down(channel) || switch_test_flag(tech_pvt, TFLAG_BYE)) { goto out; } @@ -2542,7 +2542,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "using Existing session for %s\n", ldl_session_get_id(dlsession)); - if (switch_channel_get_state(channel) >= CS_HANGUP) { + if (switch_channel_down(channel)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Call %s is already over\n", switch_channel_get_name(channel)); status = LDL_STATUS_FALSE; goto done; Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Tue Feb 24 21:41:18 2009 @@ -1081,7 +1081,7 @@ break; case IAX_EVENT_VOICE: if (tech_pvt && (tech_pvt->read_frame.datalen = iaxevent->datalen) != 0) { - if (channel && switch_channel_get_state(channel) <= CS_HANGUP) { + if (channel && switch_channel_up(channel)) { int bytes = 0, frames = 1; if (!switch_test_flag(tech_pvt, TFLAG_CODEC) || !tech_pvt->read_codec.implementation) { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Tue Feb 24 21:41:18 2009 @@ -959,7 +959,7 @@ private_object_t *tech_pvt = switch_core_session_get_private(session); switch_status_t status = SWITCH_STATUS_SUCCESS; - if (switch_channel_get_state(channel) >= CS_HANGUP || !tech_pvt) { + if (switch_channel_down(channel) || !tech_pvt) { status = SWITCH_STATUS_FALSE; goto end; } @@ -997,7 +997,7 @@ /* ones that do need to lock sofia mutex */ switch_mutex_lock(tech_pvt->sofia_mutex); - if (switch_channel_get_state(channel) >= CS_HANGUP || !tech_pvt) { + if (switch_channel_down(channel) || !tech_pvt) { status = SWITCH_STATUS_FALSE; goto end_lock; } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Tue Feb 24 21:41:18 2009 @@ -364,7 +364,7 @@ } if (session) { - if (channel && switch_channel_get_state(channel) >= CS_HANGUP) { + if (channel && switch_channel_down(channel)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel is already hungup.\n"); goto done; } @@ -3325,7 +3325,7 @@ status = switch_ivr_originate(a_session, &tsession, &cause, nhelper->exten, timeout, NULL, NULL, NULL, NULL, NULL, SOF_NONE); - if ((switch_channel_get_state(channel_a) < CS_HANGUP)) { + if ((switch_channel_up(channel_a))) { if (status != SWITCH_STATUS_SUCCESS || cause != SWITCH_CAUSE_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create Outgoing Channel! [%s]\n", nhelper->exten); Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Tue Feb 24 21:41:18 2009 @@ -1234,7 +1234,7 @@ switch_ivr_park(session, NULL); /* keep app thread running for lifetime of session */ - if (switch_channel_get_state(switch_core_session_get_channel(session)) >= CS_HANGUP) { + if (switch_channel_down(switch_core_session_get_channel(session))) { while (switch_test_flag(session_element, LFLAG_SESSION_ALIVE)) { switch_yield(100000); } Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Tue Feb 24 21:41:18 2009 @@ -430,7 +430,7 @@ listener_run(NULL, (void *) listener); } - if (switch_channel_get_state(channel) >= CS_HANGUP) { + if (switch_channel_down(channel)) { while (switch_test_flag(listener, LFLAG_SESSION)) { switch_yield(100000); } @@ -1192,7 +1192,7 @@ } } - if (channel && switch_channel_get_state(channel) >= CS_HANGUP && !switch_test_flag(listener, LFLAG_HANDLE_DISCO)) { + if (channel && switch_channel_down(channel) && !switch_test_flag(listener, LFLAG_HANDLE_DISCO)) { switch_set_flag_locked(listener, LFLAG_HANDLE_DISCO); if (switch_test_flag(listener, LFLAG_LINGER)) { char message[128] = ""; Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Tue Feb 24 21:41:18 2009 @@ -2152,7 +2152,7 @@ saveDepth = JS_SuspendRequest(cx); for (;;) { if (((elapsed = (unsigned int) ((switch_micro_time_now() - started) / 1000)) > (switch_time_t) timeout) - || switch_channel_get_state(channel) >= CS_HANGUP) { + || switch_channel_down(channel)) { *rval = BOOLEAN_TO_JSVAL(JS_FALSE); break; } @@ -2200,7 +2200,7 @@ saveDepth = JS_SuspendRequest(cx); for (;;) { if (((elapsed = (unsigned int) ((switch_micro_time_now() - started) / 1000)) > (switch_time_t) timeout) - || switch_channel_get_state(channel) >= CS_HANGUP) { + || switch_channel_down(channel)) { *rval = BOOLEAN_TO_JSVAL(JS_FALSE); break; } Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue Feb 24 21:41:18 2009 @@ -1590,7 +1590,6 @@ switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_NOTICE, "Hangup %s [%s] [%s]\n", channel->name, state_names[last_state], switch_channel_cause2str(channel->hangup_cause)); - switch_core_media_bug_remove_all(channel->session); switch_channel_set_variable(channel, "hangup_cause", switch_channel_cause2str(channel->hangup_cause)); switch_channel_presence(channel, "unavailable", switch_channel_cause2str(channel->hangup_cause), NULL); Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Tue Feb 24 21:41:18 2009 @@ -41,7 +41,7 @@ switch_io_event_hook_video_write_frame_t *ptr; switch_status_t status = SWITCH_STATUS_FALSE; - if (switch_channel_get_state(session->channel) >= CS_HANGUP) { + if (switch_channel_down(session->channel)) { return SWITCH_STATUS_FALSE; } @@ -65,7 +65,7 @@ switch_assert(session != NULL); - if (switch_channel_get_state(session->channel) >= CS_HANGUP) { + if (switch_channel_down(session->channel)) { return SWITCH_STATUS_FALSE; } @@ -123,7 +123,7 @@ top: - if (switch_channel_get_state(session->channel) >= CS_HANGUP) { + if (switch_channel_down(session->channel)) { *frame = NULL; status = SWITCH_STATUS_FALSE; goto even_more_done; } @@ -1066,7 +1066,7 @@ switch_status_t status; switch_dtmf_t new_dtmf; - if (switch_channel_get_state(session->channel) >= CS_HANGUP) { + if (switch_channel_down(session->channel)) { return SWITCH_STATUS_FALSE; } @@ -1096,7 +1096,7 @@ switch_status_t status = SWITCH_STATUS_FALSE; switch_dtmf_t new_dtmf; - if (switch_channel_get_state(session->channel) >= CS_HANGUP) { + if (switch_channel_down(session->channel)) { return SWITCH_STATUS_FALSE; } @@ -1144,7 +1144,7 @@ switch_assert(session != NULL); - if (switch_channel_get_state(session->channel) >= CS_HANGUP) { + if (switch_channel_down(session->channel)) { return SWITCH_STATUS_FALSE; } Modified: freeswitch/trunk/src/switch_core_rwlock.c ============================================================================== --- freeswitch/trunk/src/switch_core_rwlock.c (original) +++ freeswitch/trunk/src/switch_core_rwlock.c Tue Feb 24 21:41:18 2009 @@ -45,7 +45,7 @@ switch_status_t status = SWITCH_STATUS_FALSE; if (session->rwlock) { - if (switch_test_flag(session, SSF_DESTROYED) || switch_channel_get_state(session->channel) >= CS_HANGUP) { + if (switch_test_flag(session, SSF_DESTROYED) || switch_channel_down(session->channel)) { status = SWITCH_STATUS_FALSE; #ifdef SWITCH_DEBUG_RWLOCKS switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_ERROR, "%s Read lock FAIL\n", Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Tue Feb 24 21:41:18 2009 @@ -91,7 +91,7 @@ const char *this_val; session = (switch_core_session_t *) val; if (switch_core_session_read_lock(session) == SWITCH_STATUS_SUCCESS) { - if (switch_channel_get_state(session->channel) < CS_HANGUP && + if (switch_channel_up(session->channel) && (this_val = switch_channel_get_variable(session->channel, var_name)) && (!strcmp(this_val, var_val))) { switch_channel_hangup(session->channel, cause); } @@ -163,7 +163,7 @@ if ((session = switch_core_hash_find(session_manager.session_table, uuid_str)) != 0) { /* Acquire a read lock on the session or forget it the channel is dead */ if (switch_core_session_read_lock(session) == SWITCH_STATUS_SUCCESS) { - if (switch_channel_get_state(session->channel) < CS_HANGUP) { + if (switch_channel_up(session->channel)) { status = switch_core_session_receive_message(session, message); } switch_core_session_rwunlock(session); @@ -183,7 +183,7 @@ if ((session = switch_core_hash_find(session_manager.session_table, uuid_str)) != 0) { /* Acquire a read lock on the session or forget it the channel is dead */ if (switch_core_session_read_lock(session) == SWITCH_STATUS_SUCCESS) { - if (switch_channel_get_state(session->channel) < CS_HANGUP) { + if (switch_channel_up(session->channel)) { status = switch_core_session_queue_event(session, event); } switch_core_session_rwunlock(session); @@ -470,7 +470,7 @@ switch_assert(session != NULL); - if (switch_channel_get_state(session->channel) >= CS_HANGUP) { + if (switch_channel_down(session->channel)) { return SWITCH_STATUS_FALSE; } @@ -626,7 +626,7 @@ /* Acquire a read lock on the session or forget it the channel is dead */ if (switch_core_session_read_lock(session) == SWITCH_STATUS_SUCCESS) { - if (switch_channel_get_state(session->channel) < CS_HANGUP) { + if (switch_channel_up(session->channel)) { if (session->endpoint_interface->io_routines->receive_event) { status = session->endpoint_interface->io_routines->receive_event(session, *event); } @@ -1247,7 +1247,7 @@ { switch_application_interface_t *application_interface; - if (switch_channel_get_state(session->channel) >= CS_HANGUP) { + if (switch_channel_down(session->channel)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel is hungup, aborting execution of application: %s\n", app); return SWITCH_STATUS_FALSE; } Modified: freeswitch/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/trunk/src/switch_core_state_machine.c Tue Feb 24 21:41:18 2009 @@ -390,7 +390,6 @@ break; case CS_DONE: goto done; - /* HANGUP INIT ROUTING and RESET are all short term so we signal lock during their callbacks */ case CS_HANGUP: /* Deactivate and end the thread */ { const char *var = switch_channel_get_variable(session->channel, SWITCH_PROCESS_CDR_VARIABLE); @@ -410,10 +409,10 @@ do_extra_handlers = 0; } } + + switch_core_media_bug_remove_all(session); STATE_MACRO(hangup, "HANGUP"); - - switch_core_media_bug_remove_all(session); hook_var = switch_channel_get_variable(session->channel, SWITCH_API_HANGUP_HOOK_VARIABLE); if (switch_true(switch_channel_get_variable(session->channel, SWITCH_SESSION_IN_HANGUP_HOOK_VARIABLE))) { Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Tue Feb 24 21:41:18 2009 @@ -1774,13 +1774,14 @@ sth->ready = 1; - while (switch_channel_ready(channel) && !switch_test_flag(sth->ah, SWITCH_ASR_FLAG_CLOSED)) { + while (switch_channel_up(channel) && !switch_test_flag(sth->ah, SWITCH_ASR_FLAG_CLOSED)) { char *xmlstr = NULL; switch_thread_cond_wait(sth->cond, sth->mutex); - if (switch_test_flag(sth->ah, SWITCH_ASR_FLAG_CLOSED)) + if (switch_channel_down(channel) || switch_test_flag(sth->ah, SWITCH_ASR_FLAG_CLOSED)) { break; + } if (switch_core_asr_check_results(sth->ah, &flags) == SWITCH_STATUS_SUCCESS) { switch_event_t *event; Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Tue Feb 24 21:41:18 2009 @@ -206,7 +206,7 @@ goto end_of_bridge_loop; } - if ((b_state = switch_channel_get_state(chan_b)) >= CS_HANGUP) { + if ((b_state = switch_channel_down(chan_b))) { goto end_of_bridge_loop; } @@ -398,7 +398,7 @@ } - if (switch_channel_get_state(chan_b) >= CS_HANGUP) { + if (switch_channel_down(chan_b)) { if (originator && switch_channel_ready(chan_a) && !switch_channel_test_flag(chan_a, CF_ANSWERED)) { switch_channel_hangup(chan_a, switch_channel_get_cause(chan_b)); } @@ -409,7 +409,7 @@ msg.from = __FILE__; switch_core_session_receive_message(session_a, &msg); - if (!inner_bridge && switch_channel_get_state(chan_a) < CS_HANGUP) { + if (!inner_bridge && switch_channel_up(chan_a)) { if ((app_name = switch_channel_get_variable(chan_a, SWITCH_EXEC_AFTER_BRIDGE_APP_VARIABLE))) { switch_caller_extension_t *extension = NULL; if ((extension = switch_caller_extension_new(session_a, app_name, app_name)) == 0) { @@ -693,7 +693,7 @@ switch_channel_set_variable(channel, SWITCH_BRIDGE_VARIABLE, NULL); switch_channel_set_variable(other_channel, SWITCH_BRIDGE_VARIABLE, NULL); - if (switch_channel_get_state(other_channel) < CS_HANGUP) { + if (switch_channel_up(other_channel)) { switch_channel_hangup(other_channel, switch_channel_get_cause(channel)); } } @@ -723,7 +723,7 @@ switch_channel_t *peer_channel = switch_core_session_get_channel(peer_session); switch_event_t *event; - if (switch_channel_get_state(peer_channel) >= CS_HANGUP) { + if (switch_channel_down(peer_channel)) { switch_channel_hangup(caller_channel, switch_channel_get_cause(peer_channel)); return SWITCH_STATUS_FALSE; } @@ -1013,7 +1013,7 @@ originator_channel = switch_core_session_get_channel(originator_session); originatee_channel = switch_core_session_get_channel(originatee_session); - if (switch_channel_get_state(originator_channel) >= CS_HANGUP) { + if (switch_channel_down(originator_channel)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s is hungup refusing to bridge.\n", switch_channel_get_name(originatee_channel)); switch_core_session_rwunlock(originator_session); switch_core_session_rwunlock(originatee_session); Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Tue Feb 24 21:41:18 2009 @@ -171,7 +171,7 @@ switch_core_session_exec(collect->session, application_interface, app_data); - if (switch_channel_get_state(channel) < CS_HANGUP) { + if (switch_channel_up(channel)) { switch_channel_set_flag(channel, CF_WINNER); } goto wbreak; @@ -228,7 +228,7 @@ time_t elapsed = switch_epoch_time_now(NULL) - start; for (i = 0; i < max; i++) { - if (originate_status[i].peer_channel && switch_channel_get_state(originate_status[i].peer_channel) < CS_HANGUP) { + if (originate_status[i].peer_channel && switch_channel_up(originate_status[i].peer_channel)) { if (originate_status[i].per_channel_progress_timelimit_sec && elapsed > originate_status[i].per_channel_progress_timelimit_sec && !( switch_channel_test_flag(originate_status[i].peer_channel, CF_RING_READY) || @@ -1719,7 +1719,7 @@ } pchannel = switch_core_session_get_channel(originate_status[i].peer_session); - if (switch_channel_get_state(pchannel) >= CS_HANGUP) { + if (switch_channel_down(pchannel)) { cause_str = switch_channel_cause2str(switch_channel_get_cause(pchannel)); if (switch_stristr(cause_str, fail_on_single_reject_var)) { ok = 0;

1 0

[commit] r12270 - freeswitch/trunk/src
by FreeSWITCH SVN 25 Feb '09

25 Feb '09

Author: anthm Date: Tue Feb 24 20:22:07 2009 New Revision: 12270 Log: FSCORE-309 Modified: freeswitch/trunk/src/switch_xml.c Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Tue Feb 24 20:22:07 2009 @@ -1554,9 +1554,7 @@ if ((conf = switch_xml_find_child(xml, "section", "name", section)) && (tag = switch_xml_find_child(conf, tag_name, key_name, key_value))) { if (clone) { char *x; - switch_mutex_lock(XML_GEN_LOCK); x = switch_xml_toxml(tag, SWITCH_FALSE); - switch_mutex_unlock(XML_GEN_LOCK); switch_assert(x); *root = switch_xml_parse_str(x, strlen(x)); *node = *root; @@ -2112,9 +2110,12 @@ SWITCH_DECLARE(char *) switch_xml_toxml(switch_xml_t xml, switch_bool_t prn_header) { - char *s; + char *r, *s; + switch_mutex_lock(XML_GEN_LOCK); s = (char *)malloc(SWITCH_XML_BUFSIZE); - return switch_xml_toxml_buf(xml, s, SWITCH_XML_BUFSIZE, 0, prn_header); + r = switch_xml_toxml_buf(xml, s, SWITCH_XML_BUFSIZE, 0, prn_header); + switch_mutex_unlock(XML_GEN_LOCK); + return r; } // converts an switch_xml structure back to xml, returning a string of xml date that

1 0