[xiph-commits] r8692 - in trunk/oggdsf/src/lib/core/ogg: libOOOgg libOOOggSeek

[illiminable at motherfish-iii.xiph.org]

Author: illiminable
Date: 2005-01-08 12:08:14 -0800 (Sat, 08 Jan 2005)
New Revision: 8692

Modified:
   trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.h
   trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekTable.h
Log:
* Docuement the interleaver and make some stuff protected.

Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.h	2005-01-08 20:07:55 UTC (rev 8691)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.h	2005-01-08 20:08:14 UTC (rev 8692)
@@ -71,20 +71,31 @@
 
 	/// Create a new OggMuxStream.  You need one OggMuxStream per logical bitstream you wish to interleave.
 	virtual OggMuxStream* newStream();
+
 	virtual void processData();
-	virtual void writeLowest();
 
-	virtual bool isProcessable();
-	virtual bool isAllEOS();
-	virtual bool isAllEmpty();
+	/// Returns the mux progress in 100 nanoseconds
+	virtual LOOG_INT64 progressTime();
 
-	virtual LOOG_INT64 progressTime();
+	/// Returns the number of bytes written.
 	virtual LOOG_INT64 bytesWritten();
 
 	//INotifyArrival Implementation
 	virtual void notifyArrival();
 
 protected:
+	/// Writes the lowest stream out
+	virtual void writeLowest();
+
+	/// Returns if there is enough data to do some interleaving
+	virtual bool isProcessable();
+
+	/// Returns true if all the streams are at the end.
+	virtual bool isAllEOS();
+
+	/// Returns true if all the streams are empty.
+	virtual bool isAllEmpty();
+
 	vector<OggMuxStream*> mInputStreams;
 	IOggCallback* mFileWriter;		//TODO::: Shuoldn't be called filewriter.
 	INotifyComplete* mNotifier;

Modified: trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekTable.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekTable.h	2005-01-08 20:07:55 UTC (rev 8691)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekTable.h	2005-01-08 20:08:14 UTC (rev 8692)
@@ -56,13 +56,10 @@
 
 	/// Given a requested seek time in DirectShow units, returns the closest time and byte to the seek time.
 	tSeekPair getStartPos(LOOG_INT64 inTime);
-	//LOOG_INT64 getRealStartPos();
 
+	/// Returns whether this table is enabled or disabled.
 	bool enabled();
     
-    OggSeekTable(const OggSeekTable&);  // Don't copy me
-    OggSeekTable &operator=(const OggSeekTable&);  // Don't assign men
-
 protected:
 	tSeekMap mSeekMap;
 	tSeekMap::value_type mSeekValue;
@@ -70,4 +67,8 @@
 
 	//fstream stDebug;
 	bool mEnabled;
+
+private:
+	OggSeekTable(const OggSeekTable&);  // Don't copy me
+    OggSeekTable &operator=(const OggSeekTable&);  // Don't assign me
 };