diff options
author | Johannes Schickel | 2010-09-14 21:53:22 +0000 |
---|---|---|
committer | Johannes Schickel | 2010-09-14 21:53:22 +0000 |
commit | f742d2ecc5d2e467e73c5948da46b36c5af4d562 (patch) | |
tree | 2d95c9ee911052d658d9c3a8d153feb8f328e4c0 /engines | |
parent | 8ab435397fd0ee3b24f43cb135489fe70509c578 (diff) | |
download | scummvm-rg350-f742d2ecc5d2e467e73c5948da46b36c5af4d562.tar.gz scummvm-rg350-f742d2ecc5d2e467e73c5948da46b36c5af4d562.tar.bz2 scummvm-rg350-f742d2ecc5d2e467e73c5948da46b36c5af4d562.zip |
SCI: Some constification.
svn-id: r52726
Diffstat (limited to 'engines')
-rw-r--r-- | engines/sci/sound/drivers/adlib.cpp | 8 | ||||
-rw-r--r-- | engines/sci/sound/drivers/amigamac.cpp | 4 | ||||
-rw-r--r-- | engines/sci/sound/drivers/fb01.cpp | 4 | ||||
-rw-r--r-- | engines/sci/sound/drivers/midi.cpp | 12 | ||||
-rw-r--r-- | engines/sci/sound/drivers/mididriver.h | 8 | ||||
-rw-r--r-- | engines/sci/sound/drivers/pcjr.cpp | 8 |
6 files changed, 22 insertions, 22 deletions
diff --git a/engines/sci/sound/drivers/adlib.cpp b/engines/sci/sound/drivers/adlib.cpp index 89ea426efc..20bac4a2c0 100644 --- a/engines/sci/sound/drivers/adlib.cpp +++ b/engines/sci/sound/drivers/adlib.cpp @@ -73,7 +73,7 @@ public: bool loadResource(const byte *data, uint size); virtual uint32 property(int prop, uint32 param); - bool useRhythmChannel() { return _rhythmKeyMap != NULL; } + bool useRhythmChannel() const { return _rhythmKeyMap != NULL; } private: enum ChannelID { @@ -173,14 +173,14 @@ public: int open(ResourceManager *resMan); void close(); - byte getPlayId(); + byte getPlayId() const; int getPolyphony() const { return MidiDriver_AdLib::kVoices; } bool hasRhythmChannel() const { return false; } void setVolume(byte volume) { static_cast<MidiDriver_AdLib *>(_driver)->setVolume(volume); } void playSwitch(bool play) { static_cast<MidiDriver_AdLib *>(_driver)->playSwitch(play); } void loadInstrument(int idx, byte *data); - int getLastChannel() { return (static_cast<MidiDriver_AdLib *>(_driver)->useRhythmChannel() ? 8 : 15); } + int getLastChannel() const { return (static_cast<const MidiDriver_AdLib *>(_driver)->useRhythmChannel() ? 8 : 15); } }; static const byte registerOffset[MidiDriver_AdLib::kVoices] = { @@ -837,7 +837,7 @@ void MidiPlayer_AdLib::close() { } } -byte MidiPlayer_AdLib::getPlayId() { +byte MidiPlayer_AdLib::getPlayId() const { switch (_version) { case SCI_VERSION_0_EARLY: return 0x01; diff --git a/engines/sci/sound/drivers/amigamac.cpp b/engines/sci/sound/drivers/amigamac.cpp index 4fb9146b53..4b591eb609 100644 --- a/engines/sci/sound/drivers/amigamac.cpp +++ b/engines/sci/sound/drivers/amigamac.cpp @@ -966,7 +966,7 @@ bool MidiDriver_AmigaMac::loadInstrumentsSCI1(Common::SeekableReadStream &file) class MidiPlayer_AmigaMac : public MidiPlayer { public: MidiPlayer_AmigaMac(SciVersion version) : MidiPlayer(version) { _driver = new MidiDriver_AmigaMac(g_system->getMixer()); } - byte getPlayId(); + byte getPlayId() const; int getPolyphony() const { return MidiDriver_AmigaMac::kVoices; } bool hasRhythmChannel() const { return false; } void setVolume(byte volume) { static_cast<MidiDriver_AmigaMac *>(_driver)->setVolume(volume); } @@ -978,7 +978,7 @@ MidiPlayer *MidiPlayer_AmigaMac_create(SciVersion version) { return new MidiPlayer_AmigaMac(version); } -byte MidiPlayer_AmigaMac::getPlayId() { +byte MidiPlayer_AmigaMac::getPlayId() const { if (_version > SCI_VERSION_0_LATE) return 0x06; diff --git a/engines/sci/sound/drivers/fb01.cpp b/engines/sci/sound/drivers/fb01.cpp index ab9b2e3df5..7560c62f4f 100644 --- a/engines/sci/sound/drivers/fb01.cpp +++ b/engines/sci/sound/drivers/fb01.cpp @@ -59,7 +59,7 @@ public: void send(uint32 b); void sysEx(const byte *msg, uint16 length); bool hasRhythmChannel() const { return false; } - byte getPlayId(); + byte getPlayId() const; int getPolyphony() const { return kVoices; } // 9 in SCI1? void setVolume(byte volume); int getVolume(); @@ -633,7 +633,7 @@ void MidiPlayer_Fb01::sysEx(const byte *msg, uint16 length) { g_system->updateScreen(); } -byte MidiPlayer_Fb01::getPlayId() { +byte MidiPlayer_Fb01::getPlayId() const { switch (_version) { case SCI_VERSION_0_EARLY: return 0x01; diff --git a/engines/sci/sound/drivers/midi.cpp b/engines/sci/sound/drivers/midi.cpp index 11697c02ed..8ba7a6a352 100644 --- a/engines/sci/sound/drivers/midi.cpp +++ b/engines/sci/sound/drivers/midi.cpp @@ -53,10 +53,10 @@ public: void send(uint32 b); void sysEx(const byte *msg, uint16 length); bool hasRhythmChannel() const { return true; } - byte getPlayId(); + byte getPlayId() const; int getPolyphony() const { return kVoices; } - int getFirstChannel(); - int getLastChannel(); + int getFirstChannel() const; + int getLastChannel() const; void setVolume(byte volume); int getVolume(); void setReverb(byte reverb); @@ -330,13 +330,13 @@ void MidiPlayer_Midi::send(uint32 b) { // We return 1 for mt32, because if we remap channels to 0 for mt32, those won't get played at all // NOTE: SSCI uses channels 1 through 8 for General MIDI as well, in the drivers I checked -int MidiPlayer_Midi::getFirstChannel() { +int MidiPlayer_Midi::getFirstChannel() const { if (_isMt32) return 1; return 0; } -int MidiPlayer_Midi::getLastChannel() { +int MidiPlayer_Midi::getLastChannel() const { if (_isMt32) return 8; return 15; @@ -910,7 +910,7 @@ void MidiPlayer_Midi::sysEx(const byte *msg, uint16 length) { g_system->updateScreen(); } -byte MidiPlayer_Midi::getPlayId() { +byte MidiPlayer_Midi::getPlayId() const { switch (_version) { case SCI_VERSION_0_EARLY: case SCI_VERSION_0_LATE: diff --git a/engines/sci/sound/drivers/mididriver.h b/engines/sci/sound/drivers/mididriver.h index 0e38cc696c..d7f2d42386 100644 --- a/engines/sci/sound/drivers/mididriver.h +++ b/engines/sci/sound/drivers/mididriver.h @@ -84,10 +84,10 @@ public: MidiChannel *getPercussionChannel() { return _driver->getPercussionChannel(); } virtual void setTimerCallback(void *timer_param, Common::TimerManager::TimerProc timer_proc) { _driver->setTimerCallback(timer_param, timer_proc); } - virtual byte getPlayId() = 0; + virtual byte getPlayId() const = 0; virtual int getPolyphony() const = 0; - virtual int getFirstChannel() { return 0; } - virtual int getLastChannel() { return 15; } + virtual int getFirstChannel() const { return 0; } + virtual int getLastChannel() const { return 15; } virtual void setVolume(byte volume) { if(_driver) @@ -98,7 +98,7 @@ public: return _driver ? _driver->property(MIDI_PROP_MASTER_VOLUME, 0xffff) : 0; } - virtual byte getReverb() { return _reverb; } + virtual byte getReverb() const { return _reverb; } virtual void setReverb(byte reverb) { _reverb = reverb; } virtual void playSwitch(bool play) { diff --git a/engines/sci/sound/drivers/pcjr.cpp b/engines/sci/sound/drivers/pcjr.cpp index bdf90eff5c..93de072865 100644 --- a/engines/sci/sound/drivers/pcjr.cpp +++ b/engines/sci/sound/drivers/pcjr.cpp @@ -234,13 +234,13 @@ class MidiPlayer_PCJr : public MidiPlayer { public: MidiPlayer_PCJr(SciVersion version) : MidiPlayer(version) { _driver = new MidiDriver_PCJr(g_system->getMixer()); } int open(ResourceManager *resMan) { return static_cast<MidiDriver_PCJr *>(_driver)->open(getPolyphony()); } - byte getPlayId(); + byte getPlayId() const; int getPolyphony() const { return 3; } bool hasRhythmChannel() const { return false; } void setVolume(byte volume) { static_cast<MidiDriver_PCJr *>(_driver)->_global_volume = volume; } }; -byte MidiPlayer_PCJr::getPlayId() { +byte MidiPlayer_PCJr::getPlayId() const { switch (_version) { case SCI_VERSION_0_EARLY: return 0x02; @@ -259,11 +259,11 @@ class MidiPlayer_PCSpeaker : public MidiPlayer_PCJr { public: MidiPlayer_PCSpeaker(SciVersion version) : MidiPlayer_PCJr(version) { } - byte getPlayId(); + byte getPlayId() const; int getPolyphony() const { return 1; } }; -byte MidiPlayer_PCSpeaker::getPlayId() { +byte MidiPlayer_PCSpeaker::getPlayId() const { switch (_version) { case SCI_VERSION_0_EARLY: return 0x04; |