diff options
| -rw-r--r-- | gtk2_ardour/mixer_strip.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/monitor_section.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/route_ui.cc | 9 | ||||
| -rw-r--r-- | gtk2_ardour/route_ui.h | 2 |
4 files changed, 13 insertions, 2 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 99bd730b9f..2b21f3ef29 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -1265,7 +1265,7 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt << Gtkmm2ext::markup_escape_text ( pn.empty() ? connection_name : pn ); } - if (connection_name.find("ardour:") == 0) { + if (connection_name.find(RouteUI::program_port_prefix) == 0) { if (ardour_track_name.empty()) { // "ardour:Master/in 1" -> "ardour:Master/" string::size_type slash = connection_name.find("/"); diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc index 6f7caf99e6..ed1e094fe0 100644 --- a/gtk2_ardour/monitor_section.cc +++ b/gtk2_ardour/monitor_section.cc @@ -1418,7 +1418,7 @@ MonitorSection::update_output_display () << Gtkmm2ext::markup_escape_text ( pn.empty() ? connection_name : pn ); } - if (connection_name.find("ardour:") == 0) { + if (connection_name.find(RouteUI::program_port_prefix) == 0) { if (ardour_track_name.empty()) { // "ardour:Master/in 1" -> "ardour:Master/" string::size_type slash = connection_name.find("/"); diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index 8afa706e37..a3fa56945d 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -17,6 +17,8 @@ */ +#include <boost/algorithm/string.hpp> + #include <gtkmm2ext/gtk_ui.h> #include <gtkmm2ext/choice.h> #include <gtkmm2ext/doi.h> @@ -71,6 +73,7 @@ using namespace std; uint32_t RouteUI::_max_invert_buttons = 3; PBD::Signal1<void, boost::shared_ptr<Route> > RouteUI::BusSendDisplayChanged; boost::weak_ptr<Route> RouteUI::_showing_sends_to; +std::string RouteUI::program_port_prefix; RouteUI::RouteUI (ARDOUR::Session* sess) : AxisView(sess) @@ -84,6 +87,12 @@ RouteUI::RouteUI (ARDOUR::Session* sess) , output_selector (0) , _invert_menu(0) { + if (program_port_prefix.empty()) { + // compare to gtk2_ardour/port_group.cc + string lpn (PROGRAM_NAME); + boost::to_lower (lpn); + program_port_prefix = lpn + ":"; // e.g. "ardour:" + } if (sess) init (); } diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h index 04ddf683e2..ff4d45300f 100644 --- a/gtk2_ardour/route_ui.h +++ b/gtk2_ardour/route_ui.h @@ -270,6 +270,8 @@ class RouteUI : public virtual AxisView virtual void bus_send_display_changed (boost::shared_ptr<ARDOUR::Route>); + static std::string program_port_prefix; + private: void check_rec_enable_sensitivity (); void parameter_changed (std::string const &); |