X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Fgradient%2Fgradient.h;h=736e975af0b156ae1536d8b12e2b66512bcfdcc9;hb=e5d1c3ec8b49e9e4cd31f30e991f52ab11de93b1;hp=0aeb3655813a445d142329e36f7484018817ea49;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/plugins/gradient/gradient.h b/cinelerra-5.1/plugins/gradient/gradient.h index 0aeb3655..736e975a 100644 --- a/cinelerra-5.1/plugins/gradient/gradient.h +++ b/cinelerra-5.1/plugins/gradient/gradient.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 GRADIENT_H @@ -49,10 +49,10 @@ public: int equivalent(GradientConfig &that); void copy_from(GradientConfig &that); - void interpolate(GradientConfig &prev, - GradientConfig &next, - long prev_frame, - long next_frame, + void interpolate(GradientConfig &prev, + GradientConfig &next, + long prev_frame, + long next_frame, long current_frame); // Int to hex triplet conversion int get_in_color(); @@ -84,9 +84,9 @@ public: class GradientShape : public BC_PopupMenu { public: - GradientShape(GradientMain *plugin, + GradientShape(GradientMain *plugin, GradientWindow *gui, - int x, + int x, int y); void create_objects(); static char* to_text(int shape); @@ -100,8 +100,8 @@ public: class GradientRate : public BC_PopupMenu { public: - GradientRate(GradientMain *plugin, - int x, + GradientRate(GradientMain *plugin, + int x, int y); void create_objects(); static char* to_text(int shape); @@ -171,7 +171,7 @@ public: }; -class GradientInColorThread : public ColorThread +class GradientInColorThread : public ColorPicker { public: GradientInColorThread(GradientMain *plugin, GradientWindow *window); @@ -181,7 +181,7 @@ public: }; -class GradientOutColorThread : public ColorThread +class GradientOutColorThread : public ColorPicker { public: GradientOutColorThread(GradientMain *plugin, GradientWindow *window); @@ -197,11 +197,12 @@ class GradientWindow : public PluginClientWindow public: GradientWindow(GradientMain *plugin); ~GradientWindow(); - + void create_objects(); void update_in_color(); void update_out_color(); void update_shape(); + void done_event(int result); GradientMain *plugin; BC_Title *angle_title;