ScummVM/scummvm-tools
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm-tools.git synced 2026-05-21 05:40:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

TOOLS: Rename&merge File::read & readN methods to read_throwsOnError & read_noThrow (these should be changed again later, but for now this helps me not getting confused ;)

Browse Source 
svn-id: r46373
This commit is contained in:
Max Horn
2009-12-13 23:46:09 +00:00
parent 458a64039f
commit 9c5b48eedb
31 changed files with 94 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compress.cpp
+4 -4
View File
@@ -247,7 +247,7 @@ void CompressionTool::encodeAudio(const char *inname, bool rawInput, int rawSamp
File inputRaw(inname, "rb");
length = inputRaw.size();
rawData = (char *)malloc(length);
inputRaw.read(rawData, 1, length);
inputRaw.read_throwsOnError(rawData, length);
encodeRaw(rawData, length, rawSamplerate, outname, compmode);
@@ -274,7 +274,7 @@ void CompressionTool::encodeAudio(const char *inname, bool rawInput, int rawSamp
length = inputWav.readUint32LE();
wavData = (char *)malloc(length);
inputWav.read(wavData, 1, length);
inputWav.read_throwsOnError(wavData, length);
setRawAudioType(true, numChannels == 2, (uint8)bitsPerSample);
encodeRaw(wavData, length, sampleRate, outname, compmode);
@@ -572,7 +572,7 @@ void CompressionTool::extractAndEncodeWAV(const char *outName, File &input, Audi
/* Copy the WAV data to a temporary file */
File f(outName, "wb");
while (length > 0) {
size = input.readN(fbuf, 1, length > sizeof(fbuf) ? sizeof(fbuf) : length);
size = input.read_noThrow(fbuf, length > sizeof(fbuf) ? sizeof(fbuf) : length);
if (size <= 0)
break;
length -= (int)size;
@@ -648,7 +648,7 @@ void CompressionTool::extractAndEncodeVOC(const char *outName, File &input, Audi
/* Copy the raw data to a temporary file */
while (length > 0) {
size = input.readN(fbuf, 1, length > sizeof(fbuf) ? sizeof(fbuf) : (uint32)length);
size = input.read_noThrow(fbuf, length > sizeof(fbuf) ? sizeof(fbuf) : (uint32)length);
if (size <= 0) {
break;