Fix up selection of automation points.

[ardour.git] / gtk2_ardour / automation_line.h

diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h
index 436e5cbb205ac05ff3f7043947364e1b2421b6cf..7377ab92a04ccdb55a07572a504d59258a6c6ce8 100644 (file)
--- a/gtk2_ardour/automation_line.h
+++ b/gtk2_ardour/automation_line.h
@@ -34,6 +34,7 @@
 
 #include "pbd/undo.h"
 #include "pbd/statefuldestructible.h"
+#include "pbd/memento_command.h"
 
 #include "ardour/automation_list.h"
 #include "ardour/types.h"
@@ -52,6 +53,7 @@ namespace Gnome {
        }
 }
 
+/** A GUI representation of an ARDOUR::AutomationList */
 class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
 {
   public:
@@ -62,22 +64,21 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
 
        void queue_reset ();
        void reset ();
-       void clear();
+       void clear ();
 
+       std::list<ControlPoint*> point_selection_to_control_points (PointSelection const &); 
        void set_selected_points (PointSelection&);
-       void get_selectables (nframes_t& start, nframes_t& end,
-                             double botfrac, double topfrac,
-                             std::list<Selectable*>& results);
+       void get_selectables (ARDOUR::framepos_t, ARDOUR::framepos_t, double, double, std::list<Selectable*>&);
        void get_inverted_selectables (Selection&, std::list<Selectable*>& results);
 
        virtual void remove_point (ControlPoint&);
        bool control_points_adjacent (double xval, uint32_t& before, uint32_t& after);
 
        /* dragging API */
-       virtual void start_drag_single (ControlPoint*, nframes_t x, float);
+       virtual void start_drag_single (ControlPoint*, double, float);
        virtual void start_drag_line (uint32_t, uint32_t, float);
        virtual void start_drag_multiple (std::list<ControlPoint*>, float, XMLNode *);
-       virtual void drag_motion (nframes_t, float, bool);
+       virtual std::pair<double, float> drag_motion (double, float, bool, bool);
        virtual void end_drag ();
 
        ControlPoint* nth (uint32_t);
@@ -90,8 +91,6 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
        void     set_line_color (uint32_t);
        uint32_t get_line_color() const { return _line_color; }
 
-       void set_interpolation(ARDOUR::AutomationList::InterpolationStyle style);
-
        void    show ();
        void    hide ();
        void    set_height (guint32);
@@ -104,13 +103,11 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
        ArdourCanvas::Item&  parent_group() const { return _parent_group; }
        ArdourCanvas::Item&  grab_item() const { return *line; }
 
-       void show_selection();
-       void hide_selection ();
-
        std::string get_verbose_cursor_string (double) const;
        std::string fraction_to_string (double) const;
        double string_to_fraction (std::string const &) const;
        void   view_to_model_coord (double& x, double& y) const;
+       void   view_to_model_coord_y (double &) const;
        void   model_to_view_coord (double& x, double& y) const;
 
        void set_list(boost::shared_ptr<ARDOUR::AutomationList> list);
@@ -134,6 +131,12 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
        void add_always_in_view (double);
        void clear_always_in_view ();
 
+       virtual MementoCommandBinder<ARDOUR::AutomationList>* memento_command_binder ();
+
+       const Evoral::TimeConverter<double, ARDOUR::sframes_t>& time_converter () const {
+               return _time_converter;
+       }
+       
   protected:
 
        std::string    _name;
@@ -170,33 +173,32 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
        void determine_visible_control_points (ALPoints&);
        void sync_model_with_view_point (ControlPoint&, bool, int64_t);
        void sync_model_with_view_points (std::list<ControlPoint*>, bool, int64_t);
-       void start_drag_common (nframes_t, float);
+       void start_drag_common (double, float);
 
        virtual void change_model (ARDOUR::AutomationList::iterator, double x, double y);
 
        void reset_callback (const Evoral::ControlList&);
        void list_changed ();
-       PBD::ScopedConnection _state_connection;
 
        virtual bool event_handler (GdkEvent*);
        virtual void add_model_point (ALPoints& tmp_points, double frame, double yfract);
 
   private:
        std::list<ControlPoint*> _drag_points; ///< points we are dragging
+       std::list<ControlPoint*> _push_points; ///< additional points we are dragging if "push" is enabled
        bool _drag_had_movement; ///< true if the drag has seen movement, otherwise false
-       nframes64_t drag_x; ///< last x position of the drag, in frames
-       nframes64_t drag_distance; ///< total x movement of the drag, in frames
+       double _drag_x; ///< last x position of the drag, in units
+       double _drag_distance; ///< total x movement of the drag, in units
        double _last_drag_fraction; ///< last y position of the drag, as a fraction
        std::list<double> _always_in_view;
 
        const Evoral::TimeConverter<double, ARDOUR::sframes_t>& _time_converter;
-       ARDOUR::AutomationList::InterpolationStyle              _interpolation;
 
-       void modify_view_point (ControlPoint&, double, double, bool, bool with_push);
        void reset_line_coords (ControlPoint&);
        void add_visible_control_point (uint32_t, uint32_t, double, double, ARDOUR::AutomationList::iterator, uint32_t);
-
        double control_point_box_size ();
+       void connect_to_list ();
+       void interpolation_changed (ARDOUR::AutomationList::InterpolationStyle);
 
        struct ModelRepresentation {
            ARDOUR::AutomationList::iterator start;
@@ -213,6 +215,8 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
 
        void model_representation (ControlPoint&, ModelRepresentation&);
 
+       PBD::ScopedConnectionList _list_connections;
+       
        friend class AudioRegionGainLine;
 };