Changeset 3368c030bf8785290a295ce632e678ca931c8a27

Timestamp:

08/17/05 17:12:51 (3 years ago)

Author:

Christophe Massiot <massiot@videolan.org>

git-committer:

Christophe Massiot <massiot@videolan.org> 1124291571 +0000

git-parent:

[2851705c32f14a69dcf115859481f0e4267d9ac2]

git-author:

Christophe Massiot <massiot@videolan.org> 1124291571 +0000

Message:

• src/libvlc.c: Expand ~/ in --config-file.
  
• modules/control/http.c: New RPN functions :
  
  • 'module' vlc_config_save ('module' can be an empty string) returns status
    
  • vlc_config_reset
    

Files:

• modules/control/http.c (modified) (2 diffs)
• src/libvlc.c (modified) (1 diff)
• src/misc/configuration.c (modified) (1 diff)

modules/control/http.c

@@ -1367 +1367 @@
-    }
-
-*psz_dir == '~
+psz_dir[0] == '~' && psz_dir[1] == '/
-    {
-        /* This is incomplete : we should also support the ~cmassiot/ syntax. */
-        snprintf( dir, sizeof(dir), "%s/%s", p_intf->p_vlc->psz_homedir,
-1
+2
-        psz_dir = dir;
-    }
@@ -4038 +4038 @@
-            free( psz_variable );
-        }
+        else if( !strcmp( s, "vlc_config_save" ) )
+        {
+            char *psz_module = SSPop( st );
+            int i_result;
+
+            if( !*psz_module )
+            {
+                free( psz_module );
+                psz_module = NULL;
+            }
+            i_result = config_SaveConfigFile( p_intf, psz_module );
+
+            if( psz_module != NULL )
+                free( psz_module );
+            SSPushN( st, i_result );
+        }
+        else if( !strcmp( s, "vlc_config_reset" ) )
+        {
+            config_ResetAll( p_intf );
+        }
-        /* 6. playlist functions */
-        else if( !strcmp( s, "playlist_add" ) )

src/libvlc.c

@@ -367 +367 @@
-    p_vlc->psz_homedir = config_GetHomeDir();
-    p_vlc->psz_configfile = config_GetPsz( p_vlc, "config" );
+    if( p_vlc->psz_configfile != NULL && p_vlc->psz_configfile[0] == '~'
+         && p_vlc->psz_configfile[1] == '/' )
+    {
+        char *psz = malloc( strlen(p_vlc->psz_homedir)
+                             + strlen(p_vlc->psz_configfile) );
+        /* This is incomplete : we should also support the ~cmassiot/ syntax. */
+        sprintf( psz, "%s/%s", p_vlc->psz_homedir,
+                               p_vlc->psz_configfile + 2 );
+        free( p_vlc->psz_configfile );
+        p_vlc->psz_configfile = psz;
+    }
-
-    /* Check for plugins cache options */

src/misc/configuration.c

@@ -1013 +1013 @@
- * Really stupid no ?
- *****************************************************************************/
-
-
+static 
+       
-{
-    module_t *p_parser;