From 778a77df2dca3071da3262c0bf7368511164b136 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20Paul=20K=C3=BChne?= Date: Fri, 31 Mar 2006 16:12:31 +0000 Subject: [PATCH] * 2nd review of video* and control/telnet.c --- modules/control/telnet.c | 26 ++++++++++---------- modules/video_filter/adjust.c | 2 +- modules/video_filter/distort.c | 9 +++---- modules/video_filter/logo.c | 2 +- modules/video_filter/marq.c | 12 ++++----- modules/video_filter/mosaic.c | 34 +++++++++++++------------- modules/video_filter/motiondetect.c | 6 ++--- modules/video_filter/osdmenu.c | 2 +- modules/video_filter/rss.c | 14 +++++------ modules/video_filter/time.c | 6 ++--- modules/video_output/aa.c | 2 +- modules/video_output/directx/directx.c | 2 +- modules/video_output/directx/events.c | 4 +-- modules/video_output/directx/glwin32.c | 2 +- modules/video_output/ggi.c | 2 +- modules/video_output/opengl.c | 6 ++--- modules/video_output/qte/qte.cpp | 4 +-- modules/video_output/sdl.c | 2 +- modules/video_output/snapshot.c | 4 +-- modules/video_output/x11/glx.c | 8 +++--- modules/video_output/x11/xcommon.c | 2 +- modules/video_output/x11/xvideo.c | 2 +- 22 files changed, 76 insertions(+), 77 deletions(-) diff --git a/modules/control/telnet.c b/modules/control/telnet.c index 7b832068dc..751c501920 100644 --- a/modules/control/telnet.c +++ b/modules/control/telnet.c @@ -1,7 +1,7 @@ /***************************************************************************** * telnet.c: VLM interface plugin ***************************************************************************** - * Copyright (C) 2000-2005 the VideoLAN team + * Copyright (C) 2000-2006 the VideoLAN team * $Id$ * * Authors: Simon Latapie @@ -69,18 +69,18 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); -#define TELNETHOST_TEXT N_( "Telnet interface listen host" ) -#define TELNETHOST_LONGTEXT N_( "This is the host on which the telnet " \ +#define TELNETHOST_TEXT N_( "Host" ) +#define TELNETHOST_LONGTEXT N_( "This is the host on which the " \ "interface will listen. It defaults to all network interfaces (0.0.0.0)." \ - " If you want the telnet interface to be available only on the local " \ - "machine, enter 127.0.0.1" ) -#define TELNETPORT_TEXT N_( "Telnet interface port" ) -#define TELNETPORT_LONGTEXT N_( "This is the TCP port on which the telnet " \ - "interface will listen. It defaults to 4212" ) + " If you want this interface to be available only on the local " \ + "machine, enter \"127.0.0.1\"." ) +#define TELNETPORT_TEXT N_( "Port" ) +#define TELNETPORT_LONGTEXT N_( "This is the TCP port on which this " \ + "interface will listen. It defaults to 4212." ) #define TELNETPORT_DEFAULT 4212 -#define TELNETPWD_TEXT N_( "Telnet interface password" ) -#define TELNETPWD_LONGTEXT N_( "The telnet interface uses a single " \ - "administration password. The default value is \"admin\"." ) +#define TELNETPWD_TEXT N_( "Password" ) +#define TELNETPWD_LONGTEXT N_( "A single administration password is used " \ + "to protect this interface. The default value is \"admin\"." ) #define TELNETPWD_DEFAULT "admin" vlc_module_begin(); @@ -175,7 +175,7 @@ static int Open( vlc_object_t *p_this ) return VLC_EGENERIC; } - msg_Info( p_intf, "Using the VLM interface plugin..." ); + msg_Info( p_intf, "using the VLM interface plugin..." ); i_telnetport = config_GetInt( p_intf, "telnet-port" ); psz_address = config_GetPsz( p_intf, "telnet-host" ); @@ -197,7 +197,7 @@ static int Open( vlc_object_t *p_this ) return VLC_EGENERIC; } msg_Info( p_intf, - "Telnet interface started on interface %s %d", + "telnet interface started on interface %s %d", url.psz_host, url.i_port ); p_intf->p_sys->i_clients = 0; diff --git a/modules/video_filter/adjust.c b/modules/video_filter/adjust.c index f00c9f5080..c79ec440ca 100644 --- a/modules/video_filter/adjust.c +++ b/modules/video_filter/adjust.c @@ -59,7 +59,7 @@ static int SendEvents( vlc_object_t *, char const *, #define THRES_TEXT N_("Brightness threshold") #define THRES_LONGTEXT N_("When this mode is enabled, pixels will be " \ - "shown as black or white. The treshold value will be the brighness " \ + "shown as black or white. The threshold value will be the brighness " \ "defined below." ) #define CONT_TEXT N_("Image contrast (0-2)") #define CONT_LONGTEXT N_("Set the image contrast, between 0 and 2. Defaults to 1.") diff --git a/modules/video_filter/distort.c b/modules/video_filter/distort.c index ad1d564f5b..47da81f0cd 100644 --- a/modules/video_filter/distort.c +++ b/modules/video_filter/distort.c @@ -62,15 +62,15 @@ static int SendEvents ( vlc_object_t *, char const *, * Module descriptor *****************************************************************************/ #define MODE_TEXT N_("Distort mode") -#define MODE_LONGTEXT N_("Distort mode, one of \"wave\", \"ripple\", \"gradient\", \"edge\", \"hough\" and \"psychedelic\"") +#define MODE_LONGTEXT N_("Distort mode, one of \"wave\", \"ripple\", \"gradient\", \"edge\", \"hough\" and \"psychedelic\".") #define GRADIENT_TEXT N_("Gradient image type") #define GRADIENT_LONGTEXT N_("Gradient image type (0 or 1). 0 will " \ "turn the image to white while 1 will keep colors." ) #define CARTOON_TEXT N_("Apply cartoon effect") -#define CARTOON_LONGTEXT N_("Apply cartoon effect. Used by \"gradient\" " \ - "and \"edge\".") +#define CARTOON_LONGTEXT N_("Apply cartoon effect. It is only used by " \ + "\"gradient\" and \"edge\".") static char *mode_list[] = { "wave", "ripple", "gradient", "edge", "hough", "psychedelic" }; @@ -205,8 +205,7 @@ static int Create( vlc_object_t *p_this ) } else { - msg_Err( p_vout, "no valid distort mode provided, " - "using wave" ); + msg_Err( p_vout, "no valid distort mode provided, using wave" ); p_vout->p_sys->i_mode = WAVE; } } diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c index 31202c6c68..a4c0f51b5f 100644 --- a/modules/video_filter/logo.c +++ b/modules/video_filter/logo.c @@ -237,7 +237,7 @@ void __LoadLogoList( vlc_object_t *p_this, logo_list_t *p_logo_list ) if( !p_logo[i].p_pic ) { - msg_Warn( p_this, "Error while loading logo %s. It will be skipped", + msg_Warn( p_this, "error while loading logo %s, will be skipped", p_logo[i].psz_file ); } diff --git a/modules/video_filter/marq.c b/modules/video_filter/marq.c index 629a818317..d08f23446e 100644 --- a/modules/video_filter/marq.c +++ b/modules/video_filter/marq.c @@ -74,18 +74,18 @@ struct filter_sys_t }; #define MSG_TEXT N_("Text") -#define MSG_LONGTEXT N_("Marquee text to display") +#define MSG_LONGTEXT N_("Marquee text to display.") #define POSX_TEXT N_("X offset") -#define POSX_LONGTEXT N_("X offset, from the left screen edge" ) +#define POSX_LONGTEXT N_("X offset, from the left screen edge." ) #define POSY_TEXT N_("Y offset") -#define POSY_LONGTEXT N_("Y offset, down from the top" ) +#define POSY_LONGTEXT N_("Y offset, down from the top." ) #define TIMEOUT_TEXT N_("Timeout") #define TIMEOUT_LONGTEXT N_("Number of milliseconds the marquee must remain " \ - "display. Default value is " \ + "displayed. Default value is " \ "0 (remains forever).") #define OPACITY_TEXT N_("Opacity") #define OPACITY_LONGTEXT N_("Opacity (inverse of transparency) of " \ - "overlay text. 0 = transparent, 255 = totally opaque. " ) + "overlayed text. 0 = transparent, 255 = totally opaque. " ) #define SIZE_TEXT N_("Font size, pixels") #define SIZE_LONGTEXT N_("Font size, in pixels. Default is -1 (use default " \ "font size)." ) @@ -138,7 +138,7 @@ vlc_module_begin(); add_integer( "marq-timeout", 0, NULL, TIMEOUT_TEXT, TIMEOUT_LONGTEXT, VLC_FALSE ); - set_description( _("Marquee display sub filter") ); + set_description( _("Marquee display") ); add_shortcut( "marq" ); vlc_module_end(); diff --git a/modules/video_filter/mosaic.c b/modules/video_filter/mosaic.c index cda74d25ed..d12efb98f9 100644 --- a/modules/video_filter/mosaic.c +++ b/modules/video_filter/mosaic.c @@ -101,11 +101,11 @@ struct filter_sys_t #define YOFFSET_TEXT N_("Top left corner Y coordinate") #define YOFFSET_LONGTEXT N_("Y Coordinate of the top-left corner of the mosaic.") #define VBORDER_TEXT N_("Vertical border width") -#define VBORDER_LONGTEXT N_( "With in pixels of the border than can be drawn " \ - "vertically around the mosaic" ) +#define VBORDER_LONGTEXT N_( "Width in pixels of the border than can be "\ + "drawn vertically around the mosaic." ) #define HBORDER_TEXT N_("Horizontal border width") -#define HBORDER_LONGTEXT N_( "With in pixels of the border than can be drawn " \ - "horizontally around the mosaic" ) +#define HBORDER_LONGTEXT N_( "Width in pixels of the border than can "\ + "be drawn horizontally around the mosaic." ) #define ALIGN_TEXT N_("Mosaic alignment" ) #define ALIGN_LONGTEXT N_( \ @@ -758,7 +758,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, if( !strcmp( psz_var, "mosaic-alpha" ) ) { vlc_mutex_lock( &p_sys->lock ); - msg_Dbg( p_this, "Changing alpha from %d/255 to %d/255", + msg_Dbg( p_this, "changing alpha from %d/255 to %d/255", p_sys->i_alpha, newval.i_int); p_sys->i_alpha = __MIN( __MAX( newval.i_int, 0 ), 255 ); vlc_mutex_unlock( &p_sys->lock ); @@ -766,7 +766,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, else if( !strcmp( psz_var, "mosaic-height" ) ) { vlc_mutex_lock( &p_sys->lock ); - msg_Dbg( p_this, "Changing height from %dpx to %dpx", + msg_Dbg( p_this, "changing height from %dpx to %dpx", p_sys->i_height, newval.i_int ); p_sys->i_height = __MAX( newval.i_int, 0 ); vlc_mutex_unlock( &p_sys->lock ); @@ -774,7 +774,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, else if( !strcmp( psz_var, "mosaic-width" ) ) { vlc_mutex_lock( &p_sys->lock ); - msg_Dbg( p_this, "Changing width from %dpx to %dpx", + msg_Dbg( p_this, "changing width from %dpx to %dpx", p_sys->i_width, newval.i_int ); p_sys->i_width = __MAX( newval.i_int, 0 ); vlc_mutex_unlock( &p_sys->lock ); @@ -782,7 +782,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, else if( !strcmp( psz_var, "mosaic-xoffset" ) ) { vlc_mutex_lock( &p_sys->lock ); - msg_Dbg( p_this, "Changing x offset from %dpx to %dpx", + msg_Dbg( p_this, "changing x offset from %dpx to %dpx", p_sys->i_xoffset, newval.i_int ); p_sys->i_xoffset = __MAX( newval.i_int, 0 ); vlc_mutex_unlock( &p_sys->lock ); @@ -790,7 +790,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, else if( !strcmp( psz_var, "mosaic-yoffset" ) ) { vlc_mutex_lock( &p_sys->lock ); - msg_Dbg( p_this, "Changing y offset from %dpx to %dpx", + msg_Dbg( p_this, "changing y offset from %dpx to %dpx", p_sys->i_yoffset, newval.i_int ); p_sys->i_yoffset = __MAX( newval.i_int, 0 ); vlc_mutex_unlock( &p_sys->lock ); @@ -804,7 +804,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, newval.i_int = 5; while( pi_align_values[i_old] != p_sys->i_align ) i_old++; while( pi_align_values[i_new] != newval.i_int ) i_new++; - msg_Dbg( p_this, "Changing alignment from %d (%s) to %d (%s)", + msg_Dbg( p_this, "changing alignment from %d (%s) to %d (%s)", p_sys->i_align, ppsz_align_descriptions[i_old], newval.i_int, ppsz_align_descriptions[i_new] ); p_sys->i_align = newval.i_int; @@ -813,7 +813,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, else if( !strcmp( psz_var, "mosaic-vborder" ) ) { vlc_mutex_lock( &p_sys->lock ); - msg_Dbg( p_this, "Changing vertical border from %dpx to %dpx", + msg_Dbg( p_this, "changing vertical border from %dpx to %dpx", p_sys->i_vborder, newval.i_int ); p_sys->i_vborder = __MAX( newval.i_int, 0 ); vlc_mutex_unlock( &p_sys->lock ); @@ -821,7 +821,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, else if( !strcmp( psz_var, "mosaic-hborder" ) ) { vlc_mutex_lock( &p_sys->lock ); - msg_Dbg( p_this, "Changing horizontal border from %dpx to %dpx", + msg_Dbg( p_this, "changing horizontal border from %dpx to %dpx", p_sys->i_vborder, newval.i_int ); p_sys->i_hborder = __MAX( newval.i_int, 0 ); vlc_mutex_unlock( &p_sys->lock ); @@ -835,7 +835,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, else { vlc_mutex_lock( &p_sys->lock ); - msg_Dbg( p_this, "Changing position method from %d (%s) to %d (%s)", + msg_Dbg( p_this, "changing position method from %d (%s) to %d (%s)", p_sys->i_position, ppsz_pos_descriptions[p_sys->i_position], newval.i_int, ppsz_pos_descriptions[newval.i_int]); p_sys->i_position = newval.i_int; @@ -845,7 +845,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, else if( !strcmp( psz_var, "mosaic-rows" ) ) { vlc_mutex_lock( &p_sys->lock ); - msg_Dbg( p_this, "Changing number of rows from %d to %d", + msg_Dbg( p_this, "changing number of rows from %d to %d", p_sys->i_rows, newval.i_int ); p_sys->i_rows = __MAX( newval.i_int, 1 ); vlc_mutex_unlock( &p_sys->lock ); @@ -853,7 +853,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, else if( !strcmp( psz_var, "mosaic-cols" ) ) { vlc_mutex_lock( &p_sys->lock ); - msg_Dbg( p_this, "Changing number of columns from %d to %d", + msg_Dbg( p_this, "changing number of columns from %d to %d", p_sys->i_cols, newval.i_int ); p_sys->i_cols = __MAX( newval.i_int, 1 ); vlc_mutex_unlock( &p_sys->lock ); @@ -863,12 +863,12 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, vlc_mutex_lock( &p_sys->lock ); if( newval.i_int ) { - msg_Dbg( p_this, "Keep aspect ratio" ); + msg_Dbg( p_this, "keeping aspect ratio" ); p_sys->b_ar = 1; } else { - msg_Dbg( p_this, "Don't keep aspect ratio" ); + msg_Dbg( p_this, "won't keep aspect ratio" ); p_sys->b_ar = 0; } vlc_mutex_unlock( &p_sys->lock ); diff --git a/modules/video_filter/motiondetect.c b/modules/video_filter/motiondetect.c index 5f829ea23d..de88608e7e 100644 --- a/modules/video_filter/motiondetect.c +++ b/modules/video_filter/motiondetect.c @@ -53,9 +53,9 @@ static int SendEvents ( vlc_object_t *, char const *, * Module descriptor *****************************************************************************/ #define DESC_TEXT N_("Description file") -#define DESC_LONGTEXT N_("Description file, file containing simple playlist") +#define DESC_LONGTEXT N_("A file containing a simple playlist") #define HISTORY_TEXT N_("History parameter") -#define HISTORY_LONGTEXT N_("History parameter, number of frames used for detection") +#define HISTORY_LONGTEXT N_("The umber of frames used for detection.") vlc_module_begin(); set_description( _("Motion detect video filter") ); @@ -162,7 +162,7 @@ static int Create( vlc_object_t *p_this ) p_file = utf8_fopen( psz_descfilename, "r" ); if( !p_file ) { - msg_Err( p_this, "Failed to open descritpion file %s", + msg_Err( p_this, "Failed to open description file %s", psz_descfilename ); free( psz_descfilename ); free( p_vout->p_sys ); diff --git a/modules/video_filter/osdmenu.c b/modules/video_filter/osdmenu.c index 0d2846f797..acbe836790 100644 --- a/modules/video_filter/osdmenu.c +++ b/modules/video_filter/osdmenu.c @@ -114,7 +114,7 @@ vlc_module_begin(); OSD_UPDATE_LONGTEXT, VLC_TRUE ); set_capability( "sub filter", 100 ); - set_description( N_("On Screen Display menu subfilter") ); + set_description( N_("On Screen Display menu") ); set_shortname( N_("OSD menu") ); add_shortcut( "osdmenu" ); /* diff --git a/modules/video_filter/rss.c b/modules/video_filter/rss.c index d20978de64..fc0e2bd305 100644 --- a/modules/video_filter/rss.c +++ b/modules/video_filter/rss.c @@ -120,8 +120,8 @@ struct filter_sys_t #define MSG_TEXT N_("Feed URLs") #define MSG_LONGTEXT N_("RSS/Atom feed '|' (pipe) seperated URLs.") -#define SPEED_TEXT N_("Feeds speed") -#define SPEED_LONGTEXT N_("RSS/Atom feeds speed (bigger is slower).") +#define SPEED_TEXT N_("Speed of feeds") +#define SPEED_LONGTEXT N_("Speed of the RSS/Atom feeds (bigger is slower).") #define LENGTH_TEXT N_("Max length") #define LENGTH_LONGTEXT N_("Maximum number of characters displayed on the " \ "screen." ) @@ -137,7 +137,7 @@ struct filter_sys_t #define POSY_LONGTEXT N_("Y offset, down from the top." ) #define OPACITY_TEXT N_("Opacity") #define OPACITY_LONGTEXT N_("Opacity (inverse of transparency) of " \ - "overlay text. 0 = transparent, 255 = totally opaque. " ) + "overlay text. 0 = transparent, 255 = totally opaque." ) #define SIZE_TEXT N_("Font size, pixels") #define SIZE_LONGTEXT N_("Font size, in pixels. Default is -1 (use default " \ @@ -152,7 +152,7 @@ struct filter_sys_t #define POS_TEXT N_("Text position") #define POS_LONGTEXT N_( \ "You can enforce the text position on the video " \ - "(0=center, 1=left, 2=right, 4=top, 8=bottom, you can " \ + "(0=center, 1=left, 2=right, 4=top, 8=bottom; you can " \ "also use combinations of these values, eg 6 = top-right).") static int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 }; @@ -626,7 +626,7 @@ static int FetchRSS( filter_t *p_filter) p_feed->i_items = 0; p_feed->p_items = NULL; - msg_Dbg( p_filter, "Opening %s RSS/Atom feed ...", psz_feed ); + msg_Dbg( p_filter, "opening %s RSS/Atom feed ...", psz_feed ); p_stream = stream_UrlNew( p_filter, psz_feed ); if( !p_stream ) @@ -666,7 +666,7 @@ static int FetchRSS( filter_t *p_filter) return 1; } # ifdef RSS_DEBUG - msg_Dbg( p_filter, "element name : %s", psz_eltname ); + msg_Dbg( p_filter, "element name: %s", psz_eltname ); # endif if( !strcmp( psz_eltname, "item" ) /* rss */ || !strcmp( psz_eltname, "entry" ) ) /* atom */ @@ -862,7 +862,7 @@ static int FetchRSS( filter_t *p_filter) if( p_xml_reader && p_xml ) xml_ReaderDelete( p_xml, p_xml_reader ); if( p_stream ) stream_Delete( p_stream ); - msg_Dbg( p_filter, "Done with %s RSS/Atom feed.", psz_feed ); + msg_Dbg( p_filter, "done with %s RSS/Atom feed", psz_feed ); } free( psz_buffer_2 ); if( p_xml ) xml_Delete( p_xml ); diff --git a/modules/video_filter/time.c b/modules/video_filter/time.c index 54d89280a2..3107752665 100644 --- a/modules/video_filter/time.c +++ b/modules/video_filter/time.c @@ -69,14 +69,14 @@ struct filter_sys_t }; #define MSG_TEXT N_("Time format string (%Y%m%d %H%M%S)") -#define MSG_LONGTEXT N_("Time format string (%Y = year, %m = month, %d = day, %H = hour, %M = minute, %S = second") +#define MSG_LONGTEXT N_("Time format string (%Y = year, %m = month, %d = day, %H = hour, %M = minute, %S = second).") #define POSX_TEXT N_("X offset") #define POSX_LONGTEXT N_("X offset, from the left screen edge" ) #define POSY_TEXT N_("Y offset") #define POSY_LONGTEXT N_("Y offset, down from the top" ) #define OPACITY_TEXT N_("Opacity") #define OPACITY_LONGTEXT N_("Opacity (inverse of transparency) of " \ - "overlay text. 0 = transparent, 255 = totally opaque. " ) + "overlay text. 0 = transparent, 255 = totally opaque." ) #define SIZE_TEXT N_("Font size, pixels") #define SIZE_LONGTEXT N_("Font size, in pixels. Default is -1 (use default " \ @@ -92,7 +92,7 @@ struct filter_sys_t #define POS_LONGTEXT N_( \ "You can enforce the text position on the video " \ "(0=center, 1=left, 2=right, 4=top, 8=bottom, you can " \ - "also use combinations of these values, eg 6 = top-right).") + "also use combinations of these values, e.g. 6 = top-right).") static int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 }; static char *ppsz_pos_descriptions[] = diff --git a/modules/video_output/aa.c b/modules/video_output/aa.c index 2750a5eff8..4120a0bdf2 100644 --- a/modules/video_output/aa.c +++ b/modules/video_output/aa.c @@ -52,7 +52,7 @@ static void SetPalette ( vout_thread_t *, uint16_t *, uint16_t *, uint16_t * * Module descriptor *****************************************************************************/ vlc_module_begin(); - set_shortname( _("Ascii Art")); + set_shortname( _("ASCII Art")); set_category( CAT_VIDEO ); set_subcategory( SUBCAT_VIDEO_VOUT ); set_description( _("ASCII-art video output") ); diff --git a/modules/video_output/directx/directx.c b/modules/video_output/directx/directx.c index 4c430f5080..7de06ec0ab 100644 --- a/modules/video_output/directx/directx.c +++ b/modules/video_output/directx/directx.c @@ -907,7 +907,7 @@ BOOL WINAPI DirectXEnumCallback( GUID* p_guid, LPTSTR psz_desc, { rect.left = monitor_info.rcWork.left; rect.top = monitor_info.rcWork.top; - msg_Dbg( p_vout, "DirectXEnumCallback: Setting window " + msg_Dbg( p_vout, "DirectXEnumCallback: setting window " "position to %d,%d", rect.left, rect.top ); SetWindowPos( p_vout->p_sys->hwnd, NULL, rect.left, rect.top, 0, 0, diff --git a/modules/video_output/directx/events.c b/modules/video_output/directx/events.c index 71a8f61177..3add93b778 100644 --- a/modules/video_output/directx/events.c +++ b/modules/video_output/directx/events.c @@ -820,9 +820,9 @@ static long FAR PASCAL DirectXEventProc( HWND hwnd, UINT message, (LPVOID)p_vout ); /* send p_vout to WM_CREATE */ if( !p_vout->p_sys->hvideownd ) - msg_Warn( p_vout, "Can't create video sub-window" ); + msg_Warn( p_vout, "can't create video sub-window" ); else - msg_Dbg( p_vout, "Created video sub-window" ); + msg_Dbg( p_vout, "created video sub-window" ); break; case WM_PAINT: diff --git a/modules/video_output/directx/glwin32.c b/modules/video_output/directx/glwin32.c index bb2f559d0b..3a081c0ac7 100644 --- a/modules/video_output/directx/glwin32.c +++ b/modules/video_output/directx/glwin32.c @@ -222,7 +222,7 @@ static void CloseVideo( vlc_object_t *p_this ) { vout_thread_t * p_vout = (vout_thread_t *)p_this; - msg_Dbg( p_vout, "CloseVideo" ); + msg_Dbg( p_vout, "closing video" ); if( p_vout->p_sys->p_event ) { diff --git a/modules/video_output/ggi.c b/modules/video_output/ggi.c index 37825d2d43..01e9e86e78 100644 --- a/modules/video_output/ggi.c +++ b/modules/video_output/ggi.c @@ -530,7 +530,7 @@ static void SetPalette( vout_thread_t *p_vout, /* Set palette */ if( ggiSetPalette( p_vout->p_sys->p_display, 0, 256, colors ) < 0 ) { - msg_Err( p_vout, "failed setting palette" ); + msg_Err( p_vout, "failed to set palette" ); } } diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c index facc3ccf3a..d45f7c454d 100644 --- a/modules/video_output/opengl.c +++ b/modules/video_output/opengl.c @@ -121,7 +121,7 @@ static int SendEvents( vlc_object_t *, char const *, #define EFFECT_TEXT N_("Effect") #define EFFECT_LONGTEXT N_( \ - "Several OpenGL visual effects are available." ) + "Several visual OpenGL effects are available." ) static char *ppsz_effects[] = { "none", "cube", "transparent-cube" }; @@ -314,14 +314,14 @@ static int Init( vout_thread_t *p_vout ) malloc( p_sys->i_tex_width * p_sys->i_tex_height * i_pixel_pitch ); if( !p_sys->pp_buffer[0] ) { - msg_Err( p_vout, "Out of memory" ); + msg_Err( p_vout, "out of memory" ); return -1; } p_sys->pp_buffer[1] = malloc( p_sys->i_tex_width * p_sys->i_tex_height * i_pixel_pitch ); if( !p_sys->pp_buffer[1] ) { - msg_Err( p_vout, "Out of memory" ); + msg_Err( p_vout, "out of memory" ); return -1; } diff --git a/modules/video_output/qte/qte.cpp b/modules/video_output/qte/qte.cpp index c0cdcc0cb8..e5149efeb9 100644 --- a/modules/video_output/qte/qte.cpp +++ b/modules/video_output/qte/qte.cpp @@ -531,7 +531,7 @@ static int OpenDisplay( vout_thread_t *p_vout ) p_vout->i_window_height = p_vout->p_sys->i_height; #endif - msg_Dbg( p_vout, "OpenDisplay (h=%d,w=%d)",p_vout->p_sys->i_height,p_vout->p_sys->i_width); + msg_Dbg( p_vout, "opening display (h=%d,w=%d)",p_vout->p_sys->i_height,p_vout->p_sys->i_width); /* create thread to exec the qpe application */ if ( vlc_thread_create( p_vout->p_sys->p_event, "QT Embedded Thread", @@ -589,7 +589,7 @@ static void CloseDisplay( vout_thread_t *p_vout ) *****************************************************************************/ static void RunQtThread(event_thread_t *p_event) { - msg_Dbg( p_event->p_vout, "RunQtThread Starting" ); + msg_Dbg( p_event->p_vout, "RunQtThread starting" ); #ifdef NEED_QTE_MAIN if (qApp) diff --git a/modules/video_output/sdl.c b/modules/video_output/sdl.c index 9d3b3ba5ae..9cd4fd73ea 100644 --- a/modules/video_output/sdl.c +++ b/modules/video_output/sdl.c @@ -930,7 +930,7 @@ static void SetPalette( vout_thread_t *p_vout, /* Set palette */ if( SDL_SetColors( p_vout->p_sys->p_display, colors, 0, 256 ) == 0 ) { - msg_Err( p_vout, "failed setting palette" ); + msg_Err( p_vout, "failed to set palette" ); } } diff --git a/modules/video_output/snapshot.c b/modules/video_output/snapshot.c index fac9f8e3aa..6ae4e65ab5 100644 --- a/modules/video_output/snapshot.c +++ b/modules/video_output/snapshot.c @@ -72,7 +72,7 @@ static void Display ( vout_thread_t *, picture_t * ); vlc_module_begin( ); - set_description( _( "snapshot module" ) ); + set_description( _( "Snapshot module" ) ); set_shortname( N_("Snapshot") ); set_category( CAT_VIDEO ); @@ -150,7 +150,7 @@ static int Init( vout_thread_t *p_vout ) { if( strlen( psz_chroma ) < 4 ) { - msg_Err( p_vout, "snapshot-chroma should be 4 characters long." ); + msg_Err( p_vout, "snapshot-chroma should be 4 characters long" ); return VLC_EGENERIC; } i_chroma = VLC_FOURCC( psz_chroma[0], psz_chroma[1], diff --git a/modules/video_output/x11/glx.c b/modules/video_output/x11/glx.c index 23c89c2cf6..e1791baa4c 100644 --- a/modules/video_output/x11/glx.c +++ b/modules/video_output/x11/glx.c @@ -86,7 +86,7 @@ static void SwitchContext( vout_thread_t * ); *****************************************************************************/ #define ADAPTOR_TEXT N_("XVideo adaptor number") #define ADAPTOR_LONGTEXT N_( \ - "If you graphics card provides several adaptors, you have " \ + "If your graphics card provides several adaptors, you have " \ "to choose which one will be used (you shouldn't have to change this).") #define ALT_FS_TEXT N_("Alternate fullscreen method") @@ -187,7 +187,7 @@ static int CheckGLX( vlc_object_t *p_this, vlc_bool_t *b_glx13 ) p_display = XOpenDisplay( NULL ); if( p_display == NULL ) { - msg_Err( p_this, "Cannot open display" ); + msg_Err( p_this, "cannot open display" ); return VLC_EGENERIC; } @@ -215,12 +215,12 @@ static int CheckGLX( vlc_object_t *p_this, vlc_bool_t *b_glx13 ) if( i_maj <= 0 || ((i_maj == 1) && (i_min < 3)) ) { *b_glx13 = VLC_FALSE; - msg_Dbg( p_this, "Using GLX 1.2 API" ); + msg_Dbg( p_this, "using GLX 1.2 API" ); } else { *b_glx13 = VLC_TRUE; - msg_Dbg( p_this, "Using GLX 1.3 API" ); + msg_Dbg( p_this, "using GLX 1.3 API" ); } XCloseDisplay( p_display ); diff --git a/modules/video_output/x11/xcommon.c b/modules/video_output/x11/xcommon.c index d2dcbf2523..801b77c424 100644 --- a/modules/video_output/x11/xcommon.c +++ b/modules/video_output/x11/xcommon.c @@ -1314,7 +1314,7 @@ static int NewPicture( vout_thread_t *p_vout, picture_t *p_pic ) #ifdef HAVE_SYS_SHM_H if( p_pic->p_sys->p_image && p_vout->p_sys->b_shm ) { - msg_Warn( p_vout, "couldn't create SHM image, disabling SHM." ); + msg_Warn( p_vout, "couldn't create SHM image, disabling SHM" ); p_vout->p_sys->b_shm = VLC_FALSE; } #endif /* HAVE_SYS_SHM_H */ diff --git a/modules/video_output/x11/xvideo.c b/modules/video_output/x11/xvideo.c index 863da60737..daa258a07b 100644 --- a/modules/video_output/x11/xvideo.c +++ b/modules/video_output/x11/xvideo.c @@ -43,7 +43,7 @@ extern void E_(Deactivate) ( vlc_object_t * ); *****************************************************************************/ #define ADAPTOR_TEXT N_("XVideo adaptor number") #define ADAPTOR_LONGTEXT N_( \ - "If you graphics card provides several adaptors, you need to choose " \ + "If your graphics card provides several adaptors, you need to choose " \ "which one will be used (you shouldn't have to change this).") #define ALT_FS_TEXT N_("Alternate fullscreen method") -- 2.39.5