[xiph-commits] r8087 - in trunk/oggdsf: sln/oggdsf_all
src/lib/codecs/flac/filters/dsfNativeFLACSource
illiminable at motherfish-iii.xiph.org
illiminable at motherfish-iii.xiph.org
Mon Oct 25 00:33:51 PDT 2004
Author: illiminable
Date: 2004-10-25 00:33:50 -0700 (Mon, 25 Oct 2004)
New Revision: 8087
Modified:
trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/NativeFLACSourceFilter.cpp
trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/NativeFLACSourceFilter.h
trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/NativeFLACSourcePin.h
trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/dsfNativeFLACSource.h
trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/dsfNativeFLACSource.vcproj
trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/stdafx.h
Log:
* Buildable FLAC Native skeleton.
Modified: trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
===================================================================
--- trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln 2004-10-25 07:22:47 UTC (rev 8086)
+++ trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln 2004-10-25 07:33:50 UTC (rev 8087)
@@ -1211,6 +1211,7 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfNativeFLACSource", "..\..\src\lib\codecs\flac\filters\dsfNativeFLACSource\dsfNativeFLACSource.vcproj", "{43DEE58F-CEC6-49B4-BC06-3D28978BAB63}"
ProjectSection(ProjectDependencies) = postProject
+ {4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
EndProjectSection
EndProject
Global
Modified: trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/NativeFLACSourceFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/NativeFLACSourceFilter.cpp 2004-10-25 07:22:47 UTC (rev 8086)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/NativeFLACSourceFilter.cpp 2004-10-25 07:33:50 UTC (rev 8087)
@@ -58,9 +58,9 @@
NativeFLACSourceFilter::NativeFLACSourceFilter(void)
: CBaseFilter(NAME("NativeFLACSourceFilter"), NULL, m_pLock, CLSID_NativeFLACSourceFilter)
- , mDecoder(NULL)
+ //, mDecoder(NULL)
{
- mDiracSourcePin = new NativeFLACSourcePin(this, m_pLock);
+ mFLACSourcePin = new NativeFLACSourcePin(this, m_pLock);
}
NativeFLACSourceFilter::~NativeFLACSourceFilter(void)
@@ -113,11 +113,11 @@
// return S_FALSE;
//}
- mInputFile.open(StringHelper::toNarrowStr(mFileName), ios_base::in | ios_base::binary);
+ //mInputFile.open(StringHelper::toNarrowStr(mFileName), ios_base::in | ios_base::binary);
- if (!mInputFile.is_open()) {
- return S_FALSE;
- }
+ //if (!mInputFile.is_open()) {
+ // return S_FALSE;
+ //}
Modified: trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/NativeFLACSourceFilter.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/NativeFLACSourceFilter.h 2004-10-25 07:22:47 UTC (rev 8086)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/NativeFLACSourceFilter.h 2004-10-25 07:33:50 UTC (rev 8087)
@@ -30,6 +30,7 @@
//===========================================================================
#pragma once
#include "dsfNativeFLACSource.h"
+#include "NativeFLACSourcePin.h"
#include <string>
using namespace std;
Modified: trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/NativeFLACSourcePin.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/NativeFLACSourcePin.h 2004-10-25 07:22:47 UTC (rev 8086)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/NativeFLACSourcePin.h 2004-10-25 07:33:50 UTC (rev 8087)
@@ -31,9 +31,11 @@
#pragma once
#include "dsfNativeFLACSource.h"
-#include "NativeFLACSourceFilter.h"
+//#include "NativeFLACSourceFilter.h"
#include <fstream>
using namespace std;
+
+class NativeFLACSourceFilter;
class NativeFLACSourcePin
: public CBaseOutputPin
{
Modified: trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/dsfNativeFLACSource.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/dsfNativeFLACSource.h 2004-10-25 07:22:47 UTC (rev 8086)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/dsfNativeFLACSource.h 2004-10-25 07:33:50 UTC (rev 8087)
@@ -0,0 +1,45 @@
+//===========================================================================
+//Copyright (C) 2003, 2004 Zentaro Kavanagh
+//
+//Redistribution and use in source and binary forms, with or without
+//modification, are permitted provided that the following conditions
+//are met:
+//
+//- Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//
+//- Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+//- Neither the name of Zentaro Kavanagh nor the names of contributors
+// may be used to endorse or promote products derived from this software
+// without specific prior written permission.
+//
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+//PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
+//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//===========================================================================
+
+#pragma once
+#include <streams.h>
+#include <pullpin.h>
+#include <initguid.h>
+
+#include "dsfNativeFLACSource.h"
+#include "NativeFLACSourceFilter.h"
+#include "NativeFLACSourcePin.h"
+// {6DDA37BA-0553-499a-AE0D-BEBA67204548}
+DEFINE_GUID(CLSID_NativeFLACSourceFilter,
+0x6dda37ba, 0x553, 0x499a, 0xae, 0xd, 0xbe, 0xba, 0x67, 0x20, 0x45, 0x48);
+
+
+
Modified: trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/dsfNativeFLACSource.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/dsfNativeFLACSource.vcproj 2004-10-25 07:22:47 UTC (rev 8086)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/dsfNativeFLACSource.vcproj 2004-10-25 07:33:50 UTC (rev 8087)
@@ -19,20 +19,24 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
+ AdditionalIncludeDirectories="C:\DXSDK\Samples\C++\DirectShow\BaseClasses"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFNATIVEFLACSOURCE_EXPORTS"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ RuntimeLibrary="3"
UsePrecompiledHeader="3"
- WarningLevel="3"
+ WarningLevel="4"
Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="4"/>
+ DebugInformationFormat="4"
+ CallingConvention="2"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="Strmbasd.lib Msvcrtd.lib Winmm.lib Strmiids.lib Quartz.lib"
OutputFile="$(OutDir)/dsfNativeFLACSource.dll"
LinkIncremental="2"
+ AdditionalLibraryDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses\Debug""
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/dsfNativeFLACSource.pdb"
SubSystem="2"
@@ -67,18 +71,22 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="C:\DXSDK\Samples\C++\DirectShow\BaseClasses"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFNATIVEFLACSOURCE_EXPORTS"
- RuntimeLibrary="0"
+ RuntimeLibrary="2"
UsePrecompiledHeader="3"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="3"/>
+ DebugInformationFormat="3"
+ CallingConvention="2"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="Strmbase.lib Winmm.lib Strmiids.lib Quartz.lib"
OutputFile="$(OutDir)/dsfNativeFLACSource.dll"
LinkIncremental="1"
+ AdditionalLibraryDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses\Release""
GenerateDebugInformation="TRUE"
SubSystem="2"
OptimizeReferences="2"
Modified: trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/stdafx.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/stdafx.h 2004-10-25 07:22:47 UTC (rev 8086)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/stdafx.h 2004-10-25 07:33:50 UTC (rev 8087)
@@ -11,3 +11,4 @@
#include <windows.h>
// TODO: reference additional headers your program requires here
+#include "dsfNativeFLACSource.h"
\ No newline at end of file
More information about the commits
mailing list