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

[illiminable at svn.xiph.org]

Author: illiminable
Date: 2005-12-01 05:32:35 -0800 (Thu, 01 Dec 2005)
New Revision: 10512

Modified:
   branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourceFilter.cpp
   branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourceFilter.h
   branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/ds_guids.h
   branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/dsfOggDemux2.vcproj
   branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/oggdllstuff.cpp
Log:
* Add the interface for base times
* Fix the misnamed filter

Modified: branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourceFilter.cpp
===================================================================
--- branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourceFilter.cpp	2005-12-01 11:50:50 UTC (rev 10511)
+++ branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourceFilter.cpp	2005-12-01 13:32:35 UTC (rev 10512)
@@ -92,8 +92,15 @@
 	//	*ppv = (IAMMediaContent*)this;
 	//	((IUnknown*)*ppv)->AddRef();
 	//	return NOERROR;
+	}  else if (riid == IID_IOggBaseTime) {
+		*ppv = (IOggBaseTime*)this;
+		//((IUnknown*)*ppv)->AddRef();
+		return NOERROR;
 	}
 
+
+	
+
 	return CBaseFilter::NonDelegatingQueryInterface(riid, ppv); 
 }
 OggDemuxPacketSourceFilter::OggDemuxPacketSourceFilter(void)

Modified: branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourceFilter.h
===================================================================
--- branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourceFilter.h	2005-12-01 11:50:50 UTC (rev 10511)
+++ branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourceFilter.h	2005-12-01 13:32:35 UTC (rev 10512)
@@ -31,6 +31,7 @@
 #pragma once
 #include "BasicSeekPassThrough.h"
 #include "IFilterDataSource.h"
+#include "IOggBaseTime.h"
 //#include "OggStreamMapper.h"
 #include <libOOOgg/OggDataBuffer.h>
 

Modified: branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/ds_guids.h
===================================================================
--- branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/ds_guids.h	2005-12-01 11:50:50 UTC (rev 10511)
+++ branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/ds_guids.h	2005-12-01 13:32:35 UTC (rev 10512)
@@ -35,6 +35,9 @@
 DEFINE_GUID(IID_IOggOutputPin, 
 0x83d7f506, 0x53ed, 0x4f15, 0xb6, 0xd8, 0x7d, 0x8e, 0x9e, 0x72, 0xa9, 0x18);
 
+// {EB5AED9C-8CD0-4c4b-B5E8-F5D10AD1314D}
+DEFINE_GUID(IID_IOggBaseTime, 
+0xeb5aed9c, 0x8cd0, 0x4c4b, 0xb5, 0xe8, 0xf5, 0xd1, 0xa, 0xd1, 0x31, 0x4d);
 
 
 //// {3913F0AB-E7ED-41c4-979B-1D1FDD983C07}

Modified: branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/dsfOggDemux2.vcproj
===================================================================
--- branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/dsfOggDemux2.vcproj	2005-12-01 11:50:50 UTC (rev 10511)
+++ branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/dsfOggDemux2.vcproj	2005-12-01 13:32:35 UTC (rev 10512)
@@ -196,6 +196,9 @@
 				RelativePath=".\IFilterDataSource.h">
 			</File>
 			<File
+				RelativePath=".\IOggBaseTime.h">
+			</File>
+			<File
 				RelativePath=".\IOggDecoder.h">
 			</File>
 			<File

Modified: branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/oggdllstuff.cpp
===================================================================
--- branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/oggdllstuff.cpp	2005-12-01 11:50:50 UTC (rev 10511)
+++ branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/oggdllstuff.cpp	2005-12-01 13:32:35 UTC (rev 10512)
@@ -67,10 +67,10 @@
 	
 	hr = locFilterMapper->RegisterFilter(
 		CLSID_OggDemuxPacketSourceFilter,						// Filter CLSID. 
-		L"Ogg Demux Page Source Filter",							// Filter name.
+		L"Ogg Demux Packet Source Filter",							// Filter name.
         NULL,										// Device moniker. 
         &CLSID_LegacyAmFilterCategory,				// Direct Show general category
-        L"Ogg Demux Page Source Filter",							// Instance data. ???????
+        L"Ogg Demux Packet Source Filter",							// Instance data. ???????
         &OggDemuxPacketSourceFilterReg								// Pointer to filter information.
     );
 
@@ -113,7 +113,7 @@
 	
 
     hr = locFilterMapper->UnregisterFilter(&CLSID_LegacyAmFilterCategory, 
-            L"Ogg Demux Page Source Filter", CLSID_OggDemuxPacketSourceFilter);
+            L"Ogg Demux Packet Source Filter", CLSID_OggDemuxPacketSourceFilter);
 
 	//
     locFilterMapper->Release();