disable threaded waveview rendering.

This will be re-enabled once 4.5 has been released

diff --git a/libs/canvas/wave_view.cc b/libs/canvas/wave_view.cc
index a193e8c33945fd64a6e316c88c15bbf6e1b84bbb..3d70527120eea7a90b173db804e487a9826a7f3e 100644 (file)
--- a/libs/canvas/wave_view.cc
+++ b/libs/canvas/wave_view.cc
@@ -73,6 +73,8 @@ WaveView::DrawingRequestQueue WaveView::request_queue;
 PBD::Signal0<void> WaveView::VisualPropertiesChanged;
 PBD::Signal0<void> WaveView::ClipLevelChanged;
 
+#undef ENABLE_THREADED_WAVEFORM_RENDERING
+
 WaveView::WaveView (Canvas* c, boost::shared_ptr<ARDOUR::AudioRegion> 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));