libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 06:08:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

KYRA: Mark overloaded methods of Sound subclasses as virtual.

Browse Source
This commit is contained in:
Johannes Schickel 2013-01-09 06:09:22 +01:00
parent 8d5b4b75d4
commit 8520475153
1 changed files with 74 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

148
engines/kyra/sound_intern.h
View File

@ -54,31 +54,31 @@ class MidiOutput;
class SoundMidiPC : public Sound {
public:
SoundMidiPC(KyraEngine_v1 *vm, Audio::Mixer *mixer, MidiDriver *driver, kType type);
~SoundMidiPC();
virtual ~SoundMidiPC();
kType getMusicType() const { return _type; }
virtual kType getMusicType() const { return _type; }
bool init();
virtual bool init();
void updateVolumeSettings();
virtual void updateVolumeSettings();
void initAudioResourceInfo(int set, void *info);
void selectAudioResourceSet(int set);
bool hasSoundFile(uint file) const;
void loadSoundFile(uint file);
void loadSoundFile(Common::String file);
void loadSfxFile(Common::String file);
virtual void initAudioResourceInfo(int set, void *info);
virtual void selectAudioResourceSet(int set);
virtual bool hasSoundFile(uint file) const;
virtual void loadSoundFile(uint file);
virtual void loadSoundFile(Common::String file);
virtual void loadSfxFile(Common::String file);
void playTrack(uint8 track);
void haltTrack();
bool isPlaying() const;
virtual void playTrack(uint8 track);
virtual void haltTrack();
virtual bool isPlaying() const;
void playSoundEffect(uint8 track, uint8 volume = 0xFF);
void stopAllSoundEffects();
virtual void playSoundEffect(uint8 track, uint8 volume = 0xFF);
virtual void stopAllSoundEffects();
void beginFadeOut();
virtual void beginFadeOut();
void pause(bool paused);
virtual void pause(bool paused);
private:
static void onTimer(void *data);
@ -113,28 +113,28 @@ private:
class SoundTowns : public Sound {
public:
SoundTowns(KyraEngine_v1 *vm, Audio::Mixer *mixer);
~SoundTowns();
virtual ~SoundTowns();
kType getMusicType() const { return kTowns; }
virtual kType getMusicType() const { return kTowns; }
bool init();
void process();
virtual bool init();
virtual void process();
void initAudioResourceInfo(int set, void *info);
void selectAudioResourceSet(int set);
bool hasSoundFile(uint file) const;
void loadSoundFile(uint file);
void loadSoundFile(Common::String) {}
virtual void initAudioResourceInfo(int set, void *info);
virtual void selectAudioResourceSet(int set);
virtual bool hasSoundFile(uint file) const;
virtual void loadSoundFile(uint file);
virtual void loadSoundFile(Common::String) {}
void playTrack(uint8 track);
void haltTrack();
virtual void playTrack(uint8 track);
virtual void haltTrack();
void playSoundEffect(uint8 track, uint8 volume = 0xFF);
void stopAllSoundEffects();
virtual void playSoundEffect(uint8 track, uint8 volume = 0xFF);
virtual void stopAllSoundEffects();
void beginFadeOut();
virtual void beginFadeOut();
void updateVolumeSettings();
virtual void updateVolumeSettings();
private:
bool loadInstruments();
@ -167,27 +167,27 @@ private:
class SoundPC98 : public Sound {
public:
SoundPC98(KyraEngine_v1 *vm, Audio::Mixer *mixer);
~SoundPC98();
virtual ~SoundPC98();
virtual kType getMusicType() const { return kPC98; }
bool init();
virtual bool init();
void process() {}
void initAudioResourceInfo(int set, void *info);
void selectAudioResourceSet(int set);
bool hasSoundFile(uint file) const;
void loadSoundFile(uint file);
void loadSoundFile(Common::String file);
virtual void process() {}
virtual void initAudioResourceInfo(int set, void *info);
virtual void selectAudioResourceSet(int set);
virtual bool hasSoundFile(uint file) const;
virtual void loadSoundFile(uint file);
virtual void loadSoundFile(Common::String file);
void playTrack(uint8 track);
void haltTrack();
void beginFadeOut();
virtual void playTrack(uint8 track);
virtual void haltTrack();
virtual void beginFadeOut();
int32 voicePlay(const char *file, Audio::SoundHandle *handle, uint8 volume, uint8 priority, bool isSfx) { return -1; }
void playSoundEffect(uint8 track, uint8 volume = 0xFF);
virtual int32 voicePlay(const char *file, Audio::SoundHandle *handle, uint8 volume, uint8 priority, bool isSfx) { return -1; }
virtual void playSoundEffect(uint8 track, uint8 volume = 0xFF);
void updateVolumeSettings();
virtual void updateVolumeSettings();
private:
int _lastTrack;
@ -203,27 +203,27 @@ private:
class SoundTownsPC98_v2 : public Sound {
public:
SoundTownsPC98_v2(KyraEngine_v1 *vm, Audio::Mixer *mixer);
~SoundTownsPC98_v2();
virtual ~SoundTownsPC98_v2();
kType getMusicType() const { return _vm->gameFlags().platform == Common::kPlatformFMTowns ? kTowns : kPC98; }
virtual kType getMusicType() const { return _vm->gameFlags().platform == Common::kPlatformFMTowns ? kTowns : kPC98; }
bool init();
void process();
virtual bool init();
virtual void process();
void initAudioResourceInfo(int set, void *info);
void selectAudioResourceSet(int set);
bool hasSoundFile(uint file) const;
void loadSoundFile(uint file) {}
void loadSoundFile(Common::String file);
virtual void initAudioResourceInfo(int set, void *info);
virtual void selectAudioResourceSet(int set);
virtual bool hasSoundFile(uint file) const;
virtual void loadSoundFile(uint file) {}
virtual void loadSoundFile(Common::String file);
void playTrack(uint8 track);
void haltTrack();
void beginFadeOut();
virtual void playTrack(uint8 track);
virtual void haltTrack();
virtual void beginFadeOut();
int32 voicePlay(const char *file, Audio::SoundHandle *handle, uint8 volume = 255, uint8 priority = 255, bool isSfx = true);
void playSoundEffect(uint8 track, uint8 volume = 0xFF);
virtual int32 voicePlay(const char *file, Audio::SoundHandle *handle, uint8 volume = 255, uint8 priority = 255, bool isSfx = true);
virtual void playSoundEffect(uint8 track, uint8 volume = 0xFF);
void updateVolumeSettings();
virtual void updateVolumeSettings();
private:
Audio::AudioStream *_currentSFX;
@ -319,26 +319,26 @@ struct AmigaSfxTable {
class SoundAmiga : public Sound {
public:
SoundAmiga(KyraEngine_v1 *vm, Audio::Mixer *mixer);
~SoundAmiga();
virtual ~SoundAmiga();
virtual kType getMusicType() const { return kAmiga; } //FIXME
bool init();
virtual bool init();
void process() {}
virtual void process() {}
void initAudioResourceInfo(int set, void *info);
void selectAudioResourceSet(int set);
bool hasSoundFile(uint file) const;
void loadSoundFile(uint file);
void loadSoundFile(Common::String) {}
virtual void initAudioResourceInfo(int set, void *info);
virtual void selectAudioResourceSet(int set);
virtual bool hasSoundFile(uint file) const;
virtual void loadSoundFile(uint file);
virtual void loadSoundFile(Common::String) {}
void playTrack(uint8 track);
void haltTrack();
void beginFadeOut();
virtual void playTrack(uint8 track);
virtual void haltTrack();
virtual void beginFadeOut();
int32 voicePlay(const char *file, Audio::SoundHandle *handle, uint8 volume, uint8 priority, bool isSfx) { return -1; }
void playSoundEffect(uint8 track, uint8 volume = 0xFF);
virtual int32 voicePlay(const char *file, Audio::SoundHandle *handle, uint8 volume, uint8 priority, bool isSfx) { return -1; }
virtual void playSoundEffect(uint8 track, uint8 volume = 0xFF);
protected:
Audio::MaxTrax *_driver;