- if( input_GetItem(p_input)->psz_name != NULL )
- o_title = [NSMutableString stringWithUTF8String:
- input_GetItem(p_input)->psz_name];
- if( input_GetItem(p_input)->psz_uri != NULL )
- o_mrl = [NSMutableString stringWithUTF8String:
- input_GetItem(p_input)->psz_uri];
+ char *psz_nowPlaying = input_item_GetNowPlaying ( input_GetItem( p_input ) );
+ char *psz_name = input_item_GetName( input_GetItem( p_input ) );
+ char *psz_uri = input_item_GetURI( input_GetItem( p_input ) );
+ if( psz_nowPlaying != NULL )
+ o_title = [NSString stringWithUTF8String: psz_nowPlaying];
+ else if( psz_name != NULL )
+ o_title = [NSString stringWithUTF8String: psz_name];
+
+ if( psz_uri != NULL )
+ o_mrl = [NSMutableString stringWithUTF8String: psz_uri];
+
+ FREENULL( psz_nowPlaying );
+ FREENULL( psz_name );
+ FREENULL( psz_uri );
+