update track-header width when track-number visibility is toggled
[ardour.git] / gtk2_ardour / ardour_ui_options.cc
index 8cfc787ceea159dae58afd88989d3ee880e717f8..a8be3ccd0cfb63b56c7579840fc38651344370e3 100644 (file)
@@ -29,9 +29,7 @@
 #include "ardour/rc_configuration.h"
 #include "ardour/session.h"
 
-#ifdef HAVE_LIBLO
-#include "ardour/osc.h"
-#endif
+#include "canvas/wave_view.h"
 
 #include "audio_clock.h"
 #include "ardour_ui.h"
@@ -60,7 +58,7 @@ ARDOUR_UI::toggle_external_sync()
 {
        if (_session) {
                if (_session->config.get_video_pullup() != 0.0f) {
-                       if (Config->get_sync_source() == JACK) {
+                       if (Config->get_sync_source() == Engine) {
                                MessageDialog msg (
                                        _("It is not possible to use JACK as the the sync source\n\
 when the pull up/down setting is non-zero."));
@@ -69,6 +67,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 +79,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));
        }
 }
 
@@ -311,8 +309,6 @@ ARDOUR_UI::setup_session_options ()
 void
 ARDOUR_UI::parameter_changed (std::string p)
 {
-       ENSURE_GUI_THREAD (*this, &ARDOUR_UI::parameter_changed, p)
-
        if (p == "external-sync") {
 
                ActionManager::map_some_state ("Transport", "ToggleExternalSync", sigc::mem_fun (_session->config, &SessionConfiguration::get_external_sync));
@@ -321,16 +317,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") {
+       } 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") {
 
@@ -340,16 +338,6 @@ ARDOUR_UI::parameter_changed (std::string p)
 
                ActionManager::map_some_state ("options", "SendMMC", &RCConfiguration::get_send_mmc);
 
-       } else if (p == "use-osc") {
-
-#ifdef HAVE_LIBLO
-               if (Config->get_use_osc()) {
-                       osc->start ();
-               } else {
-                       osc->stop ();
-               }
-#endif
-
        } else if (p == "keep-tearoffs") {
                ActionManager::map_some_state ("Common", "KeepTearoffs", &RCConfiguration::get_keep_tearoffs);
        } else if (p == "mmc-control") {
@@ -376,14 +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 ();
-
        } 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();
@@ -407,6 +391,34 @@ 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 ();
+       } else if (p == "waveform-gradient-depth") {
+               ArdourCanvas::WaveView::set_global_gradient_depth (config()->get_waveform_gradient_depth());
+       } else if (p == "show-editor-meter") {
+               bool show = Config->get_show_editor_meter();
+
+               if (editor_meter) {
+                       if (meter_box.get_parent()) {
+                               transport_tearoff_hbox.remove (meter_box);
+                               transport_tearoff_hbox.remove (editor_meter_peak_display);
+                       }
+
+                       if (show) {
+                               transport_tearoff_hbox.pack_start (meter_box, false, false);
+                               transport_tearoff_hbox.pack_start (editor_meter_peak_display, false, false);
+                               meter_box.show();
+                               editor_meter_peak_display.show();
+                       } 
+               }
+       } else if (p == "waveform-scale") {
+               ArdourCanvas::WaveView::set_global_logscaled (Config->get_waveform_scale() == Logarithmic);
+       } else if (p == "waveform-shape") {
+               ArdourCanvas::WaveView::set_global_shape (Config->get_waveform_shape() == Rectified
+                               ? ArdourCanvas::WaveView::Rectified : ArdourCanvas::WaveView::Normal);
+       } else if (p == "show-waveform-clipping") {
+               ArdourCanvas::WaveView::set_global_show_waveform_clipping (ARDOUR_UI::config()->get_show_waveform_clipping());
        }
 }
 
@@ -415,6 +427,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;
        }
 }
 
@@ -450,7 +477,7 @@ ARDOUR_UI::synchronize_sync_source_and_video_pullup ()
                act->set_sensitive (true);
        } else {
                /* can't sync to JACK if video pullup != 0.0 */
-               if (Config->get_sync_source() == JACK) {
+               if (Config->get_sync_source() == Engine) {
                        act->set_sensitive (false);
                } else {
                        act->set_sensitive (true);