import sys
# default state file version for this build
-CURRENT_SESSION_FILE_VERSION = 3001
+CURRENT_SESSION_FILE_VERSION = 5990
I18N_PACKAGE = 'ardour'
libardour_sources = [
'amp.cc',
'analyser.cc',
+ 'analysis_graph.cc',
'async_midi_port.cc',
+ 'audio_backend.cc',
'audio_buffer.cc',
- 'audio_diskstream.cc',
'audio_library.cc',
'audio_playlist.cc',
'audio_playlist_importer.cc',
'automation_control.cc',
'automation_list.cc',
'automation_watch.cc',
- 'beats_frames_converter.cc',
+ 'beats_samples_converter.cc',
'broadcast_info.cc',
'buffer.cc',
'buffer_manager.cc',
'chan_count.cc',
'chan_mapping.cc',
'config_text.cc',
+ 'control_group.cc',
'control_protocol_manager.cc',
+ 'convolver.cc',
'cycle_timer.cc',
'data_type.cc',
'default_click.cc',
'delayline.cc',
'delivery.cc',
'directory_names.cc',
- 'diskstream.cc',
+ 'disk_io.cc',
+ 'disk_reader.cc',
+ 'disk_writer.cc',
+ 'dsp_filter.cc',
+ 'ebur128_analysis.cc',
'element_import_handler.cc',
'element_importer.cc',
'engine_slave.cc',
'filesystem_paths.cc',
'filter.cc',
'find_session.cc',
+ 'fixed_delay.cc',
+ 'fluid_synth.cc',
+ 'gain_control.cc',
'globals.cc',
'graph.cc',
'graphnode.cc',
'iec1ppmdsp.cc',
'iec2ppmdsp.cc',
'import.cc',
+ 'import_pt.cc',
'instrument_info.cc',
'internal_return.cc',
'internal_send.cc',
'io_processor.cc',
'kmeterdsp.cc',
'ladspa_plugin.cc',
+ 'latent.cc',
'legatize.cc',
'location.cc',
'location_importer.cc',
+ 'ltc_file_reader.cc',
'ltc_slave.cc',
+ 'lua_api.cc',
+ 'luabindings.cc',
+ 'luaproc.cc',
+ 'luascripting.cc',
'meter.cc',
'midi_automation_list_binder.cc',
'midi_buffer.cc',
'midi_channel_filter.cc',
'midi_clock_slave.cc',
- 'midi_diskstream.cc',
'midi_model.cc',
'midi_patch_manager.cc',
'midi_playlist.cc',
'midi_stretch.cc',
'midi_track.cc',
'midi_ui.cc',
+ 'mididm.cc',
'midiport_manager.cc',
'mix.cc',
+ 'mode.cc',
+ 'monitor_control.cc',
'monitor_processor.cc',
'mtc_slave.cc',
- 'mididm.cc',
'mtdm.cc',
+ 'muteable.cc',
+ 'mute_control.cc',
'mute_master.cc',
- 'note_fixer.cc',
'onset_detector.cc',
'operations.cc',
'pan_controllable.cc',
'panner_manager.cc',
'panner_shell.cc',
'parameter_descriptor.cc',
- 'pcm_utils.cc',
+ 'phase_control.cc',
'playlist.cc',
'playlist_factory.cc',
'playlist_source.cc',
'plugin.cc',
'plugin_insert.cc',
'plugin_manager.cc',
+ 'polarity_processor.cc',
'port.cc',
'port_insert.cc',
'port_manager.cc',
'port_set.cc',
+ 'presentation_info.cc',
'process_thread.cc',
'processor.cc',
'progress.cc',
'quantize.cc',
'rc_configuration.cc',
+ 'readonly_control.cc',
+ 'raw_midi_parser.cc',
'recent_sessions.cc',
+ 'record_enable_control.cc',
+ 'record_safe_control.cc',
'region_factory.cc',
'resampled_source.cc',
'region.cc',
'route_group.cc',
'route_group_member.cc',
'rb_effect.cc',
+ 'rt_tasklist.cc',
'scene_change.cc',
'search_paths.cc',
+ 'selection.cc',
'send.cc',
'session.cc',
+ 'session_bundles.cc',
'session_butler.cc',
'session_click.cc',
'session_command.cc',
'session_state_utils.cc',
'session_time.cc',
'session_transport.cc',
- 'slave.cc',
+ 'sidechain.cc',
+ 'slavable.cc',
+ 'slavable_automation_control.cc',
'smf_source.cc',
'sndfile_helpers.cc',
'sndfileimportable.cc',
'sndfilesource.cc',
+ 'solo_control.cc',
+ 'solo_isolate_control.cc',
+ 'solo_safe_control.cc',
'soundcloud_upload.cc',
'source.cc',
'source_factory.cc',
'speakers.cc',
'srcfilesource.cc',
+ 'stripable.cc',
'strip_silence.cc',
'system_exec.cc',
'revision.cc',
+ 'rt_midibuffer.cc',
'tape_file_matcher.cc',
'template_utils.cc',
'tempo.cc',
'track.cc',
'transient_detector.cc',
'transform.cc',
+ 'transport_fsm.cc',
+ 'transport_master.cc',
+ 'transport_master_manager.cc',
+ 'transpose.cc',
'unknown_processor.cc',
'user_bundle.cc',
'utils.cc',
+ 'vca.cc',
+ 'vca_manager.cc',
+ 'video_tools_paths.cc',
'vumeterdsp.cc',
'worker.cc'
]
autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP',
atleast_version='2.0')
- if Options.options.lv2:
- autowaf.check_pkg(conf, 'lv2', uselib_store='LV2',
- atleast_version='1.0.0', mandatory=True)
- autowaf.check_pkg(conf, 'lv2', uselib_store='LV2_1_2_0',
- atleast_version='1.2.0', mandatory=False)
- autowaf.check_pkg(conf, 'lv2', uselib_store='LV2_1_10_0',
- atleast_version='1.10.0', mandatory=False)
- autowaf.check_pkg(conf, 'serd-0', uselib_store='SERD',
- atleast_version='0.14.0', mandatory=True)
- autowaf.check_pkg(conf, 'sord-0', uselib_store='SORD',
- atleast_version='0.8.0', mandatory=True)
- autowaf.check_pkg(conf, 'sratom-0', uselib_store='SRATOM',
- atleast_version='0.2.0', mandatory=True)
- autowaf.check_pkg(conf, 'lilv-0', uselib_store='LILV',
- atleast_version='0.14.0', mandatory=True)
- autowaf.check_pkg(conf, 'lilv-0', uselib_store='LILV_0_16_0',
- atleast_version='0.16.0', mandatory=False)
- autowaf.check_pkg(conf, 'lilv-0', uselib_store='LILV_0_19_2',
- atleast_version='0.19.2', mandatory=False)
- autowaf.check_pkg(conf, 'lilv-0', uselib_store='LILV_0_21_3',
- atleast_version='0.21.3', mandatory=False)
- autowaf.check_pkg(conf, 'suil-0', uselib_store='SUIL',
- atleast_version='0.6.0', mandatory=False)
- conf.define ('LV2_SUPPORT', 1)
+ autowaf.check_pkg(conf, 'lv2', uselib_store='LV2',
+ atleast_version='1.2.0', mandatory=True)
+ autowaf.check_pkg(conf, 'lv2', uselib_store='LV2_1_10_0',
+ atleast_version='1.10.0', mandatory=False)
+ autowaf.check_pkg(conf, 'serd-0', uselib_store='SERD',
+ atleast_version='0.14.0', mandatory=True)
+ autowaf.check_pkg(conf, 'sord-0', uselib_store='SORD',
+ atleast_version='0.8.0', mandatory=True)
+ autowaf.check_pkg(conf, 'sratom-0', uselib_store='SRATOM',
+ atleast_version='0.2.0', mandatory=True)
+ autowaf.check_pkg(conf, 'lilv-0', uselib_store='LILV',
+ atleast_version='0.24.2', mandatory=True)
+ autowaf.check_pkg(conf, 'suil-0', uselib_store='SUIL',
+ atleast_version='0.6.0', mandatory=False)
+ conf.define ('LV2_SUPPORT', 1)
+
+ # non-standard LV2 extention -- TODO: add option to disable??
+ if conf.is_defined ('HAVE_LV2_1_10_0'):
+ conf.define ('LV2_EXTENDED', 1)
# autowaf.check_pkg(conf, 'soundtouch-1.0', uselib_store='SOUNDTOUCH',
# mandatory=False)
autowaf.check_pkg(conf, 'libcurl', uselib_store='CURL',
atleast_version='7.0.0')
+ autowaf.check_pkg(conf, 'fftw3f', uselib_store='FFTW35F',
+ atleast_version='3.3.5', mandatory=False)
+
# controls whether we actually use it in preference to soundtouch
# Note: as of 2104, soundtouch (WSOLA) has been out-of-use for years.
conf.define('USE_RUBBERBAND', 1)
# micro increment <=> no interface changes
LIBARDOUR_LIB_VERSION = "3.0.0"
+ # operate on copy to avoid adding sources twice
+ sources = list(libardour_sources)
+
# Library
if bld.is_defined ('INTERNAL_SHARED_LIBS'):
- obj = bld.shlib(features = 'c cxx cshlib cxxshlib', source=libardour_sources)
+ obj = bld.shlib(features = 'c cxx cshlib cxxshlib', source=sources)
# macros for this shared library
obj.defines = [ 'LIBARDOUR_DLL_EXPORTS=1' ]
else:
- obj = bld.stlib(features = 'c cxx cstlib cxxstlib', source=libardour_sources)
- obj.cxxflags = [ '-fPIC' ]
- obj.cflags = [ '-fPIC' ]
+ obj = bld.stlib(features = 'c cxx cstlib cxxstlib', source=sources)
+ obj.cxxflags = [ bld.env['compiler_flags_dict']['pic'] ]
+ obj.cflags = [ bld.env['compiler_flags_dict']['pic'] ]
obj.defines = []
obj.export_includes = ['.']
obj.includes = ['.', '../surfaces/control_protocol', '..']
obj.name = 'libardour'
obj.target = 'ardour'
- obj.uselib = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID',
- 'SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS',
+ obj.uselib = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID', 'LO',
+ 'SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS', 'GIOMM',
'OSX','BOOST','CURL','TAGLIB','VAMPSDK','VAMPHOSTSDK','RUBBERBAND']
obj.use = ['libpbd','libmidipp','libevoral',
'libaudiographer',
- 'libtimecode',
+ 'libtemporal',
+ 'liblua',
+ 'libptformat',
+ 'zita-resampler',
+ 'zita-convolver',
]
if bld.env['build_target'] != 'mingw':
obj.uselib += ['DL']
if bld.is_defined('USE_EXTERNAL_LIBS'):
- obj.uselib.extend(['VAMPSDK', 'LIBLTC'])
+ obj.uselib.extend(['VAMPSDK', 'LIBLTC', 'LIBFLUIDSYNTH'])
else:
- obj.use.extend(['librubberband', 'libltc_includes', 'libltc'])
+ obj.use.extend(['librubberband', 'libltc_includes', 'libltc', 'libfluidsynth_includes', 'libfluidsynth', 'libptformat'])
obj.vnum = LIBARDOUR_LIB_VERSION
obj.install_path = bld.env['LIBDIR']
'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"',
- 'LIBARDOUR="' + bld.env['lwrcase_dirname'] + '"',
- 'EVORAL_MIDI_XML=1',
+ 'LIBARDOUR="' + bld.env['lwrcase_dirname'] + '"'
]
#obj.source += ' st_stretch.cc st_pitch.cc '
obj.source += [ 'lxvst_plugin.cc', 'linux_vst_support.cc' ]
obj.defines += [ 'LXVST_SUPPORT' ]
- if bld.is_defined('WINDOWS_VST_SUPPORT') or bld.is_defined('LXVST_SUPPORT'):
- obj.source += [ 'session_vst.cc', 'vst_plugin.cc', 'vst_info_file.cc' ]
+ if bld.is_defined('WINDOWS_VST_SUPPORT') or bld.is_defined('LXVST_SUPPORT') or bld.is_defined('MACVST_SUPPORT'):
+ obj.source += [ 'session_vst.cc', 'vst_plugin.cc', 'vst_info_file.cc', 'vst_state.cc' ]
+
+ if bld.is_defined('MACVST_SUPPORT'):
+ obj.source += [ 'mac_vst_plugin.cc', 'mac_vst_support.cc' ]
+ obj.defines += [ 'MACVST_SUPPORT' ]
if bld.is_defined('HAVE_COREAUDIO'):
obj.source += [ 'coreaudiosource.cc', 'caimportable.cc' ]
if bld.is_defined('AUDIOUNIT_SUPPORT'):
obj.source += [ 'audio_unit.cc' ]
+ avx_sources = []
+
if Options.options.fpu_optimization:
if (bld.env['build_target'] == 'i386' or bld.env['build_target'] == 'i686'):
- obj.source += [ 'sse_functions_xmm.cc', 'sse_functions.s' ]
+ obj.source += [ 'sse_functions_xmm.cc', 'sse_functions.s', ]
+ avx_sources = [ 'sse_functions_avx_linux.cc' ]
elif bld.env['build_target'] == 'x86_64':
- obj.source += [ 'sse_functions_xmm.cc', 'sse_functions_64bit.s' ]
+ obj.source += [ 'sse_functions_xmm.cc', 'sse_functions_64bit.s', ]
+ avx_sources = [ 'sse_functions_avx_linux.cc' ]
elif bld.env['build_target'] == 'mingw':
- # usability of the 64 bit windows assembler depends on the compiler target,
- # not the build host, which in turn can only be inferred from the name
- # of the compiler.
- if re.search ('/x86_64/', str(conf.env['CC'])):
- obj.source += [ 'sse_functions_xmm.cc', 'sse_functions_64bit_win.s' ]
+ # usability of the 64 bit windows assembler depends on the compiler target,
+ # not the build host, which in turn can only be inferred from the name
+ # of the compiler.
+ if re.search ('x86_64-w64', str(bld.env['CC'])):
+ obj.source += [ 'sse_functions_xmm.cc' ]
+ obj.source += [ 'sse_functions_64bit_win.s', 'sse_avx_functions_64bit_win.s' ]
+ avx_sources = [ 'sse_functions_avx.cc' ]
+
+ if avx_sources:
+ # as long as we want to use AVX intrinsics in this file,
+ # compile it with -mavx flag - append avx flag to the existing
+ avx_cxxflags = list(bld.env['CXXFLAGS'])
+ avx_cxxflags.append (bld.env['compiler_flags_dict']['avx'])
+ avx_cxxflags.append (bld.env['compiler_flags_dict']['pic'])
+ bld(features = 'cxx',
+ source = avx_sources,
+ cxxflags = avx_cxxflags,
+ includes = [ '.' ],
+ use = [ 'libtemporal', 'libpbd', 'libevoral', 'liblua' ],
+ uselib = [ 'GLIBMM', 'XML' ],
+ target = 'sse_avx_functions')
+
+ obj.use += ['sse_avx_functions' ]
# i18n
if bld.is_defined('ENABLE_NLS'):
testcommon.use = ['libpbd','libmidipp','libevoral',
'libaudiographer','libardour']
if bld.is_defined('USE_EXTERNAL_LIBS'):
- testcommon.uselib.extend(['LIBLTC',])
+ testcommon.uselib.extend(['LIBLTC', 'LIBFLUIDSYNTH'])
else:
- testcommon.use.extend(['libltc', 'librubberband'])
+ testcommon.use.extend(['libltc', 'librubberband', 'libfluidsynth'])
testcommon.defines = [
'PACKAGE="libardour' + str(bld.env['MAJOR']) + 'test"',
'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
]
testcommon.name = 'testcommon'
- if bld.env['FPU_OPTIMIZATION']:
- testcommon.source += [ 'sse_functions_xmm.cc' ]
- if (bld.env['build_target'] == 'i386'
- or bld.env['build_target'] == 'i686'):
- testcommon.source += [ 'sse_functions.s' ]
- elif bld.env['build_target'] == 'x86_64':
- testcommon.source += [ 'sse_functions_64bit.s' ]
-
if bld.env['SINGLE_TESTS']:
create_ardour_test_program(bld, obj.includes, 'audio_engine_test', 'test_audio_engine', ['test/audio_engine_test.cc'])
create_ardour_test_program(bld, obj.includes, 'automation_list_property_test', 'test_automation_list_property', ['test/automation_list_property_test.cc'])
create_ardour_test_program(bld, obj.includes, 'bbt', 'test_bbt', ['test/bbt_test.cc'])
create_ardour_test_program(bld, obj.includes, 'tempo', 'test_tempo', ['test/tempo_test.cc'])
- create_ardour_test_program(bld, obj.includes, 'interpolation', 'test_interpolation', ['test/interpolation_test.cc'])
- create_ardour_test_program(bld, obj.includes, 'midi_clock_slave', 'test_midi_clock_slave', ['test/midi_clock_slave_test.cc'])
+ create_ardour_test_program(bld, obj.includes, 'lua_script', 'test_lua_script', ['test/lua_script_test.cc'])
+ create_ardour_test_program(bld, obj.includes, 'midi_clock', 'test_midi_clock', ['test/midi_clock_test.cc'])
create_ardour_test_program(bld, obj.includes, 'resampled_source', 'test_resampled_source', ['test/resampled_source_test.cc'])
- create_ardour_test_program(bld, obj.includes, 'framewalk_to_beats', 'test_framewalk_to_beats', ['test/framewalk_to_beats_test.cc'])
- create_ardour_test_program(bld, obj.includes, 'framepos_plus_beats', 'test_framepos_plus_beats', ['test/framepos_plus_beats_test.cc'])
- create_ardour_test_program(bld, obj.includes, 'framepos_minus_beats', 'test_framepos_minus_beats', ['test/framepos_minus_beats_test.cc'])
+ create_ardour_test_program(bld, obj.includes, 'samplewalk_to_beats', 'test_samplewalk_to_beats', ['test/samplewalk_to_beats_test.cc'])
+ create_ardour_test_program(bld, obj.includes, 'samplepos_plus_beats', 'test_samplepos_plus_beats', ['test/samplepos_plus_beats_test.cc'])
create_ardour_test_program(bld, obj.includes, 'playlist_equivalent_regions', 'test_playlist_equivalent_regions', ['test/playlist_equivalent_regions_test.cc'])
create_ardour_test_program(bld, obj.includes, 'playlist_layering', 'test_playlist_layering', ['test/playlist_layering_test.cc'])
create_ardour_test_program(bld, obj.includes, 'plugins_test', 'test_plugins', ['test/plugins_test.cc'])
create_ardour_test_program(bld, obj.includes, 'region_naming', 'test_region_naming', ['test/region_naming_test.cc'])
create_ardour_test_program(bld, obj.includes, 'control_surface', 'test_control_surfaces', ['test/control_surfaces_test.cc'])
create_ardour_test_program(bld, obj.includes, 'mtdm_test', 'test_mtdm', ['test/mtdm_test.cc'])
+ create_ardour_test_program(bld, obj.includes, 'sha1_test', 'test_sha1', ['test/sha1_test.cc'])
create_ardour_test_program(bld, obj.includes, 'session_test', 'test_session', ['test/session_test.cc'])
+ create_ardour_test_program(bld, obj.includes, 'dsp_load_calculator_test', 'test_dsp_load_calculator', ['test/dsp_load_calculator_test.cc'])
test_sources = '''
test/audio_engine_test.cc
test/automation_list_property_test.cc
test/bbt_test.cc
+ test/dsp_load_calculator_test.cc
test/tempo_test.cc
- test/interpolation_test.cc
- test/midi_clock_slave_test.cc
+ test/lua_script_test.cc
+ test/midi_clock_test.cc
test/resampled_source_test.cc
- test/framewalk_to_beats_test.cc
- test/framepos_plus_beats_test.cc
- test/framepos_minus_beats_test.cc
+ test/samplewalk_to_beats_test.cc
+ test/samplepos_plus_beats_test.cc
test/playlist_equivalent_regions_test.cc
test/playlist_layering_test.cc
test/plugins_test.cc
test/region_naming_test.cc
test/control_surfaces_test.cc
test/mtdm_test.cc
+ test/sha1_test.cc
test/session_test.cc
'''.split()
create_ardour_test_program(bld, obj.includes, 'libardour-tests', 'run-tests', test_sources)
- # Tester to just load a session
- session_load_tester = bld(features = 'cxx cxxprogram')
- session_load_tester.source = '''
+ # Utility to load and save a session
+ load_save_session = bld(features = 'cxx cxxprogram')
+ load_save_session.source = '''
test/test_util.cc
- test/load_session.cc
+ test/test_ui.cc
+ test/load_save_session.cc
test/dummy_lxvst.cc
'''.split()
- session_load_tester.includes = obj.includes
- session_load_tester.includes.append ('test')
- session_load_tester.uselib = ['CPPUNIT','SIGCPP','GLIBMM','GTHREAD',
+ load_save_session.includes = obj.includes
+ load_save_session.includes.append ('test')
+ load_save_session.uselib = ['CPPUNIT','SIGCPP','GLIBMM','GTHREAD',
'SAMPLERATE','XML','LRDF','COREAUDIO']
- session_load_tester.use = ['libpbd','libmidipp','libardour']
- session_load_tester.name = 'libardour-session-load-tester'
- session_load_tester.target = 'load-session'
- session_load_tester.install_path = ''
- session_load_tester.defines = [
+ load_save_session.use = ['libpbd','libmidipp','libardour']
+ load_save_session.name = 'libardour-load-save-session'
+ load_save_session.target = 'load-save-session'
+ load_save_session.install_path = ''
+ load_save_session.defines = [
'PACKAGE="libardour' + str(bld.env['MAJOR']) + 'profile"',
'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"',
]
- if bld.env['FPU_OPTIMIZATION']:
- session_load_tester.source += [ 'sse_functions_xmm.cc' ]
- if (bld.env['build_target'] == 'i386'
- or bld.env['build_target'] == 'i686'):
- session_load_tester.source += [ 'sse_functions.s' ]
- elif bld.env['build_target'] == 'x86_64':
- session_load_tester.source += [ 'sse_functions_64bit.s' ]
# Profiling
for p in ['runpc', 'lots_of_regions', 'load_session']:
'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"',
]
- if bld.env['FPU_OPTIMIZATION']:
- profilingobj.source += [ 'sse_functions_xmm.cc' ]
- if (bld.env['build_target'] == 'i386'
- or bld.env['build_target'] == 'i686'):
- profilingobj.source += [ 'sse_functions.s' ]
- elif bld.env['build_target'] == 'x86_64':
- profilingobj.source += [ 'sse_functions_64bit.s' ]
def create_ardour_test_program(bld, includes, name, target, sources):
testobj = bld(features = 'cxx cxxprogram')
testobj.use = ['libpbd','libmidipp','libevoral',
'libaudiographer','libardour','testcommon']
if bld.is_defined('USE_EXTERNAL_LIBS'):
- testobj.uselib.extend(['LIBLTC'])
+ testobj.uselib.extend(['LIBLTC', 'LIBFLUIDSYNTH'])
else:
- testobj.use.extend(['libltc'])
+ testobj.use.extend(['libltc', 'libfluidsynth'])
testobj.name = name
testobj.target = target