diff options
| author | Max Horn | 2007-02-24 23:40:28 +0000 |
|---|---|---|
| committer | Max Horn | 2007-02-24 23:40:28 +0000 |
| commit | b3931a847d21b0770f7b30bd1e4c793dc283abf3 (patch) | |
| tree | 07d97cf6a807d684f307fd81867f275e1ac89a42 /engines/agos | |
| parent | 65b30d84a805a7b22322474970a219d5628997d5 (diff) | |
| download | scummvm-rg350-b3931a847d21b0770f7b30bd1e4c793dc283abf3.tar.gz scummvm-rg350-b3931a847d21b0770f7b30bd1e4c793dc283abf3.tar.bz2 scummvm-rg350-b3931a847d21b0770f7b30bd1e4c793dc283abf3.zip | |
Trying to unify the order in which we try the various audio formats: Prefer FLAC (lossless) over Ogg Vorbis ('free') over MP3 -- the order is admittedly somewhat arbitrary, but at least now it's consistent across all parts of ScummVM
svn-id: r25837
Diffstat (limited to 'engines/agos')
| -rw-r--r-- | engines/agos/sound.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/engines/agos/sound.cpp b/engines/agos/sound.cpp index eee2ee540d..b11c130f87 100644 --- a/engines/agos/sound.cpp +++ b/engines/agos/sound.cpp @@ -403,23 +403,23 @@ void Sound::loadVoiceFile(const GameSpecificSettings *gss) { } } #endif -#ifdef USE_MAD +#ifdef USE_VORBIS if (!_hasVoiceFile) { - sprintf(filename, "%s.mp3", gss->speech_filename); + sprintf(filename, "%s.ogg", gss->speech_filename); file->open(filename); if (file->isOpen()) { _hasVoiceFile = true; - _voice = new MP3Sound(_mixer, file); + _voice = new VorbisSound(_mixer, file); } } #endif -#ifdef USE_VORBIS +#ifdef USE_MAD if (!_hasVoiceFile) { - sprintf(filename, "%s.ogg", gss->speech_filename); + sprintf(filename, "%s.mp3", gss->speech_filename); file->open(filename); if (file->isOpen()) { _hasVoiceFile = true; - _voice = new VorbisSound(_mixer, file); + _voice = new MP3Sound(_mixer, file); } } #endif @@ -471,13 +471,13 @@ void Sound::loadSfxFile(const GameSpecificSettings *gss) { char filename[16]; File *file = new File(); -#ifdef USE_MAD +#ifdef USE_FLAC if (!_hasEffectsFile) { - sprintf(filename, "%s.mp3", gss->effects_filename); + sprintf(filename, "%s.fla", gss->effects_filename); file->open(filename); if (file->isOpen()) { _hasEffectsFile = true; - _effects = new MP3Sound(_mixer, file); + _effects = new FlacSound(_mixer, file); } } #endif @@ -491,13 +491,13 @@ void Sound::loadSfxFile(const GameSpecificSettings *gss) { } } #endif -#ifdef USE_FLAC +#ifdef USE_MAD if (!_hasEffectsFile) { - sprintf(filename, "%s.fla", gss->effects_filename); + sprintf(filename, "%s.mp3", gss->effects_filename); file->open(filename); if (file->isOpen()) { _hasEffectsFile = true; - _effects = new FlacSound(_mixer, file); + _effects = new MP3Sound(_mixer, file); } } #endif @@ -767,23 +767,23 @@ void Sound::switchVoiceFile(const GameSpecificSettings *gss, uint disc) { } } #endif -#ifdef USE_MAD +#ifdef USE_VORBIS if (!_hasVoiceFile) { - sprintf(filename, "%s%d.mp3", gss->speech_filename, disc); + sprintf(filename, "%s%d.ogg", gss->speech_filename, disc); file->open(filename); if (file->isOpen()) { _hasVoiceFile = true; - _voice = new MP3Sound(_mixer, file); + _voice = new VorbisSound(_mixer, file); } } #endif -#ifdef USE_VORBIS +#ifdef USE_MAD if (!_hasVoiceFile) { - sprintf(filename, "%s%d.ogg", gss->speech_filename, disc); + sprintf(filename, "%s%d.mp3", gss->speech_filename, disc); file->open(filename); if (file->isOpen()) { _hasVoiceFile = true; - _voice = new VorbisSound(_mixer, file); + _voice = new MP3Sound(_mixer, file); } } #endif |