Merged changes from trunk 1699:1751 into 2.1-staging
authorPaul Davis <paul@linuxaudiosystems.com>
Thu, 26 Apr 2007 20:54:31 +0000 (20:54 +0000)
committerPaul Davis <paul@linuxaudiosystems.com>
Thu, 26 Apr 2007 20:54:31 +0000 (20:54 +0000)
commit87726495c30f90554b5204b5385d17274a8fe93e
treed7ecaf0be9b5cbd2afa226cd02cb53a36875d6a2
parent45d3ec1437cf661533bc7750c623865def4424df
Merged changes from trunk 1699:1751 into 2.1-staging

git-svn-id: svn://localhost/ardour2/branches/2.1-staging@1752 d708f5d6-7413-0410-9779-e7cbd77b26cf
182 files changed:
SConstruct
ardour.rc.in
ardour_system.rc [deleted file]
gtk2_ardour/SConscript
gtk2_ardour/about.cc
gtk2_ardour/actions.cc
gtk2_ardour/actions.h
gtk2_ardour/add_route_dialog.h
gtk2_ardour/ardour.menus
gtk2_ardour/ardour2_ui.rc
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/ardour_ui_dialogs.cc
gtk2_ardour/ardour_ui_ed.cc
gtk2_ardour/ardour_ui_options.cc
gtk2_ardour/audio_streamview.cc
gtk2_ardour/audio_streamview.h
gtk2_ardour/automation_gain_line.h
gtk2_ardour/automation_pan_line.h
gtk2_ardour/automation_selectable.h
gtk2_ardour/automation_selection.h
gtk2_ardour/automation_time_axis.cc
gtk2_ardour/automation_time_axis.h
gtk2_ardour/canvas.h
gtk2_ardour/canvas_impl.h
gtk2_ardour/color.h
gtk2_ardour/color_manager.cc
gtk2_ardour/color_manager.h
gtk2_ardour/colors.h
gtk2_ardour/crossfade_edit.h
gtk2_ardour/crossfade_xpms.h
gtk2_ardour/curvetest.cc
gtk2_ardour/draginfo.h
gtk2_ardour/editing.cc
gtk2_ardour/editing.h
gtk2_ardour/editing_syms.h
gtk2_ardour/editor.cc
gtk2_ardour/editor.h
gtk2_ardour/editor_actions.cc
gtk2_ardour/editor_audiotrack.cc
gtk2_ardour/editor_enums.h
gtk2_ardour/editor_items.h
gtk2_ardour/editor_markers.cc
gtk2_ardour/editor_mouse.cc
gtk2_ardour/editor_ops.cc
gtk2_ardour/editor_rulers.cc
gtk2_ardour/editor_selection.cc
gtk2_ardour/enums.cc
gtk2_ardour/enums.h
gtk2_ardour/export_dialog.cc
gtk2_ardour/gain_automation_time_axis.h
gtk2_ardour/ghostregion.cc
gtk2_ardour/gui_thread.h
gtk2_ardour/i18n.h
gtk2_ardour/imageframe_p.h
gtk2_ardour/itest.cc
gtk2_ardour/logmeter.h
gtk2_ardour/mixer_strip.cc
gtk2_ardour/mtest.cc
gtk2_ardour/new_session_dialog.cc
gtk2_ardour/new_session_dialog.h
gtk2_ardour/pan_automation_time_axis.h
gtk2_ardour/panner.cc
gtk2_ardour/panner.h
gtk2_ardour/playlist_selection.h
gtk2_ardour/po/de_DE.po
gtk2_ardour/po/fr_FR.po
gtk2_ardour/po/pt_PT.po
gtk2_ardour/po/sv_SE.po
gtk2_ardour/point_selection.h
gtk2_ardour/public_editor.cc
gtk2_ardour/public_editor.h
gtk2_ardour/redirect_automation_time_axis.h
gtk2_ardour/redirect_box.cc
gtk2_ardour/redirect_box.h
gtk2_ardour/redirect_selection.h
gtk2_ardour/region_gain_line.cc
gtk2_ardour/region_gain_line.h
gtk2_ardour/route_selection.h
gtk2_ardour/route_time_axis.cc
gtk2_ardour/route_time_axis.h
gtk2_ardour/route_ui.h
gtk2_ardour/simpleline_p.h
gtk2_ardour/simplerect_p.h
gtk2_ardour/streamview.cc
gtk2_ardour/strip_selection.h
gtk2_ardour/tempo_dialog.cc
gtk2_ardour/tempo_dialog.h
gtk2_ardour/time_axis_view.cc
gtk2_ardour/time_axis_view_item.cc
gtk2_ardour/time_selection.h
gtk2_ardour/track_selection.h
gtk2_ardour/waveview_p.h
libs/ardour/ardour/configuration_variable.h
libs/ardour/ardour/configuration_vars.h
libs/ardour/ardour/control_protocol_manager.h
libs/ardour/ardour/export.h
libs/ardour/ardour/noise.h
libs/ardour/ardour/peak.h
libs/ardour/ardour/playlist_factory.h
libs/ardour/ardour/plugin_manager.h
libs/ardour/ardour/profile.h
libs/ardour/ardour/region_factory.h
libs/ardour/ardour/route_group_specialized.h
libs/ardour/ardour/send.h
libs/ardour/ardour/session.h
libs/ardour/ardour/session_region.h
libs/ardour/ardour/slave.h
libs/ardour/ardour/sndfile_helpers.h
libs/ardour/ardour/source_factory.h
libs/ardour/ardour/timestamps.h
libs/ardour/audio_diskstream.cc
libs/ardour/audio_playlist.cc
libs/ardour/audioengine.cc
libs/ardour/automation.cc
libs/ardour/control_protocol_manager.cc
libs/ardour/crossfade.cc
libs/ardour/enums.cc
libs/ardour/jack_slave.cc
libs/ardour/mtc_slave.cc
libs/ardour/po/el_GR.po
libs/ardour/session.cc
libs/ardour/session_command.cc
libs/ardour/session_state.cc
libs/ardour/session_time.cc
libs/ardour/session_transport.cc
libs/ardour/sndfile_helpers.cc
libs/gtkmm2ext/dndtreeview.cc
libs/gtkmm2ext/focus_entry.cc
libs/gtkmm2ext/gtkmm2ext/choice.h
libs/gtkmm2ext/gtkmm2ext/dndtreeview.h
libs/gtkmm2ext/gtkmm2ext/focus_entry.h
libs/gtkmm2ext/gtkmm2ext/idle_adjustment.h
libs/gtkmm2ext/gtkmm2ext/pixscroller.h
libs/gtkmm2ext/gtkmm2ext/stop_signal.h
libs/gtkmm2ext/gtkmm2ext/window_title.h
libs/gtkmm2ext/idle_adjustment.cc
libs/gtkmm2ext/stateful_button.cc
libs/gtkmm2ext/window_title.cc
libs/midi++2/midi++/types.h
libs/pbd/base_ui.cc
libs/pbd/basename.cc
libs/pbd/command.cc
libs/pbd/controllable.cc
libs/pbd/copyfile.cc
libs/pbd/error.cc
libs/pbd/id.cc
libs/pbd/pbd/base_ui.h
libs/pbd/pbd/basename.h
libs/pbd/pbd/controllable.h
libs/pbd/pbd/copyfile.h
libs/pbd/pbd/crossthread.h
libs/pbd/pbd/destructible.h
libs/pbd/pbd/failed_constructor.h
libs/pbd/pbd/forkexec.h
libs/pbd/pbd/id.h
libs/pbd/pbd/pathscanner.h
libs/pbd/pbd/pthread_utils.h
libs/pbd/pbd/rcu.h
libs/pbd/pbd/replace_all.h
libs/pbd/pbd/shiva.h
libs/pbd/pbd/shortpath.h
libs/pbd/pbd/stacktrace.h
libs/pbd/pbd/statefuldestructible.h
libs/pbd/pbd/strsplit.h
libs/pbd/pbd/tokenizer.h
libs/pbd/pbd/whitespace.h
libs/pbd/shortpath.cc
libs/pbd/stacktrace.cc
libs/pbd/strreplace.cc
libs/pbd/strsplit.cc
libs/pbd/whitespace.cc
libs/surfaces/mackie/bcf_surface.cc
libs/surfaces/mackie/mackie_control_protocol.cc
libs/surfaces/mackie/mackie_control_protocol.h
libs/surfaces/mackie/scripts/bcf-controls.csv
manual/xml/mackie.xml
svn_revision.h
tools/ARDOUR/AutomationSRConverter.pm [new file with mode: 0644]
tools/ARDOUR/SessionSRHandler.pm [new file with mode: 0644]
tools/resample_session.pl [new file with mode: 0755]
tools/session_exchange.py