aboutsummaryrefslogtreecommitdiff
path: root/simon
diff options
context:
space:
mode:
authorMax Horn2004-07-31 11:46:58 +0000
committerMax Horn2004-07-31 11:46:58 +0000
commit4b6dae31eb9dd30c996eb5d428460f26f9c77b40 (patch)
tree5c658f12b5c9a8c02c08405431c50cd3284eea12 /simon
parent76bfd1f92925bc708bec2b970a7e0b1b1a6668d8 (diff)
downloadscummvm-rg350-4b6dae31eb9dd30c996eb5d428460f26f9c77b40.tar.gz
scummvm-rg350-4b6dae31eb9dd30c996eb5d428460f26f9c77b40.tar.bz2
scummvm-rg350-4b6dae31eb9dd30c996eb5d428460f26f9c77b40.zip
changed loadVOCFile to work on a generic ReadStream instead of a File, and renamed it to loadVOCFromStream; removed readVOCFromMemory as it isn't used anymore, and in the future, a MemoryReadstream plus loadVOCFromStream can achieve the same effect
svn-id: r14383
Diffstat (limited to 'simon')
-rw-r--r--simon/sound.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/simon/sound.cpp b/simon/sound.cpp
index 59626f4261..9eca280ef8 100644
--- a/simon/sound.cpp
+++ b/simon/sound.cpp
@@ -175,7 +175,7 @@ void VocSound::playSound(uint sound, PlayingSoundHandle *handle, byte flags) {
_file->seek(_offsets[sound], SEEK_SET);
int size, samples_per_sec;
- byte *buffer = loadVOCFile(_file, size, samples_per_sec);
+ byte *buffer = loadVOCFromStream(_file, size, samples_per_sec);
_mixer->playRaw(handle, buffer, size, samples_per_sec, flags | SoundMixer::FLAG_AUTOFREE);
}