smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 19:56:31 +01:00
Code Issues Projects Releases Wiki Activity

cleaner version of previous commit's fix for AutomationRangeDrag y fraction computation

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13013 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-07-10 15:58:09 +00:00
parent e89bdcd9eb
commit 43c850cdf3
2 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
gtk2_ardour/editor_drag.cc
View file

@ -4106,7 +4106,7 @@ AutomationRangeDrag::AutomationRangeDrag (Editor* editor, AutomationTimeAxisView
, _nothing_to_drag (false) , _nothing_to_drag (false)
{ {
DEBUG_TRACE (DEBUG::Drags, "New AutomationRangeDrag\n"); DEBUG_TRACE (DEBUG::Drags, "New AutomationRangeDrag\n");
track_view = atv; y_origin = atv->y_position();
setup (atv->lines ()); setup (atv->lines ());
} }
@ -4120,7 +4120,7 @@ AutomationRangeDrag::AutomationRangeDrag (Editor* editor, AudioRegionView* rv, l
list<boost::shared_ptr<AutomationLine> > lines; list<boost::shared_ptr<AutomationLine> > lines;
lines.push_back (rv->get_gain_line ()); lines.push_back (rv->get_gain_line ());
track_view = &rv->get_time_axis_view(); y_origin = rv->get_time_axis_view().y_position();
setup (lines); setup (lines);
} }
@ -4162,6 +4162,12 @@ AutomationRangeDrag::setup (list<boost::shared_ptr<AutomationLine> > const & lin
/* Now ::lines contains the AutomationLines that somehow overlap our drag */ /* Now ::lines contains the AutomationLines that somehow overlap our drag */
} }
double
AutomationRangeDrag::y_fraction (boost::shared_ptr<AutomationLine> line, double global_y) const
{
return 1.0 - ((global_y - y_origin) / line->height());
}
void void
AutomationRangeDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) AutomationRangeDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
{ {
@ -4170,7 +4176,7 @@ AutomationRangeDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
/* Get line states before we start changing things */ /* Get line states before we start changing things */
for (list<Line>::iterator i = _lines.begin(); i != _lines.end(); ++i) { for (list<Line>::iterator i = _lines.begin(); i != _lines.end(); ++i) {
i->state = &i->line->get_state (); i->state = &i->line->get_state ();
i->original_fraction = 1 - ((_drags->current_pointer_y() - track_view->y_position()) / i->line->height()); i->original_fraction = y_fraction (i->line, _drags->current_pointer_y());
} }
if (_ranges.empty()) { if (_ranges.empty()) {
@ -4276,7 +4282,7 @@ AutomationRangeDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
} }
for (list<Line>::iterator i = _lines.begin(); i != _lines.end(); ++i) { for (list<Line>::iterator i = _lines.begin(); i != _lines.end(); ++i) {
i->line->start_drag_multiple (i->points, 1 - ((_drags->current_pointer_y() - track_view->y_position()) / i->line->height ()), i->state); i->line->start_drag_multiple (i->points, y_fraction (i->line, _drags->current_pointer_y()), i->state);
} }
} }
@ -4288,7 +4294,7 @@ AutomationRangeDrag::motion (GdkEvent*, bool /*first_move*/)
} }
for (list<Line>::iterator l = _lines.begin(); l != _lines.end(); ++l) { for (list<Line>::iterator l = _lines.begin(); l != _lines.end(); ++l) {
float const f = 1 - ((_drags->current_pointer_y() - track_view->y_position()) / l->line->height()); float const f = y_fraction (l->line, _drags->current_pointer_y());
/* we are ignoring x position for this drag, so we can just pass in anything */ /* we are ignoring x position for this drag, so we can just pass in anything */
l->line->drag_motion (0, f, true, false); l->line->drag_motion (0, f, true, false);

3
gtk2_ardour/editor_drag.h
View file

@ -957,6 +957,7 @@ public:
private: private:
void setup (std::list<boost::shared_ptr<AutomationLine> > const &); void setup (std::list<boost::shared_ptr<AutomationLine> > const &);
double y_fraction (boost::shared_ptr<AutomationLine>, double global_y_position) const;
std::list<ARDOUR::AudioRange> _ranges; std::list<ARDOUR::AudioRange> _ranges;
@ -970,7 +971,7 @@ private:
}; };
std::list<Line> _lines; std::list<Line> _lines;
TimeAxisView* track_view; double y_origin;
bool _nothing_to_drag; bool _nothing_to_drag;
}; };