eessppeelllloo/veejay
1
0
Fork 0
mirror of https://github.com/game-stop/veejay.git synced 2025-12-24 08:40:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of code.dyne.org:veejay

Browse Source 
Conflicts:
	veejay-current/veejay-client/configure.ac
	veejay-current/veejay-server/configure.ac
	veejay-current/veejay-server/libel/vj-avcodec.c
	veejay-current/veejay-server/libel/vj-el.c
	veejay-current/veejay-server/libstream/v4l2utils.c
	veejay-current/veejay-server/libvje/effects/chameleon.c
This commit is contained in:
niels
2014-11-22 20:59:53 +01:00
parent 3057db6d5d 136a4bf5dc
commit 8d2ce16227
63 changed files with 1381 additions and 2613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
veejay-current/veejay-server/libplugger/frei0r-loader.c
View File

@@ -37,6 +37,7 @@
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <stdio.h>
#include <libplugger/portdef.h>
#ifdef STRICT_CHECKING
#include <assert.h>
@@ -368,7 +369,6 @@ void* deal_with_fr( void *handle, char *name)
len = 1023;
strncpy( tmp_name, finfo.name, len );
char *plug_name = strdup(tmp_name);
vevo_property_set( port, "num_params", VEVO_ATOM_TYPE_INT, 1, &r_params );
@@ -399,8 +399,6 @@ void* deal_with_fr( void *handle, char *name)
veejay_msg(VEEJAY_MSG_DEBUG, "\tparameters: %d, input channels: %d, output channels: %d, format: %x",
r_params,n_inputs,n_outputs, pixfmt );
#endif
return port;
}
@@ -542,7 +540,6 @@ void frei0r_plug_free( void *plugin )
f0r_deinit_f base;
if( vevo_property_get( plugin, "deinit", 0, &base) == VEVO_NO_ERROR )
(*base)();
// vevo_property_get( plugin, "f0r_p", 0, &n );
}
int frei0r_process_frame_f( void *plugin )
@@ -649,7 +646,7 @@ void frei0r_plug_param_f( void *port, int seq_no, void *dargs )
(*inf)( &finfo, seq_no );
char key[20];
sprintf(key, "p%02d", seq_no );
snprintf(key, sizeof(key)-1, "p%02d", seq_no );
void *param = NULL;
if(vevo_property_get( parent, key, 0, &param )!=VEVO_NO_ERROR)
@@ -695,5 +692,3 @@ void frei0r_plug_control( void *port, int *args )
{
}