November 2007 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r6395 - in freeswitch/trunk/src: . mod/applications/mod_conference
by Freeswitch SVN 24 Nov '07

24 Nov '07

Author: anthm Date: Sat Nov 24 16:48:25 2007 New Revision: 6395 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/switch_ivr_play_say.c freeswitch/trunk/src/switch_rtp.c Log: fix energy stuff to work better on 16khz calls Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Sat Nov 24 16:48:25 2007 @@ -1382,17 +1382,23 @@ if (switch_test_flag(member, MFLAG_CAN_SPEAK) && energy_level) { uint32_t energy = 0, i = 0, samples = 0, j = 0, score = 0; int16_t *data; + int divisor = 0; data = read_frame->data; + + if (!(divisor = read_codec->implementation->actual_samples_per_second / 8000)) { + divisor = 1; + } + if ((samples = read_frame->datalen / sizeof(*data))) { for (i = 0; i < samples; i++) { energy += abs(data[j]); j += read_codec->implementation->number_of_channels; } - score = energy / samples; + score = energy / (samples / divisor); } - + if (score > energy_level) { uint32_t diff = score - energy_level; if (hangover_hits) { 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 Sat Nov 24 16:48:25 2007 @@ -516,13 +516,18 @@ uint32_t samples = read_frame->datalen / sizeof(*fdata); uint32_t score, count = 0, j = 0; double energy = 0; - + int divisor = 0; + for (count = 0; count < samples; count++) { energy += abs(fdata[j]); j += read_codec->implementation->number_of_channels; } - score = (uint32_t) (energy / samples); + if (!(divisor = read_codec->implementation->actual_samples_per_second / 8000)) { + divisor = 1; + } + + score = (uint32_t) (energy / (samples / divisor)); if (score < fh->thresh) { if (!--fh->silence_hits) { break; Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Sat Nov 24 16:48:25 2007 @@ -1375,8 +1375,13 @@ uint32_t energy = 0; uint32_t x, y = 0, z = len / sizeof(int16_t); uint32_t score = 0; - + int divisor = 0; if (z) { + + if (!(divisor = rtp_session->vad_data.read_codec->implementation->actual_samples_per_second / 8000)) { + divisor = 1; + } + for (x = 0; x < z; x++) { energy += abs(decoded[y]); y += rtp_session->vad_data.read_codec->implementation->number_of_channels; @@ -1385,7 +1390,7 @@ if (++rtp_session->vad_data.start_count < rtp_session->vad_data.start) { send = 1; } else { - score = energy / z; + score = (energy / (z / divisor)); if (score && (rtp_session->vad_data.bg_count < rtp_session->vad_data.bg_len)) { rtp_session->vad_data.bg_level += score; if (++rtp_session->vad_data.bg_count == rtp_session->vad_data.bg_len) {

1 0

[Freeswitch-svn] [commit] r6394 - in freeswitch/trunk: conf/autoload_configs src/mod/applications/mod_voicemail
by Freeswitch SVN 24 Nov '07

24 Nov '07

Author: anthm Date: Sat Nov 24 16:09:52 2007 New Revision: 6394 Modified: freeswitch/trunk/conf/autoload_configs/voicemail.conf.xml freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: solution for MODAPP-52 Modified: freeswitch/trunk/conf/autoload_configs/voicemail.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/voicemail.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/voicemail.conf.xml Sat Nov 24 16:09:52 2007 @@ -29,6 +29,8 @@ <param name="restart-key" value="1"/> <param name="ff-key" value="6"/> <param name="rew-key" value="4"/> + <param name="record-silence-threshold" value="200"/> + <param name="record-silence-hits" value="2"/>  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 Sat Nov 24 16:09:52 2007 @@ -93,6 +93,8 @@ uint32_t max_login_attempts; uint32_t max_record_len; switch_mutex_t *mutex; + uint32_t record_threshold; + uint32_t record_silence_hits; #ifdef SWITCH_HAVE_ODBC switch_odbc_handle_t *master_odbc; #else @@ -297,6 +299,8 @@ char *email_headers = ""; char *email_from = ""; char *date_fmt = "%A, %B %d %Y, %I %M %p"; + uint32_t record_threshold = 200; + uint32_t record_silence_hits = 2; switch_core_db_t *db; uint32_t timeout = 10000, max_login_attempts = 3, max_record_len = 300; @@ -384,6 +388,26 @@ callback_context = val; } else if (!strcasecmp(var, "file-extension")) { file_ext = val; + } else if (!strcasecmp(var, "record-silence-threshold")) { + int tmp = 0; + if (!switch_strlen_zero(val)) { + tmp = atoi(val); + } + if (tmp >= 0 && tmp <= 10000) { + record_threshold = tmp; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "invalid threshold value [%s] must be between 0 and 10000 ms\n", val); + } + } else if (!strcasecmp(var, "record-silence-hits")) { + int tmp = 0; + if (!switch_strlen_zero(val)) { + tmp = atoi(val); + } + if (tmp >= 0 && tmp <= 1000) { + record_silence_hits = tmp; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "invalid threshold value [%s] must be between 0 and 1000 ms\n", val); + } } else if (!strcasecmp(var, "tone-spec")) { tone_spec = val; } else if (!strcasecmp(var, "digit-timeout")) { @@ -501,7 +525,8 @@ *profile->rew_key = *rew_key; *profile->urgent_key = *urgent_key; *profile->operator_key = *operator_key; - + profile->record_threshold = record_threshold; + profile->record_silence_hits = record_silence_hits; profile->operator_ext = switch_core_strdup(globals.pool, operator_ext); profile->storage_dir = switch_core_strdup(globals.pool, storage_dir); @@ -793,8 +818,8 @@ TRY_CODE(switch_ivr_gentones(session, profile->tone_spec, 0, NULL)); memset(&fh, 0, sizeof(fh)); - fh.thresh = 200; - fh.silence_hits = 2; + fh.thresh = profile->record_threshold; + fh.silence_hits = profile->record_silence_hits; switch_ivr_record_file(session, &fh, file_path, &args, profile->max_record_len);

1 0

[Freeswitch-svn] [commit] r6393 - freeswitch/trunk/src/mod/languages/mod_python
by Freeswitch SVN 24 Nov '07

24 Nov '07

Author: mikej Date: Fri Nov 23 22:18:20 2007 New Revision: 6393 Modified: freeswitch/trunk/src/mod/languages/mod_python/Makefile Log: split make and make install steps for python and Makefile cleanup. (thanks stkn) Modified: freeswitch/trunk/src/mod/languages/mod_python/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_python/Makefile Fri Nov 23 22:18:20 2007 @@ -3,8 +3,10 @@ # and define these variables to impact your build -LOCAL_CFLAGS=-I$(PREFIX)/include/python2.5/ -LOCAL_LDFLAGS=-lpython2.5 -L$(PREFIX)/lib/python2.5/config/ -lutil -lstdc++ +PYVER="Python-2.5.1" + +LOCAL_CFLAGS =-I$(BASE)/libs/$(PYVER)/ -I$(BASE)/libs/$(PYVER)/Include/ +LOCAL_LDFLAGS=-L$(BASE)/libs/$(PYVER)/ -lpython2.5 -lutil -lstdc++ LOCAL_OBJS=freeswitch_python.o mod_python_wrap.o include ../../../../build/modmake.rules @@ -14,7 +16,7 @@ SWIGIFILE=../../../switch_swig.i local_depend: - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install Python-2.5.1.tgz --prefix=$(PREFIX) --enable-threads CFLAGSFORSHARED="-fPIC" + MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) $(PYVER).tgz --prefix=$(PREFIX) --enable-threads CFLAGSFORSHARED="-fPIC" reswig: swig -python -shadow -c++ -I../../../../src/include -o mod_python_wrap.cpp mod_python.i @@ -26,6 +28,6 @@ $(CC) -w $(CFLAGS) -c $< -o $@ local_install: - test -d $(DESTDIR)$(PREFIX)/lib/python2.5/site-packages/ || mkdir -p $(DESTDIR)$(PREFIX)/lib/python2.5/site-packages/ + $(MAKE) -C $(BASE)/libs/$(PYVER)/ DESTDIR=$(DESTDIR) install cp -f freeswitch.py $(DESTDIR)$(PREFIX)/lib/python2.5/site-packages/

1 0

[Freeswitch-svn] [commit] r6392 - freeswitch/trunk/src/mod/languages/mod_python
by Freeswitch SVN 24 Nov '07

24 Nov '07

Author: mikej Date: Fri Nov 23 20:59:58 2007 New Revision: 6392 Modified: freeswitch/trunk/src/mod/languages/mod_python/Makefile Log: error on missing dir on fresh build (thanks trixter) Modified: freeswitch/trunk/src/mod/languages/mod_python/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_python/Makefile Fri Nov 23 20:59:58 2007 @@ -26,5 +26,6 @@ $(CC) -w $(CFLAGS) -c $< -o $@ local_install: + test -d $(DESTDIR)$(PREFIX)/lib/python2.5/site-packages/ || mkdir -p $(DESTDIR)$(PREFIX)/lib/python2.5/site-packages/ cp -f freeswitch.py $(DESTDIR)$(PREFIX)/lib/python2.5/site-packages/

1 0

[Freeswitch-svn] [commit] r6391 - in freeswitch/trunk/src/mod/languages: mod_java mod_python
by Freeswitch SVN 24 Nov '07

24 Nov '07

Author: mikej Date: Fri Nov 23 19:59:04 2007 New Revision: 6391 Modified: freeswitch/trunk/src/mod/languages/mod_java/Makefile.in freeswitch/trunk/src/mod/languages/mod_python/Makefile Log: add missing DESTDIR (thanks stkn) Modified: freeswitch/trunk/src/mod/languages/mod_java/Makefile.in ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_java/Makefile.in (original) +++ freeswitch/trunk/src/mod/languages/mod_java/Makefile.in Fri Nov 23 19:59:04 2007 @@ -26,5 +26,5 @@ swig -java -c++ -I../../../include -package org.freeswitch.swig -outdir src/org/freeswitch/swig -o switch_swig_wrap.cpp mod_java.i local_install: - cp freeswitch.jar $(PREFIX)/scripts + cp freeswitch.jar $(DESTDIR)$(PREFIX)/scripts Modified: freeswitch/trunk/src/mod/languages/mod_python/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_python/Makefile Fri Nov 23 19:59:04 2007 @@ -26,5 +26,5 @@ $(CC) -w $(CFLAGS) -c $< -o $@ local_install: - cp -f freeswitch.py $(PREFIX)/lib/python2.5/site-packages/ + cp -f freeswitch.py $(DESTDIR)$(PREFIX)/lib/python2.5/site-packages/

1 0

[Freeswitch-svn] [commit] r6390 - in freeswitch/trunk/src: . mod/applications/mod_conference mod/asr_tts/mod_cepstral mod/endpoints/mod_dingaling mod/endpoints/mod_portaudio mod/endpoints/mod_woomera mod/event_handlers/mod_event_multicast mod/event_handlers/mod_zeroconf
by Freeswitch SVN 23 Nov '07

23 Nov '07

Author: mikej Date: Fri Nov 23 13:50:54 2007 New Revision: 6390 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_cpp.cpp freeswitch/trunk/src/switch_ivr_originate.c freeswitch/trunk/src/switch_ivr_play_say.c Log: add some missing \n's to switch_log_printf messages. Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Fri Nov 23 13:50:54 2007 @@ -4950,7 +4950,7 @@ /* create/register custom event message type */ if (switch_event_reserve_subclass(CONF_EVENT_MAINT) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!", CONF_EVENT_MAINT); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!\n", CONF_EVENT_MAINT); return SWITCH_STATUS_TERM; } Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c Fri Nov 23 13:50:54 2007 @@ -140,7 +140,7 @@ /* Open a Swift Port through which to make TTS calls */ if (SWIFT_FAILED(cepstral->port = swift_port_open(engine, cepstral->params))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to open Swift Port."); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to open Swift Port.\n"); goto all_done; } 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 Fri Nov 23 13:50:54 2007 @@ -1778,17 +1778,17 @@ load_config(); if (switch_event_reserve_subclass(DL_EVENT_LOGIN_SUCCESS) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!", DL_EVENT_LOGIN_SUCCESS); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!\n", DL_EVENT_LOGIN_SUCCESS); return SWITCH_STATUS_GENERR; } if (switch_event_reserve_subclass(DL_EVENT_LOGIN_FAILURE) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!", DL_EVENT_LOGIN_FAILURE); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!\n", DL_EVENT_LOGIN_FAILURE); return SWITCH_STATUS_GENERR; } if (switch_event_reserve_subclass(DL_EVENT_CONNECTED) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!", DL_EVENT_CONNECTED); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!\n", DL_EVENT_CONNECTED); return SWITCH_STATUS_GENERR; } @@ -2089,7 +2089,7 @@ if (profile) { if (switch_test_flag(profile, TFLAG_IO)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Profile already exists."); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Profile already exists.\n"); stream->write_function(stream, "Profile already exists\n"); return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Fri Nov 23 13:50:54 2007 @@ -826,7 +826,7 @@ if (switch_event_reserve_subclass(MY_EVENT_RINGING) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass!"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass!\n"); return SWITCH_STATUS_GENERR; } Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Fri Nov 23 13:50:54 2007 @@ -566,7 +566,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Out of memory\n"); } else { if (profile && globals.debug) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Send Message: {%s} [%s/%d]\n%s\n%s", profile->name, + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Send Message: {%s} [%s/%d]\n%s\n%s\n", profile->name, profile->woomera_host, profile->woomera_port, WOOMERA_DEBUG_LINE, stuff); } len = strlen(stuff); @@ -682,7 +682,7 @@ next = buf; if (globals.debug) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Receive Message: {%s} [%s/%d]\n%s\n%s", profile->name, + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Receive Message: {%s} [%s/%d]\n%s\n%s\n", profile->name, profile->woomera_host, profile->woomera_port, WOOMERA_DEBUG_LINE, buf); } Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Fri Nov 23 13:50:54 2007 @@ -76,7 +76,7 @@ } if (switch_event_reserve_subclass(MULTICAST_EVENT) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass!"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass!\n"); return SWITCH_STATUS_GENERR; } Modified: freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.c Fri Nov 23 13:50:54 2007 @@ -270,12 +270,12 @@ } if (switch_event_reserve_subclass(MY_EVENT_PUBLISH) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass!"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass!\n"); return SWITCH_STATUS_GENERR; } if (switch_event_reserve_subclass(MY_EVENT_UNPUBLISH) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass!"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass!\n"); return SWITCH_STATUS_GENERR; } Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Fri Nov 23 13:50:54 2007 @@ -755,7 +755,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Loading Modules.\n"); if (switch_loadable_module_init() != SWITCH_STATUS_SUCCESS) { *err = "Cannot load modules"; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Error: %s", *err); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Error: %s\n", *err); return SWITCH_STATUS_GENERR; } Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Fri Nov 23 13:50:54 2007 @@ -67,7 +67,7 @@ CoreSession::~CoreSession() { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CoreSession::~CoreSession desctructor"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CoreSession::~CoreSession desctructor\n"); switch_channel_t *channel = NULL; if (session) { @@ -164,12 +164,12 @@ store_file_handle(&fh); if (!tts_name) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No TTS engine specified"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No TTS engine specified\n"); return SWITCH_STATUS_FALSE; } if (!voice_name) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No TTS voice specified"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No TTS voice specified\n"); return SWITCH_STATUS_FALSE; } Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Fri Nov 23 13:50:54 2007 @@ -683,7 +683,7 @@ switch_safe_free(tmp_data); } } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec Error!"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec Error!\n"); switch_channel_hangup(caller_channel, SWITCH_CAUSE_NORMAL_TEMPORARY_FAILURE); read_codec = NULL; } 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 Fri Nov 23 13:50:54 2007 @@ -1124,7 +1124,7 @@ args.buflen = digit_buffer_length; //Play the file status = switch_ivr_play_file(session, NULL, prompt_audio_file, &args); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "play gave up %s", (char *) digit_buffer); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "play gave up %s\n", (char *) digit_buffer); //Make sure we made it out alive if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) {

1 0

[Freeswitch-svn] [commit] r6389 - in freeswitch/trunk/src: . include
by Freeswitch SVN 23 Nov '07

23 Nov '07

Author: anthm Date: Fri Nov 23 13:35:38 2007 New Revision: 6389 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_core_media_bug.c freeswitch/trunk/src/switch_ivr_async.c Log: add RECORD_ANSWER_REQ var Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Fri Nov 23 13:35:38 2007 @@ -158,6 +158,14 @@ SWITCH_DECLARE(switch_frame_t *) switch_core_media_bug_get_read_replace_frame(switch_media_bug_t *bug); /*! + \brief Obtain the session from a media bug + \param bug the bug to get the data from +*/ +SWITCH_DECLARE(switch_core_session_t *) switch_core_media_bug_get_session(switch_media_bug_t *bug); + +SWITCH_DECLARE(uint32_t) switch_core_media_bug_test_flag(switch_media_bug_t *bug, uint32_t flag); + +/*! \brief Set a return replace frame \param bug the bug to set the frame on \param frame the frame to set Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Fri Nov 23 13:35:38 2007 @@ -783,6 +783,8 @@ SMBF_WRITE_STREAM - Include the Write Stream SMBF_WRITE_REPLACE - Replace the Write Stream SMBF_READ_REPLACE - Replace the Read Stream +SMBF_STEREO - Record in stereo +SMBF_ANSWER_RECORD_REQ - Don't record until the channel is answered </pre> */ typedef enum { @@ -791,7 +793,8 @@ SMBF_WRITE_STREAM = (1 << 1), SMBF_WRITE_REPLACE = (1 << 2), SMBF_READ_REPLACE = (1 << 3), - SMBF_STEREO = (1 << 4) + SMBF_STEREO = (1 << 4), + SMBF_RECORD_ANSWER_REQ = (1 << 5) } switch_media_bug_flag_t; /*! Modified: freeswitch/trunk/src/switch_core_media_bug.c ============================================================================== --- freeswitch/trunk/src/switch_core_media_bug.c (original) +++ freeswitch/trunk/src/switch_core_media_bug.c Fri Nov 23 13:35:38 2007 @@ -40,6 +40,15 @@ switch_buffer_destroy(&bug->raw_write_buffer); } +SWITCH_DECLARE(uint32_t) switch_core_media_bug_test_flag(switch_media_bug_t *bug, uint32_t flag) +{ + return switch_test_flag(bug, flag); +} + +SWITCH_DECLARE(switch_core_session_t *) switch_core_media_bug_get_session(switch_media_bug_t *bug) +{ + return bug->session; +} SWITCH_DECLARE(switch_frame_t *) switch_core_media_bug_get_write_replace_frame(switch_media_bug_t *bug) { Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Fri Nov 23 13:35:38 2007 @@ -262,10 +262,24 @@ case SWITCH_ABC_TYPE_READ: if (fh) { switch_size_t len; - + switch_core_session_t *session; + switch_channel_t *channel; + + session = switch_core_media_bug_get_session(bug); + assert(session != NULL); + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + if (switch_core_media_bug_read(bug, &frame) == SWITCH_STATUS_SUCCESS) { - len = (switch_size_t) frame.datalen / 2; - switch_core_file_write(fh, frame.data, &len); + int doit = 1; + if (!switch_channel_test_flag(channel, CF_ANSWERED) && switch_core_media_bug_test_flag(bug, SMBF_RECORD_ANSWER_REQ)) { + doit = 0; + } + + if (doit) { + len = (switch_size_t) frame.datalen / 2; + switch_core_file_write(fh, frame.data, &len); + } } } break; @@ -327,6 +341,10 @@ flags |= SMBF_STEREO; channels = 2; } + + if ((p = switch_channel_get_variable(channel, "RECORD_ANSWER_REQ")) && switch_true(p)) { + flags |= SMBF_RECORD_ANSWER_REQ; + } fh->channels = channels; fh->samplerate = read_codec->implementation->actual_samples_per_second;

1 0

[Freeswitch-svn] [commit] r6388 - freeswitch/trunk/libs/libteletone/src
by Freeswitch SVN 23 Nov '07

23 Nov '07

Author: anthm Date: Fri Nov 23 13:09:23 2007 New Revision: 6388 Modified: freeswitch/trunk/libs/libteletone/src/libteletone_generate.c Log: off by 1 err pointed out by trixter from irc Modified: freeswitch/trunk/libs/libteletone/src/libteletone_generate.c ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone_generate.c (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone_generate.c Fri Nov 23 13:09:23 2007 @@ -106,7 +106,7 @@ teletone_process_t x = 0; va_start(ap, index); - while (i <= TELETONE_MAX_TONES && (x = va_arg(ap, teletone_process_t))) { + while (i < TELETONE_MAX_TONES && (x = va_arg(ap, teletone_process_t))) { ts->TONES[index].freqs[i++] = x; } va_end(ap); @@ -122,7 +122,7 @@ teletone_process_t x = 0; va_start(ap, map); - while (i <= TELETONE_MAX_TONES && (x = va_arg(ap, teletone_process_t))) { + while (i < TELETONE_MAX_TONES && (x = va_arg(ap, teletone_process_t))) { map->freqs[i++] = x; } va_end(ap);

1 0

[Freeswitch-svn] [commit] r6387 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 23 Nov '07

23 Nov '07

Author: anthm Date: Fri Nov 23 12:56:03 2007 New Revision: 6387 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: patch from trixter's blog to add new lines to some printfs.... thank you 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 Nov 23 12:56:03 2007 @@ -1120,7 +1120,7 @@ if (!(profile = switch_core_hash_find(globals.profile_hash, profile_name))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error invalid profile %s", profile_name); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error invalid profile %s\n", profile_name); return; } @@ -1495,7 +1495,7 @@ if (switch_dir_make_recursive(dir_path, DEFAULT_DIR_PERMS, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error creating %s", dir_path); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error creating %s\n", dir_path); return; } } @@ -1563,7 +1563,7 @@ memset(&cbt, 0, sizeof(cbt)); if (!(profile = switch_core_hash_find(globals.profile_hash, profile_name))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error invalid profile %s", profile_name); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error invalid profile %s\n", profile_name); return SWITCH_STATUS_FALSE; } @@ -1588,7 +1588,7 @@ } if (switch_dir_make_recursive(dir_path, DEFAULT_DIR_PERMS, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error creating %s", dir_path); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error creating %s\n", dir_path); goto end; } @@ -1873,7 +1873,7 @@ assert(channel != NULL); if (switch_dir_make_recursive(SWITCH_GLOBAL_dirs.storage_dir, DEFAULT_DIR_PERMS, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error creating %s", SWITCH_GLOBAL_dirs.storage_dir); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error creating %s\n", SWITCH_GLOBAL_dirs.storage_dir); return; }

1 0

[Freeswitch-svn] [commit] r6384 - freeswitch/trunk/build
by Freeswitch SVN 23 Nov '07

23 Nov '07

Author: mikej Date: Thu Nov 22 22:09:08 2007 New Revision: 6384 Modified: freeswitch/trunk/build/freeswitch.spec Log: cleanup spec file Modified: freeswitch/trunk/build/freeswitch.spec ============================================================================== --- freeswitch/trunk/build/freeswitch.spec (original) +++ freeswitch/trunk/build/freeswitch.spec Thu Nov 22 22:09:08 2007 @@ -2,17 +2,13 @@ Summary: FreeSWITCH open source telephony platform License: MPL Group: Productivity/Telephony/Servers -Version: 6365 +Version: 6382 Release: 0 URL: http://www.freeswitch.org/ Packager: Peter Nixon Vendor: http://peternixon.net/ Source0: %{name}-%{version}.tar.bz2 -Source1: freeswitch.ld.so.conf -Source2: freeswitch.init -Source3: freeswitch.sysconfig -Source4: modules.conf -Patch0: curses.patch +Source1: modules.conf #AutoReqProv: no @@ -22,7 +18,6 @@ BuildRequires: curl-devel BuildRequires: gcc-c++ BuildRequires: gnutls-devel -#BuildRequires: libogg-devel BuildRequires: libtool >= 1.5.14 BuildRequires: lzo-devel BuildRequires: freeradius-client-snapshot-devel @@ -35,7 +30,6 @@ BuildRequires: python-devel BuildRequires: termcap #BuildRequires: unixODBC-devel -#BuildRequires: sqlite-devel %if %{?suse_version:1}0 %if 0%{?suse_version} > 910 @@ -104,8 +98,6 @@ %prep %setup -q -%patch0 - %build #export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DLDAP_DEPRECATED -fPIC -DPIC" @@ -114,15 +106,11 @@ export CFLAGS="$CFLAGS -fstack-protector" %endif - export VERBOSE=yes -export CFLAGS="$CFLAGS -g -ggdb" -export MOD_CFLAGS="-g -ggdb" export DESTDIR=$RPM_BUILD_ROOT/ export PKG_CONFIG_PATH=/usr/bin/pkg-config:$PKG_CONFIG_PATH export ACLOCAL_FLAGS="-I /usr/share/aclocal" ./bootstrap.sh -#./configure -C \ %configure -C \ --prefix=/opt/freeswitch \ --sysconfdir=%{_sysconfdir} \ @@ -135,29 +123,24 @@ cat src/include/switch_version.h.in | sed "s/@SVN_VERSION@/%{version}/g" > src/include/switch_version.h touch .noversion -cp %{SOURCE4} . +cp %{SOURCE1} . make %install make DESTDIR=$RPM_BUILD_ROOT install -#make DESTDIR=$RPM_BUILD_ROOT -C src/mod/event_handlers/mod_cdr install -#make DESTDIR=$RPM_BUILD_ROOT -C src/mod/codecs/mod_speex install -#make DESTDIR=$RPM_BUILD_ROOT -C src/mod/codecs/mod_g729 install -#make DESTDIR=$RPM_BUILD_ROOT -C src/mod/xml_int/mod_xml_rpc install # Create a log dir mkdir -p $RPM_BUILD_ROOT/opt/freeswitch/log + #Install the library path config so the system can find the modules mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d -cp %{SOURCE1} $RPM_BUILD_ROOT/etc/ld.so.conf.d/ +cp build/freeswitch.ld.so.conf $RPM_BUILD_ROOT/etc/ld.so.conf.d/ -#install -m 744 suse/freeswitch.init $RPM_BUILD_ROOT/etc/init.d/freeswitch -install -D -m 744 %{SOURCE2} $RPM_BUILD_ROOT/etc/init.d/freeswitch +install -D -m 744 build/freeswitch.init $RPM_BUILD_ROOT/etc/init.d/freeswitch mkdir -p $RPM_BUILD_ROOT/usr/sbin ln -sf /etc/init.d/freeswitch $RPM_BUILD_ROOT/usr/sbin/rcfreeswitch -install -D -m 744 %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/freeswitch - +install -D -m 744 build/freeswitch.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/freeswitch %pre /usr/sbin/groupadd -r freeswitch 2> /dev/null || :

1 0