[vlc-commits] Revert "--stats: default to false" (fixes #14035)

Rémi Denis-Courmont git at videolan.org
Mon Mar 9 18:51:20 CET 2015


vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Mar  2 20:28:14 2015 +0200| [e9384d12a578427bb2e4b71880f588d91034b174] | committer: Jean-Baptiste Kempf

Revert "--stats: default to false" (fixes #14035)

This reverts commit c24ea5fb3af17c08ea12d94a106577d06e9f4870.

Signed-off-by: Rafaël Carré <funman at videolan.org>
(cherry picked from commit d47fcbb413a08efbe65d72c3b79d83c39c8685fa)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=e9384d12a578427bb2e4b71880f588d91034b174
---

 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 0a35dc5..fbad415 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 2e13334..e0deebe 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 7fdf8dd..40bca47 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 449ac6d..f8adbf3 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -2074,7 +2074,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,



More information about the vlc-commits mailing list