December 2007 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r7048 - freeswitch/trunk/src/mod/applications/mod_fifo
by Freeswitch SVN 31 Dec '07

31 Dec '07

Author: brian Date: Mon Dec 31 17:29:18 2007 New Revision: 7048 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Log: normalize this event Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Mon Dec 31 17:29:18 2007 @@ -131,7 +131,6 @@ } else { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "Idle"); } - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "rpid", "%s", "unknown"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "alt_event_type", "dialog"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_count", "%d", 0); @@ -139,7 +138,6 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-state", "%s", node->waiting_count > 0 ? "CS_RING" : "CS_HANGUP"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "unique-id", "%s", node->name); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "answer-state", "%s", node->waiting_count > 0 ? "early" : "terminated"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "astate", "%s", node->waiting_count > 0 ? "early" : "terminated"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-direction", "%s", "inbound"); switch_event_fire(&event); }

1 0

[commit] r7047 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 31 Dec '07

31 Dec '07

Author: brian Date: Mon Dec 31 17:14:09 2007 New Revision: 7047 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: revert this for now Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Mon Dec 31 17:14:09 2007 @@ -742,14 +742,21 @@ stream.write_function(&stream, "<remote>\n<identity display=\"%s\">sip:%s@%s</identity>\n", clean_from_user, clean_from_user, host); stream.write_function(&stream, "<target uri=\"sip:**%s@%s\"/>\n", clean_to_user, host); stream.write_function(&stream, "</remote>\n"); - } else if (!strcasecmp(proto, "park") | !strcasecmp(proto, "conf") | !strcasecmp(proto, "ext")) { - stream.write_function(&stream, "<local>\n<identity display=\"%s\">sip:%s@%s;%s=%s</identity>\n", - proto, proto, host, proto, !switch_strlen_zero(clean_to_user) ? clean_to_user : "unknown"); - stream.write_function(&stream, "<target uri=\"sip:%s@%s\">\n", proto, host); - stream.write_function(&stream, "<param pname=\"+sip.rendering\" pvalue=\"%s\"/>\n</target>\n</local>\n", - !strcasecmp(proto, "park") ? "no" : "yes"); - stream.write_function(&stream, "<remote>\n<identity display=\"%s\">sip:%s@%s</identity>\n", proto, uuid, host); - stream.write_function(&stream, "<target uri=\"sip:%s+%s@%s;%s=%s\"/>\n", proto, uuid, host, proto, uuid); + } else if (!strcasecmp(proto, "park")) { + stream.write_function(&stream, "<local>\n<identity display=\"parking\">sip:parking@%s;fifo=%s</identity>\n", + host, !switch_strlen_zero(clean_to_user) ? clean_to_user : "unknown"); + stream.write_function(&stream, "<target uri=\"sip:parking@%s\">\n", host); + stream.write_function(&stream, "<param pname=\"+sip.rendering\" pvalue=\"no\"/>\n</target>\n</local>\n"); + stream.write_function(&stream, "<remote>\n<identity display=\"parking\">sip:%s</identity>\n", uuid); + stream.write_function(&stream, "<target uri=\"sip:park+%s\"/>\n", uuid); + stream.write_function(&stream, "</remote>\n"); + } else if (!strcasecmp(proto, "conf")) { + stream.write_function(&stream, "<local>\n<identity display=\"conference\">sip:conference@%s;conference=%s</identity>\n", + host, !switch_strlen_zero(clean_to_user) ? clean_to_user : "unknown"); + stream.write_function(&stream, "<target uri=\"sip:conference@%s\">\n", host); + stream.write_function(&stream, "<param pname=\"+sip.rendering\" pvalue=\"yes\"/>\n</target>\n</local>\n"); + stream.write_function(&stream, "<remote>\n<identity display=\"conference\">sip:%s@%s</identity>\n", uuid, host); + stream.write_function(&stream, "<target uri=\"sip:conf+%s@%s\"/>\n", uuid, host); stream.write_function(&stream, "</remote>\n"); } }

1 0

[commit] r7046 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 31 Dec '07

31 Dec '07

Author: brian Date: Mon Dec 31 15:41:35 2007 New Revision: 7046 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: park should not render but everything else should Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Mon Dec 31 15:41:35 2007 @@ -746,7 +746,8 @@ stream.write_function(&stream, "<local>\n<identity display=\"%s\">sip:%s@%s;%s=%s</identity>\n", proto, proto, host, proto, !switch_strlen_zero(clean_to_user) ? clean_to_user : "unknown"); stream.write_function(&stream, "<target uri=\"sip:%s@%s\">\n", proto, host); - stream.write_function(&stream, "<param pname=\"+sip.rendering\" pvalue=\"no\"/>\n</target>\n</local>\n"); + stream.write_function(&stream, "<param pname=\"+sip.rendering\" pvalue=\"%s\"/>\n</target>\n</local>\n", + !strcasecmp(proto, "park") ? "no" : "yes"); stream.write_function(&stream, "<remote>\n<identity display=\"%s\">sip:%s@%s</identity>\n", proto, uuid, host); stream.write_function(&stream, "<target uri=\"sip:%s+%s@%s;%s=%s\"/>\n", proto, uuid, host, proto, uuid); stream.write_function(&stream, "</remote>\n");

1 0

[commit] r7045 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 31 Dec '07

31 Dec '07

Author: brian Date: Mon Dec 31 15:33:46 2007 New Revision: 7045 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: clean up from last commit Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Mon Dec 31 15:33:46 2007 @@ -33,7 +33,6 @@ --> <condition field="${numbering_plan}" expression="^$" break="never"> <action application="set_user" data="default@${domain}"/> - <anti-action application="set" data="blank_numbering_plan=NO"/> </condition> <condition> <action application="info"/> @@ -194,13 +193,13 @@ <!-- <extension name="park"> <condition field="${sip_refer_to}" expression="<sip:park\+(.*)@(.*)>" continue="on-true"> - <action application="fifo" data="$1@$${domain} in undef $${moh_uri}"/> + <action application="fifo" data="$1 in undef $${moh_uri}"/> </condition> </extension> <extension name="unpark"> - <condition field="destination_number" expression="^parking$" continue="on-true"/> - <condition field="${sip_to_params}" expression="fifo\=(\d+)"> + <condition field="destination_number" expression="^park$" continue="on-true"/> + <condition field="${sip_to_params}" expression="park\=(\d+)"> <action application="answer"/> <action application="fifo" data="$1@$${domain} out nowait"/> </condition>

1 0

[commit] r7044 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 31 Dec '07

31 Dec '07

Author: brian Date: Mon Dec 31 15:33:08 2007 New Revision: 7044 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: generic code for various presence protocols we support Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Mon Dec 31 15:33:08 2007 @@ -742,21 +742,13 @@ stream.write_function(&stream, "<remote>\n<identity display=\"%s\">sip:%s@%s</identity>\n", clean_from_user, clean_from_user, host); stream.write_function(&stream, "<target uri=\"sip:**%s@%s\"/>\n", clean_to_user, host); stream.write_function(&stream, "</remote>\n"); - } else if (!strcasecmp(proto, "park")) { - stream.write_function(&stream, "<local>\n<identity display=\"parking\">sip:parking@%s;fifo=%s</identity>\n", - host, !switch_strlen_zero(clean_to_user) ? clean_to_user : "unknown"); - stream.write_function(&stream, "<target uri=\"sip:parking@%s\">\n", host); + } else if (!strcasecmp(proto, "park") | !strcasecmp(proto, "conf") | !strcasecmp(proto, "ext")) { + stream.write_function(&stream, "<local>\n<identity display=\"%s\">sip:%s@%s;%s=%s</identity>\n", + proto, proto, host, proto, !switch_strlen_zero(clean_to_user) ? clean_to_user : "unknown"); + stream.write_function(&stream, "<target uri=\"sip:%s@%s\">\n", proto, host); stream.write_function(&stream, "<param pname=\"+sip.rendering\" pvalue=\"no\"/>\n</target>\n</local>\n"); - stream.write_function(&stream, "<remote>\n<identity display=\"parking\">sip:%s</identity>\n", uuid); - stream.write_function(&stream, "<target uri=\"sip:park+%s\"/>\n", uuid); - stream.write_function(&stream, "</remote>\n"); - } else if (!strcasecmp(proto, "conf")) { - stream.write_function(&stream, "<local>\n<identity display=\"conference\">sip:conference@%s;conference=%s</identity>\n", - host, !switch_strlen_zero(clean_to_user) ? clean_to_user : "unknown"); - stream.write_function(&stream, "<target uri=\"sip:conference@%s\">\n", host); - stream.write_function(&stream, "<param pname=\"+sip.rendering\" pvalue=\"yes\"/>\n</target>\n</local>\n"); - stream.write_function(&stream, "<remote>\n<identity display=\"conference\">sip:%s@%s</identity>\n", uuid, host); - stream.write_function(&stream, "<target uri=\"sip:conf+%s@%s\"/>\n", uuid, host); + stream.write_function(&stream, "<remote>\n<identity display=\"%s\">sip:%s@%s</identity>\n", proto, uuid, host); + stream.write_function(&stream, "<target uri=\"sip:%s+%s@%s;%s=%s\"/>\n", proto, uuid, host, proto, uuid); stream.write_function(&stream, "</remote>\n"); } }

1 0

[commit] r7043 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 31 Dec '07

31 Dec '07

Author: brian Date: Mon Dec 31 15:03:44 2007 New Revision: 7043 Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml Log: load tone_stream Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/modules.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/modules.conf.xml Mon Dec 31 15:03:44 2007 @@ -68,6 +68,7 @@   <load module="mod_local_stream"/> + <load module="mod_tone_stream"/>

1 0

[commit] r7042 - in freeswitch/trunk/src: . mod/formats/mod_local_stream mod/formats/mod_tone_stream
by Freeswitch SVN 31 Dec '07

31 Dec '07

Author: mikej Date: Mon Dec 31 14:41:39 2007 New Revision: 7042 Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.c freeswitch/trunk/src/switch_core_file.c Log: simplify file interface for stream file interfaces, 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 Mon Dec 31 14:41:39 2007 @@ -85,7 +85,6 @@ return index; } - static void *SWITCH_THREAD_FUNC read_stream_thread(switch_thread_t *thread, void *obj) { local_stream_source_t *source = obj; @@ -151,7 +150,6 @@ } continue; } - } if (skip > 0) { @@ -180,7 +178,6 @@ return NULL; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Playing %s rate: %d\n", fname, source->rate); while (RUNNING) { @@ -217,7 +214,6 @@ switch_dir_close(source->dir_handle); source->dir_handle = NULL; - } if (fd > -1) { @@ -262,8 +258,6 @@ goto end; } - - handle->samples = 0; handle->samplerate = source->rate; handle->channels = source->channels; @@ -318,11 +312,6 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t local_stream_file_seek(switch_file_handle_t *handle, unsigned int *cur_sample, int64_t samples, int whence) -{ - return SWITCH_STATUS_FALSE; -} - static switch_status_t local_stream_file_read(switch_file_handle_t *handle, void *data, size_t *len) { local_stream_context_t *context = handle->private_info; @@ -344,21 +333,6 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t local_stream_file_write(switch_file_handle_t *handle, void *data, size_t *len) -{ - return SWITCH_STATUS_FALSE; -} - -static switch_status_t local_stream_file_set_string(switch_file_handle_t *handle, switch_audio_col_t col, const char *string) -{ - return SWITCH_STATUS_FALSE; -} - -static switch_status_t local_stream_file_get_string(switch_file_handle_t *handle, switch_audio_col_t col, const char **string) -{ - return SWITCH_STATUS_FALSE; -} - /* Registration */ static char *supported_formats[SWITCH_MAX_CODECS] = { 0 }; @@ -372,7 +346,6 @@ switch_thread_t *thread; switch_threadattr_t *thd_attr = NULL; - if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); return; @@ -442,14 +415,11 @@ switch_threadattr_detach_set(thd_attr, 1); switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); switch_thread_create(&thread, thd_attr, read_stream_thread, source, source->pool); - } switch_xml_free(xml); - } - SWITCH_MODULE_LOAD_FUNCTION(mod_local_stream_load) { switch_file_interface_t *file_interface; @@ -462,10 +432,6 @@ file_interface->file_open = local_stream_file_open; file_interface->file_close = local_stream_file_close; file_interface->file_read = local_stream_file_read; - file_interface->file_write = local_stream_file_write; - file_interface->file_seek = local_stream_file_seek; - file_interface->file_set_string = local_stream_file_set_string; - file_interface->file_get_string = local_stream_file_get_string; memset(&globals, 0, sizeof(globals)); switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, pool); Modified: freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.c Mon Dec 31 14:41:39 2007 @@ -30,14 +30,11 @@ * */ #include <switch.h> -/* for apr_pstrcat */ -#define DEFAULT_PREBUFFER_SIZE 1024 * 16 SWITCH_MODULE_LOAD_FUNCTION(mod_tone_stream_load); SWITCH_MODULE_DEFINITION(mod_tone_stream, mod_tone_stream_load, NULL, NULL); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_tone_stream_shutdown); - static int teletone_handler(teletone_generation_session_t *ts, teletone_tone_map_t *map) { switch_buffer_t *audio_buffer = ts->user_data; @@ -113,44 +110,21 @@ switch_buffer_t *audio_buffer = handle->private_info; switch_buffer_destroy(&audio_buffer); - return SWITCH_STATUS_SUCCESS; } -static switch_status_t tone_stream_file_seek(switch_file_handle_t *handle, unsigned int *cur_sample, int64_t samples, int whence) -{ - return SWITCH_STATUS_FALSE; -} - static switch_status_t tone_stream_file_read(switch_file_handle_t *handle, void *data, size_t *len) { switch_buffer_t *audio_buffer = handle->private_info; switch_size_t bytes; - if ((bytes = (uint32_t) switch_buffer_read_loop(audio_buffer, data, *len * 2)) <= 0) { + if ((bytes = switch_buffer_read_loop(audio_buffer, data, *len * 2)) <= 0) { *len = 0; return SWITCH_STATUS_FALSE; - } else { - *len = bytes / 2; } - - return SWITCH_STATUS_SUCCESS; -} - -static switch_status_t tone_stream_file_write(switch_file_handle_t *handle, void *data, size_t *len) -{ - return SWITCH_STATUS_FALSE; -} - -static switch_status_t tone_stream_file_set_string(switch_file_handle_t *handle, switch_audio_col_t col, const char *string) -{ - return SWITCH_STATUS_FALSE; -} - -static switch_status_t tone_stream_file_get_string(switch_file_handle_t *handle, switch_audio_col_t col, const char **string) -{ - return SWITCH_STATUS_FALSE; + *len = bytes / 2; + return SWITCH_STATUS_SUCCESS; } /* Registration */ @@ -169,10 +143,6 @@ file_interface->file_open = tone_stream_file_open; file_interface->file_close = tone_stream_file_close; file_interface->file_read = tone_stream_file_read; - file_interface->file_write = tone_stream_file_write; - file_interface->file_seek = tone_stream_file_seek; - file_interface->file_set_string = tone_stream_file_set_string; - file_interface->file_get_string = tone_stream_file_get_string; /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/trunk/src/switch_core_file.c (original) +++ freeswitch/trunk/src/switch_core_file.c Mon Dec 31 14:41:39 2007 @@ -178,6 +178,10 @@ switch_assert(fh != NULL); switch_assert(fh->file_interface != NULL); + + if (!fh->file_interface->file_write) { + return SWITCH_STATUS_FALSE; + } if (!switch_test_flag(fh, SWITCH_FILE_NATIVE) && fh->native_rate != fh->samplerate) { if (!fh->resampler) { @@ -225,6 +229,10 @@ switch_assert(fh != NULL); switch_assert(fh->file_interface != NULL); + if (!fh->file_interface->file_seek) { + return SWITCH_STATUS_FALSE; + } + switch_set_flag(fh, SWITCH_FILE_SEEK); status = fh->file_interface->file_seek(fh, cur_pos, samples, whence); if (samples) { @@ -238,6 +246,10 @@ switch_assert(fh != NULL); switch_assert(fh->file_interface != NULL); + if (!fh->file_interface->file_set_string) { + return SWITCH_STATUS_FALSE; + } + return fh->file_interface->file_set_string(fh, col, string); } @@ -246,6 +258,10 @@ switch_assert(fh != NULL); switch_assert(fh->file_interface != NULL); + if (!fh->file_interface->file_get_string) { + return SWITCH_STATUS_FALSE; + } + return fh->file_interface->file_get_string(fh, col, string); }

1 0

[commit] r7041 - freeswitch/trunk/build
by Freeswitch SVN 31 Dec '07

31 Dec '07

Author: brian Date: Mon Dec 31 13:56:57 2007 New Revision: 7041 Modified: freeswitch/trunk/build/modules.conf.in Log: add tone_stream to default compile Modified: freeswitch/trunk/build/modules.conf.in ============================================================================== --- freeswitch/trunk/build/modules.conf.in (original) +++ freeswitch/trunk/build/modules.conf.in Mon Dec 31 13:56:57 2007 @@ -45,6 +45,7 @@ formats/mod_sndfile #formats/mod_shout formats/mod_local_stream +formats/mod_tone_stream #languages/mod_python languages/mod_spidermonkey languages/mod_spidermonkey_teletone

1 0

[commit] r7039 - freeswitch/trunk/src/mod/formats/mod_tone_stream
by Freeswitch SVN 31 Dec '07

31 Dec '07

Author: anthm Date: Mon Dec 31 13:37:10 2007 New Revision: 7039 Added: freeswitch/trunk/src/mod/formats/mod_tone_stream/ freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.2008.vcproj freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.c freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.vcproj Log: add mod_tone_stream Added: freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.2008.vcproj Mon Dec 31 13:37:10 2007 @@ -0,0 +1,152 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_tone_stream" + ProjectGUID="{2CA40887-1622-46A1-A7F9-17FD7E7E545B}" + RootNamespace="mod_tone_stream" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_tone_stream.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.c ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.c Mon Dec 31 13:37:10 2007 @@ -0,0 +1,195 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthmct(a)yahoo.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Anthony Minessale II <anthmct(a)yahoo.com> + * + * + * mod_tone_stream.c -- Tone Generation Stream + * + */ +#include <switch.h> +/* for apr_pstrcat */ +#define DEFAULT_PREBUFFER_SIZE 1024 * 16 + +SWITCH_MODULE_LOAD_FUNCTION(mod_tone_stream_load); +SWITCH_MODULE_DEFINITION(mod_tone_stream, mod_tone_stream_load, NULL, NULL); +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_tone_stream_shutdown); + + +static int teletone_handler(teletone_generation_session_t *ts, teletone_tone_map_t *map) +{ + switch_buffer_t *audio_buffer = ts->user_data; + int wrote; + + if (!audio_buffer) { + return -1; + } + + wrote = teletone_mux_tones(ts, map); + switch_buffer_write(audio_buffer, ts->buffer, wrote * 2); + + return 0; +} + +static switch_status_t tone_stream_file_open(switch_file_handle_t *handle, const char *path) +{ + switch_buffer_t *audio_buffer = NULL; + teletone_generation_session_t ts; + char *tonespec; + int loops = 0; + char *tmp; + int fd = -1; + char buf[1024] = ""; + size_t len; + + memset(&ts, 0, sizeof(ts)); + + tonespec = switch_core_strdup(handle->memory_pool, path); + + switch_buffer_create_dynamic(&audio_buffer, 1024, 1024, 0); + switch_assert(audio_buffer); + + if ((tmp = strstr(tonespec, ";loops="))) { + *tmp = '\0'; + loops = atoi(tmp + 7); + switch_buffer_set_loops(audio_buffer, loops); + } + + if (!handle->samplerate) { + handle->samplerate = 8000; + } + + teletone_init_session(&ts, 0, teletone_handler, audio_buffer); + ts.rate = handle->samplerate; + ts.channels = 1; + + if (!strncasecmp(tonespec, "path=", 5)) { + tmp = tonespec + 5; + if ((fd = open(tmp, O_RDONLY)) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "failed to open [%s]\n", tmp); + return SWITCH_STATUS_FALSE; + } + + while((len = switch_fd_read_line(fd, buf, sizeof(buf)))) { + teletone_run(&ts, buf); + } + close(fd); + fd = -1; + } else { + teletone_run(&ts, tonespec); + } + + teletone_destroy_session(&ts); + + handle->private_info = audio_buffer; + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t tone_stream_file_close(switch_file_handle_t *handle) +{ + switch_buffer_t *audio_buffer = handle->private_info; + + switch_buffer_destroy(&audio_buffer); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t tone_stream_file_seek(switch_file_handle_t *handle, unsigned int *cur_sample, int64_t samples, int whence) +{ + return SWITCH_STATUS_FALSE; +} + +static switch_status_t tone_stream_file_read(switch_file_handle_t *handle, void *data, size_t *len) +{ + switch_buffer_t *audio_buffer = handle->private_info; + switch_size_t bytes; + + if ((bytes = (uint32_t) switch_buffer_read_loop(audio_buffer, data, *len * 2)) <= 0) { + *len = 0; + return SWITCH_STATUS_FALSE; + } else { + *len = bytes / 2; + } + + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t tone_stream_file_write(switch_file_handle_t *handle, void *data, size_t *len) +{ + return SWITCH_STATUS_FALSE; +} + +static switch_status_t tone_stream_file_set_string(switch_file_handle_t *handle, switch_audio_col_t col, const char *string) +{ + return SWITCH_STATUS_FALSE; +} + +static switch_status_t tone_stream_file_get_string(switch_file_handle_t *handle, switch_audio_col_t col, const char **string) +{ + return SWITCH_STATUS_FALSE; +} + +/* Registration */ + +static char *supported_formats[SWITCH_MAX_CODECS] = { 0 }; + +SWITCH_MODULE_LOAD_FUNCTION(mod_tone_stream_load) +{ + switch_file_interface_t *file_interface; + supported_formats[0] = "tone_stream"; + + *module_interface = switch_loadable_module_create_module_interface(pool, modname); + file_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_FILE_INTERFACE); + file_interface->interface_name = modname; + file_interface->extens = supported_formats; + file_interface->file_open = tone_stream_file_open; + file_interface->file_close = tone_stream_file_close; + file_interface->file_read = tone_stream_file_read; + file_interface->file_write = tone_stream_file_write; + file_interface->file_seek = tone_stream_file_seek; + file_interface->file_set_string = tone_stream_file_set_string; + file_interface->file_get_string = tone_stream_file_get_string; + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_tone_stream_shutdown) +{ + 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: + */ Added: freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.vcproj Mon Dec 31 13:37:10 2007 @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="mod_tone_stream" + ProjectGUID="{2CA40887-1622-46A1-A7F9-17FD7E7E545B}" + RootNamespace="mod_tone_stream" + Keyword="Win32Proj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_tone_stream.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject>

1 0

[commit] r7038 - freeswitch/trunk/src/mod/formats/mod_local_stream
by Freeswitch SVN 31 Dec '07

31 Dec '07

Author: brian Date: Mon Dec 31 11:40:26 2007 New Revision: 7038 Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/Makefile Log: Fix this Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/Makefile ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/Makefile (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/Makefile Mon Dec 31 11:40:26 2007 @@ -1,2 +1,2 @@ -MODNAME=mod_native_file +MODNAME=mod_local_stream include ../../../../build/modmake.rules

1 0