From 45d3ec1437cf661533bc7750c623865def4424df Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 11 Apr 2007 13:07:51 +0000 Subject: [PATCH] merged with 1697 revision of trunk (which is post-rc1 but pre-rc2 git-svn-id: svn://localhost/ardour2/branches/2.1-staging@1698 d708f5d6-7413-0410-9779-e7cbd77b26cf --- Makefile | 2 +- SConstruct | 45 +- ardour.dox | 12 +- ardour.rc.in | 1 + gtk2_ardour/SConscript | 10 +- gtk2_ardour/about.cc | 10 +- gtk2_ardour/about.h | 1 - gtk2_ardour/actions.cc | 1 - gtk2_ardour/add_route_dialog.cc | 3 +- gtk2_ardour/analysis_window.cc | 1 - gtk2_ardour/ardev_common.sh.in | 2 +- .../{ardour.bindings => ardour.bindings.in} | 2 +- gtk2_ardour/ardour.colors | 9 +- gtk2_ardour/ardour.menus | 10 +- gtk2_ardour/ardour2_ui.rc | 899 ++-- gtk2_ardour/ardour_image_compositor_socket.h | 1 - gtk2_ardour/ardour_ui.cc | 471 +- gtk2_ardour/ardour_ui.h | 111 +- gtk2_ardour/ardour_ui2.cc | 150 +- gtk2_ardour/ardour_ui_dependents.cc | 1 - gtk2_ardour/ardour_ui_dialogs.cc | 19 +- gtk2_ardour/ardour_ui_ed.cc | 48 +- gtk2_ardour/ardour_ui_mixer.cc | 4 +- gtk2_ardour/ardour_ui_options.cc | 107 +- gtk2_ardour/audio_clock.cc | 34 - gtk2_ardour/audio_clock.h | 1 - gtk2_ardour/audio_region_editor.cc | 10 +- gtk2_ardour/audio_region_editor.h | 1 - gtk2_ardour/audio_region_view.cc | 72 +- gtk2_ardour/audio_region_view.h | 4 +- gtk2_ardour/audio_streamview.cc | 9 + gtk2_ardour/audio_time_axis.cc | 25 +- gtk2_ardour/audio_time_axis.h | 2 +- gtk2_ardour/automation_gain_line.cc | 1 - gtk2_ardour/automation_line.cc | 9 +- gtk2_ardour/automation_line.h | 2 +- gtk2_ardour/automation_pan_line.cc | 1 - gtk2_ardour/automation_time_axis.cc | 39 +- gtk2_ardour/automation_time_axis.h | 3 + gtk2_ardour/axis_view.cc | 1 - gtk2_ardour/axis_view.h | 1 - gtk2_ardour/canvas-imageframe.h | 8 + gtk2_ardour/canvas-simplerect.c | 87 +- gtk2_ardour/canvas-waveview.c | 77 +- gtk2_ardour/canvas-waveview.h | 3 + gtk2_ardour/colors.h | 6 + gtk2_ardour/connection_editor.cc | 1 - gtk2_ardour/connection_editor.h | 1 - gtk2_ardour/crossfade_edit.cc | 35 +- gtk2_ardour/crossfade_edit.h | 5 +- gtk2_ardour/crossfade_view.cc | 1 - gtk2_ardour/crossfade_view.h | 1 - gtk2_ardour/editor.cc | 268 +- gtk2_ardour/editor.h | 37 +- gtk2_ardour/editor_actions.cc | 2 +- gtk2_ardour/editor_audio_import.cc | 53 +- gtk2_ardour/editor_audiotrack.cc | 2 - gtk2_ardour/editor_canvas.cc | 50 +- gtk2_ardour/editor_canvas_events.cc | 106 +- gtk2_ardour/editor_cursors.cc | 4 +- gtk2_ardour/editor_edit_groups.cc | 1 - gtk2_ardour/editor_export_audio.cc | 1 - gtk2_ardour/editor_hscroller.cc | 1 - gtk2_ardour/editor_imageframe.cc | 1 - gtk2_ardour/editor_keyboard.cc | 1 - gtk2_ardour/editor_keys.cc | 12 +- gtk2_ardour/editor_markers.cc | 35 +- gtk2_ardour/editor_mixer.cc | 45 +- gtk2_ardour/editor_mouse.cc | 772 ++- gtk2_ardour/editor_nudge.cc | 1 - gtk2_ardour/editor_ops.cc | 172 +- gtk2_ardour/editor_region_list.cc | 30 +- gtk2_ardour/editor_route_list.cc | 13 +- gtk2_ardour/editor_rulers.cc | 32 +- gtk2_ardour/editor_selection.cc | 20 +- gtk2_ardour/editor_selection_list.cc | 2 +- gtk2_ardour/editor_tempodisplay.cc | 37 +- gtk2_ardour/editor_timefx.cc | 9 +- gtk2_ardour/export_dialog.cc | 21 +- gtk2_ardour/export_dialog.h | 5 +- gtk2_ardour/export_range_markers_dialog.cc | 35 +- gtk2_ardour/export_range_markers_dialog.h | 2 + gtk2_ardour/export_region_dialog.cc | 3 + gtk2_ardour/export_session_dialog.cc | 3 +- gtk2_ardour/gain_automation_time_axis.cc | 1 - gtk2_ardour/gain_meter.cc | 36 +- gtk2_ardour/gain_meter.h | 5 +- gtk2_ardour/ghostregion.cc | 10 + gtk2_ardour/ghostregion.h | 2 +- gtk2_ardour/icons/crossfade_in_constant.png | Bin 0 -> 693 bytes gtk2_ardour/icons/crossfade_in_dipped.png | Bin 0 -> 667 bytes gtk2_ardour/icons/crossfade_in_fast-cut.png | Bin 0 -> 686 bytes gtk2_ardour/icons/crossfade_in_slow-cut.png | Bin 0 -> 723 bytes gtk2_ardour/icons/crossfade_in_slow-fade.png | Bin 0 -> 730 bytes gtk2_ardour/icons/crossfade_in_transition.png | Bin 0 -> 692 bytes gtk2_ardour/icons/crossfade_out_constant.png | Bin 0 -> 720 bytes gtk2_ardour/icons/crossfade_out_dipped.png | Bin 0 -> 831 bytes gtk2_ardour/icons/crossfade_out_fast-cut.png | Bin 0 -> 737 bytes gtk2_ardour/icons/crossfade_out_slow-cut.png | Bin 0 -> 770 bytes gtk2_ardour/icons/crossfade_out_slow-fade.png | Bin 0 -> 798 bytes .../icons/crossfade_out_transition.png | Bin 0 -> 737 bytes gtk2_ardour/imageframe.cc | 1 - gtk2_ardour/imageframe.h | 1 - gtk2_ardour/imageframe_socket_handler.cc | 1 - gtk2_ardour/imageframe_socket_handler.h | 1 - gtk2_ardour/imageframe_time_axis.cc | 1 - gtk2_ardour/imageframe_time_axis.h | 1 - gtk2_ardour/imageframe_time_axis_group.cc | 1 - gtk2_ardour/imageframe_time_axis_group.h | 1 - gtk2_ardour/imageframe_time_axis_view.cc | 1 - gtk2_ardour/imageframe_time_axis_view.h | 1 - gtk2_ardour/imageframe_view.cc | 1 - gtk2_ardour/imageframe_view.h | 1 - gtk2_ardour/io_selector.cc | 6 +- gtk2_ardour/io_selector.h | 2 +- gtk2_ardour/keyboard.cc | 514 +- gtk2_ardour/keyboard.h | 24 - gtk2_ardour/keyboard_target.cc | 258 - gtk2_ardour/keyboard_target.h | 83 - gtk2_ardour/ladspa_pluginui.cc | 19 +- gtk2_ardour/location_ui.cc | 9 +- gtk2_ardour/location_ui.h | 2 - gtk2_ardour/main.cc | 199 +- gtk2_ardour/marker.cc | 1 - gtk2_ardour/marker.h | 1 - gtk2_ardour/marker_time_axis.cc | 1 - gtk2_ardour/marker_time_axis.h | 1 - gtk2_ardour/marker_time_axis_view.cc | 1 - gtk2_ardour/marker_time_axis_view.h | 1 - gtk2_ardour/marker_view.cc | 1 - gtk2_ardour/marker_view.h | 1 - gtk2_ardour/meter_bridge.cc | 260 - gtk2_ardour/meter_bridge.h | 91 - gtk2_ardour/meter_bridge_strip.cc | 243 - gtk2_ardour/meter_bridge_strip.h | 110 - gtk2_ardour/mixer_strip.cc | 74 +- gtk2_ardour/mixer_strip.h | 3 - gtk2_ardour/mixer_ui.cc | 52 +- gtk2_ardour/mixer_ui.h | 6 +- gtk2_ardour/new_session_dialog.cc | 13 +- gtk2_ardour/new_session_dialog.h | 1 - gtk2_ardour/option_editor.cc | 48 +- gtk2_ardour/option_editor.h | 6 +- gtk2_ardour/opts.cc | 9 +- gtk2_ardour/opts.h | 1 - gtk2_ardour/pan_automation_time_axis.cc | 1 - gtk2_ardour/panner.cc | 10 +- gtk2_ardour/panner2d.cc | 5 +- gtk2_ardour/panner2d.h | 3 +- gtk2_ardour/panner_ui.cc | 56 +- gtk2_ardour/panner_ui.h | 1 - gtk2_ardour/playlist_selector.cc | 15 +- gtk2_ardour/plugin_selector.cc | 10 +- gtk2_ardour/plugin_ui.cc | 4 +- gtk2_ardour/plugin_ui.h | 1 - gtk2_ardour/po/de_DE.po | 4384 +++++++++-------- gtk2_ardour/po/fr_FR.po | 4249 ++++++++-------- gtk2_ardour/po/ru_RU.po | 3626 +++++++------- gtk2_ardour/po/sv_SE.po | 236 +- gtk2_ardour/prompter.cc | 1 - gtk2_ardour/prompter.h | 1 - gtk2_ardour/public_editor.h | 10 +- gtk2_ardour/redirect_automation_line.cc | 1 - gtk2_ardour/redirect_automation_line.h | 1 - gtk2_ardour/redirect_automation_time_axis.cc | 1 - gtk2_ardour/redirect_box.cc | 58 +- gtk2_ardour/redirect_box.h | 3 +- gtk2_ardour/region_editor.h | 1 - gtk2_ardour/region_selection.cc | 30 +- gtk2_ardour/region_view.cc | 30 +- gtk2_ardour/region_view.h | 64 +- gtk2_ardour/rgb_macros.h | 1 - gtk2_ardour/route_params_ui.cc | 51 +- gtk2_ardour/route_params_ui.h | 6 +- gtk2_ardour/route_redirect_selection.cc | 1 - gtk2_ardour/route_redirect_selection.h | 1 - gtk2_ardour/route_time_axis.cc | 32 +- gtk2_ardour/route_time_axis.h | 1 - gtk2_ardour/route_ui.cc | 121 +- gtk2_ardour/route_ui.h | 6 +- gtk2_ardour/selectable.h | 1 - gtk2_ardour/selection.cc | 4 +- gtk2_ardour/selection.h | 1 - gtk2_ardour/selection_templates.h | 1 - gtk2_ardour/send_ui.cc | 1 - gtk2_ardour/send_ui.h | 1 - gtk2_ardour/simpleline.cc | 1 - gtk2_ardour/simpleline.h | 1 - gtk2_ardour/simplerect.cc | 1 - gtk2_ardour/simplerect.h | 1 - gtk2_ardour/tape_region_view.cc | 1 - gtk2_ardour/tape_region_view.h | 1 - gtk2_ardour/time_axis_view.cc | 15 +- gtk2_ardour/time_axis_view.h | 1 - gtk2_ardour/time_axis_view_item.cc | 143 +- gtk2_ardour/time_axis_view_item.h | 18 +- gtk2_ardour/time_selection.cc | 1 - gtk2_ardour/utils.cc | 86 +- gtk2_ardour/utils.h | 3 +- gtk2_ardour/visual_time_axis.cc | 1 - gtk2_ardour/visual_time_axis.h | 1 - gtk2_ardour/vst_pluginui.cc | 1 - gtk2_ardour/waveview.cc | 17 +- gtk2_ardour/waveview.h | 5 +- libs/ardour/SConscript | 18 +- libs/ardour/ardour/ardour.h | 1 - libs/ardour/ardour/audio_diskstream.h | 71 +- libs/ardour/ardour/audio_track.h | 1 - libs/ardour/ardour/audioengine.h | 1 - libs/ardour/ardour/audiofilesource.h | 57 +- libs/ardour/ardour/audiofilter.h | 1 - libs/ardour/ardour/audioplaylist.h | 1 - libs/ardour/ardour/audioregion.h | 5 +- libs/ardour/ardour/audiosource.h | 80 +- libs/ardour/ardour/auditioner.h | 1 - libs/ardour/ardour/automation_event.h | 1 - libs/ardour/ardour/click.h | 1 - libs/ardour/ardour/configuration.h | 1 - libs/ardour/ardour/configuration_variable.h | 5 +- libs/ardour/ardour/configuration_vars.h | 7 +- libs/ardour/ardour/connection.h | 1 - libs/ardour/ardour/coreaudiosource.h | 2 +- libs/ardour/ardour/crossfade.h | 1 - libs/ardour/ardour/crossfade_compare.h | 1 - libs/ardour/ardour/curve.h | 1 - libs/ardour/ardour/cycle_timer.h | 1 - libs/ardour/ardour/cycles.h | 1 - libs/ardour/ardour/dB.h | 1 - libs/ardour/ardour/destructive_filesource.h | 76 - libs/ardour/ardour/diskstream.h | 8 +- libs/ardour/ardour/export.h | 6 +- libs/ardour/ardour/gain.h | 1 - libs/ardour/ardour/gdither.h | 1 - libs/ardour/ardour/gdither_types.h | 1 - libs/ardour/ardour/gdither_types_internal.h | 1 - libs/ardour/ardour/insert.h | 1 - libs/ardour/ardour/io.h | 4 +- libs/ardour/ardour/ladspa_plugin.h | 1 - libs/ardour/ardour/location.h | 9 +- libs/ardour/ardour/logcurve.h | 1 - libs/ardour/ardour/mix.h | 19 +- libs/ardour/ardour/named_selection.h | 1 - libs/ardour/ardour/osc.h | 1 - libs/ardour/ardour/panner.h | 1 - libs/ardour/ardour/pcm_utils.h | 1 - libs/ardour/ardour/playlist.h | 8 +- libs/ardour/ardour/playlist_templates.h | 1 - libs/ardour/ardour/plugin.h | 1 - libs/ardour/ardour/plugin_manager.h | 1 - libs/ardour/ardour/port.h | 1 - libs/ardour/ardour/profile.h | 31 + libs/ardour/ardour/redirect.h | 1 - libs/ardour/ardour/region.h | 1 - libs/ardour/ardour/reverse.h | 1 - libs/ardour/ardour/route.h | 22 +- libs/ardour/ardour/route_group.h | 1 - libs/ardour/ardour/send.h | 1 - libs/ardour/ardour/session.h | 34 +- libs/ardour/ardour/session_connection.h | 1 - libs/ardour/ardour/session_playlist.h | 1 - libs/ardour/ardour/session_route.h | 1 - libs/ardour/ardour/session_selection.h | 1 - libs/ardour/ardour/silentfilesource.h | 66 + libs/ardour/ardour/slave.h | 2 +- libs/ardour/ardour/sndfilesource.h | 9 +- libs/ardour/ardour/soundseq.h | 1 - libs/ardour/ardour/source.h | 5 +- libs/ardour/ardour/source_factory.h | 1 + libs/ardour/ardour/tempo.h | 1 - libs/ardour/ardour/types.h | 8 +- libs/ardour/ardour/utils.h | 1 - libs/ardour/ardour/vst_plugin.h | 1 - libs/ardour/audio_diskstream.cc | 641 +-- libs/ardour/audio_playlist.cc | 3 +- libs/ardour/audio_track.cc | 16 +- libs/ardour/audioengine.cc | 9 +- libs/ardour/audiofilesource.cc | 227 +- libs/ardour/audiofilter.cc | 2 +- libs/ardour/audioregion.cc | 72 +- libs/ardour/audiosource.cc | 605 +-- libs/ardour/auditioner.cc | 13 +- libs/ardour/automation_event.cc | 1 - libs/ardour/configuration.cc | 19 +- libs/ardour/connection.cc | 1 - libs/ardour/control_protocol_manager.cc | 13 +- libs/ardour/coreaudiosource.cc | 13 +- libs/ardour/crossfade.cc | 1 - libs/ardour/curve.cc | 1 - libs/ardour/cycle_timer.cc | 1 - libs/ardour/default_click.cc | 1 - libs/ardour/destructive_filesource.cc | 424 -- libs/ardour/diskstream.cc | 10 +- libs/ardour/enums.cc | 6 + libs/ardour/gain.cc | 1 - libs/ardour/gdither.cc | 1 - libs/ardour/globals.cc | 13 +- libs/ardour/import.cc | 275 +- libs/ardour/insert.cc | 5 +- libs/ardour/io.cc | 8 +- libs/ardour/jack_slave.cc | 1 - libs/ardour/ladspa_plugin.cc | 13 +- libs/ardour/location.cc | 21 +- .../macosx/English.lproj/InfoPlist.strings | Bin 0 -> 142 bytes libs/ardour/macosx/Info.plist | 26 + .../macosx/ardour.xcodeproj/project.pbxproj | 1214 +++++ libs/ardour/macosx/ardour_Prefix.pch | 4 + libs/ardour/macosx/version.cc | 3 + libs/ardour/macosx/version.h | 17 + libs/ardour/mix.cc | 28 +- libs/ardour/mtc_slave.cc | 38 +- libs/ardour/named_selection.cc | 1 - libs/ardour/osc.cc | 18 +- libs/ardour/panner.cc | 20 +- libs/ardour/pcm_utils.cc | 1 - libs/ardour/playlist.cc | 56 +- libs/ardour/playlist_factory.cc | 1 - libs/ardour/plugin.cc | 1 - libs/ardour/plugin_manager.cc | 1 - libs/ardour/port.cc | 1 - libs/ardour/redirect.cc | 1 - libs/ardour/region.cc | 7 +- libs/ardour/region_factory.cc | 1 - libs/ardour/reverse.cc | 33 +- libs/ardour/route.cc | 92 +- libs/ardour/route_group.cc | 1 - libs/ardour/send.cc | 1 - libs/ardour/session.cc | 175 +- libs/ardour/session_butler.cc | 13 +- libs/ardour/session_click.cc | 1 - libs/ardour/session_command.cc | 5 +- libs/ardour/session_control.cc | 30 - libs/ardour/session_events.cc | 1 - libs/ardour/session_export.cc | 58 +- libs/ardour/session_feedback.cc | 1 - libs/ardour/session_midi.cc | 57 +- libs/ardour/session_process.cc | 32 +- libs/ardour/session_state.cc | 206 +- libs/ardour/session_time.cc | 2 +- libs/ardour/session_timefx.cc | 46 +- libs/ardour/session_transport.cc | 19 +- libs/ardour/session_vst.cc | 1 - libs/ardour/silentfilesource.cc | 39 + libs/ardour/sndfilesource.cc | 82 +- libs/ardour/source.cc | 22 +- libs/ardour/source_factory.cc | 29 +- libs/ardour/sse_functions_xmm.cc | 116 + libs/ardour/tempo.cc | 1 - libs/ardour/utils.cc | 1 - libs/ardour/vst_plugin.cc | 6 +- libs/fst/fst.h | 1 + libs/fst/vstwin.c | 23 +- libs/glibmm2/autogen.sh | 22 + libs/gtkmm2ext/SConscript | 1 + libs/gtkmm2ext/barcontroller.cc | 8 +- libs/gtkmm2ext/bindable_button.cc | 13 +- libs/gtkmm2ext/fastmeter.cc | 63 +- libs/gtkmm2ext/gtk_ui.cc | 10 +- libs/gtkmm2ext/gtkmm2ext/auto_spin.h | 1 - libs/gtkmm2ext/gtkmm2ext/barcontroller.h | 1 - libs/gtkmm2ext/gtkmm2ext/bindable_button.h | 38 +- libs/gtkmm2ext/gtkmm2ext/click_box.h | 1 - libs/gtkmm2ext/gtkmm2ext/doi.h | 1 - libs/gtkmm2ext/gtkmm2ext/fastmeter.h | 7 +- libs/gtkmm2ext/gtkmm2ext/grouped_buttons.h | 1 - libs/gtkmm2ext/gtkmm2ext/gtk_ui.h | 1 - libs/gtkmm2ext/gtkmm2ext/gtkutils.h | 1 - libs/gtkmm2ext/gtkmm2ext/hexentry.h | 1 - libs/gtkmm2ext/gtkmm2ext/pixfader.h | 1 - libs/gtkmm2ext/gtkmm2ext/popup.h | 1 - libs/gtkmm2ext/gtkmm2ext/prompter.h | 1 - libs/gtkmm2ext/gtkmm2ext/selector.h | 1 - libs/gtkmm2ext/gtkmm2ext/slider_controller.h | 1 - libs/gtkmm2ext/gtkmm2ext/stateful_button.h | 59 +- libs/gtkmm2ext/gtkmm2ext/tearoff.h | 1 - libs/gtkmm2ext/gtkmm2ext/textviewer.h | 1 - libs/gtkmm2ext/gtkmm2ext/utils.h | 1 - libs/gtkmm2ext/gtkmm2ext/window_title.h | 44 + libs/gtkmm2ext/stateful_button.cc | 107 +- libs/gtkmm2ext/window_title.cc | 26 + .../macosx/English.lproj/InfoPlist.strings | Bin 0 -> 142 bytes libs/midi++2/macosx/Info.plist | 26 + .../macosx/midi++.xcodeproj/project.pbxproj | 498 ++ libs/midi++2/macosx/midi++_Prefix.pch | 3 + libs/midi++2/macosx/version.cc | 3 + libs/midi++2/macosx/version.h | 7 + libs/midi++2/midi++/alsa_rawmidi.h | 1 - libs/midi++2/midi++/alsa_sequencer.h | 1 - libs/midi++2/midi++/channel.h | 1 - libs/midi++2/midi++/factory.h | 1 - libs/midi++2/midi++/fd_midiport.h | 1 - libs/midi++2/midi++/fifomidi.h | 1 - libs/midi++2/midi++/manager.h | 1 - libs/midi++2/midi++/mmc.h | 3 +- libs/midi++2/midi++/nullmidi.h | 1 - libs/midi++2/midi++/parser.h | 5 +- libs/midi++2/midi++/port.h | 1 - libs/midi++2/midi++/port_request.h | 1 - libs/midi++2/midiparser.cc | 6 +- libs/midi++2/mmc.cc | 4 +- libs/midi++2/mtc.cc | 7 +- libs/pbd/SConscript | 2 + libs/pbd/controllable.cc | 55 + .../macosx/English.lproj/InfoPlist.strings | Bin 0 -> 136 bytes libs/pbd/macosx/Info.plist | 26 + libs/pbd/macosx/pbd.xcodeproj/project.pbxproj | 634 +++ libs/pbd/macosx/pbd_Prefix.pch | 4 + libs/pbd/macosx/version.cc | 3 + libs/pbd/macosx/version.h | 7 + libs/pbd/pbd/abstract_ui.cc | 12 +- libs/pbd/pbd/abstract_ui.h | 1 - libs/pbd/pbd/command.h | 1 - libs/pbd/pbd/controllable.h | 11 + libs/pbd/pbd/error.h | 1 - libs/pbd/pbd/mathfix.h | 1 - libs/pbd/pbd/memento_command.h | 1 - libs/pbd/pbd/mountpoint.h | 1 - libs/pbd/pbd/pool.h | 1 - libs/pbd/pbd/rcu.h | 19 +- libs/pbd/pbd/receiver.h | 1 - libs/pbd/pbd/replace_all.h | 8 + libs/pbd/pbd/ringbuffer.h | 146 +- libs/pbd/pbd/ringbufferNPT.h | 1 - libs/pbd/pbd/selectable.h | 1 - libs/pbd/pbd/shortpath.h | 8 + libs/pbd/pbd/stateful.h | 1 - libs/pbd/pbd/stl_delete.h | 1 - libs/pbd/pbd/stl_functors.h | 1 - libs/pbd/pbd/strsplit.h | 2 + libs/pbd/pbd/textreceiver.h | 1 - libs/pbd/pbd/thrown_error.h | 1 - libs/pbd/pbd/touchable.h | 1 - libs/pbd/pbd/transmitter.h | 1 - libs/pbd/pbd/undo.h | 1 - libs/pbd/shortpath.cc | 56 + libs/pbd/stacktrace.cc | 2 +- libs/pbd/strreplace.cc | 19 + libs/pbd/strsplit.cc | 39 + libs/sigc++2/autogen.sh | 21 + libs/sigc++2/sigc++/adaptors/bind.h | 28 +- libs/sigc++2/sigc++/adaptors/retype.h | 2 +- libs/sigc++2/sigc++/functors/functor_trait.h | 6 +- libs/sigc++2/sigc++/functors/slot.h | 100 +- libs/sigc++2/sigc++/retype.h | 2 +- libs/sigc++2/sigc++/signal.h | 222 +- libs/soundtouch/RateTransposer.cpp | 2 +- libs/soundtouch/RateTransposer.h | 2 +- libs/soundtouch/TDStretch.cpp | 7 - libs/surfaces/control_protocol/basic_ui.cc | 1 - .../control_protocol/control_protocol.cc | 1 - .../control_protocol/basic_ui.h | 1 - .../control_protocol/control_protocol.h | 1 - libs/surfaces/frontier/kernel_drivers/BUILD | 10 + .../surfaces/frontier/kernel_drivers/Makefile | 35 + libs/surfaces/frontier/kernel_drivers/README | 16 + .../frontier/kernel_drivers/doc/keycodes.html | 35 + .../frontier/kernel_drivers/tests/Makefile | 23 + .../frontier/kernel_drivers/tests/README | 104 + .../frontier/kernel_drivers/tests/tranzport.c | 375 ++ .../kernel_drivers/tests/tranzport_lights.c | 361 ++ .../kernel_drivers/tests/tranzport_tests.sh | 27 + .../frontier/kernel_drivers/tranzport.c | 1065 ++++ libs/surfaces/frontier/tests/Makefile | 17 + libs/surfaces/frontier/tests/README | 104 + libs/surfaces/frontier/tests/tranzport.c | 347 ++ .../frontier/tests/tranzport_lights.c | 361 ++ libs/surfaces/frontier/tranzport/SConscript | 56 + libs/surfaces/frontier/tranzport/interface.cc | 51 + .../tranzport/tranzport_control_protocol.cc | 3 +- .../tranzport/tranzport_control_protocol.h | 320 ++ libs/surfaces/generic_midi/SConscript | 4 +- .../generic_midi_control_protocol.cc | 84 +- .../generic_midi_control_protocol.h | 4 +- .../surfaces/generic_midi/midicontrollable.cc | 19 +- libs/surfaces/generic_midi/midicontrollable.h | 3 +- libs/surfaces/mackie/SConscript | 74 + libs/surfaces/mackie/TODO | 45 + libs/surfaces/mackie/bcf_surface.cc | 1473 ++++++ libs/surfaces/mackie/bcf_surface.h | 27 + libs/surfaces/mackie/controls.cc | 109 + libs/surfaces/mackie/controls.h | 301 ++ libs/surfaces/mackie/interface.cc | 96 + libs/surfaces/mackie/mackie_button_handler.cc | 691 +++ libs/surfaces/mackie/mackie_button_handler.h | 227 + .../mackie/mackie_control_exception.h | 47 + .../mackie/mackie_control_protocol.cc | 1378 ++++++ .../surfaces/mackie/mackie_control_protocol.h | 307 ++ .../mackie/mackie_control_protocol_poll.cc | 192 + libs/surfaces/mackie/mackie_midi_builder.cc | 173 + libs/surfaces/mackie/mackie_midi_builder.h | 81 + libs/surfaces/mackie/mackie_port.cc | 399 ++ libs/surfaces/mackie/mackie_port.h | 122 + libs/surfaces/mackie/mackie_surface.cc | 1504 ++++++ libs/surfaces/mackie/mackie_surface.h | 27 + libs/surfaces/mackie/midi_byte_array.cc | 98 + libs/surfaces/mackie/midi_byte_array.h | 76 + libs/surfaces/mackie/route_signal.cc | 95 + libs/surfaces/mackie/route_signal.h | 81 + libs/surfaces/mackie/scripts/bank.rb | 32 + libs/surfaces/mackie/scripts/bcf-controls.csv | 96 + libs/surfaces/mackie/scripts/controls.rb | 208 + libs/surfaces/mackie/scripts/dump.rb | 11 + .../scripts/generate-button-handlers-cc.erb | 59 + .../scripts/generate-button-handlers-h.erb | 54 + .../mackie/scripts/generate-surface.rb | 26 + libs/surfaces/mackie/scripts/host.rb | 133 + .../mackie/scripts/mackie-controls.csv | 93 + libs/surfaces/mackie/scripts/mackie.rb | 119 + libs/surfaces/mackie/scripts/parse.rb | 61 + libs/surfaces/mackie/scripts/signals.rb | 137 + libs/surfaces/mackie/scripts/simple_host.rb | 137 + .../mackie/scripts/surface-cc-template.erb | 95 + .../mackie/scripts/surface-h-template.erb | 27 + libs/surfaces/mackie/scripts/test_controls.rb | 9 + libs/surfaces/mackie/scripts/transform.rb | 26 + libs/surfaces/mackie/scripts/write.rb | 10 + libs/surfaces/mackie/surface.cc | 142 + libs/surfaces/mackie/surface.h | 94 + libs/surfaces/mackie/surface_port.cc | 178 + libs/surfaces/mackie/surface_port.h | 100 + libs/surfaces/mackie/test.cc | 25 + libs/surfaces/mackie/types.cc | 9 + libs/surfaces/mackie/types.h | 93 + libs/surfaces/tranzport/README | 90 + libs/surfaces/tranzport/SConscript | 46 +- libs/surfaces/tranzport/TODO | 6 + libs/surfaces/tranzport/bling.cc | 115 + libs/surfaces/tranzport/button_events.cc | 380 ++ libs/surfaces/tranzport/button_yn.cc | 21 + libs/surfaces/tranzport/buttons.cc | 113 + libs/surfaces/tranzport/general.cc | 333 ++ libs/surfaces/tranzport/init.cc | 314 ++ libs/surfaces/tranzport/interface.cc | 20 + libs/surfaces/tranzport/io.cc | 95 + libs/surfaces/tranzport/io_kernel.cc | 144 + libs/surfaces/tranzport/io_midi.cc | 26 + libs/surfaces/tranzport/io_usb.cc | 232 + libs/surfaces/tranzport/lcd.cc | 120 + libs/surfaces/tranzport/lights.cc | 95 + libs/surfaces/tranzport/meter.cc | 21 + libs/surfaces/tranzport/mode.cc | 107 + libs/surfaces/tranzport/mode_loop.cc | 21 + libs/surfaces/tranzport/mode_tuner.cc | 21 + libs/surfaces/tranzport/panner.cc | 34 + libs/surfaces/tranzport/screen.cc | 93 + libs/surfaces/tranzport/show.cc | 400 ++ libs/surfaces/tranzport/slider_gain.h | 40 + libs/surfaces/tranzport/state.cc | 148 + libs/surfaces/tranzport/tranzport_base.h | 78 + libs/surfaces/tranzport/tranzport_common.h | 44 + .../tranzport/tranzport_control_protocol.h | 130 +- libs/surfaces/tranzport/view_automation.cc | 21 + libs/surfaces/tranzport/view_bigmeter.cc | 21 + libs/surfaces/tranzport/view_bling.cc | 21 + libs/surfaces/tranzport/view_bus.cc | 21 + libs/surfaces/tranzport/view_config.cc | 21 + libs/surfaces/tranzport/view_layer.cc | 21 + libs/surfaces/tranzport/view_loop.cc | 21 + libs/surfaces/tranzport/view_manymeter.cc | 21 + libs/surfaces/tranzport/view_marker.cc | 21 + libs/surfaces/tranzport/view_master.cc | 21 + libs/surfaces/tranzport/view_plugins.cc | 21 + libs/surfaces/tranzport/view_std.cc | 21 + libs/surfaces/tranzport/view_tempo.cc | 21 + libs/surfaces/tranzport/view_tuner.cc | 21 + libs/surfaces/tranzport/wheel.cc | 206 + libs/surfaces/tranzport/wheel_modes.cc | 139 + manual/Makefile | 76 +- manual/catalog.xml | 17 + manual/config/dbhelper.vim | 14 +- manual/css/ardour_manual.css | 208 + manual/images/admon-bg.png | Bin 0 -> 186 bytes manual/images/manual_style.svg | 167 + .../images/mixer_strip_name_button_popup.png | Bin 0 -> 14475 bytes manual/images/tango-icons/COPYING | 67 + .../tango-icons/accessories-text-editor.svg | 552 +++ .../images/tango-icons/dialog-information.svg | 1145 +++++ manual/images/tango-icons/dialog-warning.svg | 359 ++ .../images/tango-icons/emblem-important.svg | 163 + manual/images/tango-icons/important.png | Bin 0 -> 1746 bytes manual/images/tango-icons/note.png | Bin 0 -> 2242 bytes manual/images/tango-icons/tip.png | Bin 0 -> 2976 bytes manual/images/tango-icons/warning.png | Bin 0 -> 1930 bytes manual/images/title-bg.png | Bin 0 -> 287 bytes manual/images/track_name_field.png | Bin 0 -> 7492 bytes manual/images/watermark-draft.png | Bin 0 -> 9828 bytes manual/templates/chapter_template.xml | 5 +- manual/templates/section_template.xml | 5 +- manual/xml/adding_tracks.xml | 87 +- manual/xml/advanced_editing.xml | 14 +- manual/xml/ardour_basics.xml | 32 +- manual/xml/ardour_manual.xml | 38 +- manual/xml/automation.xml | 379 +- manual/xml/basic_editing.xml | 36 +- manual/xml/basic_recording.xml | 481 +- manual/xml/bcf2000.xml | 1064 ++-- manual/xml/behringer_ddx3216.xml | 219 +- manual/xml/book_info.xml | 77 +- manual/xml/cleaning_up_a_session.xml | 64 +- manual/xml/clocks.xml | 166 +- manual/xml/closing_a_session.xml | 153 +- manual/xml/configuring_usb_device_access.xml | 77 +- manual/xml/contributing_to_the_manual.xml | 15 + manual/xml/control_surfaces.xml | 25 +- manual/xml/creating_a_new_session.xml | 254 +- manual/xml/default_track_names.xml | 22 + manual/xml/editing_concepts.xml | 580 +-- manual/xml/editor_aligning_key_bindings.xml | 118 +- manual/xml/editor_canvas_key_bindings.xml | 193 +- ...itor_edit_cursor_position_key_bindings.xml | 231 +- .../editor_locations_marks_key_bindings.xml | 99 +- .../xml/editor_miscellaneous_key_bindings.xml | 79 +- manual/xml/editor_nudging_key_bindings.xml | 122 +- .../xml/editor_play_position_key_bindings.xml | 212 +- .../editor_range_operations_key_bindings.xml | 137 +- .../editor_region_operations_key_bindings.xml | 156 +- .../editor_standard_editing_key_bindings.xml | 154 +- manual/xml/editor_window.xml | 132 +- manual/xml/editor_window_controls.xml | 609 +-- manual/xml/editor_window_group_list.xml | 30 +- manual/xml/editor_window_key_bindings.xml | 136 +- manual/xml/editor_window_region_list.xml | 254 +- manual/xml/editor_window_timeline.xml | 179 +- manual/xml/editor_window_track_list.xml | 98 +- manual/xml/editor_zoom_key_bindings.xml | 99 +- manual/xml/entities.ent | 11 + manual/xml/exporting.xml | 13 +- manual/xml/exporting_to_cd.xml | 306 +- manual/xml/formatting_conventions.xml | 242 +- manual/xml/frontier_design_tranzport.xml | 995 ++-- manual/xml/general_key_bindings.xml | 215 +- manual/xml/generic_midi_control_surface.xml | 8 +- manual/xml/generic_mouse_actions.xml | 124 +- manual/xml/glossary.xml | 503 +- manual/xml/introduction.xml | 37 +- manual/xml/jack.xml | 507 +- manual/xml/key_bindings.xml | 92 +- manual/xml/known_issues.xml | 156 +- manual/xml/mackie.xml | 249 + manual/xml/main_windows.xml | 149 +- manual/xml/midi_configuration.xml | 499 +- manual/xml/mixer_strip_list.xml | 151 +- manual/xml/mixer_strips.xml | 926 ++-- manual/xml/mixer_window.xml | 142 +- manual/xml/mixer_window_key_bindings.xml | 158 +- manual/xml/mixing.xml | 15 +- manual/xml/monitoring.xml | 345 +- manual/xml/mouse_operations.xml | 53 +- .../xml/mouse_operations_mixer_controls.xml | 353 +- manual/xml/mouse_operations_object_mode.xml | 605 +-- manual/xml/mouse_operations_range_mode.xml | 179 +- .../xml/mouse_operations_region_gain_mode.xml | 115 +- manual/xml/mouse_operations_ruler.xml | 185 +- manual/xml/mouse_operations_zoom_mode.xml | 114 +- manual/xml/mouse_wheel_actions.xml | 134 +- manual/xml/opening_a_session.xml | 91 +- manual/xml/other_windows.xml | 410 +- manual/xml/plugins.xml | 97 +- manual/xml/preface.xml | 14 +- manual/xml/recording.xml | 16 +- manual/xml/renaming_tracks.xml | 62 +- manual/xml/saving_a_session.xml | 53 +- manual/xml/sessions.xml | 41 +- manual/xml/setting_up_to_record.xml | 382 +- manual/xml/snapshots.xml | 46 +- manual/xml/starting_up_your_system.xml | 17 +- manual/xml/synchronization.xml | 15 +- manual/xml/synchronization_concepts.xml | 286 +- manual/xml/templates.xml | 80 +- manual/xml/tracks_and_busses.xml | 533 +- manual/xml/transport_key_bindings.xml | 131 +- manual/xml/user_interface_conventions.xml | 300 +- manual/xml/using_existing_audio.xml | 782 +-- manual/xml/video_synchronization_via_mtc.xml | 193 +- manual/xml/vst_plugins.xml | 69 +- manual/xml/what_is_different_about_ardour.xml | 218 +- manual/xml/why_is_it_called_ardour.xml | 375 +- manual/xml/working_with_crossfades.xml | 388 +- manual/xml/working_with_layers.xml | 247 +- manual/xml/working_with_playlists.xml | 405 +- manual/xml/working_with_ranges.xml | 48 +- manual/xml/working_with_regions.xml | 1116 +++-- manual/xmlformat/BUGS | 55 + manual/xmlformat/ChangeLog | 28 + manual/xmlformat/INSTALL | 29 + manual/xmlformat/LICENSE | 93 + manual/xmlformat/README | 35 + manual/xmlformat/xmlformat-ardour.conf | 137 + manual/xmlformat/xmlformat.pl | 1745 +++++++ manual/xsl/html.xsl | 158 + svn_revision.h | 2 +- templates/16 Tracks.template.in | 16 +- templates/32 Tracks.template.in | 24 +- templates/4 Tracks.template.in | 4 +- templates/8 Tracks.template.in | 8 +- tools/osx_packaging/ardour2_mac_ui.rc | 913 ++-- vst/ardevst | 2 +- 696 files changed, 48513 insertions(+), 22850 deletions(-) rename gtk2_ardour/{ardour.bindings => ardour.bindings.in} (99%) create mode 100644 gtk2_ardour/icons/crossfade_in_constant.png create mode 100644 gtk2_ardour/icons/crossfade_in_dipped.png create mode 100644 gtk2_ardour/icons/crossfade_in_fast-cut.png create mode 100644 gtk2_ardour/icons/crossfade_in_slow-cut.png create mode 100644 gtk2_ardour/icons/crossfade_in_slow-fade.png create mode 100644 gtk2_ardour/icons/crossfade_in_transition.png create mode 100644 gtk2_ardour/icons/crossfade_out_constant.png create mode 100644 gtk2_ardour/icons/crossfade_out_dipped.png create mode 100644 gtk2_ardour/icons/crossfade_out_fast-cut.png create mode 100644 gtk2_ardour/icons/crossfade_out_slow-cut.png create mode 100644 gtk2_ardour/icons/crossfade_out_slow-fade.png create mode 100644 gtk2_ardour/icons/crossfade_out_transition.png delete mode 100644 gtk2_ardour/keyboard_target.cc delete mode 100644 gtk2_ardour/keyboard_target.h delete mode 100644 gtk2_ardour/meter_bridge.cc delete mode 100644 gtk2_ardour/meter_bridge.h delete mode 100644 gtk2_ardour/meter_bridge_strip.cc delete mode 100644 gtk2_ardour/meter_bridge_strip.h delete mode 100644 libs/ardour/ardour/destructive_filesource.h create mode 100644 libs/ardour/ardour/profile.h create mode 100644 libs/ardour/ardour/silentfilesource.h delete mode 100644 libs/ardour/destructive_filesource.cc create mode 100644 libs/ardour/macosx/English.lproj/InfoPlist.strings create mode 100644 libs/ardour/macosx/Info.plist create mode 100644 libs/ardour/macosx/ardour.xcodeproj/project.pbxproj create mode 100644 libs/ardour/macosx/ardour_Prefix.pch create mode 100644 libs/ardour/macosx/version.cc create mode 100644 libs/ardour/macosx/version.h delete mode 100644 libs/ardour/session_control.cc create mode 100644 libs/ardour/silentfilesource.cc create mode 100644 libs/ardour/sse_functions_xmm.cc create mode 100644 libs/gtkmm2ext/gtkmm2ext/window_title.h create mode 100644 libs/gtkmm2ext/window_title.cc create mode 100644 libs/midi++2/macosx/English.lproj/InfoPlist.strings create mode 100644 libs/midi++2/macosx/Info.plist create mode 100644 libs/midi++2/macosx/midi++.xcodeproj/project.pbxproj create mode 100644 libs/midi++2/macosx/midi++_Prefix.pch create mode 100644 libs/midi++2/macosx/version.cc create mode 100644 libs/midi++2/macosx/version.h create mode 100644 libs/pbd/macosx/English.lproj/InfoPlist.strings create mode 100644 libs/pbd/macosx/Info.plist create mode 100644 libs/pbd/macosx/pbd.xcodeproj/project.pbxproj create mode 100644 libs/pbd/macosx/pbd_Prefix.pch create mode 100644 libs/pbd/macosx/version.cc create mode 100644 libs/pbd/macosx/version.h create mode 100644 libs/pbd/pbd/replace_all.h create mode 100644 libs/pbd/pbd/shortpath.h create mode 100644 libs/pbd/shortpath.cc create mode 100644 libs/pbd/strreplace.cc create mode 100644 libs/surfaces/frontier/kernel_drivers/BUILD create mode 100644 libs/surfaces/frontier/kernel_drivers/Makefile create mode 100644 libs/surfaces/frontier/kernel_drivers/README create mode 100644 libs/surfaces/frontier/kernel_drivers/doc/keycodes.html create mode 100644 libs/surfaces/frontier/kernel_drivers/tests/Makefile create mode 100644 libs/surfaces/frontier/kernel_drivers/tests/README create mode 100644 libs/surfaces/frontier/kernel_drivers/tests/tranzport.c create mode 100644 libs/surfaces/frontier/kernel_drivers/tests/tranzport_lights.c create mode 100755 libs/surfaces/frontier/kernel_drivers/tests/tranzport_tests.sh create mode 100644 libs/surfaces/frontier/kernel_drivers/tranzport.c create mode 100644 libs/surfaces/frontier/tests/Makefile create mode 100644 libs/surfaces/frontier/tests/README create mode 100644 libs/surfaces/frontier/tests/tranzport.c create mode 100644 libs/surfaces/frontier/tests/tranzport_lights.c create mode 100644 libs/surfaces/frontier/tranzport/SConscript create mode 100644 libs/surfaces/frontier/tranzport/interface.cc rename libs/surfaces/{ => frontier}/tranzport/tranzport_control_protocol.cc (99%) create mode 100644 libs/surfaces/frontier/tranzport/tranzport_control_protocol.h create mode 100644 libs/surfaces/mackie/SConscript create mode 100644 libs/surfaces/mackie/TODO create mode 100644 libs/surfaces/mackie/bcf_surface.cc create mode 100644 libs/surfaces/mackie/bcf_surface.h create mode 100644 libs/surfaces/mackie/controls.cc create mode 100644 libs/surfaces/mackie/controls.h create mode 100644 libs/surfaces/mackie/interface.cc create mode 100644 libs/surfaces/mackie/mackie_button_handler.cc create mode 100644 libs/surfaces/mackie/mackie_button_handler.h create mode 100644 libs/surfaces/mackie/mackie_control_exception.h create mode 100644 libs/surfaces/mackie/mackie_control_protocol.cc create mode 100644 libs/surfaces/mackie/mackie_control_protocol.h create mode 100644 libs/surfaces/mackie/mackie_control_protocol_poll.cc create mode 100644 libs/surfaces/mackie/mackie_midi_builder.cc create mode 100644 libs/surfaces/mackie/mackie_midi_builder.h create mode 100644 libs/surfaces/mackie/mackie_port.cc create mode 100644 libs/surfaces/mackie/mackie_port.h create mode 100644 libs/surfaces/mackie/mackie_surface.cc create mode 100644 libs/surfaces/mackie/mackie_surface.h create mode 100644 libs/surfaces/mackie/midi_byte_array.cc create mode 100644 libs/surfaces/mackie/midi_byte_array.h create mode 100644 libs/surfaces/mackie/route_signal.cc create mode 100644 libs/surfaces/mackie/route_signal.h create mode 100644 libs/surfaces/mackie/scripts/bank.rb create mode 100644 libs/surfaces/mackie/scripts/bcf-controls.csv create mode 100644 libs/surfaces/mackie/scripts/controls.rb create mode 100755 libs/surfaces/mackie/scripts/dump.rb create mode 100644 libs/surfaces/mackie/scripts/generate-button-handlers-cc.erb create mode 100644 libs/surfaces/mackie/scripts/generate-button-handlers-h.erb create mode 100755 libs/surfaces/mackie/scripts/generate-surface.rb create mode 100755 libs/surfaces/mackie/scripts/host.rb create mode 100644 libs/surfaces/mackie/scripts/mackie-controls.csv create mode 100644 libs/surfaces/mackie/scripts/mackie.rb create mode 100644 libs/surfaces/mackie/scripts/parse.rb create mode 100644 libs/surfaces/mackie/scripts/signals.rb create mode 100644 libs/surfaces/mackie/scripts/simple_host.rb create mode 100644 libs/surfaces/mackie/scripts/surface-cc-template.erb create mode 100644 libs/surfaces/mackie/scripts/surface-h-template.erb create mode 100755 libs/surfaces/mackie/scripts/test_controls.rb create mode 100644 libs/surfaces/mackie/scripts/transform.rb create mode 100644 libs/surfaces/mackie/scripts/write.rb create mode 100644 libs/surfaces/mackie/surface.cc create mode 100644 libs/surfaces/mackie/surface.h create mode 100644 libs/surfaces/mackie/surface_port.cc create mode 100644 libs/surfaces/mackie/surface_port.h create mode 100644 libs/surfaces/mackie/test.cc create mode 100644 libs/surfaces/mackie/types.cc create mode 100644 libs/surfaces/mackie/types.h create mode 100644 libs/surfaces/tranzport/README create mode 100644 libs/surfaces/tranzport/TODO create mode 100644 libs/surfaces/tranzport/bling.cc create mode 100644 libs/surfaces/tranzport/button_events.cc create mode 100644 libs/surfaces/tranzport/button_yn.cc create mode 100644 libs/surfaces/tranzport/buttons.cc create mode 100644 libs/surfaces/tranzport/general.cc create mode 100644 libs/surfaces/tranzport/init.cc create mode 100644 libs/surfaces/tranzport/io.cc create mode 100644 libs/surfaces/tranzport/io_kernel.cc create mode 100644 libs/surfaces/tranzport/io_midi.cc create mode 100644 libs/surfaces/tranzport/io_usb.cc create mode 100644 libs/surfaces/tranzport/lcd.cc create mode 100644 libs/surfaces/tranzport/lights.cc create mode 100644 libs/surfaces/tranzport/meter.cc create mode 100644 libs/surfaces/tranzport/mode.cc create mode 100644 libs/surfaces/tranzport/mode_loop.cc create mode 100644 libs/surfaces/tranzport/mode_tuner.cc create mode 100644 libs/surfaces/tranzport/panner.cc create mode 100644 libs/surfaces/tranzport/screen.cc create mode 100644 libs/surfaces/tranzport/show.cc create mode 100644 libs/surfaces/tranzport/slider_gain.h create mode 100644 libs/surfaces/tranzport/state.cc create mode 100644 libs/surfaces/tranzport/tranzport_base.h create mode 100644 libs/surfaces/tranzport/tranzport_common.h create mode 100644 libs/surfaces/tranzport/view_automation.cc create mode 100644 libs/surfaces/tranzport/view_bigmeter.cc create mode 100644 libs/surfaces/tranzport/view_bling.cc create mode 100644 libs/surfaces/tranzport/view_bus.cc create mode 100644 libs/surfaces/tranzport/view_config.cc create mode 100644 libs/surfaces/tranzport/view_layer.cc create mode 100644 libs/surfaces/tranzport/view_loop.cc create mode 100644 libs/surfaces/tranzport/view_manymeter.cc create mode 100644 libs/surfaces/tranzport/view_marker.cc create mode 100644 libs/surfaces/tranzport/view_master.cc create mode 100644 libs/surfaces/tranzport/view_plugins.cc create mode 100644 libs/surfaces/tranzport/view_std.cc create mode 100644 libs/surfaces/tranzport/view_tempo.cc create mode 100644 libs/surfaces/tranzport/view_tuner.cc create mode 100644 libs/surfaces/tranzport/wheel.cc create mode 100644 libs/surfaces/tranzport/wheel_modes.cc create mode 100644 manual/catalog.xml create mode 100644 manual/css/ardour_manual.css create mode 100644 manual/images/admon-bg.png create mode 100644 manual/images/manual_style.svg create mode 100644 manual/images/mixer_strip_name_button_popup.png create mode 100644 manual/images/tango-icons/COPYING create mode 100644 manual/images/tango-icons/accessories-text-editor.svg create mode 100644 manual/images/tango-icons/dialog-information.svg create mode 100644 manual/images/tango-icons/dialog-warning.svg create mode 100644 manual/images/tango-icons/emblem-important.svg create mode 100644 manual/images/tango-icons/important.png create mode 100644 manual/images/tango-icons/note.png create mode 100644 manual/images/tango-icons/tip.png create mode 100644 manual/images/tango-icons/warning.png create mode 100644 manual/images/title-bg.png create mode 100644 manual/images/track_name_field.png create mode 100644 manual/images/watermark-draft.png create mode 100644 manual/xml/contributing_to_the_manual.xml create mode 100644 manual/xml/default_track_names.xml create mode 100644 manual/xml/entities.ent create mode 100644 manual/xml/mackie.xml create mode 100644 manual/xmlformat/BUGS create mode 100644 manual/xmlformat/ChangeLog create mode 100644 manual/xmlformat/INSTALL create mode 100644 manual/xmlformat/LICENSE create mode 100644 manual/xmlformat/README create mode 100644 manual/xmlformat/xmlformat-ardour.conf create mode 100755 manual/xmlformat/xmlformat.pl create mode 100644 manual/xsl/html.xsl diff --git a/Makefile b/Makefile index 1a39c6d179..becce0e48c 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -all: scons cscope +all: scons scons: scons diff --git a/SConstruct b/SConstruct index 99bd85264b..d53cf624ad 100644 --- a/SConstruct +++ b/SConstruct @@ -16,7 +16,7 @@ import SCons.Node.FS SConsignFile() EnsureSConsVersion(0, 96) -ardour_version = '2.0beta11.1' +ardour_version = '2.0rc1' subst_dict = { } @@ -41,9 +41,11 @@ opts.AddOptions( PathOption('PREFIX', 'Set the install "prefix"', '/usr/local'), BoolOption('SURFACES', 'Build support for control surfaces', 1), BoolOption('SYSLIBS', 'USE AT YOUR OWN RISK: CANCELS ALL SUPPORT FROM ARDOUR AUTHORS: Use existing system versions of various libraries instead of internal ones', 0), + BoolOption('UNIVERSAL', 'Compile as universal binary. Requires that external libraries are already universal.', 0), BoolOption('VERSIONED', 'Add revision information to ardour/gtk executable name inside the build directory', 0), BoolOption('VST', 'Compile with support for VST', 0), - BoolOption('TRANZPORT', 'Compile with support for Frontier Designs (if libusb is available)', 0) + BoolOption('GPROFILE', 'Compile with support for gprofile (Developers only)', 0), + BoolOption('TRANZPORT', 'Compile with support for Frontier Designs (if libusb is available)', 1) ) #---------------------------------------------------------------------- @@ -311,7 +313,7 @@ env.Append (BUILDERS = {'VersionBuild' : version_bld}) # def versioned_builder(target,source,env): - w, r = os.popen2( "svn info | awk '/^Revision:/ { print $2}'") + w, r = os.popen2( "LANG= svn info | awk '/^Revision:/ { print $2}'") last_revision = r.readline().strip() w.close() @@ -540,7 +542,10 @@ env = conf.Finish() # opt_flags = [] -debug_flags = [ '-g' ] +if env['GPROFILE'] == 1: + debug_flags = [ '-g', '-pg' ] +else: + debug_flags = [ '-g' ] # guess at the platform, used to define compiler flags @@ -606,7 +611,7 @@ elif ((re.search ("i[0-9]86", config[config_cpu]) != None) or (re.search ("x86_6 if env['DIST_TARGET'] != 'i386': flag_line = os.popen ("cat /proc/cpuinfo | grep '^flags'").read()[:-1] - x86_flags = flag_line.split (": ")[1:][0].split (' ') + x86_flags = flag_line.split (": ")[1:][0].split () if "mmx" in x86_flags: opt_flags.append ("-mmmx") @@ -670,13 +675,19 @@ opt_flags[:0] = [ "-fomit-frame-pointer", "-ffast-math", "-fstrength-reduce", - "-fno-strict-aliasing" + "-pipe" ] if env['DEBUG'] == 1: env.Append(CCFLAGS=" ".join (debug_flags)) + env.Append(LINKFLAGS=" ".join (debug_flags)) else: env.Append(CCFLAGS=" ".join (opt_flags)) + env.Append(LINKFLAGS=" ".join (opt_flags)) + +if env['UNIVERSAL'] == 1: + env.Append(CCFLAGS="-arch i386 -arch ppc") + env.Append(LINKFLAGS="-arch i386 -arch ppc") # # warnings flags @@ -686,8 +697,9 @@ env.Append(CCFLAGS="-Wall") env.Append(CXXFLAGS="-Woverloaded-virtual") if env['EXTRA_WARN']: - env.Append(CCFLAGS="-Wextra -pedantic") + env.Append(CCFLAGS="-Wextra -pedantic -ansi") env.Append(CXXFLAGS="-ansi") +# env.Append(CFLAGS="-iso") if env['LIBLO']: env.Append(CCFLAGS="-DHAVE_LIBLO") @@ -726,7 +738,8 @@ prep_libcheck(env, libraries['flac']) libraries['flac'].Append(CCFLAGS="-I/usr/local/include", LINKFLAGS="-L/usr/local/lib") conf = Configure (libraries['flac']) -conf.CheckLib ('FLAC', 'FLAC__stream_decoder_new', language='CXX') +if conf.CheckLib ('FLAC', 'FLAC__stream_decoder_new', language='CXX'): + conf.env.Append(CCFLAGS='-DHAVE_FLAC') libraries['flac'] = conf.Finish () # or if that fails... @@ -840,7 +853,7 @@ if env['SYSLIBS']: libraries['sndfile-ardour'] = LibraryInfo(LIBS='libsndfile-ardour', LIBPATH='#libs/libsndfile', - CPPPATH=['#libs/libsndfile', '#libs/libsndfile/src']) + CPPPATH=['#libs/libsndfile/src']) # libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas') libraries['soundtouch'] = LibraryInfo() @@ -958,11 +971,14 @@ else: # its included in the tarball # -surface_subdirs = [ 'libs/surfaces/control_protocol', 'libs/surfaces/generic_midi', 'libs/surfaces/tranzport' ] +surface_subdirs = [ 'libs/surfaces/control_protocol', 'libs/surfaces/generic_midi', 'libs/surfaces/tranzport', 'libs/surfaces/mackie' ] if env['SURFACES']: if have_libusb: - env['TRANZPORT'] = 'yes' + env['TRANZPORT'] = 1 + else: + env['TRANZPORT'] = 0 + print 'Disabled building Tranzport code because libusb could not be found' if os.access ('libs/surfaces/sony9pin', os.F_OK): surface_subdirs += [ 'libs/surfaces/sony9pin' ] @@ -1069,6 +1085,13 @@ if not conf.CheckFunc('posix_memalign'): env = conf.Finish() rcbuild = env.SubstInFile ('ardour.rc','ardour.rc.in', SUBST_DICT = subst_dict) +subst_dict['%VERSION%'] = ardour_version[0:3] +subst_dict['%EXTRA_VERSION%'] = ardour_version[3:] +subst_dict['%REVISION_STRING%'] = '' +if os.path.exists('.svn'): + subst_dict['%REVISION_STRING%'] = '.' + fetch_svn_revision ('.') + 'svn' + +# specbuild = env.SubstInFile ('ardour.spec','ardour.spec.in', SUBST_DICT = subst_dict) the_revision = env.Command ('frobnicatory_decoy', [], create_stored_revision) diff --git a/ardour.dox b/ardour.dox index f2036d352e..6b4f419a9e 100644 --- a/ardour.dox +++ b/ardour.dox @@ -459,7 +459,7 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = libs/pbd libs/midi++2 libs/ardour libs/gtkmm2ext gtk2_ardour +INPUT = libs/pbd libs/midi++2 libs/ardour libs/surfaces libs/gtkmm2ext gtk2_ardour # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp @@ -556,7 +556,7 @@ FILTER_SOURCE_FILES = NO # Note: To get rid of all source code in the generated output, make sure also # VERBATIM_HEADERS is set to NO. -SOURCE_BROWSER = NO +SOURCE_BROWSER = YES # Setting the INLINE_SOURCES tag to YES will include the body # of functions and classes directly in the documentation. @@ -603,7 +603,7 @@ VERBATIM_HEADERS = YES # of all compounds will be generated. Enable this if the project # contains a lot of classes, structs, unions or interfaces. -ALPHABETICAL_INDEX = NO +ALPHABETICAL_INDEX = YES # If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then # the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns @@ -766,7 +766,7 @@ COMPACT_LATEX = NO # by the printer. Possible values are: a4, a4wide, letter, legal and # executive. If left blank a4wide will be used. -PAPER_TYPE = a4wide +PAPER_TYPE = letter # The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX # packages that should be included in the LaTeX output. @@ -791,7 +791,7 @@ PDF_HYPERLINKS = NO # plain latex in the generated Makefile. Set this option to YES to get a # higher quality PDF documentation. -USE_PDFLATEX = NO +USE_PDFLATEX = YES # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. # command to the generated LaTeX files. This will instruct LaTeX to keep @@ -1005,7 +1005,7 @@ INCLUDE_FILE_PATTERNS = # undefined via #undef or recursively expanded use the := operator # instead of the = operator. -PREDEFINED = HAVE_COREAUDIO VST_SUPPORT HAVE_LIBLO FFT_ANALYSIS +PREDEFINED = HAVE_LIBLO FFT_ANALYSIS # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. diff --git a/ardour.rc.in b/ardour.rc.in index ab34ae29d4..44738f8062 100644 --- a/ardour.rc.in +++ b/ardour.rc.in @@ -2,6 +2,7 @@ +