diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-08 13:01:47 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-08 13:01:47 -0400 |
| commit | c22e96522d9275db4b1b4ba8edddbda5e7f798b9 (patch) | |
| tree | 82d456a7409517b77a1c4e0d3599a2fb21ef0124 /gtk2_ardour | |
| parent | 84873140695a97c21f9be1edd80b27817ee9b526 (diff) | |
| parent | e495577f98ac8d4d0d429766f6b898501471db37 (diff) | |
Merge branch 'waveview_caching_for_upstream' of https://github.com/nmains/ardour into cairocanvas
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/audio_region_view.cc | 1 | ||||
| -rw-r--r-- | gtk2_ardour/time_axis_view_item.cc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index c24facb8e4..966b77af87 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -1164,6 +1164,7 @@ AudioRegionView::create_one_wave (uint32_t which, bool /*direct*/) wave->set_height (ht); wave->set_samples_per_pixel (samples_per_pixel); wave->set_show_zero_line (true); + wave->set_clip_level (Config->get_waveform_clip_level ()); switch (Config->get_waveform_shape()) { case Rectified: diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index 0ae4ec72f2..987e541144 100644 --- a/gtk2_ardour/time_axis_view_item.cc +++ b/gtk2_ardour/time_axis_view_item.cc @@ -936,6 +936,7 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width) _width = pixel_width; manage_name_highlight (); + manage_name_text (); if (pixel_width < 2.0) { |