X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fvca_time_axis.cc;h=811437b5850af4d519c5f10b1004cd864c3b7a3b;hb=63a71c597af9e24feaa4090ae37a56c584c25095;hp=0c77fd66f844fbdd103a980fb1d8930a61a8a750;hpb=8ceab4e193bb451607b68bdf892b79893b399d1a;p=ardour.git

diff --git a/gtk2_ardour/vca_time_axis.cc b/gtk2_ardour/vca_time_axis.cc
index 0c77fd66f8..811437b585 100644
--- a/gtk2_ardour/vca_time_axis.cc
+++ b/gtk2_ardour/vca_time_axis.cc
@@ -17,7 +17,7 @@
 
 */
 
-#include "pbd/convert.h"
+#include "pbd/string_convert.h"
 
 #include "ardour/mute_control.h"
 #include "ardour/profile.h"
@@ -33,7 +33,7 @@
 #include "ui_config.h"
 #include "vca_time_axis.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace ARDOUR_UI_UTILS;
@@ -83,6 +83,9 @@ VCATimeAxisView::VCATimeAxisView (PublicEditor& ed, Session* s, ArdourCanvas::Ca
 	spill_button.show ();
 	gain_meter.get_gain_slider().show ();
 
+	controls_ebox.set_name ("ControlMasterBaseUnselected");
+	time_axis_frame.set_name ("ControlMasterBaseUnselected");
+
 	s->config.ParameterChanged.connect (*this, invalidator (*this), boost::bind (&VCATimeAxisView::parameter_changed, this, _1), gui_context());
 	Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&VCATimeAxisView::parameter_changed, this, _1), gui_context());
 	UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (*this, &VCATimeAxisView::parameter_changed));
@@ -152,7 +155,7 @@ VCATimeAxisView::set_vca (boost::shared_ptr<VCA> v)
 	mute_button.set_controllable (_vca->mute_control());
 
 	/* VCA number never changes */
-	number_label.set_text (to_string (_vca->number(), std::dec));
+	number_label.set_text (PBD::to_string (_vca->number()));
 
 	set_height (preset_height (HeightNormal));
 
@@ -174,7 +177,7 @@ VCATimeAxisView::vca_property_changed (PropertyChange const & what_changed)
 void
 VCATimeAxisView::update_vca_name ()
 {
-	name_label.set_text (_vca->name());
+	name_label.set_text (_vca->full_name());
 }
 
 void
@@ -308,13 +311,13 @@ VCATimeAxisView::set_height (uint32_t h, TrackHeightMode m)
 bool
 VCATimeAxisView::marked_for_display () const
 {
-	return !_vca->presentation_info().hidden();
+	return _vca && !_vca->presentation_info().hidden();
 }
 
 bool
 VCATimeAxisView::set_marked_for_display (bool yn)
 {
-	if (yn == _vca->presentation_info().hidden()) {
+	if (_vca && (yn == _vca->presentation_info().hidden())) {
 		_vca->presentation_info().set_hidden (!yn);
 		return true; // things changed
 	}