]> git.sesse.net Git - vlc/commitdiff
Use DIR_SEP
authorAntoine Cellerier <dionoea@videolan.org>
Sun, 24 Sep 2006 16:21:52 +0000 (16:21 +0000)
committerAntoine Cellerier <dionoea@videolan.org>
Sun, 24 Sep 2006 16:21:52 +0000 (16:21 +0000)
modules/meta_engine/dummy.c
src/input/input.c

index 6cd97b057d5b3b00328e31acf9b9f6007d6abb77..cb5fd84fd0159253c3a147d771bcbc5da091546b 100644 (file)
@@ -94,7 +94,8 @@ static int FindMeta( vlc_object_t *p_this )
             char *psz_filename;
             struct stat a;
             asprintf( &psz_filename,
-                      "file://%s/" CONFIG_DIR "/art/%s/%s/art.jpg", /* ahem ... we can have other filetype too... */
+                      "file://%s" DIR_SEP CONFIG_DIR DIR_SEP "art"
+                      DIR_SEP "%s" DIR_SEP "%s" DIR_SEP "art.jpg", /* ahem ... we can have other filetype too... */
                       p_me->p_libvlc->psz_homedir,
                       p_item->p_meta->psz_artist,
                       p_item->p_meta->psz_album );
index 29c270e74304df3982cd469465b173dea5e1bcc2..cacd0c64259390460700441fba33f0ccdf97a50e 100644 (file)
@@ -2560,7 +2560,8 @@ int input_DownloadAndCacheArt( vlc_object_t *p_parent, input_item_t *p_item )
 
 
     snprintf( psz_filename, MAX_PATH,
-              "file://%s/" CONFIG_DIR "/art/%s/%s/art%s",
+              "file://%s" DIR_SEP CONFIG_DIR DIR_SEP "art"
+              DIR_SEP "%s" DIR_SEP "%s" DIR_SEP "art%s",
               p_parent->p_libvlc->psz_homedir,
               psz_artist, psz_album, psz_type );
     msg_Dbg( p_parent, "Saving album art to %s", psz_filename );
@@ -2577,16 +2578,18 @@ int input_DownloadAndCacheArt( vlc_object_t *p_parent, input_item_t *p_item )
         {
             /* GRUIKKKKKKKKKK (make sure that all the directories exist) */
             char *psz_dir = malloc( MAX_PATH );
-            snprintf( psz_dir, MAX_PATH, "%s/" CONFIG_DIR,
+            snprintf( psz_dir, MAX_PATH, "%s" DIR_SEP CONFIG_DIR,
                       p_parent->p_libvlc->psz_homedir );
             utf8_mkdir( psz_dir );
-            snprintf( psz_dir, MAX_PATH, "%s/" CONFIG_DIR "/art",
+            snprintf( psz_dir, MAX_PATH, "%s" DIR_SEP CONFIG_DIR DIR_SEP "art",
                       p_parent->p_libvlc->psz_homedir );
             utf8_mkdir( psz_dir );
-            snprintf( psz_dir, MAX_PATH, "%s/" CONFIG_DIR "/art/%s",
+            snprintf( psz_dir, MAX_PATH, "%s" DIR_SEP CONFIG_DIR DIR_SEP
+                      "art" DIR_SEP "%s",
                       p_parent->p_libvlc->psz_homedir, psz_artist );
             utf8_mkdir( psz_dir );
-            snprintf( psz_dir, MAX_PATH, "%s/" CONFIG_DIR "/art/%s/%s",
+            snprintf( psz_dir, MAX_PATH, "%s" DIR_SEP CONFIG_DIR DIR_SEP
+                      "art" DIR_SEP "%s" DIR_SEP "%s",
                       p_parent->p_libvlc->psz_homedir,
                       psz_artist, psz_album );
             utf8_mkdir( psz_dir );