diff options
| author | Johannes Schickel | 2010-02-03 09:42:11 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-02-03 09:42:11 +0000 |
| commit | fe35d372dab08a2e202b5ecb41ccc14298f8cfbd (patch) | |
| tree | 447b16207cb64222d62b6c244fcfccd2aa743cc7 /engines/sword1 | |
| parent | 9cad13957da8a67e68dd4e268eb53f8e413eb4be (diff) | |
| download | scummvm-rg350-fe35d372dab08a2e202b5ecb41ccc14298f8cfbd.tar.gz scummvm-rg350-fe35d372dab08a2e202b5ecb41ccc14298f8cfbd.tar.bz2 scummvm-rg350-fe35d372dab08a2e202b5ecb41ccc14298f8cfbd.zip | |
- Rename FlacStream to FLACStream.
- Rename makeFlacStream to makeFLACStream.
svn-id: r47846
Diffstat (limited to 'engines/sword1')
| -rw-r--r-- | engines/sword1/music.cpp | 4 | ||||
| -rw-r--r-- | engines/sword1/sound.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/sword1/music.cpp b/engines/sword1/music.cpp index 4661b042af..8a60681ebe 100644 --- a/engines/sword1/music.cpp +++ b/engines/sword1/music.cpp @@ -63,7 +63,7 @@ bool MusicHandle::play(const char *fileBase, bool loop) { if (!_audioSource) { sprintf(fileName, "%s.flac", fileBase); if (_file.open(fileName)) { - _audioSource = Audio::makeLoopingAudioStream(Audio::makeFlacStream(&_file, DisposeAfterUse::NO), loop ? 0 : 1); + _audioSource = Audio::makeLoopingAudioStream(Audio::makeFLACStream(&_file, DisposeAfterUse::NO), loop ? 0 : 1); if (!_audioSource) _file.close(); } @@ -72,7 +72,7 @@ bool MusicHandle::play(const char *fileBase, bool loop) { if (!_audioSource) { sprintf(fileName, "%s.fla", fileBase); if (_file.open(fileName)) { - _audioSource = Audio::makeLoopingAudioStream(Audio::makeFlacStream(&_file, DisposeAfterUse::NO), loop ? 0 : 1); + _audioSource = Audio::makeLoopingAudioStream(Audio::makeFLACStream(&_file, DisposeAfterUse::NO), loop ? 0 : 1); if (!_audioSource) _file.close(); } diff --git a/engines/sword1/sound.cpp b/engines/sword1/sound.cpp index e1a34d622f..cc7beaee9a 100644 --- a/engines/sword1/sound.cpp +++ b/engines/sword1/sound.cpp @@ -381,7 +381,7 @@ bool Sound::startSpeech(uint16 roomNo, uint16 localNo) { _cowFile.seek(index); Common::MemoryReadStream *tmp = _cowFile.readStream(sampleSize); assert(tmp); - stream = Audio::makeFlacStream(tmp, DisposeAfterUse::YES); + stream = Audio::makeFLACStream(tmp, DisposeAfterUse::YES); _mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_speechHandle, stream, SOUND_SPEECH_ID, speechVol, speechPan); // with compressed audio, we can't calculate the wave volume. // so default to talking. |