From 4f15591e47d52903b559507bdac13e1f5176de45 Mon Sep 17 00:00:00 2001 From: Christophe Mutricy Date: Fri, 31 Mar 2006 23:07:01 +0000 Subject: [PATCH] Access/*: Second lecture (refs #438) --- modules/access/cdda.c | 8 ++++---- modules/access/cdda/access.c | 8 ++++---- modules/access/cdda/callback.c | 14 +++++++------- modules/access/cdda/cdda.c | 10 +++++----- modules/access/directory.c | 10 +++++----- modules/access/dshow/crossbar.cpp | 4 ++-- modules/access/dshow/dshow.cpp | 24 ++++++++++++------------ modules/access/dv.c | 2 +- modules/access/dvb/access.c | 2 +- modules/access/dvdnav.c | 2 +- modules/access/dvdread.c | 4 ++-- modules/access/fake.c | 2 +- modules/access/file.c | 2 +- modules/access/ftp.c | 2 +- modules/access/gnomevfs.c | 2 +- modules/access/http.c | 6 +++--- modules/access/mms/mms.c | 2 +- modules/access/mms/mmsh.c | 2 +- modules/access/mms/mmstu.c | 6 +++--- modules/access/rtsp/access.c | 2 +- modules/access/screen/screen.c | 2 +- modules/access/smb.c | 2 +- modules/access/tcp.c | 2 +- modules/access/udp.c | 4 ++-- modules/access/v4l/v4l.c | 2 +- modules/access/vcd/vcd.c | 3 ++- 26 files changed, 65 insertions(+), 64 deletions(-) diff --git a/modules/access/cdda.c b/modules/access/cdda.c index 4919d064f4..5b3dbf1bcc 100644 --- a/modules/access/cdda.c +++ b/modules/access/cdda.c @@ -68,7 +68,7 @@ vlc_module_begin(); add_bool( "cdda-separate-tracks", VLC_TRUE, NULL, NULL, NULL, VLC_TRUE ); add_integer( "cdda-track", -1 , NULL, NULL, NULL, VLC_TRUE ); add_string( "cddb-server", "freedb.freedb.org", NULL, - N_( "CDDB Server" ), N_( "Adress of the CDDB server to use." ), + N_( "CDDB Server" ), N_( "Address of the CDDB server to use." ), VLC_TRUE ); add_integer( "cddb-port", 8880, NULL, N_( "CDDB port" ), N_( "CDDB Server port to use." ), @@ -205,7 +205,7 @@ static int Open( vlc_object_t *p_this ) p_sys->i_track = i_track - 1; } - msg_Dbg( p_access, "Separate items : %i - Single track : %i", + msg_Dbg( p_access, "separate items : %i - single track : %i", p_sys->b_separate_items, p_sys->b_single_track ); if( p_sys->b_separate_items ) @@ -698,7 +698,7 @@ static void GetCDDBInfo( access_t *p_access, int i_titles, int *p_sectors ) if(! p_access->p_sys->p_disc ) { - msg_Err( p_access, "Unable to create CDDB disc structure." ); + msg_Err( p_access, "unable to create CDDB disc structure." ); goto cddb_end; } @@ -725,7 +725,7 @@ static void GetCDDBInfo( access_t *p_access, int i_titles, int *p_sectors ) if (i_matches > 0) { if (i_matches > 1) - msg_Warn( p_access, "Found %d matches in CDDB. Using first one.", + msg_Warn( p_access, "found %d matches in CDDB. Using first one.", i_matches); cddb_read( p_cddb, p_access->p_sys->p_disc ); diff --git a/modules/access/cdda/access.c b/modules/access/cdda/access.c index cba080a543..25599546fc 100644 --- a/modules/access/cdda/access.c +++ b/modules/access/cdda/access.c @@ -100,7 +100,7 @@ cdio_log_handler (cdio_log_level_t level, const char message[]) break; default: msg_Warn( p_cdda_input, message, - "The above message had unknown cdio log level", + "the above message had unknown cdio log level", level); } return; @@ -284,7 +284,7 @@ static block_t * CDDAReadBlocks( access_t * p_access ) p_block = block_New( p_access, i_blocks * CDIO_CD_FRAMESIZE_RAW ); if( !p_block) { - msg_Err( p_access, "Cannot get a new block of size: %i", + msg_Err( p_access, "cannot get a new block of size: %i", i_blocks * CDIO_CD_FRAMESIZE_RAW ); return NULL; } @@ -679,7 +679,7 @@ CDDAOpen( vlc_object_t *p_this ) || p_cdda->i_blocks_per_read > MAX_BLOCKS_PER_READ ) { msg_Warn( p_cdda_input, - "Number of blocks (%d) has to be between %d and %d. " + "number of blocks (%d) has to be between %d and %d. " "Using %d.", p_cdda->i_blocks_per_read, MIN_BLOCKS_PER_READ, MAX_BLOCKS_PER_READ, @@ -753,7 +753,7 @@ CDDAOpen( vlc_object_t *p_this ) cdio_cddap_verbose_set(p_cdda->paranoia_cd, CDDA_MESSAGE_PRINTIT, CDDA_MESSAGE_PRINTIT); if ( 0 != cdio_cddap_open(p_cdda->paranoia_cd) ) { - msg_Warn( p_cdda_input, "Unable to get paranoia support - " + msg_Warn( p_cdda_input, "unable to get paranoia support - " "continuing without it." ); p_cdda->e_paranoia = paranoia_none; } else { diff --git a/modules/access/cdda/callback.c b/modules/access/cdda/callback.c index 64c1d24d81..19916c8c48 100644 --- a/modules/access/cdda/callback.c +++ b/modules/access/cdda/callback.c @@ -36,7 +36,7 @@ CDDADebugCB ( vlc_object_t *p_this, const char *psz_name, if (p_cdda->i_debug & (INPUT_DBG_CALL|INPUT_DBG_EXT)) { - msg_Dbg( p_cdda_input, "Old debug (x%0x) %d, new debug (x%0x) %d", + msg_Dbg( p_cdda_input, "old debug (x%0x) %d, new debug (x%0x) %d", p_cdda->i_debug, p_cdda->i_debug, val.i_int, val.i_int); } p_cdda->i_debug = val.i_int; @@ -58,7 +58,7 @@ CDDBEnabledCB ( vlc_object_t *p_this, const char *psz_name, #ifdef HAVE_LIBCDDB if (p_cdda->i_debug & (INPUT_DBG_CALL|INPUT_DBG_EXT)) { - msg_Dbg( p_cdda_input, "Old CDDB Enabled (x%0x) %d, new (x%0x) %d", + msg_Dbg( p_cdda_input, "old CDDB Enabled (x%0x) %d, new (x%0x) %d", p_cdda->b_cddb_enabled, p_cdda->b_cddb_enabled, val.b_bool, val.b_bool); } @@ -79,7 +79,7 @@ CDTextEnabledCB ( vlc_object_t *p_this, const char *psz_name, if (p_cdda->i_debug & (INPUT_DBG_CALL|INPUT_DBG_EXT)) { - msg_Dbg( p_cdda_input, "Old CDText Enabled %d, new %d", + msg_Dbg( p_cdda_input, "old CDText Enabled %d, new %d", p_cdda->b_cdtext, val.b_bool); } p_cdda->b_cdtext = val.b_bool; @@ -99,7 +99,7 @@ CDDANavModeCB( vlc_object_t *p_this, const char *psz_name, if (p_cdda->i_debug & (INPUT_DBG_CALL|INPUT_DBG_EXT)) { msg_Dbg( p_cdda_input, - "Old Navigation Mode Enabled %d, new %d", + "old Navigation Mode Enabled %d, new %d", p_cdda->b_nav_mode, val.b_bool); } p_cdda->b_nav_mode = val.b_bool; @@ -119,7 +119,7 @@ CDTextPreferCB ( vlc_object_t *p_this, const char *psz_name, #ifdef HAVE_LIBCDDB if ( p_cdda->i_debug & (INPUT_DBG_CALL|INPUT_DBG_EXT)) { - msg_Dbg( p_cdda_input, "Old CDText Prefer (x%0x) %d, new (x%0x) %d", + msg_Dbg( p_cdda_input, "old CDText Prefer (x%0x) %d, new (x%0x) %d", p_cdda->b_cdtext_prefer, p_cdda->b_cdtext_prefer, val.b_bool, val.b_bool); } @@ -140,7 +140,7 @@ CDDABlocksPerReadCB ( vlc_object_t *p_this, const char *psz_name, if (p_cdda->i_debug & (INPUT_DBG_CALL|INPUT_DBG_EXT)) { - msg_Dbg( p_cdda_input, "Old blocks per read: %d, new %d", + msg_Dbg( p_cdda_input, "old blocks per read: %d, new %d", p_cdda->i_blocks_per_read, val.i_int); } @@ -150,7 +150,7 @@ CDDABlocksPerReadCB ( vlc_object_t *p_this, const char *psz_name, else { msg_Warn( p_cdda_input, - "Number of blocks (%d) has to be between %d and %d. No change.", + "number of blocks (%d) has to be between %d and %d. No change.", val.i_int, MIN_BLOCKS_PER_READ, MAX_BLOCKS_PER_READ ); } return VLC_SUCCESS; diff --git a/modules/access/cdda/cdda.c b/modules/access/cdda/cdda.c index c71f3b5bfb..a890350994 100644 --- a/modules/access/cdda/cdda.c +++ b/modules/access/cdda/cdda.c @@ -56,11 +56,11 @@ static char *psz_paranoia_list_text[] = { N_("none"), N_("overlap"), "libcddb (0x100) 256\n" ) #define CACHING_LONGTEXT N_( \ - "Allows you to modify the default caching value for CDDA streams. This " \ + "Caching value for CDDA streams. This " \ "value should be set in millisecond units." ) #define BLOCKS_PER_READ_LONGTEXT N_( \ - "Allows you to specify how many CD blocks to get on a single CD read. " \ + "How many CD blocks to get on a single CD read. " \ "Generally on newer/faster CDs, this increases throughput at the " \ "expense of a little more memory usage and initial delay. SCSI-MMC " \ "limitations generally don't allow for more than 25 blocks per access.") @@ -121,7 +121,7 @@ vlc_module_begin(); /* Configuration options */ add_integer ( MODULE_STRING "-debug", 0, CDDADebugCB, - N_("If nonzero, this gives additional debug information."), + N_("Additional debug"), DEBUG_LONGTEXT, VLC_TRUE ); add_integer( MODULE_STRING "-caching", @@ -158,7 +158,7 @@ vlc_module_begin(); NULL, #endif N_("Use Navigation-style playback?"), - N_("If set, tracks are navigated via Navagation rather than " + N_("Tracks are navigated via Navagation rather than " "a playlist entries"), VLC_FALSE ); @@ -178,7 +178,7 @@ vlc_module_begin(); CDDB_TITLE_FMT_LONGTEXT, VLC_TRUE ); add_bool( MODULE_STRING "-cddb-enabled", VLC_TRUE, CDDBEnabledCB, - N_("Do CDDB lookups?"), + N_("CDDB lookups"), N_("If set, lookup CD-DA track information using the CDDB " "protocol"), VLC_FALSE ); diff --git a/modules/access/directory.c b/modules/access/directory.c index 17419051d1..1438e2083c 100644 --- a/modules/access/directory.c +++ b/modules/access/directory.c @@ -437,7 +437,7 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name, i_dir_content = scandir( psz_name, &pp_dir_content, Filter, alphasort ); if( i_dir_content == -1 ) { - msg_Warn( p_playlist, "Failed to read directory" ); + msg_Warn( p_playlist, "failed to read directory" ); return VLC_EGENERIC; } else if( i_dir_content <= 0 ) @@ -479,7 +479,7 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name, if( lstat( psz_uri, &stat_data ) || S_ISLNK(stat_data.st_mode) ) { - msg_Dbg( p_playlist, "Skipping directory symlink %s", + msg_Dbg( p_playlist, "skipping directory symlink %s", psz_uri ); free( psz_uri ); continue; @@ -487,14 +487,14 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name, #endif if( i_mode == MODE_NONE ) { - msg_Dbg( p_playlist, "Skipping subdirectory %s", psz_uri ); + msg_Dbg( p_playlist, "skipping subdirectory %s", psz_uri ); free( psz_uri ); continue; } else if( i_mode == MODE_EXPAND ) { char *psz_newname, *psz_tmp; - msg_Dbg(p_playlist, "Reading subdirectory %s", psz_uri ); + msg_Dbg(p_playlist, "reading subdirectory %s", psz_uri ); psz_tmp = FromLocale( p_dir_content->d_name ); psz_newname = vlc_fix_readdir_charset( @@ -537,7 +537,7 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name, } if( a < i_extensions ) { - msg_Dbg( p_playlist, "Ignoring file %s", psz_uri ); + msg_Dbg( p_playlist, "ignoring file %s", psz_uri ); free( psz_uri ); continue; } diff --git a/modules/access/dshow/crossbar.cpp b/modules/access/dshow/crossbar.cpp index fe163391cb..0bc31763e3 100644 --- a/modules/access/dshow/crossbar.cpp +++ b/modules/access/dshow/crossbar.cpp @@ -208,7 +208,7 @@ HRESULT FindCrossbarRoutes( vlc_object_t *p_this, access_sys_t *p_sys, // remember connector type physicalType = inputPinPhysicalType; - msg_Dbg( p_this, "Found Existing Route For ouput %ld (type %ld) to input %ld (type %ld)", + msg_Dbg( p_this, "found existing route for ouput %ld (type %ld) to input %ld (type %ld)", outputPinIndex, outputPinPhysicalType, inputPinIndex, inputPinPhysicalType ); @@ -259,7 +259,7 @@ HRESULT FindCrossbarRoutes( vlc_object_t *p_this, access_sys_t *p_sys, p_sys->crossbar_routes[depth].AudioInputIndex = inputPinIndexRelated; p_sys->crossbar_routes[depth].AudioOutputIndex = outputPinIndexRelated; - msg_Dbg( p_this, "Crossbar at depth %d, Found Route For " + msg_Dbg( p_this, "crossbar at depth %d, found route for " "ouput %ld (type %ld) to input %ld (type %ld)", depth, outputPinIndex, outputPinPhysicalType, inputPinIndex, inputPinPhysicalType ); diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp index 09179af5ce..e851cd666d 100644 --- a/modules/access/dshow/dshow.cpp +++ b/modules/access/dshow/dshow.cpp @@ -78,7 +78,7 @@ static char *ppsz_tuner_input_text[] = #define CACHING_TEXT N_("Caching value in ms") #define CACHING_LONGTEXT N_( \ - "Default caching value for DirectShow streams. " \ + "Caching value for DirectShow streams. " \ "This value should be set in millisecondss." ) #define VDEV_TEXT N_("Video device name") #define VDEV_LONGTEXT N_( \ @@ -89,7 +89,7 @@ static char *ppsz_tuner_input_text[] = #define ADEV_LONGTEXT N_( \ "Name of the audio device that will be used by the " \ "DirectShow plugin. If you don't specify anything, the default device " \ - "will be used.") + "will be used. You can specify a standard size (cif, d1, ...) or x") #define SIZE_TEXT N_("Video size") #define SIZE_LONGTEXT N_( \ "Size of the video that will be displayed by the " \ @@ -102,7 +102,7 @@ static char *ppsz_tuner_input_text[] = #define FPS_TEXT N_("Video input frame rate") #define FPS_LONGTEXT N_( \ "Force the DirectShow video input to use a specific frame rate" \ - "(eg. 0 means default, 25, 29.97, 50, 59.94, etc.)") + "(eg. 0 means default, 25, 29.97, 50, 59.94, etc.)" #define CONFIG_TEXT N_("Device properties") #define CONFIG_LONGTEXT N_( \ "Show the properties dialog of the selected device before starting the " \ @@ -189,16 +189,16 @@ vlc_module_begin(); change_integer_list( pi_tuner_input, ppsz_tuner_input_text, 0 ); add_integer( "dshow-video-input", -1, NULL, VIDEO_IN_TEXT, - VIDEO_IN_LONGTEXT, VLC_TRUE ); + VIDEO_IN_LONGTEXT, VLC_TRUE ); add_integer( "dshow-audio-input", -1, NULL, AUDIO_IN_TEXT, - AUDIO_IN_LONGTEXT, VLC_TRUE ); + AUDIO_IN_LONGTEXT, VLC_TRUE ); add_integer( "dshow-video-output", -1, NULL, VIDEO_OUT_TEXT, - VIDEO_OUT_LONGTEXT, VLC_TRUE ); + VIDEO_OUT_LONGTEXT, VLC_TRUE ); add_integer( "dshow-audio-output", -1, NULL, AUDIO_OUT_TEXT, - AUDIO_OUT_LONGTEXT, VLC_TRUE ); + AUDIO_OUT_LONGTEXT, VLC_TRUE ); add_shortcut( "dshow" ); set_capability( "access_demux", 0 ); @@ -320,7 +320,7 @@ static int CommonOpen( vlc_object_t *p_this, access_sys_t *p_sys, static struct {char *psz_size; int i_width; int i_height;} size_table[] = { { "subqcif", 128, 96 }, { "qsif", 160, 120 }, { "qcif", 176, 144 }, - { "sif", 320, 240 }, { "cif", 352, 288 }, { "cif", 640, 480 }, + { "sif", 320, 240 }, { "cif", 352, 288 }, { "d1", 640, 480 }, { 0, 0, 0 }, }; @@ -1849,7 +1849,7 @@ static void ShowDeviceProperties( vlc_object_t *p_this, vlc_bool_t b_audio ) { HRESULT hr; - msg_Dbg( p_this, "Configuring Device Properties" ); + msg_Dbg( p_this, "configuring Device Properties" ); /* * Video or audio capture filter page @@ -1863,7 +1863,7 @@ static void ShowDeviceProperties( vlc_object_t *p_this, { IAMStreamConfig *p_SC; - msg_Dbg( p_this, "Showing WDM Audio Configuration Pages" ); + msg_Dbg( p_this, "showing WDM Audio Configuration Pages" ); hr = p_graph->FindInterface( &PIN_CATEGORY_CAPTURE, &MEDIATYPE_Audio, p_device_filter, @@ -1895,7 +1895,7 @@ static void ShowDeviceProperties( vlc_object_t *p_this, { IAMStreamConfig *p_SC; - msg_Dbg( p_this, "Showing WDM Video Configuration Pages" ); + msg_Dbg( p_this, "showing WDM Video Configuration Pages" ); hr = p_graph->FindInterface( &PIN_CATEGORY_CAPTURE, &MEDIATYPE_Interleaved, p_device_filter, @@ -1928,7 +1928,7 @@ static void ShowTunerProperties( vlc_object_t *p_this, vlc_bool_t b_audio ) { HRESULT hr; - msg_Dbg( p_this, "Configuring Tuner Properties" ); + msg_Dbg( p_this, "configuring Tuner Properties" ); if( !p_graph || b_audio ) return; diff --git a/modules/access/dv.c b/modules/access/dv.c index b3b624b80c..f71abb4136 100644 --- a/modules/access/dv.c +++ b/modules/access/dv.c @@ -67,7 +67,7 @@ static int Control( access_t *, int, va_list ); #define CACHING_TEXT N_("Caching value in ms") #define CACHING_LONGTEXT N_( \ - "Default caching value for DV streams. This" \ + "Caching value for DV streams. This" \ "value should be set in milliseconds." ) vlc_module_begin(); diff --git a/modules/access/dvb/access.c b/modules/access/dvb/access.c index 2115af1efa..977b0a1bc9 100644 --- a/modules/access/dvb/access.c +++ b/modules/access/dvb/access.c @@ -70,7 +70,7 @@ static void Close( vlc_object_t *p_this ); #define CACHING_TEXT N_("Caching value in ms") #define CACHING_LONGTEXT N_( \ - "Default caching value for DVB streams. This " \ + "Caching value for DVB streams. This " \ "value should be set in milliseconds." ) #define ADAPTER_TEXT N_("Adapter card to tune") diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c index 92646b1ed7..387b32762e 100644 --- a/modules/access/dvdnav.c +++ b/modules/access/dvdnav.c @@ -62,7 +62,7 @@ #define CACHING_TEXT N_("Caching value in ms") #define CACHING_LONGTEXT N_( \ - "Default caching value for DVDs. This "\ + "Caching value for DVDs. This "\ "value should be set in milliseconds." ) #define MENU_TEXT N_("Start directly in menu") #define MENU_LONGTEXT N_( \ diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c index 2c81283400..cb60704efd 100644 --- a/modules/access/dvdread.c +++ b/modules/access/dvdread.c @@ -56,11 +56,11 @@ *****************************************************************************/ #define ANGLE_TEXT N_("DVD angle") #define ANGLE_LONGTEXT N_( \ - "Allows you to select the default DVD angle." ) + "Default DVD angle." ) #define CACHING_TEXT N_("Caching value in ms") #define CACHING_LONGTEXT N_( \ - "Default caching value for DVDs. " \ + "Caching value for DVDs. " \ "This value should be set in milliseconds." ) #define CSSMETHOD_TEXT N_("Method used by libdvdcss for decryption") diff --git a/modules/access/fake.c b/modules/access/fake.c index b7bbf6ce31..d24bdb2161 100644 --- a/modules/access/fake.c +++ b/modules/access/fake.c @@ -39,7 +39,7 @@ static void Close( vlc_object_t * ); #define CACHING_TEXT N_("Caching value in ms") #define CACHING_LONGTEXT N_( \ - "Default caching value for fake streams. This " \ + "Caching value for fake streams. This " \ "value should be set in milliseconds." ) #define FPS_TEXT N_("Framerate") #define FPS_LONGTEXT N_( \ diff --git a/modules/access/file.c b/modules/access/file.c index 3ea508b21e..345c3ca909 100644 --- a/modules/access/file.c +++ b/modules/access/file.c @@ -79,7 +79,7 @@ static void Close( vlc_object_t * ); #define CACHING_TEXT N_("Caching value in ms") #define CACHING_LONGTEXT N_( \ - "Default caching value for files. This " \ + "Caching value for files. This " \ "value should be set in milliseconds." ) #define CAT_TEXT N_("Concatenate with additional files") #define CAT_LONGTEXT N_( \ diff --git a/modules/access/ftp.c b/modules/access/ftp.c index 95d34c5463..db37a0a31c 100644 --- a/modules/access/ftp.c +++ b/modules/access/ftp.c @@ -41,7 +41,7 @@ static void Close( vlc_object_t * ); #define CACHING_TEXT N_("Caching value in ms") #define CACHING_LONGTEXT N_( \ - "Default caching value for FTP streams. This " \ + "Caching value for FTP streams. This " \ "value should be set in milliseconds." ) #define USER_TEXT N_("FTP user name") #define USER_LONGTEXT N_("User name that will " \ diff --git a/modules/access/gnomevfs.c b/modules/access/gnomevfs.c index 817952ef5b..097c4e4683 100644 --- a/modules/access/gnomevfs.c +++ b/modules/access/gnomevfs.c @@ -43,7 +43,7 @@ static void Close( vlc_object_t * ); #define CACHING_TEXT N_("Caching value in ms") #define CACHING_LONGTEXT N_( \ - "Default caching value for GnomeVFS streams."\ + "Caching value for GnomeVFS streams."\ "This value should be set in milliseconds." ) vlc_module_begin(); diff --git a/modules/access/http.c b/modules/access/http.c index 123c70dfef..29be758225 100644 --- a/modules/access/http.c +++ b/modules/access/http.c @@ -52,7 +52,7 @@ static void Close( vlc_object_t * ); #define CACHING_TEXT N_("Caching value in ms") #define CACHING_LONGTEXT N_( \ - "Default caching value for HTTP streams. This " \ + "Caching value for HTTP streams. This " \ "value should be set in milliseconds." ) #define AGENT_TEXT N_("HTTP user agent") @@ -288,7 +288,7 @@ connect: { char *psz_login = NULL; char *psz_password = NULL; int i_ret; - msg_Dbg( p_access, "Authentication failed" ); + msg_Dbg( p_access, "authentication failed" ); i_ret = intf_UserLoginPassword( p_access, "HTTP authentication", "Please enter a valid login and password.", &psz_login, &psz_password ); if( i_ret == DIALOG_OK_YES ) @@ -364,7 +364,7 @@ connect: if( p_sys->b_mms ) { - msg_Dbg( p_access, "This is actually a live mms server, BAIL" ); + msg_Dbg( p_access, "this is actually a live mms server, BAIL" ); goto error; } diff --git a/modules/access/mms/mms.c b/modules/access/mms/mms.c index 00585681ec..d336b57e7c 100644 --- a/modules/access/mms/mms.c +++ b/modules/access/mms/mms.c @@ -45,7 +45,7 @@ static void Close( vlc_object_t * ); #define CACHING_TEXT N_("Caching value in ms") #define CACHING_LONGTEXT N_( \ - "Default caching value for MMS streams. This " \ + "Caching value for MMS streams. This " \ "value should be set in milliseconds." ) #define ALL_TEXT N_("Force selection of all streams") diff --git a/modules/access/mms/mmsh.c b/modules/access/mms/mmsh.c index 89cc1cc6cf..4d32bd1f88 100644 --- a/modules/access/mms/mmsh.c +++ b/modules/access/mms/mmsh.c @@ -761,7 +761,7 @@ static int GetPacket( access_t * p_access, chunk_t *p_ck ) } else { - msg_Warn( p_access, "Next stream follow but not supported" ); + msg_Warn( p_access, "next stream follow but not supported" ); return VLC_EGENERIC; } } diff --git a/modules/access/mms/mmstu.c b/modules/access/mms/mmstu.c index 71f5564ec3..457ab56a8d 100644 --- a/modules/access/mms/mmstu.c +++ b/modules/access/mms/mmstu.c @@ -650,10 +650,10 @@ static int MMSOpen( access_t *p_access, vlc_url_t *p_url, int i_proto ) switch( GetDWLE( p_sys->p_cmd + MMS_CMD_HEADERSIZE ) ) { case 0x0001: - msg_Dbg( p_access, "Media file name/path accepted" ); + msg_Dbg( p_access, "media file name/path accepted" ); break; case 0x0002: - msg_Dbg( p_access, "Authentication accepted" ); + msg_Dbg( p_access, "authentication accepted" ); break; case -1: default: @@ -868,7 +868,7 @@ static int MMSStart( access_t *p_access, uint32_t i_packet ) { /* get a packet */ mms_HeaderMediaRead( p_access, MMS_PACKET_MEDIA ); - msg_Dbg( p_access, "Streaming started" ); + msg_Dbg( p_access, "streaming started" ); return( 0 ); } } diff --git a/modules/access/rtsp/access.c b/modules/access/rtsp/access.c index 8372b30372..1d4d0ccd42 100644 --- a/modules/access/rtsp/access.c +++ b/modules/access/rtsp/access.c @@ -39,7 +39,7 @@ static void Close( vlc_object_t * ); #define CACHING_TEXT N_("Caching value (ms)") #define CACHING_LONGTEXT N_( \ - "Default caching value for RTSP streams. This " \ + "Caching value for RTSP streams. This " \ "value should be set in milliseconds." ) vlc_module_begin(); diff --git a/modules/access/screen/screen.c b/modules/access/screen/screen.c index 8f165ad9c7..fae5e95a38 100644 --- a/modules/access/screen/screen.c +++ b/modules/access/screen/screen.c @@ -36,7 +36,7 @@ *****************************************************************************/ #define CACHING_TEXT N_("Caching value in ms") #define CACHING_LONGTEXT N_( \ - "Default caching value for screen capture. "\ + "Caching value for screen capture. "\ "This value should be set in milliseconds." ) #define FPS_TEXT N_("Frame rate") #define FPS_LONGTEXT N_( \ diff --git a/modules/access/smb.c b/modules/access/smb.c index 569c12e67d..50bc3cc811 100644 --- a/modules/access/smb.c +++ b/modules/access/smb.c @@ -58,7 +58,7 @@ static void Close( vlc_object_t * ); #define CACHING_TEXT N_("Caching value in ms") #define CACHING_LONGTEXT N_( \ - "Default caching value for SMB streams. This " \ + "Caching value for SMB streams. This " \ "value should be set in milliseconds." ) #define USER_TEXT N_("SMB user name") #define USER_LONGTEXT N_("User name that will " \ diff --git a/modules/access/tcp.c b/modules/access/tcp.c index a5d64e71a4..e8690e6c1f 100644 --- a/modules/access/tcp.c +++ b/modules/access/tcp.c @@ -36,7 +36,7 @@ *****************************************************************************/ #define CACHING_TEXT N_("Caching value in ms") #define CACHING_LONGTEXT N_( \ - "Default caching value for TCP streams. This " \ + "Caching value for TCP streams. This " \ "value should be set in milliseconds." ) static int Open ( vlc_object_t * ); diff --git a/modules/access/udp.c b/modules/access/udp.c index 6f326336ed..0dec318d03 100644 --- a/modules/access/udp.c +++ b/modules/access/udp.c @@ -41,7 +41,7 @@ *****************************************************************************/ #define CACHING_TEXT N_("Caching value in ms") #define CACHING_LONGTEXT N_( \ - "Default caching value for UDP streams. This " \ + "Caching value for UDP streams. This " \ "value should be set in milliseconds." ) #define AUTO_MTU_TEXT N_("Autodetection of MTU") @@ -492,7 +492,7 @@ static block_t *BlockPrebufferRTP( access_t *p_access, block_t *p_block ) p = BlockParseRTP( p_access, BlockUDP( p_access )); if( !p && (i_date - i_first) > p_sys->i_rtp_late ) { - msg_Err( p_access, "Error in RTP prebuffering!" ); + msg_Err( p_access, "error in RTP prebuffering!" ); break; } } diff --git a/modules/access/v4l/v4l.c b/modules/access/v4l/v4l.c index a5aa7b5320..6ea1bc4fe8 100644 --- a/modules/access/v4l/v4l.c +++ b/modules/access/v4l/v4l.c @@ -72,7 +72,7 @@ static void Close( vlc_object_t * ); #define CACHING_TEXT N_("Caching value in ms") #define CACHING_LONGTEXT N_( \ - "Default caching value for V4L captures. This " \ + "Caching value for V4L captures. This " \ "value should be set in milliseconds." ) #define VDEV_TEXT N_("Video device name") #define VDEV_LONGTEXT N_( \ diff --git a/modules/access/vcd/vcd.c b/modules/access/vcd/vcd.c index a2ad185395..875b4d5c56 100644 --- a/modules/access/vcd/vcd.c +++ b/modules/access/vcd/vcd.c @@ -39,7 +39,7 @@ static void Close( vlc_object_t * ); #define CACHING_TEXT N_("Caching value in ms") #define CACHING_LONGTEXT N_( \ - "Default caching value for VCDs. This " \ + "Caching value for VCDs. This " \ "value should be set in milliseconds." ) vlc_module_begin(); @@ -496,3 +496,4 @@ static int EntryPoints( access_t *p_access ) return VLC_SUCCESS; } + -- 2.39.2