X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Fchromakeyhsv%2Fchromakey.h;h=68fd8b3b2f2df146860d857a320e4929e4476da1;hb=5e3715ec449272335bab3419bf21ed4cd6d4bcbf;hp=01da1824a072c42cbd0fbfc5aed5c8914951a361;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/plugins/chromakeyhsv/chromakey.h b/cinelerra-5.1/plugins/chromakeyhsv/chromakey.h
index 01da1824..68fd8b3b 100644
--- a/cinelerra-5.1/plugins/chromakeyhsv/chromakey.h
+++ b/cinelerra-5.1/plugins/chromakeyhsv/chromakey.h
@@ -2,21 +2,21 @@
 /*
  * CINELERRA
  * Copyright (C) 2008 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 CHROMAKEY_H
@@ -48,10 +48,10 @@ public:
 
 	void copy_from(ChromaKeyConfig &src);
 	int equivalent(ChromaKeyConfig &src);
-	void interpolate(ChromaKeyConfig &prev, 
-		ChromaKeyConfig &next, 
-		int64_t prev_frame, 
-		int64_t next_frame, 
+	void interpolate(ChromaKeyConfig &prev,
+		ChromaKeyConfig &next,
+		int64_t prev_frame,
+		int64_t next_frame,
 		int64_t current_frame);
 	int get_color();
 
@@ -79,9 +79,9 @@ public:
 class ChromaKeyColor : public BC_GenericButton
 {
 public:
-	ChromaKeyColor(ChromaKeyHSV *plugin, 
-		ChromaKeyWindow *gui, 
-		int x, 
+	ChromaKeyColor(ChromaKeyHSV *plugin,
+		ChromaKeyWindow *gui,
+		int x,
 		int y);
 
 	int handle_event();
@@ -182,7 +182,7 @@ public:
 };
 
 
-class ChromaKeyColorThread : public ColorThread
+class ChromaKeyColorThread : public ColorPicker
 {
 public:
 	ChromaKeyColorThread(ChromaKeyHSV *plugin, ChromaKeyWindow *gui);
@@ -209,6 +209,7 @@ public:
 
 	void create_objects();
 	void update_sample();
+	void done_event(int result);
 
 	ChromaKeyColor *color;
 	ChromaKeyUseColorPicker *use_colorpicker;
@@ -271,7 +272,7 @@ class ChromaKeyHSV : public PluginVClient
 public:
 	ChromaKeyHSV(PluginServer *server);
 	~ChromaKeyHSV();
-	
+
 	PLUGIN_CLASS_MEMBERS(ChromaKeyConfig);
 	int process_buffer(VFrame *frame,
 		int64_t start_position,