smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 03:36:32 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
Needs testing on all platforms.
This commit is contained in:
Ben Loftis 2015-03-03 15:52:44 -06:00
parent a2d1f894b0
commit e3dd226ffa
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/backends/alsa/alsa_audiobackend.cc
View file

@ -409,9 +409,9 @@ std::vector<std::string>
AlsaAudioBackend::enumerate_midi_options () const AlsaAudioBackend::enumerate_midi_options () const
{ {
if (_midi_options.empty()) { if (_midi_options.empty()) {
_midi_options.push_back (_("None"));
_midi_options.push_back (_("ALSA raw devices")); _midi_options.push_back (_("ALSA raw devices"));
_midi_options.push_back (_("ALSA sequencer")); _midi_options.push_back (_("ALSA sequencer"));
_midi_options.push_back (_("None"));
} }
return _midi_options; return _midi_options;
} }

2
libs/backends/dummy/dummy_audiobackend.cc
View file

@ -319,13 +319,13 @@ std::vector<std::string>
DummyAudioBackend::enumerate_midi_options () const DummyAudioBackend::enumerate_midi_options () const
{ {
if (_midi_options.empty()) { 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 (_("1 in, 1 out, Silence"));
_midi_options.push_back (_("2 in, 2 out, Silence")); _midi_options.push_back (_("2 in, 2 out, Silence"));
_midi_options.push_back (_("8 in, 8 out, Silence")); _midi_options.push_back (_("8 in, 8 out, Silence"));
_midi_options.push_back (_("Midi Event Generators")); _midi_options.push_back (_("Midi Event Generators"));
_midi_options.push_back (_("8 in, 8 out, Loopback")); _midi_options.push_back (_("8 in, 8 out, Loopback"));
_midi_options.push_back (_("MIDI to Audio, Loopback")); _midi_options.push_back (_("MIDI to Audio, Loopback"));
_midi_options.push_back (_("No MIDI I/O"));
} }
return _midi_options; return _midi_options;
} }

4
libs/backends/jack/jack_utils.cc
View file

@ -960,12 +960,12 @@ ARDOUR::enumerate_midi_options ()
vector<string> v; vector<string> v;
v.push_back (get_none_string());
for (MidiOptions::const_iterator i = midi_options.begin(); i != midi_options.end(); ++i) { for (MidiOptions::const_iterator i = midi_options.begin(); i != midi_options.end(); ++i) {
v.push_back (i->first); v.push_back (i->first);
} }
v.push_back (get_none_string());
return v; return v;
} }

8
libs/backends/wavesaudio/waves_audiobackend.midi.cc
View file

@ -27,11 +27,11 @@ using namespace ARDOUR;
#ifdef __APPLE__ #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 #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 #endif
@ -48,11 +48,11 @@ int
WavesAudioBackend::set_midi_option (const std::string& option) WavesAudioBackend::set_midi_option (const std::string& option)
{ {
// COMMENTED DBG LOGS */ std::cout << "WavesAudioBackend::set_midi_option ( " << option << " )" << std::endl; // 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; _use_midi = false;
// COMMENTED DBG LOGS */ std::cout << "\tNO MIDI system used)" << std::endl; // 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; _use_midi = true;
// COMMENTED DBG LOGS */ std::cout << "\tNO MIDI system used)" << std::endl; // COMMENTED DBG LOGS */ std::cout << "\tNO MIDI system used)" << std::endl;
} }