Better method for redrawing gain meter pixmaps upon theme change

[ardour.git] / gtk2_ardour / SConscript

diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index bf97529d499184f8596972d8daf95cf46cb55964..010ce5888e7eea81567e123b167ef5b838a75d89 100644 (file)
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -39,7 +39,6 @@ gtkardour.Merge ([
     libraries['flac'],
     libraries['lrdf'],
     libraries['glibmm2'],
-    libraries['cairomm'],
     libraries['pangomm'],
     libraries['atkmm'],
     libraries['gdkmm2'],
@@ -94,20 +93,20 @@ ardour_ui_ed.cc
 ardour_ui_mixer.cc
 ardour_ui_options.cc
 audio_clock.cc
-route_time_axis.cc
 audio_time_axis.cc
+audio_region_editor.cc
 automation_gain_line.cc
 automation_line.cc
 automation_pan_line.cc
 automation_time_axis.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
 crossfade_edit.cc
 crossfade_view.cc
 curvetest.cc
@@ -123,7 +122,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
@@ -148,21 +146,12 @@ 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
 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
@@ -180,11 +169,12 @@ public_editor.cc
 redirect_automation_line.cc
 redirect_automation_time_axis.cc
 redirect_box.cc
-audio_region_editor.cc
 region_gain_line.cc
 region_selection.cc
 region_view.cc
 audio_region_view.cc
+midi_region_view.cc
+tape_region_view.cc
 route_params_ui.cc
 route_redirect_selection.cc
 route_ui.cc
@@ -193,14 +183,14 @@ sfdb_ui.cc
 send_ui.cc
 streamview.cc
 audio_streamview.cc
-tape_region_view.cc
 tempo_dialog.cc
+theme_manager.cc
 time_axis_view.cc
 time_axis_view_item.cc
+route_time_axis.cc
 time_selection.cc
 utils.cc
 version.cc
-visual_time_axis.cc
 waveview.cc
 """)
 
@@ -244,6 +234,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')
@@ -273,6 +282,13 @@ rcu = gtkardour.Program(target = 'rcu', source = rcu_files)
 tt = gtkmmtests.Program(target = 'tt', source = tt_files)
 
 my_subst_dict = { }
+
+#
+# null substitution just to avoid ardour.bindings being in svn
+#
+
+ardourbindings = env.SubstInFile ('ardour.bindings', 'ardour.bindings.in', SUBST_DICT = my_subst_dict);
+
 my_subst_dict['%INSTALL_PREFIX%'] = final_prefix
 my_subst_dict['%LIBDIR%'] = env['LIBDIR']
 my_subst_dict['%VERSION%'] = ardour_version
@@ -283,6 +299,7 @@ env.AddPostAction (ardoursh, Chmod ('$TARGET', 0755))
 ardourdev = env.SubstInFile ('ardev_common.sh','ardev_common.sh.in', SUBST_DICT = my_subst_dict);
 env.AddPostAction (ardourdev, Chmod ('$TARGET', 0755))
 
+Default(ardourbindings)
 Default(ardourdev)
 Default(ardoursh)
 
@@ -308,7 +325,8 @@ 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'))
@@ -325,8 +343,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', 'ardour.colors',
+                                       'ardev', 'ardbg',
+                                        'ardour2_ui_dark.rc', 'ardour2_ui_light.rc', 'splash.png',
+                                        'ardour.menus', 'ardour.bindings.in', 'ardour.colors',
                                        'editor_xpms'
                                         ] +
                                       gtkardour_files +