ardour/livetrax
13
0
Fork 0
Code

make editor_drag.h fully self-contained as a header file (it was missing more than a dozen necessary fwd decls etc)

Browse Source 
Conflicts:
	gtk2_ardour/editor_drag.h
This commit is contained in:
Paul Davis 2015-01-17 12:01:08 -05:00
parent eb791b7302
commit aefd089b88
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gtk2_ardour/editor_drag.h
View File

@ -27,14 +27,23 @@
#include "ardour/types.h" #include "ardour/types.h"
#include "canvas/types.h"
#include "cursor_context.h" #include "cursor_context.h"
#include "editor_items.h" #include "editor_items.h"
#include "mouse_cursors.h" #include "mouse_cursors.h"
#include "editing.h"
namespace ARDOUR { namespace ARDOUR {
class Location; class Location;
} }
namespace ArdourCanvas {
class Item;
class Line;
class Rectangle;
}
namespace PBD { namespace PBD {
class StatefulDiffCommand; class StatefulDiffCommand;
} }
@ -46,6 +55,18 @@ class TimeAxisView;
class MidiTimeAxisView; class MidiTimeAxisView;
class Drag; class Drag;
class NoteBase; 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 to manage current drags */
class DragManager class DragManager
@ -456,13 +477,13 @@ protected:
private: private:
TimeAxisView *prev_tav; // where regions were most recently dragged from TimeAxisView *prev_tav; // where regions were most recently dragged from
TimeAxisView *orig_tav; // where drag started TimeAxisView *orig_tav; // where drag started
framecnt_t prev_amount; ARDOUR::framecnt_t prev_amount;
framepos_t prev_position; ARDOUR::framepos_t prev_position;
framecnt_t selection_length; ARDOUR::framecnt_t selection_length;
bool allow_moves_across_tracks; // only if all selected regions are on one track bool allow_moves_across_tracks; // only if all selected regions are on one track
ARDOUR::RegionList *exclude; ARDOUR::RegionList *exclude;
void add_all_after_to_views (TimeAxisView *tav, framepos_t where, const RegionSelection &exclude, bool drag_in_progress); void add_all_after_to_views (TimeAxisView *tav, ARDOUR::framepos_t where, const RegionSelection &exclude, bool drag_in_progress);
void remove_unselected_from_views (framecnt_t amount, bool move_regions); void remove_unselected_from_views (ARDOUR::framecnt_t amount, bool move_regions);
}; };
@ -559,7 +580,7 @@ public:
private: private:
double y_to_region (double) const; double y_to_region (double) const;
framecnt_t grid_frames (framepos_t) const; ARDOUR::framecnt_t grid_frames (framepos_t) const;
MidiRegionView* _region_view; MidiRegionView* _region_view;
ArdourCanvas::Rectangle* _drag_rect; ArdourCanvas::Rectangle* _drag_rect;