smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 15:25:01 +01:00
Code Issues Projects Releases Wiki Activity

attempt to correctly respond to changes in _amplitude_above_axis in ArdourCanvas::WaveView

Browse source
This commit is contained in:
Paul Davis 2015-06-18 09:00:15 -04:00
parent 2e29e7ee62
commit bace0e85dc
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libs/canvas/wave_view.cc
View file

@ -399,7 +399,7 @@ WaveView::draw_image (Cairo::RefPtr<Cairo::ImageSurface>& image, PeakData* _peak
has been scaled by scale_amplitude() already. has been scaled by scale_amplitude() already.
*/ */
const double clip_level = _clip_level * _region_amplitude; const double clip_level = _clip_level * req->amplitude;
if (_shape == WaveView::Rectified) { if (_shape == WaveView::Rectified) {
@ -737,6 +737,7 @@ WaveView::draw_image (Cairo::RefPtr<Cairo::ImageSurface>& image, PeakData* _peak
boost::shared_ptr<WaveViewCache::Entry> boost::shared_ptr<WaveViewCache::Entry>
WaveView::cache_request_result (boost::shared_ptr<WaveViewThreadRequest> req) const WaveView::cache_request_result (boost::shared_ptr<WaveViewThreadRequest> req) const
{ {
boost::shared_ptr<WaveViewCache::Entry> ret (new WaveViewCache::Entry (req->channel, boost::shared_ptr<WaveViewCache::Entry> ret (new WaveViewCache::Entry (req->channel,
req->height, req->height,
req->amplitude, req->amplitude,
@ -983,6 +984,12 @@ WaveView::generate_image (boost::shared_ptr<WaveViewThreadRequest> req, bool in_
if (peaks_read > 0) { if (peaks_read > 0) {
/* region amplitude will have been used to generate the
* peak values already, but not the visual-only
* amplitude_above_axis. So apply that here before
* rendering.
*/
if (_amplitude_above_axis != 1.0) { if (_amplitude_above_axis != 1.0) {
for (framecnt_t i = 0; i < n_peaks; ++i) { for (framecnt_t i = 0; i < n_peaks; ++i) {
peaks[i].max *= _amplitude_above_axis; peaks[i].max *= _amplitude_above_axis;