X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fwscript;h=df28255d5e7f2667cbda9a325b031e07d08d2ae0;hb=9775c5c9f1b81340f3177ede038f02faed71c887;hp=831440f23eefc77ded7c19d4532835da7f257ef3;hpb=cf1651e6d7b615cba28025a5952afcc99946c18f;p=ardour.git

diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 831440f23e..df28255d5e 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',
@@ -178,6 +178,7 @@ libardour_sources = [
         'progress.cc',
         'quantize.cc',
         'rc_configuration.cc',
+        'readonly_control.cc',
         'recent_sessions.cc',
         'record_enable_control.cc',
         'record_safe_control.cc',
@@ -193,6 +194,7 @@ libardour_sources = [
         'rb_effect.cc',
         'scene_change.cc',
         'search_paths.cc',
+        'selection.cc',
         'send.cc',
         'session.cc',
         'session_butler.cc',
@@ -392,7 +394,7 @@ def build(bld):
                         'OSX','BOOST','CURL','TAGLIB','VAMPSDK','VAMPHOSTSDK','RUBBERBAND']
     obj.use          = ['libpbd','libmidipp','libevoral',
                         'libaudiographer',
-                        'libtimecode',
+                        'libtemporal',
                         'liblua',
                         ]
     if bld.env['build_target'] != 'mingw':
@@ -409,8 +411,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 '
@@ -477,7 +478,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')
 
@@ -523,8 +524,8 @@ def build(bld):
             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'])
@@ -545,8 +546,8 @@ def build(bld):
             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