From fedf3d34f32264ac57c6a222b678dc90f2bb1a88 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 21 Oct 2006 19:01:50 +0000 Subject: Merged with trunk R992. Completely untested other than it compiles, runs, and records somewhat (need to merge again). git-svn-id: svn://localhost/ardour2/branches/midi@999 d708f5d6-7413-0410-9779-e7cbd77b26cf --- SConstruct | 68 +- ardour.rc.in | 1 + gtk2_ardour/SConscript | 39 +- gtk2_ardour/about.cc | 6 +- gtk2_ardour/actions.cc | 51 ++ gtk2_ardour/actions.h | 4 + gtk2_ardour/analysis_window.cc | 4 +- gtk2_ardour/ardbg | 2 +- gtk2_ardour/ardev | 2 +- gtk2_ardour/ardev_common.sh | 2 +- gtk2_ardour/ardour.colors | 4 +- gtk2_ardour/ardour.menus | 12 +- gtk2_ardour/ardour2_ui.rc | 12 +- gtk2_ardour/ardour_ui.cc | 180 +---- gtk2_ardour/ardour_ui.h | 64 +- gtk2_ardour/ardour_ui2.cc | 123 +-- gtk2_ardour/ardour_ui_ed.cc | 188 +++-- gtk2_ardour/ardour_ui_options.cc | 897 ++++++++++++-------- gtk2_ardour/arval | 3 +- gtk2_ardour/audio_clock.cc | 173 ++-- gtk2_ardour/audio_clock.h | 29 +- gtk2_ardour/audio_region_editor.cc | 26 +- gtk2_ardour/audio_region_view.cc | 19 +- gtk2_ardour/audio_region_view.h | 4 +- gtk2_ardour/audio_streamview.cc | 93 ++- gtk2_ardour/audio_streamview.h | 7 +- gtk2_ardour/automation_line.cc | 20 +- gtk2_ardour/automation_line.h | 14 +- gtk2_ardour/automation_selectable.h | 6 +- gtk2_ardour/automation_time_axis.cc | 6 +- gtk2_ardour/automation_time_axis.h | 10 +- gtk2_ardour/canvas-waveview.c | 3 + gtk2_ardour/crossfade_edit.cc | 14 +- gtk2_ardour/crossfade_view.cc | 18 +- gtk2_ardour/draginfo.h | 8 +- gtk2_ardour/editor.cc | 372 ++------- gtk2_ardour/editor.h | 170 ++-- gtk2_ardour/editor_actions.cc | 396 ++++++--- gtk2_ardour/editor_audio_import.cc | 16 +- gtk2_ardour/editor_audiotrack.cc | 6 +- gtk2_ardour/editor_canvas.cc | 36 +- gtk2_ardour/editor_canvas_events.cc | 4 +- gtk2_ardour/editor_cursors.cc | 2 +- gtk2_ardour/editor_export_audio.cc | 22 +- gtk2_ardour/editor_imageframe.cc | 70 +- gtk2_ardour/editor_keyboard.cc | 4 +- gtk2_ardour/editor_markers.cc | 12 +- gtk2_ardour/editor_mixer.cc | 2 +- gtk2_ardour/editor_mouse.cc | 170 ++-- gtk2_ardour/editor_ops.cc | 358 ++++---- gtk2_ardour/editor_region_list.cc | 3 +- gtk2_ardour/editor_rulers.cc | 88 +- gtk2_ardour/editor_tempodisplay.cc | 19 +- gtk2_ardour/export_dialog.cc | 6 +- gtk2_ardour/export_dialog.h | 2 +- gtk2_ardour/export_range_markers_dialog.cc | 4 +- gtk2_ardour/export_range_markers_dialog.h | 6 +- gtk2_ardour/export_session_dialog.cc | 2 +- gtk2_ardour/export_session_dialog.h | 2 +- gtk2_ardour/gain_automation_time_axis.cc | 2 +- gtk2_ardour/gain_automation_time_axis.h | 2 +- gtk2_ardour/gain_meter.cc | 25 +- gtk2_ardour/gain_meter.h | 2 +- gtk2_ardour/icons/nudge_left.png | Bin 0 -> 263 bytes gtk2_ardour/icons/nudge_right.png | Bin 0 -> 252 bytes gtk2_ardour/icons/tool_audition.png | Bin 0 -> 314 bytes gtk2_ardour/icons/tool_gain.png | Bin 0 -> 417 bytes gtk2_ardour/icons/tool_object.png | Bin 0 -> 461 bytes gtk2_ardour/icons/tool_object.xpm | 54 ++ gtk2_ardour/icons/tool_stretch.png | Bin 0 -> 284 bytes gtk2_ardour/icons/tool_zoom.png | Bin 0 -> 355 bytes gtk2_ardour/icons/transport_end.png | Bin 0 -> 331 bytes gtk2_ardour/icons/transport_loop.png | Bin 0 -> 681 bytes gtk2_ardour/icons/transport_play.png | Bin 0 -> 339 bytes gtk2_ardour/icons/transport_range.png | Bin 0 -> 294 bytes gtk2_ardour/icons/transport_record.png | Bin 0 -> 546 bytes gtk2_ardour/icons/transport_start.png | Bin 0 -> 370 bytes gtk2_ardour/icons/transport_stop.png | Bin 0 -> 204 bytes gtk2_ardour/icons/tw_edit_icons_07.xcf | Bin 0 -> 5600 bytes gtk2_ardour/icons/zoom_full.png | Bin 0 -> 365 bytes gtk2_ardour/icons/zoom_in.png | Bin 0 -> 354 bytes gtk2_ardour/icons/zoom_out.png | Bin 0 -> 346 bytes gtk2_ardour/imageframe_socket_handler.cc | 20 +- gtk2_ardour/imageframe_socket_handler.h | 8 +- gtk2_ardour/imageframe_time_axis_group.cc | 2 +- gtk2_ardour/imageframe_time_axis_group.h | 2 +- gtk2_ardour/imageframe_time_axis_view.cc | 2 +- gtk2_ardour/imageframe_view.cc | 12 +- gtk2_ardour/imageframe_view.h | 8 +- gtk2_ardour/location_ui.cc | 4 +- gtk2_ardour/main.cc | 9 +- gtk2_ardour/marker.cc | 4 +- gtk2_ardour/marker.h | 6 +- gtk2_ardour/marker_time_axis_view.cc | 4 +- gtk2_ardour/marker_time_axis_view.h | 2 +- gtk2_ardour/marker_view.cc | 4 +- gtk2_ardour/marker_view.h | 4 +- gtk2_ardour/meter_bridge_strip.cc | 6 +- gtk2_ardour/meter_bridge_strip.h | 6 +- gtk2_ardour/new_session_dialog.cc | 131 ++- gtk2_ardour/new_session_dialog.h | 12 +- gtk2_ardour/option_editor.cc | 34 +- gtk2_ardour/pan_automation_time_axis.cc | 2 +- gtk2_ardour/pan_automation_time_axis.h | 2 +- gtk2_ardour/public_editor.h | 14 +- gtk2_ardour/redirect_automation_time_axis.cc | 2 +- gtk2_ardour/redirect_automation_time_axis.h | 2 +- gtk2_ardour/redirect_box.cc | 6 +- gtk2_ardour/redirect_box.h | 4 +- gtk2_ardour/region_selection.cc | 4 +- gtk2_ardour/region_selection.h | 8 +- gtk2_ardour/region_view.cc | 13 +- gtk2_ardour/region_view.h | 4 +- gtk2_ardour/route_time_axis.cc | 12 +- gtk2_ardour/route_time_axis.h | 10 +- gtk2_ardour/route_ui.cc | 25 +- gtk2_ardour/route_ui.h | 3 +- gtk2_ardour/selection.cc | 10 +- gtk2_ardour/selection.h | 10 +- gtk2_ardour/send_ui.cc | 13 +- gtk2_ardour/send_ui.h | 1 - gtk2_ardour/sfdb_ui.cc | 8 +- gtk2_ardour/splash.png | Bin 0 -> 102707 bytes gtk2_ardour/splash.ppm | 32 - gtk2_ardour/streamview.cc | 35 +- gtk2_ardour/streamview.h | 8 +- gtk2_ardour/tempo_dialog.cc | 4 +- gtk2_ardour/tempo_dialog.h | 4 +- gtk2_ardour/time_axis_view.cc | 6 +- gtk2_ardour/time_axis_view.h | 8 +- gtk2_ardour/time_axis_view_item.cc | 24 +- gtk2_ardour/time_axis_view_item.h | 34 +- gtk2_ardour/time_selection.cc | 10 +- gtk2_ardour/time_selection.h | 6 +- gtk2_ardour/utils.cc | 46 +- gtk2_ardour/utils.h | 5 +- gtk2_ardour/visual_time_axis.cc | 2 +- gtk2_ardour/visual_time_axis.h | 2 +- icons/ardour_bw.ai | 287 +++++++ icons/ardour_bw.svg | 258 ++++++ icons/icon/ardour.icns | Bin 0 -> 41196 bytes icons/icon/ardour_icon_mac.png | Bin 0 -> 12059 bytes icons/icon/ardour_icon_mac_mask.png | Bin 0 -> 417 bytes icons/icon/ardour_icon_tango_16px.xcf | Bin 0 -> 4442 bytes icons/icon/ardour_icon_tango_16px_blue.png | Bin 0 -> 799 bytes icons/icon/ardour_icon_tango_16px_red.png | Bin 0 -> 746 bytes icons/icon/ardour_icon_tango_22px.xcf | Bin 0 -> 6260 bytes icons/icon/ardour_icon_tango_22px_blue.png | Bin 0 -> 1219 bytes icons/icon/ardour_icon_tango_22px_red.png | Bin 0 -> 1156 bytes icons/icon/ardour_icon_tango_32px.xcf | Bin 0 -> 5689 bytes icons/icon/ardour_icon_tango_32px_blue.png | Bin 0 -> 1993 bytes icons/icon/ardour_icon_tango_32px_red.png | Bin 0 -> 1878 bytes icons/icon/ardour_icon_tango_48px.xcf | Bin 0 -> 10320 bytes icons/icon/ardour_icon_tango_48px_blue.png | Bin 0 -> 3370 bytes icons/icon/ardour_icon_tango_48px_red.png | Bin 0 -> 3142 bytes icons/made_with/ardour_made.png | Bin 0 -> 65138 bytes icons/made_with/ardour_made.xar | Bin 0 -> 6301 bytes libs/appleutility/SConscript | 7 +- libs/ardour/SConscript | 2 +- libs/ardour/ardour/ardour.h | 6 +- libs/ardour/ardour/audio_diskstream.h | 20 +- libs/ardour/ardour/audio_track.h | 16 +- libs/ardour/ardour/audio_unit.h | 7 +- libs/ardour/ardour/audioengine.h | 58 +- libs/ardour/ardour/audiofilesource.h | 13 +- libs/ardour/ardour/audioplaylist.h | 6 +- libs/ardour/ardour/audioregion.h | 43 +- libs/ardour/ardour/audiosource.h | 36 +- libs/ardour/ardour/auditioner.h | 6 +- libs/ardour/ardour/configuration.h | 16 +- libs/ardour/ardour/configuration_variable.h | 102 ++- libs/ardour/ardour/configuration_vars.h | 176 ++-- libs/ardour/ardour/control_protocol_manager.h | 6 + libs/ardour/ardour/coreaudiosource.h | 11 +- libs/ardour/ardour/crossfade.h | 40 +- libs/ardour/ardour/destructive_filesource.h | 20 +- libs/ardour/ardour/diskstream.h | 69 +- libs/ardour/ardour/export.h | 22 +- libs/ardour/ardour/gain.h | 8 +- libs/ardour/ardour/insert.h | 25 +- libs/ardour/ardour/io.h | 64 +- libs/ardour/ardour/ladspa_plugin.h | 14 +- libs/ardour/ardour/location.h | 30 +- libs/ardour/ardour/mix.h | 32 +- libs/ardour/ardour/panner.h | 34 +- libs/ardour/ardour/peak.h | 4 +- libs/ardour/ardour/playlist.h | 48 +- libs/ardour/ardour/plugin.h | 16 +- libs/ardour/ardour/port.h | 4 +- libs/ardour/ardour/redirect.h | 10 +- libs/ardour/ardour/region.h | 71 +- libs/ardour/ardour/region_factory.h | 12 +- libs/ardour/ardour/route.h | 47 +- libs/ardour/ardour/send.h | 3 +- libs/ardour/ardour/session.h | 450 ++++------- libs/ardour/ardour/slave.h | 28 +- libs/ardour/ardour/sndfilesource.h | 16 +- libs/ardour/ardour/source.h | 2 +- libs/ardour/ardour/source_factory.h | 5 +- libs/ardour/ardour/state_manager.h | 2 +- libs/ardour/ardour/tempo.h | 64 +- libs/ardour/ardour/track.h | 18 +- libs/ardour/ardour/types.h | 106 ++- libs/ardour/ardour/utils.h | 11 +- libs/ardour/ardour/vst_plugin.h | 6 +- libs/ardour/audio_diskstream.cc | 140 ++-- libs/ardour/audio_playlist.cc | 27 +- libs/ardour/audio_track.cc | 45 +- libs/ardour/audio_unit.cc | 6 +- libs/ardour/audioengine.cc | 65 +- libs/ardour/audiofilesource.cc | 33 +- libs/ardour/audioregion.cc | 110 +-- libs/ardour/audiosource.cc | 87 +- libs/ardour/auditioner.cc | 4 +- libs/ardour/automation_event.cc | 4 +- libs/ardour/configuration.cc | 116 ++- libs/ardour/control_protocol_manager.cc | 49 +- libs/ardour/coreaudiosource.cc | 11 +- libs/ardour/crossfade.cc | 50 +- libs/ardour/default_click.cc | 4 +- libs/ardour/destructive_filesource.cc | 58 +- libs/ardour/diskstream.cc | 13 +- libs/ardour/gain.cc | 8 +- libs/ardour/globals.cc | 35 +- libs/ardour/import.cc | 2 +- libs/ardour/insert.cc | 42 +- libs/ardour/io.cc | 67 +- libs/ardour/jack_slave.cc | 4 +- libs/ardour/ladspa_plugin.cc | 17 +- libs/ardour/location.cc | 20 +- libs/ardour/meter.cc | 4 +- libs/ardour/midi_diskstream.cc | 28 +- libs/ardour/midi_region.cc | 2 +- libs/ardour/midi_track.cc | 23 +- libs/ardour/mix.cc | 32 +- libs/ardour/mtc_slave.cc | 20 +- libs/ardour/panner.cc | 63 +- libs/ardour/playlist.cc | 126 +-- libs/ardour/playlist_factory.cc | 2 +- libs/ardour/plugin.cc | 10 +- libs/ardour/plugin_manager.cc | 3 + libs/ardour/redirect.cc | 4 +- libs/ardour/region.cc | 86 +- libs/ardour/region_factory.cc | 12 +- libs/ardour/reverse.cc | 12 +- libs/ardour/route.cc | 107 ++- libs/ardour/send.cc | 2 +- libs/ardour/session.cc | 440 ++++------ libs/ardour/session_click.cc | 65 +- libs/ardour/session_events.cc | 30 +- libs/ardour/session_export.cc | 20 +- libs/ardour/session_midi.cc | 200 ++--- libs/ardour/session_process.cc | 62 +- libs/ardour/session_state.cc | 900 +++++++-------------- libs/ardour/session_time.cc | 87 +- libs/ardour/session_timefx.cc | 12 +- libs/ardour/session_transport.cc | 167 ++-- libs/ardour/sndfilesource.cc | 75 +- libs/ardour/source.cc | 2 +- libs/ardour/source_factory.cc | 73 +- libs/ardour/sse_functions.s | 4 +- libs/ardour/tempo.cc | 86 +- libs/ardour/track.cc | 6 +- libs/ardour/utils.cc | 108 ++- libs/ardour/vst_plugin.cc | 9 +- libs/fst/SConscript | 11 +- libs/glibmm2/SConscript | 26 +- libs/gtkmm2ext/dndtreeview.cc | 85 +- libs/gtkmm2ext/gtk_ui.cc | 6 +- libs/gtkmm2ext/gtkmm2ext/dndtreeview.h | 148 +++- libs/libsndfile/SConscript | 10 +- libs/midi++2/midi++/types.h | 6 +- libs/pbd/controllable.cc | 24 +- libs/pbd/id.cc | 11 +- libs/pbd/pbd/controllable.h | 14 +- libs/pbd/pbd/destructible.h | 2 +- libs/pbd/pbd/id.h | 2 +- libs/pbd/pbd/memento_command.h | 17 +- libs/pbd/pbd/restartable_rw.h | 7 - libs/pbd/pbd/shiva.h | 51 ++ libs/pbd/pbd/stacktrace.h | 2 +- libs/pbd/pbd/undo.h | 8 +- libs/pbd/stacktrace.cc | 6 +- libs/pbd/undo.cc | 53 +- libs/sigc++2/SConscript | 21 +- libs/surfaces/control_protocol/basic_ui.cc | 29 +- .../control_protocol/control_protocol.h | 4 + .../generic_midi/generic_midi_control_protocol.cc | 66 +- .../generic_midi/generic_midi_control_protocol.h | 4 + libs/surfaces/generic_midi/interface.cc | 1 + libs/surfaces/generic_midi/midicontrollable.cc | 2 + libs/surfaces/tranzport/interface.cc | 1 + .../tranzport/tranzport_control_protocol.cc | 9 +- .../tranzport/tranzport_control_protocol.h | 2 +- vst/SConscript | 37 +- vst/ardevst | 4 + vst/ardourvst.in | 8 + 297 files changed, 6118 insertions(+), 5443 deletions(-) create mode 100644 gtk2_ardour/icons/nudge_left.png create mode 100644 gtk2_ardour/icons/nudge_right.png create mode 100644 gtk2_ardour/icons/tool_audition.png create mode 100644 gtk2_ardour/icons/tool_gain.png create mode 100644 gtk2_ardour/icons/tool_object.png create mode 100644 gtk2_ardour/icons/tool_object.xpm create mode 100644 gtk2_ardour/icons/tool_stretch.png create mode 100644 gtk2_ardour/icons/tool_zoom.png create mode 100644 gtk2_ardour/icons/transport_end.png create mode 100644 gtk2_ardour/icons/transport_loop.png create mode 100644 gtk2_ardour/icons/transport_play.png create mode 100644 gtk2_ardour/icons/transport_range.png create mode 100644 gtk2_ardour/icons/transport_record.png create mode 100644 gtk2_ardour/icons/transport_start.png create mode 100644 gtk2_ardour/icons/transport_stop.png create mode 100644 gtk2_ardour/icons/tw_edit_icons_07.xcf create mode 100644 gtk2_ardour/icons/zoom_full.png create mode 100644 gtk2_ardour/icons/zoom_in.png create mode 100644 gtk2_ardour/icons/zoom_out.png create mode 100644 gtk2_ardour/splash.png delete mode 100644 gtk2_ardour/splash.ppm create mode 100644 icons/ardour_bw.ai create mode 100644 icons/ardour_bw.svg create mode 100644 icons/icon/ardour.icns create mode 100644 icons/icon/ardour_icon_mac.png create mode 100644 icons/icon/ardour_icon_mac_mask.png create mode 100644 icons/icon/ardour_icon_tango_16px.xcf create mode 100644 icons/icon/ardour_icon_tango_16px_blue.png create mode 100644 icons/icon/ardour_icon_tango_16px_red.png create mode 100644 icons/icon/ardour_icon_tango_22px.xcf create mode 100644 icons/icon/ardour_icon_tango_22px_blue.png create mode 100644 icons/icon/ardour_icon_tango_22px_red.png create mode 100644 icons/icon/ardour_icon_tango_32px.xcf create mode 100644 icons/icon/ardour_icon_tango_32px_blue.png create mode 100644 icons/icon/ardour_icon_tango_32px_red.png create mode 100644 icons/icon/ardour_icon_tango_48px.xcf create mode 100644 icons/icon/ardour_icon_tango_48px_blue.png create mode 100644 icons/icon/ardour_icon_tango_48px_red.png create mode 100644 icons/made_with/ardour_made.png create mode 100644 icons/made_with/ardour_made.xar delete mode 100644 libs/pbd/pbd/restartable_rw.h create mode 100644 libs/pbd/pbd/shiva.h create mode 100755 vst/ardevst create mode 100644 vst/ardourvst.in diff --git a/SConstruct b/SConstruct index 73aca5a4d9..a06fadbef7 100644 --- a/SConstruct +++ b/SConstruct @@ -15,7 +15,7 @@ import SCons.Node.FS SConsignFile() EnsureSConsVersion(0, 96) -version = '2.0beta2' +version = '2.0beta5.1' subst_dict = { } @@ -25,7 +25,7 @@ subst_dict = { } opts = Options('scache.conf') opts.AddOptions( - ('ARCH', 'Set architecture-specific compilation flags by hand (all flags as 1 argument)',''), + ('ARCH', 'Set architecture-specific compilation flags by hand (all flags as 1 argument)',''), BoolOption('AUDIOUNITS', 'Compile with Apple\'s AudioUnit library. (experimental)', 0), BoolOption('COREAUDIO', 'Compile with Apple\'s CoreAudio library', 0), BoolOption('DEBUG', 'Set to build with debugging information and no optimizations', 0), @@ -365,8 +365,8 @@ if env['VST']: answer = sys.stdin.readline () answer = answer.rstrip().strip() if answer != "yes" and answer != "y": - print 'You cannot build Ardour with VST support for distribution to others.\nIt is a violation of several different licenses. VST support disabled.' - env['VST'] = 0; + print 'You cannot build Ardour with VST support for distribution to others.\nIt is a violation of several different licenses. Build with VST=false.' + sys.exit (-1); else: print "OK, VST support will be enabled" @@ -572,15 +572,18 @@ if env['SYSLIBS']: 'libs/libsndfile', 'libs/pbd', 'libs/midi++2', - 'libs/ardour' + 'libs/ardour', + # these are unconditionally included but have + # tests internally to avoid compilation etc + # if VST is not set + 'libs/fst', + 'vst', + # this is unconditionally included but has + # tests internally to avoid compilation etc + # if COREAUDIO is not set + 'libs/appleutility' ] - if env['VST']: - subdirs = ['libs/fst'] + subdirs + ['vst'] - - if env['COREAUDIO']: - subdirs = subdirs + ['libs/appleutility'] - gtk_subdirs = [ # 'libs/flowcanvas', 'libs/gtkmm2ext', @@ -633,15 +636,18 @@ else: 'libs/libsndfile', 'libs/pbd', 'libs/midi++2', - 'libs/ardour' + 'libs/ardour', + # these are unconditionally included but have + # tests internally to avoid compilation etc + # if VST is not set + 'libs/fst', + 'vst', + # this is unconditionally included but has + # tests internally to avoid compilation etc + # if COREAUDIO is not set + 'libs/appleutility' ] - if env['VST']: - subdirs = ['libs/fst'] + subdirs + ['vst'] - - if env['COREAUDIO']: - subdirs = subdirs + ['libs/appleutility'] - gtk_subdirs = [ 'libs/glibmm2', 'libs/gtkmm2/pango', @@ -687,9 +693,15 @@ if os.environ.has_key('DISTCC_HOSTS'): env['ENV']['HOME'] = os.environ['HOME'] final_prefix = '$PREFIX' -install_prefix = '$DESTDIR/$PREFIX' -subst_dict['INSTALL_PREFIX'] = install_prefix; +if env['DESTDIR'] : + install_prefix = '$DESTDIR/$PREFIX' +else: + install_prefix = env['PREFIX'] + +subst_dict['%INSTALL_PREFIX%'] = install_prefix; +subst_dict['%FINAL_PREFIX%'] = final_prefix; +subst_dict['%PREFIX%'] = final_prefix; if env['PREFIX'] == '/usr': final_config_prefix = '/etc' @@ -698,7 +710,7 @@ else: config_prefix = '$DESTDIR' + final_config_prefix -# For colorgcc ( so says the wiki, but it's still not working :/ anyone? ) +# For colorgcc if os.environ.has_key('PATH'): env['PATH'] = os.environ['PATH'] if os.environ.has_key('TERM'): @@ -706,7 +718,6 @@ if os.environ.has_key('TERM'): if os.environ.has_key('HOME'): env['HOME'] = os.environ['HOME'] - # SCons should really do this for us conf = Configure (env) @@ -958,7 +969,17 @@ env.Distribute (env['DISTTREE'], 'COPYING', 'PACKAGER_README', 'README', 'ardour.rc.in', 'ardour_system.rc', - 'tools/config.guess' + 'tools/config.guess', + 'icons/icon/ardour_icon_mac_mask.png', + 'icons/icon/ardour_icon_mac.png', + 'icons/icon/ardour_icon_tango_16px_blue.png', + 'icons/icon/ardour_icon_tango_16px_red.png', + 'icons/icon/ardour_icon_tango_22px_blue.png', + 'icons/icon/ardour_icon_tango_22px_red.png', + 'icons/icon/ardour_icon_tango_32px_blue.png', + 'icons/icon/ardour_icon_tango_32px_red.png', + 'icons/icon/ardour_icon_tango_48px_blue.png', + 'icons/icon/ardour_icon_tango_48px_red.png' ] + glob.glob ('DOCUMENTATION/AUTHORS*') + glob.glob ('DOCUMENTATION/CONTRIBUTORS*') + @@ -970,6 +991,7 @@ env.Distribute (env['DISTTREE'], srcdist = env.Tarball(env['TARBALL'], env['DISTTREE']) env.Alias ('srctar', srcdist) + # # don't leave the distree around # diff --git a/ardour.rc.in b/ardour.rc.in index 96e0fe0a5b..6488d0ed82 100644 --- a/ardour.rc.in +++ b/ardour.rc.in @@ -1,6 +1,7 @@ +