X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fwscript;h=5a5c99f22c95db6802d3bde29e1ea3bccbc06e4d;hb=9bf40bde3aed831791108bfccc4b1e10b071afdc;hp=b998732695fb4f28ec32a575575b7e3fc6fb808b;hpb=5dc24971009b20a662a58a2e01c47df9b6b5526b;p=ardour.git diff --git a/libs/ardour/wscript b/libs/ardour/wscript index b998732695..5a5c99f22c 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -8,7 +8,7 @@ import subprocess import sys # default state file version for this build -CURRENT_SESSION_FILE_VERSION = 3002 +CURRENT_SESSION_FILE_VERSION = 5990 I18N_PACKAGE = 'ardour' @@ -25,7 +25,6 @@ libardour_sources = [ 'async_midi_port.cc', 'audio_backend.cc', 'audio_buffer.cc', - 'audio_diskstream.cc', 'audio_library.cc', 'audio_playlist.cc', 'audio_playlist_importer.cc', @@ -46,7 +45,7 @@ libardour_sources = [ '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', @@ -67,7 +66,9 @@ libardour_sources = [ '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', @@ -125,7 +126,6 @@ libardour_sources = [ 'midi_buffer.cc', 'midi_channel_filter.cc', 'midi_clock_slave.cc', - 'midi_diskstream.cc', 'midi_model.cc', 'midi_patch_manager.cc', 'midi_playlist.cc', @@ -168,6 +168,7 @@ libardour_sources = [ 'plugin.cc', 'plugin_insert.cc', 'plugin_manager.cc', + 'polarity_processor.cc', 'port.cc', 'port_insert.cc', 'port_manager.cc', @@ -178,6 +179,8 @@ libardour_sources = [ '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', @@ -191,8 +194,10 @@ libardour_sources = [ '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_butler.cc', @@ -392,8 +397,9 @@ def build(bld): 'OSX','BOOST','CURL','TAGLIB','VAMPSDK','VAMPHOSTSDK','RUBBERBAND'] obj.use = ['libpbd','libmidipp','libevoral', 'libaudiographer', - 'libtimecode', + 'libtemporal', 'liblua', + 'zita-resampler', ] if bld.env['build_target'] != 'mingw': obj.uselib += ['DL'] @@ -409,8 +415,7 @@ def build(bld): '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 ' @@ -436,7 +441,7 @@ def build(bld): obj.defines += [ 'LXVST_SUPPORT' ] 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_helper.cc' ] + 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' ] @@ -477,7 +482,7 @@ def build(bld): source = avx_sources, cxxflags = avx_cxxflags, includes = [ '.' ], - use = [ 'libtimecode', 'libpbd', 'libevoral', 'liblua' ], + use = [ 'libtemporal', 'libpbd', 'libevoral', 'liblua' ], uselib = [ 'GLIBMM', 'XML' ], target = 'sse_avx_functions') @@ -519,12 +524,11 @@ def build(bld): 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, 'lua_script', 'test_lua_script', ['test/lua_script_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, '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, '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']) @@ -541,12 +545,11 @@ def build(bld): test/bbt_test.cc test/dsp_load_calculator_test.cc test/tempo_test.cc - test/interpolation_test.cc test/lua_script_test.cc test/midi_clock_slave_test.cc test/resampled_source_test.cc - test/framewalk_to_beats_test.cc - test/framepos_plus_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