From 2776e8da15bf03e60f3f36b256f954716b47b0ae Mon Sep 17 00:00:00 2001 From: niels Date: Thu, 11 Jun 2015 22:53:35 +0200 Subject: [PATCH] remove some compile warnings --- .../veejay-server/bio2jack/bio2jack.c | 2 +- .../veejay-server/libplugger/frei0r-loader.h | 2 ++ .../veejay-server/libplugger/plugload.c | 36 +++++++++---------- .../veejay-server/libplugger/utility.c | 15 -------- .../veejay-server/libplugger/utility.h | 3 +- .../veejay-server/libsample/sampleadm.c | 5 +-- .../veejay-server/libstream/vj-tag.c | 8 ++--- veejay-current/veejay-server/libvevo/vevo.c | 1 - .../veejay-server/libvjmsg/vj-common.c | 1 - .../veejay-server/libvjnet/vj-client.c | 22 ++++-------- veejay-current/veejay-server/veejay/vj-misc.c | 2 +- 11 files changed, 34 insertions(+), 63 deletions(-) diff --git a/veejay-current/veejay-server/bio2jack/bio2jack.c b/veejay-current/veejay-server/bio2jack/bio2jack.c index b8b0899d..987f9049 100644 --- a/veejay-current/veejay-server/bio2jack/bio2jack.c +++ b/veejay-current/veejay-server/bio2jack/bio2jack.c @@ -502,7 +502,7 @@ ensure_buffer_size(char **buffer, unsigned long *cur_size, static int JACK_xrun_callback(void *arg) { - jack_driver_t *drv = (jack_driver_t *) arg; +// jack_driver_t *drv = (jack_driver_t *) arg; veejay_msg(1, "xrun detected. You are doing too much"); diff --git a/veejay-current/veejay-server/libplugger/frei0r-loader.h b/veejay-current/veejay-server/libplugger/frei0r-loader.h index 443a3c79..3f32f544 100644 --- a/veejay-current/veejay-server/libplugger/frei0r-loader.h +++ b/veejay-current/veejay-server/libplugger/frei0r-loader.h @@ -3,6 +3,8 @@ void* deal_with_fr( void *handle, char *name ); +void frei0r_destroy(); + void* frei0r_plug_init( void *plugin , int w, int h,int pf ); void frei0r_plug_deinit( void *plugin ); diff --git a/veejay-current/veejay-server/libplugger/plugload.c b/veejay-current/veejay-server/libplugger/plugload.c index c26e0bfd..a50fbc8b 100644 --- a/veejay-current/veejay-server/libplugger/plugload.c +++ b/veejay-current/veejay-server/libplugger/plugload.c @@ -77,7 +77,7 @@ static struct { { "/usr/lib/frei0r-1"}, { "/usr/local/lib64/frei0r-1"}, { "/usr/lib64/frei0r-1"}, - NULL, + { NULL }, }; //forward decl @@ -541,7 +541,6 @@ int plug_sys_detect_plugins(void) add_to_plugin_list( plugger_paths[i].path ); } - (VEEJAY_MSG_INFO, "Veejay plugin system initialized"); //@ the freeframe version we use is not compatible with 64 bit systems. So, lets see if long is size 4 //@ For every time there is a void* passed as int a gremlin will be happy if( sizeof(long) == 4 ) { @@ -628,8 +627,8 @@ void plug_get_defaults( void *instance, void *fx_values ) void plug_set_defaults( void *instance, void *fx_values ) { generic_clone_parameter_f gcp; - int error = vevo_property_get( instance, "HOST_plugin_param_clone_f", 0, &gcp ); - (*gcp)( instance, 0,fx_values ); + if( vevo_property_get( instance, "HOST_plugin_param_clone_f", 0, &gcp ) == VEVO_NO_ERROR ) + (*gcp)( instance, 0,fx_values ); } void plug_deactivate( void *instance ) @@ -814,22 +813,22 @@ void plug_build_name_space( int fx_id, void *fx_instance, void *data, int entry_ { void *plugin = index_map_[fx_id]; int type = 0; - int error = vevo_property_get( plugin, "HOST_plugin_type", 0, &type); - switch( type ) - { - case VEVO_PLUG_LIVIDO: - livido_plug_build_namespace( plugin, entry_id, fx_instance, data, sample_id, cbf, cb_data ); - break; - case VEVO_PLUG_FF: - break; - case VEVO_PLUG_FR: - break; - default: - break; + if( vevo_property_get( plugin, "HOST_plugin_type", 0, &type) == VEVO_NO_ERROR ) { + switch( type ) + { + case VEVO_PLUG_LIVIDO: + livido_plug_build_namespace( plugin, entry_id, fx_instance, data, sample_id, cbf, cb_data ); + break; + case VEVO_PLUG_FF: + break; + case VEVO_PLUG_FR: + break; + default: + break; + } } - } @@ -933,7 +932,8 @@ int plug_get_num_parameters( int fx_id ) return 0; int res = 0; - int error = vevo_property_get( index_map_[fx_id], "num_params",0,&res); + if( vevo_property_get( index_map_[fx_id], "num_params",0,&res) != VEVO_NO_ERROR ) + return 0; return res; } diff --git a/veejay-current/veejay-server/libplugger/utility.c b/veejay-current/veejay-server/libplugger/utility.c index 3834d4a8..5488c63b 100644 --- a/veejay-current/veejay-server/libplugger/utility.c +++ b/veejay-current/veejay-server/libplugger/utility.c @@ -42,21 +42,6 @@ char *get_str_vevo( void *port, const char *key ){ return vevo_property_get_string(port,key); } -char *alloc_str_vevo( void *port, const char *key ) -{ - size_t len = vevo_property_element_size( port, key,0 ); - char *ret = NULL; - - if(len<=0) return NULL; - - if( vevo_property_get( port, key,0,NULL ) != VEVO_NO_ERROR ) - return NULL; - - ret = (char*) vj_malloc(sizeof(char) * len ); - return ret; -} - - double *get_dbl_arr_vevo( void *port, const char *key ) { double *res = NULL; diff --git a/veejay-current/veejay-server/libplugger/utility.h b/veejay-current/veejay-server/libplugger/utility.h index 17ca46bb..f149e9e4 100644 --- a/veejay-current/veejay-server/libplugger/utility.h +++ b/veejay-current/veejay-server/libplugger/utility.h @@ -19,8 +19,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -char *get_str_vevo( void *port, const char *key ) __attribute__ ((deprecated )); -char *alloc_str_vevo( void *port, const char *key ) __attribute__ ((deprecated)); +char *get_str_vevo( void *port, const char *key ); double *get_dbl_arr_vevo( void *port, const char *key ); void clone_prop_vevo( void *port, void *to_port, const char *key, const char *as_key ); void util_convertrgba32( uint8_t **data, int w, int h,int in_pix_fmt,int shiftv, void *out_buffer ); diff --git a/veejay-current/veejay-server/libsample/sampleadm.c b/veejay-current/veejay-server/libsample/sampleadm.c index 096b6aa8..9a9fef5e 100644 --- a/veejay-current/veejay-server/libsample/sampleadm.c +++ b/veejay-current/veejay-server/libsample/sampleadm.c @@ -949,8 +949,6 @@ void sample_del_all(void *edl) int end = sample_size(); int i; - editlist *el = NULL; - void *port = vpn(VEVO_ANONYMOUS_PORT); for (i = 1; i < end; i++) { @@ -1430,7 +1428,7 @@ int sample_stop_playing(int s1, int new_s1) return 0; if (new_s1 && !newsample) return 0; - unsigned int i,j; + unsigned int i; //@ stop playing, if new_s1 @@ -2472,7 +2470,6 @@ int sample_set_editlist(int s1, editlist *edl) int sample_apply_loop_dec(int s1, double fps) { sample_info *sample = sample_get(s1); - int inc = (int) fps; if(!sample) return -1; /* if(sample->loop_dec==1) { if( (sample->first_frame + inc) >= sample->last_frame) { diff --git a/veejay-current/veejay-server/libstream/vj-tag.c b/veejay-current/veejay-server/libstream/vj-tag.c index 7111c213..769c980b 100644 --- a/veejay-current/veejay-server/libstream/vj-tag.c +++ b/veejay-current/veejay-server/libstream/vj-tag.c @@ -374,10 +374,10 @@ static struct { const char *name; } video_norm_[] = { - "pal", - "ntsc", - "auto", - NULL + {"pal"}, + {"ntsc"}, + {"auto"}, + {NULL} }; int _vj_tag_new_unicap( vj_tag * tag, int stream_nr, int width, int height, int device_num, diff --git a/veejay-current/veejay-server/libvevo/vevo.c b/veejay-current/veejay-server/libvevo/vevo.c index 99087c1f..9a2a8d01 100644 --- a/veejay-current/veejay-server/libvevo/vevo.c +++ b/veejay-current/veejay-server/libvevo/vevo.c @@ -1685,7 +1685,6 @@ int vevo_special_union_ports( void *port_a, void *port_b ) char **Ea = vevo_list_properties( port_a ); int i; - int error; if(!Ea) return 0; diff --git a/veejay-current/veejay-server/libvjmsg/vj-common.c b/veejay-current/veejay-server/libvjmsg/vj-common.c index b03feca5..633eb19d 100644 --- a/veejay-current/veejay-server/libvjmsg/vj-common.c +++ b/veejay-current/veejay-server/libvjmsg/vj-common.c @@ -168,7 +168,6 @@ void veejay_print_backtrace() #endif void veejay_backtrace_handler(int n , void *dist, void *x) { - siginfo_t *ist = (siginfo_t*) dist; switch(n) { case SIGSEGV: veejay_msg(VEEJAY_MSG_ERROR,"Found Gremlins in your system."); //@ Suggested by Matthijs diff --git a/veejay-current/veejay-server/libvjnet/vj-client.c b/veejay-current/veejay-server/libvjnet/vj-client.c index 45e77bab..8bf244ab 100644 --- a/veejay-current/veejay-server/libvjnet/vj-client.c +++ b/veejay-current/veejay-server/libvjnet/vj-client.c @@ -18,17 +18,18 @@ */ #include -#include +#include +#include #include +#include #include +#include #include #include #include #include #include -#include #include -#include #include #include #include @@ -37,8 +38,6 @@ #include #include #include -#include -#include #include #include #define VJC_OK 0 @@ -282,13 +281,8 @@ static int vj_client_packet_negotiate( vj_client *v, int *tokens ) int vj_client_read_frame_header( vj_client *v, int *w, int *h, int *fmt, int *compr_len, int *stride1,int *stride2, int *stride3 ) { - uint8_t line[128]; - uint32_t p[4] = {0, 0,0,0 }; - uint32_t strides[4] = { 0,0,0,0 }; - int tokens[16]; - - memset( tokens,0,sizeof(tokens)); + veejay_memset( tokens,0,sizeof(tokens)); int result = vj_client_packet_negotiate( v, tokens ); if( result == 0 ) { @@ -388,15 +382,11 @@ void vj_client_decompress_frame_data( vj_client *v, uint8_t *dst, int fmt, int w uint8_t *vj_client_read_i( vj_client *v, uint8_t *dst, ssize_t *dstlen, int *ret ) { - uint8_t line[128]; uint32_t p[4] = {0, 0,0,0 }; uint32_t strides[4] = { 0,0,0,0 }; int tokens[16]; - int n = 0; - int plen = 0; - int conv = 1; int y_len = 0; int uv_len = 0; @@ -537,7 +527,7 @@ int vj_client_send_buf(vj_client *v, int sock_type,unsigned char *buf, int len) } int vj_client_send(vj_client *v, int sock_type,unsigned char *buf) { - int len = strlen(buf); + int len = strlen( (const char*)buf); if( v->mcast ) { sprintf( v->blob, "V%03dD", len ); diff --git a/veejay-current/veejay-server/veejay/vj-misc.c b/veejay-current/veejay-server/veejay/vj-misc.c index 8b62c56c..1528d7dd 100644 --- a/veejay-current/veejay-server/veejay/vj-misc.c +++ b/veejay-current/veejay-server/veejay/vj-misc.c @@ -220,7 +220,7 @@ int vj_perform_take_bg(veejay_t *info, VJFrame *frame, int pass) { int n = 0; if( pass == 0 ) { - if(frame->ssm = 1 ) { + if(frame->ssm == 1 ) { n += vj_effect_prepare( frame, VJ_VIDEO_EFFECT_CHAMBLEND ); n += vj_effect_prepare( frame, VJ_IMAGE_EFFECT_CHAMELEON ); if(n > 0 )