[Scummvm-cvs-logs] CVS: scummvm/queen queen.cpp,1.129,1.130 sound.cpp,1.54,1.55 sound.h,1.27,1.28
Max Horn
fingolfin at users.sourceforge.net
Tue May 10 16:53:22 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/kyra kyra.cpp,1.28,1.29
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sound/softsynth adlib.cpp,1.3,1.4 emumidi.h,1.3,1.4 fluidsynth.cpp,1.1,1.2 mt32.cpp,1.11,1.12 ym2612.cpp,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29875/queen
Modified Files:
queen.cpp sound.cpp sound.h
Log Message:
Moved class SoundMixer to Audio::Mixer (didn't call the namespace 'Sound' because we already have many classes with that name)
Index: queen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.cpp,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- queen.cpp 10 May 2005 23:17:15 -0000 1.129
+++ queen.cpp 10 May 2005 23:48:37 -0000 1.130
@@ -419,9 +419,9 @@
if (!_mixer->isReady())
warning("Sound initialisation failed");
- _mixer->setVolumeForSoundType(SoundMixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
+ _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
// Set mixer music volume to maximum, since music volume is regulated by MusicPlayer's MIDI messages
- _mixer->setVolumeForSoundType(SoundMixer::kMusicSoundType, SoundMixer::kMaxMixerVolume);
+ _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, Audio::Mixer::kMaxMixerVolume);
int midiDriver = MidiDriver::detectMusicDriver(MDT_NATIVE | MDT_ADLIB | MDT_PREFER_NATIVE);
MidiDriver *driver = MidiDriver::createMidi(midiDriver);
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/sound.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- sound.cpp 10 May 2005 22:55:48 -0000 1.54
+++ sound.cpp 10 May 2005 23:48:37 -0000 1.55
@@ -36,14 +36,14 @@
namespace Queen {
-Sound::Sound(SoundMixer *mixer, QueenEngine *vm) :
+Sound::Sound(Audio::Mixer *mixer, QueenEngine *vm) :
_mixer(mixer), _vm(vm), _sfxToggle(true), _speechToggle(true), _musicToggle(true), _lastOverride(0) {
}
Sound::~Sound() {
}
-Sound *Sound::giveSound(SoundMixer *mixer, QueenEngine *vm, uint8 compression) {
+Sound *Sound::giveSound(Audio::Mixer *mixer, QueenEngine *vm, uint8 compression) {
if (!mixer->isReady())
return new SilentSound(mixer, vm);
@@ -187,7 +187,7 @@
}
void SBSound::playSound(byte *sound, uint32 size, bool isSpeech) {
- byte flags = SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE;
+ byte flags = Audio::Mixer::FLAG_UNSIGNED | Audio::Mixer::FLAG_AUTOFREE;
_mixer->playRaw(isSpeech ? &_speechHandle : &_sfxHandle, sound, size, 11025, flags);
}
@@ -201,7 +201,7 @@
void MP3Sound::sfxPlay(const char *name, bool isSpeech) {
uint32 size;
Common::File *f = _vm->resource()->giveCompressedSound(name, &size);
- _mixer->playInputStream(SoundMixer::kSFXSoundType, isSpeech ? &_speechHandle : &_sfxHandle, makeMP3Stream(f, size));
+ _mixer->playInputStream(Audio::Mixer::kSFXSoundType, isSpeech ? &_speechHandle : &_sfxHandle, makeMP3Stream(f, size));
}
#endif
@@ -209,7 +209,7 @@
void OGGSound::sfxPlay(const char *name, bool isSpeech) {
uint32 size;
Common::File *f = _vm->resource()->giveCompressedSound(name, &size);
- _mixer->playInputStream(SoundMixer::kSFXSoundType, isSpeech ? &_speechHandle : &_sfxHandle, makeVorbisStream(f, size));
+ _mixer->playInputStream(Audio::Mixer::kSFXSoundType, isSpeech ? &_speechHandle : &_sfxHandle, makeVorbisStream(f, size));
}
#endif
@@ -217,7 +217,7 @@
void FLACSound::sfxPlay(const char *name, bool isSpeech) {
uint32 size;
Common::File *f = _vm->resource()->giveCompressedSound(name, &size);
- _mixer->playInputStream(SoundMixer::kSFXSoundType, isSpeech ? &_speechHandle : &_sfxHandle, makeFlacStream(f, size));
+ _mixer->playInputStream(Audio::Mixer::kSFXSoundType, isSpeech ? &_speechHandle : &_sfxHandle, makeFlacStream(f, size));
}
#endif
Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/sound.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- sound.h 12 Mar 2005 18:55:41 -0000 1.27
+++ sound.h 10 May 2005 23:48:37 -0000 1.28
@@ -51,10 +51,10 @@
class Sound {
public:
- Sound(SoundMixer *mixer, QueenEngine *vm);
+ Sound(Audio::Mixer *mixer, QueenEngine *vm);
virtual ~Sound();
virtual void sfxPlay(const char *name, bool isSpeech) = 0;
- static Sound *giveSound(SoundMixer *mixer, QueenEngine *vm, uint8 compression);
+ static Sound *giveSound(Audio::Mixer *mixer, QueenEngine *vm, uint8 compression);
void playSfx(uint16 sfx, bool isSpeech);
void playSfx(const char *base, bool isSpeech);
void playSong(int16 songNum);
@@ -103,7 +103,7 @@
protected:
void waitFinished(bool isSpeech);
- SoundMixer *_mixer;
+ Audio::Mixer *_mixer;
QueenEngine *_vm;
bool _sfxToggle;
@@ -118,13 +118,13 @@
class SilentSound : public Sound {
public:
- SilentSound(SoundMixer *mixer, QueenEngine *vm) : Sound(mixer, vm) {};
+ SilentSound(Audio::Mixer *mixer, QueenEngine *vm) : Sound(mixer, vm) {};
void sfxPlay(const char *name, bool isSpeech) { }
};
class SBSound : public Sound {
public:
- SBSound(SoundMixer *mixer, QueenEngine *vm) : Sound(mixer, vm) {};
+ SBSound(Audio::Mixer *mixer, QueenEngine *vm) : Sound(mixer, vm) {};
void sfxPlay(const char *name, bool isSpeech);
protected:
void playSound(byte *sound, uint32 size, bool isSpeech);
@@ -133,7 +133,7 @@
#ifdef USE_MAD
class MP3Sound : public Sound {
public:
- MP3Sound(SoundMixer *mixer, QueenEngine *vm) : Sound(mixer, vm) {};
+ MP3Sound(Audio::Mixer *mixer, QueenEngine *vm) : Sound(mixer, vm) {};
void sfxPlay(const char *name, bool isSpeech);
};
#endif
@@ -141,7 +141,7 @@
#ifdef USE_VORBIS
class OGGSound : public Sound {
public:
- OGGSound(SoundMixer *mixer, QueenEngine *vm) : Sound(mixer, vm) {};
+ OGGSound(Audio::Mixer *mixer, QueenEngine *vm) : Sound(mixer, vm) {};
void sfxPlay(const char *name, bool isSpeech);
};
#endif
@@ -149,7 +149,7 @@
#ifdef USE_FLAC
class FLACSound : public Sound {
public:
- FLACSound(SoundMixer *mixer, QueenEngine *vm) : Sound(mixer, vm) {};
+ FLACSound(Audio::Mixer *mixer, QueenEngine *vm) : Sound(mixer, vm) {};
void sfxPlay(const char *name, bool isSpeech);
};
#endif // #ifdef USE_FLAC
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/kyra kyra.cpp,1.28,1.29
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sound/softsynth adlib.cpp,1.3,1.4 emumidi.h,1.3,1.4 fluidsynth.cpp,1.1,1.2 mt32.cpp,1.11,1.12 ym2612.cpp,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list