X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2FSConscript;h=5470fe68ccd19083fcd8532b72e88b0f82d6108a;hb=c96b5583204263e07440ff394e1d3a7f0e54f1b2;hp=60e7bca331cc9808b171f5be687a4d975fe4e763;hpb=99904735e066804358f1d0bd138a84f1e9ecda91;p=ardour.git

diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index 60e7bca331..5470fe68cc 100644
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -84,6 +84,7 @@ gtkardour_files=Split("""
 about.cc
 actions.cc
 add_route_dialog.cc
+add_midi_cc_track_dialog.cc
 ardour_dialog.cc
 ardour_ui.cc
 ardour_ui2.cc
@@ -95,20 +96,20 @@ ardour_ui_options.cc
 audio_clock.cc
 audio_time_axis.cc
 audio_region_editor.cc
-automation_gain_line.cc
+control_point.cc
 automation_line.cc
-automation_pan_line.cc
 automation_time_axis.cc
+automation_controller.cc
 midi_time_axis.cc
 midi_streamview.cc
 axis_view.cc
-canvas-imageframe.c
 canvas-simpleline.c
 simpleline.cc
 canvas-simplerect.c
 simplerect.cc
 canvas-waveview.c
-color_manager.cc
+diamond.cc
+canvas-midi-event.cc
 crossfade_edit.cc
 crossfade_view.cc
 curvetest.cc
@@ -124,7 +125,6 @@ editor_cursors.cc
 editor_edit_groups.cc
 editor_export_audio.cc
 editor_hscroller.cc
-editor_imageframe.cc
 editor_keyboard.cc
 editor_keys.cc
 editor_markers.cc
@@ -144,32 +144,22 @@ export_dialog.cc
 export_session_dialog.cc
 export_region_dialog.cc
 export_range_markers_dialog.cc
-gain_automation_time_axis.cc
 gain_meter.cc
 ghostregion.cc
 gtk-custom-hruler.c
 gtk-custom-ruler.c
-imageframe.cc
-imageframe_socket_handler.cc
-imageframe_time_axis.cc
-imageframe_time_axis_group.cc
-imageframe_time_axis_view.cc
-imageframe_view.cc
 io_selector.cc
 keyboard.cc
 ladspa_pluginui.cc
+latency_gui.cc
 location_ui.cc
 main.cc
 marker.cc
-marker_time_axis.cc
-marker_time_axis_view.cc
-marker_view.cc
 mixer_strip.cc
 mixer_ui.cc
 new_session_dialog.cc
 option_editor.cc
 opts.cc
-pan_automation_time_axis.cc
 panner.cc
 panner2d.cc
 panner_ui.cc
@@ -178,9 +168,7 @@ plugin_selector.cc
 plugin_ui.cc
 prompter.cc
 public_editor.cc
-redirect_automation_line.cc
-redirect_automation_time_axis.cc
-redirect_box.cc
+processor_box.cc
 region_gain_line.cc
 region_selection.cc
 region_view.cc
@@ -188,7 +176,7 @@ audio_region_view.cc
 midi_region_view.cc
 tape_region_view.cc
 route_params_ui.cc
-route_redirect_selection.cc
+route_processor_selection.cc
 route_ui.cc
 selection.cc
 sfdb_ui.cc
@@ -196,13 +184,14 @@ send_ui.cc
 streamview.cc
 audio_streamview.cc
 tempo_dialog.cc
+theme_manager.cc
 time_axis_view.cc
 time_axis_view_item.cc
 route_time_axis.cc
 time_selection.cc
+ui_config.cc
 utils.cc
 version.cc
-visual_time_axis.cc
 waveview.cc
 """)
 
@@ -246,6 +235,25 @@ if env['VST']:
 	extra_sources += vst_files
 	gtkardour.Append (CCFLAGS="-DVST_SUPPORT", CPPPATH="#libs/fst")
 
+cmt_files=Split("""
+canvas-imageframe.c
+editor_imageframe.cc
+imageframe.cc
+imageframe_socket_handler.cc
+imageframe_time_axis.cc
+imageframe_time_axis_group.cc
+imageframe_time_axis_view.cc
+imageframe_view.cc
+marker_time_axis.cc
+marker_time_axis_view.cc
+marker_view.cc
+visual_time_axis.cc
+""")
+
+if env['CMT']:
+    extra_sources += cmt_files
+    gtkardour.Append (CCFLAGS="-DWITH_CMT")
+
 if gtkardour['AUDIOUNITS']:
     extra_sources += audiounit_files
     gtkardour.Append(CCFLAGS='-DHAVE_AUDIOUNITS')
@@ -318,10 +326,11 @@ if env['NLS']:
 	i18n (gtkardour, gtkardour_files+skipped_files+fft_analysis_files, env)
     
 # configuration files
-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour2_ui.rc'))
+env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour2_ui_dark.rc'))
+env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour2_ui_light.rc'))
 env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.menus'))
 env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.bindings'))
-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.colors'))
+env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour2_ui_default.conf'))
 # data files
 env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour2'), 'splash.png'))
 env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour2', 'pixmaps'), pixmap_files))
@@ -335,8 +344,9 @@ env.Alias ('tarball', env.Distribute (env['DISTTREE'],
                                         'i18n.h', 'gettext.h',
 					'ardour.sh.in',
 					'ardev_common.sh.in',
-                                        'ardour2_ui.rc', 'splash.png',
-                                        'ardour.menus', 'ardour.bindings.in', 'ardour.colors',
+					'ardev', 'ardbg',
+                                        'ardour2_ui_dark.rc', 'ardour2_ui_light.rc', 'splash.png',
+                                        'ardour.menus', 'ardour.bindings.in', 'ardour2_ui_default.conf',
 					'editor_xpms'
                                         ] +
                                       gtkardour_files +