diff options
| author | Carl Hetherington <carl@carlh.net> | 2012-03-22 16:41:23 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2012-03-22 16:41:23 +0000 |
| commit | 3120bae8b41f3eecad25534ab6953e1b123ab9de (patch) | |
| tree | 83542178768a7ca38427e2751a5a933102957537 /gtk2_ardour/automation_line.h | |
| parent | f9de5f6436486bd7fea3d7dfacc43c04af7dc85f (diff) | |
Don't leave internal edit mode when clicking on an automation region view (#4747).
git-svn-id: svn://localhost/ardour2/branches/3.0@11749 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/automation_line.h')
| -rw-r--r-- | gtk2_ardour/automation_line.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h index 3a28362195..5ca2c83cd6 100644 --- a/gtk2_ardour/automation_line.h +++ b/gtk2_ardour/automation_line.h @@ -59,7 +59,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible public: AutomationLine (const std::string& name, TimeAxisView&, ArdourCanvas::Group&, boost::shared_ptr<ARDOUR::AutomationList>, - const Evoral::TimeConverter<double, ARDOUR::framepos_t>* converter = 0); + Evoral::TimeConverter<double, ARDOUR::framepos_t>* converter = 0); virtual ~AutomationLine (); void queue_reset (); @@ -135,7 +135,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible virtual MementoCommandBinder<ARDOUR::AutomationList>* memento_command_binder (); const Evoral::TimeConverter<double, ARDOUR::framepos_t>& time_converter () const { - return _time_converter; + return *_time_converter; } std::pair<ARDOUR::framepos_t, ARDOUR::framepos_t> get_point_x_range () const; @@ -155,6 +155,9 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible uint32_t _line_color; 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) */ + bool _our_time_converter; bool _visible : 1; bool _uses_gain_mapping : 1; @@ -207,8 +210,6 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible */ ARDOUR::framecnt_t _offset; - const Evoral::TimeConverter<double, ARDOUR::framepos_t>& _time_converter; - 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 (); |