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
e15851d5
Commit
e15851d5
authored
Aug 05, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lib: remove dead code
As of
a2ab8b27
, there is always a media player underneath the media list player.
parent
6e0c141c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
19 deletions
+4
-19
lib/media_list_player.c
lib/media_list_player.c
+4
-19
No files found.
lib/media_list_player.c
View file @
e15851d5
...
@@ -383,7 +383,6 @@ static void
...
@@ -383,7 +383,6 @@ static void
uninstall_media_player_observer
(
libvlc_media_list_player_t
*
p_mlp
)
uninstall_media_player_observer
(
libvlc_media_list_player_t
*
p_mlp
)
{
{
assert_locked
(
p_mlp
);
assert_locked
(
p_mlp
);
if
(
!
p_mlp
->
p_mi
)
return
;
// From now on, media_player callback won't be relevant.
// From now on, media_player callback won't be relevant.
p_mlp
->
are_mp_callback_cancelled
=
true
;
p_mlp
->
are_mp_callback_cancelled
=
true
;
...
@@ -609,11 +608,6 @@ void libvlc_media_list_player_play(libvlc_media_list_player_t * p_mlp)
...
@@ -609,11 +608,6 @@ void libvlc_media_list_player_play(libvlc_media_list_player_t * p_mlp)
void
libvlc_media_list_player_pause
(
libvlc_media_list_player_t
*
p_mlp
)
void
libvlc_media_list_player_pause
(
libvlc_media_list_player_t
*
p_mlp
)
{
{
lock
(
p_mlp
);
lock
(
p_mlp
);
if
(
!
p_mlp
->
p_mi
)
{
unlock
(
p_mlp
);
return
;
}
libvlc_media_player_pause
(
p_mlp
->
p_mi
);
libvlc_media_player_pause
(
p_mlp
->
p_mi
);
unlock
(
p_mlp
);
unlock
(
p_mlp
);
}
}
...
@@ -624,10 +618,6 @@ void libvlc_media_list_player_pause(libvlc_media_list_player_t * p_mlp)
...
@@ -624,10 +618,6 @@ void libvlc_media_list_player_pause(libvlc_media_list_player_t * p_mlp)
int
int
libvlc_media_list_player_is_playing
(
libvlc_media_list_player_t
*
p_mlp
)
libvlc_media_list_player_is_playing
(
libvlc_media_list_player_t
*
p_mlp
)
{
{
if
(
!
p_mlp
->
p_mi
)
{
return
libvlc_NothingSpecial
;
}
libvlc_state_t
state
=
libvlc_media_player_get_state
(
p_mlp
->
p_mi
);
libvlc_state_t
state
=
libvlc_media_player_get_state
(
p_mlp
->
p_mi
);
return
(
state
==
libvlc_Opening
)
||
(
state
==
libvlc_Buffering
)
||
return
(
state
==
libvlc_Opening
)
||
(
state
==
libvlc_Buffering
)
||
(
state
==
libvlc_Playing
);
(
state
==
libvlc_Playing
);
...
@@ -639,8 +629,6 @@ libvlc_media_list_player_is_playing(libvlc_media_list_player_t * p_mlp)
...
@@ -639,8 +629,6 @@ libvlc_media_list_player_is_playing(libvlc_media_list_player_t * p_mlp)
libvlc_state_t
libvlc_state_t
libvlc_media_list_player_get_state
(
libvlc_media_list_player_t
*
p_mlp
)
libvlc_media_list_player_get_state
(
libvlc_media_list_player_t
*
p_mlp
)
{
{
if
(
!
p_mlp
->
p_mi
)
return
libvlc_Ended
;
return
libvlc_media_player_get_state
(
p_mlp
->
p_mi
);
return
libvlc_media_player_get_state
(
p_mlp
->
p_mi
);
}
}
...
@@ -694,13 +682,10 @@ static void stop(libvlc_media_list_player_t * p_mlp)
...
@@ -694,13 +682,10 @@ static void stop(libvlc_media_list_player_t * p_mlp)
{
{
assert_locked
(
p_mlp
);
assert_locked
(
p_mlp
);
if
(
p_mlp
->
p_mi
)
{
/* We are not interested in getting media stop event now */
/* We are not interested in getting media stop event now */
uninstall_media_player_observer
(
p_mlp
);
uninstall_media_player_observer
(
p_mlp
);
libvlc_media_player_stop
(
p_mlp
->
p_mi
);
libvlc_media_player_stop
(
p_mlp
->
p_mi
);
install_media_player_observer
(
p_mlp
);
install_media_player_observer
(
p_mlp
);
}
free
(
p_mlp
->
current_playing_item_path
);
free
(
p_mlp
->
current_playing_item_path
);
p_mlp
->
current_playing_item_path
=
NULL
;
p_mlp
->
current_playing_item_path
=
NULL
;
...
...
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