[xiph-commits] r16731 - in trunk/oggdsf/src/lib/core/directshow: BaseClasses dsfOggDemux2 dsfOggMux libDirectshowAbstracts
cristianadam at svn.xiph.org
cristianadam at svn.xiph.org
Wed Nov 25 15:21:07 PST 2009
Author: cristianadam
Date: 2009-11-25 15:21:06 -0800 (Wed, 25 Nov 2009)
New Revision: 16731
Modified:
trunk/oggdsf/src/lib/core/directshow/BaseClasses/baseclasses-2005.vcproj
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/IOggDecoder.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourceFilter.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/dsfOggDemux2-2005.vcproj
trunk/oggdsf/src/lib/core/directshow/dsfOggMux/stdafx.h
trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformFilter.cpp
trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformFilter.h
trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/libDirectshowAbstracts-2005.vcproj
Log:
Windows Mobile support. Refactored COM registration, added logging support.
Modified: trunk/oggdsf/src/lib/core/directshow/BaseClasses/baseclasses-2005.vcproj
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/BaseClasses/baseclasses-2005.vcproj 2009-11-25 23:18:51 UTC (rev 16730)
+++ trunk/oggdsf/src/lib/core/directshow/BaseClasses/baseclasses-2005.vcproj 2009-11-25 23:21:06 UTC (rev 16731)
@@ -67,6 +67,7 @@
ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ DebugInformationFormat="3"
CallingConvention="2"
CompileAs="0"
/>
@@ -148,6 +149,7 @@
ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ DebugInformationFormat="3"
CallingConvention="2"
CompileAs="0"
/>
@@ -227,6 +229,7 @@
ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ DebugInformationFormat="3"
CompileAs="0"
/>
<Tool
@@ -313,6 +316,7 @@
ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ DebugInformationFormat="3"
CompileAs="0"
/>
<Tool
@@ -399,6 +403,7 @@
ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ DebugInformationFormat="3"
CompileAs="0"
/>
<Tool
@@ -602,7 +607,7 @@
Name="VCCLCompilerTool"
ExecutionBucket="7"
AdditionalIncludeDirectories="$(BASECLASSES_WINCE)"
- PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)"
+ PreprocessorDefinitions="WIN32;DEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_)"
RuntimeLibrary="1"
/>
<Tool
@@ -668,7 +673,7 @@
Name="VCCLCompilerTool"
ExecutionBucket="7"
AdditionalIncludeDirectories="$(BASECLASSES_WINCE)"
- PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_)"
+ PreprocessorDefinitions="WIN32;DEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_)"
RuntimeLibrary="1"
/>
<Tool
@@ -734,7 +739,7 @@
Name="VCCLCompilerTool"
ExecutionBucket="7"
AdditionalIncludeDirectories="$(BASECLASSES_WINCE)"
- PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)"
+ PreprocessorDefinitions="WIN32;DEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_)"
RuntimeLibrary="1"
/>
<Tool
@@ -815,6 +820,7 @@
ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ DebugInformationFormat="3"
CallingConvention="2"
CompileAs="0"
/>
@@ -897,6 +903,7 @@
ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ DebugInformationFormat="3"
CallingConvention="2"
CompileAs="0"
/>
@@ -976,6 +983,7 @@
ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ DebugInformationFormat="3"
CompileAs="0"
/>
<Tool
@@ -1062,6 +1070,7 @@
ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ DebugInformationFormat="3"
CompileAs="0"
/>
<Tool
@@ -1148,6 +1157,7 @@
ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ DebugInformationFormat="3"
CompileAs="0"
/>
<Tool
@@ -1233,6 +1243,7 @@
ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ DebugInformationFormat="3"
CallingConvention="2"
CompileAs="0"
/>
@@ -1315,6 +1326,7 @@
ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ DebugInformationFormat="3"
CallingConvention="2"
CompileAs="0"
/>
@@ -1394,6 +1406,7 @@
ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ DebugInformationFormat="3"
CompileAs="0"
/>
<Tool
@@ -1480,6 +1493,7 @@
ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ DebugInformationFormat="3"
CompileAs="0"
/>
<Tool
@@ -1566,6 +1580,7 @@
ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
+ DebugInformationFormat="3"
CompileAs="0"
/>
<Tool
@@ -10939,7 +10954,6 @@
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK 2 (ARMV4I)"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@@ -10949,7 +10963,6 @@
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Smartphone SDK 2 (ARMV4I)"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@@ -10959,7 +10972,6 @@
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/IOggDecoder.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/IOggDecoder.h 2009-11-25 23:18:51 UTC (rev 16730)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/IOggDecoder.h 2009-11-25 23:21:06 UTC (rev 16731)
@@ -13,11 +13,12 @@
#include <libOOOggSeek/IOggDecoderSeek.h>
#include <string>
using namespace std;
-class IOggDecoder
- : public IOggDecoderSeek
+
+DECLARE_INTERFACE_(IOggDecoder, IOggDecoderSeek)
{
public:
- enum eAcceptHeaderResult {
+ enum eAcceptHeaderResult
+ {
AHR_ALL_HEADERS_RECEIVED,
AHR_MORE_HEADERS_TO_COME,
AHR_INVALID_HEADER,
@@ -25,6 +26,7 @@
AHR_NULL_POINTER,
};
+
virtual LOOG_INT64 __stdcall convertGranuleToTime(LOOG_INT64 inGranule) = 0;
virtual LOOG_INT64 __stdcall mustSeekBefore(LOOG_INT64 inGranule) = 0;
virtual eAcceptHeaderResult __stdcall showHeaderPacket(OggPacket* inCodecHeaderPacket) = 0;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourceFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourceFilter.cpp 2009-11-25 23:18:51 UTC (rev 16730)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourceFilter.cpp 2009-11-25 23:21:06 UTC (rev 16731)
@@ -85,7 +85,7 @@
#ifdef WINCE
LPAMOVIESETUP_FILTER OggDemuxPacketSourceFilter::GetSetupData()
{
- return (LPAMOVIESETUP_FILTER)&OggDemuxPacketSourceFilterReg;
+ return (LPAMOVIESETUP_FILTER)&m_pinReg;
}
#endif
@@ -103,7 +103,7 @@
}
OggDemuxPacketSourceFilter::OggDemuxPacketSourceFilter()
- : CBaseFilter(NAME("OggDemuxPacketSourceFilter"), NULL, m_pLock, CLSID_OggDemuxPacketSourceFilter)
+ : CBaseFilter(NAME, NULL, m_pLock, CLSID_OggDemuxPacketSourceFilter)
, mDataSource(NULL)
, mSeenAllBOSPages(false)
, mSeenPositiveGranulePos(false)
@@ -603,10 +603,12 @@
LOG(logDEBUG) << L"Adding decoder interface to seek table";
mSeekTable->addStream(locPin->getSerialNo(), locPin->getDecoderInterface());
}
+#ifndef WINCE
LOG(logDEBUG) << L"Pre seek table build";
mSeekTable->buildTable();
LOG(logDEBUG) << L"Post seek table build";
+#endif
}
}
}
@@ -725,7 +727,7 @@
*pDuration = mSeekTable->fileDuration();
- LOG(logDEBUG) << "IMediaSeeking::GetDuration([out] " << ToString(*pDuration) << ") -> 0x" << std::hex << S_OK;
+ LOG(logDEBUG3) << "IMediaSeeking::GetDuration([out] " << ToString(*pDuration) << ") -> 0x" << std::hex << S_OK;
return S_OK;
}
@@ -741,7 +743,7 @@
result = S_FALSE;
}
- LOG(logDEBUG) << "IMediaSeeking::CheckCapabilities([out] " << *pCapabilities << ") -> 0x" << std::hex << result;
+ LOG(logDEBUG3) << "IMediaSeeking::CheckCapabilities([out] " << *pCapabilities << ") -> 0x" << std::hex << result;
return result;
}
@@ -755,7 +757,7 @@
result = S_OK;
}
- LOG(logDEBUG) << "IMediaSeeking::IsFormatSupported([in] " << ToString(*pFormat) << ") -> 0x" << std::hex << result;
+ LOG(logDEBUG3) << "IMediaSeeking::IsFormatSupported([in] " << ToString(*pFormat) << ") -> 0x" << std::hex << result;
return result;
}
@@ -764,14 +766,14 @@
{
*pFormat = TIME_FORMAT_MEDIA_TIME;
- LOG(logDEBUG) << "IMediaSeeking::QueryPreferredFormat([out] " << ToString(*pFormat) << ") -> 0x" << std::hex << S_OK;
+ LOG(logDEBUG3) << "IMediaSeeking::QueryPreferredFormat([out] " << ToString(*pFormat) << ") -> 0x" << std::hex << S_OK;
return S_OK;
}
STDMETHODIMP OggDemuxPacketSourceFilter::SetTimeFormat(const GUID *pFormat)
{
- LOG(logDEBUG) << "IMediaSeeking::SetTimeFormat([in] " << ToString(pFormat) << ") -> 0x" << std::hex << E_NOTIMPL;
+ LOG(logDEBUG3) << "IMediaSeeking::SetTimeFormat([in] " << ToString(pFormat) << ") -> 0x" << std::hex << E_NOTIMPL;
return E_NOTIMPL;
}
@@ -780,7 +782,7 @@
{
*pFormat = TIME_FORMAT_MEDIA_TIME;
- LOG(logDEBUG) << "IMediaSeeking::GetTimeFormat([out] " << ToString(*pFormat) << ") -> 0x" << std::hex << S_OK;
+ LOG(logDEBUG3) << "IMediaSeeking::GetTimeFormat([out] " << ToString(*pFormat) << ") -> 0x" << std::hex << S_OK;
return S_OK;
}
@@ -794,7 +796,7 @@
*pStop = mSeekTable->fileDuration();
- LOG(logDEBUG) << "IMediaSeeking::GetStopPosition([out] " << ToString(*pStop) << ") -> 0x" << std::hex << S_OK;
+ LOG(logDEBUG3) << "IMediaSeeking::GetStopPosition([out] " << ToString(*pStop) << ") -> 0x" << std::hex << S_OK;
return S_OK;
}
@@ -806,7 +808,7 @@
STDMETHODIMP OggDemuxPacketSourceFilter::ConvertTimeFormat(LONGLONG *pTarget, const GUID *pTargetFormat, LONGLONG Source, const GUID *pSourceFormat)
{
- LOG(logDEBUG) << "IMediaSeeking::ConvertTimeFormat([out] " << ToString(pTarget)
+ LOG(logDEBUG3) << "IMediaSeeking::ConvertTimeFormat([out] " << ToString(pTarget)
<< ", [in] " << ToString(pTargetFormat) << ", [in] " << ToString(Source)
<< ", [in] " << ToString(pSourceFormat) << ") -> 0x" << std::hex << E_NOTIMPL;
@@ -817,7 +819,7 @@
{
CAutoLock locLock(m_pLock);
- LOG(logDEBUG) << "IMediaSeeking::SetPositions([in, out] " << ToString(pCurrent) << ", [in] " << dwCurrentFlags
+ LOG(logDEBUG3) << "IMediaSeeking::SetPositions([in, out] " << ToString(pCurrent) << ", [in] " << dwCurrentFlags
<< ", [in, out] " << ToString(pStop) << ", [in] " << dwStopFlags << ") -> 0x" << std::hex << S_OK;
if (mSeekTable == NULL || !mSeekTable->enabled())
@@ -868,7 +870,7 @@
*pEarliest = 0;
*pLatest = mSeekTable->fileDuration();
- LOG(logDEBUG) << "IMediaSeeking::GetAvailable([out] " << ToString(*pEarliest) << ", [out] " << ToString(*pLatest)
+ LOG(logDEBUG3) << "IMediaSeeking::GetAvailable([out] " << ToString(*pEarliest) << ", [out] " << ToString(*pLatest)
<< ") -> 0x" << std::hex << S_OK;
return S_OK;
@@ -887,7 +889,7 @@
result = E_INVALIDARG;
}
- LOG(logDEBUG) << "IMediaSeeking::SetRate([in] " << std::setprecision(3) << std::showpoint
+ LOG(logDEBUG3) << "IMediaSeeking::SetRate([in] " << std::setprecision(3) << std::showpoint
<< dRate << ") -> 0x" << std::hex << result;
return result;
@@ -897,7 +899,7 @@
{
*dRate = 1.0;
- LOG(logDEBUG) << "IMediaSeeking::GetRate([out] " << std::setprecision(3) << std::showpoint
+ LOG(logDEBUG3) << "IMediaSeeking::GetRate([out] " << std::setprecision(3) << std::showpoint
<< *dRate << ") -> 0x" << std::hex << S_OK;
return S_OK;
@@ -907,7 +909,7 @@
{
*pllPreroll = 0;
- LOG(logDEBUG) << "IMediaSeeking::GetPreroll([out] " << ToString(*pllPreroll) << ") -> 0x" << std::hex << S_OK;
+ LOG(logDEBUG3) << "IMediaSeeking::GetPreroll([out] " << ToString(*pllPreroll) << ") -> 0x" << std::hex << S_OK;
return S_OK;
}
@@ -921,7 +923,7 @@
result = S_OK;
}
- LOG(logDEBUG) << "IMediaSeeking::IsUsingTimeFormat([in] " << ToString(*pFormat) << ") -> 0x" << std::hex << result;
+ LOG(logDEBUG3) << "IMediaSeeking::IsUsingTimeFormat([in] " << ToString(*pFormat) << ") -> 0x" << std::hex << result;
return result;
}
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/dsfOggDemux2-2005.vcproj
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/dsfOggDemux2-2005.vcproj 2009-11-25 23:18:51 UTC (rev 16730)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/dsfOggDemux2-2005.vcproj 2009-11-25 23:21:06 UTC (rev 16731)
@@ -227,7 +227,7 @@
ExecutionBucket="7"
Optimization="0"
AdditionalIncludeDirectories=""$(BASECLASSES_WINCE)";..\..\ogg;..\libDirectshowAbstracts;..\..\..\helper"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;_WINDOWS;_USRDLL;DSFOGGDEMUX2_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DEBUG;_WINDOWS;_USRDLL;DSFOGGDEMUX2_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)"
MinimalRebuild="true"
ExceptionHandling="2"
RuntimeLibrary="1"
@@ -309,7 +309,7 @@
ExecutionBucket="7"
Optimization="0"
AdditionalIncludeDirectories=""$(BASECLASSES_WINCE)";..\..\ogg;..\libDirectshowAbstracts;..\..\..\helper"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;_WINDOWS;_USRDLL;DSFOGGDEMUX2_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DEBUG;_WINDOWS;_USRDLL;DSFOGGDEMUX2_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)"
MinimalRebuild="true"
ExceptionHandling="2"
RuntimeLibrary="1"
@@ -391,7 +391,7 @@
ExecutionBucket="7"
Optimization="0"
AdditionalIncludeDirectories=""$(BASECLASSES_WINCE)";..\..\ogg;..\libDirectshowAbstracts;..\..\..\helper"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;_WINDOWS;_USRDLL;DSFOGGDEMUX2_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DEBUG;_WINDOWS;_USRDLL;DSFOGGDEMUX2_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)"
MinimalRebuild="true"
ExceptionHandling="2"
RuntimeLibrary="1"
@@ -786,9 +786,9 @@
/>
<DeploymentTool
ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
+ RemoteDirectory="%CSIDL_PROGRAM_FILES%\Xiph.Org\Ogg Codecs"
+ RegisterOutput="-1"
+ AdditionalFiles="$(TargetDir)\dsfVorbisDecoder.dll"
/>
<DebuggerTool
/>
@@ -2194,11 +2194,11 @@
>
</Filter>
<File
- RelativePath=".\ReadMe.txt"
+ RelativePath="..\..\..\codecs\flac\filters\dsfNativeFLACSource\ReadMe.txt"
>
</File>
<File
- RelativePath="..\..\..\codecs\flac\filters\dsfNativeFLACSource\ReadMe.txt"
+ RelativePath=".\ReadMe.txt"
>
</File>
</Files>
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggMux/stdafx.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggMux/stdafx.h 2009-11-25 23:18:51 UTC (rev 16730)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggMux/stdafx.h 2009-11-25 23:21:06 UTC (rev 16731)
@@ -43,3 +43,7 @@
// TODO: reference additional headers your program requires here
#include "oggmuxdllstuff.h"
#include <libilliCore/StringHelper.h>
+
+#include <atlbase.h>
+#include <atlcom.h>
+
Modified: trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformFilter.cpp 2009-11-25 23:18:51 UTC (rev 16730)
+++ trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformFilter.cpp 2009-11-25 23:21:06 UTC (rev 16731)
@@ -38,7 +38,7 @@
#include "AbstractTransformFilter.h"
//Constructors
-AbstractTransformFilter::AbstractTransformFilter(TCHAR* inFilterName, REFCLSID inFilterGUID)
+AbstractTransformFilter::AbstractTransformFilter(const wchar_t* inFilterName, REFCLSID inFilterGUID)
: CBaseFilter(inFilterName, NULL, m_pLock, inFilterGUID)
, mInputPin(NULL)
Modified: trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformFilter.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformFilter.h 2009-11-25 23:18:51 UTC (rev 16730)
+++ trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformFilter.h 2009-11-25 23:21:06 UTC (rev 16731)
@@ -56,7 +56,7 @@
STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void **ppv);
//Constructors
- AbstractTransformFilter(TCHAR* inFilterName, REFCLSID inFilterGUID);
+ AbstractTransformFilter(const wchar_t* inFilterName, REFCLSID inFilterGUID);
virtual ~AbstractTransformFilter(void);
//Pin Access Methods
Modified: trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/libDirectshowAbstracts-2005.vcproj
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/libDirectshowAbstracts-2005.vcproj 2009-11-25 23:18:51 UTC (rev 16730)
+++ trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/libDirectshowAbstracts-2005.vcproj 2009-11-25 23:21:06 UTC (rev 16731)
@@ -189,7 +189,7 @@
ExecutionBucket="7"
Optimization="0"
AdditionalIncludeDirectories="$(BASECLASSES_WINCE)"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)"
MinimalRebuild="true"
RuntimeLibrary="1"
UsePrecompiledHeader="2"
@@ -261,7 +261,7 @@
ExecutionBucket="7"
Optimization="0"
AdditionalIncludeDirectories="$(BASECLASSES_WINCE)"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)"
MinimalRebuild="true"
RuntimeLibrary="1"
UsePrecompiledHeader="2"
@@ -334,7 +334,7 @@
ExecutionBucket="7"
Optimization="0"
AdditionalIncludeDirectories="$(BASECLASSES_WINCE)"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)"
MinimalRebuild="true"
RuntimeLibrary="1"
UsePrecompiledHeader="2"
More information about the commits
mailing list