Qt4: Fix the [21193] for Qt4.

diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index a1a58592f52c71fcec48e7d327974fc518075656..327e13a4e3e3012983140d269cd659439988a06c 100644 (file)
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -132,12 +132,13 @@ void InputManager::update()
 
     /* Update text */
     QString text;
-    char *psz_name = input_GetName( input_GetItem( p_input ) );
-    char *psz_nowplaying = input_item_GetNowPlaying( 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_artist = input_item_GetArtist( input_GetItem( p_input ) );
     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 ) )
     {

diff --git a/modules/gui/qt4/playlist_model.cpp b/modules/gui/qt4/playlist_model.cpp
index 839e4a2a08c8402b0777a947ec9a69dbb1a56914..60e340de30a1899632dfc91954e4ec0f382d83e0 100644 (file)
--- a/modules/gui/qt4/playlist_model.cpp
+++ b/modules/gui/qt4/playlist_model.cpp
@@ -184,9 +184,9 @@ void PLItem::update( playlist_item_t *p_item, bool iscurrent )
     current = iscurrent;
 
     char *psz_arturl = input_item_GetArtURL( p_item->p_input );
-    if( current && psz_arturl ) &&
+    if( ( current && psz_arturl ) &&
         !strncmp( psz_arturl, "file://", 7 ) )
-        model->sendArt( qfu( psz_arturl ) ) );
+        model->sendArt( qfu( psz_arturl ) ) ;
     else if( current )
         model->removeArt();
     free( psz_arturl );
@@ -215,8 +215,8 @@ void PLItem::update( playlist_item_t *p_item, bool iscurrent )
                     ADD_META( p_item, Artist );
                     break;
                 case VLC_META_ENGINE_TITLE:
-                    char *psz_title;
-                    psz_title = input_item_GetTile( p_item->p_input );
+                    char *psz_title, *psz_name;
+                    psz_title = input_item_GetTitle( p_item->p_input );
                     psz_name = input_item_GetName( p_item->p_input );
                     if( psz_title )
                     {