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

change location for initialization of static WaveView image cache, and provide a visible method to set the cache flush threshold

Browse source
This commit is contained in:
Paul Davis 2015-06-23 08:17:48 -04:00
parent 239052759f
commit 424f6539b4
2 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -276,6 +276,8 @@ public:
static void start_drawing_thread (); static void start_drawing_thread ();
static void stop_drawing_thread (); static void stop_drawing_thread ();
static void set_image_cache_size (uint64_t);
#ifdef CANVAS_COMPATIBILITY #ifdef CANVAS_COMPATIBILITY
void*& property_gain_src () { void*& property_gain_src () {
return _foo_void; return _foo_void;

26
libs/canvas/wave_view.cc
View file

@ -93,6 +93,10 @@ WaveView::WaveView (Canvas* c, boost::shared_ptr<ARDOUR::AudioRegion> region)
, always_get_image_in_thread (false) , always_get_image_in_thread (false)
, rendered (false) , rendered (false)
{ {
if (!images) {
images = new WaveViewCache;
}
VisualPropertiesChanged.connect_same_thread (invalidation_connection, boost::bind (&WaveView::handle_visual_property_change, this)); VisualPropertiesChanged.connect_same_thread (invalidation_connection, boost::bind (&WaveView::handle_visual_property_change, this));
ClipLevelChanged.connect_same_thread (invalidation_connection, boost::bind (&WaveView::handle_clip_level_change, this)); ClipLevelChanged.connect_same_thread (invalidation_connection, boost::bind (&WaveView::handle_clip_level_change, this));
@ -123,6 +127,10 @@ WaveView::WaveView (Item* parent, boost::shared_ptr<ARDOUR::AudioRegion> region)
, always_get_image_in_thread (false) , always_get_image_in_thread (false)
, rendered (false) , rendered (false)
{ {
if (!images) {
images = new WaveViewCache;
}
VisualPropertiesChanged.connect_same_thread (invalidation_connection, boost::bind (&WaveView::handle_visual_property_change, this)); VisualPropertiesChanged.connect_same_thread (invalidation_connection, boost::bind (&WaveView::handle_visual_property_change, this));
ClipLevelChanged.connect_same_thread (invalidation_connection, boost::bind (&WaveView::handle_clip_level_change, this)); ClipLevelChanged.connect_same_thread (invalidation_connection, boost::bind (&WaveView::handle_clip_level_change, this));
@ -724,10 +732,6 @@ WaveView::cache_request_result (boost::shared_ptr<WaveViewThreadRequest> req) co
req->start, req->start,
req->end, req->end,
req->image)); req->image));
if (!images) {
images = new WaveViewCache;
}
images->add (_region->audio_source (_channel), ret); images->add (_region->audio_source (_channel), ret);
/* consolidate cache first (removes fully-contained /* consolidate cache first (removes fully-contained
@ -1426,6 +1430,16 @@ WaveView::cancel_my_render_request () const
current_request.reset (); current_request.reset ();
} }
void
WaveView::set_image_cache_size (uint64_t sz)
{
if (!images) {
images = new WaveViewCache;
}
images->set_image_cache_threshold (sz);
}
/*-------------------------------------------------*/ /*-------------------------------------------------*/
void void
@ -1736,6 +1750,8 @@ WaveViewCache::cache_flush ()
if (*c == le.second) { if (*c == le.second) {
DEBUG_TRACE (DEBUG::WaveView, string_compose ("Removing cache line entry for %1\n", x->first->name()));
/* Remove this entry from this cache line */ /* Remove this entry from this cache line */
cl.erase (c); cl.erase (c);
@ -1756,6 +1772,7 @@ WaveViewCache::cache_flush ()
} else { } else {
image_cache_size = 0; image_cache_size = 0;
} }
DEBUG_TRACE (DEBUG::WaveView, string_compose ("cache shrunk to %1\n", image_cache_size));
} }
/* Remove from the linear list, even if we didn't find it in /* Remove from the linear list, even if we didn't find it in
@ -1768,6 +1785,7 @@ WaveViewCache::cache_flush ()
void void
WaveViewCache::set_image_cache_threshold (uint64_t sz) WaveViewCache::set_image_cache_threshold (uint64_t sz)
{ {
DEBUG_TRACE (DEBUG::WaveView, string_compose ("new image cache size \n", sz));
_image_cache_threshold = sz; _image_cache_threshold = sz;
cache_flush (); cache_flush ();
} }