Changeset b61c8fdebdb1260da5b9baa47bd9f0245be11252

Timestamp:

04/03/08 00:55:40 (5 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1207176940 +0200

git-parent:

[aae60936d25a41b92b4827c2c7b32ee2b3b5266c]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1207171323 +0200

Message:

libvlc: Add a --ignore-config options that allow not to use the config file. This is especially useful for libvlc based applications.

Files:

• src/libvlc-common.c (modified) (4 diffs)
• src/libvlc-module.c (modified) (2 diffs)

src/libvlc-common.c

@@ -395 +395 @@
-    /* This ain't really nice to have to reload the config here but it seems
-     * the only way to do it. */
-
+
+
+
-    config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE );
-
@@ -412 +414 @@
-        module_EndBank( p_libvlc );
-        module_InitBank( p_libvlc );
-
+
+
-        config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE );
-        p_libvlc_global->p_module_bank->b_cache_delete = b_cache_delete;
@@ -466 +469 @@
-
-    /* Check for config file options */
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -493 +499 @@
-     * Override default configuration with config file settings
-     */
-
+
+
-
-    /*

src/libvlc-module.c

@@ -2447 +2447 @@
-    N_("print help on a specific module (can be combined with --advanced " \
-       "and --help-verbose)")
+#define IGNORE_CONFIG_TEXT \
+    N_("no configuration option will be loaded nor saved to config file")
-#define SAVE_CONFIG_TEXT \
-    N_("save the current command line options in the config")
@@ -2481 +2483 @@
-    add_string( "module", NULL, NULL, MODULE_TEXT, "", VLC_FALSE );
-        change_short( 'p' );
+        change_internal();
+        change_unsaveable();
+    add_bool( "ignore-config", VLC_FALSE, NULL, IGNORE_CONFIG_TEXT, "", VLC_FALSE );
-        change_internal();
-        change_unsaveable();