X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.c;h=71ed33ad936acf572f04f87d37bd0fdcce132042;hb=bd5c615970c7b4219625e03469c506eaf6292ba3;hp=e8de65d90412d75b0824700990b10da5a307bcce;hpb=13a1c6b8b8c82e1234d11b8b90c9ceb488ee55f0;p=vlc diff --git a/src/libvlc.c b/src/libvlc.c index e8de65d904..71ed33ad93 100644 --- a/src/libvlc.c +++ b/src/libvlc.c @@ -67,7 +67,7 @@ # include #endif -#ifdef HAVE_DBUS_3 +#ifdef HAVE_DBUS /* used for one-instance mode */ # include #endif @@ -130,18 +130,6 @@ static int VerboseCallback( vlc_object_t *, char const *, static void InitDeviceValues( libvlc_int_t * ); -/***************************************************************************** - * vlc_current_object: return the current object. - ***************************************************************************** - * If i_object is non-zero, return the corresponding object. Otherwise, - * return the statically allocated p_vlc object. - *****************************************************************************/ -libvlc_int_t * vlc_current_object( int i_object ) -{ - return i_object ? vlc_object_get( i_object ) : p_static_vlc; -} - - /** * Allocate a libvlc instance, initialize global data if needed * It also initializes the threading system @@ -209,6 +197,10 @@ libvlc_int_t * libvlc_InternalCreate( void ) vlc_mutex_init( &priv->timer_lock ); vlc_mutex_init( &priv->config_lock ); + priv->threads_count = 0; + vlc_mutex_init (&priv->threads_lock); + vlc_cond_init (NULL, &priv->threads_wait); + /* Store data for the non-reentrant API */ p_static_vlc = p_libvlc; @@ -518,7 +510,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, system_Configure( p_libvlc, &i_argc, ppsz_argv ); /* FIXME: could be replaced by using Unix sockets */ -#ifdef HAVE_DBUS_3 +#ifdef HAVE_DBUS dbus_threads_init_default(); if( config_GetInt( p_libvlc, "one-instance" ) > 0 ) @@ -589,7 +581,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, if ( !dbus_message_iter_append_basic( &dbus_args, DBUS_TYPE_STRING, &ppsz_argv[i_input] ) ) { - msg_Err( p_libvlc, "Out of memory" ); dbus_message_unref( p_dbus_msg ); system_End( p_libvlc ); exit( VLC_ENOMEM ); @@ -600,7 +591,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, if ( !dbus_message_iter_append_basic( &dbus_args, DBUS_TYPE_BOOLEAN, &b_play ) ) { - msg_Err( p_libvlc, "Out of memory" ); dbus_message_unref( p_dbus_msg ); system_End( p_libvlc ); exit( VLC_ENOMEM ); @@ -806,7 +796,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, if( psz_temp ) { sprintf( psz_temp, "%s,none", psz_module ); - libvlc_InternalAddIntf( p_libvlc, psz_temp, false ); + libvlc_InternalAddIntf( p_libvlc, psz_temp ); free( psz_temp ); } } @@ -816,18 +806,18 @@ 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", false ); + libvlc_InternalAddIntf( p_libvlc, "hotkeys,none" ); -#ifdef HAVE_DBUS_3 +#ifdef HAVE_DBUS /* loads dbus control interface if in one-instance mode * we do it only when playlist exists, because dbus module needs it */ if( config_GetInt( p_libvlc, "one-instance" ) > 0 ) - libvlc_InternalAddIntf( p_libvlc, "dbus,none", false ); + libvlc_InternalAddIntf( 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", false ); + libvlc_InternalAddIntf( p_libvlc, "inhibit,none" ); #endif /* @@ -837,20 +827,20 @@ 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", false ); + libvlc_InternalAddIntf( p_libvlc, "screensaver,none" ); } #endif if( config_GetInt( p_libvlc, "file-logging" ) > 0 ) { - libvlc_InternalAddIntf( p_libvlc, "logger,none", false ); + libvlc_InternalAddIntf( 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", false ); + libvlc_InternalAddIntf( p_libvlc, "logger,none" ); if( logmode ) { @@ -864,12 +854,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", false ); + libvlc_InternalAddIntf( p_libvlc, "showintf,none" ); } if( config_GetInt( p_libvlc, "network-synchronisation") > 0 ) { - libvlc_InternalAddIntf( p_libvlc, "netsync,none", false ); + libvlc_InternalAddIntf( p_libvlc, "netsync,none" ); } #ifdef WIN32 @@ -908,6 +898,12 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* Create volume callback system. */ var_Create( p_libvlc, "volume-change", VLC_VAR_BOOL ); + /* Create a variable for showing the interface (moved from playlist). */ + var_Create( p_libvlc, "intf-show", VLC_VAR_BOOL ); + var_SetBool( p_libvlc, "intf-show", true ); + + var_Create( p_libvlc, "intf-popupmenu", VLC_VAR_BOOL ); + /* * Get input filenames given as commandline arguments */ @@ -937,7 +933,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, int libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) { intf_thread_t * p_intf = NULL; - vout_thread_t * p_vout = NULL; libvlc_priv_t *priv = libvlc_priv (p_libvlc); /* Ask the interfaces to stop and destroy them */ @@ -950,34 +945,7 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) vlc_object_release( p_intf ); /* for vlc_object_find() */ } - /* Free video outputs */ - msg_Dbg( p_libvlc, "removing all video outputs" ); - while( (p_vout = vlc_object_find( p_libvlc, VLC_OBJECT_VOUT, FIND_CHILD )) ) - { - vlc_object_detach( p_vout ); - vlc_object_release( p_vout ); - vout_Destroy( p_vout ); - } - #ifdef ENABLE_SOUT - playlist_t * p_playlist; - sout_instance_t * p_sout; - - p_playlist = vlc_object_find( p_libvlc, VLC_OBJECT_PLAYLIST, FIND_CHILD ); - if( p_playlist ) - { - p_sout = vlc_object_find( p_playlist, VLC_OBJECT_SOUT, FIND_CHILD ); - if( p_sout ) - { - msg_Dbg( p_sout, "removing kept stream output" ); - vlc_object_detach( (vlc_object_t*)p_sout ); - vlc_object_release( (vlc_object_t*)p_sout ); - sout_DeleteInstance( p_sout ); - } - - vlc_object_release( p_playlist ); - } - /* Destroy VLM if created in libvlc_InternalInit */ if( priv->p_vlm ) { @@ -985,13 +953,31 @@ 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_Yield() succeeds. */ msg_Dbg( p_libvlc, "removing playlist" ); - vlc_object_release( priv->p_playlist ); + priv->p_playlist = NULL; + vlc_object_kill( p_playlist ); /* <-- memory barrier for pl_Yield() */ + vlc_thread_join( p_playlist ); + vlc_object_release( p_playlist ); /* Free interaction */ msg_Dbg( p_libvlc, "removing interaction" ); - vlc_object_release( priv->p_interaction ); + interaction_Destroy( priv->p_interaction ); + + /* 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 (unsigned i = 0; i < list->i_count; i++) + { + vlc_object_release (list->p_values[i].p_object); + vlc_object_release (list->p_values[i].p_object); + } stats_TimersDumpAll( p_libvlc ); stats_TimersCleanAll( p_libvlc ); @@ -1010,6 +996,17 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) } #endif + /* Make sure all threads are completed before we start looking for + * reference leaks and deinitializing core LibVLC subsytems. */ + vlc_mutex_lock (&priv->threads_lock); + while (priv->threads_count) + { + msg_Dbg (p_libvlc, "waiting for %u remaining threads", + priv->threads_count); + vlc_cond_wait (&priv->threads_wait, &priv->threads_lock); + } + vlc_mutex_unlock (&priv->threads_lock); + bool b_clean = true; FOREACH_ARRAY( input_item_t *p_del, priv->input_items ) msg_Err( p_libvlc, "input item %p has not been deleted properly: refcount %d, name %s", @@ -1032,9 +1029,8 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) * 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 - * \param b_release whether we should do a release on the instance */ -int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, bool b_release ) +int libvlc_InternalDestroy( libvlc_int_t *p_libvlc ) { if( !p_libvlc ) return VLC_EGENERIC; @@ -1090,8 +1086,9 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, bool b_release ) /* Destroy mutexes */ vlc_mutex_destroy( &priv->config_lock ); vlc_mutex_destroy( &priv->timer_lock ); + vlc_cond_destroy (&priv->threads_wait); + vlc_mutex_destroy (&priv->threads_lock); - if( b_release ) vlc_object_release( p_libvlc ); vlc_object_release( p_libvlc ); p_libvlc = NULL; @@ -1106,8 +1103,7 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, bool b_release ) /** * Add an interface plugin and run it */ -int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, char const *psz_module, - bool b_play ) +int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, char const *psz_module ) { int i_err; intf_thread_t *p_intf = NULL; @@ -1141,12 +1137,7 @@ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, char const *psz_module, return VLC_EGENERIC; } - /* Interface doesn't handle play on start so do it ourselves */ - if( !p_intf->b_play && b_play ) - playlist_Play( libvlc_priv(p_libvlc)->p_playlist ); - /* Try to run the interface */ - p_intf->b_play = b_play; i_err = intf_RunThread( p_intf ); if( i_err ) { @@ -1360,9 +1351,10 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) psz_spaces_text[PADDING_SPACES+LINE_START] = '\0'; memset( psz_spaces_longtext, ' ', LINE_START+2 ); psz_spaces_longtext[LINE_START+2] = '\0'; -#ifdef WIN32 - b_color = false; // don't put color control codes in a .txt file +#ifndef WIN32 + if( !isatty( 1 ) ) #endif + b_color = false; // don't put color control codes in a .txt file if( b_color ) { @@ -1974,7 +1966,6 @@ static void InitDeviceValues( libvlc_int_t *p_vlc ) char *block_dev = NULL; dbus_bool_t b_dvd; -#ifdef HAVE_HAL_1 DBusConnection *p_connection = NULL; DBusError error; @@ -1990,41 +1981,20 @@ static void InitDeviceValues( libvlc_int_t *p_vlc ) } libhal_ctx_set_dbus_connection( ctx, p_connection ); if( libhal_ctx_init( ctx, &error ) ) -#else - ctx = hal_initialize( NULL, FALSE ); - if( ctx ) -#endif - { -#ifdef HAVE_HAL_1 if( ( devices = libhal_get_all_devices( ctx, &i_devices, NULL ) ) ) -#else - if( ( devices = hal_get_all_devices( ctx, &i_devices ) ) ) -#endif { for( i = 0; i < i_devices; i++ ) { -#ifdef HAVE_HAL_1 if( !libhal_device_property_exists( ctx, devices[i], "storage.cdrom.dvd", NULL ) ) -#else - if( !hal_device_property_exists( ctx, devices[ i ], - "storage.cdrom.dvd" ) ) -#endif { continue; } -#ifdef HAVE_HAL_1 b_dvd = libhal_device_get_property_bool( ctx, devices[ i ], "storage.cdrom.dvd", NULL ); block_dev = libhal_device_get_property_string( ctx, devices[ i ], "block.device" , NULL ); -#else - b_dvd = hal_device_get_property_bool( ctx, devices[ i ], - "storage.cdrom.dvd" ); - block_dev = hal_device_get_property_string( ctx, devices[ i ], - "block.device" ); -#endif if( b_dvd ) { config_PutPsz( p_vlc, "dvd", block_dev ); @@ -2032,26 +2002,13 @@ static void InitDeviceValues( libvlc_int_t *p_vlc ) config_PutPsz( p_vlc, "vcd", block_dev ); config_PutPsz( p_vlc, "cd-audio", block_dev ); -#ifdef HAVE_HAL_1 libhal_free_string( block_dev ); -#else - hal_free_string( block_dev ); -#endif } -#ifdef HAVE_HAL_1 libhal_free_string_array( devices ); -#else - hal_free_string_array( devices ); -#endif } - -#ifdef HAVE_HAL_1 libhal_ctx_shutdown( ctx, NULL ); dbus_connection_unref( p_connection ); libhal_ctx_free( ctx ); -#else - hal_shutdown( ctx ); -#endif } else {