qt4: compile fixes, replaced asnprintf by snprintf, which is a better choice in that...

diff --git a/include/vlc_input.h b/include/vlc_input.h
index 66e22fdc8bd7770c233b0a9511a940ed956c7926..c8085ab54b4a33d0424525b9f232299078bfb3ed 100644 (file)
--- 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 01d097d213fb2d69926530e186959c2ca21b964f..aadab0e07d8ab221dc7e2f486e828ebd4fb97e16 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 )
     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 )
     {