Changeset 146dad54bff773b990752e44b92aa35f87cbc678

Timestamp:

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

Author:

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

git-committer:

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

git-parent:

[0038469d31d5ede7c49c5133c90e70d8a0a543dc]

git-author:

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

Message:

Use config_GetUserDataDir() internally

Files:

• src/control/media_library.c (modified) (2 diffs)
• src/libvlc-common.c (modified) (2 diffs)
• src/libvlc.h (modified) (1 diff)
• src/playlist/loadsave.c (modified) (6 diffs)
• src/video_output/vout_intf.c (modified) (1 diff)

src/control/media_library.c

@@ -90 +90 @@
-                           libvlc_exception_t * p_e )
-{
-
-
+
-    char * psz_uri;
-
@@ -103 +102 @@
-                  psz_datadir ) == -1 )
-    {
+        free( psz_datadir );
-        libvlc_exception_raise( p_e, "Can't get create the path" );
-        return;
-    }
+    free( psz_datadir );
-    if( p_mlib->p_mlist )
-        libvlc_media_list_release( p_mlib->p_mlist );

src/libvlc-common.c

@@ -297 +297 @@
-    /* Set the config file stuff */
-    p_libvlc->psz_homedir    = config_GetHomeDir();
-    priv->psz_datadir    = config_GetUserDataDir();
-    priv->psz_configfile = config_GetCustomConfigFile( p_libvlc );
-
@@ -1061 +1060 @@
-
-    FREENULL( p_libvlc->psz_homedir );
-    free( priv->psz_datadir );
-    FREENULL( priv->psz_configfile );
-    var_DelCallback( p_libvlc, "key-pressed", vlc_key_to_action,

src/libvlc.h

@@ -212 +212 @@
-    vlc_mutex_t        config_lock; ///< config file lock
-    char *             psz_configfile;   ///< location of config file
-    char              *psz_datadir;      ///< user data directory
-
-    /* There is no real reason to keep a list of items, but not to break

src/playlist/loadsave.c

@@ -109 +109 @@
-int playlist_MLLoad( playlist_t *p_playlist )
-{
-onst char *psz_datadir = libvlc_priv (p_playlist->p_libvlc)->psz_datadir
+har *psz_datadir = config_GetUserDataDir()
-    char *psz_uri = NULL;
-    input_item_t *p_input;
@@ -128 +128 @@
-    /* checks if media library file is present */
-    if( utf8_stat( psz_uri , &p_stat ) )
-
-
-
-
+
-    free( psz_uri );
-
+    /* FIXME: WTF? stat() should never be used right before open()! */
-    if( asprintf( &psz_uri, "file/xspf-open://%s" DIR_SEP "ml.xspf",
-                  psz_datadir ) == -1 )
@@ -140 +138 @@
-        goto error;
-    }
+    free( psz_datadir );
+    psz_datadir = NULL;
-
-    const char *const psz_option = "meta-file";
@@ -184 +184 @@
-error:
-    free( psz_uri );
+    free( psz_datadir );
-    return VLC_ENOMEM;
-}
@@ -189 +190 @@
-int playlist_MLDump( playlist_t *p_playlist )
-{
-libvlc_priv (p_playlist->p_libvlc)->psz_datadir
+config_GetUserDataDir()
-    if( !config_GetInt( p_playlist, "media-library") ) return VLC_SUCCESS;
-    if( !psz_datadir ) /* XXX: This should never happen */
@@ -199 +200 @@
-    char psz_dirname[ strlen( psz_datadir ) + sizeof( DIR_SEP "ml.xspf")];
-    strcpy( psz_dirname, psz_datadir );
+    free( psz_datadir );
-    if( config_CreateDir( (vlc_object_t *)p_playlist, psz_dirname ) )
-    {

src/video_output/vout_intf.c

@@ -638 +638 @@
-    /* XXX: This saves in the data directory. Shouldn't we try saving
-     *      to psz_homedir/Desktop or something nicer ? */
-if( !val.psz_string && libvlc_priv (p_vout->p_libvlc)->psz_datadir )
-{
-    if( asprintf( &val.psz_string, "%s",
-              libvlc_priv (p_vout->p_libvlc)->
+char *psz_datadir = config_GetUserDataDir();
+if( !val.psz_string && psz_datadir )
+{
+if( asprintf( &val.psz_string, "%s", 
-            val.psz_string = NULL;
-    }
+    free( psz_datadir );
-#endif
-