X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Frumbler%2Frumbler.C;h=f76be44761bf0f0c979270d800c6dce0cd8496df;hb=1529091cdf16df199a901aabe6e8fa1813a933af;hp=20d0dc57a88680d6dc1960e885dd5de14474d5eb;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/plugins/rumbler/rumbler.C b/cinelerra-5.1/plugins/rumbler/rumbler.C
index 20d0dc57..f76be447 100644
--- a/cinelerra-5.1/plugins/rumbler/rumbler.C
+++ b/cinelerra-5.1/plugins/rumbler/rumbler.C
@@ -19,101 +19,17 @@
  *
  */
 
-#include "bcdisplayinfo.h"
-#include "affine.h"
-#include "clip.h"
-#include "bchash.h"
-#include "filexml.h"
-#include "guicast.h"
-#include "keyframe.h"
-#include "language.h"
-#include "pluginvclient.h"
-#include "vframe.h"
-
-#include <math.h>
-#include <string.h>
-#include <stdint.h>
-
-
-class Rumbler;
-class RumblerConfig;
-class RumblerRate;
-class RumblerSeq;
-class RumblerWindow;
-
-
-class RumblerConfig
-{
-public:
-	RumblerConfig();
-	float time_rumble, time_rate;
-	float space_rumble, space_rate;
-	int sequence;
-	void copy_from(RumblerConfig &that);
-	int equivalent(RumblerConfig &that);
-	void interpolate(RumblerConfig &prev, RumblerConfig &next,
-	        int64_t prev_frame, int64_t next_frame, int64_t current_frame);
-};
-
-class RumblerRate : public BC_TextBox
-{
-public:
-	RumblerRate(Rumbler *plugin, RumblerWindow *gui,
-		float &value, int x, int y);
-	int handle_event();
-	Rumbler *plugin;
-	RumblerWindow *gui;
-	float *value;
-};
-
-class RumblerSeq : public BC_TextBox
-{
-public:
-	RumblerSeq(Rumbler *plugin, RumblerWindow *gui,
-		int &value, int x, int y);
-	int handle_event();
-	Rumbler *plugin;
-	RumblerWindow *gui;
-	int *value;
-};
-
-
-class RumblerWindow : public PluginClientWindow
-{
-public:
-	RumblerWindow(Rumbler *plugin);
-	~RumblerWindow();
-	void create_objects();
-
-	Rumbler *plugin;
-	RumblerRate *time_rumble, *time_rate;
-	RumblerRate *space_rumble, *space_rate;
-	RumblerSeq *seq;
-};
-
-class Rumbler : public PluginVClient
-{
-public:
-	Rumbler(PluginServer *server);
-	~Rumbler();
+#include "rumbler.h"
 
-	PLUGIN_CLASS_MEMBERS(RumblerConfig)
 
-	int process_buffer(VFrame *frame, int64_t start_position, double frame_rate);
-	int is_realtime();
-	void save_data(KeyFrame *keyframe);
-	void read_data(KeyFrame *keyframe);
-	void update_gui();
-	int handle_opengl();
-	static double rumble(int64_t seq, double cur, double per, double amp);
-
-	VFrame *input, *output, *temp;
-	float x1,y1, x2,y2, x3,y3, x4,y4;
-	AffineEngine *engine;
-};
 
 
 RumblerConfig::RumblerConfig()
+{
+	reset();
+}
+
+void RumblerConfig::reset()
 {
 	time_rumble = 10;
 	time_rate = 1.;
@@ -153,7 +69,7 @@ void RumblerConfig::interpolate(RumblerConfig &prev, RumblerConfig &next,
 }
 
 RumblerWindow::RumblerWindow(Rumbler *plugin)
- : PluginClientWindow(plugin, 300, 120, 300, 120, 0)
+ : PluginClientWindow(plugin, xS(300), yS(150), xS(300), yS(150), 0)
 {
 	this->plugin = plugin;
 }
@@ -164,32 +80,46 @@ RumblerWindow::~RumblerWindow()
 
 void RumblerWindow::create_objects()
 {
-	int x = 10, x1 = x + 64, x2 =x1 + 100;
-	int y = 10;
+	int xs10 = xS(10), xs64 = xS(64), xs100 = xS(100);
+	int ys10 = yS(10), ys35 = yS(35);
+	int x = xs10, x1 = x + xs64, x2 = x1 + xs100;
+	int y = ys10;
 	BC_Title *title;
 
 	add_subwindow(title = new BC_Title(x1, y, _("rumble")));
 	add_subwindow(title = new BC_Title(x2, y, _("rate")));
-	y += title->get_h() + 10;
+	y += title->get_h() + ys10;
 	add_subwindow(title = new BC_Title(x, y, _("time:")));
 	add_subwindow(time_rumble = new RumblerRate(plugin, this, plugin->config.time_rumble, x1, y));
 	add_subwindow(time_rate = new RumblerRate(plugin, this, plugin->config.time_rate, x2, y));
-	y += title->get_h() + 10;
+	y += title->get_h() + ys10;
 	add_subwindow(title = new BC_Title(x, y, _("space:")));
 	add_subwindow(space_rumble = new RumblerRate(plugin, this, plugin->config.space_rumble, x1, y));
 	add_subwindow(space_rate = new RumblerRate(plugin, this, plugin->config.space_rate, x2, y));
-	y += title->get_h() + 10;
+	y += title->get_h() + ys10;
 	add_subwindow(title = new BC_Title(x, y, _("seq:")));
 	add_subwindow(seq = new RumblerSeq(plugin, this, plugin->config.sequence, x1, y));
+	y += ys35;
+	add_subwindow(reset = new RumblerReset(plugin, this, x, y));
 
 	show_window();
 	flush();
 }
 
+// for Reset button
+void RumblerWindow::update()
+{
+	time_rumble->update(plugin->config.time_rumble);
+	time_rate->update(plugin->config.time_rate);
+	space_rumble->update(plugin->config.space_rumble);
+	space_rate->update(plugin->config.space_rate);
+	seq->update((int64_t)(plugin->config.sequence));
+}
+
 
 RumblerRate::RumblerRate(Rumbler *plugin, RumblerWindow *gui,
 	float &value, int x, int y)
- : BC_TextBox(x, y, 90, 1, value)
+ : BC_TextBox(x, y, xS(90), 1, value)
 {
 	this->plugin = plugin;
 	this->value = &value;
@@ -205,7 +135,7 @@ int RumblerRate::handle_event()
 
 RumblerSeq::RumblerSeq(Rumbler *plugin, RumblerWindow *gui,
 	int &value, int x, int y)
- : BC_TextBox(x, y, 72, 1, value)
+ : BC_TextBox(x, y, xS(72), 1, value)
 {
 	this->plugin = plugin;
 	this->value = &value;
@@ -220,6 +150,24 @@ int RumblerSeq::handle_event()
 }
 
 
+RumblerReset::RumblerReset(Rumbler *plugin, RumblerWindow *gui, int x, int y)
+ : BC_GenericButton(x, y, _("Reset"))
+{
+	this->plugin = plugin;
+	this->gui = gui;
+}
+RumblerReset::~RumblerReset()
+{
+}
+int RumblerReset::handle_event()
+{
+	plugin->config.reset();
+	gui->update();
+	plugin->send_configure_change();
+	return 1;
+}
+
+
 REGISTER_PLUGIN(Rumbler)
 
 Rumbler::Rumbler(PluginServer *server)