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];
size_t i_in, i_out;
vlc_iconv_t iconv_handle;
if( b_probe )
{
- char * psz_expected = NULL;
- char * psz_real;
+ const char * psz_expected = NULL;
+ const char * psz_real;
if( FrontendInfo( p_access ) < 0 )
{
* SplitBuffer: Needed because aout really doesn't like big audio chunk and
* 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;
int i_samples = __MIN( p_sys->i_samples, 4096 );
#define BUTTON_LONGTEXT N_( \
"Trigger button for mouse gestures." )
-static char *button_list[] = { "left", "middle", "right" };
-static char *button_list_text[] = { N_("Left"), N_("Middle"), N_("Right") };
+static const char *button_list[] = { "left", "middle", "right" };
+static const char *button_list_text[] =
+ { N_("Left"), N_("Middle"), N_("Right") };
vlc_module_begin();
set_shortname( _("Gestures"));
i_delay -= 50000; /* 50 ms */
var_SetTime( p_input, "spu-delay", i_delay );
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) );
}
else if( i_action == ACTIONID_SUBDELAY_UP )
i_delay += 50000; /* 50 ms */
var_SetTime( p_input, "spu-delay", i_delay );
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) );
}
else if( i_action == ACTIONID_AUDIODELAY_DOWN )
i_delay -= 50000; /* 50 ms */
var_SetTime( p_input, "audio-delay", i_delay );
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) );
}
else if( i_action == ACTIONID_AUDIODELAY_UP )
i_delay += 50000; /* 50 ms */
var_SetTime( p_input, "audio-delay", i_delay );
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) );
}
else if( i_action == ACTIONID_PLAY )
static void PlayBookmark( intf_thread_t *p_intf, int i_num )
{
vlc_value_t val;
- int i;
char psz_bookmark_name[11];
playlist_t *p_playlist = pl_Yield( p_intf );
if( time.i_time > 0 )
{
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 );
}
else if( i_seconds > 0 )
}
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 );
}
}
continue;
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 ) )
{
#define LOW_THRESHOLD 80
#define HIGH_THRESHOLD 100
vout_thread_t *p_vout;
- char *psz_filter, *psz_type;
+ const char *psz_filter, *psz_type;
vlc_bool_t b_change = VLC_FALSE;
/* Wait a bit, get orientation, change filter if necessary */
|| !strcmp( psz_cmd, "vtrack" )
|| !strcmp( psz_cmd, "strack" ) )
{
- char *psz_variable;
+ const char *psz_variable;
vlc_value_t val_name;
int i_error;
"mosaic-offsets\0" "mosaic-keep-aspect-ratio\0"
"logo-file\0" "logo-x\0" "logo-y\0" "logo-position\0"
"logo-transparency\0";
- const char *psz_name;
+ const char *psz_name = NULL;
if( newval.psz_string )
for( psz_name = vars; *psz_name; psz_name += strlen( psz_name ) + 1 )
cl->fd = fd;
cl->buffer_write = NULL;
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 );
}
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->p_buffer_read = '\0';
if( strcmp( psz_password, cl->buffer_read ) == 0 )
{
- Write_message( cl, NULL, "\xff\xfc\x01\r\nWelcome, "
- "Master\r\n> ", WRITE_MODE_CMD );
+ Write_message( cl, NULL, _( "\xff\xfc\x01\r\nWelcome, "
+ "Master\r\n> " ), WRITE_MODE_CMD );
}
else
{
/* wrong password */
Write_message( cl, NULL,
- "\r\nWrong password.\r\nPassword: ",
+ _( "\r\nWrong password.\r\nPassword: " ),
WRITE_MODE_PWD );
}
}
static const struct
{
const guid_t *p_id;
- char *psz_name;
+ const char *psz_name;
} ASF_ObjectDumpDebugInfo[] =
{
{ &asf_object_header_guid, "Header" },
static struct
{
vlc_fourcc_t i_fourcc;
- char *psz_type;
+ const char *psz_type;
} AVI_strz_type[] =
{
{ AVIFOURCC_IARL, "archive location" },
#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; \
int i_actually_read; \
if( !( p_peek = p_buff = malloc( i_read ) ) ) \
return( 0 ); \
} \
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 ); \
return( 0 ); \
}
if( i_ret )
{
- char *psz_error;
+ const char *psz_error;
switch( i_ret )
{
int i_packet_size;
ts_pid_t *pat;
- char *psz_mode;
+ const char *psz_mode;
vlc_bool_t b_append;
vlc_bool_t b_topfield = VLC_FALSE;
#include <vlc/vlc.h>
#include <vlc_aout.h>
+#include "dummy.h"
+
#define FRAME_SIZE 2048
#define A52_FRAME_NB 1536
#include <stdio.h> /* sprintf() */
+#include "dummy.h"
+
/*****************************************************************************
* decoder_sys_t : theora decoder descriptor
*****************************************************************************/
*****************************************************************************/
#include <vlc/vlc.h>
#include <vlc_codec.h>
+#include "dummy.h"
/*****************************************************************************
* Local prototypes
#include <vlc_demux.h>
#include <vlc_playlist.h>
+#include "dummy.h"
+
/*****************************************************************************
* Access functions.
*****************************************************************************/
#include <vlc/vlc.h>
#include <vlc_interface.h>
+#include "dummy.h"
+
/*****************************************************************************
* Open: initialize dummy interface
*****************************************************************************/
#include <vlc_block.h>
#include <vlc_filter.h>
+#include "dummy.h"
+
static int RenderText( filter_t *, subpicture_region_t *,
subpicture_region_t * );
#define DUMMY_HEIGHT 16
#define DUMMY_MAX_DIRECTBUFFERS 10
+#include "dummy.h"
+
/*****************************************************************************
* Local prototypes
*****************************************************************************/
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-static char *mode_list[] = { "text", "html"
+static const char *mode_list[] = { "text", "html"
#ifdef HAVE_SYSLOG_H
,"syslog"
#endif
};
-static char *mode_list_text[] = { N_("Text"), "HTML"
+static const char *mode_list_text[] = { N_("Text"), "HTML"
#ifdef HAVE_SYSLOG_H
, "syslog"
#endif
/*****************************************************************************
* csa_New:
*****************************************************************************/
-csa_t *csa_New()
+csa_t *csa_New( void )
{
csa_t *c = malloc( sizeof( csa_t ) );
memset( c, 0, sizeof( csa_t ) );
audio_date_t end_date;
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_rate, i_frame_length, i_header_size;
};
if( psz_url && strrchr( psz_url, '.' ) )
{
/* by extension */
- static struct { char *ext; char *mux; } exttomux[] =
+ static struct { const char *ext; const char *mux; } exttomux[] =
{
{ "avi", "avi" },
{ "ogg", "ogg" },
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 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;
uint8_t *p_oldpix;
p_buf2[(2*line+1)*i_src_pitch+2*col+1] += diff;
break;
- case2:
+ case 2:
p_buf2[line*i_src_pitch+2*col] += diff;
p_buf2[line*i_src_pitch+2*col+1] += diff;
break;