From d084716eb5081691858acc9b9539aaa9a30d55ba Mon Sep 17 00:00:00 2001 From: Damien Fouilleul Date: Wed, 15 Aug 2007 10:16:45 +0000 Subject: [PATCH] qt4: compile fixes, replaced asnprintf by snprintf, which is a better choice in that context --- include/vlc_input.h | 1 + modules/gui/qt4/playlist_model.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/vlc_input.h b/include/vlc_input.h index 66e22fdc8b..c8085ab54b 100644 --- a/include/vlc_input.h +++ b/include/vlc_input.h @@ -310,6 +310,7 @@ static inline void input_item_MetaMerge( input_item_t *p_i, const vlc_meta_t * p #define input_item_GetEncodedBy( item ) input_item_GetMeta( item, vlc_meta_EncodedBy ) #define input_item_GetArtURL( item ) input_item_GetMeta( item, vlc_meta_ArtworkURL ) #define input_item_GetTrackID( item ) input_item_GetMeta( item, vlc_meta_TrackID ) +#define input_item_GetSetting( item ) input_item_GetMeta( item, vlc_meta_Setting ) VLC_EXPORT( char *, input_ItemGetInfo, ( input_item_t *p_i, const char *psz_cat,const char *psz_name ) ); VLC_EXPORT(int, input_ItemAddInfo, ( input_item_t *p_i, const char *psz_cat, const char *psz_name, const char *psz_format, ... ) ); diff --git a/modules/gui/qt4/playlist_model.cpp b/modules/gui/qt4/playlist_model.cpp index 01d097d213..aadab0e07d 100644 --- 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 ) type = p_item->p_input->i_type; current = iscurrent; - if( current && input_item_GetArtURL( p_item ) && - !strncmp( input_item_GetArtURL( p_item ), "file://", 7 ) ) - model->sendArt( qfu( input_item_GetArtURL( p_item ) ) ); + if( current && input_item_GetArtURL( p_item->p_input ) && + !strncmp( input_item_GetArtURL( p_item->p_input ), "file://", 7 ) ) + model->sendArt( qfu( input_item_GetArtURL( p_item->p_input ) ) ); else if( current ) model->removeArt(); @@ -199,8 +199,8 @@ void PLItem::update( playlist_item_t *p_item, bool iscurrent ) } -#define ADD_META( item, meta ) { \ - strings.append( qfu( input_item_Get ## meta ( item->p_input ) ) ); \ +#define ADD_META( item, meta ) \ + strings.append( qfu( input_item_Get ## meta ( item->p_input ) ) ) for( int i_index=1; i_index <= VLC_META_ENGINE_MB_TRM_ID; i_index = i_index * 2 ) { -- 2.39.5