diff options
| author | Robin Gareus <robin@gareus.org> | 2015-09-02 14:28:26 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-09-02 14:28:26 +0200 |
| commit | 93aa8d3734d5165d87034cfae222e492f4f2e7ff (patch) | |
| tree | 0c38e7be077171f5beb3e10de88a35c8b5e45799 /libs/canvas/wave_view.cc | |
| parent | fa32fa1abe76d6fc363789fc406881b78b002832 (diff) | |
waveform, mutex for _current_image
may be used in render-thread while invalidate_image_cache() is called.
possible fix for #6478
Diffstat (limited to 'libs/canvas/wave_view.cc')
| -rw-r--r-- | libs/canvas/wave_view.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libs/canvas/wave_view.cc b/libs/canvas/wave_view.cc index a06ec1090a..6fab308a54 100644 --- a/libs/canvas/wave_view.cc +++ b/libs/canvas/wave_view.cc @@ -65,6 +65,7 @@ double WaveView::_clip_level = 0.98853; WaveViewCache* WaveView::images = 0; gint WaveView::drawing_thread_should_quit = 0; Glib::Threads::Mutex WaveView::request_queue_lock; +Glib::Threads::Mutex WaveView::current_image_lock; Glib::Threads::Cond WaveView::request_cond; Glib::Threads::Thread* WaveView::_drawing_thread = 0; WaveView::DrawingRequestQueue WaveView::request_queue; @@ -263,6 +264,7 @@ WaveView::invalidate_image_cache () { DEBUG_TRACE (DEBUG::WaveView, string_compose ("%1 invalidates image cache and cancels current request\n", this)); cancel_my_render_request (); + Glib::Threads::Mutex::Lock lci (current_image_lock); _current_image.reset (); } @@ -1119,6 +1121,7 @@ WaveView::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) cons double image_origin_in_self_coordinates; boost::shared_ptr<WaveViewCache::Entry> image_to_draw; + Glib::Threads::Mutex::Lock lci (current_image_lock); if (_current_image) { /* check it covers the right sample range */ @@ -1181,6 +1184,7 @@ WaveView::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) cons double draw_width; if (image_to_draw != _current_image) { + lci.release (); /* the image is guaranteed to start at or before * draw_start. But if it starts before draw_start, that reduces |