ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

renamed VOC functions

Browse Source 
svn-id: r11962
This commit is contained in:
Max Horn
2003-12-27 14:10:45 +00:00
parent d0ceed85a5
commit 0aa7993218
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scumm/imuse_digi.cpp
+1 -1
View File
@@ -836,7 +836,7 @@ void IMuseDigital::startSound(int sound) {
_voiceVocData = NULL;
} else if (READ_UINT32(ptr) == MKID('Crea')) {
int32 loops = 0;
byte *t_ptr= readCreativeVoc(ptr, size, _channel[l].freq, loops);
byte *t_ptr= readVOCFromMemory(ptr, size, _channel[l].freq, loops);
_channel[l].mixerSize = _channel[l].freq * 2;
_channel[l].size = size * 2;
_channel[l].bits = 8;
scumm/sound.cpp
+1 -1
View File
@@ -812,7 +812,7 @@ void Sound::startSfxSound(File *file, int file_size, PlayingSoundHandle *handle,
int32 size;
int rate;
byte *data = loadVocSample(_sfxFile, size, rate);
byte *data = loadVOCFile(_sfxFile, size, rate);
if (_scumm->_imuseDigital) {
_scumm->_imuseDigital->setVocVoice(data, size, rate);
sound/voc.cpp
+8 -8
View File
@@ -26,7 +26,7 @@
#include "sound/voc.h"
byte *readCreativeVoc(byte *ptr, int32 &size, int &rate, int32 &loops) {
byte *readVOCFromMemory(byte *ptr, int32 &size, int &rate, int32 &loops) {
assert(strncmp((char *)ptr, "Creative Voice File\x1A", 20) == 0);
int32 offset = READ_LE_UINT16(ptr + 20);
@@ -88,11 +88,11 @@ enum {
SOUND_HEADER_BIG_SIZE = 26 + 8
};
// FIXME/TODO: loadVocSample() essentially duplicates all the code from
// FIXME/TODO: loadVOCFile() essentially duplicates all the code from
// readCreativeVoc(). Obviously this is bad, it should rather use that function
// (after some tweaks to readCreativeVoc, to deal with the alternate VTLK
// header).
byte *loadVocSample(File *file, int32 &size, int &rate) {
byte *loadVOCFile(File *file, int32 &size, int &rate) {
char ident[8];
if (file->read(ident, 8) != 8)
@@ -104,7 +104,7 @@ byte *loadVocSample(File *file, int32 &size, int &rate) {
file->seek(SOUND_HEADER_SIZE - 8, SEEK_CUR);
} else {
invalid:;
warning("loadVocSample: invalid header");
warning("loadVOCFile: invalid header");
return NULL;
}
@@ -112,7 +112,7 @@ byte *loadVocSample(File *file, int32 &size, int &rate) {
file->read(&voc_block_hdr, sizeof(voc_block_hdr));
if (voc_block_hdr.blocktype != 1) {
warning("loadVocSample: Expecting block_type == 1, got %d", voc_block_hdr.blocktype);
warning("loadVOCFile: Expecting block_type == 1, got %d", voc_block_hdr.blocktype);
return NULL;
}
@@ -121,18 +121,18 @@ byte *loadVocSample(File *file, int32 &size, int &rate) {
int comp = voc_block_hdr.pack;
if (comp != 0) {
warning("loadVocSample: Unsupported compression type %d", comp);
warning("loadVOCFile: Unsupported compression type %d", comp);
return NULL;
}
byte *data = (byte *)malloc(size);
if (data == NULL) {
error("loadVocSample: out of memory");
error("loadVOCFile: out of memory");
}
if ((int)file->read(data, size) != size) {
/* no need to free the memory since error will shut down */
error("startSfxSound: cannot read %d bytes", size);
error("loadVOCFile: cannot read %d bytes", size);
}
return data;
sound/voc.h
+3 -2
View File
@@ -55,7 +55,8 @@ struct VocBlockHeader {
* return the corresponding sample frequency.
*/
extern int getSampleRateFromVOCRate(int vocSR);
extern byte *readCreativeVoc(byte *ptr, int32 &size, int &rate, int32 &loops);
extern byte *loadVocSample(File *file, int32 &size, int &rate);
extern byte *readVOCFromMemory(byte *ptr, int &size, int &rate, int &loops);
extern byte *loadVOCFile(File *file, int &size, int &rate);
#endif