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

[sev at users.sourceforge.net]

Revision: 46439
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46439&view=rev
Author:   sev
Date:     2009-12-20 20:00:42 +0000 (Sun, 20 Dec 2009)

Log Message:
-----------
Fix compress_saga tool. Now the tool actually works.

Modified Paths:
--------------
    tools/branches/gsoc2009-gui/compress_saga.cpp
    tools/branches/gsoc2009-gui/compress_saga.h

Modified: tools/branches/gsoc2009-gui/compress_saga.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_saga.cpp	2009-12-20 19:42:02 UTC (rev 46438)
+++ tools/branches/gsoc2009-gui/compress_saga.cpp	2009-12-20 20:00:42 UTC (rev 46439)
@@ -216,6 +216,20 @@
 	tempf.write(data, inputSize);
 }
 
+byte CompressSaga::compression_format(AudioFormat format) {
+	switch(format) {
+	case AUDIO_MP3:
+		return 0;
+	case AUDIO_VORBIS:
+		return 1;
+	case AUDIO_FLAC:
+		return 2;
+	case AUDIO_NONE:
+	default:
+		throw ToolException("Unknown compression format");
+	}
+}
+
 void CompressSaga::writeHeader(File &outputFile) {
 	outputFile.writeByte(compression_format(_format));
 	outputFile.writeUint16LE(_sampleRate);

Modified: tools/branches/gsoc2009-gui/compress_saga.h
===================================================================
--- tools/branches/gsoc2009-gui/compress_saga.h	2009-12-20 19:42:02 UTC (rev 46438)
+++ tools/branches/gsoc2009-gui/compress_saga.h	2009-12-20 20:00:42 UTC (rev 46439)
@@ -82,6 +82,8 @@
 	void writeHeader(File &outputFile);
 	uint32 encodeEntry(File &inputFile, uint32 inputSize, File &outputFile);
 	void sagaEncode(Filename *inpath, Filename *outpath);
+
+	byte compression_format(AudioFormat format);
 };
 
 #endif


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