[Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,2.77,2.78 imuse.h,1.39,1.40 imuse_internal.h,2.13,2.14

[Jamieson Christian]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv16935/scummvm/scumm

Modified Files:
	imuse.cpp imuse.h imuse_internal.h 
Log Message:
Removed unused stuff.

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 2.77
retrieving revision 2.78
diff -u -d -r2.77 -r2.78
--- imuse.cpp	10 Aug 2003 11:44:43 -0000	2.77
+++ imuse.cpp	12 Aug 2003 07:32:42 -0000	2.78
@@ -73,23 +73,6 @@
 	terminate();
 }
 
-MidiDriver *IMuseInternal::getMidiDriver() {
-	MidiDriver *driver = NULL;
-
-	if (_midi_native) {
-		driver = _midi_native;
-	} else {
-		// Route it through Adlib anyway.
-		if (!_midi_adlib) {
-			_midi_adlib = MidiDriver_ADLIB_create(_mixer);
-			initMidiDriver(_midi_adlib);
-		}
-		driver = _midi_adlib;
-	}
-
-	return driver;
-}
-
 byte *IMuseInternal::findStartOfSound(int sound) {
 	byte *ptr = NULL;
 	int32 size, pos;
@@ -1766,7 +1749,6 @@
 int IMuse::clear_queue() { in(); int ret = _target->clear_queue(); out(); return ret; }
 void IMuse::setBase(byte **base) { in(); _target->setBase(base); out(); }
 uint32 IMuse::property(int prop, uint32 value) { in(); uint32 ret = _target->property(prop, value); out(); return ret; }
-MidiDriver *IMuse::getMidiDriver() { in(); MidiDriver *ret = _target->getMidiDriver(); out(); return ret; }
 
 // The IMuse::create method provides a front-end factory
 // for creating IMuseInternal without exposing that class

Index: imuse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- imuse.h	6 Aug 2003 18:20:15 -0000	1.39
+++ imuse.h	12 Aug 2003 07:32:43 -0000	1.40
@@ -72,7 +72,6 @@
 	int clear_queue();
 	void setBase(byte **base);
 	uint32 property(int prop, uint32 value);
-	MidiDriver *getMidiDriver();
 
 	// Factory methods
 	static IMuse *create(OSystem *syst, SoundMixer *mixer, MidiDriver *midi);

Index: imuse_internal.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_internal.h,v
retrieving revision 2.13
retrieving revision 2.14
diff -u -d -r2.13 -r2.14
--- imuse_internal.h	6 Aug 2003 18:20:15 -0000	2.13
+++ imuse_internal.h	12 Aug 2003 07:32:43 -0000	2.14
@@ -465,9 +465,7 @@
 	int32 doCommand (int numargs, int args[]);
 	int clear_queue();
 	void setBase(byte **base);
-
 	uint32 property(int prop, uint32 value);
-	MidiDriver *getMidiDriver();
 
 	static IMuseInternal *create(OSystem *syst, SoundMixer *mixer, MidiDriver *midi);
 };