summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorniels <niels@dyne.org>2015-07-30 20:15:39 (GMT)
committer niels <niels@dyne.org>2015-07-30 20:15:39 (GMT)
commitf5c7c03870e1b2a4928101a417da9a964d13afef (patch)
treedc7ad599ca6ffb2817d2efdf7a1d3cb8fc367528
parente70cc2d0049fb1b2d04861768bcf6c64cc7b6390 (diff)
update livido gmic plugins to api 103
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_abstraction.c4
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_arrayfade.c14
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_bokeh.c4
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_cartoon.c14
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_cracks.c4
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_crystal.c5
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_curvature.c4
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_dices.c4
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_ditheredbw.c7
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_edges.c6
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_freeform.c6
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_kuwahara.c5
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_lava.c4
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_lightpatch.c9
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_lightrelief.c4
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_marble.c6
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_noisehurl.c4
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_oldscool8bits.c4
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_pencilbw.c4
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_pendrawing.c4
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_plasma.c4
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_posteredges.c4
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_posterhope.c5
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_quadratize.c5
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_rodilius.c4
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_shifttiles.c4
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_shockwaves.c4
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_sketchbw.c6
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_sponge.c4
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_spread.c6
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_taquin.c8
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_tetris.c6
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_texturizepaper.c6
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_vignette.c6
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_water.c6
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_wave.c6
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_whirl.c7
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/gmic_wind.c6
-rw-r--r--veejay-current/plugin-packs/lvdgmic/plugins/livido.h100
39 files changed, 161 insertions, 152 deletions
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_abstraction.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_abstraction.c
index 7e7e4de..c3d9719 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_abstraction.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_abstraction.c
@@ -38,7 +38,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
}
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -49,7 +49,7 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_arrayfade.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_arrayfade.c
index 2950825..263a7db 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_arrayfade.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_arrayfade.c
@@ -48,16 +48,18 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
- lvd_extract_channel_values( my_instance, "in_channels" , 0, &w, &h, A, &palette );
+ error = lvd_extract_channel_values( my_instance, "in_channels" , 0, &w, &h, A, &palette );
+ if( error != LIVIDO_NO_ERROR )
+ return LIVIDO_ERROR_NO_INPUT_CHANNELS;
- int x_tiles = lvd_extract_param_index( my_instance,"in_parameters", 0 );
- int y_tiles = lvd_extract_param_index( my_instance,"in_parameters", 1 );
- int x_offset = lvd_extract_param_index( my_instance,"in_parameters", 2 );
- int y_offset = lvd_extract_param_index( my_instance,"in_parameters", 3 );
+ int x_tiles = lvd_extract_param_index( my_instance,"in_parameters", 0 );
+ int y_tiles = lvd_extract_param_index( my_instance,"in_parameters", 1 );
+ int x_offset = lvd_extract_param_index( my_instance,"in_parameters", 2 );
+ int y_offset = lvd_extract_param_index( my_instance,"in_parameters", 3 );
int fade_start = lvd_extract_param_index( my_instance,"in_parameters", 4 );
int fade_end = lvd_extract_param_index( my_instance,"in_parameters", 5 );
int mirror = lvd_extract_param_index( my_instance,"in_parameters", 6 );
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_bokeh.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_bokeh.c
index ca44851..408bc46 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_bokeh.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_bokeh.c
@@ -37,7 +37,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
}
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -48,7 +48,7 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_cartoon.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_cartoon.c
index 1dd327b..46f4a81 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_cartoon.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_cartoon.c
@@ -37,7 +37,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
}
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -48,11 +48,15 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
Clvdgmic *gmic = NULL;
- livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
-
- lvd_extract_channel_values( my_instance, "in_channels" , 0, &w, &h, A, &palette );
+ error = livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
+ if( error != LIVIDO_NO_ERROR )
+ return LIVIDO_ERROR_INTERNAL;
+
+ error = lvd_extract_channel_values( my_instance, "in_channels" , 0, &w, &h, A, &palette );
+ if( error != LIVIDO_NO_ERROR )
+ return LIVIDO_ERROR_NO_INPUT_CHANNELS;
int smoothness = lvd_extract_param_index( my_instance,"in_parameters", 0 );
int sharpening = lvd_extract_param_index( my_instance,"in_parameters", 1 );
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_cracks.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_cracks.c
index 4eb664f..6173dd7 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_cracks.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_cracks.c
@@ -38,7 +38,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
}
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -49,7 +49,7 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_crystal.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_crystal.c
index ed41cff..834c705 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_crystal.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_crystal.c
@@ -37,8 +37,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
return LIVIDO_NO_ERROR;
}
-
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -49,7 +48,7 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_curvature.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_curvature.c
index 7822e7d..b076d5b 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_curvature.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_curvature.c
@@ -38,7 +38,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
}
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -49,7 +49,7 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_dices.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_dices.c
index 5bfdfea..dbc510b 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_dices.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_dices.c
@@ -38,7 +38,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
}
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -49,7 +49,7 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_ditheredbw.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_ditheredbw.c
index 7558a47..9225d22 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_ditheredbw.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_ditheredbw.c
@@ -37,8 +37,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
return LIVIDO_NO_ERROR;
}
-
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -49,11 +48,11 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
- lvd_extract_channel_values( my_instance, "in_channels" , 0, &w, &h, A, &palette );
+ lvd_extract_channel_values( my_instance, "in_channels" , 0, &w, &h, A, &palette );
snprintf(cmd,sizeof(cmd),"-ditheredbw" );
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_edges.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_edges.c
index d90a7bc..a6e291e 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_edges.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_edges.c
@@ -38,7 +38,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
}
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -49,11 +49,11 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
- lvd_extract_channel_values( my_instance, "in_channels" , 0, &w, &h, A, &palette );
+ lvd_extract_channel_values( my_instance, "in_channels" , 0, &w, &h, A, &palette );
int threshold = lvd_extract_param_index( my_instance,"in_parameters", 0 );
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_freeform.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_freeform.c
index b53ae2b..54ff241 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_freeform.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_freeform.c
@@ -38,7 +38,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
}
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -49,11 +49,11 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
- lvd_extract_channel_values( my_instance, "in_channels" , 0, &w, &h, A, &palette );
+ lvd_extract_channel_values( my_instance, "in_channels" , 0, &w, &h, A, &palette );
int erode1 = lvd_extract_param_index( my_instance,"in_parameters", 0 );
int erode2 = lvd_extract_param_index( my_instance,"in_parameters", 1 );
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_kuwahara.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_kuwahara.c
index f7841cc..2862146 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_kuwahara.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_kuwahara.c
@@ -37,8 +37,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
return LIVIDO_NO_ERROR;
}
-
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -49,7 +48,7 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_lava.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_lava.c
index fafc948..ec160e6 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_lava.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_lava.c
@@ -38,7 +38,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
}
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -49,7 +49,7 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_lightpatch.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_lightpatch.c
index d9e89e0..23b41e2 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_lightpatch.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_lightpatch.c
@@ -38,7 +38,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
}
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -49,11 +49,12 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
+
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
-
- lvd_extract_channel_values( my_instance, "in_channels" , 0, &w, &h, A, &palette );
+
+ lvd_extract_channel_values( my_instance, "in_channels" , 0, &w, &h, A, &palette );
int density = lvd_extract_param_index( my_instance,"in_parameters", 0 );
int darkness = lvd_extract_param_index( my_instance,"in_parameters", 1 );
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_lightrelief.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_lightrelief.c
index 3f34931..f72ac92 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_lightrelief.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_lightrelief.c
@@ -38,7 +38,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
}
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -49,7 +49,7 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_marble.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_marble.c
index c0be72a..2f8c514 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_marble.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_marble.c
@@ -38,7 +38,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
}
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -49,11 +49,11 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
- lvd_extract_channel_values( my_instance, "in_channels" , 0, &w, &h, A, &palette );
+ lvd_extract_channel_values( my_instance, "in_channels" , 0, &w, &h, A, &palette );
int imageweight = lvd_extract_param_index( my_instance,"in_parameters", 0 );
int patternweight = lvd_extract_param_index( my_instance,"in_parameters", 1 );
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_noisehurl.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_noisehurl.c
index 4bf2f2f..11ecd83 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_noisehurl.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_noisehurl.c
@@ -38,7 +38,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
}
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -49,7 +49,7 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_oldscool8bits.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_oldscool8bits.c
index a527ccc..8c2237d 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_oldscool8bits.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_oldscool8bits.c
@@ -38,7 +38,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
}
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -49,7 +49,7 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_pencilbw.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_pencilbw.c
index cc4cd25..9f2a80f 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_pencilbw.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_pencilbw.c
@@ -37,7 +37,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
}
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -48,7 +48,7 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_pendrawing.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_pendrawing.c
index 402856d..1f88b0b 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_pendrawing.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_pendrawing.c
@@ -38,7 +38,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
}
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -49,7 +49,7 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_plasma.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_plasma.c
index 40dfaa0..6da930a 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_plasma.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_plasma.c
@@ -38,7 +38,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
}
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -49,7 +49,7 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_posteredges.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_posteredges.c
index a2648dc..2cec28f 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_posteredges.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_posteredges.c
@@ -38,7 +38,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
}
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -49,7 +49,7 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_posterhope.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_posterhope.c
index 5d34b9e..b7f71af 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_posterhope.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_posterhope.c
@@ -37,8 +37,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
return LIVIDO_NO_ERROR;
}
-
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -49,7 +48,7 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_quadratize.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_quadratize.c
index a7fb29e..5b4845e 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_quadratize.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_quadratize.c
@@ -37,8 +37,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
return LIVIDO_NO_ERROR;
}
-
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -49,7 +48,7 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_rodilius.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_rodilius.c
index 97b410c..9b07ba9 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_rodilius.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_rodilius.c
@@ -37,7 +37,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
}
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -48,7 +48,7 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_shifttiles.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_shifttiles.c
index 20aee88..eba700d 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_shifttiles.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_shifttiles.c
@@ -38,7 +38,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
}
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -49,7 +49,7 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_shockwaves.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_shockwaves.c
index f8374c6..71b3fb2 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_shockwaves.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_shockwaves.c
@@ -38,7 +38,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
}
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -49,7 +49,7 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_sketchbw.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_sketchbw.c
index f05d79c..ddff392 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_sketchbw.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_sketchbw.c
@@ -38,7 +38,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
}
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -49,11 +49,11 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
- lvd_extract_channel_values( my_instance, "in_channels" , 0, &w, &h, A, &palette );
+ lvd_extract_channel_values( my_instance, "in_channels" , 0, &w, &h, A, &palette );
int orientations = lvd_extract_param_index( my_instance,"in_parameters", 0 );
int starting_angle = lvd_extract_param_index( my_instance,"in_parameters", 1 );
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_sponge.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_sponge.c
index 4a5d440..e5fe7de 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_sponge.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_sponge.c
@@ -38,7 +38,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
}
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -49,7 +49,7 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_spread.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_spread.c
index d85a9ee..e3b6193 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_spread.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_spread.c
@@ -38,7 +38,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
}
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -49,11 +49,11 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
- lvd_extract_channel_values( my_instance, "in_channels" , 0, &w, &h, A, &palette );
+ lvd_extract_channel_values( my_instance, "in_channels" , 0, &w, &h, A, &palette );
int dx = lvd_extract_param_index( my_instance,"in_parameters", 0 );
int dy = lvd_extract_param_index( my_instance,"in_parameters", 1 );
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_taquin.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_taquin.c
index 8ceb24f..414cdcd 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_taquin.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_taquin.c
@@ -38,7 +38,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
}
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -47,13 +47,13 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int w;
int h;
- int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
+ int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
- lvd_extract_channel_values( my_instance, "in_channels" , 0, &w, &h, A, &palette );
+ lvd_extract_channel_values( my_instance, "in_channels" , 0, &w, &h, A, &palette );
int xtiles = lvd_extract_param_index( my_instance,"in_parameters", 0 );
int ytiles = lvd_extract_param_index( my_instance,"in_parameters", 1 );
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_tetris.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_tetris.c
index d891a36..836dcf6 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_tetris.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_tetris.c
@@ -38,7 +38,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
}
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -49,11 +49,11 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
- lvd_extract_channel_values( my_instance, "in_channels" , 0, &w, &h, A, &palette );
+ lvd_extract_channel_values( my_instance, "in_channels" , 0, &w, &h, A, &palette );
int scale = lvd_extract_param_index( my_instance,"in_parameters", 0 );
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_texturizepaper.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_texturizepaper.c
index 84b5fe3..b5ed139 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_texturizepaper.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_texturizepaper.c
@@ -38,7 +38,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
}
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -49,11 +49,11 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
- lvd_extract_channel_values( my_instance, "in_channels" , 0, &w, &h, A, &palette );
+ lvd_extract_channel_values( my_instance, "in_channels" , 0, &w, &h, A, &palette );
snprintf(cmd,sizeof(cmd),"-texturize_paper");
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_vignette.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_vignette.c
index cfd47c0..7bc33f8 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_vignette.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_vignette.c
@@ -38,7 +38,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
}
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -49,11 +49,11 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
- lvd_extract_channel_values( my_instance, "in_channels" , 0, &w, &h, A, &palette );
+ lvd_extract_channel_values( my_instance, "in_channels" , 0, &w, &h, A, &palette );
int strength = lvd_extract_param_index( my_instance,"in_parameters", 0 );
int min_radius = lvd_extract_param_index( my_instance,"in_parameters", 1 );
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_water.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_water.c
index f55c684..17e528c 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_water.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_water.c
@@ -40,7 +40,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
}
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -51,11 +51,11 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
- lvd_extract_channel_values( my_instance, "in_channels" , 0, &w, &h, A, &palette );
+ lvd_extract_channel_values( my_instance, "in_channels" , 0, &w, &h, A, &palette );
int amplitude = lvd_extract_param_index( my_instance,"in_parameters", 0 );
int smoothness = lvd_extract_param_index( my_instance,"in_parameters", 1 );
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_wave.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_wave.c
index 2aa8ff3..15027b2 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_wave.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_wave.c
@@ -38,7 +38,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
}
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -49,11 +49,11 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
- lvd_extract_channel_values( my_instance, "in_channels" , 0, &w, &h, A, &palette );
+ lvd_extract_channel_values( my_instance, "in_channels" , 0, &w, &h, A, &palette );
int amplitude = lvd_extract_param_index( my_instance,"in_parameters", 0 );
int frequency = lvd_extract_param_index( my_instance,"in_parameters", 1 );
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_whirl.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_whirl.c
index 0987440..569eb29 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_whirl.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_whirl.c
@@ -38,7 +38,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
}
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -49,11 +49,12 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
+
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
- lvd_extract_channel_values( my_instance, "in_channels" , 0, &w, &h, A, &palette );
+ lvd_extract_channel_values( my_instance, "in_channels" , 0, &w, &h, A, &palette );
int amplitude = lvd_extract_param_index( my_instance,"in_parameters", 0 );
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_wind.c b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_wind.c
index aebc066..1a1075b 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/gmic_wind.c
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/gmic_wind.c
@@ -38,7 +38,7 @@ livido_deinit_f deinit_instance( livido_port_t *my_instance )
}
-livido_process_f process_instance( livido_port_t *my_instance, double timecode )
+int process_instance( livido_port_t *my_instance, double timecode )
{
uint8_t *A[4] = {NULL,NULL,NULL,NULL};
uint8_t *O[4]= {NULL,NULL,NULL,NULL};
@@ -49,11 +49,11 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
int error = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
if( error != LIVIDO_NO_ERROR )
- return LIVIDO_ERROR_HARDWARE;
+ return LIVIDO_ERROR_NO_OUTPUT_CHANNELS;
Clvdgmic *gmic = NULL;
livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
- lvd_extract_channel_values( my_instance, "in_channels" , 0, &w, &h, A, &palette );
+ lvd_extract_channel_values( my_instance, "in_channels" , 0, &w, &h, A, &palette );
int amplitude = lvd_extract_param_index( my_instance,"in_parameters", 0 );
int angle = lvd_extract_param_index( my_instance,"in_parameters", 1 );
diff --git a/veejay-current/plugin-packs/lvdgmic/plugins/livido.h b/veejay-current/plugin-packs/lvdgmic/plugins/livido.h
index 4238a63..4487192 100644
--- a/veejay-current/plugin-packs/lvdgmic/plugins/livido.h
+++ b/veejay-current/plugin-packs/lvdgmic/plugins/livido.h
@@ -10,7 +10,8 @@
Revised by Niels, 2010 ( 101 )
- 2011 ( 102 )
+ 2011 ( 102 )
+ 2015 ( 103 )
LiViDO is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -54,7 +55,7 @@ LIVIDO_BEGIN_DECLS
#ifdef IS_LIVIDO_PLUGIN
typedef void livido_port_t;
#endif
-#define LIVIDO_API_VERSION 102
+#define LIVIDO_API_VERSION 103
#define LIVIDO_PALETTE_RGB888 1
#define LIVIDO_PALETTE_RGB24 1
#define LIVIDO_PALETTE_BGR888 2
@@ -93,21 +94,26 @@ typedef void livido_port_t;
#define LIVIDO_PALETTE_A16 1028
#define LIVIDO_PALETTE_AFLOAT 1027
-//@ do we want openmp?
-
+/**
+ *Plugin is not realtime capable
+ */
#define LIVIDO_FILTER_NON_REALTIME (1<<0)
+/**
+ *Plugin processes inplace
+ */
#define LIVIDO_FILTER_CAN_DO_INPLACE (1<<1)
+/**
+ *Plugin keeps internal state
+ */
#define LIVIDO_FILTER_NON_STATELESS (1<<2)
-#define LIVIDO_FILTER_IS_CONVERTOR (1<<3)
-#define LIVIDO_CHANNEL_CHANGE_UNADVISED (1<<0)
-#define LIVIDO_CHANNEL_PALETTE_UNADVISED (1<<1)
-#define LIVIDO_PARAMETER_CHANGE_UNADVISED (1<<0)
-#define LIVIDO_PROPERTY_READONLY (1<<0)
-
-#define LIVIDO_INTERLACE_NONE 0
-#define LIVIDO_INTERLACE_TOPFIRST 1
-#define LIVIDO_INTERLACE_BOTTOMFIRST 2
-#define LIVIDO_INTERLACE_PROGRESSIVE 3
+/**
+ *Plugin is parallelizable (host is allowed to run it in parallel)
+ */
+#define LIVIDO_FILTER_IS_PARALLELIZABLE (1<<4)
+
+/**
+ * Error messages
+ */
#define LIVIDO_NO_ERROR 0
#define LIVIDO_ERROR_MEMORY_ALLOCATION 1
#define LIVIDO_ERROR_PROPERTY_READONLY 2
@@ -116,8 +122,18 @@ typedef void livido_port_t;
#define LIVIDO_ERROR_WRONG_ATOM_TYPE 5
#define LIVIDO_ERROR_TOO_MANY_INSTANCES 6
#define LIVIDO_ERROR_HARDWARE 7
-#define LIVIDO_ERROR_PORT 8 //@ error in port
-
+#define LIVIDO_ERROR_PORT 8
+#define LIVIDO_ERROR_NO_OUTPUT_CHANNELS 9
+#define LIVIDO_ERROR_NO_INPUT_CHANNELS 10
+#define LIVIDO_ERROR_NO_INPUT_PARAMETERS 11
+#define LIVIDO_ERROR_NO_OUTPUT_PARAMETERS 12
+#define LIVIDO_ERROR_ENVIRONMENT 13
+#define LIVIDO_ERROR_RESOURCE 14
+#define LIVIDO_ERROR_INTERNAL 15
+
+/**
+ * Primitives
+ */
#define LIVIDO_ATOM_TYPE_INT 1
#define LIVIDO_ATOM_TYPE_DOUBLE 2
#define LIVIDO_ATOM_TYPE_BOOLEAN 3
@@ -125,6 +141,9 @@ typedef void livido_port_t;
#define LIVIDO_ATOM_TYPE_VOIDPTR 65
#define LIVIDO_ATOM_TYPE_PORTPTR 66
+/**
+ * Port types
+ */
#define LIVIDO_PORT_TYPE_PLUGIN_INFO 1
#define LIVIDO_PORT_TYPE_FILTER_CLASS 2
#define LIVIDO_PORT_TYPE_FILTER_INSTANCE 3
@@ -134,16 +153,10 @@ typedef void livido_port_t;
#define LIVIDO_PORT_TYPE_PARAMETER 7
#define LIVIDO_PORT_TYPE_GUI 8
-//#define FUNCSTRUCT
-/*
- Uncomment the #define above and recompile all
- */
-
typedef int (*livido_init_f) (livido_port_t * filter_instance);
typedef int (*livido_process_f) (livido_port_t * filter_instance,double timestamp);
typedef int (*livido_deinit_f) (livido_port_t * filter_instance);
-
typedef void *(*livido_malloc_f) (size_t size);
typedef void (*livido_free_f) (void *ptr);
typedef void *(*livido_memset_f) (void *s, int c, size_t n);
@@ -159,15 +172,9 @@ typedef char **(*livido_list_properties_f) (livido_port_t *);
typedef int (*livido_keyframe_get_f)(livido_port_t *port, long pos, int dir );
typedef int (*livido_keyframe_put_f)(livido_port_t *port, long pos, int dir );
-//@ what about openmp
-//@ automatic top/bottom half processing, using 2 threads.
-//@ maybe with preprocessor directives
-//typedef int (*livido_set_max_threads)(livido_port_t *port, int max );
-
typedef struct
{
void (*f)();
-// void *f;
} livido_setup_t;
typedef livido_port_t *(*livido_setup_f) (const livido_setup_t list[], int );
@@ -185,28 +192,27 @@ static void *(*livido_malloc) (size_t size) = 0;\
static void (*livido_free) (void *ptr) = 0;\
static void *(*livido_memset) (void *s, int c, size_t n) = 0;\
static void *(*livido_memcpy) (void *dest, const void *src, size_t n) = 0;\
-static int (*livido_keyframe_get)(livido_port_t *port, long pos, int dir) = 0;\
-static int (*livido_keyframe_put)(livido_port_t *port, long pos, int dir) = 0; \
+static int (*livido_keyframe_get)(livido_port_t *port, long pos, int dir) = 0;\
+static int (*livido_keyframe_put)(livido_port_t *port, long pos, int dir) = 0; \
-/* Using void* to pass base address of function, needs explicit typecast and host
- must match ordering */
+/* Using void* to pass base address of function, needs explicit typecast and host must match ordering */
#define LIVIDO_IMPORT(list) \
{\
- livido_malloc = (livido_malloc_f) list[0].f;\
- livido_free = (livido_free_f) list[1].f;\
- livido_memset = (livido_memset_f) list[2].f;\
- livido_memcpy = (livido_memcpy_f) list[3].f;\
- livido_port_new = (livido_port_new_f) list[4].f;\
- livido_port_free = (livido_port_free_f) list[5].f;\
- livido_property_set = (livido_property_set_f) list[6].f;\
- livido_property_get = (livido_property_get_f) list[7].f;\
- livido_property_num_elements = (livido_property_num_elements_f) list[8].f;\
- livido_property_atom_type = (livido_property_atom_type_f) list[9].f;\
- livido_property_element_size = (livido_property_element_size_f) list[10].f;\
- livido_list_properties = (livido_list_properties_f) list[11].f;\
- livido_keyframe_get = (livido_keyframe_get_f) list[12].f;\
- livido_keyframe_put = (livido_keyframe_put_f) list[13].f;\
+ livido_malloc = (livido_malloc_f) list[0].f;\
+ livido_free = (livido_free_f) list[1].f;\
+ livido_memset = (livido_memset_f) list[2].f;\
+ livido_memcpy = (livido_memcpy_f) list[3].f;\
+ livido_port_new = (livido_port_new_f) list[4].f;\
+ livido_port_free = (livido_port_free_f) list[5].f;\
+ livido_property_set = (livido_property_set_f) list[6].f;\
+ livido_property_get = (livido_property_get_f) list[7].f;\
+ livido_property_num_elements = (livido_property_num_elements_f) list[8].f;\
+ livido_property_atom_type = (livido_property_atom_type_f) list[9].f;\
+ livido_property_element_size = (livido_property_element_size_f) list[10].f;\
+ livido_list_properties = (livido_list_properties_f) list[11].f;\
+ livido_keyframe_get = (livido_keyframe_get_f) list[12].f;\
+ livido_keyframe_put = (livido_keyframe_put_f) list[13].f;\
}
LIVIDO_END_DECLS
-#endif // #ifndef __LIVIDO_H_
+#endif// #ifndef __LIVIDO_H_