X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.c;h=519efa1ede4360db70536374148931682500592b;hb=982400e1dc0c83f55ad9c4c839509e9a06e5ce6e;hp=7a905e29293e31e9caabdff6ad96d43e126a44f1;hpb=d699c5c3f62a1a5086ccf9269d2785e319dce702;p=vlc diff --git a/src/libvlc.c b/src/libvlc.c index 7a905e2929..519efa1ede 100644 --- a/src/libvlc.c +++ b/src/libvlc.c @@ -42,7 +42,6 @@ #include "modules/modules.h" #include "config/configuration.h" -#include "interface/interface.h" #include /* ENOMEM */ #include /* sprintf() */ @@ -67,6 +66,10 @@ # include #endif +#ifdef ENABLE_NLS +# include /* bindtextdomain */ +#endif + #ifdef HAVE_DBUS /* used for one-instance mode */ # include @@ -82,8 +85,6 @@ #include #include "audio_output/aout_internal.h" -#include -#include #include #include "libvlc.h" @@ -101,7 +102,6 @@ /***************************************************************************** * The evil global variables. We handle them with care, don't worry. *****************************************************************************/ -static libvlc_int_t * p_static_vlc = NULL; static unsigned i_instances = 0; #ifndef WIN32 @@ -148,13 +148,14 @@ void *vlc_hold (gc_object_t * p_gc) { uintptr_t refs; assert( p_gc ); + assert ((((uintptr_t)&p_gc->refs) & (sizeof (void *) - 1)) == 0); /* alignment */ #if defined (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) refs = __sync_add_and_fetch (&p_gc->refs, 1); -#elif defined (WIN32) && defined (__GNUC__) - refs = __builtin_choose_expr (sizeof (uintptr_t) == 4, - InterlockedIncrement (&p_gc->refs), - InterlockedIncrement64 (&p_gc->refs)); +#elif defined (WIN64) + refs = InterlockedIncrement64 (&p_gc->refs); +#elif defined (WIN32) + refs = InterlockedIncrement (&p_gc->refs); #elif defined(__APPLE__) refs = OSAtomicIncrement32Barrier((int*)&p_gc->refs); #else @@ -175,13 +176,14 @@ void vlc_release (gc_object_t *p_gc) unsigned refs; assert( p_gc ); + assert ((((uintptr_t)&p_gc->refs) & (sizeof (void *) - 1)) == 0); /* alignment */ #if defined (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) refs = __sync_sub_and_fetch (&p_gc->refs, 1); -#elif defined (WIN32) && defined (__GNUC__) - refs = __builtin_choose_expr (sizeof (uintptr_t) == 4, - InterlockedDecrement (&p_gc->refs), - InterlockedDecrement64 (&p_gc->refs)); +#elif defined (WIN64) + refs = InterlockedDecrement64 (&p_gc->refs); +#elif defined (WIN32) + refs = InterlockedDecrement (&p_gc->refs); #elif defined(__APPLE__) refs = OSAtomicDecrement32Barrier((int*)&p_gc->refs); #else @@ -223,11 +225,10 @@ static void PauseConsole ( void ); #endif static int ConsoleWidth ( void ); -static int VerboseCallback( vlc_object_t *, char const *, - vlc_value_t, vlc_value_t, void * ); - static void InitDeviceValues( libvlc_int_t * ); +static vlc_mutex_t global_lock = VLC_STATIC_MUTEX; + /** * Allocate a libvlc instance, initialize global data if needed * It also initializes the threading system @@ -238,20 +239,14 @@ libvlc_int_t * libvlc_InternalCreate( void ) libvlc_priv_t *priv; char *psz_env = NULL; - /* vlc_threads_init *must* be the first internal call! No other call is - * allowed before the thread system has been initialized. */ - if (vlc_threads_init ()) - return NULL; - /* Now that the thread system is initialized, we don't have much, but * at least we have variables */ - vlc_mutex_t *lock = var_AcquireMutex( "libvlc" ); + vlc_mutex_lock( &global_lock ); if( i_instances == 0 ) { /* Guess what CPU we have */ cpu_flags = CPUCapabilities(); /* The module bank will be initialized later */ - p_module_bank = NULL; } /* Allocate a libvlc instance object */ @@ -259,14 +254,14 @@ libvlc_int_t * libvlc_InternalCreate( void ) VLC_OBJECT_GENERIC, "libvlc" ); if( p_libvlc != NULL ) i_instances++; - vlc_mutex_unlock( lock ); + vlc_mutex_unlock( &global_lock ); if( p_libvlc == NULL ) return NULL; priv = libvlc_priv (p_libvlc); priv->p_playlist = NULL; - priv->p_interaction = NULL; + priv->p_dialog_provider = NULL; priv->p_vlm = NULL; p_libvlc->psz_object_name = strdup( "libvlc" ); @@ -285,16 +280,9 @@ libvlc_int_t * libvlc_InternalCreate( void ) priv->b_color = false; #endif - /* Announce who we are - Do it only for first instance ? */ - msg_Dbg( p_libvlc, "%s", COPYRIGHT_MESSAGE ); - msg_Dbg( p_libvlc, "libvlc was configured with %s", CONFIGURE_LINE ); - /* Initialize mutexes */ vlc_mutex_init( &priv->timer_lock ); - vlc_mutex_init( &priv->config_lock ); - - /* Store data for the non-reentrant API */ - p_static_vlc = p_libvlc; + vlc_cond_init( &priv->exiting ); return p_libvlc; } @@ -335,9 +323,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, */ LoadMessages (); - /* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */ - msg_Dbg( p_libvlc, "translation test: code is \"%s\"", _("C") ); - /* 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 @@ -346,10 +331,17 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, if( config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true ) ) { - module_EndBank( p_libvlc ); + module_EndBank( p_libvlc, false ); return VLC_EGENERIC; } + priv->i_verbose = config_GetInt( p_libvlc, "verbose" ); + /* Announce who we are - Do it only for first instance ? */ + msg_Dbg( p_libvlc, "%s", COPYRIGHT_MESSAGE ); + msg_Dbg( p_libvlc, "libvlc was 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( config_GetInt( p_libvlc, "help" ) > 0 ) { @@ -365,17 +357,8 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, i_ret = VLC_EEXITSUCCESS; } - /* Set the config file stuff */ - priv->psz_configfile = config_GetCustomConfigFile( p_libvlc ); - /* Check for plugins cache options */ - if( config_GetInt( p_libvlc, "reset-plugins-cache" ) > 0 ) - { - p_module_bank->b_cache_delete = true; - } - - /* Will be re-done properly later on */ - priv->i_verbose = config_GetInt( p_libvlc, "verbose" ); + bool b_cache_delete = config_GetInt( p_libvlc, "reset-plugins-cache" ) > 0; /* Check for daemon mode */ #ifndef WIN32 @@ -444,7 +427,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, if( b_exit ) { - module_EndBank( p_libvlc ); + module_EndBank( p_libvlc, false ); return i_ret; } @@ -458,25 +441,24 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, if( !config_GetInt( p_libvlc, "ignore-config" ) ) config_LoadConfigFile( p_libvlc, "main" ); config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true ); + priv->i_verbose = config_GetInt( p_libvlc, "verbose" ); /* Check if the user specified a custom language */ psz_language = config_GetPsz( p_libvlc, "language" ); if( psz_language && *psz_language && strcmp( psz_language, "auto" ) ) { - bool b_cache_delete = p_module_bank->b_cache_delete; - /* 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") ); - module_EndBank( p_libvlc ); + module_EndBank( p_libvlc, false ); module_InitBank( p_libvlc ); if( !config_GetInt( p_libvlc, "ignore-config" ) ) config_LoadConfigFile( p_libvlc, "main" ); config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true ); - p_module_bank->b_cache_delete = b_cache_delete; + priv->i_verbose = config_GetInt( p_libvlc, "verbose" ); } free( psz_language ); # endif @@ -488,8 +470,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, * list of configuration options exported by each module and loads their * default values. */ - module_LoadBuiltins( p_libvlc ); - module_LoadPlugins( p_libvlc ); + module_LoadPlugins( p_libvlc, b_cache_delete ); if( p_libvlc->b_die ) { b_exit = true; @@ -498,7 +479,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, size_t module_count; module_t **list = module_list_get( &module_count ); module_list_free( list ); - msg_Dbg( p_libvlc, "module bank initialized (%u modules)", module_count ); + msg_Dbg( p_libvlc, "module bank initialized (%zu modules)", module_count ); /* Check for help on modules */ if( (p_tmp = config_GetPsz( p_libvlc, "module" )) ) @@ -557,7 +538,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, if( b_exit ) { - module_EndBank( p_libvlc ); + module_EndBank( p_libvlc, true ); return i_ret; } @@ -584,9 +565,10 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, "that they are valid.\n" ); PauseConsole(); #endif - module_EndBank( p_libvlc ); + module_EndBank( p_libvlc, true ); return VLC_EGENERIC; } + priv->i_verbose = config_GetInt( p_libvlc, "verbose" ); /* * System specific configuration @@ -734,31 +716,27 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, msg_Err( p_libvlc, "verbose-objects usage: \n" "--verbose-objects=+printthatobject," "-dontprintthatone\n" - "(keyword 'all' to applies to all objects)\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 ); if( config_GetInt( p_libvlc, "quiet" ) > 0 ) { - val.i_int = -1; - var_Set( p_libvlc, "verbose", val ); + var_SetInteger( p_libvlc, "verbose", -1 ); + priv->i_verbose = -1; } - var_AddCallback( p_libvlc, "verbose", VerboseCallback, NULL ); - var_Change( p_libvlc, "verbose", VLC_VAR_TRIGGER_CALLBACKS, NULL, NULL ); if( priv->b_color ) priv->b_color = config_GetInt( p_libvlc, "color" ) > 0; - /* - * Output messages that may still be in the queue - */ - msg_Flush( p_libvlc ); - if( !config_GetInt( p_libvlc, "fpu" ) ) cpu_flags &= ~CPU_CAPABILITY_FPU; @@ -803,22 +781,12 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* * Choose the best memcpy module */ - priv->p_memcpy_module = module_need( p_libvlc, "memcpy", "$memcpy", 0 ); + priv->p_memcpy_module = module_need( p_libvlc, "memcpy", "$memcpy", false ); priv->b_stats = config_GetInt( p_libvlc, "stats" ) > 0; priv->i_timers = 0; priv->pp_timers = NULL; - /* Init stats */ - p_libvlc->p_stats = (global_stats_t *)malloc( sizeof( global_stats_t ) ); - if( !p_libvlc->p_stats ) - { - vlc_object_release( p_libvlc ); - return VLC_ENOMEM; - } - vlc_mutex_init( &p_libvlc->p_stats->lock ); - priv->p_stats_computer = NULL; - priv->i_last_input_id = 0; /* Not very safe, should be removed */ /* @@ -826,34 +794,48 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, */ var_Create( p_libvlc, "key-pressed", VLC_VAR_INTEGER ); var_Create( p_libvlc, "key-action", VLC_VAR_INTEGER ); - p_libvlc->p_hotkeys = malloc( libvlc_hotkeys_size ); - /* Do a copy (we don't need to modify the strings) */ - memcpy( p_libvlc->p_hotkeys, libvlc_hotkeys, libvlc_hotkeys_size ); - var_AddCallback( p_libvlc, "key-pressed", vlc_key_to_action, - p_libvlc->p_hotkeys ); + { + struct hotkey *p_keys = + malloc( (libvlc_actions_count + 1) * sizeof (*p_keys) ); - /* Initialize interaction */ - priv->p_interaction = interaction_Init( p_libvlc ); + /* Initialize from configuration */ + for( size_t i = 0; i < libvlc_actions_count; i++ ) + { + p_keys[i].psz_action = libvlc_actions[i].name; + p_keys[i].i_key = config_GetInt( p_libvlc, + libvlc_actions[i].name ); + p_keys[i].i_action = libvlc_actions[i].value; + } + p_keys[libvlc_actions_count].psz_action = NULL; + p_keys[libvlc_actions_count].i_key = 0; + p_keys[libvlc_actions_count].i_action = 0; + p_libvlc->p_hotkeys = p_keys; + var_AddCallback( p_libvlc, "key-pressed", vlc_key_to_action, + p_keys ); + } /* Initialize playlist and get commandline files */ - playlist_ThreadCreate( p_libvlc ); - if( !priv->p_playlist ) + p_playlist = playlist_Create( VLC_OBJECT(p_libvlc) ); + if( !p_playlist ) { msg_Err( p_libvlc, "playlist initialization failed" ); if( priv->p_memcpy_module != NULL ) { module_unneed( p_libvlc, priv->p_memcpy_module ); } - module_EndBank( p_libvlc ); + module_EndBank( p_libvlc, true ); return VLC_EGENERIC; } - p_playlist = priv->p_playlist; + playlist_Activate( p_playlist ); + vlc_object_attach( p_playlist, p_libvlc ); + /* Add service discovery modules */ psz_modules = config_GetPsz( p_playlist, "services-discovery" ); if( psz_modules && *psz_modules ) { - /* Add service discovery modules */ - playlist_ServicesDiscoveryAdd( p_playlist, psz_modules ); + char *p = psz_modules, *m; + while( ( m = strsep( &p, " :," ) ) != NULL ) + playlist_ServicesDiscoveryAdd( p_playlist, m ); } free( psz_modules ); @@ -877,9 +859,12 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, if( psz_modules && *psz_modules && psz_control && *psz_control ) { - psz_modules = (char *)realloc( psz_modules, strlen( psz_modules ) + - strlen( psz_control ) + 1 ); - sprintf( psz_modules, "%s:%s", psz_modules, psz_control ); + char* psz_tmp; + if( asprintf( &psz_tmp, "%s:%s", psz_modules, psz_control ) != -1 ) + { + free( psz_modules ); + psz_modules = psz_tmp; + } } else if( psz_control && *psz_control ) { @@ -898,11 +883,9 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, *psz_parser = '\0'; psz_parser++; } - psz_temp = (char *)malloc( strlen(psz_module) + sizeof(",none") ); - if( psz_temp ) + if( asprintf( &psz_temp, "%s,none", psz_module ) != -1) { - sprintf( psz_temp, "%s,none", psz_module ); - libvlc_InternalAddIntf( p_libvlc, psz_temp ); + intf_Create( p_libvlc, psz_temp ); free( psz_temp ); } } @@ -912,7 +895,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* * Always load the hotkeys interface if it exists */ - libvlc_InternalAddIntf( p_libvlc, "hotkeys,none" ); + intf_Create( p_libvlc, "hotkeys,none" ); #ifdef HAVE_DBUS /* loads dbus control interface if in one-instance mode @@ -920,12 +903,12 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, if( config_GetInt( p_libvlc, "one-instance" ) > 0 || ( config_GetInt( p_libvlc, "one-instance-when-started-from-file" ) && config_GetInt( p_libvlc, "started-from-file" ) ) ) - libvlc_InternalAddIntf( p_libvlc, "dbus,none" ); + intf_Create( p_libvlc, "dbus,none" ); /* Prevents the power management daemon from suspending the system * when VLC is active */ if( config_GetInt( p_libvlc, "inhibit" ) > 0 ) - libvlc_InternalAddIntf( p_libvlc, "inhibit,none" ); + intf_Create( p_libvlc, "inhibit,none" ); #endif /* @@ -935,20 +918,21 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, #ifdef HAVE_X11_XLIB_H if( config_GetInt( p_libvlc, "disable-screensaver" ) ) { - libvlc_InternalAddIntf( p_libvlc, "screensaver,none" ); + intf_Create( p_libvlc, "screensaver,none" ); } #endif - if( config_GetInt( p_libvlc, "file-logging" ) > 0 ) + if( (config_GetInt( p_libvlc, "file-logging" ) > 0) && + !config_GetInt( p_libvlc, "syslog" ) ) { - libvlc_InternalAddIntf( p_libvlc, "logger,none" ); + intf_Create( p_libvlc, "logger,none" ); } #ifdef HAVE_SYSLOG_H if( config_GetInt( p_libvlc, "syslog" ) > 0 ) { char *logmode = var_CreateGetString( p_libvlc, "logmode" ); var_SetString( p_libvlc, "logmode", "syslog" ); - libvlc_InternalAddIntf( p_libvlc, "logger,none" ); + intf_Create( p_libvlc, "logger,none" ); if( logmode ) { @@ -962,12 +946,12 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, if( config_GetInt( p_libvlc, "show-intf" ) > 0 ) { - libvlc_InternalAddIntf( p_libvlc, "showintf,none" ); + intf_Create( p_libvlc, "showintf,none" ); } if( config_GetInt( p_libvlc, "network-synchronisation") > 0 ) { - libvlc_InternalAddIntf( p_libvlc, "netsync,none" ); + intf_Create( p_libvlc, "netsync,none" ); } #ifdef WIN32 @@ -989,10 +973,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, } #endif - /* - * FIXME: kludge to use a p_libvlc-local variable for the Mozilla plugin - */ - var_Create( p_libvlc, "drawable", VLC_VAR_INTEGER ); var_Create( p_libvlc, "drawable-view-top", VLC_VAR_INTEGER ); var_Create( p_libvlc, "drawable-view-left", VLC_VAR_INTEGER ); var_Create( p_libvlc, "drawable-view-bottom", VLC_VAR_INTEGER ); @@ -1025,7 +1005,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, { playlist_t *p_playlist = pl_Hold( p_libvlc ); playlist_AddExt( p_playlist, val.psz_string, NULL, PLAYLIST_INSERT, 0, - -1, NULL, 0, true, pl_Unlocked ); + -1, 0, NULL, 0, true, pl_Unlocked ); pl_Release( p_libvlc ); } free( val.psz_string ); @@ -1037,20 +1017,23 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, * Cleanup a libvlc instance. The instance is not completely deallocated * \param p_libvlc the instance to clean */ -int libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) +void libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) { - intf_thread_t * p_intf = NULL; - libvlc_priv_t *priv = libvlc_priv (p_libvlc); + libvlc_priv_t *priv = libvlc_priv (p_libvlc); + playlist_t *p_playlist = priv->p_playlist; + + /* Deactivate the playlist */ + msg_Dbg( p_libvlc, "deactivating the playlist" ); + playlist_Deactivate( p_playlist ); + + /* Remove all services discovery */ + msg_Dbg( p_libvlc, "removing all services discovery tasks" ); + playlist_ServicesDiscoveryKillAll( p_playlist ); /* Ask the interfaces to stop and destroy them */ msg_Dbg( p_libvlc, "removing all interfaces" ); - while( (p_intf = vlc_object_find( p_libvlc, VLC_OBJECT_INTF, FIND_CHILD )) ) - { - intf_StopThread( p_intf ); - vlc_object_detach( p_intf ); - vlc_object_release( p_intf ); /* for intf_Create() */ - vlc_object_release( p_intf ); /* for vlc_object_find() */ - } + libvlc_Quit( p_libvlc ); + intf_DestroyAll( p_libvlc ); #ifdef ENABLE_VLM /* Destroy VLM if created in libvlc_InternalInit */ @@ -1060,53 +1043,19 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) } #endif - playlist_t *p_playlist = priv->p_playlist; - /* Remove all services discovery */ - msg_Dbg( p_libvlc, "removing all services discovery tasks" ); - playlist_ServicesDiscoveryKillAll( p_playlist ); - /* Free playlist */ /* Any thread still running must not assume pl_Hold() succeeds. */ msg_Dbg( p_libvlc, "removing playlist" ); - priv->p_playlist = NULL; - vlc_object_kill( p_playlist ); /* <-- memory barrier for pl_Hold() */ - vlc_thread_join( p_playlist ); - vlc_object_release( p_playlist ); - /* Free interaction */ - msg_Dbg( p_libvlc, "removing interaction" ); - interaction_Destroy( priv->p_interaction ); + libvlc_priv(p_playlist->p_libvlc)->p_playlist = NULL; + barrier(); /* FIXME is that correct ? */ - /* Free video outputs */ - msg_Dbg( p_libvlc, "removing all video outputs" ); - vlc_list_t *list = vlc_list_find (p_libvlc, VLC_OBJECT_VOUT, FIND_CHILD); - for (int i = 0; i < list->i_count; i++) - vlc_object_release (list->p_values[i].p_object); - vlc_list_release (list); + vlc_object_release( p_playlist ); stats_TimersDumpAll( p_libvlc ); stats_TimersCleanAll( p_libvlc ); msg_Dbg( p_libvlc, "removing stats" ); - vlc_mutex_destroy( &p_libvlc->p_stats->lock ); - FREENULL( p_libvlc->p_stats ); - - return VLC_SUCCESS; -} - -/** - * Destroy everything. - * This function requests the running threads to finish, waits for their - * termination, and destroys their structure. - * It stops the thread systems: no instance can run after this has run - * \param p_libvlc the instance to destroy - */ -int libvlc_InternalDestroy( libvlc_int_t *p_libvlc ) -{ - if( !p_libvlc ) - return VLC_EGENERIC; - - libvlc_priv_t *priv = libvlc_priv (p_libvlc); #ifndef WIN32 char* psz_pidfile = NULL; @@ -1134,14 +1083,25 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc ) } /* Free module bank. It is refcounted, so we call this each time */ - module_EndBank( p_libvlc ); + module_EndBank( p_libvlc, true ); - FREENULL( priv->psz_configfile ); var_DelCallback( p_libvlc, "key-pressed", vlc_key_to_action, - p_libvlc->p_hotkeys ); - FREENULL( p_libvlc->p_hotkeys ); + (void *)p_libvlc->p_hotkeys ); + free( (void *)p_libvlc->p_hotkeys ); +} - vlc_mutex_t *lock = var_AcquireMutex( "libvlc" ); +/** + * Destroy everything. + * This function requests the running threads to finish, waits for their + * termination, and destroys their structure. + * It stops the thread systems: no instance can run after this has run + * \param p_libvlc the instance to destroy + */ +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 ) @@ -1149,24 +1109,22 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc ) /* System specific cleaning code */ system_End( p_libvlc ); } - vlc_mutex_unlock( lock ); + vlc_mutex_unlock( &global_lock ); - msg_Flush( p_libvlc ); msg_Destroy( p_libvlc ); /* Destroy mutexes */ - vlc_mutex_destroy( &priv->config_lock ); + vlc_cond_destroy( &priv->exiting ); vlc_mutex_destroy( &priv->timer_lock ); - vlc_object_release( p_libvlc ); - p_libvlc = NULL; - - /* Stop thread system: last one out please shut the door! - * The number of initializations of the thread system is counted, we - * can call this each time */ - vlc_threads_end (); +#ifndef NDEBUG /* Hack to dump leaked objects tree */ + if( vlc_internals( p_libvlc )->i_refcount > 1 ) + while( vlc_internals( p_libvlc )->i_refcount > 0 ) + vlc_object_release( p_libvlc ); +#endif - return VLC_SUCCESS; + assert( vlc_internals( p_libvlc )->i_refcount == 1 ); + vlc_object_release( p_libvlc ); } /** @@ -1174,9 +1132,6 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc ) */ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, char const *psz_module ) { - int i_err; - intf_thread_t *p_intf = NULL; - if( !p_libvlc ) return VLC_EGENERIC; @@ -1192,31 +1147,52 @@ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, char const *psz_module ) psz_module = "dummy"; else #endif - msg_Info( p_libvlc, _("Running vlc with the default interface. Use 'cvlc' to use vlc without interface.") ); + msg_Info( p_libvlc, "%s", + _("Running vlc with the default interface. " + "Use 'cvlc' to use vlc without interface.") ); } free( psz_interface ); } /* Try to create the interface */ - p_intf = intf_Create( p_libvlc, psz_module ? psz_module : "$intf" ); - if( p_intf == NULL ) + if( intf_Create( p_libvlc, psz_module ? psz_module : "$intf" ) ) { msg_Err( p_libvlc, "interface \"%s\" initialization failed", psz_module ); return VLC_EGENERIC; } + return VLC_SUCCESS; +} - /* Try to run the interface */ - i_err = intf_RunThread( p_intf ); - if( i_err ) - { - vlc_object_detach( p_intf ); - vlc_object_release( p_intf ); - return i_err; - } +static vlc_mutex_t exit_lock = VLC_STATIC_MUTEX; - return VLC_SUCCESS; -}; +/** + * Waits until the LibVLC instance gets an exit signal. Normally, this happens + * when the user "exits" an interface plugin. + */ +void libvlc_InternalWait( libvlc_int_t *p_libvlc ) +{ + libvlc_priv_t *priv = libvlc_priv( p_libvlc ); + + vlc_mutex_lock( &exit_lock ); + while( vlc_object_alive( p_libvlc ) ) + vlc_cond_wait( &priv->exiting, &exit_lock ); + vlc_mutex_unlock( &exit_lock ); +} + +/** + * Posts an exit signal to LibVLC instance. This will normally initiate the + * cleanup and destroy process. It should only be called on behalf of the user. + */ +void libvlc_Quit( libvlc_int_t *p_libvlc ) +{ + libvlc_priv_t *priv = libvlc_priv( p_libvlc ); + + vlc_mutex_lock( &exit_lock ); + vlc_object_kill( p_libvlc ); + vlc_cond_signal( &priv->exiting ); + vlc_mutex_unlock( &exit_lock ); +} #if defined( ENABLE_NLS ) && (defined (__APPLE__) || defined (WIN32)) && \ ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) ) @@ -1321,8 +1297,9 @@ static int GetFilenames( libvlc_int_t *p_vlc, int i_argc, const char *ppsz_argv[ playlist_t *p_playlist = pl_Hold( p_vlc ); playlist_AddExt( p_playlist, ppsz_argv[i_opt], NULL, PLAYLIST_INSERT, - 0, -1, ( i_options ? &ppsz_argv[i_opt + 1] : NULL ), - i_options, true, pl_Unlocked ); + 0, -1, + i_options, ( i_options ? &ppsz_argv[i_opt + 1] : NULL ), VLC_INPUT_OPTION_TRUSTED, + true, pl_Unlocked ); pl_Release( p_vlc ); } @@ -1977,10 +1954,7 @@ static void Version( void ) utf8_fprintf( stdout, _("Compiled by %s@%s.%s\n"), VLC_CompileBy(), VLC_CompileHost(), VLC_CompileDomain() ); utf8_fprintf( stdout, _("Compiler: %s\n"), VLC_Compiler() ); - if( strcmp( VLC_Changeset(), "exported" ) ) - utf8_fprintf( stdout, _("Based upon Git commit [%s]\n"), - VLC_Changeset() ); - utf8_fprintf( stdout, LICENSE_MSG ); + utf8_fprintf( stdout, "%s", LICENSE_MSG ); #ifdef WIN32 /* Pause the console because it's destroyed when we exit */ PauseConsole(); @@ -2060,7 +2034,7 @@ static int ConsoleWidth( void ) i_width = 80; pclose( file ); } -#else +#elif !defined (UNDER_CE) CONSOLE_SCREEN_BUFFER_INFO buf; if (GetConsoleScreenBufferInfo (GetStdHandle (STD_OUTPUT_HANDLE), &buf)) @@ -2070,21 +2044,6 @@ static int ConsoleWidth( void ) return i_width; } -static int VerboseCallback( vlc_object_t *p_this, const char *psz_variable, - vlc_value_t old_val, vlc_value_t new_val, void *param) -{ - libvlc_int_t *p_libvlc = (libvlc_int_t *)p_this; - (void)psz_variable; - (void)old_val; - (void)param; - - if( new_val.i_int >= -1 ) - { - libvlc_priv (p_libvlc)->i_verbose = __MIN( new_val.i_int, 2 ); - } - return VLC_SUCCESS; -} - /***************************************************************************** * InitDeviceValues: initialize device values ***************************************************************************** @@ -2151,3 +2110,15 @@ static void InitDeviceValues( libvlc_int_t *p_vlc ) (void)p_vlc; #endif /* HAVE_HAL */ } + +#include + +void vlc_avcodec_mutex (bool acquire) +{ + static vlc_mutex_t lock = VLC_STATIC_MUTEX; + + if (acquire) + vlc_mutex_lock (&lock); + else + vlc_mutex_unlock (&lock); +}