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
72b8c9e5
Commit
72b8c9e5
authored
Jun 05, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vlm: use input "state" variable instead of b_eof/b_error
parent
f20f1ca7
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
5 deletions
+7
-5
src/input/vlm.c
src/input/vlm.c
+7
-5
No files found.
src/input/vlm.c
View file @
72b8c9e5
...
...
@@ -424,8 +424,11 @@ static void* Manage( void* p_object )
for
(
j
=
0
;
j
<
p_media
->
i_instance
;
)
{
vlm_media_instance_sys_t
*
p_instance
=
p_media
->
instance
[
j
];
int
state
=
INIT_S
;
if
(
p_instance
->
p_input
&&
(
p_instance
->
p_input
->
b_eof
||
p_instance
->
p_input
->
b_error
)
)
if
(
p_instance
->
p_input
!=
NULL
)
state
=
var_GetInteger
(
p_instance
->
p_input
,
"state"
);
if
(
state
==
END_S
||
state
==
ERROR_S
)
{
int
i_new_input_index
;
...
...
@@ -985,15 +988,14 @@ static int vlm_ControlMediaInstanceStart( vlm_t *p_vlm, int64_t id, const char *
input_thread_t
*
p_input
=
p_instance
->
p_input
;
if
(
p_input
)
{
if
(
p_instance
->
i_index
==
i_input_index
&&
!
p_input
->
b_eof
&&
!
p_input
->
b_error
)
if
(
p_instance
->
i_index
==
i_input_index
)
{
if
(
var_GetInteger
(
p_input
,
"state"
)
==
PAUSE_S
)
int
state
=
var_GetInteger
(
p_input
,
"state"
);
if
(
state
==
PAUSE_S
)
var_SetInteger
(
p_input
,
"state"
,
PLAYING_S
);
return
VLC_SUCCESS
;
}
input_Stop
(
p_input
);
input_Close
(
p_input
);
...
...
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