From d47fcbb413a08efbe65d72c3b79d83c39c8685fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= Date: Mon, 2 Mar 2015 20:28:14 +0200 Subject: [PATCH] Revert "--stats: default to false" (fixes #14035) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit c24ea5fb3af17c08ea12d94a106577d06e9f4870. Signed-off-by: Rafaël Carré --- bin/darwinvlc.c | 3 +-- bin/vlc.c | 3 +-- bin/winvlc.c | 3 +-- src/libvlc-module.c | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/bin/darwinvlc.c b/bin/darwinvlc.c index 0a35dc5891..fbad415286 100644 --- a/bin/darwinvlc.c +++ b/bin/darwinvlc.c @@ -150,12 +150,11 @@ int main( int i_argc, const char *ppsz_argv[] ) /* Block all these signals */ pthread_sigmask (SIG_SETMASK, &set, NULL); - const char *argv[i_argc + 3]; + const char *argv[i_argc + 2]; int argc = 0; argv[argc++] = "--no-ignore-config"; argv[argc++] = "--media-library"; - argv[argc++] = "--stats"; /* overwrite system language on Mac */ #if !TARGET_OS_IPHONE && !TARGET_IPHONE_SIMULATOR // TARGET_OS_MAC is unspecific diff --git a/bin/vlc.c b/bin/vlc.c index 2e133345e4..e0deebe474 100644 --- a/bin/vlc.c +++ b/bin/vlc.c @@ -201,12 +201,11 @@ int main( int i_argc, const char *ppsz_argv[] ) pthread_t self = pthread_self (); pthread_sigmask (SIG_SETMASK, &set, NULL); - const char *argv[i_argc + 3]; + const char *argv[i_argc + 2]; int argc = 0; argv[argc++] = "--no-ignore-config"; argv[argc++] = "--media-library"; - argv[argc++] = "--stats"; ppsz_argv++; i_argc--; /* skip executable path */ #ifdef __OS2__ diff --git a/bin/winvlc.c b/bin/winvlc.c index 7caab51332..33784e294d 100644 --- a/bin/winvlc.c +++ b/bin/winvlc.c @@ -109,13 +109,12 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, if (wargv == NULL) return 1; - char *argv[argc + 4]; + char *argv[argc + 3]; BOOL crash_handling = TRUE; int j = 0; char *lang = NULL; argv[j++] = FromWide( L"--media-library" ); - argv[j++] = FromWide( L"--stats" ); argv[j++] = FromWide( L"--no-ignore-config" ); for (int i = 1; i < argc; i++) { diff --git a/src/libvlc-module.c b/src/libvlc-module.c index 76b1914f02..31037b4c2f 100644 --- a/src/libvlc-module.c +++ b/src/libvlc-module.c @@ -2041,7 +2041,7 @@ vlc_module_begin () add_bool( "interact", true, INTERACTION_TEXT, INTERACTION_LONGTEXT, false ) - add_bool ( "stats", false, STATS_TEXT, STATS_LONGTEXT, true ) + add_bool ( "stats", true, STATS_TEXT, STATS_LONGTEXT, true ) set_subcategory( SUBCAT_INTERFACE_MAIN ) add_module_cat( "intf", SUBCAT_INTERFACE_MAIN, NULL, INTF_TEXT,