Ticket #9056: scummvm_midi_device.patch

backends/midi/windows.cpp

@@ -30 +30 @@
 
 #include "sound/musicplugin.h"
 #include "sound/mpu401.h"
+#include "common/config-manager.h"
 
 #include <mmsystem.h>
 
@@ -46 +47 @@
         HANDLE _streamEvent;
         HMIDIOUT _mo;
         bool _isOpen;
+        UINT _device;
 
         void check_error(MMRESULT result);
 
 public:
-        MidiDriver_WIN() : _isOpen(false) { }
+        MidiDriver_WIN(UINT device = MIDI_MAPPER) : _device(device), _isOpen(false) { }
         int open();
         void close();
         void send(uint32 b);
@@ -61 +63 @@
         if (_isOpen)
                 return MERR_ALREADY_OPEN;
 
+        if(_device < 0 || _device >= midiOutGetNumDevs())
+                _device = MIDI_MAPPER;
+
         _streamEvent = CreateEvent(NULL, true, true, NULL);
-        MMRESULT res = midiOutOpen((HMIDIOUT *)&_mo, MIDI_MAPPER, (DWORD_PTR)_streamEvent, 0, CALLBACK_EVENT);
+        MMRESULT res = midiOutOpen((HMIDIOUT *)&_mo, _device, (DWORD_PTR)_streamEvent, 0, CALLBACK_EVENT);
         if (res != MMSYSERR_NOERROR) {
                 check_error(res);
                 CloseHandle(_streamEvent);
@@ -170 +175 @@
 }
 
 Common::Error WindowsMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
-        *mididriver = new MidiDriver_WIN();
 
+        *mididriver = new MidiDriver_WIN(ConfMan.getInt("midi_device"));
         return Common::kNoError;
 }
 

base/commandLine.cpp

@@ -100 +100 @@
         "  --extrapath=PATH         Extra path to additional game data\n"
         "  --soundfont=FILE         Select the SoundFont for MIDI playback (only\n"
         "                           supported by some MIDI drivers)\n"
+
+#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
+        "  --midi-device=DEVICE     Select a specific midi device\n"
+#endif
         "  --multi-midi             Enable combination AdLib and native MIDI\n"
         "  --native-mt32            True Roland MT-32 (disable GM emulation)\n"
         "  --enable-gs              Enable Roland GS mode for MIDI playback\n"
@@ -167 +171 @@
         ConfMan.registerDefault("sfx_mute", false);
         ConfMan.registerDefault("speech_mute", false);
 
+#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
+        ConfMan.registerDefault("midi_device", -1);
+#endif
         ConfMan.registerDefault("multi_midi", false);
         ConfMan.registerDefault("native_mt32", false);
         ConfMan.registerDefault("enable_gs", false);
@@ -445 +452 @@
                         DO_LONG_OPTION_BOOL("disable-sdl-parachute")
                         END_OPTION
 
+#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
+                        DO_LONG_OPTION_INT("midi-device")
+                        END_OPTION
+#endif
+
                         DO_LONG_OPTION_BOOL("multi-midi")
                         END_OPTION