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

sev at users.sourceforge.net sev at users.sourceforge.net
Tue Jan 5 22:52:28 CET 2010


Revision: 47050
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47050&view=rev
Author:   sev
Date:     2010-01-05 21:52:28 +0000 (Tue, 05 Jan 2010)

Log Message:
-----------
Give more correct name to encodeAIF()

Modified Paths:
--------------
    tools/trunk/compress.cpp
    tools/trunk/compress.h
    tools/trunk/engines/sword1/compress_sword1.cpp

Modified: tools/trunk/compress.cpp
===================================================================
--- tools/trunk/compress.cpp	2010-01-05 21:46:28 UTC (rev 47049)
+++ tools/trunk/compress.cpp	2010-01-05 21:52:28 UTC (rev 47050)
@@ -597,7 +597,7 @@
 	encodeAudio(outName, false, -1, tempEncoded, compMode);
 }
 
-void CompressionTool::encodeAIF(const char *inName, const char *outName, AudioFormat compmode) {
+void CompressionTool::extractAndEncodeAIFF(const char *inName, const char *outName, AudioFormat compmode) {
 	// Get sound definition (length, frequency, stereo, ...)
 	char buf[4];
 	Common::File inFile(inName, "rb");

Modified: tools/trunk/compress.h
===================================================================
--- tools/trunk/compress.h	2010-01-05 21:46:28 UTC (rev 47049)
+++ tools/trunk/compress.h	2010-01-05 21:52:28 UTC (rev 47050)
@@ -115,7 +115,7 @@
 	void extractAndEncodeVOC(const char *outName, Common::File &input, AudioFormat compMode);
 	void extractAndEncodeWAV(const char *outName, Common::File &input, AudioFormat compMode);
 
-	void encodeAIF(const char *inName, const char *outName, AudioFormat compMode);
+	void extractAndEncodeAIFF(const char *inName, const char *outName, AudioFormat compMode);
 
 	void encodeAudio(const char *inname, bool rawInput, int rawSamplerate, const char *outname, AudioFormat compmode);
 	void setRawAudioType(bool isLittleEndian, bool isStereo, uint8 bitsPerSample);

Modified: tools/trunk/engines/sword1/compress_sword1.cpp
===================================================================
--- tools/trunk/engines/sword1/compress_sword1.cpp	2010-01-05 21:46:28 UTC (rev 47049)
+++ tools/trunk/engines/sword1/compress_sword1.cpp	2010-01-05 21:52:28 UTC (rev 47050)
@@ -541,7 +541,7 @@
 			if (!_macVersion)
 				encodeAudio(fNameIn, false, -1, fNameOut, _format);
 			else
-				encodeAIF(fNameIn, fNameOut, _format);
+				extractAndEncodeAIFF(fNameIn, fNameOut, _format);
 		} catch (Common::FileException& err) {
 			print(err.what());
 		}


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