Ticket #8860: midicfg_V4.patch

backends/midi/windows.cpp

@@ -30 +30 @@
 
 #include "sound/musicplugin.h"
 #include "sound/mpu401.h"
+#include "common/config-manager.h"
 
 #include <mmsystem.h>
 
@@ -45 +46 @@
         byte _streamBuffer[256];        // SysEx blocks should be no larger than 256 bytes
         HANDLE _streamEvent;
         HMIDIOUT _mo;
+        UINT _dev;
         bool _isOpen;
 
         void check_error(MMRESULT result);
@@ -54 +56 @@
         int open();
         void close();
         void send(uint32 b);
+        uint32 property(int prop, uint32 param);
         void sysEx(const byte *msg, uint16 length);
 };
 
@@ -62 +65 @@
                 return MERR_ALREADY_OPEN;
 
         _streamEvent = CreateEvent(NULL, true, true, NULL);
-        MMRESULT res = midiOutOpen((HMIDIOUT *)&_mo, MIDI_MAPPER, (unsigned long)_streamEvent, 0, CALLBACK_EVENT);
+        MMRESULT res = midiOutOpen((HMIDIOUT *)&_mo, _dev, (unsigned long)_streamEvent, 0, CALLBACK_EVENT);
         if (res != MMSYSERR_NOERROR) {
                 check_error(res);
                 CloseHandle(_streamEvent);
@@ -97 +100 @@
         check_error(midiOutShortMsg(_mo, u.dwData));
 }
 
+uint32 MidiDriver_WIN::property(int prop, uint32 param) {
+        if (prop == PROP_DEVICE) {
+                _dev = param;   
+                return 1;
+        }
+        
+        return 0;
+}
+
 void MidiDriver_WIN::sysEx(const byte *msg, uint16 length) {
         if (!_isOpen)
                 return;
@@ -163 +175 @@
 
 MusicDevices WindowsMusicPlugin::getDevices() const {
         MusicDevices devices;
-        // TODO: Return a different music type depending on the configuration
-        // TODO: List the available devices
-        devices.push_back(MusicDevice(this, "", MT_GM));
+
+        uint32 numDevs = midiOutGetNumDevs();
+        MIDIOUTCAPS tmp;
+
+        for (int i = 0; i < numDevs; i++) {
+                if (midiOutGetDevCaps(i, &tmp, sizeof(MIDIOUTCAPS)) != MMSYSERR_NOERROR)
+                        break;
+                // there is no way to detect the "MusicType" so I just set it to MT_GM
+                devices.push_back(MusicDevice(this, tmp.szPname, MT_GM));
+        }
         return devices;
 }
 
 PluginError WindowsMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
         *mididriver = new MidiDriver_WIN();
+        uint32 dev = 0;
 
+        if (ConfMan.hasKey("music_driver")) {
+                const Common::String drv = ConfMan.get("music_driver");
+                const MusicPlugin::List p = MusicMan.getPlugins();
+                int id = 0;
+                for (MusicPlugin::List::const_iterator m = p.begin(); m != p.end(); m++) {
+                        if (id != -1) {
+                                id = 0;
+                                MusicDevices i = (**m)->getDevices();                           
+                                for (MusicDevices::iterator d = i.begin(); d != i.end(); d++) {
+                                        if (drv.equals(d->getCompleteName())) {                                         
+                                                (*mididriver)->property(MidiDriver::PROP_DEVICE, id);
+                                                id = -1;                                                                                
+                                                break;
+                                        }
+                                        id++;
+                                }
+                        }
+                }
+                if (id != -1)
+                        // midi device turned off or whatever
+                        (*mididriver)->property(MidiDriver::PROP_DEVICE, 0);            
+        } else {
+                (*mididriver)->property(MidiDriver::PROP_DEVICE, 0);
+        }
+
         return kNoError;
 }
 

gui/options.cpp

@@ -38 +38 @@
 
 #include "graphics/scaler.h"
 
-#include "sound/mididrv.h"
+#include "sound/musicplugin.h"
 #include "sound/mixer.h"
 
 namespace GUI {
@@ -167 +167 @@
         // Audio options
         if (_midiPopUp) {
                 // Music driver
-                const MidiDriverDescription *md = MidiDriver::getAvailableMidiDrivers();
-                int i = 0;
-                const int midiDriver =
-                        ConfMan.hasKey("music_driver", _domain)
-                                ? MidiDriver::parseMusicDriver(ConfMan.get("music_driver", _domain))
-                                : MD_AUTO;
-                while (md->name && md->id != midiDriver) {
-                        i++;
-                        md++;
+                if (ConfMan.hasKey("music_driver", _domain)) {
+                        const Common::String drv = ConfMan.get("music_driver", _domain);
+                        const MusicPlugin::List p = MusicMan.getPlugins();
+                        int id = 0;
+                        for (MusicPlugin::List::const_iterator m = p.begin(); m != p.end(); m++) {
+                                if (id != -1) {
+                                        MusicDevices i = (**m)->getDevices();
+                                        if (drv.equals((**m)->getId())) {
+                                                // Backwards compatibility: If the config file only
+                                                // stores the id we just set the default device
+                                                _midiPopUp->setSelected(id);
+                                                id = -1;
+                                        } else {
+                                                for (MusicDevices::iterator d = i.begin(); d != i.end(); d++) {
+                                                        if (drv.equals(d->getCompleteName())) {
+                                                                _midiPopUp->setSelected(id);
+                                                                id = -1;                                                                                                
+                                                                break;
+                                                        }
+                                                        id++;
+                                                }
+                                        }
+                                }
+                        }
+                        if (id != -1)
+                                // midi device turned off or whatever
+                                _midiPopUp->setSelected(0);                     
+                } else {
+                        _midiPopUp->setSelected(0);
                 }
-                _midiPopUp->setSelected(md->name ? i : 0);
         }
 
         if (_outputRatePopUp) {
@@ -302 +321 @@
                 // Audio options
                 if (_midiPopUp) {
                         if (_enableAudioSettings) {
-                                const MidiDriverDescription *md = MidiDriver::getAvailableMidiDrivers();
-                                while (md->name && md->id != (int)_midiPopUp->getSelectedTag())
-                                        md++;
-                                if (md->name)
-                                        ConfMan.set("music_driver", md->name, _domain);
-                                else
+                                const MusicPlugin::List p = MusicMan.getPlugins();
+                                int id = 0;
+                                for (MusicPlugin::List::const_iterator m = p.begin(); m != p.end(); m++) {
+                                        if (id != -1) {
+                                                MusicDevices i = (**m)->getDevices();
+                                                for (MusicDevices::iterator d = i.begin(); d != i.end(); d++) {
+                                                        if (id == _midiPopUp->getSelectedTag()) {
+                                                                ConfMan.set("music_driver", d->getCompleteName(), _domain);
+                                                                id = -1;
+                                                                break;
+                                                        }
+                                                        id++;                                           
+                                                }
+                                        }
+                                }
+
+                                if (id != -1)
                                         ConfMan.removeKey("music_driver", _domain);
-                        } else {
-                                ConfMan.removeKey("music_driver", _domain);
                         }
                 }
 
@@ -543 +571 @@
         _midiPopUp = new PopUpWidget(boss, prefix + "auMidiPopup", "Music driver:", labelWidth);
 
         // Populate it
-        const MidiDriverDescription *md = MidiDriver::getAvailableMidiDrivers();
-        while (md->name) {
-                _midiPopUp->appendEntry(md->description, md->id);
-                md++;
+        const MusicPlugin::List p = MusicMan.getPlugins();
+        int id = 0;
+        for (MusicPlugin::List::const_iterator m = p.begin(); m != p.end(); m++) {
+                MusicDevices i = (**m)->getDevices();
+                for (MusicDevices::iterator d = i.begin(); d != i.end(); d++)
+                        _midiPopUp->appendEntry(d->getCompleteName(), id++);
         }
 
         // Sample rate settings

sound/mididrv.cpp

@@ -29 +29 @@
 #include "common/system.h"
 #include "common/util.h"
 #include "sound/mididrv.h"
+#include "sound/musicplugin.h"
 
 /** Internal list of all available 'midi' drivers. */
 static const MidiDriverDescription s_musicDrivers[] = {
@@ -169 +170 @@
 
 int MidiDriver::detectMusicDriver(int flags) {
         // Query the selected music driver (defaults to MD_AUTO).
-        const MidiDriverDescription &md = findMusicDriver(ConfMan.get("music_driver"));
-        int musicDriver = md.id;
+        MusicDevice md = MusicMan.findMusicDevice(ConfMan.get("music_driver"));
 
+        // temporary "solution" since it isn't obvious to me whether
+        // detectMusicDriver() and those MidiDriverFlags will be
+        // kept or removed
         // Check whether the selected music driver is compatible with the
-        // given flags.
-        if (! (md.flags & flags))
-                musicDriver = MD_AUTO;
+        // given flags. 
+        int musicDriver = MD_AUTO;
+        switch (md.getMusicType()) {
+                case MT_PCSPK:
+                case MT_PCJR:
+                        musicDriver = MD_PCJR;
+                        break;
+                case MT_ADLIB:
+                        musicDriver = MD_ADLIB;
+                        break;
+                case MT_TOWNS:
+                        musicDriver = MD_TOWNS;
+                        break;
+                case MT_GM:
+                case MT_MT32:
+                case MT_GS:
+                        musicDriver     = getDefaultMIDIDriver();
+                        break;
+                default:
+                        break;
+        }
 
         // If the selected driver is MD_AUTO, we try to determine
         // a suitable and "optimal" music driver.

sound/mididrv.h

@@ -159 +159 @@
         enum {
 //              PROP_TIMEDIV = 1,
                 PROP_OLD_ADLIB = 2,
-                PROP_CHANNEL_MASK = 3
+                PROP_CHANNEL_MASK = 3,
+                PROP_DEVICE = 4
         };
 
         /**

sound/musicplugin.cpp

@@ -25 +25 @@
 
 #include "sound/musicplugin.h"
 
+MusicDevice MusicManager::findMusicDevice(const Common::String &str) const {
+        const MusicPlugin::List p = getPlugins();
+        for (MusicPlugin::List::const_iterator m = p.begin(); m != p.end(); m++) {
+                MusicDevices i = (**m)->getDevices();
+                for (MusicDevices::iterator d = i.begin(); d != i.end(); d++) {
+                        if (str.equals(d->getMusicDriverId()) || str.equals(d->getCompleteName()))
+                                return *&*d;
+                }
+        }
+        return MusicDevice((MusicPluginObject const *)0, Common::String(""), (MusicType) 0);
+}
+
 MusicDevice::MusicDevice(MusicPluginObject const *musicPlugin, Common::String name, MusicType mt) :
         _musicDriverName(musicPlugin->getName()), _musicDriverId(musicPlugin->getId()),
         _name(name), _type(mt) {

sound/musicplugin.h

@@ -119 +119 @@
 
 public:
         const MusicPlugin::List &getPlugins() const;
+        
+        /**
+         * Find the music driver matching the given driver name/description.
+         */
+        MusicDevice findMusicDevice(const Common::String &str) const;
 };
 
 /** Convenience shortcut for accessing the Music manager. */