diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2015-01-17 12:01:08 -0500 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-06-29 14:18:13 -0400 |
commit | aefd089b888d088160a00f2769cdfa383e3e67a4 (patch) | |
tree | d9e3b529575bd06fa7a7a7287f8b569515a661f2 /gtk2_ardour/editor_drag.h | |
parent | eb791b7302123d4a0a30485bebbc54b673aa4f61 (diff) |
make editor_drag.h fully self-contained as a header file (it was missing more than a dozen necessary fwd decls etc)
Conflicts:
gtk2_ardour/editor_drag.h
Diffstat (limited to 'gtk2_ardour/editor_drag.h')
-rw-r--r-- | gtk2_ardour/editor_drag.h | 33 |
1 files changed, 27 insertions, 6 deletions
diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h index 6fcd92751a..1e0161fd71 100644 --- a/gtk2_ardour/editor_drag.h +++ b/gtk2_ardour/editor_drag.h @@ -27,14 +27,23 @@ #include "ardour/types.h" +#include "canvas/types.h" + #include "cursor_context.h" #include "editor_items.h" #include "mouse_cursors.h" +#include "editing.h" namespace ARDOUR { class Location; } +namespace ArdourCanvas { + class Item; + class Line; + class Rectangle; +} + namespace PBD { class StatefulDiffCommand; } @@ -46,6 +55,18 @@ class TimeAxisView; class MidiTimeAxisView; class Drag; class NoteBase; +class RegionView; +class TimeAxisView; +class RouteTimeAxisView; +class RegionSelection; +class MidiRegionView; +class MeterMarker; +class Marker; +class TempoMarker; +class ControlPoint; +class AudioRegionView; +class AutomationLine; +class AutomationTimeAxisView; /** Class to manage current drags */ class DragManager @@ -456,13 +477,13 @@ protected: private: TimeAxisView *prev_tav; // where regions were most recently dragged from TimeAxisView *orig_tav; // where drag started - framecnt_t prev_amount; - framepos_t prev_position; - framecnt_t selection_length; + ARDOUR::framecnt_t prev_amount; + ARDOUR::framepos_t prev_position; + ARDOUR::framecnt_t selection_length; bool allow_moves_across_tracks; // only if all selected regions are on one track ARDOUR::RegionList *exclude; - void add_all_after_to_views (TimeAxisView *tav, framepos_t where, const RegionSelection &exclude, bool drag_in_progress); - void remove_unselected_from_views (framecnt_t amount, bool move_regions); + void add_all_after_to_views (TimeAxisView *tav, ARDOUR::framepos_t where, const RegionSelection &exclude, bool drag_in_progress); + void remove_unselected_from_views (ARDOUR::framecnt_t amount, bool move_regions); }; @@ -559,7 +580,7 @@ public: private: double y_to_region (double) const; - framecnt_t grid_frames (framepos_t) const; + ARDOUR::framecnt_t grid_frames (framepos_t) const; MidiRegionView* _region_view; ArdourCanvas::Rectangle* _drag_rect; |