X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.c;h=7893701b7ed30b912d6968653bc7ce39d00c1731;hb=b1aebb75b4f3cbbb97ea04f13a1ceb3513fec7c9;hp=9f9b71daab08f75def5b9679a6f80534299f0a69;hpb=b225dc1390f75fb71581dc96888931899aa98a79;p=vlc diff --git a/src/libvlc.c b/src/libvlc.c index 9f9b71daab..7893701b7e 100644 --- a/src/libvlc.c +++ b/src/libvlc.c @@ -98,7 +98,6 @@ /***************************************************************************** * The evil global variables. We handle them with care, don't worry. *****************************************************************************/ -static unsigned i_instances = 0; #ifndef WIN32 static bool b_daemon = false; @@ -145,7 +144,7 @@ void *vlc_hold (gc_object_t * p_gc) */ void vlc_release (gc_object_t *p_gc) { - unsigned refs; + uintptr_t refs; assert( p_gc ); refs = vlc_atomic_dec (&p_gc->refs); @@ -173,7 +172,6 @@ static void PauseConsole ( void ); #endif static int ConsoleWidth ( void ); -static vlc_mutex_t global_lock = VLC_STATIC_MUTEX; extern const char psz_vlc_changeset[]; /** @@ -188,21 +186,9 @@ libvlc_int_t * libvlc_InternalCreate( void ) /* Now that the thread system is initialized, we don't have much, but * at least we have variables */ - vlc_mutex_lock( &global_lock ); - if( i_instances == 0 ) - { - /* Guess what CPU we have */ - cpu_flags = CPUCapabilities(); - /* The module bank will be initialized later */ - } - /* Allocate a libvlc instance object */ p_libvlc = vlc_custom_create( (vlc_object_t *)NULL, sizeof (*priv), - VLC_OBJECT_GENERIC, "libvlc" ); - if( p_libvlc != NULL ) - i_instances++; - vlc_mutex_unlock( &global_lock ); - + "libvlc" ); if( p_libvlc == NULL ) return NULL; @@ -212,11 +198,6 @@ libvlc_int_t * libvlc_InternalCreate( void ) priv->p_dialog_provider = NULL; priv->p_vlm = NULL; - /* Initialize message queue */ - priv->msg_bank = msg_Create (); - if (unlikely(priv->msg_bank == NULL)) - goto error; - /* Find verbosity from VLC_VERBOSE environment variable */ psz_env = getenv( "VLC_VERBOSE" ); if( psz_env != NULL ) @@ -235,9 +216,6 @@ libvlc_int_t * libvlc_InternalCreate( void ) vlc_ExitInit( &priv->exit ); return p_libvlc; -error: - vlc_object_release (p_libvlc); - return NULL; } /** @@ -249,7 +227,7 @@ error: * - configuration and commandline parsing */ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, - const char *ppsz_argv[], const void **builtins_module ) + const char *ppsz_argv[] ) { libvlc_priv_t *priv = libvlc_priv (p_libvlc); char * p_tmp = NULL; @@ -257,177 +235,102 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char * psz_parser = NULL; char * psz_control = NULL; bool b_exit = false; - int i_ret = VLC_EEXIT; playlist_t *p_playlist = NULL; char *psz_val; -#if defined( ENABLE_NLS ) \ - && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) ) -# if defined (WIN32) || defined (__APPLE__) - char * psz_language; -#endif -#endif /* System specific initialization code */ - system_Init( p_libvlc, &i_argc, ppsz_argv ); - - /* - * Support for gettext - */ - vlc_bindtextdomain (PACKAGE_NAME); + system_Init(); /* Initialize the module bank and load the configuration of the * main module. We need to do this at this stage to be able to display * a short help if required by the user. (short help == main module * options) */ - module_InitBank( p_libvlc ); + module_InitBank (); + /* Get command line options that affect module loading. */ if( config_LoadCmdLine( p_libvlc, i_argc, ppsz_argv, NULL ) ) { - module_EndBank( p_libvlc, false ); + module_EndBank (false); return VLC_EGENERIC; } - priv->i_verbose = var_InheritInteger( p_libvlc, "verbose" ); - /* Announce who we are - Do it only for first instance ? */ + + /* Announce who we are (TODO: only first instance?) */ msg_Dbg( p_libvlc, "VLC media player - %s", VERSION_MESSAGE ); msg_Dbg( p_libvlc, "%s", COPYRIGHT_MESSAGE ); msg_Dbg( p_libvlc, "revision %s", psz_vlc_changeset ); msg_Dbg( p_libvlc, "configured with %s", CONFIGURE_LINE ); - /*xgettext: Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */ - msg_Dbg( p_libvlc, "translation test: code is \"%s\"", _("C") ); - /* Check for short help option */ - if( var_InheritBool( p_libvlc, "help" ) ) - { - Help( p_libvlc, "help" ); - b_exit = true; - i_ret = VLC_EEXITSUCCESS; - } - /* Check for version option */ - else if( var_InheritBool( p_libvlc, "version" ) ) - { - Version(); - b_exit = true; - i_ret = VLC_EEXITSUCCESS; - } + /* Load the builtins and plugins into the module_bank. + * We have to do it before config_Load*() because this also gets the + * list of configuration options exported by each module and loads their + * default values. */ + size_t module_count = module_LoadPlugins (p_libvlc); - /* Check for daemon mode */ -#if !defined( WIN32 ) && !defined( __SYMBIAN32__ ) - if( var_InheritBool( p_libvlc, "daemon" ) ) + /* + * Override default configuration with config file settings + */ + if( !var_InheritBool( p_libvlc, "ignore-config" ) ) { -#ifdef HAVE_DAEMON - char *psz_pidfile = NULL; - - if( daemon( 1, 0) != 0 ) - { - msg_Err( p_libvlc, "Unable to fork vlc to daemon mode" ); - b_exit = true; - } - b_daemon = true; - - /* lets check if we need to write the pidfile */ - psz_pidfile = var_CreateGetNonEmptyString( p_libvlc, "pidfile" ); - if( psz_pidfile != NULL ) - { - FILE *pidfile; - pid_t i_pid = getpid (); - msg_Dbg( p_libvlc, "PID is %d, writing it to %s", - i_pid, psz_pidfile ); - pidfile = vlc_fopen( psz_pidfile,"w" ); - if( pidfile != NULL ) - { - utf8_fprintf( pidfile, "%d", (int)i_pid ); - fclose( pidfile ); - } - else - { - msg_Err( p_libvlc, "cannot open pid file for writing: %s (%m)", - psz_pidfile ); - } - } - free( psz_pidfile ); - -#else - pid_t i_pid; - - if( ( i_pid = fork() ) < 0 ) - { - msg_Err( p_libvlc, "unable to fork vlc to daemon mode" ); - b_exit = true; - } - else if( i_pid ) - { - /* This is the parent, exit right now */ - msg_Dbg( p_libvlc, "closing parent process" ); - b_exit = true; - i_ret = VLC_EEXITSUCCESS; - } + if( var_InheritBool( p_libvlc, "reset-config" ) ) + config_SaveConfigFile( p_libvlc ); /* Save default config */ else - { - /* We are the child */ - msg_Dbg( p_libvlc, "daemon spawned" ); - close( STDIN_FILENO ); - close( STDOUT_FILENO ); - close( STDERR_FILENO ); - - b_daemon = true; - } -#endif + config_LoadConfigFile( p_libvlc ); } -#endif - if( b_exit ) + /* + * Override configuration with command line settings + */ + int vlc_optind; + if( config_LoadCmdLine( p_libvlc, i_argc, ppsz_argv, &vlc_optind ) ) { - module_EndBank( p_libvlc, false ); - return i_ret; +#ifdef WIN32 + ShowConsole( false ); + /* Pause the console because it's destroyed when we exit */ + fprintf( stderr, "The command line options couldn't be loaded, check " + "that they are valid.\n" ); + PauseConsole(); +#endif + module_EndBank (true); + return VLC_EGENERIC; } + priv->i_verbose = var_InheritInteger( p_libvlc, "verbose" ); - /* Check for translation config option */ + /* + * Support for gettext + */ #if defined( ENABLE_NLS ) \ && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) ) # if defined (WIN32) || defined (__APPLE__) - if( !var_InheritBool( p_libvlc, "ignore-config" ) ) - config_LoadConfigFile( p_libvlc ); - priv->i_verbose = var_InheritInteger( p_libvlc, "verbose" ); - /* Check if the user specified a custom language */ - psz_language = var_CreateGetNonEmptyString( p_libvlc, "language" ); - if( psz_language && strcmp( psz_language, "auto" ) ) - { - /* Reset the default domain */ - SetLanguage( psz_language ); - - /* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */ - msg_Dbg( p_libvlc, "translation test: code is \"%s\"", _("C") ); - } - free( psz_language ); + char *lang = var_InheritString (p_libvlc, "language"); + if (lang != NULL && strcmp (lang, "auto")) + SetLanguage (lang); + free (lang); # endif + vlc_bindtextdomain (PACKAGE_NAME); #endif + /*xgettext: Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */ + msg_Dbg( p_libvlc, "translation test: code is \"%s\"", _("C") ); - /* - * Load the builtins and plugins into the module_bank. - * We have to do it before config_Load*() because this also gets the - * list of configuration options exported by each module and loads their - * default values. - */ - module_LoadPlugins( p_libvlc, builtins_module ); - if( p_libvlc->b_die ) + /* Check for short help option */ + if( var_InheritBool( p_libvlc, "help" ) ) { + Help( p_libvlc, "help" ); + b_exit = true; + } + /* Check for version option */ + else if( var_InheritBool( p_libvlc, "version" ) ) + { + Version(); b_exit = true; } - - size_t module_count; - module_t **list = module_list_get( &module_count ); - module_list_free( list ); - msg_Dbg( p_libvlc, "module bank initialized (%zu modules)", module_count ); - /* Check for help on modules */ - if( (p_tmp = var_InheritString( p_libvlc, "module" )) ) + else if( (p_tmp = var_InheritString( p_libvlc, "module" )) ) { Help( p_libvlc, p_tmp ); free( p_tmp ); b_exit = true; - i_ret = VLC_EEXITSUCCESS; } /* Check for full help option */ else if( var_InheritBool( p_libvlc, "full-help" ) ) @@ -438,76 +341,75 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, var_SetBool( p_libvlc, "help-verbose", true ); Help( p_libvlc, "full-help" ); b_exit = true; - i_ret = VLC_EEXITSUCCESS; } /* Check for long help option */ else if( var_InheritBool( p_libvlc, "longhelp" ) ) { Help( p_libvlc, "longhelp" ); b_exit = true; - i_ret = VLC_EEXITSUCCESS; } /* Check for module list option */ else if( var_InheritBool( p_libvlc, "list" ) ) { ListModules( p_libvlc, false ); b_exit = true; - i_ret = VLC_EEXITSUCCESS; } else if( var_InheritBool( p_libvlc, "list-verbose" ) ) { ListModules( p_libvlc, true ); b_exit = true; - i_ret = VLC_EEXITSUCCESS; } - /* Check for config file options */ - if( !var_InheritBool( p_libvlc, "ignore-config" ) ) + if( b_exit ) { - if( var_InheritBool( p_libvlc, "reset-config" ) ) - { - config_ResetAll( p_libvlc ); - config_SaveConfigFile( p_libvlc, NULL ); - } + module_EndBank (true); + return VLC_EEXITSUCCESS; } if( module_count <= 1 ) { - msg_Err( p_libvlc, "No modules were found, refusing to start. Check " - "that you properly gave a module path with --plugin-path."); - b_exit = true; - i_ret = VLC_ENOITEM; + msg_Err( p_libvlc, "No plugins found! Check your VLC installation."); + module_EndBank (true); + return VLC_ENOITEM; } - if( b_exit ) +#ifdef HAVE_DAEMON + /* Check for daemon mode */ + if( var_InheritBool( p_libvlc, "daemon" ) ) { - module_EndBank( p_libvlc, true ); - return i_ret; - } + char *psz_pidfile = NULL; - /* - * Override default configuration with config file settings - */ - if( !var_InheritBool( p_libvlc, "ignore-config" ) ) - config_LoadConfigFile( p_libvlc ); + if( daemon( 1, 0) != 0 ) + { + msg_Err( p_libvlc, "Unable to fork vlc to daemon mode" ); + module_EndBank (true); + return VLC_EEXIT; + } + b_daemon = true; - /* - * Override configuration with command line settings - */ - int vlc_optind; - if( config_LoadCmdLine( p_libvlc, i_argc, ppsz_argv, &vlc_optind ) ) - { -#ifdef WIN32 - ShowConsole( false ); - /* Pause the console because it's destroyed when we exit */ - fprintf( stderr, "The command line options couldn't be loaded, check " - "that they are valid.\n" ); - PauseConsole(); -#endif - module_EndBank( p_libvlc, true ); - return VLC_EGENERIC; + /* lets check if we need to write the pidfile */ + psz_pidfile = var_CreateGetNonEmptyString( p_libvlc, "pidfile" ); + if( psz_pidfile != NULL ) + { + FILE *pidfile; + pid_t i_pid = getpid (); + msg_Dbg( p_libvlc, "PID is %d, writing it to %s", + i_pid, psz_pidfile ); + pidfile = vlc_fopen( psz_pidfile,"w" ); + if( pidfile != NULL ) + { + utf8_fprintf( pidfile, "%d", (int)i_pid ); + fclose( pidfile ); + } + else + { + msg_Err( p_libvlc, "cannot open pid file for writing: %s (%m)", + psz_pidfile ); + } + } + free( psz_pidfile ); } - priv->i_verbose = var_InheritInteger( p_libvlc, "verbose" ); +#endif /* FIXME: could be replaced by using Unix sockets */ #ifdef HAVE_DBUS @@ -536,11 +438,13 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* check if VLC is available on the bus * if not: D-Bus control is not enabled on the other * instance and we can't pass MRLs to it */ - DBusMessage *p_test_msg = NULL; + DBusMessage *p_test_msg = NULL; DBusMessage *p_test_reply = NULL; + p_test_msg = dbus_message_new_method_call( - "org.mpris.vlc", "/", - "org.freedesktop.MediaPlayer", "Identity" ); + "org.mpris.MediaPlayer2.vlc", "/org/mpris/MediaPlayer2", + "org.freedesktop.DBus.Introspectable", "Introspect" ); + /* block until a reply arrives */ p_test_reply = dbus_connection_send_with_reply_and_block( p_conn, p_test_msg, -1, &dbus_error ); @@ -564,37 +468,64 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, for( i_input = vlc_optind; i_input < i_argc;i_input++ ) { + /* Skip input options, we can't pass them through D-Bus */ + if( ppsz_argv[i_input][0] == ':' ) + { + msg_Warn( p_libvlc, "Ignoring option %s", + ppsz_argv[i_input] ); + continue; + } + + /* We need to resolve relative paths in this instance */ + char *psz_mrl = make_URI( ppsz_argv[i_input], NULL ); + const char *psz_after_track = "/"; + + if( psz_mrl == NULL ) + continue; msg_Dbg( p_libvlc, "Adds %s to the running Media Player", - ppsz_argv[i_input] ); + psz_mrl ); p_dbus_msg = dbus_message_new_method_call( - "org.mpris.vlc", "/TrackList", - "org.freedesktop.MediaPlayer", "AddTrack" ); + "org.mpris.MediaPlayer2.vlc", "/org/mpris/MediaPlayer2", + "org.mpris.MediaPlayer2.TrackList", "AddTrack" ); if ( NULL == p_dbus_msg ) { msg_Err( p_libvlc, "D-Bus problem" ); - system_End( p_libvlc ); + free( psz_mrl ); + system_End( ); exit( 1 ); } /* append MRLs */ dbus_message_iter_init_append( p_dbus_msg, &dbus_args ); if ( !dbus_message_iter_append_basic( &dbus_args, - DBUS_TYPE_STRING, &ppsz_argv[i_input] ) ) + DBUS_TYPE_STRING, &psz_mrl ) ) + { + dbus_message_unref( p_dbus_msg ); + free( psz_mrl ); + system_End( ); + exit( 1 ); + } + free( psz_mrl ); + + if( !dbus_message_iter_append_basic( &dbus_args, + DBUS_TYPE_OBJECT_PATH, &psz_after_track ) ) { dbus_message_unref( p_dbus_msg ); - system_End( p_libvlc ); + system_End( ); exit( 1 ); } + b_play = TRUE; if( var_InheritBool( p_libvlc, "playlist-enqueue" ) ) b_play = FALSE; + if ( !dbus_message_iter_append_basic( &dbus_args, DBUS_TYPE_BOOLEAN, &b_play ) ) { dbus_message_unref( p_dbus_msg ); - system_End( p_libvlc ); + system_End( ); exit( 1 ); } @@ -604,7 +535,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, { msg_Err( p_libvlc, "D-Bus problem" ); dbus_message_unref( p_dbus_msg ); - system_End( p_libvlc ); + system_End( ); exit( 1 ); } @@ -612,7 +543,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, { msg_Err( p_libvlc, "D-Bus problem" ); dbus_message_unref( p_dbus_msg ); - system_End( p_libvlc ); + system_End( ); exit( 1 ); } dbus_connection_flush( p_conn ); @@ -623,7 +554,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, } /* processes all command line MRLs */ /* bye bye */ - system_End( p_libvlc ); + system_End( ); exit( 0 ); } } @@ -635,30 +566,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* * Message queue options */ - char * psz_verbose_objects = var_CreateGetNonEmptyString( p_libvlc, "verbose-objects" ); - if( psz_verbose_objects ) - { - char * psz_object, * iter = psz_verbose_objects; - while( (psz_object = strsep( &iter, "," )) ) - { - switch( psz_object[0] ) - { - printf("%s\n", psz_object+1); - case '+': msg_EnableObjectPrinting(p_libvlc, psz_object+1); break; - case '-': msg_DisableObjectPrinting(p_libvlc, psz_object+1); break; - default: - msg_Err( p_libvlc, "verbose-objects usage: \n" - "--verbose-objects=+printthatobject," - "-dontprintthatone\n" - "(keyword 'all' to applies to all objects)"); - free( psz_verbose_objects ); - /* FIXME: leaks!!!! */ - return VLC_EGENERIC; - } - } - free( psz_verbose_objects ); - } - /* Last chance to set the verbosity. Once we start interfaces and other * threads, verbosity becomes read-only. */ var_Create( p_libvlc, "verbose", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); @@ -672,67 +579,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, if( priv->b_color ) priv->b_color = var_InheritBool( p_libvlc, "color" ); - char p_capabilities[200]; -#define PRINT_CAPABILITY( capability, string ) \ - if( vlc_CPU() & capability ) \ - { \ - strncat( p_capabilities, string " ", \ - sizeof(p_capabilities) - strlen(p_capabilities) ); \ - p_capabilities[sizeof(p_capabilities) - 1] = '\0'; \ - } - p_capabilities[0] = '\0'; - -#if defined( __i386__ ) || defined( __x86_64__ ) - if( !var_InheritBool( p_libvlc, "mmx" ) ) - cpu_flags &= ~CPU_CAPABILITY_MMX; - if( !var_InheritBool( p_libvlc, "3dn" ) ) - cpu_flags &= ~CPU_CAPABILITY_3DNOW; - if( !var_InheritBool( p_libvlc, "mmxext" ) ) - cpu_flags &= ~CPU_CAPABILITY_MMXEXT; - if( !var_InheritBool( p_libvlc, "sse" ) ) - cpu_flags &= ~CPU_CAPABILITY_SSE; - if( !var_InheritBool( p_libvlc, "sse2" ) ) - cpu_flags &= ~CPU_CAPABILITY_SSE2; - if( !var_InheritBool( p_libvlc, "sse3" ) ) - cpu_flags &= ~CPU_CAPABILITY_SSE3; - if( !var_InheritBool( p_libvlc, "ssse3" ) ) - cpu_flags &= ~CPU_CAPABILITY_SSSE3; - if( !var_InheritBool( p_libvlc, "sse41" ) ) - cpu_flags &= ~CPU_CAPABILITY_SSE4_1; - if( !var_InheritBool( p_libvlc, "sse42" ) ) - cpu_flags &= ~CPU_CAPABILITY_SSE4_2; - - PRINT_CAPABILITY( CPU_CAPABILITY_MMX, "MMX" ); - PRINT_CAPABILITY( CPU_CAPABILITY_3DNOW, "3DNow!" ); - PRINT_CAPABILITY( CPU_CAPABILITY_MMXEXT, "MMXEXT" ); - PRINT_CAPABILITY( CPU_CAPABILITY_SSE, "SSE" ); - PRINT_CAPABILITY( CPU_CAPABILITY_SSE2, "SSE2" ); - PRINT_CAPABILITY( CPU_CAPABILITY_SSE3, "SSE3" ); - PRINT_CAPABILITY( CPU_CAPABILITY_SSSE3, "SSSE3" ); - PRINT_CAPABILITY( CPU_CAPABILITY_SSE4_1, "SSE4.1" ); - PRINT_CAPABILITY( CPU_CAPABILITY_SSE4_2, "SSE4.2" ); - PRINT_CAPABILITY( CPU_CAPABILITY_SSE4A, "SSE4A" ); - -#elif defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc64__ ) - if( !var_InheritBool( p_libvlc, "altivec" ) ) - cpu_flags &= ~CPU_CAPABILITY_ALTIVEC; - - PRINT_CAPABILITY( CPU_CAPABILITY_ALTIVEC, "AltiVec" ); - -#elif defined( __arm__ ) - PRINT_CAPABILITY( CPU_CAPABILITY_NEON, "NEONv1" ); - -#endif - -#if HAVE_FPU - strncat( p_capabilities, "FPU ", - sizeof(p_capabilities) - strlen( p_capabilities) ); - p_capabilities[sizeof(p_capabilities) - 1] = '\0'; -#endif - - if (p_capabilities[0]) - msg_Dbg( p_libvlc, "CPU has capabilities %s", p_capabilities ); - + vlc_CPU_dump( VLC_OBJECT(p_libvlc) ); /* * Choose the best memcpy module */ @@ -744,12 +591,10 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, priv->i_timers = 0; priv->pp_timers = NULL; - priv->i_last_input_id = 0; /* Not very safe, should be removed */ - /* * Initialize hotkey handling */ - vlc_InitActions( p_libvlc ); + priv->actions = vlc_InitActions( p_libvlc ); /* Create a variable for showing the fullscreen interface */ var_Create( p_libvlc, "intf-show", VLC_VAR_BOOL ); @@ -776,7 +621,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, { module_unneed( p_libvlc, priv->p_memcpy_module ); } - module_EndBank( p_libvlc, true ); + module_EndBank (true); return VLC_EGENERIC; } @@ -785,7 +630,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, #if defined(MEDIA_LIBRARY) /* Get the ML */ - if( var_GetBool( p_libvlc, "load-media-library-on-startup" ) == true ) + if( var_GetBool( p_libvlc, "load-media-library-on-startup" ) ) { priv->p_ml = ml_Create( VLC_OBJECT( p_libvlc ), NULL ); if( !priv->p_ml ) @@ -910,25 +755,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, intf_Create( p_libvlc, "netsync,none" ); } -#ifdef WIN32 - if( var_InheritBool( p_libvlc, "prefer-system-codecs") ) - { - char *psz_codecs = var_CreateGetNonEmptyString( p_libvlc, "codec" ); - if( psz_codecs ) - { - char *psz_morecodecs; - if( asprintf(&psz_morecodecs, "%s,dmo", psz_codecs) != -1 ) - { - var_SetString( p_libvlc, "codec", psz_morecodecs); - free( psz_morecodecs ); - } - free( psz_codecs ); - } - else - var_SetString( p_libvlc, "codec", "dmo"); - } -#endif - #ifdef __APPLE__ var_Create( p_libvlc, "drawable-view-top", VLC_VAR_INTEGER ); var_Create( p_libvlc, "drawable-view-left", VLC_VAR_INTEGER ); @@ -938,9 +764,10 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, var_Create( p_libvlc, "drawable-clip-left", VLC_VAR_INTEGER ); var_Create( p_libvlc, "drawable-clip-bottom", VLC_VAR_INTEGER ); var_Create( p_libvlc, "drawable-clip-right", VLC_VAR_INTEGER ); + var_Create( p_libvlc, "drawable-nsobject", VLC_VAR_ADDRESS ); #endif #ifdef WIN32 - var_Create( p_libvlc, "drawable-hwnd", VLC_VAR_ADDRESS ); + var_Create( p_libvlc, "drawable-hwnd", VLC_VAR_INTEGER ); #endif /* @@ -994,9 +821,6 @@ void libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) } #endif - /* Free playlist now, all threads are gone */ - playlist_Destroy( p_playlist ); - #if defined(MEDIA_LIBRARY) media_library_t* p_ml = priv->p_ml; if( p_ml ) @@ -1007,6 +831,8 @@ void libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) } #endif + /* Free playlist now, all threads are gone */ + playlist_Destroy( p_playlist ); stats_TimersDumpAll( p_libvlc ); stats_TimersCleanAll( p_libvlc ); @@ -1037,10 +863,14 @@ void libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) priv->p_memcpy_module = NULL; } + /* Save the configuration */ + if( !var_InheritBool( p_libvlc, "ignore-config" ) ) + config_AutoSaveConfigFile( VLC_OBJECT(p_libvlc) ); + /* Free module bank. It is refcounted, so we call this each time */ - module_EndBank( p_libvlc, true ); + module_EndBank (true); - vlc_DeinitActions( p_libvlc ); + vlc_DeinitActions( p_libvlc, priv->actions ); } /** @@ -1054,17 +884,7 @@ void libvlc_InternalDestroy( libvlc_int_t *p_libvlc ) { libvlc_priv_t *priv = libvlc_priv( p_libvlc ); - vlc_mutex_lock( &global_lock ); - i_instances--; - - if( i_instances == 0 ) - { - /* System specific cleaning code */ - system_End( p_libvlc ); - } - vlc_mutex_unlock( &global_lock ); - - msg_Destroy (priv->msg_bank); + system_End( ); /* Destroy mutexes */ vlc_ExitDestroy( &priv->exit ); @@ -1138,9 +958,8 @@ static void SetLanguage ( const char *psz_lang ) * the language at runtime under eg. Windows. Beware that this * makes the environment unconsistent when libvlc is unloaded and * should probably be moved to a safer place like vlc.c. */ - static char psz_lcall[20]; - snprintf( psz_lcall, sizeof(psz_lcall), "LC_ALL=%s", psz_lang ); - putenv( psz_lcall ); + setenv( "LC_ALL", psz_lang, 1 ); + #endif setlocale( LC_ALL, psz_lang ); @@ -1379,10 +1198,11 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) module_config_t *p_item = NULL; module_config_t *p_section = NULL; module_config_t *p_end = p_parser->p_config + p_parser->confsize; + const char *objname = module_get_object (p_parser); if( psz_search && - ( b_strict ? strcmp( psz_search, p_parser->psz_object_name ) - : !strstr( p_parser->psz_object_name, psz_search ) ) ) + ( b_strict ? strcmp( objname, psz_search ) + : !strstr( objname, psz_search ) ) ) { char *const *pp_shortcuts = p_parser->pp_shortcuts; unsigned i; @@ -1402,7 +1222,7 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) continue; } - b_help_module = !strcmp( "help", p_parser->psz_object_name ); + b_help_module = !strcmp( "help", objname ); /* Ugly hack to make sure that the help options always come first * (part 2) */ if( !psz_search && b_help_module ) @@ -1415,7 +1235,7 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) p_item < p_end; p_item++ ) { - if( (p_item->i_type & CONFIG_ITEM) && + if( CONFIG_ITEM(p_item->i_type) && !p_item->b_advanced && !p_item->b_removed ) break; } @@ -1429,12 +1249,12 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) b_found = true; /* Print name of module */ - if( strcmp( "main", p_parser->psz_object_name ) ) + if( strcmp( "main", objname ) ) { if( b_color ) utf8_fprintf( stdout, "\n " GREEN "%s" GRAY " (%s)\n", module_gettext( p_parser, p_parser->psz_longname ), - p_parser->psz_object_name ); + objname ); else utf8_fprintf( stdout, "\n %s\n", module_gettext(p_parser, p_parser->psz_longname ) ); @@ -1472,47 +1292,43 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) continue; } - switch( p_item->i_type ) + switch( CONFIG_CLASS(p_item->i_type) ) { - case CONFIG_HINT_CATEGORY: - case CONFIG_HINT_USAGE: - if( !strcmp( "main", p_parser->psz_object_name ) ) - { - if( b_color ) - utf8_fprintf( stdout, GREEN "\n %s\n" GRAY, - module_gettext( p_parser, p_item->psz_text ) ); - else - utf8_fprintf( stdout, "\n %s\n", - module_gettext( p_parser, p_item->psz_text ) ); - } - if( b_description && p_item->psz_longtext ) + case 0: // hint class + switch( p_item->i_type ) { - if( b_color ) - utf8_fprintf( stdout, CYAN " %s\n" GRAY, - module_gettext( p_parser, p_item->psz_longtext ) ); - else - utf8_fprintf( stdout, " %s\n", - module_gettext( p_parser, p_item->psz_longtext ) ); + case CONFIG_HINT_CATEGORY: + case CONFIG_HINT_USAGE: + if( !strcmp( "main", objname ) ) + { + if( b_color ) + utf8_fprintf( stdout, GREEN "\n %s\n" GRAY, + module_gettext( p_parser, p_item->psz_text ) ); + else + utf8_fprintf( stdout, "\n %s\n", + module_gettext( p_parser, p_item->psz_text ) ); + } + if( b_description && p_item->psz_longtext ) + { + if( b_color ) + utf8_fprintf( stdout, CYAN " %s\n" GRAY, + module_gettext( p_parser, p_item->psz_longtext ) ); + else + utf8_fprintf( stdout, " %s\n", + module_gettext( p_parser, p_item->psz_longtext ) ); } break; - case CONFIG_HINT_SUBCATEGORY: - if( strcmp( "main", p_parser->psz_object_name ) ) + case CONFIG_HINT_SUBCATEGORY: + if( strcmp( "main", objname ) ) + break; + case CONFIG_SECTION: + p_section = p_item; break; - case CONFIG_SECTION: - p_section = p_item; + } break; case CONFIG_ITEM_STRING: - case CONFIG_ITEM_LOADFILE: - case CONFIG_ITEM_SAVEFILE: - case CONFIG_ITEM_DIRECTORY: - case CONFIG_ITEM_MODULE: /* We could also have "=<" here */ - case CONFIG_ITEM_MODULE_CAT: - case CONFIG_ITEM_MODULE_LIST: - case CONFIG_ITEM_MODULE_LIST_CAT: - case CONFIG_ITEM_FONT: - case CONFIG_ITEM_PASSWORD: print_help_section( p_parser, p_section, b_color, b_description ); p_section = NULL; @@ -1534,7 +1350,6 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) } break; case CONFIG_ITEM_INTEGER: - case CONFIG_ITEM_KEY: /* FIXME: do something a bit more clever */ print_help_section( p_parser, p_section, b_color, b_description ); p_section = NULL; @@ -1610,7 +1425,8 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) - strlen( psz_bra ) - strlen( psz_type ) - strlen( psz_ket ) - 1; - if( p_item->i_type == CONFIG_ITEM_BOOL && !b_help_module ) + if( CONFIG_CLASS(p_item->i_type) == CONFIG_ITEM_BOOL + && !b_help_module ) { psz_prefix = ", --no-"; i -= strlen( p_item->psz_name ) + strlen( psz_prefix ); @@ -1626,7 +1442,8 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) psz_spaces[i] = '\0'; } - if( p_item->i_type == CONFIG_ITEM_BOOL && !b_help_module ) + if( CONFIG_CLASS(p_item->i_type) == CONFIG_ITEM_BOOL + && !b_help_module ) { utf8_fprintf( stdout, psz_format_bool, psz_short, p_item->psz_name, psz_prefix, p_item->psz_name, @@ -1650,6 +1467,7 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) i_cur_width = b_description && !b_description_hack ? i_width_description : i_width; + if( !*psz_text ) strcpy(psz_text, " "); while( *psz_text ) { char *psz_parser, *psz_word; @@ -1810,13 +1628,12 @@ static void ListModules( libvlc_int_t *p_this, bool b_verbose ) /* Enumerate each module */ for (size_t j = 0; (p_parser = list[j]) != NULL; j++) { + const char *objname = module_get_object (p_parser); if( b_color ) - utf8_fprintf( stdout, GREEN" %-22s "WHITE"%s\n"GRAY, - p_parser->psz_object_name, + utf8_fprintf( stdout, GREEN" %-22s "WHITE"%s\n"GRAY, objname, module_gettext( p_parser, p_parser->psz_longname ) ); else - utf8_fprintf( stdout, " %-22s %s\n", - p_parser->psz_object_name, + utf8_fprintf( stdout, " %-22s %s\n", objname, module_gettext( p_parser, p_parser->psz_longname ) ); if( b_verbose ) @@ -1824,7 +1641,7 @@ static void ListModules( libvlc_int_t *p_this, bool b_verbose ) char *const *pp_shortcuts = p_parser->pp_shortcuts; for( unsigned i = 0; i < p_parser->i_shortcuts; i++ ) { - if( strcmp( pp_shortcuts[i], p_parser->psz_object_name ) ) + if( strcmp( pp_shortcuts[i], objname ) ) { if( b_color ) utf8_fprintf( stdout, CYAN" s %s\n"GRAY, @@ -1888,7 +1705,7 @@ static void ShowConsole( bool b_dofile ) # ifndef UNDER_CE FILE *f_help = NULL; - if( getenv( "PWD" ) && getenv( "PS1" ) ) return; /* cygwin shell */ + if( getenv( "PWD" ) ) return; /* Cygwin shell or Wine */ AllocConsole(); /* Use the ANSI code page (e.g. Windows-1252) as expected by the LibVLC @@ -1922,7 +1739,7 @@ static void PauseConsole( void ) { # ifndef UNDER_CE - if( getenv( "PWD" ) && getenv( "PS1" ) ) return; /* cygwin shell */ + if( getenv( "PWD" ) ) return; /* Cygwin shell or Wine */ utf8_fprintf( stderr, _("\nPress the RETURN key to continue...\n") ); getchar();