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
af922d5e
Commit
af922d5e
authored
Jun 05, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
input: remove input_thread_t.b_error
parent
3b6780d3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
10 deletions
+5
-10
include/vlc_input.h
include/vlc_input.h
+0
-1
src/input/input.c
src/input/input.c
+5
-9
No files found.
include/vlc_input.h
View file @
af922d5e
...
@@ -225,7 +225,6 @@ struct input_thread_t
...
@@ -225,7 +225,6 @@ struct input_thread_t
{
{
VLC_COMMON_MEMBERS
VLC_COMMON_MEMBERS
bool
b_error
VLC_DEPRECATED
;
bool
b_preparsing
;
bool
b_preparsing
;
bool
b_dead
VLC_DEPRECATED
;
bool
b_dead
VLC_DEPRECATED
;
...
...
src/input/input.c
View file @
af922d5e
...
@@ -685,7 +685,7 @@ static void MainLoop( input_thread_t *p_input, bool b_interactive )
...
@@ -685,7 +685,7 @@ static void MainLoop( input_thread_t *p_input, bool b_interactive )
bool
b_pause_after_eof
=
b_interactive
&&
bool
b_pause_after_eof
=
b_interactive
&&
var_InheritBool
(
p_input
,
"play-and-pause"
);
var_InheritBool
(
p_input
,
"play-and-pause"
);
while
(
vlc_object_alive
(
p_input
)
&&
!
p_input
->
b_error
)
while
(
vlc_object_alive
(
p_input
)
&&
p_input
->
p
->
i_state
!=
ERROR_S
)
{
{
mtime_t
i_wakeup
=
-
1
;
mtime_t
i_wakeup
=
-
1
;
bool
b_paused
=
p_input
->
p
->
i_state
==
PAUSE_S
;
bool
b_paused
=
p_input
->
p
->
i_state
==
PAUSE_S
;
...
@@ -2810,17 +2810,13 @@ static void InputGetExtraFiles( input_thread_t *p_input,
...
@@ -2810,17 +2810,13 @@ static void InputGetExtraFiles( input_thread_t *p_input,
/* */
/* */
static
void
input_ChangeState
(
input_thread_t
*
p_input
,
int
i_state
)
static
void
input_ChangeState
(
input_thread_t
*
p_input
,
int
i_state
)
{
{
const
bool
b_changed
=
p_input
->
p
->
i_state
!=
i_state
;
if
(
p_input
->
p
->
i_state
==
i_state
)
return
;
p_input
->
p
->
i_state
=
i_state
;
p_input
->
p
->
i_state
=
i_state
;
if
(
i_state
==
ERROR_S
)
if
(
i_state
==
ERROR_S
)
p_input
->
b_error
=
true
;
input_item_SetErrorWhenReading
(
p_input
->
p
->
p_item
,
true
);
if
(
b_changed
)
{
input_item_SetErrorWhenReading
(
p_input
->
p
->
p_item
,
p_input
->
b_error
);
input_SendEventState
(
p_input
,
i_state
);
input_SendEventState
(
p_input
,
i_state
);
}
}
}
...
...
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