ardour/livetrax
13
0
Fork 0
Code

reinstate absent image.

Browse Source 
Then go back to bed and be ill some more.
This commit is contained in:
Paul Davis 2015-06-01 21:08:42 -04:00
parent e0fcd18ec6
commit 95c991ba35
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libs/canvas/wave_view.cc
View File

@ -850,7 +850,6 @@ WaveView::generate_image (boost::shared_ptr<WaveViewThreadRequest> req, bool in_
framepos_t sample_start = max (_region_start, (center - image_samples));
framepos_t sample_end = min (center + image_samples, region_end());
const int n_peaks = llrintf ((sample_end - sample_start)/ (req->samples_per_pixel));
boost::scoped_array<ARDOUR::PeakData> peaks (new PeakData[n_peaks]);
@ -860,27 +859,29 @@ WaveView::generate_image (boost::shared_ptr<WaveViewThreadRequest> req, bool in_
the Region itself.
*/
_region->read_peaks (peaks.get(), n_peaks,
sample_start, sample_end - sample_start,
req->channel,
req->samples_per_pixel);
framecnt_t peaks_read = _region->read_peaks (peaks.get(), n_peaks,
sample_start, sample_end - sample_start,
req->channel,
req->samples_per_pixel);
// apply waveform amplitude zoom multiplier
for (int i = 0; i < n_peaks; ++i) {
peaks[i].max *= _amplitude_above_axis;
peaks[i].min *= _amplitude_above_axis;
}
req->image = Cairo::ImageSurface::create (Cairo::FORMAT_ARGB32, n_peaks, req->height);
/* make sure we record the sample positions that were actually used */
req->start = sample_start;
req->end = sample_end;
draw_image (req->image, peaks.get(), n_peaks, req);
if (peaks_read > 0) {
for (framecnt_t i = 0; i < peaks_read; ++i) {
peaks[i].max *= _amplitude_above_axis;
peaks[i].min *= _amplitude_above_axis;
}
draw_image (req->image, peaks.get(), n_peaks, req);
} else {
draw_absent_image (req->image, peaks.get(), n_peaks);
}
}
if (in_render_thread && !req->should_stop()) {