- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r1813 - freeswitch/trunk/src/mod/endpoints/mod_exosip
by Freeswitch SVN 10 Jul '06

10 Jul '06

Author: anthm Date: Mon Jul 10 13:10:40 2006 New Revision: 1813 Modified: freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c Log: break 2 loops instead of 1 Modified: freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c Mon Jul 10 13:10:40 2006 @@ -1545,7 +1545,7 @@ *dpayload = strdup(payload); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Found negotiated codec Payload: %s Name: %s Rate: %s\n", *dpayload, *dname, *drate); - break; + goto done; } } @@ -1553,6 +1553,7 @@ attr = NULL; pos++; } + done: return status; }

1 0

[commit] r1811 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 10 Jul '06

10 Jul '06

Author: anthm Date: Mon Jul 10 12:28:54 2006 New Revision: 1811 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: add ability to set mute and deaf flag from the dialplan +flags{<mute>|<deaf>} 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 Mon Jul 10 12:28:54 2006 @@ -676,8 +676,6 @@ char *digit; char msg[512]; - switch_core_timer_next(&timer); - if (switch_channel_has_dtmf(channel)) { switch_channel_dequeue_dtmf(channel, dtmf, sizeof(dtmf)); } @@ -863,28 +861,33 @@ switch_buffer_zero(member->mux_buffer); switch_mutex_unlock(member->audio_out_mutex); } + switch_core_timer_next(&timer); } } } else { - /* Flush the output buffer and write all the data (presumably muxed) back to the channel */ - switch_mutex_lock(member->audio_out_mutex); - write_frame.data = data; - while ((write_frame.datalen = (uint32_t)switch_buffer_read(member->mux_buffer, write_frame.data, bytes))) { - if (write_frame.datalen && switch_test_flag(member, MFLAG_CAN_HEAR)) { - write_frame.samples = write_frame.datalen / 2; + if (switch_buffer_inuse(member->mux_buffer)) { + /* Flush the output buffer and write all the data (presumably muxed) back to the channel */ + switch_mutex_lock(member->audio_out_mutex); + write_frame.data = data; + while ((write_frame.datalen = (uint32_t)switch_buffer_read(member->mux_buffer, write_frame.data, bytes))) { + if (write_frame.datalen && switch_test_flag(member, MFLAG_CAN_HEAR)) { + write_frame.samples = write_frame.datalen / 2; + + /* Check for output volume adjustments */ + if (member->volume_out_level) { + switch_change_sln_volume(write_frame.data, write_frame.samples, member->volume_out_level); + } - /* Check for output volume adjustments */ - if (member->volume_out_level) { - switch_change_sln_volume(write_frame.data, write_frame.samples, member->volume_out_level); + switch_core_session_write_frame(member->session, &write_frame, -1, 0); } - - switch_core_session_write_frame(member->session, &write_frame, -1, 0); } + switch_mutex_unlock(member->audio_out_mutex); + } else { + switch_core_timer_next(&timer); } - switch_mutex_unlock(member->audio_out_mutex); } } /* Rinse ... Repeat */ - + switch_clear_flag_locked(member, MFLAG_RUNNING); switch_core_timer_destroy(&timer); @@ -2076,10 +2079,13 @@ char *mydata = switch_core_session_strdup(session, data); char *conf_name = NULL; char *bridge_prefix = "bridge:"; + char *flags_prefix = "+flags{"; char *bridgeto = NULL; char *profile_name = NULL; switch_xml_t cxml = NULL, cfg = NULL, profile = NULL, profiles = NULL; - + char *flags_str; + member_flag_t uflags = MFLAG_CAN_SPEAK | MFLAG_CAN_HEAR; + channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -2094,6 +2100,23 @@ return; } + + if ((flags_str=strstr(mydata, flags_prefix))) { + char *p; + + *flags_str = '\0'; + flags_str += strlen(flags_prefix); + if ((p = strchr(flags_str, '}'))) { + *p = '\0'; + } + + if (strstr(flags_str, "mute")) { + uflags &= ~MFLAG_CAN_SPEAK; + } else if (strstr(flags_str, "deaf")) { + uflags &= ~MFLAG_CAN_HEAR; + } + } + if (!strncasecmp(mydata, bridge_prefix, strlen(bridge_prefix))) { char *uuid = switch_core_session_get_uuid(session); @@ -2269,7 +2292,7 @@ if (conference_add_member(conference, &member) != SWITCH_STATUS_SUCCESS) { goto codec_done1; } - switch_set_flag_locked((&member), MFLAG_RUNNING | MFLAG_CAN_SPEAK | MFLAG_CAN_HEAR); + switch_set_flag_locked((&member), MFLAG_RUNNING | uflags); /* Run the confernece loop */ conference_loop(&member);

1 0

[commit] r1800 - freeswitch/trunk
by Freeswitch SVN 09 Jul '06

09 Jul '06

Author: mikej Date: Sun Jul 9 19:53:51 2006 New Revision: 1800 Modified: freeswitch/trunk/modules.conf.in Log: add mod_conference to modules.conf.in Modified: freeswitch/trunk/modules.conf.in ============================================================================== --- freeswitch/trunk/modules.conf.in (original) +++ freeswitch/trunk/modules.conf.in Sun Jul 9 19:53:51 2006 @@ -1,6 +1,7 @@ loggers/mod_console loggers/mod_syslog applications/mod_commands +applications/mod_conference applications/mod_bridgecall applications/mod_echo applications/mod_ivrtest

1 0

[commit] r1795 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 08 Jul '06

08 Jul '06

Author: anthm Date: Sat Jul 8 15:11:09 2006 New Revision: 1795 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: forgot a few stupid things, here they are 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 Jul 8 15:11:09 2006 @@ -213,6 +213,7 @@ #define SMAX 32767 #define SMIN -32768 +#define normalize_to_16bit(n) if (n > SMAX) n = SMAX; else if (n < SMIN) n = SMIN; static void switch_change_sln_volume(int16_t *data, uint32_t samples, int32_t vol) { @@ -224,17 +225,14 @@ if (v > 0) { mult += (.2 * abs(v)); + mult = 4; } else { mult -= 1; } for (x = 0; x < samples; x++) { b = (int32_t)((double)p[x] * mult); - if (b > SMAX) { - b = SMAX; - } else if (b < SMIN) { - b = SMIN; - } + normalize_to_16bit(b); p[x] = (int16_t) b; } } @@ -557,7 +555,9 @@ muxed = (int16_t *) omember->mux_frame; for (x = 0; x < imember->read / 2; x++) { - muxed[x] = muxed[x] + bptr[x]; + int32_t z = muxed[x] + bptr[x]; + normalize_to_16bit(z); + muxed[x] = z; } ready++; @@ -2424,7 +2424,7 @@ /* Check for input volume adjustments */ if (member->volume_in_level) { - switch_change_sln_volume(read_frame->data, read_frame->samples, member->volume_in_level); + switch_change_sln_volume(read_frame->data, read_frame->datalen / 2, member->volume_in_level); } /* Write the audio into the input buffer */

1 0

[commit] r1792 - freeswitch/branches/athompson/trunk/src/mod/applications/mod_sleep
by Freeswitch SVN 08 Jul '06

08 Jul '06

Author: athompson Date: Fri Jul 7 23:53:14 2006 New Revision: 1792 Modified: freeswitch/branches/athompson/trunk/src/mod/applications/mod_sleep/mod_sleep.c Log: Rewrite of mod_sleep to read packets/digits off the channel for the requested time instead of just stopping time with a call to sleep. Modified: freeswitch/branches/athompson/trunk/src/mod/applications/mod_sleep/mod_sleep.c ============================================================================== --- freeswitch/branches/athompson/trunk/src/mod/applications/mod_sleep/mod_sleep.c (original) +++ freeswitch/branches/athompson/trunk/src/mod/applications/mod_sleep/mod_sleep.c Fri Jul 7 23:53:14 2006 @@ -36,7 +36,12 @@ static void sleep_function(switch_core_session_t *session, char *data) { switch_channel_t *channel; + switch_status_t status; char *delay = NULL; + unsigned int timeout; + switch_time_t maxtime; + + switch_time_t started = switch_time_now(); channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -44,8 +49,23 @@ switch_channel_answer(channel); delay = switch_core_session_strdup(session, data); - /* 1000000 seems to be equiv to 1 second */ - switch_sleep(atof(delay) * 1000000); + maxtime = (atoi(delay) * 1000) + started; + + while(switch_channel_ready(channel)) { + switch_frame_t *read_frame; + + if (switch_time_now() >= maxtime) { + break; + } + + if (switch_channel_has_dtmf(channel)) { + char dtmf[128]; + switch_channel_dequeue_dtmf(channel, dtmf, sizeof(dtmf)); + } + + timeout = (unsigned int)((maxtime - switch_time_now()) / 1000); + status = switch_core_session_read_frame(session, &read_frame, timeout, 0); + } } static const switch_application_interface_t sleep_application_interface = {

1 0

[commit] r1580 - freeswitch/trunk/src
by anthm＠freeswitch.org 09 Jun '06

09 Jun '06

Author: anthm Date: Thu Jun 8 20:40:04 2006 New Revision: 1580 Modified: freeswitch/trunk/src/switch_rtp.c Log: just in case make autoadj harder for spoofers Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Thu Jun 8 20:40:04 2006 @@ -787,19 +787,21 @@ if (rtp_session->recv_msg.header.version) { - if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOADJ) && rtp_session->from_addr->port && - (rtp_session->from_addr->port != rtp_session->remote_port)) { - const char *err; - char *tx_host; - uint32_t old = rtp_session->remote_port; - char *old_host; + if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOADJ) && rtp_session->from_addr->port) { + if ((rtp_session->from_addr->port != rtp_session->remote_port)) { + const char *err; + char *tx_host; + uint32_t old = rtp_session->remote_port; + char *old_host; - switch_sockaddr_ip_get(&tx_host, rtp_session->from_addr); - switch_sockaddr_ip_get(&old_host, rtp_session->remote_addr); - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Auto Changing port from %s:%u to %s:%u\n", - old_host, old, tx_host, rtp_session->from_addr->port); - switch_rtp_set_remote_address(rtp_session, tx_host, rtp_session->from_addr->port, &err); + switch_sockaddr_ip_get(&tx_host, rtp_session->from_addr); + switch_sockaddr_ip_get(&old_host, rtp_session->remote_addr); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Auto Changing port from %s:%u to %s:%u\n", + old_host, old, tx_host, rtp_session->from_addr->port); + switch_rtp_set_remote_address(rtp_session, tx_host, rtp_session->from_addr->port, &err); + } + switch_clear_flag(rtp_session, SWITCH_RTP_FLAG_AUTOADJ); } }

1 0

[commit] r1579 - freeswitch/trunk/src/mod/applications/mod_rss
by anthm＠freeswitch.org 08 Jun '06

08 Jun '06

Author: anthm Date: Thu Jun 8 18:03:23 2006 New Revision: 1579 Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c Log: merge Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c (original) +++ freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c Thu Jun 8 18:03:23 2006 @@ -135,7 +135,7 @@ const char *err = NULL; struct dtmf_buffer dtb = {0}; switch_xml_t xml = NULL, item, xchannel = NULL; - struct shashdot_entry entries[TTS_MAX_ENTRIES] = {0}; + struct shashdot_entry entries[TTS_MAX_ENTRIES] = {{0}}; uint32_t i = 0; char *title_txt = "", *description_txt = "", *rights_txt = ""; switch_codec_t speech_codec, *codec = switch_core_session_get_read_codec(session); @@ -158,6 +158,10 @@ char buf[1024]; int32_t jumpto = -1; + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + if (!(cxml = switch_xml_open_cfg(cf, &cfg, NULL))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); return; @@ -179,6 +183,17 @@ switch_xml_free(cxml); + switch_channel_answer(channel); + + + for (dtb.index = 0; dtb.index < 10; dtb.index++) { + if ((status = switch_core_session_read_frame(session, &read_frame, -1, 0)) != SWITCH_STATUS_SUCCESS) { + switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + goto done; + } + } + + if (!switch_strlen_zero(data)) { if ((mydata = switch_core_session_strdup(session, data))) { argc = switch_separate_string(mydata, ' ', argv, sizeof(argv)/sizeof(argv[0])); @@ -207,13 +222,6 @@ return; } - channel = switch_core_session_get_channel(session); - assert(channel != NULL); - - - switch_channel_answer(channel); - - memset(&sh, 0, sizeof(sh)); if (switch_core_speech_open(&sh, engine, @@ -403,13 +411,6 @@ i++; } - for (dtb.index = 0; dtb.index < 10; dtb.index++) { - if ((status = switch_core_session_read_frame(session, &read_frame, -1, 0)) != SWITCH_STATUS_SUCCESS) { - switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); - goto done; - } - } - if (switch_channel_ready(channel)) { switch_time_exp_t tm; char date[80] = ""; @@ -437,6 +438,9 @@ switch (*cmd) { case '0': switch_set_flag(&dtb, SFLAG_INSTRUCT); + break; + case '#': + goto main_menu; break; } }

1 0

[commit] r1578 - freeswitch/trunk/docs
by mikej＠freeswitch.org 08 Jun '06

08 Jun '06

Author: mikej Date: Thu Jun 8 15:47:07 2006 New Revision: 1578 Modified: freeswitch/trunk/docs/ (props changed) Log: Add more build files to the ignore list.

1 0

[commit] r1577 - freeswitch/trunk/src/mod/applications/mod_rss
by mikej＠freeswitch.org 08 Jun '06

08 Jun '06

Author: mikej Date: Thu Jun 8 15:44:43 2006 New Revision: 1577 Added: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.vcproj Modified: freeswitch/trunk/src/mod/applications/mod_rss/ (props changed) freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c Log: mod_rss msvc build Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c (original) +++ freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c Thu Jun 8 15:44:43 2006 @@ -135,7 +135,7 @@ const char *err = NULL; struct dtmf_buffer dtb = {0}; switch_xml_t xml = NULL, item, xchannel = NULL; - struct shashdot_entry entries[TTS_MAX_ENTRIES] = {}; + struct shashdot_entry entries[TTS_MAX_ENTRIES] = {0}; uint32_t i = 0; char *title_txt = "", *description_txt = "", *rights_txt = ""; switch_codec_t speech_codec, *codec = switch_core_session_get_read_codec(session); @@ -273,16 +273,16 @@ switch_core_speech_flush_tts(&sh); snprintf(buf + len, sizeof(buf) - len, "Main Menu. <break time=\"600ms\"/> Choose one of the following Feeds or press pound to exit. <break time=\"600ms\"/>"); - len = strlen(buf); + len = (int32_t)strlen(buf); for (idx = 0; idx < feed_index; idx++) { snprintf(buf + len, sizeof(buf) - len, "Feed Number %d %s. <break time=\"600ms\"/>", idx + 1, feed_names[idx]); - len = strlen(buf); + len = (int32_t)strlen(buf); } snprintf(buf + len, sizeof(buf) - len, "<break time=\"2000ms\"/>"); - len = strlen(buf); + len = (int32_t)strlen(buf); status = switch_ivr_speak_text_handle(session, &sh, @@ -485,7 +485,7 @@ sh.voice, dtb.speed ); - len = strlen(buf); + len = (uint32_t)strlen(buf); } if (switch_test_flag(&dtb, SFLAG_INSTRUCT)) { @@ -500,21 +500,21 @@ "To hear these options again, press zero or press pound to return to the main menu. "); } else { snprintf(buf + len, sizeof(buf) - len, "Story %d. ", dtb.index + 1); - len = strlen(buf); + len = (uint32_t)strlen(buf); if (entries[dtb.index].subject_txt) { snprintf(buf + len, sizeof(buf) - len, "Subject %s. ", entries[dtb.index].subject_txt); - len = strlen(buf); + len = (uint32_t)strlen(buf); } if (entries[dtb.index].dept_txt) { snprintf(buf + len, sizeof(buf) - len, "From the %s department. ", entries[dtb.index].dept_txt); - len = strlen(buf); + len = (uint32_t)strlen(buf); } if (entries[dtb.index].title_txt) { snprintf(buf + len, sizeof(buf) - len, "%s", entries[dtb.index].title_txt); - len = strlen(buf); + len = (uint32_t)strlen(buf); } } switch_core_speech_flush_tts(&sh); Added: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.vcproj Thu Jun 8 15:44:43 2006 @@ -0,0 +1,209 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="mod_rss" + ProjectGUID="{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}" + RootNamespace="mod_rss" + Keyword="Win32Proj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="Debug" + IntermediateDirectory="Debug" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include"" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + UsePrecompiledHeader="0" + WarningLevel="4" + WarnAsError="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_rss.dll" + LinkIncremental="2" + AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)/mod_rss.pdb" + SubSystem="2" + ImportLibrary="$(OutDir)/mod_rss.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="Release" + IntermediateDirectory="Release" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include"" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" + RuntimeLibrary="0" + UsePrecompiledHeader="0" + WarningLevel="4" + WarnAsError="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_rss.dll" + LinkIncremental="1" + AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)" + GenerateDebugInformation="true" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + ImportLibrary="$(OutDir)/mod_rss.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath=".\mod_rss.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject>

1 0

[commit] r1576 - freeswitch/trunk/src/mod/applications/mod_rss
by anthm＠freeswitch.org 08 Jun '06

08 Jun '06

Author: anthm Date: Thu Jun 8 15:41:14 2006 New Revision: 1576 Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c Log: tweak Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c (original) +++ freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c Thu Jun 8 15:41:14 2006 @@ -145,7 +145,8 @@ switch_speech_handle_t sh; switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_TTS; switch_core_thread_session_t thread_session; - uint32_t rate, interval = 20, stream_id = 0; + uint32_t rate, interval = 20; + int stream_id = 0; switch_timer_t timer = {0}, *timerp = NULL; uint32_t last; char *mydata = NULL; @@ -155,7 +156,7 @@ char *cf = "rss.conf"; switch_xml_t cfg, cxml, feeds, feed; char buf[1024]; - uint32_t jumpto = -1; + int32_t jumpto = -1; if (!(cxml = switch_xml_open_cfg(cf, &cfg, NULL))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf);

1 0