diff options
| author | Strangerke | 2013-06-26 23:11:34 +0200 |
|---|---|---|
| committer | Strangerke | 2013-06-26 23:11:34 +0200 |
| commit | 6e2d567bca53b6ffee771b4105e2e73dbd73f5b4 (patch) | |
| tree | 9880f0c496263ffb6928248d495ce4172dabed18 /backends/midi/seq.cpp | |
| parent | ac387835e4527c1814919093b4e4bc9798d5742d (diff) | |
| parent | 6716fa39a6fb2a3925576288c256688c5aadd7e9 (diff) | |
| download | scummvm-rg350-6e2d567bca53b6ffee771b4105e2e73dbd73f5b4.tar.gz scummvm-rg350-6e2d567bca53b6ffee771b4105e2e73dbd73f5b4.tar.bz2 scummvm-rg350-6e2d567bca53b6ffee771b4105e2e73dbd73f5b4.zip | |
Merge branch 'master' of https://github.com/scummvm/scummvm into mortevielle
Conflicts:
engines/engines.mk
Diffstat (limited to 'backends/midi/seq.cpp')
| -rw-r--r-- | backends/midi/seq.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/backends/midi/seq.cpp b/backends/midi/seq.cpp index 4efad9ceae..37986520bf 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"); @@ -145,7 +142,7 @@ void MidiDriver_SEQ::send(uint32 b) { buf[position++] = 0; break; default: - warning("MidiDriver_SEQ::send: unknown : %08x", (int)b); + warning("MidiDriver_SEQ::send: unknown: %08x", (int)b); break; } if (write(device, buf, position) == -1) |