From 94af19d7d4d4abc03aca6586d81ef8a4442ddce7 Mon Sep 17 00:00:00 2001
From: "[d.j.a.y] Jerome Blanchi" <d.j.a.y@free.fr>
Date: Fri, 29 Jul 2016 10:35:07 +0200
Subject: [PATCH] Libvje / refactor : water

* rippletv.h ---> water.h
---
 .../veejay-server/libvje/effects/water.c        | 17 ++++++-----------
 .../libvje/effects/{rippletv.h => water.h}      | 13 +++++++------
 veejay-current/veejay-server/libvje/internal.h  |  4 ++--
 veejay-current/veejay-server/libvje/vj-effect.c |  2 +-
 veejay-current/veejay-server/libvje/vj-effman.c |  2 +-
 5 files changed, 17 insertions(+), 21 deletions(-)
 rename veejay-current/veejay-server/libvje/effects/{rippletv.h => water.h} (77%)

diff --git a/veejay-current/veejay-server/libvje/effects/water.c b/veejay-current/veejay-server/libvje/effects/water.c
index 84094f79..8b23ec4e 100644
--- a/veejay-current/veejay-server/libvje/effects/water.c
+++ b/veejay-current/veejay-server/libvje/effects/water.c
@@ -22,20 +22,14 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307 , USA.
  */
 
-
-#include <config.h>
-#include <stdlib.h>
 #include <stdint.h>
 #include <stdio.h>
+#include <math.h>
 #include <libvje/vje.h>
 #include <libvjmem/vjmem.h>
-#include <stdlib.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdint.h>
 #include "common.h"
-#include "rippletv.h"
 #include "softblur.h"
+#include "water.h"
 
 typedef struct {
 	uint8_t *ripple_data[4];
@@ -502,7 +496,8 @@ static void raindrop(water_t *w)
 	period--;
 }
 
-void	water_apply(void *user_data, VJFrame *frame, VJFrame *frame2, int width, int height, int fresh_rate, int loopnum, int decay, int mode, int threshold )
+void water_apply(void *user_data, VJFrame *frame, VJFrame *frame2, int fresh_rate,
+                 int loopnum, int decay, int mode, int threshold )
 {
 	int x, y, i;
 	int dx, dy;
@@ -621,8 +616,8 @@ void	water_apply(void *user_data, VJFrame *frame, VJFrame *frame2, int width, in
 		vp+=2;
 	}
 
-	hi = height;
-	wi = width;
+	hi = frame->height;
+	wi = frame->width;
 	vp = w->vtable;
 
 	for(y=0; y<hi; y+=2) {
diff --git a/veejay-current/veejay-server/libvje/effects/rippletv.h b/veejay-current/veejay-server/libvje/effects/water.h
similarity index 77%
rename from veejay-current/veejay-server/libvje/effects/rippletv.h
rename to veejay-current/veejay-server/libvje/effects/water.h
index d10d3ff7..ded14ccb 100644
--- a/veejay-current/veejay-server/libvje/effects/rippletv.h
+++ b/veejay-current/veejay-server/libvje/effects/water.h
@@ -18,10 +18,11 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307 , USA.
  */
 
-#ifndef RIPPLETV_H
-#define RIPPLETV_H
-vj_effect* water_init(int width, int height);
-int water_malloc(void **d,int w, int h);
-void water_free(void *d);
-void water_apply(void *user_data, VJFrame *frame, VJFrame *frame2, int width, int height,int fresh, int loopnum, int decay, int mode, int threshold );
+#ifndef WATERRIPPLE_H
+#define WATERRIPPLE_H
+vj_effect *water_init(int width, int height);
+int water_malloc(void **d, int width, int height);
+void water_apply(void *user_data, VJFrame *frame, VJFrame *frame2, int fresh_rate,
+                 int loopnum, int decay, int mode, int threshold );
+void water_free(void *ud);
 #endif
diff --git a/veejay-current/veejay-server/libvje/internal.h b/veejay-current/veejay-server/libvje/internal.h
index 025fe7e2..d30e4fc7 100644
--- a/veejay-current/veejay-server/libvje/internal.h
+++ b/veejay-current/veejay-server/libvje/internal.h
@@ -422,9 +422,9 @@ extern void deinterlace_apply(VJFrame *frame, int val);
 //extern void simplematte_apply(VJFrame *frame, int threshold, int invert);
 extern void crosspixel_apply(VJFrame *frame,int type, int val);
 extern void color_apply(VJFrame *frame, int a, int b, int c);
-
 //extern void water_apply(VJFrame *frame, int w, int h, int val, int l, int d);
-extern void	water_apply(void *user_data, VJFrame *frame, VJFrame *frame2, int width, int height, int fresh,int loopnum, int decay, int mode, int threshold);
+extern void	water_apply(void *user_data, VJFrame *frame, VJFrame *frame2,
+                        int fresh,int loopnum, int decay, int mode, int threshold);
 
 extern void pencilsketch_apply(VJFrame *frame, int w, int h, int type, int threshold, int opacity, int mode);
 
diff --git a/veejay-current/veejay-server/libvje/vj-effect.c b/veejay-current/veejay-server/libvje/vj-effect.c
index 0fefe5ac..3055e09f 100644
--- a/veejay-current/veejay-server/libvje/vj-effect.c
+++ b/veejay-current/veejay-server/libvje/vj-effect.c
@@ -113,7 +113,7 @@
 #include "effects/sinoids.h"
 #include "effects/average.h"
 #include "effects/ripple.h"
-#include "effects/rippletv.h"
+#include "effects/water.h"
 #include "effects/waterrippletv.h"
 #include "effects/bathroom.h"
 #include "effects/slicer.h"
diff --git a/veejay-current/veejay-server/libvje/vj-effman.c b/veejay-current/veejay-server/libvje/vj-effman.c
index 29075bdb..23eb1a83 100644
--- a/veejay-current/veejay-server/libvje/vj-effman.c
+++ b/veejay-current/veejay-server/libvje/vj-effman.c
@@ -619,7 +619,7 @@ static void vj_effman_apply_video_effect( VJFrame **frames, vjp_kf *todo_info,in
 			arg[0], arg[1], arg[2], arg[3] );
 	break;
 	case VJ_VIDEO_EFFECT_RIPPLETV:
-	water_apply( vj_effects[entry]->user_data,frames[0],frames[1],frames[0]->width,frames[0]->height,arg[0],arg[1],arg[2],arg[3],arg[4] );
+	water_apply( vj_effects[entry]->user_data,frames[0],frames[1],arg[0],arg[1],arg[2],arg[3],arg[4] );
 
 	break;
 	case VJ_VIDEO_EFFECT_RADIOACTIVE: