X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui_options.cc;h=f0ec519775ead8dd10baa5d20564d8910b5e72f4;hb=8b230014412b90b78240685b16a8d4e624cc5ce6;hp=365810df75f0c3b3fc48d337958bdbddfb4bb995;hpb=23e7cf10191270d70357ccf0ed9294f020c7b7ab;p=ardour.git

diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc
index 365810df75..f0ec519775 100644
--- a/gtk2_ardour/ardour_ui_options.cc
+++ b/gtk2_ardour/ardour_ui_options.cc
@@ -326,9 +326,9 @@ ARDOUR_UI::parameter_changed (std::string p)
 			ActionManager::get_action ("Transport", "ToggleFollowEdits")->set_sensitive (false);
 		}
 
-	} else if (p == "always-play-range") {
+	} else if (p == "follow-edits") {
 
-		ActionManager::map_some_state ("Transport", "ToggleFollowEdits", &RCConfiguration::get_always_play_range);
+		ActionManager::map_some_state ("Transport", "ToggleFollowEdits", &RCConfiguration::get_follow_edits);
 
 	} else if (p == "send-mtc") {
 
@@ -364,15 +364,10 @@ ARDOUR_UI::parameter_changed (std::string p)
 		ActionManager::map_some_state ("Transport", "ToggleClick", &RCConfiguration::get_clicking);
 	} else if (p == "use-video-sync") {
 		ActionManager::map_some_state ("Transport",  "ToggleVideoSync", sigc::mem_fun (_session->config, &SessionConfiguration::get_use_video_sync));
-	} else if (p == "video-pullup" || p == "timecode-format") {
-
-		synchronize_sync_source_and_video_pullup ();
-		reset_main_clocks ();
-		editor->queue_visual_videotimeline_update();
-
 	} else if (p == "sync-source") {
 
 		synchronize_sync_source_and_video_pullup ();
+		set_fps_timeout_connection ();
 
 	} else if (p == "show-track-meters") {
 		editor->toggle_meter_updating();
@@ -397,8 +392,10 @@ ARDOUR_UI::parameter_changed (std::string p)
 			secondary_clock->set_widget_name ("secondary");
 		}
 	} else if (p == "super-rapid-clock-update") {
-		stop_clocking ();
-		start_clocking ();
+		if (_session) {
+			stop_clocking ();
+			start_clocking ();
+		}
 	} else if (p == "waveform-gradient-depth") {
 		ArdourCanvas::WaveView::set_global_gradient_depth (config()->get_waveform_gradient_depth());
 	} else if (p == "show-editor-meter") {
@@ -432,6 +429,21 @@ ARDOUR_UI::session_parameter_changed (std::string p)
 {
 	if (p == "native-file-data-format" || p == "native-file-header-format") {
 		update_format ();
+	} else if (p == "timecode-format") {
+		set_fps_timeout_connection ();
+	} else if (p == "video-pullup" || p == "timecode-format") {
+		set_fps_timeout_connection ();
+
+		synchronize_sync_source_and_video_pullup ();
+		reset_main_clocks ();
+		editor->queue_visual_videotimeline_update();
+	} else if (p == "track-name-number") {
+		/* DisplaySuspender triggers _route->redisplay() when going out of scope
+		 * which eventually calls reset_controls_layout_width() and re-sets the
+		 * track-header width.
+		 * see also RouteTimeAxisView::update_track_number_visibility()
+		 */
+		DisplaySuspender ds;
 	}
 }