[vlc-commits] playlist: remove unnecessary shortcuts

Rémi Denis-Courmont git at videolan.org
Sat Nov 19 16:16:32 CET 2016


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Nov 19 17:11:34 2016 +0200| [2b69fa1f941806839cf3bae503b28ff0bf2719e7] | committer: Rémi Denis-Courmont

playlist: remove unnecessary shortcuts

Controls can be processed if the playlist is empty. They just do
nothing. Conversely, stop need not be processed if the playlist was
already killed.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2b69fa1f941806839cf3bae503b28ff0bf2719e7
---

 src/playlist/control.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/playlist/control.c b/src/playlist/control.c
index d1ac9d0..b7469e0 100644
--- a/src/playlist/control.c
+++ b/src/playlist/control.c
@@ -53,9 +53,8 @@ static void playlist_vaControl( playlist_t *p_playlist, int i_query, va_list arg
 {
     PL_ASSERT_LOCKED;
 
-    if( i_query != PLAYLIST_STOP )
-        if( pl_priv(p_playlist)->killed || playlist_IsEmpty( p_playlist ) )
-            return;
+    if( pl_priv(p_playlist)->killed )
+        return;
 
     switch( i_query )
     {



More information about the vlc-commits mailing list