X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_ui.cc;h=385279ac30e4123fdcea1d2a8caf298faca3362b;hb=70d246fbe30d24197781384fa4825f32fb0f4235;hp=e9ccea65c3eda908e7214f9322b1ad2d86aad1b8;hpb=6f306c98216a2901d45d1b5537d836d084673eb3;p=ardour.git

diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index e9ccea65c3..385279ac30 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -587,7 +587,7 @@ RouteUI::build_record_menu ()
                 using namespace Menu_Helpers;
                 MenuList& items = record_menu->items();
                 
-                items.push_back (CheckMenuElem (_("Step Edit"), sigc::mem_fun (*this, &RouteUI::toggle_step_edit)));
+                items.push_back (CheckMenuElem (_("Step Entry"), sigc::mem_fun (*this, &RouteUI::toggle_step_edit)));
                 step_edit_item = dynamic_cast<CheckMenuItem*> (&items.back());
 
                 if (_route->record_enabled()) {
@@ -1011,7 +1011,7 @@ RouteUI::update_mute_display ()
 		--_i_am_the_modifier;
 	}
 
-	mute_button->set_visual_state (mute_visual_state (_session, _route));
+        mute_button->set_visual_state (mute_visual_state (_session, _route));
 }
 
 void
@@ -1294,8 +1294,8 @@ RouteUI::ensure_xml_node ()
 			xml_node = new XMLNode ("GUI");
 			_route->add_extra_xml (*xml_node);
 		} else {
-			/* the Route has one, so it must have been loaded */
-			if (Stateful::loading_state_version < 3000) {
+			/* the Route has one; it may have been loaded */
+			if (Stateful::loading_state_version != 0 && Stateful::loading_state_version < 3000) {
 				/* the GUI extra XML is in 2.X format; we must convert it to the new
 				   format to avoid problems later
 				*/
@@ -1320,6 +1320,7 @@ RouteUI::ensure_xml_node ()
 				}
 
 				_route->add_extra_xml (*new_xml_node);
+				xml_node = new_xml_node;
 			}
 		}
 	}
@@ -1470,7 +1471,7 @@ RouteUI::toggle_route_active ()
 
 	if (route_active_menu_item) {
 		if (route_active_menu_item->get_active() != (yn = _route->active())) {
-			_route->set_active (!yn);
+			_route->set_active (!yn, this);
 		}
 	}
 }
@@ -1610,6 +1611,7 @@ RouteUI::save_as_template ()
 
 	p.set_title (_("Save As Template"));
 	p.set_prompt (_("Template name:"));
+	p.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
 	switch (p.run()) {
 	case RESPONSE_ACCEPT:
 		break;
@@ -1643,9 +1645,7 @@ RouteUI::parameter_changed (string const & p)
 {
 	if (p == "disable-disarm-during-roll") {
 		check_rec_enable_sensitivity ();
-	} else if (p == "solo-control-is-listen-control") {
-		set_button_names ();
-	} else if (p == "listen-position") {
+	} else if (p == "use-monitor-bus" || p == "solo-control-is-listen-control" || p == "listen-position") {
 		set_button_names ();
 	}
 }
@@ -1822,3 +1822,11 @@ RouteUI::invert_menu_toggled (uint32_t c)
 	
 	_route->set_phase_invert (c, !_route->phase_invert (c));
 }
+
+void
+RouteUI::set_invert_sensitive (bool yn)
+{
+        for (list<BindableToggleButton*>::iterator b = _invert_buttons.begin(); b != _invert_buttons.end(); ++b) {
+                (*b)->set_sensitive (yn);
+        }
+}