September 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r9682 - in freeswitch/trunk/src/mod/languages: mod_java mod_java/src/org/freeswitch/swig mod_lua mod_perl mod_python
by Freeswitch SVN 27 Sep '08

27 Sep '08

Author: anthm Date: Sat Sep 27 16:13:14 2008 New Revision: 9682 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/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_perl/mod_perl_wrap.cpp freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp Log: swig 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 Sat Sep 27 16:13:14 2008 @@ -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) { - 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), 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, 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 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 Sat Sep 27 16:13:14 2008 @@ -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); + 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 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 Sat Sep 27 16:13:14 2008 @@ -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) { +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) { jlong jresult = 0 ; IVRMenu *arg1 = (IVRMenu *) 0 ; char *arg2 = (char *) 0 ; @@ -259,6 +259,7 @@ int arg11 ; int arg12 ; int arg13 ; + int arg14 ; IVRMenu *result = 0 ; (void)jenv; @@ -305,7 +306,8 @@ arg11 = (int)jarg11; arg12 = (int)jarg12; arg13 = (int)jarg13; - 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 = (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); *(IVRMenu **)&jresult = result; if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2); if (arg3) jenv->ReleaseStringUTFChars(jarg3, (const char *)arg3); 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 Sat Sep 27 16:13:14 2008 @@ -1593,9 +1593,10 @@ int arg11 ; int arg12 ; int arg13 ; + int arg14 ; IVRMenu *result = 0 ; - SWIG_check_num_args("IVRMenu",13,13) + SWIG_check_num_args("IVRMenu",14,14) 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 *"); @@ -1609,6 +1610,7 @@ 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 (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_IVRMenu,0))){ SWIG_fail_ptr("new_IVRMenu",1,SWIGTYPE_p_IVRMenu); @@ -1626,7 +1628,8 @@ arg11 = (int)lua_tonumber(L, 11); arg12 = (int)lua_tonumber(L, 12); arg13 = (int)lua_tonumber(L, 13); - 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 = (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); SWIG_arg=0; SWIG_NewPointerObj(L,result,SWIGTYPE_p_IVRMenu,1); SWIG_arg++; return SWIG_arg; 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 Sat Sep 27 16:13:14 2008 @@ -1995,6 +1995,7 @@ int arg11 ; int arg12 ; int arg13 ; + int arg14 ; IVRMenu *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; @@ -2029,11 +2030,13 @@ int ecode12 = 0 ; int val13 ; int ecode13 = 0 ; + int val14 ; + int ecode14 = 0 ; int argvi = 0; dXSARGS; - if ((items < 13) || (items > 13)) { - 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);"); + 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);"); } res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_IVRMenu, 0 | 0 ); if (!SWIG_IsOK(res1)) { @@ -2100,7 +2103,12 @@ SWIG_exception_fail(SWIG_ArgError(ecode13), "in method '" "new_IVRMenu" "', argument " "13"" of type '" "int""'"); } arg13 = static_cast< int >(val13); - 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); + ecode14 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(13), &val14); + if (!SWIG_IsOK(ecode14)) { + 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); ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_IVRMenu, SWIG_OWNER | SWIG_SHADOW); argvi++ ; if (alloc2 == SWIG_NEWOBJ) delete[] buf2; @@ -2115,6 +2123,7 @@ + XSRETURN(argvi); fail: @@ -2130,6 +2139,7 @@ + SWIG_croak_null(); } } 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 Sat Sep 27 16:13:14 2008 @@ -3084,6 +3084,7 @@ int arg11 ; int arg12 ; int arg13 ; + int arg14 ; IVRMenu *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; @@ -3118,6 +3119,8 @@ int ecode12 = 0 ; int val13 ; int ecode13 = 0 ; + int val14 ; + int ecode14 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -3131,8 +3134,9 @@ PyObject * obj10 = 0 ; PyObject * obj11 = 0 ; PyObject * obj12 = 0 ; + PyObject * obj13 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOOOOOO:new_IVRMenu",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOOOOOOO:new_IVRMenu",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13)) 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 *""'"); @@ -3198,7 +3202,12 @@ SWIG_exception_fail(SWIG_ArgError(ecode13), "in method '" "new_IVRMenu" "', argument " "13"" of type '" "int""'"); } arg13 = static_cast< int >(val13); - 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); + ecode14 = SWIG_AsVal_int(obj13, &val14); + if (!SWIG_IsOK(ecode14)) { + 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); 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;

1 0

[commit] r9681 - freeswitch/trunk/src/mod/formats/mod_shout
by Freeswitch SVN 27 Sep '08

27 Sep '08

Author: anthm Date: Sat Sep 27 15:52:27 2008 New Revision: 9681 Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Log: cleanup Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Sat Sep 27 15:52:27 2008 @@ -55,7 +55,6 @@ switch_buffer_t *audio_buffer; switch_memory_pool_t *memory_pool; unsigned char decode_buf[MP3_DCACHE]; - //struct mpstr mp; switch_file_handle_t *handle; mpg123_handle *mh; int err; @@ -251,7 +250,6 @@ lp = sizeof(inbuf); if (!context->eof && ((switch_file_read(context->fd, inbuf, &lp) != SWITCH_STATUS_SUCCESS) || lp == 0)) { context->eof++; - //goto end; } inlen = (int) lp; @@ -404,18 +402,11 @@ x++; } - if (decode_status == MP3_TOOSMALL) { - switch_mutex_lock(context->audio_mutex); - if (context->audio_buffer) { - switch_buffer_write(context->audio_buffer, context->decode_buf, usedlen); - } else { - goto error; - } - out = context->decode_buf; - outlen = sizeof(context->decode_buf); - usedlen = 0; - switch_mutex_unlock(context->audio_mutex); - + if (decode_status == MPG123_NEW_FORMAT) { + continue; + } else if (decode_status == MPG123_OK) { + usedlen = dlen; + break; } else if (decode_status == MPG123_ERR) { if (++context->mp3err >= 20) { @@ -424,11 +415,11 @@ } mpg123_close(context->mh); - //InitMP3(context->mh, OUTSCALE, context->samplerate); context->mh = mpg123_new(NULL, NULL); mpg123_open_feed(context->mh); - mpg123_format(context->mh, context->samplerate, MPG123_MONO, 0); - + mpg123_param(context->mh, MPG123_FORCE_RATE, context->samplerate, 0); + mpg123_param(context->mh, MPG123_FLAGS, MPG123_MONO_MIX, 0); + mpg123_param(context->mh, MPG123_FLAGS, MPG123_SEEKBUFFER|MPG123_MONO_MIX, 0); return realsize; } @@ -617,17 +608,18 @@ } switch_mutex_init(&context->audio_mutex, SWITCH_MUTEX_NESTED, context->memory_pool); - //InitMP3(context->mh, OUTSCALE, context->samplerate); context->mh = mpg123_new(NULL, NULL); mpg123_open_feed(context->mh); + mpg123_format_all(context->mh); mpg123_param(context->mh, MPG123_FORCE_RATE, context->samplerate, 0); - if (handle->handler) { + mpg123_param(context->mh, MPG123_FLAGS, MPG123_SEEKBUFFER|MPG123_MONO_MIX, 0); context->stream_url = switch_core_sprintf(context->memory_pool, "http://%s", path); context->prebuf = handle->prebuf; launch_read_stream_thread(context); } else { + mpg123_param(context->mh, MPG123_FLAGS, MPG123_MONO_MIX, 0); if (switch_file_open(&context->fd, path, SWITCH_FOPEN_READ, SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE, handle->memory_pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error opening %s\n", path); @@ -800,7 +792,6 @@ shout_context_t *context = handle->private_info; if (handle->handler) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot seek on a stream.\n"); return SWITCH_STATUS_FALSE; } else { switch_mutex_lock(context->audio_mutex); @@ -812,10 +803,10 @@ } mpg123_close(context->mh); - //InitMP3(context->mh, OUTSCALE, context->samplerate); context->mh = mpg123_new(NULL, NULL); mpg123_open_feed(context->mh); - mpg123_format(context->mh, context->samplerate, MPG123_MONO, 0); + mpg123_param(context->mh, MPG123_FORCE_RATE, context->samplerate, 0); + mpg123_param(context->mh, MPG123_FLAGS, MPG123_MONO_MIX, 0); switch_buffer_zero(context->audio_buffer); } else { @@ -1405,7 +1396,6 @@ //*module_interface = &shout_module_interface; shout_init(); - //InitMP3Constants(); mpg123_init(); SWITCH_ADD_API(shout_api_interface, "telecast", "telecast", telecast_api_function, TELECAST_SYNTAX); @@ -1417,6 +1407,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_shout_shutdown) { curl_global_cleanup(); + mpg123_exit(); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r9680 - in freeswitch/trunk/src: . mod/applications/mod_commands
by Freeswitch SVN 27 Sep '08

27 Sep '08

Author: brian Date: Sat Sep 27 14:49:21 2008 New Revision: 9680 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/switch_ivr_async.c Log: part two of FSCORE-193 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 Sat Sep 27 14:49:21 2008 @@ -1421,9 +1421,17 @@ } if (!strcasecmp(action, "start")) { - switch_ivr_record_session(rsession, path, limit, NULL); + if (switch_ivr_record_session(rsession, path, limit, NULL)!= SWITCH_STATUS_SUCCESS) { + stream->write_function(stream, "-ERR Cannot record session!\n"); + } else { + stream->write_function(stream, "+OK Success\n"); + } } else if (!strcasecmp(action, "stop")) { - switch_ivr_stop_record_session(rsession, path); + if (switch_ivr_stop_record_session(rsession, path) != SWITCH_STATUS_SUCCESS) { + stream->write_function(stream, "-ERR Cannot stop record session!\n"); + } else { + stream->write_function(stream, "+OK Success\n"); + } } else { goto usage; } @@ -1481,9 +1489,17 @@ } if (!strcasecmp(action, "start")) { - switch_ivr_displace_session(rsession, path, limit, flags); + if (switch_ivr_displace_session(rsession, path, limit, flags) != SWITCH_STATUS_SUCCESS) { + stream->write_function(stream, "-ERR Cannot displace session!\n"); + } else { + stream->write_function(stream, "+OK Success\n"); + } } else if (!strcasecmp(action, "stop")) { - switch_ivr_stop_displace_session(rsession, path); + if (switch_ivr_stop_displace_session(rsession, path) != SWITCH_STATUS_SUCCESS) { + stream->write_function(stream, "-ERR Cannot stop displace session!\n"); + } else { + stream->write_function(stream, "+OK Success\n"); + } } else { goto usage; } Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Sat Sep 27 14:49:21 2008 @@ -345,7 +345,7 @@ if (!switch_channel_media_ready(channel) || !switch_core_session_get_read_codec(session)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can not displace session. Media not enabled on channel\n"); - return status; + return SWITCH_STATUS_FALSE; } if ((bug = switch_channel_get_private(channel, file))) { @@ -816,7 +816,7 @@ if (!switch_channel_media_ready(channel) || !switch_core_session_get_read_codec(session)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can not record session. Media not enabled on channel\n"); - return status; + return SWITCH_STATUS_FALSE; } channels = read_codec->implementation->number_of_channels;

1 0

[commit] r9679 - freeswitch/trunk/src/mod/formats/mod_shout
by Freeswitch SVN 27 Sep '08

27 Sep '08

Author: anthm Date: Sat Sep 27 14:28:31 2008 New Revision: 9679 Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Log: remove code Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Sat Sep 27 14:28:31 2008 @@ -289,18 +289,6 @@ } else if (decode_status == MPG123_OK) { usedlen = dlen; break; - if (context->audio_buffer) { - switch_buffer_write(context->audio_buffer, context->decode_buf, usedlen); - } else { - goto error; - } - - out = context->decode_buf; - outlen = sizeof(context->decode_buf); - usedlen = 0; - - continue; - } else if (decode_status == MPG123_DONE) { context->eof++; goto end;

1 0

[commit] r9678 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 27 Sep '08

27 Sep '08

Author: brian Date: Sat Sep 27 12:20:52 2008 New Revision: 9678 Modified: freeswitch/trunk/conf/sip_profiles/internal.xml Log: add docs for this feature Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Sat Sep 27 12:20:52 2008 @@ -145,6 +145,7 @@    +  </settings> </profile>

1 0

[commit] r9677 - freeswitch/trunk/src
by Freeswitch SVN 27 Sep '08

27 Sep '08

Author: brian Date: Sat Sep 27 04:52:13 2008 New Revision: 9677 Modified: freeswitch/trunk/src/switch_ivr_async.c Log: round one from FSCORE-193, we need to revisit this for improvement Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Sat Sep 27 04:52:13 2008 @@ -340,6 +340,13 @@ switch_status_t status; time_t to = 0; displace_helper_t *dh; + + status = switch_channel_pre_answer(channel); + + if (!switch_channel_media_ready(channel) || !switch_core_session_get_read_codec(session)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can not displace session. Media not enabled on channel\n"); + return status; + } if ((bug = switch_channel_get_private(channel, file))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Only 1 of the same file per channel please!\n"); @@ -803,7 +810,16 @@ switch_status_t status; time_t to = 0; switch_media_bug_flag_t flags = SMBF_READ_STREAM | SMBF_WRITE_STREAM; - uint8_t channels = read_codec->implementation->number_of_channels; + uint8_t channels; + + status = switch_channel_pre_answer(channel); + + if (!switch_channel_media_ready(channel) || !switch_core_session_get_read_codec(session)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can not record session. Media not enabled on channel\n"); + return status; + } + + channels = read_codec->implementation->number_of_channels; if ((bug = switch_channel_get_private(channel, file))) { return switch_ivr_stop_record_session(session, file); @@ -838,8 +854,6 @@ return SWITCH_STATUS_GENERR; } - switch_channel_pre_answer(channel); - if ((p = switch_channel_get_variable(channel, "RECORD_TITLE"))) { vval = (const char *) switch_core_session_strdup(session, p); switch_core_file_set_string(fh, SWITCH_AUDIO_COL_STR_TITLE, vval);

1 0

[commit] r9676 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su
by Freeswitch SVN 26 Sep '08

26 Sep '08

Author: brian Date: Fri Sep 26 19:37:27 2008 New Revision: 9676 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c Log: revert this change for now Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri Sep 26 19:37:27 2008 @@ -1 +1 @@ -Fri Sep 26 15:32:07 EDT 2008 +Fri Sep 26 18:37:04 CDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c Fri Sep 26 19:37:27 2008 @@ -1019,10 +1019,8 @@ home->suh_blocks = NULL; - if (home->suh_lock) { + if (home->suh_lock) _su_home_destroy_mutexes(home->suh_lock); - UNLOCK(home); - } } home->suh_lock = NULL;

1 0

[commit] r9675 - freeswitch/trunk/src/mod/formats/mod_shout
by Freeswitch SVN 26 Sep '08

26 Sep '08

Author: anthm Date: Fri Sep 26 19:14:19 2008 New Revision: 9675 Removed: freeswitch/trunk/src/mod/formats/mod_shout/common.c freeswitch/trunk/src/mod/formats/mod_shout/dct64_i386.c freeswitch/trunk/src/mod/formats/mod_shout/decode_i386.c freeswitch/trunk/src/mod/formats/mod_shout/decode_ntom.c freeswitch/trunk/src/mod/formats/mod_shout/huffman.h freeswitch/trunk/src/mod/formats/mod_shout/interface.c freeswitch/trunk/src/mod/formats/mod_shout/layer3.c freeswitch/trunk/src/mod/formats/mod_shout/mpg123.h freeswitch/trunk/src/mod/formats/mod_shout/mpglib.h freeswitch/trunk/src/mod/formats/mod_shout/tabinit.c Modified: freeswitch/trunk/src/mod/formats/mod_shout/Makefile freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Log: break mod_shout Modified: freeswitch/trunk/src/mod/formats/mod_shout/Makefile ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/Makefile (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/Makefile Fri Sep 26 19:14:19 2008 @@ -1,21 +1,22 @@ LAME=lame-3.97 SHOUT=libshout-2.2.2 +MPG123=mpg123 switch_srcdir=../../../.. WANT_CURL=yes LAME_DIR=$(switch_srcdir)/libs/$(LAME) SHOUT_DIR=$(switch_srcdir)/libs/$(SHOUT) +MPG123_DIR=$(switch_srcdir)/libs/$(MPG123) LAMELA=$(LAME_DIR)/libmp3lame/libmp3lame.la SHOUTLA=$(SHOUT_DIR)/src/libshout.la +MPG123LA=$(MPG123_DIR)/src/libmpg123/.libs/libmpg123.la -LOCAL_CFLAGS=-I$(SHOUT_DIR)/include -I$(LAME_DIR)/include -LOCAL_LIBADD=$(LAMELA) $(SHOUTLA) +LOCAL_CFLAGS=-I$(SHOUT_DIR)/include -I$(LAME_DIR)/include -I$(MPG123_DIR)/src +LOCAL_LIBADD=$(LAMELA) $(SHOUTLA) $(MPG123LA) -LOCAL_LDFLAGS=`cat ../../../../libs/libshout-2.2.2/Makefile | grep SPEEX_LIBS | sed -e 's|^SPEEX_LIBS =||'` -MP3SOURCES=common.c dct64_i386.c decode_ntom.c layer3.c tabinit.c interface.c -MP3OBJS=common.o dct64_i386.o decode_ntom.o layer3.o tabinit.o interface.o +LOCAL_LDFLAGS=`cat ../../../../libs/libshout-2.2.2/Makefile | grep SPEEX_LIBS | sed -e 's|^SPEEX_LIBS =||'` LOCAL_OBJS=$(MP3OBJS) LOCAL_SOURCES=$(MP3SOURCES) @@ -25,6 +26,17 @@ $(LOCAL_OBJS): $(LOCAL_SOURCES) +$(MPG123_DIR): + $(GETLIB) $(MPG123).tar.gz + +$(MPG123_DIR)/Makefile: $(MPG123_DIR) + cd $(MPG123_DIR) && ./configure $(DEFAULT_ARGS) --disable-shared + $(TOUCH_TARGET) + +$(MPG123LA): $(MPG123_DIR)/Makefile + cd $(MPG123_DIR) && $(MAKE) + $(TOUCH_TARGET) + $(LAME_DIR): $(GETLIB) $(LAME).tar.gz @@ -40,7 +52,7 @@ $(GETLIB) $(SHOUT).tar.gz $(SHOUT_DIR)/Makefile: $(SHOUT_DIR) - cd $(SHOUT_DIR) && ./configure $(DEFAULT_ARGS) --with-speex=no --without-vorbis + cd $(SHOUT_DIR) && ./configure $(DEFAULT_ARGS) --without-speex --without-vorbis --without-ogg $(TOUCH_TARGET) $(SHOUTLA): $(SHOUT_DIR)/Makefile Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Fri Sep 26 19:14:19 2008 @@ -30,8 +30,7 @@ * example filename: shout://user:pass@host.com/mount.mp3 * */ -#include "mpg123.h" -#include "mpglib.h" +#include "libmpg123/mpg123.h" #include <switch.h> #include <shout/shout.h> #include <lame.h> @@ -40,6 +39,7 @@ #define OUTSCALE 8192 * 2 #define MP3_SCACHE 16384 * 2 #define MP3_DCACHE 8192 *2 +#define MP3_TOOSMALL -1234 SWITCH_MODULE_LOAD_FUNCTION(mod_shout_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_shout_shutdown); @@ -54,8 +54,10 @@ switch_mutex_t *audio_mutex; switch_buffer_t *audio_buffer; switch_memory_pool_t *memory_pool; - char decode_buf[MP3_DCACHE]; - struct mpstr mp; + unsigned char decode_buf[MP3_DCACHE]; + //struct mpstr mp; + switch_file_handle_t *handle; + mpg123_handle *mh; int err; int mp3err; int dlen; @@ -141,7 +143,12 @@ } } - ExitMP3(&context->mp); + + } + + if (context->mh) { + mpg123_close(context->mh); + mpg123_delete(context->mh); } } } @@ -227,24 +234,24 @@ static size_t decode_fd(shout_context_t *context, void *data, size_t bytes) { int decode_status = 0; - int dlen = 0; + size_t dlen = 0; int x = 0; - char *in; + unsigned char *in; int inlen = 0; - char *out; + unsigned char *out; int outlen; int usedlen; - char inbuf[MP3_SCACHE]; + unsigned char inbuf[MP3_SCACHE]; int done = 0; size_t used; size_t lp; size_t rb = 0; - while (!context->eof && switch_buffer_inuse(context->audio_buffer) < bytes) { + while (context->eof < 2 && switch_buffer_inuse(context->audio_buffer) < bytes) { lp = sizeof(inbuf); - if ((switch_file_read(context->fd, inbuf, &lp) != SWITCH_STATUS_SUCCESS) || lp == 0) { + if (!context->eof && ((switch_file_read(context->fd, inbuf, &lp) != SWITCH_STATUS_SUCCESS) || lp == 0)) { context->eof++; - goto end; + //goto end; } inlen = (int) lp; @@ -260,8 +267,13 @@ } do { - decode_status = decodeMP3(&context->mp, in, inlen, out, outlen, &dlen); - + if (context->eof) { + decode_status = mpg123_read(context->mh, out, outlen, &dlen); + } else { + decode_status = mpg123_decode(context->mh, in, inlen, out, outlen, &dlen); + } + + if (context->err) { goto error; } @@ -272,7 +284,11 @@ x++; } - if (decode_status == MP3_TOOSMALL) { + if (decode_status == MPG123_NEW_FORMAT) { + continue; + } else if (decode_status == MPG123_OK) { + usedlen = dlen; + break; if (context->audio_buffer) { switch_buffer_write(context->audio_buffer, context->decode_buf, usedlen); } else { @@ -285,7 +301,10 @@ continue; - } else if (decode_status == MP3_ERR) { + } else if (decode_status == MPG123_DONE) { + context->eof++; + goto end; + } else if (decode_status == MPG123_ERR || decode_status > 0) { if (++context->mp3err >= 5) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Decoder Error!\n"); context->eof++; @@ -302,7 +321,7 @@ dlen = 0; - } while (decode_status != MP3_NEED_MORE); + } while (decode_status != MPG123_NEED_MORE); if (context->audio_buffer) { switch_buffer_write(context->audio_buffer, context->decode_buf, usedlen); @@ -318,7 +337,7 @@ end: used = switch_buffer_inuse(context->audio_buffer); - + if (context->eof || done || used >= bytes) { if (!(rb = switch_buffer_read(context->audio_buffer, data, bytes))) { goto error; @@ -342,15 +361,15 @@ register unsigned int realsize = (unsigned int) (size * nmemb); shout_context_t *context = data; int decode_status = 0; - int dlen = 0; + size_t dlen = 0; int x = 0; - char *in; + unsigned char *in; int inlen; - char *out; + unsigned char *out; int outlen; int usedlen; uint32_t used, buf_size = 1024 * 64; - + in = ptr; inlen = realsize; out = context->decode_buf; @@ -387,7 +406,7 @@ error_check(); do { - decode_status = decodeMP3(&context->mp, in, inlen, out, outlen, &dlen); + decode_status = mpg123_decode(context->mh, in, inlen, out, outlen, &dlen); error_check(); @@ -409,16 +428,19 @@ usedlen = 0; switch_mutex_unlock(context->audio_mutex); - } else if (decode_status == MP3_ERR) { + } else if (decode_status == MPG123_ERR) { if (++context->mp3err >= 20) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Decoder Error!\n"); goto error; } - ExitMP3(&context->mp); - InitMP3(&context->mp, OUTSCALE, context->samplerate); - + mpg123_close(context->mh); + //InitMP3(context->mh, OUTSCALE, context->samplerate); + context->mh = mpg123_new(NULL, NULL); + mpg123_open_feed(context->mh); + mpg123_format(context->mh, context->samplerate, MPG123_MONO, 0); + return realsize; } @@ -427,7 +449,7 @@ out += dlen; outlen -= dlen; dlen = 0; - } while (decode_status != MP3_NEED_MORE); + } while (decode_status != MPG123_NEED_MORE); switch_mutex_lock(context->audio_mutex); @@ -598,6 +620,7 @@ context->memory_pool = handle->memory_pool; context->samplerate = handle->samplerate; + context->handle = handle; if (switch_test_flag(handle, SWITCH_FILE_FLAG_READ)) { if (switch_buffer_create_dynamic(&context->audio_buffer, TC_BUFFER_SIZE, TC_BUFFER_SIZE * 2, 0) != SWITCH_STATUS_SUCCESS) { @@ -606,17 +629,23 @@ } switch_mutex_init(&context->audio_mutex, SWITCH_MUTEX_NESTED, context->memory_pool); - InitMP3(&context->mp, OUTSCALE, context->samplerate); + //InitMP3(context->mh, OUTSCALE, context->samplerate); + context->mh = mpg123_new(NULL, NULL); + mpg123_open_feed(context->mh); + mpg123_param(context->mh, MPG123_FORCE_RATE, context->samplerate, 0); + + if (handle->handler) { context->stream_url = switch_core_sprintf(context->memory_pool, "http://%s", path); context->prebuf = handle->prebuf; launch_read_stream_thread(context); } else { - if (switch_file_open(&context->fd, path, SWITCH_FOPEN_READ, SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE, handle->memory_pool) != + if (switch_file_open(&context->fd, path, SWITCH_FOPEN_READ, SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE, handle->memory_pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error opening %s\n", path); goto error; } + } } else if (switch_test_flag(handle, SWITCH_FILE_FLAG_WRITE)) { if (!(context->gfp = lame_init())) { @@ -794,8 +823,11 @@ *cur_sample = fseek(context->fp, *cur_sample, whence); } - ExitMP3(&context->mp); - InitMP3(&context->mp, OUTSCALE, context->samplerate); + mpg123_close(context->mh); + //InitMP3(context->mh, OUTSCALE, context->samplerate); + context->mh = mpg123_new(NULL, NULL); + mpg123_open_feed(context->mh); + mpg123_format(context->mh, context->samplerate, MPG123_MONO, 0); switch_buffer_zero(context->audio_buffer); } else { @@ -1385,7 +1417,8 @@ //*module_interface = &shout_module_interface; shout_init(); - InitMP3Constants(); + //InitMP3Constants(); + mpg123_init(); SWITCH_ADD_API(shout_api_interface, "telecast", "telecast", telecast_api_function, TELECAST_SYNTAX);

1 0

[commit] r9674 - freeswitch/trunk/docs/phrase
by Freeswitch SVN 26 Sep '08

26 Sep '08

Author: brian Date: Fri Sep 26 16:53:33 2008 New Revision: 9674 Modified: freeswitch/trunk/docs/phrase/phrase_en.xml Log: add sound Modified: freeswitch/trunk/docs/phrase/phrase_en.xml ============================================================================== --- freeswitch/trunk/docs/phrase/phrase_en.xml (original) +++ freeswitch/trunk/docs/phrase/phrase_en.xml Fri Sep 26 16:53:33 2008 @@ -281,6 +281,7 @@ <prompt phrase="Please enter extension you want to transfer to" filename="transfer1.wav"/> <prompt phrase="Transfer" filename="transfer2.wav"/> <prompt phrase="We are trying to reach" filename="we_are_trying_to_reach.wav"/> + <prompt phrase="An error has occurred please contact the administrator" filename="error.wav"/> </misc> </en> </language>

1 0

[commit] r9671 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 26 Sep '08

26 Sep '08

Author: mikej Date: Fri Sep 26 15:48:55 2008 New Revision: 9671 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: (MODAPP-139) localize voice-mail notification emails Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Fri Sep 26 15:48:55 2008 @@ -26,6 +26,7 @@ * Anthony Minessale II <anthmct(a)yahoo.com> * Bret McDanel <trixter AT 0xdecafbad.com> * John Wehle (john(a)feith.com) + * Raymond Chandler <intralanman(a)gmail.com> * * mod_voicemail.c -- Voicemail Module * @@ -2052,6 +2053,7 @@ char *vm_email = NULL; char *vm_notify_email = NULL; char *email_addr = NULL; + char *vm_timezone = NULL; int send_mail = 0; int send_main = 0; int send_notify = 0; @@ -2112,9 +2114,12 @@ insert_db = switch_true(val); } else if (!strcasecmp(var, "vm-attach-file")) { email_attach = switch_true(val); + } else if (!strcasecmp(var, "timezone")) { + vm_timezone = switch_core_strdup(pool, val); } + /*switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "send mail is %d, var is %s\n", send_mail, var);*/ } - + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "send mail is %d and that's my final answer\n", send_mail); if (!switch_strlen_zero(vm_storage_dir)) { dir_path = switch_mprintf("%s%s%s", vm_storage_dir, SWITCH_PATH_SEPARATOR, myid); } else if (!switch_strlen_zero(profile->storage_dir)) { @@ -2199,7 +2204,38 @@ switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_caller_id_name", caller_id_name); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_file_path", file_path); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_read_flags", read_flags); - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_time", date); + + if(switch_loadable_module_exists("mod_timezone") == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "mod_timezone is loaded... let's try to convert\n"); + if(!switch_strlen_zero(vm_timezone)) { + switch_status_t status; + switch_stream_handle_t time_stream = { 0 }; + char *reply; + char *args = switch_mprintf("%s %s", vm_timezone, profile->date_fmt); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "User's timezone is %s\n", vm_timezone); + SWITCH_STANDARD_STREAM(time_stream); + if ((status = switch_api_execute("strftime_tz", args, NULL, &time_stream)) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Successfully Converted Timezone\n"); + reply = time_stream.data; + if(strncasecmp(reply, "-ERR", 4)) { + if(strlen(reply)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "old time was: %s, new time is: %s\n", date, reply); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_time", reply); + } else { + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_time", date); + } + switch_safe_free(reply); + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed To Successfully Convert Timezone\n"); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_time", date); + } + switch_safe_free(args); + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "mod_timezone isn't loaded... we'll only be using system time\n"); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_time", date); + } switch_snprintf(tmpvar, sizeof(tmpvar), "%d", priority); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_priority", tmpvar); if (vm_email) {

1 0