diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-03-25 16:03:31 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-03-25 16:03:31 +0000 |
| commit | ac5bbf4b99635a71093f859e233ad5fe4b07453b (patch) | |
| tree | 01b3760b07835a56144d78b52d6fdc65d0910213 /libs | |
| parent | f1b0f30cd5d72e16084e4f4305e4bb5877311b2c (diff) | |
use correct (RCConfig-based) name for MIDI port in generic MIDI control stuff; make monitor section track configuration params that apply to it; add use-monitor-bus option to rc option editor
git-svn-id: svn://localhost/ardour2/branches/3.0@6797 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/surfaces/generic_midi/generic_midi_control_protocol.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc index 08c0e7a125..5d5fe2ae3a 100644 --- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc +++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc @@ -36,6 +36,7 @@ #include "ardour/session.h" #include "ardour/route.h" #include "ardour/midi_ui.h" +#include "ardour/rc_configuration.h" #include "generic_midi_control_protocol.h" #include "midicontrollable.h" @@ -61,10 +62,12 @@ GenericMidiControlProtocol::GenericMidiControlProtocol (Session& s) the name is defined in ardour.rc which is likely not internationalized. */ - _port = mm->port (X_("control")); + _port = mm->port (Config->get_midi_port_name()); if (_port == 0) { - error << _("no MIDI port named \"control\" exists - generic MIDI control disabled") << endmsg; + error << string_compose (_("no MIDI port named \"%1\" exists - generic MIDI control disabled"), + Config->get_midi_port_name()) + << endmsg; throw failed_constructor(); } |