Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
ccba67b5
Commit
ccba67b5
authored
Feb 14, 2010
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
es_out_SetDelay cannot fail.
parent
6dad2831
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
13 deletions
+10
-13
src/input/es_out.h
src/input/es_out.h
+4
-3
src/input/input.c
src/input/input.c
+6
-10
No files found.
src/input/es_out.h
View file @
ccba67b5
...
...
@@ -58,7 +58,7 @@ enum es_out_query_private_e
ES_OUT_GET_BUFFERING
,
/* arg1=bool* res=cannot fail */
/* Set delay for a ES category */
ES_OUT_SET_DELAY
,
/* arg1=es_category_e, res=can fail */
ES_OUT_SET_DELAY
,
/* arg1=es_category_e, res=can
not
fail */
/* Set record state */
ES_OUT_SET_RECORD_STATE
,
/* arg1=bool res=can fail */
...
...
@@ -111,9 +111,10 @@ static inline bool es_out_GetEmpty( es_out_t *p_out )
assert
(
!
i_ret
);
return
b
;
}
static
inline
int
es_out_SetDelay
(
es_out_t
*
p_out
,
int
i_cat
,
mtime_t
i_delay
)
static
inline
void
es_out_SetDelay
(
es_out_t
*
p_out
,
int
i_cat
,
mtime_t
i_delay
)
{
return
es_out_Control
(
p_out
,
ES_OUT_SET_DELAY
,
i_cat
,
i_delay
);
int
i_ret
=
es_out_Control
(
p_out
,
ES_OUT_SET_DELAY
,
i_cat
,
i_delay
);
assert
(
!
i_ret
);
}
static
inline
int
es_out_SetRecordState
(
es_out_t
*
p_out
,
bool
b_record
)
{
...
...
src/input/input.c
View file @
ccba67b5
...
...
@@ -1920,19 +1920,15 @@ static bool Control( input_thread_t *p_input,
break
;
case
INPUT_CONTROL_SET_AUDIO_DELAY
:
if
(
!
es_out_SetDelay
(
p_input
->
p
->
p_es_out_display
,
AUDIO_ES
,
val
.
i_time
)
)
{
input_SendEventAudioDelay
(
p_input
,
val
.
i_time
);
UpdatePtsDelay
(
p_input
);
}
es_out_SetDelay
(
p_input
->
p
->
p_es_out_display
,
AUDIO_ES
,
val
.
i_time
);
input_SendEventAudioDelay
(
p_input
,
val
.
i_time
);
UpdatePtsDelay
(
p_input
);
break
;
case
INPUT_CONTROL_SET_SPU_DELAY
:
if
(
!
es_out_SetDelay
(
p_input
->
p
->
p_es_out_display
,
SPU_ES
,
val
.
i_time
)
)
{
input_SendEventSubtitleDelay
(
p_input
,
val
.
i_time
);
UpdatePtsDelay
(
p_input
);
}
es_out_SetDelay
(
p_input
->
p
->
p_es_out_display
,
SPU_ES
,
val
.
i_time
);
input_SendEventSubtitleDelay
(
p_input
,
val
.
i_time
);
UpdatePtsDelay
(
p_input
);
break
;
case
INPUT_CONTROL_SET_TITLE
:
...
...
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