X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_time_axis.cc;h=f291af5dc58f286e3c95c0ce781c427f57b92ff3;hb=537272b3b17d010e888249335f6c8c2ef450b7ba;hp=986a274ee620bad34ec1bf53bba77ce56e86f387;hpb=106851b33a52b122cdded8fa2dd03c47bac955a9;p=ardour.git

diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 986a274ee6..f291af5dc5 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -191,8 +191,6 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
 			gm.set_fader_name ("AudioTrackFader");
                 }
 
-		rec_enable_button->set_sensitive (_session->writable());
-
 		/* set playlist button tip to the current playlist, and make it update when it changes */
 		update_playlist_tip ();
 		track()->PlaylistChanged.connect (*this, invalidator (*this), ui_bind(&RouteTimeAxisView::update_playlist_tip, this), gui_context());
@@ -1825,13 +1823,12 @@ RouteTimeAxisView::map_frozen ()
 	switch (track()->freeze_state()) {
 	case Track::Frozen:
 		playlist_button.set_sensitive (false);
-		rec_enable_button->set_sensitive (false);
 		break;
 	default:
 		playlist_button.set_sensitive (true);
-		rec_enable_button->set_sensitive (true);
 		break;
 	}
+	RouteUI::map_frozen ();
 }
 
 void
@@ -2496,7 +2493,11 @@ RouteTimeAxisView::can_edit_name () const
 {
 	/* we do not allow track name changes if it is record enabled
 	 */
-	return !_route->record_enabled();
+	boost::shared_ptr<Track> trk (boost::dynamic_pointer_cast<Track> (_route));
+	if (!trk) {
+		return true;
+	}
+	return !trk->rec_enable_control()->get_value();
 }
 
 void
@@ -2646,7 +2647,7 @@ RouteTimeAxisView::set_underlay_state()
 			continue;
 		}
 
-		XMLProperty* prop = child_node->property ("id");
+		XMLProperty const * prop = child_node->property ("id");
 		if (prop) {
 			PBD::ID id (prop->value());
 
@@ -2688,7 +2689,7 @@ RouteTimeAxisView::add_underlay (StreamView* v, bool /*update_xml*/)
 			}
 
 			XMLNode* node = underlay_xml_node->add_child("Underlay");
-			XMLProperty* prop = node->add_property("id");
+			XMLProperty const * prop = node->add_property("id");
 			prop->set_value(v->trackview().route()->id().to_s());
 		}
 #endif
@@ -2727,7 +2728,7 @@ RouteTimeAxisView::remove_underlay (StreamView* v)
 void
 RouteTimeAxisView::set_button_names ()
 {
-	if (_route && _route->solo_safe()) {
+	if (_route && _route->solo_safe_control()->solo_safe()) {
 		solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive));
 	} else {
 		solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() & ~Gtkmm2ext::Insensitive));