Commit 22bafc1a authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt4: Fix the [21193] for Qt4.

parent 2feb5a9d
...@@ -132,12 +132,13 @@ void InputManager::update() ...@@ -132,12 +132,13 @@ void InputManager::update()
/* Update text */ /* Update text */
QString text; QString text;
char *psz_name = input_GetName( input_GetItem( p_input ) ); char *psz_name = input_item_GetName( input_GetItem( p_input ) );
char *psz_nowplaying = input_item_GetNowPlaying( input_GetItem( p_input ); char *psz_nowplaying =
input_item_GetNowPlaying( input_GetItem( p_input ) );
char *psz_artist = input_item_GetArtist( input_GetItem( p_input ) ); char *psz_artist = input_item_GetArtist( input_GetItem( p_input ) );
if( !EMPTY_STR( psz_nowplaying ) ) if( !EMPTY_STR( psz_nowplaying ) )
{ {
text.sprintf( "%s - %s", psz_now_playing, psz_name ); text.sprintf( "%s - %s", psz_nowplaying, psz_name );
} }
else if( !EMPTY_STR( psz_artist ) ) else if( !EMPTY_STR( psz_artist ) )
{ {
......
...@@ -184,9 +184,9 @@ void PLItem::update( playlist_item_t *p_item, bool iscurrent ) ...@@ -184,9 +184,9 @@ void PLItem::update( playlist_item_t *p_item, bool iscurrent )
current = iscurrent; current = iscurrent;
char *psz_arturl = input_item_GetArtURL( p_item->p_input ); char *psz_arturl = input_item_GetArtURL( p_item->p_input );
if( current && psz_arturl ) && if( ( current && psz_arturl ) &&
!strncmp( psz_arturl, "file://", 7 ) ) !strncmp( psz_arturl, "file://", 7 ) )
model->sendArt( qfu( psz_arturl ) ) ); model->sendArt( qfu( psz_arturl ) ) ;
else if( current ) else if( current )
model->removeArt(); model->removeArt();
free( psz_arturl ); free( psz_arturl );
...@@ -215,8 +215,8 @@ void PLItem::update( playlist_item_t *p_item, bool iscurrent ) ...@@ -215,8 +215,8 @@ void PLItem::update( playlist_item_t *p_item, bool iscurrent )
ADD_META( p_item, Artist ); ADD_META( p_item, Artist );
break; break;
case VLC_META_ENGINE_TITLE: case VLC_META_ENGINE_TITLE:
char *psz_title; char *psz_title, *psz_name;
psz_title = input_item_GetTile( p_item->p_input ); psz_title = input_item_GetTitle( p_item->p_input );
psz_name = input_item_GetName( p_item->p_input ); psz_name = input_item_GetName( p_item->p_input );
if( psz_title ) if( 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