[Scummvm-cvs-logs] SF.net SVN: scummvm:[47807] scummvm/trunk/engines/sci/sound/music.cpp

[waltervn at users.sourceforge.net]

Revision: 47807
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47807&view=rev
Author:   waltervn
Date:     2010-02-02 03:23:48 +0000 (Tue, 02 Feb 2010)

Log Message:
-----------
SCI: Abort when sound driver fails to open.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sound/music.cpp

Modified: scummvm/trunk/engines/sci/sound/music.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/music.cpp	2010-02-02 01:36:45 UTC (rev 47806)
+++ scummvm/trunk/engines/sci/sound/music.cpp	2010-02-02 03:23:48 UTC (rev 47807)
@@ -84,12 +84,13 @@
 			_pMidiDrv = MidiPlayer_Midi_create(_soundVersion);
 	}
 
-	if (_pMidiDrv) {
-		_pMidiDrv->open();
+	if (_pMidiDrv && !_pMidiDrv->open()) {
 		_pMidiDrv->setTimerCallback(this, &miditimerCallback);
 		_dwTempo = _pMidiDrv->getBaseTempo();
-	} else
-		warning("Can't initialise music driver");
+	} else {
+		error("Failed to initialize sound driver");
+	}
+
 	_bMultiMidi = ConfMan.getBool("multi_midi");
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.