[xiph-commits] r8408 - trunk/oggdsf/src/lib/core/directshow/dsfOggDemux

[illiminable at motherfish-iii.xiph.org]

Author: illiminable
Date: 2004-12-15 01:53:28 -0800 (Wed, 15 Dec 2004)
New Revision: 8408

Modified:
   trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.h
   trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourcePin.h
Log:
* Tidied HTTPFileSource HEader

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.h	2004-12-15 09:50:45 UTC (rev 8407)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.h	2004-12-15 09:53:28 UTC (rev 8408)
@@ -31,18 +31,18 @@
 #pragma once
 #include "oggdllstuff.h"
 #include <winsock.h>
-//#include <stdlib.h>
 #include "HTTPSocket.h"
 #include "SingleMediaFileCache.h"
 #include <string>
 #include <sstream>
 #include <fstream>
+
 using namespace std;
+
 class OGG_DEMUX_API HTTPFileSource
 	:	public IFilterDataSource
 	,	public CAMThread
-	,	protected HTTPSocket
-	
+	,	protected HTTPSocket	
 {
 public:
 	HTTPFileSource(void);
@@ -51,7 +51,6 @@
 	//Thread commands
 	static const int THREAD_RUN = 0;
 	static const int THREAD_EXIT = 1;
-	//
 
 	//IFilterDataSource Interface
 	virtual unsigned long seek(unsigned long inPos);
@@ -60,19 +59,15 @@
 	virtual void clear();
 	virtual bool isEOF();
 	virtual unsigned long read(char* outBuffer, unsigned long inNumBytes);
-	//
 
 	//CAMThread pure virtuals
 	DWORD HTTPFileSource::ThreadProc();
-	//
 
-
 protected:
-	void HTTPFileSource::unChunk(unsigned char* inBuff, unsigned long inNumBytes);
-	bool HTTPFileSource::startThread();
+	void unChunk(unsigned char* inBuff, unsigned long inNumBytes);
+	bool startThread();
 	void DataProcessLoop();
 
-	//stringstream mStreamBuffer;
 	SingleMediaFileCache mFileCache;
 
 	bool mIsChunked;
@@ -88,6 +83,5 @@
 	unsigned long mNumLeftovers;
 	static	const unsigned long RECV_BUFF_SIZE = 1024;
 
-
 	CCritSec* mBufferLock;
 };

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourcePin.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourcePin.h	2004-12-15 09:50:45 UTC (rev 8407)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourcePin.h	2004-12-15 09:53:28 UTC (rev 8408)
@@ -49,13 +49,13 @@
 
 	DECLARE_IUNKNOWN
 	STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void **ppv);
-	OggDemuxSourcePin(	TCHAR* inObjectName, 
-										OggDemuxSourceFilter* inParentFilter,
-										CCritSec* inFilterLock,
-										StreamHeaders* inHeaderSource, 
-										CMediaType* inMediaType,
-										wstring inPinName,
-										bool inAllowSeek);
+	OggDemuxSourcePin(		TCHAR* inObjectName, 
+							OggDemuxSourceFilter* inParentFilter,
+							CCritSec* inFilterLock,
+							StreamHeaders* inHeaderSource, 
+							CMediaType* inMediaType,
+							wstring inPinName,
+							bool inAllowSeek);