Commit 80fde19d authored by Clément Stenac's avatar Clément Stenac

More cleanup

parent eedba76b
...@@ -2310,7 +2310,8 @@ void E_(en50221_End)( access_t * p_access ) ...@@ -2310,7 +2310,8 @@ void E_(en50221_End)( access_t * p_access )
static char *dvbsi_to_utf8( char *psz_instring, size_t i_length ) static char *dvbsi_to_utf8( char *psz_instring, size_t i_length )
{ {
char *psz_encoding, *psz_stringstart, *psz_outstring, *psz_tmp; const char *psz_encoding;
char *psz_stringstart, *psz_outstring, *psz_tmp;
char psz_encbuf[12]; char psz_encbuf[12];
size_t i_in, i_out; size_t i_in, i_out;
vlc_iconv_t iconv_handle; vlc_iconv_t iconv_handle;
......
...@@ -118,8 +118,8 @@ int E_(FrontendOpen)( access_t *p_access ) ...@@ -118,8 +118,8 @@ int E_(FrontendOpen)( access_t *p_access )
if( b_probe ) if( b_probe )
{ {
char * psz_expected = NULL; const char * psz_expected = NULL;
char * psz_real; const char * psz_real;
if( FrontendInfo( p_access ) < 0 ) if( FrontendInfo( p_access ) < 0 )
{ {
......
...@@ -166,7 +166,7 @@ int E_(InitAudioDec)( decoder_t *p_dec, AVCodecContext *p_context, ...@@ -166,7 +166,7 @@ int E_(InitAudioDec)( decoder_t *p_dec, AVCodecContext *p_context,
* SplitBuffer: Needed because aout really doesn't like big audio chunk and * SplitBuffer: Needed because aout really doesn't like big audio chunk and
* wma produces easily > 30000 samples... * wma produces easily > 30000 samples...
*****************************************************************************/ *****************************************************************************/
aout_buffer_t *SplitBuffer( decoder_t *p_dec ) static aout_buffer_t *SplitBuffer( decoder_t *p_dec )
{ {
decoder_sys_t *p_sys = p_dec->p_sys; decoder_sys_t *p_sys = p_dec->p_sys;
int i_samples = __MIN( p_sys->i_samples, 4096 ); int i_samples = __MIN( p_sys->i_samples, 4096 );
......
...@@ -83,8 +83,9 @@ static void RunIntf ( intf_thread_t *p_intf ); ...@@ -83,8 +83,9 @@ static void RunIntf ( intf_thread_t *p_intf );
#define BUTTON_LONGTEXT N_( \ #define BUTTON_LONGTEXT N_( \
"Trigger button for mouse gestures." ) "Trigger button for mouse gestures." )
static char *button_list[] = { "left", "middle", "right" }; static const char *button_list[] = { "left", "middle", "right" };
static char *button_list_text[] = { N_("Left"), N_("Middle"), N_("Right") }; static const char *button_list_text[] =
{ N_("Left"), N_("Middle"), N_("Right") };
vlc_module_begin(); vlc_module_begin();
set_shortname( _("Gestures")); set_shortname( _("Gestures"));
......
...@@ -658,7 +658,8 @@ static void Run( intf_thread_t *p_intf ) ...@@ -658,7 +658,8 @@ static void Run( intf_thread_t *p_intf )
i_delay -= 50000; /* 50 ms */ i_delay -= 50000; /* 50 ms */
var_SetTime( p_input, "spu-delay", i_delay ); var_SetTime( p_input, "spu-delay", i_delay );
ClearChannels( p_intf, p_vout ); ClearChannels( p_intf, p_vout );
vout_OSDMessage( p_intf, DEFAULT_CHAN, "Subtitle delay %i ms", vout_OSDMessage( p_intf, DEFAULT_CHAN,
_( "Subtitle delay %i ms" ),
(int)(i_delay/1000) ); (int)(i_delay/1000) );
} }
else if( i_action == ACTIONID_SUBDELAY_UP ) else if( i_action == ACTIONID_SUBDELAY_UP )
...@@ -667,7 +668,8 @@ static void Run( intf_thread_t *p_intf ) ...@@ -667,7 +668,8 @@ static void Run( intf_thread_t *p_intf )
i_delay += 50000; /* 50 ms */ i_delay += 50000; /* 50 ms */
var_SetTime( p_input, "spu-delay", i_delay ); var_SetTime( p_input, "spu-delay", i_delay );
ClearChannels( p_intf, p_vout ); ClearChannels( p_intf, p_vout );
vout_OSDMessage( p_intf, DEFAULT_CHAN, "Subtitle delay %i ms", vout_OSDMessage( p_intf, DEFAULT_CHAN,
_( "Subtitle delay %i ms" ),
(int)(i_delay/1000) ); (int)(i_delay/1000) );
} }
else if( i_action == ACTIONID_AUDIODELAY_DOWN ) else if( i_action == ACTIONID_AUDIODELAY_DOWN )
...@@ -676,7 +678,8 @@ static void Run( intf_thread_t *p_intf ) ...@@ -676,7 +678,8 @@ static void Run( intf_thread_t *p_intf )
i_delay -= 50000; /* 50 ms */ i_delay -= 50000; /* 50 ms */
var_SetTime( p_input, "audio-delay", i_delay ); var_SetTime( p_input, "audio-delay", i_delay );
ClearChannels( p_intf, p_vout ); ClearChannels( p_intf, p_vout );
vout_OSDMessage( p_intf, DEFAULT_CHAN, "Audio delay %i ms", vout_OSDMessage( p_intf, DEFAULT_CHAN,
_( "Audio delay %i ms" ),
(int)(i_delay/1000) ); (int)(i_delay/1000) );
} }
else if( i_action == ACTIONID_AUDIODELAY_UP ) else if( i_action == ACTIONID_AUDIODELAY_UP )
...@@ -685,7 +688,8 @@ static void Run( intf_thread_t *p_intf ) ...@@ -685,7 +688,8 @@ static void Run( intf_thread_t *p_intf )
i_delay += 50000; /* 50 ms */ i_delay += 50000; /* 50 ms */
var_SetTime( p_input, "audio-delay", i_delay ); var_SetTime( p_input, "audio-delay", i_delay );
ClearChannels( p_intf, p_vout ); ClearChannels( p_intf, p_vout );
vout_OSDMessage( p_intf, DEFAULT_CHAN, "Audio delay %i ms", vout_OSDMessage( p_intf, DEFAULT_CHAN,
_( "Audio delay %i ms" ),
(int)(i_delay/1000) ); (int)(i_delay/1000) );
} }
else if( i_action == ACTIONID_PLAY ) else if( i_action == ACTIONID_PLAY )
...@@ -788,7 +792,6 @@ static int ActionKeyCB( vlc_object_t *p_this, char const *psz_var, ...@@ -788,7 +792,6 @@ static int ActionKeyCB( vlc_object_t *p_this, char const *psz_var,
static void PlayBookmark( intf_thread_t *p_intf, int i_num ) static void PlayBookmark( intf_thread_t *p_intf, int i_num )
{ {
vlc_value_t val; vlc_value_t val;
int i;
char psz_bookmark_name[11]; char psz_bookmark_name[11];
playlist_t *p_playlist = pl_Yield( p_intf ); playlist_t *p_playlist = pl_Yield( p_intf );
...@@ -848,7 +851,7 @@ static void DisplayPosition( intf_thread_t *p_intf, vout_thread_t *p_vout, ...@@ -848,7 +851,7 @@ static void DisplayPosition( intf_thread_t *p_intf, vout_thread_t *p_vout,
if( time.i_time > 0 ) if( time.i_time > 0 )
{ {
secstotimestr( psz_duration, time.i_time / 1000000 ); secstotimestr( psz_duration, time.i_time / 1000000 );
vout_OSDMessage( p_input, POSITION_TEXT_CHAN, "%s / %s", vout_OSDMessage( p_input, POSITION_TEXT_CHAN, (char *) "%s / %s",
psz_time, psz_duration ); psz_time, psz_duration );
} }
else if( i_seconds > 0 ) else if( i_seconds > 0 )
...@@ -880,7 +883,7 @@ static void DisplayVolume( intf_thread_t *p_intf, vout_thread_t *p_vout, ...@@ -880,7 +883,7 @@ static void DisplayVolume( intf_thread_t *p_intf, vout_thread_t *p_vout,
} }
else else
{ {
vout_OSDMessage( p_vout, VOLUME_TEXT_CHAN, "Volume %d%%", vout_OSDMessage( p_vout, VOLUME_TEXT_CHAN, _( "Volume %d%%" ),
i_vol*400/AOUT_VOLUME_MAX ); i_vol*400/AOUT_VOLUME_MAX );
} }
} }
......
...@@ -206,7 +206,7 @@ int E_(ParseDirectory)( intf_thread_t *p_intf, char *psz_root, ...@@ -206,7 +206,7 @@ int E_(ParseDirectory)( intf_thread_t *p_intf, char *psz_root,
continue; continue;
sprintf( dir, "%s%c%s", psz_dir, sep, psz_filename ); sprintf( dir, "%s%c%s", psz_dir, sep, psz_filename );
free( psz_filename ); free( (char*) psz_filename );
if( E_(ParseDirectory)( p_intf, psz_root, dir ) ) if( E_(ParseDirectory)( p_intf, psz_root, dir ) )
{ {
......
...@@ -150,7 +150,7 @@ static void RunIntf( intf_thread_t *p_intf ) ...@@ -150,7 +150,7 @@ static void RunIntf( intf_thread_t *p_intf )
#define LOW_THRESHOLD 80 #define LOW_THRESHOLD 80
#define HIGH_THRESHOLD 100 #define HIGH_THRESHOLD 100
vout_thread_t *p_vout; vout_thread_t *p_vout;
char *psz_filter, *psz_type; const char *psz_filter, *psz_type;
vlc_bool_t b_change = VLC_FALSE; vlc_bool_t b_change = VLC_FALSE;
/* Wait a bit, get orientation, change filter if necessary */ /* Wait a bit, get orientation, change filter if necessary */
......
...@@ -1181,7 +1181,7 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1181,7 +1181,7 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd,
|| !strcmp( psz_cmd, "vtrack" ) || !strcmp( psz_cmd, "vtrack" )
|| !strcmp( psz_cmd, "strack" ) ) || !strcmp( psz_cmd, "strack" ) )
{ {
char *psz_variable; const char *psz_variable;
vlc_value_t val_name; vlc_value_t val_name;
int i_error; int i_error;
...@@ -1475,7 +1475,7 @@ static int Other( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1475,7 +1475,7 @@ static int Other( vlc_object_t *p_this, char const *psz_cmd,
"mosaic-offsets\0" "mosaic-keep-aspect-ratio\0" "mosaic-offsets\0" "mosaic-keep-aspect-ratio\0"
"logo-file\0" "logo-x\0" "logo-y\0" "logo-position\0" "logo-file\0" "logo-x\0" "logo-y\0" "logo-position\0"
"logo-transparency\0"; "logo-transparency\0";
const char *psz_name; const char *psz_name = NULL;
if( newval.psz_string ) if( newval.psz_string )
for( psz_name = vars; *psz_name; psz_name += strlen( psz_name ) + 1 ) for( psz_name = vars; *psz_name; psz_name += strlen( psz_name ) + 1 )
......
...@@ -269,7 +269,8 @@ static void Run( intf_thread_t *p_intf ) ...@@ -269,7 +269,8 @@ static void Run( intf_thread_t *p_intf )
cl->fd = fd; cl->fd = fd;
cl->buffer_write = NULL; cl->buffer_write = NULL;
cl->p_buffer_write = cl->buffer_write; cl->p_buffer_write = cl->buffer_write;
Write_message( cl, NULL, "Password: \xff\xfb\x01", WRITE_MODE_PWD ); Write_message( cl, NULL,
_( "Password: \xff\xfb\x01" ), WRITE_MODE_PWD );
TAB_APPEND( p_sys->i_clients, p_sys->clients, cl ); TAB_APPEND( p_sys->i_clients, p_sys->clients, cl );
} }
...@@ -376,7 +377,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -376,7 +377,7 @@ static void Run( intf_thread_t *p_intf )
if( cl->p_buffer_read - cl->buffer_read == 999 ) if( cl->p_buffer_read - cl->buffer_read == 999 )
{ {
Write_message( cl, NULL, "Line too long\r\n", Write_message( cl, NULL, _( "Line too long\r\n" ),
cl->i_mode + 2 ); cl->i_mode + 2 );
} }
...@@ -406,14 +407,14 @@ static void Run( intf_thread_t *p_intf ) ...@@ -406,14 +407,14 @@ static void Run( intf_thread_t *p_intf )
*cl->p_buffer_read = '\0'; *cl->p_buffer_read = '\0';
if( strcmp( psz_password, cl->buffer_read ) == 0 ) if( strcmp( psz_password, cl->buffer_read ) == 0 )
{ {
Write_message( cl, NULL, "\xff\xfc\x01\r\nWelcome, " Write_message( cl, NULL, _( "\xff\xfc\x01\r\nWelcome, "
"Master\r\n> ", WRITE_MODE_CMD ); "Master\r\n> " ), WRITE_MODE_CMD );
} }
else else
{ {
/* wrong password */ /* wrong password */
Write_message( cl, NULL, Write_message( cl, NULL,
"\r\nWrong password.\r\nPassword: ", _( "\r\nWrong password.\r\nPassword: " ),
WRITE_MODE_PWD ); WRITE_MODE_PWD );
} }
} }
......
...@@ -1363,7 +1363,7 @@ static void ASF_FreeObject( stream_t *s, asf_object_t *p_obj ) ...@@ -1363,7 +1363,7 @@ static void ASF_FreeObject( stream_t *s, asf_object_t *p_obj )
static const struct static const struct
{ {
const guid_t *p_id; const guid_t *p_id;
char *psz_name; const char *psz_name;
} ASF_ObjectDumpDebugInfo[] = } ASF_ObjectDumpDebugInfo[] =
{ {
{ &asf_object_header_guid, "Header" }, { &asf_object_header_guid, "Header" },
......
...@@ -566,7 +566,7 @@ static void AVI_ChunkFree_indx( avi_chunk_t *p_chk ) ...@@ -566,7 +566,7 @@ static void AVI_ChunkFree_indx( avi_chunk_t *p_chk )
static struct static struct
{ {
vlc_fourcc_t i_fourcc; vlc_fourcc_t i_fourcc;
char *psz_type; const char *psz_type;
} AVI_strz_type[] = } AVI_strz_type[] =
{ {
{ AVIFOURCC_IARL, "archive location" }, { AVIFOURCC_IARL, "archive location" },
......
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
#define MP4_READBOX_ENTER( MP4_Box_data_TYPE_t ) \ #define MP4_READBOX_ENTER( MP4_Box_data_TYPE_t ) \
uint64_t i_read = p_box->i_size; \ int64_t i_read = p_box->i_size; \
uint8_t *p_peek, *p_buff; \ uint8_t *p_peek, *p_buff; \
int i_actually_read; \ int i_actually_read; \
if( !( p_peek = p_buff = malloc( i_read ) ) ) \ if( !( p_peek = p_buff = malloc( i_read ) ) ) \
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
return( 0 ); \ return( 0 ); \
} \ } \
i_actually_read = stream_Read( p_stream, p_peek, i_read ); \ i_actually_read = stream_Read( p_stream, p_peek, i_read ); \
if( i_actually_read < 0 || (uint64_t)i_actually_read < i_read )\ if( i_actually_read < 0 || (int64_t)i_actually_read < i_read )\
{ \ { \
free( p_buff ); \ free( p_buff ); \
return( 0 ); \ return( 0 ); \
...@@ -2055,7 +2055,7 @@ static int MP4_ReadBox_drms( stream_t *p_stream, MP4_Box_t *p_box ) ...@@ -2055,7 +2055,7 @@ static int MP4_ReadBox_drms( stream_t *p_stream, MP4_Box_t *p_box )
} }
if( i_ret ) if( i_ret )
{ {
char *psz_error; const char *psz_error;
switch( i_ret ) switch( i_ret )
{ {
......
...@@ -388,7 +388,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -388,7 +388,7 @@ static int Open( vlc_object_t *p_this )
int i_packet_size; int i_packet_size;
ts_pid_t *pat; ts_pid_t *pat;
char *psz_mode; const char *psz_mode;
vlc_bool_t b_append; vlc_bool_t b_append;
vlc_bool_t b_topfield = VLC_FALSE; vlc_bool_t b_topfield = VLC_FALSE;
......
...@@ -30,6 +30,8 @@ ...@@ -30,6 +30,8 @@
#include <vlc/vlc.h> #include <vlc/vlc.h>
#include <vlc_aout.h> #include <vlc_aout.h>
#include "dummy.h"
#define FRAME_SIZE 2048 #define FRAME_SIZE 2048
#define A52_FRAME_NB 1536 #define A52_FRAME_NB 1536
......
...@@ -48,6 +48,8 @@ ...@@ -48,6 +48,8 @@
#include <stdio.h> /* sprintf() */ #include <stdio.h> /* sprintf() */
#include "dummy.h"
/***************************************************************************** /*****************************************************************************
* decoder_sys_t : theora decoder descriptor * decoder_sys_t : theora decoder descriptor
*****************************************************************************/ *****************************************************************************/
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
*****************************************************************************/ *****************************************************************************/
#include <vlc/vlc.h> #include <vlc/vlc.h>
#include <vlc_codec.h> #include <vlc_codec.h>
#include "dummy.h"
/***************************************************************************** /*****************************************************************************
* Local prototypes * Local prototypes
......
...@@ -33,6 +33,8 @@ ...@@ -33,6 +33,8 @@
#include <vlc_demux.h> #include <vlc_demux.h>
#include <vlc_playlist.h> #include <vlc_playlist.h>
#include "dummy.h"
/***************************************************************************** /*****************************************************************************
* Access functions. * Access functions.
*****************************************************************************/ *****************************************************************************/
......
...@@ -30,6 +30,8 @@ ...@@ -30,6 +30,8 @@
#include <vlc/vlc.h> #include <vlc/vlc.h>
#include <vlc_interface.h> #include <vlc_interface.h>
#include "dummy.h"
/***************************************************************************** /*****************************************************************************
* Open: initialize dummy interface * Open: initialize dummy interface
*****************************************************************************/ *****************************************************************************/
......
...@@ -26,6 +26,8 @@ ...@@ -26,6 +26,8 @@
#include <vlc_block.h> #include <vlc_block.h>
#include <vlc_filter.h> #include <vlc_filter.h>
#include "dummy.h"
static int RenderText( filter_t *, subpicture_region_t *, static int RenderText( filter_t *, subpicture_region_t *,
subpicture_region_t * ); subpicture_region_t * );
......
...@@ -34,6 +34,8 @@ ...@@ -34,6 +34,8 @@
#define DUMMY_HEIGHT 16 #define DUMMY_HEIGHT 16
#define DUMMY_MAX_DIRECTBUFFERS 10 #define DUMMY_MAX_DIRECTBUFFERS 10
#include "dummy.h"
/***************************************************************************** /*****************************************************************************
* Local prototypes * Local prototypes
*****************************************************************************/ *****************************************************************************/
......
...@@ -105,12 +105,12 @@ static void DoRRD( intf_thread_t *p_intf ); ...@@ -105,12 +105,12 @@ static void DoRRD( intf_thread_t *p_intf );
/***************************************************************************** /*****************************************************************************
* Module descriptor * Module descriptor
*****************************************************************************/ *****************************************************************************/
static char *mode_list[] = { "text", "html" static const char *mode_list[] = { "text", "html"
#ifdef HAVE_SYSLOG_H #ifdef HAVE_SYSLOG_H
,"syslog" ,"syslog"
#endif #endif
}; };
static char *mode_list_text[] = { N_("Text"), "HTML" static const char *mode_list_text[] = { N_("Text"), "HTML"
#ifdef HAVE_SYSLOG_H #ifdef HAVE_SYSLOG_H
, "syslog" , "syslog"
#endif #endif
......
...@@ -59,7 +59,7 @@ static void csa_BlockCypher( uint8_t kk[57], uint8_t bd[8], uint8_t ib[8] ); ...@@ -59,7 +59,7 @@ static void csa_BlockCypher( uint8_t kk[57], uint8_t bd[8], uint8_t ib[8] );
/***************************************************************************** /*****************************************************************************
* csa_New: * csa_New:
*****************************************************************************/ *****************************************************************************/
csa_t *csa_New() csa_t *csa_New( void )
{ {
csa_t *c = malloc( sizeof( csa_t ) ); csa_t *c = malloc( sizeof( csa_t ) );
memset( c, 0, sizeof( csa_t ) ); memset( c, 0, sizeof( csa_t ) );
......
...@@ -68,7 +68,8 @@ struct decoder_sys_t ...@@ -68,7 +68,8 @@ struct decoder_sys_t
audio_date_t end_date; audio_date_t end_date;
mtime_t i_pts; mtime_t i_pts;
int i_frame_size, i_raw_blocks; int i_frame_size;
unsigned int i_raw_blocks;
unsigned int i_channels; unsigned int i_channels;
unsigned int i_rate, i_frame_length, i_header_size; unsigned int i_rate, i_frame_length, i_header_size;
}; };
......
...@@ -158,7 +158,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -158,7 +158,7 @@ static int Open( vlc_object_t *p_this )
if( psz_url && strrchr( psz_url, '.' ) ) if( psz_url && strrchr( psz_url, '.' ) )
{ {
/* by extension */ /* by extension */
static struct { char *ext; char *mux; } exttomux[] = static struct { const char *ext; const char *mux; } exttomux[] =
{ {
{ "avi", "avi" }, { "avi", "avi" },
{ "ogg", "ogg" }, { "ogg", "ogg" },
......
...@@ -137,7 +137,6 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_inpic ) ...@@ -137,7 +137,6 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_inpic )
const uint8_t *p_inpix_u = p_inpic->p[U_PLANE].p_pixels; const uint8_t *p_inpix_u = p_inpic->p[U_PLANE].p_pixels;
const uint8_t *p_inpix_v = p_inpic->p[V_PLANE].p_pixels; const uint8_t *p_inpix_v = p_inpic->p[V_PLANE].p_pixels;
const int i_src_pitch_u = p_inpic->p[U_PLANE].i_pitch; const int i_src_pitch_u = p_inpic->p[U_PLANE].i_pitch;
const int i_src_visible_u = p_inpic->p[U_PLANE].i_visible_pitch;
const int i_num_lines_u = p_inpic->p[U_PLANE].i_visible_lines; const int i_num_lines_u = p_inpic->p[U_PLANE].i_visible_lines;
uint8_t *p_oldpix; uint8_t *p_oldpix;
...@@ -257,7 +256,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_inpic ) ...@@ -257,7 +256,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_inpic )
p_buf2[(2*line+1)*i_src_pitch+2*col+1] += diff; p_buf2[(2*line+1)*i_src_pitch+2*col+1] += diff;
break; break;
case2: case 2:
p_buf2[line*i_src_pitch+2*col] += diff; p_buf2[line*i_src_pitch+2*col] += diff;
p_buf2[line*i_src_pitch+2*col+1] += diff; p_buf2[line*i_src_pitch+2*col+1] += diff;
break; break;
......
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