X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Faging%2Faging.h;h=534beb805c1cd8fc957cd9fb2bc6177809d3f6d3;hb=6853a2c0b04cc5ff4e87a2022c914227f925cb7f;hp=faee988f5a4a8538d9f3cd4fba4b59b5387bd024;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/plugins/aging/aging.h b/cinelerra-5.1/plugins/aging/aging.h
index faee988f..534beb80 100644
--- a/cinelerra-5.1/plugins/aging/aging.h
+++ b/cinelerra-5.1/plugins/aging/aging.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 AGING_H
@@ -34,35 +34,23 @@ class AgingEngine;
 
 #define SCRATCH_MAX 20
 
-
-typedef struct _scratch
-{
-	int life;
-	int x;
-	int dx;
-	int init;
-} scratch_t;
-
 class AgingConfig
 {
 public:
 	AgingConfig();
+	~AgingConfig();
+
+	void reset();
+	int equivalent(AgingConfig &that);
+	void copy_from(AgingConfig &that);
+	void interpolate(AgingConfig &prev, AgingConfig &next,
+		int64_t prev_frame, int64_t next_frame, int64_t current_frame);
 
 	int area_scale;
 	int aging_mode;
-	scratch_t scratches[SCRATCH_MAX];
-
-	static int dx[8];
-	static int dy[8];
 	int dust_interval;
-
-
 	int pits_interval;
-	
 	int scratch_lines;
-	int pit_count;
-	int dust_count;
-	
 	int colorage;
 	int scratch;
 	int pits;
@@ -81,7 +69,7 @@ class AgingServer : public LoadServer
 {
 public:
 	AgingServer(AgingMain *plugin, int total_clients, int total_packages);
-	
+
 	LoadClient* new_client();
 	LoadPackage* new_package();
 	void init_packages();
@@ -92,29 +80,27 @@ class AgingClient : public LoadClient
 {
 public:
 	AgingClient(AgingServer *server);
-	
-	void coloraging(unsigned char **output_ptr, 
-		unsigned char **input_ptr,
-		int color_model,
-		int w,
-		int h);
+
+	void coloraging(unsigned char **output_ptr, unsigned char **input_ptr,
+			int color_model, int w, int h);
 	void scratching(unsigned char **output_ptr,
-		int color_model,
-		int w,
-		int h);
+			int color_model, int w, int h);
 	void pits(unsigned char **output_ptr,
-		int color_model,
-		int w,
-		int h);
+			int color_model, int w, int h);
 	void dusts(unsigned char **output_ptr,
-		int color_model,
-		int w,
-		int h);
+			int color_model, int w, int h);
 	void process_package(LoadPackage *package);
 
 	AgingMain *plugin;
 };
 
+typedef struct _scratch {
+	int life;
+	int x;
+	int dx;
+	int init;
+} scratch_t;
+
 
 class AgingMain : public PluginVClient
 {
@@ -128,15 +114,16 @@ public:
 	int is_realtime();
 	void save_data(KeyFrame *keyframe);
 	void read_data(KeyFrame *keyframe);
-	
-	int load_defaults();
-	int save_defaults();
 
 	AgingServer *aging_server;
 	AgingClient *aging_client;
 
 	AgingEngine **engine;
 	VFrame *input_ptr, *output_ptr;
+
+	int pits_count, dust_count;
+	scratch_t scratches[SCRATCH_MAX];
+	static int dx[8], dy[8];
 };