[xiph-commits] r8662 - trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper

[illiminable at motherfish-iii.xiph.org]

Author: illiminable
Date: 2005-01-07 08:25:35 -0800 (Fri, 07 Jan 2005)
New Revision: 8662

Modified:
   trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACHeaderTweaker.cpp
   trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACMetadataSplitter.cpp
   trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACPushDecoder.cpp
Log:
* More warnings killed.

Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACHeaderTweaker.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACHeaderTweaker.cpp	2005-01-07 16:18:17 UTC (rev 8661)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACHeaderTweaker.cpp	2005-01-07 16:25:35 UTC (rev 8662)
@@ -125,7 +125,7 @@
 			//It's the comment packet.
 			//debugLog<<"Found a comment packet..."<<endl;
 			locFoundComment = true;
-			locCommentNo = i;
+			locCommentNo = (int)i;
 			mNewHeaderList.push_back(mOldHeaderList[i]->clone());
 		}
 	}
@@ -138,6 +138,7 @@
 
 	for (size_t i = 2; i < mOldHeaderList.size(); i++) {
 	
+		//**** WARNING ::: Leave this unless you check it !
 		if (i != locCommentNo) {
 			//debugLog<<"Adding another ehader..."<<endl;
 			//If it's not the comment packet we already added, put it in the list.

Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACMetadataSplitter.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACMetadataSplitter.cpp	2005-01-07 16:18:17 UTC (rev 8661)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACMetadataSplitter.cpp	2005-01-07 16:25:35 UTC (rev 8662)
@@ -82,7 +82,7 @@
 	//debugLog<<"Splitmetadata"<<endl;
 	//emptyList();
 	//OggPacket* locPacket = NULL;
-	unsigned char* locBuff = NULL;
+	//unsigned char* locBuff = NULL;
 	if (mMetadataBlock == NULL) {
 		return false;
 	} else {
@@ -92,6 +92,9 @@
 			addStreamInfo();
 			addOtherHeaders();
 			//debugLog<<"Done adding packets..."<<endl;
+
+			//TODO::: Should really verify this !
+			return true;
 		} else {
 			return false;
 		}

Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACPushDecoder.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACPushDecoder.cpp	2005-01-07 16:18:17 UTC (rev 8661)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACPushDecoder.cpp	2005-01-07 16:25:35 UTC (rev 8662)
@@ -92,7 +92,7 @@
 	}
 	unsigned long locNumFrames = inFrame->header.blocksize;
 	unsigned long locActualSize = locNumFrames * mFrameSize;
-	unsigned long locTotalFrameCount = locNumFrames * mNumChannels;
+	//unsigned long locTotalFrameCount = locNumFrames * mNumChannels;
 
 	//BUG::: There's a bug here. Implicitly assumes 2 channels.
 	unsigned char* locBuff = new unsigned char[locActualSize];
@@ -102,7 +102,7 @@
 	
 	signed short tempInt = 0;
 	int tempLong = 0;
-	float tempFloat = 0;
+	//float tempFloat = 0;
 	
 	//FIX:::Move the clipping to the abstract function
 	//Make sure our sample buffer is big enough
@@ -134,9 +134,9 @@
 }
 void FLACPushDecoder::metadata_callback(const ::FLAC__StreamMetadata* inMetadata) 
 {
-	int i = 0;
+
 }
 void FLACPushDecoder::error_callback(::FLAC__StreamDecoderErrorStatus inStatus) 
 {
-	int i = 0;
+
 }