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

[illiminable at svn.xiph.org]

Author: illiminable
Date: 2005-12-01 03:50:50 -0800 (Thu, 01 Dec 2005)
New Revision: 10511

Added:
   branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/IOggBaseTime.h
Modified:
   branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/HTTPSocket.cpp
   branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourceFilter.cpp
   branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourceFilter.h
Log:
* Add a special interface to the ogg filter, so applications that need to have non-zeroed streams, can get the offset info.

Modified: branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/HTTPSocket.cpp
===================================================================
--- branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/HTTPSocket.cpp	2005-12-01 01:39:59 UTC (rev 10510)
+++ branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/HTTPSocket.cpp	2005-12-01 11:50:50 UTC (rev 10511)
@@ -204,5 +204,6 @@
 }
 void HTTPSocket::closeSocket() {
 	//debugLog2<<"Close Socket:"<<endl;
-	closesocket(mSocket);
+	int ret = closesocket(mSocket);
+	ret = ret;
 }
\ No newline at end of file

Added: branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/IOggBaseTime.h
===================================================================
--- branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/IOggBaseTime.h	2005-12-01 01:39:59 UTC (rev 10510)
+++ branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/IOggBaseTime.h	2005-12-01 11:50:50 UTC (rev 10511)
@@ -0,0 +1,8 @@
+
+#pragma once
+class IOggBaseTime {
+public:
+	
+	virtual __int64 getGlobalBaseTime() = 0;
+
+};
\ No newline at end of file

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 01:39:59 UTC (rev 10510)
+++ branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourceFilter.cpp	2005-12-01 11:50:50 UTC (rev 10511)
@@ -127,6 +127,9 @@
 	delete mDemuxLock;
 	delete mStreamLock;
 	delete mSourceFileLock;
+
+	mDataSource->close();
+	delete mDataSource;
 }
 //IMEdiaStreaming
 STDMETHODIMP OggDemuxPacketSourceFilter::Run(REFERENCE_TIME tStart) 

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 01:39:59 UTC (rev 10510)
+++ branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourceFilter.h	2005-12-01 11:50:50 UTC (rev 10511)
@@ -44,6 +44,7 @@
 	,	public CAMThread
 	,	public IFileSourceFilter
 	,	public IOggCallback
+	,	public IOggBaseTime
 	,	public BasicSeekPassThrough
 	//,	public ISpecifyPropertyPages
 	,	public IAMFilterMiscFlags
@@ -115,6 +116,8 @@
 
 	//HHHH:::
 	virtual bool notifyStreamBaseTime(__int64 inStreamBaseTime);
+
+	//IOggBaseTime Interface
 	virtual __int64 getGlobalBaseTime();
 	//
 protected: