fix conflicts caused by meterbridge merge

[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 9b7f8fb178f9cda6b8d883cc93d56d78a88444ea..15c58a8b8d3b1e151531a80b05c505761f2c965d 100644 (file)
--- a/gtk2_ardour/ardour_ui_options.cc
+++ b/gtk2_ardour/ardour_ui_options.cc
@@ -33,6 +33,8 @@
 #include "ardour/osc.h"
 #endif
 
+#include "canvas/wave_view.h"
+
 #include "audio_clock.h"
 #include "ardour_ui.h"
 #include "actions.h"
@@ -311,8 +313,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));
@@ -382,9 +382,7 @@ 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") {
 
@@ -415,6 +413,8 @@ ARDOUR_UI::parameter_changed (std::string p)
        } 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());
        }
 }