diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-10-15 20:56:55 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-10-15 20:56:55 +0000 |
| commit | 4b72c5851a17ba9813c453530382cce8d1897da4 (patch) | |
| tree | 62ede93553eac64bc6d45e9c1a346354bf3a6cdc | |
| parent | c7c11d2532b2652d89ca96c22e12a9c5390830fd (diff) | |
cross-port fix to generic MIDI control port choice from mixbus2
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@13283 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | libs/surfaces/generic_midi/generic_midi_control_protocol.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc index 3b784f4f67..db4cd39a83 100644 --- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc +++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc @@ -43,14 +43,11 @@ GenericMidiControlProtocol::GenericMidiControlProtocol (Session& s) { MIDI::Manager* mm = MIDI::Manager::instance(); - /* XXX it might be nice to run "control" through i18n, but thats a bit tricky because - 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(); } |