fix compile warnings mostly, some bugfixes.

veejay-current/veejay-server/libplugger/livido-loader.c

@@ -38,6 +38,7 @@
 #include <libplugger/ldefs.h>
 #include <libplugger/specs/livido.h>
 #include <libplugger/portdef.h>
+#include <libplugger/defaults.h>
 #include <libyuv/yuvconv.h>
 #include <libavutil/pixfmt.h>
 #include <stdlib.h>
@@ -665,7 +666,7 @@ char	*livido_describe_parameter_format_osc( void *instance, int p )
 void	livido_plug_free_namespace( void *fx_instance , void *data )
 {
 	void *osc_namespace = NULL;
-	int error = vevo_property_get( fx_instance, "HOST_osc",0,&osc_namespace);
+	vevo_property_get( fx_instance, "HOST_osc",0,&osc_namespace);
 //@TODO OMC
 //	if( error == VEVO_NO_ERROR)
 //		veejay_osc_del_methods( data,osc_namespace,fx_instance, fx_instance );
@@ -921,18 +922,18 @@ void	livido_plug_retrieve_values( void *instance, void *fx_values )
 {
 	int vj_np = vevo_property_num_elements( instance, "in_parameters" );
 	int i;
+	char vkey[8];
 	for( i = 0; i < vj_np; i ++ )
 	{
-		char	vkey[10];
 		void *param = NULL;
 		void *param_templ = NULL;
-		int error = vevo_property_get( instance, "in_parameters", i, &param);
-
-		error = vevo_property_get( param, "parent_template", 0, &param_templ );
-
+		if(vevo_property_get( instance, "in_parameters", i, &param)==VEVO_NO_ERROR) {
+			if( vevo_property_get( param, "parent_template", 0, &param_templ ) == VEVO_NO_ERROR ) {
 				snprintf(vkey,sizeof(vkey), "p%02d", i );
 				clone_prop_vevo( param_templ, fx_values, "default", vkey );
 			}
+		}
+	}
 }
 
 int	livido_plug_read_output_parameters( void *instance, void *fx_values )
@@ -960,14 +961,15 @@ char	*livido_describe_parameter_format( void *instance, int p )
 {
 	void *param = NULL;
 	void *param_templ = NULL;
-	int error = vevo_property_get( instance, "in_parameters", p, &param );
-	if(error != VEVO_NO_ERROR )
-		return 0;
-	error = vevo_property_get( param, "parent_template",0,&param_templ);
-	int kind = 0;
-	error = vevo_property_get( param_templ, "HOST_kind",0,&kind );
+	if( vevo_property_get( instance, "in_parameters", p, &param ) != VEVO_NO_ERROR )
+		return NULL;
+	if( vevo_property_get( param, "parent_template",0,&param_templ) != VEVO_NO_ERROR )
+		return NULL;
 
-	int n_elems = vevo_property_num_elements( param, "value" );
+	int kind = 0;
+	vevo_property_get( param_templ, "HOST_kind",0,&kind );
+
+//	int n_elems = vevo_property_num_elements( param, "value" );
 
 	char fmt[2];
 	fmt[1] = '\0';
@@ -997,8 +999,7 @@ char	*livido_describe_parameter_format( void *instance, int p )
 			break;
 	}
 
-	char *res = vj_strdup( fmt );
-	return res;
+	return vj_strdup( fmt );
 }
 
 
@@ -1085,15 +1086,13 @@ static void	livido_notify_parameter_update( void *instance ,void *param, void *v
 void	livido_set_parameter( void *instance, int seq, void *value )
 {
 	void *param = NULL;
-	void *param_templ = NULL;
-	int error = vevo_property_get( instance, "in_parameters", seq, &param);
-	if( error == LIVIDO_NO_ERROR )
-	{
+	if( vevo_property_get( instance, "in_parameters", seq, &param) == VEVO_NO_ERROR ) {
 		livido_set_parameter_f pctrl;
-		error = vevo_property_get( param, "HOST_parameter_func", 0, &pctrl );
+		if( vevo_property_get( param, "HOST_parameter_func", 0, &pctrl ) == VEVO_NO_ERROR ) {
 			if( (*pctrl)( param, value ) )
 				livido_notify_parameter_update( instance,param, value );
 		}
+	}
 }
 
 
@@ -1143,7 +1142,7 @@ int	livido_read_plug_configuration(void *filter_template, const char *name)
 		void *templ = livido_get_parameter_template( filter_template, i );
 		if(templ==NULL)
 			break;
-		int n_properties = vevo_sscanf_port( templ, buf ); 
+		vevo_sscanf_port( templ, buf ); 
 		i ++;
 	}
 

veejay-current/veejay-server/libplugger/plugload.c

@@ -91,12 +91,13 @@ static	int	select_f( const struct dirent *d )
 
 int		plug_set_param_from_str( void *plugin , int p, const char *str, void *values )
 {
-	int type = 0;
+	//FIXME other types
 	return livido_set_parameter_from_string( plugin, p, str, values );
 }
 
 char		*plug_describe_param( void *plugin, int p )
 {
+	//FIXME other types
 	return livido_describe_parameter_format( plugin,p );
 }
 
@@ -423,7 +424,6 @@ static	int	scan_plugins()
 
 	if( read( fd, data, CONFIG_FILE_LEN ) > 0 )
 	{
-		int len = strlen(data);
 		char *pch = strtok( data, "\n" );
 		while( pch != NULL )
 		{

veejay-current/veejay-server/libplugger/utility.c

@@ -107,7 +107,6 @@ void clone_prop_vevo( void *port, void *to_port, const char *key, const char *as
 	double dtemp[16]; //FIXME
 	
 	int error;
-	void *ptr = NULL;
 	
 	switch( type )
 	{
@@ -162,21 +161,20 @@ void		clone_prop_vevo2( void *port, void *to_port, const char *key, const char *
 	int n = vevo_property_atom_type( port ,key);
 	int itmp = 0;
 	double dtmp = 0.0;
-	int error = 0;
 
 	switch(n)
 	{
 		case VEVO_ATOM_TYPE_INT:
-			error = vevo_property_get( port, key, 0, &itmp );
-			error = vevo_property_set( to_port, as_key, n, 1, &itmp );
+			vevo_property_get( port, key, 0, &itmp );
+			vevo_property_set( to_port, as_key, n, 1, &itmp );
 			break;
 		case VEVO_ATOM_TYPE_DOUBLE:
-			error = vevo_property_get( port, key, 0, &dtmp );
-			error = vevo_property_set( to_port, as_key, n, 1, &dtmp );
+			vevo_property_get( port, key, 0, &dtmp );
+			vevo_property_set( to_port, as_key, n, 1, &dtmp );
 			break;
 		case VEVO_ATOM_TYPE_BOOL:
-			error = vevo_property_get( port, key, 0, &itmp );
-			error = vevo_property_set( to_port, as_key, n, 1, &itmp );
+			vevo_property_get( port, key, 0, &itmp );
+			vevo_property_set( to_port, as_key, n, 1, &itmp );
 			break;
 		default:
 			veejay_msg(0, "Type %d cannot be cloned",n);

veejay-current/veejay-server/libvje/effects/water.c

@@ -503,12 +503,11 @@ void	water_apply(void *user_data, VJFrame *frame, VJFrame *frame2, int width, in
 	if(w->last_fresh_rate != fresh_rate)
 	{
 		w->last_fresh_rate = fresh_rate;
-		//vj_frame_clear1( w->map, 0,(w->map_h*w->map_w*2*sizeof(int)));
 		veejay_memset( w->map, 0, (w->map_h*w->map_w*2*sizeof(int)));
 	}
 	if(w->lastmode != mode )
 	{
-		vj_frame_clear1( w->map, 0, (w->map_h*w->map_w*2*sizeof(int)));
+		veejay_memset( w->map, 0, (w->map_h*w->map_w*2*sizeof(int)));
 		w->have_img = 0;
 		w->lastmode = mode;
 	}

veejay-current/veejay-server/libvjmem/memcpy.c

@@ -953,7 +953,7 @@ static void *fast_memcpy(void * to, const void * from, size_t len)
 		"movntps %%xmm2, 32(%1)\n"
 		"movntps %%xmm3, 48(%1)\n"
 		:: "r" (f), "r" (t) : "memory");
-		f=((const unsigned char *)f)+64;
+		f=((unsigned char *)f)+64;
 		t=((unsigned char *)t)+64;
 
 	}
@@ -1475,7 +1475,7 @@ void find_best_memset()
      if (best) {
           veejay_memset = memset_method[best].function;
      } else {
-		  veejay_memset = memset;
+		  veejay_memset = memset_method[1].function;
 	 }
 
      free( buf1 );

veejay-current/veejay-server/veejay/liblavplayvj.c

@@ -2035,7 +2035,6 @@ int veejay_init(veejay_t * info, int x, int y,char *arg, int def_tags, int gen_t
 		int plugrdy = 0;
 		for ( i = 0; i < total; i ++ ) {
 			int plugid = world[i];
-			veejay_msg(VEEJAY_MSG_DEBUG, "Plug index %d", plugid );
 			if( vj_tag_new( VJ_TAG_TYPE_GENERATOR, NULL,-1, el, info->pixel_format,
 					plugid, 0, 0 ) > 0 )
 				plugrdy++;

veejay-current/veejay-server/veejay/vj-composite.c

@@ -72,6 +72,7 @@ typedef struct
 	int has_mirror_plane;
 	int mirror_row_start;
 	int mirror_row_end;
+	int	ownback1;
 } composite_t;
 
 //@ round to multiple of 8
@@ -178,6 +179,12 @@ void	*composite_clone( void *compiz )
 void	composite_set_backing( void *compiz, void *vp )
 {
 	composite_t *c = (composite_t*) compiz;
+	if(c->ownback1) {
+		c->ownback1 = 0;
+		if(c->back1) {
+			viewport_destroy( c->back1 );
+		}	
+	}
 	c->back1 = vp;
 }
 
@@ -188,7 +195,7 @@ void	composite_destroy( void *compiz )
 	{
 		if(c->proj_plane[0]) free(c->proj_plane[0]);
 		if(c->vp1) viewport_destroy( c->vp1 );
-		if(c->back1) viewport_destroy(c->back1);
+		if(c->ownback1 && c->back1) { viewport_destroy(c->back1); c->back1 = NULL; c->ownback1 = 0; }
 		if(c->scaler)	yuv_free_swscaler( c->scaler );	
 		if(c->back_scaler) yuv_free_swscaler(c->back_scaler);
 		if(c->frame1) free(c->frame1);
@@ -244,6 +251,7 @@ void	*composite_load_config( void *compiz, void *vc, int *result )
 	if(res) {
 		if( c->back1 == NULL ) {
 			c->back1 = composite_clone(c );
+			c->ownback1 = 1;
 		}
 		viewport_update_from(c->vp1, c->back1 );
 		c->Y_only = cm;

veejay-current/veejay-server/veejay/vj-viewport.c

@@ -472,10 +472,8 @@ char *viewport_get_my_help(void *vv)
 
 	char tmp[1500];
 	char startup_mode[16];
-	sprintf(startup_mode, "%s", (v->initial_active==1 ? "Active" :"Inactive"  ));
-	int gw = v->grid_width;
-	int gh = v->grid_height;
-	sprintf(tmp, "Interactive Input/Projection calibration\nMouse Left: Set point\nCTRL + Cursor Keys: Finetune point\nMouse Left + RSHIFT: Set projection quad \nMouse Right: %s\nMouse Middle: Exit without saving\nMouse Middle + LSHIFT: Line Color\nCTRL + h:Hide/Show this Help\nCTRL + p:Enable/disable transform\nCTRL + a: %s on startup.\nCTRL + s: Exit this screen.\n%s\n\n",
+	snprintf(startup_mode,sizeof(startup_mode), "%s", (v->initial_active==1 ? "Active" :"Inactive"  ));
+	snprintf(tmp,sizeof(tmp), "Interactive Input/Projection calibration\nMouse Left: Set point\nCTRL + Cursor Keys: Finetune point\nMouse Left + RSHIFT: Set projection quad \nMouse Right: %s\nMouse Middle: Exit without saving\nMouse Middle + LSHIFT: Line Color\nCTRL + h:Hide/Show this Help\nCTRL + p:Enable/disable transform\nCTRL + a: %s on startup.\nCTRL + s: Exit this screen.\n%s\n\n",
 			reverse_mode,
 			startup_mode,
 			scroll_mode
@@ -490,8 +488,8 @@ char *viewport_get_my_status(void  *vv)
 	if(!v->user_ui )
 		return NULL;
 
-	float x = v->usermouse[2] / ( v->w / 100.0f );
-	float y = v->usermouse[3] / ( v->h / 100.0f );
+//	float x = v->usermouse[2] / ( v->w / 100.0f );
+//	float y = v->usermouse[3] / ( v->h / 100.0f );
 
 	float tx = vsx(v,v->usermouse[4]);
 	float ty = vsy(v,v->usermouse[5]);
@@ -743,9 +741,7 @@ static	float		msy(viewport_t *v, float y)
 		return y;
 	}
 	ui_t *u = v->ui;
-	int	    cx = v->w / 2;
 	int	    cy = v->h / 2;
-	int	    dx = cx - ( u->sw / 2 );
 	int	    dy = cy - ( u->sh / 2 );
 
 	float		a = (float) dy / ( v->h / 100.0f );
@@ -761,9 +757,7 @@ static	float		msx(viewport_t *v, float x)
 	}
 	ui_t *u = v->ui;
 	int	    cx = v->w / 2;
-	int	    cy = v->h / 2;
 	int	    dx = cx - ( u->sw / 2 );
-	int	    dy = cy - ( u->sh / 2 );
 
 	float		a = (float) dx / ( v->w / 100.0f );
 	float		s  = (float) v->w / (float) v->ui->sw;
@@ -778,9 +772,7 @@ static	float		vsx(viewport_t *v, float x)
 	}
 	ui_t *u = v->ui;
 	int	    cx = v->w / 2;
-	int	    cy = v->h / 2;
 	int	    dx = cx - ( u->sw / 2 );
-	int	    dy = cy - ( u->sh / 2 );
 
 	float		a = (float) dx / ( v->w / 100.0f );
 	float		s  = (float) v->w / (float) v->ui->sw;
@@ -792,9 +784,7 @@ static	float		vsy(viewport_t *v, float x)
 		return x;
 
 	ui_t *u = v->ui;
-	int	    cx = v->w / 2;
 	int	    cy = v->h / 2;
-	int	    dx = cx - ( u->sw / 2 );
 	int	    dy = cy - ( u->sh / 2 );
 
 	float		a = (float) dy / ( v->h / 100.0f );
@@ -825,7 +815,7 @@ static int		viewport_configure(
 
 	v->grid_width = grid_resolution;
 	v->grid_height = grid_resolution * rat;
-	float scale = 1.0f;//v->ui->scale;
+	
 	v->points[X0] = (float) x1 * (float) w / 100.0;
 	v->points[Y0] = (float) y1 * (float) h / 100.0;
 
@@ -924,10 +914,7 @@ static void		viewport_process( viewport_t *p )
 	const int32_t h = p->h;
 	const int32_t X = p->x0;
 	const int32_t Y = p->y0;
-	const int32_t W0 = p->w0;
-	const int32_t H0 = p->h0;
 
-	matrix_t *M = p->M;
 	matrix_t *m = p->m;
 
 	const int len = w * h;
@@ -953,7 +940,6 @@ static void		viewport_process( viewport_t *p )
 	int32_t itx,ity;
 
 	int32_t *map = p->map;
-	register int32_t pos = 0;
 
 	for( y = ty1; y < ty2; y ++ )
 	{
@@ -993,9 +979,6 @@ static void		viewport_process( viewport_t *p )
 
 static	void	viewport_prepare_process( viewport_t *v )
 {
-	const int32_t w = v->w;
-	const int32_t h = v->h;
-
 	const int32_t X = v->x0;
 	const int32_t Y = v->y0;
 
@@ -1037,9 +1020,6 @@ void		viewport_process_dynamic_map( void *data, uint8_t *in[3], uint8_t *out[3],
 	const int32_t h = v->h;
 	const int32_t X = v->x0;
 	const int32_t Y = v->y0;
-	const int32_t W0 = v->w0;
-	const int32_t H0 = v->h0;
-	matrix_t *M = v->M;
 	matrix_t *m = v->m;
 
 	const 	float xinc = m->m[0][0];
@@ -1174,7 +1154,6 @@ void		viewport_process_dynamic( void *data, uint8_t *in[3], uint8_t *out[3] )
 	const int32_t h = v->h;
 	const int32_t X = v->x0;
 	const int32_t Y = v->y0;
-	matrix_t *M = v->M;
 	matrix_t *m = v->m;
 
 	const 	float xinc = m->m[0][0];
@@ -1466,9 +1445,7 @@ void	*viewport_get_configuration(void *vv )
 {
 
 	viewport_t *v = (viewport_t*) vv;
-	viewport_config_t *o = (viewport_config_t*) vj_calloc(sizeof(viewport_config_t));
-
-
+	viewport_config_t *o = (viewport_config_t*) vj_calloc(sizeof(viewport_config_t)); //FIXME not always freed?
 	o->saved_w = v->saved_w;
 	o->saved_h = v->saved_h;
 	o->reverse = v->user_reverse;
@@ -2434,19 +2411,11 @@ int	viewport_finetune_coord(void *data, int screen_width, int screen_height,int
 	if(!v->user_ui)
 		return 0;
 
-	int width = v->w;
-	int height = v->h;
 	int point = -1;
 	int i;
 
 	//@ use screen width/height
 	double dist = 100.0;
-	int	    cx = v->w / 2;
-	int	    cy = v->h / 2;
-	int	    dx = cx - ( v->ui->sw / 2 );
-	int	    dy = cy - ( v->ui->sh / 2 );
-	float		scx  = (float) v->w / (float) v->ui->sw;
-	float		scy = (float) v->h / (float) v->ui->sh;
 	int	x = v->usermouse[4];
 	int	y = v->usermouse[5];
 	float p_cpy[9];
@@ -2528,8 +2497,6 @@ int	viewport_external_mouse( void *data, uint8_t *img[3], int sx, int sy, int bu
 		return 0;
 
 	int ch = 0;
-	int width = v->w;
-	int height = v->h;
 	int point = -1;
 	int i;
 
@@ -2575,11 +2542,6 @@ int	viewport_external_mouse( void *data, uint8_t *img[3], int sx, int sy, int bu
 	float tx = vsx(v,v->usermouse[4]);
 	float ty = vsy(v,v->usermouse[5]);
 
-
-	float bx = msx(v,tx);
-	float by = msy(v,ty);
-
-
 	for( i = 0; i < 4 ; i ++ )
 		v->users[ i ]  = 1;
 
@@ -2666,7 +2628,6 @@ int	viewport_external_mouse( void *data, uint8_t *img[3], int sx, int sy, int bu
 		ch = 1;
 	}
 
-	float rat = (v->h/(float)v->w);
 	if( button == 15 ) {
 		v->grid_mode --;
 		if(v->grid_mode < 0 ) 
@@ -2764,12 +2725,6 @@ void		viewport_push_frame(void *data, int w, int h, uint8_t *Y, uint8_t *U, uint
 {
 	viewport_t *v = (viewport_t*) data;
 	ui_t	   *u = v->ui;
-
-	float	    s = u->scale;
-
-	int	    nw = w * s;
-	int	    nh = h * s;
-
 	VJFrame *srci = yuv_yuv_template( Y, U,V, w,h, PIX_FMT_GRAY8 );
     VJFrame *dsti = yuv_yuv_template( u->buf[0],NULL,NULL,u->sw, u->sh, PIX_FMT_GRAY8); 
   
@@ -2785,12 +2740,10 @@ static void		viewport_translate_frame(void *data, uint8_t *plane )
 	int	    cx = v->w / 2;
 	int	    cy = v->h / 2;
 	int	     w = v->w;
-	int	     h = v->h;
 	int	    dx = cx - ( u->sw / 2 );
 	int	    dy = cy - ( u->sh / 2 );
 
 	int 		x,y;
-	int		 j = 0;
 
 	uint8_t		*img = u->buf[0];
 	for( y = 0; y < u->sh; y ++ ) {
@@ -2871,7 +2824,6 @@ static	void	viewport_draw_points(viewport_t *v, int width, int height, uint8_t *
 }
 static	void	viewport_compute_grid( viewport_t *v )
 {
-	int i;
 	int k = 0;
 	int gw = v->w/ v->grid_resolution;
 	int gh = v->h/v->grid_resolution;
@@ -2922,10 +2874,7 @@ static void	viewport_draw_col( void *data, uint8_t *plane, uint8_t *u, uint8_t *
 	int fx4 = (int)( msx(v,v->x4) *wx );
 	int fy4 = (int)( msy(v,v->y4) *wy );
 
-
-
 	const uint8_t p = v->grid_val;
-	const uint8_t uv = 128;
 
 	if(v->grid)
 		switch(v->grid_mode)
@@ -3016,7 +2965,7 @@ void	viewport_produce_full_img( void *vdata, uint8_t *img[3], uint8_t *out_img[3
 	viewport_t *v = (viewport_t*) vdata;
 	const int len = v->w * v->h;
 	register const int w = v->w;
-	register uint32_t i,j,n;
+	register uint32_t i,n;
 	const int32_t *map = v->map;
 	uint8_t *inY  = img[0];
 	uint8_t *inU  = img[1];
@@ -3067,7 +3016,7 @@ void	viewport_produce_bw_img( void *vdata, uint8_t *img[3], uint8_t *out_img[3],
 	viewport_t *v = (viewport_t*) vdata;
 	const int len = v->w * v->h;
 	register const int w = v->w;
-	register uint32_t i,j,n;
+	register uint32_t i,n;
 	const int32_t *map = v->map;
 	uint8_t *inY  = img[0];
 	uint8_t       *outY = out_img[0];
@@ -3121,7 +3070,6 @@ void	viewport_produce_full_img_yuyv( void *vdata, uint8_t *img[3], uint8_t *out_
 	register const	int32_t	ty1 = v->tty1;
 	register const	int32_t ty2 = v->tty2;
 	register const int w = v->w;
-	register const int h = v->h;
 	register const int uw = v->w >> 1;
 	register uint32_t i,x,y;
 	register int32_t n,m;
@@ -3194,13 +3142,11 @@ void viewport_render( void *vdata, uint8_t *in[3], uint8_t *out[3],int width, in
 	if( v->disable ) 
 		return;
 
-	int len = (width * height);
-
 	if(! v->user_ui )
 	{
 		const int len = v->w * v->h;
 		const int w = v->w;
-		register uint32_t i,j,n,block;
+		register uint32_t i,j,n;
 		const int32_t *map = v->map;
 		uint8_t *inY  = in[0];
 		uint8_t *inU  = in[1];
@@ -3423,7 +3369,6 @@ void 	viewport_save_xml(xmlNodePtr parent,void *vv)
 		NULL );
 
     char buffer[100];
-    xmlNodePtr childnode;
 
     sprintf(buffer, "%f", vc->x1);
     xmlNewChild(node, NULL, (const xmlChar *) "x1",