[Scummvm-cvs-logs] scummvm master -> 34c36d8f8f5fd9add4afc80d81718013855c77b8

wjp wjp at usecode.org
Tue Apr 23 21:26:04 CEST 2013


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
34c36d8f8f AUDIO: Remove useless check


Commit: 34c36d8f8f5fd9add4afc80d81718013855c77b8
    https://github.com/scummvm/scummvm/commit/34c36d8f8f5fd9add4afc80d81718013855c77b8
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2013-04-23T12:25:03-07:00

Commit Message:
AUDIO: Remove useless check

Changed paths:
    backends/midi/seq.cpp



diff --git a/backends/midi/seq.cpp b/backends/midi/seq.cpp
index d48b80c..3798652 100644
--- a/backends/midi/seq.cpp
+++ b/backends/midi/seq.cpp
@@ -88,12 +88,9 @@ int MidiDriver_SEQ::open() {
 
 	device = ::open((device_name), O_RDWR, 0);
 
-	if ((device_name == NULL) || (device < 0)) {
-		if (device_name == NULL)
-			warning("Opening /dev/null (no music will be heard)");
-		else
-			warning("Cannot open rawmidi device %s - using /dev/null (no music will be heard)",
-							device_name);
+	if (device < 0) {
+		warning("Cannot open rawmidi device %s - using /dev/null (no music will be heard)",
+					device_name);
 		device = (::open(("/dev/null"), O_RDWR, 0));
 		if (device < 0)
 			error("Cannot open /dev/null to dump midi output");






More information about the Scummvm-git-logs mailing list