Finish moving msvc vcproj files into the corresponding module directories.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@222 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/TODO b/TODO
index c30376f0b0867a1ac7a6ebdc03ccbcd8d0a4d48f..9719e42089f16d882d2b97bf38b131845608e1c1 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,9 +1,4 @@
-1. MOD_PLAYBACK: Convert to use APR files, remove all the WIN32 ifdefs for file stuff.\r
-2. switch.h: Find a good home for the SWITCH_DECLARE stuff for win32\r
-3. MOD_WOOMERACHAN: #if 1==0 sectiton, convert to use switch_now instead of gettimeof day \r
+1. switch.h: Find a good home for the SWITCH_DECLARE stuff for win32\r
+2. MOD_WOOMERACHAN: #if 1==0 sectiton, convert to use switch_now instead of gettimeof day \r
                                SWITCH_SLEEP (should I be using switch_sleep or switch_yield where I changed from sleep and usleep)\r
-4. all // comented headers and code, cleanup\remove after verifying everything works happy on other platforms\r
-5. if we don't need the timeval stuff let's get rid of it... it doesn't appear to be used.\r
-6. Decide if we are going to keep the libraries in tree or if we build a system that downloads (and patches if necessary) \r
-7. Exclude .ilk files from loading as modules (they are built when building debug builds and greatly increase the speed of re-linking the lib on a recompile)... \r
-               it is necessary if we want to be able to debug from the gui.  It can be #ifdef WIN32'd if you like.
\ No newline at end of file
+3. if we don't need the timeval stuff let's get rid of it... it doesn't appear to be used.\r

diff --git a/w32/vsnet/mod_exosip.vcproj b/src/mod/mod_exosip/mod_exosip.vcproj
similarity index 70%
rename from w32/vsnet/mod_exosip.vcproj
rename to src/mod/mod_exosip/mod_exosip.vcproj
index 872691cd2d313bc04ea58da70d6f0567161456a6..b9ff74cf56c58a466fcc7b25fcd1afbccdbe63c6 100644 (file)
--- a/w32/vsnet/mod_exosip.vcproj
+++ b/src/mod/mod_exosip/mod_exosip.vcproj
@@ -25,7 +25,7 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="cscript /nologo $(InputDir)getlibs.vbs Mod_Exosip Debug"\r
+                               CommandLine="cscript /nologo $(InputDir)..\..\..\w32\vsnet\getlibs.vbs Mod_Exosip Debug"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -43,7 +43,7 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/D _CRT_SECURE_NO_DEPRECATE"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\libeXosip2\include;..\..\libs\osip\include;..\..\libs\jrtp4c\src;..\..\libs\osip\src\osipparser2"\r
+                               AdditionalIncludeDirectories="..\..\include;..\..\..\libs\include;..\..\..\libs\libeXosip2\include;..\..\..\libs\osip\include;..\..\..\libs\jrtp4c\src;..\..\..\libs\osip\src\osipparser2"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"\r
                                GeneratePreprocessedFile="0"\r
                                MinimalRebuild="true"\r
@@ -68,9 +68,9 @@
                                AdditionalOptions="/NODEFAULTLIB:LIBCMT"\r
                                AdditionalDependencies="Ws2_32.lib Iphlpapi.lib libcpmt.lib eXosip.lib jrtp4c.lib jrtplib.lib jthread.lib osipparser2.lib osip2.lib"\r
                                ShowProgress="0"\r
-                               OutputFile="$(OutDir)/mod/mod_exosip.dll"\r
+                               OutputFile="..\..\..\w32\vsnet\$(OutDir)/mod/mod_exosip.dll"\r
                                LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\Debug&quot;;&quot;$(InputDir)..\..\libs\jrtp4c\w32\Debug&quot;;&quot;$(InputDir)..\..\libs\jrtplib\Debug&quot;;&quot;$(InputDir)..\..\libs\jthread-1.1.2\Debug&quot;;&quot;$(InputDir)..\..\libs\libeXosip2\platform\vsnet\Debug&quot;;&quot;$(InputDir)..\..\libs\osip\platform\vsnet\Debug&quot;"\r
+                               AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\libs\apr\Debug&quot;;&quot;$(InputDir)..\..\..\libs\jrtp4c\w32\Debug&quot;;&quot;$(InputDir)..\..\..\libs\jrtplib\Debug&quot;;&quot;$(InputDir)..\..\..\libs\jthread-1.1.2\Debug&quot;;&quot;$(InputDir)..\..\..\libs\libeXosip2\platform\vsnet\Debug&quot;;&quot;$(InputDir)..\..\..\libs\osip\platform\vsnet\Debug&quot;"\r
                                IgnoreAllDefaultLibraries="false"\r
                                IgnoreDefaultLibraryNames=""\r
                                GenerateDebugInformation="true"\r
@@ -114,7 +114,7 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="cscript /nologo $(InputDir)getlibs.vbs Mod_Exosip Release"\r
+                               CommandLine="cscript /nologo $(InputDir)..\..\..\w32\vsnet\getlibs.vbs Mod_Exosip Release"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -130,7 +130,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\libeXosip2\include;..\..\libs\osip\include;..\..\libs\jrtp4c\src;..\..\libs\osip\src\osipparser2"\r
+                               AdditionalIncludeDirectories="..\..\include;..\..\..\libs\include;..\..\..\libs\libeXosip2\include;..\..\..\libs\osip\include;..\..\..\libs\jrtp4c\src;..\..\..\libs\osip\src\osipparser2"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"\r
                                RuntimeLibrary="0"\r
                                UsePrecompiledHeader="0"\r
@@ -150,9 +150,9 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="Ws2_32.lib Iphlpapi.lib libcpmt.lib eXosip.lib jrtp4c.lib jrtplib.lib jthread.lib osipparser2.lib osip2.lib"\r
-                               OutputFile="$(OutDir)/mod/mod_exosip.dll"\r
+                               OutputFile="..\..\..\w32\vsnet\$(OutDir)/mod/mod_exosip.dll"\r
                                LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\Release&quot;;&quot;$(InputDir)..\..\libs\jrtp4c\w32\Release&quot;;&quot;$(InputDir)..\..\libs\jrtplib\Release&quot;;&quot;$(InputDir)..\..\libs\jthread-1.1.2\Release&quot;;&quot;$(InputDir)..\..\libs\libeXosip2\platform\vsnet\Release&quot;;&quot;$(InputDir)..\..\libs\osip\platform\vsnet\Release&quot;"\r
+                               AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\libs\apr\Release&quot;;&quot;$(InputDir)..\..\..\libs\jrtp4c\w32\Release&quot;;&quot;$(InputDir)..\..\..\libs\jrtplib\Release&quot;;&quot;$(InputDir)..\..\..\libs\jthread-1.1.2\Release&quot;;&quot;$(InputDir)..\..\..\libs\libeXosip2\platform\vsnet\Release&quot;;&quot;$(InputDir)..\..\..\libs\osip\platform\vsnet\Release&quot;"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r
@@ -195,11 +195,11 @@
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\src\mod\mod_exosip\mod_exosip.c"\r
+                               RelativePath=".\mod_exosip.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libs\osip\src\osipparser2\osip_rfc3264.c"\r
+                               RelativePath="..\..\..\libs\osip\src\osipparser2\osip_rfc3264.c"\r
                                >\r
                        </File>\r
                </Filter>\r
@@ -209,7 +209,7 @@
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\libs\osip\src\osipparser2\osip_rfc3264i.h"\r
+                               RelativePath="..\..\..\libs\osip\src\osipparser2\osip_rfc3264i.h"\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/w32/vsnet/mod_g711codec.vcproj b/src/mod/mod_g711codec/mod_g711codec.vcproj
similarity index 90%
rename from w32/vsnet/mod_g711codec.vcproj
rename to src/mod/mod_g711codec/mod_g711codec.vcproj
index 7ffe09488d2ff5d6ba98556f63088240cf0f0144..2d794480783580d3c6493ba10bdda0bfb0bf187e 100644 (file)
--- a/w32/vsnet/mod_g711codec.vcproj
+++ b/src/mod/mod_g711codec/mod_g711codec.vcproj
@@ -62,7 +62,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               OutputFile="$(OutDir)/mod/mod_g711codec.dll"\r
+                               OutputFile="..\..\..\w32\vsnet\$(OutDir)/mod/mod_g711codec.dll"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="$(InputDir)..\..\libs\apr\Debug"\r
                                GenerateDebugInformation="true"\r
@@ -140,7 +140,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               OutputFile="$(OutDir)/mod/mod_g711codec.dll"\r
+                               OutputFile="..\..\..\w32\vsnet\$(OutDir)/mod/mod_g711codec.dll"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\Release&quot;"\r
                                GenerateDebugInformation="true"\r
@@ -185,11 +185,11 @@
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\src\mod\mod_g711codec\g711.c"\r
+                               RelativePath=".\g711.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\mod\mod_g711codec\mod_g711codec.c"\r
+                               RelativePath=".\mod_g711codec.c"\r
                                >\r
                        </File>\r
                </Filter>\r
@@ -199,7 +199,7 @@
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\src\mod\mod_g711codec\g711.h"\r
+                               RelativePath=".\g711.h"\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/w32/vsnet/mod_IaxChan.vcproj b/src/mod/mod_iaxchan/mod_IaxChan.vcproj
similarity index 86%
rename from w32/vsnet/mod_IaxChan.vcproj
rename to src/mod/mod_iaxchan/mod_IaxChan.vcproj
index 8ac9945c23ab0c11908f913878ab249eaf27dcf8..3b0a8f4d62ae78281c7caf56b393f9d64546e6f3 100644 (file)
--- a/w32/vsnet/mod_IaxChan.vcproj
+++ b/src/mod/mod_iaxchan/mod_IaxChan.vcproj
@@ -25,7 +25,7 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="cscript /nologo $(InputDir)getlibs.vbs Mod_IaxChan Debug"\r
+                               CommandLine="cscript /nologo $(InputDir)..\..\..\w32\vsnet\getlibs.vbs Mod_IaxChan Debug"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -64,9 +64,9 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="Ws2_32.lib Iphlpapi.lib libiax2.lib Winmm.lib"\r
-                               OutputFile="$(OutDir)/mod/mod_IaxChan.dll"\r
+                               OutputFile="..\..\..\w32\vsnet\$(OutDir)/mod/mod_IaxChan.dll"\r
                                LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="$(InputDir)..\..\libs\iax\Debug"\r
+                               AdditionalLibraryDirectories="$(InputDir)..\..\..\libs\iax\Debug"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/mod_IaxChan.pdb"\r
                                SubSystem="2"\r
@@ -108,7 +108,7 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="cscript /nologo $(InputDir)getlibs.vbs Mod_IaxChan Release"\r
+                               CommandLine="cscript /nologo $(InputDir)..\..\..\w32\vsnet\getlibs.vbs Mod_IaxChan Release"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -144,9 +144,9 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="Ws2_32.lib Iphlpapi.lib libiax2.lib Winmm.lib"\r
-                               OutputFile="$(OutDir)/mod/mod_IaxChan.dll"\r
+                               OutputFile="..\..\..\w32\vsnet\$(OutDir)/mod/mod_IaxChan.dll"\r
                                LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\iax\Release&quot;"\r
+                               AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\libs\iax\Release&quot;"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r
@@ -190,7 +190,7 @@
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\src\mod\mod_iaxchan\mod_iaxchan.c"\r
+                               RelativePath=".\mod_iaxchan.c"\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/w32/vsnet/mod_playback.vcproj b/src/mod/mod_playback/mod_playback.vcproj
similarity index 92%
rename from w32/vsnet/mod_playback.vcproj
rename to src/mod/mod_playback/mod_playback.vcproj
index 8f57e72d2079109296ffce6257b3841cd459c97a..a63395a01c5e54f21e22d4529be5fcb7b4da4efa 100644 (file)
--- a/w32/vsnet/mod_playback.vcproj
+++ b/src/mod/mod_playback/mod_playback.vcproj
@@ -62,7 +62,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               OutputFile="$(OutDir)/mod/mod_playback.dll"\r
+                               OutputFile="..\..\..\w32\vsnet\$(OutDir)/mod/mod_playback.dll"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="$(InputDir)..\..\libs\apr\Debug"\r
                                GenerateDebugInformation="true"\r
@@ -140,7 +140,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               OutputFile="$(OutDir)/mod/mod_playback.dll"\r
+                               OutputFile="..\..\..\w32\vsnet\$(OutDir)/mod/mod_playback.dll"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\Release&quot;"\r
                                GenerateDebugInformation="true"\r
@@ -185,7 +185,7 @@
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\src\mod\mod_playback\mod_playback.c"\r
+                               RelativePath=".\mod_playback.c"\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/w32/vsnet/mod_PortAudio.vcproj b/src/mod/mod_portaudio/mod_PortAudio.vcproj
similarity index 71%
rename from w32/vsnet/mod_PortAudio.vcproj
rename to src/mod/mod_portaudio/mod_PortAudio.vcproj
index 026af83ec44c94a2beeafd976fec22fe484d06f0..5afdc338d3d61932fc8c8a45bc47bd0ac9d9c5d2 100644 (file)
--- a/w32/vsnet/mod_PortAudio.vcproj
+++ b/src/mod/mod_portaudio/mod_PortAudio.vcproj
@@ -25,7 +25,7 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="cscript /nologo $(InputDir)getlibs.vbs Mod_PortAudio Debug"\r
+                               CommandLine="cscript /nologo $(InputDir)..\..\..\w32\vsnet\getlibs.vbs Mod_PortAudio Debug"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -42,7 +42,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\src\include&quot;;&quot;$(ProjectDir)include&quot;;&quot;$(ProjectDir)..\..\libs\include&quot;;&quot;$(ProjectDir)..\..\libs\portaudio\pa_common&quot;;&quot;$(ProjectDir)\..\..\..\src\mod\mod_portaudio&quot;;&quot;$(ProjectDir)..\..\libs\portaudio\pa_win_wmme&quot;"\r
+                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\include&quot;;&quot;$(InputDir)&quot;;&quot;$(InputDir)..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\libs\portaudio\pa_common&quot;;&quot;$(InputDir)..\..\..\libs\portaudio\pa_win_wmme&quot;"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -65,9 +65,9 @@
                                Name="VCLinkerTool"\r
                                AdditionalOptions="/NODEFAULTLIB:LIMBCTD"\r
                                AdditionalDependencies="Ws2_32.lib Iphlpapi.lib  PAStaticWMMED.lib Winmm.lib"\r
-                               OutputFile="$(OutDir)/mod/mod_PortAudio.dll"\r
+                               OutputFile="..\..\..\w32\vsnet\$(OutDir)/mod/mod_PortAudio.dll"\r
                                LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\Debug&quot;;&quot;$(InputDir)..\..\libs\portaudio\winvc\Lib&quot;"\r
+                               AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\libs\portaudio\winvc\Lib&quot;"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/mod_PortAudio.pdb"\r
                                SubSystem="2"\r
@@ -109,7 +109,7 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="cscript /nologo $(InputDir)getlibs.vbs Mod_PortAudio Release"\r
+                               CommandLine="cscript /nologo $(InputDir)..\..\..\w32\vsnet\getlibs.vbs Mod_PortAudio Release"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -125,7 +125,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\src\include&quot;;&quot;$(ProjectDir)include&quot;;&quot;$(ProjectDir)..\..\libs\include&quot;;&quot;$(ProjectDir)..\..\libs\portaudio\pa_common&quot;;&quot;$(ProjectDir)\..\..\..\src\mod\mod_portaudio&quot;;&quot;$(ProjectDir)..\..\libs\portaudio\pa_win_wmme&quot;"\r
+                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\include&quot;;&quot;$(InputDir)&quot;;&quot;$(InputDir)..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\libs\portaudio\pa_common&quot;;&quot;$(InputDir)..\..\..\libs\portaudio\pa_win_wmme&quot;"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"\r
                                RuntimeLibrary="0"\r
                                UsePrecompiledHeader="0"\r
@@ -145,9 +145,9 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="Ws2_32.lib Iphlpapi.lib  PAStaticWMME.lib Winmm.lib"\r
-                               OutputFile="$(OutDir)/mod/mod_PortAudio.dll"\r
+                               OutputFile="..\..\..\w32\vsnet\$(OutDir)/mod/mod_PortAudio.dll"\r
                                LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\Release&quot;;&quot;$(InputDir)..\..\libs\portaudio\winvc\Lib&quot;"\r
+                               AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\libs\portaudio\winvc\Lib&quot;"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r
@@ -190,15 +190,15 @@
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\src\mod\mod_PortAudio\mod_PortAudio.c"\r
+                               RelativePath=".\mod_PortAudio.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\mod\mod_portaudio\pablio.c"\r
+                               RelativePath=".\pablio.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\mod\mod_portaudio\ringbuffer.c"\r
+                               RelativePath=".\ringbuffer.c"\r
                                >\r
                        </File>\r
                </Filter>\r
@@ -208,11 +208,11 @@
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\src\mod\mod_portaudio\pablio.h"\r
+                               RelativePath=".\pablio.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\mod\mod_portaudio\ringbuffer.h"\r
+                               RelativePath=".\ringbuffer.h"\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/w32/vsnet/mod_rawaudio.vcproj b/src/mod/mod_rawaudio/mod_rawaudio.vcproj
similarity index 92%
rename from w32/vsnet/mod_rawaudio.vcproj
rename to src/mod/mod_rawaudio/mod_rawaudio.vcproj
index a71ac4124c57315ce02c59f5e899d9d165d993f6..da2a55f6a94f0528c22d5cd995bb9c4a9f915b70 100644 (file)
--- a/w32/vsnet/mod_rawaudio.vcproj
+++ b/src/mod/mod_rawaudio/mod_rawaudio.vcproj
@@ -62,7 +62,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               OutputFile="$(OutDir)/mod/mod_rawaudio.dll"\r
+                               OutputFile="..\..\..\w32\vsnet\$(OutDir)/mod/mod_rawaudio.dll"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="$(InputDir)..\..\libs\apr\Debug"\r
                                GenerateDebugInformation="true"\r
@@ -140,7 +140,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               OutputFile="$(OutDir)/mod/mod_rawaudio.dll"\r
+                               OutputFile="..\..\..\w32\vsnet\$(OutDir)/mod/mod_rawaudio.dll"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\Release&quot;"\r
                                GenerateDebugInformation="true"\r
@@ -185,7 +185,7 @@
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\src\mod\mod_rawaudio\mod_rawaudio.c"\r
+                               RelativePath=".\mod_rawaudio.c"\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/w32/vsnet/mod_softtimer.vcproj b/src/mod/mod_softtimer/mod_softtimer.vcproj
similarity index 92%
rename from w32/vsnet/mod_softtimer.vcproj
rename to src/mod/mod_softtimer/mod_softtimer.vcproj
index 5129bc7e525852338b312b3e4aa74a4414ce6e0b..b268d2fe5d09000b0ad5f6844db9791d7ee2b38f 100644 (file)
--- a/w32/vsnet/mod_softtimer.vcproj
+++ b/src/mod/mod_softtimer/mod_softtimer.vcproj
@@ -62,7 +62,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               OutputFile="$(OutDir)/mod/mod_softtimer.dll"\r
+                               OutputFile="..\..\..\w32\vsnet\$(OutDir)/mod/mod_softtimer.dll"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="$(InputDir)..\..\libs\apr\Debug"\r
                                GenerateDebugInformation="true"\r
@@ -140,7 +140,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               OutputFile="$(OutDir)/mod/mod_softtimer.dll"\r
+                               OutputFile="..\..\..\w32\vsnet\$(OutDir)/mod/mod_softtimer.dll"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\Release&quot;"\r
                                GenerateDebugInformation="true"\r
@@ -185,7 +185,7 @@
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\src\mod\mod_softtimer\mod_softtimer.c"\r
+                               RelativePath=".\mod_softtimer.c"\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/w32/vsnet/mod_speexcodec.vcproj b/src/mod/mod_speexcodec/mod_speexcodec.vcproj
similarity index 84%
rename from w32/vsnet/mod_speexcodec.vcproj
rename to src/mod/mod_speexcodec/mod_speexcodec.vcproj
index f4f77418f8dad1e2cb1a52105e5d6f407ecc0493..0abb26ac7ca88d43e5762710ea6c4deefd460e04 100644 (file)
--- a/w32/vsnet/mod_speexcodec.vcproj
+++ b/src/mod/mod_speexcodec/mod_speexcodec.vcproj
@@ -25,7 +25,7 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="cscript /nologo $(InputDir)getlibs.vbs Mod_SpeexCodec Debug"\r
+                               CommandLine="cscript /nologo $(InputDir)..\..\..\w32\vsnet\getlibs.vbs Mod_SpeexCodec Debug"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -64,9 +64,9 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="libspeex.lib"\r
-                               OutputFile="$(OutDir)/mod/mod_speexcodec.dll"\r
+                               OutputFile="..\..\..\w32\vsnet\$(OutDir)/mod/mod_speexcodec.dll"\r
                                LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\Debug&quot;;&quot;$(InputDir)..\..\libs\speex\win32\libspeex\Debug&quot;"\r
+                               AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\libs\speex\win32\libspeex\Debug&quot;"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/mod_speexcodec.pdb"\r
                                SubSystem="2"\r
@@ -108,7 +108,7 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="cscript /nologo $(InputDir)getlibs.vbs Mod_SpeexCodec Release"\r
+                               CommandLine="cscript /nologo $(InputDir)..\..\..\w32\vsnet\getlibs.vbs Mod_SpeexCodec Release"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -144,9 +144,9 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="libspeex.lib"\r
-                               OutputFile="$(OutDir)/mod/mod_speexcodec.dll"\r
+                               OutputFile="..\..\..\w32\vsnet\$(OutDir)/mod/mod_speexcodec.dll"\r
                                LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\Release&quot;;&quot;$(InputDir)..\..\libs\speex\win32\libspeex\Release&quot;"\r
+                               AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\libs\speex\win32\libspeex\Release&quot;"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r
@@ -189,7 +189,7 @@
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\src\mod\mod_speexcodec\mod_speexcodec.c"\r
+                               RelativePath=".\mod_speexcodec.c"\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/src/mod/mod_woomerachan/mod_woomerachan.vcproj b/src/mod/mod_woomerachan/mod_woomerachan.vcproj
new file mode 100644 (file)
index 0000000..2d89ed1
--- /dev/null
+++ b/src/mod/mod_woomerachan/mod_woomerachan.vcproj
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="mod_woomerachan"\r
+       ProjectGUID="{FE3540C5-3303-46E0-A69E-D92F775687F1}"\r
+       RootNamespace="mod_woomerachan"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="Debug"\r
+                       IntermediateDirectory="Debug"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\include&quot;;&quot;$(InputDir)include&quot;;&quot;$(InputDir)..\..\..\libs\include&quot;"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="1"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               OutputFile="..\..\..\w32\vsnet\$(OutDir)/mod/mod_woomerachan.dll"\r
+                               LinkIncremental="2"\r
+                               AdditionalLibraryDirectories="$(InputDir)..\..\libs\apr\Debug"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="$(OutDir)/mod_woomerachan.pdb"\r
+                               SubSystem="2"\r
+                               ImportLibrary="$(OutDir)/mod_woomerachan.lib"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="Release"\r
+                       IntermediateDirectory="Release"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\include&quot;;&quot;$(InputDir)include&quot;;&quot;$(InputDir)..\..\..\libs\include&quot;"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"\r
+                               RuntimeLibrary="0"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               OutputFile="..\..\..\w32\vsnet\$(OutDir)/mod/mod_woomerachan.dll"\r
+                               LinkIncremental="1"\r
+                               AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\Release&quot;"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               ImportLibrary="$(OutDir)/mod_woomerachan.lib"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\mod_woomerachan.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r

diff --git a/w32/vsnet/Freeswitch.sln b/w32/vsnet/Freeswitch.sln
index 442a195dc40312b0d4f7a716dcddc21d09b3cd18..7efaec9bee0b23529278917d023d42da95466642 100644 (file)
--- a/w32/vsnet/Freeswitch.sln
+++ b/w32/vsnet/Freeswitch.sln
@@ -8,82 +8,82 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchConsole", "FreeSw
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchCoreLib", "FreeSwitchCore.vcproj", "{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_softtimer", "mod_softtimer.vcproj", "{DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_codec_g729", "..\..\src\mod\mod_codec_g729\mod_codec_g729.vcproj", "{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_exosip", "mod_exosip.vcproj", "{45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_codec_gsm", "..\..\src\mod\codec\mod_codec_gsm\mod_codec_gsm.vcproj", "{4926323F-4EA8-4B7D-A3D3-65488725988F}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g711codec", "mod_g711codec.vcproj", "{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xmpp_event", "..\..\src\mod\mod_xmpp_event\mod_xmpp_event.vcproj", "{F10BE67C-A8FF-4CB2-AF29-D46D2590DC59}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_playback", "mod_playback.vcproj", "{78100236-7CEA-4948-96CC-E8ED3160329C}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sndfile", "..\..\src\mod\mod_sndfile\mod_sndfilel.vcproj", "{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_rawaudio", "mod_rawaudio.vcproj", "{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_bridgecall", "..\..\src\mod\mod_bridgecall\mod_bridgecall.vcproj", "{E1794405-29D4-466D-9BE3-DD2344C2A663}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_woomerachan", "mod_woomerachan.vcproj", "{FE3540C5-3303-46E0-A69E-D92F775687F1}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dialplan_demo", "..\..\src\mod\mod_dialplan_demo\mod_dialplan_demo.vcproj", "{2988EB83-785F-45D4-8731-8E1E4345177E}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_IaxChan", "mod_IaxChan.vcproj", "{3A5B9131-F20C-4A85-9447-6C1610941CEE}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_event_test", "..\..\src\mod\mod_event_test\mod_event_test.vcproj", "{3A2A7795-C216-4FFF-B8EF-4D17A84BACCC}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_PortAudio", "mod_PortAudio.vcproj", "{5FD31A25-5D83-4794-8BEE-904DAD84CE71}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_exosip", "..\..\src\mod\mod_exosip\mod_exosip.vcproj", "{45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_codec_g729", "..\..\src\mod\mod_codec_g729\mod_codec_g729.vcproj", "{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g711codec", "..\..\src\mod\mod_g711codec\mod_g711codec.vcproj", "{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_speexcodec", "mod_speexcodec.vcproj", "{5580D60E-0F77-4716-9CD4-B8E5986FA375}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_IaxChan", "..\..\src\mod\mod_iaxchan\mod_IaxChan.vcproj", "{3A5B9131-F20C-4A85-9447-6C1610941CEE}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_codec_gsm", "..\..\src\mod\codec\mod_codec_gsm\mod_codec_gsm.vcproj", "{4926323F-4EA8-4B7D-A3D3-65488725988F}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_playback", "..\..\src\mod\mod_playback\mod_playback.vcproj", "{78100236-7CEA-4948-96CC-E8ED3160329C}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xmpp_event", "..\..\src\mod\mod_xmpp_event\mod_xmpp_event.vcproj", "{F10BE67C-A8FF-4CB2-AF29-D46D2590DC59}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_PortAudio", "..\..\src\mod\mod_portaudio\mod_PortAudio.vcproj", "{5FD31A25-5D83-4794-8BEE-904DAD84CE71}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sndfile", "..\..\src\mod\mod_sndfile\mod_sndfilel.vcproj", "{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_rawaudio", "..\..\src\mod\mod_rawaudio\mod_rawaudio.vcproj", "{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_bridgecall", "..\..\src\mod\mod_bridgecall\mod_bridgecall.vcproj", "{E1794405-29D4-466D-9BE3-DD2344C2A663}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_softtimer", "..\..\src\mod\mod_softtimer\mod_softtimer.vcproj", "{DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dialplan_demo", "..\..\src\mod\mod_dialplan_demo\mod_dialplan_demo.vcproj", "{2988EB83-785F-45D4-8731-8E1E4345177E}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_speexcodec", "..\..\src\mod\mod_speexcodec\mod_speexcodec.vcproj", "{5580D60E-0F77-4716-9CD4-B8E5986FA375}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_event_test", "..\..\src\mod\mod_event_test\mod_event_test.vcproj", "{3A2A7795-C216-4FFF-B8EF-4D17A84BACCC}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_woomerachan", "..\..\src\mod\mod_woomerachan\mod_woomerachan.vcproj", "{FE3540C5-3303-46E0-A69E-D92F775687F1}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
        EndProjectSection\r
@@ -102,46 +102,10 @@ Global
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Debug|Win32.Build.0 = Debug|Win32\r
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Release|Win32.ActiveCfg = Release|Win32\r
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Release|Win32.Build.0 = Release|Win32\r
-               {DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}.Debug|Win32.Build.0 = Debug|Win32\r
-               {DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}.Release|Win32.ActiveCfg = Release|Win32\r
-               {DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}.Release|Win32.Build.0 = Release|Win32\r
-               {45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552}.Debug|Win32.Build.0 = Debug|Win32\r
-               {45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552}.Release|Win32.ActiveCfg = Release|Win32\r
-               {45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552}.Release|Win32.Build.0 = Release|Win32\r
-               {B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Debug|Win32.Build.0 = Debug|Win32\r
-               {B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Release|Win32.ActiveCfg = Release|Win32\r
-               {B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Release|Win32.Build.0 = Release|Win32\r
-               {78100236-7CEA-4948-96CC-E8ED3160329C}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {78100236-7CEA-4948-96CC-E8ED3160329C}.Debug|Win32.Build.0 = Debug|Win32\r
-               {78100236-7CEA-4948-96CC-E8ED3160329C}.Release|Win32.ActiveCfg = Release|Win32\r
-               {78100236-7CEA-4948-96CC-E8ED3160329C}.Release|Win32.Build.0 = Release|Win32\r
-               {5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Debug|Win32.Build.0 = Debug|Win32\r
-               {5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Release|Win32.ActiveCfg = Release|Win32\r
-               {5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Release|Win32.Build.0 = Release|Win32\r
-               {FE3540C5-3303-46E0-A69E-D92F775687F1}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {FE3540C5-3303-46E0-A69E-D92F775687F1}.Debug|Win32.Build.0 = Debug|Win32\r
-               {FE3540C5-3303-46E0-A69E-D92F775687F1}.Release|Win32.ActiveCfg = Release|Win32\r
-               {FE3540C5-3303-46E0-A69E-D92F775687F1}.Release|Win32.Build.0 = Release|Win32\r
-               {3A5B9131-F20C-4A85-9447-6C1610941CEE}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {3A5B9131-F20C-4A85-9447-6C1610941CEE}.Debug|Win32.Build.0 = Debug|Win32\r
-               {3A5B9131-F20C-4A85-9447-6C1610941CEE}.Release|Win32.ActiveCfg = Release|Win32\r
-               {3A5B9131-F20C-4A85-9447-6C1610941CEE}.Release|Win32.Build.0 = Release|Win32\r
-               {5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Debug|Win32.Build.0 = Debug|Win32\r
-               {5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Release|Win32.ActiveCfg = Release|Win32\r
-               {5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Release|Win32.Build.0 = Release|Win32\r
                {1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.Debug|Win32.Build.0 = Debug|Win32\r
                {1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.Release|Win32.ActiveCfg = Release|Win32\r
                {1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.Release|Win32.Build.0 = Release|Win32\r
-               {5580D60E-0F77-4716-9CD4-B8E5986FA375}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {5580D60E-0F77-4716-9CD4-B8E5986FA375}.Debug|Win32.Build.0 = Debug|Win32\r
-               {5580D60E-0F77-4716-9CD4-B8E5986FA375}.Release|Win32.ActiveCfg = Release|Win32\r
-               {5580D60E-0F77-4716-9CD4-B8E5986FA375}.Release|Win32.Build.0 = Release|Win32\r
                {4926323F-4EA8-4B7D-A3D3-65488725988F}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {4926323F-4EA8-4B7D-A3D3-65488725988F}.Debug|Win32.Build.0 = Debug|Win32\r
                {4926323F-4EA8-4B7D-A3D3-65488725988F}.Release|Win32.ActiveCfg = Release|Win32\r
@@ -166,6 +130,42 @@ Global
                {3A2A7795-C216-4FFF-B8EF-4D17A84BACCC}.Debug|Win32.Build.0 = Debug|Win32\r
                {3A2A7795-C216-4FFF-B8EF-4D17A84BACCC}.Release|Win32.ActiveCfg = Release|Win32\r
                {3A2A7795-C216-4FFF-B8EF-4D17A84BACCC}.Release|Win32.Build.0 = Release|Win32\r
+               {45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552}.Debug|Win32.Build.0 = Debug|Win32\r
+               {45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552}.Release|Win32.ActiveCfg = Release|Win32\r
+               {45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552}.Release|Win32.Build.0 = Release|Win32\r
+               {B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Debug|Win32.Build.0 = Debug|Win32\r
+               {B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Release|Win32.ActiveCfg = Release|Win32\r
+               {B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Release|Win32.Build.0 = Release|Win32\r
+               {3A5B9131-F20C-4A85-9447-6C1610941CEE}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {3A5B9131-F20C-4A85-9447-6C1610941CEE}.Debug|Win32.Build.0 = Debug|Win32\r
+               {3A5B9131-F20C-4A85-9447-6C1610941CEE}.Release|Win32.ActiveCfg = Release|Win32\r
+               {3A5B9131-F20C-4A85-9447-6C1610941CEE}.Release|Win32.Build.0 = Release|Win32\r
+               {78100236-7CEA-4948-96CC-E8ED3160329C}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {78100236-7CEA-4948-96CC-E8ED3160329C}.Debug|Win32.Build.0 = Debug|Win32\r
+               {78100236-7CEA-4948-96CC-E8ED3160329C}.Release|Win32.ActiveCfg = Release|Win32\r
+               {78100236-7CEA-4948-96CC-E8ED3160329C}.Release|Win32.Build.0 = Release|Win32\r
+               {5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Debug|Win32.Build.0 = Debug|Win32\r
+               {5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Release|Win32.ActiveCfg = Release|Win32\r
+               {5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Release|Win32.Build.0 = Release|Win32\r
+               {5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Debug|Win32.Build.0 = Debug|Win32\r
+               {5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Release|Win32.ActiveCfg = Release|Win32\r
+               {5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Release|Win32.Build.0 = Release|Win32\r
+               {DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}.Debug|Win32.Build.0 = Debug|Win32\r
+               {DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}.Release|Win32.ActiveCfg = Release|Win32\r
+               {DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}.Release|Win32.Build.0 = Release|Win32\r
+               {5580D60E-0F77-4716-9CD4-B8E5986FA375}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {5580D60E-0F77-4716-9CD4-B8E5986FA375}.Debug|Win32.Build.0 = Debug|Win32\r
+               {5580D60E-0F77-4716-9CD4-B8E5986FA375}.Release|Win32.ActiveCfg = Release|Win32\r
+               {5580D60E-0F77-4716-9CD4-B8E5986FA375}.Release|Win32.Build.0 = Release|Win32\r
+               {FE3540C5-3303-46E0-A69E-D92F775687F1}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {FE3540C5-3303-46E0-A69E-D92F775687F1}.Debug|Win32.Build.0 = Debug|Win32\r
+               {FE3540C5-3303-46E0-A69E-D92F775687F1}.Release|Win32.ActiveCfg = Release|Win32\r
+               {FE3540C5-3303-46E0-A69E-D92F775687F1}.Release|Win32.Build.0 = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r