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

[illiminable at motherfish-iii.xiph.org]

Author: illiminable
Date: 2004-08-24 11:49:45 -0700 (Tue, 24 Aug 2004)
New Revision: 7627

Modified:
   trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.cpp
Log:
* Network stream works reasonably now. Still a crash at the end.

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.cpp	2004-08-24 18:18:25 UTC (rev 7626)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.cpp	2004-08-24 18:49:45 UTC (rev 7627)
@@ -73,7 +73,7 @@
 		if (locNumRead == 0) {
 			debugLog<<"Read last bytes..."<<endl;
 			mIsEOF = true;
-			break;
+			return;
 		}
 
 		{//CRITICAL SECTION - PROTECTING BUFFER STATE
@@ -250,7 +250,7 @@
 		CAutoLock locLock(mBufferLock);
 		
 		debugLog<<"Read:"<<endl;
-		if(mIsEOF || mWasError) {
+		if((mFileCache.bytesAvail() == 0) || mWasError) {
 			debugLog<<"read : Can't read is error or eof"<<endl;
 			return 0;
 		} else {