ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

unhardcode "ardour:" port-prefix

This commit is contained in:
Robin Gareus 2015-12-21 18:54:34 +01:00
parent 3be59616e8
commit 7edd521afe
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/mixer_strip.cc
View File

@ -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("/");

2
gtk2_ardour/monitor_section.cc
View File

@ -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("/");

9
gtk2_ardour/route_ui.cc
View File

@ -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 ();
}

2
gtk2_ardour/route_ui.h
View File

@ -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 &);