[Scummvm-cvs-logs] SF.net SVN: scummvm:[44367] tools/branches/gsoc2009-gui/compress.cpp

[fingolfin at users.sourceforge.net]

Revision: 44367
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44367&view=rev
Author:   fingolfin
Date:     2009-09-25 19:38:24 +0000 (Fri, 25 Sep 2009)

Log Message:
-----------
cleanup

Modified Paths:
--------------
    tools/branches/gsoc2009-gui/compress.cpp

Modified: tools/branches/gsoc2009-gui/compress.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress.cpp	2009-09-25 19:28:44 UTC (rev 44366)
+++ tools/branches/gsoc2009-gui/compress.cpp	2009-09-25 19:38:24 UTC (rev 44367)
@@ -249,11 +249,6 @@
 			rawData = (char *)malloc(length);
 			inputRaw.read(rawData, 1, length);
 
-			print(" - length = %ld\n", length);
-			print(" - channels = %d\n", (rawAudioType.isStereo ? 2 : 1));
-			print(" - sample rate = %d\n", rawSamplerate);
-			print(" - compression = %dbits\n", rawAudioType.bitsPerSample);
-
 			encodeRaw(rawData, length, rawSamplerate, outname, compmode);
 
 			free(rawData);
@@ -281,19 +276,20 @@
 			wavData = (char *)malloc(length);
 			inputWav.read(wavData, 1, length);
 
-			print(" - length = %d\n", length);
-			print(" - channels = %d\n", numChannels);
-			print(" - sample rate = %d\n", sampleRate);
-			print(" - compression = %dbits\n", bitsPerSample);
-
 			setRawAudioType(true, numChannels == 2, (uint8)bitsPerSample);
 			encodeRaw(wavData, length, sampleRate, outname, compmode);
 
-			free (wavData);
+			free(wavData);
 		}
 }
 
 void CompressionTool::encodeRaw(char *rawData, int length, int samplerate, const char *outname, AudioFormat compmode) {
+
+	print(" - length = %ld\n", length);
+	print(" - channels = %d\n", (rawAudioType.isStereo ? 2 : 1));
+	print(" - sample rate = %d\n", samplerate);
+	print(" - compression = %dbits\n", rawAudioType.bitsPerSample);
+
 #ifndef DISABLE_BUILTIN_VORBIS
 	if (compmode == AUDIO_VORBIS) {
 		char outputString[256] = "";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.