[Scummvm-cvs-logs] SF.net SVN: scummvm: [21079] scummvm/trunk/engines/scumm/imuse/imuse.h

Jamieson630 at users.sourceforge.net Jamieson630 at users.sourceforge.net
Sat Mar 4 10:39:01 CET 2006


Revision: 21079
Author:   Jamieson630
Date:     2006-03-04 10:38:27 -0800 (Sat, 04 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=21079&view=rev

Log Message:
-----------
Rearranged methods in the IMuse class declaration to denote those derived from the MusicEngine base class.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/imuse/imuse.h
Modified: scummvm/trunk/engines/scumm/imuse/imuse.h
===================================================================
--- scummvm/trunk/engines/scumm/imuse/imuse.h	2006-03-04 18:34:28 UTC (rev 21078)
+++ scummvm/trunk/engines/scumm/imuse/imuse.h	2006-03-04 18:38:27 UTC (rev 21079)
@@ -62,20 +62,22 @@
 	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);
 };







More information about the Scummvm-git-logs mailing list