Move intf-popupmenu and video-on-top variables from playlist to libvlc.

[vlc] / modules / gui / wxwidgets / timer.cpp

diff --git a/modules/gui/wxwidgets/timer.cpp b/modules/gui/wxwidgets/timer.cpp
index b9f4e0e0ad21da4cc53acac0cd34782c37b43ff5..f65b090f0c671b98911a54b70180f4189c448449 100644 (file)
--- a/modules/gui/wxwidgets/timer.cpp
+++ b/modules/gui/wxwidgets/timer.cpp
@@ -49,12 +49,7 @@ Timer::Timer( intf_thread_t *_p_intf, Interface *_p_main_interface )
     var_AddCallback( p_intf->p_libvlc, "intf-show", IntfShowCB, p_intf );
 
     /* Register callback for the intf-popupmenu variable */
-    playlist_t *p_playlist = pl_Yield( p_intf );
-    if( p_playlist != NULL )
-    {
-        var_AddCallback( p_playlist, "intf-popupmenu", PopupMenuCB, p_intf );
-        pl_Release( p_playlist );
-    }
+    var_AddCallback( p_intf->p_libvlc, "intf-popupmenu", PopupMenuCB, p_intf );
 
     Start( 100 /*milliseconds*/, wxTIMER_CONTINUOUS );
 }
@@ -64,12 +59,7 @@ Timer::~Timer()
     var_DelCallback( p_intf->p_libvlc, "intf-show", IntfShowCB, p_intf );
 
     /* Unregister callback */
-    playlist_t *p_playlist = pl_Yield( p_intf );
-    if( p_playlist != NULL )
-    {
-        var_DelCallback( p_playlist, "intf-popupmenu", PopupMenuCB, p_intf );
-        pl_Release( p_playlist );
-    }
+    var_DelCallback( p_intf->p_libvlc, "intf-popupmenu", PopupMenuCB, p_intf );
 }
 
 /*****************************************************************************