ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

global one-time setup of waveform preferences.

Browse Source 
see note in previous commit.
This commit is contained in:
Robin Gareus 2014-05-27 00:34:27 +02:00
parent a8f11b6004
commit cadf07e362
3 changed files with 7 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk2_ardour/ardour_ui_options.cc
View File

@ -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());
}
}

34
gtk2_ardour/audio_region_view.cc
View File

@ -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 ();
}
}

3
gtk2_ardour/audio_region_view.h
View File

@ -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.