Use pl_Release an factorise two lines.

[vlc] / modules / misc / notify / xosd.c

diff --git a/modules/misc/notify/xosd.c b/modules/misc/notify/xosd.c
index ee31cc592becd2758dd3c150784e99b04989d022..4c766bfe85acf99c856fccb7e65181088e9546f8 100644 (file)
--- a/modules/misc/notify/xosd.c
+++ b/modules/misc/notify/xosd.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_playlist.h>
 #include <vlc_input.h>
@@ -211,7 +211,7 @@ static void Run( intf_thread_t *p_intf )
     char psz_duration[MSTRTIME_MAX_SIZE+2];
     char *psz_display = NULL;
 
-    while( !p_intf->b_die )
+    while( vlc_object_alive (p_intf) )
     {
         if( p_intf->p_sys->b_need_update == true )
         {
@@ -220,7 +220,7 @@ static void Run( intf_thread_t *p_intf )
 
             if( playlist_IsEmpty( p_playlist ) )
             {
-                vlc_object_release( p_playlist );
+                pl_Release( p_playlist );
                 continue;
             }
             free( psz_display );
@@ -228,24 +228,21 @@ static void Run( intf_thread_t *p_intf )
             if( p_playlist->status.i_status == PLAYLIST_STOPPED )
             {
                 psz_display = strdup(_("Stop"));
-                vlc_object_release( p_playlist );
+                pl_Release( p_playlist );
             }
             else if( p_playlist->status.i_status == PLAYLIST_PAUSED )
             {
                 psz_display = strdup(_("Pause"));
-                vlc_object_release( p_playlist );
+                pl_Release( p_playlist );
             }
             else
             {
                 p_item = p_playlist->status.p_item;
                 p_input = p_item->p_input;
+
+                pl_Release( p_playlist );
                 if( !p_item )
-                {
-                    vlc_object_release( p_playlist );
                     continue;
-                }
-
-                vlc_object_release( p_playlist );
 
                 mtime_t i_duration = input_item_GetDuration( p_input );
                 if( i_duration != -1 )