Snap note dragging vertically to note values (rows).

[ardour.git] / gtk2_ardour / SConscript

diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index 384e312e622b06cdb77d028476473ac5a49d9836..5470fe68ccd19083fcd8532b72e88b0f82d6108a 100644 (file)
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -96,11 +96,10 @@ ardour_ui_options.cc
 audio_clock.cc
 audio_time_axis.cc
 audio_region_editor.cc
-automation_gain_line.cc
-automation_midi_cc_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
@@ -109,6 +108,8 @@ simpleline.cc
 canvas-simplerect.c
 simplerect.cc
 canvas-waveview.c
+diamond.cc
+canvas-midi-event.cc
 crossfade_edit.cc
 crossfade_view.cc
 curvetest.cc
@@ -143,8 +144,6 @@ export_dialog.cc
 export_session_dialog.cc
 export_region_dialog.cc
 export_range_markers_dialog.cc
-gain_automation_time_axis.cc
-midi_controller_time_axis.cc
 gain_meter.cc
 ghostregion.cc
 gtk-custom-hruler.c
@@ -161,7 +160,6 @@ mixer_ui.cc
 new_session_dialog.cc
 option_editor.cc
 opts.cc
-pan_automation_time_axis.cc
 panner.cc
 panner2d.cc
 panner_ui.cc
@@ -170,8 +168,6 @@ plugin_selector.cc
 plugin_ui.cc
 prompter.cc
 public_editor.cc
-processor_automation_line.cc
-processor_automation_time_axis.cc
 processor_box.cc
 region_gain_line.cc
 region_selection.cc
@@ -193,6 +189,7 @@ time_axis_view.cc
 time_axis_view_item.cc
 route_time_axis.cc
 time_selection.cc
+ui_config.cc
 utils.cc
 version.cc
 waveview.cc
@@ -333,7 +330,7 @@ env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour
 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))
@@ -349,7 +346,7 @@ env.Alias ('tarball', env.Distribute (env['DISTTREE'],
                                        'ardev_common.sh.in',
                                        'ardev', 'ardbg',
                                         'ardour2_ui_dark.rc', 'ardour2_ui_light.rc', 'splash.png',
-                                        'ardour.menus', 'ardour.bindings.in',# 'ardour.colors',
+                                        'ardour.menus', 'ardour.bindings.in', 'ardour2_ui_default.conf',
                                        'editor_xpms'
                                         ] +
                                       gtkardour_files +