aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/agos/sound.cpp8
-rw-r--r--engines/kyra/sound.cpp4
-rw-r--r--engines/kyra/sound_digital.cpp2
-rw-r--r--engines/queen/sound.cpp2
-rw-r--r--engines/saga/music.cpp2
-rw-r--r--engines/saga/sound.cpp2
-rw-r--r--engines/scumm/imuse_digi/dimuse_sndmgr.cpp2
-rw-r--r--engines/scumm/sound.cpp14
-rw-r--r--engines/sword1/music.cpp4
-rw-r--r--engines/sword1/sound.cpp2
-rw-r--r--engines/sword2/music.cpp2
-rw-r--r--engines/tinsel/sound.cpp28
-rw-r--r--engines/touche/resource.cpp2
-rw-r--r--engines/tucker/resource.cpp2
14 files changed, 38 insertions, 38 deletions
diff --git a/engines/agos/sound.cpp b/engines/agos/sound.cpp
index 6f7aebc5b9..06ba6246e5 100644
--- a/engines/agos/sound.cpp
+++ b/engines/agos/sound.cpp
@@ -364,14 +364,14 @@ public:
#pragma mark -
#ifdef USE_FLAC
-class FlacSound : public CompressedSound {
+class FLACSound : public CompressedSound {
public:
- FlacSound(Audio::Mixer *mixer, File *file, uint32 base = 0) : CompressedSound(mixer, file, base) {}
+ FLACSound(Audio::Mixer *mixer, File *file, uint32 base = 0) : CompressedSound(mixer, file, base) {}
Audio::AudioStream *makeAudioStream(uint sound) {
Common::MemoryReadStream *tmp = loadStream(sound);
if (!tmp)
return NULL;
- return Audio::makeFlacStream(tmp, DisposeAfterUse::YES);
+ return Audio::makeFLACStream(tmp, DisposeAfterUse::YES);
}
};
#endif
@@ -383,7 +383,7 @@ static CompressedSound *makeCompressedSound(Audio::Mixer *mixer, File *file, con
#ifdef USE_FLAC
file->open(basename + ".fla");
if (file->isOpen()) {
- return new FlacSound(mixer, file);
+ return new FLACSound(mixer, file);
}
#endif
#ifdef USE_VORBIS
diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp
index af33d893d5..9b049eb2d6 100644
--- a/engines/kyra/sound.cpp
+++ b/engines/kyra/sound.cpp
@@ -273,8 +273,8 @@ const Sound::SpeechCodecs Sound::_supportedCodecs[] = {
#endif // USE_VORBIS
#ifdef USE_FLAC
- { ".VOF", Audio::makeFlacStream },
- { ".FLA", Audio::makeFlacStream },
+ { ".VOF", Audio::makeFLACStream },
+ { ".FLA", Audio::makeFLACStream },
#endif // USE_FLAC
{ 0, 0 }
diff --git a/engines/kyra/sound_digital.cpp b/engines/kyra/sound_digital.cpp
index 7a04fc0691..f9684bed35 100644
--- a/engines/kyra/sound_digital.cpp
+++ b/engines/kyra/sound_digital.cpp
@@ -531,7 +531,7 @@ Audio::SeekableAudioStream *makeAUDStream(Common::SeekableReadStream *stream, Di
const SoundDigital::AudioCodecs SoundDigital::_supportedCodecs[] = {
#ifdef USE_FLAC
- { ".FLA", Audio::makeFlacStream },
+ { ".FLA", Audio::makeFLACStream },
#endif // USE_FLAC
#ifdef USE_VORBIS
{ ".OGG", Audio::makeVorbisStream },
diff --git a/engines/queen/sound.cpp b/engines/queen/sound.cpp
index 0711f74f8e..cc85d459c9 100644
--- a/engines/queen/sound.cpp
+++ b/engines/queen/sound.cpp
@@ -147,7 +147,7 @@ protected:
void playSoundData(Common::File *f, uint32 size, Audio::SoundHandle *soundHandle) {
Common::MemoryReadStream *tmp = f->readStream(size);
assert(tmp);
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, soundHandle, new AudioStreamWrapper(Audio::makeFlacStream(tmp, DisposeAfterUse::YES)));
+ _mixer->playInputStream(Audio::Mixer::kSFXSoundType, soundHandle, new AudioStreamWrapper(Audio::makeFLACStream(tmp, DisposeAfterUse::YES)));
}
};
#endif // #ifdef USE_FLAC
diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp
index cc3a52b975..200537d62e 100644
--- a/engines/saga/music.cpp
+++ b/engines/saga/music.cpp
@@ -322,7 +322,7 @@ void Music::play(uint32 resourceId, MusicFlags flags) {
#endif
} else if (identifier == 2) { // FLAC
#ifdef USE_FLAC
- audioStream = Audio::makeFlacStream(musicStream, DisposeAfterUse::YES);
+ audioStream = Audio::makeFLACStream(musicStream, DisposeAfterUse::YES);
#endif
}
}
diff --git a/engines/saga/sound.cpp b/engines/saga/sound.cpp
index 48c01ef947..c369ec169f 100644
--- a/engines/saga/sound.cpp
+++ b/engines/saga/sound.cpp
@@ -90,7 +90,7 @@ void Sound::playSoundBuffer(Audio::SoundHandle *handle, const SoundBuffer &buffe
#endif
#ifdef USE_FLAC
case kSoundFLAC:
- stream = Audio::makeFlacStream(memStream, DisposeAfterUse::YES);
+ stream = Audio::makeFLACStream(memStream, DisposeAfterUse::YES);
break;
#endif
default:
diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
index e1e6083db9..8b11c0aadd 100644
--- a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
+++ b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
@@ -704,7 +704,7 @@ int32 ImuseDigiSndMgr::getDataFromRegion(SoundDesc *soundDesc, int region, byte
assert(tmp);
#ifdef USE_FLAC
if (soundMode == 3)
- soundDesc->compressedStream = Audio::makeFlacStream(tmp, DisposeAfterUse::YES);
+ soundDesc->compressedStream = Audio::makeFLACStream(tmp, DisposeAfterUse::YES);
#endif
#ifdef USE_VORBIS
if (soundMode == 2)
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index aed412039a..283bf81be0 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -634,28 +634,28 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle
switch (_soundMode) {
case kMP3Mode:
- #ifdef USE_MAD
+#ifdef USE_MAD
assert(size > 0);
tmp = _sfxFile->readStream(size);
assert(tmp);
input = Audio::makeMP3Stream(tmp, DisposeAfterUse::YES);
- #endif
+#endif
break;
case kVorbisMode:
- #ifdef USE_VORBIS
+#ifdef USE_VORBIS
assert(size > 0);
tmp = _sfxFile->readStream(size);
assert(tmp);
input = Audio::makeVorbisStream(tmp, DisposeAfterUse::YES);
- #endif
+#endif
break;
case kFlacMode:
- #ifdef USE_FLAC
+#ifdef USE_FLAC
assert(size > 0);
tmp = _sfxFile->readStream(size);
assert(tmp);
- input = Audio::makeFlacStream(tmp, DisposeAfterUse::YES);
- #endif
+ input = Audio::makeFLACStream(tmp, DisposeAfterUse::YES);
+#endif
break;
default:
input = Audio::makeVOCStream(*_sfxFile, Audio::FLAG_UNSIGNED);
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.
diff --git a/engines/sword2/music.cpp b/engines/sword2/music.cpp
index 11dda11470..41b2d62c4a 100644
--- a/engines/sword2/music.cpp
+++ b/engines/sword2/music.cpp
@@ -209,7 +209,7 @@ static Audio::AudioStream *getAudioStream(SoundFileHandle *fh, const char *base,
#ifdef USE_FLAC
case kFlacMode:
tmp = new SafeSubReadStream(&fh->file, pos, pos + enc_len);
- return Audio::makeFlacStream(tmp, DisposeAfterUse::YES);
+ return Audio::makeFLACStream(tmp, DisposeAfterUse::YES);
#endif
default:
return NULL;
diff --git a/engines/tinsel/sound.cpp b/engines/tinsel/sound.cpp
index 9beece40cb..9fef0d830e 100644
--- a/engines/tinsel/sound.cpp
+++ b/engines/tinsel/sound.cpp
@@ -139,19 +139,19 @@ bool SoundManager::playSample(int id, Audio::Mixer::SoundType type, Audio::Sound
// play it
switch (_soundMode) {
case kMP3Mode:
- #ifdef USE_MAD
+#ifdef USE_MAD
sampleStream = Audio::makeMP3Stream(compressedStream, DisposeAfterUse::YES);
- #endif
+#endif
break;
case kVorbisMode:
- #ifdef USE_VORBIS
+#ifdef USE_VORBIS
sampleStream = Audio::makeVorbisStream(compressedStream, DisposeAfterUse::YES);
- #endif
+#endif
break;
case kFlacMode:
- #ifdef USE_FLAC
- sampleStream = Audio::makeFlacStream(compressedStream, DisposeAfterUse::YES);
- #endif
+#ifdef USE_FLAC
+ sampleStream = Audio::makeFLACStream(compressedStream, DisposeAfterUse::YES);
+#endif
break;
default:
sampleStream = Audio::makeRawStream(sampleBuf, sampleLen, 22050, Audio::FLAG_UNSIGNED);
@@ -288,19 +288,19 @@ bool SoundManager::playSample(int id, int sub, bool bLooped, int x, int y, int p
switch (_soundMode) {
case kMP3Mode:
- #ifdef USE_MAD
+#ifdef USE_MAD
sampleStream = Audio::makeMP3Stream(compressedStream, DisposeAfterUse::YES);
- #endif
+#endif
break;
case kVorbisMode:
- #ifdef USE_VORBIS
+#ifdef USE_VORBIS
sampleStream = Audio::makeVorbisStream(compressedStream, DisposeAfterUse::YES);
- #endif
+#endif
break;
case kFlacMode:
- #ifdef USE_FLAC
- sampleStream = Audio::makeFlacStream(compressedStream, DisposeAfterUse::YES);
- #endif
+#ifdef USE_FLAC
+ sampleStream = Audio::makeFLACStream(compressedStream, DisposeAfterUse::YES);
+#endif
break;
default:
sampleStream = Audio::makeADPCMStream(compressedStream, DisposeAfterUse::YES, sampleLen, Audio::kADPCMTinsel6, 22050, 1, 24);
diff --git a/engines/touche/resource.cpp b/engines/touche/resource.cpp
index 45329c5612..dead9ae4c7 100644
--- a/engines/touche/resource.cpp
+++ b/engines/touche/resource.cpp
@@ -53,7 +53,7 @@ struct CompressedSpeechFile {
static const CompressedSpeechFile compressedSpeechFilesTable[] = {
#ifdef USE_FLAC
- { "TOUCHE.SOF", Audio::makeFlacStream },
+ { "TOUCHE.SOF", Audio::makeFLACStream },
#endif
#ifdef USE_VORBIS
{ "TOUCHE.SOG", Audio::makeVorbisStream },
diff --git a/engines/tucker/resource.cpp b/engines/tucker/resource.cpp
index 50dcc7f5d6..c82a46ee9c 100644
--- a/engines/tucker/resource.cpp
+++ b/engines/tucker/resource.cpp
@@ -48,7 +48,7 @@ struct CompressedSoundFile {
static const CompressedSoundFile compressedSoundFilesTable[] = {
#ifdef USE_FLAC
- { "TUCKER.SOF", Audio::makeFlacStream },
+ { "TUCKER.SOF", Audio::makeFLACStream },
#endif
#ifdef USE_VORBIS
{ "TUCKER.SOG", Audio::makeVorbisStream },
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-02 05:42:36 +0000