From eeff08aac40ce8c43c49d512a51643ea47330436 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 3 Feb 2016 17:27:01 -0500 Subject: [PATCH] mackie: use bus shortname in send subview. Also slightly tighten route name display --- libs/surfaces/mackie/strip.cc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libs/surfaces/mackie/strip.cc b/libs/surfaces/mackie/strip.cc index 82ec45226e..84d949cfd1 100644 --- a/libs/surfaces/mackie/strip.cc +++ b/libs/surfaces/mackie/strip.cc @@ -395,15 +395,12 @@ Strip::show_route_name () } else { fullname = _route->name(); } - string line1; if (fullname.length() <= 6) { - line1 = fullname; + pending_display[0] = fullname; } else { - line1 = PBD::short_version (fullname, 6); + pending_display[0] = PBD::short_version (fullname, 6); } - - pending_display[0] = line1; } void @@ -1751,7 +1748,7 @@ Strip::setup_sends_vpot (boost::shared_ptr r) pc->Changed.connect (subview_connections, MISSING_INVALIDATOR, boost::bind (&Strip::notify_send_level_change, this, BusSendLevel, global_pos, false), ui_context()); _vpot->set_control (pc); - pending_display[0] = r->send_name (global_pos); + pending_display[0] = PBD::short_version (r->send_name (global_pos), 6); notify_send_level_change (BusSendLevel, global_pos, true); }