Merged with trunk revision 600
authorDavid Robillard <d@drobilla.net>
Thu, 15 Jun 2006 01:34:54 +0000 (01:34 +0000)
committerDavid Robillard <d@drobilla.net>
Thu, 15 Jun 2006 01:34:54 +0000 (01:34 +0000)
commitb5db1f624d347c8865c27fdae23bf4595be372d2
tree19d57731a87490c8de9773b64ee7ba76d244dc73
parenta8f44b1556e68f4cf28bd52e6de7359581a1ec45
Merged with trunk revision 600

git-svn-id: svn://localhost/ardour2/branches/midi@601 d708f5d6-7413-0410-9779-e7cbd77b26cf
207 files changed:
LAST_MERGE
SConstruct
gtk2_ardour/SConscript
gtk2_ardour/ardev_common.sh
gtk2_ardour/ardour.menus
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_clock.cc
gtk2_ardour/audio_clock.h
gtk2_ardour/audio_time_axis.cc
gtk2_ardour/audio_time_axis.h
gtk2_ardour/crossfade_edit.cc
gtk2_ardour/editor.cc
gtk2_ardour/editor.h
gtk2_ardour/editor_audio_import.cc
gtk2_ardour/editor_audiotrack.cc
gtk2_ardour/editor_canvas_events.cc
gtk2_ardour/editor_export_audio.cc
gtk2_ardour/editor_mouse.cc
gtk2_ardour/editor_ops.cc
gtk2_ardour/editor_region_list.cc
gtk2_ardour/editor_timefx.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/io_selector.cc
gtk2_ardour/main.cc
gtk2_ardour/meter_bridge.cc
gtk2_ardour/mixer_strip.cc
gtk2_ardour/mixer_strip.h
gtk2_ardour/mixer_ui.cc
gtk2_ardour/mixer_ui.h
gtk2_ardour/opts.cc
gtk2_ardour/playlist_selector.cc
gtk2_ardour/redirect_box.cc
gtk2_ardour/regionview.cc
gtk2_ardour/route_params_ui.cc
gtk2_ardour/route_ui.cc
gtk2_ardour/route_ui.h
gtk2_ardour/sfdb_ui.cc
gtk2_ardour/sfdb_ui.h
gtk2_ardour/streamview.cc
gtk2_ardour/streamview.h
gtk2_ardour/taperegionview.cc
libs/ardour/SConscript
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/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/playlist.h
libs/ardour/ardour/session.h
libs/ardour/ardour/session_diskstream.h
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_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/configuration.cc
libs/ardour/destructive_filesource.cc
libs/ardour/diskstream.cc [deleted file]
libs/ardour/externalsource.cc [deleted file]
libs/ardour/filesource.cc
libs/ardour/globals.cc
libs/ardour/import.cc
libs/ardour/osc.cc
libs/ardour/reverse.cc
libs/ardour/route_group.cc
libs/ardour/session.cc
libs/ardour/session_butler.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/libsndfile/AUTHORS [new file with mode: 0644]
libs/libsndfile/ChangeLog [new file with mode: 0644]
libs/libsndfile/Mingw-make-dist.sh [new file with mode: 0755]
libs/libsndfile/NEWS [new file with mode: 0644]
libs/libsndfile/README [new file with mode: 0644]
libs/libsndfile/SConscript [new file with mode: 0644]
libs/libsndfile/acinclude.m4 [new file with mode: 0644]
libs/libsndfile/aclocal.m4 [new file with mode: 0644]
libs/libsndfile/compile [new file with mode: 0755]
libs/libsndfile/config.guess [new file with mode: 0755]
libs/libsndfile/config.sub [new file with mode: 0755]
libs/libsndfile/configure [new file with mode: 0755]
libs/libsndfile/configure.ac [new file with mode: 0644]
libs/libsndfile/depcomp [new file with mode: 0755]
libs/libsndfile/install-sh [new file with mode: 0755]
libs/libsndfile/libsndfile.spec.in [new file with mode: 0644]
libs/libsndfile/missing [new file with mode: 0755]
libs/libsndfile/mkinstalldirs [new file with mode: 0755]
libs/libsndfile/sndfile.pc.in [new file with mode: 0644]
libs/libsndfile/src/G72x/ChangeLog [new file with mode: 0644]
libs/libsndfile/src/G72x/README [new file with mode: 0644]
libs/libsndfile/src/G72x/README.original [new file with mode: 0644]
libs/libsndfile/src/G72x/g721.c [new file with mode: 0644]
libs/libsndfile/src/G72x/g723_16.c [new file with mode: 0644]
libs/libsndfile/src/G72x/g723_24.c [new file with mode: 0644]
libs/libsndfile/src/G72x/g723_40.c [new file with mode: 0644]
libs/libsndfile/src/G72x/g72x.c [new file with mode: 0644]
libs/libsndfile/src/G72x/g72x.h [new file with mode: 0644]
libs/libsndfile/src/G72x/g72x_priv.h [new file with mode: 0644]
libs/libsndfile/src/G72x/g72x_test.c [new file with mode: 0644]
libs/libsndfile/src/GSM610/COPYRIGHT [new file with mode: 0644]
libs/libsndfile/src/GSM610/ChangeLog [new file with mode: 0644]
libs/libsndfile/src/GSM610/README [new file with mode: 0644]
libs/libsndfile/src/GSM610/add.c [new file with mode: 0644]
libs/libsndfile/src/GSM610/code.c [new file with mode: 0644]
libs/libsndfile/src/GSM610/config.h [new file with mode: 0644]
libs/libsndfile/src/GSM610/decode.c [new file with mode: 0644]
libs/libsndfile/src/GSM610/gsm.h [new file with mode: 0644]
libs/libsndfile/src/GSM610/gsm610_priv.h [new file with mode: 0644]
libs/libsndfile/src/GSM610/gsm_create.c [new file with mode: 0644]
libs/libsndfile/src/GSM610/gsm_decode.c [new file with mode: 0644]
libs/libsndfile/src/GSM610/gsm_destroy.c [new file with mode: 0644]
libs/libsndfile/src/GSM610/gsm_encode.c [new file with mode: 0644]
libs/libsndfile/src/GSM610/gsm_option.c [new file with mode: 0644]
libs/libsndfile/src/GSM610/long_term.c [new file with mode: 0644]
libs/libsndfile/src/GSM610/lpc.c [new file with mode: 0644]
libs/libsndfile/src/GSM610/preprocess.c [new file with mode: 0644]
libs/libsndfile/src/GSM610/rpe.c [new file with mode: 0644]
libs/libsndfile/src/GSM610/short_term.c [new file with mode: 0644]
libs/libsndfile/src/GSM610/table.c [new file with mode: 0644]
libs/libsndfile/src/Symbols.darwin [new file with mode: 0644]
libs/libsndfile/src/Symbols.linux [new file with mode: 0644]
libs/libsndfile/src/aiff.c [new file with mode: 0644]
libs/libsndfile/src/alaw.c [new file with mode: 0644]
libs/libsndfile/src/au.c [new file with mode: 0644]
libs/libsndfile/src/avr.c [new file with mode: 0644]
libs/libsndfile/src/broadcast.c [new file with mode: 0644]
libs/libsndfile/src/caf.c [new file with mode: 0644]
libs/libsndfile/src/command.c [new file with mode: 0644]
libs/libsndfile/src/common.c [new file with mode: 0644]
libs/libsndfile/src/common.h [new file with mode: 0644]
libs/libsndfile/src/config.h.in [new file with mode: 0644]
libs/libsndfile/src/cygsndfile.def [new file with mode: 0644]
libs/libsndfile/src/dither.c [new file with mode: 0644]
libs/libsndfile/src/double64.c [new file with mode: 0644]
libs/libsndfile/src/dwd.c [new file with mode: 0644]
libs/libsndfile/src/dwvw.c [new file with mode: 0644]
libs/libsndfile/src/file_io.c [new file with mode: 0644]
libs/libsndfile/src/flac.c [new file with mode: 0644]
libs/libsndfile/src/float32.c [new file with mode: 0644]
libs/libsndfile/src/float_cast.h [new file with mode: 0644]
libs/libsndfile/src/g72x.c [new file with mode: 0644]
libs/libsndfile/src/gsm610.c [new file with mode: 0644]
libs/libsndfile/src/htk.c [new file with mode: 0644]
libs/libsndfile/src/ima_adpcm.c [new file with mode: 0644]
libs/libsndfile/src/interleave.c [new file with mode: 0644]
libs/libsndfile/src/ircam.c [new file with mode: 0644]
libs/libsndfile/src/libsndfile.def [new file with mode: 0644]
libs/libsndfile/src/macbinary3.c [new file with mode: 0644]
libs/libsndfile/src/macos.c [new file with mode: 0644]
libs/libsndfile/src/mat4.c [new file with mode: 0644]
libs/libsndfile/src/mat5.c [new file with mode: 0644]
libs/libsndfile/src/ms_adpcm.c [new file with mode: 0644]
libs/libsndfile/src/nist.c [new file with mode: 0644]
libs/libsndfile/src/ogg.c [new file with mode: 0644]
libs/libsndfile/src/paf.c [new file with mode: 0644]
libs/libsndfile/src/pcm.c [new file with mode: 0644]
libs/libsndfile/src/pvf.c [new file with mode: 0644]
libs/libsndfile/src/raw.c [new file with mode: 0644]
libs/libsndfile/src/rx2.c [new file with mode: 0644]
libs/libsndfile/src/sd2.c [new file with mode: 0644]
libs/libsndfile/src/sds.c [new file with mode: 0644]
libs/libsndfile/src/sf_unistd.h [new file with mode: 0644]
libs/libsndfile/src/sfconfig.h [new file with mode: 0644]
libs/libsndfile/src/sfendian.h [new file with mode: 0644]
libs/libsndfile/src/sndfile.c [new file with mode: 0644]
libs/libsndfile/src/sndfile.h.in [new file with mode: 0644]
libs/libsndfile/src/stamp-h1 [new file with mode: 0644]
libs/libsndfile/src/strings.c [new file with mode: 0644]
libs/libsndfile/src/svx.c [new file with mode: 0644]
libs/libsndfile/src/txw.c [new file with mode: 0644]
libs/libsndfile/src/ulaw.c [new file with mode: 0644]
libs/libsndfile/src/voc.c [new file with mode: 0644]
libs/libsndfile/src/vox_adpcm.c [new file with mode: 0644]
libs/libsndfile/src/w64.c [new file with mode: 0644]
libs/libsndfile/src/wav.c [new file with mode: 0644]
libs/libsndfile/src/wav_w64.c [new file with mode: 0644]
libs/libsndfile/src/wav_w64.h [new file with mode: 0644]
libs/libsndfile/src/wve.c [new file with mode: 0644]
libs/libsndfile/src/xi.c [new file with mode: 0644]