X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffloatauto.h;h=cc4168c46c824b60f526a136459d1742f155b1bc;hp=1051d3b8c88b1c0e03537b6f5e56febea3c0c7e8;hb=2e48b660e37eb5c661264d601211e16cb6cd6e89;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd diff --git a/cinelerra-5.1/cinelerra/floatauto.h b/cinelerra-5.1/cinelerra/floatauto.h index 1051d3b8..cc4168c4 100644 --- a/cinelerra-5.1/cinelerra/floatauto.h +++ b/cinelerra-5.1/cinelerra/floatauto.h @@ -2,21 +2,21 @@ /* * CINELERRA * Copyright (C) 2008 Adam Williams - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * */ #ifndef FLOATAUTO_H @@ -32,6 +32,7 @@ class FloatAuto; class FloatAuto : public Auto { + friend class FloatAutos; public: FloatAuto() {}; FloatAuto(EDL *edl, FloatAutos *autos); @@ -41,6 +42,7 @@ public: int operator==(Auto &that); int operator==(FloatAuto &that); int identical(FloatAuto *src); + int equals(FloatAuto *src); void copy_from(Auto *that); void copy_from(FloatAuto *that); int interpolate_from(Auto *a1, Auto *a2, int64_t pos, Auto *templ=0); // bezier interpolation @@ -51,9 +53,9 @@ public: float get_value() {return this->value;} void set_value(float newval); -// Possible policies to handle the tagents for the +// Possible policies to handle the tagents for the // bézier curves connecting adjacent automation points - enum t_mode + enum t_mode { SMOOTH, // curves are coupled in order to yield a smooth curve LINEAR, // curves always pointing directly to neighbouring automation points @@ -70,12 +72,12 @@ public: float get_control_out_value() {check_pos(); return this->control_out_value;} void set_control_in_value(float newval); void set_control_out_value(float newval); - -// get calculated x-position of control points for drawing, + +// get calculated x-position of control points for drawing, // relative to auto position, in native units of the track. int64_t get_control_in_position() {check_pos(); return this->control_in_position;} int64_t get_control_out_position() {check_pos(); return this->control_out_position;} - + // define new position and value, re-adjust ctrl point, notify neighbours void adjust_to_new_coordinates(int64_t position, float value); // text name for curve mode @@ -88,7 +90,7 @@ private: void calculate_slope(FloatAuto* a1, FloatAuto* a2, float& dvdx, float& dx); void check_pos() { if(position != pos_valid) adjust_ctrl_positions(); } void curve_dirty() { pos_valid=-1; } - void handle_automatic_curve_after_copy(); + void handle_automatic_curve_after_copy(); // Control values are relative to value float value, control_in_value, control_out_value;