diff options
| author | Robin Gareus <robin@gareus.org> | 2014-05-27 00:34:27 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2014-05-27 16:37:01 +0200 |
| commit | cadf07e362684fc74e5541181d451600767e928d (patch) | |
| tree | 1aca1b755206e47e2ee89f6cff832f67d6777c33 /gtk2_ardour | |
| parent | a8f11b6004bfd247dd192ef642bffa0a0b46f80f (diff) | |
global one-time setup of waveform preferences.
see note in previous commit.
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/ardour_ui_options.cc | 7 | ||||
| -rw-r--r-- | gtk2_ardour/audio_region_view.cc | 34 | ||||
| -rw-r--r-- | gtk2_ardour/audio_region_view.h | 3 |
3 files changed, 7 insertions, 37 deletions
diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc index e1435f7a8d..365810df75 100644 --- a/gtk2_ardour/ardour_ui_options.cc +++ b/gtk2_ardour/ardour_ui_options.cc @@ -417,6 +417,13 @@ ARDOUR_UI::parameter_changed (std::string p) 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()); } } diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index 1d867a157e..49844425e6 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -215,7 +215,6 @@ AudioRegionView::init (Gdk::Color const & basic_color, bool wfd) set_colors (); setup_waveform_visibility (); - setup_waveform_shape (); if (frame_handle_start) { frame_handle_start->raise_to_top (); @@ -1259,33 +1258,6 @@ AudioRegionView::remove_gain_point_event (ArdourCanvas::Item *item, GdkEvent* /* audio_region()->envelope()->erase (cp->model()); } -void -AudioRegionView::setup_waveform_shape () -{ - WaveView::Shape shape; - - switch (Config->get_waveform_shape()) { - case Rectified: - shape = WaveView::Rectified; - break; - default: - shape = WaveView::Normal; - } - WaveView::set_global_shape (shape); -} - -void -AudioRegionView::setup_waveform_scale () -{ - WaveView::set_global_logscaled (Config->get_waveform_scale() == Logarithmic); -} - -void -AudioRegionView::setup_waveform_clipping () -{ - WaveView::set_global_show_waveform_clipping (ARDOUR_UI::config()->get_show_waveform_clipping()); -} - GhostRegion* AudioRegionView::add_ghost (TimeAxisView& tv) { @@ -1631,11 +1603,5 @@ AudioRegionView::parameter_changed (string const & p) { if (p == "show-waveforms") { setup_waveform_visibility (); - } else if (p == "waveform-scale") { - setup_waveform_scale (); - } else if (p == "waveform-shape") { - setup_waveform_shape (); - } else if (p == "show-waveform-clipping") { - setup_waveform_clipping (); } } diff --git a/gtk2_ardour/audio_region_view.h b/gtk2_ardour/audio_region_view.h index 0a737cd6a1..3c6b675692 100644 --- a/gtk2_ardour/audio_region_view.h +++ b/gtk2_ardour/audio_region_view.h @@ -208,9 +208,6 @@ private: void parameter_changed (std::string const &); void setup_waveform_visibility (); - void setup_waveform_shape (); - void setup_waveform_scale (); - void setup_waveform_clipping (); /** A ScopedConnection for each PeaksReady callback (one per channel). Each member * may be 0 if no connection exists. |