[xiph-commits] r11897 - in trunk/oggdsf: sln/oggdsf_all
src/lib/codecs/speex/filters/dsfSpeexDecoder
src/lib/codecs/speex/filters/dsfSpeexEncoder
src/lib/codecs/vorbis/filters/dsfVorbisDecoder
src/lib/codecs/vorbis/filters/dsfVorbisEncoder
illiminable at svn.xiph.org
illiminable at svn.xiph.org
Tue Oct 10 04:58:34 PDT 2006
Author: illiminable
Date: 2006-10-10 04:58:23 -0700 (Tue, 10 Oct 2006)
New Revision: 11897
Removed:
trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexDecoder/fish_cdecl.h
trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/fish_cdecl.h
trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/fish_cdecl.h
trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/fish_cdecl.h
Modified:
trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/dsfVorbisDecoder.vcproj
trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/dsfVorbisEncoder.vcproj
Log:
* Tidy up the vorbis and speex filter onfigurations
Modified: trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
===================================================================
--- trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln 2006-10-10 10:12:24 UTC (rev 11896)
+++ trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln 2006-10-10 11:58:23 UTC (rev 11897)
@@ -70,7 +70,6 @@
{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
- {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
EndProjectSection
@@ -90,7 +89,6 @@
{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
{359DBC2D-2BF1-4A1A-BE81-248268F557CC} = {359DBC2D-2BF1-4A1A-BE81-248268F557CC}
{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
- {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
EndProjectSection
EndProject
Deleted: trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexDecoder/fish_cdecl.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexDecoder/fish_cdecl.h 2006-10-10 10:12:24 UTC (rev 11896)
+++ trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexDecoder/fish_cdecl.h 2006-10-10 11:58:23 UTC (rev 11897)
@@ -1,47 +0,0 @@
-#include <fishsound/constants.h>
-typedef struct {
- int samplerate;
- int channels;
- int format;
-} FishSoundInfo;
-typedef struct {
- int format;
- const char * name;
- const char * extension;
-} FishSoundFormat;
-
-typedef void * FishSound;
-typedef int (__cdecl *FishSoundDecoded) (FishSound * fsound, float ** pcm,
- long frames, void * user_data);
-typedef int (__cdecl *FishSoundEncoded) (FishSound * fsound, unsigned char * buf,
- long bytes, void * user_data);
-int __cdecl fish_sound_identify (unsigned char * buf, long bytes);
-
-FishSound * __cdecl fish_sound_new (int mode, FishSoundInfo * fsinfo);
-
-int __cdecl fish_sound_set_decoded_callback (FishSound * fsound,
- FishSoundDecoded decoded,
- void * user_data);
-
-int __cdecl fish_sound_set_encoded_callback (FishSound * fsound,
- FishSoundEncoded encoded,
- void * user_data);
-
-long __cdecl fish_sound_decode (FishSound * fsound, unsigned char * buf, long bytes);
-
-long __cdecl fish_sound_encode (FishSound * fsound, float ** pcm, long frames);
-
-long __cdecl fish_sound_flush (FishSound * fsound);
-
-int __cdecl fish_sound_reset (FishSound * fsound);
-
-int __cdecl fish_sound_delete (FishSound * fsound);
-
-int __cdecl fish_sound_command (FishSound * fsound, int command, void * data,
- int datasize);
-
-int __cdecl fish_sound_get_interleave (FishSound * fsound);
-
-int __cdecl fish_sound_set_interleave (FishSound * fsound, int interleave);
-
-long __cdecl fish_sound_get_frameno (FishSound * fsound);
Deleted: trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/fish_cdecl.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/fish_cdecl.h 2006-10-10 10:12:24 UTC (rev 11896)
+++ trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/fish_cdecl.h 2006-10-10 11:58:23 UTC (rev 11897)
@@ -1,47 +0,0 @@
-#include <fishsound/constants.h>
-typedef struct {
- int samplerate;
- int channels;
- int format;
-} FishSoundInfo;
-typedef struct {
- int format;
- const char * name;
- const char * extension;
-} FishSoundFormat;
-
-typedef void * FishSound;
-typedef int (__cdecl *FishSoundDecoded) (FishSound * fsound, float ** pcm,
- long frames, void * user_data);
-typedef int (__cdecl *FishSoundEncoded) (FishSound * fsound, unsigned char * buf,
- long bytes, void * user_data);
-int __cdecl fish_sound_identify (unsigned char * buf, long bytes);
-
-FishSound * __cdecl fish_sound_new (int mode, FishSoundInfo * fsinfo);
-
-int __cdecl fish_sound_set_decoded_callback (FishSound * fsound,
- FishSoundDecoded decoded,
- void * user_data);
-
-int __cdecl fish_sound_set_encoded_callback (FishSound * fsound,
- FishSoundEncoded encoded,
- void * user_data);
-
-long __cdecl fish_sound_decode (FishSound * fsound, unsigned char * buf, long bytes);
-
-long __cdecl fish_sound_encode (FishSound * fsound, float ** pcm, long frames);
-
-long __cdecl fish_sound_flush (FishSound * fsound);
-
-int __cdecl fish_sound_reset (FishSound * fsound);
-
-int __cdecl fish_sound_delete (FishSound * fsound);
-
-int __cdecl fish_sound_command (FishSound * fsound, int command, void * data,
- int datasize);
-
-int __cdecl fish_sound_get_interleave (FishSound * fsound);
-
-int __cdecl fish_sound_set_interleave (FishSound * fsound, int interleave);
-
-long __cdecl fish_sound_get_frameno (FishSound * fsound);
Modified: trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/dsfVorbisDecoder.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/dsfVorbisDecoder.vcproj 2006-10-10 10:12:24 UTC (rev 11896)
+++ trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/dsfVorbisDecoder.vcproj 2006-10-10 11:58:23 UTC (rev 11897)
@@ -187,12 +187,13 @@
/>
</Configuration>
<Configuration
- Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
- IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
+ Name="Release|Win32"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="1"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -208,18 +209,24 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="1"
/>
<Tool
Name="VCCLCompilerTool"
- ExecutionBucket="7"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper;..\..\..\..\core\directshow\dsfOggDemux2"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFVORBISDECODER_EXPORTS"
- MinimalRebuild="true"
- RuntimeLibrary="3"
+ Optimization="2"
+ InlineFunctionExpansion="2"
+ EnableIntrinsicFunctions="true"
+ FavorSizeOrSpeed="1"
+ OmitFramePointers="true"
+ AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\..\helper;..\..\..\..\core\directshow\dsfOggDemux2;..\..\libs\libOOVorbis;..\..\libs\libvorbis\include;..\..\..\..\core\ogg\libogg\include"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFVORBISDECODER_EXPORTS"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2"
WarningLevel="4"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="0"
+ CallingConvention="2"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -232,45 +239,48 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib"
+ AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib unicows.lib"
OutputFile="$(OutDir)/dsfVorbisDecoder.dll"
- LinkIncremental="2"
+ LinkIncremental="1"
AdditionalLibraryDirectories=""
ModuleDefinitionFile="vorbisdecoder.def"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/dsfVorbisDecoder.pdb"
SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ OptimizeForWindows98="1"
ImportLibrary="$(OutDir)/dsfVorbisDecoder.lib"
- TargetMachine="0"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
+ Name="VCManifestTool"
+ />
+ <Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
- Name="VCCodeSignTool"
+ Name="VCFxCopTool"
/>
<Tool
- Name="VCPostBuildEventTool"
+ Name="VCAppVerifierTool"
/>
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
+ <Tool
+ Name="VCWebDeploymentTool"
/>
- <DebuggerTool
+ <Tool
+ Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
- Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ Name="Release|Pocket PC 2003 (ARMV4)"
+ OutputDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
+ IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="1"
@@ -290,24 +300,23 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="1"
/>
<Tool
Name="VCCLCompilerTool"
+ ExecutionBucket="7"
Optimization="2"
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
- OmitFramePointers="true"
- AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\..\helper;..\..\..\..\core\directshow\dsfOggDemux2;..\..\libs\libOOVorbis;..\..\libs\libvorbis\include;..\..\..\..\core\ogg\libogg\include"
+ AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper;..\..\..\..\core\directshow\dsfOggDemux2"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFVORBISDECODER_EXPORTS"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2"
WarningLevel="4"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="0"
- CallingConvention="2"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -320,7 +329,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib unicows.lib"
+ AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib"
OutputFile="$(OutDir)/dsfVorbisDecoder.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""
@@ -331,41 +340,39 @@
EnableCOMDATFolding="2"
OptimizeForWindows98="1"
ImportLibrary="$(OutDir)/dsfVorbisDecoder.lib"
- TargetMachine="1"
+ TargetMachine="0"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
- Name="VCManifestTool"
- />
- <Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
- Name="VCFxCopTool"
+ Name="VCCodeSignTool"
/>
<Tool
- Name="VCAppVerifierTool"
+ Name="VCPostBuildEventTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
+ <DeploymentTool
+ ForceDirty="-1"
+ RemoteDirectory=""
+ RegisterOutput="0"
+ AdditionalFiles=""
/>
- <Tool
- Name="VCPostBuildEventTool"
+ <DebuggerTool
/>
</Configuration>
<Configuration
- Name="Release|Pocket PC 2003 (ARMV4)"
- OutputDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
- IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
+ Name="Debug_CE_ARM|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="1"
- WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -381,23 +388,20 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="1"
/>
<Tool
Name="VCCLCompilerTool"
- ExecutionBucket="7"
- Optimization="2"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="1"
+ Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper;..\..\..\..\core\directshow\dsfOggDemux2"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFVORBISDECODER_EXPORTS"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFVORBISDECODER_EXPORTS"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
UsePrecompiledHeader="2"
WarningLevel="4"
- DebugInformationFormat="0"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ CallingConvention="2"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -412,49 +416,47 @@
Name="VCLinkerTool"
AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib"
OutputFile="$(OutDir)/dsfVorbisDecoder.dll"
- LinkIncremental="1"
+ LinkIncremental="2"
AdditionalLibraryDirectories=""
ModuleDefinitionFile="vorbisdecoder.def"
GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/dsfVorbisDecoder.pdb"
SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- OptimizeForWindows98="1"
ImportLibrary="$(OutDir)/dsfVorbisDecoder.lib"
- TargetMachine="0"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
+ Name="VCManifestTool"
+ />
+ <Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
- Name="VCCodeSignTool"
+ Name="VCFxCopTool"
/>
<Tool
- Name="VCPostBuildEventTool"
+ Name="VCAppVerifierTool"
/>
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
+ <Tool
+ Name="VCWebDeploymentTool"
/>
- <DebuggerTool
+ <Tool
+ Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
- Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
- IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
+ Name="Debug_CE_ARM|Pocket PC 2003 (ARMV4)"
+ OutputDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
+ IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="1"
- WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -475,18 +477,13 @@
<Tool
Name="VCCLCompilerTool"
ExecutionBucket="7"
- Optimization="2"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="1"
+ Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper;..\..\..\..\core\directshow\dsfOggDemux2"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFVORBISDECODER_EXPORTS"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFVORBISDECODER_EXPORTS"
+ MinimalRebuild="true"
+ RuntimeLibrary="3"
UsePrecompiledHeader="2"
WarningLevel="4"
- DebugInformationFormat="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -501,14 +498,12 @@
Name="VCLinkerTool"
AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib"
OutputFile="$(OutDir)/dsfVorbisDecoder.dll"
- LinkIncremental="1"
+ LinkIncremental="2"
AdditionalLibraryDirectories=""
ModuleDefinitionFile="vorbisdecoder.def"
GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/dsfVorbisDecoder.pdb"
SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- OptimizeForWindows98="1"
ImportLibrary="$(OutDir)/dsfVorbisDecoder.lib"
TargetMachine="0"
/>
@@ -537,7 +532,7 @@
/>
</Configuration>
<Configuration
- Name="Debug_CE_ARM|Win32"
+ Name="Debug_WM5_PPC_ARM|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
@@ -562,7 +557,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper;..\..\..\..\core\directshow\dsfOggDemux2"
+ AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\..\helper;..\..\..\..\core\directshow\dsfOggDemux2;..\..\libs\libOOVorbis;..\..\libs\libvorbis\include;..\..\..\..\core\ogg\libogg\include"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFVORBISDECODER_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -621,7 +616,7 @@
/>
</Configuration>
<Configuration
- Name="Debug_CE_ARM|Pocket PC 2003 (ARMV4)"
+ Name="Debug_WM5_PPC_ARM|Pocket PC 2003 (ARMV4)"
OutputDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
ConfigurationType="2"
@@ -702,9 +697,9 @@
/>
</Configuration>
<Configuration
- Name="Debug_CE_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
- IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
+ Name="Release_WM5_PPC_ARM|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="1"
@@ -723,18 +718,20 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="1"
/>
<Tool
Name="VCCLCompilerTool"
- ExecutionBucket="7"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper;..\..\..\..\core\directshow\dsfOggDemux2"
+ AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\..\helper;..\..\..\..\core\directshow\dsfOggDemux2;..\..\libs\libOOVorbis;..\..\libs\libvorbis\include;..\..\..\..\core\ogg\libogg\include"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFVORBISDECODER_EXPORTS"
MinimalRebuild="true"
+ BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
WarningLevel="4"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ CallingConvention="2"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -756,36 +753,37 @@
ProgramDatabaseFile="$(OutDir)/dsfVorbisDecoder.pdb"
SubSystem="2"
ImportLibrary="$(OutDir)/dsfVorbisDecoder.lib"
- TargetMachine="0"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
+ Name="VCManifestTool"
+ />
+ <Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
- Name="VCCodeSignTool"
+ Name="VCFxCopTool"
/>
<Tool
- Name="VCPostBuildEventTool"
+ Name="VCAppVerifierTool"
/>
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
+ <Tool
+ Name="VCWebDeploymentTool"
/>
- <DebuggerTool
+ <Tool
+ Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
- Name="Debug_WM5_PPC_ARM|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ Name="Release_WM5_PPC_ARM|Pocket PC 2003 (ARMV4)"
+ OutputDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
+ IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="1"
@@ -804,20 +802,18 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="1"
/>
<Tool
Name="VCCLCompilerTool"
+ ExecutionBucket="7"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\..\helper;..\..\..\..\core\directshow\dsfOggDemux2;..\..\libs\libOOVorbis;..\..\libs\libvorbis\include;..\..\..\..\core\ogg\libogg\include"
+ AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper;..\..\..\..\core\directshow\dsfOggDemux2"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFVORBISDECODER_EXPORTS"
MinimalRebuild="true"
- BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
WarningLevel="4"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- CallingConvention="2"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -839,37 +835,36 @@
ProgramDatabaseFile="$(OutDir)/dsfVorbisDecoder.pdb"
SubSystem="2"
ImportLibrary="$(OutDir)/dsfVorbisDecoder.lib"
- TargetMachine="1"
+ TargetMachine="0"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
- Name="VCManifestTool"
- />
- <Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
- Name="VCFxCopTool"
+ Name="VCCodeSignTool"
/>
<Tool
- Name="VCAppVerifierTool"
+ Name="VCPostBuildEventTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
+ <DeploymentTool
+ ForceDirty="-1"
+ RemoteDirectory=""
+ RegisterOutput="0"
+ AdditionalFiles=""
/>
- <Tool
- Name="VCPostBuildEventTool"
+ <DebuggerTool
/>
</Configuration>
<Configuration
- Name="Debug_WM5_PPC_ARM|Pocket PC 2003 (ARMV4)"
- OutputDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
- IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
+ Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
+ IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="1"
@@ -948,12 +943,13 @@
/>
</Configuration>
<Configuration
- Name="Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="1"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -974,14 +970,18 @@
<Tool
Name="VCCLCompilerTool"
ExecutionBucket="7"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\..\helper;..\..\..\..\core\directshow\dsfOggDemux2;..\..\libs\libOOTremor;..\..\libs\libtremor"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;USING_TREMOR;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFVORBISDECODER_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"
- MinimalRebuild="true"
- RuntimeLibrary="3"
- TreatWChar_tAsBuiltInType="false"
+ Optimization="2"
+ InlineFunctionExpansion="2"
+ EnableIntrinsicFunctions="true"
+ FavorSizeOrSpeed="1"
+ AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper;..\..\..\..\core\directshow\dsfOggDemux2"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFVORBISDECODER_EXPORTS"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2"
WarningLevel="4"
+ DebugInformationFormat="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -994,15 +994,16 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="strmbase.lib strmiids.lib"
+ AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib"
OutputFile="$(OutDir)/dsfVorbisDecoder.dll"
- LinkIncremental="2"
+ LinkIncremental="1"
AdditionalLibraryDirectories=""
ModuleDefinitionFile="vorbisdecoder.def"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/dsfVorbisDecoder.pdb"
- SubSystem="9"
- EntryPointSymbol=""
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ OptimizeForWindows98="1"
ImportLibrary="$(OutDir)/dsfVorbisDecoder.lib"
TargetMachine="0"
/>
@@ -1024,16 +1025,16 @@
<DeploymentTool
ForceDirty="-1"
RemoteDirectory=""
- RegisterOutput="-1"
+ RegisterOutput="0"
AdditionalFiles=""
/>
<DebuggerTool
/>
</Configuration>
<Configuration
- Name="Release_WM5_PPC_ARM|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ Name="Debug_CE_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
+ IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="1"
@@ -1052,20 +1053,18 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="1"
/>
<Tool
Name="VCCLCompilerTool"
+ ExecutionBucket="7"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\..\helper;..\..\..\..\core\directshow\dsfOggDemux2;..\..\libs\libOOVorbis;..\..\libs\libvorbis\include;..\..\..\..\core\ogg\libogg\include"
+ AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper;..\..\..\..\core\directshow\dsfOggDemux2"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFVORBISDECODER_EXPORTS"
MinimalRebuild="true"
- BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
WarningLevel="4"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- CallingConvention="2"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -1087,37 +1086,36 @@
ProgramDatabaseFile="$(OutDir)/dsfVorbisDecoder.pdb"
SubSystem="2"
ImportLibrary="$(OutDir)/dsfVorbisDecoder.lib"
- TargetMachine="1"
+ TargetMachine="0"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
- Name="VCManifestTool"
- />
- <Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
- Name="VCFxCopTool"
+ Name="VCCodeSignTool"
/>
<Tool
- Name="VCAppVerifierTool"
+ Name="VCPostBuildEventTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
+ <DeploymentTool
+ ForceDirty="-1"
+ RemoteDirectory=""
+ RegisterOutput="0"
+ AdditionalFiles=""
/>
- <Tool
- Name="VCPostBuildEventTool"
+ <DebuggerTool
/>
</Configuration>
<Configuration
- Name="Release_WM5_PPC_ARM|Pocket PC 2003 (ARMV4)"
- OutputDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
- IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
+ Name="Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
+ IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="1"
@@ -1142,10 +1140,11 @@
Name="VCCLCompilerTool"
ExecutionBucket="7"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper;..\..\..\..\core\directshow\dsfOggDemux2"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFVORBISDECODER_EXPORTS"
+ AdditionalIncludeDirectories="..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\..\helper;..\..\..\..\core\directshow\dsfOggDemux2;..\..\libs\libOOTremor;..\..\libs\libtremor"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;USING_TREMOR;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFVORBISDECODER_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"
MinimalRebuild="true"
RuntimeLibrary="3"
+ TreatWChar_tAsBuiltInType="false"
UsePrecompiledHeader="2"
WarningLevel="4"
/>
@@ -1160,14 +1159,15 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib"
+ AdditionalDependencies="strmbase.lib strmiids.lib"
OutputFile="$(OutDir)/dsfVorbisDecoder.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""
ModuleDefinitionFile="vorbisdecoder.def"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/dsfVorbisDecoder.pdb"
- SubSystem="2"
+ SubSystem="9"
+ EntryPointSymbol=""
ImportLibrary="$(OutDir)/dsfVorbisDecoder.lib"
TargetMachine="0"
/>
@@ -1189,7 +1189,7 @@
<DeploymentTool
ForceDirty="-1"
RemoteDirectory=""
- RegisterOutput="0"
+ RegisterOutput="-1"
AdditionalFiles=""
/>
<DebuggerTool
@@ -1316,7 +1316,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -1324,7 +1324,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
@@ -1332,7 +1332,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Pocket PC 2003 (ARMV4)"
+ Name="Debug_CE_ARM|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -1340,7 +1340,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ Name="Debug_CE_ARM|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
@@ -1348,7 +1348,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug_CE_ARM|Win32"
+ Name="Debug_WM5_PPC_ARM|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -1356,7 +1356,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug_CE_ARM|Pocket PC 2003 (ARMV4)"
+ Name="Debug_WM5_PPC_ARM|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
@@ -1364,7 +1364,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug_CE_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ Name="Release_WM5_PPC_ARM|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -1372,7 +1372,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug_WM5_PPC_ARM|Win32"
+ Name="Release_WM5_PPC_ARM|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
@@ -1380,7 +1380,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug_WM5_PPC_ARM|Pocket PC 2003 (ARMV4)"
+ Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
@@ -1388,7 +1388,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
@@ -1396,7 +1396,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release_WM5_PPC_ARM|Win32"
+ Name="Debug_CE_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
@@ -1404,7 +1404,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release_WM5_PPC_ARM|Pocket PC 2003 (ARMV4)"
+ Name="Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
@@ -1446,10 +1446,6 @@
Filter="h;hpp;hxx;hm;inl;inc"
>
<File
- RelativePath="fish_cdecl.h"
- >
- </File>
- <File
RelativePath="stdafx.h"
>
</File>
Deleted: trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/fish_cdecl.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/fish_cdecl.h 2006-10-10 10:12:24 UTC (rev 11896)
+++ trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/fish_cdecl.h 2006-10-10 11:58:23 UTC (rev 11897)
@@ -1,47 +0,0 @@
-#include <fishsound/constants.h>
-typedef struct {
- int samplerate;
- int channels;
- int format;
-} FishSoundInfo;
-typedef struct {
- int format;
- const char * name;
- const char * extension;
-} FishSoundFormat;
-
-typedef void * FishSound;
-typedef int (__cdecl *FishSoundDecoded) (FishSound * fsound, float ** pcm,
- long frames, void * user_data);
-typedef int (__cdecl *FishSoundEncoded) (FishSound * fsound, unsigned char * buf,
- long bytes, void * user_data);
-int __cdecl fish_sound_identify (unsigned char * buf, long bytes);
-
-FishSound * __cdecl fish_sound_new (int mode, FishSoundInfo * fsinfo);
-
-int __cdecl fish_sound_set_decoded_callback (FishSound * fsound,
- FishSoundDecoded decoded,
- void * user_data);
-
-int __cdecl fish_sound_set_encoded_callback (FishSound * fsound,
- FishSoundEncoded encoded,
- void * user_data);
-
-long __cdecl fish_sound_decode (FishSound * fsound, unsigned char * buf, long bytes);
-
-long __cdecl fish_sound_encode (FishSound * fsound, float ** pcm, long frames);
-
-long __cdecl fish_sound_flush (FishSound * fsound);
-
-int __cdecl fish_sound_reset (FishSound * fsound);
-
-int __cdecl fish_sound_delete (FishSound * fsound);
-
-int __cdecl fish_sound_command (FishSound * fsound, int command, void * data,
- int datasize);
-
-int __cdecl fish_sound_get_interleave (FishSound * fsound);
-
-int __cdecl fish_sound_set_interleave (FishSound * fsound, int interleave);
-
-long __cdecl fish_sound_get_frameno (FishSound * fsound);
Modified: trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/dsfVorbisEncoder.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/dsfVorbisEncoder.vcproj 2006-10-10 10:12:24 UTC (rev 11896)
+++ trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/dsfVorbisEncoder.vcproj 2006-10-10 11:58:23 UTC (rev 11897)
@@ -47,7 +47,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32;..\..\..\..\helper;..\..\libs\libOOVorbis;..\..\libs\libvorbis\include;..\..\..\..\core\ogg\libogg\include"
+ AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\..\helper;..\..\libs\libOOVorbis;..\..\libs\libvorbis\include;..\..\..\..\core\ogg\libogg\include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFVORBISENCODER_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -217,7 +217,7 @@
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
OmitFramePointers="true"
- AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32;..\..\..\..\helper;..\..\libs\libOOVorbis;..\..\libs\libvorbis\include;..\..\..\..\core\ogg\libogg\include"
+ AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\..\helper;..\..\libs\libOOVorbis;..\..\libs\libvorbis\include;..\..\..\..\core\ogg\libogg\include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFVORBISENCODER_EXPORTS"
StringPooling="true"
RuntimeLibrary="2"
@@ -392,7 +392,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32;..\..\..\..\helper;..\..\libs\libOOVorbis;..\..\libs\libvorbis\include;..\..\..\..\core\ogg\libogg\include"
+ AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\..\helper;..\..\libs\libOOVorbis;..\..\libs\libvorbis\include;..\..\..\..\core\ogg\libogg\include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFVORBISENCODER_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -557,7 +557,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32;..\..\..\..\helper;..\..\libs\libOOVorbis;..\..\libs\libvorbis\include;..\..\..\..\core\ogg\libogg\include"
+ AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\..\helper;..\..\libs\libOOVorbis;..\..\libs\libvorbis\include;..\..\..\..\core\ogg\libogg\include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFVORBISENCODER_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -722,7 +722,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32;..\..\..\..\helper;..\..\libs\libOOVorbis;..\..\libs\libvorbis\include;..\..\..\..\core\ogg\libogg\include"
+ AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\..\helper;..\..\libs\libOOVorbis;..\..\libs\libvorbis\include;..\..\..\..\core\ogg\libogg\include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFVORBISENCODER_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -1438,10 +1438,6 @@
Filter="h;hpp;hxx;hm;inl;inc"
>
<File
- RelativePath=".\fish_cdecl.h"
- >
- </File>
- <File
RelativePath=".\IVorbisEncodeSettings.h"
>
</File>
Deleted: trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/fish_cdecl.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/fish_cdecl.h 2006-10-10 10:12:24 UTC (rev 11896)
+++ trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/fish_cdecl.h 2006-10-10 11:58:23 UTC (rev 11897)
@@ -1,47 +0,0 @@
-#include <fishsound/constants.h>
-typedef struct {
- int samplerate;
- int channels;
- int format;
-} FishSoundInfo;
-typedef struct {
- int format;
- const char * name;
- const char * extension;
-} FishSoundFormat;
-
-typedef void * FishSound;
-typedef int (__cdecl *FishSoundDecoded) (FishSound * fsound, float ** pcm,
- long frames, void * user_data);
-typedef int (__cdecl *FishSoundEncoded) (FishSound * fsound, unsigned char * buf,
- long bytes, void * user_data);
-int __cdecl fish_sound_identify (unsigned char * buf, long bytes);
-
-FishSound * __cdecl fish_sound_new (int mode, FishSoundInfo * fsinfo);
-
-int __cdecl fish_sound_set_decoded_callback (FishSound * fsound,
- FishSoundDecoded decoded,
- void * user_data);
-
-int __cdecl fish_sound_set_encoded_callback (FishSound * fsound,
- FishSoundEncoded encoded,
- void * user_data);
-
-long __cdecl fish_sound_decode (FishSound * fsound, unsigned char * buf, long bytes);
-
-long __cdecl fish_sound_encode (FishSound * fsound, float ** pcm, long frames);
-
-long __cdecl fish_sound_flush (FishSound * fsound);
-
-int __cdecl fish_sound_reset (FishSound * fsound);
-
-int __cdecl fish_sound_delete (FishSound * fsound);
-
-int __cdecl fish_sound_command (FishSound * fsound, int command, void * data,
- int datasize);
-
-int __cdecl fish_sound_get_interleave (FishSound * fsound);
-
-int __cdecl fish_sound_set_interleave (FishSound * fsound, int interleave);
-
-long __cdecl fish_sound_get_frameno (FishSound * fsound);
More information about the commits
mailing list