Commit 70d1cb5f authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Always show something in the statusLabel, even if you don't have ANY metadata.

This will slow a few complaints from many people.
parent 038ee68f
...@@ -305,6 +305,7 @@ void InputManager::UpdateMeta() ...@@ -305,6 +305,7 @@ void InputManager::UpdateMeta()
/* Update text, name and nowplaying */ /* Update text, name and nowplaying */
QString text; QString text;
/* Try to get the Title, then the Name */
char *psz_name = input_item_GetTitle( input_GetItem( p_input ) ); char *psz_name = input_item_GetTitle( input_GetItem( p_input ) );
if( EMPTY_STR( psz_name ) ) if( EMPTY_STR( psz_name ) )
{ {
...@@ -312,28 +313,37 @@ void InputManager::UpdateMeta() ...@@ -312,28 +313,37 @@ void InputManager::UpdateMeta()
psz_name = input_item_GetName( input_GetItem( p_input ) ); psz_name = input_item_GetName( input_GetItem( p_input ) );
} }
/* Try to get the nowplaying */
char *psz_nowplaying = char *psz_nowplaying =
input_item_GetNowPlaying( input_GetItem( p_input ) ); input_item_GetNowPlaying( input_GetItem( p_input ) );
if( !EMPTY_STR( psz_nowplaying ) ) if( !EMPTY_STR( psz_nowplaying ) )
{ {
text.sprintf( "%s - %s", psz_nowplaying, psz_name ); text.sprintf( "%s - %s", psz_nowplaying, psz_name );
} }
else else /* Do it ourself */
{ {
char *psz_artist = input_item_GetArtist( input_GetItem( p_input ) ); char *psz_artist = input_item_GetArtist( input_GetItem( p_input ) );
if( !EMPTY_STR( psz_artist ) ) if( !EMPTY_STR( psz_artist ) )
{
text.sprintf( "%s - %s", psz_artist, psz_name ); text.sprintf( "%s - %s", psz_artist, psz_name );
}
else else
{
text.sprintf( "%s", psz_name ); text.sprintf( "%s", psz_name );
}
free( psz_artist ); free( psz_artist );
} }
/* Free everything */
free( psz_name ); free( psz_name );
free( psz_nowplaying ); free( psz_nowplaying );
/* If we have Nothing */
if( text.isEmpty() )
{
psz_name = input_item_GetURI( input_GetItem( p_input ) );
text.sprintf( "%s", psz_name );
text = text.remove( 0, text.lastIndexOf( DIR_SEP ) + 1 );
free( psz_name );
}
if( old_name != text ) if( old_name != text )
{ {
emit nameChanged( text ); emit nameChanged( text );
......
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