From 2acc37e38d69c6c8510996b78bab8526f5648c9b Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 12 Mar 2013 17:36:51 -0400 Subject: [PATCH] merged with 3.0, probably finished --- .gitignore | 190 +- README | 2 +- ardour.1 | 3 + ardour_system.rc | 2 +- doc/updating_waf.txt | 3 - gtk2_ardour/about.cc | 2 +- gtk2_ardour/ambiguous_file_dialog.cc | 2 +- gtk2_ardour/ardbg | 2 +- gtk2_ardour/ardev | 1 - gtk2_ardour/ardev_common.sh.in | 14 +- gtk2_ardour/ardour.menus.in | 1 + gtk2_ardour/ardour.sh.in | 8 +- gtk2_ardour/ardour3_styles.rc.in | 15 +- gtk2_ardour/ardour3_ui_dark.rc.in | 4 +- gtk2_ardour/ardour3_ui_default.conf | 42 +- gtk2_ardour/ardour3_widget_list.rc | 17 +- gtk2_ardour/ardour_button.cc | 55 +- gtk2_ardour/ardour_button.h | 1 + gtk2_ardour/ardour_ui.cc | 248 +- gtk2_ardour/ardour_ui.h | 18 +- gtk2_ardour/ardour_ui2.cc | 4 +- gtk2_ardour/ardour_ui_dependents.cc | 19 + gtk2_ardour/ardour_ui_ed.cc | 12 - gtk2_ardour/ardour_ui_options.cc | 14 + gtk2_ardour/arldd | 1 - gtk2_ardour/arval | 11 +- gtk2_ardour/au_pluginui.h | 19 + gtk2_ardour/audio_clock.cc | 291 +- gtk2_ardour/audio_clock.h | 7 +- gtk2_ardour/audio_region_view.cc | 139 +- gtk2_ardour/audio_region_view.h | 18 +- gtk2_ardour/automation_line.cc | 55 +- gtk2_ardour/automation_line.h | 4 +- gtk2_ardour/automation_streamview.cc | 7 +- gtk2_ardour/automation_time_axis.cc | 42 +- gtk2_ardour/button_joiner.cc | 19 + gtk2_ardour/button_joiner.h | 19 + gtk2_ardour/canvas-flag.cc | 19 + gtk2_ardour/canvas-flag.h | 19 + gtk2_ardour/canvas-hit.cc | 19 + gtk2_ardour/canvas-note.cc | 19 + gtk2_ardour/canvas_patch_change.cc | 135 +- gtk2_ardour/canvas_vars.h | 19 + gtk2_ardour/crossfade_edit.cc | 4 +- gtk2_ardour/editor.cc | 84 +- gtk2_ardour/editor.h | 6 +- gtk2_ardour/editor_actions.cc | 5 +- gtk2_ardour/editor_audio_import.cc | 70 +- gtk2_ardour/editor_canvas_events.cc | 10 +- gtk2_ardour/editor_cursors.h | 3 +- gtk2_ardour/editor_drag.cc | 310 +- gtk2_ardour/editor_drag.h | 25 +- gtk2_ardour/editor_group_tabs.cc | 1 - gtk2_ardour/editor_markers.cc | 33 +- gtk2_ardour/editor_mixer.cc | 2 +- gtk2_ardour/editor_mouse.cc | 129 +- gtk2_ardour/editor_ops.cc | 27 +- gtk2_ardour/editor_regions.cc | 17 +- gtk2_ardour/editor_route_groups.cc | 16 +- gtk2_ardour/editor_route_groups.h | 2 - gtk2_ardour/editor_routes.cc | 15 +- gtk2_ardour/editor_scrub.cc | 0 gtk2_ardour/editor_selection.cc | 5 +- gtk2_ardour/editor_summary.cc | 2 +- gtk2_ardour/engine_dialog.cc | 45 +- gtk2_ardour/evtest.cc | 19 + gtk2_ardour/gain_meter.cc | 50 +- gtk2_ardour/gain_meter.h | 10 +- gtk2_ardour/global_signals.h | 19 + gtk2_ardour/group_tabs.cc | 12 +- gtk2_ardour/group_tabs.h | 1 + gtk2_ardour/gtk_pianokeyboard.h | 19 + gtk2_ardour/gui_thread.h | 19 + gtk2_ardour/i18n.h | 4 + gtk2_ardour/keyeditor.h | 19 + gtk2_ardour/latency_gui.cc | 5 +- gtk2_ardour/latency_gui.h | 19 + gtk2_ardour/linux_vst_gui_support.cc | 23 +- gtk2_ardour/location_ui.cc | 3 +- gtk2_ardour/lv2_external_ui.h | 19 + gtk2_ardour/lxvst_plugin_ui.cc | 8 +- gtk2_ardour/lxvst_plugin_ui.h | 19 + gtk2_ardour/main.cc | 126 +- gtk2_ardour/midi_channel_selector.cc | 10 +- gtk2_ardour/midi_port_dialog.cc | 19 + gtk2_ardour/midi_port_dialog.h | 19 + gtk2_ardour/midi_region_view.cc | 185 +- gtk2_ardour/midi_region_view.h | 10 +- gtk2_ardour/midi_streamview.cc | 42 +- gtk2_ardour/midi_time_axis.cc | 680 +- gtk2_ardour/midi_time_axis.h | 25 +- gtk2_ardour/midi_tracer.h | 19 + gtk2_ardour/missing_plugin_dialog.h | 19 + gtk2_ardour/mixer_strip.cc | 91 +- gtk2_ardour/mixer_ui.h | 1 + gtk2_ardour/mnemonic-us.bindings.in | 8 +- gtk2_ardour/monitor_section.cc | 49 +- gtk2_ardour/mono_panner.cc | 2 +- gtk2_ardour/nag.cc | 21 +- gtk2_ardour/nag.h | 19 + gtk2_ardour/option_editor.cc | 21 +- gtk2_ardour/option_editor.h | 7 +- gtk2_ardour/opts.cc | 9 +- gtk2_ardour/opts.h | 1 + gtk2_ardour/panner_ui.cc | 5 + gtk2_ardour/patch_change_dialog.cc | 29 +- gtk2_ardour/patch_change_dialog.h | 5 +- gtk2_ardour/plugin_ui.cc | 12 +- gtk2_ardour/processor_box.cc | 100 +- gtk2_ardour/processor_box.h | 11 +- gtk2_ardour/public_editor.h | 4 + gtk2_ardour/rc_option_editor.cc | 102 +- gtk2_ardour/region_editor.cc | 3 +- gtk2_ardour/region_gain_line.cc | 4 +- gtk2_ardour/region_gain_line.h | 2 +- gtk2_ardour/region_layering_order_editor.cc | 2 +- gtk2_ardour/region_view.cc | 12 +- gtk2_ardour/region_view.h | 4 +- gtk2_ardour/rhythm_ferret.cc | 19 + gtk2_ardour/rhythm_ferret.h | 19 + gtk2_ardour/route_group_dialog.cc | 13 +- gtk2_ardour/route_time_axis.cc | 75 +- gtk2_ardour/route_time_axis.h | 13 +- gtk2_ardour/route_ui.cc | 109 +- gtk2_ardour/search_path_option.cc | 5 +- gtk2_ardour/search_path_option.h | 1 + gtk2_ardour/selection.cc | 30 +- gtk2_ardour/selection.h | 2 + gtk2_ardour/session_option_editor.cc | 55 +- gtk2_ardour/sfdb_freesound_mootcher.cc | 17 +- gtk2_ardour/sfdb_freesound_mootcher.h | 19 + gtk2_ardour/sfdb_ui.cc | 510 +- gtk2_ardour/sfdb_ui.h | 33 +- gtk2_ardour/shuttle_control.cc | 35 +- gtk2_ardour/shuttle_control.h | 9 +- gtk2_ardour/splash.cc | 27 +- gtk2_ardour/splash.h | 3 +- gtk2_ardour/splash.png | Bin 102707 -> 48735 bytes gtk2_ardour/startup.cc | 193 +- gtk2_ardour/startup.h | 9 +- gtk2_ardour/step_editing.bindings | 1 + gtk2_ardour/step_editor.cc | 19 + gtk2_ardour/step_editor.h | 19 + gtk2_ardour/stereo_panner.cc | 4 +- gtk2_ardour/tempo_lines.cc | 62 +- gtk2_ardour/theme_manager.cc | 7 + gtk2_ardour/time_axis_view.cc | 401 +- gtk2_ardour/time_axis_view.h | 98 +- gtk2_ardour/time_axis_view_item.cc | 4 +- gtk2_ardour/time_info_box.cc | 2 +- gtk2_ardour/timecode_tester.cc | 19 + gtk2_ardour/ui_config_vars.h | 19 + gtk2_ardour/visual_time_axis.cc | 16 +- gtk2_ardour/visual_time_axis.h | 3 - gtk2_ardour/vst_plugin_ui.cc | 2 +- gtk2_ardour/wscript | 46 +- libs/ardour/ardour/analyser.h | 19 + libs/ardour/ardour/ardour.h | 9 +- libs/ardour/ardour/audioplaylist.h | 2 - libs/ardour/ardour/audioregion.h | 15 +- libs/ardour/ardour/buffer_manager.h | 19 + libs/ardour/ardour/callback.h | 11 - libs/ardour/ardour/debug.h | 1 + libs/ardour/ardour/directory_names.h | 19 + libs/ardour/ardour/event_type_map.h | 4 - libs/ardour/ardour/export_multiplication.h | 19 + libs/ardour/ardour/filename_extensions.h | 19 + libs/ardour/ardour/instrument_info.h | 17 +- libs/ardour/ardour/linux_vst_support.h | 19 + libs/ardour/ardour/location.h | 6 +- libs/ardour/ardour/lv2_plugin.h | 1 + libs/ardour/ardour/midi_diskstream.h | 8 +- libs/ardour/ardour/midi_playlist_source.h | 11 +- libs/ardour/ardour/midi_ring_buffer.h | 4 +- libs/ardour/ardour/midi_source.h | 69 +- libs/ardour/ardour/midi_state_tracker.h | 2 +- libs/ardour/ardour/midi_track.h | 23 +- libs/ardour/ardour/midi_ui.h | 19 + libs/ardour/ardour/movable.h | 19 + libs/ardour/ardour/panner_manager.h | 19 + libs/ardour/ardour/playlist.h | 10 +- libs/ardour/ardour/process_thread.h | 19 + libs/ardour/ardour/rc_configuration_vars.h | 11 +- libs/ardour/ardour/readable.h | 19 + libs/ardour/ardour/region.h | 1 + libs/ardour/ardour/route.h | 2 + libs/ardour/ardour/route_group.h | 5 +- libs/ardour/ardour/session.h | 13 +- .../ardour/session_configuration_vars.h | 3 - libs/ardour/ardour/session_event.h | 19 + libs/ardour/ardour/session_utils.h | 19 + libs/ardour/ardour/slave.h | 10 +- libs/ardour/ardour/smf_source.h | 14 +- libs/ardour/ardour/svn_revision.h | 19 + libs/ardour/ardour/template_utils.h | 19 + libs/ardour/ardour/thread_buffers.h | 19 + libs/ardour/ardour/track.h | 2 +- libs/ardour/ardour/trimmable.h | 19 + libs/ardour/ardour/utils.h | 1 + libs/ardour/audio_diskstream.cc | 4 +- libs/ardour/audio_playlist.cc | 210 +- libs/ardour/audioanalyser.cc | 19 + libs/ardour/audioengine.cc | 1 + libs/ardour/audiofile_tagger.cc | 2 +- libs/ardour/audioregion.cc | 131 +- libs/ardour/auto_bundle.cc | 19 + libs/ardour/automatable.cc | 5 +- libs/ardour/automation_list.cc | 3 +- libs/ardour/caimportable.cc | 19 + libs/ardour/control_protocol_manager.cc | 14 +- libs/ardour/debug.cc | 1 + libs/ardour/delivery.cc | 5 +- libs/ardour/directory_names.cc | 19 + libs/ardour/diskstream.cc | 4 +- libs/ardour/export_filename.cc | 3 + libs/ardour/export_format_base.cc | 2 +- libs/ardour/export_graph_builder.cc | 20 + libs/ardour/export_multiplication.cc | 20 + libs/ardour/filename_extensions.cc | 19 + libs/ardour/find_session.cc | 19 + libs/ardour/globals.cc | 75 +- libs/ardour/import.cc | 11 +- libs/ardour/instrument_info.cc | 43 +- libs/ardour/interpolation.cc | 19 + libs/ardour/io.cc | 4 +- libs/ardour/ladspa_plugin.cc | 4 +- libs/ardour/linux_vst_info_file.cc | 19 + libs/ardour/linux_vst_support.cc | 96 +- libs/ardour/location.cc | 111 +- libs/ardour/ltc_slave.cc | 7 +- libs/ardour/lv2_plugin.cc | 39 +- .../macosx/English.lproj/InfoPlist.strings | Bin 142 -> 0 bytes libs/ardour/macosx/Info.plist | 26 - libs/ardour/macosx/ardour_Prefix.pch | 4 - libs/ardour/macosx/version.cc | 3 - libs/ardour/macosx/version.h | 17 - libs/ardour/midi_clock_slave.cc | 2 +- libs/ardour/midi_diskstream.cc | 265 +- libs/ardour/midi_patch_manager.cc | 34 +- libs/ardour/midi_patch_search_path.cc | 2 +- libs/ardour/midi_playlist_source.cc | 4 +- libs/ardour/midi_port.cc | 12 +- libs/ardour/midi_ring_buffer.cc | 73 +- libs/ardour/midi_source.cc | 34 +- libs/ardour/midi_state_tracker.cc | 10 +- libs/ardour/midi_stretch.cc | 11 +- libs/ardour/midi_track.cc | 37 +- libs/ardour/mtc_slave.cc | 20 +- libs/ardour/onset_detector.cc | 19 + libs/ardour/playlist.cc | 50 +- libs/ardour/plugin.cc | 5 +- libs/ardour/plugin_manager.cc | 8 +- libs/ardour/rb_effect.cc | 2 +- libs/ardour/rc_configuration.cc | 2 +- libs/ardour/region.cc | 32 +- libs/ardour/route.cc | 31 +- libs/ardour/route_group.cc | 23 +- libs/ardour/run-tests.sh | 2 +- libs/ardour/session.cc | 17 +- libs/ardour/session_command.cc | 4 +- libs/ardour/session_export.cc | 1 + libs/ardour/session_midi.cc | 70 +- libs/ardour/session_process.cc | 11 +- libs/ardour/session_rtevents.cc | 2 +- libs/ardour/session_state.cc | 32 +- libs/ardour/session_time.cc | 6 - libs/ardour/session_transport.cc | 6 +- libs/ardour/smf_source.cc | 131 +- libs/ardour/sndfilesource.cc | 9 +- libs/ardour/template_utils.cc | 19 + libs/ardour/tempo_map_importer.cc | 2 +- libs/ardour/test/combine_regions_test.cc | 5 +- libs/ardour/test/playlist_read_test.cc | 6 +- libs/ardour/track.cc | 19 +- libs/ardour/transient_detector.cc | 19 + libs/ardour/user_bundle.cc | 19 + libs/ardour/utils.cc | 72 +- libs/ardour/wscript | 9 +- libs/audiographer/src/debug_utils.cc | 22 +- .../src/general/sample_format_converter.cc | 36 +- libs/audiographer/src/general/sr_converter.cc | 20 + libs/audiographer/src/routines.cc | 20 + libs/clearlooks-newer/wscript | 6 +- libs/evoral/evoral/ControlList.hpp | 14 +- libs/evoral/evoral/EventRingBuffer.hpp | 2 +- libs/evoral/src/ControlList.cpp | 4 +- libs/evoral/test/SequenceTest.cpp | 4 +- libs/fst/jackvst.h | 4 + libs/fst/vsti.c | 4 +- libs/gtkmm2ext/bindings.cc | 19 + libs/gtkmm2ext/cairo_packer.cc | 19 + libs/gtkmm2ext/fr_FR.po | 86 - libs/gtkmm2ext/gtkmm2ext/pixfader.h | 86 +- libs/gtkmm2ext/gtkmm2ext/slider_controller.h | 12 +- libs/gtkmm2ext/gtkmm2ext/utils.h | 10 +- libs/gtkmm2ext/keyboard.cc | 2 +- libs/gtkmm2ext/motionfeedback.cc | 1 + libs/gtkmm2ext/persistent_tooltip.cc | 22 +- libs/gtkmm2ext/pixfader.cc | 436 +- libs/gtkmm2ext/po/el_GR.po | 123 - libs/gtkmm2ext/po/es_ES.po | 126 - libs/gtkmm2ext/po/pl_PL.po | 107 - libs/gtkmm2ext/po/pt_BR.po | 123 - libs/gtkmm2ext/slider_controller.cc | 23 +- libs/gtkmm2ext/utils.cc | 25 +- libs/midi++2/jack_midi_port.cc | 21 +- libs/midi++2/midi++/ipmidi_port.h | 11 + libs/midi++2/midi++/midnam_patch.h | 188 +- libs/midi++2/miditrace.cc | 19 + libs/midi++2/midnam_patch.cc | 344 +- libs/midi++2/mmctest.cc | 19 + libs/midi++2/run-tests.sh | 3 +- libs/midi++2/test/MidnamTest.cpp | 24 +- libs/panners/vbap/vbap.cc | 19 + libs/pbd/clear_dir.cc | 19 + libs/pbd/cpus.cc | 1 + libs/pbd/event_loop.cc | 19 + libs/pbd/fpu.cc | 19 + libs/pbd/locale_guard.cc | 19 + libs/pbd/malign.cc | 19 + libs/pbd/openuri.cc | 24 + libs/pbd/pbd/abstract_ui.cc | 19 + libs/pbd/pbd/clear_dir.h | 19 + libs/pbd/pbd/floating.h | 19 + libs/pbd/pbd/fpu.h | 19 + libs/pbd/pbd/malign.h | 19 + libs/pbd/pbd/openuri.h | 22 + libs/pbd/pbd/pool.h | 15 +- libs/pbd/pbd/unknown_type.h | 19 + libs/pbd/pbd/xml++.h | 19 + libs/pbd/wscript | 4 + libs/rubberband/src/main.cpp | 2 +- libs/surfaces/control_protocol/basic_ui.cc | 14 +- libs/surfaces/frontier/tranzport/interface.cc | 19 + .../generic_midi_control_protocol.cc | 14 +- libs/surfaces/generic_midi/interface.cc | 19 + .../surfaces/generic_midi/midicontrollable.cc | 21 + .../mackie/mackie_control_protocol.cc | 689 +- .../surfaces/mackie/mackie_control_protocol.h | 8 + libs/surfaces/mackie/mcp_buttons.cc | 26 + libs/surfaces/mackie/strip.cc | 7 + libs/surfaces/mackie/surface.cc | 657 + libs/surfaces/mackie/surface.h | 8 + libs/surfaces/mackie/surface_port.cc | 4 + libs/surfaces/mackie/types.cc | 19 + libs/surfaces/wiimote/interface.cc | 68 +- libs/surfaces/wiimote/wiimote.cc | 675 +- libs/surfaces/wiimote/wiimote.h | 82 +- libs/surfaces/wiimote/wscript | 9 +- libs/surfaces/wscript | 20 +- .../src/vamp-hostsdk/PluginLoader.cpp | 3 - manual/Makefile | 73 - manual/catalog.xml | 17 - manual/config/dbhelper.vim | 129 - manual/css/ardour_manual.css | 208 - manual/images/add_track_bus.png | Bin 11376 -> 0 bytes manual/images/admon-bg.png | Bin 186 -> 0 bytes manual/images/con1.jpg | Bin 25851 -> 0 bytes manual/images/con2.jpg | Bin 27603 -> 0 bytes manual/images/inactive_track.png | Bin 13308 -> 0 bytes manual/images/internalhigheroverlap.png | Bin 2849 -> 0 bytes manual/images/internalloweroverlap.png | Bin 2423 -> 0 bytes manual/images/invert_polarity.png | Bin 8125 -> 0 bytes manual/images/ladspa.jpg | Bin 80314 -> 0 bytes manual/images/manual_style.svg | 167 - manual/images/matrixmixer.png | Bin 34333 -> 0 bytes manual/images/midiopts.jpg | Bin 21991 -> 0 bytes manual/images/mixer.png | Bin 79364 -> 0 bytes manual/images/mixer_strip_diagram.png | Bin 87540 -> 0 bytes manual/images/mixer_strip_diagram.svg | 782 - .../images/mixer_strip_name_button_popup.png | Bin 14475 -> 0 bytes manual/images/mixerstrip.png | Bin 17196 -> 0 bytes manual/images/mute_options.png | Bin 8523 -> 0 bytes manual/images/new_session_advanced_tab.png | Bin 35381 -> 0 bytes .../images/new_session_select_directory.png | Bin 24374 -> 0 bytes manual/images/overlapearlyhigher.png | Bin 2812 -> 0 bytes manual/images/overlaplaterhigher.png | Bin 3107 -> 0 bytes manual/images/pluginmenu.jpg | Bin 58905 -> 0 bytes manual/images/plugins.jpg | Bin 341980 -> 0 bytes manual/images/qjackctl.png | Bin 20818 -> 0 bytes manual/images/qjopt.jpg | Bin 22473 -> 0 bytes manual/images/qjopts.jpg | Bin 43652 -> 0 bytes manual/images/qjpatch.jpg | Bin 36264 -> 0 bytes manual/images/remove_track_editor_window.png | Bin 18278 -> 0 bytes manual/images/resize_track.png | Bin 18667 -> 0 bytes manual/images/save_session_dialog.png | Bin 12781 -> 0 bytes manual/images/save_template_dialog.png | Bin 6618 -> 0 bytes manual/images/session_control.png | Bin 18820 -> 0 bytes manual/images/signal_flow.png | Bin 37303 -> 0 bytes manual/images/simplemixer.png | Bin 26020 -> 0 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 1746 -> 0 bytes manual/images/tango-icons/note.png | Bin 2242 -> 0 bytes manual/images/tango-icons/tip.png | Bin 2976 -> 0 bytes manual/images/tango-icons/warning.png | Bin 1930 -> 0 bytes manual/images/title-bg.png | Bin 287 -> 0 bytes manual/images/track_list.png | Bin 30606 -> 0 bytes manual/images/track_list_reorder.png | Bin 14062 -> 0 bytes manual/images/track_name_field.png | Bin 7492 -> 0 bytes manual/images/transctls.jpg | Bin 8598 -> 0 bytes manual/images/watermark-draft.png | Bin 9828 -> 0 bytes manual/templates/chapter_template.xml | 24 - manual/templates/section_template.xml | 23 - manual/wscript | 23 - manual/xml/adding_tracks.xml | 70 - manual/xml/advanced_editing.xml | 17 - manual/xml/ardour_basics.xml | 29 - manual/xml/ardour_manual.xml | 64 - manual/xml/automation.xml | 223 - manual/xml/basic_editing.xml | 28 - manual/xml/basic_recording.xml | 273 - manual/xml/bcf2000.xml | 671 - manual/xml/behringer_ddx3216.xml | 126 - manual/xml/book_info.xml | 43 - manual/xml/cleaning_up_a_session.xml | 43 - manual/xml/clocks.xml | 105 - manual/xml/closing_a_session.xml | 85 - manual/xml/configuring_usb_device_access.xml | 69 - manual/xml/contributing_to_the_manual.xml | 20 - manual/xml/control_surfaces.xml | 27 - manual/xml/creating_a_new_session.xml | 138 - manual/xml/deactivating_tracks.xml | 43 - manual/xml/default_track_names.xml | 26 - manual/xml/editing_concepts.xml | 348 - manual/xml/editor_aligning_key_bindings.xml | 72 - manual/xml/editor_canvas_key_bindings.xml | 92 - ...itor_edit_cursor_position_key_bindings.xml | 233 - .../editor_locations_marks_key_bindings.xml | 172 - manual/xml/editor_marker_bindings.xml | 32 - .../xml/editor_miscellaneous_key_bindings.xml | 112 - manual/xml/editor_nudging_key_bindings.xml | 57 - .../xml/editor_play_position_key_bindings.xml | 205 - .../editor_range_operations_key_bindings.xml | 62 - .../editor_region_operations_key_bindings.xml | 219 - manual/xml/editor_selection_key_bindings.xml | 142 - .../editor_standard_editing_key_bindings.xml | 92 - manual/xml/editor_window.xml | 81 - manual/xml/editor_window_controls.xml | 345 - manual/xml/editor_window_group_list.xml | 28 - manual/xml/editor_window_key_bindings.xml | 82 - manual/xml/editor_window_region_list.xml | 152 - manual/xml/editor_window_timeline.xml | 113 - manual/xml/editor_zoom_key_bindings.xml | 118 - manual/xml/entities.ent.in | 22 - manual/xml/exporting.xml | 15 - manual/xml/exporting_to_cd.xml | 190 - manual/xml/formatting_conventions.xml | 140 - manual/xml/frontier_design_tranzport.xml | 558 - manual/xml/general_key_bindings.xml | 72 - manual/xml/generic_midi_control_surface.xml | 16 - manual/xml/generic_mouse_actions.xml | 74 - manual/xml/glossary.xml | 334 - manual/xml/introduction.xml | 30 - manual/xml/invert_polarity.xml | 40 - manual/xml/jack.xml | 292 - manual/xml/key_bindings.xml | 86 - manual/xml/known_issues.xml | 96 - manual/xml/mackie.xml | 280 - manual/xml/main_windows.xml | 92 - manual/xml/midi_configuration.xml | 299 - manual/xml/mixer_strip_list.xml | 96 - manual/xml/mixer_strips.xml | 491 - manual/xml/mixer_window.xml | 89 - manual/xml/mixer_window_key_bindings.xml | 96 - manual/xml/mixing.xml | 22 - manual/xml/monitoring.xml | 203 - manual/xml/mouse_operations.xml | 42 - .../xml/mouse_operations_mixer_controls.xml | 202 - manual/xml/mouse_operations_object_mode.xml | 334 - manual/xml/mouse_operations_range_mode.xml | 106 - .../xml/mouse_operations_region_gain_mode.xml | 73 - manual/xml/mouse_operations_ruler.xml | 111 - manual/xml/mouse_operations_zoom_mode.xml | 73 - manual/xml/mouse_wheel_actions.xml | 82 - manual/xml/muting_tracks.xml | 44 - manual/xml/opening_a_session.xml | 53 - manual/xml/other_windows.xml | 246 - manual/xml/plugins.xml | 60 - manual/xml/preface.xml | 16 - manual/xml/recording.xml | 19 - manual/xml/removing_tracks.xml | 44 - manual/xml/renaming_tracks.xml | 57 - manual/xml/resizing_tracks.xml | 43 - manual/xml/saving_a_session.xml | 32 - manual/xml/sessions.xml | 27 - manual/xml/setting_up_to_record.xml | 302 - manual/xml/signal_flow.xml | 21 - manual/xml/snapshots.xml | 44 - manual/xml/soloing_tracks.xml | 128 - manual/xml/starting_up_your_system.xml | 14 - manual/xml/synchronization.xml | 17 - manual/xml/synchronization_concepts.xml | 170 - manual/xml/templates.xml | 47 - manual/xml/track_controls.xml | 13 - manual/xml/track_display.xml | 17 - manual/xml/track_edit_groups.xml | 31 - manual/xml/track_list.xml | 87 - manual/xml/tracks_and_busses.xml | 113 - manual/xml/transport_key_bindings.xml | 83 - manual/xml/user_interface_conventions.xml | 183 - manual/xml/using_existing_audio.xml | 311 - manual/xml/video_synchronization_via_mtc.xml | 115 - manual/xml/vst_plugins.xml | 51 - manual/xml/what_is_different_about_ardour.xml | 121 - manual/xml/why_is_it_called_ardour.xml | 222 - manual/xml/window_key_bindings.xml | 112 - manual/xml/working_with_crossfades.xml | 224 - manual/xml/working_with_layers.xml | 151 - manual/xml/working_with_playlists.xml | 233 - manual/xml/working_with_ranges.xml | 38 - manual/xml/working_with_regions.xml | 645 - 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 - patchfiles/*Super BassStation(bw).midnam | 268 - patchfiles/Clavia Nord Lead II.midnam | 766 - patchfiles/DPM-V3AB.midnam | 883 -- patchfiles/E-mu Mo Phatt.midnam | 1156 -- patchfiles/E-mu Proteus 2000.midnam | 1710 --- patchfiles/ER-1.midnam | 324 - patchfiles/EX-5.midnam | 1548 -- patchfiles/Fantom.midnam | 1390 -- patchfiles/JV-1080.midnam | 1 - patchfiles/KORG_NX5R.midnam | 1164 -- patchfiles/Korg MS2000R.midnam | 196 - patchfiles/Kurzweil SP88x.midnam | 98 - patchfiles/M3000.midnam | 1 - patchfiles/MP1.midnam | 188 - patchfiles/Micro Q.midnam | 1 - patchfiles/PSR 540.midnam | 494 - patchfiles/PSR-275.midnam | 1 - patchfiles/Prophet 600.midnam | 191 - patchfiles/ProtoolsPatchFile.midnam | 11756 ---------------- patchfiles/RD-250s.midnam | 191 - patchfiles/Roland GR-1.midnam | 859 -- patchfiles/Roland GR-33.midnam | 328 - patchfiles/Roland JV-1080 exp.midnam | 1494 -- patchfiles/Roland M-BD1.midnam | 295 - patchfiles/Roland XV-5080.midnam | 1905 --- patchfiles/Roland XV-88.midnam | 2056 --- patchfiles/Yamaha MM6.midnam | 1040 -- patchfiles/Yamaha MOTIF XS.midnam | 1490 -- patchfiles/Yamaha MOTIF-RACK ES.midnam | 1563 -- patchfiles/Yamaha MU10XG.midnam | 975 -- patchfiles/Yamaha S90.midnam | 895 -- patchfiles/alesis_DM5.midnam | 1592 --- patchfiles/alesis_NanoPiano.midnam | 1 - patchfiles/casio_CZ-1.midnam | 1 - patchfiles/fantom_xa.midnam | 1887 --- patchfiles/line_6_EchoPro.midnam | 1 - patchfiles/line_6_ModPro.midnam | 1 - patchfiles/novation_nova.midnam | 750 - tools/fmt-bindings | 174 +- tools/linux_packaging/build | 68 +- tools/linux_packaging/noderun | 4 + tools/linux_packaging/package | 4 +- tools/linux_packaging/stage2.run | 101 +- tools/osx_packaging/osx_build | 173 +- waf | Bin 90912 -> 94786 bytes wscript | 154 +- 569 files changed, 9469 insertions(+), 63938 deletions(-) delete mode 100644 gtk2_ardour/editor_scrub.cc delete mode 100644 libs/ardour/ardour/callback.h delete mode 100644 libs/ardour/macosx/English.lproj/InfoPlist.strings delete mode 100644 libs/ardour/macosx/Info.plist delete mode 100644 libs/ardour/macosx/ardour_Prefix.pch delete mode 100644 libs/ardour/macosx/version.cc delete mode 100644 libs/ardour/macosx/version.h delete mode 100644 libs/gtkmm2ext/fr_FR.po delete mode 100644 libs/gtkmm2ext/po/el_GR.po delete mode 100644 libs/gtkmm2ext/po/es_ES.po delete mode 100644 libs/gtkmm2ext/po/pl_PL.po delete mode 100644 libs/gtkmm2ext/po/pt_BR.po delete mode 100644 manual/Makefile delete mode 100644 manual/catalog.xml delete mode 100644 manual/config/dbhelper.vim delete mode 100644 manual/css/ardour_manual.css delete mode 100644 manual/images/add_track_bus.png delete mode 100644 manual/images/admon-bg.png delete mode 100644 manual/images/con1.jpg delete mode 100644 manual/images/con2.jpg delete mode 100644 manual/images/inactive_track.png delete mode 100644 manual/images/internalhigheroverlap.png delete mode 100644 manual/images/internalloweroverlap.png delete mode 100644 manual/images/invert_polarity.png delete mode 100644 manual/images/ladspa.jpg delete mode 100644 manual/images/manual_style.svg delete mode 100644 manual/images/matrixmixer.png delete mode 100644 manual/images/midiopts.jpg delete mode 100644 manual/images/mixer.png delete mode 100644 manual/images/mixer_strip_diagram.png delete mode 100644 manual/images/mixer_strip_diagram.svg delete mode 100644 manual/images/mixer_strip_name_button_popup.png delete mode 100644 manual/images/mixerstrip.png delete mode 100644 manual/images/mute_options.png delete mode 100644 manual/images/new_session_advanced_tab.png delete mode 100644 manual/images/new_session_select_directory.png delete mode 100644 manual/images/overlapearlyhigher.png delete mode 100644 manual/images/overlaplaterhigher.png delete mode 100644 manual/images/pluginmenu.jpg delete mode 100644 manual/images/plugins.jpg delete mode 100644 manual/images/qjackctl.png delete mode 100644 manual/images/qjopt.jpg delete mode 100644 manual/images/qjopts.jpg delete mode 100644 manual/images/qjpatch.jpg delete mode 100644 manual/images/remove_track_editor_window.png delete mode 100644 manual/images/resize_track.png delete mode 100644 manual/images/save_session_dialog.png delete mode 100644 manual/images/save_template_dialog.png delete mode 100644 manual/images/session_control.png delete mode 100644 manual/images/signal_flow.png delete mode 100644 manual/images/simplemixer.png delete mode 100644 manual/images/tango-icons/COPYING delete mode 100644 manual/images/tango-icons/accessories-text-editor.svg delete mode 100644 manual/images/tango-icons/dialog-information.svg delete mode 100644 manual/images/tango-icons/dialog-warning.svg delete mode 100644 manual/images/tango-icons/emblem-important.svg delete mode 100644 manual/images/tango-icons/important.png delete mode 100644 manual/images/tango-icons/note.png delete mode 100644 manual/images/tango-icons/tip.png delete mode 100644 manual/images/tango-icons/warning.png delete mode 100644 manual/images/title-bg.png delete mode 100644 manual/images/track_list.png delete mode 100644 manual/images/track_list_reorder.png delete mode 100644 manual/images/track_name_field.png delete mode 100644 manual/images/transctls.jpg delete mode 100644 manual/images/watermark-draft.png delete mode 100644 manual/templates/chapter_template.xml delete mode 100644 manual/templates/section_template.xml delete mode 100644 manual/wscript delete mode 100644 manual/xml/adding_tracks.xml delete mode 100644 manual/xml/advanced_editing.xml delete mode 100644 manual/xml/ardour_basics.xml delete mode 100644 manual/xml/ardour_manual.xml delete mode 100644 manual/xml/automation.xml delete mode 100644 manual/xml/basic_editing.xml delete mode 100644 manual/xml/basic_recording.xml delete mode 100644 manual/xml/bcf2000.xml delete mode 100644 manual/xml/behringer_ddx3216.xml delete mode 100644 manual/xml/book_info.xml delete mode 100644 manual/xml/cleaning_up_a_session.xml delete mode 100644 manual/xml/clocks.xml delete mode 100644 manual/xml/closing_a_session.xml delete mode 100644 manual/xml/configuring_usb_device_access.xml delete mode 100644 manual/xml/contributing_to_the_manual.xml delete mode 100644 manual/xml/control_surfaces.xml delete mode 100644 manual/xml/creating_a_new_session.xml delete mode 100644 manual/xml/deactivating_tracks.xml delete mode 100644 manual/xml/default_track_names.xml delete mode 100644 manual/xml/editing_concepts.xml delete mode 100644 manual/xml/editor_aligning_key_bindings.xml delete mode 100644 manual/xml/editor_canvas_key_bindings.xml delete mode 100644 manual/xml/editor_edit_cursor_position_key_bindings.xml delete mode 100644 manual/xml/editor_locations_marks_key_bindings.xml delete mode 100644 manual/xml/editor_marker_bindings.xml delete mode 100644 manual/xml/editor_miscellaneous_key_bindings.xml delete mode 100644 manual/xml/editor_nudging_key_bindings.xml delete mode 100644 manual/xml/editor_play_position_key_bindings.xml delete mode 100644 manual/xml/editor_range_operations_key_bindings.xml delete mode 100644 manual/xml/editor_region_operations_key_bindings.xml delete mode 100644 manual/xml/editor_selection_key_bindings.xml delete mode 100644 manual/xml/editor_standard_editing_key_bindings.xml delete mode 100644 manual/xml/editor_window.xml delete mode 100644 manual/xml/editor_window_controls.xml delete mode 100644 manual/xml/editor_window_group_list.xml delete mode 100644 manual/xml/editor_window_key_bindings.xml delete mode 100644 manual/xml/editor_window_region_list.xml delete mode 100644 manual/xml/editor_window_timeline.xml delete mode 100644 manual/xml/editor_zoom_key_bindings.xml delete mode 100644 manual/xml/entities.ent.in delete mode 100644 manual/xml/exporting.xml delete mode 100644 manual/xml/exporting_to_cd.xml delete mode 100644 manual/xml/formatting_conventions.xml delete mode 100644 manual/xml/frontier_design_tranzport.xml delete mode 100644 manual/xml/general_key_bindings.xml delete mode 100644 manual/xml/generic_midi_control_surface.xml delete mode 100644 manual/xml/generic_mouse_actions.xml delete mode 100644 manual/xml/glossary.xml delete mode 100644 manual/xml/introduction.xml delete mode 100644 manual/xml/invert_polarity.xml delete mode 100644 manual/xml/jack.xml delete mode 100644 manual/xml/key_bindings.xml delete mode 100644 manual/xml/known_issues.xml delete mode 100644 manual/xml/mackie.xml delete mode 100644 manual/xml/main_windows.xml delete mode 100644 manual/xml/midi_configuration.xml delete mode 100644 manual/xml/mixer_strip_list.xml delete mode 100644 manual/xml/mixer_strips.xml delete mode 100644 manual/xml/mixer_window.xml delete mode 100644 manual/xml/mixer_window_key_bindings.xml delete mode 100644 manual/xml/mixing.xml delete mode 100644 manual/xml/monitoring.xml delete mode 100644 manual/xml/mouse_operations.xml delete mode 100644 manual/xml/mouse_operations_mixer_controls.xml delete mode 100644 manual/xml/mouse_operations_object_mode.xml delete mode 100644 manual/xml/mouse_operations_range_mode.xml delete mode 100644 manual/xml/mouse_operations_region_gain_mode.xml delete mode 100644 manual/xml/mouse_operations_ruler.xml delete mode 100644 manual/xml/mouse_operations_zoom_mode.xml delete mode 100644 manual/xml/mouse_wheel_actions.xml delete mode 100644 manual/xml/muting_tracks.xml delete mode 100644 manual/xml/opening_a_session.xml delete mode 100644 manual/xml/other_windows.xml delete mode 100644 manual/xml/plugins.xml delete mode 100644 manual/xml/preface.xml delete mode 100644 manual/xml/recording.xml delete mode 100644 manual/xml/removing_tracks.xml delete mode 100644 manual/xml/renaming_tracks.xml delete mode 100644 manual/xml/resizing_tracks.xml delete mode 100644 manual/xml/saving_a_session.xml delete mode 100644 manual/xml/sessions.xml delete mode 100644 manual/xml/setting_up_to_record.xml delete mode 100644 manual/xml/signal_flow.xml delete mode 100644 manual/xml/snapshots.xml delete mode 100644 manual/xml/soloing_tracks.xml delete mode 100644 manual/xml/starting_up_your_system.xml delete mode 100644 manual/xml/synchronization.xml delete mode 100644 manual/xml/synchronization_concepts.xml delete mode 100644 manual/xml/templates.xml delete mode 100644 manual/xml/track_controls.xml delete mode 100644 manual/xml/track_display.xml delete mode 100644 manual/xml/track_edit_groups.xml delete mode 100644 manual/xml/track_list.xml delete mode 100644 manual/xml/tracks_and_busses.xml delete mode 100644 manual/xml/transport_key_bindings.xml delete mode 100644 manual/xml/user_interface_conventions.xml delete mode 100644 manual/xml/using_existing_audio.xml delete mode 100644 manual/xml/video_synchronization_via_mtc.xml delete mode 100644 manual/xml/vst_plugins.xml delete mode 100644 manual/xml/what_is_different_about_ardour.xml delete mode 100644 manual/xml/why_is_it_called_ardour.xml delete mode 100644 manual/xml/window_key_bindings.xml delete mode 100644 manual/xml/working_with_crossfades.xml delete mode 100644 manual/xml/working_with_layers.xml delete mode 100644 manual/xml/working_with_playlists.xml delete mode 100644 manual/xml/working_with_ranges.xml delete mode 100644 manual/xml/working_with_regions.xml delete mode 100644 manual/xmlformat/BUGS delete mode 100644 manual/xmlformat/ChangeLog delete mode 100644 manual/xmlformat/INSTALL delete mode 100644 manual/xmlformat/LICENSE delete mode 100644 manual/xmlformat/README delete mode 100644 manual/xmlformat/xmlformat-ardour.conf delete mode 100755 manual/xmlformat/xmlformat.pl delete mode 100644 manual/xsl/html.xsl delete mode 100644 patchfiles/*Super BassStation(bw).midnam delete mode 100755 patchfiles/Clavia Nord Lead II.midnam delete mode 100644 patchfiles/DPM-V3AB.midnam delete mode 100755 patchfiles/E-mu Mo Phatt.midnam delete mode 100755 patchfiles/E-mu Proteus 2000.midnam delete mode 100644 patchfiles/ER-1.midnam delete mode 100755 patchfiles/EX-5.midnam delete mode 100755 patchfiles/Fantom.midnam delete mode 100755 patchfiles/JV-1080.midnam delete mode 100755 patchfiles/KORG_NX5R.midnam delete mode 100644 patchfiles/Korg MS2000R.midnam delete mode 100755 patchfiles/Kurzweil SP88x.midnam delete mode 100644 patchfiles/M3000.midnam delete mode 100755 patchfiles/MP1.midnam delete mode 100644 patchfiles/Micro Q.midnam delete mode 100755 patchfiles/PSR 540.midnam delete mode 100644 patchfiles/PSR-275.midnam delete mode 100644 patchfiles/Prophet 600.midnam delete mode 100755 patchfiles/ProtoolsPatchFile.midnam delete mode 100644 patchfiles/RD-250s.midnam delete mode 100755 patchfiles/Roland GR-1.midnam delete mode 100755 patchfiles/Roland GR-33.midnam delete mode 100644 patchfiles/Roland JV-1080 exp.midnam delete mode 100755 patchfiles/Roland M-BD1.midnam delete mode 100755 patchfiles/Roland XV-5080.midnam delete mode 100755 patchfiles/Roland XV-88.midnam delete mode 100644 patchfiles/Yamaha MM6.midnam delete mode 100644 patchfiles/Yamaha MOTIF XS.midnam delete mode 100644 patchfiles/Yamaha MOTIF-RACK ES.midnam delete mode 100644 patchfiles/Yamaha MU10XG.midnam delete mode 100755 patchfiles/Yamaha S90.midnam delete mode 100755 patchfiles/alesis_DM5.midnam delete mode 100755 patchfiles/alesis_NanoPiano.midnam delete mode 100755 patchfiles/casio_CZ-1.midnam delete mode 100644 patchfiles/fantom_xa.midnam delete mode 100644 patchfiles/line_6_EchoPro.midnam delete mode 100644 patchfiles/line_6_ModPro.midnam delete mode 100644 patchfiles/novation_nova.midnam diff --git a/.gitignore b/.gitignore index 9e84d0792a..3252162817 100644 --- a/.gitignore +++ b/.gitignore @@ -1,124 +1,40 @@ -# git-ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): *.[oa] -*~ *.o *.os -Makefile *.template *.binding -.scache -.deps *.so +*.dylib *.pyc -.sconf_temp/ -.sconsign.dblite -ardour_system.rc +# autotools +aclocal.m4 config.log -gtk2_ardour/SAE-de.bindings -gtk2_ardour/SAE-us.bindings -gtk2_ardour/ardev_common.sh -gtk2_ardour/ardour-3.0 -gtk2_ardour/ardour.sh -gtk2_ardour/ardour3_ui_dark.rc -gtk2_ardour/ardour3_ui_light.rc -gtk2_ardour/ergonomic-us.bindings -gtk2_ardour/mnemonic-us.bindings -gtk2_ardour/version.cc -gtk2_ardour/version.h -gtk2_ardour/test/*.cpp -gtk2_ardour/test/test_ui_config -libs/ardour/ardour/version.h -libs/ardour/config_text.cc -libs/ardour/svn_revision.cc -libs/ardour/version.cc -libs/glibmm2/Makefile.in -libs/glibmm2/aclocal.m4 -libs/glibmm2/autom4te.cache/ -libs/glibmm2/config.log -libs/glibmm2/configure -libs/glibmm2/glib/Makefile.in -libs/gtkmm2ext/gtkmm2ext/version.h -libs/gtkmm2ext/version.cc -libs/midi++2/midi++/version.h -libs/midi++2/version.cc -libs/pbd/pbd/version.h -libs/pbd/version.cc -libs/sigc++2/Makefile.in -libs/sigc++2/aclocal.m4 -libs/sigc++2/autom4te.cache/ -libs/sigc++2/config.guess -libs/sigc++2/config.log -libs/sigc++2/config.status -libs/sigc++2/config.sub -libs/sigc++2/configure -libs/sigc++2/depcomp -libs/sigc++2/install-sh -libs/sigc++2/libsigc++-2.0.spec -libs/sigc++2/libtool -libs/sigc++2/ltmain.sh -libs/sigc++2/scripts/Makefile.in -libs/sigc++2/sigc++-2.0.pc -libs/sigc++2/sigc++/Makefile.in -libs/sigc++2/sigc++config.h -libs/sigc++2/stamp-h1 -libs/taglib/bindings/c/taglib_c.pc -libs/taglib/config.h -libs/taglib/config.log -libs/taglib/config.status -libs/taglib/headers/ -libs/taglib/libtool -libs/taglib/stamp-h1 -libs/taglib/taglib-config -libs/taglib/taglib.pc -manual/xml/entities.ent -scache.conf -tools/osx_packaging/Resources/ -gtk2_ardour/SAE-de-keypad.bindings -gtk2_ardour/SAE-de-nokeypad.bindings -gtk2_ardour/SAE-us-keypad.bindings -gtk2_ardour/SAE-us-nokeypad.bindings -gtk2_ardour/ardour.menus -gtk2_ardour/ardour3_ui_dark_sae.rc -gtk2_ardour/ardour3_ui_light_sae.rc -libs/glibmm2/config.h -libs/glibmm2/config.status -libs/glibmm2/glib/stamp-h2 -libs/glibmm2/libtool -libs/glibmm2/scripts/config.guess -libs/glibmm2/scripts/config.sub -libs/glibmm2/scripts/install-sh -libs/glibmm2/scripts/libtool.m4 -libs/glibmm2/scripts/ltmain.sh -libs/glibmm2/scripts/ltoptions.m4 -libs/glibmm2/scripts/ltsugar.m4 -libs/glibmm2/scripts/ltversion.m4 -libs/glibmm2/scripts/lt~obsolete.m4 -libs/glibmm2/scripts/missing -libs/glibmm2/stamp-h1 -libs/glibmm2/glibmm-2.4.pc -libs/glibmm2/glibmm/ -libs/glibmm2/glibmmconfig.h -libs/sigc++2/scripts/libtool.m4 -libs/sigc++2/scripts/ltoptions.m4 -libs/sigc++2/scripts/ltsugar.m4 -libs/sigc++2/scripts/ltversion.m4 -libs/sigc++2/scripts/lt~obsolete.m4 -libs/evoral/build -libs/evoral/.waf* -libs/evoral/.lock-wscript -libs/glibmm2/autom4te.cache -libs/sigc++2/autom4te.cache -.sconf_temp -libs/taglib/headers/taglib -.lock-wscript -.waf-* -build +config.status +config.guess +config.sub +Makefile +Makefile.in +autom4te.cache +stamp-h1 +libtool +ltmain.sh +install-sh +depcomp +.deps + +# OSX +.DS_STORE + +# misc editor/tools +*~ *.swp +.gdb_history +core +cscope.files +cscope.out tags +<<<<<<< variant A BROWSE core gtk2_ardour/po/*.mo @@ -130,3 +46,57 @@ GPATH GRTAGS GSYMS GTAGS +>>>>>>> variant B + +# generated folders doc, build, packaging +.waf-* +.lock-waf* +/build/ +/doc/html/ +/doc/latex/ +/tools/osx_packaging/Resources/ + + +# translations +/gtk2_ardour/po/*.mo +/gtk2_ardour/*.pot +/libs/ardour/po/*.mo +/libs/ardour/libardour.pot + +# /gtk2_ardour/ +/gtk2_ardour/ardour.sh +/gtk2_ardour/ardev_common.sh +/gtk2_ardour/*.bindings +/gtk2_ardour/*.rc +/gtk2_ardour/version.cc +/gtk2_ardour/version.h + +# /libs/ardour/ +/libs/ardour/version.cc +/libs/ardour/ardour/version.h +/libs/ardour/svn_revision.cc +libs/ardour/config_text.cc + +# /libs/gtkmm2ext/ +/libs/gtkmm2ext/*.pot +/libs/gtkmm2ext/*.mo +/libs/gtkmm2ext/*.po +/libs/gtkmm2ext/version.cc +/libs/gtkmm2ext/gtkmm2ext/version.h + +# /libs/midi++2/ +/libs/midi++2/version.cc +/libs/midi++2/midi++/version.h + +# /libs/pbd/ +/libs/pbd/version.cc +/libs/pbd/pbd/version.h +####### Ancestor +BROWSE +core +gtk2_ardour/po/*.mo +libs/ardour/po/*.mo +gtk2_ardour/*.pot +libs/ardour/libardour.pot + +======= end diff --git a/README b/README index 9f70698de9..bfbaa9801a 100644 --- a/README +++ b/README @@ -1,3 +1,3 @@ Please see the Ardour web site at http://ardour.org/ for all documentation.. -For information on building ardour: http://ardour.org/building. +For information on building ardour: http://ardour.org/development.html diff --git a/ardour.1 b/ardour.1 index cca40787b9..3ee96e9a0f 100644 --- a/ardour.1 +++ b/ardour.1 @@ -27,6 +27,9 @@ controller, such as the Mackie Digital 8 Bus mixer and many other modern digital mixers. .SH OPTIONS .TP +.B \-a +do not contact ardour.org at program startup to check for announcements +.TP .B \-b Print all possible keyboard binding names. .TP diff --git a/ardour_system.rc b/ardour_system.rc index 7534d79bf2..5603209928 100644 --- a/ardour_system.rc +++ b/ardour_system.rc @@ -39,7 +39,7 @@