Commit 0ade81b0 authored by Christophe Mutricy's avatar Christophe Mutricy
Browse files

All: string review (refs: #438)

parent e970f05f
......@@ -156,7 +156,7 @@ static int Demux( demux_t *p_demux )
ASF_GetGUID( &guid, p_peek );
if( ASF_CmpGUID( &guid, &asf_object_header_guid ) )
{
msg_Warn( p_demux, "Found a new ASF header" );
msg_Warn( p_demux, "found a new ASF header" );
/* We end this stream */
DemuxEnd( p_demux );
......@@ -366,7 +366,7 @@ static int DemuxPacket( demux_t *p_demux )
i_packet_send_time = GetDWLE( p_peek + i_skip ); i_skip += 4;
i_packet_duration = GetWLE( p_peek + i_skip ); i_skip += 2;
// i_packet_size_left = i_packet_length; // XXX donn�s reellement lu
// i_packet_size_left = i_packet_length; // XXX data really read
/* FIXME I have to do that for some file, I don't known why */
i_packet_size_left = i_data_packet_min;
......
......@@ -717,7 +717,7 @@ static int ASF_ReadObject_content_description(stream_t *s, asf_object_t *p_obj)
#ifdef ASF_DEBUG
msg_Dbg( s,
"Read \"content description object\" title:\"%s\" author:\"%s\" copyright:\"%s\" description:\"%s\" rating:\"%s\"",
"read \"content description object\" title:\"%s\" author:\"%s\" copyright:\"%s\" description:\"%s\" rating:\"%s\"",
p_cd->psz_title,
p_cd->psz_author,
p_cd->psz_copyright,
......@@ -779,7 +779,7 @@ static int ASF_ReadObject_language_list(stream_t *s, asf_object_t *p_obj)
}
#ifdef ASF_DEBUG
msg_Dbg( s, "Read \"language list object\" %d entries",
msg_Dbg( s, "read \"language list object\" %d entries",
p_ll->i_language );
for( i = 0; i < p_ll->i_language; i++ )
msg_Dbg( s, " - '%s'",
......@@ -825,7 +825,7 @@ static int ASF_ReadObject_stream_bitrate_properties( stream_t *s,
}
#ifdef ASF_DEBUG
msg_Dbg( s,"Read \"stream bitrate properties object\"" );
msg_Dbg( s,"read \"stream bitrate properties object\"" );
for( i = 0; i < p_sb->i_bitrate; i++ )
{
msg_Dbg( s," - stream=%d bitrate=%d",
......@@ -924,7 +924,7 @@ static int ASF_ReadObject_extended_stream_properties( stream_t *s,
}
#ifdef ASF_DEBUG
msg_Dbg( s, "Read \"extended stream properties object\":" );
msg_Dbg( s, "read \"extended stream properties object\":" );
msg_Dbg( s, " - start="I64Fd" end="I64Fd,
p_esp->i_start_time, p_esp->i_end_time );
msg_Dbg( s, " - data bitrate=%d buffer=%d initial fullness=%d",
......@@ -991,7 +991,7 @@ static int ASF_ReadObject_advanced_mutual_exclusion( stream_t *s,
}
#ifdef ASF_DEBUG
msg_Dbg( s, "Read \"advanced mutual exclusion object\"" );
msg_Dbg( s, "read \"advanced mutual exclusion object\"" );
for( i = 0; i < p_ae->i_stream_number_count; i++ )
msg_Dbg( s, " - stream=%d", p_ae->pi_stream_number[i] );
#endif
......@@ -1033,7 +1033,7 @@ static int ASF_ReadObject_stream_prioritization( stream_t *s,
p_sp->pi_priority_flag[i] = GetWLE( p_data ); p_data += 2;
}
#ifdef ASF_DEBUG
msg_Dbg( s, "Read \"stream prioritization object\"" );
msg_Dbg( s, "read \"stream prioritization object\"" );
for( i = 0; i < p_sp->i_priority_count; i++ )
msg_Dbg( s, " - Stream:%d flags=0x%x",
p_sp->pi_priority_stream_number[i],
......@@ -1137,7 +1137,7 @@ static int ASF_ReadObject_extended_content_description( stream_t *s,
}
#ifdef ASF_DEBUG
msg_Dbg( s, "Read \"extended content description object\"" );
msg_Dbg( s, "read \"extended content description object\"" );
for( i = 0; i < p_ec->i_count; i++ )
msg_Dbg( s, " - '%s' = '%s'",
p_ec->ppsz_name[i],
......
......@@ -40,7 +40,7 @@
*****************************************************************************/
#define INTERLEAVE_TEXT N_("Force interleaved method" )
#define INTERLEAVE_LONGTEXT N_( "Force interleaved method" )
#define INTERLEAVE_LONGTEXT N_( "Force interleaved method." )
#define INDEX_TEXT N_("Force index creation")
#define INDEX_LONGTEXT N_( \
......
......@@ -191,7 +191,7 @@ static int Activate( vlc_object_t * p_this )
/* Allocate p_m3u */
p_demux->p_sys = malloc( sizeof( demux_sys_t ) );
p_demux->p_sys->i_type = i_type;
msg_Dbg( p_this, "Playlist type: %d - %d", i_type, i_type2 );
msg_Dbg( p_this, "playlist type: %d - %d", i_type, i_type2 );
return VLC_SUCCESS;
}
......
......@@ -43,7 +43,7 @@ static void Close( vlc_object_t * );
#define FPS_TEXT N_("Frames per Second")
#define FPS_LONGTEXT N_("This is the desired frame rate when " \
"playing MJPEG from a file. Use 0 (this is the default value) for a " \
"live stream (from the camera).")
"live stream (from a camera).")
vlc_module_begin();
set_shortname( "MJPEG");
......@@ -236,7 +236,7 @@ static vlc_bool_t CheckMimeHeader( demux_t *p_demux, int *p_header_size )
}
else
{
msg_Dbg( p_demux, "Discard MIME header: %s", psz_line );
msg_Dbg( p_demux, "discard MIME header: %s", psz_line );
}
free( psz_line );
psz_line = GetLine( p_demux, &i_pos );
......@@ -408,11 +408,11 @@ static int MjpgDemux( demux_t *p_demux )
i++;
if( i >= p_sys->i_data_peeked )
{
msg_Dbg( p_demux, "Did not find JPEG EOI in %d bytes",
msg_Dbg( p_demux, "did not find JPEG EOI in %d bytes",
p_sys->i_data_peeked );
if( !Peek( p_demux, VLC_FALSE ) )
{
msg_Warn( p_demux, "No more data is available at the moment" );
msg_Warn( p_demux, "no more data is available at the moment" );
return 0;
}
}
......@@ -471,7 +471,7 @@ static int MimeDemux( demux_t *p_demux )
if( !Peek( p_demux, VLC_FALSE ) )
{
msg_Warn( p_demux, "No more data is available at the "
msg_Warn( p_demux, "no more data is available at the "
"moment" );
return 0;
}
......@@ -491,7 +491,7 @@ static int MimeDemux( demux_t *p_demux )
if( !b_match )
{
msg_Err( p_demux, "Discard non-JPEG part" );
msg_Err( p_demux, "discard non-JPEG part" );
stream_Read( p_demux->s, NULL, i );
return 0;
}
......
......@@ -888,7 +888,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
return VLC_EGENERIC;
default:
msg_Warn( p_demux, "control query unimplemented !!!" );
msg_Warn( p_demux, "control query unimplemented!" );
return VLC_EGENERIC;
}
}
......
......@@ -211,7 +211,7 @@ char *nscdec( vlc_object_t *p_demux, char* p_encoded )
buf16 = (unsigned char *)malloc( buf16_size );
if( buf16 == NULL )
{
msg_Err( p_demux, "Out of memory" );
msg_Err( p_demux, "out of memory" );
return NULL;
}
......@@ -229,7 +229,7 @@ char *nscdec( vlc_object_t *p_demux, char* p_encoded )
buf8 = (char *)malloc( buf8_size + 1 );
if( buf8 == NULL )
{
msg_Err( p_demux, "Out of memory" );
msg_Err( p_demux, "out of memory" );
free( (void *)buf16 );
return NULL;
}
......
......@@ -84,7 +84,7 @@ int E_(Import_B4S)( vlc_object_t *p_this )
p_demux->p_sys = p_sys = malloc( sizeof(demux_sys_t) );
if( p_sys == NULL )
{
msg_Err( p_demux, "Out of memory" );
msg_Err( p_demux, "out of memory" );
return VLC_ENOMEM;
}
p_sys->b_shout = p_demux->psz_demux &&
......
......@@ -76,7 +76,7 @@ int E_(Import_PLS)( vlc_object_t *p_this )
p_demux->p_sys = malloc( sizeof(demux_sys_t) );
if( p_demux->p_sys == NULL )
{
msg_Err( p_demux, "Out of memory" );
msg_Err( p_demux, "out of memory" );
return VLC_ENOMEM;
}
p_demux->p_sys->psz_prefix = E_(FindPrefix)( p_demux );
......
......@@ -76,7 +76,7 @@ int E_(Import_podcast)( vlc_object_t *p_this )
p_demux->p_sys = p_sys = malloc( sizeof(demux_sys_t) );
if( p_sys == NULL )
{
msg_Err( p_demux, "Out of memory" );
msg_Err( p_demux, "out of memory" );
return VLC_ENOMEM;
}
p_sys->psz_prefix = E_(FindPrefix)( p_demux );
......
......@@ -396,7 +396,7 @@ static block_t *dv_extract_audio( demux_t *p_demux,
i_audio_quant = p_buf[4] & 0x07; /* 0 - 16bit, 1 - 12bit */
if( i_audio_quant > 1 )
{
msg_Dbg( p_demux, "Unsupported quantization for DV audio");
msg_Dbg( p_demux, "unsupported quantization for DV audio");
return NULL;
}
......
......@@ -82,26 +82,29 @@ static void Close ( vlc_object_t * );
#define PMT_TEXT N_("Extra PMT")
#define PMT_LONGTEXT N_( \
"Allows a user to specify an extra pmt (pmt_pid=pid:stream_type[,...])" )
"Allows a user to specify an extra pmt (pmt_pid=pid:stream_type[,...])." )
#define PID_TEXT N_("Set id of ES to PID")
#define PID_LONGTEXT N_("set id of es to pid")
#define PID_LONGTEXT N_("Set the internal ID of each elementary stream" \
" handled by VLC to the same value as the PID in" \
" the TS stream, instead of 1, 2, 3, etc. Useful to" \
" do \'#duplicate{..., select=\"es=<pid>\"}\'.")
#define TSOUT_TEXT N_("Fast udp streaming")
#define TSOUT_LONGTEXT N_( \
"Sends TS to specific ip:port by udp (you must know what you are doing)")
"Sends TS to specific ip:port by udp (you must know what you are doing).")
#define MTUOUT_TEXT N_("MTU for out mode")
#define MTUOUT_LONGTEXT N_("MTU for out mode")
#define MTUOUT_LONGTEXT N_("MTU for out mode.")
#define CSA_TEXT N_("CSA ck")
#define CSA_LONGTEXT N_("CSA ck")
#define CSA_LONGTEXT N_("Control word for the CSa encryption algorithm")
#define SILENT_TEXT N_("Silent mode")
#define SILENT_LONGTEXT N_("do not complain on encrypted PES")
#define SILENT_LONGTEXT N_("Do not complain on encrypted PES.")
#define CAPMT_SYSID_TEXT N_("CAPMT System ID")
#define CAPMT_SYSID_LONGTEXT N_("only forward descriptors from this SysID to the CAM")
#define CAPMT_SYSID_LONGTEXT N_("Only forward descriptors from this SysID to the CAM.")
#define CPKT_TEXT N_("Packet size in bytes to decrypt")
#define CPKT_LONGTEXT N_("Specify the size of the TS packet to decrypt. " \
......@@ -109,7 +112,7 @@ static void Close ( vlc_object_t * );
"decrypting. " )
#define TSDUMP_TEXT N_("Filename of dump")
#define TSDUMP_LONGTEXT N_("Specify a filename where to dump the TS in")
#define TSDUMP_LONGTEXT N_("Specify a filename where to dump the TS in.")
#define APPEND_TEXT N_("Append")
#define APPEND_LONGTEXT N_( \
......@@ -832,7 +835,7 @@ static int DemuxFile( demux_t *p_demux )
i_data = stream_Read( p_demux->s, p_sys->buffer, i_bufsize );
if( (i_data <= 0) && (i_data < p_sys->i_packet_size) )
{
msg_Dbg( p_demux, "Error reading malformed packets" );
msg_Dbg( p_demux, "error reading malformed packets" );
return i_data;
}
......
......@@ -784,7 +784,7 @@ static int ty_stream_seek(demux_t *p_demux, double seek_pct)
/* seek within the chunk to get roughly to where we want */
p_sys->i_cur_rec = (int)
((double) ((seek_pos % CHUNK_SIZE) / (double) (CHUNK_SIZE)) * p_sys->i_num_recs);
msg_Dbg(p_demux, "Seeked to file pos " I64Fd, seek_pos);
msg_Dbg(p_demux, "seeked to file pos " I64Fd, seek_pos);
msg_Dbg(p_demux, " (chunk %d, record %d)",
p_sys->i_chunk_count - 1, p_sys->i_cur_rec);
......
......@@ -157,7 +157,6 @@ static unsigned int fix_voc_sr( unsigned int sr )
return sr;
}
static int ReadBlockHeader( demux_t *p_demux )
{
es_format_t new_fmt;
......@@ -189,7 +188,7 @@ static int ReadBlockHeader( demux_t *p_demux )
if( buf[1] )
{
msg_Err( p_demux, "Unsupported compression" );
msg_Err( p_demux, "unsupported compression" );
return VLC_EGENERIC;
}
......@@ -265,7 +264,7 @@ static int ReadBlockHeader( demux_t *p_demux )
if( buf[2] )
{
msg_Err( p_demux, "Unsupported compression" );
msg_Err( p_demux, "unsupported compression" );
return VLC_EGENERIC;
}
......@@ -295,7 +294,7 @@ static int ReadBlockHeader( demux_t *p_demux )
if( buf[1] )
{
msg_Err( p_demux, "Unsupported compression" );
msg_Err( p_demux, "unsupported compression" );
return VLC_EGENERIC;
}
......@@ -328,7 +327,7 @@ static int ReadBlockHeader( demux_t *p_demux )
break;
default:
msg_Err( p_demux, "Unsupported bit res.: %u bits",
msg_Err( p_demux, "unsupported bit res.: %u bits",
new_fmt.audio.i_bitspersample );
return VLC_EGENERIC;
}
......@@ -346,14 +345,14 @@ static int ReadBlockHeader( demux_t *p_demux )
break;
default:
msg_Err( p_demux, "Unsupported bit res.: %u bits",
msg_Err( p_demux, "unsupported bit res.: %u bits",
new_fmt.audio.i_bitspersample );
return VLC_EGENERIC;
}
break;
default:
msg_Err( p_demux, "Unsupported compression" );
msg_Err( p_demux, "unsupported compression" );
return VLC_EGENERIC;
}
......@@ -366,7 +365,7 @@ static int ReadBlockHeader( demux_t *p_demux )
break;
default:
msg_Dbg( p_demux, "Unknown block type %u - skipping block",
msg_Dbg( p_demux, "unknown block type %u - skipping block",
(unsigned)*buf);
case 4: /* blocks of non-audio types can be skipped */
case 5:
......
......@@ -381,7 +381,7 @@ static int ChunkFind( demux_t *p_demux, char *fcc, unsigned int *pi_size )
i_size = GetDWLE( p_peek + 4 );
msg_Dbg( p_demux, "Chunk: fcc=`%4.4s` size=%d", p_peek, i_size );
msg_Dbg( p_demux, "chunk: fcc=`%4.4s` size=%d", p_peek, i_size );
if( !memcmp( p_peek, fcc, 4 ) )
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment