[xiph-commits] r8088 - in trunk/oggdsf: sln/oggdsf_all src/lib/codecs/flac/filters/dsfNativeFLACSource

[illiminable at motherfish-iii.xiph.org]

Author: illiminable
Date: 2004-10-25 01:22:27 -0700 (Mon, 25 Oct 2004)
New Revision: 8088

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/dsfNativeFLACSource.vcproj
Log:
* All the stubs for flacs callbacks.

Modified: trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
===================================================================
--- trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln	2004-10-25 07:33:50 UTC (rev 8087)
+++ trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln	2004-10-25 08:22:27 UTC (rev 8088)
@@ -1211,7 +1211,9 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfNativeFLACSource", "..\..\src\lib\codecs\flac\filters\dsfNativeFLACSource\dsfNativeFLACSource.vcproj", "{43DEE58F-CEC6-49B4-BC06-3D28978BAB63}"
 	ProjectSection(ProjectDependencies) = postProject
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
 		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
 	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:33:50 UTC (rev 8087)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/NativeFLACSourceFilter.cpp	2004-10-25 08:22:27 UTC (rev 8088)
@@ -58,6 +58,7 @@
 
 NativeFLACSourceFilter::NativeFLACSourceFilter(void)
 	:	CBaseFilter(NAME("NativeFLACSourceFilter"), NULL, m_pLock, CLSID_NativeFLACSourceFilter)
+	
 	//,	mDecoder(NULL)
 {
 	mFLACSourcePin = new NativeFLACSourcePin(this, m_pLock);
@@ -202,4 +203,31 @@
 	
 	}
 	return S_OK;
+}
+
+
+::FLAC__SeekableStreamDecoderReadStatus NativeFLACSourceFilter::read_callback(FLAC__byte outBuffer[], unsigned int* outNumBytes) {
+	return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_OK;
+}
+::FLAC__SeekableStreamDecoderSeekStatus NativeFLACSourceFilter::seek_callback(FLAC__uint64 inSeekPos) {
+	return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_OK;
+}
+::FLAC__SeekableStreamDecoderTellStatus NativeFLACSourceFilter::tell_callback(FLAC__uint64* outTellPos) {
+	return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK;
+}
+::FLAC__SeekableStreamDecoderLengthStatus NativeFLACSourceFilter::length_callback(FLAC__uint64* outLength) {
+	return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK;
+}
+::FLAC__StreamDecoderWriteStatus NativeFLACSourceFilter::write_callback(const FLAC__Frame* outFrame,const FLAC__int32 *const outBuffer[]) {
+	return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
+}
+void NativeFLACSourceFilter::metadata_callback(const FLAC__StreamMetadata* inMetaData) {
+
+}
+void NativeFLACSourceFilter::error_callback(FLAC__StreamDecoderErrorStatus inStatus) {
+
+}
+
+bool NativeFLACSourceFilter::eof_callback(void) {
+	return false;
 }
\ No newline at end of file

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:33:50 UTC (rev 8087)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/NativeFLACSourceFilter.h	2004-10-25 08:22:27 UTC (rev 8088)
@@ -31,9 +31,10 @@
 #pragma once
 #include "dsfNativeFLACSource.h"
 #include "NativeFLACSourcePin.h"
-
+#include "FLAC++/decoder.h"
 #include <string>
 using namespace std;
+using namespace FLAC::Decoder;
 
 
 class NativeFLACSourcePin;
@@ -42,6 +43,7 @@
 	,	public IFileSourceFilter
 	,	public IAMFilterMiscFlags
 	,	public CAMThread
+	,	protected FLAC::Decoder::SeekableStream
 {
 public:
 	enum eThreadCommands {
@@ -76,6 +78,23 @@
 
 	//CAMThread
 	virtual DWORD ThreadProc(void);
+
+	//FLAC Virtuals
+
+	::FLAC__SeekableStreamDecoderReadStatus read_callback(FLAC__byte outBuffer[], unsigned int* outNumBytes);
+	::FLAC__SeekableStreamDecoderSeekStatus seek_callback(FLAC__uint64 inSeekPos);
+	::FLAC__SeekableStreamDecoderTellStatus tell_callback(FLAC__uint64* outTellPos);
+	::FLAC__SeekableStreamDecoderLengthStatus length_callback(FLAC__uint64* outLength);
+	::FLAC__StreamDecoderWriteStatus write_callback(const FLAC__Frame* outFrame,const FLAC__int32 *const outBuffer[]);
+	void metadata_callback(const FLAC__StreamMetadata* inMetaData);
+	void error_callback(FLAC__StreamDecoderErrorStatus inStatus);
+
+
+	bool eof_callback(void);
+
+
+
+
 protected:
 
 	HRESULT DataProcessLoop();

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:33:50 UTC (rev 8087)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/dsfNativeFLACSource.vcproj	2004-10-25 08:22:27 UTC (rev 8088)
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="C:\DXSDK\Samples\C++\DirectShow\BaseClasses"
+				AdditionalIncludeDirectories="&quot;C:\DXSDK\Samples\C++\DirectShow\BaseClasses&quot;;..\..\libs\libflac\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFNATIVEFLACSOURCE_EXPORTS"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -71,7 +71,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="C:\DXSDK\Samples\C++\DirectShow\BaseClasses"
+				AdditionalIncludeDirectories="&quot;C:\DXSDK\Samples\C++\DirectShow\BaseClasses&quot;;..\..\libs\libflac\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFNATIVEFLACSOURCE_EXPORTS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="3"