no renaming tracks that are record-enabled

git-svn-id: svn://localhost/ardour2/trunk@1751 d708f5d6-7413-0410-9779-e7cbd77b26cf

4 files changed, 22 insertions, 8 deletions

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 70e0a6aa18..8ac941e4e5 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -175,7 +175,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
 	bottom_button_table.set_col_spacings (0);
 	bottom_button_table.set_homogeneous (true);
 	bottom_button_table.attach (group_button, 0, 1, 0, 1);
-
+	
 	if (is_audio_track()) {
 		
 		rec_enable_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::rec_enable_press), false);
@@ -367,7 +367,7 @@ void
 MixerStrip::set_stuff_from_route ()
 {
 	XMLProperty *prop;
-	
+
 	ensure_xml_node ();
 
 	if ((prop = xml_node->property ("strip_width")) != 0) {
@@ -563,7 +563,7 @@ MixerStrip::input_press (GdkEventButton *ev)
 		msg.run ();
 		return true;
 	}
-	
+
 	switch (ev->button) {
 
 	case 1:
@@ -692,7 +692,7 @@ void
 MixerStrip::connect_to_pan ()
 {
 	ENSURE_GUI_THREAD(mem_fun(*this, &MixerStrip::connect_to_pan));
-	
+
 	panstate_connection.disconnect ();
 	panstyle_connection.disconnect ();
 
@@ -773,7 +773,8 @@ MixerStrip::output_changed (IOChange change, void *src)
 
 
 void 
-MixerStrip::comment_editor_done_editing() {
+MixerStrip::comment_editor_done_editing() 
+{
 	string str =  comment_area->get_buffer()->get_text();
 	if (_route->comment() != str) {
 		_route->set_comment (str, this);
@@ -973,12 +974,11 @@ void
 MixerStrip::build_route_ops_menu ()
 {
 	using namespace Menu_Helpers;
-
 	route_ops_menu = manage (new Menu);
 	route_ops_menu->set_name ("ArdourContextMenu");
 
 	MenuList& items = route_ops_menu->items();
-	
+
 	items.push_back (MenuElem (_("Rename"), mem_fun(*this, &RouteUI::route_rename)));
 	items.push_back (SeparatorElem());
 	items.push_back (CheckMenuElem (_("Active"), mem_fun (*this, &RouteUI::toggle_route_active)));
@@ -1003,6 +1003,11 @@ MixerStrip::name_button_button_press (GdkEventButton* ev)
 {
 	if (ev->button == 1) {
 		list_route_operations ();
+
+		Menu_Helpers::MenuList& items = route_ops_menu->items();
+		/* do not allow rename if the track is record-enabled */
+		static_cast<MenuItem*> (&items.front())->set_sensitive (!_route->record_enabled());
+
 		route_ops_menu->popup (1, ev->time);
 	}
 	return FALSE;
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 9769037461..f14aa53e71 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -1772,3 +1772,10 @@ RouteTimeAxisView::reset_redirect_automation_curves ()
 	}
 }
 
+void
+RouteTimeAxisView::update_rec_display ()
+{
+	RouteUI::update_rec_display ();
+	name_entry.set_sensitive (!_route->record_enabled());
+}
+		
diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h
index a72bc5a2cf..cf522df789 100644
--- a/gtk2_ardour/route_time_axis.h
+++ b/gtk2_ardour/route_time_axis.h
@@ -159,6 +159,8 @@ protected:
 	void route_name_changed (void *);
 	void name_entry_changed ();
 
+	void update_rec_display ();
+
 	virtual void label_view ();
 	
 	void add_edit_group_menu_item (ARDOUR::RouteGroup *, Gtk::RadioMenuItem::Group*);
diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h
index 465daf8ff3..2de7a5b025 100644
--- a/gtk2_ardour/route_ui.h
+++ b/gtk2_ardour/route_ui.h
@@ -145,7 +145,7 @@ class RouteUI : public virtual AxisView
 	void disconnect_input ();
 	void disconnect_output ();
 
-	void update_rec_display ();
+	virtual void update_rec_display ();
 	void update_mute_display ();
 
 	bool was_solo_safe;