no more edit point clock (except SAE version, but who knows why or even if)

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@5928 d708f5d6-7413-0410-9779-e7cbd77b26cf

4 files changed, 11 insertions, 14 deletions

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 5fd90e1068..7a8340bfad 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -3046,7 +3046,9 @@ Editor::setup_toolbar ()
 	edit_point_selector.signal_changed().connect (mem_fun(*this, &Editor::edit_point_selection_done));
 	ARDOUR_UI::instance()->tooltips().set_tip (edit_point_selector, _("Edit point"));
 
-	snap_box.pack_start (edit_point_clock, false, false);
+	if (Profile->get_sae()) {
+		snap_box.pack_start (edit_point_clock, false, false);
+	}
 	snap_box.pack_start (snap_mode_selector, false, false);
 	snap_box.pack_start (snap_type_selector, false, false);
 	snap_box.pack_start (edit_point_selector, false, false);
diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index 6517d7de85..80c8b34a29 100644
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -1214,12 +1214,14 @@ Editor::marker_selection_changed ()
 		(*x)->show_line ();
 	}
 
-	edit_point_clock.set (selection->markers.front()->position());
+	if (Profile->get_sae()) {
+		edit_point_clock.set (selection->markers.front()->position());
+	}
 
 	bool ignored;
 	Location* loc = find_location_from_marker (selection->markers.front(), ignored);
 
-	if (loc) {
+	if (loc && Profile->get_sae()) {
 		edit_point_clock_connection_a = loc->changed.connect (mem_fun (*this, &Editor::selected_marker_moved));
 		edit_point_clock_connection_b = loc->start_changed.connect (mem_fun (*this, &Editor::selected_marker_moved));
 	}
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 83bb3bd5c6..490112d430 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -2627,7 +2627,9 @@ Editor::marker_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 		abort();
 	}
 
-	edit_point_clock.set (drag_info.copied_locations.front()->start());
+	if (Profile->get_sae()) {
+		edit_point_clock.set (drag_info.copied_locations.front()->start());
+	}
 	show_verbose_time_cursor (newframe, 10);
 
 #ifdef GTKOSX
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 6f4fa592b5..a024661006 100644
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -787,16 +787,7 @@ Mixer_UI::set_auto_rebinding( bool val )
 void 
 Mixer_UI::toggle_auto_rebinding() 
 {
-	if (auto_rebinding)
-	{
-		set_auto_rebinding( FALSE );
-	}
-	
-	else
-	{
-		set_auto_rebinding( TRUE );
-	}
-
+	set_auto_rebinding (!auto_rebinding);
 	auto_rebind_midi_controls();
 }