Changeset 22bafc1a64b214063b1074d9b322d6dbe3d6caf6

Show
Ignore:
Timestamp:
18/08/07 10:56:41 (1 year ago)
Author:
Jean-Baptiste Kempf <jb@videolan.org>
git-committer:
Jean-Baptiste Kempf <jb@videolan.org> 1187427401 +0000
git-parent:

[2feb5a9db033f511a45f710058409da7ccecbe5c]

git-author:
Jean-Baptiste Kempf <jb@videolan.org> 1187427401 +0000
Message:

Qt4: Fix the [21193] for Qt4.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/gui/qt4/input_manager.cpp

    r38dbd37 r22bafc1  
    133133    /* Update text */ 
    134134    QString text; 
    135     char *psz_name = input_GetName( input_GetItem( p_input ) ); 
    136     char *psz_nowplaying = input_item_GetNowPlaying( input_GetItem( p_input ); 
     135    char *psz_name = input_item_GetName( input_GetItem( p_input ) ); 
     136    char *psz_nowplaying = 
     137        input_item_GetNowPlaying( input_GetItem( p_input ) ); 
    137138    char *psz_artist = input_item_GetArtist( input_GetItem( p_input ) ); 
    138139    if( !EMPTY_STR( psz_nowplaying ) ) 
    139140    { 
    140         text.sprintf( "%s - %s", psz_now_playing, psz_name ); 
     141        text.sprintf( "%s - %s", psz_nowplaying, psz_name ); 
    141142    } 
    142143    else if( !EMPTY_STR( psz_artist ) ) 

  • modules/gui/qt4/playlist_model.cpp

    r38dbd37 r22bafc1  
    185185 
    186186    char *psz_arturl = input_item_GetArtURL( p_item->p_input ); 
    187     if( current && psz_arturl ) && 
     187    if( ( current && psz_arturl ) && 
    188188        !strncmp( psz_arturl, "file://", 7 ) ) 
    189         model->sendArt( qfu( psz_arturl ) ) ); 
     189        model->sendArt( qfu( psz_arturl ) ) ; 
    190190    else if( current ) 
    191191        model->removeArt(); 
    …… 
    216216                    break; 
    217217                case VLC_META_ENGINE_TITLE: 
    218                     char *psz_title; 
    219                     psz_title = input_item_GetTile( p_item->p_input ); 
     218                    char *psz_title, *psz_name; 
     219                    psz_title = input_item_GetTitle( p_item->p_input ); 
    220220                    psz_name = input_item_GetName( p_item->p_input ); 
    221221                    if( psz_title )