Commit 4572062f authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Goom: use playlist_CurrentInput instead of vlc_object_find

parent 95759bad
...@@ -408,35 +408,30 @@ static void Close( vlc_object_t *p_this ) ...@@ -408,35 +408,30 @@ static void Close( vlc_object_t *p_this )
static char *TitleGet( vlc_object_t *p_this ) static char *TitleGet( vlc_object_t *p_this )
{ {
char *psz_title = NULL; playlist_t *pl = pl_Hold( p_this );
input_thread_t *p_input = if( !pl )
vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_ANYWHERE ); return NULL;
if( p_input ) input_thread_t *p_input = playlist_CurrentInput( pl );
{ pl_Release( p_this );
psz_title = input_item_GetTitle( input_GetItem( p_input ) ); if( !p_input )
return NULL;
char *psz_title = input_item_GetTitle( input_GetItem( p_input ) );
if( EMPTY_STR( psz_title ) ) if( EMPTY_STR( psz_title ) )
{ {
free( psz_title ); free( psz_title );
char *psz_orig = input_item_GetURI( input_GetItem( p_input ) );
char *psz = strrchr( psz_orig, '/' );
char *psz_uri = input_item_GetURI( input_GetItem( p_input ) );
const char *psz = strrchr( psz_orig, '/' );
if( psz ) if( psz )
{ {
psz++; psz_title = strdup( psz + 1 );
free( psz_uri );
} }
else else
{ psz_title = psz_uri;
psz = psz_orig;
}
if( psz && *psz )
{
psz_title = strdup( psz );
}
free( psz_orig );
} }
vlc_object_release( p_input ); vlc_object_release( p_input );
}
return psz_title; return psz_title;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment