[xiph-commits] r8526 - in trunk/oggdsf/src/lib/core: directshow/dsfOggDemux ogg/libOOOggSeek

[illiminable at motherfish-iii.xiph.org]

Author: illiminable
Date: 2004-12-22 21:36:26 -0800 (Wed, 22 Dec 2004)
New Revision: 8526

Modified:
   trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp
   trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.cpp
   trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekTable.cpp
   trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekTable.h
Log:
&* Unused seek function removed


Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp	2004-12-23 04:28:16 UTC (rev 8525)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp	2004-12-23 05:36:26 UTC (rev 8526)
@@ -115,7 +115,7 @@
 	mDemuxLock = new CCritSec;
 	mStreamLock = new CCritSec;
 	mStreamMapper = new OggStreamMapper(this);
-	debugLog.open("d:\\zen\\logs\\sourcelog.log", ios_base::out);
+	debugLog.open("g:\\logs\\sourcelog.log", ios_base::out);
 	//debugLog<<"Test..."<<endl;
 	//debugLog.seekp(0, ios_base::end);
 	//debugLog<<"Test2..."<<endl;

Modified: trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.cpp	2004-12-23 04:28:16 UTC (rev 8525)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.cpp	2004-12-23 05:36:26 UTC (rev 8526)
@@ -159,6 +159,7 @@
 			LOOG_INT64 locTimePerBlock = iLE_Math::CharArrToInt64(inOggPage->getPacket(0)->packetData() + 17);
 			LOOG_INT64 locSamplesPerBlock = iLE_Math::CharArrToInt64(inOggPage->getPacket(0)->packetData() + 25);
 
+			//TODO::: The division is the wrong way round !!
 			mSampleRate = (unsigned long) ( (10000000 / locTimePerBlock) * locSamplesPerBlock );
 			mFoundStreamInfo = true;
 			mSerialNoToTrack = inOggPage->header()->StreamSerialNo();

Modified: trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekTable.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekTable.cpp	2004-12-23 04:28:16 UTC (rev 8525)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekTable.cpp	2004-12-23 05:36:26 UTC (rev 8526)
@@ -57,11 +57,11 @@
 
 }
 
-LOOG_INT64 OggSeekTable::getRealStartPos() {
-	
-	return mRealStartPos;
-
-}
+//LOOG_INT64 OggSeekTable::getRealStartPos() {
+//	
+//	return mRealStartPos;
+//
+//}
 OggSeekTable::tSeekPair OggSeekTable::getStartPos(LOOG_INT64 inTime) {
 	 return *(--(mSeekMap.upper_bound(inTime)));
 	 //mRealStartPos = locValue.first;

Modified: trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekTable.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekTable.h	2004-12-23 04:28:16 UTC (rev 8525)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekTable.h	2004-12-23 05:36:26 UTC (rev 8526)
@@ -49,7 +49,7 @@
 
 	bool addSeekPoint(LOOG_INT64 inTime, unsigned long mStartPos);
 	tSeekPair getStartPos(LOOG_INT64 inTime);
-	LOOG_INT64 getRealStartPos();
+	//LOOG_INT64 getRealStartPos();
 
 	bool enabled();