diff --git a/veejay-current/veejay-server/libvje/Makefile.am b/veejay-current/veejay-server/libvje/Makefile.am index fce183dc..a24c3446 100644 --- a/veejay-current/veejay-server/libvje/Makefile.am +++ b/veejay-current/veejay-server/libvje/Makefile.am @@ -242,4 +242,15 @@ libvje_la_SOURCES = libvje.c vjert.c \ effects/edgefold.c \ effects/virtualcamera.c \ effects/ghostwash.c \ - effects/plasmafeedback.c + effects/plasmafeedback.c \ + effects/chronofold.c \ + effects/chronocortex.c \ + effects/chronorain.c \ + effects/chronovein.c \ + effects/chronoglass.c \ + effects/chronomirror.c \ + effects/blackhole.c \ + effects/strataflight.c \ + effects/chronoetch.c \ + effects/radiantfissure.c \ + effects/meteorvector.c diff --git a/veejay-current/veejay-server/libvje/internal.h b/veejay-current/veejay-server/libvje/internal.h index c35b5966..77a3e342 100644 --- a/veejay-current/veejay-server/libvje/internal.h +++ b/veejay-current/veejay-server/libvje/internal.h @@ -253,8 +253,19 @@ #include "./effects/virtualcamera.h" #include "./effects/ghostwash.h" #include "./effects/plasmafeedback.h" +#include "./effects/chronofold.h" +#include "./effects/chronocortex.h" +#include "./effects/chronorain.h" +#include "./effects/chronovein.h" +#include "./effects/chronoglass.h" +#include "./effects/chronomirror.h" +#include "./effects/strataflight.h" +#include "./effects/blackhole.h" +#include "./effects/radiantfissure.h" +#include "./effects/meteorvector.h" +#include "./effects/chronoetch.h" -#define VJ_IMAGE_EFFECT_MIN 32 +#define VJ_IMAGE_EFFECT_MIN 21 #define VJ_IMAGE_EFFECT_MAX 198 #define VJ_VIDEO_EFFECT_MIN 200 @@ -543,6 +554,17 @@ enum { VJ_IMAGE_EFFECT_VIRTUALCAMERA = 34, VJ_IMAGE_EFFECT_GHOSTWASH = 33, VJ_IMAGE_EFFECT_PLASMAFEEDBACK = 32, + VJ_IMAGE_EFFECT_CHRONOFOLD = 31, + VJ_IMAGE_EFFECT_CHRONOCORTEX = 30, + VJ_IMAGE_EFFECT_CHRONORAIN = 29, + VJ_IMAGE_EFFECT_CHRONOVEIN = 28, + VJ_IMAGE_EFFECT_CHRONOGLASS = 27, + VJ_IMAGE_EFFECT_CHRONOMIRROR = 26, + VJ_IMAGE_EFFECT_BLACKHOLE = 25, + VJ_IMAGE_EFFECT_STRATAFLIGHT = 24, + VJ_IMAGE_EFFECT_RADIANTFISSURE = 23, + VJ_IMAGE_EFFECT_METEORVECTOR = 22, + VJ_IMAGE_EFFECT_CHRONOETCH = 21, VJ_IMAGE_EFFECT_DUMMY=0, }; diff --git a/veejay-current/veejay-server/libvje/libvje.c b/veejay-current/veejay-server/libvje/libvje.c index 8073f061..ffe56dc5 100644 --- a/veejay-current/veejay-server/libvje/libvje.c +++ b/veejay-current/veejay-server/libvje/libvje.c @@ -114,6 +114,17 @@ static struct { { strobo_init,strobo_malloc,strobo_free,NULL,NULL,strobo_apply,NULL,NULL,NULL,NULL,VJ_IMAGE_EFFECT_STROBOTSU }, { spectralmotion_init,spectralmotion_malloc,spectralmotion_free,NULL,NULL,spectralmotion_apply,NULL,NULL,NULL,NULL,VJ_IMAGE_EFFECT_SPECTRALMOTION}, { falsecolors_init, falsecolors_malloc,falsecolors_free, NULL,NULL, falsecolors_apply, NULL,NULL,NULL,NULL, VJ_IMAGE_EFFECT_FALSECOLORS }, + { chronofold_init, chronofold_malloc,chronofold_free, NULL,NULL, chronofold_apply, NULL,NULL,NULL,NULL, VJ_IMAGE_EFFECT_CHRONOFOLD }, + { chronocortex_init, chronocortex_malloc,chronocortex_free, NULL,NULL, chronocortex_apply, NULL,NULL,NULL,NULL, VJ_IMAGE_EFFECT_CHRONOCORTEX }, + { chronorain_init, chronorain_malloc,chronorain_free, NULL,NULL, chronorain_apply, NULL,NULL,NULL,NULL, VJ_IMAGE_EFFECT_CHRONORAIN }, + { chronovein_init, chronovein_malloc,chronovein_free, NULL,NULL, chronovein_apply, NULL,NULL,NULL,NULL, VJ_IMAGE_EFFECT_CHRONOVEIN }, + { chronoglass_init, chronoglass_malloc,chronoglass_free, NULL,NULL, chronoglass_apply, NULL,NULL,NULL,NULL, VJ_IMAGE_EFFECT_CHRONOGLASS }, + { chronomirror_init, chronomirror_malloc,chronomirror_free, NULL,NULL, chronomirror_apply, NULL,NULL,NULL,NULL, VJ_IMAGE_EFFECT_CHRONOMIRROR }, + { chronoetch_init, chronoetch_malloc,chronoetch_free, NULL,NULL, chronoetch_apply, NULL,NULL,NULL,NULL, VJ_IMAGE_EFFECT_CHRONOETCH }, + { radiantfissure_init, radiantfissure_malloc, radiantfissure_free, NULL,NULL, radiantfissure_apply, NULL,NULL,NULL,NULL, VJ_IMAGE_EFFECT_RADIANTFISSURE }, + { meteorvector_init, meteorvector_malloc, meteorvector_free, NULL,NULL, meteorvector_apply, NULL,NULL,NULL,NULL, VJ_IMAGE_EFFECT_METEORVECTOR }, + { blackhole_init, blackhole_malloc,blackhole_free, NULL,NULL, blackhole_apply, NULL,NULL,NULL,NULL, VJ_IMAGE_EFFECT_BLACKHOLE }, + { strataflight_init, strataflight_malloc,strataflight_free, NULL,NULL, strataflight_apply, NULL,NULL,NULL,NULL, VJ_IMAGE_EFFECT_STRATAFLIGHT }, { rgbkeysmooth_init,rgbkeysmooth_malloc,rgbkeysmooth_free,NULL,NULL,NULL,rgbkeysmooth_apply,NULL,NULL,NULL,VJ_VIDEO_EFFECT_RGBKEYSMOOTH }, { rgbkey_init,rgbkey_malloc,rgbkey_free,NULL,NULL,NULL,rgbkey_apply,NULL,NULL,NULL,VJ_VIDEO_EFFECT_RGBKEY }, { rgbchannel_init,NULL,NULL,NULL,NULL,rgbchannel_apply,NULL, NULL,NULL,NULL, VJ_IMAGE_EFFECT_RGBCHANNEL},