Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
80fde19d
Commit
80fde19d
authored
Dec 24, 2006
by
zorglub
Browse files
More cleanup
parent
eedba76b
Changes
25
Hide whitespace changes
Inline
Side-by-side
modules/access/dvb/en50221.c
View file @
80fde19d
...
...
@@ -2310,7 +2310,8 @@ void E_(en50221_End)( access_t * p_access )
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
;
...
...
modules/access/dvb/linux_dvb.c
View file @
80fde19d
...
...
@@ -118,8 +118,8 @@ int E_(FrontendOpen)( access_t *p_access )
if
(
b_probe
)
{
char
*
psz_expected
=
NULL
;
char
*
psz_real
;
const
char
*
psz_expected
=
NULL
;
const
char
*
psz_real
;
if
(
FrontendInfo
(
p_access
)
<
0
)
{
...
...
modules/codec/ffmpeg/audio.c
View file @
80fde19d
...
...
@@ -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
* 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
);
...
...
modules/control/gestures.c
View file @
80fde19d
...
...
@@ -83,8 +83,9 @@ static void RunIntf ( intf_thread_t *p_intf );
#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"
));
...
...
modules/control/hotkeys.c
View file @
80fde19d
...
...
@@ -658,7 +658,8 @@ static void Run( intf_thread_t *p_intf )
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
)
...
...
@@ -667,7 +668,8 @@ static void Run( intf_thread_t *p_intf )
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
)
...
...
@@ -676,7 +678,8 @@ static void Run( intf_thread_t *p_intf )
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
)
...
...
@@ -685,7 +688,8 @@ static void Run( intf_thread_t *p_intf )
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
)
...
...
@@ -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
)
{
vlc_value_t
val
;
int
i
;
char
psz_bookmark_name
[
11
];
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,
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
)
...
...
@@ -880,7 +883,7 @@ static void DisplayVolume( intf_thread_t *p_intf, vout_thread_t *p_vout,
}
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
);
}
}
...
...
modules/control/http/util.c
View file @
80fde19d
...
...
@@ -206,7 +206,7 @@ int E_(ParseDirectory)( intf_thread_t *p_intf, char *psz_root,
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
)
)
{
...
...
modules/control/motion.c
View file @
80fde19d
...
...
@@ -150,7 +150,7 @@ static void RunIntf( intf_thread_t *p_intf )
#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 */
...
...
modules/control/rc.c
View file @
80fde19d
...
...
@@ -1181,7 +1181,7 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd,
||
!
strcmp
(
psz_cmd
,
"vtrack"
)
||
!
strcmp
(
psz_cmd
,
"strack"
)
)
{
char
*
psz_variable
;
const
char
*
psz_variable
;
vlc_value_t
val_name
;
int
i_error
;
...
...
@@ -1475,7 +1475,7 @@ static int Other( vlc_object_t *p_this, char const *psz_cmd,
"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
)
...
...
modules/control/telnet.c
View file @
80fde19d
...
...
@@ -269,7 +269,8 @@ static void Run( intf_thread_t *p_intf )
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
);
}
...
...
@@ -376,7 +377,7 @@ static void Run( intf_thread_t *p_intf )
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
);
}
...
...
@@ -406,14 +407,14 @@ static void Run( intf_thread_t *p_intf )
*
cl
->
p_buffer_read
=
'\0'
;
if
(
strcmp
(
psz_password
,
cl
->
buffer_read
)
==
0
)
{
Write_message
(
cl
,
NULL
,
"
\xff\xfc\x01\r\n
Welcome, "
"Master
\r\n
> "
,
WRITE_MODE_CMD
);
Write_message
(
cl
,
NULL
,
_
(
"
\xff\xfc\x01\r\n
Welcome, "
"Master
\r\n
> "
)
,
WRITE_MODE_CMD
);
}
else
{
/* wrong password */
Write_message
(
cl
,
NULL
,
"
\r\n
Wrong password.
\r\n
Password: "
,
_
(
"
\r\n
Wrong password.
\r\n
Password: "
)
,
WRITE_MODE_PWD
);
}
}
...
...
modules/demux/asf/libasf.c
View file @
80fde19d
...
...
@@ -1363,7 +1363,7 @@ static void ASF_FreeObject( stream_t *s, asf_object_t *p_obj )
static
const
struct
{
const
guid_t
*
p_id
;
char
*
psz_name
;
const
char
*
psz_name
;
}
ASF_ObjectDumpDebugInfo
[]
=
{
{
&
asf_object_header_guid
,
"Header"
},
...
...
modules/demux/avi/libavi.c
View file @
80fde19d
...
...
@@ -566,7 +566,7 @@ static void AVI_ChunkFree_indx( avi_chunk_t *p_chk )
static
struct
{
vlc_fourcc_t
i_fourcc
;
char
*
psz_type
;
const
char
*
psz_type
;
}
AVI_strz_type
[]
=
{
{
AVIFOURCC_IARL
,
"archive location"
},
...
...
modules/demux/mp4/libmp4.c
View file @
80fde19d
...
...
@@ -82,7 +82,7 @@
#define MP4_READBOX_ENTER( MP4_Box_data_TYPE_t ) \
u
int64_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 ) ) ) \
...
...
@@ -90,7 +90,7 @@
return( 0 ); \
} \
i_actually_read = stream_Read( p_stream, p_peek, i_read ); \
if( i_actually_read < 0 || (
u
int64_t)i_actually_read < i_read )\
if( i_actually_read < 0 || (int64_t)i_actually_read < i_read )\
{ \
free( p_buff ); \
return( 0 ); \
...
...
@@ -2055,7 +2055,7 @@ static int MP4_ReadBox_drms( stream_t *p_stream, MP4_Box_t *p_box )
}
if
(
i_ret
)
{
char
*
psz_error
;
const
char
*
psz_error
;
switch
(
i_ret
)
{
...
...
modules/demux/ts.c
View file @
80fde19d
...
...
@@ -388,7 +388,7 @@ static int Open( vlc_object_t *p_this )
int
i_packet_size
;
ts_pid_t
*
pat
;
c
har
*
psz_mode
;
c
onst
char
*
psz_mode
;
vlc_bool_t
b_append
;
vlc_bool_t
b_topfield
=
VLC_FALSE
;
...
...
modules/misc/dummy/aout.c
View file @
80fde19d
...
...
@@ -30,6 +30,8 @@
#include <vlc/vlc.h>
#include <vlc_aout.h>
#include "dummy.h"
#define FRAME_SIZE 2048
#define A52_FRAME_NB 1536
...
...
modules/misc/dummy/decoder.c
View file @
80fde19d
...
...
@@ -48,6 +48,8 @@
#include <stdio.h>
/* sprintf() */
#include "dummy.h"
/*****************************************************************************
* decoder_sys_t : theora decoder descriptor
*****************************************************************************/
...
...
modules/misc/dummy/encoder.c
View file @
80fde19d
...
...
@@ -26,6 +26,7 @@
*****************************************************************************/
#include <vlc/vlc.h>
#include <vlc_codec.h>
#include "dummy.h"
/*****************************************************************************
* Local prototypes
...
...
modules/misc/dummy/input.c
View file @
80fde19d
...
...
@@ -33,6 +33,8 @@
#include <vlc_demux.h>
#include <vlc_playlist.h>
#include "dummy.h"
/*****************************************************************************
* Access functions.
*****************************************************************************/
...
...
modules/misc/dummy/interface.c
View file @
80fde19d
...
...
@@ -30,6 +30,8 @@
#include <vlc/vlc.h>
#include <vlc_interface.h>
#include "dummy.h"
/*****************************************************************************
* Open: initialize dummy interface
*****************************************************************************/
...
...
modules/misc/dummy/renderer.c
View file @
80fde19d
...
...
@@ -26,6 +26,8 @@
#include <vlc_block.h>
#include <vlc_filter.h>
#include "dummy.h"
static
int
RenderText
(
filter_t
*
,
subpicture_region_t
*
,
subpicture_region_t
*
);
...
...
modules/misc/dummy/vout.c
View file @
80fde19d
...
...
@@ -34,6 +34,8 @@
#define DUMMY_HEIGHT 16
#define DUMMY_MAX_DIRECTBUFFERS 10
#include "dummy.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/
...
...
Prev
1
2
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment