fix a bad transition in the transportFSM.

[ardour.git] / libs / ardour / wscript

diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 0e10cd1f70a3e978d935688101171eb12fcc69eb..27fc0ba3e8d532d9d71dcf3a7daf3fe313ac7353 100644 (file)
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -113,6 +113,7 @@ libardour_sources = [
         'io_processor.cc',
         'kmeterdsp.cc',
         'ladspa_plugin.cc',
+        'latent.cc',
         'legatize.cc',
         'location.cc',
         'location_importer.cc',
@@ -152,7 +153,6 @@ libardour_sources = [
         'muteable.cc',
         'mute_control.cc',
         'mute_master.cc',
-        'note_fixer.cc',
         'onset_detector.cc',
         'operations.cc',
         'pan_controllable.cc',
@@ -161,7 +161,6 @@ libardour_sources = [
         'panner_manager.cc',
         'panner_shell.cc',
         'parameter_descriptor.cc',
-        'pcm_utils.cc',
         'phase_control.cc',
         'playlist.cc',
         'playlist_factory.cc',
@@ -201,6 +200,7 @@ libardour_sources = [
         'selection.cc',
         'send.cc',
         'session.cc',
+        'session_bundles.cc',
         'session_butler.cc',
         'session_click.cc',
         'session_command.cc',
@@ -239,6 +239,7 @@ libardour_sources = [
         'strip_silence.cc',
         'system_exec.cc',
         'revision.cc',
+        'rt_midibuffer.cc',
         'tape_file_matcher.cc',
         'template_utils.cc',
         'tempo.cc',
@@ -248,6 +249,7 @@ libardour_sources = [
         'track.cc',
         'transient_detector.cc',
         'transform.cc',
+        'transport_fsm.cc',
         'transport_master.cc',
         'transport_master_manager.cc',
         'transpose.cc',
@@ -299,24 +301,21 @@ def configure(conf):
     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.24.2', 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'):
@@ -332,6 +331,9 @@ def configure(conf):
     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)
@@ -371,8 +373,6 @@ def build(bld):
 
     # operate on copy to avoid adding sources twice
     sources = list(libardour_sources)
-    if bld.is_tracks_build():
-        sources += [ 'engine_state_controller.cc' ]
 
     # Library
     if bld.is_defined ('INTERNAL_SHARED_LIBS'):
@@ -524,7 +524,7 @@ def build(bld):
             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, '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, '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, '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'])
@@ -545,7 +545,7 @@ def build(bld):
             test/dsp_load_calculator_test.cc
             test/tempo_test.cc
             test/lua_script_test.cc
-            test/midi_clock_slave_test.cc
+            test/midi_clock_test.cc
             test/resampled_source_test.cc
             test/samplewalk_to_beats_test.cc
             test/samplepos_plus_beats_test.cc