January 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r7388 - in freeswitch/trunk/src/mod: applications/mod_soundtouch asr_tts/mod_lumenvox asr_tts/mod_openmrcp dialplans/mod_dialplan_directory
by Freeswitch SVN 27 Jan '08

27 Jan '08

Author: brian Date: Sun Jan 27 00:45:28 2008 New Revision: 7388 Modified: freeswitch/trunk/src/mod/applications/mod_soundtouch/mod_soundtouch.cpp freeswitch/trunk/src/mod/asr_tts/mod_lumenvox/mod_lumenvox.cpp freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c Log: more cleanup Modified: freeswitch/trunk/src/mod/applications/mod_soundtouch/mod_soundtouch.cpp ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_soundtouch/mod_soundtouch.cpp (original) +++ freeswitch/trunk/src/mod/applications/mod_soundtouch/mod_soundtouch.cpp Sun Jan 27 00:45:28 2008 @@ -25,7 +25,7 @@ * * Anthony Minessale II <anthmct(a)yahoo.com> * - * mod_soundtouch.c -- Example of writeable media bugs + * mod_soundtouch.cpp -- Example of writeable media bugs * */ Modified: freeswitch/trunk/src/mod/asr_tts/mod_lumenvox/mod_lumenvox.cpp ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_lumenvox/mod_lumenvox.cpp (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_lumenvox/mod_lumenvox.cpp Sun Jan 27 00:45:28 2008 @@ -26,7 +26,7 @@ * Anthony Minessale II <anthmct(a)yahoo.com> * * - * mod_lumenvox.c -- Lumenvox Interface + * mod_lumenvox.cpp -- Lumenvox Interface * * */ Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Sun Jan 27 00:45:28 2008 @@ -26,6 +26,8 @@ * Traun Leyden <tleyden(a)branchcut.com> * Arsen Chaloyan <achaloyan(a)yahoo.com> * + * mod_openmrcp.c -- OpenMRCP Interface + * * Module which acts as an MRCP client to an MRCP speech recognition * server. In other words it bridges freeswitch to an external speech * recognition system. Documentation on how to install and configure Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c Sun Jan 27 00:45:28 2008 @@ -26,7 +26,7 @@ * Anthony Minessale II <anthmct(a)yahoo.com> * * - * mod_dialplan_demo.c -- Example Dialplan Module + * mod_dialplan_directory.c -- Example Dialplan Module * */ #include <switch.h>

1 0

[commit] r7387 - freeswitch/trunk/src
by Freeswitch SVN 27 Jan '08

27 Jan '08

Author: silik0n Date: Sun Jan 27 00:44:21 2008 New Revision: 7387 Modified: freeswitch/trunk/src/switch_core_db.c Log: BKWs not the only one that can whitespace fix :P Modified: freeswitch/trunk/src/switch_core_db.c ============================================================================== --- freeswitch/trunk/src/switch_core_db.c (original) +++ freeswitch/trunk/src/switch_core_db.c Sun Jan 27 00:44:21 2008 @@ -37,7 +37,6 @@ static void db_pick_path(char *dbname, char *buf, switch_size_t size) { - memset(buf, 0, size); if (switch_is_file_path(dbname)) { strncpy(buf, dbname, size);

1 0

[commit] r7386 - in freeswitch/trunk/src/mod/codecs: mod_g711 mod_g723_1 mod_g726 mod_g729 mod_gsm mod_h26x mod_ilbc mod_l16
by Freeswitch SVN 27 Jan '08

27 Jan '08

Author: brian Date: Sun Jan 27 00:37:58 2008 New Revision: 7386 Modified: freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c freeswitch/trunk/src/mod/codecs/mod_gsm/mod_gsm.c freeswitch/trunk/src/mod/codecs/mod_h26x/mod_h26x.c freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.c freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c Log: housekeeping.. *tap* *tap* housekeeping... Modified: freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c Sun Jan 27 00:37:58 2008 @@ -26,7 +26,7 @@ * Anthony Minessale II <anthmct(a)yahoo.com> * * - * mod_g711codec.c -- G711 Ulaw/Alaw Codec Module + * mod_g711.c -- G711 Ulaw/Alaw Codec Module * */ #include <switch.h> Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c Sun Jan 27 00:37:58 2008 @@ -28,7 +28,7 @@ * * The g723.1 codec itself is not distributed with this module. * - * mod_g723.c -- G723.1 Codec Module + * mod_g723_1.c -- G723.1 Codec Module * */ #include "switch.h" @@ -97,7 +97,6 @@ #endif } - static switch_status_t switch_g723_destroy(switch_codec_t *codec) { #ifndef G723_PASSTHROUGH Modified: freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c Sun Jan 27 00:37:58 2008 @@ -39,7 +39,6 @@ typedef int (*encoder_t) (int, int, g726_state *); typedef int (*decoder_t) (int, int, g726_state *); - typedef struct { g726_state context; switch_byte_t bits_per_frame; @@ -101,15 +100,12 @@ } } - static switch_status_t switch_g726_destroy(switch_codec_t *codec) { codec->private_info = NULL; return SWITCH_STATUS_SUCCESS; } - - static switch_status_t switch_g726_encode(switch_codec_t *codec, switch_codec_t *other_codec, void *decoded_data, @@ -117,11 +113,9 @@ uint32_t decoded_rate, void *encoded_data, uint32_t * encoded_data_len, uint32_t * encoded_rate, unsigned int *flag) { - g726_handle_t *handle = codec->private_info; g726_state *context = &handle->context; uint32_t len = codec->implementation->bytes_per_frame; - //uint32_t elen = codec->implementation->encoded_bytes_per_frame; if (!context) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error!\n"); @@ -155,8 +149,6 @@ return SWITCH_STATUS_SUCCESS; } - - static switch_status_t switch_g726_decode(switch_codec_t *codec, switch_codec_t *other_codec, void *encoded_data, @@ -164,7 +156,6 @@ uint32_t encoded_rate, void *decoded_data, uint32_t * decoded_data_len, uint32_t * decoded_rate, unsigned int *flag) { - g726_handle_t *handle = codec->private_info; g726_state *context = &handle->context; int16_t *ddp = decoded_data; @@ -195,13 +186,9 @@ return SWITCH_STATUS_FALSE; } - return SWITCH_STATUS_SUCCESS; - } - - /* Registration */ static switch_codec_implementation_t g726_16k_implementation = { @@ -225,7 +212,6 @@ /*.destroy */ switch_g726_destroy, }; - static switch_codec_implementation_t g726_24k_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 126, @@ -289,8 +275,6 @@ /*.destroy */ switch_g726_destroy, }; - - static switch_codec_implementation_t aal2_g726_16k_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 124, @@ -312,7 +296,6 @@ /*.destroy */ switch_g726_destroy, }; - static switch_codec_implementation_t aal2_g726_24k_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 123, Modified: freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c Sun Jan 27 00:37:58 2008 @@ -78,7 +78,6 @@ codec->private_info = context; return SWITCH_STATUS_SUCCESS; - } #endif } @@ -151,7 +150,6 @@ if (!context) { return SWITCH_STATUS_FALSE; - } if (encoded_data_len % 2 == 0) { @@ -192,11 +190,8 @@ } if (new_len <= *decoded_data_len) { - *decoded_data_len = new_len; - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "buffer overflow!!!\n"); return SWITCH_STATUS_FALSE; Modified: freeswitch/trunk/src/mod/codecs/mod_gsm/mod_gsm.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_gsm/mod_gsm.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_gsm/mod_gsm.c Sun Jan 27 00:37:58 2008 @@ -26,7 +26,7 @@ * Anthony Minessale II <anthmct(a)yahoo.com> * Michael Jerris <mike(a)jerris.com> * - * mod_codec_gsm.c -- gsm Codec Module + * mod_gsm.c -- gsm Codec Module * */ #include "switch.h" Modified: freeswitch/trunk/src/mod/codecs/mod_h26x/mod_h26x.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_h26x/mod_h26x.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_h26x/mod_h26x.c Sun Jan 27 00:37:58 2008 @@ -71,7 +71,6 @@ static switch_status_t switch_h26x_destroy(switch_codec_t *codec) { - return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.c Sun Jan 27 00:37:58 2008 @@ -51,7 +51,6 @@ int encoding, decoding; uint8_t ms = (uint8_t) (codec->implementation->microseconds_per_frame / 1000); - if (ms != 20 && ms != 30) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "invalid speed! (I should never happen)\n"); return SWITCH_STATUS_FALSE; Modified: freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c Sun Jan 27 00:37:58 2008 @@ -26,7 +26,7 @@ * Anthony Minessale II <anthmct(a)yahoo.com> * * - * mod_rawaudio.c -- Raw Signed Linear Codec + * mod_l16.c -- Raw Signed Linear Codec * */ #include <switch.h>

1 0

[commit] r7385 - in freeswitch/trunk/src: . mod/applications/mod_enum mod/asr_tts/mod_openmrcp mod/endpoints/mod_sofia mod/endpoints/mod_wanpipe mod/languages/mod_python mod/say/mod_say_de mod/say/mod_say_en mod/say/mod_say_es mod/say/mod_say_fr mod/say/mod_say_it mod/say/mod_say_nl
by Freeswitch SVN 27 Jan '08

27 Jan '08

Author: brian Date: Sun Jan 27 00:02:52 2008 New Revision: 7385 Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c freeswitch/trunk/src/mod/languages/mod_python/mod_python.c freeswitch/trunk/src/mod/say/mod_say_de/mod_say_de.c freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c freeswitch/trunk/src/mod/say/mod_say_es/mod_say_es.c freeswitch/trunk/src/mod/say/mod_say_fr/mod_say_fr.c freeswitch/trunk/src/mod/say/mod_say_it/mod_say_it.c freeswitch/trunk/src/mod/say/mod_say_nl/mod_say_nl.c freeswitch/trunk/src/switch_core_asr.c freeswitch/trunk/src/switch_core_directory.c freeswitch/trunk/src/switch_core_file.c freeswitch/trunk/src/switch_core_hash.c freeswitch/trunk/src/switch_core_io.c freeswitch/trunk/src/switch_core_media_bug.c freeswitch/trunk/src/switch_core_rwlock.c freeswitch/trunk/src/switch_core_speech.c freeswitch/trunk/src/switch_core_timer.c freeswitch/trunk/src/switch_ivr_bridge.c freeswitch/trunk/src/switch_ivr_menu.c freeswitch/trunk/src/switch_ivr_originate.c freeswitch/trunk/src/switch_ivr_play_say.c Log: more house keeping.. and one commit tony forgot to commit from my dev box Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c (original) +++ freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Sun Jan 27 00:02:52 2008 @@ -733,3 +733,14 @@ switch_core_hash_destroy(&globals.routes); return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Sun Jan 27 00:02:52 2008 @@ -981,3 +981,14 @@ openmrcp_destroy(); return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Sun Jan 27 00:02:52 2008 @@ -2891,3 +2891,14 @@ } } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Sun Jan 27 00:02:52 2008 @@ -2421,3 +2421,14 @@ return 1; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Sun Jan 27 00:02:52 2008 @@ -1132,7 +1132,13 @@ return status; } - - - - +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Sun Jan 27 00:02:52 2008 @@ -2471,7 +2471,6 @@ set_global_dialplan("XML"); } - globals.configured_spans = 0; for(current_span = 1; current_span < MAX_SPANS; current_span++) { if (SPANS[current_span]) { @@ -2496,11 +2495,16 @@ } } - - return SWITCH_STATUS_SUCCESS; - } - - +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/mod_python.c (original) +++ freeswitch/trunk/src/mod/languages/mod_python/mod_python.c Sun Jan 27 00:02:52 2008 @@ -331,7 +331,15 @@ } - - - /* Return the number of arguments of the application command line */ + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/say/mod_say_de/mod_say_de.c ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_de/mod_say_de.c (original) +++ freeswitch/trunk/src/mod/say/mod_say_de/mod_say_de.c Sun Jan 27 00:02:52 2008 @@ -536,3 +536,14 @@ /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c (original) +++ freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c Sun Jan 27 00:02:52 2008 @@ -536,3 +536,14 @@ /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/say/mod_say_es/mod_say_es.c ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_es/mod_say_es.c (original) +++ freeswitch/trunk/src/mod/say/mod_say_es/mod_say_es.c Sun Jan 27 00:02:52 2008 @@ -536,3 +536,14 @@ /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/say/mod_say_fr/mod_say_fr.c ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_fr/mod_say_fr.c (original) +++ freeswitch/trunk/src/mod/say/mod_say_fr/mod_say_fr.c Sun Jan 27 00:02:52 2008 @@ -536,3 +536,14 @@ /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/say/mod_say_it/mod_say_it.c ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_it/mod_say_it.c (original) +++ freeswitch/trunk/src/mod/say/mod_say_it/mod_say_it.c Sun Jan 27 00:02:52 2008 @@ -536,3 +536,14 @@ /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/say/mod_say_nl/mod_say_nl.c ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_nl/mod_say_nl.c (original) +++ freeswitch/trunk/src/mod/say/mod_say_nl/mod_say_nl.c Sun Jan 27 00:02:52 2008 @@ -536,3 +536,14 @@ /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/switch_core_asr.c ============================================================================== --- freeswitch/trunk/src/switch_core_asr.c (original) +++ freeswitch/trunk/src/switch_core_asr.c Sun Jan 27 00:02:52 2008 @@ -158,3 +158,14 @@ return ah->asr_interface->asr_get_results(ah, xmlstr, flags); } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/switch_core_directory.c ============================================================================== --- freeswitch/trunk/src/switch_core_directory.c (original) +++ freeswitch/trunk/src/switch_core_directory.c Sun Jan 27 00:02:52 2008 @@ -84,3 +84,13 @@ return status; } +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/trunk/src/switch_core_file.c (original) +++ freeswitch/trunk/src/switch_core_file.c Sun Jan 27 00:02:52 2008 @@ -299,3 +299,14 @@ return status; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/switch_core_hash.c ============================================================================== --- freeswitch/trunk/src/switch_core_hash.c (original) +++ freeswitch/trunk/src/switch_core_hash.c Sun Jan 27 00:02:52 2008 @@ -153,3 +153,14 @@ *val = sqliteHashData((HashElem *) hi); } } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Sun Jan 27 00:02:52 2008 @@ -1010,3 +1010,14 @@ return sent ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ 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 Sun Jan 27 00:02:52 2008 @@ -348,3 +348,14 @@ return status; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/switch_core_rwlock.c ============================================================================== --- freeswitch/trunk/src/switch_core_rwlock.c (original) +++ freeswitch/trunk/src/switch_core_rwlock.c Sun Jan 27 00:02:52 2008 @@ -84,3 +84,14 @@ switch_thread_rwlock_unlock(session->rwlock); } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/switch_core_speech.c ============================================================================== --- freeswitch/trunk/src/switch_core_speech.c (original) +++ freeswitch/trunk/src/switch_core_speech.c Sun Jan 27 00:02:52 2008 @@ -34,7 +34,6 @@ #include <switch.h> #include "private/switch_core_pvt.h" - SWITCH_DECLARE(switch_status_t) switch_core_speech_open(switch_speech_handle_t *sh, const char *module_name, const char *voice_name, @@ -151,3 +150,14 @@ return status; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/switch_core_timer.c ============================================================================== --- freeswitch/trunk/src/switch_core_timer.c (original) +++ freeswitch/trunk/src/switch_core_timer.c Sun Jan 27 00:02:52 2008 @@ -114,3 +114,14 @@ return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Sun Jan 27 00:02:52 2008 @@ -882,3 +882,14 @@ switch_ivr_uuid_bridge(switch_core_session_get_uuid(session), uuid); } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/switch_ivr_menu.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_menu.c (original) +++ freeswitch/trunk/src/switch_ivr_menu.c Sun Jan 27 00:02:52 2008 @@ -676,3 +676,14 @@ return status; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Sun Jan 27 00:02:52 2008 @@ -1280,3 +1280,14 @@ return status; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ 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 Sun Jan 27 00:02:52 2008 @@ -688,7 +688,7 @@ int stream_id = 0; switch_status_t status = SWITCH_STATUS_SUCCESS; switch_file_handle_t lfh; - switch_codec_t *read_codec = switch_core_session_get_read_codec(session); + switch_codec_t *read_codec = NULL; const char *p; char *title = "", *copyright = "", *software = "", *artist = "", *comment = "", *date = ""; uint8_t asis = 0; @@ -707,8 +707,9 @@ prefix = switch_channel_get_variable(channel, "sound_prefix"); timer_name = switch_channel_get_variable(channel, "timer_name"); + read_codec = switch_core_session_get_read_codec(session); - if (switch_strlen_zero(file)) { + if (switch_strlen_zero(file) || !read_codec) { status = SWITCH_STATUS_FALSE; goto end; } @@ -1662,3 +1663,14 @@ switch_core_session_reset(session, SWITCH_TRUE); return status; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */

1 0

[commit] r7384 - in freeswitch/trunk/src/mod/formats: mod_local_stream mod_native_file mod_shout mod_sndfile
by Freeswitch SVN 27 Jan '08

27 Jan '08

Author: brian Date: Sat Jan 26 22:14:27 2008 New Revision: 7384 Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c freeswitch/trunk/src/mod/formats/mod_native_file/mod_native_file.c freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c Log: formats cleanup Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Sat Jan 26 22:14:27 2008 @@ -56,6 +56,7 @@ int line; struct local_stream_context *next; }; + typedef struct local_stream_context local_stream_context_t; struct local_stream_source { @@ -74,6 +75,7 @@ switch_memory_pool_t *pool; int shuffle; }; + typedef struct local_stream_source local_stream_source_t; static unsigned int S = 0; Modified: freeswitch/trunk/src/mod/formats/mod_native_file/mod_native_file.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_native_file/mod_native_file.c (original) +++ freeswitch/trunk/src/mod/formats/mod_native_file/mod_native_file.c Sat Jan 26 22:14:27 2008 @@ -69,8 +69,6 @@ return SWITCH_STATUS_GENERR; } - - handle->samples = 0; handle->samplerate = 8000; handle->channels = 1; @@ -82,7 +80,6 @@ handle->flags |= SWITCH_FILE_NATIVE; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Opening File [%s] %dhz\n", path, handle->samplerate); - return SWITCH_STATUS_SUCCESS; } @@ -105,7 +102,6 @@ switch_file_seek(context->fd, whence, &samples); return SWITCH_STATUS_FALSE; - } static switch_status_t native_file_file_read(switch_file_handle_t *handle, void *data, size_t *len) @@ -138,7 +134,6 @@ static char *supported_formats[SWITCH_MAX_CODECS] = { 0 }; - SWITCH_MODULE_LOAD_FUNCTION(mod_native_file_load) { switch_file_interface_t *file_interface; 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 Jan 26 22:14:27 2008 @@ -70,7 +70,6 @@ typedef struct shout_context shout_context_t; - static size_t decode_fd(shout_context_t * context, void *data, size_t bytes); static inline void free_context(shout_context_t * context) @@ -128,7 +127,6 @@ } } - static void log_error(char const *fmt, va_list ap) { char *data = NULL; @@ -287,7 +285,6 @@ } while (decode_status != MP3_NEED_MORE); - if (context->audio_buffer) { switch_buffer_write(context->audio_buffer, context->decode_buf, usedlen); } else { @@ -311,7 +308,6 @@ context->err++; switch_mutex_unlock(context->audio_mutex); return 0; - } #define error_check() if (context->err) goto error; @@ -424,7 +420,6 @@ context->err++; switch_mutex_unlock(context->audio_mutex); return 0; - } @@ -804,7 +799,6 @@ int16_t *audio = data; int nsamples = *len; - if (context->shout && !context->shout_init) { context->shout_init++; if (shout_open(context->shout) != SHOUTERR_SUCCESS) { @@ -941,7 +935,6 @@ return SWITCH_STATUS_FALSE; } - static switch_bool_t telecast_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type) { switch_buffer_t *buffer = (switch_buffer_t *) user_data; @@ -993,7 +986,6 @@ char title_aft[128*3] = ""; char *mp3, *m3u; - /* 0 uuid VARCHAR(255), 1 created VARCHAR(255), @@ -1011,8 +1003,6 @@ 13 write_rate VARCHAR(255) */ - - holder->stream->write_function(holder->stream, "<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>", argv[1], argv[4], argv[5], argv[7], argv[8] ? argv[8] : "N/A", argv[9] ? argv[9] : "N/A", argv[10], argv[11]); @@ -1031,7 +1021,6 @@ return 0; } - void do_telecast(switch_stream_handle_t *stream) { char *path_info = switch_event_get_header(stream->event, "http-path-info"); @@ -1047,7 +1036,6 @@ char *ref = switch_event_get_header(stream->event, "http-referer"); stream->write_function(stream,"Content-type: text/html\r\n\r\n<h2>Not Found!</h2>\n" "<META http-equiv=\"refresh\" content=\"1;URL=%s\">", ref); - } else { switch_media_bug_t *bug = NULL; switch_buffer_t *buffer; @@ -1056,7 +1044,6 @@ lame_global_flags *gfp = NULL; switch_codec_t *read_codec; - if (!(gfp = lame_init())) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not allocate lame\n"); goto end; @@ -1108,7 +1095,6 @@ memset(buf, 0, bytes); } - if ((rlen = lame_encode_buffer(gfp, (void *)buf, NULL, bytes / 2, mp3buf, sizeof(mp3buf))) < 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "MP3 encode error %d!\n", rlen); goto end; @@ -1122,7 +1108,6 @@ } } - end: switch_safe_free(uuid); @@ -1142,10 +1127,8 @@ switch_core_session_rwunlock(tsession); } - } - void do_broadcast(switch_stream_handle_t *stream) { char *path_info = switch_event_get_header(stream->event, "http-path-info"); @@ -1204,7 +1187,6 @@ "Content-Disposition: inline; filename=\"%s.mp3\"\r\n\r\n", path_info + 7); - if (fh.interval) { interval = fh.interval * 1000; } @@ -1233,11 +1215,8 @@ goto end; } } - - } - while ((rlen = lame_encode_flush(gfp, mp3buf, sizeof(mp3buf))) > 0) { if (stream->raw_write_function(stream, mp3buf, rlen)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Disconnected\n"); @@ -1245,7 +1224,6 @@ } } - end: if (fh.channels) { @@ -1257,11 +1235,9 @@ if (gfp) { lame_close(gfp); gfp = NULL; - } - + } } - void do_index(switch_stream_handle_t *stream) { switch_core_db_t *db = switch_core_db_handle(); @@ -1275,8 +1251,6 @@ holder.stream = stream; stream->write_function(stream, "Content-type: text/html\r\n\r\n"); - - stream->write_function(stream, "<table align=center border=1 cellpadding=6 cellspacing=0>" "<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>\n", @@ -1295,13 +1269,11 @@ } #define TELECAST_SYNTAX "" - SWITCH_STANDARD_API(telecast_api_function) { char *host = NULL, *port = NULL, *uri = NULL, *path_info = NULL; - - if (session) { + if (session) { return SWITCH_STATUS_FALSE; } @@ -1369,8 +1341,6 @@ file_interface->file_set_string = shout_file_set_string; file_interface->file_get_string = shout_file_get_string; - - /* connect my internal structure to the blank pointer passed to me */ //*module_interface = &shout_module_interface; @@ -1383,7 +1353,6 @@ return SWITCH_STATUS_SUCCESS; } - SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_shout_shutdown) { curl_global_cleanup(); Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c (original) +++ freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c Sat Jan 26 22:14:27 2008 @@ -71,7 +71,6 @@ } ext++; - if (switch_test_flag(handle, SWITCH_FILE_FLAG_READ)) { mode += SFM_READ; } @@ -177,13 +176,11 @@ handle->seekable = context->sfinfo.seekable; handle->speed = 0; handle->private_info = context; - end: switch_safe_free(alt_path); switch_safe_free(ldup); - return status; } @@ -210,7 +207,6 @@ handle->pos = *cur_sample; return SWITCH_STATUS_SUCCESS; - } static switch_status_t sndfile_file_read(switch_file_handle_t *handle, void *data, size_t *len) @@ -302,7 +298,6 @@ return SWITCH_STATUS_FALSE; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "\nLibSndFile Version : %s Supported Formats\n", buffer); switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO, "================================================================================\n"); sf_command(NULL, SFC_GET_FORMAT_MAJOR_COUNT, &major_count, sizeof(int)); @@ -355,14 +350,11 @@ } */ } - } for (m = 0; m < exlen; m++) { supported_formats[len++] = extras[m]; } - - switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_NOTICE, "================================================================================\n"); return SWITCH_STATUS_SUCCESS;

1 0

[commit] r7383 - in freeswitch/trunk/src/mod/dialplans: mod_dialplan_asterisk mod_dialplan_xml
by Freeswitch SVN 27 Jan '08

27 Jan '08

Author: brian Date: Sat Jan 26 22:06:52 2008 New Revision: 7383 Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Log: whitespace cleanup... Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c Sat Jan 26 22:06:52 2008 @@ -47,7 +47,6 @@ return SWITCH_STATUS_FALSE; } - SWITCH_STANDARD_APP(dial_function) { int argc; @@ -77,7 +76,6 @@ goto ok; } - error: switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error!\n"); @@ -85,7 +83,6 @@ ok: return; - } SWITCH_STANDARD_APP(avoid_function) @@ -107,8 +104,6 @@ memset((void *) y, 0, 1000); } - - SWITCH_STANDARD_APP(goto_function) { int argc; @@ -118,7 +113,6 @@ channel = switch_core_session_get_channel(session); assert(channel != NULL); - if (data && (mydata = switch_core_session_strdup(session, data))) { if ((argc = switch_separate_string(mydata, '|', argv, (sizeof(argv) / sizeof(argv[0])))) < 1) { @@ -128,7 +122,6 @@ switch_ivr_session_transfer(session, argv[1], "asterisk", argv[0]); goto ok; } - error: switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error!\n"); @@ -136,10 +129,8 @@ ok: return; - } - SWITCH_STANDARD_DIALPLAN(asterisk_dialplan_hunt) { switch_caller_extension_t *extension = NULL; @@ -316,7 +307,6 @@ return extension; } - /* fake chan_sip */ switch_endpoint_interface_t *sip_endpoint_interface; static switch_call_cause_t sip_outgoing_channel(switch_core_session_t *session, @@ -379,9 +369,6 @@ return WE_DONT_NEED_NO_STINKIN_KEY; } - - - SWITCH_MODULE_LOAD_FUNCTION(mod_dialplan_asterisk_load) { switch_dialplan_interface_t *dp_interface; @@ -408,7 +395,6 @@ sip_endpoint_interface->interface_name = "SIP"; sip_endpoint_interface->io_routines = &sip_io_routines; - /* fake chan_iax2 facade */ iax2_endpoint_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE); iax2_endpoint_interface->interface_name = "IAX2"; Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Sat Jan 26 22:06:52 2008 @@ -131,7 +131,6 @@ assert(re != NULL); } - for (xaction = switch_xml_child(xcond, "action"); xaction; xaction = xaction->next) { char *application = (char *) switch_xml_attr_soft(xaction, "application"); char *data = NULL; @@ -221,7 +220,6 @@ if (!caller_profile->context) { caller_profile->context = "default"; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Processing %s->%s!\n", caller_profile->caller_id_name, caller_profile->destination_number); @@ -274,7 +272,6 @@ xexten = xexten->next; } - switch_xml_free(xml); xml = NULL;

1 0

[commit] r7382 - in freeswitch/trunk/src/mod/xml_int: mod_xml_cdr mod_xml_curl mod_xml_rpc
by Freeswitch SVN 27 Jan '08

27 Jan '08

Author: brian Date: Sat Jan 26 22:03:09 2008 New Revision: 7382 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Log: whitespace cleanup... Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c Sat Jan 26 22:03:09 2008 @@ -179,7 +179,6 @@ } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Got error [%ld] posting to web server [%s]\n",httpRes, globals.url); } - } curl_easy_cleanup(curl_handle); curl_slist_free_all(headers); @@ -209,7 +208,6 @@ } } - success: status = SWITCH_STATUS_SUCCESS; @@ -225,7 +223,6 @@ return status; } - static switch_state_handler_table_t state_handlers = { /*.on_init */ NULL, /*.on_ring */ NULL, @@ -326,7 +323,6 @@ globals.retries = 0; } - if (globals.retries && globals.delay<=0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "retries set but delay 0 setting to 5000ms\n"); globals.delay = 5000; @@ -338,7 +334,6 @@ return status; } - SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_xml_cdr_shutdown) { @@ -346,8 +341,6 @@ return SWITCH_STATUS_SUCCESS; } - - /* For Emacs: * Local Variables: * mode:c Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Sat Jan 26 22:03:09 2008 @@ -81,7 +81,6 @@ return SWITCH_STATUS_SUCCESS; } - static size_t file_callback(void *ptr, size_t size, size_t nmemb, void *data) { register unsigned int realsize = (unsigned int) (size * nmemb); @@ -94,7 +93,6 @@ return x; } - static switch_xml_t xml_url_fetch(const char *section, const char *tag_name, const char *key_name, const char *key_value, switch_event_t *params, void *user_data) { @@ -129,7 +127,6 @@ return xml; } - switch_snprintf(basic_data, sizeof(basic_data), "hostname=%s&section=%s&tag_name=%s&key_name=%s&key_value=%s", hostname, section, @@ -285,7 +282,6 @@ return x ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; } - SWITCH_MODULE_LOAD_FUNCTION(mod_xml_curl_load) { switch_api_interface_t *xml_curl_api_interface; Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Sat Jan 26 22:03:09 2008 @@ -104,7 +104,6 @@ return SWITCH_STATUS_SUCCESS; } - SWITCH_MODULE_LOAD_FUNCTION(mod_xml_rpc_load) { /* connect my internal structure to the blank pointer passed to me */ @@ -118,7 +117,6 @@ return SWITCH_STATUS_SUCCESS; } - static switch_status_t http_stream_raw_write(switch_stream_handle_t *handle, uint8_t *data, switch_size_t datalen) { TSession *r = handle->data; @@ -147,7 +145,6 @@ return ret ? SWITCH_STATUS_FALSE : SWITCH_STATUS_SUCCESS; } - static abyss_bool http_directory_auth(TSession *r, char *domain_name) { char *p, *x; @@ -227,7 +224,6 @@ if (!(x_params = switch_xml_child(x_user, "params"))) { goto authed; } - for (x_param = switch_xml_child(x_params, "param"); x_param; x_param = x_param->next) { const char *var = switch_xml_attr_soft(x_param, "name"); @@ -307,7 +303,6 @@ } goto fail; - authed: ResponseAddField(r, "freeswitch-user", r->user); @@ -339,8 +334,6 @@ char *domain_name, *e; abyss_bool ret = FALSE; - - if (!strncmp(r->uri, "/domains/", 9)) { domain_name = strdup(r->uri + 9); switch_assert(domain_name); @@ -373,7 +366,6 @@ SWITCH_GLOBAL_dirs.htdocs_dir, new_uri ); - if (switch_directory_exists(tmp, NULL) == SWITCH_STATUS_SUCCESS) { for (x = 0; x < 2; x++) { @@ -404,9 +396,7 @@ ret = !http_directory_auth(r, NULL); } } - } - return ret; } @@ -442,7 +432,6 @@ if ((path_info = strchr(command, '/'))) { *path_info++ = '\0'; } - for (i=0;i<r->response_headers.size;i++) { ti=&r->response_headers.item[i]; @@ -492,7 +481,6 @@ auth: - if (switch_event_create(&stream.event, SWITCH_EVENT_API) == SWITCH_STATUS_SUCCESS) { const char * const content_length = RequestHeaderValue(r, "content-length"); @@ -557,7 +545,6 @@ query = qbuf; } - } if (query) { switch_event_add_header(stream.event, SWITCH_STACK_BOTTOM, "HTTP-QUERY", "%s", query); @@ -582,7 +569,6 @@ } switch_url_decode(q); - name = q; if ((val = strchr(name, '='))) { @@ -593,13 +579,10 @@ } while (q != NULL); free(qd); - } } } - - //ResponseChunked(r); //ResponseContentType(r, mime); @@ -609,7 +592,6 @@ //HTTPWrite(r, "<pre>\n\n", 7); - /* generation of the date field */ if (DateToString(&r->date, buf)) { ResponseAddField(r,"Date", buf); @@ -629,7 +611,6 @@ ConnWrite(r->conn, ti->value, (uint32_t)strlen(ti->value)); ConnWrite(r->conn,CRLF,2); } - switch_snprintf(buf, sizeof(buf), "Connection: close\r\n"); ConnWrite(r->conn, buf, (uint32_t) strlen(buf)); @@ -656,7 +637,6 @@ return ret; } - static xmlrpc_value *freeswitch_api(xmlrpc_env * const envP, xmlrpc_value * const paramArrayP, void *const userData) { char *command = NULL, *arg = NULL; @@ -744,7 +724,6 @@ SWITCH_MODULE_RUNTIME_FUNCTION(mod_xml_rpc_runtime) { - xmlrpc_registry *registryP; xmlrpc_env env; char logfile[512]; @@ -783,7 +762,6 @@ return SWITCH_STATUS_TERM; } - ServerAddHandler(&globals.abyssServer, handler_hook); ServerAddHandler(&globals.abyssServer, auth_hook); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Starting HTTP Port %d, DocRoot [%s]\n", globals.port, SWITCH_GLOBAL_dirs.htdocs_dir); @@ -793,11 +771,8 @@ return SWITCH_STATUS_TERM; } - - SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_xml_rpc_shutdown) { - globals.abyssServer.running = 0; shutdown(globals.abyssServer.listensock, 2); while(globals.running) {

1 0

[commit] r7381 - freeswitch/trunk/src/mod/codecs/mod_g711
by Freeswitch SVN 27 Jan '08

27 Jan '08

Author: brian Date: Sat Jan 26 21:56:15 2008 New Revision: 7381 Modified: freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c Log: more cleanup Modified: freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c Sat Jan 26 21:56:15 2008 @@ -35,7 +35,6 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_g711_load); SWITCH_MODULE_DEFINITION(mod_g711, mod_g711_load, NULL, NULL); - static switch_status_t switch_g711u_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings) { int encoding, decoding; @@ -50,7 +49,6 @@ } } - static switch_status_t switch_g711u_encode(switch_codec_t *codec, switch_codec_t *other_codec, void *decoded_data, @@ -122,7 +120,6 @@ } } - static switch_status_t switch_g711a_encode(switch_codec_t *codec, switch_codec_t *other_codec, void *decoded_data, @@ -181,7 +178,6 @@ /* Registration */ - static switch_codec_implementation_t g711u_8k_120ms_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 0, @@ -291,8 +287,6 @@ /*.next */ &g711u_8k_20ms_implementation }; - - static switch_codec_implementation_t g711a_8k_120ms_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 8,

1 0

[commit] r7380 - freeswitch/trunk/src/mod/codecs/mod_amr
by Freeswitch SVN 27 Jan '08

27 Jan '08

Author: brian Date: Sat Jan 26 21:54:41 2008 New Revision: 7380 Modified: freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c Log: more cleanup Modified: freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c Sat Jan 26 21:54:41 2008 @@ -72,7 +72,6 @@ AMR_OPT_INTERLEAVING = (1 << 4) } amr_flag_t; - typedef enum { GENERIC_PARAMETER_AMR_MAXAL_SDUFRAMES = 0, GENERIC_PARAMETER_AMR_BITRATE, @@ -93,7 +92,6 @@ AMR_BITRATE_1220 } amr_bitrate_t; - struct amr_context { void *encoder_state; void *decoder_state; @@ -106,7 +104,6 @@ switch_byte_t flags; }; - #define AMR_DEFAULT_BITRATE AMR_BITRATE_1220 static struct { @@ -117,7 +114,6 @@ static switch_status_t switch_amr_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings) { - #ifdef AMR_PASSTHROUGH codec->flags |= SWITCH_CODEC_FLAG_PASSTHROUGH; if (codec->fmtp_in) { @@ -148,7 +144,6 @@ } if ((arg = strchr(data, '='))) { *arg++ = '\0'; - //printf("Codec arg %d [%s]=[%s]\n", x, data, arg); if (!strcasecmp(data, "octet-align")) { if (atoi(arg)) { switch_set_flag(context, AMR_OPT_OCTET_ALIGN); @@ -341,3 +336,14 @@ /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */

1 0

[commit] r7379 - freeswitch/trunk/src/mod/codecs/mod_g729
by Freeswitch SVN 27 Jan '08

27 Jan '08

Author: brian Date: Sat Jan 26 21:50:50 2008 New Revision: 7379 Modified: freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c Log: cleanup Modified: freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c Sat Jan 26 21:50:50 2008 @@ -252,7 +252,7 @@ /*.encode */ switch_g729_encode, /*.decode */ switch_g729_decode, /*.destroy */ switch_g729_destroy, - &g729_40ms_8k_implementation + /*.next */ &g729_40ms_8k_implementation }; static switch_codec_implementation_t g729_10ms_8k_implementation = { @@ -274,7 +274,7 @@ /*.encode */ switch_g729_encode, /*.decode */ switch_g729_decode, /*.destroy */ switch_g729_destroy, - &g729_30ms_8k_implementation + /*.next */ &g729_30ms_8k_implementation }; static switch_codec_implementation_t g729_8k_implementation = { @@ -296,7 +296,7 @@ /*.encode */ switch_g729_encode, /*.decode */ switch_g729_decode, /*.destroy */ switch_g729_destroy, - &g729_10ms_8k_implementation + /*.next */ &g729_10ms_8k_implementation }; SWITCH_MODULE_LOAD_FUNCTION(mod_g729_load)

1 0