X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fwscript;h=5d175edcb52c4474ba211aae49acd02a18beaea2;hb=1c94f6490e3f0bd4b35a001a9a530cee752100b0;hp=a51a7db1ee8fa699973fb77319e90e2b0466c7af;hpb=6815dc7ead18c6d791833d2022b76cb9d75d0a96;p=ardour.git

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index a51a7db1ee..5d175edcb5 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -35,7 +35,9 @@ gtk2_ardour_sources = [
         'ardour_dialog.cc',
         'ardour_display.cc',
         'ardour_dropdown.cc',
+        'ardour_http.cc',
         'ardour_knob.cc',
+        'ardour_spinner.cc',
         'ardour_ui.cc',
         'ardour_ui2.cc',
         'ardour_ui_dependents.cc',
@@ -59,9 +61,11 @@ gtk2_ardour_sources = [
         'bundle_manager.cc',
         'button_joiner.cc',
         'clock_group.cc',
+        'color_theme_manager.cc',
         'configinfo.cc',
         'control_point.cc',
         'control_point_dialog.cc',
+        'control_slave_ui.cc',
         'cursor_context.cc',
         'curvetest.cc',
         'debug.cc',
@@ -151,7 +155,6 @@ gtk2_ardour_sources = [
         'midi_velocity_dialog.cc',
         'missing_file_dialog.cc',
         'missing_plugin_dialog.cc',
-        'mixer_actor.cc',
         'mixer_group_tabs.cc',
         'mixer_strip.cc',
         'mixer_ui.cc',
@@ -223,6 +226,7 @@ gtk2_ardour_sources = [
         'selection.cc',
         'selection_memento.cc',
         'send_ui.cc',
+        'session_archive_dialog.cc',
         'session_dialog.cc',
         'session_import_dialog.cc',
         'session_metadata_dialog.cc',
@@ -241,6 +245,7 @@ gtk2_ardour_sources = [
         'strip_silence_dialog.cc',
         'sys_ex.cc',
         'tape_region_view.cc',
+        'tempo_curve.cc',
         'tempo_dialog.cc',
         'tempo_lines.cc',
         'theme_manager.cc',
@@ -257,6 +262,7 @@ gtk2_ardour_sources = [
         'transpose_dialog.cc',
         'ui_config.cc',
         'utils.cc',
+        'vca_master_strip.cc',
         'verbose_cursor.cc',
         'visibility_group.cc',
         'window_manager.cc',
@@ -264,6 +270,7 @@ gtk2_ardour_sources = [
         'video_image_frame.cc',
         'add_video_dialog.cc',
         'editor_videotimeline.cc',
+        'vca_time_axis.cc',
         'video_timeline.cc',
         'video_monitor.cc',
         'transcode_ffmpeg.cc',
@@ -300,8 +307,17 @@ def enoify (major, minor):
             return "\\n\\\"Evening Star\\\""
         elif minor == 7:
             return "\\n\\\"Cluster and Eno\\\""
-        elif minor == 8:
+    elif major == 5:
+        if minor == 0:
             return "\\n\\\"Before and After Science\\\""
+        elif minor == 1:
+            return "\\n\\\"After the Heat\\\""
+        elif minor == 2:
+            return "\\n\\\"Music for Airports\\\""
+        elif minor == 3:
+            return "\\n\\\"Music for Films\\\""
+        elif minor == 4:
+            return "\\n\\\"In a Land of Clear Colours\\\""
     return "\\\"\\\""
 
 def options(opt):
@@ -808,8 +824,9 @@ def build(bld):
 
     # Default UI configuration
     bld.install_files(bld.env['CONFDIR'], 'default_ui_config')
-    # Color Themes
-    bld.install_files(bld.env['CONFDIR'], 'dark.colors')
+    # Color Themes. Find each color file for this program only
+    # and install
+    bld.install_files (os.path.join(bld.env['DATADIR'], 'themes'), bld.path.ant_glob ('themes/*-' + Options.options.program_name.lower() + '.colors'));
 
     # Default export stuff
     bld.install_files(os.path.join(bld.env['CONFDIR'], 'export'), bld.path.ant_glob('export/*.format'))
@@ -849,13 +866,16 @@ def i18n_mo(bld):
 def appdata_i18n_pot(bld):
     potfile = os.path.join(bld.top_dir, 'gtk2_ardour', 'appdata',
             'ardour.appdata.pot')
-    if bld.cmd == 'build':
+    if bld.cmd == 'i18n_pot':
         Logs.info('Generating pot file from Ardour appdata')
         itsfile = os.path.join(bld.top_dir, 'tools', 'as-metainfo.its')
         adsource = os.path.join(bld.top_dir, 'gtk2_ardour',
                 'ardour.appdata.xml.in.in')
         Logs.info('Updating ' + potfile)
-        subprocess.call(('itstool', '-i', itsfile, '-o', potfile, adsource))
+        try:
+                subprocess.call(('itstool', '-i', itsfile, '-o', potfile, adsource))
+        except:
+                print ('Error processing appdata pot file - ignored')
     elif bld.cmd == 'clean' and os.path.exists(potfile):
         Logs.info('Removing Ardour appdata pot file')
         os.remove(potfile)