Merging from trunk
authorHans Fugal <hans@fugal.net>
Thu, 22 Jun 2006 23:40:55 +0000 (23:40 +0000)
committerHans Fugal <hans@fugal.net>
Thu, 22 Jun 2006 23:40:55 +0000 (23:40 +0000)
commit7ff370e79895d7eb293e7214689b791bd98415fb
treed36f88880be2925593984ee43e73283af48a0119
parentfd742b30fa1071c44d053cf4676149641f977a35
Merging from trunk

git-svn-id: svn://localhost/ardour2/branches/undo@638 d708f5d6-7413-0410-9779-e7cbd77b26cf
267 files changed:
SConstruct
gtk2_ardour/SConscript
gtk2_ardour/about.cc
gtk2_ardour/actions.cc
gtk2_ardour/add_route_dialog.cc
gtk2_ardour/analysis_window.cc
gtk2_ardour/ardev_common.sh
gtk2_ardour/ardour.menus
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/ardour_ui2.cc
gtk2_ardour/ardour_ui_dependents.cc
gtk2_ardour/ardour_ui_dialogs.cc
gtk2_ardour/ardour_ui_ed.cc
gtk2_ardour/ardour_ui_mixer.cc
gtk2_ardour/ardour_ui_options.cc
gtk2_ardour/audio_clock.cc
gtk2_ardour/audio_clock.h
gtk2_ardour/audio_time_axis.cc
gtk2_ardour/audio_time_axis.h
gtk2_ardour/automation_gain_line.cc
gtk2_ardour/automation_line.cc
gtk2_ardour/automation_pan_line.cc
gtk2_ardour/automation_time_axis.cc
gtk2_ardour/axis_view.h
gtk2_ardour/canvas-waveview.c
gtk2_ardour/color_manager.cc
gtk2_ardour/connection_editor.cc
gtk2_ardour/crossfade_edit.cc
gtk2_ardour/crossfade_view.cc
gtk2_ardour/crossfade_view.h
gtk2_ardour/curvetest.cc
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_cursors.cc
gtk2_ardour/editor_edit_groups.cc
gtk2_ardour/editor_export_audio.cc
gtk2_ardour/editor_hscroller.cc
gtk2_ardour/editor_imageframe.cc
gtk2_ardour/editor_keys.cc
gtk2_ardour/editor_markers.cc
gtk2_ardour/editor_mouse.cc
gtk2_ardour/editor_nudge.cc
gtk2_ardour/editor_ops.cc
gtk2_ardour/editor_region_list.cc
gtk2_ardour/editor_route_list.cc
gtk2_ardour/editor_rulers.cc
gtk2_ardour/editor_selection_list.cc
gtk2_ardour/editor_tempodisplay.cc
gtk2_ardour/editor_timefx.cc
gtk2_ardour/export_dialog.cc
gtk2_ardour/export_range_markers_dialog.cc
gtk2_ardour/gain_automation_time_axis.cc
gtk2_ardour/gain_meter.cc
gtk2_ardour/glade_factory.cc [deleted file]
gtk2_ardour/glade_factory.h [deleted file]
gtk2_ardour/glade_path.cc [deleted file]
gtk2_ardour/glade_path.h [deleted file]
gtk2_ardour/imageframe_socket_handler.cc
gtk2_ardour/imageframe_time_axis.cc
gtk2_ardour/imageframe_time_axis_view.cc
gtk2_ardour/imageframe_view.cc
gtk2_ardour/imageframe_view.h
gtk2_ardour/io_selector.cc
gtk2_ardour/keyboard.cc
gtk2_ardour/location_ui.cc
gtk2_ardour/main.cc
gtk2_ardour/marker_time_axis.cc
gtk2_ardour/meter_bridge.cc
gtk2_ardour/meter_bridge_strip.cc
gtk2_ardour/mixer_strip.cc
gtk2_ardour/mixer_strip.h
gtk2_ardour/mixer_ui.cc
gtk2_ardour/mixer_ui.h
gtk2_ardour/new_session_dialog.cc
gtk2_ardour/option_editor.cc
gtk2_ardour/opts.cc
gtk2_ardour/pan_automation_time_axis.cc
gtk2_ardour/panner2d.cc
gtk2_ardour/panner2d.h
gtk2_ardour/panner_ui.cc
gtk2_ardour/playlist_selector.cc
gtk2_ardour/plugin_selector.cc
gtk2_ardour/plugin_ui.cc
gtk2_ardour/plugin_ui.h
gtk2_ardour/po/de_DE.po
gtk2_ardour/po/el_GR.po
gtk2_ardour/po/es_ES.po
gtk2_ardour/po/fr_FR.po
gtk2_ardour/po/it_IT.po
gtk2_ardour/po/pt_BR.po
gtk2_ardour/po/pt_PT.po
gtk2_ardour/po/ru_RU.po
gtk2_ardour/redirect_automation_line.cc
gtk2_ardour/redirect_automation_line.h
gtk2_ardour/redirect_automation_time_axis.cc
gtk2_ardour/redirect_box.cc
gtk2_ardour/region_editor.cc
gtk2_ardour/region_gain_line.cc
gtk2_ardour/region_selection.cc
gtk2_ardour/regionview.cc
gtk2_ardour/regionview.h
gtk2_ardour/route_params_ui.cc
gtk2_ardour/route_redirect_selection.cc
gtk2_ardour/route_ui.cc
gtk2_ardour/route_ui.h
gtk2_ardour/selectable.h
gtk2_ardour/selection.cc
gtk2_ardour/send_ui.cc
gtk2_ardour/sfdb_ui.cc
gtk2_ardour/sfdb_ui.h
gtk2_ardour/streamview.cc
gtk2_ardour/streamview.h
gtk2_ardour/taperegionview.cc
gtk2_ardour/tempo_dialog.cc
gtk2_ardour/time_axis_view.cc
gtk2_ardour/time_axis_view_item.cc
gtk2_ardour/time_axis_view_item.h
gtk2_ardour/time_selection.cc
gtk2_ardour/utils.cc
gtk2_ardour/visual_time_axis.cc
gtk2_ardour/vst_pluginui.cc
libs/ardour/SConscript
libs/ardour/ardour/ardour.h
libs/ardour/ardour/audio_diskstream.h [new file with mode: 0644]
libs/ardour/ardour/audio_track.h
libs/ardour/ardour/audiofilesource.h [new file with mode: 0644]
libs/ardour/ardour/audiofilter.h
libs/ardour/ardour/audioregion.h
libs/ardour/ardour/audiosource.h [new file with mode: 0644]
libs/ardour/ardour/constsource.h [deleted file]
libs/ardour/ardour/coreaudio_source.h
libs/ardour/ardour/cycle_timer.h
libs/ardour/ardour/destructive_filesource.h
libs/ardour/ardour/diskstream.h [deleted file]
libs/ardour/ardour/externalsource.h [deleted file]
libs/ardour/ardour/filesource.h [deleted file]
libs/ardour/ardour/io.h
libs/ardour/ardour/osc.h
libs/ardour/ardour/playlist.h
libs/ardour/ardour/region.h
libs/ardour/ardour/route.h
libs/ardour/ardour/seqsource.h [deleted file]
libs/ardour/ardour/session.h
libs/ardour/ardour/session_diskstream.h
libs/ardour/ardour/silentsource.h [deleted file]
libs/ardour/ardour/sndfilesource.h
libs/ardour/ardour/source.h
libs/ardour/ardour/types.h
libs/ardour/audio_diskstream.cc [new file with mode: 0644]
libs/ardour/audio_library.cc
libs/ardour/audio_playlist.cc
libs/ardour/audio_track.cc
libs/ardour/audioengine.cc
libs/ardour/audiofilesource.cc [new file with mode: 0644]
libs/ardour/audiofilter.cc
libs/ardour/audioregion.cc
libs/ardour/audiosource.cc [new file with mode: 0644]
libs/ardour/auditioner.cc
libs/ardour/automation_event.cc
libs/ardour/configuration.cc
libs/ardour/connection.cc
libs/ardour/control_protocol_manager.cc
libs/ardour/coreaudio_source.cc
libs/ardour/crossfade.cc
libs/ardour/curve.cc
libs/ardour/cycle_timer.cc
libs/ardour/destructive_filesource.cc
libs/ardour/diskstream.cc [deleted file]
libs/ardour/externalsource.cc [deleted file]
libs/ardour/filesource.cc [deleted file]
libs/ardour/globals.cc
libs/ardour/import.cc
libs/ardour/insert.cc
libs/ardour/io.cc
libs/ardour/jack_slave.cc
libs/ardour/ladspa_plugin.cc
libs/ardour/location.cc
libs/ardour/mtc_slave.cc
libs/ardour/named_selection.cc
libs/ardour/osc.cc
libs/ardour/panner.cc
libs/ardour/playlist.cc
libs/ardour/playlist_factory.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/recent_sessions.cc
libs/ardour/redirect.cc
libs/ardour/region.cc
libs/ardour/reverse.cc
libs/ardour/route.cc
libs/ardour/route_group.cc
libs/ardour/send.cc
libs/ardour/session.cc
libs/ardour/session_butler.cc
libs/ardour/session_click.cc
libs/ardour/session_control.cc
libs/ardour/session_events.cc
libs/ardour/session_export.cc
libs/ardour/session_feedback.cc
libs/ardour/session_midi.cc
libs/ardour/session_process.cc
libs/ardour/session_state.cc
libs/ardour/session_time.cc
libs/ardour/session_timefx.cc
libs/ardour/session_transport.cc
libs/ardour/sndfilesource.cc
libs/ardour/source.cc
libs/ardour/state_manager.cc
libs/ardour/stateful.cc
libs/ardour/tempo.cc
libs/ardour/utils.cc
libs/ardour/vst_plugin.cc
libs/fst/SConscript [new file with mode: 0644]
libs/fst/fst.c [new file with mode: 0644]
libs/fst/fst.h [new file with mode: 0644]
libs/fst/fstinfofile.c [new file with mode: 0644]
libs/fst/jackvst.h [new file with mode: 0644]
libs/fst/vsti.c [new file with mode: 0644]
libs/fst/vstwin.c [new file with mode: 0644]
libs/gtkmm2ext/fastmeter.cc
libs/gtkmm2ext/gtk_ui.cc
libs/gtkmm2ext/po/el_GR.po
libs/gtkmm2ext/po/es_ES.po
libs/gtkmm2ext/po/pt_BR.po
libs/gtkmm2ext/po/ru_RU.po
libs/gtkmm2ext/selector.cc
libs/libsndfile/src/sndfile.c
libs/libsndfile/src/wav.c
libs/midi++2/fd_midiport.cc
libs/midi++2/midicontrollable.cc
libs/midi++2/midimanager.cc
libs/midi++2/mmc.cc
libs/midi++2/mmctest.cc
libs/pbd3/SConscript
libs/pbd3/base_ui.cc
libs/pbd3/error.cc [new file with mode: 0644]
libs/pbd3/pathscanner.cc
libs/pbd3/pbd/error.h
libs/pbd3/pbd/transmitter.h
libs/pbd3/pool.cc
libs/pbd3/transmitter.cc
libs/surfaces/control_protocol/SConscript
libs/surfaces/control_protocol/basic_ui.cc
libs/surfaces/control_protocol/basic_ui.h [deleted file]
libs/surfaces/control_protocol/control_protocol.cc
libs/surfaces/control_protocol/control_protocol.h [deleted file]
libs/surfaces/control_protocol/control_protocol/basic_ui.h [new file with mode: 0644]
libs/surfaces/control_protocol/control_protocol/control_protocol.h [new file with mode: 0644]
libs/surfaces/control_protocol/control_protocol/smpte.h [new file with mode: 0644]
libs/surfaces/control_protocol/smpte.cc [new file with mode: 0644]
libs/surfaces/generic_midi/generic_midi_control_protocol.h
libs/surfaces/generic_midi/interface.cc
libs/surfaces/tranzport/interface.cc
libs/surfaces/tranzport/tranzport_control_protocol.cc
libs/surfaces/tranzport/tranzport_control_protocol.h
templates/SConscript
vst/SConscript [new file with mode: 0644]
vst/winmain.c [new file with mode: 0644]