remove extra unused argument to ::sync_model_with_view_point(s)

[ardour.git] / gtk2_ardour / automation_line.h

diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h
index 3ca2ec171bac64531f4a0284e39ae93441cc0e2e..b78c2da676b365d61a3105f1b5d3a8884d3fc65e 100644 (file)
--- a/gtk2_ardour/automation_line.h
+++ b/gtk2_ardour/automation_line.h
@@ -57,6 +57,12 @@ namespace Gnome {
 class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
 {
   public:
+       enum VisibleAspects {
+               Line = 0x1,
+               ControlPoints = 0x2,
+               SelectedControlPoints = 0x4
+       };
+       
        AutomationLine (const std::string& name, TimeAxisView&, ArdourCanvas::Group&,
                        boost::shared_ptr<ARDOUR::AutomationList>,
                        Evoral::TimeConverter<double, ARDOUR::framepos_t>* converter = 0);
@@ -66,7 +72,6 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
        void reset ();
        void clear ();
 
-       std::list<ControlPoint*> point_selection_to_control_points (PointSelection const &);
        void set_selected_points (PointSelection const &);
        void get_selectables (ARDOUR::framepos_t, ARDOUR::framepos_t, double, double, std::list<Selectable*>&);
        void get_inverted_selectables (Selection&, std::list<Selectable*>& results);
@@ -86,17 +91,20 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
        uint32_t npoints() const { return control_points.size(); }
 
        std::string  name()    const { return _name; }
-       bool    visible() const { return _visible; }
+       bool    visible() const { return _visible != VisibleAspects(0); }
        guint32 height()  const { return _height; }
 
        void     set_line_color (uint32_t);
        uint32_t get_line_color() const { return _line_color; }
 
-       void    show ();
-       void    hide ();
-       void    set_height (guint32);
-       void    set_uses_gain_mapping (bool yn);
-       bool    get_uses_gain_mapping () const { return _uses_gain_mapping; }
+       void set_visibility (VisibleAspects);
+       void add_visibility (VisibleAspects);
+       void remove_visibility (VisibleAspects);
+
+       void hide ();
+       void set_height (guint32);
+       void set_uses_gain_mapping (bool yn);
+       bool get_uses_gain_mapping () const { return _uses_gain_mapping; }
 
        TimeAxisView& trackview;
 
@@ -114,9 +122,6 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
        void set_list(boost::shared_ptr<ARDOUR::AutomationList> list);
        boost::shared_ptr<ARDOUR::AutomationList> the_list() const { return alist; }
 
-       void show_all_control_points ();
-       void hide_all_but_selected_control_points ();
-
        void track_entered();
        void track_exited();
 
@@ -129,9 +134,6 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
 
        void modify_point_y (ControlPoint&, double);
 
-       void add_always_in_view (double);
-       void clear_always_in_view ();
-
        virtual MementoCommandBinder<ARDOUR::AutomationList>* memento_command_binder ();
 
        const Evoral::TimeConverter<double, ARDOUR::framepos_t>& time_converter () const {
@@ -148,6 +150,8 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
        void set_offset (ARDOUR::framecnt_t);
        void set_width (ARDOUR::framecnt_t);
 
+       framepos_t session_position (ARDOUR::AutomationList::const_iterator) const;
+
   protected:
 
        std::string    _name;
@@ -156,16 +160,17 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
 
        boost::shared_ptr<ARDOUR::AutomationList> alist;
        Evoral::TimeConverter<double, ARDOUR::framepos_t>* _time_converter;
-       /** true if _time_converter belongs to us (ie we should delete it) */
+       /** true if _time_converter belongs to us (ie we should delete it on destruction) */
        bool _our_time_converter;
 
-       bool    _visible                  : 1;
+       VisibleAspects _visible;
+
        bool    _uses_gain_mapping        : 1;
        bool    terminal_points_can_slide : 1;
        bool    update_pending            : 1;
        bool    no_draw                   : 1;
        bool    _is_boolean               : 1;
-       bool    points_visible            : 1;
+       /** true if we did a push at any point during the current drag */
        bool    did_push;
 
        ArdourCanvas::Group&        _parent_group;
@@ -174,8 +179,8 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
        ArdourCanvas::Points        line_points; /* coordinates for canvas line */
        std::vector<ControlPoint*>  control_points; /* visible control points */
 
-       void sync_model_with_view_point (ControlPoint&, bool, int64_t);
-       void sync_model_with_view_points (std::list<ControlPoint*>, bool, int64_t);
+       void sync_model_with_view_point (ControlPoint&);
+       void sync_model_with_view_points (std::list<ControlPoint*>);
        void start_drag_common (double, float);
 
        virtual void change_model (ARDOUR::AutomationList::iterator, double x, double y);
@@ -190,14 +195,14 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
        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
        double _drag_x; ///< last x position of the drag, in units
-       double _drag_distance; ///< total x movement of the drag, in units
+       double _drag_distance; ///< total x movement of the drag, in canvas units
        double _last_drag_fraction; ///< last y position of the drag, as a fraction
-       std::list<double> _always_in_view;
        /** offset from the start of the automation list to the start of the line, so that
         *  a +ve offset means that the 0 on the line is at _offset in the list
         */
        ARDOUR::framecnt_t _offset;
 
+       void show ();
        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 ();