- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r9040 - in freeswitch/trunk: conf/autoload_configs libs libs/curl/lib libs/libedit libs/xmlrpc-c libs/xmlrpc-c/include/xmlrpc-c libs/yaml libs/yaml/include libs/yaml/src libs/yaml/tests src src/include src/mod/asr_tts src/mod/asr_tts/mod_flite src/mod/asr_tts/mod_pocketsphinx src/mod/languages/mod_lua src/mod/languages/mod_lua/lua src/mod/languages/mod_perl src/mod/languages/mod_python src/mod/languages/mod_yaml
by Freeswitch SVN 15 Jul '08

15 Jul '08

Author: anthm Date: Tue Jul 15 13:39:16 2008 New Revision: 9040 Added: freeswitch/trunk/conf/autoload_configs/python.conf.xml Modified: freeswitch/trunk/libs/ (props changed) freeswitch/trunk/libs/curl/lib/ (props changed) freeswitch/trunk/libs/libedit/ (props changed) freeswitch/trunk/libs/xmlrpc-c/ (props changed) freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/ (props changed) freeswitch/trunk/libs/yaml/ (props changed) freeswitch/trunk/libs/yaml/include/ (props changed) freeswitch/trunk/libs/yaml/src/ (props changed) freeswitch/trunk/libs/yaml/tests/ (props changed) freeswitch/trunk/src/include/ (props changed) freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/mod/asr_tts/ (props changed) freeswitch/trunk/src/mod/asr_tts/mod_flite/ (props changed) freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/ (props changed) freeswitch/trunk/src/mod/languages/mod_lua/ (props changed) freeswitch/trunk/src/mod/languages/mod_lua/lua/ (props changed) freeswitch/trunk/src/mod/languages/mod_perl/ (props changed) freeswitch/trunk/src/mod/languages/mod_python/ (props changed) freeswitch/trunk/src/mod/languages/mod_yaml/ (props changed) freeswitch/trunk/src/switch_core_codec.c freeswitch/trunk/src/switch_core_session.c freeswitch/trunk/src/switch_ivr_async.c freeswitch/trunk/src/switch_ivr_originate.c freeswitch/trunk/src/switch_ivr_play_say.c Log: update Added: freeswitch/trunk/conf/autoload_configs/python.conf.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/autoload_configs/python.conf.xml Tue Jul 15 13:39:16 2008 @@ -0,0 +1,6 @@ +<configuration name="python.conf" description="PYTHON Configuration"> + <settings> +  +  + </settings> +</configuration> Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Tue Jul 15 13:39:16 2008 @@ -1122,6 +1122,8 @@ */ SWITCH_DECLARE(switch_status_t) switch_core_session_set_read_codec(_In_ switch_core_session_t *session, switch_codec_t *codec); +SWITCH_DECLARE(void) switch_core_session_unset_read_codec(_In_ switch_core_session_t *session); + /*! \brief Retrieve the read codec from a given session \param session session to retrieve from Modified: freeswitch/trunk/src/switch_core_codec.c ============================================================================== --- freeswitch/trunk/src/switch_core_codec.c (original) +++ freeswitch/trunk/src/switch_core_codec.c Tue Jul 15 13:39:16 2008 @@ -42,6 +42,11 @@ return CODEC_ID++; } +SWITCH_DECLARE(void) switch_core_session_unset_read_codec(switch_core_session_t *session) +{ + session->real_read_codec = session->read_codec = NULL; +} + SWITCH_DECLARE(switch_status_t) switch_core_session_set_read_codec(switch_core_session_t *session, switch_codec_t *codec) { @@ -49,52 +54,55 @@ switch_channel_t *channel = switch_core_session_get_channel(session); char tmp[30]; - if (!codec || !codec->implementation) { + if (codec && !codec->implementation) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot set ININITILIZED codec!\n"); + return SWITCH_STATUS_FALSE; + } + + if (!codec || codec == session->real_read_codec) { if (session->real_read_codec) { session->read_codec = session->real_read_codec; - session->real_read_codec = NULL; } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot set NULL codec!\n"); return SWITCH_STATUS_FALSE; } - } else if (session->read_codec) { - if (session->real_read_codec) { - if (codec == session->real_read_codec) { - session->read_codec = codec; - session->real_read_codec = NULL; - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot double-set codec!\n"); - return SWITCH_STATUS_FALSE; - } - } else { - session->real_read_codec = session->read_codec; - session->read_codec = codec; + } else if (codec) { + if (session->read_codec != session->real_read_codec) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot double-set codec!\n"); + return SWITCH_STATUS_FALSE; } - } else { + session->read_codec = codec; - } - if (switch_event_create(&event, SWITCH_EVENT_CODEC) == SWITCH_STATUS_SUCCESS) { - switch_channel_event_set_data(session->channel, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-read-codec-name", "%s", session->read_codec->implementation->iananame); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-read-codec-rate", "%d", session->read_codec->implementation->actual_samples_per_second); - if (session->read_codec->implementation->actual_samples_per_second != session->read_codec->implementation->samples_per_second) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-reported-read-codec-rate", "%d", session->read_codec->implementation->samples_per_second); + if (!session->real_read_codec) { + session->real_read_codec = session->read_codec; } - switch_event_fire(&event); } - switch_channel_set_variable(channel, "read_codec", session->read_codec->implementation->iananame); - switch_snprintf(tmp, sizeof(tmp), "%d", session->read_codec->implementation->actual_samples_per_second); - switch_channel_set_variable(channel, "read_rate", tmp); + if (session->read_codec && session->read_codec->implementation) { + if (switch_event_create(&event, SWITCH_EVENT_CODEC) == SWITCH_STATUS_SUCCESS) { + switch_channel_event_set_data(session->channel, event); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-read-codec-name", "%s", session->read_codec->implementation->iananame); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-read-codec-rate", "%d", session->read_codec->implementation->actual_samples_per_second); + if (session->read_codec->implementation->actual_samples_per_second != session->read_codec->implementation->samples_per_second) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-reported-read-codec-rate", "%d", session->read_codec->implementation->samples_per_second); + } + switch_event_fire(&event); + } + switch_channel_set_variable(channel, "read_codec", session->read_codec->implementation->iananame); + switch_snprintf(tmp, sizeof(tmp), "%d", session->read_codec->implementation->actual_samples_per_second); + switch_channel_set_variable(channel, "read_rate", tmp); - session->raw_read_frame.codec = session->read_codec; - session->raw_write_frame.codec = session->read_codec; - session->enc_read_frame.codec = session->read_codec; - session->enc_write_frame.codec = session->read_codec; - return SWITCH_STATUS_SUCCESS; + session->raw_read_frame.codec = session->read_codec; + session->raw_write_frame.codec = session->read_codec; + session->enc_read_frame.codec = session->read_codec; + session->enc_write_frame.codec = session->read_codec; + return SWITCH_STATUS_SUCCESS; + } + + return SWITCH_STATUS_FALSE; + } SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_effective_read_codec(switch_core_session_t *session) Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Tue Jul 15 13:39:16 2008 @@ -666,6 +666,8 @@ switch_channel_t *channel = switch_core_session_get_channel(session); switch_size_t has; + switch_core_session_set_read_codec(session, NULL); + /* clear resamplers */ switch_mutex_lock(session->resample_mutex); switch_resample_destroy(&session->read_resampler); Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Tue Jul 15 13:39:16 2008 @@ -732,7 +732,6 @@ switch_core_session_rwunlock(tsession); status = SWITCH_STATUS_SUCCESS; - switch_core_session_set_read_codec(session, read_codec); switch_core_session_reset(session, SWITCH_TRUE); } Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Tue Jul 15 13:39:16 2008 @@ -444,11 +444,9 @@ switch_buffer_destroy(&ringback.audio_buffer); } - if (!pass && write_codec.implementation) { - if (read_codec && !ringback.asis) { - switch_core_session_set_read_codec(session, read_codec); - switch_core_session_reset(session, SWITCH_TRUE); - } + switch_core_session_reset(session, SWITCH_TRUE); + + if (write_codec.implementation) { switch_core_codec_destroy(&write_codec); } @@ -1403,15 +1401,12 @@ switch_buffer_destroy(&ringback.audio_buffer); } - if (!pass && write_codec.implementation) { - if (read_codec && !ringback.asis) { - switch_core_session_set_read_codec(session, read_codec); - switch_core_session_reset(session, SWITCH_FALSE); - } + switch_core_session_reset(session, SWITCH_FALSE); + + if (write_codec.implementation) { switch_core_codec_destroy(&write_codec); } - for (i = 0; i < and_argc; i++) { if (!peer_channels[i]) { continue; Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Tue Jul 15 13:39:16 2008 @@ -567,7 +567,6 @@ } } - switch_core_session_set_read_codec(session, read_codec); switch_core_file_close(fh); switch_core_session_reset(session, SWITCH_TRUE); return status; @@ -1316,7 +1315,7 @@ } } - switch_core_session_set_read_codec(session, NULL); + switch_core_session_reset(session, SWITCH_FALSE); switch_core_codec_destroy(&raw_codec); end:

1 0

[commit] r9039 - freeswitch/trunk/src
by Freeswitch SVN 15 Jul '08

15 Jul '08

Author: anthm Date: Tue Jul 15 13:15:34 2008 New Revision: 9039 Modified: freeswitch/trunk/src/switch_ivr_play_say.c Log: update Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Tue Jul 15 13:15:34 2008 @@ -1116,7 +1116,8 @@ write_frame.timestamp = timer.samplecount; } #ifndef WIN32 -#if SWITCH_BYTE_ORDER == __BIG_ENDIAN +#if 0 // don't seem to need it, maybe only on mac? +//#if SWITCH_BYTE_ORDER == __BIG_ENDIAN if (!asis) { switch_swap_linear(write_frame.data, (int) write_frame.datalen / 2); }

1 0

[commit] r9038 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 15 Jul '08

15 Jul '08

Author: brian Date: Tue Jul 15 13:09:36 2008 New Revision: 9038 Modified: freeswitch/trunk/conf/autoload_configs/console.conf.xml Log: tweak UPDATE YOUR CONFIG Modified: freeswitch/trunk/conf/autoload_configs/console.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/console.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/console.conf.xml Tue Jul 15 13:09:36 2008 @@ -30,7 +30,7 @@ <map name="mod_local_stream.c" value="warning,debug"/> <map name="mod_sndfile.c" value="warning,info,debug"/> --> - <map name="all" value="debug,info,notice,warning,err,crit,alert"/> + <map name="all" value="console,debug,info,notice,warning,err,crit,alert"/> <!-- You can use or modify this sample set of mappings. It turns on higher

1 0

[commit] r9037 - in freeswitch/trunk/src: . include
by Freeswitch SVN 15 Jul '08

15 Jul '08

Author: anthm Date: Tue Jul 15 12:15:49 2008 New Revision: 9037 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_ivr_play_say.c Log: use our SWITCH_BYTE_ORDER macro Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Tue Jul 15 12:15:49 2008 @@ -445,7 +445,7 @@ #pragma pack(push, r1, 1) #endif -#if __BYTE_ORDER == __BIG_ENDIAN +#if SWITCH_BYTE_ORDER == __BIG_ENDIAN typedef struct { unsigned version:2; /* protocol version */ unsigned p:1; /* padding flag */ Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Tue Jul 15 12:15:49 2008 @@ -1116,7 +1116,7 @@ write_frame.timestamp = timer.samplecount; } #ifndef WIN32 -#if __BYTE_ORDER == __BIG_ENDIAN +#if SWITCH_BYTE_ORDER == __BIG_ENDIAN if (!asis) { switch_swap_linear(write_frame.data, (int) write_frame.datalen / 2); }

1 0

[commit] r9036 - freeswitch/trunk/src
by Freeswitch SVN 15 Jul '08

15 Jul '08

Author: anthm Date: Tue Jul 15 11:51:10 2008 New Revision: 9036 Modified: freeswitch/trunk/src/switch_console.c Log: fix FSCORE-150 Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Tue Jul 15 11:51:10 2008 @@ -407,8 +407,13 @@ switch_memory_pool_t *pool = (switch_memory_pool_t *) obj; while (running) { - int32_t arg; + int32_t arg = 0; + if (getppid() == 1) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "We've become an orphan, no more console for us.\n"); + break; + } + switch_core_session_ctl(SCSC_CHECK_RUNNING, &arg); if (!arg) { break; @@ -437,6 +442,7 @@ } switch_core_destroy_memory_pool(&pool); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Editline thread exiting\n"); return NULL; } @@ -681,7 +687,6 @@ } - SWITCH_DECLARE(void) switch_console_loop(void) { switch_thread_t *thread;

1 0

[commit] r9035 - freeswitch/trunk/src
by Freeswitch SVN 15 Jul '08

15 Jul '08

Author: anthm Date: Tue Jul 15 10:56:30 2008 New Revision: 9035 Modified: freeswitch/trunk/src/switch_log.c Log: minor logger tweaks Modified: freeswitch/trunk/src/switch_log.c ============================================================================== --- freeswitch/trunk/src/switch_log.c (original) +++ freeswitch/trunk/src/switch_log.c Tue Jul 15 10:56:30 2008 @@ -62,6 +62,7 @@ static int8_t THREAD_RUNNING = 0; static uint8_t MAX_LEVEL = 0; static int mods_loaded = 0; +static int console_mods_loaded = 0; static switch_bool_t COLORIZE = SWITCH_FALSE; #ifdef WIN32 @@ -144,8 +145,9 @@ BINDINGS = ptr->next; } status = SWITCH_STATUS_SUCCESS; + mods_loaded--; if (ptr->is_console) { - mods_loaded--; + console_mods_loaded--; } break; } @@ -182,8 +184,9 @@ BINDINGS = binding; } if (is_console) { - mods_loaded++; + console_mods_loaded++; } + mods_loaded++; switch_mutex_unlock(BINDLOCK); return SWITCH_STATUS_SUCCESS; @@ -230,6 +233,7 @@ return NULL; } +#define do_mods (LOG_QUEUE && THREAD_RUNNING) SWITCH_DECLARE(void) switch_log_printf(switch_text_channel_t channel, const char *file, const char *func, int line, const char *userdata, switch_log_level_t level, const char *fmt, ...) { @@ -300,8 +304,8 @@ goto end; } - - if (level == SWITCH_LOG_CONSOLE || mods_loaded == 0 || !LOG_QUEUE || !THREAD_RUNNING) { + + if (console_mods_loaded == 0 || !do_mods) { if (handle) { int aok = 1; #ifndef WIN32 @@ -336,7 +340,9 @@ } } } - } else if (level <= MAX_LEVEL) { + } + + if (do_mods && level <= MAX_LEVEL) { switch_log_node_t *node; void *pop = NULL;

1 0

[commit] r9034 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 15 Jul '08

15 Jul '08

Author: anthm Date: Tue Jul 15 10:56:15 2008 New Revision: 9034 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: fix possible printf of NULL 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 Tue Jul 15 10:56:15 2008 @@ -1632,7 +1632,7 @@ SWITCH_STANDARD_STREAM(stream); switch_api_execute(cmd, arg, NULL, &stream); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Command %s(%s):\n%s\n", cmd, arg, switch_str_nil((char *) stream.data)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Command %s(%s):\n%s\n", cmd, switch_str_nil(arg), switch_str_nil((char *) stream.data)); switch_safe_free(stream.data); }

1 0

[commit] r9033 - in freeswitch/trunk/src: . include
by Freeswitch SVN 15 Jul '08

15 Jul '08

Author: brian Date: Tue Jul 15 10:41:08 2008 New Revision: 9033 Modified: freeswitch/trunk/src/include/switch_cpp.h freeswitch/trunk/src/switch_cpp.cpp Log: tweaks Modified: freeswitch/trunk/src/include/switch_cpp.h ============================================================================== --- freeswitch/trunk/src/include/switch_cpp.h (original) +++ freeswitch/trunk/src/include/switch_cpp.h Tue Jul 15 10:41:08 2008 @@ -13,7 +13,31 @@ #define this_check_void() do { if (!this) { switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "object is not initalized\n");}} while(0) #define sanity_check(x) do { if (!(session && allocated)) { switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "session is not initalized\n"); return x;}} while(0) #define sanity_check_noreturn do { if (!(session && allocated)) { switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "session is not initalized\n"); return;}} while(0) -#define init_vars() do { allocated = 0; session = NULL; channel = NULL; uuid = NULL; tts_name = NULL; voice_name = NULL; xml_cdr_text = NULL; memset(&caller_profile, 0, sizeof(caller_profile)); memset(&args, 0, sizeof(args)); ap = NULL; caller_profile.source = "mod_unknown"; caller_profile.dialplan = ""; caller_profile.context = ""; caller_profile.caller_id_name = ""; caller_profile.caller_id_number = ""; caller_profile.network_addr = ""; caller_profile.ani = ""; caller_profile.aniii = ""; caller_profile.rdnis = ""; caller_profile.username = ""; on_hangup = NULL; memset(&cb_state, 0, sizeof(cb_state)); hook_state = CS_NEW; } while(0) +#define init_vars() allocated = 0; \ + session = NULL; \ + channel = NULL; \ + uuid = NULL; \ + tts_name = NULL; \ + voice_name = NULL; \ + xml_cdr_text = NULL; \ + memset(&caller_profile, 0, sizeof(caller_profile)); \ + memset(&args, 0, sizeof(args)); \ + ap = NULL; \ + caller_profile.source = "mod_unknown"; \ + caller_profile.dialplan = ""; \ + caller_profile.context = ""; \ + caller_profile.caller_id_name = ""; \ + caller_profile.caller_id_number = ""; \ + caller_profile.network_addr = ""; \ + caller_profile.ani = ""; \ + caller_profile.aniii = ""; \ + caller_profile.rdnis = ""; \ + caller_profile.username = ""; \ + on_hangup = NULL; \ + memset(&cb_state, 0, sizeof(cb_state)); \ + hook_state = CS_NEW; \ + fhp = NULL + //// C++ Interface: switch_to_cpp_mempool//// Description: This class allows for overloading the new operator to allocate from a switch_memory_pool_t//// Author: Yossi Neiman <freeswitch(a)cartissolutions.com>, (C) 2007//// Copyright: See COPYING file that comes with this distribution// #if 0 #ifndef SWITCHTOMEMPOOL Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Tue Jul 15 10:41:08 2008 @@ -1124,8 +1124,6 @@ SWITCH_DECLARE(switch_status_t) CoreSession::process_callback_result(char *result) { - switch_file_handle_t *fh = NULL; - this_check(SWITCH_STATUS_FALSE); sanity_check(SWITCH_STATUS_FALSE); @@ -1134,20 +1132,6 @@ } if (fhp) { - fh = fhp; - } - - if (fh) { - if (!fh) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Process callback result aborted because fh is null\n"); - return SWITCH_STATUS_FALSE; - } - - if (!fh->file_interface) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Process callback result aborted because fh->file_interface is null\n"); - return SWITCH_STATUS_FALSE; - } - if (!strncasecmp(result, "speed", 4)) { char *p; @@ -1158,10 +1142,10 @@ if (!(step = atoi(p))) { step = 1; } - fh->speed += step; + fhp->speed += step; } else { int speed = atoi(p); - fh->speed = speed; + fhp->speed = speed; } return SWITCH_STATUS_SUCCESS; } @@ -1169,18 +1153,18 @@ return SWITCH_STATUS_FALSE; } else if (!strcasecmp(result, "pause")) { - if (switch_test_flag(fh, SWITCH_FILE_PAUSE)) { - switch_clear_flag(fh, SWITCH_FILE_PAUSE); + if (switch_test_flag(fhp, SWITCH_FILE_PAUSE)) { + switch_clear_flag(fhp, SWITCH_FILE_PAUSE); } else { - switch_set_flag(fh, SWITCH_FILE_PAUSE); + switch_set_flag(fhp, SWITCH_FILE_PAUSE); } return SWITCH_STATUS_SUCCESS; } else if (!strcasecmp(result, "stop")) { return SWITCH_STATUS_FALSE; } else if (!strcasecmp(result, "restart")) { unsigned int pos = 0; - fh->speed = 0; - switch_core_file_seek(fh, &pos, 0, SEEK_SET); + fhp->speed = 0; + switch_core_file_seek(fhp, &pos, 0, SEEK_SET); return SWITCH_STATUS_SUCCESS; } else if (!strncasecmp(result, "seek", 4)) { switch_codec_t *codec; @@ -1199,18 +1183,18 @@ if (step > 0) { samps = step * (codec->implementation->samples_per_second / 1000); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "going to seek\n"); - switch_core_file_seek(fh, &pos, samps, SEEK_CUR); + switch_core_file_seek(fhp, &pos, samps, SEEK_CUR); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "done seek\n"); } else { samps = step * (codec->implementation->samples_per_second / 1000); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "going to seek\n"); - switch_core_file_seek(fh, &pos, fh->pos - samps, SEEK_SET); + switch_core_file_seek(fhp, &pos, fhp->pos - samps, SEEK_SET); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "done seek\n"); } } else { samps = atoi(p) * (codec->implementation->samples_per_second / 1000); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "going to seek\n"); - switch_core_file_seek(fh, &pos, samps, SEEK_SET); + switch_core_file_seek(fhp, &pos, samps, SEEK_SET); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "done seek\n"); } } @@ -1218,6 +1202,7 @@ return SWITCH_STATUS_SUCCESS; } } + if (!strcmp(result, "true") || !strcmp(result, "undefined")) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "return success\n"); return SWITCH_STATUS_SUCCESS;

1 0

[commit] r9032 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 15 Jul '08

15 Jul '08

Author: brian Date: Tue Jul 15 07:23:46 2008 New Revision: 9032 Modified: freeswitch/trunk/conf/autoload_configs/pocketsphinx.conf.xml Log: tweak Modified: freeswitch/trunk/conf/autoload_configs/pocketsphinx.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/pocketsphinx.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/pocketsphinx.conf.xml Tue Jul 15 07:23:46 2008 @@ -1,8 +1,8 @@ <configuration name="pocketsphinx.conf" description="PocketSphinx ASR Configuration"> <settings> <param name="threshold" value="400"/> - <param name="silence-hits" value="35"/> - <param name="listen-hits" value="5"/> + <param name="silence-hits" value="25"/> + <param name="listen-hits" value="1"/> <param name="auto-reload" value="true"/> </settings> </configuration>

1 0

[commit] r9031 - in freeswitch/trunk: conf/autoload_configs src/mod/loggers/mod_syslog
by Freeswitch SVN 15 Jul '08

15 Jul '08

Author: mikej Date: Tue Jul 15 00:02:24 2008 New Revision: 9031 Modified: freeswitch/trunk/conf/autoload_configs/syslog.conf.xml freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c Log: tweak to make mod_syslog work again (FSCORE-153) Modified: freeswitch/trunk/conf/autoload_configs/syslog.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/syslog.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/syslog.conf.xml Tue Jul 15 00:02:24 2008 @@ -10,6 +10,6 @@  <settings> <param name="ident" value="freeswitch"/> - <param name="format" value="${time} - ${message}"/> + <param name="loglevel" value="warning"/> </settings> </configuration> Modified: freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c Tue Jul 15 00:02:24 2008 @@ -44,6 +44,7 @@ SWITCH_MODULE_DEFINITION(mod_syslog, mod_syslog_load, mod_syslog_shutdown, NULL); static switch_status_t load_config(void); +static switch_log_level_t log_level; static struct { char *ident; @@ -68,7 +69,6 @@ static switch_status_t mod_syslog_logger(const switch_log_node_t *node, switch_log_level_t level) { - char *message = NULL; int syslog_level; switch (level) { @@ -98,7 +98,7 @@ break; } - if (!switch_strlen_zero(message)) { + if (!switch_strlen_zero(node->data)) { syslog(syslog_level, "%s", node->data); } @@ -111,6 +111,9 @@ { char *cf = "syslog.conf"; switch_xml_t cfg, xml, settings, param; + + /* default log level */ + log_level = SWITCH_LOG_WARNING; if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); @@ -124,7 +127,13 @@ set_global_ident(val); } else if (!strcmp(var, "format")) { set_global_format(val); - } + } else if (!strcasecmp(var, "loglevel") && !switch_strlen_zero(val)) { + log_level = switch_log_str2level(val); + if(log_level == SWITCH_LOG_INVALID) + { + log_level = SWITCH_LOG_WARNING; + } + } } } @@ -152,7 +161,8 @@ openlog(globals.ident, LOG_PID, LOG_USER); - switch_log_bind_logger(mod_syslog_logger, SWITCH_LOG_DEBUG, SWITCH_FALSE); + setlogmask(LOG_UPTO(LOG_DEBUG)); + switch_log_bind_logger(mod_syslog_logger, log_level, SWITCH_FALSE); return SWITCH_STATUS_SUCCESS; }

1 0