April 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r13103 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia
by FreeSWITCH SVN 21 Apr '09

21 Apr '09

Author: anthm Date: Tue Apr 21 12:47:22 2009 New Revision: 13103 Log: add calls count and failed calls count to sofia profile sorted by direction Modified: freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/switch_channel.c Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Tue Apr 21 12:47:22 2009 @@ -512,6 +512,7 @@ SWITCH_DECLARE(void) switch_channel_clear_app_flag(switch_channel_t *channel, uint32_t flags); SWITCH_DECLARE(int) switch_channel_test_app_flag(switch_channel_t *channel, uint32_t flags); SWITCH_DECLARE(void) switch_channel_set_hangup_time(switch_channel_t *channel); +SWITCH_DECLARE(switch_call_direction_t) switch_channel_direction(switch_channel_t *channel); /** @} */ Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Tue Apr 21 12:47:22 2009 @@ -273,6 +273,14 @@ switch_mutex_lock(tech_pvt->sofia_mutex); + if (!switch_channel_test_flag(channel, CF_ANSWERED)) { + if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND) { + tech_pvt->profile->ob_failed_calls++; + } else { + tech_pvt->profile->ib_failed_calls++; + } + } + if (!((use_my_cause = switch_channel_get_variable(channel, "sip_ignore_remote_cause")) && switch_true(use_my_cause))) { ps_cause = switch_channel_get_variable(channel, SWITCH_PROTO_SPECIFIC_HANGUP_CAUSE_VARIABLE); } @@ -1664,6 +1672,10 @@ stream->write_function(stream, "AGGRESSIVENAT \t%s\n", sofia_test_pflag(profile, PFLAG_AGGRESSIVE_NAT_DETECTION) ? "true" : "false"); stream->write_function(stream, "STUN_ENABLED \t%s\n", sofia_test_pflag(profile, PFLAG_STUN_ENABLED) ? "true" : "false"); stream->write_function(stream, "STUN_AUTO_DISABLE\t%s\n", sofia_test_pflag(profile, PFLAG_STUN_AUTO_DISABLE) ? "true" : "false"); + stream->write_function(stream, "CallsIN \t%d\n", profile->ib_calls); + stream->write_function(stream, "FailedCallsIN \t%d\n", profile->ib_failed_calls); + stream->write_function(stream, "CallsOUT \t%d\n", profile->ob_calls); + stream->write_function(stream, "FailedCallsOUT \t%d\n", profile->ob_failed_calls); } stream->write_function(stream, "\nRegistrations:\n%s\n", line); @@ -1796,8 +1808,8 @@ stream->write_function(stream, " <pingfreq>%d</pingfreq>\n", gp->ping_freq); stream->write_function(stream, " <state>%s</state>\n", sofia_state_names[gp->state]); stream->write_function(stream, " <status>%s%s</status>\n", status_names[gp->status], gp->pinging ? " (ping)" : ""); - stream->write_function(stream, " <callsin>%d</callsin>\n", gp->ib_calls); - stream->write_function(stream, " <callsout>%d</callsout>\n", gp->ob_calls); + stream->write_function(stream, " <calls-in>%d</calls-in>\n", gp->ib_calls); + stream->write_function(stream, " <calls-out>%d</calls-out>\n", gp->ob_calls); stream->write_function(stream, " </gateway>\n"); sofia_reg_release_gateway(gp); @@ -1845,9 +1857,15 @@ stream->write_function(stream, " <nomedia>%s</nomedia>\n", sofia_test_flag(profile, TFLAG_INB_NOMEDIA) ? "true" : "false"); stream->write_function(stream, " <late-neg>%s</late-neg>\n", sofia_test_flag(profile, TFLAG_LATE_NEGOTIATION) ? "true" : "false"); stream->write_function(stream, " <proxy-media>%s</proxy-media>\n", sofia_test_flag(profile, TFLAG_PROXY_MEDIA) ? "true" : "false"); - stream->write_function(stream, " <aggressivenat>%s</aggressive-nat>\n", sofia_test_pflag(profile, PFLAG_AGGRESSIVE_NAT_DETECTION) ? "true" : "false"); + stream->write_function(stream, " <aggressivenat>%s</aggressive-nat>\n", + sofia_test_pflag(profile, PFLAG_AGGRESSIVE_NAT_DETECTION) ? "true" : "false"); stream->write_function(stream, " <stun-enabled>%s</stun-enabled>\n", sofia_test_pflag(profile, PFLAG_STUN_ENABLED) ? "true" : "false"); - stream->write_function(stream, " <stun-auto-disable>%s</stun-auto-disable>\n", sofia_test_pflag(profile, PFLAG_STUN_AUTO_DISABLE) ? "true" : "false"); + stream->write_function(stream, " <stun-auto-disable>%s</stun-auto-disable>\n", + sofia_test_pflag(profile, PFLAG_STUN_AUTO_DISABLE) ? "true" : "false"); + stream->write_function(stream, " <calls-in>%s</calls-in>\n", profile->ib_calls); + stream->write_function(stream, " <calls-out>%s</calls-out>\n", profile->ob_calls); + stream->write_function(stream, " <failed-calls-in>%s</failed-calls-in>\n", profile->ib_failed_calls); + stream->write_function(stream, " <failed-calls-out>%s</failed-calls-out>\n", profile->ob_failed_calls); } stream->write_function(stream, " </profile-info>\n"); @@ -2694,6 +2712,11 @@ done: if (profile) { + if (cause == SWITCH_CAUSE_SUCCESS) { + profile->ob_calls++; + } else { + profile->ob_failed_calls++; + } sofia_glue_release_profile(profile); } return cause; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Tue Apr 21 12:47:22 2009 @@ -469,6 +469,10 @@ sofia_media_options_t media_options; uint32_t force_subscription_expires; switch_rtp_bug_flag_t auto_rtp_bugs; + uint32_t ib_calls; + uint32_t ob_calls; + uint32_t ib_failed_calls; + uint32_t ob_failed_calls; }; struct private_object { 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 Tue Apr 21 12:47:22 2009 @@ -1473,6 +1473,10 @@ profile->rport_level = 1; /* default setting */ profile->acl_count = 0; sofia_set_pflag(profile, PFLAG_STUN_ENABLED); + profile->ib_calls = 0; + profile->ob_calls = 0; + profile->ib_failed_calls = 0; + profile->ob_failed_calls = 0; if (xprofiledomain) { profile->domain_name = switch_core_strdup(profile->pool, xprofiledomain); @@ -4124,21 +4128,23 @@ char *is_nat = NULL; char acl_token[512] = ""; + profile->ib_calls++; + if (sess_count >= sess_max || !sofia_test_pflag(profile, PFLAG_RUNNING)) { nua_respond(nh, 503, "Maximum Calls In Progress", SIPTAG_RETRY_AFTER_STR("300"), TAG_END()); - return; + goto fail; } if (!sip || !sip->sip_request || !sip->sip_request->rq_method_name) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Received an invalid packet!\n"); nua_respond(nh, SIP_503_SERVICE_UNAVAILABLE, TAG_END()); - return; + goto fail; } if (!(sip->sip_contact && sip->sip_contact->m_url)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "NO CONTACT!\n"); nua_respond(nh, 400, "Missing Contact Header", TAG_END()); - return; + goto fail; } get_addr(network_ip, sizeof(network_ip), my_addrinfo->ai_addr, my_addrinfo->ai_addrlen); @@ -4209,7 +4215,7 @@ if (!sofia_test_pflag(profile, PFLAG_AUTH_CALLS)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "IP %s Rejected by acl \"%s\"\n", network_ip, switch_str_nil(last_acl)); nua_respond(nh, SIP_403_FORBIDDEN, TAG_END()); - return; + goto fail; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "IP %s Rejected by acl \"%s\". Falling back to Digest auth.\n", network_ip, switch_str_nil(last_acl)); @@ -4226,6 +4232,11 @@ if (v_event) { switch_event_destroy(&v_event); } + + if (sip->sip_authorization || sip->sip_proxy_authorization) { + goto fail; + } + return; } } @@ -4242,14 +4253,14 @@ if (!session) { nua_respond(nh, 503, "Maximum Calls In Progress", SIPTAG_RETRY_AFTER_STR("300"), TAG_END()); - return; + goto fail; } if (!(tech_pvt = (private_object_t *) switch_core_session_alloc(session, sizeof(private_object_t)))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Hey where is my memory pool?\n"); nua_respond(nh, SIP_503_SERVICE_UNAVAILABLE, TAG_END()); switch_core_session_destroy(&session); - return; + goto fail; } @@ -4860,6 +4871,12 @@ sofia_private_free(sofia_private); switch_core_session_destroy(&session); nua_respond(nh, 503, "Maximum Calls In Progress", SIPTAG_RETRY_AFTER_STR("300"), TAG_END()); + return; + + fail: + profile->ib_failed_calls++; + return; + } void sofia_handle_sip_i_options(int status, Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue Apr 21 12:47:22 2009 @@ -212,6 +212,11 @@ return times; } +SWITCH_DECLARE(switch_call_direction_t) switch_channel_direction(switch_channel_t *channel) +{ + return channel->direction; +} + SWITCH_DECLARE(switch_status_t) switch_channel_alloc(switch_channel_t **channel, switch_call_direction_t direction, switch_memory_pool_t *pool) { switch_assert(pool != NULL);

1 0

[commit] r13102 - freeswitch/trunk/src/mod/applications/mod_commands
by FreeSWITCH SVN 21 Apr '09

21 Apr '09

Author: anthm Date: Tue Apr 21 12:41:54 2009 New Revision: 13102 Log: fix arg parsing in new command Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Tue Apr 21 12:41:54 2009 @@ -532,6 +532,11 @@ switch_core_session_t *xsession; char uuid[80] = ""; + if (switch_strlen_zero(cmd)) { + stream->write_function(stream, "-ERR, no input\n"); + return SWITCH_STATUS_SUCCESS; + } + dup = strdup(cmd); mycmd = dup; @@ -558,8 +563,10 @@ *arg++ = '\0'; } - expanded = switch_event_expand_headers(stream->param_event, arg); - status = switch_api_execute(mycmd, expanded, session, stream); + expanded = arg ? switch_event_expand_headers(stream->param_event, arg) : arg; + if ((status = switch_api_execute(mycmd, expanded, session, stream)) != SWITCH_STATUS_SUCCESS) { + stream->write_function(stream, "-ERR, error executing command\n"); + } if (expanded != arg) { free(expanded); @@ -569,7 +576,7 @@ free(dup); dup = NULL; - return status; + return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r13101 - in freeswitch/trunk/src: . mod/applications/mod_commands
by FreeSWITCH SVN 21 Apr '09

21 Apr '09

Author: anthm Date: Tue Apr 21 09:57:43 2009 New Revision: 13101 Log: add echo api command (echo back exact input) add expand api command (executes another api command with variable expansion) e.g. expand originate sofia/default/1000@${some_domain} e.g. expand uuid:958b6c3c-2e82-11de-a717-2731820639f9 echo ${variable_read_codec} Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/switch_channel.c Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Tue Apr 21 09:57:43 2009 @@ -515,6 +515,64 @@ return SWITCH_STATUS_SUCCESS; } +SWITCH_STANDARD_API(echo_function) +{ + stream->write_function(stream, "%s", cmd); + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_STANDARD_API(expand_function) +{ + char *expanded; + char *dup; + char *arg; + char *mycmd; + switch_status_t status; + const char *p; + switch_core_session_t *xsession; + char uuid[80] = ""; + + dup = strdup(cmd); + mycmd = dup; + + if (!strncasecmp(mycmd, "uuid:", 5)) { + p = cmd + 5; + if ((mycmd = strchr(p, ' ')) && *mycmd++) { + switch_copy_string(uuid, p, mycmd - p); + } + } + + if (switch_strlen_zero(mycmd)) { + stream->write_function(stream, "-ERR, no input\n"); + return SWITCH_STATUS_SUCCESS; + } + + if (*uuid) { + if ((xsession = switch_core_session_locate(uuid))) { + switch_channel_event_set_data(switch_core_session_get_channel(xsession), stream->param_event); + switch_core_session_rwunlock(xsession); + } + } + + if ((arg = strchr(mycmd, ' '))) { + *arg++ = '\0'; + } + + expanded = switch_event_expand_headers(stream->param_event, arg); + status = switch_api_execute(mycmd, expanded, session, stream); + + if (expanded != arg) { + free(expanded); + expanded = NULL; + } + + free(dup); + dup = NULL; + + return status; +} + + SWITCH_STANDARD_API(eval_function) { char *expanded; @@ -3332,7 +3390,9 @@ SWITCH_ADD_API(commands_api_interface, "module_exists", "check if module exists", module_exists_function, "<module>"); SWITCH_ADD_API(commands_api_interface, "domain_exists", "check if a domain exists", domain_exists_function, "<domain>"); SWITCH_ADD_API(commands_api_interface, "uuid_send_dtmf", "send dtmf digits", uuid_send_dtmf_function, UUID_SEND_DTMF_SYNTAX); - SWITCH_ADD_API(commands_api_interface, "eval", "eval (noop)", eval_function, "<expression>"); + SWITCH_ADD_API(commands_api_interface, "eval", "eval (noop)", eval_function, "[uuid:<uuid> ]<expression>"); + SWITCH_ADD_API(commands_api_interface, "expand", "expand vars and exexute", expand_function, "[uuid:<uuid> ]<cmd> <args>"); + SWITCH_ADD_API(commands_api_interface, "echo", "echo", echo_function, "<data>"); SWITCH_ADD_API(commands_api_interface, "system", "Execute a system command", system_function, SYSTEM_SYNTAX); SWITCH_ADD_API(commands_api_interface, "time_test", "time_test", time_test_function, "<mss>"); Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue Apr 21 09:57:43 2009 @@ -1321,6 +1321,7 @@ event->event_id == SWITCH_EVENT_CHANNEL_DATA || event->event_id == SWITCH_EVENT_CHANNEL_EXECUTE_COMPLETE || event->event_id == SWITCH_EVENT_SESSION_HEARTBEAT || + event->event_id == SWITCH_EVENT_API || event->event_id == SWITCH_EVENT_CUSTOM ) {

1 0

[commit] r13100 - freeswitch/trunk/libs/libdingaling/src
by FreeSWITCH SVN 21 Apr '09

21 Apr '09

Author: anthm Date: Tue Apr 21 08:57:31 2009 New Revision: 13100 Log: add a func to check for connected and authorized Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c freeswitch/trunk/libs/libdingaling/src/libdingaling.h Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Tue Apr 21 08:57:31 2009 @@ -2336,6 +2336,16 @@ return ldl_test_flag(handle, LDL_FLAG_RUNNING) ? 1 : 0; } +int ldl_handle_connected(ldl_handle_t *handle) +{ + return ldl_test_flag(handle, LDL_FLAG_CONNECTED) ? 1 : 0; +} + +int ldl_handle_authorized(ldl_handle_t *handle) +{ + return ldl_test_flag(handle, LDL_FLAG_AUTHORIZED) ? 1 : 0; +} + void ldl_handle_stop(ldl_handle_t *handle) { ldl_clear_flag_locked(handle, LDL_FLAG_RUNNING); Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.h ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.h (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.h Tue Apr 21 08:57:31 2009 @@ -591,6 +591,8 @@ void ldl_handle_stop(ldl_handle_t *handle); int ldl_handle_running(ldl_handle_t *handle); +int ldl_handle_connected(ldl_handle_t *handle); +int ldl_handle_authorized(ldl_handle_t *handle); /*!

1 0

[commit] r13099 - freeswitch/trunk/src/mod/say/mod_say_en
by FreeSWITCH SVN 21 Apr '09

21 Apr '09

Author: anthm Date: Tue Apr 21 08:23:38 2009 New Revision: 13099 Log: MODAPP-263 Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c 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 Tue Apr 21 08:23:38 2009 @@ -101,7 +101,11 @@ if (b) { if (b > 1) { - say_file("digits/%d0.wav", b); + if ((c==0) && (method == SSM_COUNTED)) { + say_file("digits/h-%d0.wav", b); + } else { + say_file("digits/%d0.wav", b); + } } else { say_file("digits/%d%d.wav", b, c); c = 0; @@ -439,6 +443,10 @@ if (say_time) { int32_t hour = tm.tm_hour, pm = 0; + if (say_date) { + say_file("time/at.wav"); + } + if (hour > 12) { hour -= 12; pm = 1;

1 0

[commit] r13098 - freeswitch/trunk/src/mod/endpoints/mod_opal
by FreeSWITCH SVN 21 Apr '09

21 Apr '09

Author: anthm Date: Tue Apr 21 08:11:32 2009 New Revision: 13098 Log: try to flag CNG frames MODOPAL-6 Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp Tue Apr 21 08:11:32 2009 @@ -24,6 +24,7 @@ #include "mod_opal.h" #include <opal/patch.h> +#include <opal/rtp/rtp.h> #include <h323/h323pdu.h> #include <h323/gkclient.h> @@ -1354,16 +1355,33 @@ //switch_core_timer_step(&m_switchTimer); - m_readFrame.buflen = m_readRTP.GetSize(); - m_readFrame.data = m_readRTP.GetPayloadPtr(); - m_readFrame.packet = m_readRTP.GetPointer(); - m_readFrame.packetlen = m_readRTP.GetHeaderSize() + m_readFrame.datalen; - m_readFrame.payload = (switch_payload_t) m_readRTP.GetPayloadType(); - m_readFrame.timestamp = m_readRTP.GetTimestamp(); - m_readFrame.m = (switch_bool_t) m_readRTP.GetMarker(); - m_readFrame.seq = m_readRTP.GetSequenceNumber(); - m_readFrame.ssrc = m_readRTP.GetSyncSource(); - m_readFrame.codec = m_switchCodec; + if (m_readFrame.payload == RTP_DataFrame::CN || m_readFrame.payload == RTP_DataFrame::Cisco_CN) { + m_readFrame.flags = SFF_CNG; + } + + if (m_readFrame.flags & SFF_CNG) { + m_readFrame.buflen = sizeof(m_buf); + m_readFrame.data = m_buf; + m_readFrame.packet = NULL; + m_readFrame.packetlen = 0; + m_readFrame.timestamp = 0; + m_readFrame.m = SWITCH_FALSE; + m_readFrame.seq = 0; + m_readFrame.ssrc = 0; + m_readFrame.codec = m_switchCodec; + } else { + m_readFrame.buflen = m_readRTP.GetSize(); + m_readFrame.data = m_readRTP.GetPayloadPtr(); + m_readFrame.packet = m_readRTP.GetPointer(); + m_readFrame.packetlen = m_readRTP.GetHeaderSize() + m_readFrame.datalen; + m_readFrame.payload = (switch_payload_t) m_readRTP.GetPayloadType(); + m_readFrame.timestamp = m_readRTP.GetTimestamp(); + m_readFrame.m = (switch_bool_t) m_readRTP.GetMarker(); + m_readFrame.seq = m_readRTP.GetSequenceNumber(); + m_readFrame.ssrc = m_readRTP.GetSyncSource(); + m_readFrame.codec = m_switchCodec; + } + *frame = &m_readFrame; return SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h Tue Apr 21 08:11:32 2009 @@ -252,6 +252,7 @@ switch_timer_t *m_switchTimer; switch_codec_t *m_switchCodec; switch_frame_t m_readFrame; + unsigned char m_buf[SWITCH_RECOMMENDED_BUFFER_SIZE]; RTP_DataFrame m_readRTP; bool m_callOnStart; uint32_t m_timeStamp;

1 0

[commit] r13097 - in freeswitch/trunk: build libs/win32
by FreeSWITCH SVN 21 Apr '09

21 Apr '09

Author: mikej Date: Mon Apr 20 23:34:41 2009 New Revision: 13097 Log: use sound_version.txt and moh_version.txt to determine sound file version on windows (FSBUILD-152) Modified: freeswitch/trunk/build/moh_version.txt freeswitch/trunk/build/sounds_version.txt freeswitch/trunk/libs/win32/Dowload 32khz Sounds.2008.vcproj freeswitch/trunk/libs/win32/Dowload 32khz music.2008.vcproj freeswitch/trunk/libs/win32/Download 16khz Sounds.2008.vcproj freeswitch/trunk/libs/win32/Download 16khz music.2008.vcproj freeswitch/trunk/libs/win32/Download 8khz Sounds.2008.vcproj freeswitch/trunk/libs/win32/Download 8khz music.2008.vcproj Modified: freeswitch/trunk/build/moh_version.txt ============================================================================== --- freeswitch/trunk/build/moh_version.txt (original) +++ freeswitch/trunk/build/moh_version.txt Mon Apr 20 23:34:41 2009 @@ -1 +1 @@ -1.0.8 +1.0.8 \ No newline at end of file Modified: freeswitch/trunk/build/sounds_version.txt ============================================================================== --- freeswitch/trunk/build/sounds_version.txt (original) +++ freeswitch/trunk/build/sounds_version.txt Mon Apr 20 23:34:41 2009 @@ -1 +1 @@ -1.0.8 +1.0.8 \ No newline at end of file Modified: freeswitch/trunk/libs/win32/Dowload 32khz Sounds.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Dowload 32khz Sounds.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/Dowload 32khz Sounds.2008.vcproj Mon Apr 20 23:34:41 2009 @@ -75,7 +75,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading 32khzsound." - CommandLine="if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-32000-1.0.8.tar.… "$(ProjectDir)..\sounds"
" + CommandLine="set /P SOUND_VERSION=<$(ProjectDir)..\..\build\sounds_version.txt
if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-32000-%SOUND_VER… "$(ProjectDir)..\sounds"
" Outputs="$(ProjectDir)..\sounds\en\us\callie\voicemail\32000" /> </FileConfiguration> @@ -85,7 +85,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading 32khzsound." - CommandLine="if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-32000-1.0.8.tar.… "$(ProjectDir)..\sounds"
" + CommandLine="set /P SOUND_VERSION=<$(ProjectDir)..\..\build\sounds_version.txt
if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-32000-%SOUND_VER… "$(ProjectDir)..\sounds"
" Outputs="$(ProjectDir)..\sounds\en\us\callie\voicemail\32000" /> </FileConfiguration> Modified: freeswitch/trunk/libs/win32/Dowload 32khz music.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Dowload 32khz music.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/Dowload 32khz music.2008.vcproj Mon Apr 20 23:34:41 2009 @@ -75,7 +75,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading 32khzsound." - CommandLine="if not exist "$(ProjectDir)..\sounds\music\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-32000-1.0.8.tar.gz "$(ProjectDir)..\sounds"
" + CommandLine="set /P SOUND_VERSION=<$(ProjectDir)..\..\build\moh_version.txt
if not exist "$(ProjectDir)..\sounds\music\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-32000-%SOUND_VERSION%.t… "$(ProjectDir)..\sounds"

" Outputs="$(ProjectDir)..\sounds\music\32000" /> </FileConfiguration> @@ -85,7 +85,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading 32khzsound." - CommandLine="if not exist "$(ProjectDir)..\sounds\music\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-32000-1.0.8.tar.gz "$(ProjectDir)..\sounds"
" + CommandLine="set /P SOUND_VERSION=<$(ProjectDir)..\..\build\moh_version.txt
if not exist "$(ProjectDir)..\sounds\music\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-32000-%SOUND_VERSION%.t… "$(ProjectDir)..\sounds"

" Outputs="$(ProjectDir)..\sounds\music\32000" /> </FileConfiguration> Modified: freeswitch/trunk/libs/win32/Download 16khz Sounds.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download 16khz Sounds.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/Download 16khz Sounds.2008.vcproj Mon Apr 20 23:34:41 2009 @@ -75,7 +75,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading 16khzsound." - CommandLine="if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-16000-1.0.8.tar.… "$(ProjectDir)..\sounds"
" + CommandLine="set /P SOUND_VERSION=<$(ProjectDir)..\..\build\sounds_version.txt
if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-16000-%SOUND_VER… "$(ProjectDir)..\sounds"
" Outputs="$(ProjectDir)..\sounds\en\us\callie\voicemail\16000" /> </FileConfiguration> @@ -85,7 +85,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading 16khzsound." - CommandLine="if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-16000-1.0.8.tar.… "$(ProjectDir)..\sounds"
" + CommandLine="set /P SOUND_VERSION=<$(ProjectDir)..\..\build\sounds_version.txt
if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-16000-%SOUND_VER… "$(ProjectDir)..\sounds"
" Outputs="$(ProjectDir)..\sounds\en\us\callie\voicemail\16000" /> </FileConfiguration> Modified: freeswitch/trunk/libs/win32/Download 16khz music.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download 16khz music.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/Download 16khz music.2008.vcproj Mon Apr 20 23:34:41 2009 @@ -75,7 +75,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading 16khzsound." - CommandLine="if not exist "$(ProjectDir)..\sounds\music\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-16000-1.0.8.tar.gz "$(ProjectDir)..\sounds"
" + CommandLine="set /P SOUND_VERSION=<$(ProjectDir)..\..\build\moh_version.txt
if not exist "$(ProjectDir)..\sounds\music\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-16000-%SOUND_VERSION%.t… "$(ProjectDir)..\sounds"

" Outputs="$(ProjectDir)..\sounds\music\16000" /> </FileConfiguration> @@ -85,7 +85,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading 16khzsound." - CommandLine="if not exist "$(ProjectDir)..\sounds\music\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-16000-1.0.8.tar.gz "$(ProjectDir)..\sounds"
" + CommandLine="set /P SOUND_VERSION=<$(ProjectDir)..\..\build\moh_version.txt
if not exist "$(ProjectDir)..\sounds\music\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-16000-%SOUND_VERSION%.t… "$(ProjectDir)..\sounds"

" Outputs="$(ProjectDir)..\sounds\music\16000" /> </FileConfiguration> Modified: freeswitch/trunk/libs/win32/Download 8khz Sounds.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download 8khz Sounds.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/Download 8khz Sounds.2008.vcproj Mon Apr 20 23:34:41 2009 @@ -75,7 +75,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading 8khzsound." - CommandLine="if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-8000-1.0.8.tar.gz "$(ProjectDir)..\sounds"
" + CommandLine="set /P SOUND_VERSION=<$(ProjectDir)..\..\build\sounds_version.txt
if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-8000-%SOUND_VERS… "$(ProjectDir)..\sounds"
" Outputs="$(ProjectDir)..\sounds\en\us\callie\voicemail\8000" /> </FileConfiguration> @@ -85,7 +85,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading 8khzsound." - CommandLine="if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-8000-1.0.8.tar.gz "$(ProjectDir)..\sounds"
" + CommandLine="set /P SOUND_VERSION=<$(ProjectDir)..\..\build\sounds_version.txt
if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-8000-%SOUND_VERS… "$(ProjectDir)..\sounds"
" Outputs="$(ProjectDir)..\sounds\en\us\callie\voicemail\8000" /> </FileConfiguration> Modified: freeswitch/trunk/libs/win32/Download 8khz music.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download 8khz music.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/Download 8khz music.2008.vcproj Mon Apr 20 23:34:41 2009 @@ -75,7 +75,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading 8khzsound." - CommandLine="if not exist "$(ProjectDir)..\sounds\music\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-8000-1.0.8.tar.gz "$(ProjectDir)..\sounds"
" + CommandLine="set /P SOUND_VERSION=<$(ProjectDir)..\..\build\moh_version.txt
if not exist "$(ProjectDir)..\sounds\music\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-8000-%SOUND_VERSION%.ta… "$(ProjectDir)..\sounds"
" Outputs="$(ProjectDir)..\sounds\music\8000" /> </FileConfiguration> @@ -85,7 +85,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading 8khzsound." - CommandLine="if not exist "$(ProjectDir)..\sounds\music\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-8000-1.0.8.tar.gz "$(ProjectDir)..\sounds"
" + CommandLine="set /P SOUND_VERSION=<$(ProjectDir)..\..\build\moh_version.txt
if not exist "$(ProjectDir)..\sounds\music\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-8000-%SOUND_VERSION%.ta… "$(ProjectDir)..\sounds"
" Outputs="$(ProjectDir)..\sounds\music\8000" /> </FileConfiguration>

1 0

[commit] r13096 - in freeswitch/trunk: . libs/win32 libs/win32/Sound_Files
by FreeSWITCH SVN 21 Apr '09

21 Apr '09

Author: mikej Date: Mon Apr 20 22:21:15 2009 New Revision: 13096 Log: de-couple version numbers and builds of sound files and moh files (FSBUILD-153) Added: freeswitch/trunk/libs/win32/Dowload 32khz music.2008.vcproj freeswitch/trunk/libs/win32/Download 16khz music.2008.vcproj freeswitch/trunk/libs/win32/Download 8khz music.2008.vcproj freeswitch/trunk/libs/win32/Sound_Files/16khzmusic.2008.vcproj freeswitch/trunk/libs/win32/Sound_Files/32khzmusic.2008.vcproj freeswitch/trunk/libs/win32/Sound_Files/8khzmusic.2008.vcproj Modified: freeswitch/trunk/Freeswitch.2008.express.sln freeswitch/trunk/Freeswitch.2008.sln freeswitch/trunk/libs/win32/Dowload 32khz Sounds.2008.vcproj freeswitch/trunk/libs/win32/Download 16khz Sounds.2008.vcproj freeswitch/trunk/libs/win32/Download 8khz Sounds.2008.vcproj freeswitch/trunk/libs/win32/Sound_Files/16khz.2008.vcproj freeswitch/trunk/libs/win32/Sound_Files/32khz.2008.vcproj freeswitch/trunk/libs/win32/Sound_Files/8khz.2008.vcproj Modified: freeswitch/trunk/Freeswitch.2008.express.sln ============================================================================== --- freeswitch/trunk/Freeswitch.2008.express.sln (original) +++ freeswitch/trunk/Freeswitch.2008.express.sln Mon Apr 20 22:21:15 2009 @@ -610,6 +610,27 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_modem_filter", "libs\spandsp\src\msvc\make_modem_filter.2008.vcproj", "{329A6FA0-0FCC-4435-A950-E670AEFA9838}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download 32khz music", "libs\win32\Dowload 32khz music.2008.vcproj", "{1F0A8A77-E661-418F-BB92-82172AE43803}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download 8khz music", "libs\win32\Download 8khz music.2008.vcproj", "{4F5C9D55-98EF-4256-8311-32D7BD360406}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download 16khz music", "libs\win32\Download 16khz music.2008.vcproj", "{E10571C4-E7F4-4608-B5F2-B22E7EB95400}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "8khz music", "libs\win32\Sound_Files\8khzmusic.2008.vcproj", "{D1ABE208-6442-4FB4-9AAD-1677E41BC870}" + ProjectSection(ProjectDependencies) = postProject + {4F5C9D55-98EF-4256-8311-32D7BD360406} = {4F5C9D55-98EF-4256-8311-32D7BD360406} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "16khz music", "libs\win32\Sound_Files\16khzmusic.2008.vcproj", "{BA599D0A-4310-4505-91DA-6A6447B3E289}" + ProjectSection(ProjectDependencies) = postProject + {E10571C4-E7F4-4608-B5F2-B22E7EB95400} = {E10571C4-E7F4-4608-B5F2-B22E7EB95400} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "32khz music", "libs\win32\Sound_Files\32khzmusic.2008.vcproj", "{EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}" + ProjectSection(ProjectDependencies) = postProject + {1F0A8A77-E661-418F-BB92-82172AE43803} = {1F0A8A77-E661-418F-BB92-82172AE43803} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution All|Win32 = All|Win32 @@ -698,7 +719,6 @@ {5580D60E-0F77-4716-9CD4-B8E5986FA375}.Release|x64.ActiveCfg = Release|x64 {5580D60E-0F77-4716-9CD4-B8E5986FA375}.Release|x64.Build.0 = Release|x64 {1A1FF289-4FD6-4285-A422-D31DD67A4723}.All|Win32.ActiveCfg = Release|Win32 - {1A1FF289-4FD6-4285-A422-D31DD67A4723}.All|Win32.Build.0 = Release|Win32 {1A1FF289-4FD6-4285-A422-D31DD67A4723}.All|x64.ActiveCfg = Release|Win32 {1A1FF289-4FD6-4285-A422-D31DD67A4723}.Debug|Win32.ActiveCfg = Debug|Win32 {1A1FF289-4FD6-4285-A422-D31DD67A4723}.Debug|x64.ActiveCfg = Debug|Win32 @@ -1584,6 +1604,7 @@ {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.All|Win32.ActiveCfg = Release|Win32 {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.All|Win32.Build.0 = Release|Win32 {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.All|x64.ActiveCfg = Release|Win32 + {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.All|x64.Build.0 = Release|Win32 {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Debug|Win32.ActiveCfg = Debug|Win32 {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Debug|Win32.Build.0 = Debug|Win32 {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Debug|x64.ActiveCfg = Debug|Win32 @@ -1593,7 +1614,6 @@ {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Release|x64.ActiveCfg = Release|Win32 {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Release|x64.Build.0 = Release|Win32 {87A1FE3D-F410-4C8E-9591-8C625985BC70}.All|Win32.ActiveCfg = Release|Win32 - {87A1FE3D-F410-4C8E-9591-8C625985BC70}.All|Win32.Build.0 = Release|Win32 {87A1FE3D-F410-4C8E-9591-8C625985BC70}.All|x64.ActiveCfg = Release|Win32 {87A1FE3D-F410-4C8E-9591-8C625985BC70}.Debug|Win32.ActiveCfg = Debug|Win32 {87A1FE3D-F410-4C8E-9591-8C625985BC70}.Debug|x64.ActiveCfg = Debug|Win32 @@ -1602,6 +1622,7 @@ {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.All|Win32.ActiveCfg = Release|Win32 {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.All|Win32.Build.0 = Release|Win32 {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.All|x64.ActiveCfg = Release|Win32 + {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.All|x64.Build.0 = Release|Win32 {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Debug|Win32.ActiveCfg = Debug|Win32 {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Debug|Win32.Build.0 = Debug|Win32 {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Debug|x64.ActiveCfg = Debug|Win32 @@ -1611,21 +1632,18 @@ {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Release|x64.ActiveCfg = Release|Win32 {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Release|x64.Build.0 = Release|Win32 {7EB71250-F002-4ED8-92CA-CA218114537A}.All|Win32.ActiveCfg = Release|Win32 - {7EB71250-F002-4ED8-92CA-CA218114537A}.All|Win32.Build.0 = Release|Win32 {7EB71250-F002-4ED8-92CA-CA218114537A}.All|x64.ActiveCfg = Release|Win32 {7EB71250-F002-4ED8-92CA-CA218114537A}.Debug|Win32.ActiveCfg = Debug|Win32 {7EB71250-F002-4ED8-92CA-CA218114537A}.Debug|x64.ActiveCfg = Debug|Win32 {7EB71250-F002-4ED8-92CA-CA218114537A}.Release|Win32.ActiveCfg = Release|Win32 {7EB71250-F002-4ED8-92CA-CA218114537A}.Release|x64.ActiveCfg = Release|Win32 {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.All|Win32.ActiveCfg = Release|Win32 - {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.All|Win32.Build.0 = Release|Win32 {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.All|x64.ActiveCfg = Release|Win32 {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.Debug|Win32.ActiveCfg = Debug|Win32 {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.Debug|x64.ActiveCfg = Debug|Win32 {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.Release|Win32.ActiveCfg = Release|Win32 {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.Release|x64.ActiveCfg = Release|Win32 {464AAB78-5489-4916-BE51-BF8D61822311}.All|Win32.ActiveCfg = Release|Win32 - {464AAB78-5489-4916-BE51-BF8D61822311}.All|Win32.Build.0 = Release|Win32 {464AAB78-5489-4916-BE51-BF8D61822311}.All|x64.ActiveCfg = Release|Win32 {464AAB78-5489-4916-BE51-BF8D61822311}.Debug|Win32.ActiveCfg = Debug|Win32 {464AAB78-5489-4916-BE51-BF8D61822311}.Debug|x64.ActiveCfg = Debug|Win32 @@ -2001,6 +2019,54 @@ {329A6FA0-0FCC-4435-A950-E670AEFA9838}.Release|Win32.Build.0 = All|Win32 {329A6FA0-0FCC-4435-A950-E670AEFA9838}.Release|x64.ActiveCfg = All|Win32 {329A6FA0-0FCC-4435-A950-E670AEFA9838}.Release|x64.Build.0 = All|Win32 + {1F0A8A77-E661-418F-BB92-82172AE43803}.All|Win32.ActiveCfg = Release|Win32 + {1F0A8A77-E661-418F-BB92-82172AE43803}.All|x64.ActiveCfg = Release|Win32 + {1F0A8A77-E661-418F-BB92-82172AE43803}.Debug|Win32.ActiveCfg = Debug|Win32 + {1F0A8A77-E661-418F-BB92-82172AE43803}.Debug|x64.ActiveCfg = Debug|Win32 + {1F0A8A77-E661-418F-BB92-82172AE43803}.Release|Win32.ActiveCfg = Release|Win32 + {1F0A8A77-E661-418F-BB92-82172AE43803}.Release|x64.ActiveCfg = Release|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.All|Win32.ActiveCfg = Release|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.All|Win32.Build.0 = Release|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.All|x64.ActiveCfg = Release|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.All|x64.Build.0 = Release|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.Debug|Win32.ActiveCfg = Debug|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.Debug|Win32.Build.0 = Debug|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.Debug|x64.ActiveCfg = Debug|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.Debug|x64.Build.0 = Debug|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.Release|Win32.ActiveCfg = Release|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.Release|Win32.Build.0 = Release|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.Release|x64.ActiveCfg = Release|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.Release|x64.Build.0 = Release|Win32 + {E10571C4-E7F4-4608-B5F2-B22E7EB95400}.All|Win32.ActiveCfg = Release|Win32 + {E10571C4-E7F4-4608-B5F2-B22E7EB95400}.All|x64.ActiveCfg = Release|Win32 + {E10571C4-E7F4-4608-B5F2-B22E7EB95400}.Debug|Win32.ActiveCfg = Debug|Win32 + {E10571C4-E7F4-4608-B5F2-B22E7EB95400}.Debug|x64.ActiveCfg = Debug|Win32 + {E10571C4-E7F4-4608-B5F2-B22E7EB95400}.Release|Win32.ActiveCfg = Release|Win32 + {E10571C4-E7F4-4608-B5F2-B22E7EB95400}.Release|x64.ActiveCfg = Release|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.All|Win32.ActiveCfg = Release|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.All|Win32.Build.0 = Release|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.All|x64.ActiveCfg = Release|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.All|x64.Build.0 = Release|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Debug|Win32.ActiveCfg = Debug|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Debug|Win32.Build.0 = Debug|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Debug|x64.ActiveCfg = Debug|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Debug|x64.Build.0 = Debug|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Release|Win32.ActiveCfg = Release|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Release|Win32.Build.0 = Release|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Release|x64.ActiveCfg = Release|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Release|x64.Build.0 = Release|Win32 + {BA599D0A-4310-4505-91DA-6A6447B3E289}.All|Win32.ActiveCfg = Release|Win32 + {BA599D0A-4310-4505-91DA-6A6447B3E289}.All|x64.ActiveCfg = Release|Win32 + {BA599D0A-4310-4505-91DA-6A6447B3E289}.Debug|Win32.ActiveCfg = Debug|Win32 + {BA599D0A-4310-4505-91DA-6A6447B3E289}.Debug|x64.ActiveCfg = Debug|Win32 + {BA599D0A-4310-4505-91DA-6A6447B3E289}.Release|Win32.ActiveCfg = Release|Win32 + {BA599D0A-4310-4505-91DA-6A6447B3E289}.Release|x64.ActiveCfg = Release|Win32 + {EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.All|Win32.ActiveCfg = Release|Win32 + {EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.All|x64.ActiveCfg = Release|Win32 + {EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Debug|Win32.ActiveCfg = Debug|Win32 + {EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Debug|x64.ActiveCfg = Debug|Win32 + {EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Release|Win32.ActiveCfg = Release|Win32 + {EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Modified: freeswitch/trunk/Freeswitch.2008.sln ============================================================================== --- freeswitch/trunk/Freeswitch.2008.sln (original) +++ freeswitch/trunk/Freeswitch.2008.sln Mon Apr 20 22:21:15 2009 @@ -997,6 +997,27 @@ {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download 32khz music", "libs\win32\Dowload 32khz music.2008.vcproj", "{1F0A8A77-E661-418F-BB92-82172AE43803}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download 8khz music", "libs\win32\Download 8khz music.2008.vcproj", "{4F5C9D55-98EF-4256-8311-32D7BD360406}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download 16khz music", "libs\win32\Download 16khz music.2008.vcproj", "{E10571C4-E7F4-4608-B5F2-B22E7EB95400}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "8khz music", "libs\win32\Sound_Files\8khzmusic.2008.vcproj", "{D1ABE208-6442-4FB4-9AAD-1677E41BC870}" + ProjectSection(ProjectDependencies) = postProject + {4F5C9D55-98EF-4256-8311-32D7BD360406} = {4F5C9D55-98EF-4256-8311-32D7BD360406} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "16khz music", "libs\win32\Sound_Files\16khzmusic.2008.vcproj", "{BA599D0A-4310-4505-91DA-6A6447B3E289}" + ProjectSection(ProjectDependencies) = postProject + {E10571C4-E7F4-4608-B5F2-B22E7EB95400} = {E10571C4-E7F4-4608-B5F2-B22E7EB95400} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "32khz music", "libs\win32\Sound_Files\32khzmusic.2008.vcproj", "{EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}" + ProjectSection(ProjectDependencies) = postProject + {1F0A8A77-E661-418F-BB92-82172AE43803} = {1F0A8A77-E661-418F-BB92-82172AE43803} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution All|Win32 = All|Win32 @@ -1085,7 +1106,6 @@ {5580D60E-0F77-4716-9CD4-B8E5986FA375}.Release|x64.ActiveCfg = Release|x64 {5580D60E-0F77-4716-9CD4-B8E5986FA375}.Release|x64.Build.0 = Release|x64 {1A1FF289-4FD6-4285-A422-D31DD67A4723}.All|Win32.ActiveCfg = Release|Win32 - {1A1FF289-4FD6-4285-A422-D31DD67A4723}.All|Win32.Build.0 = Release|Win32 {1A1FF289-4FD6-4285-A422-D31DD67A4723}.All|x64.ActiveCfg = Release|Win32 {1A1FF289-4FD6-4285-A422-D31DD67A4723}.Debug|Win32.ActiveCfg = Debug|Win32 {1A1FF289-4FD6-4285-A422-D31DD67A4723}.Debug|x64.ActiveCfg = Debug|Win32 @@ -1970,6 +1990,7 @@ {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.All|Win32.ActiveCfg = Release|Win32 {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.All|Win32.Build.0 = Release|Win32 {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.All|x64.ActiveCfg = Release|Win32 + {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.All|x64.Build.0 = Release|Win32 {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Debug|Win32.ActiveCfg = Debug|Win32 {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Debug|Win32.Build.0 = Debug|Win32 {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Debug|x64.ActiveCfg = Debug|Win32 @@ -1979,7 +2000,6 @@ {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Release|x64.ActiveCfg = Release|Win32 {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Release|x64.Build.0 = Release|Win32 {87A1FE3D-F410-4C8E-9591-8C625985BC70}.All|Win32.ActiveCfg = Release|Win32 - {87A1FE3D-F410-4C8E-9591-8C625985BC70}.All|Win32.Build.0 = Release|Win32 {87A1FE3D-F410-4C8E-9591-8C625985BC70}.All|x64.ActiveCfg = Release|Win32 {87A1FE3D-F410-4C8E-9591-8C625985BC70}.Debug|Win32.ActiveCfg = Debug|Win32 {87A1FE3D-F410-4C8E-9591-8C625985BC70}.Debug|x64.ActiveCfg = Debug|Win32 @@ -1988,6 +2008,7 @@ {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.All|Win32.ActiveCfg = Release|Win32 {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.All|Win32.Build.0 = Release|Win32 {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.All|x64.ActiveCfg = Release|Win32 + {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.All|x64.Build.0 = Release|Win32 {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Debug|Win32.ActiveCfg = Debug|Win32 {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Debug|Win32.Build.0 = Debug|Win32 {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Debug|x64.ActiveCfg = Debug|Win32 @@ -1997,21 +2018,18 @@ {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Release|x64.ActiveCfg = Release|Win32 {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Release|x64.Build.0 = Release|Win32 {7EB71250-F002-4ED8-92CA-CA218114537A}.All|Win32.ActiveCfg = Release|Win32 - {7EB71250-F002-4ED8-92CA-CA218114537A}.All|Win32.Build.0 = Release|Win32 {7EB71250-F002-4ED8-92CA-CA218114537A}.All|x64.ActiveCfg = Release|Win32 {7EB71250-F002-4ED8-92CA-CA218114537A}.Debug|Win32.ActiveCfg = Debug|Win32 {7EB71250-F002-4ED8-92CA-CA218114537A}.Debug|x64.ActiveCfg = Debug|Win32 {7EB71250-F002-4ED8-92CA-CA218114537A}.Release|Win32.ActiveCfg = Release|Win32 {7EB71250-F002-4ED8-92CA-CA218114537A}.Release|x64.ActiveCfg = Release|Win32 {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.All|Win32.ActiveCfg = Release|Win32 - {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.All|Win32.Build.0 = Release|Win32 {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.All|x64.ActiveCfg = Release|Win32 {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.Debug|Win32.ActiveCfg = Debug|Win32 {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.Debug|x64.ActiveCfg = Debug|Win32 {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.Release|Win32.ActiveCfg = Release|Win32 {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.Release|x64.ActiveCfg = Release|Win32 {464AAB78-5489-4916-BE51-BF8D61822311}.All|Win32.ActiveCfg = Release|Win32 - {464AAB78-5489-4916-BE51-BF8D61822311}.All|Win32.Build.0 = Release|Win32 {464AAB78-5489-4916-BE51-BF8D61822311}.All|x64.ActiveCfg = Release|Win32 {464AAB78-5489-4916-BE51-BF8D61822311}.Debug|Win32.ActiveCfg = Debug|Win32 {464AAB78-5489-4916-BE51-BF8D61822311}.Debug|x64.ActiveCfg = Debug|Win32 @@ -2408,6 +2426,54 @@ {C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.Debug|x64.ActiveCfg = Debug|Win32 {C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.Release|Win32.ActiveCfg = Release|Win32 {C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.Release|x64.ActiveCfg = Release|Win32 + {1F0A8A77-E661-418F-BB92-82172AE43803}.All|Win32.ActiveCfg = Release|Win32 + {1F0A8A77-E661-418F-BB92-82172AE43803}.All|x64.ActiveCfg = Release|Win32 + {1F0A8A77-E661-418F-BB92-82172AE43803}.Debug|Win32.ActiveCfg = Debug|Win32 + {1F0A8A77-E661-418F-BB92-82172AE43803}.Debug|x64.ActiveCfg = Debug|Win32 + {1F0A8A77-E661-418F-BB92-82172AE43803}.Release|Win32.ActiveCfg = Release|Win32 + {1F0A8A77-E661-418F-BB92-82172AE43803}.Release|x64.ActiveCfg = Release|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.All|Win32.ActiveCfg = Release|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.All|Win32.Build.0 = Release|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.All|x64.ActiveCfg = Release|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.All|x64.Build.0 = Release|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.Debug|Win32.ActiveCfg = Debug|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.Debug|Win32.Build.0 = Debug|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.Debug|x64.ActiveCfg = Debug|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.Debug|x64.Build.0 = Debug|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.Release|Win32.ActiveCfg = Release|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.Release|Win32.Build.0 = Release|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.Release|x64.ActiveCfg = Release|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.Release|x64.Build.0 = Release|Win32 + {E10571C4-E7F4-4608-B5F2-B22E7EB95400}.All|Win32.ActiveCfg = Release|Win32 + {E10571C4-E7F4-4608-B5F2-B22E7EB95400}.All|x64.ActiveCfg = Release|Win32 + {E10571C4-E7F4-4608-B5F2-B22E7EB95400}.Debug|Win32.ActiveCfg = Debug|Win32 + {E10571C4-E7F4-4608-B5F2-B22E7EB95400}.Debug|x64.ActiveCfg = Debug|Win32 + {E10571C4-E7F4-4608-B5F2-B22E7EB95400}.Release|Win32.ActiveCfg = Release|Win32 + {E10571C4-E7F4-4608-B5F2-B22E7EB95400}.Release|x64.ActiveCfg = Release|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.All|Win32.ActiveCfg = Release|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.All|Win32.Build.0 = Release|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.All|x64.ActiveCfg = Release|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.All|x64.Build.0 = Release|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Debug|Win32.ActiveCfg = Debug|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Debug|Win32.Build.0 = Debug|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Debug|x64.ActiveCfg = Debug|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Debug|x64.Build.0 = Debug|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Release|Win32.ActiveCfg = Release|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Release|Win32.Build.0 = Release|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Release|x64.ActiveCfg = Release|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Release|x64.Build.0 = Release|Win32 + {BA599D0A-4310-4505-91DA-6A6447B3E289}.All|Win32.ActiveCfg = Release|Win32 + {BA599D0A-4310-4505-91DA-6A6447B3E289}.All|x64.ActiveCfg = Release|Win32 + {BA599D0A-4310-4505-91DA-6A6447B3E289}.Debug|Win32.ActiveCfg = Debug|Win32 + {BA599D0A-4310-4505-91DA-6A6447B3E289}.Debug|x64.ActiveCfg = Debug|Win32 + {BA599D0A-4310-4505-91DA-6A6447B3E289}.Release|Win32.ActiveCfg = Release|Win32 + {BA599D0A-4310-4505-91DA-6A6447B3E289}.Release|x64.ActiveCfg = Release|Win32 + {EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.All|Win32.ActiveCfg = Release|Win32 + {EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.All|x64.ActiveCfg = Release|Win32 + {EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Debug|Win32.ActiveCfg = Debug|Win32 + {EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Debug|x64.ActiveCfg = Debug|Win32 + {EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Release|Win32.ActiveCfg = Release|Win32 + {EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -2531,6 +2597,9 @@ {D5D2BF72-29FE-4982-A9FA-82AB1086DB1B} = {C120A020-773F-4EA3-923F-B67AF28B750D} {E796E337-DE78-4303-8614-9A590862EE95} = {C120A020-773F-4EA3-923F-B67AF28B750D} {2B8A45C9-FEB4-4734-AB37-8DB9DB899917} = {C120A020-773F-4EA3-923F-B67AF28B750D} + {1F0A8A77-E661-418F-BB92-82172AE43803} = {C120A020-773F-4EA3-923F-B67AF28B750D} + {4F5C9D55-98EF-4256-8311-32D7BD360406} = {C120A020-773F-4EA3-923F-B67AF28B750D} + {E10571C4-E7F4-4608-B5F2-B22E7EB95400} = {C120A020-773F-4EA3-923F-B67AF28B750D} {988CACF7-3FCB-4992-BE69-77872AE67DC8} = {6CD61A1D-797C-470A-BE08-8C31B68BB336} {5BC072DB-3826-48EA-AF34-FE32AA01E83B} = {6CD61A1D-797C-470A-BE08-8C31B68BB336} {FA429E98-8B03-45E6-A096-A4BC5E821DE4} = {6CD61A1D-797C-470A-BE08-8C31B68BB336} @@ -2587,5 +2656,8 @@ {7A8D8174-B355-4114-AFC1-04777CB9DE0A} = {4F227C26-768F-46A3-8684-1D08A46FB374} {7EB71250-F002-4ED8-92CA-CA218114537A} = {4F227C26-768F-46A3-8684-1D08A46FB374} {464AAB78-5489-4916-BE51-BF8D61822311} = {4F227C26-768F-46A3-8684-1D08A46FB374} + {D1ABE208-6442-4FB4-9AAD-1677E41BC870} = {4F227C26-768F-46A3-8684-1D08A46FB374} + {BA599D0A-4310-4505-91DA-6A6447B3E289} = {4F227C26-768F-46A3-8684-1D08A46FB374} + {EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959} = {4F227C26-768F-46A3-8684-1D08A46FB374} EndGlobalSection EndGlobal Modified: freeswitch/trunk/libs/win32/Dowload 32khz Sounds.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Dowload 32khz Sounds.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/Dowload 32khz Sounds.2008.vcproj Mon Apr 20 22:21:15 2009 @@ -75,7 +75,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading 32khzsound." - CommandLine="if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-32000-1.0.7.tar.… "$(ProjectDir)..\sounds"
if not exist "$(ProjectDir)..\sounds\music\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-32000-1.0.7.tar.gz "$(ProjectDir)..\sounds"
" + CommandLine="if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-32000-1.0.8.tar.… "$(ProjectDir)..\sounds"
" Outputs="$(ProjectDir)..\sounds\en\us\callie\voicemail\32000" /> </FileConfiguration> @@ -85,7 +85,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading 32khzsound." - CommandLine="if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-32000-1.0.7.tar.… "$(ProjectDir)..\sounds"
if not exist "$(ProjectDir)..\sounds\music\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-32000-1.0.7.tar.gz "$(ProjectDir)..\sounds"
" + CommandLine="if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-32000-1.0.8.tar.… "$(ProjectDir)..\sounds"
" Outputs="$(ProjectDir)..\sounds\en\us\callie\voicemail\32000" /> </FileConfiguration> Added: freeswitch/trunk/libs/win32/Dowload 32khz music.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/win32/Dowload 32khz music.2008.vcproj Mon Apr 20 22:21:15 2009 @@ -0,0 +1,96 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="Download 32khz music" + ProjectGUID="{1F0A8A77-E661-418F-BB92-82172AE43803}" + RootNamespace="Download 32khz music" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="10" + CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + CommandLine="" + Outputs="" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="10" + CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\32khzsound\cleancount" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading 32khzsound." + CommandLine="if not exist "$(ProjectDir)..\sounds\music\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-32000-1.0.8.tar.gz "$(ProjectDir)..\sounds"
" + Outputs="$(ProjectDir)..\sounds\music\32000" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading 32khzsound." + CommandLine="if not exist "$(ProjectDir)..\sounds\music\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-32000-1.0.8.tar.gz "$(ProjectDir)..\sounds"
" + Outputs="$(ProjectDir)..\sounds\music\32000" + /> + </FileConfiguration> + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/trunk/libs/win32/Download 16khz Sounds.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download 16khz Sounds.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/Download 16khz Sounds.2008.vcproj Mon Apr 20 22:21:15 2009 @@ -75,7 +75,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading 16khzsound." - CommandLine="if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-16000-1.0.7.tar.… "$(ProjectDir)..\sounds"
if not exist "$(ProjectDir)..\sounds\music\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-16000-1.0.7.tar.gz "$(ProjectDir)..\sounds"
" + CommandLine="if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-16000-1.0.8.tar.… "$(ProjectDir)..\sounds"
" Outputs="$(ProjectDir)..\sounds\en\us\callie\voicemail\16000" /> </FileConfiguration> @@ -85,7 +85,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading 16khzsound." - CommandLine="if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-16000-1.0.7.tar.… "$(ProjectDir)..\sounds"
if not exist "$(ProjectDir)..\sounds\music\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-16000-1.0.7.tar.gz "$(ProjectDir)..\sounds"
" + CommandLine="if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-16000-1.0.8.tar.… "$(ProjectDir)..\sounds"
" Outputs="$(ProjectDir)..\sounds\en\us\callie\voicemail\16000" /> </FileConfiguration> Added: freeswitch/trunk/libs/win32/Download 16khz music.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/win32/Download 16khz music.2008.vcproj Mon Apr 20 22:21:15 2009 @@ -0,0 +1,96 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="Download 16khz music" + ProjectGUID="{E10571C4-E7F4-4608-B5F2-B22E7EB95400}" + RootNamespace="Download 16khz music" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="10" + CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + CommandLine="" + Outputs="" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="10" + CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\16khzsound\cleancount" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading 16khzsound." + CommandLine="if not exist "$(ProjectDir)..\sounds\music\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-16000-1.0.8.tar.gz "$(ProjectDir)..\sounds"
" + Outputs="$(ProjectDir)..\sounds\music\16000" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading 16khzsound." + CommandLine="if not exist "$(ProjectDir)..\sounds\music\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-16000-1.0.8.tar.gz "$(ProjectDir)..\sounds"
" + Outputs="$(ProjectDir)..\sounds\music\16000" + /> + </FileConfiguration> + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/trunk/libs/win32/Download 8khz Sounds.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download 8khz Sounds.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/Download 8khz Sounds.2008.vcproj Mon Apr 20 22:21:15 2009 @@ -75,7 +75,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading 8khzsound." - CommandLine="if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-8000-1.0.7.tar.gz "$(ProjectDir)..\sounds"
if not exist "$(ProjectDir)..\sounds\music\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-8000-1.0.7.tar.gz "$(ProjectDir)..\sounds"
" + CommandLine="if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-8000-1.0.8.tar.gz "$(ProjectDir)..\sounds"
" Outputs="$(ProjectDir)..\sounds\en\us\callie\voicemail\8000" /> </FileConfiguration> @@ -85,7 +85,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading 8khzsound." - CommandLine="if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-8000-1.0.7.tar.gz "$(ProjectDir)..\sounds"
if not exist "$(ProjectDir)..\sounds\music\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-8000-1.0.7.tar.gz "$(ProjectDir)..\sounds"
" + CommandLine="if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-8000-1.0.8.tar.gz "$(ProjectDir)..\sounds"
" Outputs="$(ProjectDir)..\sounds\en\us\callie\voicemail\8000" /> </FileConfiguration> Added: freeswitch/trunk/libs/win32/Download 8khz music.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/win32/Download 8khz music.2008.vcproj Mon Apr 20 22:21:15 2009 @@ -0,0 +1,96 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="Download 8khz music" + ProjectGUID="{4F5C9D55-98EF-4256-8311-32D7BD360406}" + RootNamespace="Download 8khz music" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="10" + CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + CommandLine="" + Outputs="" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="10" + CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\8khzsound\cleancount" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading 8khzsound." + CommandLine="if not exist "$(ProjectDir)..\sounds\music\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-8000-1.0.8.tar.gz "$(ProjectDir)..\sounds"
" + Outputs="$(ProjectDir)..\sounds\music\8000" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading 8khzsound." + CommandLine="if not exist "$(ProjectDir)..\sounds\music\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-8000-1.0.8.tar.gz "$(ProjectDir)..\sounds"
" + Outputs="$(ProjectDir)..\sounds\music\8000" + /> + </FileConfiguration> + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/trunk/libs/win32/Sound_Files/16khz.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Sound_Files/16khz.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/Sound_Files/16khz.2008.vcproj Mon Apr 20 22:21:15 2009 @@ -33,7 +33,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="xcopy "$(SolutionDir)libs\sounds\en\us\callie\voicemail\16000\*.*" "$(OutDir)\sounds\en\us\callie\voicemail\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\ivr\16000\*.*" "$(OutDir)\sounds\en\us\callie\ivr\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\conference\16000\*.*" "$(OutDir)\sounds\en\us\callie\conference\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\time\16000\*.*" "$(OutDir)\sounds\en\us\callie\time\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\digits\16000\*.*" "$(OutDir)\sounds\en\us\callie\digits\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\ascii\16000\*.*" "$(OutDir)\sounds\en\us\callie\ascii\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\misc\16000\*.*" "$(OutDir)\sounds\en\us\callie\misc\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\currency\16000\*.*" "$(OutDir)\sounds\en\us\callie\currency\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\16000\*.*" "$(OutDir)\sounds\en\us\callie\phonetic-ascii\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\music\16000\*.*" "$(OutDir)\sounds\music\16000" /C /D /Y /S /I
" + CommandLine="xcopy "$(SolutionDir)libs\sounds\en\us\callie\voicemail\16000\*.*" "$(OutDir)\sounds\en\us\callie\voicemail\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\ivr\16000\*.*" "$(OutDir)\sounds\en\us\callie\ivr\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\conference\16000\*.*" "$(OutDir)\sounds\en\us\callie\conference\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\time\16000\*.*" "$(OutDir)\sounds\en\us\callie\time\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\digits\16000\*.*" "$(OutDir)\sounds\en\us\callie\digits\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\ascii\16000\*.*" "$(OutDir)\sounds\en\us\callie\ascii\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\misc\16000\*.*" "$(OutDir)\sounds\en\us\callie\misc\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\currency\16000\*.*" "$(OutDir)\sounds\en\us\callie\currency\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\16000\*.*" "$(OutDir)\sounds\en\us\callie\phonetic-ascii\16000" /C /D /Y /S /I
" /> </Configuration> <Configuration @@ -55,7 +55,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="if not exist "$(OutDir)\sounds\en\us\callie\voicemail\16000" xcopy "$(SolutionDir)libs\sounds\en\us\callie\voicemail\16000\*.*" "$(OutDir)\sounds\en\us\callie\voicemail\16000" /C /D /Y /S /I
if not exist "$(OutDir)\sounds\music\16000" xcopy "$(SolutionDir)libs\sounds\music\16000\*.*" "$(OutDir)\sounds\music\16000" /C /D /Y /S /I
" + CommandLine="xcopy "$(SolutionDir)libs\sounds\en\us\callie\voicemail\16000\*.*" "$(OutDir)\sounds\en\us\callie\voicemail\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\ivr\16000\*.*" "$(OutDir)\sounds\en\us\callie\ivr\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\conference\16000\*.*" "$(OutDir)\sounds\en\us\callie\conference\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\time\16000\*.*" "$(OutDir)\sounds\en\us\callie\time\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\digits\16000\*.*" "$(OutDir)\sounds\en\us\callie\digits\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\ascii\16000\*.*" "$(OutDir)\sounds\en\us\callie\ascii\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\misc\16000\*.*" "$(OutDir)\sounds\en\us\callie\misc\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\currency\16000\*.*" "$(OutDir)\sounds\en\us\callie\currency\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\16000\*.*" "$(OutDir)\sounds\en\us\callie\phonetic-ascii\16000" /C /D /Y /S /I
" /> </Configuration> </Configurations> Added: freeswitch/trunk/libs/win32/Sound_Files/16khzmusic.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/win32/Sound_Files/16khzmusic.2008.vcproj Mon Apr 20 22:21:15 2009 @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="16khz music" + ProjectGUID="{BA599D0A-4310-4505-91DA-6A6447B3E289}" + RootNamespace="My16khzmusic" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="10" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="xcopy "$(SolutionDir)libs\sounds\music\16000\*.*" "$(OutDir)\sounds\music\16000" /C /D /Y /S /I
" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="10" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="xcopy "$(SolutionDir)libs\sounds\music\16000\*.*" "$(OutDir)\sounds\music\16000" /C /D /Y /S /I
" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/trunk/libs/win32/Sound_Files/32khz.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Sound_Files/32khz.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/Sound_Files/32khz.2008.vcproj Mon Apr 20 22:21:15 2009 @@ -33,7 +33,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="xcopy "$(SolutionDir)libs\sounds\en\us\callie\voicemail\32000\*.*" "$(OutDir)\sounds\en\us\callie\voicemail\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\ivr\32000\*.*" "$(OutDir)\sounds\en\us\callie\ivr\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\conference\32000\*.*" "$(OutDir)\sounds\en\us\callie\conference\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\time\32000\*.*" "$(OutDir)\sounds\en\us\callie\time\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\digits\32000\*.*" "$(OutDir)\sounds\en\us\callie\digits\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\ascii\32000\*.*" "$(OutDir)\sounds\en\us\callie\ascii\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\misc\32000\*.*" "$(OutDir)\sounds\en\us\callie\misc\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\currency\32000\*.*" "$(OutDir)\sounds\en\us\callie\currency\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\32000\*.*" "$(OutDir)\sounds\en\us\callie\phonetic-ascii\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\music\32000\*.*" "$(OutDir)\sounds\music\32000" /C /D /Y /S /I" + CommandLine="xcopy "$(SolutionDir)libs\sounds\en\us\callie\voicemail\32000\*.*" "$(OutDir)\sounds\en\us\callie\voicemail\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\ivr\32000\*.*" "$(OutDir)\sounds\en\us\callie\ivr\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\conference\32000\*.*" "$(OutDir)\sounds\en\us\callie\conference\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\time\32000\*.*" "$(OutDir)\sounds\en\us\callie\time\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\digits\32000\*.*" "$(OutDir)\sounds\en\us\callie\digits\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\ascii\32000\*.*" "$(OutDir)\sounds\en\us\callie\ascii\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\misc\32000\*.*" "$(OutDir)\sounds\en\us\callie\misc\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\currency\32000\*.*" "$(OutDir)\sounds\en\us\callie\currency\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\32000\*.*" "$(OutDir)\sounds\en\us\callie\phonetic-ascii\32000" /C /D /Y /S /I
" /> </Configuration> <Configuration @@ -55,7 +55,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="if not exist "$(OutDir)\sounds\en\us\callie\voicemail\32000" xcopy "$(SolutionDir)libs\sounds\en\us\callie\voicemail\32000\*.*" "$(OutDir)\sounds\en\us\callie\voicemail\32000" /C /D /Y /S /I
if not exist "$(OutDir)\sounds\music\32000" xcopy "$(SolutionDir)libs\sounds\music\32000\*.*" "$(OutDir)\sounds\music\32000" /C /D /Y /S /I
" + CommandLine="xcopy "$(SolutionDir)libs\sounds\en\us\callie\voicemail\32000\*.*" "$(OutDir)\sounds\en\us\callie\voicemail\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\ivr\32000\*.*" "$(OutDir)\sounds\en\us\callie\ivr\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\conference\32000\*.*" "$(OutDir)\sounds\en\us\callie\conference\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\time\32000\*.*" "$(OutDir)\sounds\en\us\callie\time\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\digits\32000\*.*" "$(OutDir)\sounds\en\us\callie\digits\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\ascii\32000\*.*" "$(OutDir)\sounds\en\us\callie\ascii\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\misc\32000\*.*" "$(OutDir)\sounds\en\us\callie\misc\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\currency\32000\*.*" "$(OutDir)\sounds\en\us\callie\currency\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\32000\*.*" "$(OutDir)\sounds\en\us\callie\phonetic-ascii\32000" /C /D /Y /S /I
" /> </Configuration> </Configurations> Added: freeswitch/trunk/libs/win32/Sound_Files/32khzmusic.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/win32/Sound_Files/32khzmusic.2008.vcproj Mon Apr 20 22:21:15 2009 @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="32khz music" + ProjectGUID="{EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}" + RootNamespace="My32khz music" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="10" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="xcopy "$(SolutionDir)libs\sounds\music\32000\*.*" "$(OutDir)\sounds\music\32000" /C /D /Y /S /I" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="10" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="xcopy "$(SolutionDir)libs\sounds\music\32000\*.*" "$(OutDir)\sounds\music\32000" /C /D /Y /S /I" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/trunk/libs/win32/Sound_Files/8khz.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Sound_Files/8khz.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/Sound_Files/8khz.2008.vcproj Mon Apr 20 22:21:15 2009 @@ -33,7 +33,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="xcopy "$(SolutionDir)libs\sounds\en\us\callie\voicemail\8000\*.*" "$(OutDir)\sounds\en\us\callie\voicemail\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\ivr\8000\*.*" "$(OutDir)\sounds\en\us\callie\ivr\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\conference\8000\*.*" "$(OutDir)\sounds\en\us\callie\conference\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\time\8000\*.*" "$(OutDir)\sounds\en\us\callie\time\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\digits\8000\*.*" "$(OutDir)\sounds\en\us\callie\digits\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\ascii\8000\*.*" "$(OutDir)\sounds\en\us\callie\ascii\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\misc\8000\*.*" "$(OutDir)\sounds\en\us\callie\misc\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\currency\8000\*.*" "$(OutDir)\sounds\en\us\callie\currency\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\8000\*.*" "$(OutDir)\sounds\en\us\callie\phonetic-ascii\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\music\8000\*.*" "$(OutDir)\sounds\music\8000" /C /D /Y /S /I
" + CommandLine="xcopy "$(SolutionDir)libs\sounds\en\us\callie\voicemail\8000\*.*" "$(OutDir)\sounds\en\us\callie\voicemail\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\ivr\8000\*.*" "$(OutDir)\sounds\en\us\callie\ivr\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\conference\8000\*.*" "$(OutDir)\sounds\en\us\callie\conference\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\time\8000\*.*" "$(OutDir)\sounds\en\us\callie\time\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\digits\8000\*.*" "$(OutDir)\sounds\en\us\callie\digits\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\ascii\8000\*.*" "$(OutDir)\sounds\en\us\callie\ascii\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\misc\8000\*.*" "$(OutDir)\sounds\en\us\callie\misc\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\currency\8000\*.*" "$(OutDir)\sounds\en\us\callie\currency\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\8000\*.*" "$(OutDir)\sounds\en\us\callie\phonetic-ascii\8000" /C /D /Y /S /I
" /> </Configuration> <Configuration @@ -55,7 +55,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="if not exist "$(OutDir)\sounds\en\us\callie\voicemail\8000" xcopy "$(SolutionDir)libs\sounds\en\us\callie\voicemail\8000\*.*" "$(OutDir)\sounds\en\us\callie\voicemail\8000" /C /D /Y /S /I
if not exist "$(OutDir)\sounds\music\8000" xcopy "$(SolutionDir)libs\sounds\music\8000\*.*" "$(OutDir)\sounds\music\8000" /C /D /Y /S /I
" + CommandLine="xcopy "$(SolutionDir)libs\sounds\en\us\callie\voicemail\8000\*.*" "$(OutDir)\sounds\en\us\callie\voicemail\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\ivr\8000\*.*" "$(OutDir)\sounds\en\us\callie\ivr\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\conference\8000\*.*" "$(OutDir)\sounds\en\us\callie\conference\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\time\8000\*.*" "$(OutDir)\sounds\en\us\callie\time\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\digits\8000\*.*" "$(OutDir)\sounds\en\us\callie\digits\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\ascii\8000\*.*" "$(OutDir)\sounds\en\us\callie\ascii\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\misc\8000\*.*" "$(OutDir)\sounds\en\us\callie\misc\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\currency\8000\*.*" "$(OutDir)\sounds\en\us\callie\currency\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\8000\*.*" "$(OutDir)\sounds\en\us\callie\phonetic-ascii\8000" /C /D /Y /S /I
" /> </Configuration> </Configurations> Added: freeswitch/trunk/libs/win32/Sound_Files/8khzmusic.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/win32/Sound_Files/8khzmusic.2008.vcproj Mon Apr 20 22:21:15 2009 @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="8khz music" + ProjectGUID="{D1ABE208-6442-4FB4-9AAD-1677E41BC870}" + RootNamespace="8khz music" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="10" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="xcopy "$(SolutionDir)libs\sounds\music\8000\*.*" "$(OutDir)\sounds\music\8000" /C /D /Y /S /I
" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="10" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="xcopy "$(SolutionDir)libs\sounds\music\8000\*.*" "$(OutDir)\sounds\music\8000" /C /D /Y /S /I
" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + </Files> + <Globals> + </Globals> +</VisualStudioProject>

1 0

[commit] r13095 - freeswitch/trunk/scripts/contrib/nmartin/dial_by_name_directory
by FreeSWITCH SVN 21 Apr '09

21 Apr '09

Author: nmartin Date: Mon Apr 20 21:23:25 2009 New Revision: 13095 Log: cleaned up license and give proper attribution Modified: freeswitch/trunk/scripts/contrib/nmartin/dial_by_name_directory/README freeswitch/trunk/scripts/contrib/nmartin/dial_by_name_directory/dial_by_name_directory.js Modified: freeswitch/trunk/scripts/contrib/nmartin/dial_by_name_directory/README ============================================================================== --- freeswitch/trunk/scripts/contrib/nmartin/dial_by_name_directory/README (original) +++ freeswitch/trunk/scripts/contrib/nmartin/dial_by_name_directory/README Mon Apr 20 21:23:25 2009 @@ -11,9 +11,9 @@ ======================= -If the prior author's claimed copyright is infringed by the one I claim we'll -work it out, BUT I prefer a much looser license: -============================================================== +================================================================================ +Copyright (c) 2008 Feith Systems and Software, Inc. +and Copyright (c) 2009 Nik Martin Permission is hereby granted, free of charge, to any person @@ -41,7 +41,7 @@ OTHER DEALINGS IN THE SOFTWARE. -============================================================== +================================================================================ dial_by_name_directory.xml is a phrase macro for the beginning of the directory app. dial_by_name_directory.js is the directory app itself. Modified: freeswitch/trunk/scripts/contrib/nmartin/dial_by_name_directory/dial_by_name_directory.js ============================================================================== --- freeswitch/trunk/scripts/contrib/nmartin/dial_by_name_directory/dial_by_name_directory.js (original) +++ freeswitch/trunk/scripts/contrib/nmartin/dial_by_name_directory/dial_by_name_directory.js Mon Apr 20 21:23:25 2009 @@ -8,10 +8,9 @@ ======================= -If the prior author's claimed copyright is infringed by the one I claim we'll -work it out, BUT I prefer a much looser MIT license: -============================================================== - +================================================================================ +Copyright (c) 2008 Feith Systems and Software, Inc. +and Copyright (c) 2009 Nik Martin Permission is hereby granted, free of charge, to any person @@ -39,7 +38,7 @@ OTHER DEALINGS IN THE SOFTWARE. -============================================================== +================================================================================ */ var digitTimeOut = 3000;

1 0

[commit] r13094 - freeswitch/trunk/src/mod/applications/mod_fifo
by FreeSWITCH SVN 21 Apr '09

21 Apr '09

Author: anthm Date: Mon Apr 20 21:21:34 2009 New Revision: 13094 Log: don't do wrapup when agent is in nowait mode or call has ended Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c 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 Apr 20 21:21:34 2009 @@ -995,7 +995,6 @@ switch_frame_t *read_frame; switch_status_t status; char *uuid; - int done = 0; switch_core_session_t *other_session; switch_input_args_t args = { 0 }; const char *pop_order = NULL; @@ -1310,9 +1309,10 @@ switch_mutex_unlock(node->mutex); send_presence(node); switch_core_session_rwunlock(other_session); + switch_safe_free(uuid); - if (!do_wait) { - done = 1; + if (!do_wait || !switch_channel_ready(channel)) { + break; } fifo_consumer_wrapup_sound = switch_channel_get_variable(channel, "fifo_consumer_wrapup_sound"); @@ -1377,13 +1377,7 @@ } switch_channel_set_variable(channel, "fifo_status", "WAITING"); } - - switch_safe_free(uuid); - - if (done) { - break; - } - + if (do_wait && switch_channel_ready(channel)) { if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, FIFO_EVENT) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(channel, event); @@ -1393,7 +1387,7 @@ } } } - + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, FIFO_EVENT) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(channel, event); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "FIFO-Name", argv[0]);

1 0