From f5b18c0fdd91c1e5690e11819fcf769124881806 Mon Sep 17 00:00:00 2001 From: Seven Du Date: Fri, 13 Dec 2013 11:46:14 +0800 Subject: [PATCH 01/43] FS-5642 --resolve add back the ETIMEDOUT check, needed on Mac --- libs/sofia-sip/libsofia-sip-ua/tport/ws.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/sofia-sip/libsofia-sip-ua/tport/ws.c b/libs/sofia-sip/libsofia-sip-ua/tport/ws.c index 41df93fdcf..f5534d6175 100644 --- a/libs/sofia-sip/libsofia-sip-ua/tport/ws.c +++ b/libs/sofia-sip/libsofia-sip-ua/tport/ws.c @@ -290,7 +290,7 @@ int ws_handshake(wsh_t *wsh) ws_raw_write(wsh, respond, strlen(respond)); wsh->handshake = 1; - + return 0; err: @@ -809,7 +809,7 @@ int xp_errno(void) int xp_is_blocking(int errcode) { - return errcode == EAGAIN || errcode == EWOULDBLOCK || errcode == EINPROGRESS || errcode == EINTR; + return errcode == EAGAIN || errcode == EWOULDBLOCK || errcode == EINPROGRESS || errcode == EINTR || errcode == ETIMEDOUT; } #endif From 87751f9eafb418fd1730ced1c170e3560ce01296 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Fri, 13 Dec 2013 23:13:56 +0500 Subject: [PATCH 02/43] FS-5036 --resolve --- src/switch_event.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/switch_event.c b/src/switch_event.c index 48743a7c30..33584496d7 100644 --- a/src/switch_event.c +++ b/src/switch_event.c @@ -1102,9 +1102,16 @@ static switch_status_t switch_event_base_add_header(switch_event_t *event, switc *header->value = '\0'; } + hv += strlen(header->value); for(j = 0; j < header->idx; j++) { - switch_snprintf(header->value + strlen(header->value), len - strlen(header->value), "%s%s", j == 0 ? "" : "|:", header->array[j]); + if (j > 0) { + memcpy(hv, "|:", 2); + hv += 2; + } + memcpy(hv, header->array[j], strlen(header->array[j])); + hv += strlen(header->array[j]); } + *hv = '\0'; } } else { From 0292a04c7c39c7c90c8824df3c4ffcd28ccd312a Mon Sep 17 00:00:00 2001 From: Seven Du Date: Sun, 15 Dec 2013 11:44:30 +0800 Subject: [PATCH 03/43] debug all media type --- src/mod/applications/mod_commands/mod_commands.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/mod/applications/mod_commands/mod_commands.c b/src/mod/applications/mod_commands/mod_commands.c index 7956903c38..8640524149 100644 --- a/src/mod/applications/mod_commands/mod_commands.c +++ b/src/mod/applications/mod_commands/mod_commands.c @@ -3666,7 +3666,7 @@ SWITCH_STANDARD_API(uuid_video_refresh_function) } -#define DEBUG_MEDIA_SYNTAX " " +#define DEBUG_MEDIA_SYNTAX " " SWITCH_STANDARD_API(uuid_debug_media_function) { char *mycmd = NULL, *argv[3] = { 0 }; @@ -3690,7 +3690,18 @@ SWITCH_STANDARD_API(uuid_debug_media_function) msg.from = __FILE__; if ((lsession = switch_core_session_locate(argv[0]))) { + if (!strcasecmp(argv[1], "all")) { + msg.string_array_arg[0] = "both"; + } + + again: status = switch_core_session_receive_message(lsession, &msg); + + if (status == SWITCH_STATUS_SUCCESS && !strcasecmp(argv[1], "all") && !strcmp(msg.string_array_arg[0], "both")) { + msg.string_array_arg[0] = "vboth"; + goto again; + } + switch_core_session_rwunlock(lsession); } } From 14f7e1aa5803f43179f1d92a6bf74de3966d1ee3 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Mon, 16 Dec 2013 11:54:15 -0500 Subject: [PATCH 04/43] FS-5920 --resolve --- libs/js/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/js/configure.ac b/libs/js/configure.ac index d13ed9cc06..98fdbe985b 100644 --- a/libs/js/configure.ac +++ b/libs/js/configure.ac @@ -35,7 +35,7 @@ AC_SUBST(JS_VERSION) CFLAGS="$CFLAGS $CONFIGURE_CFLAGS" CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS" -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS" +LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS -lm" AC_CANONICAL_BUILD AC_CANONICAL_HOST From bc0859181283722501297ac26a4d260235738306 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Mon, 16 Dec 2013 22:55:50 +0500 Subject: [PATCH 05/43] update opus to 1.1 --- src/mod/codecs/mod_opus/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mod/codecs/mod_opus/Makefile b/src/mod/codecs/mod_opus/Makefile index 53ad7d5ffa..64183f1a78 100644 --- a/src/mod/codecs/mod_opus/Makefile +++ b/src/mod/codecs/mod_opus/Makefile @@ -1,6 +1,6 @@ BASE=../../../.. -OPUS=opus-1.0.3 +OPUS=opus-1.1 OPUS_DIR=$(switch_srcdir)/libs/$(OPUS) OPUS_BUILDDIR=$(switch_builddir)/libs/$(OPUS) From 8231cb9f01093a04176f3ed212252faf79c6cb57 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Mon, 16 Dec 2013 23:46:29 +0500 Subject: [PATCH 06/43] fix codec renegotiation on hold/reinvite issue --- src/switch_core_media.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/switch_core_media.c b/src/switch_core_media.c index cc960c886d..7ffd10eed4 100644 --- a/src/switch_core_media.c +++ b/src/switch_core_media.c @@ -2844,6 +2844,13 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s } } + if (session->bugs) { + switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, + "Session is connected to a media bug. " + "Re-Negotiation implicitly disabled.\n"); + reneg = 0; + } + if (!reneg && smh->num_negotiated_codecs) { codec_array = smh->negotiated_codecs; total_codecs = smh->num_negotiated_codecs; @@ -3278,7 +3285,8 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s match = 1; a_engine->codec_negotiated = 1; - + smh->num_negotiated_codecs = 0; + for(j = 0; j < m_idx; j++) { payload_map_t *pmap = switch_core_media_add_payload_map(session, SWITCH_MEDIA_TYPE_AUDIO, @@ -3329,7 +3337,6 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s pmap->rm_fmtp = switch_core_session_strdup(session, (char *) mmap->rm_fmtp); pmap->agreed_pt = (switch_payload_t) mmap->rm_pt; - smh->num_negotiated_codecs = 0; smh->negotiated_codecs[smh->num_negotiated_codecs++] = mimp; pmap->recv_pt = (switch_payload_t)mmap->rm_pt; From f2f1c38fe45f37a87a3bf86bb24da9091526bf92 Mon Sep 17 00:00:00 2001 From: Travis Cross Date: Mon, 16 Dec 2013 21:13:34 +0000 Subject: [PATCH 07/43] Follow bump to opus lib version for debian packaging --- debian/util.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/util.sh b/debian/util.sh index 94ef0e0791..a767f3ba4f 100755 --- a/debian/util.sh +++ b/debian/util.sh @@ -107,7 +107,7 @@ getlibs () { getlib http://files.freeswitch.org/downloads/libs/pocketsphinx-0.7.tar.gz getlib http://files.freeswitch.org/downloads/libs/communicator_semi_6000_20080321.tar.gz getlib http://files.freeswitch.org/downloads/libs/celt-0.10.0.tar.gz - getlib http://files.freeswitch.org/downloads/libs/opus-1.0.2.tar.gz + getlib http://files.freeswitch.org/downloads/libs/opus-1.1.tar.gz getlib http://files.freeswitch.org/downloads/libs/openldap-2.4.19.tar.gz getlib http://download.zeromq.org/zeromq-2.1.9.tar.gz \ || getlib http://download.zeromq.org/historic/zeromq-2.1.9.tar.gz From 23534be6761d130dc30441397458a0272c9c0755 Mon Sep 17 00:00:00 2001 From: Ken Rice Date: Mon, 16 Dec 2013 16:41:13 -0600 Subject: [PATCH 08/43] bump opus rev for rpm builds Conflicts: freeswitch.spec --- freeswitch.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeswitch.spec b/freeswitch.spec index b59bc0f4ed..c53ee53d14 100644 --- a/freeswitch.spec +++ b/freeswitch.spec @@ -126,7 +126,7 @@ Source8: http://files.freeswitch.org/downloads/libs/sphinxbase-0.7.tar.gz Source9: http://files.freeswitch.org/downloads/libs/communicator_semi_6000_20080321.tar.gz Source10: http://files.freeswitch.org/downloads/libs/libmemcached-0.32.tar.gz Source11: http://files.freeswitch.org/downloads/libs/json-c-0.9.tar.gz -Source12: http://files.freeswitch.org/downloads/libs/opus-1.0.3.tar.gz +Source12: http://files.freeswitch.org/downloads/libs/opus-1.1.tar.gz Prefix: %{prefix} From 24b7b48885ff91eecac06eb24169b90380e5a2f3 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Wed, 18 Dec 2013 00:55:29 +0500 Subject: [PATCH 09/43] FS-6042 FS-6044 --resolve --- src/include/switch_resample.h | 2 +- .../mod_conference/mod_conference.c | 156 ++++++++++++++---- src/switch_resample.c | 8 +- 3 files changed, 127 insertions(+), 39 deletions(-) diff --git a/src/include/switch_resample.h b/src/include/switch_resample.h index ee1de4e2c7..59fc0c68ec 100644 --- a/src/include/switch_resample.h +++ b/src/include/switch_resample.h @@ -39,7 +39,7 @@ */ #define switch_normalize_volume(x) if (x > 4) x = 4; if (x < -4) x = -4; -#define switch_normalize_volume_granular(x) if (x > 12) x = 12; if (x < -12) x = -12; +#define switch_normalize_volume_granular(x) if (x > 13) x = 13; if (x < -13) x = -13; #ifndef SWITCH_RESAMPLE_H #define SWITCH_RESAMPLE_H diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index cc3003b0cc..da2f6762ad 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -274,6 +274,7 @@ typedef struct conference_file_node { struct conference_file_node *next; char *file; switch_bool_t mux; + uint32_t member_id; } conference_file_node_t; typedef enum { @@ -2108,6 +2109,48 @@ static void conference_set_floor_holder(conference_obj_t *conference, conference } +static switch_status_t conference_file_close(conference_obj_t *conference, conference_file_node_t *node) +{ + switch_event_t *event; + conference_member_t *member = NULL; + + if (test_eflag(conference, EFLAG_PLAY_FILE_DONE) && + switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + + conference_add_event_data(conference, event); + + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "seconds", "%ld", (long) node->fh.samples_in / node->fh.native_rate); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "milliseconds", "%ld", (long) node->fh.samples_in / (node->fh.native_rate / 1000)); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "samples", "%ld", (long) node->fh.samples_in); + + if (node->fh.params) { + switch_event_merge(event, node->fh.params); + } + + if (node->member_id) { + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "play-file-member-done"); + + if ((member = conference_member_get(conference, node->member_id))) { + conference_add_event_member_data(member, event); + switch_thread_rwlock_unlock(member->rwlock); + } + + } else { + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "play-file-done"); + } + + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "File", node->file); + + if (node->async) { + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Async", "true"); + } + + switch_event_fire(&event); + } + + return switch_core_file_close(&node->fh); +} + /* Gain exclusive access and remove the member from the list */ static switch_status_t conference_del_member(conference_obj_t *conference, conference_member_t *member) { @@ -2177,7 +2220,7 @@ static switch_status_t conference_del_member(conference_obj_t *conference, confe fnode = fnode->next; if (cur->type != NODE_TYPE_SPEECH) { - switch_core_file_close(&cur->fh); + conference_file_close(conference, cur); } pool = cur->pool; @@ -2662,18 +2705,12 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v } } else if (conference->fnode->type == NODE_TYPE_FILE) { switch_core_file_read(&conference->fnode->fh, file_frame, &file_sample_len); + if (conference->fnode->fh.vol) { + switch_change_sln_volume_granular((void *)file_frame, file_sample_len, conference->fnode->fh.vol); + } } if (file_sample_len <= 0) { - if (test_eflag(conference, EFLAG_PLAY_FILE_DONE) && - switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - conference_add_event_data(conference, event); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "play-file-done"); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "File", conference->fnode->file); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Async", "true"); - switch_event_fire(&event); - } - conference->fnode->done++; } else { has_file_data = 1; @@ -2690,14 +2727,6 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v switch_core_file_read(&conference->async_fnode->fh, async_file_frame, &file_sample_len); if (file_sample_len <= 0) { - if (test_eflag(conference, EFLAG_PLAY_FILE) && - switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - conference_add_event_data(conference, event); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "play-file-done"); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "File", conference->async_fnode->file); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Async", "true"); - switch_event_fire(&event); - } conference->async_fnode->done++; } else { if (has_file_data) { @@ -2852,7 +2881,7 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v if (conference->async_fnode && conference->async_fnode->done) { switch_memory_pool_t *pool; - switch_core_file_close(&conference->async_fnode->fh); + conference_file_close(conference, conference->async_fnode); pool = conference->async_fnode->pool; conference->async_fnode = NULL; switch_core_destroy_memory_pool(&pool); @@ -2863,7 +2892,7 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v switch_memory_pool_t *pool; if (conference->fnode->type != NODE_TYPE_SPEECH) { - switch_core_file_close(&conference->fnode->fh); + conference_file_close(conference, conference->fnode); } fnode = conference->fnode; @@ -2918,7 +2947,7 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v fnode = fnode->next; if (cur->type != NODE_TYPE_SPEECH) { - switch_core_file_close(&cur->fh); + conference_file_close(conference, cur); } pool = cur->pool; @@ -2929,7 +2958,7 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v if (conference->async_fnode) { switch_memory_pool_t *pool; - switch_core_file_close(&conference->async_fnode->fh); + conference_file_close(conference, conference->async_fnode); pool = conference->async_fnode->pool; conference->async_fnode = NULL; switch_core_destroy_memory_pool(&pool); @@ -3953,7 +3982,7 @@ static void member_add_file_data(conference_member_t *member, int16_t *data, swi switch_memory_pool_t *pool; if (member->fnode->type != NODE_TYPE_SPEECH) { - switch_core_file_close(&member->fnode->fh); + conference_file_close(member->conference, member->fnode); } fnode = member->fnode; @@ -3981,17 +4010,7 @@ static void member_add_file_data(conference_member_t *member, int16_t *data, swi } if (file_sample_len <= 0) { - switch_event_t *event; member->fnode->done++; - - if (test_eflag(member->conference, EFLAG_PLAY_FILE) && - switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - conference_add_event_data(member->conference, event); - conference_add_event_member_data(member, event); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "play-file-member-done"); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "File", member->fnode->file); - switch_event_fire(&event); - } } else { /* there is file node data to mix into the frame */ int32_t i, sample; @@ -4814,6 +4833,14 @@ static switch_status_t conference_play_file(conference_obj_t *conference, char * goto done; } + if (fnode->fh.params) { + const char *vol = switch_event_get_header(fnode->fh.params, "vol"); + + if (!zstr(vol)) { + fnode->fh.vol = atoi(vol); + } + } + fnode->pool = pool; fnode->async = async; fnode->file = switch_core_strdup(fnode->pool, file); @@ -4829,7 +4856,7 @@ static switch_status_t conference_play_file(conference_obj_t *conference, char * if (nptr) { switch_memory_pool_t *tmppool; - switch_core_file_close(&nptr->fh); + conference_file_close(conference, nptr); tmppool = nptr->pool; switch_core_destroy_memory_pool(&tmppool); } @@ -4903,6 +4930,7 @@ static switch_status_t conference_member_play_file(conference_member_t *member, fnode->type = NODE_TYPE_FILE; fnode->leadin = leadin; fnode->mux = mux; + fnode->member_id = member->id; /* Open the file */ fnode->fh.pre_buffer_datalen = SWITCH_DEFAULT_FILE_BUFFER_LEN; @@ -6232,6 +6260,11 @@ static switch_status_t conf_api_sub_play(conference_obj_t *conference, switch_st if (test_eflag(conference, EFLAG_PLAY_FILE) && switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_data(conference, event); + + if (conference->fnode->fh.params) { + switch_event_merge(event, conference->fnode->fh.params); + } + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "play-file"); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "File", argv[2]); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Async", async ? "true" : "false"); @@ -6256,6 +6289,11 @@ static switch_status_t conf_api_sub_play(conference_obj_t *conference, switch_st if (test_eflag(conference, EFLAG_PLAY_FILE_MEMBER) && switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_member_data(member, event); + + if (member->fnode->fh.params) { + switch_event_merge(event, member->fnode->fh.params); + } + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "play-file-member"); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "File", argv[2]); switch_event_fire(&event); @@ -6897,6 +6935,54 @@ static switch_status_t conf_api_sub_recording(conference_obj_t *conference, swit } } +static switch_status_t conf_api_sub_file_vol(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char **argv) +{ + if (argc >= 1) { + conference_file_node_t *fnode; + int vol = 0; + int ok = 0; + + if (argc < 2) { + stream->write_function(stream, "missing args\n"); + return SWITCH_STATUS_GENERR; + } + + switch_mutex_lock(conference->mutex); + + fnode = conference->fnode; + + vol = atoi(argv[2]); + + if (argc > 3) { + if (strcasecmp(argv[3], "async")) { + fnode = conference->async_fnode; + } + } + + printf("WTF %p %p\n", (void *) conference, (void *) fnode); + + if (fnode && fnode->type == NODE_TYPE_FILE) { + fnode->fh.vol = vol; + ok = 1; + } + switch_mutex_unlock(conference->mutex); + + + if (ok) { + stream->write_function(stream, "volume changed\n"); + return SWITCH_STATUS_SUCCESS; + } else { + stream->write_function(stream, "File not playing\n"); + return SWITCH_STATUS_GENERR; + } + + + } else { + stream->write_function(stream, "Invalid parameters:\n"); + return SWITCH_STATUS_GENERR; + } +} + static switch_status_t conf_api_sub_pin(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char **argv) { switch_assert(conference != NULL); @@ -7085,6 +7171,7 @@ static api_command_t conf_api_sub_commands[] = { {"nopin", (void_fn_t) & conf_api_sub_pin, CONF_API_SUB_ARGS_SPLIT, "nopin", ""}, {"get", (void_fn_t) & conf_api_sub_get, CONF_API_SUB_ARGS_SPLIT, "get", ""}, {"set", (void_fn_t) & conf_api_sub_set, CONF_API_SUB_ARGS_SPLIT, "set", " "}, + {"file-vol", (void_fn_t) & conf_api_sub_file_vol, CONF_API_SUB_ARGS_SPLIT, "file-vol", ""}, {"floor", (void_fn_t) & conf_api_sub_floor, CONF_API_SUB_MEMBER_TARGET, "floor", ""}, {"vid-floor", (void_fn_t) & conf_api_sub_vid_floor, CONF_API_SUB_MEMBER_TARGET, "vid-floor", " [force]"}, {"clear-vid-floor", (void_fn_t) & conf_api_sub_clear_vid_floor, CONF_API_SUB_ARGS_AS_ONE, "clear-vid-floor", ""} @@ -9772,7 +9859,6 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_conference_load) nl = strlen(conf_api_sub_commands[i].pcommand) + strlen(conf_api_sub_commands[i].psyntax) + 5; switch_snprintf(cmd_str, sizeof(cmd_str), "add conference ::conference::list_conferences %s", conf_api_sub_commands[i].pcommand); - switch_console_set_complete(cmd_str); if (p != NULL) { diff --git a/src/switch_resample.c b/src/switch_resample.c index 807d8fb18f..e245ad188e 100644 --- a/src/switch_resample.c +++ b/src/switch_resample.c @@ -289,8 +289,8 @@ SWITCH_DECLARE(void) switch_mux_channels(int16_t *data, switch_size_t samples, u SWITCH_DECLARE(void) switch_change_sln_volume_granular(int16_t *data, uint32_t samples, int32_t vol) { double newrate = 0; - double pos[12] = {1.25, 1.50, 1.75, 2.0, 2.25, 2.50, 2.75, 3.0, 3.25, 3.50, 3.75, 4.0}; - double neg[12] = {.917, .834, .751, .668, .585, .502, .419, .336, .253, .017, .087, .004}; + double pos[13] = {1.25, 1.50, 1.75, 2.0, 2.25, 2.50, 2.75, 3.0, 3.25, 3.50, 3.75, 4.0, 4.5}; + double neg[13] = {.917, .834, .751, .668, .585, .502, .419, .336, .253, .087, .017, .004, 0.0}; double *chart; uint32_t i; @@ -306,7 +306,7 @@ SWITCH_DECLARE(void) switch_change_sln_volume_granular(int16_t *data, uint32_t s i = abs(vol) - 1; - switch_assert(i < 12); + switch_assert(i < 13); newrate = chart[i]; @@ -320,6 +320,8 @@ SWITCH_DECLARE(void) switch_change_sln_volume_granular(int16_t *data, uint32_t s switch_normalize_to_16bit(tmp); fp[x] = (int16_t) tmp; } + } else { + memset(data, 0, samples * 2); } } From 635fbc4bd3769cd4468a5d871f2186b8aa991787 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Wed, 18 Dec 2013 03:19:33 +0500 Subject: [PATCH 10/43] add loops var durning looped execution --- src/switch_ivr.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/switch_ivr.c b/src/switch_ivr.c index daba288c7e..d3124ca5ce 100644 --- a/src/switch_ivr.c +++ b/src/switch_ivr.c @@ -620,6 +620,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_parse_event(switch_core_session_t *se switch_channel_set_variable(channel, "app_uuid", event_uuid); } + switch_channel_set_variable_printf(channel, "current_loop", "%d", x + 1); + switch_channel_set_variable_printf(channel, "total_loops", "%d", loops); if (switch_core_session_execute_application(session, app_name, app_arg) != SWITCH_STATUS_SUCCESS) { if (!inner || switch_channel_test_flag(channel, CF_STOP_BROADCAST)) switch_channel_clear_flag(channel, CF_BROADCAST); @@ -632,6 +634,9 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_parse_event(switch_core_session_t *se } } + switch_channel_set_variable(channel, "current_loop", NULL); + switch_channel_set_variable(channel, "total_loops", NULL); + if (b_uuid) { if ((b_session = switch_core_session_locate(b_uuid))) { switch_channel_t *b_channel = switch_core_session_get_channel(b_session); From 713303a2a9584cd61e75c60cc9196454eba6ddcb Mon Sep 17 00:00:00 2001 From: Eliot Gable Date: Wed, 18 Dec 2013 16:19:58 +0000 Subject: [PATCH 11/43] Add case-insensitive search to switch_regex_match() based on code from switch_regex_perform(). --- src/switch_regex.c | 42 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/src/switch_regex.c b/src/switch_regex.c index 2a98638134..f31b50afdf 100644 --- a/src/switch_regex.c +++ b/src/switch_regex.c @@ -79,6 +79,9 @@ SWITCH_DECLARE(int) switch_regex_perform(const char *field, const char *expressi if ((opts = strrchr(tmp, '/'))) { *opts++ = '\0'; } else { + /* Note our error */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "Regular Expression Error expression[%s] missing ending '/' delimeter\n", expression); goto end; } expression = tmp; @@ -212,9 +215,35 @@ SWITCH_DECLARE(switch_status_t) switch_regex_match_partial(const char *target, c int match_count = 0; /* Number of times the regex was matched */ int offset_vectors[255]; /* not used, but has to exist or pcre won't even try to find a match */ int pcre_flags = 0; + uint32_t flags = 0; + char *tmp = NULL; + switch_status_t status = SWITCH_STATUS_FALSE; + + if (*expression == '/') { + char *opts = NULL; + tmp = strdup(expression + 1); + assert(tmp); + if ((opts = strrchr(tmp, '/'))) { + *opts++ = '\0'; + } else { + /* Note our error */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "Regular Expression Error expression[%s] missing ending '/' delimeter\n", expression); + goto end; + } + expression = tmp; + if (opts) { + if (strchr(opts, 'i')) { + flags |= PCRE_CASELESS; + } + if (strchr(opts, 's')) { + flags |= PCRE_DOTALL; + } + } + } /* Compile the expression */ - pcre_prepared = pcre_compile(expression, 0, &error, &error_offset, NULL); + pcre_prepared = pcre_compile(expression, flags, &error, &error_offset, NULL); /* See if there was an error in the expression */ if (error != NULL) { @@ -228,7 +257,7 @@ SWITCH_DECLARE(switch_status_t) switch_regex_match_partial(const char *target, c "Regular Expression Error expression[%s] error[%s] location[%d]\n", expression, error, error_offset); /* We definitely didn't match anything */ - return SWITCH_STATUS_FALSE; + goto end; } if (*partial) { @@ -250,14 +279,17 @@ SWITCH_DECLARE(switch_status_t) switch_regex_match_partial(const char *target, c /* Was it a match made in heaven? */ if (match_count > 0) { *partial = 0; - return SWITCH_STATUS_SUCCESS; + switch_goto_status(SWITCH_STATUS_SUCCESS, end); } else if (match_count == PCRE_ERROR_PARTIAL || match_count == PCRE_ERROR_BADPARTIAL) { /* yes it is already set, but the code is clearer this way */ *partial = 1; - return SWITCH_STATUS_SUCCESS; + switch_goto_status(SWITCH_STATUS_SUCCESS, end); } else { - return SWITCH_STATUS_FALSE; + goto end; } + end: + switch_safe_free(tmp); + return status; } SWITCH_DECLARE(switch_status_t) switch_regex_match(const char *target, const char *expression) From 9a20d0ab0c17cdd12d9279720ade804ce2fefe13 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Wed, 18 Dec 2013 23:22:13 +0500 Subject: [PATCH 12/43] FS-6054 --resolve --- src/switch_core_media.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/switch_core_media.c b/src/switch_core_media.c index 7ffd10eed4..7ecaa5123a 100644 --- a/src/switch_core_media.c +++ b/src/switch_core_media.c @@ -3717,6 +3717,8 @@ SWITCH_DECLARE(int) switch_core_media_toggle_hold(switch_core_session_t *session switch_channel_clear_flag(session->channel, CF_HOLD_LOCK); if (switch_channel_test_flag(session->channel, CF_PROTO_HOLD)) { + const char *val; + switch_yield(250000); if (a_engine->max_missed_packets) { @@ -3735,6 +3737,13 @@ SWITCH_DECLARE(int) switch_core_media_toggle_hold(switch_core_session_t *session } } + if (!switch_media_handle_test_media_flag(smh, SCMF_DISABLE_RTP_AUTOADJ) && + !((val = switch_channel_get_variable(session->channel, "disable_rtp_auto_adjust")) && switch_true(val)) && + !switch_channel_test_flag(session->channel, CF_WEBRTC)) { + /* Reactivate the NAT buster flag. */ + switch_rtp_set_flag(a_engine->rtp_session, SWITCH_RTP_FLAG_AUTOADJ); + } + switch_channel_clear_flag(session->channel, CF_PROTO_HOLD); switch_channel_mark_hold(session->channel, SWITCH_FALSE); switch_channel_presence(session->channel, "unknown", "unhold", NULL); From 763bc8cfde6f36b939c5f67de2d5d9035b94a886 Mon Sep 17 00:00:00 2001 From: Travis Cross Date: Wed, 18 Dec 2013 18:53:19 +0000 Subject: [PATCH 13/43] Fix freeswitch-all module provides/replaces/conflicts We were generating freeswitch-mod-mod-* rather than freeswitch-mod-*. --- debian/bootstrap.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh index 8f12a9fc3f..3704b4b1a9 100755 --- a/debian/bootstrap.sh +++ b/debian/bootstrap.sh @@ -230,8 +230,8 @@ map_pkgs () { map_pkgs_langs () { $fsx "freeswitch-lang-${lang//_/-}"; } map_langs map_pkgs_langs map_pkgs_mods () { - $fsx "freeswitch-mod-${module//_/-}" - $fsx "freeswitch-mod-${module//_/-}-dbg"; } + $fsx "freeswitch-${module//_/-}" + $fsx "freeswitch-${module//_/-}-dbg"; } map_modules map_pkgs_mods } From 8d1c1a5bb9aa77f757659dec07f0c34a1379823b Mon Sep 17 00:00:00 2001 From: Travis Cross Date: Wed, 18 Dec 2013 19:51:12 +0000 Subject: [PATCH 14/43] Treat freeswitch-{sounds,music} as virtual packages only Previously we were creating freeswitch-music, freeswitch-sounds, freeswitch-sounds-en, and freeswitch-sounds-en-us metapackages and also providing those names as virtual packages from the freeswitch-{sounds,music} source packages. This is unnecessarily confusing and meant that freeswitch-all wasn't depending on any sounds in actuality as it was also providing freeswitch-sounds. --- debian/bootstrap.sh | 68 ++++++++------------------------------------- 1 file changed, 11 insertions(+), 57 deletions(-) diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh index 3704b4b1a9..dbe0491ee4 100755 --- a/debian/bootstrap.sh +++ b/debian/bootstrap.sh @@ -68,10 +68,6 @@ freeswitch-init freeswitch-sysvinit freeswitch-systemd freeswitch-lang -freeswitch-music -freeswitch-sounds -freeswitch-sounds-en -freeswitch-sounds-en-us ) err () { @@ -358,8 +354,8 @@ Recommends: freeswitch-mod-commands (= \${binary:Version}), freeswitch-init (= \${binary:Version}), freeswitch-lang (= \${binary:Version}), - freeswitch-music (= \${binary:Version}), - freeswitch-sounds (= \${binary:Version}) + freeswitch-music, + freeswitch-sounds Suggests: Description: Cross-Platform Scalable Multi-Protocol Soft Switch $(debian_wrap "${fs_description}") @@ -392,8 +388,8 @@ Recommends: freeswitch-init (= \${binary:Version}), freeswitch-lang (= \${binary:Version}), freeswitch-meta-codecs (= \${binary:Version}), - freeswitch-music (= \${binary:Version}), - freeswitch-sounds (= \${binary:Version}) + freeswitch-music, + freeswitch-sounds Suggests: freeswitch-mod-cidlookup (= \${binary:Version}), freeswitch-mod-curl (= \${binary:Version}), @@ -447,8 +443,8 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}), Recommends: freeswitch-init (= \${binary:Version}), freeswitch-lang (= \${binary:Version}), - freeswitch-music (= \${binary:Version}), - freeswitch-sounds (= \${binary:Version}), + freeswitch-music, + freeswitch-sounds, freeswitch-conf-vanilla (= \${binary:Version}), Suggests: freeswitch-mod-spidermonkey (= \${binary:Version}), @@ -465,8 +461,8 @@ Recommends: freeswitch-init (= \${binary:Version}), freeswitch-lang (= \${binary:Version}), freeswitch-meta-codecs (= \${binary:Version}), - freeswitch-music (= \${binary:Version}), - freeswitch-sounds (= \${binary:Version}), + freeswitch-music, + freeswitch-sounds, freeswitch-mod-abstraction (= \${binary:Version}), freeswitch-mod-avmd (= \${binary:Version}), freeswitch-mod-blacklist (= \${binary:Version}), @@ -551,8 +547,8 @@ Recommends: freeswitch-meta-conf (= \${binary:Version}), freeswitch-meta-lang (= \${binary:Version}), freeswitch-meta-mod-say (= \${binary:Version}), - freeswitch-music (= \${binary:Version}), - freeswitch-sounds (= \${binary:Version}), + freeswitch-music, + freeswitch-sounds, freeswitch-mod-abstraction (= \${binary:Version}), freeswitch-mod-avmd (= \${binary:Version}), freeswitch-mod-blacklist (= \${binary:Version}), @@ -834,48 +830,6 @@ Description: Language files for FreeSWITCH This is a metapackage which depends on the default language packages for FreeSWITCH. -## sounds - -Package: freeswitch-music -Architecture: all -Depends: \${misc:Depends}, - freeswitch-music-default (>= 1.0.8) -Description: Music on hold audio for FreeSWITCH - $(debian_wrap "${fs_description}") - . - This is a metapackage which depends on the default music on hold - packages for FreeSWITCH. - -Package: freeswitch-sounds -Architecture: all -Depends: \${misc:Depends}, - freeswitch-sounds-en (= \${binary:Version}) -Description: Sounds for FreeSWITCH - $(debian_wrap "${fs_description}") - . - This is a metapackage which depends on the default sound packages for - FreeSWITCH. - -Package: freeswitch-sounds-en -Architecture: all -Depends: \${misc:Depends}, - freeswitch-sounds-en-us (= \${binary:Version}) -Description: English sounds for FreeSWITCH - $(debian_wrap "${fs_description}") - . - This is a metapackage which depends on the default English sound - packages for FreeSWITCH. - -Package: freeswitch-sounds-en-us -Architecture: all -Depends: \${misc:Depends}, - freeswitch-sounds-en-us-callie (>= 1.0.18) -Description: US English sounds for FreeSWITCH - $(debian_wrap "${fs_description}") - . - This is a metapackage which depends on the default US/English sound - packages for FreeSWITCH. - EOF } @@ -998,7 +952,7 @@ print_lang_control () { Package: freeswitch-lang-${lang//_/-} Architecture: all Depends: \${misc:Depends} -Recommends: freeswitch-sounds-${lang} (= \${binary:Version}) +Recommends: freeswitch-sounds-${lang} Description: ${lang_name} language files for FreeSWITCH $(debian_wrap "${fs_description}") . From 417ef16de5ca4a0b15da6b9ea6f8fbabc741ae48 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Thu, 19 Dec 2013 21:32:37 +0500 Subject: [PATCH 15/43] FS-6054 --- src/switch_core_media.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/switch_core_media.c b/src/switch_core_media.c index 7ecaa5123a..56c8d72ad4 100644 --- a/src/switch_core_media.c +++ b/src/switch_core_media.c @@ -3739,7 +3739,7 @@ SWITCH_DECLARE(int) switch_core_media_toggle_hold(switch_core_session_t *session if (!switch_media_handle_test_media_flag(smh, SCMF_DISABLE_RTP_AUTOADJ) && !((val = switch_channel_get_variable(session->channel, "disable_rtp_auto_adjust")) && switch_true(val)) && - !switch_channel_test_flag(session->channel, CF_WEBRTC)) { + !switch_channel_test_flag(session->channel, CF_WEBRTC) && a_engine->rtp_session) { /* Reactivate the NAT buster flag. */ switch_rtp_set_flag(a_engine->rtp_session, SWITCH_RTP_FLAG_AUTOADJ); } From 0ab8cf0f7cd29958813eb8bef8c5eb20a8aa9452 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Thu, 19 Dec 2013 21:36:28 +0500 Subject: [PATCH 16/43] FS-6054 --- src/switch_core_media.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/switch_core_media.c b/src/switch_core_media.c index 56c8d72ad4..d77e430b83 100644 --- a/src/switch_core_media.c +++ b/src/switch_core_media.c @@ -3739,9 +3739,16 @@ SWITCH_DECLARE(int) switch_core_media_toggle_hold(switch_core_session_t *session if (!switch_media_handle_test_media_flag(smh, SCMF_DISABLE_RTP_AUTOADJ) && !((val = switch_channel_get_variable(session->channel, "disable_rtp_auto_adjust")) && switch_true(val)) && - !switch_channel_test_flag(session->channel, CF_WEBRTC) && a_engine->rtp_session) { + !switch_channel_test_flag(session->channel, CF_WEBRTC)) { /* Reactivate the NAT buster flag. */ - switch_rtp_set_flag(a_engine->rtp_session, SWITCH_RTP_FLAG_AUTOADJ); + + if (a_engine->rtp_session) { + switch_rtp_set_flag(a_engine->rtp_session, SWITCH_RTP_FLAG_AUTOADJ); + } + + if (v_engine->rtp_session) { + switch_rtp_set_flag(v_engine->rtp_session, SWITCH_RTP_FLAG_AUTOADJ); + } } switch_channel_clear_flag(session->channel, CF_PROTO_HOLD); From fede96f35ba9ee5269a553f091ed4a1199fa6b5c Mon Sep 17 00:00:00 2001 From: Chris Rienzo Date: Thu, 19 Dec 2013 12:10:59 -0500 Subject: [PATCH 17/43] rpmbuild: tweak to config-rayo.sh to play nice /w rpmbuilder.sh --- scripts/ci/config-rayo.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ci/config-rayo.sh b/scripts/ci/config-rayo.sh index c346f5e0ed..119e01ea96 100755 --- a/scripts/ci/config-rayo.sh +++ b/scripts/ci/config-rayo.sh @@ -15,8 +15,8 @@ rpmbuild --define "VERSION_NUMBER $1" \ --define "_srcrpmdir %{_topdir}" \ -ba freeswitch-config-rayo.spec -mkdir $src_repo/RPMS -mv $src_repo/rpmbuild/*/*.rpm $src_repo/RPMS/. +mkdir -p $src_repo/RPMS +mv $src_repo/rpmbuild/*/freeswitch-config-rayo*.rpm $src_repo/RPMS/. cat 1>&2 < Date: Fri, 20 Dec 2013 09:56:04 -0500 Subject: [PATCH 18/43] FS-6051 added some logging to help troubleshoot mod_rayo crash --- src/mod/event_handlers/mod_rayo/mod_rayo.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/mod/event_handlers/mod_rayo/mod_rayo.c b/src/mod/event_handlers/mod_rayo/mod_rayo.c index a6b749a869..c650e66877 100644 --- a/src/mod/event_handlers/mod_rayo/mod_rayo.c +++ b/src/mod/event_handlers/mod_rayo/mod_rayo.c @@ -731,8 +731,9 @@ struct rayo_actor *rayo_actor_locate(const char *jid, const char *file, int line if (actor) { if (!actor->destroy) { actor->ref_count++; - switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "", line, "", SWITCH_LOG_DEBUG, "Locate %s: ref count = %i\n", RAYO_JID(actor), actor->ref_count); + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "", line, "", SWITCH_LOG_DEBUG, "Locate (jid) %s: ref count = %i\n", RAYO_JID(actor), actor->ref_count); } else { + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "", line, "", SWITCH_LOG_WARNING, "Locate (jid) %s: already marked for destruction!\n", jid); actor = NULL; } } @@ -754,8 +755,9 @@ struct rayo_actor *rayo_actor_locate_by_id(const char *id, const char *file, int if (actor) { if (!actor->destroy) { actor->ref_count++; - switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "", line, "", SWITCH_LOG_DEBUG, "Locate %s: ref count = %i\n", RAYO_JID(actor), actor->ref_count); + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "", line, "", SWITCH_LOG_DEBUG, "Locate (id) %s: ref count = %i\n", RAYO_JID(actor), actor->ref_count); } else { + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "", line, "", SWITCH_LOG_WARNING, "Locate (id) %s: already marked for destruction!\n", id); actor = NULL; } } @@ -780,7 +782,12 @@ void rayo_actor_destroy(struct rayo_actor *actor, const char *file, int line) } actor->destroy = 1; if (actor->ref_count <= 0) { - switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "", line, "", SWITCH_LOG_DEBUG, "Destroying %s\n", RAYO_JID(actor)); + if (actor->ref_count < 0) { + /* too many unlocks detected! */ + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "", line, "", SWITCH_LOG_WARNING, "Destroying %s, ref_count = %i\n", RAYO_JID(actor), actor->ref_count); + } else { + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "", line, "", SWITCH_LOG_DEBUG, "Destroying %s\n", RAYO_JID(actor)); + } if (actor->cleanup_fn) { actor->cleanup_fn(actor); } @@ -813,7 +820,12 @@ void rayo_actor_unlock(struct rayo_actor *actor, const char *file, int line) if (actor) { switch_mutex_lock(globals.actors_mutex); actor->ref_count--; - switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "", line, "", SWITCH_LOG_DEBUG, "Unlock %s: ref count = %i\n", RAYO_JID(actor), actor->ref_count); + if (actor->ref_count < 0) { + /* too many unlocks detected! */ + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "", line, "", SWITCH_LOG_WARNING, "Unlock %s: ref count = %i\n", RAYO_JID(actor), actor->ref_count); + } else { + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "", line, "", SWITCH_LOG_DEBUG, "Unlock %s: ref count = %i\n", RAYO_JID(actor), actor->ref_count); + } if (actor->ref_count <= 0 && actor->destroy) { rayo_actor_destroy(actor, file, line); } From 8f73c4ef448af91ec507f99681798b5a8d7ebd7f Mon Sep 17 00:00:00 2001 From: Marc Olivier Chouinard Date: Mon, 23 Dec 2013 07:34:34 -0500 Subject: [PATCH 19/43] FS-6062 --resolve --- .../applications/mod_callcenter/mod_callcenter.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/mod/applications/mod_callcenter/mod_callcenter.c b/src/mod/applications/mod_callcenter/mod_callcenter.c index 785d44bc5e..07449411f0 100644 --- a/src/mod/applications/mod_callcenter/mod_callcenter.c +++ b/src/mod/applications/mod_callcenter/mod_callcenter.c @@ -797,6 +797,7 @@ int cc_queue_count(const char *queue) cc_status_t cc_agent_add(const char *agent, const char *type) { + switch_event_t *event; cc_status_t result = CC_STATUS_SUCCESS; char *sql; @@ -818,6 +819,14 @@ cc_status_t cc_agent_add(const char *agent, const char *type) agent, type, cc_agent_status2str(CC_AGENT_STATUS_LOGGED_OUT), cc_agent_state2str(CC_AGENT_STATE_WAITING)); cc_execute_sql(NULL, sql, NULL); switch_safe_free(sql); + + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CALLCENTER_EVENT) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "CC-Agent", agent); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "CC-Agent-Type", type); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "CC-Action", "agent-add"); + switch_event_fire(&event); + } + } else { result = CC_STATUS_AGENT_INVALID_TYPE; goto done; @@ -986,6 +995,13 @@ cc_status_t cc_agent_update(const char *key, const char *value, const char *agen switch_safe_free(sql); result = CC_STATUS_SUCCESS; + + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CALLCENTER_EVENT) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "CC-Agent", agent); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "CC-Action", "agent-contact-change"); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "CC-Agent-Contact", value); + switch_event_fire(&event); + } } else if (!strcasecmp(key, "ready_time")) { sql = switch_mprintf("UPDATE agents SET ready_time = '%ld', system = 'single_box' WHERE name = '%q'", atol(value), agent); cc_execute_sql(NULL, sql, NULL); From 1af72288d15ef6773bd8bc04bb867dd532b2d256 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Mon, 23 Dec 2013 22:43:06 +0500 Subject: [PATCH 20/43] FS-6061 --resolve --- src/switch_cpp.cpp | 2 +- swig_common.i | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/switch_cpp.cpp b/src/switch_cpp.cpp index 27d6dc68b6..85fc978a6f 100644 --- a/src/switch_cpp.cpp +++ b/src/switch_cpp.cpp @@ -1306,7 +1306,7 @@ SWITCH_DECLARE(bool) email(char *to, char *from, char *headers, char *body, char return false; } -SWITCH_DECLARE(void) msleep(unsigned ms) +SWITCH_DECLARE(void) switch_msleep(unsigned ms) { switch_sleep(ms * 1000); return; diff --git a/swig_common.i b/swig_common.i index 617b97551a..d64642027a 100644 --- a/swig_common.i +++ b/swig_common.i @@ -1,2 +1,7 @@ %typemap(newfree) char * "free($1);"; %newobject getGlobalVariable; +%rename(msleep) switch_msleep; + + + + From b63bacf43ff9d8fa9275bd6e548290cac2fd11a8 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Mon, 23 Dec 2013 22:43:48 +0500 Subject: [PATCH 21/43] FS-6061 swigall --- src/include/switch_cpp.h | 2 +- src/mod/languages/mod_java/switch_swig_wrap.cpp | 2 +- src/mod/languages/mod_lua/freeswitch.i | 2 ++ src/mod/languages/mod_lua/mod_lua_wrap.cpp | 6 +++--- src/mod/languages/mod_managed/freeswitch_wrap.cxx | 2 +- src/mod/languages/mod_perl/mod_perl_wrap.cpp | 2 +- src/mod/languages/mod_python/mod_python_wrap.cpp | 2 +- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/include/switch_cpp.h b/src/include/switch_cpp.h index 57d122b79b..5a372c3cdb 100644 --- a/src/include/switch_cpp.h +++ b/src/include/switch_cpp.h @@ -398,7 +398,7 @@ SWITCH_DECLARE(bool) email(char *to, char *from, char *headers = NULL, char *bod SWITCH_DECLARE(void) console_log(char *level_str, char *msg); SWITCH_DECLARE(void) console_clean_log(char *msg); -SWITCH_DECLARE(void) msleep(unsigned ms); +SWITCH_DECLARE(void) switch_msleep(unsigned ms); /** \brief bridge the audio of session_b into session_a * diff --git a/src/mod/languages/mod_java/switch_swig_wrap.cpp b/src/mod/languages/mod_java/switch_swig_wrap.cpp index 76de068715..fee7726382 100644 --- a/src/mod/languages/mod_java/switch_swig_wrap.cpp +++ b/src/mod/languages/mod_java/switch_swig_wrap.cpp @@ -3169,7 +3169,7 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_msleep(JNIEnv *je (void)jenv; (void)jcls; arg1 = (unsigned int)jarg1; - msleep(arg1); + switch_msleep(arg1); } diff --git a/src/mod/languages/mod_lua/freeswitch.i b/src/mod/languages/mod_lua/freeswitch.i index 6fca226001..e61cad315b 100644 --- a/src/mod/languages/mod_lua/freeswitch.i +++ b/src/mod/languages/mod_lua/freeswitch.i @@ -19,6 +19,8 @@ %} + + /* Lua function typemap */ %typemap(in, checkfn = "lua_isfunction") SWIGLUA_FN { $1.L = L; diff --git a/src/mod/languages/mod_lua/mod_lua_wrap.cpp b/src/mod/languages/mod_lua/mod_lua_wrap.cpp index b1ff6d3a55..21e22ed53d 100644 --- a/src/mod/languages/mod_lua/mod_lua_wrap.cpp +++ b/src/mod/languages/mod_lua/mod_lua_wrap.cpp @@ -6299,10 +6299,10 @@ static int _wrap_msleep(lua_State* L) { int SWIG_arg = -1; unsigned int arg1 ; - SWIG_check_num_args("msleep",1,1) - if(!lua_isnumber(L,1)) SWIG_fail_arg("msleep",1,"unsigned int"); + SWIG_check_num_args("switch_msleep",1,1) + if(!lua_isnumber(L,1)) SWIG_fail_arg("switch_msleep",1,"unsigned int"); arg1 = (unsigned int)lua_tonumber(L, 1); - msleep(arg1); + switch_msleep(arg1); SWIG_arg=0; return SWIG_arg; diff --git a/src/mod/languages/mod_managed/freeswitch_wrap.cxx b/src/mod/languages/mod_managed/freeswitch_wrap.cxx index ea1a306269..88d3c7abfb 100644 --- a/src/mod/languages/mod_managed/freeswitch_wrap.cxx +++ b/src/mod/languages/mod_managed/freeswitch_wrap.cxx @@ -43119,7 +43119,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_msleep(unsigned int jarg1) { unsigned int arg1 ; arg1 = (unsigned int)jarg1; - msleep(arg1); + switch_msleep(arg1); } diff --git a/src/mod/languages/mod_perl/mod_perl_wrap.cpp b/src/mod/languages/mod_perl/mod_perl_wrap.cpp index 0757fcd85c..a7c2a690bd 100644 --- a/src/mod/languages/mod_perl/mod_perl_wrap.cpp +++ b/src/mod/languages/mod_perl/mod_perl_wrap.cpp @@ -8195,7 +8195,7 @@ XS(_wrap_msleep) { SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "msleep" "', argument " "1"" of type '" "unsigned int""'"); } arg1 = static_cast< unsigned int >(val1); - msleep(arg1); + switch_msleep(arg1); XSRETURN(argvi); diff --git a/src/mod/languages/mod_python/mod_python_wrap.cpp b/src/mod/languages/mod_python/mod_python_wrap.cpp index b7379edb7d..979621bafe 100644 --- a/src/mod/languages/mod_python/mod_python_wrap.cpp +++ b/src/mod/languages/mod_python/mod_python_wrap.cpp @@ -8398,7 +8398,7 @@ SWIGINTERN PyObject *_wrap_msleep(PyObject *SWIGUNUSEDPARM(self), PyObject *args SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "msleep" "', argument " "1"" of type '" "unsigned int""'"); } arg1 = static_cast< unsigned int >(val1); - msleep(arg1); + switch_msleep(arg1); resultobj = SWIG_Py_Void(); return resultobj; fail: From 0de5e6fb93a359bb2280c99e07719dbbeae7bd8a Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Mon, 23 Dec 2013 23:24:13 +0500 Subject: [PATCH 22/43] chage swig hack diff --- src/mod/languages/mod_python/hack.diff | 36 +++++++++----------------- 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/src/mod/languages/mod_python/hack.diff b/src/mod/languages/mod_python/hack.diff index 593e01aa27..9e50d93ba1 100644 --- a/src/mod/languages/mod_python/hack.diff +++ b/src/mod/languages/mod_python/hack.diff @@ -1,28 +1,16 @@ -Index: mod_python_wrap.cpp -=================================================================== ---- mod_python_wrap.cpp (revision 16581) -+++ mod_python_wrap.cpp (working copy) -@@ -5555,7 +5555,9 @@ - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "EventConsumer_pop" "', argument " "2"" of type '" "int""'"); - } - arg2 = static_cast< int >(val2); -+ Py_BEGIN_ALLOW_THREADS; - result = (Event *)(arg1)->pop(arg2); -+ Py_END_ALLOW_THREADS; - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Event, SWIG_POINTER_OWN | 0 ); - return resultobj; - fail: -@@ -5577,7 +5579,9 @@ - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "EventConsumer_pop" "', argument " "1"" of type '" "EventConsumer *""'"); +--- mod_python_wrap_patched.cpp 2013-12-23 23:19:43.308488527 +0500 ++++ mod_python_wrap.cpp 2013-12-23 23:19:37.572488834 +0500 +@@ -5585,7 +5585,9 @@ + } + arg3 = static_cast< int >(val3); } - arg1 = reinterpret_cast< EventConsumer * >(argp1); + Py_BEGIN_ALLOW_THREADS; - result = (Event *)(arg1)->pop(); + result = (Event *)(arg1)->pop(arg2,arg3); + Py_END_ALLOW_THREADS; resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Event, SWIG_POINTER_OWN | 0 ); return resultobj; fail: -@@ -9560,20 +9564,20 @@ +@@ -8515,20 +8517,20 @@ } @@ -46,7 +34,7 @@ Index: mod_python_wrap.cpp PyObject *resultobj = 0; char *arg1 = (char *) 0 ; CoreSession *arg2 = (CoreSession *) 0 ; -@@ -9598,7 +9602,7 @@ +@@ -8553,7 +8555,7 @@ } arg2 = reinterpret_cast< CoreSession * >(argp2); result = (PYTHON::Session *)new PYTHON::Session(arg1,arg2); @@ -55,7 +43,7 @@ Index: mod_python_wrap.cpp if (alloc1 == SWIG_NEWOBJ) delete[] buf1; return resultobj; fail: -@@ -9607,7 +9611,7 @@ +@@ -8562,7 +8564,7 @@ } @@ -64,7 +52,7 @@ Index: mod_python_wrap.cpp PyObject *resultobj = 0; char *arg1 = (char *) 0 ; PYTHON::Session *result = 0 ; -@@ -9623,7 +9627,7 @@ +@@ -8578,7 +8580,7 @@ } arg1 = reinterpret_cast< char * >(buf1); result = (PYTHON::Session *)new PYTHON::Session(arg1); @@ -73,7 +61,7 @@ Index: mod_python_wrap.cpp if (alloc1 == SWIG_NEWOBJ) delete[] buf1; return resultobj; fail: -@@ -9632,7 +9636,7 @@ +@@ -8587,7 +8589,7 @@ } @@ -82,7 +70,7 @@ Index: mod_python_wrap.cpp PyObject *resultobj = 0; switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; PYTHON::Session *result = 0 ; -@@ -9647,7 +9651,7 @@ +@@ -8602,7 +8604,7 @@ } arg1 = reinterpret_cast< switch_core_session_t * >(argp1); result = (PYTHON::Session *)new PYTHON::Session(arg1); From 615a4ec1cff0f2ae998dfa63dea79caa05ddbb09 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Mon, 23 Dec 2013 23:26:34 +0500 Subject: [PATCH 23/43] update python diff --- src/mod/languages/mod_python/mod_python_wrap.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mod/languages/mod_python/mod_python_wrap.cpp b/src/mod/languages/mod_python/mod_python_wrap.cpp index 979621bafe..8db6cc0c8f 100644 --- a/src/mod/languages/mod_python/mod_python_wrap.cpp +++ b/src/mod/languages/mod_python/mod_python_wrap.cpp @@ -5596,7 +5596,9 @@ SWIGINTERN PyObject *_wrap_EventConsumer_pop(PyObject *SWIGUNUSEDPARM(self), PyO } arg3 = static_cast< int >(val3); } + Py_BEGIN_ALLOW_THREADS; result = (Event *)(arg1)->pop(arg2,arg3); + Py_END_ALLOW_THREADS; resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Event, SWIG_POINTER_OWN | 0 ); return resultobj; fail: From bc8f2ffeb37e2acd0696748dd504ae04e1b92dc4 Mon Sep 17 00:00:00 2001 From: Jeff Lenk Date: Mon, 23 Dec 2013 15:28:30 -0600 Subject: [PATCH 24/43] vs2010 reswig --- src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx b/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx index 6a444f6ec1..8014491d77 100644 --- a/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx +++ b/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx @@ -42152,7 +42152,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_msleep(unsigned int jarg1) { unsigned int arg1 ; arg1 = (unsigned int)jarg1; - msleep(arg1); + switch_msleep(arg1); } From 88545a7fe186e4eff2dc22e3ef946d14aa0eb5d5 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Mon, 23 Dec 2013 17:27:20 -0500 Subject: [PATCH 25/43] .gitignore --- libs/esl/.gitignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 libs/esl/.gitignore diff --git a/libs/esl/.gitignore b/libs/esl/.gitignore new file mode 100644 index 0000000000..8c6f167b4c --- /dev/null +++ b/libs/esl/.gitignore @@ -0,0 +1,3 @@ +eslmake.rules +testserver_fork + From 87e3d25515a16be80e6455d78c428b3d88e43aa0 Mon Sep 17 00:00:00 2001 From: Jeff Lenk Date: Tue, 24 Dec 2013 10:36:45 -0600 Subject: [PATCH 26/43] FS-6052 --resolve --- src/mod/say/mod_say_ru/mod_say_ru.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/mod/say/mod_say_ru/mod_say_ru.c b/src/mod/say/mod_say_ru/mod_say_ru.c index 826daa747a..843bb8b216 100644 --- a/src/mod/say/mod_say_ru/mod_say_ru.c +++ b/src/mod/say/mod_say_ru/mod_say_ru.c @@ -223,6 +223,20 @@ static switch_status_t ru_say_general_count(switch_say_file_handle_t *sh, char * switch_status_t status; cases_t cases; //падеж say_gender_t gender; //тип произношения + char sbuf[128] = ""; + + if (say_args->method == SSM_ITERATED) { + if ((tosay = switch_strip_commas(tosay, sbuf, sizeof(sbuf)-1))) { + char *p; + for (p = tosay; p && *p; p++) { + switch_say_file(sh, "digits/%c", *p); + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error!\n"); + return SWITCH_STATUS_GENERR; + } + return SWITCH_STATUS_SUCCESS; + } switch (say_args->type) { case SST_MESSAGES: From 1fb555770e0f758c5a76e31f0561a4ce8d38e8d3 Mon Sep 17 00:00:00 2001 From: Jeff Lenk Date: Tue, 24 Dec 2013 10:40:32 -0600 Subject: [PATCH 27/43] FS-6052 line endings --- src/mod/say/mod_say_ru/mod_say_ru.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/mod/say/mod_say_ru/mod_say_ru.c b/src/mod/say/mod_say_ru/mod_say_ru.c index 843bb8b216..14b266f6c2 100644 --- a/src/mod/say/mod_say_ru/mod_say_ru.c +++ b/src/mod/say/mod_say_ru/mod_say_ru.c @@ -223,19 +223,19 @@ static switch_status_t ru_say_general_count(switch_say_file_handle_t *sh, char * switch_status_t status; cases_t cases; //падеж say_gender_t gender; //тип произношения - char sbuf[128] = ""; - - if (say_args->method == SSM_ITERATED) { - if ((tosay = switch_strip_commas(tosay, sbuf, sizeof(sbuf)-1))) { - char *p; - for (p = tosay; p && *p; p++) { - switch_say_file(sh, "digits/%c", *p); - } - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error!\n"); - return SWITCH_STATUS_GENERR; - } - return SWITCH_STATUS_SUCCESS; + char sbuf[128] = ""; + + if (say_args->method == SSM_ITERATED) { + if ((tosay = switch_strip_commas(tosay, sbuf, sizeof(sbuf)-1))) { + char *p; + for (p = tosay; p && *p; p++) { + switch_say_file(sh, "digits/%c", *p); + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error!\n"); + return SWITCH_STATUS_GENERR; + } + return SWITCH_STATUS_SUCCESS; } switch (say_args->type) { From f03e9fe8af867c7c8939a6e7120b468d77bbbf8b Mon Sep 17 00:00:00 2001 From: Jeff Lenk Date: Tue, 24 Dec 2013 11:37:09 -0600 Subject: [PATCH 28/43] FS-5585 --resolve --- src/switch_core_sqldb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/switch_core_sqldb.c b/src/switch_core_sqldb.c index c53fc75a40..05d27c6caf 100644 --- a/src/switch_core_sqldb.c +++ b/src/switch_core_sqldb.c @@ -347,7 +347,7 @@ SWITCH_DECLARE(switch_status_t) _switch_cache_db_get_db_handle_dsn(switch_cache_ } else if (!strncasecmp(dsn, "sqlite://", 9)) { type = SCDB_TYPE_CORE_DB; connection_options.core_db_options.db_path = (char *)(dsn + 9); - } else if ((!(i = strncasecmp(dsn, "odbc://", 7))) || strchr(dsn, ':')) { + } else if ((!(i = strncasecmp(dsn, "odbc://", 7))) || strchr(dsn+2, ':')) { type = SCDB_TYPE_ODBC; if (i) { From cb6c17a691203813fa9fa8cbe9321296513f7d2c Mon Sep 17 00:00:00 2001 From: Brian West Date: Tue, 24 Dec 2013 11:49:23 -0600 Subject: [PATCH 29/43] Tired of this --- scripts/perl/f-off-friendly-scanner.pl | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 scripts/perl/f-off-friendly-scanner.pl diff --git a/scripts/perl/f-off-friendly-scanner.pl b/scripts/perl/f-off-friendly-scanner.pl new file mode 100644 index 0000000000..48c0b75083 --- /dev/null +++ b/scripts/perl/f-off-friendly-scanner.pl @@ -0,0 +1,19 @@ +#!/usr/bin/perl +# Fsck Friendly Scanner +# +use Data::Dumper; +require ESL; +$| = 1; +my $c = new ESL::ESLconnection("localhost", "8021", "ClueCon"); +$c->events("plain", "CUSTOM sofia::register"); + +while ($c->connected()) { + my $event = $c->recvEvent(); + + my $user_agent = $event->getHeader('user-agent'); + my $network_ip = $event->getHeader('network-ip'); + + if ($user_agent =~ m/friendly-scanner/) { + system("/sbin/iptables -I INPUT -s $network_ip -j DROP"); + } +} From a27fe4c5a5084a5d80808bd0aa0a45c697fea897 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Thu, 26 Dec 2013 23:57:10 +0500 Subject: [PATCH 30/43] some null checks from coverity --- src/switch_ivr_play_say.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/switch_ivr_play_say.c b/src/switch_ivr_play_say.c index 47451c3ca6..74ed83efb8 100644 --- a/src/switch_ivr_play_say.c +++ b/src/switch_ivr_play_say.c @@ -1084,7 +1084,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_play_file(switch_core_session_t *sess arg_recursion_check_start(args); - if (!strcasecmp(read_impl.iananame, "l16")) { + if (!zstr(read_impl.iananame) && !strcasecmp(read_impl.iananame, "l16")) { l16++; } @@ -1997,7 +1997,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_read(switch_core_session_t *session, switch_channel_set_variable(channel, SWITCH_READ_TERMINATOR_USED_VARIABLE, tb); - if ((p = strchr(valid_terminators, tb[0]))) { + if (!zstr(valid_terminators) && (p = strchr(valid_terminators, tb[0]))) { if (p >= (valid_terminators + 1) && (*(p - 1) == '+' || *(p - 1) == 'x')) { switch_snprintf(digit_buffer + strlen(digit_buffer), digit_buffer_length - strlen(digit_buffer), "%s", tb); if (*(p - 1) == 'x') { From de65c19c3c538ef178c279b9a1507938dbab7ace Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Sat, 28 Dec 2013 01:39:03 +0500 Subject: [PATCH 31/43] FS-6007 FS-5083 FS-4514 --resolve --- src/switch_rtp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/switch_rtp.c b/src/switch_rtp.c index afd308b9c5..58c7c054c4 100644 --- a/src/switch_rtp.c +++ b/src/switch_rtp.c @@ -5637,6 +5637,9 @@ static int rtp_common_write(switch_rtp_t *rtp_session, if (send_msg) { bytes = datalen; + + m = send_msg->header.m; + if (flags && *flags & SFF_RFC2833) { send_msg->header.pt = rtp_session->te; } From 910c66150862546ca90fbccca479c133d38df036 Mon Sep 17 00:00:00 2001 From: Jeff Lenk Date: Fri, 27 Dec 2013 14:52:52 -0600 Subject: [PATCH 32/43] fix trivial compiler warning for last commit --- src/switch_rtp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/switch_rtp.c b/src/switch_rtp.c index 58c7c054c4..37865d2e9b 100644 --- a/src/switch_rtp.c +++ b/src/switch_rtp.c @@ -5638,7 +5638,7 @@ static int rtp_common_write(switch_rtp_t *rtp_session, if (send_msg) { bytes = datalen; - m = send_msg->header.m; + m = (uint8_t) send_msg->header.m; if (flags && *flags & SFF_RFC2833) { send_msg->header.pt = rtp_session->te; From 2f3f0bca5d78b9152cb4da1d56582fdebfa099e9 Mon Sep 17 00:00:00 2001 From: Brian West Date: Fri, 27 Dec 2013 16:39:11 -0600 Subject: [PATCH 33/43] fix list_users to have all users on all profiles --- src/mod/applications/mod_commands/mod_commands.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mod/applications/mod_commands/mod_commands.c b/src/mod/applications/mod_commands/mod_commands.c index 8640524149..be2d36cb4f 100644 --- a/src/mod/applications/mod_commands/mod_commands.c +++ b/src/mod/applications/mod_commands/mod_commands.c @@ -284,7 +284,7 @@ static void dump_user(struct user_struct *us) } if(zstr(dname)) { - apip = switch_mprintf("%s",switch_xml_attr_soft(x_user_tag, "id")); + apip = switch_mprintf("*/%s",switch_xml_attr_soft(x_user_tag, "id")); } else { apip = switch_mprintf("%s@%s",switch_xml_attr_soft(x_user_tag, "id"), dname); } From d432e837c5b9812b11bc8142256d4e9624d8839c Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Mon, 30 Dec 2013 23:36:24 +0500 Subject: [PATCH 34/43] FS-6035 try this --- .../applications/mod_spandsp/mod_spandsp_modem.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/mod/applications/mod_spandsp/mod_spandsp_modem.c b/src/mod/applications/mod_spandsp/mod_spandsp_modem.c index 7c43577427..64218c1b31 100644 --- a/src/mod/applications/mod_spandsp/mod_spandsp_modem.c +++ b/src/mod/applications/mod_spandsp/mod_spandsp_modem.c @@ -1238,7 +1238,7 @@ static void *SWITCH_THREAD_FUNC modem_thread(switch_thread_t *thread, void *obj) DWORD readBytes; OVERLAPPED o; #endif - char buf[T31_TX_BUF_LEN], tmp[80]; + char buf[T31_TX_BUF_LEN]; switch_mutex_lock(globals.mutex); modem_init(modem, control_handler); @@ -1298,18 +1298,8 @@ static void *SWITCH_THREAD_FUNC modem_thread(switch_thread_t *thread, void *obj) #endif t31_at_rx(modem->t31_state, buf, r); - memset(tmp, 0, sizeof(tmp)); if (!strncasecmp(buf, "AT", 2)) { - int x; - - strncpy(tmp, buf, r); - for (x = 0; x < r; x++) { - if (tmp[x] == '\r' || tmp[x] == '\n') { - tmp[x] = '\0'; - } - } - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "Command on %s [%s]\n", modem->devlink, tmp); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "Command on %s [%s]\n", modem->devlink, buf); } } From 990d41b1218fa209c8f0f8105f3343a67ad1c876 Mon Sep 17 00:00:00 2001 From: Jeff Lenk Date: Mon, 30 Dec 2013 13:14:05 -0600 Subject: [PATCH 35/43] FS-5704 --resolve --- Freeswitch.2010.sln | 149 +++++++++ Freeswitch.2012.sln | 149 +++++++++ libs/win32/Download OPUS.2010.vcxproj | 78 +++++ libs/win32/Download OPUS.2012.vcxproj | 80 +++++ libs/win32/opus/opus.2010.vcxproj | 250 ++++++++++++++ libs/win32/opus/opus.2010.vcxproj.filters | 93 ++++++ libs/win32/opus/opus.2012.vcxproj | 254 ++++++++++++++ libs/win32/opus/opus.2012.vcxproj.filters | 93 ++++++ libs/win32/opus/opus.celt.2010.vcxproj | 252 ++++++++++++++ .../win32/opus/opus.celt.2010.vcxproj.filters | 147 ++++++++ libs/win32/opus/opus.celt.2012.vcxproj | 256 ++++++++++++++ .../win32/opus/opus.celt.2012.vcxproj.filters | 147 ++++++++ libs/win32/opus/opus.silk_common.2010.vcxproj | 307 +++++++++++++++++ .../opus.silk_common.2010.vcxproj.filters | 315 ++++++++++++++++++ libs/win32/opus/opus.silk_common.2012.vcxproj | 311 +++++++++++++++++ .../opus.silk_common.2012.vcxproj.filters | 315 ++++++++++++++++++ libs/win32/opus/opus.silk_fixed.2010.vcxproj | 193 +++++++++++ .../opus/opus.silk_fixed.2010.vcxproj.filters | 111 ++++++ libs/win32/opus/opus.silk_fixed.2012.vcxproj | 197 +++++++++++ .../opus/opus.silk_fixed.2012.vcxproj.filters | 111 ++++++ libs/win32/opus/opus.silk_float.2010.vcxproj | 245 ++++++++++++++ .../opus/opus.silk_float.2010.vcxproj.filters | 129 +++++++ libs/win32/opus/opus.silk_float.2012.vcxproj | 249 ++++++++++++++ .../opus/opus.silk_float.2012.vcxproj.filters | 129 +++++++ src/mod/codecs/mod_opus/mod_opus.2010.vcxproj | 152 +++++++++ src/mod/codecs/mod_opus/mod_opus.2012.vcxproj | 156 +++++++++ 26 files changed, 4868 insertions(+) create mode 100644 libs/win32/Download OPUS.2010.vcxproj create mode 100644 libs/win32/Download OPUS.2012.vcxproj create mode 100644 libs/win32/opus/opus.2010.vcxproj create mode 100644 libs/win32/opus/opus.2010.vcxproj.filters create mode 100644 libs/win32/opus/opus.2012.vcxproj create mode 100644 libs/win32/opus/opus.2012.vcxproj.filters create mode 100644 libs/win32/opus/opus.celt.2010.vcxproj create mode 100644 libs/win32/opus/opus.celt.2010.vcxproj.filters create mode 100644 libs/win32/opus/opus.celt.2012.vcxproj create mode 100644 libs/win32/opus/opus.celt.2012.vcxproj.filters create mode 100644 libs/win32/opus/opus.silk_common.2010.vcxproj create mode 100644 libs/win32/opus/opus.silk_common.2010.vcxproj.filters create mode 100644 libs/win32/opus/opus.silk_common.2012.vcxproj create mode 100644 libs/win32/opus/opus.silk_common.2012.vcxproj.filters create mode 100644 libs/win32/opus/opus.silk_fixed.2010.vcxproj create mode 100644 libs/win32/opus/opus.silk_fixed.2010.vcxproj.filters create mode 100644 libs/win32/opus/opus.silk_fixed.2012.vcxproj create mode 100644 libs/win32/opus/opus.silk_fixed.2012.vcxproj.filters create mode 100644 libs/win32/opus/opus.silk_float.2010.vcxproj create mode 100644 libs/win32/opus/opus.silk_float.2010.vcxproj.filters create mode 100644 libs/win32/opus/opus.silk_float.2012.vcxproj create mode 100644 libs/win32/opus/opus.silk_float.2012.vcxproj.filters create mode 100644 src/mod/codecs/mod_opus/mod_opus.2010.vcxproj create mode 100644 src/mod/codecs/mod_opus/mod_opus.2012.vcxproj diff --git a/Freeswitch.2010.sln b/Freeswitch.2010.sln index 37ba5cfac0..a8f431c61e 100644 --- a/Freeswitch.2010.sln +++ b/Freeswitch.2010.sln @@ -572,6 +572,22 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcbt", "libs\win32\libcbt EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_cielab_luts", "libs\spandsp\src\msvc\make_cielab_luts.2010.vcxproj", "{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download OPUS", "libs\win32\Download OPUS.2010.vcxproj", "{092124C9-09ED-43C7-BD6D-4AE5D6B3C547}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "opus", "opus", "{ED2CA8B5-8E91-4296-A120-02BB0B674652}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opus", "libs\win32\opus\opus.2010.vcxproj", "{FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opus.celt", "libs\win32\opus\opus.celt.2010.vcxproj", "{245603E3-F580-41A5-9632-B25FE3372CBF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opus.silk_common", "libs\win32\opus\opus.silk_common.2010.vcxproj", "{C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opus.silk_fixed", "libs\win32\opus\opus.silk_fixed.2010.vcxproj", "{8484C90D-1561-402F-A91D-2DB10F8C5171}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opus.silk_float", "libs\win32\opus\opus.silk_float.2010.vcxproj", "{9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_opus", "src\mod\codecs\mod_opus\mod_opus.2010.vcxproj", "{64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_t43_gray_code_tables", "libs\spandsp\src\msvc\make_t43_gray_code_tables.2010.vcxproj", "{EDDB8AB9-C53E-44C0-A620-0E86C2CBD5D5}" EndProject Global @@ -3812,6 +3828,131 @@ Global {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x64.Build.0 = All|Win32 {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x64 Setup.ActiveCfg = All|Win32 {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x86 Setup.ActiveCfg = All|Win32 + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.All|Win32.ActiveCfg = Release|Win32 + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.All|Win32.Build.0 = Release|Win32 + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.All|x64.ActiveCfg = Release|Win32 + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.All|x64 Setup.ActiveCfg = Release|Win32 + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.All|x86 Setup.ActiveCfg = Release|Win32 + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.Debug|Win32.ActiveCfg = Debug|Win32 + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.Debug|Win32.Build.0 = Debug|Win32 + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.Debug|x64.ActiveCfg = Debug|Win32 + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.Debug|x64.Build.0 = Debug|Win32 + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.Debug|x64 Setup.ActiveCfg = Debug|Win32 + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.Debug|x86 Setup.ActiveCfg = Debug|Win32 + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.Release|Win32.ActiveCfg = Release|Win32 + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.Release|Win32.Build.0 = Release|Win32 + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.Release|x64.ActiveCfg = Release|Win32 + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.Release|x64.Build.0 = Release|Win32 + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.Release|x64 Setup.ActiveCfg = Release|Win32 + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.Release|x86 Setup.ActiveCfg = Release|Win32 + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.All|Win32.ActiveCfg = Release|Win32 + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.All|Win32.Build.0 = Release|Win32 + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.All|x64.ActiveCfg = Release|x64 + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.All|x64.Build.0 = Release|x64 + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.All|x64 Setup.ActiveCfg = Release|Win32 + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.All|x86 Setup.ActiveCfg = Release|Win32 + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.Debug|Win32.ActiveCfg = Debug|Win32 + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.Debug|Win32.Build.0 = Debug|Win32 + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.Debug|x64.ActiveCfg = Debug|x64 + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.Debug|x64.Build.0 = Debug|x64 + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.Debug|x64 Setup.ActiveCfg = Debug|Win32 + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.Debug|x86 Setup.ActiveCfg = Debug|Win32 + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.Release|Win32.ActiveCfg = Release|Win32 + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.Release|Win32.Build.0 = Release|Win32 + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.Release|x64.ActiveCfg = Release|x64 + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.Release|x64.Build.0 = Release|x64 + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.Release|x64 Setup.ActiveCfg = Release|Win32 + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.Release|x86 Setup.ActiveCfg = Release|Win32 + {245603E3-F580-41A5-9632-B25FE3372CBF}.All|Win32.ActiveCfg = Release|Win32 + {245603E3-F580-41A5-9632-B25FE3372CBF}.All|Win32.Build.0 = Release|Win32 + {245603E3-F580-41A5-9632-B25FE3372CBF}.All|x64.ActiveCfg = Release|x64 + {245603E3-F580-41A5-9632-B25FE3372CBF}.All|x64.Build.0 = Release|x64 + {245603E3-F580-41A5-9632-B25FE3372CBF}.All|x64 Setup.ActiveCfg = Release|Win32 + {245603E3-F580-41A5-9632-B25FE3372CBF}.All|x86 Setup.ActiveCfg = Release|Win32 + {245603E3-F580-41A5-9632-B25FE3372CBF}.Debug|Win32.ActiveCfg = Debug|Win32 + {245603E3-F580-41A5-9632-B25FE3372CBF}.Debug|Win32.Build.0 = Debug|Win32 + {245603E3-F580-41A5-9632-B25FE3372CBF}.Debug|x64.ActiveCfg = Debug|x64 + {245603E3-F580-41A5-9632-B25FE3372CBF}.Debug|x64.Build.0 = Debug|x64 + {245603E3-F580-41A5-9632-B25FE3372CBF}.Debug|x64 Setup.ActiveCfg = Debug|Win32 + {245603E3-F580-41A5-9632-B25FE3372CBF}.Debug|x86 Setup.ActiveCfg = Debug|Win32 + {245603E3-F580-41A5-9632-B25FE3372CBF}.Release|Win32.ActiveCfg = Release|Win32 + {245603E3-F580-41A5-9632-B25FE3372CBF}.Release|Win32.Build.0 = Release|Win32 + {245603E3-F580-41A5-9632-B25FE3372CBF}.Release|x64.ActiveCfg = Release|x64 + {245603E3-F580-41A5-9632-B25FE3372CBF}.Release|x64.Build.0 = Release|x64 + {245603E3-F580-41A5-9632-B25FE3372CBF}.Release|x64 Setup.ActiveCfg = Release|Win32 + {245603E3-F580-41A5-9632-B25FE3372CBF}.Release|x86 Setup.ActiveCfg = Release|Win32 + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.All|Win32.ActiveCfg = Release|Win32 + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.All|Win32.Build.0 = Release|Win32 + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.All|x64.ActiveCfg = Release|x64 + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.All|x64.Build.0 = Release|x64 + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.All|x64 Setup.ActiveCfg = Release|Win32 + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.All|x86 Setup.ActiveCfg = Release|Win32 + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.Debug|Win32.ActiveCfg = Debug|Win32 + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.Debug|Win32.Build.0 = Debug|Win32 + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.Debug|x64.ActiveCfg = Debug|x64 + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.Debug|x64.Build.0 = Debug|x64 + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.Debug|x64 Setup.ActiveCfg = Debug|Win32 + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.Debug|x86 Setup.ActiveCfg = Debug|Win32 + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.Release|Win32.ActiveCfg = Release|Win32 + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.Release|Win32.Build.0 = Release|Win32 + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.Release|x64.ActiveCfg = Release|x64 + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.Release|x64.Build.0 = Release|x64 + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.Release|x64 Setup.ActiveCfg = Release|Win32 + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.Release|x86 Setup.ActiveCfg = Release|Win32 + {8484C90D-1561-402F-A91D-2DB10F8C5171}.All|Win32.ActiveCfg = Release|Win32 + {8484C90D-1561-402F-A91D-2DB10F8C5171}.All|Win32.Build.0 = Release|Win32 + {8484C90D-1561-402F-A91D-2DB10F8C5171}.All|x64.ActiveCfg = Release|x64 + {8484C90D-1561-402F-A91D-2DB10F8C5171}.All|x64.Build.0 = Release|x64 + {8484C90D-1561-402F-A91D-2DB10F8C5171}.All|x64 Setup.ActiveCfg = Release|Win32 + {8484C90D-1561-402F-A91D-2DB10F8C5171}.All|x86 Setup.ActiveCfg = Release|Win32 + {8484C90D-1561-402F-A91D-2DB10F8C5171}.Debug|Win32.ActiveCfg = Debug|Win32 + {8484C90D-1561-402F-A91D-2DB10F8C5171}.Debug|Win32.Build.0 = Debug|Win32 + {8484C90D-1561-402F-A91D-2DB10F8C5171}.Debug|x64.ActiveCfg = Debug|x64 + {8484C90D-1561-402F-A91D-2DB10F8C5171}.Debug|x64.Build.0 = Debug|x64 + {8484C90D-1561-402F-A91D-2DB10F8C5171}.Debug|x64 Setup.ActiveCfg = Debug|Win32 + {8484C90D-1561-402F-A91D-2DB10F8C5171}.Debug|x86 Setup.ActiveCfg = Debug|Win32 + {8484C90D-1561-402F-A91D-2DB10F8C5171}.Release|Win32.ActiveCfg = Release|Win32 + {8484C90D-1561-402F-A91D-2DB10F8C5171}.Release|Win32.Build.0 = Release|Win32 + {8484C90D-1561-402F-A91D-2DB10F8C5171}.Release|x64.ActiveCfg = Release|x64 + {8484C90D-1561-402F-A91D-2DB10F8C5171}.Release|x64.Build.0 = Release|x64 + {8484C90D-1561-402F-A91D-2DB10F8C5171}.Release|x64 Setup.ActiveCfg = Release|Win32 + {8484C90D-1561-402F-A91D-2DB10F8C5171}.Release|x86 Setup.ActiveCfg = Release|Win32 + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.All|Win32.ActiveCfg = Release|Win32 + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.All|Win32.Build.0 = Release|Win32 + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.All|x64.ActiveCfg = Release|x64 + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.All|x64.Build.0 = Release|x64 + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.All|x64 Setup.ActiveCfg = Release|Win32 + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.All|x86 Setup.ActiveCfg = Release|Win32 + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.Debug|Win32.ActiveCfg = Debug|Win32 + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.Debug|Win32.Build.0 = Debug|Win32 + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.Debug|x64.ActiveCfg = Debug|x64 + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.Debug|x64.Build.0 = Debug|x64 + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.Debug|x64 Setup.ActiveCfg = Debug|Win32 + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.Debug|x86 Setup.ActiveCfg = Debug|Win32 + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.Release|Win32.ActiveCfg = Release|Win32 + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.Release|Win32.Build.0 = Release|Win32 + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.Release|x64.ActiveCfg = Release|x64 + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.Release|x64.Build.0 = Release|x64 + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.Release|x64 Setup.ActiveCfg = Release|Win32 + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.Release|x86 Setup.ActiveCfg = Release|Win32 + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}.All|Win32.ActiveCfg = Release|Win32 + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}.All|Win32.Build.0 = Release|Win32 + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}.All|x64.ActiveCfg = Release|x64 + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}.All|x64.Build.0 = Release|x64 + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}.All|x64 Setup.ActiveCfg = Release|Win32 + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}.All|x86 Setup.ActiveCfg = Release|Win32 + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}.Debug|Win32.ActiveCfg = Debug|Win32 + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}.Debug|Win32.Build.0 = Debug|Win32 + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}.Debug|x64.ActiveCfg = Debug|x64 + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}.Debug|x64.Build.0 = Debug|x64 + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}.Debug|x64 Setup.ActiveCfg = Debug|Win32 + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}.Debug|x86 Setup.ActiveCfg = Debug|Win32 + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}.Release|Win32.ActiveCfg = Release|Win32 + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}.Release|Win32.Build.0 = Release|Win32 + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}.Release|x64.ActiveCfg = Release|x64 + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}.Release|x64.Build.0 = Release|x64 + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}.Release|x64 Setup.ActiveCfg = Release|Win32 + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}.Release|x86 Setup.ActiveCfg = Release|Win32 {EDDB8AB9-C53E-44C0-A620-0E86C2CBD5D5}.All|Win32.ActiveCfg = All|Win32 {EDDB8AB9-C53E-44C0-A620-0E86C2CBD5D5}.All|Win32.Build.0 = All|Win32 {EDDB8AB9-C53E-44C0-A620-0E86C2CBD5D5}.All|x64.ActiveCfg = All|Win32 @@ -3845,6 +3986,7 @@ Global {D5C87B19-150D-4EF3-A671-96589BD2D14A} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} {4D418176-3B33-47E6-A63E-01BA34ADD21C} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} {AFA983D6-4569-4F88-BA94-555ED00FD9A8} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} {5FD31A25-5D83-4794-8BEE-904DAD84CE71} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {FFAA4C52-3A53-4F99-90C1-D59D1F0427F3} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {0DF3ABD0-DDC0-4265-B778-07C66780979B} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} @@ -3946,6 +4088,7 @@ Global {9D04A840-CE18-4FF5-A6D3-0A2BB92FF2E6} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {ED2CA8B5-8E91-4296-A120-02BB0B674652} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {EDDB8AB9-C53E-44C0-A620-0E86C2CBD5D5} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {EC3E5C7F-EE09-47E2-80FE-546363D14A98} = {B8F5B47B-8568-46EB-B320-64C17D2A98BC} {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {0C808854-54D1-4230-BFF5-77B5FD905000} @@ -3986,6 +4129,7 @@ Global {B808178B-82F0-4CF4-A2B1-921939FA24D0} = {C120A020-773F-4EA3-923F-B67AF28B750D} {D578E676-7EC8-4548-BD8B-845C635F14AD} = {C120A020-773F-4EA3-923F-B67AF28B750D} {652AD5F7-8488-489F-AAD0-7FBE064703B6} = {C120A020-773F-4EA3-923F-B67AF28B750D} + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547} = {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} @@ -4034,5 +4178,10 @@ Global {0D108721-EAE8-4BAF-8102-D8960EC93647} = {9DE35039-A8F6-4FBF-B1B6-EB527F802411} {CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA} = {9DE35039-A8F6-4FBF-B1B6-EB527F802411} {B535402E-38D2-4D54-8360-423ACBD17192} = {9DE35039-A8F6-4FBF-B1B6-EB527F802411} + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E} = {ED2CA8B5-8E91-4296-A120-02BB0B674652} + {245603E3-F580-41A5-9632-B25FE3372CBF} = {ED2CA8B5-8E91-4296-A120-02BB0B674652} + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16} = {ED2CA8B5-8E91-4296-A120-02BB0B674652} + {8484C90D-1561-402F-A91D-2DB10F8C5171} = {ED2CA8B5-8E91-4296-A120-02BB0B674652} + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782} = {ED2CA8B5-8E91-4296-A120-02BB0B674652} EndGlobalSection EndGlobal diff --git a/Freeswitch.2012.sln b/Freeswitch.2012.sln index be88964420..2d4ad4a9cc 100644 --- a/Freeswitch.2012.sln +++ b/Freeswitch.2012.sln @@ -577,6 +577,22 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcbt", "libs\win32\libcbt EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_cielab_luts", "libs\spandsp\src\msvc\make_cielab_luts.2012.vcxproj", "{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download OPUS", "libs\win32\Download OPUS.2012.vcxproj", "{092124C9-09ED-43C7-BD6D-4AE5D6B3C547}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "opus", "opus", "{ED2CA8B5-8E91-4296-A120-02BB0B674652}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opus", "libs\win32\opus\opus.2012.vcxproj", "{FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opus.celt", "libs\win32\opus\opus.celt.2012.vcxproj", "{245603E3-F580-41A5-9632-B25FE3372CBF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opus.silk_common", "libs\win32\opus\opus.silk_common.2012.vcxproj", "{C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opus.silk_fixed", "libs\win32\opus\opus.silk_fixed.2012.vcxproj", "{8484C90D-1561-402F-A91D-2DB10F8C5171}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opus.silk_float", "libs\win32\opus\opus.silk_float.2012.vcxproj", "{9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_opus", "src\mod\codecs\mod_opus\mod_opus.2012.vcxproj", "{64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_t43_gray_code_tables", "libs\spandsp\src\msvc\make_t43_gray_code_tables.2012.vcxproj", "{EDDB8AB9-C53E-44C0-A620-0E86C2CBD5D5}" EndProject Global @@ -3822,6 +3838,131 @@ Global {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x64.Build.0 = All|Win32 {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x64 Setup.ActiveCfg = All|Win32 {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x86 Setup.ActiveCfg = All|Win32 + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.All|Win32.ActiveCfg = Release|Win32 + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.All|Win32.Build.0 = Release|Win32 + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.All|x64.ActiveCfg = Release|Win32 + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.All|x64 Setup.ActiveCfg = Release|Win32 + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.All|x86 Setup.ActiveCfg = Release|Win32 + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.Debug|Win32.ActiveCfg = Debug|Win32 + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.Debug|Win32.Build.0 = Debug|Win32 + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.Debug|x64.ActiveCfg = Debug|Win32 + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.Debug|x64.Build.0 = Debug|Win32 + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.Debug|x64 Setup.ActiveCfg = Debug|Win32 + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.Debug|x86 Setup.ActiveCfg = Debug|Win32 + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.Release|Win32.ActiveCfg = Release|Win32 + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.Release|Win32.Build.0 = Release|Win32 + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.Release|x64.ActiveCfg = Release|Win32 + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.Release|x64.Build.0 = Release|Win32 + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.Release|x64 Setup.ActiveCfg = Release|Win32 + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.Release|x86 Setup.ActiveCfg = Release|Win32 + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.All|Win32.ActiveCfg = Release|Win32 + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.All|Win32.Build.0 = Release|Win32 + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.All|x64.ActiveCfg = Release|x64 + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.All|x64.Build.0 = Release|x64 + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.All|x64 Setup.ActiveCfg = Release|Win32 + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.All|x86 Setup.ActiveCfg = Release|Win32 + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.Debug|Win32.ActiveCfg = Debug|Win32 + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.Debug|Win32.Build.0 = Debug|Win32 + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.Debug|x64.ActiveCfg = Debug|x64 + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.Debug|x64.Build.0 = Debug|x64 + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.Debug|x64 Setup.ActiveCfg = Debug|Win32 + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.Debug|x86 Setup.ActiveCfg = Debug|Win32 + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.Release|Win32.ActiveCfg = Release|Win32 + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.Release|Win32.Build.0 = Release|Win32 + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.Release|x64.ActiveCfg = Release|x64 + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.Release|x64.Build.0 = Release|x64 + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.Release|x64 Setup.ActiveCfg = Release|Win32 + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.Release|x86 Setup.ActiveCfg = Release|Win32 + {245603E3-F580-41A5-9632-B25FE3372CBF}.All|Win32.ActiveCfg = Release|Win32 + {245603E3-F580-41A5-9632-B25FE3372CBF}.All|Win32.Build.0 = Release|Win32 + {245603E3-F580-41A5-9632-B25FE3372CBF}.All|x64.ActiveCfg = Release|x64 + {245603E3-F580-41A5-9632-B25FE3372CBF}.All|x64.Build.0 = Release|x64 + {245603E3-F580-41A5-9632-B25FE3372CBF}.All|x64 Setup.ActiveCfg = Release|Win32 + {245603E3-F580-41A5-9632-B25FE3372CBF}.All|x86 Setup.ActiveCfg = Release|Win32 + {245603E3-F580-41A5-9632-B25FE3372CBF}.Debug|Win32.ActiveCfg = Debug|Win32 + {245603E3-F580-41A5-9632-B25FE3372CBF}.Debug|Win32.Build.0 = Debug|Win32 + {245603E3-F580-41A5-9632-B25FE3372CBF}.Debug|x64.ActiveCfg = Debug|x64 + {245603E3-F580-41A5-9632-B25FE3372CBF}.Debug|x64.Build.0 = Debug|x64 + {245603E3-F580-41A5-9632-B25FE3372CBF}.Debug|x64 Setup.ActiveCfg = Debug|Win32 + {245603E3-F580-41A5-9632-B25FE3372CBF}.Debug|x86 Setup.ActiveCfg = Debug|Win32 + {245603E3-F580-41A5-9632-B25FE3372CBF}.Release|Win32.ActiveCfg = Release|Win32 + {245603E3-F580-41A5-9632-B25FE3372CBF}.Release|Win32.Build.0 = Release|Win32 + {245603E3-F580-41A5-9632-B25FE3372CBF}.Release|x64.ActiveCfg = Release|x64 + {245603E3-F580-41A5-9632-B25FE3372CBF}.Release|x64.Build.0 = Release|x64 + {245603E3-F580-41A5-9632-B25FE3372CBF}.Release|x64 Setup.ActiveCfg = Release|Win32 + {245603E3-F580-41A5-9632-B25FE3372CBF}.Release|x86 Setup.ActiveCfg = Release|Win32 + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.All|Win32.ActiveCfg = Release|Win32 + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.All|Win32.Build.0 = Release|Win32 + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.All|x64.ActiveCfg = Release|x64 + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.All|x64.Build.0 = Release|x64 + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.All|x64 Setup.ActiveCfg = Release|Win32 + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.All|x86 Setup.ActiveCfg = Release|Win32 + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.Debug|Win32.ActiveCfg = Debug|Win32 + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.Debug|Win32.Build.0 = Debug|Win32 + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.Debug|x64.ActiveCfg = Debug|x64 + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.Debug|x64.Build.0 = Debug|x64 + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.Debug|x64 Setup.ActiveCfg = Debug|Win32 + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.Debug|x86 Setup.ActiveCfg = Debug|Win32 + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.Release|Win32.ActiveCfg = Release|Win32 + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.Release|Win32.Build.0 = Release|Win32 + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.Release|x64.ActiveCfg = Release|x64 + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.Release|x64.Build.0 = Release|x64 + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.Release|x64 Setup.ActiveCfg = Release|Win32 + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.Release|x86 Setup.ActiveCfg = Release|Win32 + {8484C90D-1561-402F-A91D-2DB10F8C5171}.All|Win32.ActiveCfg = Release|Win32 + {8484C90D-1561-402F-A91D-2DB10F8C5171}.All|Win32.Build.0 = Release|Win32 + {8484C90D-1561-402F-A91D-2DB10F8C5171}.All|x64.ActiveCfg = Release|x64 + {8484C90D-1561-402F-A91D-2DB10F8C5171}.All|x64.Build.0 = Release|x64 + {8484C90D-1561-402F-A91D-2DB10F8C5171}.All|x64 Setup.ActiveCfg = Release|Win32 + {8484C90D-1561-402F-A91D-2DB10F8C5171}.All|x86 Setup.ActiveCfg = Release|Win32 + {8484C90D-1561-402F-A91D-2DB10F8C5171}.Debug|Win32.ActiveCfg = Debug|Win32 + {8484C90D-1561-402F-A91D-2DB10F8C5171}.Debug|Win32.Build.0 = Debug|Win32 + {8484C90D-1561-402F-A91D-2DB10F8C5171}.Debug|x64.ActiveCfg = Debug|x64 + {8484C90D-1561-402F-A91D-2DB10F8C5171}.Debug|x64.Build.0 = Debug|x64 + {8484C90D-1561-402F-A91D-2DB10F8C5171}.Debug|x64 Setup.ActiveCfg = Debug|Win32 + {8484C90D-1561-402F-A91D-2DB10F8C5171}.Debug|x86 Setup.ActiveCfg = Debug|Win32 + {8484C90D-1561-402F-A91D-2DB10F8C5171}.Release|Win32.ActiveCfg = Release|Win32 + {8484C90D-1561-402F-A91D-2DB10F8C5171}.Release|Win32.Build.0 = Release|Win32 + {8484C90D-1561-402F-A91D-2DB10F8C5171}.Release|x64.ActiveCfg = Release|x64 + {8484C90D-1561-402F-A91D-2DB10F8C5171}.Release|x64.Build.0 = Release|x64 + {8484C90D-1561-402F-A91D-2DB10F8C5171}.Release|x64 Setup.ActiveCfg = Release|Win32 + {8484C90D-1561-402F-A91D-2DB10F8C5171}.Release|x86 Setup.ActiveCfg = Release|Win32 + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.All|Win32.ActiveCfg = Release|Win32 + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.All|Win32.Build.0 = Release|Win32 + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.All|x64.ActiveCfg = Release|x64 + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.All|x64.Build.0 = Release|x64 + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.All|x64 Setup.ActiveCfg = Release|Win32 + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.All|x86 Setup.ActiveCfg = Release|Win32 + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.Debug|Win32.ActiveCfg = Debug|Win32 + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.Debug|Win32.Build.0 = Debug|Win32 + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.Debug|x64.ActiveCfg = Debug|x64 + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.Debug|x64.Build.0 = Debug|x64 + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.Debug|x64 Setup.ActiveCfg = Debug|Win32 + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.Debug|x86 Setup.ActiveCfg = Debug|Win32 + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.Release|Win32.ActiveCfg = Release|Win32 + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.Release|Win32.Build.0 = Release|Win32 + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.Release|x64.ActiveCfg = Release|x64 + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.Release|x64.Build.0 = Release|x64 + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.Release|x64 Setup.ActiveCfg = Release|Win32 + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.Release|x86 Setup.ActiveCfg = Release|Win32 + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}.All|Win32.ActiveCfg = Release|Win32 + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}.All|Win32.Build.0 = Release|Win32 + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}.All|x64.ActiveCfg = Release|x64 + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}.All|x64.Build.0 = Release|x64 + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}.All|x64 Setup.ActiveCfg = Release|Win32 + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}.All|x86 Setup.ActiveCfg = Release|Win32 + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}.Debug|Win32.ActiveCfg = Debug|Win32 + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}.Debug|Win32.Build.0 = Debug|Win32 + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}.Debug|x64.ActiveCfg = Debug|x64 + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}.Debug|x64.Build.0 = Debug|x64 + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}.Debug|x64 Setup.ActiveCfg = Debug|Win32 + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}.Debug|x86 Setup.ActiveCfg = Debug|Win32 + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}.Release|Win32.ActiveCfg = Release|Win32 + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}.Release|Win32.Build.0 = Release|Win32 + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}.Release|x64.ActiveCfg = Release|x64 + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}.Release|x64.Build.0 = Release|x64 + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}.Release|x64 Setup.ActiveCfg = Release|Win32 + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}.Release|x86 Setup.ActiveCfg = Release|Win32 {EDDB8AB9-C53E-44C0-A620-0E86C2CBD5D5}.All|Win32.ActiveCfg = All|Win32 {EDDB8AB9-C53E-44C0-A620-0E86C2CBD5D5}.All|Win32.Build.0 = All|Win32 {EDDB8AB9-C53E-44C0-A620-0E86C2CBD5D5}.All|x64.ActiveCfg = All|Win32 @@ -3855,6 +3996,7 @@ Global {D5C87B19-150D-4EF3-A671-96589BD2D14A} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} {4D418176-3B33-47E6-A63E-01BA34ADD21C} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} {AFA983D6-4569-4F88-BA94-555ED00FD9A8} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} {5FD31A25-5D83-4794-8BEE-904DAD84CE71} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {FFAA4C52-3A53-4F99-90C1-D59D1F0427F3} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {0DF3ABD0-DDC0-4265-B778-07C66780979B} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} @@ -3956,6 +4098,7 @@ Global {2386B892-35F5-46CF-A0F0-10394D2FBF9B} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {ED2CA8B5-8E91-4296-A120-02BB0B674652} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {EDDB8AB9-C53E-44C0-A620-0E86C2CBD5D5} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {EC3E5C7F-EE09-47E2-80FE-546363D14A98} = {B8F5B47B-8568-46EB-B320-64C17D2A98BC} {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {0C808854-54D1-4230-BFF5-77B5FD905000} @@ -3996,6 +4139,7 @@ Global {B808178B-82F0-4CF4-A2B1-921939FA24D0} = {C120A020-773F-4EA3-923F-B67AF28B750D} {D578E676-7EC8-4548-BD8B-845C635F14AD} = {C120A020-773F-4EA3-923F-B67AF28B750D} {652AD5F7-8488-489F-AAD0-7FBE064703B6} = {C120A020-773F-4EA3-923F-B67AF28B750D} + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547} = {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} @@ -4044,5 +4188,10 @@ Global {0D108721-EAE8-4BAF-8102-D8960EC93647} = {9DE35039-A8F6-4FBF-B1B6-EB527F802411} {CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA} = {9DE35039-A8F6-4FBF-B1B6-EB527F802411} {B535402E-38D2-4D54-8360-423ACBD17192} = {9DE35039-A8F6-4FBF-B1B6-EB527F802411} + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E} = {ED2CA8B5-8E91-4296-A120-02BB0B674652} + {245603E3-F580-41A5-9632-B25FE3372CBF} = {ED2CA8B5-8E91-4296-A120-02BB0B674652} + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16} = {ED2CA8B5-8E91-4296-A120-02BB0B674652} + {8484C90D-1561-402F-A91D-2DB10F8C5171} = {ED2CA8B5-8E91-4296-A120-02BB0B674652} + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782} = {ED2CA8B5-8E91-4296-A120-02BB0B674652} EndGlobalSection EndGlobal diff --git a/libs/win32/Download OPUS.2010.vcxproj b/libs/win32/Download OPUS.2010.vcxproj new file mode 100644 index 0000000000..36688eba3a --- /dev/null +++ b/libs/win32/Download OPUS.2010.vcxproj @@ -0,0 +1,78 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + Download OPUS + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547} + Download OPUS + Win32Proj + + + + Utility + MultiByte + + + Utility + MultiByte + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(PlatformName)\OPUS\$(Configuration)\ + $(PlatformName)\OPUS\$(Configuration)\ + + + + $(IntDir)BuildLog $(ProjectName).htm + + + + + + + + + $(IntDir)BuildLog $(ProjectName).htm + + + + + + + + + Document + Downloading OPUS. + if not exist "$(ProjectDir)..\opus-1.1" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/opus-1.1.tar.gz "$(ProjectDir).." + + $(ProjectDir)..\opus-1.1;%(Outputs) + Downloading OPUS. + if not exist "$(ProjectDir)..\opus-1.1" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/opus-1.1.tar.gz "$(ProjectDir).." + + $(ProjectDir)..\opus-1.1;%(Outputs) + + + + + + diff --git a/libs/win32/Download OPUS.2012.vcxproj b/libs/win32/Download OPUS.2012.vcxproj new file mode 100644 index 0000000000..42553ea7ee --- /dev/null +++ b/libs/win32/Download OPUS.2012.vcxproj @@ -0,0 +1,80 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + Download OPUS + {092124C9-09ED-43C7-BD6D-4AE5D6B3C547} + Download OPUS + Win32Proj + + + + Utility + MultiByte + v110 + + + Utility + MultiByte + v110 + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(PlatformName)\OPUS\$(Configuration)\ + $(PlatformName)\OPUS\$(Configuration)\ + + + + $(IntDir)BuildLog $(ProjectName).htm + + + + + + + + + $(IntDir)BuildLog $(ProjectName).htm + + + + + + + + + Document + Downloading OPUS. + if not exist "$(ProjectDir)..\opus-1.1" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/opus-1.1.tar.gz "$(ProjectDir).." + + $(ProjectDir)..\opus-1.1;%(Outputs) + Downloading OPUS. + if not exist "$(ProjectDir)..\opus-1.1" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/opus-1.1.tar.gz "$(ProjectDir).." + + $(ProjectDir)..\opus-1.1;%(Outputs) + + + + + + diff --git a/libs/win32/opus/opus.2010.vcxproj b/libs/win32/opus/opus.2010.vcxproj new file mode 100644 index 0000000000..7dc9cd19e4 --- /dev/null +++ b/libs/win32/opus/opus.2010.vcxproj @@ -0,0 +1,250 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + Win32Proj + opus + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E} + + + + StaticLibrary + true + + + StaticLibrary + true + + + false + StaticLibrary + true + + + StaticLibrary + false + + + + + + + + + + + + + + + + + + + true + opus + + + true + opus + + + false + opus + + + false + + + opus + + + + HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..\opus-1.1\silk;..\..\opus-1.1\celt;..\..\opus-1.1\win32;..\..\opus-1.1\include;%(AdditionalIncludeDirectories) + MultiThreadedDebugDLL + Level3 + ProgramDatabase + Disabled + + + MachineX86 + true + Console + $(SolutionDir)$(Configuration)$(PlatformArchitecture);%(AdditionalLibraryDirectories) + celt.lib;silk_common.lib;silk_fixed.lib;silk_float.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + "$(ProjectDir)..\..\opus-1.1\win32\genversion.bat" "$(ProjectDir)..\..\opus-1.1\win32\version.h" OPUS_VERSION + Generating version.h + + + + + + + + + + + + + HAVE_CONFIG_H;WIN32;WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..\opus-1.1\silk;..\..\opus-1.1\celt;..\..\opus-1.1\win32;..\..\opus-1.1\include;%(AdditionalIncludeDirectories) + MultiThreadedDebugDLL + Level3 + ProgramDatabase + Disabled + + + true + Console + $(SolutionDir)$(Configuration)$(PlatformArchitecture);%(AdditionalLibraryDirectories) + celt.lib;silk_common.lib;silk_fixed.lib;silk_float.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + "$(ProjectDir)..\..\opus-1.1\win32\genversion.bat" "$(ProjectDir)..\..\opus-1.1\win32\version.h" OPUS_VERSION + Generating version.h + + + + + + + + + + + + + HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..\opus-1.1\silk;..\..\opus-1.1\celt;..\..\opus-1.1\win32;..\..\opus-1.1\include;%(AdditionalIncludeDirectories) + MultiThreadedDLL + Level3 + ProgramDatabase + true + + + MachineX86 + false + Console + true + true + celt.lib;silk_common.lib;silk_fixed.lib;silk_float.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + $(SolutionDir)$(Configuration)$(PlatformArchitecture);%(AdditionalLibraryDirectories) + false + + + "$(ProjectDir)..\..\opus-1.1\win32\genversion.bat" "$(ProjectDir)..\..\opus-1.1\win32\version.h" OPUS_VERSION + Generating version.h + + + + + + + + + + + + + HAVE_CONFIG_H;WIN32;WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..\opus-1.1\silk;..\..\opus-1.1\celt;..\..\opus-1.1\win32;..\..\opus-1.1\include;%(AdditionalIncludeDirectories) + MultiThreadedDLL + Level3 + ProgramDatabase + + + false + Console + true + true + celt.lib;silk_common.lib;silk_fixed.lib;silk_float.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + $(SolutionDir)$(Configuration)$(PlatformArchitecture);%(AdditionalLibraryDirectories) + false + + + "$(ProjectDir)..\..\opus-1.1\win32\genversion.bat" "$(ProjectDir)..\..\opus-1.1\win32\version.h" OPUS_VERSION + Generating version.h + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {092124c9-09ed-43c7-bd6d-4ae5d6b3c547} + false + false + false + false + false + + + {245603e3-f580-41a5-9632-b25fe3372cbf} + + + {c303d2fc-ff97-49b8-9ddd-467b4c9a0b16} + + + {8484c90d-1561-402f-a91d-2db10f8c5171} + + + {9c4961d2-5ddb-40c7-9be8-ca918dc4e782} + + + + + + diff --git a/libs/win32/opus/opus.2010.vcxproj.filters b/libs/win32/opus/opus.2010.vcxproj.filters new file mode 100644 index 0000000000..80b78c2044 --- /dev/null +++ b/libs/win32/opus/opus.2010.vcxproj.filters @@ -0,0 +1,93 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + diff --git a/libs/win32/opus/opus.2012.vcxproj b/libs/win32/opus/opus.2012.vcxproj new file mode 100644 index 0000000000..ab8a0e1f29 --- /dev/null +++ b/libs/win32/opus/opus.2012.vcxproj @@ -0,0 +1,254 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + Win32Proj + opus + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E} + + + + StaticLibrary + true + v110 + + + StaticLibrary + true + v110 + + + false + StaticLibrary + true + v110 + + + StaticLibrary + false + v110 + + + + + + + + + + + + + + + + + + + true + opus + + + true + opus + + + false + opus + + + false + + + opus + + + + HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..\opus-1.1\silk;..\..\opus-1.1\celt;..\..\opus-1.1\win32;..\..\opus-1.1\include;%(AdditionalIncludeDirectories) + MultiThreadedDebugDLL + Level3 + ProgramDatabase + Disabled + + + MachineX86 + true + Console + $(SolutionDir)$(Configuration)$(PlatformArchitecture);%(AdditionalLibraryDirectories) + celt.lib;silk_common.lib;silk_fixed.lib;silk_float.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + "$(ProjectDir)..\..\opus-1.1\win32\genversion.bat" "$(ProjectDir)..\..\opus-1.1\win32\version.h" OPUS_VERSION + Generating version.h + + + + + + + + + + + + + HAVE_CONFIG_H;WIN32;WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..\opus-1.1\silk;..\..\opus-1.1\celt;..\..\opus-1.1\win32;..\..\opus-1.1\include;%(AdditionalIncludeDirectories) + MultiThreadedDebugDLL + Level3 + ProgramDatabase + Disabled + + + true + Console + $(SolutionDir)$(Configuration)$(PlatformArchitecture);%(AdditionalLibraryDirectories) + celt.lib;silk_common.lib;silk_fixed.lib;silk_float.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + "$(ProjectDir)..\..\opus-1.1\win32\genversion.bat" "$(ProjectDir)..\..\opus-1.1\win32\version.h" OPUS_VERSION + Generating version.h + + + + + + + + + + + + + HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..\opus-1.1\silk;..\..\opus-1.1\celt;..\..\opus-1.1\win32;..\..\opus-1.1\include;%(AdditionalIncludeDirectories) + MultiThreadedDLL + Level3 + ProgramDatabase + true + + + MachineX86 + false + Console + true + true + celt.lib;silk_common.lib;silk_fixed.lib;silk_float.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + $(SolutionDir)$(Configuration)$(PlatformArchitecture);%(AdditionalLibraryDirectories) + false + + + "$(ProjectDir)..\..\opus-1.1\win32\genversion.bat" "$(ProjectDir)..\..\opus-1.1\win32\version.h" OPUS_VERSION + Generating version.h + + + + + + + + + + + + + HAVE_CONFIG_H;WIN32;WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..\opus-1.1\silk;..\..\opus-1.1\celt;..\..\opus-1.1\win32;..\..\opus-1.1\include;%(AdditionalIncludeDirectories) + MultiThreadedDLL + Level3 + ProgramDatabase + + + false + Console + true + true + celt.lib;silk_common.lib;silk_fixed.lib;silk_float.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + $(SolutionDir)$(Configuration)$(PlatformArchitecture);%(AdditionalLibraryDirectories) + false + + + "$(ProjectDir)..\..\opus-1.1\win32\genversion.bat" "$(ProjectDir)..\..\opus-1.1\win32\version.h" OPUS_VERSION + Generating version.h + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {092124c9-09ed-43c7-bd6d-4ae5d6b3c547} + false + false + false + false + false + + + {245603e3-f580-41a5-9632-b25fe3372cbf} + + + {c303d2fc-ff97-49b8-9ddd-467b4c9a0b16} + + + {8484c90d-1561-402f-a91d-2db10f8c5171} + + + {9c4961d2-5ddb-40c7-9be8-ca918dc4e782} + + + + + + diff --git a/libs/win32/opus/opus.2012.vcxproj.filters b/libs/win32/opus/opus.2012.vcxproj.filters new file mode 100644 index 0000000000..80b78c2044 --- /dev/null +++ b/libs/win32/opus/opus.2012.vcxproj.filters @@ -0,0 +1,93 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + diff --git a/libs/win32/opus/opus.celt.2010.vcxproj b/libs/win32/opus/opus.celt.2010.vcxproj new file mode 100644 index 0000000000..f722cb0a0d --- /dev/null +++ b/libs/win32/opus/opus.celt.2010.vcxproj @@ -0,0 +1,252 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {245603E3-F580-41A5-9632-B25FE3372CBF} + Win32Proj + opus.celt + opus.celt + + + + StaticLibrary + true + Unicode + + + StaticLibrary + true + Unicode + + + StaticLibrary + false + true + Unicode + + + StaticLibrary + false + true + Unicode + + + + + + + + + + + + + + + + + + + + + + celt + + + + celt + + + + celt + + + celt + + + + + + Level3 + Disabled + HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\opus-1.1\win32;..\..\opus-1.1\include;%(AdditionalIncludeDirectories) + MultiThreadedDebugDLL + + + Windows + true + + + "$(ProjectDir)..\..\opus-1.1\win32\genversion.bat" "$(ProjectDir)..\..\opus-1.1\win32\version.h" OPUS_VERSION + Generating version.h + + + + + + + + + + + + + + + Level3 + Disabled + HAVE_CONFIG_H;WIN32;WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\opus-1.1\win32;..\..\opus-1.1\include;%(AdditionalIncludeDirectories) + MultiThreadedDebugDLL + + + Windows + true + + + "$(ProjectDir)..\..\opus-1.1\win32\genversion.bat" "$(ProjectDir)..\..\opus-1.1\win32\version.h" OPUS_VERSION + Generating version.h + + + + + + + + + + + + + Level3 + + + true + true + HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\opus-1.1\win32;..\..\opus-1.1\include;%(AdditionalIncludeDirectories) + MultiThreadedDLL + + + Windows + true + true + true + + + "$(ProjectDir)..\..\opus-1.1\win32\genversion.bat" "$(ProjectDir)..\..\opus-1.1\win32\version.h" OPUS_VERSION + Generating version.h + + + + + + + + + + + + + Level3 + + + MaxSpeed + true + true + HAVE_CONFIG_H;WIN32;WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\opus-1.1\win32;..\..\opus-1.1\include;%(AdditionalIncludeDirectories) + MultiThreadedDLL + + + Windows + true + true + true + + + "$(ProjectDir)..\..\opus-1.1\win32\genversion.bat" "$(ProjectDir)..\..\opus-1.1\win32\version.h" OPUS_VERSION + Generating version.h + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {092124c9-09ed-43c7-bd6d-4ae5d6b3c547} + + + + + + diff --git a/libs/win32/opus/opus.celt.2010.vcxproj.filters b/libs/win32/opus/opus.celt.2010.vcxproj.filters new file mode 100644 index 0000000000..9cdc36139e --- /dev/null +++ b/libs/win32/opus/opus.celt.2010.vcxproj.filters @@ -0,0 +1,147 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + diff --git a/libs/win32/opus/opus.celt.2012.vcxproj b/libs/win32/opus/opus.celt.2012.vcxproj new file mode 100644 index 0000000000..4d4119e328 --- /dev/null +++ b/libs/win32/opus/opus.celt.2012.vcxproj @@ -0,0 +1,256 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {245603E3-F580-41A5-9632-B25FE3372CBF} + Win32Proj + opus.celt + opus.celt + + + + StaticLibrary + true + Unicode + v110 + + + StaticLibrary + true + Unicode + v110 + + + StaticLibrary + false + true + Unicode + v110 + + + StaticLibrary + false + true + Unicode + v110 + + + + + + + + + + + + + + + + + + + + + + celt + + + + celt + + + + celt + + + celt + + + + + + Level3 + Disabled + HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\opus-1.1\win32;..\..\opus-1.1\include;%(AdditionalIncludeDirectories) + MultiThreadedDebugDLL + + + Windows + true + + + "$(ProjectDir)..\..\opus-1.1\win32\genversion.bat" "$(ProjectDir)..\..\opus-1.1\win32\version.h" OPUS_VERSION + Generating version.h + + + + + + + + + + + + + + + Level3 + Disabled + HAVE_CONFIG_H;WIN32;WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\opus-1.1\win32;..\..\opus-1.1\include;%(AdditionalIncludeDirectories) + MultiThreadedDebugDLL + + + Windows + true + + + "$(ProjectDir)..\..\opus-1.1\win32\genversion.bat" "$(ProjectDir)..\..\opus-1.1\win32\version.h" OPUS_VERSION + Generating version.h + + + + + + + + + + + + + Level3 + + + true + true + HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\opus-1.1\win32;..\..\opus-1.1\include;%(AdditionalIncludeDirectories) + MultiThreadedDLL + + + Windows + true + true + true + + + "$(ProjectDir)..\..\opus-1.1\win32\genversion.bat" "$(ProjectDir)..\..\opus-1.1\win32\version.h" OPUS_VERSION + Generating version.h + + + + + + + + + + + + + Level3 + + + MaxSpeed + true + true + HAVE_CONFIG_H;WIN32;WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\opus-1.1\win32;..\..\opus-1.1\include;%(AdditionalIncludeDirectories) + MultiThreadedDLL + + + Windows + true + true + true + + + "$(ProjectDir)..\..\opus-1.1\win32\genversion.bat" "$(ProjectDir)..\..\opus-1.1\win32\version.h" OPUS_VERSION + Generating version.h + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {092124c9-09ed-43c7-bd6d-4ae5d6b3c547} + + + + + + diff --git a/libs/win32/opus/opus.celt.2012.vcxproj.filters b/libs/win32/opus/opus.celt.2012.vcxproj.filters new file mode 100644 index 0000000000..9cdc36139e --- /dev/null +++ b/libs/win32/opus/opus.celt.2012.vcxproj.filters @@ -0,0 +1,147 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + diff --git a/libs/win32/opus/opus.silk_common.2010.vcxproj b/libs/win32/opus/opus.silk_common.2010.vcxproj new file mode 100644 index 0000000000..6e17e5cdc7 --- /dev/null +++ b/libs/win32/opus/opus.silk_common.2010.vcxproj @@ -0,0 +1,307 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16} + Win32Proj + src_common + opus.silk_common + + + + StaticLibrary + true + Unicode + + + StaticLibrary + true + Unicode + + + StaticLibrary + false + true + Unicode + + + StaticLibrary + false + true + Unicode + + + + + + + + + + + + + + + + + + + silk_common + + + silk_common + + + silk_common + + + + + silk_common + + + + + + Level3 + Disabled + HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\opus-1.1\silk\fixed;..\..\opus-1.1\silk\float;..\..\opus-1.1\win32;..\..\opus-1.1\celt;..\..\opus-1.1\include + MultiThreadedDebugDLL + + + Windows + true + + + "$(ProjectDir)..\..\opus-1.1\win32\genversion.bat" "$(ProjectDir)..\..\opus-1.1\win32\version.h" OPUS_VERSION + Generating version.h + + + + + + + + + + + + + + + Level3 + Disabled + HAVE_CONFIG_H;WIN32;WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\opus-1.1\silk\fixed;..\..\opus-1.1\silk\float;..\..\opus-1.1\win32;..\..\opus-1.1\celt;..\..\opus-1.1\include + MultiThreadedDebugDLL + + + Windows + true + + + "$(ProjectDir)..\..\opus-1.1\win32\genversion.bat" "$(ProjectDir)..\..\opus-1.1\win32\version.h" OPUS_VERSION + Generating version.h + + + + + + + + + + + + + Level3 + + + true + true + HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\opus-1.1\silk\fixed;..\..\opus-1.1\silk\float;..\..\opus-1.1\win32;..\..\opus-1.1\celt;..\..\opus-1.1\include + MultiThreadedDLL + Fast + + + Windows + true + true + true + + + "$(ProjectDir)..\..\opus-1.1\win32\genversion.bat" "$(ProjectDir)..\..\opus-1.1\win32\version.h" OPUS_VERSION + Generating version.h + + + + + + + + + + + + + Level3 + + + MaxSpeed + true + true + HAVE_CONFIG_H;WIN32;WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\opus-1.1\silk\fixed;..\..\opus-1.1\silk\float;..\..\opus-1.1\win32;..\..\opus-1.1\celt;..\..\opus-1.1\include + MultiThreadedDLL + Fast + + + Windows + true + true + true + + + "$(ProjectDir)..\..\opus-1.1\win32\genversion.bat" "$(ProjectDir)..\..\opus-1.1\win32\version.h" OPUS_VERSION + Generating version.h + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {092124c9-09ed-43c7-bd6d-4ae5d6b3c547} + + + + + + diff --git a/libs/win32/opus/opus.silk_common.2010.vcxproj.filters b/libs/win32/opus/opus.silk_common.2010.vcxproj.filters new file mode 100644 index 0000000000..000040c0ca --- /dev/null +++ b/libs/win32/opus/opus.silk_common.2010.vcxproj.filters @@ -0,0 +1,315 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + diff --git a/libs/win32/opus/opus.silk_common.2012.vcxproj b/libs/win32/opus/opus.silk_common.2012.vcxproj new file mode 100644 index 0000000000..9c4952bc5c --- /dev/null +++ b/libs/win32/opus/opus.silk_common.2012.vcxproj @@ -0,0 +1,311 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16} + Win32Proj + src_common + opus.silk_common + + + + StaticLibrary + true + Unicode + v110 + + + StaticLibrary + true + Unicode + v110 + + + StaticLibrary + false + true + Unicode + v110 + + + StaticLibrary + false + true + Unicode + v110 + + + + + + + + + + + + + + + + + + + silk_common + + + silk_common + + + silk_common + + + + + silk_common + + + + + + Level3 + Disabled + HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\opus-1.1\silk\fixed;..\..\opus-1.1\silk\float;..\..\opus-1.1\win32;..\..\opus-1.1\celt;..\..\opus-1.1\include + MultiThreadedDebugDLL + + + Windows + true + + + "$(ProjectDir)..\..\opus-1.1\win32\genversion.bat" "$(ProjectDir)..\..\opus-1.1\win32\version.h" OPUS_VERSION + Generating version.h + + + + + + + + + + + + + + + Level3 + Disabled + HAVE_CONFIG_H;WIN32;WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\opus-1.1\silk\fixed;..\..\opus-1.1\silk\float;..\..\opus-1.1\win32;..\..\opus-1.1\celt;..\..\opus-1.1\include + MultiThreadedDebugDLL + + + Windows + true + + + "$(ProjectDir)..\..\opus-1.1\win32\genversion.bat" "$(ProjectDir)..\..\opus-1.1\win32\version.h" OPUS_VERSION + Generating version.h + + + + + + + + + + + + + Level3 + + + true + true + HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\opus-1.1\silk\fixed;..\..\opus-1.1\silk\float;..\..\opus-1.1\win32;..\..\opus-1.1\celt;..\..\opus-1.1\include + MultiThreadedDLL + Fast + + + Windows + true + true + true + + + "$(ProjectDir)..\..\opus-1.1\win32\genversion.bat" "$(ProjectDir)..\..\opus-1.1\win32\version.h" OPUS_VERSION + Generating version.h + + + + + + + + + + + + + Level3 + + + MaxSpeed + true + true + HAVE_CONFIG_H;WIN32;WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\opus-1.1\silk\fixed;..\..\opus-1.1\silk\float;..\..\opus-1.1\win32;..\..\opus-1.1\celt;..\..\opus-1.1\include + MultiThreadedDLL + Fast + + + Windows + true + true + true + + + "$(ProjectDir)..\..\opus-1.1\win32\genversion.bat" "$(ProjectDir)..\..\opus-1.1\win32\version.h" OPUS_VERSION + Generating version.h + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {092124c9-09ed-43c7-bd6d-4ae5d6b3c547} + + + + + + diff --git a/libs/win32/opus/opus.silk_common.2012.vcxproj.filters b/libs/win32/opus/opus.silk_common.2012.vcxproj.filters new file mode 100644 index 0000000000..000040c0ca --- /dev/null +++ b/libs/win32/opus/opus.silk_common.2012.vcxproj.filters @@ -0,0 +1,315 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + diff --git a/libs/win32/opus/opus.silk_fixed.2010.vcxproj b/libs/win32/opus/opus.silk_fixed.2010.vcxproj new file mode 100644 index 0000000000..33a7f5a065 --- /dev/null +++ b/libs/win32/opus/opus.silk_fixed.2010.vcxproj @@ -0,0 +1,193 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {8484C90D-1561-402F-A91D-2DB10F8C5171} + Win32Proj + src_FIX + opus.silk_fixed + + + + StaticLibrary + true + Unicode + + + StaticLibrary + true + Unicode + + + StaticLibrary + false + true + Unicode + + + StaticLibrary + false + true + Unicode + + + + + + + + + + + + + + + + + + + silk_fixed + + + silk_fixed + + + silk_fixed + + + silk_fixed + + + + + + Level3 + Disabled + HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\opus-1.1\silk\;..\..\opus-1.1\win32;..\..\opus-1.1\celt;..\..\opus-1.1\include + MultiThreadedDebugDLL + + + Windows + true + + + + + + + Level3 + Disabled + HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\opus-1.1\silk\;..\..\opus-1.1\win32;..\..\opus-1.1\celt;..\..\opus-1.1\include + MultiThreadedDebugDLL + + + Windows + true + + + + + Level3 + + + true + true + HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\opus-1.1\silk\;..\..\opus-1.1\win32;..\..\opus-1.1\celt;..\..\opus-1.1\include + MultiThreadedDLL + + + Windows + true + true + true + + + + + Level3 + + + MaxSpeed + true + true + HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\opus-1.1\silk\;..\..\opus-1.1\win32;..\..\opus-1.1\celt;..\..\opus-1.1\include + MultiThreadedDLL + + + Windows + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {092124c9-09ed-43c7-bd6d-4ae5d6b3c547} + + + {c303d2fc-ff97-49b8-9ddd-467b4c9a0b16} + + + {9c4961d2-5ddb-40c7-9be8-ca918dc4e782} + + + + + + diff --git a/libs/win32/opus/opus.silk_fixed.2010.vcxproj.filters b/libs/win32/opus/opus.silk_fixed.2010.vcxproj.filters new file mode 100644 index 0000000000..d4c0785df5 --- /dev/null +++ b/libs/win32/opus/opus.silk_fixed.2010.vcxproj.filters @@ -0,0 +1,111 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + diff --git a/libs/win32/opus/opus.silk_fixed.2012.vcxproj b/libs/win32/opus/opus.silk_fixed.2012.vcxproj new file mode 100644 index 0000000000..3e6b7c001c --- /dev/null +++ b/libs/win32/opus/opus.silk_fixed.2012.vcxproj @@ -0,0 +1,197 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {8484C90D-1561-402F-A91D-2DB10F8C5171} + Win32Proj + src_FIX + opus.silk_fixed + + + + StaticLibrary + true + Unicode + v110 + + + StaticLibrary + true + Unicode + v110 + + + StaticLibrary + false + true + Unicode + v110 + + + StaticLibrary + false + true + Unicode + v110 + + + + + + + + + + + + + + + + + + + silk_fixed + + + silk_fixed + + + silk_fixed + + + silk_fixed + + + + + + Level3 + Disabled + HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\opus-1.1\silk\;..\..\opus-1.1\win32;..\..\opus-1.1\celt;..\..\opus-1.1\include + MultiThreadedDebugDLL + + + Windows + true + + + + + + + Level3 + Disabled + HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\opus-1.1\silk\;..\..\opus-1.1\win32;..\..\opus-1.1\celt;..\..\opus-1.1\include + MultiThreadedDebugDLL + + + Windows + true + + + + + Level3 + + + true + true + HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\opus-1.1\silk\;..\..\opus-1.1\win32;..\..\opus-1.1\celt;..\..\opus-1.1\include + MultiThreadedDLL + + + Windows + true + true + true + + + + + Level3 + + + MaxSpeed + true + true + HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\opus-1.1\silk\;..\..\opus-1.1\win32;..\..\opus-1.1\celt;..\..\opus-1.1\include + MultiThreadedDLL + + + Windows + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {092124c9-09ed-43c7-bd6d-4ae5d6b3c547} + + + {c303d2fc-ff97-49b8-9ddd-467b4c9a0b16} + + + {9c4961d2-5ddb-40c7-9be8-ca918dc4e782} + + + + + + diff --git a/libs/win32/opus/opus.silk_fixed.2012.vcxproj.filters b/libs/win32/opus/opus.silk_fixed.2012.vcxproj.filters new file mode 100644 index 0000000000..d4c0785df5 --- /dev/null +++ b/libs/win32/opus/opus.silk_fixed.2012.vcxproj.filters @@ -0,0 +1,111 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + diff --git a/libs/win32/opus/opus.silk_float.2010.vcxproj b/libs/win32/opus/opus.silk_float.2010.vcxproj new file mode 100644 index 0000000000..85be5aad3e --- /dev/null +++ b/libs/win32/opus/opus.silk_float.2010.vcxproj @@ -0,0 +1,245 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782} + Win32Proj + src_FLP + opus.silk_float + + + + StaticLibrary + true + Unicode + + + StaticLibrary + true + Unicode + + + StaticLibrary + false + true + Unicode + + + StaticLibrary + false + true + Unicode + + + + + + + + + + + + + + + + + + + silk_float + + + silk_float + + + silk_float + + + Compile + silk_float + + + + + + Level3 + Disabled + HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\opus-1.1\silk;..\..\opus-1.1\silk\fixed;..\..\opus-1.1\win32;..\..\opus-1.1\celt;..\..\opus-1.1\include + MultiThreadedDebugDLL + + + Windows + true + + + "$(ProjectDir)..\..\opus-1.1\win32\genversion.bat" "$(ProjectDir)..\..\opus-1.1\win32\version.h" OPUS_VERSION + Generating version.h + + + + + + + + + + + + + + + Level3 + Disabled + HAVE_CONFIG_H;WIN32;WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\opus-1.1\silk;..\..\opus-1.1\silk\fixed;..\..\opus-1.1\win32;..\..\opus-1.1\celt;..\..\opus-1.1\include + MultiThreadedDebugDLL + + + Windows + true + + + "$(ProjectDir)..\..\opus-1.1\win32\genversion.bat" "$(ProjectDir)..\..\opus-1.1\win32\version.h" OPUS_VERSION + Generating version.h + + + + + + + + + + + + + Level3 + + + true + true + HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\opus-1.1\silk;..\..\opus-1.1\silk\fixed;..\..\opus-1.1\win32;..\..\opus-1.1\celt;..\..\opus-1.1\include + MultiThreadedDLL + + + Windows + true + true + true + + + "$(ProjectDir)..\..\opus-1.1\win32\genversion.bat" "$(ProjectDir)..\..\opus-1.1\win32\version.h" OPUS_VERSION + Generating version.h + + + + + + + + + + + + + Level3 + + + MaxSpeed + true + true + HAVE_CONFIG_H;WIN32;WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\opus-1.1\silk;..\..\opus-1.1\silk\fixed;..\..\opus-1.1\win32;..\..\opus-1.1\celt;..\..\opus-1.1\include + MultiThreadedDLL + + + Windows + true + true + true + + + "$(ProjectDir)..\..\opus-1.1\win32\genversion.bat" "$(ProjectDir)..\..\opus-1.1\win32\version.h" OPUS_VERSION + Generating version.h + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {092124c9-09ed-43c7-bd6d-4ae5d6b3c547} + + + {c303d2fc-ff97-49b8-9ddd-467b4c9a0b16} + + + + + + diff --git a/libs/win32/opus/opus.silk_float.2010.vcxproj.filters b/libs/win32/opus/opus.silk_float.2010.vcxproj.filters new file mode 100644 index 0000000000..4e132e1222 --- /dev/null +++ b/libs/win32/opus/opus.silk_float.2010.vcxproj.filters @@ -0,0 +1,129 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + diff --git a/libs/win32/opus/opus.silk_float.2012.vcxproj b/libs/win32/opus/opus.silk_float.2012.vcxproj new file mode 100644 index 0000000000..fce1b4cae5 --- /dev/null +++ b/libs/win32/opus/opus.silk_float.2012.vcxproj @@ -0,0 +1,249 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782} + Win32Proj + src_FLP + opus.silk_float + + + + StaticLibrary + true + Unicode + v110 + + + StaticLibrary + true + Unicode + v110 + + + StaticLibrary + false + true + Unicode + v110 + + + StaticLibrary + false + true + Unicode + v110 + + + + + + + + + + + + + + + + + + + silk_float + + + silk_float + + + silk_float + + + Compile + silk_float + + + + + + Level3 + Disabled + HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\opus-1.1\silk;..\..\opus-1.1\silk\fixed;..\..\opus-1.1\win32;..\..\opus-1.1\celt;..\..\opus-1.1\include + MultiThreadedDebugDLL + + + Windows + true + + + "$(ProjectDir)..\..\opus-1.1\win32\genversion.bat" "$(ProjectDir)..\..\opus-1.1\win32\version.h" OPUS_VERSION + Generating version.h + + + + + + + + + + + + + + + Level3 + Disabled + HAVE_CONFIG_H;WIN32;WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\opus-1.1\silk;..\..\opus-1.1\silk\fixed;..\..\opus-1.1\win32;..\..\opus-1.1\celt;..\..\opus-1.1\include + MultiThreadedDebugDLL + + + Windows + true + + + "$(ProjectDir)..\..\opus-1.1\win32\genversion.bat" "$(ProjectDir)..\..\opus-1.1\win32\version.h" OPUS_VERSION + Generating version.h + + + + + + + + + + + + + Level3 + + + true + true + HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\opus-1.1\silk;..\..\opus-1.1\silk\fixed;..\..\opus-1.1\win32;..\..\opus-1.1\celt;..\..\opus-1.1\include + MultiThreadedDLL + + + Windows + true + true + true + + + "$(ProjectDir)..\..\opus-1.1\win32\genversion.bat" "$(ProjectDir)..\..\opus-1.1\win32\version.h" OPUS_VERSION + Generating version.h + + + + + + + + + + + + + Level3 + + + MaxSpeed + true + true + HAVE_CONFIG_H;WIN32;WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\opus-1.1\silk;..\..\opus-1.1\silk\fixed;..\..\opus-1.1\win32;..\..\opus-1.1\celt;..\..\opus-1.1\include + MultiThreadedDLL + + + Windows + true + true + true + + + "$(ProjectDir)..\..\opus-1.1\win32\genversion.bat" "$(ProjectDir)..\..\opus-1.1\win32\version.h" OPUS_VERSION + Generating version.h + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {092124c9-09ed-43c7-bd6d-4ae5d6b3c547} + + + {c303d2fc-ff97-49b8-9ddd-467b4c9a0b16} + + + + + + diff --git a/libs/win32/opus/opus.silk_float.2012.vcxproj.filters b/libs/win32/opus/opus.silk_float.2012.vcxproj.filters new file mode 100644 index 0000000000..4e132e1222 --- /dev/null +++ b/libs/win32/opus/opus.silk_float.2012.vcxproj.filters @@ -0,0 +1,129 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + diff --git a/src/mod/codecs/mod_opus/mod_opus.2010.vcxproj b/src/mod/codecs/mod_opus/mod_opus.2010.vcxproj new file mode 100644 index 0000000000..412d5c4cbf --- /dev/null +++ b/src/mod/codecs/mod_opus/mod_opus.2010.vcxproj @@ -0,0 +1,152 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB} + mod_opus + Win32Proj + mod_opus + + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + + + + ..\..\..\..\libs\opus-1.1\include;%(AdditionalIncludeDirectories) + + + + + false + + + + + + + X64 + + + ..\..\..\..\libs\opus-1.1\include;%(AdditionalIncludeDirectories) + + + + + false + + + MachineX64 + + + + + ..\..\..\..\libs\opus-1.1\include;%(AdditionalIncludeDirectories) + + + + + false + + + + + + + X64 + + + ..\..\..\..\libs\opus-1.1\include;%(AdditionalIncludeDirectories) + + + + + false + + + MachineX64 + + + + + + + + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E} + true + false + false + true + false + + + {245603e3-f580-41a5-9632-b25fe3372cbf} + + + {c303d2fc-ff97-49b8-9ddd-467b4c9a0b16} + + + {9c4961d2-5ddb-40c7-9be8-ca918dc4e782} + + + {202d7a4e-760d-4d0e-afa1-d7459ced30ff} + false + + + + + + diff --git a/src/mod/codecs/mod_opus/mod_opus.2012.vcxproj b/src/mod/codecs/mod_opus/mod_opus.2012.vcxproj new file mode 100644 index 0000000000..7921694c6b --- /dev/null +++ b/src/mod/codecs/mod_opus/mod_opus.2012.vcxproj @@ -0,0 +1,156 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB} + mod_opus + Win32Proj + mod_opus + + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + + + + ..\..\..\..\libs\opus-1.1\include;%(AdditionalIncludeDirectories) + + + + + false + + + + + + + X64 + + + ..\..\..\..\libs\opus-1.1\include;%(AdditionalIncludeDirectories) + + + + + false + + + MachineX64 + + + + + ..\..\..\..\libs\opus-1.1\include;%(AdditionalIncludeDirectories) + + + + + false + + + + + + + X64 + + + ..\..\..\..\libs\opus-1.1\include;%(AdditionalIncludeDirectories) + + + + + false + + + MachineX64 + + + + + + + + {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E} + true + false + false + true + false + + + {245603e3-f580-41a5-9632-b25fe3372cbf} + + + {c303d2fc-ff97-49b8-9ddd-467b4c9a0b16} + + + {9c4961d2-5ddb-40c7-9be8-ca918dc4e782} + + + {202d7a4e-760d-4d0e-afa1-d7459ced30ff} + false + + + + + + From e71dabae5001804913303da770a43572d879f424 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Tue, 31 Dec 2013 00:21:45 +0500 Subject: [PATCH 36/43] FS-6007 --- src/include/switch_types.h | 1 + src/switch_rtp.c | 26 ++++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/include/switch_types.h b/src/include/switch_types.h index cf6f4c247d..ced44eb05e 100644 --- a/src/include/switch_types.h +++ b/src/include/switch_types.h @@ -634,6 +634,7 @@ typedef enum { */ typedef enum { SWITCH_RTP_FLAG_NOBLOCK = 0, + SWITCH_RTP_FLAG_DTMF_ON, SWITCH_RTP_FLAG_IO, SWITCH_RTP_FLAG_USE_TIMER, SWITCH_RTP_FLAG_RTCP_PASSTHRU, diff --git a/src/switch_rtp.c b/src/switch_rtp.c index 37865d2e9b..0819b658cb 100644 --- a/src/switch_rtp.c +++ b/src/switch_rtp.c @@ -478,6 +478,15 @@ static void do_2833(switch_rtp_t *rtp_session); static handle_rfc2833_result_t handle_rfc2833(switch_rtp_t *rtp_session, switch_size_t bytes, int *do_cng) { + if (rtp_session->flags[SWITCH_RTP_FLAG_DTMF_ON]) { + rtp_session->flags[SWITCH_RTP_FLAG_DTMF_ON]++; + + if (rtp_session->flags[SWITCH_RTP_FLAG_DTMF_ON] > 1000) { + rtp_session->flags[SWITCH_RTP_FLAG_DTMF_ON] = 0; + } + } + + #ifdef DEBUG_2833 if (rtp_session->dtmf_data.in_digit_sanity && !(rtp_session->dtmf_data.in_digit_sanity % 100)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "sanity %d %ld\n", rtp_session->dtmf_data.in_digit_sanity, bytes); @@ -496,8 +505,9 @@ static handle_rfc2833_result_t handle_rfc2833(switch_rtp_t *rtp_session, switch_ we put up with as much as we can so we don't have to deal with being punished for doing it right. Nice guys finish last! */ + if (bytes > rtp_header_len && !rtp_session->flags[SWITCH_RTP_FLAG_PROXY_MEDIA] && - !rtp_session->flags[SWITCH_RTP_FLAG_PASS_RFC2833] && rtp_session->recv_te && rtp_session->recv_msg.header.pt == rtp_session->recv_te) { + rtp_session->recv_te && rtp_session->recv_msg.header.pt == rtp_session->recv_te) { switch_size_t len = bytes - rtp_header_len; unsigned char *packet = (unsigned char *) RTP_BODY(rtp_session); int end; @@ -528,6 +538,17 @@ static handle_rfc2833_result_t handle_rfc2833(switch_rtp_t *rtp_session, switch_ in_digit_seq = ntohs((uint16_t) rtp_session->recv_msg.header.seq); ts = htonl(rtp_session->recv_msg.header.ts); + if (rtp_session->flags[SWITCH_RTP_FLAG_PASS_RFC2833]) { + + if (end) { + rtp_session->flags[SWITCH_RTP_FLAG_DTMF_ON] = 998; + } else if (!rtp_session->flags[SWITCH_RTP_FLAG_DTMF_ON]) { + rtp_session->flags[SWITCH_RTP_FLAG_DTMF_ON] = 1; + } + + return RESULT_CONTINUE; + } + if (in_digit_seq < rtp_session->dtmf_data.in_digit_seq) { if (rtp_session->dtmf_data.in_digit_seq - in_digit_seq > 100) { rtp_session->dtmf_data.in_digit_seq = 0; @@ -4031,7 +4052,8 @@ static void do_flush(switch_rtp_t *rtp_session, int force) if (!force) { if (rtp_session->flags[SWITCH_RTP_FLAG_PROXY_MEDIA] || rtp_session->flags[SWITCH_RTP_FLAG_VIDEO] || - rtp_session->flags[SWITCH_RTP_FLAG_UDPTL] + rtp_session->flags[SWITCH_RTP_FLAG_UDPTL] || + rtp_session->flags[SWITCH_RTP_FLAG_DTMF_ON] ) { return; } From 153f66d739f45b1ad4871d6fa90c137e3de537f5 Mon Sep 17 00:00:00 2001 From: Jeff Lenk Date: Tue, 31 Dec 2013 16:45:44 -0600 Subject: [PATCH 37/43] add freetdm vs2012 build support --- libs/freetdm/freetdm.2012.sln | 127 ++++++++++ .../mod_freetdm/mod_freetdm.2012.vcxproj | 221 +++++++++++++++++ .../mod_freetdm.2012.vcxproj.filters | 14 ++ libs/freetdm/msvc/freetdm.2012.vcxproj | 230 ++++++++++++++++++ .../freetdm/msvc/freetdm.2012.vcxproj.filters | 137 +++++++++++ .../msvc/testanalog/testanalog.2012.vcxproj | 217 +++++++++++++++++ .../testanalog.2012.vcxproj.filters | 14 ++ .../msvc/testisdn/testisdn.2012.vcxproj | 217 +++++++++++++++++ .../testisdn/testisdn.2012.vcxproj.filters | 14 ++ .../ftmod_analog/ftmod_analog.2012.vcxproj | 202 +++++++++++++++ .../ftmod_analog.2012.vcxproj.filters | 23 ++ .../ftmod_analog_em.2012.vcxproj | 202 +++++++++++++++ .../ftmod_analog_em.2012.vcxproj.filters | 23 ++ .../ftmod/ftmod_isdn/ftmod_isdn.2012.vcxproj | 227 +++++++++++++++++ .../ftmod_isdn.2012.vcxproj.filters | 110 +++++++++ .../ftmod/ftmod_pika/ftmod_pika.2012.vcxproj | 202 +++++++++++++++ .../ftmod_pika.2012.vcxproj.filters | 23 ++ .../src/ftmod/ftmod_r2/ftmod_r2.2012.vcxproj | 163 +++++++++++++ .../ftmod_r2/ftmod_r2.2012.vcxproj.filters | 22 ++ .../ftmod_sangoma_isdn.2010.vcxproj | 6 +- .../ftmod_sangoma_isdn.2012.vcxproj | 207 ++++++++++++++++ .../ftmod_sangoma_isdn.2012.vcxproj.filters | 60 +++++ .../ftmod_wanpipe/ftmod_wanpipe.2012.vcxproj | 205 ++++++++++++++++ .../ftmod_wanpipe.2012.vcxproj.filters | 18 ++ 24 files changed, 2883 insertions(+), 1 deletion(-) create mode 100644 libs/freetdm/freetdm.2012.sln create mode 100644 libs/freetdm/mod_freetdm/mod_freetdm.2012.vcxproj create mode 100644 libs/freetdm/mod_freetdm/mod_freetdm.2012.vcxproj.filters create mode 100644 libs/freetdm/msvc/freetdm.2012.vcxproj create mode 100644 libs/freetdm/msvc/freetdm.2012.vcxproj.filters create mode 100644 libs/freetdm/msvc/testanalog/testanalog.2012.vcxproj create mode 100644 libs/freetdm/msvc/testanalog/testanalog.2012.vcxproj.filters create mode 100644 libs/freetdm/msvc/testisdn/testisdn.2012.vcxproj create mode 100644 libs/freetdm/msvc/testisdn/testisdn.2012.vcxproj.filters create mode 100644 libs/freetdm/src/ftmod/ftmod_analog/ftmod_analog.2012.vcxproj create mode 100644 libs/freetdm/src/ftmod/ftmod_analog/ftmod_analog.2012.vcxproj.filters create mode 100644 libs/freetdm/src/ftmod/ftmod_analog_em/ftmod_analog_em.2012.vcxproj create mode 100644 libs/freetdm/src/ftmod/ftmod_analog_em/ftmod_analog_em.2012.vcxproj.filters create mode 100644 libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.2012.vcxproj create mode 100644 libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.2012.vcxproj.filters create mode 100644 libs/freetdm/src/ftmod/ftmod_pika/ftmod_pika.2012.vcxproj create mode 100644 libs/freetdm/src/ftmod/ftmod_pika/ftmod_pika.2012.vcxproj.filters create mode 100644 libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.2012.vcxproj create mode 100644 libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.2012.vcxproj.filters create mode 100644 libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.2012.vcxproj create mode 100644 libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.2012.vcxproj.filters create mode 100644 libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.2012.vcxproj create mode 100644 libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.2012.vcxproj.filters diff --git a/libs/freetdm/freetdm.2012.sln b/libs/freetdm/freetdm.2012.sln new file mode 100644 index 0000000000..1d4c335a8d --- /dev/null +++ b/libs/freetdm/freetdm.2012.sln @@ -0,0 +1,127 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetdm", "msvc\freetdm.2012.vcxproj", "{93B8812C-3EC4-4F78-8970-FFBFC99E167D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testanalog", "msvc\testanalog\testanalog.2012.vcxproj", "{BB833648-BAFF-4BE2-94DB-F8BB043C588C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testisdn", "msvc\testisdn\testisdn.2012.vcxproj", "{6DA6FD42-641D-4147-92F5-3BC4AAA6589B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_freetdm", "mod_freetdm\mod_freetdm.2012.vcxproj", "{FE3540C5-3303-46E0-A69E-D92F775687F1}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ftmod_analog", "src\ftmod\ftmod_analog\ftmod_analog.2012.vcxproj", "{37C94798-6E33-4B4F-8EE0-C72A7DC91157}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ftmod_analog_em", "src\ftmod\ftmod_analog_em\ftmod_analog_em.2012.vcxproj", "{B3F49375-2834-4937-9D8C-4AC2EC911010}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ftmod_isdn", "src\ftmod\ftmod_isdn\ftmod_isdn.2012.vcxproj", "{729344A5-D5E9-434D-8EE8-AF8C6C795D15}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ftmod_pika", "src\ftmod\ftmod_pika\ftmod_pika.2012.vcxproj", "{E886B4D5-AB4F-4092-B8F4-3B06E1E462EF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ftmod_wanpipe", "src\ftmod\ftmod_wanpipe\ftmod_wanpipe.2012.vcxproj", "{1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ftmod_sangoma_isdn", "src\ftmod\ftmod_sangoma_isdn\ftmod_sangoma_isdn.2012.vcxproj", "{B2AF4EA6-0CD7-4529-9EB5-5AF43DB90395}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ftmod_r2", "src\ftmod\ftmod_r2\ftmod_r2.2012.vcxproj", "{08C3EA27-A51D-47F8-B47D-B189C649CF30}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {93B8812C-3EC4-4F78-8970-FFBFC99E167D}.Debug|Win32.ActiveCfg = Debug|Win32 + {93B8812C-3EC4-4F78-8970-FFBFC99E167D}.Debug|Win32.Build.0 = Debug|Win32 + {93B8812C-3EC4-4F78-8970-FFBFC99E167D}.Debug|x64.ActiveCfg = Debug|x64 + {93B8812C-3EC4-4F78-8970-FFBFC99E167D}.Debug|x64.Build.0 = Debug|x64 + {93B8812C-3EC4-4F78-8970-FFBFC99E167D}.Release|Win32.ActiveCfg = Release|Win32 + {93B8812C-3EC4-4F78-8970-FFBFC99E167D}.Release|Win32.Build.0 = Release|Win32 + {93B8812C-3EC4-4F78-8970-FFBFC99E167D}.Release|x64.ActiveCfg = Release|x64 + {93B8812C-3EC4-4F78-8970-FFBFC99E167D}.Release|x64.Build.0 = Release|x64 + {BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Debug|Win32.ActiveCfg = Debug|Win32 + {BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Debug|Win32.Build.0 = Debug|Win32 + {BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Debug|x64.ActiveCfg = Debug|x64 + {BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Debug|x64.Build.0 = Debug|x64 + {BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Release|Win32.ActiveCfg = Release|Win32 + {BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Release|Win32.Build.0 = Release|Win32 + {BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Release|x64.ActiveCfg = Release|x64 + {BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Release|x64.Build.0 = Release|x64 + {6DA6FD42-641D-4147-92F5-3BC4AAA6589B}.Debug|Win32.ActiveCfg = Debug|Win32 + {6DA6FD42-641D-4147-92F5-3BC4AAA6589B}.Debug|x64.ActiveCfg = Debug|x64 + {6DA6FD42-641D-4147-92F5-3BC4AAA6589B}.Release|Win32.ActiveCfg = Release|Win32 + {6DA6FD42-641D-4147-92F5-3BC4AAA6589B}.Release|x64.ActiveCfg = Release|x64 + {FE3540C5-3303-46E0-A69E-D92F775687F1}.Debug|Win32.ActiveCfg = Debug|Win32 + {FE3540C5-3303-46E0-A69E-D92F775687F1}.Debug|Win32.Build.0 = Debug|Win32 + {FE3540C5-3303-46E0-A69E-D92F775687F1}.Debug|x64.ActiveCfg = Debug|x64 + {FE3540C5-3303-46E0-A69E-D92F775687F1}.Debug|x64.Build.0 = Debug|x64 + {FE3540C5-3303-46E0-A69E-D92F775687F1}.Release|Win32.ActiveCfg = Release|Win32 + {FE3540C5-3303-46E0-A69E-D92F775687F1}.Release|Win32.Build.0 = Release|Win32 + {FE3540C5-3303-46E0-A69E-D92F775687F1}.Release|x64.ActiveCfg = Release|x64 + {FE3540C5-3303-46E0-A69E-D92F775687F1}.Release|x64.Build.0 = Release|x64 + {37C94798-6E33-4B4F-8EE0-C72A7DC91157}.Debug|Win32.ActiveCfg = Debug|Win32 + {37C94798-6E33-4B4F-8EE0-C72A7DC91157}.Debug|Win32.Build.0 = Debug|Win32 + {37C94798-6E33-4B4F-8EE0-C72A7DC91157}.Debug|x64.ActiveCfg = Debug|x64 + {37C94798-6E33-4B4F-8EE0-C72A7DC91157}.Debug|x64.Build.0 = Debug|x64 + {37C94798-6E33-4B4F-8EE0-C72A7DC91157}.Release|Win32.ActiveCfg = Release|Win32 + {37C94798-6E33-4B4F-8EE0-C72A7DC91157}.Release|Win32.Build.0 = Release|Win32 + {37C94798-6E33-4B4F-8EE0-C72A7DC91157}.Release|x64.ActiveCfg = Release|x64 + {37C94798-6E33-4B4F-8EE0-C72A7DC91157}.Release|x64.Build.0 = Release|x64 + {B3F49375-2834-4937-9D8C-4AC2EC911010}.Debug|Win32.ActiveCfg = Debug|Win32 + {B3F49375-2834-4937-9D8C-4AC2EC911010}.Debug|Win32.Build.0 = Debug|Win32 + {B3F49375-2834-4937-9D8C-4AC2EC911010}.Debug|x64.ActiveCfg = Debug|x64 + {B3F49375-2834-4937-9D8C-4AC2EC911010}.Debug|x64.Build.0 = Debug|x64 + {B3F49375-2834-4937-9D8C-4AC2EC911010}.Release|Win32.ActiveCfg = Release|Win32 + {B3F49375-2834-4937-9D8C-4AC2EC911010}.Release|Win32.Build.0 = Release|Win32 + {B3F49375-2834-4937-9D8C-4AC2EC911010}.Release|x64.ActiveCfg = Release|x64 + {B3F49375-2834-4937-9D8C-4AC2EC911010}.Release|x64.Build.0 = Release|x64 + {729344A5-D5E9-434D-8EE8-AF8C6C795D15}.Debug|Win32.ActiveCfg = Debug|Win32 + {729344A5-D5E9-434D-8EE8-AF8C6C795D15}.Debug|x64.ActiveCfg = Debug|x64 + {729344A5-D5E9-434D-8EE8-AF8C6C795D15}.Release|Win32.ActiveCfg = Release|Win32 + {729344A5-D5E9-434D-8EE8-AF8C6C795D15}.Release|x64.ActiveCfg = Release|x64 + {E886B4D5-AB4F-4092-B8F4-3B06E1E462EF}.Debug|Win32.ActiveCfg = Debug|Win32 + {E886B4D5-AB4F-4092-B8F4-3B06E1E462EF}.Debug|x64.ActiveCfg = Debug|x64 + {E886B4D5-AB4F-4092-B8F4-3B06E1E462EF}.Release|Win32.ActiveCfg = Release|Win32 + {E886B4D5-AB4F-4092-B8F4-3B06E1E462EF}.Release|x64.ActiveCfg = Release|x64 + {1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}.Debug|Win32.ActiveCfg = Debug|Win32 + {1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}.Debug|Win32.Build.0 = Debug|Win32 + {1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}.Debug|x64.ActiveCfg = Debug|x64 + {1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}.Release|Win32.ActiveCfg = Release|Win32 + {1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}.Release|x64.ActiveCfg = Release|x64 + {D021EF2A-460D-4827-A0F7-41FDECF46F1B}.Debug|Win32.ActiveCfg = Debug|Win32 + {D021EF2A-460D-4827-A0F7-41FDECF46F1B}.Debug|Win32.Build.0 = Debug|Win32 + {D021EF2A-460D-4827-A0F7-41FDECF46F1B}.Debug|x64.ActiveCfg = Debug|x64 + {D021EF2A-460D-4827-A0F7-41FDECF46F1B}.Debug|x64.Build.0 = Debug|x64 + {D021EF2A-460D-4827-A0F7-41FDECF46F1B}.Release|Win32.ActiveCfg = Release|Win32 + {D021EF2A-460D-4827-A0F7-41FDECF46F1B}.Release|Win32.Build.0 = Release|Win32 + {D021EF2A-460D-4827-A0F7-41FDECF46F1B}.Release|x64.ActiveCfg = Release|x64 + {D021EF2A-460D-4827-A0F7-41FDECF46F1B}.Release|x64.Build.0 = Release|x64 + {2B1BAF36-0241-43E7-B865-A8338AD48E2E}.Debug|Win32.ActiveCfg = Debug|Win32 + {2B1BAF36-0241-43E7-B865-A8338AD48E2E}.Debug|Win32.Build.0 = Debug|Win32 + {2B1BAF36-0241-43E7-B865-A8338AD48E2E}.Debug|x64.ActiveCfg = Debug|x64 + {2B1BAF36-0241-43E7-B865-A8338AD48E2E}.Debug|x64.Build.0 = Debug|x64 + {2B1BAF36-0241-43E7-B865-A8338AD48E2E}.Release|Win32.ActiveCfg = Release|Win32 + {2B1BAF36-0241-43E7-B865-A8338AD48E2E}.Release|Win32.Build.0 = Release|Win32 + {2B1BAF36-0241-43E7-B865-A8338AD48E2E}.Release|x64.ActiveCfg = Release|x64 + {2B1BAF36-0241-43E7-B865-A8338AD48E2E}.Release|x64.Build.0 = Release|x64 + {0DA69C18-4FA1-4E8C-89CE-12498637C5BE}.Debug|Win32.ActiveCfg = Debug|Win32 + {0DA69C18-4FA1-4E8C-89CE-12498637C5BE}.Debug|Win32.Build.0 = Debug|Win32 + {0DA69C18-4FA1-4E8C-89CE-12498637C5BE}.Debug|x64.ActiveCfg = Debug|x64 + {0DA69C18-4FA1-4E8C-89CE-12498637C5BE}.Debug|x64.Build.0 = Debug|x64 + {0DA69C18-4FA1-4E8C-89CE-12498637C5BE}.Release|Win32.ActiveCfg = Release|Win32 + {0DA69C18-4FA1-4E8C-89CE-12498637C5BE}.Release|Win32.Build.0 = Release|Win32 + {0DA69C18-4FA1-4E8C-89CE-12498637C5BE}.Release|x64.ActiveCfg = Release|x64 + {0DA69C18-4FA1-4E8C-89CE-12498637C5BE}.Release|x64.Build.0 = Release|x64 + {B2AF4EA6-0CD7-4529-9EB5-5AF43DB90395}.Debug|Win32.ActiveCfg = Debug|Win32 + {B2AF4EA6-0CD7-4529-9EB5-5AF43DB90395}.Debug|x64.ActiveCfg = Debug|x64 + {B2AF4EA6-0CD7-4529-9EB5-5AF43DB90395}.Release|Win32.ActiveCfg = Release|Win32 + {B2AF4EA6-0CD7-4529-9EB5-5AF43DB90395}.Release|x64.ActiveCfg = Release|x64 + {08C3EA27-A51D-47F8-B47D-B189C649CF30}.Debug|Win32.ActiveCfg = Debug|Win32 + {08C3EA27-A51D-47F8-B47D-B189C649CF30}.Debug|x64.ActiveCfg = Debug|x64 + {08C3EA27-A51D-47F8-B47D-B189C649CF30}.Release|Win32.ActiveCfg = Release|Win32 + {08C3EA27-A51D-47F8-B47D-B189C649CF30}.Release|x64.ActiveCfg = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.2012.vcxproj b/libs/freetdm/mod_freetdm/mod_freetdm.2012.vcxproj new file mode 100644 index 0000000000..c89130912f --- /dev/null +++ b/libs/freetdm/mod_freetdm/mod_freetdm.2012.vcxproj @@ -0,0 +1,221 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + mod_freetdm + {FE3540C5-3303-46E0-A69E-D92F775687F1} + mod_freetdm + Win32Proj + + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)$(PlatformName)\$(Configuration)\mod\ + $(Platform)\$(Configuration)\ + true + $(SolutionDir)$(PlatformName)\$(Configuration)\mod\ + $(Platform)\$(Configuration)\ + false + $(SolutionDir)$(PlatformName)\$(Configuration)\mod\ + $(Platform)\$(Configuration)\ + true + $(SolutionDir)$(PlatformName)\$(Configuration)\mod\ + $(Platform)\$(Configuration)\ + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + Disabled + ../../../src/include;../src/include;../../curl/include;../src/isdn/include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level4 + true + ProgramDatabase + + + FreeSwitchCore.lib;%(AdditionalDependencies) + ../../../$(PlatformName)\$(Configuration);%(AdditionalLibraryDirectories) + true + $(OutDir)$(TargetName).pdb + Windows + false + + + $(OutDir)mod_freetdm.lib + MachineX86 + + + + + ../../../src/include;../src/include;../../curl/include;../src/isdn/include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level4 + true + ProgramDatabase + + + FreeSwitchCore.lib;%(AdditionalDependencies) + ../../../$(PlatformName)\$(Configuration);%(AdditionalLibraryDirectories) + true + $(OutDir)$(TargetName).pdb + Windows + true + true + UseLinkTimeCodeGeneration + false + + + $(OutDir)mod_freetdm.lib + MachineX86 + + + + + X64 + + + Disabled + ../../../src/include;../src/include;../../curl/include;../src/isdn/include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level4 + true + ProgramDatabase + + + FreeSwitchCore.lib;%(AdditionalDependencies) + ../../../$(PlatformName)\$(Configuration);%(AdditionalLibraryDirectories) + true + $(OutDir)$(TargetName).pdb + Windows + false + + + $(OutDir)mod_freetdm.lib + MachineX64 + + + + + X64 + + + ../../../src/include;../src/include;../../curl/include;../src/isdn/include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level4 + true + ProgramDatabase + + + FreeSwitchCore.lib;%(AdditionalDependencies) + ../../../$(PlatformName)\$(Configuration);%(AdditionalLibraryDirectories) + true + $(OutDir)$(TargetName).pdb + Windows + true + true + UseLinkTimeCodeGeneration + false + + + $(OutDir)mod_freetdm.lib + MachineX64 + + + + + + + + {93b8812c-3ec4-4f78-8970-ffbfc99e167d} + false + + + + + + \ No newline at end of file diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.2012.vcxproj.filters b/libs/freetdm/mod_freetdm/mod_freetdm.2012.vcxproj.filters new file mode 100644 index 0000000000..92ac5ead47 --- /dev/null +++ b/libs/freetdm/mod_freetdm/mod_freetdm.2012.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + \ No newline at end of file diff --git a/libs/freetdm/msvc/freetdm.2012.vcxproj b/libs/freetdm/msvc/freetdm.2012.vcxproj new file mode 100644 index 0000000000..e07a5ce072 --- /dev/null +++ b/libs/freetdm/msvc/freetdm.2012.vcxproj @@ -0,0 +1,230 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + freetdm + {93B8812C-3EC4-4F78-8970-FFBFC99E167D} + freetdm + Win32Proj + + + + DynamicLibrary + MultiByte + true + v110 + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + true + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + $(IntDir)BuildLog-freetdm.htm + + + Disabled + ../src/include;../src/include/private;../src/isdn/include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FREETDM_EXPORTS;TELETONE_EXPORTS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + false + + + Level4 + true + ProgramDatabase + CompileAsC + + + true + + + + + $(IntDir)BuildLog-freetdm.htm + + + ../src/include;../src/include/private;../src/isdn/include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FREETDM_EXPORTS;TELETONE_EXPORTS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + MultiThreadedDLL + false + false + + + Level4 + true + ProgramDatabase + CompileAsC + + + + + $(IntDir)BuildLog-freetdm.htm + + + X64 + + + Disabled + ../src/include;../src/include/private;../src/isdn/include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FREETDM_EXPORTS;TELETONE_EXPORTS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + false + + + Level4 + true + ProgramDatabase + CompileAsC + + + true + MachineX64 + + + + + $(IntDir)BuildLog-freetdm.htm + + + X64 + + + ../src/include;../src/include/private;../src/isdn/include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FREETDM_EXPORTS;TELETONE_EXPORTS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + MultiThreadedDLL + false + false + + + Level4 + true + ProgramDatabase + CompileAsC + + + MachineX64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libs/freetdm/msvc/freetdm.2012.vcxproj.filters b/libs/freetdm/msvc/freetdm.2012.vcxproj.filters new file mode 100644 index 0000000000..9f15c9c737 --- /dev/null +++ b/libs/freetdm/msvc/freetdm.2012.vcxproj.filters @@ -0,0 +1,137 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + diff --git a/libs/freetdm/msvc/testanalog/testanalog.2012.vcxproj b/libs/freetdm/msvc/testanalog/testanalog.2012.vcxproj new file mode 100644 index 0000000000..5276eafa7b --- /dev/null +++ b/libs/freetdm/msvc/testanalog/testanalog.2012.vcxproj @@ -0,0 +1,217 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + testanalog + {BB833648-BAFF-4BE2-94DB-F8BB043C588C} + testanalog + Win32Proj + + + + Application + Unicode + true + v110 + + + Application + Unicode + v110 + + + Application + Unicode + true + v110 + + + Application + Unicode + v110 + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + $(IntDir)BuildLog-testanalog.htm + + + Disabled + ../../src/include;../../src/isdn/include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level4 + true + EditAndContinue + 4100;%(DisableSpecificWarnings) + + + true + Console + false + + + MachineX86 + + + + + $(IntDir)BuildLog-testanalog.htm + + + ../../src/include;../../src/isdn/include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level4 + true + ProgramDatabase + 4100;%(DisableSpecificWarnings) + + + true + Console + true + true + false + + + MachineX86 + + + + + $(IntDir)BuildLog-testanalog.htm + + + X64 + + + Disabled + ../../src/include;../../src/isdn/include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level4 + true + ProgramDatabase + 4100;%(DisableSpecificWarnings) + + + true + Console + false + + + MachineX64 + + + + + $(IntDir)BuildLog-testanalog.htm + + + X64 + + + ../../src/include;../../src/isdn/include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level4 + true + ProgramDatabase + 4100;%(DisableSpecificWarnings) + + + true + Console + true + true + false + + + MachineX64 + + + + + + + + {93b8812c-3ec4-4f78-8970-ffbfc99e167d} + false + + + + + + \ No newline at end of file diff --git a/libs/freetdm/msvc/testanalog/testanalog.2012.vcxproj.filters b/libs/freetdm/msvc/testanalog/testanalog.2012.vcxproj.filters new file mode 100644 index 0000000000..7ac3635cc5 --- /dev/null +++ b/libs/freetdm/msvc/testanalog/testanalog.2012.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + \ No newline at end of file diff --git a/libs/freetdm/msvc/testisdn/testisdn.2012.vcxproj b/libs/freetdm/msvc/testisdn/testisdn.2012.vcxproj new file mode 100644 index 0000000000..61f4759f1b --- /dev/null +++ b/libs/freetdm/msvc/testisdn/testisdn.2012.vcxproj @@ -0,0 +1,217 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + testisdn + {6DA6FD42-641D-4147-92F5-3BC4AAA6589B} + testisdn + Win32Proj + + + + Application + Unicode + true + v110 + + + Application + Unicode + v110 + + + Application + Unicode + true + v110 + + + Application + Unicode + v110 + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + $(IntDir)BuildLog-testisdn.htm + + + Disabled + ../../src/include;../../src/isdn/include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level4 + true + EditAndContinue + 4100;%(DisableSpecificWarnings) + + + true + Console + false + + + MachineX86 + + + + + $(IntDir)BuildLog-testisdn.htm + + + ../../src/include;../../src/isdn/include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level4 + true + ProgramDatabase + 4100;%(DisableSpecificWarnings) + + + true + Console + true + true + false + + + MachineX86 + + + + + $(IntDir)BuildLog-testisdn.htm + + + X64 + + + Disabled + ../../src/include;../../src/isdn/include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level4 + true + ProgramDatabase + 4100;%(DisableSpecificWarnings) + + + true + Console + false + + + MachineX64 + + + + + $(IntDir)BuildLog-testisdn.htm + + + X64 + + + ../../src/include;../../src/isdn/include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level4 + true + ProgramDatabase + 4100;%(DisableSpecificWarnings) + + + true + Console + true + true + false + + + MachineX64 + + + + + + + + {93b8812c-3ec4-4f78-8970-ffbfc99e167d} + false + + + + + + \ No newline at end of file diff --git a/libs/freetdm/msvc/testisdn/testisdn.2012.vcxproj.filters b/libs/freetdm/msvc/testisdn/testisdn.2012.vcxproj.filters new file mode 100644 index 0000000000..9d48828d4a --- /dev/null +++ b/libs/freetdm/msvc/testisdn/testisdn.2012.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + \ No newline at end of file diff --git a/libs/freetdm/src/ftmod/ftmod_analog/ftmod_analog.2012.vcxproj b/libs/freetdm/src/ftmod/ftmod_analog/ftmod_analog.2012.vcxproj new file mode 100644 index 0000000000..03589c2300 --- /dev/null +++ b/libs/freetdm/src/ftmod/ftmod_analog/ftmod_analog.2012.vcxproj @@ -0,0 +1,202 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + ftmod_analog + {37C94798-6E33-4B4F-8EE0-C72A7DC91157} + ftmod_analog + Win32Proj + + + + DynamicLibrary + Unicode + true + v110 + + + DynamicLibrary + Unicode + v110 + + + DynamicLibrary + Unicode + true + v110 + + + DynamicLibrary + Unicode + v110 + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + Disabled + ..\..\include;..\..\isdn\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level4 + true + EditAndContinue + 4100;%(DisableSpecificWarnings) + + + true + Windows + MachineX86 + + + + + MaxSpeed + true + ..\..\include;..\..\isdn\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level4 + true + ProgramDatabase + 4100;%(DisableSpecificWarnings) + + + true + Windows + true + true + MachineX86 + + + + + X64 + + + Disabled + ..\..\include;..\..\isdn\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level4 + false + ProgramDatabase + 4100;%(DisableSpecificWarnings) + + + true + Windows + MachineX64 + + + + + X64 + + + MaxSpeed + true + ..\..\include;..\..\isdn\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level4 + false + ProgramDatabase + 4100;%(DisableSpecificWarnings) + + + true + Windows + true + true + MachineX64 + + + + + + + + + + + {93b8812c-3ec4-4f78-8970-ffbfc99e167d} + false + + + + + + \ No newline at end of file diff --git a/libs/freetdm/src/ftmod/ftmod_analog/ftmod_analog.2012.vcxproj.filters b/libs/freetdm/src/ftmod/ftmod_analog/ftmod_analog.2012.vcxproj.filters new file mode 100644 index 0000000000..b6fed5927a --- /dev/null +++ b/libs/freetdm/src/ftmod/ftmod_analog/ftmod_analog.2012.vcxproj.filters @@ -0,0 +1,23 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Source Files + + + + + Header Files + + + \ No newline at end of file diff --git a/libs/freetdm/src/ftmod/ftmod_analog_em/ftmod_analog_em.2012.vcxproj b/libs/freetdm/src/ftmod/ftmod_analog_em/ftmod_analog_em.2012.vcxproj new file mode 100644 index 0000000000..14c0021092 --- /dev/null +++ b/libs/freetdm/src/ftmod/ftmod_analog_em/ftmod_analog_em.2012.vcxproj @@ -0,0 +1,202 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + ftmod_analog_em + {B3F49375-2834-4937-9D8C-4AC2EC911010} + ftmod_analog_em + Win32Proj + + + + DynamicLibrary + Unicode + true + v110 + + + DynamicLibrary + Unicode + v110 + + + DynamicLibrary + Unicode + true + v110 + + + DynamicLibrary + Unicode + v110 + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + Disabled + ..\..\include;..\..\isdn\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EM_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level4 + true + EditAndContinue + 4100;%(DisableSpecificWarnings) + + + true + Windows + MachineX86 + + + + + MaxSpeed + true + ..\..\include;..\..\isdn\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EM_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level4 + true + ProgramDatabase + 4100;%(DisableSpecificWarnings) + + + true + Windows + true + true + MachineX86 + + + + + X64 + + + Disabled + ..\..\include;..\..\isdn\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EM_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level4 + false + ProgramDatabase + 4100;%(DisableSpecificWarnings) + + + true + Windows + MachineX64 + + + + + X64 + + + MaxSpeed + true + ..\..\include;..\..\isdn\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EM_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level4 + false + ProgramDatabase + 4100;%(DisableSpecificWarnings) + + + true + Windows + true + true + MachineX64 + + + + + + + + + + + {93b8812c-3ec4-4f78-8970-ffbfc99e167d} + false + + + + + + \ No newline at end of file diff --git a/libs/freetdm/src/ftmod/ftmod_analog_em/ftmod_analog_em.2012.vcxproj.filters b/libs/freetdm/src/ftmod/ftmod_analog_em/ftmod_analog_em.2012.vcxproj.filters new file mode 100644 index 0000000000..3326f9fd16 --- /dev/null +++ b/libs/freetdm/src/ftmod/ftmod_analog_em/ftmod_analog_em.2012.vcxproj.filters @@ -0,0 +1,23 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Source Files + + + + + Header Files + + + \ No newline at end of file diff --git a/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.2012.vcxproj b/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.2012.vcxproj new file mode 100644 index 0000000000..cf2344c4ec --- /dev/null +++ b/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.2012.vcxproj @@ -0,0 +1,227 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + ftmod_isdn + {729344A5-D5E9-434D-8EE8-AF8C6C795D15} + ftmod_isdn + Win32Proj + + + + DynamicLibrary + Unicode + true + v110 + + + DynamicLibrary + Unicode + v110 + + + DynamicLibrary + Unicode + true + v110 + + + DynamicLibrary + Unicode + v110 + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + Disabled + ..\..\isdn\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_ISDN_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level4 + true + EditAndContinue + + + true + Windows + MachineX86 + + + + + MaxSpeed + true + ..\..\isdn\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_ISDN_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level4 + true + ProgramDatabase + + + true + Windows + true + true + MachineX86 + + + + + X64 + + + Disabled + ..\..\isdn\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_ISDN_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level4 + true + ProgramDatabase + + + true + Windows + MachineX64 + + + + + X64 + + + MaxSpeed + true + ..\..\isdn\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_ISDN_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level4 + true + ProgramDatabase + + + true + Windows + true + true + MachineX64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {93b8812c-3ec4-4f78-8970-ffbfc99e167d} + false + + + + + + \ No newline at end of file diff --git a/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.2012.vcxproj.filters b/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.2012.vcxproj.filters new file mode 100644 index 0000000000..30824888fc --- /dev/null +++ b/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.2012.vcxproj.filters @@ -0,0 +1,110 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/libs/freetdm/src/ftmod/ftmod_pika/ftmod_pika.2012.vcxproj b/libs/freetdm/src/ftmod/ftmod_pika/ftmod_pika.2012.vcxproj new file mode 100644 index 0000000000..c17deb8795 --- /dev/null +++ b/libs/freetdm/src/ftmod/ftmod_pika/ftmod_pika.2012.vcxproj @@ -0,0 +1,202 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + ftmod_pika + {E886B4D5-AB4F-4092-B8F4-3B06E1E462EF} + ftmod_pika + Win32Proj + + + + DynamicLibrary + Unicode + true + v110 + + + DynamicLibrary + Unicode + v110 + + + DynamicLibrary + Unicode + true + v110 + + + DynamicLibrary + Unicode + v110 + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + Disabled + ..\..\isdn\include;..\..\include;..\..\..\pika\aoh\inc;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_PIKA_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + pikahmpapi.lib;%(AdditionalDependencies) + ..\..\..\pika\aoh\lib;%(AdditionalLibraryDirectories) + true + Windows + MachineX86 + + + + + MaxSpeed + true + ..\..\isdn\include;..\..\include;..\..\..\pika\aoh\inc;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_PIKA_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + pikahmpapi.lib;%(AdditionalDependencies) + ..\..\..\pika\aoh\lib;%(AdditionalLibraryDirectories) + true + Windows + true + true + MachineX86 + + + + + X64 + + + Disabled + ..\..\isdn\include;..\..\include;..\..\..\pika\aoh\inc;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_PIKA_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + pikahmpapi.lib;%(AdditionalDependencies) + ..\..\..\pika\aoh\lib;%(AdditionalLibraryDirectories) + true + Windows + MachineX64 + + + + + X64 + + + MaxSpeed + true + ..\..\isdn\include;..\..\include;..\..\..\pika\aoh\inc;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_PIKA_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + pikahmpapi.lib;%(AdditionalDependencies) + ..\..\..\pika\aoh\lib;%(AdditionalLibraryDirectories) + true + Windows + true + true + MachineX64 + + + + + + + + + + + {93b8812c-3ec4-4f78-8970-ffbfc99e167d} + false + + + + + + \ No newline at end of file diff --git a/libs/freetdm/src/ftmod/ftmod_pika/ftmod_pika.2012.vcxproj.filters b/libs/freetdm/src/ftmod/ftmod_pika/ftmod_pika.2012.vcxproj.filters new file mode 100644 index 0000000000..4d4cec4668 --- /dev/null +++ b/libs/freetdm/src/ftmod/ftmod_pika/ftmod_pika.2012.vcxproj.filters @@ -0,0 +1,23 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Source Files + + + + + Header Files + + + \ No newline at end of file diff --git a/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.2012.vcxproj b/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.2012.vcxproj new file mode 100644 index 0000000000..b95d13a02f --- /dev/null +++ b/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.2012.vcxproj @@ -0,0 +1,163 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + ftmod_r2 + {08C3EA27-A51D-47F8-B47D-B189C649CF30} + Win32Proj + + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + true + true + true + true + AllRules.ruleset + AllRules.ruleset + + + + + AllRules.ruleset + AllRules.ruleset + + + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\ + + + + Disabled + ..\..\include;c:\Program Files\openr2\include\openr2;C:\Program Files\openr2\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_R2_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + freetdm.lib;openr2.lib;%(AdditionalDependencies) + C:\Program Files\openr2\lib;$(OutDir);%(AdditionalLibraryDirectories) + true + Windows + MachineX86 + + + + + Disabled + ..\..\include;c:\Program Files\openr2\include\openr2;C:\Program Files\openr2\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_R2_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + freetdm.lib;openr2.lib;%(AdditionalDependencies) + C:\Program Files\openr2\lib;$(OutDir);%(AdditionalLibraryDirectories) + true + Windows + + + + + ..\..\include;C:\Program Files\openr2\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_R2_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + true + Windows + true + true + MachineX86 + + + + + ..\..\include;C:\Program Files\openr2\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_R2_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + true + Windows + true + true + + + + + + + + + \ No newline at end of file diff --git a/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.2012.vcxproj.filters b/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.2012.vcxproj.filters new file mode 100644 index 0000000000..9c91228e09 --- /dev/null +++ b/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.2012.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + \ No newline at end of file diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.2010.vcxproj b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.2010.vcxproj index 7ec8fd3346..102e7efe92 100644 --- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.2010.vcxproj +++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.2010.vcxproj @@ -28,16 +28,20 @@ DynamicLibrary true + v110 DynamicLibrary true + v110 DynamicLibrary + v110 DynamicLibrary + v110 @@ -200,4 +204,4 @@ - + \ No newline at end of file diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.2012.vcxproj b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.2012.vcxproj new file mode 100644 index 0000000000..102e7efe92 --- /dev/null +++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.2012.vcxproj @@ -0,0 +1,207 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + ftmod_sangoma_isdn + {B2AF4EA6-0CD7-4529-9EB5-5AF43DB90395} + ftmod_sangoma_isdn + Win32Proj + + + + DynamicLibrary + true + v110 + + + DynamicLibrary + true + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)$(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + true + $(SolutionDir)$(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Configuration)\ + true + true + AllRules.ruleset + AllRules.ruleset + + + + + AllRules.ruleset + AllRules.ruleset + + + + + + + + Disabled + C:\Program Files\sangoma\sng_isdn\include;../../include;C:\Program Files\Sangoma\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + EnableFastChecks + + + Level3 + EditAndContinue + MultiThreadedDebugDLL + + + freetdm.lib;libsng_isdn.lib;%(AdditionalDependencies) + $(OutDir);C:\Program Files\sangoma\sng_isdn\lib;C:\Program Files\Sangoma\api\lib\x86;%(AdditionalLibraryDirectories) + true + Console + false + + + MachineX86 + + + + + Disabled + C:\Program Files\sangoma\sng_isdn\include;../../include;C:\Program Files\Sangoma\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + EnableFastChecks + + + Level3 + ProgramDatabase + MultiThreadedDebugDLL + + + freetdm.lib;libsng_isdn.lib;%(AdditionalDependencies) + $(OutDir);C:\Program Files\libsng_isdn\lib;C:\Program Files\Sangoma\api\lib\x86;%(AdditionalLibraryDirectories) + true + Console + false + + + + + + + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDLL + + + Level3 + ProgramDatabase + C:\Program Files\sangoma\sng_isdn\include;../../include;C:\Program Files\Sangoma\include;%(AdditionalIncludeDirectories) + Disabled + + + true + Windows + true + true + MachineX86 + freetdm.lib;libsng_isdn.lib;%(AdditionalDependencies) + $(OutDir);C:\Program Files\sangoma\sng_isdn\lib;C:\Program Files\Sangoma\api\lib\x86;%(AdditionalLibraryDirectories) + + + + + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDLL + + + Level3 + ProgramDatabase + C:\Program Files\sangoma\sng_isdn\include;../../include;C:\Program Files\Sangoma\include;%(AdditionalIncludeDirectories) + + + true + Windows + true + true + freetdm.lib;libsng_isdn.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + + + + {93b8812c-3ec4-4f78-8970-ffbfc99e167d} + false + + + + + + \ No newline at end of file diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.2012.vcxproj.filters b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.2012.vcxproj.filters new file mode 100644 index 0000000000..b3f44b428c --- /dev/null +++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.2012.vcxproj.filters @@ -0,0 +1,60 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.2012.vcxproj b/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.2012.vcxproj new file mode 100644 index 0000000000..c91e4dc92a --- /dev/null +++ b/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.2012.vcxproj @@ -0,0 +1,205 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + ftmod_wanpipe + {1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD} + ftmod_wanpipe + Win32Proj + + + + DynamicLibrary + MultiByte + true + v110 + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + true + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + Disabled + ../../include;C:\Program Files\Sangoma\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + libsangoma.lib;%(AdditionalDependencies) + $(OutDir);C:\Program Files\Sangoma\api\lib\x86;%(AdditionalLibraryDirectories) + true + Console + false + + + MachineX86 + + + + + X64 + + + Disabled + ../../include;C:\Program Files\Sangoma\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + libsangoma.lib;%(AdditionalDependencies) + $(OutDir);C:\Program Files\Sangoma\api\lib\x64;%(AdditionalLibraryDirectories) + true + Console + false + + + MachineX64 + + + + + ../../include;C:\Program Files\Sangoma\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + libsangoma.lib;%(AdditionalDependencies) + $(OutDir);C:\Program Files\Sangoma\api\lib\x86;%(AdditionalLibraryDirectories) + true + Console + true + true + false + + + MachineX86 + + + + + X64 + + + ../../include;C:\Program Files\Sangoma\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + libsangoma.lib;%(AdditionalDependencies) + $(OutDir);C:\Program Files\Sangoma\api\lib\x64;%(AdditionalLibraryDirectories) + true + Console + true + true + false + + + MachineX64 + + + + + + + + {93b8812c-3ec4-4f78-8970-ffbfc99e167d} + false + + + + + + \ No newline at end of file diff --git a/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.2012.vcxproj.filters b/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.2012.vcxproj.filters new file mode 100644 index 0000000000..15a8bc3d35 --- /dev/null +++ b/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.2012.vcxproj.filters @@ -0,0 +1,18 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Source Files + + + \ No newline at end of file From e75497c98d7b01b1b1666ee52ae6cbc3475e35e1 Mon Sep 17 00:00:00 2001 From: Jeff Lenk Date: Wed, 1 Jan 2014 12:08:40 -0600 Subject: [PATCH 38/43] revert accidental change in last commit for freetdm sang isdn --- .../ftmod_sangoma_isdn/ftmod_sangoma_isdn.2010.vcxproj | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.2010.vcxproj b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.2010.vcxproj index 102e7efe92..7ec8fd3346 100644 --- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.2010.vcxproj +++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.2010.vcxproj @@ -28,20 +28,16 @@ DynamicLibrary true - v110 DynamicLibrary true - v110 DynamicLibrary - v110 DynamicLibrary - v110 @@ -204,4 +200,4 @@ - \ No newline at end of file + From 7ebb663ce6b8936ab05acc9439f4e34111f5b6aa Mon Sep 17 00:00:00 2001 From: Jeff Lenk Date: Thu, 2 Jan 2014 17:51:09 -0600 Subject: [PATCH 39/43] FS-5401 --resolve whitespace only --- src/mod/applications/mod_avmd/mod_avmd.c | 614 +++++++++++------------ 1 file changed, 307 insertions(+), 307 deletions(-) diff --git a/src/mod/applications/mod_avmd/mod_avmd.c b/src/mod/applications/mod_avmd/mod_avmd.c index 68c72755fc..dffa78cd73 100644 --- a/src/mod/applications/mod_avmd/mod_avmd.c +++ b/src/mod/applications/mod_avmd/mod_avmd.c @@ -98,28 +98,28 @@ SWITCH_STANDARD_APP(avmd_start_function); /*! Status of the beep detection */ typedef enum { - BEEP_DETECTED, - BEEP_NOTDETECTED + BEEP_DETECTED, + BEEP_NOTDETECTED } avmd_beep_state_t; /*! Data related to the current status of the beep */ typedef struct { - avmd_beep_state_t beep_state; - size_t last_beep; + avmd_beep_state_t beep_state; + size_t last_beep; } avmd_state_t; /*! Type that holds session information pertinent to the avmd module. */ typedef struct { - /*! Internal FreeSWITCH session. */ - switch_core_session_t *session; - uint32_t rate; - circ_buffer_t b; - sma_buffer_t sma_b; - sma_buffer_t sqa_b; - size_t pos; - double f; - /* freq_table_t ft; */ - avmd_state_t state; + /*! Internal FreeSWITCH session. */ + switch_core_session_t *session; + uint32_t rate; + circ_buffer_t b; + sma_buffer_t sma_b; + sma_buffer_t sqa_b; + size_t pos; + double f; + /* freq_table_t ft; */ + avmd_state_t state; } avmd_session_t; static void avmd_process(avmd_session_t *session, switch_frame_t *frame); @@ -135,26 +135,26 @@ static void init_avmd_session_data(avmd_session_t *avmd_session, switch_core_se static void init_avmd_session_data(avmd_session_t *avmd_session, switch_core_session_t *fs_session) { /*! This is a worst case sample rate estimate */ - avmd_session->rate = 48000; - INIT_CIRC_BUFFER(&avmd_session->b, BEEP_LEN(avmd_session->rate), FRAME_LEN(avmd_session->rate), fs_session); + avmd_session->rate = 48000; + INIT_CIRC_BUFFER(&avmd_session->b, BEEP_LEN(avmd_session->rate), FRAME_LEN(avmd_session->rate), fs_session); - avmd_session->session = fs_session; - avmd_session->pos = 0; - avmd_session->f = 0.0; - avmd_session->state.last_beep = 0; - avmd_session->state.beep_state = BEEP_NOTDETECTED; + avmd_session->session = fs_session; + avmd_session->pos = 0; + avmd_session->f = 0.0; + avmd_session->state.last_beep = 0; + avmd_session->state.beep_state = BEEP_NOTDETECTED; - INIT_SMA_BUFFER( - &avmd_session->sma_b, - BEEP_LEN(avmd_session->rate) / SINE_LEN(avmd_session->rate), - fs_session - ); + INIT_SMA_BUFFER( + &avmd_session->sma_b, + BEEP_LEN(avmd_session->rate) / SINE_LEN(avmd_session->rate), + fs_session + ); - INIT_SMA_BUFFER( - &avmd_session->sqa_b, - BEEP_LEN(avmd_session->rate) / SINE_LEN(avmd_session->rate), - fs_session - ); + INIT_SMA_BUFFER( + &avmd_session->sqa_b, + BEEP_LEN(avmd_session->rate) / SINE_LEN(avmd_session->rate), + fs_session + ); } @@ -168,42 +168,42 @@ static void init_avmd_session_data(avmd_session_t *avmd_session, switch_core_se */ static switch_bool_t avmd_callback(switch_media_bug_t * bug, void *user_data, switch_abc_type_t type) { - avmd_session_t *avmd_session; - switch_codec_t *read_codec; - switch_frame_t *frame; + avmd_session_t *avmd_session; + switch_codec_t *read_codec; + switch_frame_t *frame; - avmd_session = (avmd_session_t *) user_data; - if (avmd_session == NULL) { - return SWITCH_FALSE; - } + avmd_session = (avmd_session_t *) user_data; + if (avmd_session == NULL) { + return SWITCH_FALSE; + } - switch (type) { + switch (type) { - case SWITCH_ABC_TYPE_INIT: - read_codec = switch_core_session_get_read_codec(avmd_session->session); - avmd_session->rate = read_codec->implementation->samples_per_second; - /* avmd_session->vmd_codec.channels = read_codec->implementation->number_of_channels; */ - break; + case SWITCH_ABC_TYPE_INIT: + read_codec = switch_core_session_get_read_codec(avmd_session->session); + avmd_session->rate = read_codec->implementation->samples_per_second; + /* avmd_session->vmd_codec.channels = read_codec->implementation->number_of_channels; */ + break; - case SWITCH_ABC_TYPE_READ_PING: - case SWITCH_ABC_TYPE_CLOSE: - case SWITCH_ABC_TYPE_READ: - case SWITCH_ABC_TYPE_WRITE: - case SWITCH_ABC_TYPE_TAP_NATIVE_READ: - case SWITCH_ABC_TYPE_TAP_NATIVE_WRITE: - break; + case SWITCH_ABC_TYPE_READ_PING: + case SWITCH_ABC_TYPE_CLOSE: + case SWITCH_ABC_TYPE_READ: + case SWITCH_ABC_TYPE_WRITE: + case SWITCH_ABC_TYPE_TAP_NATIVE_READ: + case SWITCH_ABC_TYPE_TAP_NATIVE_WRITE: + break; - case SWITCH_ABC_TYPE_READ_REPLACE: - frame = switch_core_media_bug_get_read_replace_frame(bug); - avmd_process(avmd_session, frame); - return SWITCH_TRUE; + case SWITCH_ABC_TYPE_READ_REPLACE: + frame = switch_core_media_bug_get_read_replace_frame(bug); + avmd_process(avmd_session, frame); + return SWITCH_TRUE; - case SWITCH_ABC_TYPE_WRITE_REPLACE: - break; - } + case SWITCH_ABC_TYPE_WRITE_REPLACE: + break; + } - return SWITCH_TRUE; + return SWITCH_TRUE; } /*! \brief FreeSWITCH module loading function @@ -214,40 +214,40 @@ static switch_bool_t avmd_callback(switch_media_bug_t * bug, void *user_data, sw SWITCH_MODULE_LOAD_FUNCTION(mod_avmd_load) { - switch_application_interface_t *app_interface; - switch_api_interface_t *api_interface; - /* connect my internal structure to the blank pointer passed to me */ - *module_interface = switch_loadable_module_create_module_interface(pool, modname); + switch_application_interface_t *app_interface; + switch_api_interface_t *api_interface; + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = switch_loadable_module_create_module_interface(pool, modname); - switch_log_printf( - SWITCH_CHANNEL_LOG, - SWITCH_LOG_NOTICE, - "Advanced Voicemail detection enabled\n" - ); + switch_log_printf( + SWITCH_CHANNEL_LOG, + SWITCH_LOG_NOTICE, + "Advanced Voicemail detection enabled\n" + ); #ifdef FASTMATH - init_fast_acosf(); - switch_log_printf( - SWITCH_CHANNEL_LOG, - SWITCH_LOG_NOTICE, - "Advanced Voicemail detection: fast math enabled\n" - ); + init_fast_acosf(); + switch_log_printf( + SWITCH_CHANNEL_LOG, + SWITCH_LOG_NOTICE, + "Advanced Voicemail detection: fast math enabled\n" + ); #endif - SWITCH_ADD_APP( - app_interface, - "avmd", - "Beep detection", - "Advanced detection of voicemail beeps", - avmd_start_function, - "[start] [stop]", - SAF_NONE - ); + SWITCH_ADD_APP( + app_interface, + "avmd", + "Beep detection", + "Advanced detection of voicemail beeps", + avmd_start_function, + "[start] [stop]", + SAF_NONE + ); - SWITCH_ADD_API(api_interface, "avmd", "Voicemail beep detection", avmd_api_main, AVMD_SYNTAX); + SWITCH_ADD_API(api_interface, "avmd", "Voicemail beep detection", avmd_api_main, AVMD_SYNTAX); - /* indicate that the module should continue to be loaded */ - return SWITCH_STATUS_SUCCESS; + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; } /*! \brief FreeSWITCH application handler function. @@ -258,63 +258,63 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_avmd_load) */ SWITCH_STANDARD_APP(avmd_start_function) { - switch_media_bug_t *bug; - switch_status_t status; - switch_channel_t *channel; - avmd_session_t *avmd_session; + switch_media_bug_t *bug; + switch_status_t status; + switch_channel_t *channel; + avmd_session_t *avmd_session; - if (session == NULL) - return; + if (session == NULL) + return; - channel = switch_core_session_get_channel(session); + channel = switch_core_session_get_channel(session); - /* Is this channel already using avmd ? */ - bug = (switch_media_bug_t *) switch_channel_get_private(channel, "_avmd_"); - /* If it is using avmd */ - if (bug != NULL) { - /* If we have a stop remove audio bug */ - if (strcasecmp(data, "stop") == 0) { - switch_channel_set_private(channel, "_avmd_", NULL); - switch_core_media_bug_remove(session, &bug); - return; - } + /* Is this channel already using avmd ? */ + bug = (switch_media_bug_t *) switch_channel_get_private(channel, "_avmd_"); + /* If it is using avmd */ + if (bug != NULL) { + /* If we have a stop remove audio bug */ + if (strcasecmp(data, "stop") == 0) { + switch_channel_set_private(channel, "_avmd_", NULL); + switch_core_media_bug_remove(session, &bug); + return; + } - /* We have already started */ - switch_log_printf( - SWITCH_CHANNEL_SESSION_LOG(session), - SWITCH_LOG_WARNING, - "Cannot run 2 at once on the same channel!\n" - ); + /* We have already started */ + switch_log_printf( + SWITCH_CHANNEL_SESSION_LOG(session), + SWITCH_LOG_WARNING, + "Cannot run 2 at once on the same channel!\n" + ); - return; - } + return; + } - avmd_session = (avmd_session_t *)switch_core_session_alloc(session, sizeof(avmd_session_t)); + avmd_session = (avmd_session_t *)switch_core_session_alloc(session, sizeof(avmd_session_t)); - init_avmd_session_data(avmd_session, session); + init_avmd_session_data(avmd_session, session); - status = switch_core_media_bug_add( - session, - "avmd", - NULL, - avmd_callback, - avmd_session, - 0, - SMBF_READ_REPLACE, - &bug - ); + status = switch_core_media_bug_add( + session, + "avmd", + NULL, + avmd_callback, + avmd_session, + 0, + SMBF_READ_REPLACE, + &bug + ); - if (status != SWITCH_STATUS_SUCCESS) { - switch_log_printf( - SWITCH_CHANNEL_SESSION_LOG(session), - SWITCH_LOG_ERROR, - "Failure hooking to stream\n" - ); + if (status != SWITCH_STATUS_SUCCESS) { + switch_log_printf( + SWITCH_CHANNEL_SESSION_LOG(session), + SWITCH_LOG_ERROR, + "Failure hooking to stream\n" + ); - return; - } + return; + } - switch_channel_set_private(channel, "_avmd_", bug); + switch_channel_set_private(channel, "_avmd_", bug); } /*! \brief Called when the module shuts down @@ -326,16 +326,16 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_avmd_shutdown) { #ifdef FASTMATH - destroy_fast_acosf(); + destroy_fast_acosf(); #endif - switch_log_printf( - SWITCH_CHANNEL_LOG, - SWITCH_LOG_NOTICE, - "Advanced Voicemail detection disabled\n" - ); + switch_log_printf( + SWITCH_CHANNEL_LOG, + SWITCH_LOG_NOTICE, + "Advanced Voicemail detection disabled\n" + ); - return SWITCH_STATUS_SUCCESS; + return SWITCH_STATUS_SUCCESS; } /*! \brief FreeSWITCH API handler function. @@ -347,127 +347,127 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_avmd_shutdown) */ SWITCH_STANDARD_API(avmd_api_main) { - switch_core_session_t *fs_session = NULL; - switch_media_bug_t *bug; - avmd_session_t *avmd_session; - switch_channel_t *channel; - switch_status_t status; - int argc; - char *argv[AVMD_PARAMS]; - char *ccmd = NULL; - char *uuid; - char *command; + switch_core_session_t *fs_session = NULL; + switch_media_bug_t *bug; + avmd_session_t *avmd_session; + switch_channel_t *channel; + switch_status_t status; + int argc; + char *argv[AVMD_PARAMS]; + char *ccmd = NULL; + char *uuid; + char *command; - /* No command? Display usage */ - if (zstr(cmd)) { - stream->write_function(stream, "-USAGE: %s\n", AVMD_SYNTAX); - return SWITCH_STATUS_SUCCESS; - } + /* No command? Display usage */ + if (zstr(cmd)) { + stream->write_function(stream, "-USAGE: %s\n", AVMD_SYNTAX); + return SWITCH_STATUS_SUCCESS; + } - /* Duplicated contents of original string */ - ccmd = strdup(cmd); - /* Separate the arguments */ - argc = switch_separate_string(ccmd, ' ', argv, AVMD_PARAMS); + /* Duplicated contents of original string */ + ccmd = strdup(cmd); + /* Separate the arguments */ + argc = switch_separate_string(ccmd, ' ', argv, AVMD_PARAMS); - /* If we don't have the expected number of parameters - * display usage */ - if (argc != AVMD_PARAMS) { - stream->write_function(stream, "-USAGE: %s\n", AVMD_SYNTAX); - goto end; - } + /* If we don't have the expected number of parameters + * display usage */ + if (argc != AVMD_PARAMS) { + stream->write_function(stream, "-USAGE: %s\n", AVMD_SYNTAX); + goto end; + } - uuid = argv[0]; - command = argv[1]; + uuid = argv[0]; + command = argv[1]; - /* using uuid locate a reference to the FreeSWITCH session */ - fs_session = switch_core_session_locate(uuid); + /* using uuid locate a reference to the FreeSWITCH session */ + fs_session = switch_core_session_locate(uuid); - /* If the session was not found exit */ - if (fs_session == NULL) { - stream->write_function(stream, "-USAGE: %s\n", AVMD_SYNTAX); - goto end; - } + /* If the session was not found exit */ + if (fs_session == NULL) { + stream->write_function(stream, "-USAGE: %s\n", AVMD_SYNTAX); + goto end; + } - /* Get current channel of the session to tag the session - * This indicates that our module is present */ - channel = switch_core_session_get_channel(fs_session); + /* Get current channel of the session to tag the session + * This indicates that our module is present */ + channel = switch_core_session_get_channel(fs_session); - /* Is this channel already set? */ - bug = (switch_media_bug_t *) switch_channel_get_private(channel, "_avmd_"); - /* If yes */ - if (bug != NULL) { - /* If we have a stop remove audio bug */ - if (strcasecmp(command, "stop") == 0) { - switch_channel_set_private(channel, "_avmd_", NULL); - switch_core_media_bug_remove(fs_session, &bug); - switch_safe_free(ccmd); - stream->write_function(stream, "+OK\n"); - goto end; - } + /* Is this channel already set? */ + bug = (switch_media_bug_t *) switch_channel_get_private(channel, "_avmd_"); + /* If yes */ + if (bug != NULL) { + /* If we have a stop remove audio bug */ + if (strcasecmp(command, "stop") == 0) { + switch_channel_set_private(channel, "_avmd_", NULL); + switch_core_media_bug_remove(fs_session, &bug); + switch_safe_free(ccmd); + stream->write_function(stream, "+OK\n"); + goto end; + } - /* We have already started */ - switch_log_printf( - SWITCH_CHANNEL_SESSION_LOG(session), - SWITCH_LOG_WARNING, - "Cannot run 2 at once on the same channel!\n" - ); + /* We have already started */ + switch_log_printf( + SWITCH_CHANNEL_SESSION_LOG(session), + SWITCH_LOG_WARNING, + "Cannot run 2 at once on the same channel!\n" + ); - goto end; - } + goto end; + } - /* If we don't see the expected start exit */ - if (strcasecmp(command, "start") != 0) { - stream->write_function(stream, "-USAGE: %s\n", AVMD_SYNTAX); - goto end; - } + /* If we don't see the expected start exit */ + if (strcasecmp(command, "start") != 0) { + stream->write_function(stream, "-USAGE: %s\n", AVMD_SYNTAX); + goto end; + } - /* Allocate memory attached to this FreeSWITCH session for - * use in the callback routine and to store state information */ - avmd_session = (avmd_session_t *) switch_core_session_alloc(fs_session, sizeof(avmd_session_t)); + /* Allocate memory attached to this FreeSWITCH session for + * use in the callback routine and to store state information */ + avmd_session = (avmd_session_t *) switch_core_session_alloc(fs_session, sizeof(avmd_session_t)); - init_avmd_session_data(avmd_session, fs_session); + init_avmd_session_data(avmd_session, fs_session); - /* Add a media bug that allows me to intercept the - * reading leg of the audio stream */ - status = switch_core_media_bug_add( - fs_session, - "avmd", - NULL, - avmd_callback, - avmd_session, - 0, - SMBF_READ_REPLACE, - &bug - ); + /* Add a media bug that allows me to intercept the + * reading leg of the audio stream */ + status = switch_core_media_bug_add( + fs_session, + "avmd", + NULL, + avmd_callback, + avmd_session, + 0, + SMBF_READ_REPLACE, + &bug + ); - /* If adding a media bug fails exit */ - if (status != SWITCH_STATUS_SUCCESS) { + /* If adding a media bug fails exit */ + if (status != SWITCH_STATUS_SUCCESS) { - switch_log_printf( - SWITCH_CHANNEL_SESSION_LOG(session), - SWITCH_LOG_ERROR, - "Failure hooking to stream\n" - ); + switch_log_printf( + SWITCH_CHANNEL_SESSION_LOG(session), + SWITCH_LOG_ERROR, + "Failure hooking to stream\n" + ); - goto end; - } + goto end; + } - /* Set the vmd tag to detect an existing vmd media bug */ - switch_channel_set_private(channel, "_avmd_", bug); + /* Set the vmd tag to detect an existing vmd media bug */ + switch_channel_set_private(channel, "_avmd_", bug); - /* Everything went according to plan! Notify the user */ - stream->write_function(stream, "+OK\n"); + /* Everything went according to plan! Notify the user */ + stream->write_function(stream, "+OK\n"); end: - if (fs_session) { - switch_core_session_rwunlock(fs_session); - } + if (fs_session) { + switch_core_session_rwunlock(fs_session); + } - switch_safe_free(ccmd); + switch_safe_free(ccmd); - return SWITCH_STATUS_SUCCESS; + return SWITCH_STATUS_SUCCESS; } /*! \brief Process one frame of data with avmd algorithm @@ -477,102 +477,102 @@ end: */ static void avmd_process(avmd_session_t *session, switch_frame_t *frame) { - switch_event_t *event; - switch_status_t status; - switch_event_t *event_copy; - switch_channel_t *channel; + switch_event_t *event; + switch_status_t status; + switch_event_t *event_copy; + switch_channel_t *channel; - circ_buffer_t *b; - size_t pos; - double f; - double v; -// double error = 0.0; -// double success = 0.0; -// double amp = 0.0; -// double s_rate; -// double e_rate; -// double avg_a; - //double sine_len; - uint32_t sine_len_i; - //uint32_t beep_len_i; -// int valid; + circ_buffer_t *b; + size_t pos; + double f; + double v; + // double error = 0.0; + // double success = 0.0; + // double amp = 0.0; + // double s_rate; + // double e_rate; + // double avg_a; + //double sine_len; + uint32_t sine_len_i; + //uint32_t beep_len_i; + // int valid; b = &session->b; /*! If beep has already been detected skip the CPU heavy stuff */ - if(session->state.beep_state == BEEP_DETECTED){ - return; - } + if(session->state.beep_state == BEEP_DETECTED){ + return; + } /*! Precompute values used heavily in the inner loop */ - sine_len_i = SINE_LEN(session->rate); - //sine_len = (double)sine_len_i; - //beep_len_i = BEEP_LEN(session->rate); - - channel = switch_core_session_get_channel(session->session); + sine_len_i = SINE_LEN(session->rate); + //sine_len = (double)sine_len_i; + //beep_len_i = BEEP_LEN(session->rate); + + channel = switch_core_session_get_channel(session->session); /*! Insert frame of 16 bit samples into buffer */ - INSERT_INT16_FRAME(b, (int16_t *)(frame->data), frame->samples); + INSERT_INT16_FRAME(b, (int16_t *)(frame->data), frame->samples); - //switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session->session), SWITCH_LOG_INFO, "<<< AVMD sine_len_i=%d >>>\n", sine_len_i); + //switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session->session), SWITCH_LOG_INFO, "<<< AVMD sine_len_i=%d >>>\n", sine_len_i); - /*! INNER LOOP -- OPTIMIZATION TARGET */ - for(pos = session->pos; pos < (GET_CURRENT_POS(b) - P); pos++){ - if ((pos % sine_len_i) == 0) { - /*! Get a desa2 frequency estimate every sine len */ - f = desa2(b, pos); + /*! INNER LOOP -- OPTIMIZATION TARGET */ + for(pos = session->pos; pos < (GET_CURRENT_POS(b) - P); pos++){ + if ((pos % sine_len_i) == 0) { + /*! Get a desa2 frequency estimate every sine len */ + f = desa2(b, pos); - if(f < MIN_FREQUENCY_R(session->rate) || f > MAX_FREQUENCY_R(session->rate)) { - v = 99999.0; - RESET_SMA_BUFFER(&session->sma_b); - RESET_SMA_BUFFER(&session->sqa_b); - } else { - APPEND_SMA_VAL(&session->sma_b, f); - APPEND_SMA_VAL(&session->sqa_b, f * f); - - /* calculate variance */ - v = session->sqa_b.sma - (session->sma_b.sma * session->sma_b.sma); + if(f < MIN_FREQUENCY_R(session->rate) || f > MAX_FREQUENCY_R(session->rate)) { + v = 99999.0; + RESET_SMA_BUFFER(&session->sma_b); + RESET_SMA_BUFFER(&session->sqa_b); + } else { + APPEND_SMA_VAL(&session->sma_b, f); + APPEND_SMA_VAL(&session->sqa_b, f * f); - switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session->session), SWITCH_LOG_DEBUG, "<<< AVMD v=%f f=%f %fHz sma=%f sqa=%f >>>\n", v, f, TO_HZ(session->rate, f), session->sma_b.sma, session->sqa_b.sma); - } + /* calculate variance */ + v = session->sqa_b.sma - (session->sma_b.sma * session->sma_b.sma); - /*! If variance is less than threshold then we have detection */ - if(v < VARIANCE_THRESHOLD){ + switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session->session), SWITCH_LOG_DEBUG, "<<< AVMD v=%f f=%f %fHz sma=%f sqa=%f >>>\n", v, f, TO_HZ(session->rate, f), session->sma_b.sma, session->sqa_b.sma); + } + + /*! If variance is less than threshold then we have detection */ + if(v < VARIANCE_THRESHOLD){ switch_channel_execute_on(switch_core_session_get_channel(session->session), "execute_on_avmd_beep"); /*! Throw an event to FreeSWITCH */ - status = switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, AVMD_EVENT_BEEP); - if(status != SWITCH_STATUS_SUCCESS) { - return; - } + status = switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, AVMD_EVENT_BEEP); + if(status != SWITCH_STATUS_SUCCESS) { + return; + } - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Beep-Status", "stop"); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Unique-ID", switch_core_session_get_uuid(session->session)); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-command", "avmd"); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Beep-Status", "stop"); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Unique-ID", switch_core_session_get_uuid(session->session)); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-command", "avmd"); - if ((switch_event_dup(&event_copy, event)) != SWITCH_STATUS_SUCCESS) { - return; - } + if ((switch_event_dup(&event_copy, event)) != SWITCH_STATUS_SUCCESS) { + return; + } - switch_core_session_queue_event(session->session, &event); - switch_event_fire(&event_copy); + switch_core_session_queue_event(session->session, &event); + switch_event_fire(&event_copy); - switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session->session), SWITCH_LOG_DEBUG, "<<< AVMD - Beep Detected >>>\n"); - switch_channel_set_variable(channel, "avmd_detect", "TRUE"); - RESET_SMA_BUFFER(&session->sma_b); - RESET_SMA_BUFFER(&session->sqa_b); - session->state.beep_state = BEEP_DETECTED; + switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session->session), SWITCH_LOG_DEBUG, "<<< AVMD - Beep Detected >>>\n"); + switch_channel_set_variable(channel, "avmd_detect", "TRUE"); + RESET_SMA_BUFFER(&session->sma_b); + RESET_SMA_BUFFER(&session->sqa_b); + session->state.beep_state = BEEP_DETECTED; - return; - } + return; + } - //amp = 0.0; - //success = 0.0; - //error = 0.0; - } - } - session->pos = pos; + //amp = 0.0; + //success = 0.0; + //error = 0.0; + } + } + session->pos = pos; } /* For Emacs: From 2c5a861b033713a79517637f064ab0d8614733e8 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Fri, 3 Jan 2014 23:43:42 +0500 Subject: [PATCH 40/43] FS-6074 --resolve --- .../event_handlers/mod_event_socket/mod_event_socket.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/mod/event_handlers/mod_event_socket/mod_event_socket.c b/src/mod/event_handlers/mod_event_socket/mod_event_socket.c index 0c5cd880db..8c0c85911a 100644 --- a/src/mod/event_handlers/mod_event_socket/mod_event_socket.c +++ b/src/mod/event_handlers/mod_event_socket/mod_event_socket.c @@ -1569,12 +1569,18 @@ static switch_bool_t auth_api_command(listener_t *listener, const char *api_cmd, static switch_status_t parse_command(listener_t *listener, switch_event_t **event, char *reply, uint32_t reply_len) { switch_status_t status = SWITCH_STATUS_SUCCESS; - char *cmd = switch_event_get_header(*event, "command"); + char *cmd = NULL; char unload_cheat[] = "api bgapi unload mod_event_socket"; char reload_cheat[] = "api bgapi reload mod_event_socket"; *reply = '\0'; + if (!event || !*event || !(cmd = switch_event_get_header(*event, "command"))) { + switch_clear_flag_locked(listener, LFLAG_RUNNING); + switch_snprintf(reply, reply_len, "-ERR command parse error."); + goto done; + } + if (switch_stristr("unload", cmd) && switch_stristr("mod_event_socket", cmd)) { cmd = unload_cheat; } else if (switch_stristr("reload", cmd) && switch_stristr("mod_event_socket", cmd)) { From 3ca06e1ea7fd073dd4b81704d481148b628a7688 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Fri, 3 Jan 2014 23:45:35 +0500 Subject: [PATCH 41/43] FS-6073 --resolve --- src/switch_core_media.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/switch_core_media.c b/src/switch_core_media.c index d77e430b83..c7fec519ac 100644 --- a/src/switch_core_media.c +++ b/src/switch_core_media.c @@ -4899,14 +4899,14 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_activate_rtp(switch_core_sessi } } - if ((val = switch_channel_get_variable(session->channel, "params->rtp_timeout_sec"))) { + if ((val = switch_channel_get_variable(session->channel, "rtp_timeout_sec"))) { int v = atoi(val); if (v >= 0) { smh->mparams->rtp_timeout_sec = v; } } - if ((val = switch_channel_get_variable(session->channel, "params->rtp_hold_timeout_sec"))) { + if ((val = switch_channel_get_variable(session->channel, "rtp_hold_timeout_sec"))) { int v = atoi(val); if (v >= 0) { smh->mparams->rtp_hold_timeout_sec = v; From ae7371e7c577599174db937aa555e1ca20167551 Mon Sep 17 00:00:00 2001 From: Chris Rienzo Date: Fri, 3 Jan 2014 16:21:29 -0500 Subject: [PATCH 42/43] mod_http_cache: allow underscore in amazon s3 hostname --- src/mod/applications/mod_http_cache/aws.c | 2 +- src/mod/applications/mod_http_cache/test_aws/main.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mod/applications/mod_http_cache/aws.c b/src/mod/applications/mod_http_cache/aws.c index 17d6a233ab..cb6db5cb58 100644 --- a/src/mod/applications/mod_http_cache/aws.c +++ b/src/mod/applications/mod_http_cache/aws.c @@ -44,7 +44,7 @@ int aws_s3_is_s3_url(const char *url) { /* AWS bucket naming rules are complex... this match only supports virtual hosting of buckets */ - return !zstr(url) && switch_regex_match(url, "^https?://[a-z0-9][-a-z0-9.]{1,61}[a-z0-9]\\.s3\\.amazonaws\\.com/.*$") == SWITCH_STATUS_SUCCESS; + return !zstr(url) && switch_regex_match(url, "^https?://[a-z0-9_][-a-z0-9._]{1,61}[a-z0-9_]\\.s3\\.amazonaws\\.com/.*$") == SWITCH_STATUS_SUCCESS; } /** diff --git a/src/mod/applications/mod_http_cache/test_aws/main.c b/src/mod/applications/mod_http_cache/test_aws/main.c index 8610127bbe..6c361ca8f1 100644 --- a/src/mod/applications/mod_http_cache/test_aws/main.c +++ b/src/mod/applications/mod_http_cache/test_aws/main.c @@ -48,6 +48,7 @@ static void test_check_url(void) ASSERT_TRUE(aws_s3_is_s3_url("https://bucket.s3.amazonaws.com/object")); ASSERT_TRUE(aws_s3_is_s3_url("https://bucket.s3.amazonaws.com/recordings/1240fwjf8we.mp3")); ASSERT_TRUE(aws_s3_is_s3_url("https://bucket.s3.amazonaws.com/en/us/8000/1232345.mp3")); + ASSERT_TRUE(aws_s3_is_s3_url("https://bucket_with_underscore.s3.amazonaws.com/en/us/8000/1232345.mp3")); ASSERT_FALSE(aws_s3_is_s3_url("bucket.s3.amazonaws.com/object.ext")); ASSERT_FALSE(aws_s3_is_s3_url("https://s3.amazonaws.com/bucket/object")); ASSERT_FALSE(aws_s3_is_s3_url("http://s3.amazonaws.com/bucket/object")); From a14ad62e327634b66cf86ee59c23e295fb55e1d2 Mon Sep 17 00:00:00 2001 From: Seven Du Date: Sat, 4 Jan 2014 16:53:36 +0800 Subject: [PATCH 43/43] return +OK on success --- src/mod/applications/mod_commands/mod_commands.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/mod/applications/mod_commands/mod_commands.c b/src/mod/applications/mod_commands/mod_commands.c index be2d36cb4f..2b21821ccc 100644 --- a/src/mod/applications/mod_commands/mod_commands.c +++ b/src/mod/applications/mod_commands/mod_commands.c @@ -3187,8 +3187,13 @@ SWITCH_STANDARD_API(uuid_answer_function) if (uuid && (xsession = switch_core_session_locate(uuid))) { switch_channel_t *channel = switch_core_session_get_channel(xsession); - switch_channel_answer(channel); + switch_status_t status = switch_channel_answer(channel); switch_core_session_rwunlock(xsession); + if (status == SWITCH_STATUS_SUCCESS) { + stream->write_function(stream, "+OK\n"); + } else { + stream->write_function(stream, "-ERROR\n"); + } } else { stream->write_function(stream, "-ERROR\n"); }