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

some slightly hackish changes to make it possible to use the new internal ALSA midi client (soon to become a driver, however)

Browse source
This commit is contained in:
Paul Davis 2013-10-10 16:54:46 -04:00
parent b194c1ad88
commit cf3d8d15f0
1 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -83,6 +83,7 @@ namespace {
const char * const dummy_driver_command_line_name = X_("dummy"); const char * const dummy_driver_command_line_name = X_("dummy");
// should we provide more "pretty" names like above? // should we provide more "pretty" names like above?
const char * const alsaint_midi_driver_name = X_("alsa");
const char * const alsaseq_midi_driver_name = X_("seq"); const char * const alsaseq_midi_driver_name = X_("seq");
const char * const alsaraw_midi_driver_name = X_("raw"); const char * const alsaraw_midi_driver_name = X_("raw");
const char * const winmme_midi_driver_name = X_("winmme"); const char * const winmme_midi_driver_name = X_("winmme");
@ -742,6 +743,13 @@ ARDOUR::get_jack_command_line_string (JackCommandLineOptions& options, string& c
} }
#endif #endif
if (options.driver == alsa_driver_name) {
if (options.midi_driver == alsaint_midi_driver_name) {
args.push_back ("-I");
args.push_back ("alsa_midi");
}
}
string command_line_driver_name; string command_line_driver_name;
if (!get_jack_command_line_audio_driver_name (options.driver, command_line_driver_name)) { if (!get_jack_command_line_audio_driver_name (options.driver, command_line_driver_name)) {
@ -852,9 +860,11 @@ ARDOUR::get_jack_command_line_string (JackCommandLineOptions& options, string& c
if (options.driver == alsa_driver_name || options.driver == coreaudio_driver_name) { if (options.driver == alsa_driver_name || options.driver == coreaudio_driver_name) {
if (!options.midi_driver.empty() && options.midi_driver != get_none_string ()) { if (options.midi_driver != alsaint_midi_driver_name) {
args.push_back ("-X"); if (!options.midi_driver.empty() && options.midi_driver != get_none_string ()) {
args.push_back (options.midi_driver); args.push_back ("-X");
args.push_back (options.midi_driver);
}
} }
} }
@ -911,8 +921,9 @@ ARDOUR::enumerate_midi_options ()
{ {
if (midi_options.empty()) { if (midi_options.empty()) {
#ifdef HAVE_ALSA #ifdef HAVE_ALSA
midi_options.push_back (make_pair (_("ALSA raw devices"), alsaraw_midi_driver_name)); midi_options.push_back (make_pair (_("ALSA"), alsaint_midi_driver_name));
midi_options.push_back (make_pair (_("ALSA sequencer"), alsaseq_midi_driver_name)); midi_options.push_back (make_pair (_("(legacy) ALSA raw devices"), alsaraw_midi_driver_name));
midi_options.push_back (make_pair (_("(legacy) ALSA sequencer"), alsaseq_midi_driver_name));
#endif #endif
#ifdef HAVE_PORTAUDIO #ifdef HAVE_PORTAUDIO
/* Windows folks: what name makes sense here? Are there other /* Windows folks: what name makes sense here? Are there other