Commit 13d838b6 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

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).
parent 48085051
...@@ -124,6 +124,7 @@ int main( int i_argc, const char *ppsz_argv[] ) ...@@ -124,6 +124,7 @@ int main( int i_argc, const char *ppsz_argv[] )
const char *argv[i_argc + 3]; const char *argv[i_argc + 3];
int argc = 0; int argc = 0;
argv[argc++] = "--no-ignore-config";
#ifdef TOP_BUILDDIR #ifdef TOP_BUILDDIR
argv[argc++] = FromLocale ("--plugin-path="TOP_BUILDDIR"/modules"); argv[argc++] = FromLocale ("--plugin-path="TOP_BUILDDIR"/modules");
#endif #endif
...@@ -136,6 +137,7 @@ int main( int i_argc, const char *ppsz_argv[] ) ...@@ -136,6 +137,7 @@ int main( int i_argc, const char *ppsz_argv[] )
for (int i = 1; i < i_argc; i++) for (int i = 1; i < i_argc; i++)
if ((argv[argc++] = FromLocale (ppsz_argv[i])) == NULL) if ((argv[argc++] = FromLocale (ppsz_argv[i])) == NULL)
return 1; // BOOM! return 1; // BOOM!
argv[argc] = NULL;
libvlc_exception_t ex, dummy; libvlc_exception_t ex, dummy;
libvlc_exception_init (&ex); libvlc_exception_init (&ex);
......
...@@ -126,7 +126,9 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, ...@@ -126,7 +126,9 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
char *argv[argc + 1]; char *argv[argc + 1];
BOOL crash_handling = TRUE; BOOL crash_handling = TRUE;
int j = 0; 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")) if(!wcscmp(wargv[i], L"--no-crashdump"))
{ {
...@@ -166,7 +168,7 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, ...@@ -166,7 +168,7 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
/* Initialize libvlc */ /* Initialize libvlc */
libvlc_instance_t *vlc; 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) if (vlc != NULL)
{ {
libvlc_add_intf (vlc, "globalhotkeys,none", &ex); libvlc_add_intf (vlc, "globalhotkeys,none", &ex);
......
...@@ -2700,7 +2700,7 @@ vlc_module_begin () ...@@ -2700,7 +2700,7 @@ vlc_module_begin ()
change_short( 'p' ) change_short( 'p' )
change_internal () change_internal ()
change_unsaveable () 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_internal ()
change_unsaveable () change_unsaveable ()
add_bool( "save-config", false, NULL, SAVE_CONFIG_TEXT, "", add_bool( "save-config", false, NULL, SAVE_CONFIG_TEXT, "",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment