From b16c801c846f24b94b0aaee07f906cfa28a62f10 Mon Sep 17 00:00:00 2001 From: niels Date: Thu, 23 Apr 2015 22:47:38 +0200 Subject: [PATCH] drop obsolete function, remove dead code, remove dead vims event, fix some compile warnings --- veejay-current/veejay-server/libel/vj-el.c | 1 + .../veejay-server/libplugger/livido-loader.c | 4 +- .../veejay-server/libplugger/oscservit.c | 9 +-- .../veejay-server/libplugger/plugload.c | 5 +- .../veejay-server/libsamplerec/samplerecord.c | 4 +- .../veejay-server/libstream/vj-tag.c | 9 ++- veejay-current/veejay-server/libvevo/vevo.c | 25 +++++---- .../veejay-server/libvjmsg/vj-common.c | 56 ------------------- .../veejay-server/libvjmsg/vj-msg.h | 3 - veejay-current/veejay-server/libvjnet/dummy.c | 3 +- .../veejay-server/veejay/liblavplayvj.c | 5 -- veejay-current/veejay-server/veejay/vims.h | 1 - .../veejay-server/veejay/vj-composite.c | 2 +- .../veejay-server/veejay/vj-event.c | 28 ---------- .../veejay-server/veejay/vj-event.h | 1 - .../veejay-server/veejay/vj-eventman.c | 9 +-- veejay-current/veejay-server/veejay/vj-font.c | 2 +- .../veejay-server/veejay/vj-share.c | 9 ++- 18 files changed, 35 insertions(+), 141 deletions(-) diff --git a/veejay-current/veejay-server/libel/vj-el.c b/veejay-current/veejay-server/libel/vj-el.c index f1b949d2..d07323e2 100644 --- a/veejay-current/veejay-server/libel/vj-el.c +++ b/veejay-current/veejay-server/libel/vj-el.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include diff --git a/veejay-current/veejay-server/libplugger/livido-loader.c b/veejay-current/veejay-server/libplugger/livido-loader.c index af04b108..0b3cd921 100644 --- a/veejay-current/veejay-server/libplugger/livido-loader.c +++ b/veejay-current/veejay-server/libplugger/livido-loader.c @@ -1008,10 +1008,8 @@ char *livido_describe_parameter_format( void *instance, int p ) int n_elems = vevo_property_num_elements( param, "value" ); - char fmt[5]; + char fmt[3] = { 0,0,0 }; - bzero(fmt,5); - switch(kind) { case HOST_PARAM_INDEX: diff --git a/veejay-current/veejay-server/libplugger/oscservit.c b/veejay-current/veejay-server/libplugger/oscservit.c index afe971e5..2acdae7d 100644 --- a/veejay-current/veejay-server/libplugger/oscservit.c +++ b/veejay-current/veejay-server/libplugger/oscservit.c @@ -58,8 +58,7 @@ static char *osc_create_path( const char *base, const char *path ) { int n = strlen(base) + strlen(path) + 2; char *res = (char*) vj_malloc(n); - bzero(res,n); - sprintf(res,"%s/%s", base,path); + snprintf(res,n,"%s/%s", base,path); return res; } @@ -67,8 +66,7 @@ static char *osc_fx_pair_str( const char *base, const char *key ) { int n = strlen(base) + strlen(key) + 2; char *res = (char*) vj_malloc(n); - bzero(res,n); - snprintf( res,n, "%s/%s", base,key); + snprintf( res,n,"%s/%s", base,key); return res; } @@ -79,9 +77,8 @@ static char *vevo_str_to_liblo( const char *format ) if( n <= 0 ) return NULL; - char *res = (char*) vj_malloc( n ); + char *res = (char*) vj_calloc( n ); int k = 0; - bzero(res,n ); while(*format) { if(*format=='d' || *format=='s') diff --git a/veejay-current/veejay-server/libplugger/plugload.c b/veejay-current/veejay-server/libplugger/plugload.c index b382ed9a..39d44ac2 100644 --- a/veejay-current/veejay-server/libplugger/plugload.c +++ b/veejay-current/veejay-server/libplugger/plugload.c @@ -193,9 +193,8 @@ static int add_to_plugin_list( const char *path ) veejay_msg(VEEJAY_MSG_DEBUG, "'%s' marked as bad", name); continue; } - bzero(fullname , PATH_MAX+1); - sprintf(fullname, "%s/%s", path,name ); + snprintf(fullname,sizeof(fullname),"%s/%s", path,name ); void *handle = dlopen(fullname, RTLD_NOW ); @@ -422,7 +421,7 @@ static int scan_plugins() return 0; } - bzero( data, CONFIG_FILE_LEN ); + veejay_memset( data,0, sizeof(data)); if( read( fd, data, CONFIG_FILE_LEN ) > 0 ) { diff --git a/veejay-current/veejay-server/libsamplerec/samplerecord.c b/veejay-current/veejay-server/libsamplerec/samplerecord.c index 900fb5d0..3c7f7b3d 100644 --- a/veejay-current/veejay-server/libsamplerec/samplerecord.c +++ b/veejay-current/veejay-server/libsamplerec/samplerecord.c @@ -370,8 +370,8 @@ int sample_reset_autosplit(int s1) { sample_info *si = sample_get(s1); if(!si) return -1; - bzero( si->encoder_base, 255 ); - bzero( si->encoder_destination , 255 ); + veejay_memset( si->encoder_base,0,sizeof(si->encoder_base) ); + veejay_memset( si->encoder_destination,0,sizeof(si->encoder_destination) ); si->sequence_num = 0; return 1; } diff --git a/veejay-current/veejay-server/libstream/vj-tag.c b/veejay-current/veejay-server/libstream/vj-tag.c index f7717a36..d2d981b9 100644 --- a/veejay-current/veejay-server/libstream/vj-tag.c +++ b/veejay-current/veejay-server/libstream/vj-tag.c @@ -324,6 +324,7 @@ void vj_tag_record_init(int w, int h) int _vj_tag_new_net(vj_tag *tag, int stream_nr, int w, int h,int f, char *host, int port, int p, int type ) { + char tmp[1024]; vj_client *v; if( !host ) { veejay_msg(0, "No hostname given"); @@ -347,9 +348,7 @@ int _vj_tag_new_net(vj_tag *tag, int stream_nr, int w, int h,int f, char *host, veejay_msg(0, "Memory allocation error while creating network stream"); return 0; }*/ - char tmp[255]; - bzero(tmp,255); - snprintf(tmp,sizeof(tmp)-1, "%s %d", host, port ); + snprintf(tmp,sizeof(tmp), "%s %d", host, port ); tag->extra = (void*) strdup(tmp); int fmt= vj_tag_input->pix_fmt; @@ -2822,8 +2821,8 @@ int vj_tag_reset_autosplit(int s1) { vj_tag *si = vj_tag_get(s1); if(!si) return -1; - bzero( si->encoder_base, 255 ); - bzero( si->encoder_destination , 255 ); + veejay_memset( si->encoder_base, 0,sizeof(si->encoder_base) ); + veejay_memset( si->encoder_destination,0 , sizeof(si->encoder_destination) ); si->sequence_num = 0; return 1; } diff --git a/veejay-current/veejay-server/libvevo/vevo.c b/veejay-current/veejay-server/libvevo/vevo.c index 5a15df34..6bbff514 100644 --- a/veejay-current/veejay-server/libvevo/vevo.c +++ b/veejay-current/veejay-server/libvevo/vevo.c @@ -1790,7 +1790,7 @@ static char *vevo_format_inline_property( vevo_port_t *port, int n_elem, int typ { char *res = NULL; char token[5]; - bzero(token,5); + memset(token,0,sizeof(token)); switch(type) { case VEVO_ATOM_TYPE_INT: @@ -1840,7 +1840,7 @@ char *vevo_format_property( vevo_port_t *port, const char *key ) if( n_elem <= 0 ) n_elem = 1; - bzero(token,5); + memset(token,0,sizeof(token)); switch( atom_type ) { @@ -1889,8 +1889,8 @@ char *vevo_format_kind( vevo_port_t *port, const char *key ) char token[5]; int atom_type = vevo_property_atom_type( port, key ); - bzero(token,5); - + memset(token,0,sizeof(token)); + switch( atom_type ) { case VEVO_ATOM_TYPE_INT: @@ -2040,7 +2040,8 @@ int vevo_sscanf_property( vevo_port_t *port, const char *s) { int done = 0; char key[PROPERTY_KEY_SIZE]; - bzero(key, PROPERTY_KEY_SIZE ); + memset( key,0,sizeof(key)); + const char *value = vevo_split_token_(s, '=', key, PROPERTY_KEY_SIZE ); if(value==NULL) return 0; @@ -2085,12 +2086,12 @@ int vevo_sscanf_property( vevo_port_t *port, const char *s) while( *fmt != '\0' ) { char arg[256]; - bzero(arg,256); + memset(arg,0,sizeof(arg)); if( *fmt == 's' ) - p = vevo_split_token_q( p, ':', arg, 1024 ); + p = vevo_split_token_q( p, ':', arg, sizeof(arg) ); else - p = vevo_split_token_( p, ':', arg, 1024 ); + p = vevo_split_token_( p, ':', arg, sizeof(arg) ); if( p == NULL ) return 0; @@ -2305,7 +2306,7 @@ char *vevo_sprintf_property( vevo_port_t *port, const char *key ) while( *format && nerr == 0) { char tmp[1024]; - bzero(tmp,256); + memset(tmp,0,sizeof(tmp)); switch(*format) { case 'd': @@ -2430,12 +2431,12 @@ int vevo_property_from_string( vevo_port_t *port, const char *s, const char *key while( *fmt != '\0' ) { char arg[256]; - bzero(arg,256); + memset(arg,0,sizeof(arg)); if( *fmt == 's' ) - p = vevo_split_token_q( p, ':', arg, 1024 ); + p = vevo_split_token_q( p, ':', arg, sizeof(arg) ); else - p = vevo_split_token_( p, ':', arg, 1024 ); + p = vevo_split_token_( p, ':', arg,sizeof(arg) ); if( p == NULL ) { diff --git a/veejay-current/veejay-server/libvjmsg/vj-common.c b/veejay-current/veejay-server/libvjmsg/vj-common.c index a39346bc..ef029180 100644 --- a/veejay-current/veejay-server/libvjmsg/vj-common.c +++ b/veejay-current/veejay-server/libvjmsg/vj-common.c @@ -361,62 +361,6 @@ void veejay_msg(int type, const char format[], ...) va_end(args); } -char *veejay_pop_messages(int *num_lines, int *total_len) -{ - char *res = NULL; -/* if( _message_his_status == 0 ) - return res; - if( _message_history.w_index == 0 ) - return res; - int i; - int len = 0; - for( i = 0; i < _message_history.w_index ; i ++ ) - len += strlen( _message_history.msg[i] ); - if(len <= 0) - return res; - - res = (char*) vj_malloc(sizeof(char) * (len+1) ); - if(!res) - return NULL; - bzero(res, len ); - *num_lines = i; - - for( i = 0; i < _message_history.w_index ; i ++ ) - { - if( strlen(_message_history.msg[i]) > 0 ) - strcat( res, _message_history.msg[i] ); - } - *total_len = len; - _message_history.r_index ++; -*/ - return res; - -} - -int veejay_keep_messages(void) -{ -/* if( _message_history.r_index ) - return 0; -*/ - return 1; -} - -void veejay_reap_messages(void) -{ -/* for( i = 0; i < _message_history.w_index ; i ++ ) - { - if( _message_history.msg[i] ) - { - free(_message_history.msg[i] ); - _message_history.msg[i] = NULL; - } - } - - _message_his_status = 0; - _message_history.w_index = 0; -*/ -} - int veejay_get_file_ext( char *file, char *dst, int dlen) { int len = strlen(file)-1; diff --git a/veejay-current/veejay-server/libvjmsg/vj-msg.h b/veejay-current/veejay-server/libvjmsg/vj-msg.h index 9f26ebfc..65b8c848 100644 --- a/veejay-current/veejay-server/libvjmsg/vj-msg.h +++ b/veejay-current/veejay-server/libvjmsg/vj-msg.h @@ -38,9 +38,6 @@ extern void veejay_set_debug_level(int level); extern void veejay_set_colors(int level); extern void veejay_silent(); extern int veejay_is_silent(); -extern int veejay_keep_messages(void); -extern void veejay_reap_messages(void); -extern char *veejay_pop_messages(int *num_lines, int *total_len); extern int veejay_get_file_ext( char *file, char *dst, int dlen); extern void veejay_chomp_str( char *str, int *dlen ); extern int has_env_setting( const char *env, const char *value ); diff --git a/veejay-current/veejay-server/libvjnet/dummy.c b/veejay-current/veejay-server/libvjnet/dummy.c index 7adf170f..60eca9e1 100644 --- a/veejay-current/veejay-server/libvjnet/dummy.c +++ b/veejay-current/veejay-server/libvjnet/dummy.c @@ -23,6 +23,7 @@ */ #include +#include #include "vj-server.h" int main( int argc, char *argv[] ) @@ -58,7 +59,7 @@ int main( int argc, char *argv[] ) if( res > 0 ) { char tmp[4096]; - bzero(tmp,4096); + memset(tmp,0,sizeof(tmp)); while( vj_server_retrieve_msg(s,i, tmp ) ) { printf("recv [%s]\n", tmp ); diff --git a/veejay-current/veejay-server/veejay/liblavplayvj.c b/veejay-current/veejay-server/veejay/liblavplayvj.c index a72bebcb..6aed8583 100644 --- a/veejay-current/veejay-server/veejay/liblavplayvj.c +++ b/veejay-current/veejay-server/veejay/liblavplayvj.c @@ -390,8 +390,6 @@ int veejay_free(veejay_t * info) vj_mem_threaded_stop(); - veejay_reap_messages(); - vj_event_stop(); vj_tag_free(); @@ -2291,7 +2289,6 @@ static void veejay_playback_cycle(veejay_t * info) while (settings->state != LAVPLAY_STATE_STOP) { int current_speed = settings->current_playback_speed; - int gidx = 0; tdiff1 = 0.; tdiff2 = 0.; @@ -2321,8 +2318,6 @@ static void veejay_playback_cycle(veejay_t * info) } while (stats.tdiff > settings->spvf && (stats.nsync - first_free) < (QUEUE_LEN-1)); - int stuck = 0; - veejay_event_handle(info); #ifdef HAVE_JACK diff --git a/veejay-current/veejay-server/veejay/vims.h b/veejay-current/veejay-server/veejay/vims.h index 11407b5b..9f93dd45 100644 --- a/veejay-current/veejay-server/veejay/vims.h +++ b/veejay-current/veejay-server/veejay/vims.h @@ -53,7 +53,6 @@ enum { VIMS_STREAM_GET_V4L = 409, VIMS_CHAIN_GET_ENTRY = 410, VIMS_VIMS_LIST = 411, - VIMS_LOG = 412, VIMS_SAMPLE_INFO = 413, VIMS_SAMPLE_OPTIONS = 414, VIMS_DEVICE_LIST = 415, diff --git a/veejay-current/veejay-server/veejay/vj-composite.c b/veejay-current/veejay-server/veejay/vj-composite.c index 2f6599e8..f874895c 100644 --- a/veejay-current/veejay-server/veejay/vj-composite.c +++ b/veejay-current/veejay-server/veejay/vj-composite.c @@ -432,7 +432,7 @@ int composite_process(void *compiz, VJFrame *output, VJFrame *input, int which_v else if ( which_vp == 1 ) { int strides[4] = { input->len, input->len, input->len, 0 }; - vj_frame_copy( input, c->frame2, strides ); + vj_frame_copy( input->data, c->frame2->data, strides ); } return 1; } diff --git a/veejay-current/veejay-server/veejay/vj-event.c b/veejay-current/veejay-server/veejay/vj-event.c index fd2450b7..8bdc9e29 100644 --- a/veejay-current/veejay-server/veejay/vj-event.c +++ b/veejay-current/veejay-server/veejay/vj-event.c @@ -1730,10 +1730,6 @@ void vj_event_update_remote(void *ptr) } } - - if(!veejay_keep_messages()) - veejay_reap_messages(); - return; } @@ -8744,30 +8740,6 @@ void vj_event_send_sample_list ( void *ptr, const char format[], va_list ap ) free(s_print_buf); } -void vj_event_send_log ( void *ptr, const char format[], va_list ap ) -{ - veejay_t *v = (veejay_t*) ptr; - int num_lines = 0; - int str_len = 0; - char *messages = NULL; - - char *s_print_buf = get_print_buf(0); - - messages = veejay_pop_messages( &num_lines, &str_len ); - - if(str_len == 0 || num_lines == 0 ) - sprintf(s_print_buf, "%06d", 0); - else - sprintf(s_print_buf, "%06d%s", str_len, messages ); - if(messages) - free(messages); - - veejay_msg(VEEJAY_MSG_DEBUG, "\tDebug: send log %s", s_print_buf); - - SEND_MSG( v, s_print_buf ); - free(s_print_buf); -} - void vj_event_send_sample_stack ( void *ptr, const char format[], va_list ap ) { char line[32]; diff --git a/veejay-current/veejay-server/veejay/vj-event.h b/veejay-current/veejay-server/veejay/vj-event.h index b34d0ccc..848be67e 100644 --- a/veejay-current/veejay-server/veejay/vj-event.h +++ b/veejay-current/veejay-server/veejay/vj-event.h @@ -184,7 +184,6 @@ void vj_event_send_keylist( void *ptr, const char format[], va_list ap ); void vj_event_send_tag_list ( void *ptr, const char format[], va_list ap ); void vj_event_send_working_dir(void *ptr, const char format[], va_list ap); void vj_event_send_sample_list ( void *ptr, const char format[], va_list ap ); -void vj_event_send_log ( void *ptr, const char format[], va_list ap ); void vj_event_send_chain_list ( void *ptr, const char format[], va_list ap ); void vj_event_send_chain_entry ( void *ptr, const char format[], va_list ap ); void vj_event_send_chain_entry_parameters ( void *ptr, const char format[], va_list ap ); diff --git a/veejay-current/veejay-server/veejay/vj-eventman.c b/veejay-current/veejay-server/veejay/vj-eventman.c index 65af64f1..476c0ccc 100644 --- a/veejay-current/veejay-server/veejay/vj-eventman.c +++ b/veejay-current/veejay-server/veejay/vj-eventman.c @@ -2054,14 +2054,7 @@ void vj_init_vevo_events(void) 0, VIMS_ALLOW_ANY, NULL ); - index_map_[VIMS_LOG] = _new_event( - NULL, - VIMS_LOG, - "GUI: Get console output", - vj_event_send_log, - 0, - VIMS_ALLOW_ANY, - NULL ); + index_map_[VIMS_CHAIN_LIST] = _new_event( "%d", VIMS_CHAIN_LIST, diff --git a/veejay-current/veejay-server/veejay/vj-font.c b/veejay-current/veejay-server/veejay/vj-font.c index 57c87d7f..8eb9d8e0 100644 --- a/veejay-current/veejay-server/veejay/vj-font.c +++ b/veejay-current/veejay-server/veejay/vj-font.c @@ -1481,7 +1481,7 @@ void *vj_font_get_dict(void *font) { vj_font_t *f = (vj_font_t*) font; if(f == NULL ) - return; + return NULL; return f->dictionary; } diff --git a/veejay-current/veejay-server/veejay/vj-share.c b/veejay-current/veejay-server/veejay/vj-share.c index 3c102214..2809dc4d 100644 --- a/veejay-current/veejay-server/veejay/vj-share.c +++ b/veejay-current/veejay-server/veejay/vj-share.c @@ -48,15 +48,14 @@ static vj_client *vj_share_connect(char *hostname, int port) return c; } static void vj_flush(vj_client *sayvims,int frames) { - int n = 0; - char status[100]; - bzero(status,100); + char status[128]; + memset(status,0,sizeof(status)); while(frames>0) { if( vj_client_poll(sayvims, V_STATUS )) { char sta_len[6]; - bzero(sta_len, 6 ); + memset(sta_len,0,sizeof(sta_len)); int nb = vj_client_read( sayvims, V_STATUS, sta_len, 5 ); if( nb <= 0 ) break; @@ -66,7 +65,7 @@ static void vj_flush(vj_client *sayvims,int frames) { sscanf( sta_len + 1, "%03d", &bytes ); if(bytes > 0 ) { - bzero(status, 100); + memset(status,0,sizeof(status)); int n = vj_client_read(sayvims,V_STATUS,status,bytes); if( n ) {