Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
470b47fe
Commit
470b47fe
authored
Mar 28, 2006
by
Clément Stenac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
String fixes in src (Refs:#438)
parent
4dfd839a
Changes
20
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
128 additions
and
107 deletions
+128
-107
src/audio_output/input.c
src/audio_output/input.c
+11
-9
src/audio_output/intf.c
src/audio_output/intf.c
+4
-2
src/audio_output/mixer.c
src/audio_output/mixer.c
+1
-1
src/audio_output/output.c
src/audio_output/output.c
+2
-2
src/control/mediacontrol_audio_video.c
src/control/mediacontrol_audio_video.c
+8
-7
src/control/mediacontrol_core.c
src/control/mediacontrol_core.c
+8
-6
src/control/mediacontrol_util.c
src/control/mediacontrol_util.c
+2
-1
src/extras/libc.c
src/extras/libc.c
+27
-27
src/input/control.c
src/input/control.c
+2
-1
src/input/decoder.c
src/input/decoder.c
+3
-3
src/input/demux.c
src/input/demux.c
+5
-4
src/input/es_out.c
src/input/es_out.c
+10
-7
src/input/input.c
src/input/input.c
+10
-8
src/input/subtitles.c
src/input/subtitles.c
+17
-11
src/interface/interaction.c
src/interface/interaction.c
+1
-3
src/interface/interface.c
src/interface/interface.c
+5
-3
src/misc/objects.c
src/misc/objects.c
+4
-4
src/misc/stats.c
src/misc/stats.c
+1
-1
src/misc/vlm.c
src/misc/vlm.c
+3
-3
src/network/acl.c
src/network/acl.c
+4
-4
No files found.
src/audio_output/input.c
View file @
470b47fe
...
...
@@ -166,14 +166,14 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input )
if
(
psz_parser
==
NULL
||
!*
psz_parser
)
continue
;
while
(
psz_parser
&&
*
psz_parser
)
{
aout_filter_t
*
p_filter
=
NULL
;
if
(
p_input
->
i_nb_filters
>=
AOUT_MAX_FILTERS
)
{
msg_Dbg
(
p_aout
,
"max filter reached (%d)"
,
AOUT_MAX_FILTERS
);
msg_Dbg
(
p_aout
,
"max filter
s
reached (%d)"
,
AOUT_MAX_FILTERS
);
break
;
}
...
...
@@ -210,7 +210,7 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input )
sizeof
(
audio_sample_format_t
)
);
memcpy
(
&
p_filter
->
output
,
&
chain_output_format
,
sizeof
(
audio_sample_format_t
)
);
p_filter
->
p_module
=
module_Need
(
p_filter
,
"visualization"
,
psz_parser
,
VLC_TRUE
);
}
...
...
@@ -235,7 +235,8 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input )
{
aout_FormatPrepare
(
&
p_filter
->
input
);
aout_FormatPrepare
(
&
p_filter
->
output
);
p_filter
->
p_module
=
module_Need
(
p_filter
,
"audio filter"
,
p_filter
->
p_module
=
module_Need
(
p_filter
,
"audio filter"
,
psz_parser
,
VLC_TRUE
);
}
/* try visual filters */
...
...
@@ -245,7 +246,8 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input )
sizeof
(
audio_sample_format_t
)
);
memcpy
(
&
p_filter
->
output
,
&
chain_output_format
,
sizeof
(
audio_sample_format_t
)
);
p_filter
->
p_module
=
module_Need
(
p_filter
,
"visualization"
,
p_filter
->
p_module
=
module_Need
(
p_filter
,
"visualization"
,
psz_parser
,
VLC_TRUE
);
}
}
...
...
@@ -460,8 +462,8 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
mdate
()
-
p_buffer
->
start_date
);
if
(
p_input
->
p_input_thread
)
{
stats_UpdateInteger
(
p_input
->
p_input_thread
,
STATS_LOST_ABUFFERS
,
1
,
NULL
);
stats_UpdateInteger
(
p_input
->
p_input_thread
,
STATS_LOST_ABUFFERS
,
1
,
NULL
);
}
aout_BufferFree
(
p_buffer
);
p_input
->
i_resampling_type
=
AOUT_RESAMPLING_NONE
;
...
...
@@ -502,8 +504,8 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
aout_BufferFree
(
p_buffer
);
if
(
p_input
->
p_input_thread
)
{
stats_UpdateInteger
(
p_input
->
p_input_thread
,
STATS_LOST_ABUFFERS
,
1
,
NULL
);
stats_UpdateInteger
(
p_input
->
p_input_thread
,
STATS_LOST_ABUFFERS
,
1
,
NULL
);
}
return
0
;
}
...
...
src/audio_output/intf.c
View file @
470b47fe
...
...
@@ -158,7 +158,8 @@ int __aout_VolumeUp( vlc_object_t * p_object, int i_nb_steps,
}
config_PutInt
(
p_object
,
"volume"
,
i_volume
);
var_Create
(
p_object
->
p_libvlc
,
"saved-volume"
,
VLC_VAR_INTEGER
);
var_SetInteger
(
p_object
->
p_libvlc
,
"saved-volume"
,
(
audio_volume_t
)
i_volume
);
var_SetInteger
(
p_object
->
p_libvlc
,
"saved-volume"
,
(
audio_volume_t
)
i_volume
);
if
(
pi_volume
!=
NULL
)
*
pi_volume
=
(
audio_volume_t
)
i_volume
;
if
(
p_aout
==
NULL
)
return
0
;
...
...
@@ -166,7 +167,8 @@ int __aout_VolumeUp( vlc_object_t * p_object, int i_nb_steps,
vlc_mutex_lock
(
&
p_aout
->
mixer_lock
);
if
(
!
p_aout
->
mixer
.
b_error
)
{
i_result
=
p_aout
->
output
.
pf_volume_set
(
p_aout
,
(
audio_volume_t
)
i_volume
);
i_result
=
p_aout
->
output
.
pf_volume_set
(
p_aout
,
(
audio_volume_t
)
i_volume
);
}
vlc_mutex_unlock
(
&
p_aout
->
mixer_lock
);
...
...
src/audio_output/mixer.c
View file @
470b47fe
...
...
@@ -46,7 +46,7 @@ int aout_MixerNew( aout_instance_t * p_aout )
p_aout
->
mixer
.
p_module
=
module_Need
(
p_aout
,
"audio mixer"
,
NULL
,
0
);
if
(
p_aout
->
mixer
.
p_module
==
NULL
)
{
msg_Err
(
p_aout
,
"no suitable a
out
mixer"
);
msg_Err
(
p_aout
,
"no suitable a
udio
mixer"
);
return
-
1
;
}
p_aout
->
mixer
.
b_error
=
0
;
...
...
src/audio_output/output.c
View file @
470b47fe
...
...
@@ -57,7 +57,7 @@ int aout_OutputNew( aout_instance_t * p_aout,
p_aout
->
output
.
p_module
=
module_Need
(
p_aout
,
"audio output"
,
"$aout"
,
0
);
if
(
p_aout
->
output
.
p_module
==
NULL
)
{
msg_Err
(
p_aout
,
"no suitable a
o
ut module"
);
msg_Err
(
p_aout
,
"no suitable a
udio outp
ut module"
);
vlc_mutex_unlock
(
&
p_aout
->
output_fifo_lock
);
return
-
1
;
}
...
...
@@ -195,7 +195,7 @@ int aout_OutputNew( aout_instance_t * p_aout,
&
p_aout
->
mixer
.
mixer
,
&
p_aout
->
output
.
output
)
<
0
)
{
msg_Err
(
p_aout
,
"couldn't
set an
output pipeline"
);
msg_Err
(
p_aout
,
"couldn't
create audio
output pipeline"
);
module_Unneed
(
p_aout
,
p_aout
->
output
.
p_module
);
return
-
1
;
}
...
...
src/control/mediacontrol_audio_video.c
View file @
470b47fe
...
...
@@ -97,7 +97,7 @@ mediacontrol_snapshot( mediacontrol_Instance *self,
{
p_pic
=
_mediacontrol_createRGBPicture
(
p_snapshot
->
i_width
,
p_snapshot
->
i_height
,
VLC_FOURCC
(
'p'
,
'n'
,
'g'
,
' '
),
VLC_FOURCC
(
'p'
,
'n'
,
'g'
,
' '
),
p_snapshot
->
date
,
p_snapshot
->
p_data
,
p_snapshot
->
i_datasize
);
...
...
@@ -199,10 +199,11 @@ mediacontrol_display_text( mediacontrol_Instance *self,
mtime_t
i_duration
=
0
;
mtime_t
i_now
=
mdate
();
i_duration
=
1000
*
mediacontrol_unit_convert
(
self
->
p_playlist
->
p_input
,
end
->
key
,
mediacontrol_MediaTime
,
end
->
value
);
i_duration
=
1000
*
mediacontrol_unit_convert
(
self
->
p_playlist
->
p_input
,
end
->
key
,
mediacontrol_MediaTime
,
end
->
value
);
mediacontrol_showtext
(
p_vout
,
DEFAULT_CHAN
,
psz_message
,
NULL
,
OSD_ALIGN_BOTTOM
|
OSD_ALIGN_LEFT
,
0
,
0
,
...
...
@@ -225,11 +226,11 @@ mediacontrol_display_text( mediacontrol_Instance *self,
i_now
=
mdate
();
i_debut
=
mediacontrol_position2microsecond
(
p_input
,
(
mediacontrol_Position
*
)
begin
);
(
mediacontrol_Position
*
)
begin
);
i_debut
+=
i_now
;
i_fin
=
mediacontrol_position2microsecond
(
p_input
,
(
mediacontrol_Position
*
)
end
);
(
mediacontrol_Position
*
)
end
);
i_fin
+=
i_now
;
vout_ShowTextAbsolute
(
p_vout
,
DEFAULT_CHAN
,
psz_message
,
NULL
,
...
...
src/control/mediacontrol_core.c
View file @
470b47fe
...
...
@@ -123,7 +123,8 @@ mediacontrol_get_media_position( mediacontrol_Instance *self,
if
(
an_origin
!=
mediacontrol_AbsolutePosition
)
{
/* Relative or ModuloPosition make no sense */
RAISE
(
mediacontrol_PositionOriginNotSupported
,
"Only absolute position is valid."
);
RAISE
(
mediacontrol_PositionOriginNotSupported
,
"Only absolute position is valid."
);
return
NULL
;
}
...
...
@@ -364,7 +365,8 @@ mediacontrol_get_stream_information( mediacontrol_Instance *self,
input_thread_t
*
p_input
=
self
->
p_playlist
->
p_input
;
vlc_value_t
val
;
retval
=
(
mediacontrol_StreamInformation
*
)
malloc
(
sizeof
(
mediacontrol_StreamInformation
)
);
retval
=
(
mediacontrol_StreamInformation
*
)
malloc
(
sizeof
(
mediacontrol_StreamInformation
)
);
if
(
!
retval
)
{
RAISE
(
mediacontrol_InternalException
,
"Out of memory"
);
...
...
@@ -410,11 +412,11 @@ mediacontrol_get_stream_information( mediacontrol_Instance *self,
retval
->
length
=
val
.
i_time
/
1000
;
retval
->
position
=
mediacontrol_unit_convert
(
p_input
,
mediacontrol_MediaTime
,
a_key
,
retval
->
position
);
mediacontrol_MediaTime
,
a_key
,
retval
->
position
);
retval
->
length
=
mediacontrol_unit_convert
(
p_input
,
mediacontrol_MediaTime
,
a_key
,
retval
->
length
);
mediacontrol_MediaTime
,
a_key
,
retval
->
length
);
}
return
retval
;
}
src/control/mediacontrol_util.c
View file @
470b47fe
...
...
@@ -96,7 +96,8 @@ vlc_int64_t mediacontrol_unit_convert( input_thread_t *p_input,
{
double
f_fps
;
if
(
demux2_Control
(
p_input
->
input
.
p_demux
,
DEMUX_GET_FPS
,
&
f_fps
)
||
f_fps
<
0
.
1
)
if
(
demux2_Control
(
p_input
->
input
.
p_demux
,
DEMUX_GET_FPS
,
&
f_fps
)
||
f_fps
<
0
.
1
)
return
0
;
if
(
to
==
mediacontrol_ByteCount
)
...
...
src/extras/libc.c
View file @
470b47fe
...
...
@@ -896,7 +896,7 @@ int __vlc_execve( vlc_object_t *p_object, int i_argc, char **ppsz_argv,
tv
.
tv_sec
=
0
;
tv
.
tv_usec
=
10000
;
i_ret
=
select
(
pi_stdin
[
0
]
>
pi_stdout
[
0
]
?
pi_stdin
[
0
]
+
1
:
pi_stdout
[
0
]
+
1
,
&
readfds
,
&
writefds
,
NULL
,
&
tv
);
if
(
i_ret
>
0
)
...
...
@@ -958,10 +958,10 @@ int __vlc_execve( vlc_object_t *p_object, int i_argc, char **ppsz_argv,
}
#elif defined( WIN32 ) && !defined( UNDER_CE )
SECURITY_ATTRIBUTES
saAttr
;
PROCESS_INFORMATION
piProcInfo
;
SECURITY_ATTRIBUTES
saAttr
;
PROCESS_INFORMATION
piProcInfo
;
STARTUPINFO
siStartInfo
;
BOOL
bFuncRetn
=
FALSE
;
BOOL
bFuncRetn
=
FALSE
;
HANDLE
hChildStdinRd
,
hChildStdinWr
,
hChildStdoutRd
,
hChildStdoutWr
;
DWORD
i_status
;
char
*
psz_cmd
,
*
p_env
,
*
p
;
...
...
@@ -969,14 +969,14 @@ int __vlc_execve( vlc_object_t *p_object, int i_argc, char **ppsz_argv,
int
i_size
;
/* Set the bInheritHandle flag so pipe handles are inherited. */
saAttr
.
nLength
=
sizeof
(
SECURITY_ATTRIBUTES
);
saAttr
.
bInheritHandle
=
TRUE
;
saAttr
.
lpSecurityDescriptor
=
NULL
;
saAttr
.
nLength
=
sizeof
(
SECURITY_ATTRIBUTES
);
saAttr
.
bInheritHandle
=
TRUE
;
saAttr
.
lpSecurityDescriptor
=
NULL
;
/* Create a pipe for the child process's STDOUT. */
if
(
!
CreatePipe
(
&
hChildStdoutRd
,
&
hChildStdoutWr
,
&
saAttr
,
0
)
)
if
(
!
CreatePipe
(
&
hChildStdoutRd
,
&
hChildStdoutWr
,
&
saAttr
,
0
)
)
{
msg_Err
(
p_object
,
"stdout pipe creation failed"
);
msg_Err
(
p_object
,
"stdout pipe creation failed"
);
return
-
1
;
}
...
...
@@ -984,9 +984,9 @@ int __vlc_execve( vlc_object_t *p_object, int i_argc, char **ppsz_argv,
SetHandleInformation
(
hChildStdoutRd
,
HANDLE_FLAG_INHERIT
,
0
);
/* Create a pipe for the child process's STDIN. */
if
(
!
CreatePipe
(
&
hChildStdinRd
,
&
hChildStdinWr
,
&
saAttr
,
0
)
)
if
(
!
CreatePipe
(
&
hChildStdinRd
,
&
hChildStdinWr
,
&
saAttr
,
0
)
)
{
msg_Err
(
p_object
,
"stdin pipe creation failed"
);
msg_Err
(
p_object
,
"stdin pipe creation failed"
);
return
-
1
;
}
...
...
@@ -995,10 +995,10 @@ int __vlc_execve( vlc_object_t *p_object, int i_argc, char **ppsz_argv,
/* Set up members of the PROCESS_INFORMATION structure. */
ZeroMemory
(
&
piProcInfo
,
sizeof
(
PROCESS_INFORMATION
)
);
/* Set up members of the STARTUPINFO structure. */
ZeroMemory
(
&
siStartInfo
,
sizeof
(
STARTUPINFO
)
);
siStartInfo
.
cb
=
sizeof
(
STARTUPINFO
);
siStartInfo
.
cb
=
sizeof
(
STARTUPINFO
);
siStartInfo
.
hStdError
=
hChildStdoutWr
;
siStartInfo
.
hStdOutput
=
hChildStdoutWr
;
siStartInfo
.
hStdInput
=
hChildStdinRd
;
...
...
@@ -1045,25 +1045,25 @@ int __vlc_execve( vlc_object_t *p_object, int i_argc, char **ppsz_argv,
ppsz_parser
++
;
}
*
p
=
'\0'
;
/* Create the child process. */
bFuncRetn
=
CreateProcess
(
NULL
,
psz_cmd
,
// command line
NULL
,
// process security attributes
NULL
,
// primary thread security attributes
TRUE
,
// handles are inherited
0
,
// creation flags
psz_cmd
,
// command line
NULL
,
// process security attributes
NULL
,
// primary thread security attributes
TRUE
,
// handles are inherited
0
,
// creation flags
p_env
,
psz_cwd
,
&
siStartInfo
,
// STARTUPINFO pointer
&
piProcInfo
);
// receives PROCESS_INFORMATION
&
siStartInfo
,
// STARTUPINFO pointer
&
piProcInfo
);
// receives PROCESS_INFORMATION
free
(
psz_cmd
);
free
(
p_env
);
if
(
bFuncRetn
==
0
)
if
(
bFuncRetn
==
0
)
{
msg_Err
(
p_object
,
"child creation failed"
);
msg_Err
(
p_object
,
"child creation failed"
);
return
-
1
;
}
...
...
@@ -1083,7 +1083,7 @@ int __vlc_execve( vlc_object_t *p_object, int i_argc, char **ppsz_argv,
/* Close the write end of the pipe before reading from the
* read end of the pipe. */
CloseHandle
(
hChildStdoutWr
);
/* Read output from the child process. */
*
pi_data
=
0
;
*
pp_data
=
malloc
(
1025
);
/* +1 for \0 */
...
...
@@ -1091,10 +1091,10 @@ int __vlc_execve( vlc_object_t *p_object, int i_argc, char **ppsz_argv,
while
(
!
p_object
->
b_die
)
{
DWORD
i_read
;
if
(
!
ReadFile
(
hChildStdoutRd
,
&
(
*
pp_data
)[
*
pi_data
],
1024
,
&
i_read
,
if
(
!
ReadFile
(
hChildStdoutRd
,
&
(
*
pp_data
)[
*
pi_data
],
1024
,
&
i_read
,
NULL
)
||
i_read
==
0
)
break
;
break
;
*
pi_data
+=
i_read
;
*
pp_data
=
realloc
(
*
pp_data
,
*
pi_data
+
1025
);
}
...
...
src/input/control.c
View file @
470b47fe
...
...
@@ -533,7 +533,8 @@ static void NotifyPlaylist( input_thread_t *p_input )
FIND_PARENT
);
if
(
p_playlist
)
{
var_SetInteger
(
p_playlist
,
"item-change"
,
p_input
->
input
.
p_item
->
i_id
);
var_SetInteger
(
p_playlist
,
"item-change"
,
p_input
->
input
.
p_item
->
i_id
);
vlc_object_release
(
p_playlist
);
}
}
...
...
src/input/decoder.c
View file @
470b47fe
...
...
@@ -943,15 +943,15 @@ static picture_t *vout_new_buffer( decoder_t *p_dec )
var_CreateGetBool
(
p_dec
,
"hdtv-fix"
)
)
{
p_dec
->
fmt_out
.
video
.
i_visible_height
=
1080
;
p_dec
->
fmt_out
.
video
.
i_sar_num
*=
135
;
p_dec
->
fmt_out
.
video
.
i_sar_den
*=
136
;
p_dec
->
fmt_out
.
video
.
i_sar_num
*=
135
;
p_dec
->
fmt_out
.
video
.
i_sar_den
*=
136
;
msg_Warn
(
p_dec
,
"Fixing broken HDTV stream (display_height=1088)"
);
}
if
(
!
p_dec
->
fmt_out
.
video
.
i_sar_num
||
!
p_dec
->
fmt_out
.
video
.
i_sar_den
)
{
p_dec
->
fmt_out
.
video
.
i_sar_num
=
p_dec
->
fmt_out
.
video
.
i_aspect
*
p_dec
->
fmt_out
.
video
.
i_sar_num
=
p_dec
->
fmt_out
.
video
.
i_aspect
*
p_dec
->
fmt_out
.
video
.
i_visible_height
;
p_dec
->
fmt_out
.
video
.
i_sar_den
=
VOUT_ASPECT_FACTOR
*
...
...
src/input/demux.c
View file @
470b47fe
...
...
@@ -75,9 +75,10 @@ demux_t *__demux2_New( vlc_object_t *p_obj,
if
(
s
&&
*
psz_module
==
'\0'
&&
strrchr
(
p_demux
->
psz_path
,
'.'
)
)
{
/* XXX: add only file without any problem here and with strong detection.
* - no .mp3, .a52, ... (aac is added as it works only by file ext anyway
* - wav can't be added 'cause of a52 and dts in them as raw audio
/* XXX: add only file without any problem here and with strong detection.
* - no .mp3, .a52, ... (aac is added as it works only by file ext
* anyway
* - wav can't be added 'cause of a52 and dts in them as raw audio
*/
static
struct
{
char
*
ext
;
char
*
demux
;
}
exttodemux
[]
=
{
...
...
@@ -99,7 +100,7 @@ demux_t *__demux2_New( vlc_object_t *p_obj,
{
NULL
,
NULL
},
};
/* Here, we don't mind if it does not work, it must be quick */
static
struct
{
char
*
ext
;
char
*
demux
;
}
exttodemux_quick
[]
=
static
struct
{
char
*
ext
;
char
*
demux
;
}
exttodemux_quick
[]
=
{
{
"mp3"
,
"mpga"
},
{
"ogg"
,
"ogg"
},
...
...
src/input/es_out.c
View file @
470b47fe
...
...
@@ -179,7 +179,7 @@ es_out_t *input_EsOutNew( input_thread_t *p_input )
if
(
p_sys
->
ppsz_audio_language
)
{
for
(
i
=
0
;
p_sys
->
ppsz_audio_language
[
i
];
i
++
)
msg_Dbg
(
p_input
,
"select
audio in
language[%d] %s"
,
msg_Dbg
(
p_input
,
"select
ed audio
language[%d] %s"
,
i
,
p_sys
->
ppsz_audio_language
[
i
]
);
}
if
(
val
.
psz_string
)
free
(
val
.
psz_string
);
...
...
@@ -189,7 +189,7 @@ es_out_t *input_EsOutNew( input_thread_t *p_input )
if
(
p_sys
->
ppsz_sub_language
)
{
for
(
i
=
0
;
p_sys
->
ppsz_sub_language
[
i
];
i
++
)
msg_Dbg
(
p_input
,
"select
subtitle in
language[%d] %s"
,
msg_Dbg
(
p_input
,
"select
ed subtitle
language[%d] %s"
,
i
,
p_sys
->
ppsz_sub_language
[
i
]
);
}
if
(
val
.
psz_string
)
free
(
val
.
psz_string
);
...
...
@@ -287,7 +287,7 @@ void input_EsOutDiscontinuity( es_out_t *out, vlc_bool_t b_audio )
{
es_out_id_t
*
es
=
p_sys
->
es
[
i
];
es
->
b_discontinuity
=
VLC_TRUE
;
/* signal discontinuity */
/* Send a dummy block to let decoder know that
* there is a discontinuity */
if
(
es
->
p_dec
&&
(
!
b_audio
||
es
->
fmt
.
i_cat
==
AUDIO_ES
)
)
...
...
@@ -368,8 +368,10 @@ static void EsOutESVarUpdate( es_out_t *out, es_out_id_t *es,
{
if
(
es
->
psz_language
&&
*
es
->
psz_language
)
{
text
.
psz_string
=
malloc
(
strlen
(
es
->
fmt
.
psz_description
)
+
strlen
(
es
->
psz_language
)
+
10
);
sprintf
(
text
.
psz_string
,
"%s - [%s]"
,
es
->
fmt
.
psz_description
,
es
->
psz_language
);
text
.
psz_string
=
malloc
(
strlen
(
es
->
fmt
.
psz_description
)
+
strlen
(
es
->
psz_language
)
+
10
);
sprintf
(
text
.
psz_string
,
"%s - [%s]"
,
es
->
fmt
.
psz_description
,
es
->
psz_language
);
}
else
text
.
psz_string
=
strdup
(
es
->
fmt
.
psz_description
);
}
...
...
@@ -378,7 +380,8 @@ static void EsOutESVarUpdate( es_out_t *out, es_out_id_t *es,
if
(
es
->
psz_language
&&
*
es
->
psz_language
)
{
char
*
temp
;
text
.
psz_string
=
malloc
(
strlen
(
_
(
"Track %i"
)
)
+
strlen
(
es
->
psz_language
)
+
30
);
text
.
psz_string
=
malloc
(
strlen
(
_
(
"Track %i"
)
)
+
strlen
(
es
->
psz_language
)
+
30
);
asprintf
(
&
temp
,
_
(
"Track %i"
),
val
.
i_int
);
sprintf
(
text
.
psz_string
,
"%s - [%s]"
,
temp
,
es
->
psz_language
);
free
(
temp
);
...
...
@@ -780,7 +783,7 @@ static void EsSelect( es_out_t *out, es_out_id_t *es )
msg_Dbg
(
p_input
,
"spu is disabled, not selecting ES 0x%x"
,
es
->
i_id
);
return
;
}
}
}
es
->
i_preroll_end
=
-
1
;
...
...
src/input/input.c
View file @
470b47fe
...
...
@@ -207,7 +207,8 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item,
}
else
if
(
!
strncmp
(
psz_start
,
"time="
,
5
)
)
{
p_seekpoint
->
i_time_offset
=
atoll
(
psz_start
+
5
)
*
1000000
;
p_seekpoint
->
i_time_offset
=
atoll
(
psz_start
+
5
)
*
1000000
;
}
psz_start
=
psz_end
+
1
;
}
...
...
@@ -1576,7 +1577,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type,
{
input_EsOutDiscontinuity
(
p_input
->
p_es_out
,
VLC_FALSE
);
es_out_Control
(
p_input
->
p_es_out
,
ES_OUT_RESET_PCR
);
access2_Control
(
p_access
,
ACCESS_SET_TITLE
,
i_title
);
stream_AccessReset
(
p_input
->
input
.
p_stream
);
}
...
...
@@ -1617,7 +1618,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type,
{
input_EsOutDiscontinuity
(
p_input
->
p_es_out
,
VLC_FALSE
);
es_out_Control
(
p_input
->
p_es_out
,
ES_OUT_RESET_PCR
);
demux2_Control
(
p_demux
,
DEMUX_SET_SEEKPOINT
,
i_seekpoint
);
}
}
...
...
@@ -1653,8 +1654,9 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type,
{
input_EsOutDiscontinuity
(
p_input
->
p_es_out
,
VLC_FALSE
);
es_out_Control
(
p_input
->
p_es_out
,
ES_OUT_RESET_PCR
);
access2_Control
(
p_access
,
ACCESS_SET_SEEKPOINT
,
i_seekpoint
);
access2_Control
(
p_access
,
ACCESS_SET_SEEKPOINT
,
i_seekpoint
);
stream_AccessReset
(
p_input
->
input
.
p_stream
);
}
}
...
...
@@ -1971,7 +1973,7 @@ static void UpdateItemLength( input_thread_t *p_input, int64_t i_length,
static
input_source_t
*
InputSourceNew
(
input_thread_t
*
p_input
)
{
input_source_t
*
in
=
(
input_source_t
*
)
malloc
(
sizeof
(
input_source_t
)
);
if
(
!
in
)
{
msg_Err
(
p_input
,
"out of memory for new input source"
);
...
...
@@ -2043,7 +2045,7 @@ static int InputSourceInit( input_thread_t *p_input,
{
psz_demux
=
psz_var_demux
;
msg_Dbg
(
p_input
,
"
Enforce
demux ` %s'"
,
psz_demux
);
msg_Dbg
(
p_input
,
"
enforced
demux ` %s'"
,
psz_demux
);
}
else
if
(
psz_var_demux
)
{
...
...
@@ -2281,7 +2283,7 @@ static void SlaveDemux( input_thread_t *p_input )
{
int64_t
i_time
;
int
i
;
if
(
demux2_Control
(
p_input
->
input
.
p_demux
,
DEMUX_GET_TIME
,
&
i_time
)
)
{
msg_Err
(
p_input
,
"demux doesn't like DEMUX_GET_TIME"
);
...
...
src/input/subtitles.c
View file @
470b47fe
...
...
@@ -36,8 +36,8 @@
# include <dirent.h>
#endif
#ifdef HAVE_LIMITS_H
# include <limits.h>
#ifdef HAVE_LIMITS_H
# include <limits.h>
#endif
#ifdef HAVE_UNISTD_H
...
...
@@ -64,7 +64,7 @@
/**
* The possible extentions for subtitle files we support
*/
static
const
char
*
sub_exts
[]
=
{
"utf"
,
"utf8"
,
"utf-8"
,
"sub"
,
"srt"
,
"smi"
,
"txt"
,
"ssa"
,
"idx"
,
NULL
};
static
const
char
*
sub_exts
[]
=
{
"utf"
,
"utf8"
,
"utf-8"
,
"sub"
,
"srt"
,
"smi"
,
"txt"
,
"ssa"
,
"idx"
,
NULL
};
/* extensions from unsupported types */
/* rt, aqt, jss, js, ass */
...
...
@@ -161,7 +161,7 @@ static int compare_sub_priority( const void *a, const void *b )
#endif
}
/* Utility function for scandir */
/* Utility function for scandir */
static
int
Filter
(
const
char
*
psz_dir_content
)
{
/* does it end with a subtitle extension? */
...
...
@@ -229,7 +229,7 @@ static char **paths_to_list( char *psz_dir, char *psz_path )
+
strlen
(
psz_subdir
)
+
2
);
if
(
psz_temp
)
{
sprintf
(
psz_temp
,
"%s%s%c"
,
sprintf
(
psz_temp
,
"%s%s%c"
,
psz_subdir
[
0
]
==
'.'
?
psz_dir
:
""
,
psz_subdir
,
psz_subdir
[
strlen
(
psz_subdir
)
-
1
]
==
...
...
@@ -343,8 +343,8 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
tmp_subdirs
=
paths_to_list
(
f_dir
,
psz_path
);
subdirs
=
tmp_subdirs
;
for
(
j
=
-
1
;
(
j
==
-
1
)
||
(
(
j
>=
0
)
&&
(
subdirs
!=
NULL
)
&&
(
*
subdirs
!=
NULL
)
);
j
++
)
for
(
j
=
-
1
;
(
j
==
-
1
)
||
(
(
j
>=
0
)
&&
(
subdirs
!=
NULL
)
&&
(
*
subdirs
!=
NULL
)
);
j
++
)
{
const
char
*
psz_dir
=
j
<
0
?
f_dir
:
*
subdirs
;
char
**
ppsz_dir_content
;
...
...
@@ -364,7 +364,8 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
msg_Dbg
(
p_this
,
"looking for a subtitle file in %s"
,
psz_dir
);
for
(
a
=
0
;
a
<
i_dir_content
;
a
++
)
{
char
*
psz_name
=
vlc_fix_readdir_charset
(
p_this
,
ppsz_dir_content
[
a
]
);
char
*
psz_name
=
vlc_fix_readdir_charset
(
p_this
,
ppsz_dir_content
[
a
]
);
int
i_prio
=
0
;
if
(
psz_name
==
NULL
)
...
...
@@ -408,12 +409,16 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
char
psz_path
[
strlen
(
psz_dir
)
+
strlen
(
psz_name
)
+
1
];
sprintf
(
psz_path
,
"%s%s"
,
psz_dir
,
psz_name
);
msg_Dbg
(
p_this
,
"autodetected subtitle: %s with priority %d"
,
psz_path
,
i_prio
);
msg_Dbg
(
p_this
,
"autodetected subtitle: %s with priority %d"
,
psz_path
,
i_prio
);
/* FIXME: a portable wrapper for stat() or access() would be more suited */
if
(
(
f
=
utf8_fopen
(
psz_path
,
"rt"
)
)
)
{
fclose
(
f
);
msg_Dbg
(
p_this
,
"autodetected subtitle: %s with priority %d"
,
psz_path
,
i_prio
);
msg_Dbg
(
p_this
,
"autodetected subtitle: %s with priority %d"
,
psz_path
,
i_prio
);
result
[
i_sub_count
].
priority
=
i_prio
;
result
[
i_sub_count
].
psz_fname
=
psz_path
;
result
[
i_sub_count
].
psz_ext
=
strdup
(
tmp_fname_ext
);
...
...
@@ -456,7 +461,8 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
for
(
i
=
0
;
i
<
i_sub_count
;
i
++
)
{
if
(
result
[
i
].
psz_fname
&&
result
[
j
].
psz_fname
&&
!
strncasecmp
(
result
[
j
].
psz_fname
,
result
[
i
].
psz_fname
,
sizeof
(
result
[
j
].
psz_fname
)
-
4
)
&&
!
strncasecmp
(
result
[
j
].
psz_fname
,
result
[
i
].
psz_fname
,
sizeof
(
result
[
j
].
psz_fname
)
-
4
)
&&
!
strcasecmp
(
result
[
i
].
psz_ext
,
"idx"
)
)
break
;
}
...
...
src/interface/interaction.c
View file @
470b47fe
...
...
@@ -513,8 +513,6 @@ static void intf_InteractionInit( playlist_t *p_playlist )
{
interaction_t
*
p_interaction
;
msg_Dbg
(
p_playlist
,
"initializing interaction system"
);
p_interaction
=
vlc_object_create
(
VLC_OBJECT
(
p_playlist
),
sizeof
(
interaction_t
)
);
if
(
!
p_interaction
)
...
...
@@ -544,7 +542,7 @@ static void intf_InteractionSearchInterface( interaction_t *p_interaction )
p_list
=
vlc_list_find
(
p_interaction
,
VLC_OBJECT_INTF
,
FIND_ANYWHERE
);
if
(
!
p_list
)
{
msg_Err
(
p_interaction
,
"
U
nable to create module list"
);
msg_Err
(
p_interaction
,
"
u
nable to create module list"
);
return
;
}
...
...
src/interface/interface.c
View file @
470b47fe
...
...
@@ -119,7 +119,7 @@ intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module,
if
(
p_intf
->
p_module
==
NULL
)
{
msg_Err
(
p_intf
,
"no suitable int
f
module"
);
msg_Err
(
p_intf
,
"no suitable int
erface
module"
);
vlc_object_destroy
(
p_intf
);
return
NULL
;
}
...
...
@@ -160,7 +160,7 @@ int intf_RunThread( intf_thread_t *p_intf )
{
/* This is the primary intf */
/* Run a manager thread, launch the interface, kill the manager */
if
(
vlc_thread_create
(
p_intf
,
"manage
r
"
,
Manager
,
if
(
vlc_thread_create
(
p_intf
,
"manage"
,
Manager
,
VLC_THREAD_PRIORITY_LOW
,
VLC_FALSE
)
)
{
msg_Err
(
p_intf
,
"cannot spawn manager thread"
);
...
...
@@ -189,7 +189,9 @@ int intf_RunThread( intf_thread_t *p_intf )
/* Run the interface in a separate thread */
if
(
!
strcmp
(
p_intf
->
p_module
->
psz_object_name
,
"macosx"
)
)
{
msg_Err
(
p_intf
,
"You cannot run the MacOS X module as an extrainterface. Please read the README.MacOSX.rtf file"
);
msg_Err
(
p_intf
,
"You cannot run the MacOS X module as an "
"extra interface. Please read the "
"README.MacOSX.rtf file"
);
return
VLC_EGENERIC
;
}
if
(
vlc_thread_create
(
p_intf
,
"interface"
,
RunInterface
,
...
...
src/misc/objects.c
View file @
470b47fe
...
...
@@ -122,7 +122,7 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type )
break
;
case
VLC_OBJECT_DIALOGS
:
i_size
=
sizeof
(
intf_thread_t
);
psz_type
=
"dialogs
provider
"
;
psz_type
=
"dialogs"
;
break
;
case
VLC_OBJECT_PLAYLIST
:
i_size
=
sizeof
(
playlist_t
);
...
...
@@ -170,7 +170,7 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type )
break
;
case
VLC_OBJECT_SPU
:
i_size
=
sizeof
(
spu_t
);
psz_type
=
"subpicture
unit
"
;
psz_type
=
"subpicture"
;
break
;
case
VLC_OBJECT_AOUT
:
i_size
=
sizeof
(
aout_instance_t
);
...
...
@@ -206,11 +206,11 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type )
break
;
case
VLC_OBJECT_OPENGL
:
i_size
=
sizeof
(
vout_thread_t
);
psz_type
=
"opengl
provider
"
;
psz_type
=
"opengl"
;
break
;
case
VLC_OBJECT_ANNOUNCE
:
i_size
=
sizeof
(
announce_handler_t
);
psz_type
=
"announce
handler
"
;
psz_type
=
"announce"
;
break
;
case
VLC_OBJECT_OSDMENU
:
i_size
=
sizeof
(
osd_menu_t
);
...
...
src/misc/stats.c
View file @
470b47fe
...
...
@@ -505,7 +505,7 @@ static int stats_CounterUpdate( stats_handler_t *p_handler,
p_counter
->
i_type
!=
VLC_VAR_INTEGER
&&
p_counter
->
i_compute_type
!=
STATS_LAST
)
{
msg_Err
(
p_handler
,
"
U
nable to compute MIN or MAX for this type"
);
msg_Err
(
p_handler
,
"
u
nable to compute MIN or MAX for this type"
);
return
VLC_EGENERIC
;
}
...
...
src/misc/vlm.c
View file @
470b47fe
...
...
@@ -82,7 +82,7 @@ vlm_t *__vlm_New ( vlc_object_t *p_this )
if
(
!
(
p_vlm
=
vlc_object_find
(
p_this
,
VLC_OBJECT_VLM
,
FIND_ANYWHERE
))
)
{
msg_Info
(
p_this
,
"creating
vlm
"
);
msg_Info
(
p_this
,
"creating
VLM
"
);
if
(
(
p_vlm
=
vlc_object_create
(
p_this
,
VLC_OBJECT_VLM
)
)
==
NULL
)
{
vlc_mutex_unlock
(
lockval
.
p_address
);
...
...
@@ -117,13 +117,13 @@ vlm_t *__vlm_New ( vlc_object_t *p_this )
vlm_message_t
*
p_message
=
NULL
;
char
*
psz_buffer
=
NULL
;
msg_Dbg
(
p_this
,
"loading
vlm conf ...
"
);
msg_Dbg
(
p_this
,
"loading
VLM configuration
"
);
asprintf
(
&
psz_buffer
,
"load %s"
,
psz_vlmconf
);
if
(
psz_buffer
)
{
msg_Dbg
(
p_this
,
psz_buffer
);
if
(
vlm_ExecuteCommand
(
p_vlm
,
psz_buffer
,
&
p_message
)
){
msg_Warn
(
p_this
,
"error while loading the
vlm conf
file"
);
msg_Warn
(
p_this
,
"error while loading the
configuration
file"
);
}
vlm_MessageDelete
(
p_message
);
free
(
psz_buffer
);
...
...
src/network/acl.c
View file @
470b47fe
...
...
@@ -97,7 +97,7 @@ static int ACL_Resolve( vlc_object_t *p_this, uint8_t *p_bytes,
#endif
default:
msg_Err
(
p_this
,
"
IMPOSSIBLE: unknown address family!
"
);
msg_Err
(
p_this
,
"
unknown address family
"
);
vlc_freeaddrinfo
(
res
);
return
-
1
;
}
...
...
@@ -283,7 +283,7 @@ int ACL_LoadFile( vlc_acl_t *p_acl, const char *psz_path )
{
if
(
ferror
(
file
)
)
{
msg_Err
(
p_acl
->
p_owner
,
"
E
rror reading %s : %s
\n
"
,
psz_path
,
msg_Err
(
p_acl
->
p_owner
,
"
e
rror reading %s : %s
\n
"
,
psz_path
,
strerror
(
errno
)
);
goto
error
;
}
...
...
@@ -303,14 +303,14 @@ int ACL_LoadFile( vlc_acl_t *p_acl, const char *psz_path )
ptr
=
strchr
(
psz_ip
,
'\n'
);
if
(
ptr
==
NULL
)
{
msg_Warn
(
p_acl
->
p_owner
,
"
S
kipping overly long line in %s
\n
"
,
msg_Warn
(
p_acl
->
p_owner
,
"
s
kipping overly long line in %s
\n
"
,
psz_path
);
do
{
fgets
(
line
,
sizeof
(
line
),
file
);
if
(
ferror
(
file
)
||
feof
(
file
)
)
{
msg_Err
(
p_acl
->
p_owner
,
"
E
rror reading %s : %s
\n
"
,
msg_Err
(
p_acl
->
p_owner
,
"
e
rror reading %s : %s
\n
"
,
psz_path
,
strerror
(
errno
)
);
goto
error
;
}
...
...
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