diff options
Diffstat (limited to 'gtk2_ardour/automation_line.h')
-rw-r--r-- | gtk2_ardour/automation_line.h | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h index cafeeee2ac..405fc63e11 100644 --- a/gtk2_ardour/automation_line.h +++ b/gtk2_ardour/automation_line.h @@ -56,7 +56,7 @@ namespace Gnome { /** A GUI representation of an ARDOUR::AutomationList */ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible { - public: +public: enum VisibleAspects { Line = 0x1, ControlPoints = 0x2, @@ -64,8 +64,8 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible }; AutomationLine (const std::string& name, TimeAxisView&, ArdourCanvas::Group&, - boost::shared_ptr<ARDOUR::AutomationList>, - Evoral::TimeConverter<double, ARDOUR::framepos_t>* converter = 0); + boost::shared_ptr<ARDOUR::AutomationList>, + Evoral::TimeConverter<double, ARDOUR::framepos_t>* converter = 0); virtual ~AutomationLine (); void queue_reset (); @@ -80,11 +80,11 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible bool control_points_adjacent (double xval, uint32_t& before, uint32_t& after); /* dragging API */ - 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 std::pair<double, float> drag_motion (double, float, bool, bool with_push, uint32_t& final_index); - virtual void end_drag (bool with_push, uint32_t final_index); + 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 std::pair<double, float> drag_motion (double, float, bool, bool with_push, uint32_t& final_index); + virtual void end_drag (bool with_push, uint32_t final_index); ControlPoint* nth (uint32_t); ControlPoint const * nth (uint32_t) const; @@ -113,9 +113,9 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible ArdourCanvas::Item& grab_item() const { return *line; } std::string get_verbose_cursor_string (double) const; - std::string get_verbose_cursor_relative_string (double, double) const; + std::string get_verbose_cursor_relative_string (double, double) const; std::string fraction_to_string (double) const; - std::string fraction_to_relative_string (double, double) const; + std::string fraction_to_relative_string (double, 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; @@ -145,7 +145,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible std::pair<ARDOUR::framepos_t, ARDOUR::framepos_t> get_point_x_range () const; void set_maximum_time (ARDOUR::framecnt_t); - ARDOUR::framecnt_t maximum_time () const { + ARDOUR::framecnt_t maximum_time () const { return _maximum_time; } @@ -154,7 +154,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible framepos_t session_position (ARDOUR::AutomationList::const_iterator) const; - protected: +protected: std::string _name; guint32 _height; @@ -167,12 +167,12 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible VisibleAspects _visible; - bool _uses_gain_mapping; - bool terminal_points_can_slide; - bool update_pending; - bool have_timeout; - bool no_draw; - bool _is_boolean; + bool _uses_gain_mapping; + bool terminal_points_can_slide; + bool update_pending; + bool have_timeout; + bool no_draw; + bool _is_boolean; /** true if we did a push at any point during the current drag */ bool did_push; @@ -182,26 +182,26 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible ArdourCanvas::Points line_points; /* coordinates for canvas line */ std::vector<ControlPoint*> control_points; /* visible control points */ - class ContiguousControlPoints : public std::list<ControlPoint*> { - public: - ContiguousControlPoints (AutomationLine& al); - double clamp_dx (double dx); - void move (double dx, double dy); - void compute_x_bounds (); - private: - AutomationLine& line; - double before_x; - double after_x; + class ContiguousControlPoints : public std::list<ControlPoint*> { +public: + ContiguousControlPoints (AutomationLine& al); + double clamp_dx (double dx); + void move (double dx, double dy); + void compute_x_bounds (); +private: + AutomationLine& line; + double before_x; + double after_x; }; - friend class ContiguousControlPoints; + friend class ContiguousControlPoints; typedef boost::shared_ptr<ContiguousControlPoints> CCP; - std::vector<CCP> contiguous_points; + std::vector<CCP> contiguous_points; void sync_model_with_view_point (ControlPoint&); void sync_model_with_view_points (std::list<ControlPoint*>); - void start_drag_common (double, float); + void start_drag_common (double, float); virtual void change_model (ARDOUR::AutomationList::iterator, double x, double y); @@ -210,7 +210,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible virtual bool event_handler (GdkEvent*); - private: +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 |