From: Rémi Denis-Courmont <remi@remlab.net>
Date: Mon, 18 Jan 2010 17:38:24 +0000 (+0200)
Subject: Goom: use playlist_CurrentInput instead of vlc_object_find
X-Git-Tag: 1.1.0-ff~1123
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=4572062f504c2aab3079a4dde5bfe3aebb2154b3;p=vlc

Goom: use playlist_CurrentInput instead of vlc_object_find
---

diff --git a/modules/visualization/goom.c b/modules/visualization/goom.c
index 6d93663273..d7c6d036a7 100644
--- a/modules/visualization/goom.c
+++ b/modules/visualization/goom.c
@@ -408,35 +408,30 @@ static void Close( vlc_object_t *p_this )
 
 static char *TitleGet( vlc_object_t *p_this )
 {
-    char *psz_title = NULL;
-    input_thread_t *p_input =
-        vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_ANYWHERE );
+    playlist_t *pl = pl_Hold( p_this );
+    if( !pl )
+        return NULL;
 
-    if( p_input )
+    input_thread_t *p_input = playlist_CurrentInput( pl );
+    pl_Release( p_this );
+    if( !p_input )
+        return NULL;
+
+    char *psz_title = input_item_GetTitle( input_GetItem( p_input ) );
+    if( EMPTY_STR( psz_title ) )
     {
-        psz_title = input_item_GetTitle( input_GetItem( p_input ) );
-        if( EMPTY_STR( psz_title ) )
+        free( psz_title );
+
+        char *psz_uri = input_item_GetURI( input_GetItem( p_input ) );
+        const char *psz = strrchr( psz_orig, '/' );
+        if( psz )
         {
-            free( psz_title );
-            char *psz_orig = input_item_GetURI( input_GetItem( p_input ) );
-            char *psz = strrchr( psz_orig, '/' );
-
-            if( psz )
-            {
-                psz++;
-            }
-            else
-            {
-                psz = psz_orig;
-            }
-            if( psz && *psz )
-            {
-                psz_title = strdup( psz );
-            }
-            free( psz_orig );
+            psz_title = strdup( psz + 1 );
+            free( psz_uri );
         }
-        vlc_object_release( p_input );
+        else
+            psz_title = psz_uri;
     }
-
+    vlc_object_release( p_input );
     return psz_title;
 }