Uncrustify (no functional changes).

[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 8bd250829242676ce271c8eb025af4def1cefa5d..aee08f13b57f9c3fc654ff0515a3d7cda189f637 100644 (file)
--- a/gtk2_ardour/ardour_ui_options.cc
+++ b/gtk2_ardour/ardour_ui_options.cc
@@ -29,6 +29,7 @@
 #include "ardour/configuration.h"
 #include "ardour/session.h"
 #include "ardour/audioengine.h"
+#include "ardour/rc_configuration.h"
 
 #ifdef HAVE_LIBLO
 #include "ardour/osc.h"
@@ -57,19 +58,19 @@ ARDOUR_UI::toggle_keep_tearoffs ()
 void
 ARDOUR_UI::toggle_external_sync()
 {
-        if (_session) {
-                if (_session->config.get_video_pullup() != 0.0f) {
-                        if (_session->config.get_sync_source() == JACK) {
-                                MessageDialog msg (_(
-"It is not possible to use JACK as the the sync source\n\
+       if (_session) {
+               if (_session->config.get_video_pullup() != 0.0f) {
+                       if (_session->config.get_sync_source() == JACK) {
+                               MessageDialog msg (
+                                       _("It is not possible to use JACK as the the sync source\n\
 when the pull up/down setting is non-zero."));
-                                msg.run ();
-                                return;
-                        }
-                }
+                               msg.run ();
+                               return;
+                       }
+               }
                                                                    
-                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));
-        }
+               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));
+       }
 }
 
 void
@@ -330,7 +331,7 @@ ARDOUR_UI::parameter_changed (std::string p)
                        ActionManager::get_action ("Transport", "ToggleAutoPlay")->set_sensitive (true);
                        ActionManager::get_action ("Transport", "ToggleAutoReturn")->set_sensitive (true);
                } else {
-                       sync_button.set_label (sync_source_to_string (_session->config.get_sync_source()));
+                       sync_button.set_label (sync_source_to_string (_session->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);
@@ -413,15 +414,19 @@ ARDOUR_UI::parameter_changed (std::string p)
                }
        } else if (p == "video-pullup" || p == "timecode-format") {
 
-                synchronize_sync_source_and_video_pullup ();
+               synchronize_sync_source_and_video_pullup ();
                reset_main_clocks ();
 
-        } else if (p == "sync-source") {
+       } else if (p == "sync-source") {
 
-                synchronize_sync_source_and_video_pullup ();
+               synchronize_sync_source_and_video_pullup ();
 
        } else if (p == "show-track-meters") {
                editor->toggle_meter_updating();
+       } else if (p == "primary-clock-delta-edit-cursor") {
+               primary_clock.set_is_duration (Config->get_primary_clock_delta_edit_cursor());
+       } else if (p == "secondary-clock-delta-edit-cursor") {
+               secondary_clock.set_is_duration (Config->get_secondary_clock_delta_edit_cursor());
        }
 }
 
@@ -442,39 +447,39 @@ ARDOUR_UI::reset_main_clocks ()
 void
 ARDOUR_UI::synchronize_sync_source_and_video_pullup ()
 {
-        Glib::RefPtr<Action> act = ActionManager::get_action (X_("Transport"), X_("ToggleExternalSync"));
-
-        if (!act) {
-                return;
-        }
-
-        if (!_session) {
-                goto just_label;
-        }
-
-        if (_session->config.get_video_pullup() == 0.0f) {
-                /* with no video pull up/down, any sync source is OK */
-                act->set_sensitive (true);
-        } else {
-                /* can't sync to JACK if video pullup != 0.0 */
-                if (_session->config.get_sync_source() == JACK) {
-                        act->set_sensitive (false);
-                } else {
-                        act->set_sensitive (true);
-                }
-        }
-
-        /* XXX should really be able to set the video pull up
-           action to insensitive/sensitive, but there is no action.
-           FIXME
-        */
+       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Transport"), X_("ToggleExternalSync"));
+
+       if (!act) {
+               return;
+       }
+
+       if (!_session) {
+               goto just_label;
+       }
+
+       if (_session->config.get_video_pullup() == 0.0f) {
+               /* with no video pull up/down, any sync source is OK */
+               act->set_sensitive (true);
+       } else {
+               /* can't sync to JACK if video pullup != 0.0 */
+               if (_session->config.get_sync_source() == JACK) {
+                       act->set_sensitive (false);
+               } else {
+                       act->set_sensitive (true);
+               }
+       }
+
+       /* XXX should really be able to set the video pull up
+          action to insensitive/sensitive, but there is no action.
+          FIXME
+       */
 
   just_label:
-        if (act->get_sensitive ()) {
-                set_tip (sync_button, _("Enable/Disable external positional sync"));
-        } else {
-                set_tip (sync_button, _("Sync to JACK is not possible: video pull up/down is set"));
-        }
+       if (act->get_sensitive ()) {
+               set_tip (sync_button, _("Enable/Disable external positional sync"));
+       } else {
+               set_tip (sync_button, _("Sync to JACK is not possible: video pull up/down is set"));
+       }
 
 }