Skip to content

V
vlc-1.1
Commit d084716e authored by Damien Fouilleul's avatar Damien Fouilleul
Browse files
Options

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

parent a26821d0
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 5 deletions
include/vlc_input.h
View file @ d084716e
...@@ -310,6 +310,7 @@ static inline void input_item_MetaMerge( input_item_t *p_i, const vlc_meta_t * p ...@@ -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_GetEncodedBy( item ) input_item_GetMeta( item, vlc_meta_EncodedBy )
#define input_item_GetArtURL( item ) input_item_GetMeta( item, vlc_meta_ArtworkURL ) #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_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( 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, ... ) ); VLC_EXPORT(int, input_ItemAddInfo, ( input_item_t *p_i, const char *psz_cat, const char *psz_name, const char *psz_format, ... ) );
......
modules/gui/qt4/playlist_model.cpp
View file @ d084716e
...@@ -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 )
type = p_item->p_input->i_type; type = p_item->p_input->i_type;
current = iscurrent; current = iscurrent;
if( current && input_item_GetArtURL( p_item ) && if( current && input_item_GetArtURL( p_item->p_input ) &&
!strncmp( input_item_GetArtURL( p_item ), "file://", 7 ) ) !strncmp( input_item_GetArtURL( p_item->p_input ), "file://", 7 ) )
model->sendArt( qfu( input_item_GetArtURL( p_item ) ) ); model->sendArt( qfu( input_item_GetArtURL( p_item->p_input ) ) );
else if( current ) else if( current )
model->removeArt(); model->removeArt();
...@@ -199,8 +199,8 @@ void PLItem::update( playlist_item_t *p_item, bool iscurrent ) ...@@ -199,8 +199,8 @@ void PLItem::update( playlist_item_t *p_item, bool iscurrent )
} }
#define ADD_META( item, meta ) { \ #define ADD_META( item, meta ) \
strings.append( qfu( input_item_Get ## meta ( item->p_input ) ) ); \ 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 ) for( int i_index=1; i_index <= VLC_META_ENGINE_MB_TRM_ID; i_index = i_index * 2 )
{ {
......
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