Merge branch 'master' into windows+cc

[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 0e28900450162f28e80d063720da5aa36095d9ac..199ff45ec42df29845e9ff54cc1532d4f38d6c0a 100644 (file)
--- a/gtk2_ardour/ardour_ui_options.cc
+++ b/gtk2_ardour/ardour_ui_options.cc
@@ -307,8 +307,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));
@@ -399,6 +397,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());
        } else if (p == "show-editor-meter") {
                bool show = Config->get_show_editor_meter();
                if (editor_meter && show) {