diff --git a/veejay-current/veejay-server/libvje/internal.h b/veejay-current/veejay-server/libvje/internal.h index e7373df5..da17ba6f 100644 --- a/veejay-current/veejay-server/libvje/internal.h +++ b/veejay-current/veejay-server/libvje/internal.h @@ -171,7 +171,7 @@ enum { VJ_IMAGE_EFFECT_NOISEPENCIL = 148, VJ_IMAGE_EFFECT_RIPPLETV = 149, VJ_IMAGE_EFFECT_PENCILSKETCH = 143, - VJ_IMAGE_EFFECT_PIXELATE = 150, + VJ_IMAGE_EFFECT_BGSUBTRACT = 150, VJ_IMAGE_EFFECT_MAGICMIRROR = 151, VJ_IMAGE_EFFECT_PIXELSMEAR = 152, VJ_IMAGE_EFFECT_RASTER = 153, @@ -211,12 +211,11 @@ enum { VJ_IMAGE_EFFECT_BALTANTV = 187, VJ_IMAGE_EFFECT_CONTOUR = 188, VJ_IMAGE_EFFECT_LENSCORRECTION = 189, - VJ_IMAGE_EFFECT_BGSUBTRACT = 190, VJ_IMAGE_EFFECT_DUMMY=100, }; #define VJ_IMAGE_EFFECT_MIN 100 -#define VJ_IMAGE_EFFECT_MAX 191 +#define VJ_IMAGE_EFFECT_MAX 190 #define VJ_VIDEO_EFFECT_MIN 200 #define VJ_VIDEO_EFFECT_MAX 246 diff --git a/veejay-current/veejay-server/libvje/vj-effect.c b/veejay-current/veejay-server/libvje/vj-effect.c index 9e2d6851..ceccd3f6 100644 --- a/veejay-current/veejay-server/libvje/vj-effect.c +++ b/veejay-current/veejay-server/libvje/vj-effect.c @@ -122,7 +122,6 @@ #include "effects/color.h" #include "effects/noisepencil.h" #include "effects/pencilsketch.h" -#include "effects/pixelate.h" #include "effects/magicmirror.h" #include "effects/lumamask.h" #include "effects/smear.h" @@ -554,7 +553,7 @@ void vj_effect_initialize(int width, int height, int full_range) vj_effects[i + 47] = diffimg_init(width,height); vj_effects[i + 48] = noisepencil_init(width,height); vj_effects[i + 43] = pencilsketch_init(width,height); - vj_effects[i + 50] = pixelate_init(width,height); + vj_effects[i + 50] = bgsubtract_init(width,height); vj_effects[i + 51] = magicmirror_init(width,height); vj_effects[i + 52] = smear_init(width,height); vj_effects[i + 53] = raster_init(width,height); @@ -595,7 +594,6 @@ void vj_effect_initialize(int width, int height, int full_range) vj_effects[i + 88] = contourextract_init(width,height); vj_effects[i + 49] = waterrippletv_init(width,height); vj_effects[i + 89 ]= radcor_init(width,height); - vj_effects[i + 90 ]= bgsubtract_init(width,height); max_width = width; max_height = height; diff --git a/veejay-current/veejay-server/libvje/vj-effman.c b/veejay-current/veejay-server/libvje/vj-effman.c index f8b7447c..82b2644e 100644 --- a/veejay-current/veejay-server/libvje/vj-effman.c +++ b/veejay-current/veejay-server/libvje/vj-effman.c @@ -196,9 +196,6 @@ void vj_effman_apply_image_effect( case VJ_IMAGE_EFFECT_PIXELSMEAR: smear_apply(frames[0], frameinfo->width, frameinfo->height,arg[0],arg[1]); break; - case VJ_IMAGE_EFFECT_PIXELATE: - pixelate_apply(frames[0],frameinfo->width,frameinfo->height,arg[0]); - break; case VJ_IMAGE_EFFECT_UVCORRECT: uvcorrect_apply(frames[0], frameinfo->width, frameinfo->height,arg[0],arg[1],arg[2],arg[3],arg[4],arg[5],arg[6]); break; diff --git a/veejay-current/veejay-server/libvje/vje.h b/veejay-current/veejay-server/libvje/vje.h index 7c85095d..d52e924f 100644 --- a/veejay-current/veejay-server/libvje/vje.h +++ b/veejay-current/veejay-server/libvje/vje.h @@ -22,7 +22,7 @@ #define FX_LIMIT 1024 -#define MAX_EFFECTS 137 +#define MAX_EFFECTS 136 #define PARAM_WIDTH (1<<0x2) #define PARAM_HEIGHT (1<<0x3) #define PARAM_FADER (1<<0x1)