X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_line.cc;h=a8125c0818be4e0b649003ad56fc5ff1a18c114b;hb=4336bb25d739cd007811ccd0298a15acc5e20787;hp=dd5f11f0428ab8fd90d0e8852adb779648f1ea38;hpb=cc6016400bbd903e5d2a1720708ecde8d71f44d3;p=ardour.git diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc index dd5f11f042..a8125c0818 100644 --- a/gtk2_ardour/automation_line.cc +++ b/gtk2_ardour/automation_line.cc @@ -41,7 +41,6 @@ #include "selection.h" #include "time_axis_view.h" #include "point_selection.h" -#include "automation_selectable.h" #include "automation_time_axis.h" #include "public_editor.h" @@ -56,22 +55,25 @@ using namespace PBD; using namespace Editing; using namespace Gnome; // for Canvas -static const Evoral::IdentityConverter default_converter; +static const Evoral::IdentityConverter default_converter; AutomationLine::AutomationLine (const string& name, TimeAxisView& tv, ArdourCanvas::Group& parent, boost::shared_ptr al, - const Evoral::TimeConverter* converter) + const Evoral::TimeConverter* converter) : trackview (tv) , _name (name) , alist (al) , _parent_group (parent) + , _offset (0) , _time_converter (converter ? (*converter) : default_converter) + , _maximum_time (max_framepos) { points_visible = false; update_pending = false; _uses_gain_mapping = false; no_draw = false; _visible = true; + _is_boolean = false; terminal_points_can_slide = true; _height = 0; @@ -204,6 +206,16 @@ AutomationLine::nth (uint32_t n) } } +ControlPoint const * +AutomationLine::nth (uint32_t n) const +{ + if (n < control_points.size()) { + return control_points[n]; + } else { + return 0; + } +} + void AutomationLine::modify_point_y (ControlPoint& cp, double y) { @@ -215,7 +227,7 @@ AutomationLine::modify_point_y (ControlPoint& cp, double y) y = min (1.0, y); y = _height - (y * _height); - double const x = trackview.editor().frame_to_unit (_time_converter.to((*cp.model())->when)); + double const x = trackview.editor().frame_to_unit (_time_converter.to((*cp.model())->when) - _offset); trackview.editor().session()->begin_reversible_command (_("automation event move")); trackview.editor().session()->add_command ( @@ -276,11 +288,11 @@ AutomationLine::model_representation (ControlPoint& cp, ModelRepresentation& mr) /* if xval has not changed, set it directly from the model to avoid rounding errors */ - if (mr.xval == trackview.editor().frame_to_unit(_time_converter.to((*cp.model())->when))) { - mr.xval = (*cp.model())->when; + if (mr.xval == trackview.editor().frame_to_unit(_time_converter.to((*cp.model())->when)) - _offset) { + mr.xval = (*cp.model())->when - _offset; } else { mr.xval = trackview.editor().unit_to_frame (mr.xval); - view_to_model_coord_x (mr.xval); + mr.xval = _time_converter.from (mr.xval + _offset); } /* convert y to model units; the x was already done above @@ -291,7 +303,7 @@ AutomationLine::model_representation (ControlPoint& cp, ModelRepresentation& mr) /* part 2: find out where the model point is now */ - mr.xpos = (*cp.model())->when; + mr.xpos = (*cp.model())->when - _offset; mr.ypos = (*cp.model())->value; /* part 3: get the position of the visual control @@ -554,13 +566,13 @@ AutomationLine::string_to_fraction (string const & s) const bool AutomationLine::invalid_point (ALPoints& p, uint32_t index) { - return p[index].x == max_frames && p[index].y == DBL_MAX; + return p[index].x == max_framepos && p[index].y == DBL_MAX; } void AutomationLine::invalidate_point (ALPoints& p, uint32_t index) { - p[index].x = max_frames; + p[index].x = max_framepos; p[index].y = DBL_MAX; } @@ -582,9 +594,9 @@ AutomationLine::start_drag_single (ControlPoint* cp, double x, float fraction) _drag_points.clear (); _drag_points.push_back (cp); - if (cp->selected ()) { + if (cp->get_selected ()) { for (vector::iterator i = control_points.begin(); i != control_points.end(); ++i) { - if (*i != cp && (*i)->selected()) { + if (*i != cp && (*i)->get_selected()) { _drag_points.push_back (*i); } } @@ -795,7 +807,6 @@ AutomationLine::end_drag () new MementoCommand(memento_command_binder (), 0, &alist->get_state()) ); - trackview.editor().session()->commit_reversible_command (); trackview.editor().session()->set_dirty (); } @@ -947,55 +958,30 @@ AutomationLine::remove_point (ControlPoint& cp) trackview.editor().session()->set_dirty (); } +/** Get selectable points within an area. + * @param start Start position in session frames. + * @param end End position in session frames. + * @param bot Bottom y range, as a fraction of line height, where 0 is the bottom of the line. + * @param top Top y range, as a fraction of line height, where 0 is the bottom of the line. + * @param result Filled in with selectable things; in this case, ControlPoints. + */ void -AutomationLine::get_selectables (nframes_t start, nframes_t end, - double botfrac, double topfrac, list& results) +AutomationLine::get_selectables ( + framepos_t start, framepos_t end, double botfrac, double topfrac, list& results + ) { - - double top; - double bot; - sframes_t nstart; - sframes_t nend; - bool collecting = false; - - /* Curse X11 and its inverted coordinate system! */ - - bot = (1.0 - topfrac) * _height; - top = (1.0 - botfrac) * _height; - - nstart = max_frames; - nend = 0; + /* convert fractions to display coordinates with 0 at the top of the track */ + double const bot_track = (1 - topfrac) * trackview.current_height (); + double const top_track = (1 - botfrac) * trackview.current_height (); for (vector::iterator i = control_points.begin(); i != control_points.end(); ++i) { - sframes_t const when = _time_converter.to ((*(*i)->model())->when); - - if (when >= start && when <= end) { - - if ((*i)->get_y() >= bot && (*i)->get_y() <= top) { + double const model_when = (*(*i)->model())->when; + framepos_t const session_frames_when = _time_converter.to (model_when - _offset) + _time_converter.origin_b (); - (*i)->show(); - (*i)->set_visible(true); - collecting = true; - nstart = min (nstart, when); - nend = max (nend, when); - - } else { - - if (collecting) { - - results.push_back (new AutomationSelectable (nstart, nend, botfrac, topfrac, &trackview)); - collecting = false; - nstart = max_frames; - nend = 0; - } - } + if (session_frames_when >= start && session_frames_when <= end && (*i)->get_y() >= bot_track && (*i)->get_y() <= top_track) { + results.push_back (*i); } } - - if (collecting) { - results.push_back (new AutomationSelectable (nstart, nend, botfrac, topfrac, &trackview)); - } - } void @@ -1016,15 +1002,13 @@ AutomationLine::point_selection_to_control_points (PointSelection const & s) continue; } - /* Curse X11 and its inverted coordinate system! */ - - double const bot = (1.0 - i->high_fract) * _height; - double const top = (1.0 - i->low_fract) * _height; + double const bot = (1 - i->high_fract) * trackview.current_height (); + double const top = (1 - i->low_fract) * trackview.current_height (); for (vector::iterator j = control_points.begin(); j != control_points.end(); ++j) { - double const rstart = trackview.editor().frame_to_unit (i->start); - double const rend = trackview.editor().frame_to_unit (i->end); + double const rstart = trackview.editor().frame_to_unit (_time_converter.to (i->start)); + double const rend = trackview.editor().frame_to_unit (_time_converter.to (i->end)); if ((*j)->get_x() >= rstart && (*j)->get_x() <= rend) { if ((*j)->get_y() >= bot && (*j)->get_y() <= top) { @@ -1092,20 +1076,17 @@ AutomationLine::reset_callback (const Evoral::ControlList& events) double translated_y = (*ai)->value; model_to_view_coord (translated_x, translated_y); - add_model_point (tmp_points, (*ai)->when, translated_y); + if (translated_x >= 0 && translated_x < _maximum_time) { + tmp_points.push_back (ALPoint ( + trackview.editor().frame_to_unit (translated_x), + _height - (translated_y * _height)) + ); + } } determine_visible_control_points (tmp_points); } - -void -AutomationLine::add_model_point (ALPoints& tmp_points, double frame, double yfract) -{ - tmp_points.push_back (ALPoint (trackview.editor().frame_to_unit (_time_converter.to(frame)), - _height - (yfract * _height))); -} - void AutomationLine::reset () { @@ -1146,6 +1127,11 @@ AutomationLine::set_list (boost::shared_ptr list) void AutomationLine::show_all_control_points () { + if (_is_boolean) { + // show the line but don't allow any control points + return; + } + points_visible = true; for (vector::iterator i = control_points.begin(); i != control_points.end(); ++i) { @@ -1166,7 +1152,7 @@ AutomationLine::hide_all_but_selected_control_points () points_visible = false; for (vector::iterator i = control_points.begin(); i != control_points.end(); ++i) { - if (!(*i)->selected()) { + if (!(*i)->get_selected()) { (*i)->set_visible (false); } } @@ -1205,16 +1191,10 @@ AutomationLine::set_state (const XMLNode &node, int version) void AutomationLine::view_to_model_coord (double& x, double& y) const { - view_to_model_coord_x (x); + x = _time_converter.from (x); view_to_model_coord_y (y); } -void -AutomationLine::view_to_model_coord_x (double& x) const -{ - x = _time_converter.from(x); -} - void AutomationLine::view_to_model_coord_y (double& y) const { @@ -1230,7 +1210,7 @@ AutomationLine::view_to_model_coord_y (double& y) const } else if (alist->parameter().type() == PluginAutomation) { y = y * (double)(alist->get_max_y()- alist->get_min_y()) + alist->get_min_y(); } else { - y = (int)(y * alist->parameter().max()); + y = rint (y * alist->parameter().max()); } } @@ -1250,7 +1230,7 @@ AutomationLine::model_to_view_coord (double& x, double& y) const y = y / (double)alist->parameter().max(); /* ... like this */ } - x = _time_converter.to(x); + x = _time_converter.to (x) - _offset; } /** Called when our list has announced that its interpolation style has changed */ @@ -1346,3 +1326,43 @@ AutomationLine::memento_command_binder () { return new SimpleMementoCommandBinder (*alist.get()); } + +/** Set the maximum time that points on this line can be at, relative + * to the start of the track or region that it is on. + */ +void +AutomationLine::set_maximum_time (framecnt_t t) +{ + if (_maximum_time == t) { + return; + } + + _maximum_time = t; + reset (); +} + + +/** @return min and max x positions of points that are in the list, in session frames */ +pair +AutomationLine::get_point_x_range () const +{ + pair r (max_framepos, 0); + + for (AutomationList::const_iterator i = the_list()->begin(); i != the_list()->end(); ++i) { + r.first = min (r.first, _time_converter.to ((*i)->when) + _offset + _time_converter.origin_b ()); + r.second = max (r.second, _time_converter.to ((*i)->when) + _offset + _time_converter.origin_b ()); + } + + return r; +} + +void +AutomationLine::set_offset (framepos_t off) +{ + if (_offset == off) { + return; + } + + _offset = off; + reset (); +}