- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r7663 - in freeswitch/trunk: . build libs/curl/lib libs/js/nsprpub/config libs/xmlrpc-c src src/mod/asr_tts/mod_openmrcp src/mod/endpoints/mod_sofia src/mod/languages/mod_spidermonkey
by Freeswitch SVN 18 Feb '08

18 Feb '08

Author: cypromis Date: Mon Feb 18 09:58:41 2008 New Revision: 7663 Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/build/modmake.rules.in freeswitch/trunk/configure.in freeswitch/trunk/libs/curl/lib/config.h.in freeswitch/trunk/libs/js/nsprpub/config/rules.mk freeswitch/trunk/libs/xmlrpc-c/xmlrpc_amconfig.h.in freeswitch/trunk/src/Makefile.am freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/Makefile freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile.am freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile Log: Make libdir and bindir being accepted by libs and modules add a setting called --modinstdir to be able to define where modules get installed Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Mon Feb 18 09:58:41 2008 @@ -31,6 +31,9 @@ moh: sounds-music-8000 moh-install: sounds-music-8000-install +libdir = @libdir@ +bindir = @bindir@ +includedir = @includedir@ libfreeswitch_la_SOURCES = \ src/switch_apr.c \ src/switch_buffer.c \ @@ -198,6 +201,7 @@ @for x in mod db log log/xml_cdr bin scripts grammar recordings ; do \ $(mkinstalldirs) $(DESTDIR)$(prefix)/$$x ; \ done + $(mkinstalldirs) $(DESTDIR)@modinstdir@ test -d $(DESTDIR)$(prefix)/conf || $(MAKE) samples-conf test -d $(DESTDIR)$(prefix)/htdocs || $(MAKE) samples-htdocs @@ -334,10 +338,10 @@ scripts/fsxs: scripts/fsxs.in @echo creating fsxs - @sed -e "s,@MODULES_DIR\@,$(PREFIX)/mod," \ - -e "s,@LIB_DIR\@,$(PREFIX)/lib," \ - -e "s,@BIN_DIR\@,$(PREFIX)/bin," \ - -e "s,@INC_DIR\@,$(PREFIX)/include," \ + @sed -e "s,@MODULES_DIR\@,@modinstdir@," \ + -e "s,@LIB_DIR\@,@libdir@," \ + -e "s,@BIN_DIR\@,@bindir@," \ + -e "s,@INC_DIR\@,@includedir@," \ -e "s,@CFG_DIR\@,$(PREFIX)/conf," \ -e "s,@DB_DIR\@,$(PREFIX)/db," \ -e "s,@PREFIX\@,$(PREFIX)," \ @@ -365,7 +369,7 @@ rm -f `find ./libs -name \*.la` libclean: - @for file in `ls ./libs`; do pushd "./libs/"$$file; make clean; popd; done + @for file in `ls ./libs`; do pushd "./libs/"$$file; make clean; rm -f .built; popd; done modules.conf: if test -f $@; then touch $@; else cp build/modules.conf.in $@ ;fi Modified: freeswitch/trunk/build/modmake.rules.in ============================================================================== --- freeswitch/trunk/build/modmake.rules.in (original) +++ freeswitch/trunk/build/modmake.rules.in Mon Feb 18 09:58:41 2008 @@ -24,9 +24,10 @@ LIBS=$(switch_builddir)/libfreeswitch.la DEFS=@DEFS@ PREFIX = @prefix@ +MODINSTDIR = @modinstdir@ -DYLD_LIBRARY_PATH=$(PREFIX)/lib:$DYLD_LIBRARY_PATH -LD_LIBRARY_PATH=$(PREFIX)/lib:$LD_LIBRARY_PATH +DYLD_LIBRARY_PATH=${_libdir}:$DYLD_LIBRARY_PATH +LD_LIBRARY_PATH=${_libdir}:$LD_LIBRARY_PATH OSARCH=`uname -s` DYNAMIC_LIB_EXTEN = @DYNAMIC_LIB_EXTEN@ SOLINK = @SOLINK@ @@ -119,14 +120,14 @@ mod_clean: @rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *.lo *~ .libs $(LOCAL_OBJS) -mod_install: $(DESTDIR)$(PREFIX)/mod/$(MODNAME).$(DYNAMIC_LIB_EXTEN) +mod_install: $(DESTDIR)$(MODINSTDIR)/$(MODNAME).$(DYNAMIC_LIB_EXTEN) -$(DESTDIR)$(PREFIX)/mod/$(MODNAME).$(DYNAMIC_LIB_EXTEN):$(MODNAME).$(DYNAMIC_LIB_EXTEN) +$(DESTDIR)$(MODINSTDIR)/$(MODNAME).$(DYNAMIC_LIB_EXTEN):$(MODNAME).$(DYNAMIC_LIB_EXTEN) @echo installing $< - @$(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod >/dev/null + @$(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(MODINSTDIR) >/dev/null mod_uninstall: - @$(LTUNINSTALL) $(DESTDIR)$(PREFIX)/mod/$(MODNAME).$(DYNAMIC_LIB_EXTEN) + @$(LTUNINSTALL) $(DESTDIR)$(MODINSTDIR)/$(MODNAME).$(DYNAMIC_LIB_EXTEN) # define these in your makefile if you wish local_all local_depend local_clean depend_install local_install local_distclean local_extraclean local_uninstall: Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Mon Feb 18 09:58:41 2008 @@ -30,8 +30,11 @@ AC_SUBST(switch_srcdir) AC_SUBST(switch_builddir) -moddir=$prefix/mod -AC_SUBST(moddir) +# Where to install the modules +AC_ARG_WITH(modinstdir, [ --with-modinstdir (default=$prefix/mod)], modinstdir=$withval, modinstdir="${prefix}/mod") + +AC_SUBST(modinstdir) +AC_DEFINE_UNQUOTED([SWITCH_MOD_DIR],"${modinstdir}",[where to install the modules to]) #Set default language AC_LANG_C @@ -66,7 +69,7 @@ # Optional Features AC_ARG_ENABLE(resample, -[AC_HELP_STRING([--enable-resample],[build with embedded resamper])],[enable_resample="$enable_resample"],[enable_resample="yes"]) +[AC_HELP_STRING([--enable-resample],[build with embedded resampler])],[enable_resample="$enable_resample"],[enable_resample="yes"]) # We should add checking for out of tree libresample here RESAMPLE_LIB= @@ -383,6 +386,9 @@ AC_SUBST(uint64_t_fmt) AC_SUBST(ssize_t_fmt) AC_SUBST(size_t_fmt) +AC_SUBST(libdir) +AC_SUBST(bindir) +AC_SUBST(includedir) AC_PATH_PROGS(ZCAT, gunzip gzcat gzip zcat) AC_PATH_PROGS(TAR, gtar tar) @@ -476,7 +482,7 @@ AC_CONFIG_SUBDIRS(libs/speex) AC_CONFIG_SUBDIRS(libs/xmlrpc-c) AC_CONFIG_SUBDIRS(libs/portaudio) -#AC_CONFIG_SUBDIRS(libs/openmrcp) +AC_CONFIG_SUBDIRS(libs/openmrcp) AC_CONFIG_SUBDIRS(libs/openzap) AC_OUTPUT Modified: freeswitch/trunk/libs/curl/lib/config.h.in ============================================================================== --- freeswitch/trunk/libs/curl/lib/config.h.in (original) +++ freeswitch/trunk/libs/curl/lib/config.h.in Mon Feb 18 09:58:41 2008 @@ -621,16 +621,16 @@ /* Define to the function return type for send. */ #undef SEND_TYPE_RETV -/* The size of a `curl_off_t', as computed by sizeof. */ +/* The size of `curl_off_t', as computed by sizeof. */ #undef SIZEOF_CURL_OFF_T -/* The size of a `long', as computed by sizeof. */ +/* The size of `long', as computed by sizeof. */ #undef SIZEOF_LONG -/* The size of a `size_t', as computed by sizeof. */ +/* The size of `size_t', as computed by sizeof. */ #undef SIZEOF_SIZE_T -/* The size of a `time_t', as computed by sizeof. */ +/* The size of `time_t', as computed by sizeof. */ #undef SIZEOF_TIME_T /* Define to 1 if you have the ANSI C header files. */ @@ -685,7 +685,7 @@ /* type to use in place of in_addr_t if not defined */ #undef in_addr_t -/* Define to `unsigned' if <sys/types.h> does not define. */ +/* Define to `unsigned int' if <sys/types.h> does not define. */ #undef size_t /* type to use in place of socklen_t if not defined */ Modified: freeswitch/trunk/libs/js/nsprpub/config/rules.mk ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/config/rules.mk (original) +++ freeswitch/trunk/libs/js/nsprpub/config/rules.mk Mon Feb 18 09:58:41 2008 @@ -232,7 +232,7 @@ # $(NSINSTALL) -t -m 0644 $(RELEASE_HEADERS) $(DESTDIR)$(includedir)/$(include_subdir) #endif ifdef RELEASE_LIBS - $(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) $(DESTDIR)$(prefix)/lib + $(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) $(DESTDIR)$(libdir) endif +$(LOOP_OVER_DIRS) Modified: freeswitch/trunk/libs/xmlrpc-c/xmlrpc_amconfig.h.in ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/xmlrpc_amconfig.h.in (original) +++ freeswitch/trunk/libs/xmlrpc-c/xmlrpc_amconfig.h.in Mon Feb 18 09:58:41 2008 @@ -81,5 +81,5 @@ /* Version number of package */ #undef VERSION -/* Define to `unsigned' if <sys/types.h> does not define. */ +/* Define to `unsigned int' if <sys/types.h> does not define. */ #undef size_t Modified: freeswitch/trunk/src/Makefile.am ============================================================================== --- freeswitch/trunk/src/Makefile.am (original) +++ freeswitch/trunk/src/Makefile.am Mon Feb 18 09:58:41 2008 @@ -1,3 +1 @@ SUBDIRS = mod - - Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/Makefile ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/Makefile (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/Makefile Mon Feb 18 09:58:41 2008 @@ -39,4 +39,3 @@ ../../../../libs/sofia-sip/libsofia-sip-ua/nua/sofia-sip/nua_tag.h: $(SOFIALA) - Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile.am ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile.am (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile.am Mon Feb 18 09:58:41 2008 @@ -8,7 +8,7 @@ # Dirty trick to override the link output LIBS+=> $(MODNAME).log || error="yes";if test -n "$(VERBOSE)" -o "$$error" = "yes";then cat $(MODNAME).log;fi;if test "$$error" = "yes";then exit 1;fi -moddir=$(prefix)/mod +moddir=@modinstdir@ MODNAME=mod_sofia Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile Mon Feb 18 09:58:41 2008 @@ -6,9 +6,9 @@ include sm.mak -depend_install: $(DESTDIR)$(PREFIX)/lib/libjs.la +depend_install: $(DESTDIR)$(libdir)/libjs.la -$(DESTDIR)$(PREFIX)/lib/libjs.la: $(JSLA) +$(DESTDIR)$(libdir)/libjs.la: $(JSLA) cd $(JS_DIR)/nsprpub/ && $(MAKE) install cd $(JS_DIR) && $(MAKE) install

1 0

[commit] r7662 - freeswitch/trunk
by Freeswitch SVN 17 Feb '08

17 Feb '08

Author: mikej Date: Sun Feb 17 16:53:47 2008 New Revision: 7662 Modified: freeswitch/trunk/bootstrap.sh freeswitch/trunk/configure.in Log: add autoconf for openzap Modified: freeswitch/trunk/bootstrap.sh ============================================================================== --- freeswitch/trunk/bootstrap.sh (original) +++ freeswitch/trunk/bootstrap.sh Sun Feb 17 16:53:47 2008 @@ -5,7 +5,7 @@ LIBDIR=${BASEDIR}/libs; SUBDIRS="codec/g7xx codec/gsm codec/ilbc curl iax iksemel voipcodecs \ js js/nsprpub libdingaling libedit libresample libsndfile pcre sofia-sip \ - speex sqlite srtp xmlrpc-c"; + speex sqlite srtp xmlrpc-c openzap"; if [ ! -f modules.conf ]; then Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Sun Feb 17 16:53:47 2008 @@ -477,5 +477,6 @@ AC_CONFIG_SUBDIRS(libs/xmlrpc-c) AC_CONFIG_SUBDIRS(libs/portaudio) #AC_CONFIG_SUBDIRS(libs/openmrcp) +AC_CONFIG_SUBDIRS(libs/openzap) AC_OUTPUT

1 0

[commit] r7661 - freeswitch/trunk/src
by Freeswitch SVN 17 Feb '08

17 Feb '08

Author: anthm Date: Sun Feb 17 13:11:27 2008 New Revision: 7661 Modified: freeswitch/trunk/src/switch_rtp.c Log: gotta sleep less cos some crappier boxes really stink Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Sun Feb 17 13:11:27 2008 @@ -1296,12 +1296,8 @@ break; do_continue: - - if (rtp_session->ms_per_packet) { - switch_yield((rtp_session->ms_per_packet / 1000) * 750); - } else { - switch_yield(1000); - } + + switch_yield(5000); } *payload_type = (switch_payload_t) rtp_session->recv_msg.header.pt;

1 0

[commit] r7660 - freeswitch/trunk/src/mod/asr_tts/mod_openmrcp
by Freeswitch SVN 17 Feb '08

17 Feb '08

Author: achaloyan Date: Sun Feb 17 06:24:28 2008 New Revision: 7660 Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/Makefile freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.2008.vcproj freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.vcproj Log: update to the recent OpenMRCP Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/Makefile ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/Makefile (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/Makefile Sun Feb 17 06:24:28 2008 @@ -6,9 +6,9 @@ OPENMRCP_DIR=../../../../libs/openmrcp -OPENMRCP_INCLUDE=-I$(OPENMRCP_DIR)/mrcpcore/client/include/ -I$(OPENMRCP_DIR)/platform/openmrcpclient/include/ -I$(OPENMRCP_DIR)/mediaframe/include/ -I$(OPENMRCP_DIR)/mrcpcore/engine/include/ -I$(OPENMRCP_DIR)/mrcpcore/include/ -I$(OPENMRCP_DIR)/mrcpcore/parser/include/ -I$(OPENMRCP_DIR)/mrcpcore/server/include/ -I$(OPENMRCP_DIR)/mrcpcore/media/include/ -I$(OPENMRCP_DIR)/mrcpcore/util/include -I$(OPENMRCP_DIR)/mrcpcore/resource/include/ +OPENMRCP_INCLUDE=-I$(OPENMRCP_DIR)/mrcpcore/client/include/ -I$(OPENMRCP_DIR)/platform/openmrcpclient/include/ -I$(OPENMRCP_DIR)/aprtoolkit/include/ -I$(OPENMRCP_DIR)/mediaframe/include/ -I$(OPENMRCP_DIR)/mrcpcore/engine/include/ -I$(OPENMRCP_DIR)/mrcpcore/include/ -I$(OPENMRCP_DIR)/mrcpcore/parser/include/ -I$(OPENMRCP_DIR)/mrcpcore/server/include/ -I$(OPENMRCP_DIR)/mrcpcore/media/include/ -I$(OPENMRCP_DIR)/mrcpcore/util/include -I$(OPENMRCP_DIR)/mrcpcore/resource/include/ -OPENMRCP_LIBS=$(OPENMRCP_DIR)/platform/openmrcpclient/.libs/libopenmrcpclient.a $(OPENMRCP_DIR)/platform/openmrcpserver/.libs/libopenmrcpserver.a $(OPENMRCP_DIR)/mrcpcore/client/.libs/libmrcpclient.a $(OPENMRCP_DIR)/mediaframe/.libs/libmediaframe.a $(OPENMRCP_DIR)/mrcpcore/engine/.libs/libmrcpengine.a $(OPENMRCP_DIR)/mrcpcore/parser/.libs/libmrcpparser.a $(OPENMRCP_DIR)/mrcpcore/server/.libs/libmrcpserver.a $(OPENMRCP_DIR)/mrcpcore/media/.libs/libmrcpmedia.a $(OPENMRCP_DIR)/mrcpcore/util/.libs/libmrcputil.a $(OPENMRCP_DIR)/mrcpcore/resource/.libs/libmrcpresource.a $(OPENMRCP_DIR)/module/plugin/demo/.libs/libdemoplugin.a $(OPENMRCP_DIR)/module/mrcpv2agent/.libs/libmrcpv2agent.a $(OPENMRCP_DIR)/module/mrcpmediaframe/.libs/libmrcpmediaframe.a $(OPENMRCP_DIR)/module/mrcpsofiasip/.libs/libmrcpsofiasip.a $(OPENMRCP_DIR)/mrcpcore/.libs/libmrcpcore.a +OPENMRCP_LIBS=$(OPENMRCP_DIR)/platform/openmrcpclient/.libs/libopenmrcpclient.a $(OPENMRCP_DIR)/mrcpcore/client/.libs/libmrcpclient.a $(OPENMRCP_DIR)/mediaframe/.libs/libmediaframe.a $(OPENMRCP_DIR)/mrcpcore/engine/.libs/libmrcpengine.a $(OPENMRCP_DIR)/mrcpcore/parser/.libs/libmrcpparser.a $(OPENMRCP_DIR)/mrcpcore/media/.libs/libmrcpmedia.a $(OPENMRCP_DIR)/mrcpcore/resource/.libs/libmrcpresource.a $(OPENMRCP_DIR)/module/mrcpv2agent/.libs/libmrcpv2agent.a $(OPENMRCP_DIR)/module/mrcpmediaframe/.libs/libmrcpmediaframe.a $(OPENMRCP_DIR)/module/mrcpsofiasip/.libs/libmrcpsofiasip.a $(OPENMRCP_DIR)/mrcpcore/.libs/libmrcpcore.a $(OPENMRCP_DIR)/aprtoolkit/.libs/libaprtoolkit.a MRCP_APR_INCLUDES = -I../../../../libs/apr/include MRCP_APU_INCLUDES = -I../../../../libs/apr-util/include Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.2008.vcproj (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.2008.vcproj Sun Feb 17 06:24:28 2008 @@ -39,7 +39,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\openmrcp\platform\openmrcpclient\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\client\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\parser\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\media\include";"$(InputDir)..\..\..\..\libs\openmrcp\mediaframe\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\resource\include";"$(InputDir)..\..\..\..\libs\apr\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\openmrcp\platform\openmrcpclient\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\client\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\parser\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\media\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\resource\include";"$(InputDir)..\..\..\..\libs\openmrcp\mediaframe\include";"$(InputDir)..\..\..\..\libs\openmrcp\aprtoolkit\include";"$(InputDir)..\..\..\..\libs\apr\include"" UsePrecompiledHeader="0" /> <Tool @@ -103,7 +103,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\openmrcp\platform\openmrcpclient\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\client\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\parser\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\media\include";"$(InputDir)..\..\..\..\libs\openmrcp\mediaframe\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\resource\include";"$(InputDir)..\..\..\..\libs\apr\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\openmrcp\platform\openmrcpclient\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\client\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\parser\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\media\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\resource\include";"$(InputDir)..\..\..\..\libs\openmrcp\mediaframe\include";"$(InputDir)..\..\..\..\libs\openmrcp\aprtoolkit\include";"$(InputDir)..\..\..\..\libs\apr\include"" UsePrecompiledHeader="0" /> <Tool @@ -167,7 +167,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\openmrcp\platform\openmrcpclient\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\client\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\parser\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\media\include";"$(InputDir)..\..\..\..\libs\openmrcp\mediaframe\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\resource\include";"$(InputDir)..\..\..\..\libs\apr\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\openmrcp\platform\openmrcpclient\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\client\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\parser\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\media\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\resource\include";"$(InputDir)..\..\..\..\libs\openmrcp\mediaframe\include";"$(InputDir)..\..\..\..\libs\openmrcp\aprtoolkit\include";"$(InputDir)..\..\..\..\libs\apr\include"" UsePrecompiledHeader="0" /> <Tool @@ -231,7 +231,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\openmrcp\platform\openmrcpclient\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\client\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\parser\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\media\include";"$(InputDir)..\..\..\..\libs\openmrcp\mediaframe\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\resource\include";"$(InputDir)..\..\..\..\libs\apr\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\openmrcp\platform\openmrcpclient\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\client\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\parser\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\media\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\resource\include";"$(InputDir)..\..\..\..\libs\openmrcp\mediaframe\include";"$(InputDir)..\..\..\..\libs\openmrcp\aprtoolkit\include";"$(InputDir)..\..\..\..\libs\apr\include"" UsePrecompiledHeader="0" /> <Tool Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Sun Feb 17 06:24:28 2008 @@ -783,7 +783,7 @@ return SWITCH_STATUS_TERM; } - mrcp_logger.priority = MRCP_PRIO_EMERGENCY; + apt_log_priority_set(APT_PRIO_EMERGENCY); if ((settings = switch_xml_child(cfg, "settings"))) { for (param = switch_xml_child(settings, "param"); param; param = param->next) { const char *var = switch_xml_attr_soft(param, "name"); @@ -794,7 +794,7 @@ } else if (!strcasecmp(var, "tts_default_profile")) { openmrcp_module.tts_profile_name = switch_core_strdup(openmrcp_module.pool, val); } else if (!strcasecmp(var, "log_level")) { - mrcp_logger.priority = atoi(val); + apt_log_priority_set(atoi(val)); } } } @@ -902,9 +902,10 @@ static switch_status_t openmrcp_init() { /* one-time mrcp global initialization */ - mrcp_global_init(); + if(apr_pool_create(&openmrcp_module.pool,NULL) != APR_SUCCESS) { + return SWITCH_STATUS_FALSE; + } - openmrcp_module.pool = mrcp_global_pool_get(); switch_core_hash_init(&openmrcp_module.profile_hash, openmrcp_module.pool); /* read config */ @@ -917,6 +918,8 @@ static switch_status_t openmrcp_destroy() { + /* one-time mrcp global destroy */ + /* destroy asr/tts profiles */ switch_hash_index_t *hi; void *val; @@ -933,8 +936,8 @@ switch_core_hash_destroy(&openmrcp_module.profile_hash); openmrcp_module.profile_hash = NULL; - /* one-time mrcp global destroy */ - mrcp_global_destroy(); + apr_pool_destroy(openmrcp_module.pool); + openmrcp_module.pool = NULL; return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.vcproj ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.vcproj (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.vcproj Sun Feb 17 06:24:28 2008 @@ -23,7 +23,7 @@ > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\openmrcp\platform\openmrcpclient\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\client\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\parser\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\media\include";"$(InputDir)..\..\..\..\libs\openmrcp\mediaframe\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\resource\include";"$(InputDir)..\..\..\..\libs\apr\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\openmrcp\platform\openmrcpclient\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\client\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\parser\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\media\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\resource\include";"$(InputDir)..\..\..\..\libs\openmrcp\mediaframe\include";"$(InputDir)..\..\..\..\libs\openmrcp\aprtoolkit\include";"$(InputDir)..\..\..\..\libs\apr\include"" UsePrecompiledHeader="0" /> <Tool @@ -40,7 +40,7 @@ > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\openmrcp\platform\openmrcpclient\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\client\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\parser\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\media\include";"$(InputDir)..\..\..\..\libs\openmrcp\mediaframe\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\resource\include";"$(InputDir)..\..\..\..\libs\apr\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\openmrcp\platform\openmrcpclient\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\client\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\parser\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\media\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\resource\include";"$(InputDir)..\..\..\..\libs\openmrcp\mediaframe\include";"$(InputDir)..\..\..\..\libs\openmrcp\aprtoolkit\include";"$(InputDir)..\..\..\..\libs\apr\include"" UsePrecompiledHeader="0" /> <Tool @@ -57,7 +57,7 @@ > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\openmrcp\platform\openmrcpclient\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\client\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\parser\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\media\include";"$(InputDir)..\..\..\..\libs\openmrcp\mediaframe\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\resource\include";"$(InputDir)..\..\..\..\libs\apr\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\openmrcp\platform\openmrcpclient\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\client\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\parser\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\media\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\resource\include";"$(InputDir)..\..\..\..\libs\openmrcp\mediaframe\include";"$(InputDir)..\..\..\..\libs\openmrcp\aprtoolkit\include";"$(InputDir)..\..\..\..\libs\apr\include"" UsePrecompiledHeader="0" /> <Tool @@ -74,7 +74,7 @@ > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\openmrcp\platform\openmrcpclient\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\client\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\parser\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\media\include";"$(InputDir)..\..\..\..\libs\openmrcp\mediaframe\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\resource\include";"$(InputDir)..\..\..\..\libs\apr\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\openmrcp\platform\openmrcpclient\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\client\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\parser\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\media\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\resource\include";"$(InputDir)..\..\..\..\libs\openmrcp\mediaframe\include";"$(InputDir)..\..\..\..\libs\openmrcp\aprtoolkit\include";"$(InputDir)..\..\..\..\libs\apr\include"" UsePrecompiledHeader="0" /> <Tool

1 0

[commit] r7659 - freeswitch/trunk
by Freeswitch SVN 17 Feb '08

17 Feb '08

Author: mikej Date: Sun Feb 17 02:46:20 2008 New Revision: 7659 Modified: freeswitch/trunk/Makefile.am Log: add moh and moh-install targets to install default moh Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Sun Feb 17 02:46:20 2008 @@ -28,6 +28,8 @@ sounds: sounds-en-us-callie-8000 sounds-install: sounds-en-us-callie-8000-install +moh: sounds-music-8000 +moh-install: sounds-music-8000-install libfreeswitch_la_SOURCES = \ src/switch_apr.c \

1 0

[commit] r7658 - freeswitch/trunk
by Freeswitch SVN 17 Feb '08

17 Feb '08

Author: mikej Date: Sun Feb 17 01:32:09 2008 New Revision: 7658 Modified: freeswitch/trunk/Freeswitch.2008.sln freeswitch/trunk/Freeswitch.sln Log: remove unused libs from msvc build Modified: freeswitch/trunk/Freeswitch.2008.sln ============================================================================== --- freeswitch/trunk/Freeswitch.2008.sln (original) +++ freeswitch/trunk/Freeswitch.2008.sln Sun Feb 17 01:32:09 2008 @@ -545,8 +545,6 @@ {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgsm", "libs\codec\gsm\libgsm.2008.vcproj", "{8FD2E297-4096-47E5-9258-C48FF1841523}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libilbc", "libs\codec\ilbc\libilbc.2008.vcproj", "{989BB874-7AF1-44CB-8E5C-CC8113D267E8}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libiax2", "libs\iax\libiax2.2008.vcproj", "{5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}" @@ -623,8 +621,6 @@ {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libg7xx", "libs\codec\g7xx\libg7xx.2008.vcproj", "{D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsofia_sip_ua_static", "libs\win32\sofia\libsofia_sip_ua_static.2008.vcproj", "{70A49BC2-7500-41D0-B75D-EDCC5BE987A0}" ProjectSection(ProjectDependencies) = postProject {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} @@ -1031,12 +1027,6 @@ {05515420-16DE-4E63-BE73-85BE85BA5142}.Release|Win32.ActiveCfg = Release|Win32 {05515420-16DE-4E63-BE73-85BE85BA5142}.Release|Win32.Build.0 = Release|Win32 {05515420-16DE-4E63-BE73-85BE85BA5142}.Release|x64.ActiveCfg = Release|Win32 - {8FD2E297-4096-47E5-9258-C48FF1841523}.Debug|Win32.ActiveCfg = Debug|Win32 - {8FD2E297-4096-47E5-9258-C48FF1841523}.Debug|Win32.Build.0 = Debug|Win32 - {8FD2E297-4096-47E5-9258-C48FF1841523}.Debug|x64.ActiveCfg = Debug|Win32 - {8FD2E297-4096-47E5-9258-C48FF1841523}.Release|Win32.ActiveCfg = Release|Win32 - {8FD2E297-4096-47E5-9258-C48FF1841523}.Release|Win32.Build.0 = Release|Win32 - {8FD2E297-4096-47E5-9258-C48FF1841523}.Release|x64.ActiveCfg = Release|Win32 {989BB874-7AF1-44CB-8E5C-CC8113D267E8}.Debug|Win32.ActiveCfg = Debug|Win32 {989BB874-7AF1-44CB-8E5C-CC8113D267E8}.Debug|Win32.Build.0 = Debug|Win32 {989BB874-7AF1-44CB-8E5C-CC8113D267E8}.Debug|x64.ActiveCfg = Debug|Win32 @@ -1175,12 +1165,6 @@ {0DF3ABD0-DDC0-4265-B778-07C66780979B}.Release|Win32.ActiveCfg = Release|Win32 {0DF3ABD0-DDC0-4265-B778-07C66780979B}.Release|Win32.Build.0 = Release|Win32 {0DF3ABD0-DDC0-4265-B778-07C66780979B}.Release|x64.ActiveCfg = Release|Win32 - {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}.Debug|Win32.ActiveCfg = Debug|Win32 - {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}.Debug|Win32.Build.0 = Debug|Win32 - {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}.Debug|x64.ActiveCfg = Debug|Win32 - {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}.Release|Win32.ActiveCfg = Release|Win32 - {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}.Release|Win32.Build.0 = Release|Win32 - {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}.Release|x64.ActiveCfg = Release|Win32 {70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Debug|Win32.ActiveCfg = Debug|Win32 {70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Debug|Win32.Build.0 = Debug|Win32 {70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Debug|x64.ActiveCfg = Debug|Win32 @@ -1494,7 +1478,6 @@ {08DAD348-9E0A-4A2E-97F1-F1E7E24A7836} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5} {ACFD96F2-58AA-491D-B4C0-33BD0BD57FDE} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {89385C74-5860-4174-9CAF-A39E7C48909C} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} - {8FD2E297-4096-47E5-9258-C48FF1841523} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {989BB874-7AF1-44CB-8E5C-CC8113D267E8} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {1906D736-08BD-4EE1-924F-B536249B9A54} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} @@ -1516,7 +1499,6 @@ {356EC96D-4C9F-47B5-9083-FC328B87BA94} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {155844C3-EC5F-407F-97A4-A2DDADED9B2F} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {204FA0DE-305D-4414-AE2E-F195A23F390D} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} - {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {4043FC6A-9A30-4577-8AD5-9B233C9575D8} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} Modified: freeswitch/trunk/Freeswitch.sln ============================================================================== --- freeswitch/trunk/Freeswitch.sln (original) +++ freeswitch/trunk/Freeswitch.sln Sun Feb 17 01:32:09 2008 @@ -196,8 +196,6 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Libraries", "_Libraries", "{EB910B0D-F27D-4B62-B67B-DE834C99AC5B}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgsm", "libs\codec\gsm\libgsm.vcproj", "{8FD2E297-4096-47E5-9258-C48FF1841523}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libilbc", "libs\codec\ilbc\libilbc.vcproj", "{989BB874-7AF1-44CB-8E5C-CC8113D267E8}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libiax2", "libs\iax\libiax2.vcproj", "{5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}" @@ -276,8 +274,6 @@ {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libg7xx", "libs\codec\g7xx\libg7xx.vcproj", "{D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsofia_sip_ua_static", "libs\win32\sofia\libsofia_sip_ua_static.vcproj", "{70A49BC2-7500-41D0-B75D-EDCC5BE987A0}" ProjectSection(ProjectDependencies) = postProject {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} @@ -1034,12 +1030,6 @@ {05515420-16DE-4E63-BE73-85BE85BA5142}.Release|Win32.ActiveCfg = Release|Win32 {05515420-16DE-4E63-BE73-85BE85BA5142}.Release|Win32.Build.0 = Release|Win32 {05515420-16DE-4E63-BE73-85BE85BA5142}.Release|x64.ActiveCfg = Release|Win32 - {8FD2E297-4096-47E5-9258-C48FF1841523}.Debug|Win32.ActiveCfg = Debug|Win32 - {8FD2E297-4096-47E5-9258-C48FF1841523}.Debug|Win32.Build.0 = Debug|Win32 - {8FD2E297-4096-47E5-9258-C48FF1841523}.Debug|x64.ActiveCfg = Debug|Win32 - {8FD2E297-4096-47E5-9258-C48FF1841523}.Release|Win32.ActiveCfg = Release|Win32 - {8FD2E297-4096-47E5-9258-C48FF1841523}.Release|Win32.Build.0 = Release|Win32 - {8FD2E297-4096-47E5-9258-C48FF1841523}.Release|x64.ActiveCfg = Release|Win32 {989BB874-7AF1-44CB-8E5C-CC8113D267E8}.Debug|Win32.ActiveCfg = Debug|Win32 {989BB874-7AF1-44CB-8E5C-CC8113D267E8}.Debug|Win32.Build.0 = Debug|Win32 {989BB874-7AF1-44CB-8E5C-CC8113D267E8}.Debug|x64.ActiveCfg = Debug|Win32 @@ -1178,12 +1168,6 @@ {0DF3ABD0-DDC0-4265-B778-07C66780979B}.Release|Win32.ActiveCfg = Release|Win32 {0DF3ABD0-DDC0-4265-B778-07C66780979B}.Release|Win32.Build.0 = Release|Win32 {0DF3ABD0-DDC0-4265-B778-07C66780979B}.Release|x64.ActiveCfg = Release|Win32 - {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}.Debug|Win32.ActiveCfg = Debug|Win32 - {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}.Debug|Win32.Build.0 = Debug|Win32 - {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}.Debug|x64.ActiveCfg = Debug|Win32 - {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}.Release|Win32.ActiveCfg = Release|Win32 - {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}.Release|Win32.Build.0 = Release|Win32 - {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}.Release|x64.ActiveCfg = Release|Win32 {70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Debug|Win32.ActiveCfg = Debug|Win32 {70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Debug|Win32.Build.0 = Debug|Win32 {70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Debug|x64.ActiveCfg = Debug|Win32 @@ -1484,7 +1468,6 @@ {1A1FF289-4FD6-4285-A422-D31DD67A4723} = {CBD81696-EFB4-4D2F-8451-1B8DAA86155A} {EC3E5C7F-EE09-47E2-80FE-546363D14A98} = {B8F5B47B-8568-46EB-B320-64C17D2A98BC} {89385C74-5860-4174-9CAF-A39E7C48909C} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} - {8FD2E297-4096-47E5-9258-C48FF1841523} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {989BB874-7AF1-44CB-8E5C-CC8113D267E8} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {1906D736-08BD-4EE1-924F-B536249B9A54} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} @@ -1506,7 +1489,6 @@ {356EC96D-4C9F-47B5-9083-FC328B87BA94} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {155844C3-EC5F-407F-97A4-A2DDADED9B2F} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {204FA0DE-305D-4414-AE2E-F195A23F390D} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} - {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {4043FC6A-9A30-4577-8AD5-9B233C9575D8} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}

1 0

[commit] r7657 - in freeswitch/trunk: . w32/Setup
by Freeswitch SVN 17 Feb '08

17 Feb '08

Author: mikej Date: Sun Feb 17 01:28:45 2008 New Revision: 7657 Modified: freeswitch/trunk/Freeswitch.2008.sln freeswitch/trunk/Freeswitch.sln freeswitch/trunk/w32/Setup/Setup.vdproj Log: pull old codec mods from msvc build. Modified: freeswitch/trunk/Freeswitch.2008.sln ============================================================================== --- freeswitch/trunk/Freeswitch.2008.sln (original) +++ freeswitch/trunk/Freeswitch.2008.sln Sun Feb 17 01:28:45 2008 @@ -399,12 +399,6 @@ {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_gsm", "src\mod\codecs\mod_gsm\mod_gsm.2008.vcproj", "{4926323F-4EA8-4B7D-A3D3-65488725988F}" - ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {8FD2E297-4096-47E5-9258-C48FF1841523} = {8FD2E297-4096-47E5-9258-C48FF1841523} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sndfile", "src\mod\formats\mod_sndfile\mod_sndfile.2008.vcproj", "{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}" ProjectSection(ProjectDependencies) = postProject {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} @@ -412,11 +406,6 @@ {3D0370CA-BED2-4657-A475-32375CBCB6E4} = {3D0370CA-BED2-4657-A475-32375CBCB6E4} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g711", "src\mod\codecs\mod_g711\mod_g711.2008.vcproj", "{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}" - ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_iax", "src\mod\endpoints\mod_iax\mod_iax.2008.vcproj", "{3A5B9131-F20C-4A85-9447-6C1610941CEE}" ProjectSection(ProjectDependencies) = postProject {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} @@ -634,22 +623,8 @@ {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g726", "src\mod\codecs\mod_g726\mod_g726.2008.vcproj", "{486369EB-F150-4B56-BCC8-77B9E18FF5F5}" - ProjectSection(ProjectDependencies) = postProject - {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} = {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libg7xx", "libs\codec\g7xx\libg7xx.2008.vcproj", "{D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g722", "src\mod\codecs\mod_g722\mod_g722.2008.vcproj", "{D42518CC-7475-454D-B392-0E132C07D761}" - ProjectSection(ProjectDependencies) = postProject - {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} = {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsofia_sip_ua_static", "libs\win32\sofia\libsofia_sip_ua_static.2008.vcproj", "{70A49BC2-7500-41D0-B75D-EDCC5BE987A0}" ProjectSection(ProjectDependencies) = postProject {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} @@ -910,24 +885,12 @@ {1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.Release|Win32.ActiveCfg = Release Passthrough|Win32 {1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.Release|Win32.Build.0 = Release Passthrough|Win32 {1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.Release|x64.ActiveCfg = Release|Win32 - {4926323F-4EA8-4B7D-A3D3-65488725988F}.Debug|Win32.ActiveCfg = Debug|Win32 - {4926323F-4EA8-4B7D-A3D3-65488725988F}.Debug|Win32.Build.0 = Debug|Win32 - {4926323F-4EA8-4B7D-A3D3-65488725988F}.Debug|x64.ActiveCfg = Debug|Win32 - {4926323F-4EA8-4B7D-A3D3-65488725988F}.Release|Win32.ActiveCfg = Release|Win32 - {4926323F-4EA8-4B7D-A3D3-65488725988F}.Release|Win32.Build.0 = Release|Win32 - {4926323F-4EA8-4B7D-A3D3-65488725988F}.Release|x64.ActiveCfg = Release|Win32 {AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.Debug|Win32.ActiveCfg = Debug|Win32 {AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.Debug|Win32.Build.0 = Debug|Win32 {AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.Debug|x64.ActiveCfg = Debug|Win32 {AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.Release|Win32.ActiveCfg = Release|Win32 {AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.Release|Win32.Build.0 = Release|Win32 {AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.Release|x64.ActiveCfg = Release|Win32 - {B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Debug|Win32.ActiveCfg = Debug|Win32 - {B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Debug|Win32.Build.0 = Debug|Win32 - {B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Debug|x64.ActiveCfg = Debug|Win32 - {B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Release|Win32.ActiveCfg = Release|Win32 - {B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Release|Win32.Build.0 = Release|Win32 - {B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Release|x64.ActiveCfg = Release|Win32 {3A5B9131-F20C-4A85-9447-6C1610941CEE}.Debug|Win32.ActiveCfg = Debug|Win32 {3A5B9131-F20C-4A85-9447-6C1610941CEE}.Debug|Win32.Build.0 = Debug|Win32 {3A5B9131-F20C-4A85-9447-6C1610941CEE}.Debug|x64.ActiveCfg = Debug|Win32 @@ -1212,24 +1175,12 @@ {0DF3ABD0-DDC0-4265-B778-07C66780979B}.Release|Win32.ActiveCfg = Release|Win32 {0DF3ABD0-DDC0-4265-B778-07C66780979B}.Release|Win32.Build.0 = Release|Win32 {0DF3ABD0-DDC0-4265-B778-07C66780979B}.Release|x64.ActiveCfg = Release|Win32 - {486369EB-F150-4B56-BCC8-77B9E18FF5F5}.Debug|Win32.ActiveCfg = Debug|Win32 - {486369EB-F150-4B56-BCC8-77B9E18FF5F5}.Debug|Win32.Build.0 = Debug|Win32 - {486369EB-F150-4B56-BCC8-77B9E18FF5F5}.Debug|x64.ActiveCfg = Debug|Win32 - {486369EB-F150-4B56-BCC8-77B9E18FF5F5}.Release|Win32.ActiveCfg = Release|Win32 - {486369EB-F150-4B56-BCC8-77B9E18FF5F5}.Release|Win32.Build.0 = Release|Win32 - {486369EB-F150-4B56-BCC8-77B9E18FF5F5}.Release|x64.ActiveCfg = Release|Win32 {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}.Debug|Win32.ActiveCfg = Debug|Win32 {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}.Debug|Win32.Build.0 = Debug|Win32 {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}.Debug|x64.ActiveCfg = Debug|Win32 {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}.Release|Win32.ActiveCfg = Release|Win32 {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}.Release|Win32.Build.0 = Release|Win32 {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}.Release|x64.ActiveCfg = Release|Win32 - {D42518CC-7475-454D-B392-0E132C07D761}.Debug|Win32.ActiveCfg = Debug|Win32 - {D42518CC-7475-454D-B392-0E132C07D761}.Debug|Win32.Build.0 = Debug|Win32 - {D42518CC-7475-454D-B392-0E132C07D761}.Debug|x64.ActiveCfg = Debug|Win32 - {D42518CC-7475-454D-B392-0E132C07D761}.Release|Win32.ActiveCfg = Release|Win32 - {D42518CC-7475-454D-B392-0E132C07D761}.Release|Win32.Build.0 = Release|Win32 - {D42518CC-7475-454D-B392-0E132C07D761}.Release|x64.ActiveCfg = Release|Win32 {70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Debug|Win32.ActiveCfg = Debug|Win32 {70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Debug|Win32.Build.0 = Debug|Win32 {70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Debug|x64.ActiveCfg = Debug|Win32 @@ -1494,13 +1445,9 @@ EndGlobalSection GlobalSection(NestedProjects) = preSolution {1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} - {4926323F-4EA8-4B7D-A3D3-65488725988F} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} - {B1FE4613-3F4B-4DAF-9714-2472BF8F56AE} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} {5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} {5580D60E-0F77-4716-9CD4-B8E5986FA375} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} {D3EC0AFF-76FC-4210-A825-9A17410660A3} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} - {486369EB-F150-4B56-BCC8-77B9E18FF5F5} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} - {D42518CC-7475-454D-B392-0E132C07D761} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} {FEA1EEF7-876F-48DE-88BF-C0E3E606D758} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} {8DEB383C-4091-4F42-A56F-C9E46D552D79} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} {2C3C2423-234B-4772-8899-D3B137E5CA35} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} Modified: freeswitch/trunk/Freeswitch.sln ============================================================================== --- freeswitch/trunk/Freeswitch.sln (original) +++ freeswitch/trunk/Freeswitch.sln Sun Feb 17 01:28:45 2008 @@ -24,12 +24,6 @@ {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_gsm", "src\mod\codecs\mod_gsm\mod_gsm.vcproj", "{4926323F-4EA8-4B7D-A3D3-65488725988F}" - ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {8FD2E297-4096-47E5-9258-C48FF1841523} = {8FD2E297-4096-47E5-9258-C48FF1841523} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sndfile", "src\mod\formats\mod_sndfile\mod_sndfile.vcproj", "{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}" ProjectSection(ProjectDependencies) = postProject {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} @@ -37,11 +31,6 @@ {3D0370CA-BED2-4657-A475-32375CBCB6E4} = {3D0370CA-BED2-4657-A475-32375CBCB6E4} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g711", "src\mod\codecs\mod_g711\mod_g711.vcproj", "{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}" - ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_iax", "src\mod\endpoints\mod_iax\mod_iax.vcproj", "{3A5B9131-F20C-4A85-9447-6C1610941CEE}" ProjectSection(ProjectDependencies) = postProject {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} @@ -287,22 +276,8 @@ {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g726", "src\mod\codecs\mod_g726\mod_g726.vcproj", "{486369EB-F150-4B56-BCC8-77B9E18FF5F5}" - ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} = {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libg7xx", "libs\codec\g7xx\libg7xx.vcproj", "{D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g722", "src\mod\codecs\mod_g722\mod_g722.vcproj", "{D42518CC-7475-454D-B392-0E132C07D761}" - ProjectSection(ProjectDependencies) = postProject - {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} = {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsofia_sip_ua_static", "libs\win32\sofia\libsofia_sip_ua_static.vcproj", "{70A49BC2-7500-41D0-B75D-EDCC5BE987A0}" ProjectSection(ProjectDependencies) = postProject {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} @@ -913,24 +888,12 @@ {1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.Release|Win32.ActiveCfg = Release Passthrough|Win32 {1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.Release|Win32.Build.0 = Release Passthrough|Win32 {1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.Release|x64.ActiveCfg = Release|Win32 - {4926323F-4EA8-4B7D-A3D3-65488725988F}.Debug|Win32.ActiveCfg = Debug|Win32 - {4926323F-4EA8-4B7D-A3D3-65488725988F}.Debug|Win32.Build.0 = Debug|Win32 - {4926323F-4EA8-4B7D-A3D3-65488725988F}.Debug|x64.ActiveCfg = Debug|Win32 - {4926323F-4EA8-4B7D-A3D3-65488725988F}.Release|Win32.ActiveCfg = Release|Win32 - {4926323F-4EA8-4B7D-A3D3-65488725988F}.Release|Win32.Build.0 = Release|Win32 - {4926323F-4EA8-4B7D-A3D3-65488725988F}.Release|x64.ActiveCfg = Release|Win32 {AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.Debug|Win32.ActiveCfg = Debug|Win32 {AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.Debug|Win32.Build.0 = Debug|Win32 {AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.Debug|x64.ActiveCfg = Debug|Win32 {AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.Release|Win32.ActiveCfg = Release|Win32 {AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.Release|Win32.Build.0 = Release|Win32 {AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.Release|x64.ActiveCfg = Release|Win32 - {B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Debug|Win32.ActiveCfg = Debug|Win32 - {B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Debug|Win32.Build.0 = Debug|Win32 - {B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Debug|x64.ActiveCfg = Debug|Win32 - {B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Release|Win32.ActiveCfg = Release|Win32 - {B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Release|Win32.Build.0 = Release|Win32 - {B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Release|x64.ActiveCfg = Release|Win32 {3A5B9131-F20C-4A85-9447-6C1610941CEE}.Debug|Win32.ActiveCfg = Debug|Win32 {3A5B9131-F20C-4A85-9447-6C1610941CEE}.Debug|Win32.Build.0 = Debug|Win32 {3A5B9131-F20C-4A85-9447-6C1610941CEE}.Debug|x64.ActiveCfg = Debug|Win32 @@ -1215,24 +1178,12 @@ {0DF3ABD0-DDC0-4265-B778-07C66780979B}.Release|Win32.ActiveCfg = Release|Win32 {0DF3ABD0-DDC0-4265-B778-07C66780979B}.Release|Win32.Build.0 = Release|Win32 {0DF3ABD0-DDC0-4265-B778-07C66780979B}.Release|x64.ActiveCfg = Release|Win32 - {486369EB-F150-4B56-BCC8-77B9E18FF5F5}.Debug|Win32.ActiveCfg = Debug|Win32 - {486369EB-F150-4B56-BCC8-77B9E18FF5F5}.Debug|Win32.Build.0 = Debug|Win32 - {486369EB-F150-4B56-BCC8-77B9E18FF5F5}.Debug|x64.ActiveCfg = Debug|Win32 - {486369EB-F150-4B56-BCC8-77B9E18FF5F5}.Release|Win32.ActiveCfg = Release|Win32 - {486369EB-F150-4B56-BCC8-77B9E18FF5F5}.Release|Win32.Build.0 = Release|Win32 - {486369EB-F150-4B56-BCC8-77B9E18FF5F5}.Release|x64.ActiveCfg = Release|Win32 {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}.Debug|Win32.ActiveCfg = Debug|Win32 {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}.Debug|Win32.Build.0 = Debug|Win32 {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}.Debug|x64.ActiveCfg = Debug|Win32 {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}.Release|Win32.ActiveCfg = Release|Win32 {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}.Release|Win32.Build.0 = Release|Win32 {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}.Release|x64.ActiveCfg = Release|Win32 - {D42518CC-7475-454D-B392-0E132C07D761}.Debug|Win32.ActiveCfg = Debug|Win32 - {D42518CC-7475-454D-B392-0E132C07D761}.Debug|Win32.Build.0 = Debug|Win32 - {D42518CC-7475-454D-B392-0E132C07D761}.Debug|x64.ActiveCfg = Debug|Win32 - {D42518CC-7475-454D-B392-0E132C07D761}.Release|Win32.ActiveCfg = Release|Win32 - {D42518CC-7475-454D-B392-0E132C07D761}.Release|Win32.Build.0 = Release|Win32 - {D42518CC-7475-454D-B392-0E132C07D761}.Release|x64.ActiveCfg = Release|Win32 {70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Debug|Win32.ActiveCfg = Debug|Win32 {70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Debug|Win32.Build.0 = Debug|Win32 {70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Debug|x64.ActiveCfg = Debug|Win32 @@ -1496,14 +1447,10 @@ HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {4926323F-4EA8-4B7D-A3D3-65488725988F} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} - {B1FE4613-3F4B-4DAF-9714-2472BF8F56AE} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} {5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} {5580D60E-0F77-4716-9CD4-B8E5986FA375} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} {1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} {D3EC0AFF-76FC-4210-A825-9A17410660A3} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} - {486369EB-F150-4B56-BCC8-77B9E18FF5F5} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} - {D42518CC-7475-454D-B392-0E132C07D761} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} {FEA1EEF7-876F-48DE-88BF-C0E3E606D758} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} {8DEB383C-4091-4F42-A56F-C9E46D552D79} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} {2C3C2423-234B-4772-8899-D3B137E5CA35} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} Modified: freeswitch/trunk/w32/Setup/Setup.vdproj ============================================================================== --- freeswitch/trunk/w32/Setup/Setup.vdproj (original) +++ freeswitch/trunk/w32/Setup/Setup.vdproj Sun Feb 17 01:28:45 2008 @@ -27,12 +27,6 @@ } "Entry" { - "MsmKey" = "8:_0BF27B651AA0454FB928D31367A40213" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_103209E575C54D649DD1472DBB9B5F5D" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -453,12 +447,6 @@ } "Entry" { - "MsmKey" = "8:_834AFC35916346B3B9450D32C2B92579" - "OwnerKey" = "8:_8EA64E049159460A8739906DB768F658" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_8471500508034D338D599ED5C35F938F" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -477,12 +465,6 @@ } "Entry" { - "MsmKey" = "8:_87768631363249B2B301143C193612F7" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_879085EF680EFDF6242DCB77439EC825" "OwnerKey" = "8:_3FBEFE0119944C6781F81104ECEF37CA" "MsmSig" = "8:_UNDEFINED" @@ -519,554 +501,500 @@ } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_0772289C2CC6435396616D7A2C407EA2" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_FBB0E565B1DE49CE9C827ACAC337AC5B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_FB1B9FBDC3294F1C96DAC4246C013C22" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_F0B800E719294692A02518CFD8CBAEFF" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_EF14CB99F3414BB689D0CB0E6D6B8AB8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_EC4922AEC1064C90B96EBBDD3104D761" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_EAF4B051F44745ABA9B58038FB93994C" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_E763C699DF0948B6984DDEB96A2DFD06" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_E1AA7C5B96DA4A26859D2C7A21E00AB6" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_D7EC5795A9C645AC8E129C2EE6D461ED" + "MsmKey" = "8:_8FB175B8685A47F7BE75E1A025F65693" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_D6F0F5845FAD4707975CE012A33CD607" + "MsmKey" = "8:_90D7F247E8254DE797317F431E3FB010" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_D2EF447106B24E67907DAED3D39CFBB1" + "MsmKey" = "8:_91BA2668F87764F53188E93BC8D363D7" + "OwnerKey" = "8:_59CFED0C4EC0492C945E4EBC04FE965F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_D1269F1E49D442CF8EAC96C23E60325D" + "MsmKey" = "8:_92F95219F6434CE3A736526946DA2ABB" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_D0BB09AFB8D94B76918F0EE85BCCAD0A" + "MsmKey" = "8:_95D01083472B4853AC3F06514558F347" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_C81AC700C1BC4A55B98DF12C0CBAFD6F" + "MsmKey" = "8:_96F8F7DE89C74DC399E8AE55C22B4F15" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_C105055EE271471A999CE7022E617EB7" + "MsmKey" = "8:_970ADC4156DB4B3DBBC2C65E1C41B642" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_C1036825E1364537B537E542E71F9C0E" + "MsmKey" = "8:_98C7D74F78A84DA3B32B460138019AE2" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_BB99CEDF341D40F3976B6D5486D9366D" + "MsmKey" = "8:_991CC352E2204C50ABEDAE5D104B4310" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_B5542B260CD5493395871EFDE833E438" + "MsmKey" = "8:_9B19C40442134D69B533E16D0851D99B" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_B20769E090034897B32E3EA4EC1BA8A0" + "MsmKey" = "8:_9B429CDF56AE431D975C90AC00A348CD" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_B0A2E9B4C45D4098AFD734D0C4E3EAFB" + "MsmKey" = "8:_9B4D63B995014A0C8AF19FF42616D292" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_AD2EB44FE6D548F2A8DA4F9F2CE817AC" + "MsmKey" = "8:_9ECA16E530634A7582AC80138BDA016B" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_A0D5F714A0F94250A1C39603B699AB82" + "MsmKey" = "8:_9FCEC602DF6540E5BC437B8F3CF0F2BC" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_9B19C40442134D69B533E16D0851D99B" + "MsmKey" = "8:_A0D5F714A0F94250A1C39603B699AB82" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_96F8F7DE89C74DC399E8AE55C22B4F15" + "MsmKey" = "8:_A164EF86C4B57E41C8CE77B48F39DAC7" + "OwnerKey" = "8:_D2EF447106B24E67907DAED3D39CFBB1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_95D01083472B4853AC3F06514558F347" + "MsmKey" = "8:_A3936A2727E73289F5804D5DA006FD0A" + "OwnerKey" = "8:_28FBC5A60B44423B8A2CC378347483CE" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_8F74B66237D34BACBB12B2F4CFCCD932" + "MsmKey" = "8:_A944ADCEDF884574A23F7BA5420A6BA1" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_8E023477B9DC4126921A556B285B29E5" + "MsmKey" = "8:_AC40F24B3F5140FCAA48FAC397D8BEB0" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_8B53F026686B44189676CBC200E641C1" + "MsmKey" = "8:_AD2EB44FE6D548F2A8DA4F9F2CE817AC" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_87768631363249B2B301143C193612F7" + "MsmKey" = "8:_ADA22D44BCDEBA509E09A5D4C155AA41" + "OwnerKey" = "8:_0772289C2CC6435396616D7A2C407EA2" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_7B1050643E1E48A3B67B281B4AD43904" + "MsmKey" = "8:_ADA22D44BCDEBA509E09A5D4C155AA41" + "OwnerKey" = "8:_FBB0E565B1DE49CE9C827ACAC337AC5B" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_6E5C001E7A314DCEA0A4BF52BF74BCAD" + "MsmKey" = "8:_ADA22D44BCDEBA509E09A5D4C155AA41" + "OwnerKey" = "8:_D2EF447106B24E67907DAED3D39CFBB1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_5EDFD5418DD243D1A03D882B83BBBCF1" + "MsmKey" = "8:_ADA22D44BCDEBA509E09A5D4C155AA41" + "OwnerKey" = "8:_BB99CEDF341D40F3976B6D5486D9366D" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_59CFED0C4EC0492C945E4EBC04FE965F" + "MsmKey" = "8:_ADA22D44BCDEBA509E09A5D4C155AA41" + "OwnerKey" = "8:_9B19C40442134D69B533E16D0851D99B" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_4A285D260C3748A4BEFA6E5A9004D128" + "MsmKey" = "8:_ADA22D44BCDEBA509E09A5D4C155AA41" + "OwnerKey" = "8:_1CFB1AB04E024FC993E0EB4859DF8408" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_3FBEFE0119944C6781F81104ECEF37CA" + "MsmKey" = "8:_B0A2E9B4C45D4098AFD734D0C4E3EAFB" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_3E37631016BC45B2B672FE23257D542B" + "MsmKey" = "8:_B33F513CD3524D3BB7BD11E035C3B562" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_3DB5A5EF1E624F999BCEA20250508EEA" + "MsmKey" = "8:_B34D0605157A4FE2A81F4639019E31BD" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_318FCC99E8D143D6B4F9F534E63009B3" + "MsmKey" = "8:_B5542B260CD5493395871EFDE833E438" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_2F2FEC549F02436EB87961BD1B9E5783" + "MsmKey" = "8:_B5ADB663C7CE49A1A11E895E4EBB4933" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_2D9E612823084E3F9E10376A7AC0C476" + "MsmKey" = "8:_B700A9A1FCA94E5D8C8B08C4FD856669" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_2B80DCCD934745B1BB4F0B31099094D9" + "MsmKey" = "8:_B9EAE14D8B704EFAB8A848C6EF94630A" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_297D0BADB993435092DDB8CDF9F2A3C6" + "MsmKey" = "8:_BB108A4FE89F4F58BA592B3BD4B89058" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_28FBC5A60B44423B8A2CC378347483CE" + "MsmKey" = "8:_BB649A2C1ABE4895859025B09A240323" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_2814E641538B42EFA83525986A9D5AC1" + "MsmKey" = "8:_BB99CEDF341D40F3976B6D5486D9366D" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_1CFB1AB04E024FC993E0EB4859DF8408" + "MsmKey" = "8:_BEADBF5396084C0093E53DF1605856B8" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_1777CB4B737E4B8481E25A10950B2B5A" + "MsmKey" = "8:_BF3BA59EA18342C891BD04B0DB279B13" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_166BDBE308F54EE4881DA68F2A8189F5" + "MsmKey" = "8:_C1036825E1364537B537E542E71F9C0E" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8EA64E049159460A8739906DB768F658" - "OwnerKey" = "8:_0BF27B651AA0454FB928D31367A40213" + "MsmKey" = "8:_C105055EE271471A999CE7022E617EB7" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8F74B66237D34BACBB12B2F4CFCCD932" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_0772289C2CC6435396616D7A2C407EA2" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8FB175B8685A47F7BE75E1A025F65693" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_FBB0E565B1DE49CE9C827ACAC337AC5B" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_90D7F247E8254DE797317F431E3FB010" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_FB1B9FBDC3294F1C96DAC4246C013C22" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_91BA2668F87764F53188E93BC8D363D7" - "OwnerKey" = "8:_59CFED0C4EC0492C945E4EBC04FE965F" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_F0B800E719294692A02518CFD8CBAEFF" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_92F95219F6434CE3A736526946DA2ABB" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_EF14CB99F3414BB689D0CB0E6D6B8AB8" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_95D01083472B4853AC3F06514558F347" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_EC4922AEC1064C90B96EBBDD3104D761" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_96F8F7DE89C74DC399E8AE55C22B4F15" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_EAF4B051F44745ABA9B58038FB93994C" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_970ADC4156DB4B3DBBC2C65E1C41B642" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_E763C699DF0948B6984DDEB96A2DFD06" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_98C7D74F78A84DA3B32B460138019AE2" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_E1AA7C5B96DA4A26859D2C7A21E00AB6" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_991CC352E2204C50ABEDAE5D104B4310" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_D7EC5795A9C645AC8E129C2EE6D461ED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_99D01E0DD51C3B0A35FC1B32E1BD2003" - "OwnerKey" = "8:_96F8F7DE89C74DC399E8AE55C22B4F15" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_D6F0F5845FAD4707975CE012A33CD607" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9B19C40442134D69B533E16D0851D99B" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_D1269F1E49D442CF8EAC96C23E60325D" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9B429CDF56AE431D975C90AC00A348CD" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_D0BB09AFB8D94B76918F0EE85BCCAD0A" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9B4D63B995014A0C8AF19FF42616D292" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_C81AC700C1BC4A55B98DF12C0CBAFD6F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9ECA16E530634A7582AC80138BDA016B" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_C105055EE271471A999CE7022E617EB7" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9FCEC602DF6540E5BC437B8F3CF0F2BC" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_C1036825E1364537B537E542E71F9C0E" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A0D5F714A0F94250A1C39603B699AB82" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_BB99CEDF341D40F3976B6D5486D9366D" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A164EF86C4B57E41C8CE77B48F39DAC7" - "OwnerKey" = "8:_D2EF447106B24E67907DAED3D39CFBB1" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_B5542B260CD5493395871EFDE833E438" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A3936A2727E73289F5804D5DA006FD0A" - "OwnerKey" = "8:_28FBC5A60B44423B8A2CC378347483CE" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_B0A2E9B4C45D4098AFD734D0C4E3EAFB" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A944ADCEDF884574A23F7BA5420A6BA1" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_AD2EB44FE6D548F2A8DA4F9F2CE817AC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_AC40F24B3F5140FCAA48FAC397D8BEB0" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_9B19C40442134D69B533E16D0851D99B" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_AD2EB44FE6D548F2A8DA4F9F2CE817AC" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_96F8F7DE89C74DC399E8AE55C22B4F15" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_ADA22D44BCDEBA509E09A5D4C155AA41" - "OwnerKey" = "8:_0772289C2CC6435396616D7A2C407EA2" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_95D01083472B4853AC3F06514558F347" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_ADA22D44BCDEBA509E09A5D4C155AA41" - "OwnerKey" = "8:_FBB0E565B1DE49CE9C827ACAC337AC5B" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_8E023477B9DC4126921A556B285B29E5" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_ADA22D44BCDEBA509E09A5D4C155AA41" - "OwnerKey" = "8:_D2EF447106B24E67907DAED3D39CFBB1" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_8B53F026686B44189676CBC200E641C1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_ADA22D44BCDEBA509E09A5D4C155AA41" - "OwnerKey" = "8:_BB99CEDF341D40F3976B6D5486D9366D" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_7B1050643E1E48A3B67B281B4AD43904" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_ADA22D44BCDEBA509E09A5D4C155AA41" - "OwnerKey" = "8:_9B19C40442134D69B533E16D0851D99B" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_6E5C001E7A314DCEA0A4BF52BF74BCAD" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_ADA22D44BCDEBA509E09A5D4C155AA41" - "OwnerKey" = "8:_1CFB1AB04E024FC993E0EB4859DF8408" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_5EDFD5418DD243D1A03D882B83BBBCF1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B0A2E9B4C45D4098AFD734D0C4E3EAFB" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_59CFED0C4EC0492C945E4EBC04FE965F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B20769E090034897B32E3EA4EC1BA8A0" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_4A285D260C3748A4BEFA6E5A9004D128" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B33F513CD3524D3BB7BD11E035C3B562" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_3FBEFE0119944C6781F81104ECEF37CA" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B34D0605157A4FE2A81F4639019E31BD" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_3E37631016BC45B2B672FE23257D542B" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B5542B260CD5493395871EFDE833E438" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_3DB5A5EF1E624F999BCEA20250508EEA" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B5ADB663C7CE49A1A11E895E4EBB4933" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_318FCC99E8D143D6B4F9F534E63009B3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B700A9A1FCA94E5D8C8B08C4FD856669" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_2F2FEC549F02436EB87961BD1B9E5783" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B9EAE14D8B704EFAB8A848C6EF94630A" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_2D9E612823084E3F9E10376A7AC0C476" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_BB108A4FE89F4F58BA592B3BD4B89058" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_2B80DCCD934745B1BB4F0B31099094D9" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_BB649A2C1ABE4895859025B09A240323" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_297D0BADB993435092DDB8CDF9F2A3C6" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_BB99CEDF341D40F3976B6D5486D9366D" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_28FBC5A60B44423B8A2CC378347483CE" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_BEADBF5396084C0093E53DF1605856B8" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_2814E641538B42EFA83525986A9D5AC1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_BF3BA59EA18342C891BD04B0DB279B13" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_1CFB1AB04E024FC993E0EB4859DF8408" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C1036825E1364537B537E542E71F9C0E" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_1777CB4B737E4B8481E25A10950B2B5A" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C105055EE271471A999CE7022E617EB7" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "OwnerKey" = "8:_166BDBE308F54EE4881DA68F2A8189F5" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1233,6 +1161,12 @@ } "Entry" { + "MsmKey" = "8:_EF8AEAED91BC475C8B67BC0EBBF87258" + "OwnerKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_EFB1E330D42F4B8F8FC368D7D9D37115" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1263,12 +1197,6 @@ } "Entry" { - "MsmKey" = "8:_F9ABD5CBDCEFB23E0FB3FD8B23583E47" - "OwnerKey" = "8:_F0B800E719294692A02518CFD8CBAEFF" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_FAA16AE2AC704545915D1FF2BD5943F7" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2728,26 +2656,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_99D01E0DD51C3B0A35FC1B32E1BD2003" - { - "SourcePath" = "8:curllib.dll" - "TargetName" = "8:curllib.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:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9B429CDF56AE431D975C90AC00A348CD" { "SourcePath" = "8:..\\..\\conf\\dialplan\\extensions\\sipbroker.com.noload" @@ -3468,26 +3376,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F9ABD5CBDCEFB23E0FB3FD8B23583E47" - { - "SourcePath" = "8:curllib.dll" - "TargetName" = "8:curllib.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}:_FAA16AE2AC704545915D1FF2BD5943F7" { "SourcePath" = "8:..\\..\\conf\\autoload_configs\\voicemail.conf.xml" @@ -4417,11 +4305,11 @@ } "MergeModule" { - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_834AFC35916346B3B9450D32C2B92579" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_C4908CD1D76D499A8A801FB03E9D3813" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:microsoft_vc90_debugcrt_x86.msm" + "SourcePath" = "8:policy_9_0_Microsoft_VC90_DebugCRT_x86.msm" "Properties" { } @@ -4431,11 +4319,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_8EA64E049159460A8739906DB768F658" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_EF8AEAED91BC475C8B67BC0EBBF87258" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:policy_9_0_Microsoft_VC90_DebugCRT_x86.msm" + "SourcePath" = "8:microsoft_vc90_debugcrt_x86.msm" "Properties" { } @@ -4476,34 +4364,6 @@ { } } - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_0BF27B651AA0454FB928D31367A40213" - { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_g722.dll" - "TargetName" = "8:" - "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:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - "ProjectOutputGroupRegister" = "3:1" - "OutputConfiguration" = "8:" - "OutputGroupCanonicalName" = "8:Built" - "OutputProjectGuid" = "8:{D42518CC-7475-454D-B392-0E132C07D761}" - "ShowKeyOutput" = "11:TRUE" - "ExcludeFilters" - { - } - } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_166BDBE308F54EE4881DA68F2A8189F5" { "SourcePath" = "8:..\\..\\Debug\\mod\\mod_enum.dll" @@ -5008,34 +4868,6 @@ { } } - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_87768631363249B2B301143C193612F7" - { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_g711.dll" - "TargetName" = "8:" - "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:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - "ProjectOutputGroupRegister" = "3:1" - "OutputConfiguration" = "8:" - "OutputGroupCanonicalName" = "8:Built" - "OutputProjectGuid" = "8:{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}" - "ShowKeyOutput" = "11:TRUE" - "ExcludeFilters" - { - } - } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8B53F026686B44189676CBC200E641C1" { "SourcePath" = "8:..\\..\\Debug\\mod\\mod_amr.dll" @@ -5092,34 +4924,6 @@ { } } - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8F74B66237D34BACBB12B2F4CFCCD932" - { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_g726.dll" - "TargetName" = "8:" - "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:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - "ProjectOutputGroupRegister" = "3:1" - "OutputConfiguration" = "8:" - "OutputGroupCanonicalName" = "8:Built" - "OutputProjectGuid" = "8:{486369EB-F150-4B56-BCC8-77B9E18FF5F5}" - "ShowKeyOutput" = "11:TRUE" - "ExcludeFilters" - { - } - } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_95D01083472B4853AC3F06514558F347" { "SourcePath" = "8:..\\..\\Debug\\mod\\mod_spidermonkey_teletone.dll" @@ -5316,34 +5120,6 @@ { } } - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_B20769E090034897B32E3EA4EC1BA8A0" - { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_gsm.dll" - "TargetName" = "8:" - "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:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - "ProjectOutputGroupRegister" = "3:1" - "OutputConfiguration" = "8:" - "OutputGroupCanonicalName" = "8:Built" - "OutputProjectGuid" = "8:{4926323F-4EA8-4B7D-A3D3-65488725988F}" - "ShowKeyOutput" = "11:TRUE" - "ExcludeFilters" - { - } - } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_B5542B260CD5493395871EFDE833E438" { "SourcePath" = "8:..\\..\\Debug\\mod\\mod_openmrcp.dll"

1 0

[commit] r7656 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 17 Feb '08

17 Feb '08

Author: mikej Date: Sun Feb 17 01:02:45 2008 New Revision: 7656 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: don't log lost logs of 0 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Sun Feb 17 01:02:45 2008 @@ -109,13 +109,15 @@ char *data = strdup(node->data); if (data) { if (switch_queue_trypush(l->log_queue, data) == SWITCH_STATUS_SUCCESS) { - int ll = l->lost_logs; - switch_event_t *event; - l->lost_logs = 0; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Lost %d log lines!\n", ll); - if (switch_event_create(&event, SWITCH_EVENT_TRAP) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "info", "lost %d log lines", ll); - switch_event_fire(&event); + if (l->lost_logs) { + int ll = l->lost_logs; + switch_event_t *event; + l->lost_logs = 0; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Lost %d log lines!\n", ll); + if (switch_event_create(&event, SWITCH_EVENT_TRAP) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "info", "lost %d log lines", ll); + switch_event_fire(&event); + } } } else { switch_safe_free(data);

1 0

[commit] r7655 - in freeswitch/trunk/libs/voipcodecs/src: . voipcodecs
by Freeswitch SVN 17 Feb '08

17 Feb '08

Author: mikej Date: Sun Feb 17 00:57:07 2008 New Revision: 7655 Modified: freeswitch/trunk/libs/voipcodecs/src/lpc10_voicing.c freeswitch/trunk/libs/voipcodecs/src/voipcodecs/telephony.h Log: hints for the code analysis. Modified: freeswitch/trunk/libs/voipcodecs/src/lpc10_voicing.c ============================================================================== --- freeswitch/trunk/libs/voipcodecs/src/lpc10_voicing.c (original) +++ freeswitch/trunk/libs/voipcodecs/src/lpc10_voicing.c Sun Feb 17 00:57:07 2008 @@ -303,7 +303,9 @@ s->voice[1][1] = s->voice[2][1]; s->maxmin = *maxamd / max(*minamd, 1.0f); } - /* Calculate voicing parameters twice per frame */ + vc_assert(lpbuf); + vc_assert(inbuf); + /* Calculate voicing parameters twice per frame */ vparms(vwin, &inbuf[inbuf_offset], &lpbuf[lpbuf_offset], Modified: freeswitch/trunk/libs/voipcodecs/src/voipcodecs/telephony.h ============================================================================== --- freeswitch/trunk/libs/voipcodecs/src/voipcodecs/telephony.h (original) +++ freeswitch/trunk/libs/voipcodecs/src/voipcodecs/telephony.h Sun Feb 17 00:57:07 2008 @@ -55,6 +55,7 @@ #define TRUE (!FALSE) #endif +#include <assert.h> #if (_MSC_VER >= 1400) // VC8+ #define vc_assert(expr) assert(expr);__analysis_assume( expr ) #else

1 0

[commit] r7654 - freeswitch/trunk/libs/voipcodecs/src
by Freeswitch SVN 17 Feb '08

17 Feb '08

Author: mikej Date: Sun Feb 17 00:38:28 2008 New Revision: 7654 Modified: freeswitch/trunk/libs/voipcodecs/src/lpc10_voicing.c Log: hints for the code analysis. Modified: freeswitch/trunk/libs/voipcodecs/src/lpc10_voicing.c ============================================================================== --- freeswitch/trunk/libs/voipcodecs/src/lpc10_voicing.c (original) +++ freeswitch/trunk/libs/voipcodecs/src/lpc10_voicing.c Sun Feb 17 00:38:28 2008 @@ -251,7 +251,11 @@ int32_t lbe; float snr2; - inbuf_offset = 0; +#if (_MSC_VER >= 1400) + __analysis_assume(half >=0 && half < 2); +#endif + + inbuf_offset = 0; lpbuf_offset = 0; if (inbuf) {

1 0