Author: stkn Date: Mon Jul 24 21:16:46 2006 New Revision: 2088 Added: freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/ - copied from r2087, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/ freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/Makefile - copied unchanged from r2087, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/README - copied unchanged from r2087, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/README freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/basecdr.cpp - copied unchanged from r2087, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.cpp freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/basecdr.h - copied unchanged from r2087, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.h freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/baseregistry.cpp - copied unchanged from r2087, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/baseregistry.cpp freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/baseregistry.h - copied unchanged from r2087, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/baseregistry.h freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp - copied unchanged from r2087, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/cdrcontainer.h - copied unchanged from r2087, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.h freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/csvcdr.cpp - copied unchanged from r2087, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.cpp freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/csvcdr.h - copied unchanged from r2087, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.h freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/mod_cdr.cpp - copied unchanged from r2087, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.cpp freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj - copied unchanged from r2087, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp - copied unchanged from r2087, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/mysqlcdr.h - copied unchanged from r2087, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.h freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/pddcdr.cpp - copied unchanged from r2087, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/pddcdr.cpp freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/pddcdr.h - copied unchanged from r2087, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/pddcdr.h freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/schema-update.mysql - copied unchanged from r2087, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/schema-update.mysql freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/schema.sql - copied unchanged from r2087, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/schema.sql Modified: freeswitch/branches/stkn/AUTHORS freeswitch/branches/stkn/src/include/switch.h freeswitch/branches/stkn/src/include/switch_apr.h freeswitch/branches/stkn/src/include/switch_platform.h freeswitch/branches/stkn/src/mod/applications/mod_conference/mod_conference.c freeswitch/branches/stkn/src/mod/asr_tts/mod_cepstral/mod_cepstral.c freeswitch/branches/stkn/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/branches/stkn/w32/Setup/Setup.vdproj freeswitch/branches/stkn/w32/vsnet/Freeswitch.sln Log: Merge changes from trunk. Modified: freeswitch/branches/stkn/AUTHORS ============================================================================== --- freeswitch/branches/stkn/AUTHORS (original) +++ freeswitch/branches/stkn/AUTHORS Mon Jul 24 21:16:46 2006 @@ -22,6 +22,7 @@ Michal "cypromis" Bielicki (michal.bielicki AT halo2.pl) - Solaris porting, and autotools enhancements. James Martelletti <james@nerdc0re.com> - All around cool guy (mod_syslog) Johny Kadarisman <jkr888@gmail.com> + Yossi Neiman of Cartis Solutions, Inc. <freeswitch AT cartissolutions.com> - implementation of mod_cdr (perldd, mysql, csv) A big THANK YOU goes to: Modified: freeswitch/branches/stkn/src/include/switch.h ============================================================================== --- freeswitch/branches/stkn/src/include/switch.h (original) +++ freeswitch/branches/stkn/src/include/switch.h Mon Jul 24 21:16:46 2006 @@ -43,7 +43,6 @@ #define END_EXTERN_C #endif -BEGIN_EXTERN_C //Need to include this before any other includes (MSVC Bug) #include <switch_platform.h> @@ -75,7 +74,6 @@ #include <switch_log.h> #include <switch_xml.h> -END_EXTERN_C /** \mainpage FreeSWITCH * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Modified: freeswitch/branches/stkn/src/include/switch_apr.h ============================================================================== --- freeswitch/branches/stkn/src/include/switch_apr.h (original) +++ freeswitch/branches/stkn/src/include/switch_apr.h Mon Jul 24 21:16:46 2006 @@ -39,8 +39,6 @@ #ifndef SWITCH_APR_H #define SWITCH_APR_H -BEGIN_EXTERN_C - #include <apr.h> #include <apr_network_io.h> #include <apr_errno.h> @@ -64,6 +62,8 @@ #define APR_WANT_STRFUNC #include <apr_want.h> #include <apr_env.h> + +BEGIN_EXTERN_C /* The pieces of apr we allow ppl to pass around between modules we typedef into our namespace and wrap all the functions Modified: freeswitch/branches/stkn/src/include/switch_platform.h ============================================================================== --- freeswitch/branches/stkn/src/include/switch_platform.h (original) +++ freeswitch/branches/stkn/src/include/switch_platform.h Mon Jul 24 21:16:46 2006 @@ -65,7 +65,7 @@ * C4819: The file contains a character that cannot be represented in the current code page * C4132: 'object' : const object should be initialized (fires innapropriately for prototyped forward declaration of cost var) */ -#pragma warning(disable:4152 4054 4100 4142 4200 4204 4706 4055 4214 4819 4132) +#pragma warning(disable:4152 4054 4100 4142 4200 4204 4706 4055 4214 4819 4132 4510 4512 4610) #if (_MSC_VER >= 1400) // VC8+ #ifndef _CRT_SECURE_NO_DEPRECATE @@ -95,12 +95,6 @@ #endif #define PACKED #include <io.h> -#ifndef WIN32IOP_H //macro collision with perl -#define write _write -#define open _open -#define close _close -#define read _read -#endif #else /* packed attribute */ #ifndef PACKED Modified: freeswitch/branches/stkn/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/branches/stkn/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/branches/stkn/src/mod/applications/mod_conference/mod_conference.c Mon Jul 24 21:16:46 2006 @@ -992,7 +992,18 @@ { confernce_file_node_t *fnode, *nptr; switch_memory_pool_t *pool; + uint32_t count; + switch_mutex_lock(conference->mutex); + switch_mutex_lock(conference->member_mutex); + count = conference->count; + switch_mutex_unlock(conference->member_mutex); + switch_mutex_unlock(conference->mutex); + + if (!count) { + return SWITCH_STATUS_FALSE; + } + if (*file != '/') { return conference_say(conference, file, leadin); } @@ -1155,9 +1166,19 @@ confernce_file_node_t *fnode, *nptr; switch_memory_pool_t *pool; switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_TTS; + uint32_t count; + switch_mutex_lock(conference->mutex); + switch_mutex_lock(conference->member_mutex); + count = conference->count; if (!(conference->tts_engine && conference->tts_voice)) { - return SWITCH_STATUS_SUCCESS; + count = 0; + } + switch_mutex_unlock(conference->member_mutex); + switch_mutex_unlock(conference->mutex); + + if (!count) { + return SWITCH_STATUS_FALSE; } /* Setup a memory pool to use. */ @@ -1406,10 +1427,13 @@ char *tbuf = NULL; char *text; - if ((tbuf = strdup(buf))) { - if ((text = strstr(tbuf, "say "))) { + if (argc > 2 && (tbuf = strdup(buf))) { + if ((text = strstr(tbuf, "say"))) { text += 4; - if (text && conference_say(conference, text, 0) == SWITCH_STATUS_SUCCESS) { + while(*text == ' ') { + text++; + } + if (!switch_strlen_zero(text) && conference_say(conference, text, 0) == SWITCH_STATUS_SUCCESS) { stream->write_function(stream, "(say) OK\n"); if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", conference->name); @@ -1425,6 +1449,8 @@ } free(tbuf); + } else { + stream->write_function(stream, "(say) Error! No text."); } } else if (!strcasecmp(argv[1], "saymember")) { char *tbuf = NULL, *text, *name; Modified: freeswitch/branches/stkn/src/mod/asr_tts/mod_cepstral/mod_cepstral.c ============================================================================== --- freeswitch/branches/stkn/src/mod/asr_tts/mod_cepstral/mod_cepstral.c (original) +++ freeswitch/branches/stkn/src/mod/asr_tts/mod_cepstral/mod_cepstral.c Mon Jul 24 21:16:46 2006 @@ -210,17 +210,23 @@ cepstral->done_gen = 0; cepstral->done = 0; - + cepstral->tts_stream = NULL; if (!strncasecmp(text, fp, len)) { text += len; + if (switch_strlen_zero(text)) { + return SWITCH_STATUS_FALSE; + } swift_port_speak_file(cepstral->port, text, NULL, &cepstral->tts_stream, NULL); } else { + if (switch_strlen_zero(text)) { + return SWITCH_STATUS_FALSE; + } swift_port_speak_text(cepstral->port, text, 0, NULL, &cepstral->tts_stream, NULL); } - return SWITCH_STATUS_FALSE; + return SWITCH_STATUS_SUCCESS; } static void cepstral_speech_flush_tts(switch_speech_handle_t *sh) Modified: freeswitch/branches/stkn/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/branches/stkn/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/branches/stkn/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Mon Jul 24 21:16:46 2006 @@ -26,7 +26,7 @@ * Anthony Minessale II <anthmct@yahoo.com> * * - * mod_event_socket.c -- Framework Demo Module + * mod_event_socket.c -- Socket Controled Event Handler * */ #include <switch.h> @@ -115,7 +115,7 @@ switch_mutex_lock(listen_list.mutex); for (l = listen_list.listeners; l; l = l->next) { if (switch_test_flag(l, LFLAG_EVENTS) && (l->event_list[(uint8_t)event->event_id] || l->event_list[(uint8_t)SWITCH_EVENT_ALL])) { - if (event->event_id != SWITCH_EVENT_CUSTOM || switch_core_hash_find(l->event_hash, switch_event_name(event->event_id))) { + if (event->event_id != SWITCH_EVENT_CUSTOM || (event->subclass && switch_core_hash_find(l->event_hash, event->subclass->name))) { if (switch_event_dup(&clone, event) == SWITCH_STATUS_SUCCESS) { switch_queue_push(l->event_queue, clone); } else { Modified: freeswitch/branches/stkn/w32/Setup/Setup.vdproj ============================================================================== --- freeswitch/branches/stkn/w32/Setup/Setup.vdproj (original) +++ freeswitch/branches/stkn/w32/Setup/Setup.vdproj Mon Jul 24 21:16:46 2006 @@ -15,12 +15,6 @@ { "Entry" { - "MsmKey" = "8:_045CD868C425A84E27B5FD7DA5097B9D" - "OwnerKey" = "8:_1F21CF104E90499E8F6BBD2136A52884" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_0A2A2813738E4157B2CC6A4EF2A303BB" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -45,246 +39,240 @@ } "Entry" { - "MsmKey" = "8:_180AE5B7EEED44D098233F52DEDDF9A1" - "OwnerKey" = "8:_2F2FEC549F02436EB87961BD1B9E5783" + "MsmKey" = "8:_1BD78CCD666E4BB5BE1168302E9613A2" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_180AE5B7EEED44D098233F52DEDDF9A1" - "OwnerKey" = "8:_D1269F1E49D442CF8EAC96C23E60325D" + "MsmKey" = "8:_1CFB1AB04E024FC993E0EB4859DF8408" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_180AE5B7EEED44D098233F52DEDDF9A1" - "OwnerKey" = "8:_2814E641538B42EFA83525986A9D5AC1" + "MsmKey" = "8:_1F21CF104E90499E8F6BBD2136A52884" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_180AE5B7EEED44D098233F52DEDDF9A1" - "OwnerKey" = "8:_1CFB1AB04E024FC993E0EB4859DF8408" + "MsmKey" = "8:_2814E641538B42EFA83525986A9D5AC1" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_180AE5B7EEED44D098233F52DEDDF9A1" - "OwnerKey" = "8:_EF14CB99F3414BB689D0CB0E6D6B8AB8" + "MsmKey" = "8:_2D09AB81AB8D45FF97E9DFA4DAC3465D" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_180AE5B7EEED44D098233F52DEDDF9A1" - "OwnerKey" = "8:_1F21CF104E90499E8F6BBD2136A52884" + "MsmKey" = "8:_2F2FEC549F02436EB87961BD1B9E5783" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_180AE5B7EEED44D098233F52DEDDF9A1" - "OwnerKey" = "8:_F0B800E719294692A02518CFD8CBAEFF" + "MsmKey" = "8:_318FCC99E8D143D6B4F9F534E63009B3" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_180AE5B7EEED44D098233F52DEDDF9A1" - "OwnerKey" = "8:_EE46A936D4054F7286909355BF2AE5D7" + "MsmKey" = "8:_36D88C9590054DCA8F6ABAE6F05C2FD6" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_180AE5B7EEED44D098233F52DEDDF9A1" - "OwnerKey" = "8:_E72980C058C646E0A7FAF423EB57EA6E" + "MsmKey" = "8:_413E616556854689B457A68A06830A82" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_180AE5B7EEED44D098233F52DEDDF9A1" - "OwnerKey" = "8:_B20769E090034897B32E3EA4EC1BA8A0" + "MsmKey" = "8:_4A285D260C3748A4BEFA6E5A9004D128" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_180AE5B7EEED44D098233F52DEDDF9A1" - "OwnerKey" = "8:_A0D5F714A0F94250A1C39603B699AB82" + "MsmKey" = "8:_53150E807A66E04034BACF0B4D81105A" + "OwnerKey" = "8:_E72980C058C646E0A7FAF423EB57EA6E" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_180AE5B7EEED44D098233F52DEDDF9A1" - "OwnerKey" = "8:_83C1B93AD71B4F8F9E074F9607B60DF1" + "MsmKey" = "8:_53150E807A66E04034BACF0B4D81105A" + "OwnerKey" = "8:_F0B800E719294692A02518CFD8CBAEFF" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_180AE5B7EEED44D098233F52DEDDF9A1" - "OwnerKey" = "8:_6753CE9F969E43A2A50ADEC0245F58A4" + "MsmKey" = "8:_5A636BB90F7F4B86ACB8839EA2C899AA" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_180AE5B7EEED44D098233F52DEDDF9A1" - "OwnerKey" = "8:_4A285D260C3748A4BEFA6E5A9004D128" + "MsmKey" = "8:_6753CE9F969E43A2A50ADEC0245F58A4" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_180AE5B7EEED44D098233F52DEDDF9A1" - "OwnerKey" = "8:_318FCC99E8D143D6B4F9F534E63009B3" + "MsmKey" = "8:_684D96FA2BDD46909367E651099D8C4E" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_1BD78CCD666E4BB5BE1168302E9613A2" + "MsmKey" = "8:_6E5C001E7A314DCEA0A4BF52BF74BCAD" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_1CFB1AB04E024FC993E0EB4859DF8408" + "MsmKey" = "8:_72A8732C0C0C4D0EAAE89DBB82073335" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_1F21CF104E90499E8F6BBD2136A52884" + "MsmKey" = "8:_7358123D2D064AD1BC517911A8B23D1B" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2814E641538B42EFA83525986A9D5AC1" + "MsmKey" = "8:_83062AA0528B40A59202BC7668F7132A" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2D09AB81AB8D45FF97E9DFA4DAC3465D" + "MsmKey" = "8:_83C1B93AD71B4F8F9E074F9607B60DF1" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2F2FEC549F02436EB87961BD1B9E5783" + "MsmKey" = "8:_87768631363249B2B301143C193612F7" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_318FCC99E8D143D6B4F9F534E63009B3" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_8FC4214A35474C90B4FFD16CA8F225D4" + "OwnerKey" = "8:_1CFB1AB04E024FC993E0EB4859DF8408" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_36D88C9590054DCA8F6ABAE6F05C2FD6" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_8FC4214A35474C90B4FFD16CA8F225D4" + "OwnerKey" = "8:_F0B800E719294692A02518CFD8CBAEFF" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_3F927D72DFA53DCF09A9D5F6EB00333D" - "OwnerKey" = "8:_E72980C058C646E0A7FAF423EB57EA6E" + "MsmKey" = "8:_8FC4214A35474C90B4FFD16CA8F225D4" + "OwnerKey" = "8:_EF14CB99F3414BB689D0CB0E6D6B8AB8" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_413E616556854689B457A68A06830A82" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_8FC4214A35474C90B4FFD16CA8F225D4" + "OwnerKey" = "8:_EE46A936D4054F7286909355BF2AE5D7" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_4A285D260C3748A4BEFA6E5A9004D128" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_8FC4214A35474C90B4FFD16CA8F225D4" + "OwnerKey" = "8:_E72980C058C646E0A7FAF423EB57EA6E" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5A636BB90F7F4B86ACB8839EA2C899AA" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_8FC4214A35474C90B4FFD16CA8F225D4" + "OwnerKey" = "8:_D1269F1E49D442CF8EAC96C23E60325D" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_6753CE9F969E43A2A50ADEC0245F58A4" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_8FC4214A35474C90B4FFD16CA8F225D4" + "OwnerKey" = "8:_B20769E090034897B32E3EA4EC1BA8A0" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_684D96FA2BDD46909367E651099D8C4E" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_8FC4214A35474C90B4FFD16CA8F225D4" + "OwnerKey" = "8:_A0D5F714A0F94250A1C39603B699AB82" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_6E5C001E7A314DCEA0A4BF52BF74BCAD" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_8FC4214A35474C90B4FFD16CA8F225D4" + "OwnerKey" = "8:_83C1B93AD71B4F8F9E074F9607B60DF1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_72A8732C0C0C4D0EAAE89DBB82073335" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_8FC4214A35474C90B4FFD16CA8F225D4" + "OwnerKey" = "8:_6753CE9F969E43A2A50ADEC0245F58A4" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_7358123D2D064AD1BC517911A8B23D1B" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_8FC4214A35474C90B4FFD16CA8F225D4" + "OwnerKey" = "8:_4A285D260C3748A4BEFA6E5A9004D128" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_83062AA0528B40A59202BC7668F7132A" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_8FC4214A35474C90B4FFD16CA8F225D4" + "OwnerKey" = "8:_318FCC99E8D143D6B4F9F534E63009B3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_83C1B93AD71B4F8F9E074F9607B60DF1" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_8FC4214A35474C90B4FFD16CA8F225D4" + "OwnerKey" = "8:_2F2FEC549F02436EB87961BD1B9E5783" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_87768631363249B2B301143C193612F7" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_8FC4214A35474C90B4FFD16CA8F225D4" + "OwnerKey" = "8:_2814E641538B42EFA83525986A9D5AC1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8C45B56F84B700A7F349973FF46D5249" - "OwnerKey" = "8:_4A285D260C3748A4BEFA6E5A9004D128" + "MsmKey" = "8:_8FC4214A35474C90B4FFD16CA8F225D4" + "OwnerKey" = "8:_1F21CF104E90499E8F6BBD2136A52884" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8C45B56F84B700A7F349973FF46D5249" - "OwnerKey" = "8:_C105055EE271471A999CE7022E617EB7" + "MsmKey" = "8:_9A293E8A356A4959BB6E541B7DC213CD" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8C45B56F84B700A7F349973FF46D5249" - "OwnerKey" = "8:_EC68A140B58841DA9B9172BAFA5BEC63" + "MsmKey" = "8:_9B01D8B92FE15ACCAAD5F4F4C7681FD6" + "OwnerKey" = "8:_E72980C058C646E0A7FAF423EB57EA6E" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_95DF1AC815283888345057940530D1C0" + "MsmKey" = "8:_A044EB8034E3CED402BF9A7DB7CC4550" "OwnerKey" = "8:_F0B800E719294692A02518CFD8CBAEFF" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9A293E8A356A4959BB6E541B7DC213CD" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_A0D5F714A0F94250A1C39603B699AB82" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -297,12 +285,6 @@ } "Entry" { - "MsmKey" = "8:_A55F680EDBCDA3F18A46EF6CFC14A1D5" - "OwnerKey" = "8:_E72980C058C646E0A7FAF423EB57EA6E" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_AD2EB44FE6D548F2A8DA4F9F2CE817AC" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -321,26 +303,20 @@ } "Entry" { - "MsmKey" = "8:_B4DB166A7F41DC9EF58E277B90CC68AB" - "OwnerKey" = "8:_E72980C058C646E0A7FAF423EB57EA6E" + "MsmKey" = "8:_C105055EE271471A999CE7022E617EB7" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B4DB166A7F41DC9EF58E277B90CC68AB" - "OwnerKey" = "8:_F0B800E719294692A02518CFD8CBAEFF" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_C105055EE271471A999CE7022E617EB7" + "MsmKey" = "8:_C81AC700C1BC4A55B98DF12C0CBAFD6F" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C81AC700C1BC4A55B98DF12C0CBAFD6F" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_CD7DAA5960C15D1769787DCAC200919C" + "OwnerKey" = "8:_E72980C058C646E0A7FAF423EB57EA6E" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -357,26 +333,20 @@ } "Entry" { - "MsmKey" = "8:_D4F501ED67B41C5D55B4698A2B50E1BF" - "OwnerKey" = "8:_6753CE9F969E43A2A50ADEC0245F58A4" + "MsmKey" = "8:_D6F0F5845FAD4707975CE012A33CD607" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D4F501ED67B41C5D55B4698A2B50E1BF" - "OwnerKey" = "8:_EE46A936D4054F7286909355BF2AE5D7" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_D6F0F5845FAD4707975CE012A33CD607" + "MsmKey" = "8:_D7EC5795A9C645AC8E129C2EE6D461ED" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D7EC5795A9C645AC8E129C2EE6D461ED" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_DDC345A5D8F3411B871108AAD163F920" + "OwnerKey" = "8:_8FC4214A35474C90B4FFD16CA8F225D4" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -399,12 +369,6 @@ } "Entry" { - "MsmKey" = "8:_E91E659A30834790A7F1C1669AE92172" - "OwnerKey" = "8:_180AE5B7EEED44D098233F52DEDDF9A1" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_EC68A140B58841DA9B9172BAFA5BEC63" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -479,6 +443,43 @@ } } } + "Debug with MySql" + { + "DisplayName" = "8:Debug with MySql" + "IsDebugOnly" = "11:FALSE" + "IsReleaseOnly" = "11:FALSE" + "OutputFilename" = "8:Debug with MySql\\Setup.msi" + "PackageFilesAs" = "3:2" + "PackageFileSize" = "3:-2147483648" + "CabType" = "3:1" + "Compression" = "3:2" + "SignOutput" = "11:FALSE" + "CertificateFile" = "8:" + "PrivateKeyFile" = "8:" + "TimeStampServer" = "8:" + "InstallerBootstrapper" = "3:2" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:FALSE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + "Items" + { + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Visual.C++.8.0.x86" + { + "Name" = "8:Visual C++ Runtime Libraries (x86)" + "ProductCode" = "8:Microsoft.Visual.C++.8.0.x86" + } + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.3.1" + { + "Name" = "8:Windows Installer 3.1" + "ProductCode" = "8:Microsoft.Windows.Installer.3.1" + } + } + } + } "Release" { "DisplayName" = "8:Release" @@ -516,6 +517,43 @@ } } } + "Release with MySql" + { + "DisplayName" = "8:Release with MySql" + "IsDebugOnly" = "11:FALSE" + "IsReleaseOnly" = "11:FALSE" + "OutputFilename" = "8:Release with MySql\\Setup.msi" + "PackageFilesAs" = "3:2" + "PackageFileSize" = "3:-2147483648" + "CabType" = "3:1" + "Compression" = "3:2" + "SignOutput" = "11:FALSE" + "CertificateFile" = "8:" + "PrivateKeyFile" = "8:" + "TimeStampServer" = "8:" + "InstallerBootstrapper" = "3:2" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:FALSE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + "Items" + { + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Visual.C++.8.0.x86" + { + "Name" = "8:Visual C++ Runtime Libraries (x86)" + "ProductCode" = "8:Microsoft.Visual.C++.8.0.x86" + } + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.3.1" + { + "Name" = "8:Windows Installer 3.1" + "ProductCode" = "8:Microsoft.Windows.Installer.3.1" + } + } + } + } } "Deployable" { @@ -536,26 +574,6 @@ } "File" { - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_045CD868C425A84E27B5FD7DA5097B9D" - { - "SourcePath" = "8:swift.dll" - "TargetName" = "8:swift.dll" - "Tag" = "8:" - "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0A2A2813738E4157B2CC6A4EF2A303BB" { "SourcePath" = "8:..\\..\\AUTHORS" @@ -636,12 +654,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3F927D72DFA53DCF09A9D5F6EB00333D" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_413E616556854689B457A68A06830A82" { - "SourcePath" = "8:libaprutil-1.dll" - "TargetName" = "8:libaprutil-1.dll" + "SourcePath" = "8:..\\..\\src\\mod\\languages\\mod_perl\\freeswitch.pm" + "TargetName" = "8:freeswitch.pm" "Tag" = "8:" - "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" + "Folder" = "8:_27A96C279A6A44E8A2FDF8D51CD86E29" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -653,15 +671,15 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" + "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_413E616556854689B457A68A06830A82" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_53150E807A66E04034BACF0B4D81105A" { - "SourcePath" = "8:..\\..\\src\\mod\\languages\\mod_perl\\freeswitch.pm" - "TargetName" = "8:freeswitch.pm" + "SourcePath" = "8:libapr-1.dll" + "TargetName" = "8:libapr-1.dll" "Tag" = "8:" - "Folder" = "8:_27A96C279A6A44E8A2FDF8D51CD86E29" + "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -673,7 +691,7 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" + "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_83062AA0528B40A59202BC7668F7132A" @@ -696,10 +714,10 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_8C45B56F84B700A7F349973FF46D5249" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9B01D8B92FE15ACCAAD5F4F4C7681FD6" { - "SourcePath" = "8:sqlite.dll" - "TargetName" = "8:sqlite.dll" + "SourcePath" = "8:libaprutil-1.dll" + "TargetName" = "8:libaprutil-1.dll" "Tag" = "8:" "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" "Condition" = "8:" @@ -712,11 +730,11 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_95DF1AC815283888345057940530D1C0" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A044EB8034E3CED402BF9A7DB7CC4550" { "SourcePath" = "8:FreeSwitch.dll" "TargetName" = "8:FreeSwitch.dll" @@ -756,7 +774,7 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A55F680EDBCDA3F18A46EF6CFC14A1D5" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CD7DAA5960C15D1769787DCAC200919C" { "SourcePath" = "8:sqlite.dll" "TargetName" = "8:sqlite.dll" @@ -776,46 +794,6 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B4DB166A7F41DC9EF58E277B90CC68AB" - { - "SourcePath" = "8:libapr-1.dll" - "TargetName" = "8:libapr-1.dll" - "Tag" = "8:" - "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D4F501ED67B41C5D55B4698A2B50E1BF" - { - "SourcePath" = "8:perl58.dll" - "TargetName" = "8:perl58.dll" - "Tag" = "8:" - "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } } "FileType" { @@ -1558,7 +1536,7 @@ } "MergeModule" { - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_180AE5B7EEED44D098233F52DEDDF9A1" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_8FC4214A35474C90B4FFD16CA8F225D4" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" @@ -1572,7 +1550,7 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_E91E659A30834790A7F1C1669AE92172" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_DDC345A5D8F3411B871108AAD163F920" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" Modified: freeswitch/branches/stkn/w32/vsnet/Freeswitch.sln ============================================================================== --- freeswitch/branches/stkn/w32/vsnet/Freeswitch.sln (original) +++ freeswitch/branches/stkn/w32/vsnet/Freeswitch.sln Mon Jul 24 21:16:46 2006 @@ -146,8 +146,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey", "..\..\src\mod\languages\mod_spidermonkey\mod_spidermonkey.vcproj", "{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}" ProjectSection(ProjectDependencies) = postProject - {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ASR-TTS", "ASR-TTS", "{4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0}" @@ -221,6 +221,11 @@ {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_cdr", "..\..\src\mod\event_handlers\mod_cdr\mod_cdr.vcproj", "{3D1EED36-A510-4EDB-B4D9-4E0F4A5EC2A8}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -379,6 +384,10 @@ {05515420-16DE-4E63-BE73-85BE85BA5142}.Debug|Win32.Build.0 = Debug|Win32 {05515420-16DE-4E63-BE73-85BE85BA5142}.Release|Win32.ActiveCfg = Release|Win32 {05515420-16DE-4E63-BE73-85BE85BA5142}.Release|Win32.Build.0 = Release|Win32 + {3D1EED36-A510-4EDB-B4D9-4E0F4A5EC2A8}.Debug|Win32.ActiveCfg = Debug with MySql|Win32 + {3D1EED36-A510-4EDB-B4D9-4E0F4A5EC2A8}.Debug|Win32.Build.0 = Debug with MySql|Win32 + {3D1EED36-A510-4EDB-B4D9-4E0F4A5EC2A8}.Release|Win32.ActiveCfg = Release|Win32 + {3D1EED36-A510-4EDB-B4D9-4E0F4A5EC2A8}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -395,6 +404,7 @@ {C7705DC4-2088-493E-AF8D-65BC6D65C125} = {9ADF1E48-2F5C-4ED7-A893-596259FABFE0} {784113EF-44D9-4949-835D-7065D3C7AD08} = {9ADF1E48-2F5C-4ED7-A893-596259FABFE0} {05515420-16DE-4E63-BE73-85BE85BA5142} = {9ADF1E48-2F5C-4ED7-A893-596259FABFE0} + {3D1EED36-A510-4EDB-B4D9-4E0F4A5EC2A8} = {9ADF1E48-2F5C-4ED7-A893-596259FABFE0} {AFAC0568-7548-42D5-9F6A-8D3400A1E4F6} = {A5A27244-AD24-46E5-B01B-840CD296C91D} {78100236-7CEA-4948-96CC-E8ED3160329C} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {E1794405-29D4-466D-9BE3-DD2344C2A663} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}