aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/imuse
diff options
context:
space:
mode:
authorJamieson Christian2006-03-04 18:38:27 +0000
committerJamieson Christian2006-03-04 18:38:27 +0000
commit01af975df48e82938031ed78f95ee2c9719fa3a6 (patch)
tree24c1658a751c9ff74a75aa443d151d00c60f017c /engines/scumm/imuse
parent6010d48a8e0c16959b7cd6168e523bf33ac9fe67 (diff)
downloadscummvm-rg350-01af975df48e82938031ed78f95ee2c9719fa3a6.tar.gz
scummvm-rg350-01af975df48e82938031ed78f95ee2c9719fa3a6.tar.bz2
scummvm-rg350-01af975df48e82938031ed78f95ee2c9719fa3a6.zip
Rearranged methods in the IMuse class declaration to denote those derived from the MusicEngine base class.
svn-id: r21079
Diffstat (limited to 'engines/scumm/imuse')
-rw-r--r--engines/scumm/imuse/imuse.h16
1 files changed, 9 insertions, 7 deletions
diff --git a/engines/scumm/imuse/imuse.h b/engines/scumm/imuse/imuse.h
index 0c9a9206ba..790deb5dc5 100644
--- a/engines/scumm/imuse/imuse.h
+++ b/engines/scumm/imuse/imuse.h
@@ -62,19 +62,21 @@ public:
void on_timer(MidiDriver *midi);
void pause(bool paused);
int save_or_load(Serializer *ser, ScummEngine *scumm);
- void setMusicVolume(int vol);
- void startSound(int sound);
- void stopSound(int sound);
- void stopAllSounds();
- int getSoundStatus(int sound) const;
bool get_sound_active(int sound) const;
- int getMusicTimer() const;
int32 doCommand(int a, int b, int c, int d, int e, int f, int g, int h);
int32 doCommand(int numargs, int args[]);
int clear_queue();
void setBase(byte **base);
uint32 property(int prop, uint32 value);
- void terminate();
+
+ // MusicEngine base class methods
+ virtual void setMusicVolume(int vol);
+ virtual void startSound(int sound);
+ virtual void stopSound(int sound);
+ virtual void stopAllSounds();
+ virtual int getSoundStatus(int sound) const;
+ virtual int getMusicTimer() const;
+ virtual void terminate();
// Factory methods
static IMuse *create(OSystem *syst, MidiDriver *nativeMidiDriver, MidiDriver *adlibMidiDriver);