X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_line.cc;h=7206f2dfdcd4aae7b02be40246bf9d45066ca14e;hb=5b45dc04dfba73846893a8c591c4175c20b3415f;hp=45b9573f71b388a74c320c0e81f13e38060fb6f1;hpb=15b5fce90480490455237da917167b0bcb5ce946;p=ardour.git diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc index 45b9573f71..7206f2dfdc 100644 --- a/gtk2_ardour/automation_line.cc +++ b/gtk2_ardour/automation_line.cc @@ -87,8 +87,6 @@ AutomationLine::AutomationLine (const string& name, TimeAxisView& tv, ArdourCanv line->signal_event().connect (sigc::mem_fun (*this, &AutomationLine::event_handler)); - connect_to_list (); - trackview.session()->register_with_memento_command_factory(alist->id(), this); if (alist->parameter().type() == GainAutomation || @@ -251,7 +249,7 @@ AutomationLine::modify_point_y (ControlPoint& cp, double y) trackview.editor().session()->add_command ( new MementoCommand (memento_command_binder(), 0, &alist->get_state()) ); - + trackview.editor().session()->commit_reversible_command (); trackview.editor().session()->set_dirty (); } @@ -342,11 +340,19 @@ AutomationLine::model_representation (ControlPoint& cp, ModelRepresentation& mr) } } +/** @param points AutomationLine points to consider. These will correspond 1-to-1 to + * points in the AutomationList, but will have been transformed so that they are in pixels; + * the x coordinate being the pixel distance from the start of the line (0, or the start + * of the AutomationRegionView if we are in one). + * + * @param skipped Number of points in the AutomationList that were skipped before + * `points' starts. + */ + void -AutomationLine::determine_visible_control_points (ALPoints& points) +AutomationLine::determine_visible_control_points (ALPoints& points, int skipped) { uint32_t view_index, pi, n; - AutomationList::iterator model; uint32_t npoints; uint32_t this_rx = 0; uint32_t prev_rx = 0; @@ -385,8 +391,16 @@ AutomationLine::determine_visible_control_points (ALPoints& points) view_index = 0; - for (model = alist->begin(), pi = 0; pi < npoints; ++model, ++pi) { + /* skip over unused AutomationList points before we start */ + AutomationList::iterator model = alist->begin (); + for (int i = 0; i < skipped; ++i) { + ++model; + } + + for (pi = 0; pi < npoints; ++model, ++pi) { + + /* If this line is in an AutomationRegionView, this is an offset from the region position, in pixels */ double tx = points[pi].x; double ty = points[pi].y; @@ -448,7 +462,7 @@ AutomationLine::determine_visible_control_points (ALPoints& points) /* ok, we should display this point */ add_visible_control_point (view_index, pi, tx, ty, model, npoints); - + prev_rx = this_rx; prev_ry = this_ry; @@ -523,11 +537,10 @@ AutomationLine::fraction_to_string (double fraction) const if (fraction == 0.0) { snprintf (buf, sizeof (buf), "-inf"); } else { - snprintf (buf, sizeof (buf), "%.1f", accurate_coefficient_to_dB (slider_position_to_gain (fraction))); + snprintf (buf, sizeof (buf), "%.1f", accurate_coefficient_to_dB (slider_position_to_gain_with_max (fraction, Config->get_max_gain()))); } } else { - double dummy = 0.0; - view_to_model_coord (dummy, fraction); + view_to_model_coord_y (fraction); if (EventTypeMap::instance().is_integer (alist->parameter())) { snprintf (buf, sizeof (buf), "%d", (int)fraction); } else { @@ -554,7 +567,7 @@ AutomationLine::string_to_fraction (string const & s) const sscanf (s.c_str(), "%lf", &v); if (_uses_gain_mapping) { - v = gain_to_slider_position (dB_to_coefficient (v)); + v = gain_to_slider_position_with_max (dB_to_coefficient (v), Config->get_max_gain()); } else { double dummy = 0.0; model_to_view_coord (dummy, v); @@ -601,7 +614,7 @@ AutomationLine::start_drag_single (ControlPoint* cp, double x, float fraction) } } } - + start_drag_common (x, fraction); } @@ -692,7 +705,7 @@ AutomationLine::drag_motion (double x, float fraction, bool ignore_x, bool with_ copy (_push_points.begin(), _push_points.end(), back_inserter (points)); points.sort (ControlPointSorter ()); } - + double dx = ignore_x ? 0 : (x - _drag_x); double dy = fraction - _last_drag_fraction; @@ -796,7 +809,7 @@ AutomationLine::end_drag () copy (_push_points.begin(), _push_points.end(), back_inserter (points)); points.sort (ControlPointSorter ()); } - + sync_model_with_view_points (points, did_push, rint (_drag_distance * trackview.editor().get_current_zoom ())); alist->thaw (); @@ -806,7 +819,7 @@ AutomationLine::end_drag () trackview.editor().session()->add_command ( new MementoCommand(memento_command_binder (), 0, &alist->get_state()) ); - + trackview.editor().session()->set_dirty (); } @@ -953,7 +966,7 @@ AutomationLine::remove_point (ControlPoint& cp) trackview.editor().session()->add_command( new MementoCommand (memento_command_binder (), &before, &alist->get_state()) ); - + trackview.editor().session()->commit_reversible_command (); trackview.editor().session()->set_dirty (); } @@ -976,7 +989,12 @@ AutomationLine::get_selectables ( for (vector::iterator i = control_points.begin(); i != control_points.end(); ++i) { double const model_when = (*(*i)->model())->when; - framepos_t const session_frames_when = _time_converter.to (model_when - _offset) + _time_converter.origin_b (); + + /* model_when is relative to the start of the source, so we just need to add on the origin_b here + (as it is the session frame position of the start of the source) + */ + + framepos_t const session_frames_when = _time_converter.to (model_when) + _time_converter.origin_b (); if (session_frames_when >= start && session_frames_when <= end && (*i)->get_y() >= bot_track && (*i)->get_y() <= top_track) { results.push_back (*i); @@ -995,7 +1013,7 @@ list AutomationLine::point_selection_to_control_points (PointSelection const & s) { list cp; - + for (PointSelection::const_iterator i = s.begin(); i != s.end(); ++i) { if (i->track != &trackview) { @@ -1007,8 +1025,8 @@ AutomationLine::point_selection_to_control_points (PointSelection const & s) for (vector::iterator j = control_points.begin(); j != control_points.end(); ++j) { - 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)); + double const rstart = trackview.editor().frame_to_unit (_time_converter.to (i->start) - _offset); + double const rend = trackview.editor().frame_to_unit (_time_converter.to (i->end) - _offset); if ((*j)->get_x() >= rstart && (*j)->get_x() <= rend) { if ((*j)->get_y() >= bot && (*j)->get_y() <= top) { @@ -1023,7 +1041,7 @@ AutomationLine::point_selection_to_control_points (PointSelection const & s) } void -AutomationLine::set_selected_points (PointSelection& points) +AutomationLine::set_selected_points (PointSelection const & points) { for (vector::iterator i = control_points.begin(); i != control_points.end(); ++i) { (*i)->set_selected (false); @@ -1069,6 +1087,7 @@ AutomationLine::reset_callback (const Evoral::ControlList& events) } AutomationList::const_iterator ai; + int skipped = 0; for (ai = events.begin(); ai != events.end(); ++ai) { @@ -1081,10 +1100,12 @@ AutomationLine::reset_callback (const Evoral::ControlList& events) trackview.editor().frame_to_unit (translated_x), _height - (translated_y * _height)) ); + } else if (translated_x < 0) { + ++skipped; } } - determine_visible_control_points (tmp_points); + determine_visible_control_points (tmp_points, skipped); } void @@ -1201,7 +1222,7 @@ AutomationLine::view_to_model_coord_y (double& y) const /* TODO: This should be more generic ... */ if (alist->parameter().type() == GainAutomation || alist->parameter().type() == EnvelopeAutomation) { - y = slider_position_to_gain (y); + y = slider_position_to_gain_with_max (y, Config->get_max_gain()); y = max (0.0, y); y = min (2.0, y); } else if (alist->parameter().type() == PanAzimuthAutomation || @@ -1221,7 +1242,7 @@ AutomationLine::model_to_view_coord (double& x, double& y) const /* TODO: This should be more generic ... */ if (alist->parameter().type() == GainAutomation || alist->parameter().type() == EnvelopeAutomation) { - y = gain_to_slider_position (y); + y = gain_to_slider_position_with_max (y, Config->get_max_gain()); } else if (alist->parameter().type() == PanAzimuthAutomation || alist->parameter().type() == PanElevationAutomation || alist->parameter().type() == PanWidthAutomation) { @@ -1287,7 +1308,7 @@ AutomationLine::add_visible_control_point (uint32_t view_index, uint32_t pi, dou control_points[view_index]->reset (tx, ty, model, view_index, shape); /* finally, control visibility */ - + if (_visible && points_visible) { control_points[view_index]->show (); control_points[view_index]->set_visible (true); @@ -1316,9 +1337,9 @@ void AutomationLine::connect_to_list () { _list_connections.drop_connections (); - + alist->StateChanged.connect (_list_connections, invalidator (*this), boost::bind (&AutomationLine::list_changed, this), gui_context()); - + alist->InterpolationChanged.connect ( _list_connections, invalidator (*this), boost::bind (&AutomationLine::interpolation_changed, this, _1), gui_context() ); @@ -1365,7 +1386,7 @@ AutomationLine::set_offset (framepos_t off) if (_offset == off) { return; } - + _offset = off; reset (); }