Skip to content

V
vlc
Commit 3f71509f authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

Disable media-library by default 

Enable it in vlc binary
parent 14fbb294
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
bin/vlc.c
View file @ 3f71509f
...@@ -171,10 +171,11 @@ int main( int i_argc, const char *ppsz_argv[] ) ...@@ -171,10 +171,11 @@ int main( int i_argc, const char *ppsz_argv[] )
pthread_sigmask (SIG_BLOCK, &set, NULL); pthread_sigmask (SIG_BLOCK, &set, NULL);
/* Note that FromLocale() can be used before libvlc is initialized */ /* 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; int argc = 0;
argv[argc++] = "--no-ignore-config"; argv[argc++] = "--no-ignore-config";
argv[argc++] = "--media-library";
#ifdef TOP_BUILDDIR #ifdef TOP_BUILDDIR
argv[argc++] = FromLocale ("--plugin-path="TOP_BUILDDIR"/modules"); argv[argc++] = FromLocale ("--plugin-path="TOP_BUILDDIR"/modules");
#endif #endif
......
src/libvlc-module.c
View file @ 3f71509f
...@@ -2142,7 +2142,7 @@ vlc_module_begin () ...@@ -2142,7 +2142,7 @@ vlc_module_begin ()
change_safe() change_safe()
add_bool( "play-and-pause", 0, NULL, PAP_TEXT, PAP_LONGTEXT, true ) add_bool( "play-and-pause", 0, NULL, PAP_TEXT, PAP_LONGTEXT, true )
change_safe() 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 ) #if defined( MEDIA_LIBRARY )
add_bool( "load-media-library-on-startup", 1, NULL, LOAD_ML_TEXT, add_bool( "load-media-library-on-startup", 1, NULL, LOAD_ML_TEXT,
LOAD_ML_LONGTEXT, false ) LOAD_ML_LONGTEXT, false )
......
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