X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Fchromakey%2Fchromakey.h;h=8e1a1aafada53e5bb08dba57560de047c04f31e8;hb=9304882bd349ce15be054efb7cdcf69a0829f0f9;hp=4304da8d3527288d3860ee9f752a3484b08729c3;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/plugins/chromakey/chromakey.h b/cinelerra-5.1/plugins/chromakey/chromakey.h index 4304da8d..8e1a1aaf 100644 --- a/cinelerra-5.1/plugins/chromakey/chromakey.h +++ b/cinelerra-5.1/plugins/chromakey/chromakey.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 CHROMAKEY_H @@ -42,10 +42,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(); @@ -60,9 +60,9 @@ public: class ChromaKeyColor : public BC_GenericButton { public: - ChromaKeyColor(ChromaKey *plugin, - ChromaKeyWindow *gui, - int x, + ChromaKeyColor(ChromaKey *plugin, + ChromaKeyWindow *gui, + int x, int y); int handle_event(); @@ -103,7 +103,7 @@ public: }; -class ChromaKeyColorThread : public ColorThread +class ChromaKeyColorThread : public ColorPicker { public: ChromaKeyColorThread(ChromaKey *plugin, ChromaKeyWindow *gui); @@ -121,6 +121,7 @@ public: void create_objects(); void update_sample(); + void done_event(int result); ChromaKeyColor *color; ChromaKeyThreshold *threshold; @@ -169,7 +170,7 @@ class ChromaKey : public PluginVClient public: ChromaKey(PluginServer *server); ~ChromaKey(); - + PLUGIN_CLASS_MEMBERS(ChromaKeyConfig) int process_buffer(VFrame *frame, int64_t start_position,