Change order of midi entries so a new backend will default to a working midi system.

Needs testing on all platforms.

diff --git a/libs/backends/alsa/alsa_audiobackend.cc b/libs/backends/alsa/alsa_audiobackend.cc
index 812d9813bcdd7a02ed1a773b50769f26cf17890a..8090ac8c9db8d22f51175904736293db511c7a66 100644 (file)
--- a/libs/backends/alsa/alsa_audiobackend.cc
+++ b/libs/backends/alsa/alsa_audiobackend.cc
@@ -409,9 +409,9 @@ std::vector<std::string>
 AlsaAudioBackend::enumerate_midi_options () const
 {
        if (_midi_options.empty()) {
-               _midi_options.push_back (_("None"));
                _midi_options.push_back (_("ALSA raw devices"));
                _midi_options.push_back (_("ALSA sequencer"));
+               _midi_options.push_back (_("None"));
        }
        return _midi_options;
 }

diff --git a/libs/backends/dummy/dummy_audiobackend.cc b/libs/backends/dummy/dummy_audiobackend.cc
index a2e632ea6a49ec8638d383f93b722465c41c485d..790056b5e81ed693602239c2f9c8525db28a1108 100644 (file)
--- a/libs/backends/dummy/dummy_audiobackend.cc
+++ b/libs/backends/dummy/dummy_audiobackend.cc
@@ -319,13 +319,13 @@ std::vector<std::string>
 DummyAudioBackend::enumerate_midi_options () const
 {
        if (_midi_options.empty()) {
-               _midi_options.push_back (_("No MIDI I/O"));
                _midi_options.push_back (_("1 in, 1 out, Silence"));
                _midi_options.push_back (_("2 in, 2 out, Silence"));
                _midi_options.push_back (_("8 in, 8 out, Silence"));
                _midi_options.push_back (_("Midi Event Generators"));
                _midi_options.push_back (_("8 in, 8 out, Loopback"));
                _midi_options.push_back (_("MIDI to Audio, Loopback"));
+               _midi_options.push_back (_("No MIDI I/O"));
        }
        return _midi_options;
 }

diff --git a/libs/backends/jack/jack_utils.cc b/libs/backends/jack/jack_utils.cc
index cda7a6d8e780b12b451f496faf56f5e6b5fe4914..981c0d4b869384cf2c9b755bfeb3a56c10ff2c5e 100644 (file)
--- a/libs/backends/jack/jack_utils.cc
+++ b/libs/backends/jack/jack_utils.cc
@@ -960,12 +960,12 @@ ARDOUR::enumerate_midi_options ()
 
        vector<string> v;
 
-       v.push_back (get_none_string());
-
        for (MidiOptions::const_iterator i = midi_options.begin(); i != midi_options.end(); ++i) {
                v.push_back (i->first);
        }
 
+       v.push_back (get_none_string());
+
        return v;
 }
 

diff --git a/libs/backends/wavesaudio/waves_audiobackend.midi.cc b/libs/backends/wavesaudio/waves_audiobackend.midi.cc
index f77a288624fa17e01acbcf867531171cc850f105..0fa88e9df390832784523471add88ff64bff9f71 100644 (file)
--- a/libs/backends/wavesaudio/waves_audiobackend.midi.cc
+++ b/libs/backends/wavesaudio/waves_audiobackend.midi.cc
@@ -27,11 +27,11 @@ using namespace ARDOUR;
 
 #ifdef __APPLE__
 
-const std::vector<std::string> WavesAudioBackend::__available_midi_options = boost::assign::list_of ("None") ("CoreMIDI");
+const std::vector<std::string> WavesAudioBackend::__available_midi_options = boost::assign::list_of ("CoreMIDI") ("None");
 
 #elif PLATFORM_WINDOWS
 
-const std::vector<std::string> WavesAudioBackend::__available_midi_options = boost::assign::list_of ("None") ("Multimedia Extensions");
+const std::vector<std::string> WavesAudioBackend::__available_midi_options = boost::assign::list_of ("Multimedia Extensions") ("None");
 
 #endif
 
@@ -48,11 +48,11 @@ int
 WavesAudioBackend::set_midi_option (const std::string& option)
 {
     // COMMENTED DBG LOGS */ std::cout << "WavesAudioBackend::set_midi_option ( " << option << " )" << std::endl;
-    if (option == __available_midi_options[0]) {
+    if (option == __available_midi_options[1]) {
         _use_midi = false;
         // COMMENTED DBG LOGS */ std::cout << "\tNO MIDI system used)" << std::endl;
     }
-    else if (option == __available_midi_options[1]) {
+    else if (option == __available_midi_options[0]) {
         _use_midi = true;
         // COMMENTED DBG LOGS */ std::cout << "\tNO MIDI system used)" << std::endl;
     }