[vlc-commits] playlist: automatically resume from pause when uncorked

Rémi Denis-Courmont git at videolan.org
Mon Dec 15 18:25:19 CET 2014


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Dec 15 19:24:25 2014 +0200| [ab500430e6dfd02ae4e19ecb9a3d76f3f9486522] | committer: Rémi Denis-Courmont

playlist: automatically resume from pause when uncorked

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

 src/playlist/engine.c |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index 742d9e4..05ea3b1 100644
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -84,18 +84,19 @@ static int CorksCallback( vlc_object_t *obj, char const *var,
     if( !old.i_int == !cur.i_int )
         return VLC_SUCCESS; /* nothing to do */
 
+    if( !var_InheritBool( obj, "playlist-cork" ) )
+        return VLC_SUCCESS;
+
     if( cur.i_int )
     {
-        if( var_InheritBool( obj, "playlist-cork" ) )
-        {
-            msg_Dbg( obj, "corked" );
-            playlist_Pause( pl );
-        }
-        else
-            msg_Dbg( obj, "not corked" );
+        msg_Dbg( obj, "corked" );
+        playlist_Pause( pl );
     }
     else
+    {
         msg_Dbg( obj, "uncorked" );
+        playlist_Resume( pl );
+    }
 
     (void) var; (void) dummy;
     return VLC_SUCCESS;



More information about the vlc-commits mailing list