[Scummvm-cvs-logs] SF.net SVN: scummvm:[52726] scummvm/trunk/engines/sci/sound/drivers
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Tue Sep 14 23:53:22 CEST 2010
Revision: 52726
http://scummvm.svn.sourceforge.net/scummvm/?rev=52726&view=rev
Author: lordhoto
Date: 2010-09-14 21:53:22 +0000 (Tue, 14 Sep 2010)
Log Message:
-----------
SCI: Some constification.
Modified Paths:
--------------
scummvm/trunk/engines/sci/sound/drivers/adlib.cpp
scummvm/trunk/engines/sci/sound/drivers/amigamac.cpp
scummvm/trunk/engines/sci/sound/drivers/fb01.cpp
scummvm/trunk/engines/sci/sound/drivers/midi.cpp
scummvm/trunk/engines/sci/sound/drivers/mididriver.h
scummvm/trunk/engines/sci/sound/drivers/pcjr.cpp
Modified: scummvm/trunk/engines/sci/sound/drivers/adlib.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/drivers/adlib.cpp 2010-09-14 19:02:33 UTC (rev 52725)
+++ scummvm/trunk/engines/sci/sound/drivers/adlib.cpp 2010-09-14 21:53:22 UTC (rev 52726)
@@ -73,7 +73,7 @@
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 @@
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 @@
}
}
-byte MidiPlayer_AdLib::getPlayId() {
+byte MidiPlayer_AdLib::getPlayId() const {
switch (_version) {
case SCI_VERSION_0_EARLY:
return 0x01;
Modified: scummvm/trunk/engines/sci/sound/drivers/amigamac.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/drivers/amigamac.cpp 2010-09-14 19:02:33 UTC (rev 52725)
+++ scummvm/trunk/engines/sci/sound/drivers/amigamac.cpp 2010-09-14 21:53:22 UTC (rev 52726)
@@ -966,7 +966,7 @@
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 @@
return new MidiPlayer_AmigaMac(version);
}
-byte MidiPlayer_AmigaMac::getPlayId() {
+byte MidiPlayer_AmigaMac::getPlayId() const {
if (_version > SCI_VERSION_0_LATE)
return 0x06;
Modified: scummvm/trunk/engines/sci/sound/drivers/fb01.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/drivers/fb01.cpp 2010-09-14 19:02:33 UTC (rev 52725)
+++ scummvm/trunk/engines/sci/sound/drivers/fb01.cpp 2010-09-14 21:53:22 UTC (rev 52726)
@@ -59,7 +59,7 @@
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 @@
g_system->updateScreen();
}
-byte MidiPlayer_Fb01::getPlayId() {
+byte MidiPlayer_Fb01::getPlayId() const {
switch (_version) {
case SCI_VERSION_0_EARLY:
return 0x01;
Modified: scummvm/trunk/engines/sci/sound/drivers/midi.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/drivers/midi.cpp 2010-09-14 19:02:33 UTC (rev 52725)
+++ scummvm/trunk/engines/sci/sound/drivers/midi.cpp 2010-09-14 21:53:22 UTC (rev 52726)
@@ -53,10 +53,10 @@
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 @@
// 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 @@
g_system->updateScreen();
}
-byte MidiPlayer_Midi::getPlayId() {
+byte MidiPlayer_Midi::getPlayId() const {
switch (_version) {
case SCI_VERSION_0_EARLY:
case SCI_VERSION_0_LATE:
Modified: scummvm/trunk/engines/sci/sound/drivers/mididriver.h
===================================================================
--- scummvm/trunk/engines/sci/sound/drivers/mididriver.h 2010-09-14 19:02:33 UTC (rev 52725)
+++ scummvm/trunk/engines/sci/sound/drivers/mididriver.h 2010-09-14 21:53:22 UTC (rev 52726)
@@ -84,10 +84,10 @@
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 @@
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) {
Modified: scummvm/trunk/engines/sci/sound/drivers/pcjr.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/drivers/pcjr.cpp 2010-09-14 19:02:33 UTC (rev 52725)
+++ scummvm/trunk/engines/sci/sound/drivers/pcjr.cpp 2010-09-14 21:53:22 UTC (rev 52726)
@@ -234,13 +234,13 @@
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 @@
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;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list