diff --git a/veejay-current/veejay-client/src/gveejay.c b/veejay-current/veejay-client/src/gveejay.c index 15522572..169ae400 100644 --- a/veejay-current/veejay-client/src/gveejay.c +++ b/veejay-current/veejay-client/src/gveejay.c @@ -227,7 +227,7 @@ gint vj_gui_command_line (GApplication *app, n_tracks = 1 + arg_tracks; if( n_tracks < 1 || n_tracks > mt_get_max_tracks() ) n_tracks = 1; - if(verbosity) veejay_msg(VEEJAY_MSG_INFO, "TracXs parameted at %d", n_tracks); + if(verbosity) veejay_msg(VEEJAY_MSG_INFO, "Tracks parameted at %d", n_tracks); } if( arg_style ) { diff --git a/veejay-current/veejay-core/libvjnet/vj-server.c b/veejay-current/veejay-core/libvjnet/vj-server.c index b7569014..eab5fb68 100644 --- a/veejay-current/veejay-core/libvjnet/vj-server.c +++ b/veejay-current/veejay-core/libvjnet/vj-server.c @@ -288,7 +288,7 @@ static int _vj_server_classic(vj_server *vjs, int port_offset) if( setsockopt( vjs->handle, SOL_SOCKET, SO_RCVBUF, (const char*) &send_size, sizeof(send_size)) == 1 ) { - veejay_msg(0, "Cannot set recv buffer sze:%s", strerror(errno)); + veejay_msg(0, "Cannot set recv buffer size:%s", strerror(errno)); return 0; } if( getsockopt( vjs->handle, SOL_SOCKET, SO_RCVBUF, (unsigned char*) &(vjs->recv_size), &tmp) == -1 ) diff --git a/veejay-current/veejay-server/libplugger/frei0r-loader.c b/veejay-current/veejay-server/libplugger/frei0r-loader.c index 1f16e43f..cd66956d 100644 --- a/veejay-current/veejay-server/libplugger/frei0r-loader.c +++ b/veejay-current/veejay-server/libplugger/frei0r-loader.c @@ -758,7 +758,7 @@ void* deal_with_fr( void *handle, char *name) //@ cheap check for insane frei0r plugins if( (finfo.plugin_type == F0R_PLUGIN_TYPE_FILTER && processf == NULL) || (finfo.plugin_type == F0R_PLUGIN_TYPE_MIXER2 && processm == NULL) ) { - veejay_msg(0, "Frei0r plugin %s behaves badly",name); + veejay_msg(0, "Frei0r plugin %s misbehaves",name); (*f0r_deinit_func)(); vpf(port); return NULL; diff --git a/veejay-current/veejay-server/libplugger/livido-loader.c b/veejay-current/veejay-server/libplugger/livido-loader.c index f3e672fd..3747e7b4 100644 --- a/veejay-current/veejay-server/libplugger/livido-loader.c +++ b/veejay-current/veejay-server/libplugger/livido-loader.c @@ -675,7 +675,7 @@ static int init_ports_from_template( livido_port_t *filter_instance, livido_port { if(!init_channel_port( ptr,in_channels[i],w,h)) { - veejay_msg(0,"Unable to intialize output channel %d ",i ); + veejay_msg(0,"Unable to initialize output channel %d ",i ); return -1; } } diff --git a/veejay-current/veejay-server/libsample/sampleadm.c b/veejay-current/veejay-server/libsample/sampleadm.c index e5dfd8d2..d1024539 100644 --- a/veejay-current/veejay-server/libsample/sampleadm.c +++ b/veejay-current/veejay-server/libsample/sampleadm.c @@ -335,7 +335,7 @@ sample_info *sample_skeleton_new(long startFrame, long endFrame) if(endFrame <= startFrame ) { - veejay_msg(VEEJAY_MSG_ERROR,"End frame %ld must be greater then start frame %ld", endFrame, startFrame); + veejay_msg(VEEJAY_MSG_ERROR,"End frame %ld must be greater than start frame %ld", endFrame, startFrame); return NULL; } diff --git a/veejay-current/veejay-server/libstream/v4l2utils.c b/veejay-current/veejay-server/libstream/v4l2utils.c index 69bad8e7..cc15a12b 100644 --- a/veejay-current/veejay-server/libstream/v4l2utils.c +++ b/veejay-current/veejay-server/libstream/v4l2utils.c @@ -669,7 +669,7 @@ static int v4l2_negotiate_pixel_format( v4l2info *v, int host_fmt, int wid, int if( supported ) { veejay_msg(VEEJAY_MSG_DEBUG,"v4l2: Capture device supports JPEG format" ); if( v4l2_setup_avcodec_capture( v, wid,hei, CODEC_ID_MJPEG ) == 0 ) { - veejay_msg(VEEJAY_MSG_ERROR, "v4l2: Failed to intialize MJPEG decoder"); + veejay_msg(VEEJAY_MSG_ERROR, "v4l2: Failed to initialize MJPEG decoder"); return 0; } return 1; @@ -679,7 +679,7 @@ static int v4l2_negotiate_pixel_format( v4l2info *v, int host_fmt, int wid, int if( supported ) { veejay_msg(VEEJAY_MSG_DEBUG, "v4l2: Capture device supports MJPEG format"); if( v4l2_setup_avcodec_capture( v, wid,hei, CODEC_ID_MJPEG ) == 0 ) { - veejay_msg(VEEJAY_MSG_ERROR, "v4l2: Failed to intialize MJPEG decoder"); + veejay_msg(VEEJAY_MSG_ERROR, "v4l2: Failed to initialize MJPEG decoder"); return 0; } return 1; @@ -710,7 +710,7 @@ static int v4l2_negotiate_pixel_format( v4l2info *v, int host_fmt, int wid, int if( supported ) { veejay_msg(VEEJAY_MSG_DEBUG,"v4l2: Capture device supports JPEG format" ); if( v4l2_setup_avcodec_capture( v, wid,hei, CODEC_ID_MJPEG ) == 0 ) { - veejay_msg(VEEJAY_MSG_ERROR, "v4l2: Failed to intialize MJPEG decoder"); + veejay_msg(VEEJAY_MSG_ERROR, "v4l2: Failed to initialize MJPEG decoder"); return 0; } return 1; @@ -720,7 +720,7 @@ static int v4l2_negotiate_pixel_format( v4l2info *v, int host_fmt, int wid, int if( supported ) { veejay_msg(VEEJAY_MSG_DEBUG, "v4l2: Capture device supports MJPEG format"); if( v4l2_setup_avcodec_capture( v, wid,hei, CODEC_ID_MJPEG ) == 0 ) { - veejay_msg(VEEJAY_MSG_ERROR, "v4l2: Failed to intialize MJPEG decoder"); + veejay_msg(VEEJAY_MSG_ERROR, "v4l2: Failed to initialize MJPEG decoder"); return 0; } return 1; @@ -1805,7 +1805,7 @@ void v4l2_set_control( void *d, uint32_t type, int32_t value ) veejay_msg(VEEJAY_MSG_DEBUG, "v4l2: property type %s not supported",v4l2_get_property_name(type) ); } } else if ( queryctrl.flags & V4L2_CTRL_FLAG_DISABLED || queryctrl.flags & V4L2_CTRL_FLAG_INACTIVE ) { - veejay_msg( VEEJAY_MSG_DEBUG, "v4l2: property type %s not supported (disabld)",v4l2_get_property_name(type) ); + veejay_msg( VEEJAY_MSG_DEBUG, "v4l2: property type %s not supported (disabled)",v4l2_get_property_name(type) ); } else { memset(&control,0,sizeof(control)); control.id = type; diff --git a/veejay-current/veejay-server/veejay/liblavplayvj.c b/veejay-current/veejay-server/veejay/liblavplayvj.c index a02278aa..e3803988 100644 --- a/veejay-current/veejay-server/veejay/liblavplayvj.c +++ b/veejay-current/veejay-server/veejay/liblavplayvj.c @@ -750,7 +750,7 @@ void veejay_change_playback_mode( veejay_t *info, int new_pm, int sample_id ) veejay_msg(VEEJAY_MSG_INFO, "Sample %d starts playing from frame %d",sample_id,pos); } else { - veejay_msg(VEEJAY_MSG_INFO, "Already playing sample %d (continous mode is on)", sample_id); + veejay_msg(VEEJAY_MSG_INFO, "Already playing sample %d (continuous mode is on)", sample_id); } return; } @@ -1464,7 +1464,7 @@ void vj_unlock(veejay_t *info) } static void donothing2(int sig) { - veejay_msg(VEEJAY_MSG_WARNING,"Catched signal %x (ignored)",sig ); + veejay_msg(VEEJAY_MSG_WARNING,"Caught signal %x (ignored)",sig ); } static void veejay_event_handle(veejay_t *info) diff --git a/veejay-current/veejay-server/veejay/vj-event.c b/veejay-current/veejay-server/veejay/vj-event.c index 11909193..cbeba8cd 100644 --- a/veejay-current/veejay-server/veejay/vj-event.c +++ b/veejay-current/veejay-server/veejay/vj-event.c @@ -2192,7 +2192,7 @@ void vj_event_init(void *ptr) return; } if( !(keyboard_eventid_map = hash_create( MAX_KEY_MNE, int_bundle_compare, int_bundle_hash))) { - veejay_msg(VEEJAY_MSG_ERROR, "Cannot creating mapping between keyboard events and VIMS event identifiers"); + veejay_msg(VEEJAY_MSG_ERROR, "Cannot create mapping between keyboard events and VIMS event identifiers"); return; } #endif @@ -2382,7 +2382,7 @@ void vj_event_no_caching(void *ptr, const char format[], va_list ap) else { vj_el_setup_cache( v->current_edit_list ); - veejay_msg(VEEJAY_MSG_INFO,"Sample FX Cache enabled : Recycling identicial samples in FX chain (default)"); + veejay_msg(VEEJAY_MSG_INFO,"Sample FX Cache enabled : Recycling identical samples in FX chain (default)"); } vj_el_set_caching(v->no_caching); @@ -4365,7 +4365,7 @@ void vj_event_sample_rec_start( void *ptr, const char format[], va_list ap) if(args[0] <= 1 ) { - veejay_msg(VEEJAY_MSG_ERROR, "Cowardly refusing to record less then 2 frames"); + veejay_msg(VEEJAY_MSG_ERROR, "Cowardly refusing to record less than 2 frames"); return; } @@ -4518,7 +4518,7 @@ void vj_event_sample_set_start(void *ptr, const char format[], va_list ap) } else { - veejay_msg(VEEJAY_MSG_ERROR, "Sample %d 's starting position %d must be greater than ending position %d", + veejay_msg(VEEJAY_MSG_ERROR, "Sample %d's starting position %d must be greater than ending position %d", args[0],args[1], sample_get_endFrame(args[0])); } } @@ -4560,7 +4560,7 @@ void vj_event_sample_set_end(void *ptr, const char format[] , va_list ap) } else { - veejay_msg(0, "Ending position must be greater then start position"); + veejay_msg(0, "Ending position must be greater than start position"); } } @@ -4671,7 +4671,7 @@ void vj_event_stream_set_length( void *ptr, const char format[], va_list ap) constrain_stream( v, v->uc->sample_id, (long) args[0]); } else - veejay_msg(VEEJAY_MSG_ERROR, "Ficticious length must be 0 - 2160000"); + veejay_msg(VEEJAY_MSG_ERROR, "Fictitious length must be 0 - 2160000"); } else p_invalid_mode(); @@ -7132,7 +7132,7 @@ void vj_event_viewport_frontback(void *ptr, const char format[], va_list ap) composite_set_ui( v->composite, 2 ); v->settings->composite = 2; v->use_osd=3; - veejay_msg(VEEJAY_MSG_INFO, "You can now calibrate your projection/camera, press CTRL-s again to save and exit"); + veejay_msg(VEEJAY_MSG_INFO, "You can now calibrate your projection/camera, Press CTRL-s again to save and exit"); } } @@ -7370,7 +7370,7 @@ static void _vj_event_tag_record( veejay_t *v , int *args ) if(args[0] <= 1 ) { - veejay_msg(VEEJAY_MSG_ERROR, "Cowardly refusing to record less then 2 frames"); + veejay_msg(VEEJAY_MSG_ERROR, "Cowardly refusing to record less than 2 frames"); return; } @@ -7465,7 +7465,7 @@ void vj_event_tag_rec_offline_start(void *ptr, const char format[], va_list ap) if( v->settings->tag_record && STREAM_PLAYING(v) && v->uc->sample_id == v->settings->offline_tag_id) { - veejay_msg(VEEJAY_MSG_ERROR ,"Please stop the stream recorder on stream %d first", v->uc->sample_id); + veejay_msg(VEEJAY_MSG_ERROR ,"Please stop the stream recorder for stream %d first", v->uc->sample_id); return; } diff --git a/veejay-current/veejay-server/veejay/vj-share.c b/veejay-current/veejay-server/veejay/vj-share.c index 931ca23b..d1a5ccf4 100644 --- a/veejay-current/veejay-server/veejay/vj-share.c +++ b/veejay-current/veejay-server/veejay/vj-share.c @@ -101,7 +101,7 @@ int32_t vj_share_pull_master( void *shm, char *master_host, int master_port ) int32_t key = strtol( (char*)tmp, (char**) NULL, 10); - veejay_msg(VEEJAY_MSG_DEBUG, "Veejay sister at port %d says shared resoure ID is %d",master_port,key); + veejay_msg(VEEJAY_MSG_DEBUG, "Veejay sister at port %d says shared resource ID is %d",master_port,key); vj_client_send( c, V_CMD, (unsigned char*) "025:1;" ); //@ master starts writing frames to shm diff --git a/veejay-current/veejay-server/veejay/vj-split.c b/veejay-current/veejay-server/veejay/vj-split.c index c964bdb6..8033aacc 100644 --- a/veejay-current/veejay-server/veejay/vj-split.c +++ b/veejay-current/veejay-server/veejay/vj-split.c @@ -236,7 +236,7 @@ void *vj_split_new_from_file(char *filename, int out_w, int out_h, int vfmt) &row,&col,&port,hostname) ) { if(!split) { - veejay_msg(VEEJAY_MSG_ERROR,"Screen not intialized"); + veejay_msg(VEEJAY_MSG_ERROR,"Screen not initialized"); fclose(f); return NULL; }