manually apply d697a31abf2fa1b0bedcab025188f03611920fdf from master (git could not...

[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..e1435f7a8dae4dc65e479a11ebe6d9237b123bf2 100644 (file)
--- a/gtk2_ardour/ardour_ui_options.cc
+++ b/gtk2_ardour/ardour_ui_options.cc
@@ -29,6 +29,8 @@
 #include "ardour/rc_configuration.h"
 #include "ardour/session.h"
 
+#include "canvas/wave_view.h"
+
 #include "audio_clock.h"
 #include "ardour_ui.h"
 #include "actions.h"
@@ -307,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));
@@ -399,14 +399,23 @@ 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) {
-                       meter_box.show();
-                       editor_meter_peak_display.show();
-               } else if (editor_meter && !show) {
-                       meter_box.hide();
-                       editor_meter_peak_display.hide();
+
+               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();
+                       } 
                }
        }
 }