[Scummvm-cvs-logs] CVS: scummvm/backends/midi adlib.cpp,1.40,1.41

[Max Horn]

Update of /cvsroot/scummvm/scummvm/backends/midi
In directory sc8-pr-cvs1:/tmp/cvs-serv27828/backends/midi

Modified Files:
	adlib.cpp 
Log Message:
getting rid of g_mixer; removing lots of whitespace

Index: adlib.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/adlib.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- adlib.cpp	5 Aug 2003 23:57:37 -0000	1.40
+++ adlib.cpp	5 Aug 2003 23:58:24 -0000	1.41
@@ -554,7 +554,7 @@
 	friend class AdlibPercussionChannel;
 
 public:
-	MidiDriver_ADLIB();
+	MidiDriver_ADLIB(SoundMixer *mixer);
 
 	int open();
 	void close();
@@ -810,14 +810,14 @@
 
 // MidiDriver method implementations
 
-MidiDriver_ADLIB::MidiDriver_ADLIB()  {
+MidiDriver_ADLIB::MidiDriver_ADLIB(SoundMixer *mixer) 
+	: _mixer(mixer) {
 	uint i;
 
 	_isOpen = false;
 	_game_SmallHeader = false;
 
 	_adlib_reg_cache = 0;
-	_mixer = 0
 
 	_timer_proc = 0;
 	_timer_param = 0;
@@ -839,8 +839,7 @@
 	if (_isOpen)
 		return MERR_ALREADY_OPEN;
 	_isOpen = true;
-	_mixer = g_mixer;
-	
+
 	int i;
 	AdlibVoice *voice;