summaryrefslogtreecommitdiff
path: root/libs/canvas
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2015-12-16 10:28:17 -0500
committerPaul Davis <paul@linuxaudiosystems.com>2015-12-16 10:28:17 -0500
commit2992506652a20d14540ccdcc2afa3858ce08aa73 (patch)
treea260703dabf05b130e59fe00523a68298b590f43 /libs/canvas
parent90f64364cb3f088e0136a336829f63e468f13528 (diff)
disable threaded waveview rendering.
This will be re-enabled once 4.5 has been released
Diffstat (limited to 'libs/canvas')
-rw-r--r--libs/canvas/wave_view.cc9
1 files changed, 8 insertions, 1 deletions
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<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));