Commit 581da20c authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Qt4: use make_path

parent 532e2f3e
...@@ -234,14 +234,13 @@ void MetaPanel::update( input_item_t *p_item ) ...@@ -234,14 +234,13 @@ void MetaPanel::update( input_item_t *p_item )
QString file; QString file;
char *psz_art = input_item_GetArtURL( p_item ); char *psz_art = input_item_GetArtURL( p_item );
if( psz_art && !strncmp( psz_art, "file://", 7 ) && if( psz_art )
decode_URI( psz_art + 7 ) ) {
#ifdef WIN32 char *psz = make_path( psz_art );
file = qfu( psz_art + 8 ); // Remove extra / on Win32 URI.
#else
file = qfu( psz_art + 7 );
#endif
free( psz_art ); free( psz_art );
file = qfu( psz );
free( psz );
}
art_cover->showArtUpdate( file ); art_cover->showArtUpdate( file );
......
...@@ -609,20 +609,18 @@ const QString InputManager::decodeArtURL( input_item_t *p_item ) ...@@ -609,20 +609,18 @@ const QString InputManager::decodeArtURL( input_item_t *p_item )
assert( p_item ); assert( p_item );
char *psz_art = input_item_GetArtURL( p_item ); char *psz_art = input_item_GetArtURL( p_item );
QString url; if( psz_art )
if( psz_art && !strncmp( psz_art, "file://", 7 ) && {
decode_URI( psz_art + 7 ) ) char *psz = make_path( psz_art );
#ifdef WIN32
url = qfu( psz_art + 8 ); // Remove extra / starting on Win32.
#else
url = qfu( psz_art + 7 );
#endif
free( psz_art ); free( psz_art );
psz_art = psz;
}
url = url.replace( "file://", "" ); #if 0
/* Taglib seems to define a attachment://, It won't work yet */ /* Taglib seems to define a attachment://, It won't work yet */
url = url.replace( "attachment://", "" ); url = url.replace( "attachment://", "" );
return url; #endif
return qfu( psz_art ? psz_art : "" );
} }
void InputManager::UpdateArt() void InputManager::UpdateArt()
......
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