Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
7
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Steve Lhomme
VLC
Commits
83a737dc
Commit
83a737dc
authored
6 years ago
by
Thomas Guillem
Browse files
Options
Downloads
Patches
Plain Diff
resource: remove unused HasVout
parent
e6f406bc
Loading
Loading
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/input/input_interface.h
+0
-7
0 additions, 7 deletions
src/input/input_interface.h
src/input/resource.c
+0
-10
0 additions, 10 deletions
src/input/resource.c
src/playlist_legacy/thread.c
+0
-8
0 additions, 8 deletions
src/playlist_legacy/thread.c
with
0 additions
and
25 deletions
src/input/input_interface.h
+
0
−
7
View file @
83a737dc
...
...
@@ -43,11 +43,4 @@ void input_item_SetEpgOffline( input_item_t * );
*/
void
input_resource_TerminateSout
(
input_resource_t
*
p_resource
);
/**
* This function return true if there is at least one vout in the resources.
*
* It can only be called on detached resources.
*/
bool
input_resource_HasVout
(
input_resource_t
*
p_resource
);
#endif
This diff is collapsed.
Click to expand it.
src/input/resource.c
+
0
−
10
View file @
83a737dc
...
...
@@ -484,16 +484,6 @@ void input_resource_TerminateVout( input_resource_t *p_resource )
vlc_mutex_unlock
(
&
p_resource
->
lock
);
}
bool
input_resource_HasVout
(
input_resource_t
*
p_resource
)
{
vlc_mutex_lock
(
&
p_resource
->
lock
);
assert
(
!
p_resource
->
p_input
);
const
bool
b_vout
=
p_resource
->
p_vout_free
!=
NULL
;
vlc_mutex_unlock
(
&
p_resource
->
lock
);
return
b_vout
;
}
/* */
sout_instance_t
*
input_resource_RequestSout
(
input_resource_t
*
p_resource
,
sout_instance_t
*
p_sout
,
const
char
*
psz_sout
)
{
...
...
This diff is collapsed.
Click to expand it.
src/playlist_legacy/thread.c
+
0
−
8
View file @
83a737dc
...
...
@@ -517,14 +517,6 @@ static void *Thread ( void *data )
msg_Info
(
p_playlist
,
"end of playlist, exiting"
);
libvlc_Quit
(
vlc_object_instance
(
p_playlist
)
);
}
/* Destroy any video display now (XXX: ugly hack) */
if
(
input_resource_HasVout
(
p_sys
->
p_input_resource
)
)
{
PL_UNLOCK
;
/* Mind: NO LOCKS while manipulating input resources! */
input_resource_TerminateVout
(
p_sys
->
p_input_resource
);
PL_LOCK
;
}
}
PL_UNLOCK
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment