[Scummvm-cvs-logs] CVS: scummvm/scumm imuse.h,1.15,1.16

Jamieson Christian jamieson630 at users.sourceforge.net
Mon Oct 21 00:41:26 CEST 2002


Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv8503/scummvm/scumm

Modified Files:
	imuse.h 
Log Message:
Changed IMuse from a proxy into a virtual base class

Index: imuse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- imuse.h	16 Oct 2002 07:59:11 -0000	1.15
+++ imuse.h	21 Oct 2002 07:31:51 -0000	1.16
@@ -29,25 +29,26 @@
 		PROP_TEMPO_BASE = 1,
 	};
 
-	  IMuse();
-	 ~IMuse();
+	IMuse() { }
+	virtual ~IMuse() { };
 
-	void on_timer();							// For the MacOS 9 port only
-	void pause(bool paused);
-	int save_or_load(Serializer *ser, Scumm *scumm);
-	int set_music_volume(uint vol);
-	int get_music_volume();
-	int set_master_volume(uint vol);
-	int get_master_volume();
-	bool start_sound(int sound);
-	int stop_sound(int sound);
-	int stop_all_sounds();
-	int get_sound_status(int sound);
-	int32 do_command(int a, int b, int c, int d, int e, int f, int g, int h);
-	int clear_queue();
-	void setBase(byte **base);
-	uint32 property(int prop, uint32 value);
+	virtual void on_timer() = 0; // For the MacOS 9 port only
+	virtual void pause(bool paused) = 0;
+	virtual int save_or_load(Serializer *ser, Scumm *scumm) = 0;
+	virtual int set_music_volume(uint vol) = 0;
+	virtual int get_music_volume() = 0;
+	virtual int set_master_volume(uint vol) = 0;
+	virtual int get_master_volume() = 0;
+	virtual bool start_sound(int sound) = 0;
+	virtual int stop_sound(int sound) = 0;
+	virtual int stop_all_sounds() = 0;
+	virtual int get_sound_status(int sound) = 0;
+	virtual int32 do_command(int a, int b, int c, int d, int e, int f, int g, int h) = 0;
+	virtual int clear_queue() = 0;
+	virtual void setBase(byte **base) = 0;
+	virtual uint32 property(int prop, uint32 value) = 0;
 
+	// Factory methods
 	static IMuse *create(OSystem *syst, MidiDriver *midi, SoundMixer *mixer);
 
 	static IMuse *create_adlib(OSystem *syst, SoundMixer *mixer) {
@@ -56,9 +57,6 @@
 	static IMuse *create_midi(OSystem *syst, MidiDriver *midi) {
 		return create(syst, midi, NULL);
 	}
-
-private:
-	IMuseInternal *_imuse;				// Pointer to the real imuse object
 };
 
 #define MAX_DIGITAL_CHANNELS 8





More information about the Scummvm-git-logs mailing list