Changeset 75c438d3302e2a816a473576a35e17989d05a42c

Timestamp:

05/06/08 22:15:51 (4 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1210104951 +0300

git-parent:

[d9d67e17350d62d8fe7481fd92e8b131ea3edcb9]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1210103817 +0300

Message:

Use config_GetCacheDir internally

Files:

• src/input/meta.c (modified) (2 diffs)
• src/libvlc-common.c (modified) (2 diffs)
• src/libvlc.h (modified) (1 diff)
• src/modules/cache.c (modified) (6 diffs)

src/input/meta.c

@@ -240 +240 @@
-                                  const char *psz_artist, const char *psz_album )
-{
+   char *psz_cachedir = config_GetCacheDir();
+
-    if( !EMPTY_STR(psz_artist) && !EMPTY_STR(psz_album) )
-    {
-        char * psz_album_sanitized = ArtCacheGetSanitizedFileName( psz_album );
-        char * psz_artist_sanitized = ArtCacheGetSanitizedFileName( psz_artist );
-
-        snprintf( psz_dir, PATH_MAX, "%s" DIR_SEP
-                  "art" DIR_SEP "artistalbum" DIR_SEP "%s" DIR_SEP "%s",
-
-
+
-        free( psz_album_sanitized );
-        free( psz_artist_sanitized );
@@ -257 +257 @@
-        snprintf( psz_dir, PATH_MAX, "%s" DIR_SEP
-                  "art" DIR_SEP "title" DIR_SEP "%s",
-
-
+
-        free( psz_title_sanitized );
-    }
+    free( psz_cachedir );
-}
-

src/libvlc-common.c

@@ -299 +299 @@
-    priv->psz_configdir  = config_GetUserConfDir();
-    priv->psz_datadir    = config_GetUserDataDir();
-    priv->psz_cachedir   = config_GetCacheDir();
-    priv->psz_configfile = config_GetCustomConfigFile( p_libvlc );
-
@@ -1065 +1064 @@
-    free( priv->psz_configdir );
-    free( priv->psz_datadir );
-    free( priv->psz_cachedir );
-    FREENULL( priv->psz_configfile );
-    var_DelCallback( p_libvlc, "key-pressed", vlc_key_to_action,

src/libvlc.h

@@ -214 +214 @@
-    char              *psz_configdir;    ///< user configuration directory
-    char              *psz_datadir;      ///< user data directory
-    char              *psz_cachedir; ///< user cache directory
-
-    /* There is no real reason to keep a list of items, but not to break

src/modules/cache.c

@@ -97 +97 @@
-void CacheLoad( vlc_object_t *p_this )
-{
-
+ = config_GetCacheDir()
-    FILE *file;
-    int i, j, i_size, i_read;
@@ -107 +107 @@
-    libvlc_global_data_t *p_libvlc_global = vlc_global();
-
-    psz_cachedir = libvlc_priv(p_this->p_libvlc)->psz_cachedir;
-    if( !psz_cachedir ) /* XXX: this should never happen */
-    {
@@ -116 +115 @@
-    i_size = asprintf( &psz_filename, "%s"DIR_SEP"%s",
-                       psz_cachedir, CacheName() );
+    free( psz_cachedir );
-    if( i_size <= 0 )
-    {
-        msg_Err( p_this, "out of memory" );
-        return;
-    }
@@ -455 +454 @@
-        "#   http://www.brynosaurus.com/cachedir/\r\n";
-
-
+ = config_GetCacheDir()
-    FILE *file;
-    int i, j, i_cache;
@@ -462 +461 @@
-    libvlc_global_data_t *p_libvlc_global = vlc_global();
-
-    psz_cachedir = libvlc_priv(p_this->p_libvlc)->psz_cachedir;
-    if( !psz_cachedir ) /* XXX: this should never happen */
-    {
@@ -484 +482 @@
-    snprintf( psz_filename, sizeof( psz_filename ),
-              "%s"DIR_SEP"%s", psz_cachedir, CacheName() );
+    free( psz_cachedir );
-    msg_Dbg( p_this, "writing plugins cache %s", psz_filename );
-