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

Merge branch 'cache_fixes' of https://github.com/nmains/ardour into cairocanvas

Browse source
This commit is contained in:
Paul Davis 2014-06-17 11:35:13 -04:00
commit 47efeb9f21
2 changed files with 33 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libs/canvas/canvas/wave_view.h
View file

@ -58,13 +58,18 @@ public:
int channel;
Coord height;
float amplitude;
Color fill_color;
Color outline_color;
framepos_t start;
framepos_t end;
Cairo::RefPtr<Cairo::ImageSurface> image;
CacheEntry() :
channel (0), height (0), amplitude(0), start (0), end (0), image (0) {}
CacheEntry(int chan, Coord hght, float amp, framepos_t strt, framepos_t ed, Cairo::RefPtr<Cairo::ImageSurface> img) :
channel (chan), height (hght), amplitude (amp), start (strt), end (ed), image (img) {}
channel (0), height (0), amplitude(0), fill_color (0),
outline_color (0), start (0), end (0), image (0) {}
CacheEntry(int chan, Coord hght, float amp, Color fcol, Color ocol,
framepos_t strt, framepos_t ed, Cairo::RefPtr<Cairo::ImageSurface> img) :
channel (chan), height (hght), amplitude (amp), fill_color (fcol),
outline_color (ocol), start (strt), end (ed), image (img) {}
};
/* Displays a single channel of waveform data for the given Region.

30
libs/canvas/wave_view.cc
View file

@ -223,7 +223,12 @@ WaveView::invalidate_image_cache ()
for (uint32_t i = 0; i < caches.size (); ++i) {
if (_channel != caches[i].channel || _height != caches[i].height || _region_amplitude != caches[i].amplitude) {
if (_channel != caches[i].channel
|| _height != caches[i].height
|| _region_amplitude != caches[i].amplitude
|| _fill_color != caches[i].fill_color
|| _outline_color != caches[i].outline_color) {
continue;
}
@ -258,7 +263,12 @@ WaveView::consolidate_image_cache () const
for (uint32_t i = 0; i < caches.size (); ++i) {
if (_channel != caches[i].channel || _height != caches[i].height || _region_amplitude != caches[i].amplitude) {
if (_channel != caches[i].channel
|| _height != caches[i].height
|| _region_amplitude != caches[i].amplitude
|| _fill_color != caches[i].fill_color
|| _outline_color != caches[i].outline_color) {
other_entries++;
continue;
}
@ -268,7 +278,12 @@ WaveView::consolidate_image_cache () const
for (uint32_t j = i; j < caches.size (); ++j) {
if (i == j || _channel != caches[j].channel || _height != caches[i].height || _region_amplitude != caches[i].amplitude) {
if (i == j || _channel != caches[j].channel
|| _height != caches[i].height
|| _region_amplitude != caches[i].amplitude
|| _fill_color != caches[i].fill_color
|| _outline_color != caches[i].outline_color) {
continue;
}
@ -546,7 +561,12 @@ WaveView::get_image (Cairo::RefPtr<Cairo::ImageSurface>& image, framepos_t start
*/
for (uint32_t i = 0; i < caches.size (); ++i) {
if (_channel != caches[i].channel || _height != caches[i].height || _region_amplitude != caches[i].amplitude) {
if (_channel != caches[i].channel
|| _height != caches[i].height
|| _region_amplitude != caches[i].amplitude
|| _fill_color != caches[i].fill_color
|| _outline_color != caches[i].outline_color) {
continue;
}
@ -589,7 +609,7 @@ WaveView::get_image (Cairo::RefPtr<Cairo::ImageSurface>& image, framepos_t start
draw_image (image, peaks.get(), n_peaks);
_image_cache[_region->audio_source ()].push_back (CacheEntry (_channel, _height, _region_amplitude, sample_start, sample_end, image));
_image_cache[_region->audio_source ()].push_back (CacheEntry (_channel, _height, _region_amplitude, _fill_color, _outline_color, sample_start, sample_end, image));
image_offset = (sample_start - _region->start()) / _samples_per_pixel;