[vlc-commits] commit: Disable media-library by default ( Rafaël Carré )

[git at videolan.org]

vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Wed Oct 20 16:17:31 2010 +0200| [3f71509f445580a4b5ec08f16bc03aa12201cfba] | committer: Rafaël Carré 

Disable media-library by default

Enable it in vlc binary

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

 bin/vlc.c           |    3 ++-
 src/libvlc-module.c |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/vlc.c b/bin/vlc.c
index 085aa3a..de9c88b 100644
--- a/bin/vlc.c
+++ b/bin/vlc.c
@@ -171,10 +171,11 @@ int main( int i_argc, const char *ppsz_argv[] )
     pthread_sigmask (SIG_BLOCK, &set, NULL);
 
     /* Note that FromLocale() can be used before libvlc is initialized */
-    const char *argv[i_argc + 3];
+    const char *argv[i_argc + 4];
     int argc = 0;
 
     argv[argc++] = "--no-ignore-config";
+    argv[argc++] = "--media-library";
 #ifdef TOP_BUILDDIR
     argv[argc++] = FromLocale ("--plugin-path="TOP_BUILDDIR"/modules");
 #endif
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index b6c74eb..2fc5136 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -2142,7 +2142,7 @@ vlc_module_begin ()
         change_safe()
     add_bool( "play-and-pause", 0, NULL, PAP_TEXT, PAP_LONGTEXT, true )
         change_safe()
-    add_bool( "media-library", 1, NULL, ML_TEXT, ML_LONGTEXT, false )
+    add_bool( "media-library", 0, NULL, ML_TEXT, ML_LONGTEXT, false )
 #if defined( MEDIA_LIBRARY )
     add_bool( "load-media-library-on-startup", 1, NULL, LOAD_ML_TEXT,
             LOAD_ML_LONGTEXT, false )