]> git.sesse.net Git - vlc/blobdiff - modules/visualization/goom.c
Remove stdlib.h
[vlc] / modules / visualization / goom.c
index 888aeaa2128f30f8013c5e668f2906f58e4e2717..8547518a0dd14db21f91575ca82884025aef6ad0 100644 (file)
@@ -25,7 +25,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>                                              /* strdup() */
 #include <errno.h>
 
@@ -384,7 +383,7 @@ static void Close( vlc_object_t *p_this )
     aout_filter_sys_t *p_sys = p_filter->p_sys;
 
     /* Stop Goom Thread */
-    p_sys->p_thread->b_die = VLC_TRUE;
+    vlc_object_kill( p_sys->p_thread );
 
     vlc_mutex_lock( &p_sys->p_thread->lock );
     vlc_cond_signal( &p_sys->p_thread->wait );
@@ -416,13 +415,10 @@ static char *TitleGet( vlc_object_t *p_this )
 
     if( p_input )
     {
-        if( input_GetItem(p_input)->p_meta->psz_title &&
-                *input_GetItem(p_input)->p_meta->psz_title )
-        {
-            psz_title = strdup( input_GetItem(p_input)->p_meta->psz_title );
-        }
-        else
+        psz_title = strdup( input_item_GetTitle( input_GetItem( p_input ) ) );
+        if( EMPTY_STR( psz_title ) )
         {
+            free( psz_title );
             char *psz = strrchr( input_GetItem(p_input)->psz_uri, '/' );
 
             if( psz )