Renamed playlist "playlist-current" to "item-current".
[vlc.git] / modules / gui / maemo / maemo.c
index 0690062..96e6080 100644 (file)
@@ -228,7 +228,7 @@ static void Run( intf_thread_t *p_intf )
     g_timeout_add( 150 /* miliseconds */, should_die, p_intf );
     var_AddCallback( p_intf->p_sys->p_playlist, "item-change",
                      item_changed_cb, p_intf );
-    var_AddCallback( p_intf->p_sys->p_playlist, "playlist-current",
+    var_AddCallback( p_intf->p_sys->p_playlist, "item-current",
                      playlist_current_cb, p_intf );
     var_AddCallback( p_intf->p_sys->p_playlist, "activity",
                      activity_cb, p_intf );
@@ -244,7 +244,7 @@ static void Run( intf_thread_t *p_intf )
     delete_input( p_intf );
     var_DelCallback( p_intf->p_sys->p_playlist, "item-change",
                      item_changed_cb, p_intf );
-    var_DelCallback( p_intf->p_sys->p_playlist, "playlist-current",
+    var_DelCallback( p_intf->p_sys->p_playlist, "item-current",
                      playlist_current_cb, p_intf );
     var_DelCallback( p_intf->p_sys->p_playlist, "activity",
                      activity_cb, p_intf );
@@ -254,8 +254,7 @@ static void Run( intf_thread_t *p_intf )
 
     if( p_vout )
     {
-        if( vout_Control( p_vout, VOUT_CLOSE ) != VLC_SUCCESS )
-            vout_Control( p_vout, VOUT_REPARENT, 0 );
+        vout_Control( p_vout, VOUT_REPARENT, 0 );
         vlc_object_release( p_vout );
     }