Merge branch 'nsm' of https://github.com/royvegard/ardour

[ardour.git] / gtk2_ardour / ardour_ui_options.cc

diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc
index 8e0066da0d738958b550e07227341113e62582c7..9b7f8fb178f9cda6b8d883cc93d56d78a88444ea 100644 (file)
--- a/gtk2_ardour/ardour_ui_options.cc
+++ b/gtk2_ardour/ardour_ui_options.cc
@@ -69,6 +69,8 @@ when the pull up/down setting is non-zero."));
                        }
                }
 
+               ActionManager::toggle_config_state_foo ("Transport", "ToggleExternalSync", sigc::mem_fun (_session->config, &SessionConfiguration::set_external_sync), sigc::mem_fun (_session->config, &SessionConfiguration::get_external_sync));
+
                /* activating a slave is a session-property.
                 * The slave type is a RC property.
                 * When the slave is active is must not be reconfigured.
@@ -79,8 +81,6 @@ when the pull up/down setting is non-zero."));
                 * status changed:
                 */
                Config->ParameterChanged("sync-source");
-
-               ActionManager::toggle_config_state_foo ("Transport", "ToggleExternalSync", sigc::mem_fun (_session->config, &SessionConfiguration::set_external_sync), sigc::mem_fun (_session->config, &SessionConfiguration::get_external_sync));
        }
 }
 
@@ -321,16 +321,18 @@ ARDOUR_UI::parameter_changed (std::string p)
                        sync_button.set_text (_("Internal"));
                        ActionManager::get_action ("Transport", "ToggleAutoPlay")->set_sensitive (true);
                        ActionManager::get_action ("Transport", "ToggleAutoReturn")->set_sensitive (true);
+                       ActionManager::get_action ("Transport", "ToggleFollowEdits")->set_sensitive (true);
                } else {
                        sync_button.set_text (sync_source_to_string (Config->get_sync_source(), true));
                        /* XXX need to make auto-play is off as well as insensitive */
                        ActionManager::get_action ("Transport", "ToggleAutoPlay")->set_sensitive (false);
                        ActionManager::get_action ("Transport", "ToggleAutoReturn")->set_sensitive (false);
+                       ActionManager::get_action ("Transport", "ToggleFollowEdits")->set_sensitive (false);
                }
 
        } else if (p == "always-play-range") {
 
-               ActionManager::map_some_state ("Transport", "AlwaysPlayRange", &RCConfiguration::get_always_play_range);
+               ActionManager::map_some_state ("Transport", "ToggleFollowEdits", &RCConfiguration::get_always_play_range);
 
        } else if (p == "send-mtc") {
 
@@ -380,6 +382,9 @@ ARDOUR_UI::parameter_changed (std::string p)
 
                synchronize_sync_source_and_video_pullup ();
                reset_main_clocks ();
+#ifdef WITH_VIDEOTIMELINE
+               editor->queue_visual_videotimeline_update();
+#endif
 
        } else if (p == "sync-source") {
 
@@ -407,6 +412,9 @@ ARDOUR_UI::parameter_changed (std::string p)
                        secondary_clock->set_editable (true);
                        secondary_clock->set_widget_name ("secondary");
                }
+       } else if (p == "super-rapid-clock-update") {
+               stop_clocking ();
+               start_clocking ();
        }
 }