[xiph-commits] r8275 - in trunk/oggdsf: sln/oggdsf_all
src/lib/core/directshow/libDirectshowAbstracts
src/lib/core/ogg/libOOOgg src/lib/helper/libilliCore
illiminable at motherfish-iii.xiph.org
illiminable at motherfish-iii.xiph.org
Wed Nov 24 01:54:48 PST 2004
Author: illiminable
Date: 2004-11-24 01:54:47 -0800 (Wed, 24 Nov 2004)
New Revision: 8275
Modified:
trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformFilter.h
trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformInputPin.h
trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformOutputPin.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/libOOOgg.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/stdafx.h
trunk/oggdsf/src/lib/helper/libilliCore/StringHelper.h
trunk/oggdsf/src/lib/helper/libilliCore/iBE_Math.h
trunk/oggdsf/src/lib/helper/libilliCore/iLE_Math.h
trunk/oggdsf/src/lib/helper/libilliCore/libilliCore.cpp
trunk/oggdsf/src/lib/helper/libilliCore/libilliCore.h
trunk/oggdsf/src/lib/helper/libilliCore/libilliCore.vcproj
trunk/oggdsf/src/lib/helper/libilliCore/stdafx.h
Log:
* Core helper library now static for efficiency and whole program optimisation purposes
Modified: trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
===================================================================
--- trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln 2004-11-24 09:44:27 UTC (rev 8274)
+++ trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln 2004-11-24 09:54:47 UTC (rev 8275)
@@ -75,7 +75,6 @@
{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
{7F213248-16F2-4AAE-B941-C402670082BC} = {7F213248-16F2-4AAE-B941-C402670082BC}
- {A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
@@ -89,7 +88,6 @@
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfVorbisDecoder", "..\..\src\lib\codecs\vorbis\filters\dsfVorbisDecoder\dsfVorbisDecoder.vcproj", "{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}"
ProjectSection(ProjectDependencies) = postProject
{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
- {A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
@@ -120,7 +118,6 @@
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfSpeexDecoder", "..\..\src\lib\codecs\speex\filters\dsfSpeexDecoder\dsfSpeexDecoder.vcproj", "{3FB9B20E-790A-402F-A02C-B0FBDC5938E3}"
ProjectSection(ProjectDependencies) = postProject
{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
- {A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
Modified: trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformFilter.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformFilter.h 2004-11-24 09:44:27 UTC (rev 8274)
+++ trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformFilter.h 2004-11-24 09:54:47 UTC (rev 8275)
@@ -63,12 +63,9 @@
CBasePin* GetPin(int inPinNo);
int GetPinCount(void);
-
-
protected:
//Pin Creation Methods
virtual bool ConstructPins() = 0;
-
virtual void DestroyPins();
//Pin Member Data
Modified: trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformInputPin.h 2004-11-24 09:44:27 UTC (rev 8274)
+++ trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformInputPin.h 2004-11-24 09:54:47 UTC (rev 8275)
@@ -42,8 +42,6 @@
//
using namespace std;
-
-
//Forward Declarations
class AbstractTransformOutputPin;
class AbstractTransformFilter;
@@ -99,7 +97,6 @@
HRESULT mHR;
-
//TODO::: Couldn't this be gotten from the parent filter if we make them friends ??
AbstractTransformOutputPin* mOutputPin;
AbstractTransformFilter* mParentFilter;
Modified: trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformOutputPin.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformOutputPin.h 2004-11-24 09:44:27 UTC (rev 8274)
+++ trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformOutputPin.h 2004-11-24 09:54:47 UTC (rev 8275)
@@ -84,7 +84,7 @@
COutputQueue* mDataQueue;
vector<CMediaType*> mAcceptableMediaTypes;
- HRESULT mHR;
+ HRESULT mHR; //Is this even used ??
//Buffer parameter member data
int mDesiredBufferSize;
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/libOOOgg.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/libOOOgg.h 2004-11-24 09:44:27 UTC (rev 8274)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/libOOOgg.h 2004-11-24 09:54:47 UTC (rev 8275)
@@ -31,8 +31,8 @@
#include "dllstuff.h"
-#include "libilliCore.h"
+
#include "OggTypeDefs.h"
#include "IOggCallback.h"
#include "IStampedOggPacketSink.h"
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/stdafx.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/stdafx.h 2004-11-24 09:44:27 UTC (rev 8274)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/stdafx.h 2004-11-24 09:54:47 UTC (rev 8275)
@@ -60,7 +60,7 @@
// TODO: reference additional headers your program requires here
//#include "StringHelper.h"
-#include "libilliCore.h"
+
//#include "iLE_Math.h"
//#include "iBE_Math.h"
//#include "StringHelper.h"
Modified: trunk/oggdsf/src/lib/helper/libilliCore/StringHelper.h
===================================================================
--- trunk/oggdsf/src/lib/helper/libilliCore/StringHelper.h 2004-11-24 09:44:27 UTC (rev 8274)
+++ trunk/oggdsf/src/lib/helper/libilliCore/StringHelper.h 2004-11-24 09:54:47 UTC (rev 8275)
@@ -34,8 +34,8 @@
#include <string>
using namespace std;
-#include "libilliCore.h"
-class LIBILLICORE_API StringHelper
+
+class StringHelper
{
public:
StringHelper(void);
Modified: trunk/oggdsf/src/lib/helper/libilliCore/iBE_Math.h
===================================================================
--- trunk/oggdsf/src/lib/helper/libilliCore/iBE_Math.h 2004-11-24 09:44:27 UTC (rev 8274)
+++ trunk/oggdsf/src/lib/helper/libilliCore/iBE_Math.h 2004-11-24 09:54:47 UTC (rev 8275)
@@ -30,13 +30,13 @@
//===========================================================================
#pragma once
-#include "libilliCore.h"
-class LIBILLICORE_API iBE_Math
+
+class iBE_Math
{
public:
iBE_Math(void);
~iBE_Math(void);
- static unsigned long charArrToULong(unsigned char* inCharArray);
+ static unsigned long charArrToULong(unsigned char* inCharArray);
static void ULongToCharArr(unsigned long inLong, unsigned char* outCharArray);
static unsigned short charArrToUShort(unsigned char* inCharArray);
Modified: trunk/oggdsf/src/lib/helper/libilliCore/iLE_Math.h
===================================================================
--- trunk/oggdsf/src/lib/helper/libilliCore/iLE_Math.h 2004-11-24 09:44:27 UTC (rev 8274)
+++ trunk/oggdsf/src/lib/helper/libilliCore/iLE_Math.h 2004-11-24 09:54:47 UTC (rev 8275)
@@ -31,17 +31,15 @@
#pragma once
-#include "libilliCore.h"
-class LIBILLICORE_API iLE_Math
+
+class iLE_Math
{
public:
iLE_Math(void);
~iLE_Math(void);
- static unsigned long charArrToULong(const unsigned char* inCharArray);
+ static unsigned long charArrToULong(const unsigned char* inCharArray);
static void ULongToCharArr(unsigned long inLong, unsigned char* outCharArray);
static __int64 CharArrToInt64(const unsigned char* inCharArray);
static void Int64ToCharArr(__int64 inInt64, unsigned char* outCharArray);
static unsigned short charArrToUShort(const unsigned char* inCharArray);
-
-
};
Modified: trunk/oggdsf/src/lib/helper/libilliCore/libilliCore.cpp
===================================================================
--- trunk/oggdsf/src/lib/helper/libilliCore/libilliCore.cpp 2004-11-24 09:44:27 UTC (rev 8274)
+++ trunk/oggdsf/src/lib/helper/libilliCore/libilliCore.cpp 2004-11-24 09:54:47 UTC (rev 8275)
@@ -2,7 +2,7 @@
//
#include "stdafx.h"
-#include "libilliCore.h"
+#include "libillicore.h"
BOOL APIENTRY DllMain( HANDLE hModule,
DWORD ul_reason_for_call,
LPVOID lpReserved
Modified: trunk/oggdsf/src/lib/helper/libilliCore/libilliCore.h
===================================================================
--- trunk/oggdsf/src/lib/helper/libilliCore/libilliCore.h 2004-11-24 09:44:27 UTC (rev 8274)
+++ trunk/oggdsf/src/lib/helper/libilliCore/libilliCore.h 2004-11-24 09:54:47 UTC (rev 8275)
@@ -1,15 +0,0 @@
-// The following ifdef block is the standard way of creating macros which make exporting
-// from a DLL simpler. All files within this DLL are compiled with the LIBILLICORE_EXPORTS
-// symbol defined on the command line. this symbol should not be defined on any project
-// that uses this DLL. This way any other project whose source files include this file see
-// LIBILLICORE_API functions as being imported from a DLL, whereas this DLL sees symbols
-// defined with this macro as being exported.
-#ifdef LIBILLICORE_EXPORTS
-#define LIBILLICORE_API __declspec(dllexport)
-#else
-#define LIBILLICORE_API __declspec(dllimport)
-#endif
-
-//#include "iLE_Math.h"
-//#include "iBE_Math.h"
-//#include "StringHelper.h"
\ No newline at end of file
Modified: trunk/oggdsf/src/lib/helper/libilliCore/libilliCore.vcproj
===================================================================
--- trunk/oggdsf/src/lib/helper/libilliCore/libilliCore.vcproj 2004-11-24 09:44:27 UTC (rev 8274)
+++ trunk/oggdsf/src/lib/helper/libilliCore/libilliCore.vcproj 2004-11-24 09:54:47 UTC (rev 8275)
@@ -14,7 +14,7 @@
Name="Debug|Win32"
OutputDirectory="Debug"
IntermediateDirectory="Debug"
- ConfigurationType="2"
+ ConfigurationType="4"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
@@ -31,14 +31,7 @@
<Tool
Name="VCCustomBuildTool"/>
<Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)/libilliCore.dll"
- LinkIncremental="2"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile="$(OutDir)/libilliCore.pdb"
- SubSystem="2"
- ImportLibrary="$(OutDir)/libilliCore.lib"
- TargetMachine="1"/>
+ Name="VCLibrarianTool"/>
<Tool
Name="VCMIDLTool"/>
<Tool
@@ -54,8 +47,6 @@
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
@@ -64,7 +55,7 @@
Name="Release|Win32"
OutputDirectory="Release"
IntermediateDirectory="Release"
- ConfigurationType="2"
+ ConfigurationType="4"
CharacterSet="2"
WholeProgramOptimization="TRUE">
<Tool
@@ -87,16 +78,7 @@
<Tool
Name="VCCustomBuildTool"/>
<Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)/libilliCore.dll"
- LinkIncremental="1"
- GenerateDebugInformation="TRUE"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- OptimizeForWindows98="1"
- ImportLibrary="$(OutDir)/libilliCore.lib"
- TargetMachine="1"/>
+ Name="VCLibrarianTool"/>
<Tool
Name="VCMIDLTool"/>
<Tool
@@ -112,8 +94,6 @@
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
@@ -122,7 +102,7 @@
Name="Release_SSE2|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="2"
+ ConfigurationType="4"
CharacterSet="2"
WholeProgramOptimization="TRUE">
<Tool
@@ -145,16 +125,7 @@
<Tool
Name="VCCustomBuildTool"/>
<Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)/libilliCore.dll"
- LinkIncremental="1"
- GenerateDebugInformation="TRUE"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- OptimizeForWindows98="1"
- ImportLibrary="$(OutDir)/libilliCore.lib"
- TargetMachine="1"/>
+ Name="VCLibrarianTool"/>
<Tool
Name="VCMIDLTool"/>
<Tool
@@ -170,8 +141,6 @@
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
@@ -180,7 +149,7 @@
Name="Release_SSE|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="2"
+ ConfigurationType="4"
CharacterSet="2"
WholeProgramOptimization="TRUE">
<Tool
@@ -203,16 +172,7 @@
<Tool
Name="VCCustomBuildTool"/>
<Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)/libilliCore.dll"
- LinkIncremental="1"
- GenerateDebugInformation="TRUE"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- OptimizeForWindows98="1"
- ImportLibrary="$(OutDir)/libilliCore.lib"
- TargetMachine="1"/>
+ Name="VCLibrarianTool"/>
<Tool
Name="VCMIDLTool"/>
<Tool
@@ -228,8 +188,6 @@
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
Modified: trunk/oggdsf/src/lib/helper/libilliCore/stdafx.h
===================================================================
--- trunk/oggdsf/src/lib/helper/libilliCore/stdafx.h 2004-11-24 09:44:27 UTC (rev 8274)
+++ trunk/oggdsf/src/lib/helper/libilliCore/stdafx.h 2004-11-24 09:54:47 UTC (rev 8275)
@@ -11,4 +11,3 @@
#include <windows.h>
// TODO: reference additional headers your program requires here
-#include "libilliCore.h"
\ No newline at end of file
More information about the commits
mailing list