From 714677f036fba26df47f2ffd2547447838b3b9b3 Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Tue, 3 Mar 2015 15:52:44 -0600 Subject: Change order of midi entries so a new backend will default to a working midi system. Needs testing on all platforms. --- libs/backends/alsa/alsa_audiobackend.cc | 2 +- libs/backends/dummy/dummy_audiobackend.cc | 2 +- libs/backends/jack/jack_utils.cc | 4 ++-- libs/backends/wavesaudio/waves_audiobackend.midi.cc | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'libs/backends') diff --git a/libs/backends/alsa/alsa_audiobackend.cc b/libs/backends/alsa/alsa_audiobackend.cc index ade04b5c30..d1b28fa560 100644 --- a/libs/backends/alsa/alsa_audiobackend.cc +++ b/libs/backends/alsa/alsa_audiobackend.cc @@ -409,9 +409,9 @@ std::vector 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 2aa2f485b8..ff6a66db3a 100644 --- a/libs/backends/dummy/dummy_audiobackend.cc +++ b/libs/backends/dummy/dummy_audiobackend.cc @@ -317,13 +317,13 @@ std::vector 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 cda7a6d8e7..981c0d4b86 100644 --- a/libs/backends/jack/jack_utils.cc +++ b/libs/backends/jack/jack_utils.cc @@ -960,12 +960,12 @@ ARDOUR::enumerate_midi_options () vector 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 f77a288624..0fa88e9df3 100644 --- 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 WavesAudioBackend::__available_midi_options = boost::assign::list_of ("None") ("CoreMIDI"); +const std::vector WavesAudioBackend::__available_midi_options = boost::assign::list_of ("CoreMIDI") ("None"); #elif PLATFORM_WINDOWS -const std::vector WavesAudioBackend::__available_midi_options = boost::assign::list_of ("None") ("Multimedia Extensions"); +const std::vector 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; } -- cgit v1.2.3