ardour/livetrax
13
0
Fork 0
Code

make threaded waveview rendering a configure time option (enabled by default)

Browse Source
This commit is contained in:
Paul Davis 2016-02-21 12:34:10 -05:00
parent 344cf05540
commit 2d18283379
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/canvas/wave_view.cc
View File

@ -73,7 +73,13 @@ WaveView::DrawingRequestQueue WaveView::request_queue;
PBD::Signal0<void> WaveView::VisualPropertiesChanged; PBD::Signal0<void> WaveView::VisualPropertiesChanged;
PBD::Signal0<void> WaveView::ClipLevelChanged; PBD::Signal0<void> WaveView::ClipLevelChanged;
/* NO_THREAD_WAVEVIEWS is defined by the top level wscript
* if --no-threaded-waveviws is provided at the configure step.
*/
#ifndef NO_THREADED_WAVEVIEWS
#define ENABLE_THREADED_WAVEFORM_RENDERING #define ENABLE_THREADED_WAVEFORM_RENDERING
#endif
WaveView::WaveView (Canvas* c, boost::shared_ptr<ARDOUR::AudioRegion> region) WaveView::WaveView (Canvas* c, boost::shared_ptr<ARDOUR::AudioRegion> region)
: Item (c) : Item (c)

5
wscript
View File

@ -741,6 +741,8 @@ def options(opt):
help='Turn on AddressSanitizer (requires GCC >= 4.8 or clang >= 3.1)') help='Turn on AddressSanitizer (requires GCC >= 4.8 or clang >= 3.1)')
opt.add_option('--ptformat', action='store_true', default=False, dest='ptformat', opt.add_option('--ptformat', action='store_true', default=False, dest='ptformat',
help='Turn on PT session import option') help='Turn on PT session import option')
opt.add_option('--no-threaded-waveviews', action='store_true', default=False, dest='no_threaded_waveviews',
help='Disable threaded waveview rendering')
for i in children: for i in children:
opt.recurse(i) opt.recurse(i)
@ -1079,6 +1081,9 @@ int main () { return 0; }
if opts.ptformat: if opts.ptformat:
conf.define('PTFORMAT', 1) conf.define('PTFORMAT', 1)
conf.env['PTFORMAT'] = True conf.env['PTFORMAT'] = True
if opts.no_threaded_waveviews:
conf.define('NO_THREADED_WAVEVIEWS', 1)
conf.env['NO_THREADED_WAVEVIEWS'] = True
backends = opts.with_backends.split(',') backends = opts.with_backends.split(',')