Disable media-library by default

Enable it in vlc binary

diff --git a/bin/vlc.c b/bin/vlc.c
index 085aa3afda453b37dd9cf8422b42c05b5c55c5b3..de9c88be60be734c77c3c0c36e78619b780569bc 100644 (file)
--- 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 b6c74eb335b29015a09c981b613a7066d32d4fa1..2fc5136f867db157676f8e48152d5f5e0a2aa4f9 100644 (file)
--- 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 )