(from 2.x) make sure that F4 is bound to the real separate action, not the Separate...

[ardour.git] / gtk2_ardour / automation_line.cc

diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc
index cd89abcc99688216307a2f95c7a23c49ab46bd11..bde9308ded05fdf107bf098072e958401d47b28b 100644 (file)
--- a/gtk2_ardour/automation_line.cc
+++ b/gtk2_ardour/automation_line.cc
@@ -64,6 +64,7 @@ AutomationLine::AutomationLine (const string& name, TimeAxisView& tv, ArdourCanv
        , _name (name)
        , alist (al)
        , _parent_group (parent)
+       , _offset (0)
        , _time_converter (converter ? (*converter) : default_converter)
        , _maximum_time (max_framepos)
 {
@@ -226,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 (
@@ -287,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);
-               mr.xval = _time_converter.from (mr.xval);
+               mr.xval = _time_converter.from (mr.xval + _offset);
        }
 
        /* convert y to model units; the x was already done above
@@ -302,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
@@ -525,8 +526,7 @@ AutomationLine::fraction_to_string (double fraction) const
                        snprintf (buf, sizeof (buf), "%.1f", accurate_coefficient_to_dB (slider_position_to_gain (fraction)));
                }
        } 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 {
@@ -975,7 +975,7 @@ AutomationLine::get_selectables (
 
        for (vector<ControlPoint*>::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) + _time_converter.origin_b ();
+               framepos_t const session_frames_when = _time_converter.to (model_when - _offset) + _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);
@@ -1075,20 +1075,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 ()
 {
@@ -1206,8 +1203,9 @@ AutomationLine::view_to_model_coord_y (double& y) const
                y = slider_position_to_gain (y);
                y = max (0.0, y);
                y = min (2.0, y);
-       } else if (alist->parameter().type() == PanAutomation) {
-               // vertical coordinate axis reversal
+       } else if (alist->parameter().type() == PanAzimuthAutomation ||
+                   alist->parameter().type() == PanElevationAutomation ||
+                   alist->parameter().type() == PanWidthAutomation) {
                y = 1.0 - y;
        } else if (alist->parameter().type() == PluginAutomation) {
                y = y * (double)(alist->get_max_y()- alist->get_min_y()) + alist->get_min_y();
@@ -1223,7 +1221,9 @@ AutomationLine::model_to_view_coord (double& x, double& y) const
        if (alist->parameter().type() == GainAutomation ||
            alist->parameter().type() == EnvelopeAutomation) {
                y = gain_to_slider_position (y);
-       } else if (alist->parameter().type() == PanAutomation) {
+       } else if (alist->parameter().type() == PanAzimuthAutomation ||
+                   alist->parameter().type() == PanElevationAutomation ||
+                   alist->parameter().type() == PanWidthAutomation) {
                // vertical coordinate axis reversal
                y = 1.0 - y;
        } else if (alist->parameter().type() == PluginAutomation) {
@@ -1232,7 +1232,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 */
@@ -1333,9 +1333,14 @@ AutomationLine::memento_command_binder ()
  *  to the start of the track or region that it is on.
  */
 void
-AutomationLine::set_maximum_time (framepos_t t)
+AutomationLine::set_maximum_time (framecnt_t t)
 {
+       if (_maximum_time == t) {
+               return;
+       }
+
        _maximum_time = t;
+       reset ();
 }
 
 
@@ -1346,9 +1351,20 @@ AutomationLine::get_point_x_range () const
        pair<framepos_t, framepos_t> 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) + _time_converter.origin_b ());
-               r.second = max (r.second, _time_converter.to ((*i)->when) + _time_converter.origin_b ());
+               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 ();
+}