r3406 - in trunk: libminisip/source/subsystem_media/soundcard minisip minisip/include minisip/minisip/gui/textui minisip/vs8_proj
erik at minisip.org
erik at minisip.org
Thu Aug 30 16:23:57 CEST 2007
Author: erik
Date: 2007-08-30 16:23:56 +0200 (Thu, 30 Aug 2007)
New Revision: 3406
Added:
trunk/minisip/vs8_proj/
trunk/minisip/vs8_proj/minisip_textui.vcproj
Modified:
trunk/libminisip/source/subsystem_media/soundcard/SoundDriverRegistry.cxx
trunk/minisip/include/config.h
trunk/minisip/minisip/gui/textui/MinisipTextMain.cxx
Log:
minisip:
* Added visual studio project file to build the command line based UI.
* Trivial compile fixes.
libminisip:
* Made the DirectSound driver available (register it as a built
in plugin).
Modified: trunk/libminisip/source/subsystem_media/soundcard/SoundDriverRegistry.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/soundcard/SoundDriverRegistry.cxx 2007-08-30 13:51:49 UTC (rev 3405)
+++ trunk/libminisip/source/subsystem_media/soundcard/SoundDriverRegistry.cxx 2007-08-30 14:23:56 UTC (rev 3406)
@@ -28,6 +28,10 @@
#include<libmutil/dbg.h>
#include<libminisip/media/soundcard/FileSoundDriver.h>
+#ifdef _MSC_VER
+#include"DirectSoundDriver.h"
+#endif
+
#include<algorithm>
// #ifdef PORTAUDIO_SUPPORT
@@ -52,6 +56,9 @@
SoundDriverRegistry::SoundDriverRegistry(){
registerPlugin( new FileSoundDriver( NULL ) );
+#ifdef _MSC_VER
+ registerPlugin( new DirectSoundDriver(NULL) );
+#endif
}
const std::vector< MRef<SoundDriver*> > &SoundDriverRegistry::getDrivers() const{
Modified: trunk/minisip/include/config.h
===================================================================
--- trunk/minisip/include/config.h 2007-08-30 13:51:49 UTC (rev 3405)
+++ trunk/minisip/include/config.h 2007-08-30 14:23:56 UTC (rev 3406)
@@ -24,10 +24,10 @@
#define CONFIG_H
/* Compilation time configuration */
-#ifndef _WIN32_WCE
+#if defined(_WIN32_WCE) || defined(_MSC_VER)
+# include"compilation_config_w32_wce.h"
+#else
# include"compilation_config.h"
-#else
-# include"compilation_config_w32_wce.h"
#endif
#include<libmutil/mtypes.h>
Modified: trunk/minisip/minisip/gui/textui/MinisipTextMain.cxx
===================================================================
--- trunk/minisip/minisip/gui/textui/MinisipTextMain.cxx 2007-08-30 13:51:49 UTC (rev 3405)
+++ trunk/minisip/minisip/gui/textui/MinisipTextMain.cxx 2007-08-30 14:23:56 UTC (rev 3406)
@@ -25,6 +25,7 @@
#include"MinisipTextUI.h"
#include<libminisip/Minisip.h>
+#include<libminisip/gui/ConsoleDebugger.h>
using namespace std;
Added: trunk/minisip/vs8_proj/minisip_textui.vcproj
===================================================================
--- trunk/minisip/vs8_proj/minisip_textui.vcproj (rev 0)
+++ trunk/minisip/vs8_proj/minisip_textui.vcproj 2007-08-30 14:23:56 UTC (rev 3406)
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="minisip_textui"
+ ProjectGUID="{114176D6-DE11-47E9-B047-9B2BCA3C0B2A}"
+ RootNamespace="minisip_textui"
+ Keyword="Win32Proj"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\include;..\..\libmutil\include;..\..\libminisip\include;..\..\libmsip\include;..\..\libmnetutil\include;..\..\libmcrypto\include;..\..\libmikey\include"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="..\..\libminisip\vs8_proj\Debug\libminisip.lib ..\..\libmsip\vs8_proj\Debug\libmsip.lib ..\..\libmikey\vs8_proj\Debug\libmikey.lib ..\..\libmcrypto\vs8_proj\Debug\libmcrypto.lib ..\..\libmnetutil\vs8_proj\Debug\libmnetutil.lib ..\..\libmutil\vs8_proj\Debug\libmutil.lib ..\..\libmstun\vs8_proj\Debug\libmstun.lib"
+ LinkIncremental="2"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\include;..\..\libmutil\include;..\..\libminisip\include;..\..\libmsip\include;..\..\libmnetutil\include;..\..\libmcrypto\include;..\..\libmikey\include"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="..\..\libminisip\vs8_proj\Debug\libminisip.lib ..\..\libmsip\vs8_proj\Debug\libmsip.lib ..\..\libmikey\vs8_proj\Debug\libmikey.lib ..\..\libmcrypto\vs8_proj\Debug\libmcrypto.lib ..\..\libmnetutil\vs8_proj\Debug\libmnetutil.lib ..\..\libmutil\vs8_proj\Debug\libmutil.lib ..\..\libmstun\vs8_proj\Debug\libmstun.lib"
+ LinkIncremental="1"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath="..\minisip\gui\textui\MinisipTextMain.cxx"
+ >
+ </File>
+ <File
+ RelativePath="..\minisip\gui\textui\MinisipTextUI.cxx"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ <File
+ RelativePath="..\include\compilation_config_w32_wce.h"
+ >
+ </File>
+ <File
+ RelativePath="..\include\config.h"
+ >
+ </File>
+ <File
+ RelativePath="..\minisip\gui\textui\MinisipTextUI.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
More information about the Minisip-devel
mailing list