[Scummvm-cvs-logs] SF.net SVN: scummvm:[46722] tools/branches/gsoc2009-gui/engines/scumm/ compress_scumm_bun.cpp

[sev at users.sourceforge.net]

Revision: 46722
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46722&view=rev
Author:   sev
Date:     2009-12-29 22:30:20 +0000 (Tue, 29 Dec 2009)

Log Message:
-----------
Fix compress_scumm_bun. Works as expected

Modified Paths:
--------------
    tools/branches/gsoc2009-gui/engines/scumm/compress_scumm_bun.cpp

Modified: tools/branches/gsoc2009-gui/engines/scumm/compress_scumm_bun.cpp
===================================================================
--- tools/branches/gsoc2009-gui/engines/scumm/compress_scumm_bun.cpp	2009-12-29 22:29:59 UTC (rev 46721)
+++ tools/branches/gsoc2009-gui/engines/scumm/compress_scumm_bun.cpp	2009-12-29 22:30:20 UTC (rev 46722)
@@ -711,8 +711,6 @@
 	_waveDataSize += size;
 }
 
-static AudioFormat gCompMode = AUDIO_MP3;
-
 typedef struct { int offset, size, codec; } CompTable;
 
 byte *CompressScummBun::decompressBundleSound(int index, Common::File  &input, int32 &finalSize) {
@@ -881,7 +879,7 @@
 		free(outputData);
 		sprintf(tmpPath, "%s%s_reg%03d", dir, filename, l);
 
-		switch (gCompMode) {
+		switch (_format) {
 		case AUDIO_MP3:
 			encodeWaveWithLame(tmpPath);
 			break;
@@ -899,7 +897,7 @@
 		unlink(tmpPath);
 
 		int32 startPos = output.pos();
-		switch (gCompMode) {
+		switch (_format) {
 		case AUDIO_MP3:
 			sprintf(_cbundleTable[_cbundleCurIndex].filename, "%s_reg%03d.mp3", filename, l);
 			sprintf(tmpPath, "%s%s_reg%03d.mp3", dir, filename, l);
@@ -1096,10 +1094,10 @@
 	if (outpath.empty()) {
 		// Change extension for output
 		outpath = inpath;
-		outpath.setExtension(".bun");
 	}
 
 	outpath.setFullName(inpath.getName());
+	outpath.setExtension(".bun");
 	Common::File output(outpath, "wb");
 
 	output.writeUint32BE('LB23');


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