X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_line.h;h=3e0f0f4bb3c364b0a163f6d7b9f6a2180b943ed1;hb=129ace60e24aa7b5297563d389edbae1d70a3a80;hp=1f3c72c4c7b0e5dc630b978253e31563ea2da95c;hpb=4297071b3f7360b17d81ef9cf36b8d75d46d2818;p=ardour.git diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h index 1f3c72c4c7..3e0f0f4bb3 100644 --- a/gtk2_ardour/automation_line.h +++ b/gtk2_ardour/automation_line.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002 Paul Davis + Copyright (C) 2002 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -29,12 +29,11 @@ #include #include "canvas.h" #include "simplerect.h" -#include "shared_ptrs.h" #include "evoral/TimeConverter.hpp" #include "pbd/undo.h" -#include "pbd/statefuldestructible.h" +#include "pbd/statefuldestructible.h" #include "ardour/automation_list.h" #include "ardour/types.h" @@ -53,10 +52,10 @@ namespace Gnome { } } -class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoingAway +class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible { public: - AutomationLine (const std::string& name, TimeAxisViewPtr, ArdourCanvas::Group&, + AutomationLine (const std::string& name, TimeAxisView&, ArdourCanvas::Group&, boost::shared_ptr, const Evoral::TimeConverter* converter = 0); virtual ~AutomationLine (); @@ -65,20 +64,22 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin void reset (); void clear(); + std::list 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, + double botfrac, double topfrac, std::list& results); void get_inverted_selectables (Selection&, std::list& results); virtual void remove_point (ControlPoint&); bool control_points_adjacent (double xval, uint32_t& before, uint32_t& after); - + /* dragging API */ - virtual void start_drag (ControlPoint*, nframes_t x, float fraction); - virtual void point_drag(ControlPoint&, nframes_t x, float, bool with_push); - virtual void end_drag (ControlPoint*); - virtual void line_drag(uint32_t i1, uint32_t i2, float, bool with_push); + 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, float, XMLNode *); + virtual std::pair drag_motion (double, float, bool, bool); + virtual void end_drag (); ControlPoint* nth (uint32_t); uint32_t npoints() const { return control_points.size(); } @@ -98,15 +99,12 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin void set_uses_gain_mapping (bool yn); bool get_uses_gain_mapping () const { return _uses_gain_mapping; } - TimeAxisViewPtr trackview; + TimeAxisView& trackview; ArdourCanvas::Group& canvas_group() const { return *group; } 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; @@ -126,17 +124,20 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin bool is_first_point (ControlPoint &); XMLNode& get_state (void); - int set_state (const XMLNode&); + int set_state (const XMLNode&, int version); void set_colors(); void modify_point_y (ControlPoint&, double); - + + void add_always_in_view (double); + void clear_always_in_view (); + protected: std::string _name; guint32 _height; uint32_t _line_color; - + boost::shared_ptr alist; bool _visible : 1; @@ -163,33 +164,35 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin static void invalidate_point (ALPoints&, uint32_t index); static bool invalid_point (ALPoints&, uint32_t index); - + void determine_visible_control_points (ALPoints&); - void sync_model_with_view_point (ControlPoint&, bool did_push, int64_t distance); - void sync_model_with_view_line (uint32_t, uint32_t); - + void sync_model_with_view_point (ControlPoint&, bool, int64_t); + void sync_model_with_view_points (std::list, bool, int64_t); + 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: - uint32_t drags; - double first_drag_fraction; - double last_drag_fraction; - uint32_t line_drag_cp1; - uint32_t line_drag_cp2; - int64_t drag_x; - int64_t drag_distance; + std::list _drag_points; ///< points we are dragging + std::list _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 _last_drag_fraction; ///< last y position of the drag, as a fraction + std::list _always_in_view; const Evoral::TimeConverter& _time_converter; ARDOUR::AutomationList::InterpolationStyle _interpolation; - void modify_view_point (ControlPoint&, double, double, 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 ();