[Scummvm-cvs-logs] SF.net SVN: scummvm: [23086] tools/trunk

eriktorbjorn at users.sourceforge.net eriktorbjorn at users.sourceforge.net
Tue Jun 13 14:18:38 CEST 2006


Revision: 23086
Author:   eriktorbjorn
Date:     2006-06-13 05:18:34 -0700 (Tue, 13 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23086&view=rev

Log Message:
-----------
Since the file names are quoted in encodeAudio(), not only do we no longer need
to do it here -- doing it here breaks compression of digmusic.bun, as reported
on the forum. (I haven't tested if it broke SAN compression as well, but the
same reasoning should still hold true there.)

Modified Paths:
--------------
    tools/trunk/compress_scumm_bun.cpp
    tools/trunk/compress_scumm_san.cpp
Modified: tools/trunk/compress_scumm_bun.cpp
===================================================================
--- tools/trunk/compress_scumm_bun.cpp	2006-06-13 10:20:59 UTC (rev 23085)
+++ tools/trunk/compress_scumm_bun.cpp	2006-06-13 12:18:34 UTC (rev 23086)
@@ -648,8 +648,8 @@
 void encodeWaveWithOgg(char *filename) {
 	char fbuf[2048];
 	char fbuf2[2048];
-	sprintf(fbuf, "\"%s\".wav", filename);
-	sprintf(fbuf2, "\"%s\".ogg", filename);
+	sprintf(fbuf, "%s.wav", filename);
+	sprintf(fbuf2, "%s.ogg", filename);
 	encodeAudio(fbuf, false, -1, fbuf2, kVorbisMode);
 }
 
@@ -657,8 +657,8 @@
 	char fbuf[2048];
 	char fbuf2[2048];
 
-	sprintf(fbuf, "\"%s\".wav", filename);
-	sprintf(fbuf2, "\"%s\".mp3", filename);
+	sprintf(fbuf, "%s.wav", filename);
+	sprintf(fbuf2, "%s.mp3", filename);
 	encodeAudio(fbuf, false, -1, fbuf2, kMP3Mode);
 }
 

Modified: tools/trunk/compress_scumm_san.cpp
===================================================================
--- tools/trunk/compress_scumm_san.cpp	2006-06-13 10:20:59 UTC (rev 23085)
+++ tools/trunk/compress_scumm_san.cpp	2006-06-13 12:18:34 UTC (rev 23086)
@@ -91,8 +91,8 @@
 void encodeWaveWithOgg(char *filename) {
 	char fbuf[2048];
 	char fbuf2[2048];
-	sprintf(fbuf, "\"%s\".wav", filename);
-	sprintf(fbuf2, "\"%s\".ogg", filename);
+	sprintf(fbuf, "%s.wav", filename);
+	sprintf(fbuf2, "%s.ogg", filename);
 	encodeAudio(fbuf, false, -1, fbuf2, kVorbisMode);
 }
 
@@ -100,8 +100,8 @@
 	char fbuf[2048];
 	char fbuf2[2048];
 
-	sprintf(fbuf, "\"%s\".wav", filename);
-	sprintf(fbuf2, "\"%s\".mp3", filename);
+	sprintf(fbuf, "%s.wav", filename);
+	sprintf(fbuf2, "%s.mp3", filename);
 	encodeAudio(fbuf, false, -1, fbuf2, kMP3Mode);
 }
 


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





More information about the Scummvm-git-logs mailing list