fix ruler, cwdw info popup updates, reset camera/projector shortcuts, findobj tweak...

[goodguy/history.git] / cinelerra-5.1 / plugins / color3way / color3way.h

diff --git a/cinelerra-5.1/plugins/color3way/color3way.h b/cinelerra-5.1/plugins/color3way/color3way.h
index ba373bcd5a60c2f08f386340f5cb06fccc8fff04..17f1a08f83a546898a9cf1691f5a57254050825d 100644 (file)
--- a/cinelerra-5.1/plugins/color3way/color3way.h
+++ b/cinelerra-5.1/plugins/color3way/color3way.h
@@ -2,21 +2,21 @@
 /*
  * CINELERRA
  * Copyright (C) 1997-2011 Adam Williams <broadcast at earthling dot net>
- * 
+ *
  * 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 COLOR3WAY_H
@@ -34,7 +34,7 @@ class Color3WayEngine;
 
 #include "color3waywindow.h"
 #include "condition.h"
-#include "cicolors.h"
+#include "bccolors.h"
 #include "guicast.h"
 #include "loadbalance.h"
 #include "pluginvclient.h"
@@ -48,10 +48,10 @@ public:
 
        int equivalent(Color3WayConfig &that);
        void copy_from(Color3WayConfig &that);
-       void interpolate(Color3WayConfig &prev, 
-               Color3WayConfig &next, 
-               int64_t prev_frame, 
-               int64_t next_frame, 
+       void interpolate(Color3WayConfig &prev,
+               Color3WayConfig &next,
+               int64_t prev_frame,
+               int64_t next_frame,
                int64_t current_frame);
        void boundaries();
        void copy_to_all(int section);
@@ -80,7 +80,6 @@ public:
        Color3WayUnit(Color3WayMain *plugin, Color3WayEngine *server);
        void process_package(LoadPackage *package);
        Color3WayMain *plugin;
-       YUV yuv;
 };
 
 class Color3WayEngine : public LoadServer
@@ -112,7 +111,6 @@ public:
        void update_gui();
        void save_data(KeyFrame *keyframe);
        void read_data(KeyFrame *keyframe);
-       int handle_opengl();
 
        void get_aggregation(int *aggregate_interpolate,
                int *aggregate_gamma);
@@ -122,8 +120,8 @@ public:
        void process_pixel(float *r,
                float *g,
                float *b,
-               float r_in, 
-               float g_in, 
+               float r_in,
+               float g_in,
                float b_in,
                float x,
                float y);