Remove internal edit mode and add "content" tool.

[ardour.git] / gtk2_ardour / editor_drag.h

diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h
index 9b4a0a652162967a8eadfff47516b39031453ce8..78b541d4f54097ed5fadda1d5124157e3ad4fcf0 100644 (file)
--- a/gtk2_ardour/editor_drag.h
+++ b/gtk2_ardour/editor_drag.h
@@ -154,7 +154,7 @@ public:
         *  @return true if this drag should happen in this mouse mode.
         */
        virtual bool active (Editing::MouseMode m) {
-               return (m != Editing::MouseGain);
+               return true;
        }
 
        /** @return minimum number of frames (in x) and pixels (in y) that should be considered a movement */
@@ -523,6 +523,14 @@ public:
        void finished (GdkEvent *, bool);
        void aborted (bool);
 
+       bool active (Editing::MouseMode mode) {
+               return mode == Editing::MouseDraw;
+       }
+
+       bool y_movement_matters () const {
+               return false;
+       }
+
 private:
        double y_to_region (double) const;
        framecnt_t grid_frames (framepos_t) const;
@@ -689,10 +697,6 @@ public:
        void finished (GdkEvent *, bool);
        void aborted (bool);
 
-       bool active (Editing::MouseMode) {
-               return true;
-       }
-
        bool allow_vertical_autoscroll () const {
                return false;
        }
@@ -820,17 +824,11 @@ public:
        void finished (GdkEvent *, bool);
        void aborted (bool);
 
-       bool active (Editing::MouseMode) {
-               return true;
-       }
-
 private:
 
        AutomationLine* _line;
        double _fixed_grab_x;
        double _fixed_grab_y;
-       uint32_t _before;
-       uint32_t _after;
        double _cumulative_y_drag;
 };
 
@@ -845,10 +843,6 @@ public:
        void finished (GdkEvent *, bool);
        void aborted (bool);
 
-       bool active (Editing::MouseMode) {
-               return true;
-       }
-
 private:
 
        ArdourCanvas::Line* _line;
@@ -978,9 +972,7 @@ public:
 private:
        Operation _operation;
        bool _add;
-       bool _extend;
        int _original_pointer_time_axis;
-       int _last_pointer_time_axis;
        std::list<TimeAxisView*> _added_time_axes;
        bool _time_selection_at_start;
         framepos_t start_at_start;
@@ -1058,10 +1050,6 @@ public:
                return false;
        }
 
-       bool active (Editing::MouseMode) {
-               return true;
-       }
-
 private:
        void setup (std::list<boost::shared_ptr<AutomationLine> > const &);
         double y_fraction (boost::shared_ptr<AutomationLine>, double global_y_position) const;