From 2992506652a20d14540ccdcc2afa3858ce08aa73 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 16 Dec 2015 10:28:17 -0500 Subject: [PATCH] disable threaded waveview rendering. This will be re-enabled once 4.5 has been released --- libs/canvas/wave_view.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libs/canvas/wave_view.cc b/libs/canvas/wave_view.cc index a193e8c339..3d70527120 100644 --- a/libs/canvas/wave_view.cc +++ b/libs/canvas/wave_view.cc @@ -73,6 +73,8 @@ WaveView::DrawingRequestQueue WaveView::request_queue; PBD::Signal0 WaveView::VisualPropertiesChanged; PBD::Signal0 WaveView::ClipLevelChanged; +#undef ENABLE_THREADED_WAVEFORM_RENDERING + WaveView::WaveView (Canvas* c, boost::shared_ptr region) : Item (c) , _region (region) @@ -835,7 +837,12 @@ WaveView::get_image (framepos_t start, framepos_t end, bool& full_image) const if (!ret || !full_image) { - if ((rendered && get_image_in_thread) || always_get_image_in_thread) { +#ifndef ENABLE_THREADED_WAVEFORM_RENDERING + if (1) +#else + if ((rendered && get_image_in_thread) || always_get_image_in_thread) +#endif + { DEBUG_TRACE (DEBUG::WaveView, string_compose ("%1: generating image in caller thread\n", name));