macosx: Don't use playlist_NodeAddInput() it's deprecated. Fix #1705.

[vlc] / modules / access / dvdnav.c

diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index 58de10d592d04f3d810a8637c5f7ac31c2c331f2..43f0c1112ad6a7e5431cf6b360e506e263cd6ec6 100644 (file)
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -1234,7 +1234,7 @@ static int EventThread( vlc_object_t *p_this )
     var_AddCallback( p_ev->p_libvlc, "key-action", EventKey, p_ev );
 
     /* main loop */
-    while( !p_ev->b_die )
+    while( vlc_object_alive (p_ev) )
     {
         bool b_activated = false;
 
@@ -1243,9 +1243,6 @@ static int EventThread( vlc_object_t *p_this )
         {
             pci_t *pci = dvdnav_get_current_nav_pci( p_sys->dvdnav );
 
-            vlc_value_t valk;
-            int i;
-
             vlc_mutex_lock( &p_ev->lock );
             switch( p_ev->i_key_action )
             {
@@ -1300,7 +1297,7 @@ static int EventThread( vlc_object_t *p_this )
             p_ev->b_clicked = false;
             vlc_mutex_unlock( &p_ev->lock );
         }
-        if( p_vout && p_vout->b_die )
+        if( p_vout && !vlc_object_alive (p_vout) )
         {
             var_DelCallback( p_vout, "mouse-moved", EventMouse, p_ev );
             var_DelCallback( p_vout, "mouse-clicked", EventMouse, p_ev );