[CinCV-commits] CinelerraCV.git (#1540) - master (branch) updated: v2.3-88-g9dc9b0f

git repository hosting git at cinelerra-cv.org
Sun Apr 24 18:41:41 CEST 2016


The branch, master has been updated
       via  9dc9b0f3ec4880ebc1d7e2cfc59b94d3233e80ae (commit)
      from  b672901711562259c76b1b02f100378703639840 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9dc9b0f3ec4880ebc1d7e2cfc59b94d3233e80ae
Author: Einar R√ľnkaru <einarrunkaru at gmail.com>
Date:   Wed Apr 20 18:11:18 2016 +0300

    Use PLUGIN_CLASS_MEMBERS macro in declarations of plugins
    
    Functions that are defined in macros should be declared
    in macros. Makes plugin api management simpler.

-----------------------------------------------------------------------

Summary of changes:
 plugins/C41/c41.C                       | 11 +----------
 plugins/aging/aging.C                   |  3 ++-
 plugins/aging/aging.h                   | 12 +-----------
 plugins/brightness/brightness.h         | 18 +-----------------
 plugins/burn/burn.C                     |  3 ++-
 plugins/burn/burn.h                     | 12 +-----------
 plugins/chromakey/chromakey.h           | 11 +----------
 plugins/chromakeyhsv/chromakey.h        | 10 +---------
 plugins/colorbalance/colorbalance.h     | 13 +------------
 plugins/decimate/decimate.C             | 11 +----------
 plugins/delayvideo/delayvideo.h         | 10 +---------
 plugins/denoisemjpeg/denoisemjpeg.h     | 10 +---------
 plugins/denoiseseltempavg/seltempavg.h  | 12 +-----------
 plugins/denoisevideo/denoisevideo.h     | 10 +---------
 plugins/despike/despike.h               | 15 +--------------
 plugins/dot/dot.C                       |  3 ++-
 plugins/dot/dot.h                       | 11 +----------
 plugins/freeverb/freeverb.C             | 15 +--------------
 plugins/huesaturation/huesaturation.C   | 10 +---------
 plugins/invertvideo/invert.C            | 10 +---------
 plugins/oilpainting/oil.C               | 10 +---------
 plugins/pitch/pitch.h                   | 15 +--------------
 plugins/polar/polar.C                   | 11 +----------
 plugins/reverb/reverb.h                 | 17 ++---------------
 plugins/rgb601/rgb601.C                 |  3 ++-
 plugins/rgb601/rgb601.h                 | 12 ++----------
 plugins/rotate/rotate.C                 | 11 +----------
 plugins/scale/scale.h                   | 12 +-----------
 plugins/sharpen/sharpen.h               | 13 +------------
 plugins/shiftinterlace/shiftinterlace.C | 13 +------------
 plugins/spectrogram/spectrogram.C       |  3 ++-
 plugins/spectrogram/spectrogram.h       | 10 +---------
 plugins/svg/svg.h                       | 13 +------------
 plugins/swapchannels/swapchannels.C     |  3 ++-
 plugins/swapchannels/swapchannels.h     | 10 +---------
 plugins/timeavg/timeavg.h               | 13 +------------
 plugins/timestretch/timestretch.h       | 18 +-----------------
 plugins/translate/translate.h           | 12 +-----------
 plugins/videoscope/videoscope.C         | 10 +---------
 plugins/wave/wave.C                     | 11 +----------
 plugins/whirl/whirl.C                   | 10 +---------
 plugins/yuv/yuv.C                       | 11 +----------
 42 files changed, 50 insertions(+), 401 deletions(-)

The diff of changes is:
diff --git a/plugins/C41/c41.C b/plugins/C41/c41.C
index 8ca6c60..bc449d2 100644
--- a/plugins/C41/c41.C
+++ b/plugins/C41/c41.C
@@ -134,28 +134,19 @@ public:
 			int64_t start_position,
 			double frame_rate);
 	int is_realtime();
-	const char* plugin_title();
-	VFrame* new_picon();
+	PLUGIN_CLASS_MEMBERS(C41Config, C41Thread)
 	int load_defaults();
 	int save_defaults();
 	void save_data(KeyFrame *keyframe);
 	void read_data(KeyFrame *keyframe);
 	void update_gui();
 	void render_gui(void* data);
-	int show_gui();
-	void raise_window();
-	int set_string();
-	int load_configuration();
 	float myLog2(float i) __attribute__ ((optimize(0)));
 	float myPow2(float i) __attribute__ ((optimize(0)));
 	float myPow(float a, float b);
 	double difftime_nano(timespec start, timespec end);
 
 	struct magic values;
-
-	C41Config config;
-	C41Thread *thread;
-	BC_Hash *defaults;
 };
 
 
diff --git a/plugins/aging/aging.C b/plugins/aging/aging.C
index 8c84438..8ef906b 100644
--- a/plugins/aging/aging.C
+++ b/plugins/aging/aging.C
@@ -98,8 +98,9 @@ int AgingMain::save_defaults()
 	return 0;
 }
 
-void AgingMain::load_configuration()
+int AgingMain::load_configuration()
 {
+	return 0;
 }
 
 
diff --git a/plugins/aging/aging.h b/plugins/aging/aging.h
index 8180fba..ba3958b 100644
--- a/plugins/aging/aging.h
+++ b/plugins/aging/aging.h
@@ -125,27 +125,17 @@ public:
 // required for all realtime plugins
 	int process_realtime(VFrame *input_ptr, VFrame *output_ptr);
 	int is_realtime();
-	const char* plugin_title();
-	int show_gui();
-	void raise_window();
-	int set_string();
-	void load_configuration();
 	void save_data(KeyFrame *keyframe);
 	void read_data(KeyFrame *keyframe);
 	
 	int load_defaults();
 	int save_defaults();
-	VFrame* new_picon();
-
 // a thread for the GUI
-	AgingThread *thread;
 	AgingServer *aging_server;
 	AgingClient *aging_client;
-	AgingConfig config;
-
-	BC_Hash *defaults;
 	AgingEngine **engine;
 	VFrame *input_ptr, *output_ptr;
+	PLUGIN_CLASS_MEMBERS(AgingConfig, AgingThread)
 };
 
 
diff --git a/plugins/brightness/brightness.h b/plugins/brightness/brightness.h
index a39242b..31363df 100644
--- a/plugins/brightness/brightness.h
+++ b/plugins/brightness/brightness.h
@@ -59,35 +59,19 @@ public:
 		int64_t start_position,
 		double frame_rate);
 	int is_realtime();
-	const char* plugin_title();
-	int show_gui();
-	void raise_window();
 	void update_gui();
-	int set_string();
-	int load_configuration();
 	void save_data(KeyFrame *keyframe);
 	void read_data(KeyFrame *keyframe);
 	int load_defaults();
 	int save_defaults();
-	VFrame* new_picon();
 	int handle_opengl();
 
-
-
-
-
-
-
-
-	BrightnessConfig config;
-// a thread for the GUI
-	BrightnessThread *thread;
 	BrightnessEngine *engine;
-	BC_Hash *defaults;
     int redo_buffers;
 	static YUV yuv;
 	
 	VFrame *input, *output;
+	PLUGIN_CLASS_MEMBERS(BrightnessConfig, BrightnessThread)
 };
 
 
diff --git a/plugins/burn/burn.C b/plugins/burn/burn.C
index 6204cc2..311eef9 100644
--- a/plugins/burn/burn.C
+++ b/plugins/burn/burn.C
@@ -96,9 +96,10 @@ int BurnMain::save_defaults()
 	return 0;
 }
 
-void BurnMain::load_configuration()
+int  BurnMain::load_configuration()
 {
 //printf("BurnMain::load_configuration %d\n", source_position);
+	return 0;
 }
 
 
diff --git a/plugins/burn/burn.h b/plugins/burn/burn.h
index 66cfbeb..5d3899f 100644
--- a/plugins/burn/burn.h
+++ b/plugins/burn/burn.h
@@ -81,17 +81,11 @@ public:
 // required for all realtime plugins
 	int process_realtime(VFrame *input_ptr, VFrame *output_ptr);
 	int is_realtime();
-	const char* plugin_title();
-	int show_gui();
-	void raise_window();
-	int set_string();
-	void load_configuration();
 	void save_data(KeyFrame *keyframe);
 	void read_data(KeyFrame *keyframe);
 	
 	int load_defaults();
 	int save_defaults();
-	VFrame* new_picon();
 
 
 
@@ -104,11 +98,7 @@ public:
 		int *b,
 		int color_model);
 	void make_palette(int color_model);
-
-// a thread for the GUI
-	BurnThread *thread;
 	BurnServer *burn_server;
-	BurnConfig config;
 
 	int palette[3][256];
 	unsigned char *buffer;
@@ -116,9 +106,9 @@ public:
 	int total;
 
 	EffectTV *effecttv;
-	BC_Hash *defaults;
 	VFrame *input_ptr, *output_ptr;
 	YUV *yuv;
+	PLUGIN_CLASS_MEMBERS(BurnConfig, BurnThread)
 };
 
 
diff --git a/plugins/chromakey/chromakey.h b/plugins/chromakey/chromakey.h
index 3e32dd5..3793779 100644
--- a/plugins/chromakey/chromakey.h
+++ b/plugins/chromakey/chromakey.h
@@ -176,23 +176,14 @@ public:
 		double frame_rate);
 	int handle_opengl();
 	int is_realtime();
-	const char* plugin_title();
-	VFrame* new_picon();
-	int load_configuration();
 	int load_defaults();
 	int save_defaults();
 	void save_data(KeyFrame *keyframe);
 	void read_data(KeyFrame *keyframe);
-	int show_gui();
-	int set_string();
-	void raise_window();
 	void update_gui();
-
-	ChromaKeyConfig config;
 	VFrame *input, *output;
 	ChromaKeyServer *engine;
-	ChromaKeyThread *thread;
-	BC_Hash *defaults;
+	PLUGIN_CLASS_MEMBERS(ChromaKeyConfig, ChromaKeyThread)
 };
 
 
diff --git a/plugins/chromakeyhsv/chromakey.h b/plugins/chromakeyhsv/chromakey.h
index 9436843..5396137 100644
--- a/plugins/chromakeyhsv/chromakey.h
+++ b/plugins/chromakeyhsv/chromakey.h
@@ -278,23 +278,15 @@ public:
 		double frame_rate);
 	int handle_opengl();
 	int is_realtime();
-	const char* plugin_title();
-	VFrame* new_picon();
-	int load_configuration();
 	int load_defaults();
 	int save_defaults();
 	void save_data(KeyFrame *keyframe);
 	void read_data(KeyFrame *keyframe);
-	int show_gui();
-	int set_string();
-	void raise_window();
 	void update_gui();
 
-	ChromaKeyConfig config;
 	VFrame *input, *output;
 	ChromaKeyServer *engine;
-	ChromaKeyThread *thread;
-	BC_Hash *defaults;
+	PLUGIN_CLASS_MEMBERS(ChromaKeyConfig, ChromaKeyThread)
 };
 
 
diff --git a/plugins/colorbalance/colorbalance.h b/plugins/colorbalance/colorbalance.h
index f0c6400..3f20b9c 100644
--- a/plugins/colorbalance/colorbalance.h
+++ b/plugins/colorbalance/colorbalance.h
@@ -86,22 +86,16 @@ public:
 		int64_t start_position,
 		double frame_rate);
 	int is_realtime();
-	const char* plugin_title();
-	int show_gui();
 	void update_gui();
-	void raise_window();
-	int set_string();
-	int load_configuration();
 	void save_data(KeyFrame *keyframe);
 	void read_data(KeyFrame *keyframe);
 	int load_defaults();
 	int save_defaults();
-	VFrame* new_picon();
 	int handle_opengl();
 
 	void get_aggregation(int *aggregate_interpolate,
 		int *aggregate_gamma);
-
+	PLUGIN_CLASS_MEMBERS(ColorBalanceConfig, ColorBalanceThread)
 
 	int64_t calculate_slider(float in);
 	float calculate_transfer(float in);
@@ -110,15 +104,10 @@ public:
 	int reconfigure();
     int synchronize_params(ColorBalanceSlider *slider, float difference);
     int test_boundary(float &value);
-
-	ColorBalanceConfig config;
-// a thread for the GUI
-	ColorBalanceThread *thread;
 	ColorBalanceEngine **engine;
 	int total_engines;
 
 
-	BC_Hash *defaults;
     int r_lookup_8[0x100];
     int g_lookup_8[0x100];
     int b_lookup_8[0x100];
diff --git a/plugins/decimate/decimate.C b/plugins/decimate/decimate.C
index 6d71d3c..f7535c2 100644
--- a/plugins/decimate/decimate.C
+++ b/plugins/decimate/decimate.C
@@ -137,16 +137,10 @@ public:
 		int64_t start_position,
 		double frame_rate);
 	int is_realtime();
-	const char* plugin_title();
-	VFrame* new_picon();
-	int show_gui();
-	int load_configuration();
-	int set_string();
 	int load_defaults();
 	int save_defaults();
 	void save_data(KeyFrame *keyframe);
 	void read_data(KeyFrame *keyframe);
-	void raise_window();
 	void update_gui();
 	void render_gui(void *data);
 
@@ -176,10 +170,7 @@ public:
 	double lookahead_rate;
 // Last requested position
 	int64_t last_position;
-
-	DecimateThread *thread;
-	DecimateConfig config;
-	BC_Hash *defaults;
+	PLUGIN_CLASS_MEMBERS(DecimateConfig, DecimateThread)
 };
 
 
diff --git a/plugins/delayvideo/delayvideo.h b/plugins/delayvideo/delayvideo.h
index 5f3150d..e010abc 100644
--- a/plugins/delayvideo/delayvideo.h
+++ b/plugins/delayvideo/delayvideo.h
@@ -96,19 +96,13 @@ public:
 	
 	int process_realtime(VFrame *input_ptr, VFrame *output_ptr);
 	int is_realtime();
-	const char* plugin_title();
-	int show_gui();
-	void raise_window();
-	int set_string();
 	void save_data(KeyFrame *keyframe);
 	void read_data(KeyFrame *keyframe);
-	VFrame* new_picon();
 	void reset();
 	void reconfigure();
 
 
 
-	int load_configuration();
 	int load_defaults();
 	int save_defaults();
 	void update_gui();
@@ -116,11 +110,9 @@ public:
 
 	int need_reconfigure;
 	int allocation;
-	DelayVideoConfig config;
-	DelayVideoThread *thread;
 	VFrame **buffer;
-	BC_Hash *defaults;
 	VFrame *input, *output;
+	PLUGIN_CLASS_MEMBERS(DelayVideoConfig, DelayVideoThread)
 };
 
 
diff --git a/plugins/denoisemjpeg/denoisemjpeg.h b/plugins/denoisemjpeg/denoisemjpeg.h
index 6873af4..ae0cd2c 100644
--- a/plugins/denoisemjpeg/denoisemjpeg.h
+++ b/plugins/denoisemjpeg/denoisemjpeg.h
@@ -187,22 +187,14 @@ public:
 
 	int process_realtime(VFrame *input, VFrame *output);
 	int is_realtime();
-	const char* plugin_title();
-	VFrame* new_picon();
-	int show_gui();
-	int load_configuration();
-	int set_string();
 	int load_defaults();
 	int save_defaults();
 	void save_data(KeyFrame *keyframe);
 	void read_data(KeyFrame *keyframe);
-	void raise_window();
 	void update_gui();
 
 	float *accumulation;
-	DenoiseMJPEGThread *thread;
-	DenoiseMJPEGConfig config;
-	BC_Hash *defaults;
+	PLUGIN_CLASS_MEMBERS(DenoiseMJPEGConfig, DenoiseMJPEGThread)
 };
 
 
diff --git a/plugins/denoiseseltempavg/seltempavg.h b/plugins/denoiseseltempavg/seltempavg.h
index 371e232..db9c5bd 100644
--- a/plugins/denoiseseltempavg/seltempavg.h
+++ b/plugins/denoiseseltempavg/seltempavg.h
@@ -77,17 +77,11 @@ public:
 // required for all realtime plugins
 	int process_buffer(VFrame *frame, int64_t start_position, double frame_rate);
 	int is_realtime();
-	const char* plugin_title();
-	VFrame* new_picon();
-	int show_gui();
-	int load_configuration();
-	int set_string();
 	int load_defaults();
 	int save_defaults();
 	void save_data(KeyFrame *keyframe);
 	void read_data(KeyFrame *keyframe);
 	int nextkeyframeisoffsetrestart(KeyFrame *keyframe);
-	void raise_window();
 	void update_gui();
 	void clear_accum(int w, int h, int color_model);
 	void subtract_accum(VFrame *frame);
@@ -108,16 +102,12 @@ public:
 	unsigned char *accumulation_sq;
 	unsigned char *accumulation_grey;
 
-// a thread for the GUI
-	SelTempAvgThread *thread;
-	SelTempAvgConfig config;
 	int history_size;
 // Starting frame of history in requested framerate
 	int64_t history_start;
 // When subtraction is disabled, this detects no change for paranoid mode.
 	int64_t prev_frame;
-
-	BC_Hash *defaults;
+	PLUGIN_CLASS_MEMBERS(SelTempAvgConfig, SelTempAvgThread)
 };
 
 
diff --git a/plugins/denoisevideo/denoisevideo.h b/plugins/denoisevideo/denoisevideo.h
index 6ecc4ba..b7358c4 100644
--- a/plugins/denoisevideo/denoisevideo.h
+++ b/plugins/denoisevideo/denoisevideo.h
@@ -110,22 +110,14 @@ public:
 
 	int process_realtime(VFrame *input, VFrame *output);
 	int is_realtime();
-	const char* plugin_title();
-	VFrame* new_picon();
-	int show_gui();
-	int load_configuration();
-	int set_string();
 	int load_defaults();
 	int save_defaults();
 	void save_data(KeyFrame *keyframe);
 	void read_data(KeyFrame *keyframe);
-	void raise_window();
 	void update_gui();
 
 	float *accumulation;
-	DenoiseVideoThread *thread;
-	DenoiseVideoConfig config;
-	BC_Hash *defaults;
+	PLUGIN_CLASS_MEMBERS(DenoiseVideoConfig, DenoiseVideoThread)
 };
 
 
diff --git a/plugins/despike/despike.h b/plugins/despike/despike.h
index 6548377..ed49e37 100644
--- a/plugins/despike/despike.h
+++ b/plugins/despike/despike.h
@@ -52,30 +52,17 @@ public:
 	~Despike();
 
 	void update_gui();
-	int load_configuration();
-	
-// data for despike
-	DespikeConfig config;
-	
 	DB db;
-
-	const char* plugin_title();
-	VFrame* new_picon();
 	int is_realtime();
 	int process_realtime(int64_t size, double *input_ptr, double *output_ptr);
-	int show_gui();
-	int set_string();
 	void save_data(KeyFrame *keyframe);
 	void read_data(KeyFrame *keyframe);
-	void raise_window();
 
 // non realtime support
 	int load_defaults();
 	int save_defaults();
-	BC_Hash *defaults;
-	
-	DespikeThread *thread;
 	double last_sample;
+	PLUGIN_CLASS_MEMBERS(DespikeConfig, DespikeThread)
 };
 
 #endif
diff --git a/plugins/dot/dot.C b/plugins/dot/dot.C
index 414f82c..b327958 100644
--- a/plugins/dot/dot.C
+++ b/plugins/dot/dot.C
@@ -102,8 +102,9 @@ int DotMain::save_defaults()
 	return 0;
 }
 
-void DotMain::load_configuration()
+int DotMain::load_configuration()
 {
+	return 0;
 }
 
 
diff --git a/plugins/dot/dot.h b/plugins/dot/dot.h
index a80755d..a8b1e1a 100644
--- a/plugins/dot/dot.h
+++ b/plugins/dot/dot.h
@@ -95,28 +95,18 @@ public:
 // required for all realtime plugins
 	int process_realtime(VFrame *input_ptr, VFrame *output_ptr);
 	int is_realtime();
-	const char* plugin_title();
-	int show_gui();
-	void raise_window();
-	int set_string();
-	void load_configuration();
 	void save_data(KeyFrame *keyframe);
 	void read_data(KeyFrame *keyframe);
 	
 	int load_defaults();
 	int save_defaults();
-	VFrame* new_picon();
 	void make_pattern();
 	void init_sampxy_table();
 	void reconfigure();
 
 // a thread for the GUI
-	DotThread *thread;
 	DotServer *dot_server;
 	DotClient *dot_client;
-	DotConfig config;
-
-	BC_Hash *defaults;
 	VFrame *input_ptr, *output_ptr;
 	int dots_width;
 	int dots_height;
@@ -126,6 +116,7 @@ public:
 	int *sampx, *sampy;
 	int need_reconfigure;
 	EffectTV *effecttv;
+	PLUGIN_CLASS_MEMBERS(DotConfig, DotThread)
 };
 
 
diff --git a/plugins/freeverb/freeverb.C b/plugins/freeverb/freeverb.C
index 2cb626c..e293615 100644
--- a/plugins/freeverb/freeverb.C
+++ b/plugins/freeverb/freeverb.C
@@ -155,34 +155,21 @@ class FreeverbEffect : public PluginAClient
 public:
 	FreeverbEffect(PluginServer *server);
 	~FreeverbEffect();
-
-	VFrame* new_picon();
-	const char* plugin_title();
-	int show_gui();
-	void raise_window();
-	int set_string();
 	int is_realtime();
 	int is_multichannel();
 	void read_data(KeyFrame *keyframe);
 	void save_data(KeyFrame *keyframe);
 	int process_realtime(int64_t size, double **input_ptr, double **output_ptr);
 
-
-
-
 	int load_defaults();
 	int save_defaults();
-	int load_configuration();
 	void update_gui();
 
-
-	BC_Hash *defaults;
-	FreeverbThread *thread;
-	FreeverbConfig config;
 	revmodel *engine;
 	float **temp;
 	float **temp_out;
 	int temp_allocated;
+	PLUGIN_CLASS_MEMBERS(FreeverbConfig, FreeverbThread)
 };
 
 
diff --git a/plugins/huesaturation/huesaturation.C b/plugins/huesaturation/huesaturation.C
index 66fcee9..9740d78 100644
--- a/plugins/huesaturation/huesaturation.C
+++ b/plugins/huesaturation/huesaturation.C
@@ -143,24 +143,16 @@ public:
 		int64_t start_position,
 		double frame_rate);
 	int is_realtime();
-	const char* plugin_title();
-	VFrame* new_picon();
-	int load_configuration();
 	int load_defaults();
 	int save_defaults();
 	void save_data(KeyFrame *keyframe);
 	void read_data(KeyFrame *keyframe);
-	int show_gui();
-	int set_string();
-	void raise_window();
 	void update_gui();
 	int handle_opengl();
 
-	HueConfig config;
 	VFrame *input, *output;
-	BC_Hash *defaults;
-	HueThread *thread;
 	HueEngine *engine;
+	PLUGIN_CLASS_MEMBERS(HueConfig, HueThread)
 };
 
 
diff --git a/plugins/invertvideo/invert.C b/plugins/invertvideo/invert.C
index 9b2d059..8e3a81b 100644
--- a/plugins/invertvideo/invert.C
+++ b/plugins/invertvideo/invert.C
@@ -84,22 +84,14 @@ public:
 		int64_t start_position,
 		double frame_rate);
 	int is_realtime();
-	const char* plugin_title();
-	VFrame* new_picon();
 	int load_defaults();
 	int save_defaults();
 	void save_data(KeyFrame *keyframe);
 	void read_data(KeyFrame *keyframe);
 	void update_gui();
-	int show_gui();
-	void raise_window();
-	int set_string();
-	int load_configuration();
 	int handle_opengl();
 
-	InvertVideoConfig config;
-	InvertVideoThread *thread;
-	BC_Hash *defaults;
+	PLUGIN_CLASS_MEMBERS(InvertVideoConfig, InvertVideoThread)
 };
 
 
diff --git a/plugins/oilpainting/oil.C b/plugins/oilpainting/oil.C
index 4f8fdd1..9192827 100644
--- a/plugins/oilpainting/oil.C
+++ b/plugins/oilpainting/oil.C
@@ -139,25 +139,17 @@ public:
 
 	int process_realtime(VFrame *input, VFrame *output);
 	int is_realtime();
-	const char* plugin_title();
-	VFrame* new_picon();
-	int load_configuration();
 	int load_defaults();
 	int save_defaults();
 	void save_data(KeyFrame *keyframe);
 	void read_data(KeyFrame *keyframe);
-	int show_gui();
-	int set_string();
-	void raise_window();
 	void update_gui();
 
-	OilConfig config;
 	VFrame *temp_frame;
 	VFrame *input, *output;
-	BC_Hash *defaults;
-	OilThread *thread;
 	OilServer *engine;
 	int need_reconfigure;
+	PLUGIN_CLASS_MEMBERS(OilConfig, OilThread)
 };
 
 
diff --git a/plugins/pitch/pitch.h b/plugins/pitch/pitch.h
index d141125..be3804d 100644
--- a/plugins/pitch/pitch.h
+++ b/plugins/pitch/pitch.h
@@ -99,8 +99,6 @@ public:
 	PitchEffect(PluginServer *server);
 	~PitchEffect();
 
-	VFrame* new_picon();
-	const char* plugin_title();
 	int is_realtime();
 	void read_data(KeyFrame *keyframe);
 	void save_data(KeyFrame *keyframe);
@@ -108,24 +106,13 @@ public:
 		double *buffer,
 		int64_t start_position,
 		int sample_rate);
-	int show_gui();
-	void raise_window();
-	int set_string();
-
-
-
-
 	int load_defaults();
 	int save_defaults();
-	int load_configuration();
 	void reset();
 	void update_gui();
 
-
-	BC_Hash *defaults;
-	PitchThread *thread;
 	PitchFFT *fft;
-	PitchConfig config;
+	PLUGIN_CLASS_MEMBERS(PitchConfig, PitchThread)
 };
 
 
diff --git a/plugins/polar/polar.C b/plugins/polar/polar.C
index 5619931..4e920d6 100644
--- a/plugins/polar/polar.C
+++ b/plugins/polar/polar.C
@@ -132,25 +132,16 @@ public:
 
 	int process_realtime(VFrame *input, VFrame *output);
 	int is_realtime();
-	const char* plugin_title();
-	VFrame* new_picon();
-	int load_configuration();
 	int load_defaults();
 	int save_defaults();
 	void save_data(KeyFrame *keyframe);
 	void read_data(KeyFrame *keyframe);
-	int show_gui();
-	int set_string();
-	void raise_window();
 	void update_gui();
-
-	PolarConfig config;
-	BC_Hash *defaults;
-	PolarThread *thread;
 	PolarEngine *engine;
 	VFrame *temp_frame;
 	VFrame *input, *output;
 	int need_reconfigure;
+	PLUGIN_CLASS_MEMBERS(PolarConfig, PolarThread)
 };
 
 
diff --git a/plugins/reverb/reverb.h b/plugins/reverb/reverb.h
index b11b84e..6824ce5 100644
--- a/plugins/reverb/reverb.h
+++ b/plugins/reverb/reverb.h
@@ -61,11 +61,6 @@ public:
 	void update_gui();
 	int load_from_file(char *data);
 	int save_to_file(char *data);
-	int load_configuration();
-	
-// data for reverb
-	ReverbConfig config;
-	
 	char config_directory[1024];
 
 	double **main_in, **main_out;
@@ -77,28 +72,20 @@ public:
 // skirts for lowpass filter
 	double **lowpass_in1, **lowpass_in2;
 	DB db;
-// required for all realtime/multichannel plugins
 
 	int process_realtime(int64_t size, double **input_ptr, double **output_ptr);
 	int is_realtime();
 	int is_synthesis();
 	int is_multichannel();
-	const char* plugin_title();
-	int show_gui();
-	int set_string();
 	void save_data(KeyFrame *keyframe);
 	void read_data(KeyFrame *keyframe);
-	void raise_window();
-	VFrame* new_picon();
-
 // non realtime support
 	int load_defaults();
 	int save_defaults();
-	BC_Hash *defaults;
-	
-	ReverbThread *thread;
+
 	ReverbEngine **engine;
 	int initialized;
+	PLUGIN_CLASS_MEMBERS(ReverbConfig, ReverbThread)
 };
 
 class ReverbEngine : public Thread
diff --git a/plugins/rgb601/rgb601.C b/plugins/rgb601/rgb601.C
index 5cbe03a..e59ed3d 100644
--- a/plugins/rgb601/rgb601.C
+++ b/plugins/rgb601/rgb601.C
@@ -97,13 +97,14 @@ int RGB601Main::save_defaults()
 	return 0;
 }
 
-void RGB601Main::load_configuration()
+int RGB601Main::load_configuration()
 {
 	KeyFrame *prev_keyframe;
 
 	prev_keyframe = get_prev_keyframe(get_source_position());
 // Must also switch between interpolation between keyframes and using first keyframe
 	read_data(prev_keyframe);
+	return 0;
 }
 
 
diff --git a/plugins/rgb601/rgb601.h b/plugins/rgb601/rgb601.h
index 878e8fb..2d5bed2 100644
--- a/plugins/rgb601/rgb601.h
+++ b/plugins/rgb601/rgb601.h
@@ -53,25 +53,17 @@ public:
 		int64_t start_position,
 		double frame_rate);
 	int is_realtime();
-	const char* plugin_title();
-	int show_gui();
 	void update_gui();
-	void raise_window();
-	int set_string();
-	void load_configuration();
 	void save_data(KeyFrame *keyframe);
 	void read_data(KeyFrame *keyframe);
 	int load_defaults();
 	int save_defaults();
-	VFrame* new_picon();
 	int handle_opengl();
 
 	void create_table(VFrame *input_ptr);
 	void process(int *table, VFrame *input_ptr, VFrame *output_ptr);
-	
-	RGB601Thread *thread;
-	RGB601Config config;
-	BC_Hash *defaults;
+
+	PLUGIN_CLASS_MEMBERS(RGB601Config, RGB601Thread)
 	int forward_table[0x10000], reverse_table[0x10000];
 };
 
diff --git a/plugins/rotate/rotate.C b/plugins/rotate/rotate.C
index c3eab6c..b731500 100644
--- a/plugins/rotate/rotate.C
+++ b/plugins/rotate/rotate.C
@@ -192,24 +192,15 @@ public:
 		int64_t start_position,
 		double frame_rate);
 	int is_realtime();
-	const char* plugin_title();
-	VFrame* new_picon();
-	int show_gui();
-	void raise_window();
 	void update_gui();
-	int set_string();
-	int load_configuration();
 	int load_defaults();
 	int save_defaults();
 	void save_data(KeyFrame *keyframe);
 	void read_data(KeyFrame *keyframe);
 	int handle_opengl();
-
-	RotateConfig config;
 	AffineEngine *engine;
-	RotateThread *thread;
-	BC_Hash *defaults;
 	int need_reconfigure;
+	PLUGIN_CLASS_MEMBERS(RotateConfig, RotateThread)
 };
 
 
diff --git a/plugins/scale/scale.h b/plugins/scale/scale.h
index bb9f597..7a8641f 100644
--- a/plugins/scale/scale.h
+++ b/plugins/scale/scale.h
@@ -126,24 +126,14 @@ public:
 		float &out_y2);
 	int handle_opengl();
 	int is_realtime();
-	const char* plugin_title();
-	int show_gui();
-	void raise_window();
-	int set_string();
 	void update_gui();
 	void save_data(KeyFrame *keyframe);
 	void read_data(KeyFrame *keyframe);
-	VFrame* new_picon();
 	int load_defaults();
 	int save_defaults();
-	int load_configuration();
-
-// a thread for the GUI
-	ScaleThread *thread;
 
 	OverlayFrame *overlayer;   // To scale images
-	BC_Hash *defaults;
-	ScaleConfig config;
+	PLUGIN_CLASS_MEMBERS(ScaleConfig, ScaleThread)
 };
 
 
diff --git a/plugins/sharpen/sharpen.h b/plugins/sharpen/sharpen.h
index 7bd8f3f..62f7754 100644
--- a/plugins/sharpen/sharpen.h
+++ b/plugins/sharpen/sharpen.h
@@ -67,30 +67,19 @@ public:
 // required for all realtime plugins
 	int process_realtime(VFrame *input_ptr, VFrame *output_ptr);
 	int is_realtime();
-	const char* plugin_title();
-	int show_gui();
-	void raise_window();
-	int set_string();
 	void update_gui();
-	int load_configuration();
 	void save_data(KeyFrame *keyframe);
 	void read_data(KeyFrame *keyframe);
 	int load_defaults();
 	int save_defaults();
-	VFrame* new_picon();
-
 // parameters needed for sharpness
 	int row_step;
-
-// a thread for the GUI
-	SharpenThread *thread;
 	int pos_lut[0x10000], neg_lut[0x10000];
-	SharpenConfig config;
 	VFrame *output, *input;
+	PLUGIN_CLASS_MEMBERS(SharpenConfig, SharpenThread)
 
 private:
 	int get_luts(int *pos_lut, int *neg_lut, int color_model);
-	BC_Hash *defaults;
 	SharpenEngine **engine;
 	int total_engines;
 };
diff --git a/plugins/shiftinterlace/shiftinterlace.C b/plugins/shiftinterlace/shiftinterlace.C
index 299f867..8b01665 100644
--- a/plugins/shiftinterlace/shiftinterlace.C
+++ b/plugins/shiftinterlace/shiftinterlace.C
@@ -106,15 +106,9 @@ public:
 // required for all realtime plugins
 	int process_realtime(VFrame *input_ptr, VFrame *output_ptr);
 	int is_realtime();
-	const char* plugin_title();
-	VFrame* new_picon();
-	int show_gui();
-	void raise_window();
 	void update_gui();
-	int set_string();
 	void save_data(KeyFrame *keyframe);
 	void read_data(KeyFrame *keyframe);
-	int load_configuration();
 	int load_defaults();
 	int save_defaults();
 
@@ -124,12 +118,7 @@ public:
 		int offset,
 		int row);
 
-
-
-
-	ShiftInterlaceConfig config;
-	ShiftInterlaceThread *thread;
-	BC_Hash *defaults;
+	PLUGIN_CLASS_MEMBERS(ShiftInterlaceConfig, ShiftInterlaceThread)
 };
 
 
diff --git a/plugins/spectrogram/spectrogram.C b/plugins/spectrogram/spectrogram.C
index 6190938..35f5c07 100644
--- a/plugins/spectrogram/spectrogram.C
+++ b/plugins/spectrogram/spectrogram.C
@@ -330,12 +330,13 @@ void Spectrogram::render_gui(void *data, int size)
 	}
 }
 
-void Spectrogram::load_configuration()
+int Spectrogram::load_configuration()
 {
 	KeyFrame *prev_keyframe;
 	prev_keyframe = get_prev_keyframe(get_source_position());
 
  	read_data(prev_keyframe);
+	return 0;
 }
 
 void Spectrogram::read_data(KeyFrame *keyframe)
diff --git a/plugins/spectrogram/spectrogram.h b/plugins/spectrogram/spectrogram.h
index 30b8e5d..5d840d0 100644
--- a/plugins/spectrogram/spectrogram.h
+++ b/plugins/spectrogram/spectrogram.h
@@ -101,17 +101,11 @@ public:
 	Spectrogram(PluginServer *server);
 	~Spectrogram();
 	
-	VFrame* new_picon();
-	const char* plugin_title();
 	int is_realtime();
 	int process_buffer(int64_t size, 
 		double *buffer,
 		int64_t start_position,
 		int sample_rate);
-	int show_gui();
-	void raise_window();
-	int set_string();
-	void load_configuration();
 	int load_defaults();
 	int save_defaults();
 	void read_data(KeyFrame *keyframe);
@@ -124,12 +118,10 @@ public:
 	int done;
 
 	int need_reconfigure;
-	BC_Hash *defaults;
-	SpectrogramConfig config;
-	SpectrogramThread *thread;
 	SpectrogramFFT *fft;
 	float *data;
 	int total_windows;
+	PLUGIN_CLASS_MEMBERS(SpectrogramConfig, SpectrogramThread)
 };
 
 
diff --git a/plugins/svg/svg.h b/plugins/svg/svg.h
index 9c4fe71..0f61328 100644
--- a/plugins/svg/svg.h
+++ b/plugins/svg/svg.h
@@ -62,27 +62,16 @@ public:
 	int process_realtime(VFrame *input_ptr, VFrame *output_ptr);
 	int is_realtime();
 	int is_synthesis();
-	const char* plugin_title();
-	int show_gui();
-	void raise_window();
 	void update_gui();
-	int set_string();
 	void save_data(KeyFrame *keyframe);
 	void read_data(KeyFrame *keyframe);
-	VFrame* new_picon();
 	int load_defaults();
 	int save_defaults();
-	int load_configuration();
-
-// a thread for the GUI
-	SvgThread *thread;
-
 	OverlayFrame *overlayer;   // To translate images
 	VFrame *temp_frame;        // Used if buffers are the same
-	BC_Hash *defaults;
-	SvgConfig config;
 	int need_reconfigure;
 	int force_raw_render;     //force rendering of PNG on first start
+	PLUGIN_CLASS_MEMBERS(SvgConfig, SvgThread)
 };
 
 
diff --git a/plugins/swapchannels/swapchannels.C b/plugins/swapchannels/swapchannels.C
index 95eafe1..9827a1f 100644
--- a/plugins/swapchannels/swapchannels.C
+++ b/plugins/swapchannels/swapchannels.C
@@ -304,12 +304,13 @@ void SwapMain::update_gui()
 }
 
 
-void SwapMain::load_configuration()
+int SwapMain::load_configuration()
 {
 	KeyFrame *prev_keyframe;
 	prev_keyframe = get_prev_keyframe(get_source_position());
 	
  	read_data(prev_keyframe);
+	return 0;
 }
 
 
diff --git a/plugins/swapchannels/swapchannels.h b/plugins/swapchannels/swapchannels.h
index 2139f4c..b121693 100644
--- a/plugins/swapchannels/swapchannels.h
+++ b/plugins/swapchannels/swapchannels.h
@@ -117,12 +117,7 @@ public:
 	int process_realtime(VFrame *input_ptr, VFrame *output_ptr);
 	int is_realtime();
 	int is_synthesis();
-	const char* plugin_title();
-	VFrame* new_picon();
-	int show_gui();
-	void raise_window();
 	void update_gui();
-	int set_string();
 	void save_data(KeyFrame *keyframe);
 	void read_data(KeyFrame *keyframe);
 
@@ -133,7 +128,6 @@ public:
 
 
 	void reset();
-	void load_configuration();
 	int load_defaults();
 	int save_defaults();
 
@@ -145,9 +139,7 @@ public:
 	int text_to_output(char *text);
 
 	VFrame *temp;
-	SwapConfig config;
-	SwapThread *thread;
-	BC_Hash *defaults;
+	PLUGIN_CLASS_MEMBERS(SwapConfig, SwapThread)
 };
 
 
diff --git a/plugins/timeavg/timeavg.h b/plugins/timeavg/timeavg.h
index c441fea..dae7dd2 100644
--- a/plugins/timeavg/timeavg.h
+++ b/plugins/timeavg/timeavg.h
@@ -60,16 +60,10 @@ public:
 		int64_t start_position,
 		double frame_rate);
 	int is_realtime();
-	const char* plugin_title();
-	VFrame* new_picon();
-	int show_gui();
-	int load_configuration();
-	int set_string();
 	int load_defaults();
 	int save_defaults();
 	void save_data(KeyFrame *keyframe);
 	void read_data(KeyFrame *keyframe);
-	void raise_window();
 	void update_gui();
 	void clear_accum(int w, int h, int color_model);
 	void subtract_accum(VFrame *frame);
@@ -82,17 +76,12 @@ public:
 	int64_t *history_frame;
 	int *history_valid;
 	unsigned char *accumulation;
-
-// a thread for the GUI
-	TimeAvgThread *thread;
-	TimeAvgConfig config;
 	int history_size;
 // Starting frame of history in requested framerate
 	int64_t history_start;
 // When subtraction is disabled, this detects no change for paranoid mode.
 	int64_t prev_frame;
-
-	BC_Hash *defaults;
+	PLUGIN_CLASS_MEMBERS(TimeAvgConfig, TimeAvgThread)
 };
 
 
diff --git a/plugins/timestretch/timestretch.h b/plugins/timestretch/timestretch.h
index e85244e..e5a2183 100644
--- a/plugins/timestretch/timestretch.h
+++ b/plugins/timestretch/timestretch.h
@@ -117,9 +117,6 @@ public:
 	TimeStretch(PluginServer *server);
 	~TimeStretch();
 	
-	
-	VFrame* new_picon();
-	const char* plugin_title();
 	int is_realtime();
 	int get_parameters();
 	void read_data(KeyFrame *keyframe);
@@ -130,19 +127,10 @@ public:
 		int64_t start_position,
 		int sample_rate);
 
-
-	int show_gui();
-	void raise_window();
-	int set_string();
-
-	
-	int load_configuration();
 	int load_defaults();
 	int save_defaults();
-	
 	void update_gui();
 	
-	
 
 	PitchEngine *pitch;
 	Resample *resample;
@@ -152,11 +140,7 @@ public:
 	int input_allocated;
 
 	TimeStretchEngine *stretch;
-
-	BC_Hash *defaults;
-	TimeStretchConfig config;
-	TimeStretchThread *thread;
-
+	PLUGIN_CLASS_MEMBERS(TimeStretchConfig, TimeStretchThread)
 };
 
 
diff --git a/plugins/translate/translate.h b/plugins/translate/translate.h
index 3871dd3..d87b356 100644
--- a/plugins/translate/translate.h
+++ b/plugins/translate/translate.h
@@ -57,25 +57,15 @@ public:
 // required for all realtime plugins
 	int process_realtime(VFrame *input_ptr, VFrame *output_ptr);
 	int is_realtime();
-	const char* plugin_title();
-	int show_gui();
-	void raise_window();
 	void update_gui();
-	int set_string();
 	void save_data(KeyFrame *keyframe);
 	void read_data(KeyFrame *keyframe);
-	VFrame* new_picon();
 	int load_defaults();
 	int save_defaults();
-	int load_configuration();
-
-// a thread for the GUI
-	TranslateThread *thread;
 
 	OverlayFrame *overlayer;   // To translate images
 	VFrame *temp_frame;        // Used if buffers are the same
-	BC_Hash *defaults;
-	TranslateConfig config;
+	PLUGIN_CLASS_MEMBERS(TranslateConfig, TranslateThread)
 };
 
 
diff --git a/plugins/videoscope/videoscope.C b/plugins/videoscope/videoscope.C
index 46eca0c..ca7c498 100644
--- a/plugins/videoscope/videoscope.C
+++ b/plugins/videoscope/videoscope.C
@@ -272,23 +272,15 @@ public:
 
 	int process_realtime(VFrame *input, VFrame *output);
 	int is_realtime();
-	const char* plugin_title();
-	VFrame* new_picon();
 	int load_defaults();
 	int save_defaults();
 	void save_data(KeyFrame *keyframe);
 	void read_data(KeyFrame *keyframe);
-	int show_gui();
-	int set_string();
-	void raise_window();
 	void render_gui(void *input);
-	int load_configuration();
 
 	VFrame *input;
-	VideoScopeConfig config;
 	VideoScopeEngine *engine;
-	BC_Hash *defaults;
-	VideoScopeThread *thread;
+	PLUGIN_CLASS_MEMBERS(VideoScopeConfig, VideoScopeThread)
 };
 
 
diff --git a/plugins/wave/wave.C b/plugins/wave/wave.C
index 6a5ff46..f8c1e9c 100644
--- a/plugins/wave/wave.C
+++ b/plugins/wave/wave.C
@@ -189,24 +189,15 @@ public:
 
 	int process_realtime(VFrame *input, VFrame *output);
 	int is_realtime();
-	const char* plugin_title();
-	VFrame* new_picon();
-	int load_configuration();
 	int load_defaults();
 	int save_defaults();
 	void save_data(KeyFrame *keyframe);
 	void read_data(KeyFrame *keyframe);
-	int show_gui();
-	int set_string();
-	void raise_window();
 	void update_gui();
-
-	WaveConfig config;
 	VFrame *temp_frame;
 	VFrame *input, *output;
-	BC_Hash *defaults;
-	WaveThread *thread;
 	WaveServer *engine;
+	PLUGIN_CLASS_MEMBERS(WaveConfig, WaveThread)
 };
 
 
diff --git a/plugins/whirl/whirl.C b/plugins/whirl/whirl.C
index 94db08a..cd7e266 100644
--- a/plugins/whirl/whirl.C
+++ b/plugins/whirl/whirl.C
@@ -149,13 +149,7 @@ public:
 
 	int process_realtime(VFrame *input, VFrame *output);
 	int is_realtime();
-	const char* plugin_title();
-	VFrame* new_picon();
-	int show_gui();
-	void raise_window();
 	void update_gui();
-	int set_string();
-	int load_configuration();
 	int load_defaults();
 	int save_defaults();
 	void save_data(KeyFrame *keyframe);
@@ -164,10 +158,8 @@ public:
 	WhirlEngine *engine;
 	VFrame *temp_frame;
 	VFrame *input, *output;
-	WhirlConfig config;
-	BC_Hash *defaults;
-	WhirlThread *thread;
 	int need_reconfigure;
+	PLUGIN_CLASS_MEMBERS(WhirlConfig, WhirlThread)
 };
 
 
diff --git a/plugins/yuv/yuv.C b/plugins/yuv/yuv.C
index f021cdf..faac7d0 100644
--- a/plugins/yuv/yuv.C
+++ b/plugins/yuv/yuv.C
@@ -81,21 +81,12 @@ public:
 	~YUVEffect();
 	int process_realtime(VFrame *input, VFrame *output);
 	int is_realtime();
-	const char* plugin_title();
-	VFrame* new_picon();
 	int load_defaults();
 	int save_defaults();
 	void save_data(KeyFrame *keyframe);
 	void read_data(KeyFrame *keyframe);
 	void update_gui();
-	int show_gui();
-	void raise_window();
-	int set_string();
-	int load_configuration();
-
-	YUVConfig config;
-	YUVThread *thread;
-	BC_Hash *defaults;
+	PLUGIN_CLASS_MEMBERS(YUVConfig, YUVThread)
 };
 
 


hooks/post-receive
-- 
CinelerraCV.git (CinelerraCV)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CinelerraCV.git" (CinelerraCV).



More information about the cinelerra-commits mailing list