initial commit of hand merging, plus getting "ancient" waf script to work correctly
authorPaul Davis <paul@linuxaudiosystems.com>
Thu, 4 Apr 2013 04:32:52 +0000 (00:32 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Thu, 4 Apr 2013 04:32:52 +0000 (00:32 -0400)
commitaaea166135ace01709f7e0be64f40be80f4107ec
tree0e794ef7a723e4aaf909b841a6816e405b4ceca1
parent1d8bac08c0c00d44e22c581768a275e1b21a99a7
initial commit of hand merging, plus getting "ancient" waf script to work correctly
245 files changed:
gtk2_ardour/ardev_common.sh.in
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/audio_region_editor.h
gtk2_ardour/audio_region_view.cc
gtk2_ardour/audio_region_view.h
gtk2_ardour/audio_streamview.cc
gtk2_ardour/audio_streamview.h
gtk2_ardour/audio_time_axis.cc
gtk2_ardour/audio_time_axis.h
gtk2_ardour/automation_line.cc
gtk2_ardour/automation_line.h
gtk2_ardour/automation_region_view.cc
gtk2_ardour/automation_region_view.h
gtk2_ardour/automation_streamview.cc
gtk2_ardour/automation_streamview.h
gtk2_ardour/automation_time_axis.cc
gtk2_ardour/automation_time_axis.h
gtk2_ardour/canvas-curve.h [deleted file]
gtk2_ardour/canvas-flag.cc [deleted file]
gtk2_ardour/canvas-flag.h [deleted file]
gtk2_ardour/canvas-hit.cc [deleted file]
gtk2_ardour/canvas-hit.h [deleted file]
gtk2_ardour/canvas-imageframe.c [deleted file]
gtk2_ardour/canvas-imageframe.h [deleted file]
gtk2_ardour/canvas-noevent-pixbuf.h [deleted file]
gtk2_ardour/canvas-noevent-rect.h [deleted file]
gtk2_ardour/canvas-noevent-text.h [deleted file]
gtk2_ardour/canvas-note-event.cc [deleted file]
gtk2_ardour/canvas-note-event.h [deleted file]
gtk2_ardour/canvas-note.cc [deleted file]
gtk2_ardour/canvas-note.h [deleted file]
gtk2_ardour/canvas-simpleline.h [deleted file]
gtk2_ardour/canvas-simplerect.h [deleted file]
gtk2_ardour/canvas-sysex.cc [deleted file]
gtk2_ardour/canvas-sysex.h [deleted file]
gtk2_ardour/canvas-waveview.h [deleted file]
gtk2_ardour/canvas.h [deleted file]
gtk2_ardour/canvas_impl.h [deleted file]
gtk2_ardour/canvas_patch_change.h [deleted file]
gtk2_ardour/control_point.cc
gtk2_ardour/control_point.h
gtk2_ardour/crossfade_edit.cc
gtk2_ardour/crossfade_edit.h
gtk2_ardour/crossfade_view.h
gtk2_ardour/diamond.cc [deleted file]
gtk2_ardour/diamond.h [deleted file]
gtk2_ardour/edit_note_dialog.cc
gtk2_ardour/edit_note_dialog.h
gtk2_ardour/editor.cc
gtk2_ardour/editor.h
gtk2_ardour/editor_actions.cc
gtk2_ardour/editor_audiotrack.cc
gtk2_ardour/editor_canvas.cc
gtk2_ardour/editor_canvas_events.cc
gtk2_ardour/editor_cursors.cc
gtk2_ardour/editor_cursors.h
gtk2_ardour/editor_drag.cc
gtk2_ardour/editor_drag.h
gtk2_ardour/editor_imageframe.cc
gtk2_ardour/editor_markers.cc
gtk2_ardour/editor_mixer.cc
gtk2_ardour/editor_mouse.cc
gtk2_ardour/editor_ops.cc
gtk2_ardour/editor_routes.cc
gtk2_ardour/editor_rulers.cc
gtk2_ardour/editor_selection.cc
gtk2_ardour/editor_summary.cc
gtk2_ardour/editor_tempodisplay.cc
gtk2_ardour/enums.h
gtk2_ardour/ghostregion.cc
gtk2_ardour/ghostregion.h
gtk2_ardour/imageframe.cc [deleted file]
gtk2_ardour/imageframe.h [deleted file]
gtk2_ardour/imageframe_time_axis.cc
gtk2_ardour/imageframe_time_axis.h
gtk2_ardour/imageframe_time_axis_group.cc
gtk2_ardour/imageframe_time_axis_group.h
gtk2_ardour/imageframe_time_axis_view.cc
gtk2_ardour/imageframe_time_axis_view.h
gtk2_ardour/imageframe_view.cc
gtk2_ardour/imageframe_view.h
gtk2_ardour/lineset.cc [deleted file]
gtk2_ardour/lineset.h [deleted file]
gtk2_ardour/lxvst_plugin_ui.h [changed mode: 0755->0644]
gtk2_ardour/marker.cc
gtk2_ardour/marker.h
gtk2_ardour/marker_time_axis.cc
gtk2_ardour/marker_time_axis.h
gtk2_ardour/marker_time_axis_view.cc
gtk2_ardour/marker_time_axis_view.h
gtk2_ardour/marker_view.cc
gtk2_ardour/marker_view.h
gtk2_ardour/midi_automation_line.cc [changed mode: 0755->0644]
gtk2_ardour/midi_automation_line.h [changed mode: 0755->0644]
gtk2_ardour/midi_region_view.cc
gtk2_ardour/midi_region_view.h
gtk2_ardour/midi_streamview.cc
gtk2_ardour/midi_streamview.h
gtk2_ardour/midi_time_axis.cc
gtk2_ardour/midi_time_axis.h
gtk2_ardour/missing_plugin_dialog.cc [changed mode: 0755->0644]
gtk2_ardour/missing_plugin_dialog.h [changed mode: 0755->0644]
gtk2_ardour/note.cc [new file with mode: 0644]
gtk2_ardour/note.h [new file with mode: 0644]
gtk2_ardour/patch_change.cc [new file with mode: 0644]
gtk2_ardour/patch_change.h [new file with mode: 0644]
gtk2_ardour/public_editor.h
gtk2_ardour/region_editor.cc [changed mode: 0755->0644]
gtk2_ardour/region_editor.h
gtk2_ardour/region_gain_line.cc
gtk2_ardour/region_gain_line.h
gtk2_ardour/region_view.cc
gtk2_ardour/region_view.h
gtk2_ardour/route_time_axis.cc
gtk2_ardour/route_time_axis.h
gtk2_ardour/simpleline.cc [deleted file]
gtk2_ardour/simpleline.h [deleted file]
gtk2_ardour/simpleline_p.h [deleted file]
gtk2_ardour/simplerect.cc [deleted file]
gtk2_ardour/simplerect.h [deleted file]
gtk2_ardour/simplerect_p.h [deleted file]
gtk2_ardour/streamview.cc
gtk2_ardour/streamview.h
gtk2_ardour/strip_silence_dialog.cc
gtk2_ardour/strip_silence_dialog.h
gtk2_ardour/tape_region_view.cc
gtk2_ardour/tape_region_view.h
gtk2_ardour/tempo_lines.cc
gtk2_ardour/tempo_lines.h
gtk2_ardour/time_axis_view.cc
gtk2_ardour/time_axis_view.h
gtk2_ardour/time_axis_view_item.cc
gtk2_ardour/time_axis_view_item.h
gtk2_ardour/track_selection.cc [changed mode: 0755->0644]
gtk2_ardour/track_view_list.cc [changed mode: 0755->0644]
gtk2_ardour/track_view_list.h [changed mode: 0755->0644]
gtk2_ardour/utils.cc
gtk2_ardour/utils.h
gtk2_ardour/verbose_cursor.cc
gtk2_ardour/verbose_cursor.h
gtk2_ardour/video_image_frame.h
gtk2_ardour/visual_time_axis.cc
gtk2_ardour/visual_time_axis.h
gtk2_ardour/waveview.cc [deleted file]
gtk2_ardour/waveview.h [deleted file]
gtk2_ardour/waveview_p.h [deleted file]
gtk2_ardour/window_proxy.cc [changed mode: 0755->0644]
gtk2_ardour/window_proxy.h [changed mode: 0755->0644]
gtk2_ardour/wscript
libs/ardour/ardour/audioregion.h
libs/ardour/ardour/silentfilesource.h
libs/ardour/audioregion.cc
libs/ardour/wscript
libs/canvas/Notes [new file with mode: 0644]
libs/canvas/arrow.cc [new file with mode: 0644]
libs/canvas/benchmark/benchmark.cc [new file with mode: 0644]
libs/canvas/benchmark/benchmark.h [new file with mode: 0644]
libs/canvas/benchmark/items_at_point.cc [new file with mode: 0644]
libs/canvas/benchmark/render_from_log.cc [new file with mode: 0644]
libs/canvas/benchmark/render_parts.cc [new file with mode: 0644]
libs/canvas/benchmark/render_whole.cc [new file with mode: 0644]
libs/canvas/benchmark/sessions/midi1.xml [new file with mode: 0644]
libs/canvas/benchmark/sessions/old_sunday.xml [new file with mode: 0644]
libs/canvas/build-and-run-benchmark.sh [new file with mode: 0644]
libs/canvas/build-and-run-manual-test.sh [new file with mode: 0644]
libs/canvas/build-and-run-tests.sh [new file with mode: 0644]
libs/canvas/canvas.cc [new file with mode: 0644]
libs/canvas/canvas/arrow.h [new file with mode: 0644]
libs/canvas/canvas/canvas.h [new file with mode: 0644]
libs/canvas/canvas/debug.h [new file with mode: 0644]
libs/canvas/canvas/fill.h [new file with mode: 0644]
libs/canvas/canvas/flag.h [new file with mode: 0644]
libs/canvas/canvas/group.h [new file with mode: 0644]
libs/canvas/canvas/item.h [new file with mode: 0644]
libs/canvas/canvas/item_factory.h [new file with mode: 0644]
libs/canvas/canvas/line.h [new file with mode: 0644]
libs/canvas/canvas/line_set.h [new file with mode: 0644]
libs/canvas/canvas/lookup_table.h [new file with mode: 0644]
libs/canvas/canvas/outline.h [new file with mode: 0644]
libs/canvas/canvas/pixbuf.h [new file with mode: 0644]
libs/canvas/canvas/poly_item.h [new file with mode: 0644]
libs/canvas/canvas/poly_line.h [new file with mode: 0644]
libs/canvas/canvas/polygon.h [new file with mode: 0644]
libs/canvas/canvas/rectangle.h [new file with mode: 0644]
libs/canvas/canvas/root_group.h [new file with mode: 0644]
libs/canvas/canvas/text.h [new file with mode: 0644]
libs/canvas/canvas/types.h [new file with mode: 0644]
libs/canvas/canvas/utils.h [new file with mode: 0644]
libs/canvas/canvas/wave_view.h [new file with mode: 0644]
libs/canvas/debug.cc [new file with mode: 0644]
libs/canvas/doc/ardour.dot [new file with mode: 0644]
libs/canvas/doc/make.sh [new file with mode: 0644]
libs/canvas/fill.cc [new file with mode: 0644]
libs/canvas/flag.cc [new file with mode: 0644]
libs/canvas/group.cc [new file with mode: 0644]
libs/canvas/item.cc [new file with mode: 0644]
libs/canvas/item_factory.cc [new file with mode: 0644]
libs/canvas/line.cc [new file with mode: 0644]
libs/canvas/line_set.cc [new file with mode: 0644]
libs/canvas/lookup_table.cc [new file with mode: 0644]
libs/canvas/outline.cc [new file with mode: 0644]
libs/canvas/pixbuf.cc [new file with mode: 0644]
libs/canvas/poly_item.cc [new file with mode: 0644]
libs/canvas/poly_line.cc [new file with mode: 0644]
libs/canvas/polygon.cc [new file with mode: 0644]
libs/canvas/rectangle.cc [new file with mode: 0644]
libs/canvas/root_group.cc [new file with mode: 0644]
libs/canvas/run-manual-test.sh [new file with mode: 0644]
libs/canvas/run-tests.sh [new file with mode: 0644]
libs/canvas/test/arrow.cc [new file with mode: 0644]
libs/canvas/test/arrow.h [new file with mode: 0644]
libs/canvas/test/group.cc [new file with mode: 0644]
libs/canvas/test/group.h [new file with mode: 0644]
libs/canvas/test/gtk_drag.cc [new file with mode: 0644]
libs/canvas/test/gtk_many.cc [new file with mode: 0644]
libs/canvas/test/gtk_movement.cc [new file with mode: 0644]
libs/canvas/test/gtk_scene.cc [new file with mode: 0644]
libs/canvas/test/gtk_viewport.cc [new file with mode: 0644]
libs/canvas/test/hello_world.cc [new file with mode: 0644]
libs/canvas/test/item.cc [new file with mode: 0644]
libs/canvas/test/item.h [new file with mode: 0644]
libs/canvas/test/optimizing_lookup_table.cc [new file with mode: 0644]
libs/canvas/test/optimizing_lookup_table.h [new file with mode: 0644]
libs/canvas/test/polygon.cc [new file with mode: 0644]
libs/canvas/test/polygon.h [new file with mode: 0644]
libs/canvas/test/render.cc [new file with mode: 0644]
libs/canvas/test/render.h [new file with mode: 0644]
libs/canvas/test/test.xml [new file with mode: 0644]
libs/canvas/test/testrunner.cpp [new file with mode: 0644]
libs/canvas/test/types.cc [new file with mode: 0644]
libs/canvas/test/types.h [new file with mode: 0644]
libs/canvas/test/wave_view.cc [new file with mode: 0644]
libs/canvas/test/wave_view.h [new file with mode: 0644]
libs/canvas/test/xml.cc [new file with mode: 0644]
libs/canvas/test/xml.h [new file with mode: 0644]
libs/canvas/text.cc [new file with mode: 0644]
libs/canvas/types.cc [new file with mode: 0644]
libs/canvas/utils.cc [new file with mode: 0644]
libs/canvas/wave_view.cc [new file with mode: 0644]
libs/canvas/wscript [new file with mode: 0644]
libs/gtkmm2ext/gtkmm2ext/utils.h
libs/gtkmm2ext/utils.cc
libs/surfaces/control_protocol/wscript
wscript