r269@gandalf: fugalh | 2006-08-03 20:18:05 -0600
authorHans Fugal <hans@fugal.net>
Fri, 4 Aug 2006 02:18:45 +0000 (02:18 +0000)
committerHans Fugal <hans@fugal.net>
Fri, 4 Aug 2006 02:18:45 +0000 (02:18 +0000)
commit79986643c0c904f6574bb5323e2233a43a9e622e
tree859323dbb096ac1658359881e7d11415b6588caa
parentb0b723445816bc968a6a183c6619fccc61e82859
 r269@gandalf:  fugalh | 2006-08-03 20:18:05 -0600
 Trunk merge conflicts resolved

git-svn-id: svn://localhost/ardour2/branches/undo@756 d708f5d6-7413-0410-9779-e7cbd77b26cf
444 files changed:
SConstruct
ardour.dox
gtk2_ardour/SConscript
gtk2_ardour/actions.cc
gtk2_ardour/analysis_window.cc
gtk2_ardour/ardev_common.sh
gtk2_ardour/ardour.menus
gtk2_ardour/ardour2_ui.rc
gtk2_ardour/ardour_dialog.h
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/ardour_ui2.cc
gtk2_ardour/ardour_ui_dialogs.cc
gtk2_ardour/ardour_ui_ed.cc
gtk2_ardour/audio_clock.h
gtk2_ardour/audio_region_editor.cc [new file with mode: 0644]
gtk2_ardour/audio_region_editor.h [new file with mode: 0644]
gtk2_ardour/audio_region_view.cc [new file with mode: 0644]
gtk2_ardour/audio_region_view.h [new file with mode: 0644]
gtk2_ardour/audio_regionview.cc [new file with mode: 0644]
gtk2_ardour/audio_streamview.cc [new file with mode: 0644]
gtk2_ardour/audio_streamview.h [new file with mode: 0644]
gtk2_ardour/audio_time_axis.cc
gtk2_ardour/audio_time_axis.h
gtk2_ardour/automation_time_axis.cc
gtk2_ardour/automation_time_axis.h
gtk2_ardour/canvas-waveview.h
gtk2_ardour/crossfade_edit.cc
gtk2_ardour/crossfade_view.cc
gtk2_ardour/crossfade_view.h
gtk2_ardour/editing_syms.h
gtk2_ardour/editor.cc
gtk2_ardour/editor.h
gtk2_ardour/editor_actions.cc
gtk2_ardour/editor_audio_import.cc
gtk2_ardour/editor_audiotrack.cc
gtk2_ardour/editor_canvas.cc
gtk2_ardour/editor_canvas_events.cc
gtk2_ardour/editor_export_audio.cc
gtk2_ardour/editor_items.h
gtk2_ardour/editor_keyboard.cc
gtk2_ardour/editor_keys.cc
gtk2_ardour/editor_markers.cc
gtk2_ardour/editor_mixer.cc
gtk2_ardour/editor_mouse.cc
gtk2_ardour/editor_ops.cc
gtk2_ardour/editor_route_list.cc
gtk2_ardour/editor_timefx.cc
gtk2_ardour/export_dialog.cc
gtk2_ardour/export_region_dialog.cc
gtk2_ardour/export_region_dialog.h
gtk2_ardour/fft_graph.cc
gtk2_ardour/fft_graph.h
gtk2_ardour/fft_result.cc
gtk2_ardour/gain_automation_time_axis.cc
gtk2_ardour/gain_automation_time_axis.h
gtk2_ardour/gain_meter.cc
gtk2_ardour/gain_meter.h
gtk2_ardour/io_selector.cc
gtk2_ardour/io_selector.h
gtk2_ardour/keyboard.h
gtk2_ardour/main.cc
gtk2_ardour/mixer_strip.cc
gtk2_ardour/mixer_strip.h
gtk2_ardour/mixer_ui.cc
gtk2_ardour/mixer_ui.h
gtk2_ardour/option_editor.cc
gtk2_ardour/option_editor.h
gtk2_ardour/pan_automation_time_axis.cc
gtk2_ardour/pan_automation_time_axis.h
gtk2_ardour/panner_ui.cc
gtk2_ardour/panner_ui.h
gtk2_ardour/pixmaps/tool_audition.xpm [new file with mode: 0644]
gtk2_ardour/pixmaps/tool_gain.xpm [new file with mode: 0644]
gtk2_ardour/pixmaps/tool_object.xpm [new file with mode: 0644]
gtk2_ardour/pixmaps/tool_range.xpm [new file with mode: 0644]
gtk2_ardour/pixmaps/tool_stretch.xpm [new file with mode: 0644]
gtk2_ardour/pixmaps/tool_zoom.xpm [new file with mode: 0644]
gtk2_ardour/pixmaps/zoom_full.xpm [new file with mode: 0644]
gtk2_ardour/pixmaps/zoom_in.xpm [new file with mode: 0644]
gtk2_ardour/pixmaps/zoom_out.xpm [new file with mode: 0644]
gtk2_ardour/playlist_selector.cc
gtk2_ardour/playlist_selector.h
gtk2_ardour/plugin_selector.cc
gtk2_ardour/plugin_selector.h
gtk2_ardour/plugin_ui.cc
gtk2_ardour/plugin_ui.h
gtk2_ardour/po/SConscript
gtk2_ardour/public_editor.h
gtk2_ardour/redirect_automation_line.cc
gtk2_ardour/redirect_automation_time_axis.cc
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_editor.cc [deleted file]
gtk2_ardour/region_editor.h
gtk2_ardour/region_gain_line.cc
gtk2_ardour/region_selection.cc
gtk2_ardour/region_selection.h
gtk2_ardour/region_view.cc [new file with mode: 0644]
gtk2_ardour/region_view.h [new file with mode: 0644]
gtk2_ardour/regionview.cc [deleted file]
gtk2_ardour/regionview.h [deleted file]
gtk2_ardour/route_params_ui.cc
gtk2_ardour/route_params_ui.h
gtk2_ardour/route_redirect_selection.cc
gtk2_ardour/route_redirect_selection.h
gtk2_ardour/route_selection.h
gtk2_ardour/route_time_axis.cc [new file with mode: 0644]
gtk2_ardour/route_time_axis.h [new file with mode: 0644]
gtk2_ardour/route_ui.cc
gtk2_ardour/route_ui.h
gtk2_ardour/selectable.h
gtk2_ardour/selection.cc
gtk2_ardour/selection.h
gtk2_ardour/selection_templates.h
gtk2_ardour/send_ui.cc
gtk2_ardour/send_ui.h
gtk2_ardour/sfdb_ui.cc
gtk2_ardour/sfdb_ui.h
gtk2_ardour/streamview.cc
gtk2_ardour/streamview.h
gtk2_ardour/tape_region_view.cc [new file with mode: 0644]
gtk2_ardour/tape_region_view.h [new file with mode: 0644]
gtk2_ardour/taperegionview.cc [deleted file]
gtk2_ardour/taperegionview.h [deleted file]
gtk2_ardour/time_axis_view.cc
gtk2_ardour/time_axis_view.h
gtk2_ardour/time_axis_view_item.cc
gtk2_ardour/time_axis_view_item.h
gtk2_ardour/utils.cc
gtk2_ardour/visual_time_axis.cc
gtk2_ardour/visual_time_axis.h
libs/appleutility/AUOutputBL.cpp [new file with mode: 0644]
libs/appleutility/AUOutputBL.h [new file with mode: 0644]
libs/appleutility/CAAudioChannelLayout.cpp [new file with mode: 0644]
libs/appleutility/CAAudioChannelLayout.h [new file with mode: 0644]
libs/appleutility/CAAudioChannelLayoutObject.cpp [new file with mode: 0644]
libs/appleutility/CAAudioUnit.cpp [new file with mode: 0644]
libs/appleutility/CAAudioUnit.h [new file with mode: 0644]
libs/appleutility/CACFDictionary.cpp [new file with mode: 0644]
libs/appleutility/CACFDictionary.h [new file with mode: 0644]
libs/appleutility/CACFNumber.cpp [new file with mode: 0644]
libs/appleutility/CACFNumber.h [new file with mode: 0644]
libs/appleutility/CACFString.cpp [new file with mode: 0644]
libs/appleutility/CACFString.h [new file with mode: 0644]
libs/appleutility/CAComponent.cpp [new file with mode: 0644]
libs/appleutility/CAComponent.h [new file with mode: 0644]
libs/appleutility/CAComponentDescription.cpp [new file with mode: 0644]
libs/appleutility/CAComponentDescription.h [new file with mode: 0644]
libs/appleutility/CAConditionalMacros.h [new file with mode: 0644]
libs/appleutility/CADebugMacros.cpp [new file with mode: 0644]
libs/appleutility/CADebugMacros.h [new file with mode: 0644]
libs/appleutility/CAMath.h [new file with mode: 0644]
libs/appleutility/CAReferenceCounted.h [new file with mode: 0644]
libs/appleutility/CAStreamBasicDescription.cpp [new file with mode: 0644]
libs/appleutility/CAStreamBasicDescription.h [new file with mode: 0644]
libs/appleutility/SConscript [new file with mode: 0644]
libs/ardour/SConscript
libs/ardour/ardour/ardour.h
libs/ardour/ardour/audio_diskstream.h
libs/ardour/ardour/audio_library.h
libs/ardour/ardour/audio_track.h
libs/ardour/ardour/audio_unit.h [new file with mode: 0644]
libs/ardour/ardour/audioengine.h
libs/ardour/ardour/audiofilesource.h
libs/ardour/ardour/audioplaylist.h
libs/ardour/ardour/audioregion.h
libs/ardour/ardour/audiosource.h
libs/ardour/ardour/buffer.h [new file with mode: 0644]
libs/ardour/ardour/configuration.h
libs/ardour/ardour/connection.h
libs/ardour/ardour/control_protocol_manager.h
libs/ardour/ardour/curve.h
libs/ardour/ardour/data_type.h [new file with mode: 0644]
libs/ardour/ardour/destructive_filesource.h
libs/ardour/ardour/diskstream.h [new file with mode: 0644]
libs/ardour/ardour/export.h
libs/ardour/ardour/insert.h
libs/ardour/ardour/io.h
libs/ardour/ardour/ladspa_plugin.h
libs/ardour/ardour/location.h
libs/ardour/ardour/logcurve.h
libs/ardour/ardour/named_selection.h
libs/ardour/ardour/panner.h
libs/ardour/ardour/playlist.h
libs/ardour/ardour/plugin.h
libs/ardour/ardour/plugin_manager.h
libs/ardour/ardour/port.h
libs/ardour/ardour/redirect.h
libs/ardour/ardour/region.h
libs/ardour/ardour/route.h
libs/ardour/ardour/route_group.h
libs/ardour/ardour/route_group_specialized.h
libs/ardour/ardour/send.h
libs/ardour/ardour/session.h
libs/ardour/ardour/session_diskstream.h [deleted file]
libs/ardour/ardour/session_region.h
libs/ardour/ardour/session_route.h
libs/ardour/ardour/sndfilesource.h
libs/ardour/ardour/source.h
libs/ardour/ardour/stateful.h [deleted file]
libs/ardour/ardour/tempo.h
libs/ardour/ardour/track.h [new file with mode: 0644]
libs/ardour/ardour/types.h
libs/ardour/ardour/utils.h
libs/ardour/ardour/vst_plugin.h
libs/ardour/audio_diskstream.cc
libs/ardour/audio_library.cc
libs/ardour/audio_playlist.cc
libs/ardour/audio_track.cc
libs/ardour/audio_unit.cc [new file with mode: 0644]
libs/ardour/audioengine.cc
libs/ardour/audiofilesource.cc
libs/ardour/audioregion.cc
libs/ardour/audiosource.cc
libs/ardour/auditioner.cc
libs/ardour/automation_event.cc
libs/ardour/configuration.cc
libs/ardour/control_protocol_manager.cc
libs/ardour/coreaudiosource.cc
libs/ardour/crossfade.cc
libs/ardour/destructive_filesource.cc
libs/ardour/diskstream.cc [new file with mode: 0644]
libs/ardour/globals.cc
libs/ardour/insert.cc
libs/ardour/io.cc
libs/ardour/ladspa_plugin.cc
libs/ardour/location.cc
libs/ardour/mix.cc
libs/ardour/panner.cc
libs/ardour/playlist.cc
libs/ardour/plugin.cc
libs/ardour/plugin_manager.cc
libs/ardour/po/el_GR.po
libs/ardour/po/it_IT.po
libs/ardour/po/ru_RU.po
libs/ardour/port.cc
libs/ardour/redirect.cc
libs/ardour/region.cc
libs/ardour/route.cc
libs/ardour/session.cc
libs/ardour/session_butler.cc
libs/ardour/session_export.cc
libs/ardour/session_midi.cc
libs/ardour/session_process.cc
libs/ardour/session_state.cc
libs/ardour/session_time.cc
libs/ardour/session_transport.cc
libs/ardour/sndfilesource.cc
libs/ardour/source.cc
libs/ardour/stateful.cc [deleted file]
libs/ardour/track.cc [new file with mode: 0644]
libs/ardour/utils.cc
libs/ardour/vst_plugin.cc
libs/gtkmm2ext/SConscript
libs/gtkmm2ext/barcontroller.cc
libs/gtkmm2ext/binding_proxy.cc [new file with mode: 0644]
libs/gtkmm2ext/controller.cc [deleted file]
libs/gtkmm2ext/gtkmm2ext/barcontroller.h
libs/gtkmm2ext/gtkmm2ext/bindable_button.h
libs/gtkmm2ext/gtkmm2ext/binding_proxy.h [new file with mode: 0644]
libs/gtkmm2ext/gtkmm2ext/controller.h [deleted file]
libs/gtkmm2ext/gtkmm2ext/pathlist.h [new file with mode: 0644]
libs/gtkmm2ext/gtkmm2ext/slider_controller.h
libs/gtkmm2ext/pathlist.cc [new file with mode: 0644]
libs/gtkmm2ext/popup.cc
libs/gtkmm2ext/slider_controller.cc
libs/libgnomecanvasmm/SConscript
libs/libsndfile/src/sndfile.c
libs/midi++2/SConscript
libs/midi++2/midi++/channel.h
libs/midi++2/midi++/controllable.h [deleted file]
libs/midi++2/midi++/coremidi_midiport.h
libs/midi++2/midi++/factory.h
libs/midi++2/midi++/fd_midiport.h
libs/midi++2/midi++/fifomidi.h
libs/midi++2/midi++/manager.h
libs/midi++2/midi++/mmc.h
libs/midi++2/midi++/nullmidi.h
libs/midi++2/midi++/parser.h
libs/midi++2/midi++/port.h
libs/midi++2/midi++/port_request.h
libs/midi++2/midi++/types.h
libs/midi++2/midicontrollable.cc [deleted file]
libs/midi++2/midiparser.cc
libs/pbd/.cvsignore [new file with mode: 0644]
libs/pbd/AUTHORS [new file with mode: 0644]
libs/pbd/COPYING [new file with mode: 0644]
libs/pbd/ChangeLog [new file with mode: 0644]
libs/pbd/NEWS [new file with mode: 0644]
libs/pbd/README [new file with mode: 0644]
libs/pbd/SConscript [new file with mode: 0644]
libs/pbd/base_ui.cc [new file with mode: 0644]
libs/pbd/basename.cc [new file with mode: 0644]
libs/pbd/command.cc [new file with mode: 0644]
libs/pbd/controllable.cc [new file with mode: 0644]
libs/pbd/convert.cc [new file with mode: 0644]
libs/pbd/dmalloc.cc [new file with mode: 0644]
libs/pbd/error.cc [new file with mode: 0644]
libs/pbd/gettext.h [new file with mode: 0644]
libs/pbd/i18n.h [new file with mode: 0644]
libs/pbd/id.cc [new file with mode: 0644]
libs/pbd/libpbd.pc.in [new file with mode: 0644]
libs/pbd/libpbd.spec.in [new file with mode: 0644]
libs/pbd/mountpoint.cc [new file with mode: 0644]
libs/pbd/path.cc [new file with mode: 0644]
libs/pbd/pathscanner.cc [new file with mode: 0644]
libs/pbd/pbd/.DS_Store [new file with mode: 0644]
libs/pbd/pbd/.cvsignore [new file with mode: 0644]
libs/pbd/pbd/abstract_ui.cc [new file with mode: 0644]
libs/pbd/pbd/abstract_ui.h [new file with mode: 0644]
libs/pbd/pbd/base_ui.h [new file with mode: 0644]
libs/pbd/pbd/basename.h [new file with mode: 0644]
libs/pbd/pbd/command.h [new file with mode: 0644]
libs/pbd/pbd/compose.h [new file with mode: 0644]
libs/pbd/pbd/controllable.h [new file with mode: 0644]
libs/pbd/pbd/convert.h [new file with mode: 0644]
libs/pbd/pbd/error.h [new file with mode: 0644]
libs/pbd/pbd/failed_constructor.h [new file with mode: 0644]
libs/pbd/pbd/fastlog.h [new file with mode: 0644]
libs/pbd/pbd/forkexec.h [new file with mode: 0644]
libs/pbd/pbd/id.h [new file with mode: 0644]
libs/pbd/pbd/mathfix.h [new file with mode: 0644]
libs/pbd/pbd/memento_command.h [new file with mode: 0644]
libs/pbd/pbd/mountpoint.h [new file with mode: 0644]
libs/pbd/pbd/path.h [new file with mode: 0644]
libs/pbd/pbd/pathscanner.h [new file with mode: 0644]
libs/pbd/pbd/pool.h [new file with mode: 0644]
libs/pbd/pbd/pthread_utils.h [new file with mode: 0644]
libs/pbd/pbd/rcu.h [new file with mode: 0644]
libs/pbd/pbd/receiver.h [new file with mode: 0644]
libs/pbd/pbd/restartable_rw.h [new file with mode: 0644]
libs/pbd/pbd/ringbuffer.h [new file with mode: 0644]
libs/pbd/pbd/ringbufferNPT.h [new file with mode: 0644]
libs/pbd/pbd/selectable.h [new file with mode: 0644]
libs/pbd/pbd/serializable.h [new file with mode: 0644]
libs/pbd/pbd/stacktrace.h [new file with mode: 0644]
libs/pbd/pbd/stateful.h [new file with mode: 0644]
libs/pbd/pbd/stl_delete.h [new file with mode: 0644]
libs/pbd/pbd/stl_functors.h [new file with mode: 0644]
libs/pbd/pbd/strsplit.h [new file with mode: 0644]
libs/pbd/pbd/textreceiver.h [new file with mode: 0644]
libs/pbd/pbd/thrown_error.h [new file with mode: 0644]
libs/pbd/pbd/tokenizer.h [new file with mode: 0644]
libs/pbd/pbd/touchable.h [new file with mode: 0644]
libs/pbd/pbd/transmitter.h [new file with mode: 0644]
libs/pbd/pbd/undo.h [new file with mode: 0644]
libs/pbd/pbd/whitespace.h [new file with mode: 0644]
libs/pbd/pbd/xml++.h [new file with mode: 0644]
libs/pbd/pool.cc [new file with mode: 0644]
libs/pbd/pthread_utils.cc [new file with mode: 0644]
libs/pbd/receiver.cc [new file with mode: 0644]
libs/pbd/stacktrace.cc [new file with mode: 0644]
libs/pbd/stateful.cc [new file with mode: 0644]
libs/pbd/strsplit.cc [new file with mode: 0644]
libs/pbd/textreceiver.cc [new file with mode: 0644]
libs/pbd/transmitter.cc [new file with mode: 0644]
libs/pbd/undo.cc [new file with mode: 0644]
libs/pbd/whitespace.cc [new file with mode: 0644]
libs/pbd/xml++.cc [new file with mode: 0644]
libs/pbd3/.cvsignore [deleted file]
libs/pbd3/AUTHORS [deleted file]
libs/pbd3/COPYING [deleted file]
libs/pbd3/ChangeLog [deleted file]
libs/pbd3/NEWS [deleted file]
libs/pbd3/README [deleted file]
libs/pbd3/SConscript [deleted file]
libs/pbd3/base_ui.cc [deleted file]
libs/pbd3/basename.cc [deleted file]
libs/pbd3/command.cc [deleted file]
libs/pbd3/convert.cc [deleted file]
libs/pbd3/dmalloc.cc [deleted file]
libs/pbd3/error.cc [deleted file]
libs/pbd3/gettext.h [deleted file]
libs/pbd3/i18n.h [deleted file]
libs/pbd3/libpbd.pc.in [deleted file]
libs/pbd3/libpbd.spec.in [deleted file]
libs/pbd3/mountpoint.cc [deleted file]
libs/pbd3/pathscanner.cc [deleted file]
libs/pbd3/pbd/.DS_Store [deleted file]
libs/pbd3/pbd/.cvsignore [deleted file]
libs/pbd3/pbd/abstract_ui.cc [deleted file]
libs/pbd3/pbd/abstract_ui.h [deleted file]
libs/pbd3/pbd/base_ui.h [deleted file]
libs/pbd3/pbd/basename.h [deleted file]
libs/pbd3/pbd/command.h [deleted file]
libs/pbd3/pbd/compose.h [deleted file]
libs/pbd3/pbd/convert.h [deleted file]
libs/pbd3/pbd/error.h [deleted file]
libs/pbd3/pbd/failed_constructor.h [deleted file]
libs/pbd3/pbd/fastlog.h [deleted file]
libs/pbd3/pbd/forkexec.h [deleted file]
libs/pbd3/pbd/mathfix.h [deleted file]
libs/pbd3/pbd/memento_command.h [deleted file]
libs/pbd3/pbd/mountpoint.h [deleted file]
libs/pbd3/pbd/pathscanner.h [deleted file]
libs/pbd3/pbd/pool.h [deleted file]
libs/pbd3/pbd/pthread_utils.h [deleted file]
libs/pbd3/pbd/receiver.h [deleted file]
libs/pbd3/pbd/restartable_rw.h [deleted file]
libs/pbd3/pbd/ringbuffer.h [deleted file]
libs/pbd3/pbd/ringbufferNPT.h [deleted file]
libs/pbd3/pbd/selectable.h [deleted file]
libs/pbd3/pbd/serializable.h [deleted file]
libs/pbd3/pbd/stacktrace.h [deleted file]
libs/pbd3/pbd/stl_delete.h [deleted file]
libs/pbd3/pbd/stl_functors.h [deleted file]
libs/pbd3/pbd/strsplit.h [deleted file]
libs/pbd3/pbd/textreceiver.h [deleted file]
libs/pbd3/pbd/thrown_error.h [deleted file]
libs/pbd3/pbd/touchable.h [deleted file]
libs/pbd3/pbd/transmitter.h [deleted file]
libs/pbd3/pbd/undo.h [deleted file]
libs/pbd3/pbd/whitespace.h [deleted file]
libs/pbd3/pbd/xml++.h [deleted file]
libs/pbd3/pool.cc [deleted file]
libs/pbd3/pthread_utils.cc [deleted file]
libs/pbd3/receiver.cc [deleted file]
libs/pbd3/stacktrace.cc [deleted file]
libs/pbd3/strsplit.cc [deleted file]
libs/pbd3/textreceiver.cc [deleted file]
libs/pbd3/transmitter.cc [deleted file]
libs/pbd3/undo.cc [deleted file]
libs/pbd3/whitespace.cc [deleted file]
libs/pbd3/xml++.cc [deleted file]
libs/soundtouch/STTypes.h
libs/surfaces/control_protocol/SConscript
libs/surfaces/control_protocol/control_protocol.cc
libs/surfaces/control_protocol/control_protocol/control_protocol.h
libs/surfaces/generic_midi/SConscript
libs/surfaces/generic_midi/generic_midi_control_protocol.cc
libs/surfaces/generic_midi/generic_midi_control_protocol.h
libs/surfaces/generic_midi/interface.cc
libs/surfaces/generic_midi/midicontrollable.cc [new file with mode: 0644]
libs/surfaces/generic_midi/midicontrollable.h [new file with mode: 0644]
libs/surfaces/tranzport/SConscript
libs/surfaces/tranzport/tranzport_control_protocol.cc
libs/surfaces/tranzport/tranzport_control_protocol.h
tools/.cvsignore [deleted file]
tools/config.guess
tools/osx_packaging/ardour2_mac_ui.rc [new file with mode: 0644]
vst/SConscript