ignore-config defaults to true

This saves all third party LibVLC application from having to set it
(The library depending on VLC configuration was really lame IMHO).

diff --git a/bin/vlc.c b/bin/vlc.c
index 4582318f8861defbd607f44c49520604633c9486..e752b0536d93254210e82eace46c4df7f11b5c8e 100644 (file)
--- a/bin/vlc.c
+++ b/bin/vlc.c
@@ -124,6 +124,7 @@ int main( int i_argc, const char *ppsz_argv[] )
     const char *argv[i_argc + 3];
     int argc = 0;
 
+    argv[argc++] = "--no-ignore-config";
 #ifdef TOP_BUILDDIR
     argv[argc++] = FromLocale ("--plugin-path="TOP_BUILDDIR"/modules");
 #endif
@@ -136,6 +137,7 @@ int main( int i_argc, const char *ppsz_argv[] )
     for (int i = 1; i < i_argc; i++)
         if ((argv[argc++] = FromLocale (ppsz_argv[i])) == NULL)
             return 1; // BOOM!
+    argv[argc] = NULL;
 
     libvlc_exception_t ex, dummy;
     libvlc_exception_init (&ex);

diff --git a/bin/winvlc.c b/bin/winvlc.c
index 0c2543c4174f1937bec2c79c2a64d8ef64b89c21..3ac028af73f03e2dfba2307851e9b2c65f221411 100644 (file)
--- a/bin/winvlc.c
+++ b/bin/winvlc.c
@@ -126,7 +126,9 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
     char *argv[argc + 1];
     BOOL crash_handling = TRUE;
     int j = 0;
-    for (int i = 0; i < argc; i++)
+
+    argv[j++] = FromWide( L"--no-ignore-config" );
+    for (int i = 1; i < argc; i++)
     {
         if(!wcscmp(wargv[i], L"--no-crashdump"))
         {
@@ -166,7 +168,7 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
 
     /* Initialize libvlc */
     libvlc_instance_t *vlc;
-    vlc = libvlc_new (argc - 1, (const char **)argv + 1, &ex);
+    vlc = libvlc_new (argc, (const char **)argv, &ex);
     if (vlc != NULL)
     {
         libvlc_add_intf (vlc, "globalhotkeys,none", &ex);

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index ec6453dfbb520a92eba0be7f2a2192cb31912fee..12341bc6830cffd66802647d56893f899a406346 100644 (file)
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -2700,7 +2700,7 @@ vlc_module_begin ()
         change_short( 'p' )
         change_internal ()
         change_unsaveable ()
-    add_bool( "ignore-config", false, NULL, IGNORE_CONFIG_TEXT, "", false )
+    add_bool( "ignore-config", true, NULL, IGNORE_CONFIG_TEXT, "", false )
         change_internal ()
         change_unsaveable ()
     add_bool( "save-config", false, NULL, SAVE_CONFIG_TEXT, "",