diff options
| author | Nicola Mettifogo | 2007-09-19 08:40:12 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2007-09-19 08:40:12 +0000 |
| commit | 258901bab96f0050385a9912c8ea0fe2a41b2d6f (patch) | |
| tree | a3ae8675b679c9f3b58ac8d97c79369502ea23c1 /backends/midi | |
| parent | a89694c0d61a75a960f5bec6c498659c988401cc (diff) | |
| download | scummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.tar.gz scummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.tar.bz2 scummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.zip | |
Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.
svn-id: r28966
Diffstat (limited to 'backends/midi')
| -rw-r--r-- | backends/midi/alsa.cpp | 2 | ||||
| -rw-r--r-- | backends/midi/coreaudio.cpp | 1 | ||||
| -rw-r--r-- | backends/midi/coremidi.cpp | 5 | ||||
| -rw-r--r-- | backends/midi/morphos.cpp | 1 | ||||
| -rw-r--r-- | backends/midi/seq.cpp | 1 | ||||
| -rw-r--r-- | backends/midi/windows.cpp | 1 | ||||
| -rw-r--r-- | backends/midi/ypa1.cpp | 1 | ||||
| -rw-r--r-- | backends/midi/zodiac.cpp | 3 |
8 files changed, 3 insertions, 12 deletions
diff --git a/backends/midi/alsa.cpp b/backends/midi/alsa.cpp index b077f333f1..174bb73f65 100644 --- a/backends/midi/alsa.cpp +++ b/backends/midi/alsa.cpp @@ -22,14 +22,12 @@ * $Id$ */ -#include "common/stdafx.h" #include "common/scummsys.h" #if defined(UNIX) && defined(USE_ALSA) #include "sound/mpu401.h" -#include "common/stdafx.h" #include "common/util.h" #include "common/config-manager.h" diff --git a/backends/midi/coreaudio.cpp b/backends/midi/coreaudio.cpp index e14ab24e79..54777f6c69 100644 --- a/backends/midi/coreaudio.cpp +++ b/backends/midi/coreaudio.cpp @@ -24,7 +24,6 @@ #ifdef MACOSX -#include "common/stdafx.h" #include "common/config-manager.h" #include "common/util.h" #include "sound/mpu401.h" diff --git a/backends/midi/coremidi.cpp b/backends/midi/coremidi.cpp index aa8790a83e..251b41a986 100644 --- a/backends/midi/coremidi.cpp +++ b/backends/midi/coremidi.cpp @@ -24,7 +24,6 @@ #ifdef MACOSX -#include "common/stdafx.h" #include "common/config-manager.h" #include "common/util.h" #include "sound/mpu401.h" @@ -91,8 +90,8 @@ int MidiDriver_CoreMIDI::open() { } else { return MERR_DEVICE_NOT_AVAILABLE; } - - if (err != noErr) + + if (err != noErr) return MERR_CANNOT_CONNECT; return 0; diff --git a/backends/midi/morphos.cpp b/backends/midi/morphos.cpp index 530967c331..1a322dc6e2 100644 --- a/backends/midi/morphos.cpp +++ b/backends/midi/morphos.cpp @@ -33,7 +33,6 @@ #include <proto/dos.h> #include <proto/etude.h> -#include "common/stdafx.h" #include "common/endian.h" #include "sound/mpu401.h" #include "common/util.h" diff --git a/backends/midi/seq.cpp b/backends/midi/seq.cpp index cb5aafd170..39c61dd85b 100644 --- a/backends/midi/seq.cpp +++ b/backends/midi/seq.cpp @@ -30,7 +30,6 @@ #if defined(UNIX) && !defined(__BEOS__) && !defined(__MAEMO__) -#include "common/stdafx.h" #include "sound/mpu401.h" #include "common/util.h" diff --git a/backends/midi/windows.cpp b/backends/midi/windows.cpp index 5f53c59173..db3ed50165 100644 --- a/backends/midi/windows.cpp +++ b/backends/midi/windows.cpp @@ -27,7 +27,6 @@ #include <windows.h> #include <mmsystem.h> -#include "common/stdafx.h" #include "sound/mpu401.h" #include "common/util.h" diff --git a/backends/midi/ypa1.cpp b/backends/midi/ypa1.cpp index da84211753..ca77de7300 100644 --- a/backends/midi/ypa1.cpp +++ b/backends/midi/ypa1.cpp @@ -22,7 +22,6 @@ * $Id$ */ -#include "common/stdafx.h" #include "sound/mpu401.h" #include "common/util.h" diff --git a/backends/midi/zodiac.cpp b/backends/midi/zodiac.cpp index 349635f8b2..10a9d166b4 100644 --- a/backends/midi/zodiac.cpp +++ b/backends/midi/zodiac.cpp @@ -22,7 +22,6 @@ * $Id$ */ -#include "common/stdafx.h" #include "sound/mpu401.h" #include "common/util.h" @@ -113,7 +112,7 @@ void MidiDriver_Zodiac::send(uint32 b) { void MidiDriver_Zodiac::sysEx(const byte *msg, uint16 length) { unsigned char buf[256]; - + buf[0] = 0xF0; memcpy(buf + 1, msg, length); buf[length + 1] = 0xF7; |