[Scummvm-cvs-logs] CVS: scummvm/backends/midi windows.cpp,1.3,1.4

[Jamieson Christian]

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

Modified Files:
	windows.cpp 
Log Message:
Fixed VC++ errors in Windows driver after streaming capability was removed.

Index: windows.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/windows.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- windows.cpp	11 Dec 2002 16:09:54 -0000	1.3
+++ windows.cpp	12 Dec 2002 01:35:57 -0000	1.4
@@ -31,35 +31,32 @@
 ////////////////////////////////////////
 
 class MidiDriver_WIN : public MidiDriver_MPU401 {
-public:
-	MidiDriver_WIN();
-	int open(int mode);
-	void close();
-	void send(uint32 b);
-
 private:
 	HMIDIOUT _mo;
+	bool _isOpen;
 
 	void check_error(MMRESULT result);
-	uint32 property(int prop, uint32 param);
-};
+	uint32 property(int prop, uint32 param) { return 0; }
 
-MidiDriver_WIN::MidiDriver_WIN()
-{
-	_isOpen = false;
-}
+public:
+	MidiDriver_WIN() : _isOpen (false) { }
+	int open();
+	void close();
+	void send(uint32 b);
+};
 
 int MidiDriver_WIN::open()
 {
 	if (_isOpen)
 		return MERR_ALREADY_OPEN;
 
-	_isOpen = true;
-
 	MMRESULT res = midiOutOpen((HMIDIOUT *) &_mo, MIDI_MAPPER, 0, 0, 0);
-	if (res != MMSYSERR_NOERROR)
+	if (res != MMSYSERR_NOERROR) {
 		check_error(res);
+		return MERR_DEVICE_NOT_AVAILABLE;
+	}
 
+	_isOpen = true;
 	return 0;
 }