Small cleanups to port matrix context menu.

[ardour.git] / gtk2_ardour / SConscript

diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index 61897275e4bdab84a2d7b833c021734788e418a0..b04ccc85d72b3e0888e73d80710bd4c0ca643570 100644 (file)
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -56,8 +56,8 @@ gtkardour.Merge ([
     libraries['sndfile'],
     libraries['taglib'],
     libraries['sysmidi'],
-    libraries['vamp'],
     libraries['vamphost'],
+    libraries['vamp'],
     libraries['xml'],
     libraries['xslt']
 ])
@@ -126,13 +126,13 @@ automation_streamview.cc
 automation_time_axis.cc
 axis_view.cc
 bundle_manager.cc
+canvas-flag.cc
 canvas-note-event.cc
 canvas-note.cc
-canvas-flag.cc
 canvas-program-change.cc
-canvas-sysex.cc
 canvas-simpleline.c
 canvas-simplerect.c
+canvas-sysex.cc
 canvas-waveview.c
 control_point.cc
 control_point_dialog.cc
@@ -148,6 +148,7 @@ editor_audiotrack.cc
 editor_canvas.cc
 editor_canvas_events.cc
 editor_cursors.cc
+editor_drag.cc
 editor_edit_groups.cc
 editor_export_audio.cc
 editor_hscroller.cc
@@ -164,14 +165,15 @@ editor_rulers.cc
 editor_scrub.cc
 editor_selection.cc
 editor_selection_list.cc
+editor_summary.cc
 editor_tempodisplay.cc
 editor_timefx.cc
 engine_dialog.cc
 enums.cc
 export_channel_selector.cc
 export_dialog.cc
-export_filename_selector.cc
 export_file_notebook.cc
+export_filename_selector.cc
 export_format_dialog.cc
 export_format_selector.cc
 export_preset_selector.cc
@@ -179,7 +181,6 @@ export_timespan_selector.cc
 fft.cc
 fft_graph.cc
 fft_result.cc
-plugin_eq_gui.cc
 gain_meter.cc
 generic_pluginui.cc
 ghostregion.cc
@@ -204,7 +205,6 @@ midi_time_axis.cc
 mixer_strip.cc
 mixer_ui.cc
 nag.cc
-new_session_dialog.cc
 option_editor.cc
 opts.cc
 panner.cc
@@ -212,6 +212,7 @@ panner2d.cc
 panner_ui.cc
 piano_roll_header.cc
 playlist_selector.cc
+plugin_eq_gui.cc
 plugin_selector.cc
 plugin_ui.cc
 port_group.cc
@@ -225,9 +226,11 @@ port_matrix_row_labels.cc
 processor_box.cc
 prompter.cc
 public_editor.cc
+rc_option_editor.cc
 region_gain_line.cc
 region_selection.cc
 region_view.cc
+return_ui.cc
 rhythm_ferret.cc
 route_params_ui.cc
 route_processor_selection.cc
@@ -237,11 +240,14 @@ selection.cc
 send_ui.cc
 session_import_dialog.cc
 session_metadata_dialog.cc
+session_option_editor.cc
 sfdb_ui.cc
 simpleline.cc
 simplerect.cc
 splash.cc
+startup.cc
 streamview.cc
+strip_silence_dialog.cc
 tape_region_view.cc
 tempo_dialog.cc
 tempo_lines.cc
@@ -302,7 +308,7 @@ lv2_files = [ 'lv2_plugin_ui.cc' ]
 
 if env['LV2']:
        extra_sources += lv2_files
-       gtkardour.Append (CCFLAGS="-DHAVE_LV2")
+       gtkardour.Append (CCFLAGS="-DHAVE_SLV2")
        gtkardour.Merge ([libraries['slv2']])
 
 
@@ -449,20 +455,20 @@ if gtkardour['GTKOSX']:
        #  NSCommand (aka "Command" aka "Apple" aka "Cauliflower") -> Meta
        #  NSAlternate (aka "Option")  -> Mod1
        #
-       keybindings_dict['%PRIMARY%'] = 'Meta'
-       keybindings_dict['%SECONDARY%'] = 'Mod1'
-       keybindings_dict['%TERTIARY%'] = 'Shift'
-       keybindings_dict['%LEVEL4%'] = 'Ctrl'
-       keybindings_dict['%WINDOW%'] = 'Mod1'
+       keybindings_dict['@PRIMARY@'] = 'Meta'
+       keybindings_dict['@SECONDARY@'] = 'Mod1'
+       keybindings_dict['@TERTIARY@'] = 'Shift'
+       keybindings_dict['@LEVEL4@'] = 'Ctrl'
+       keybindings_dict['@WINDOW@'] = 'Mod1'
 else:
        #
        # Ctrl, Alt, Shift, Mod4(Super/Windows/Hyper)
        #
-       keybindings_dict['%PRIMARY%'] = 'Ctrl'
-       keybindings_dict['%SECONDARY%'] = 'Alt'
-       keybindings_dict['%TERTIARY%'] = 'Shift'
-       keybindings_dict['%LEVEL4%'] = env['WINDOWS_KEY']
-       keybindings_dict['%WINDOW%'] = 'Alt'
+       keybindings_dict['@PRIMARY@'] = 'Ctrl'
+       keybindings_dict['@SECONDARY@'] = 'Alt'
+       keybindings_dict['@TERTIARY@'] = 'Shift'
+       keybindings_dict['@LEVEL4@'] = env['WINDOWS_KEY']
+       keybindings_dict['@WINDOW@'] = 'Alt'
 
 for b in [ 'SAE-de-keypad',  'SAE-de-nokeypad', 'SAE-us-keypad', 'SAE-us-nokeypad', 'mnemonic-us', 'ergonomic-us' ]:
        target_file = b + '.bindings'