Ticket #7919: rawmidi2.patch

Makefile

@@ -2 +2 @@
 
 CC      = gcc
 CFLAGS  = -g -Wno-multichar
+
+#Replace -DUSE_TIMIDITY with -DUSE_RAWMIDI for music on a raw midi device
+#in unix
+#
 DEFINES = -DUNIX -DHAVE_READLINE -DUSE_TIMIDITY
+
 LDFLAGS := 
 INCLUDES:= `sdl-config --cflags`
 CPPFLAGS= $(DEFINES) $(INCLUDES)

imuse.cpp

@@ -2471 +2471 @@
 
 #define MIDI_OUT(a,b) midiOutShortMsg((HMIDIOUT)(a), (b))
 
+#elif defined(USE_RAWMIDI)
+static int open_rawmidi_device()
+{
+        int device;
+        char *device_name = getenv("SCUMMVM_MIDI");
+        if (device_name != NULL) {
+                device = (open((device_name), O_RDWR, 0));
+        } else {
+                warning("You need to set-up the SCUMMVM_MIDI environment variable properly (see readme.txt) ");
+        }
+        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);
+                device = (open(("/dev/null"), O_RDWR, 0));
+                if (device < 0)
+                        error("Cannot open /dev/null to dump midi output");
+        }
+        return device;
+}
+
+void SoundEngine::midiInit()
+{
+        int device;
+        device = open_rawmidi_device();
+        _mo = (void *) device;
+}
+
+static inline void MIDI_OUT(void *a, int b) {
+        int device = (int) a;
+        unsigned char buf[256];
+        int position = 0;
+        
+        switch (b & 0xF0) {
+        case 0x80:
+        case 0x90:
+        case 0xA0:
+        case 0xB0:
+        case 0xE0:
+                buf[position++] = b;
+                buf[position++] = (b >> 8) & 0x7F;
+                buf[position++] = (b >> 16) & 0x7F;
+                break;
+        case 0xC0:
+        case 0xD0:
+                buf[position++] = b;
+                buf[position++] = (b >> 8) & 0x7F;
+                break;
+        default:
+                fprintf(stderr, "Unknown : %08x\n", b);
+                break;
+        }
+        write(device, buf, position);
+}
+
 #elif defined(USE_TIMIDITY)
 
 static int connect_to_timidity(int port)

readme.txt

@@ -20 +20 @@
 
 GCC:
 ----
+* If you need to, to change music settings, edit the file 'Makefile' as per the instructions for either raw midi output or timidity output later in this readme
 * Type make (or gmake if that's what GNU make is called on your system) and
 hopefully ScummVM will compile for you.
 
@@ -42 +43 @@
 Ctrl-s shows memory consumption.
 
 
-Playing sound with Timidity:
+Playing music in Unix with a raw midi device (/dev/midi):
+----------------------------------------------------------
+Edit the Makefile and make sure on the line "DEFINES", there is -DUSE_RAWMIDI listed. If there is -DUSE_TIMIDITY, replace it (unless you want to use timidity for music -- i.e. your soundcard does not have a working midi device).
+Compile scummvm by typing "make" (or possibly "gmake" depending on your system configuration)
+Before you run scummvm, make sure you have the environment variable SCUMMVM_MIDI set to your midi device (usually /dev/midi). In bash, this is done as follows
+
+$ SCUMMVM_MIDI="/dev/midi" && export SCUMMVM_MIDI
+
+Then you can run scummvm, and hopefully you will hear music out your midi device
+
+
+Playing music in Unix with Timidity:
 ----------------------------
+Edit the Makefile and make sure on the line "DEFINES" there is -DUSE_TIMIDITY listed. If there is -DUSE_RAWMIDI, replace it (unless you want to use a raw midi device for music)
+Compile scummvm by typing "make" (or possibly "gmake" depending on youru system configuration)
 Start Timidity with the following command line :
 
 $ timidity -irv 7777
@@ -53 +67 @@
 
 Good Luck,
 Ludvig Strigeus
-
-
-
-
-
-
-
-
-
-
-