[xiph-commits] r10241 - branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2

[illiminable at svn.xiph.org]

Author: illiminable
Date: 2005-10-22 01:14:34 -0700 (Sat, 22 Oct 2005)
New Revision: 10241

Modified:
   branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPageSourceFilter.cpp
   branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPageSourceFilter.h
Log:
* Skeletons for IFileSourceFilter interface

Modified: branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPageSourceFilter.cpp
===================================================================
--- branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPageSourceFilter.cpp	2005-10-22 08:01:32 UTC (rev 10240)
+++ branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPageSourceFilter.cpp	2005-10-22 08:14:34 UTC (rev 10241)
@@ -114,3 +114,34 @@
 	//TODO::: IMplement
 	return NULL;
 }
+
+//IFileSource Interface
+STDMETHODIMP OggDemuxPageSourceFilter::GetCurFile(LPOLESTR* outFileName, AM_MEDIA_TYPE* outMediaType) 
+{
+	////Return the filename and mediatype of the raw data
+	//LPOLESTR x = SysAllocString(mFileName.c_str());
+	//*outFileName = x;
+
+	//TODO:::
+	
+	return S_OK;
+}
+
+
+STDMETHODIMP OggDemuxPageSourceFilter::Load(LPCOLESTR inFileName, const AM_MEDIA_TYPE* inMediaType) 
+{
+	////Initialise the file here and setup all the streams
+	//CAutoLock locLock(m_pLock);
+	//mFileName = inFileName;
+
+	//debugLog<<"Loading : "<<StringHelper::toNarrowStr(mFileName)<<endl;
+
+	//debugLog << "Opening source file : "<<StringHelper::toNarrowStr(mFileName)<<endl;
+	//mSeekTable = new AutoOggSeekTable(StringHelper::toNarrowStr(mFileName));
+	//mSeekTable->buildTable();
+	//
+	//return SetUpPins();
+
+	//TODO:::
+	return S_OK;
+}

Modified: branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPageSourceFilter.h
===================================================================
--- branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPageSourceFilter.h	2005-10-22 08:01:32 UTC (rev 10240)
+++ branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPageSourceFilter.h	2005-10-22 08:14:34 UTC (rev 10241)
@@ -33,7 +33,7 @@
 class OggDemuxPageSourceFilter
 	:	public CBaseFilter
 	//,	public CAMThread
-	//,	public IFileSourceFilter
+	,	public IFileSourceFilter
 	//,	public IOggCallback
 	//,	public BasicSeekPassThrough
 	//,	public ISpecifyPropertyPages
@@ -45,7 +45,7 @@
 	virtual ~OggDemuxPageSourceFilter(void);
 
 	//Com Stuff
-	//DECLARE_IUNKNOWN
+	DECLARE_IUNKNOWN
 
 	STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void **ppv);
 	static CUnknown * WINAPI CreateInstance(LPUNKNOWN pUnk, HRESULT *pHr);
@@ -55,4 +55,9 @@
 	virtual int GetPinCount();
 	virtual CBasePin* GetPin(int inPinNo);
 
+	//IFileSource Interface
+	virtual STDMETHODIMP GetCurFile(LPOLESTR* outFileName, AM_MEDIA_TYPE* outMediaType);
+	virtual STDMETHODIMP Load(LPCOLESTR inFileName, const AM_MEDIA_TYPE* inMediaType);
+
+
 };