/* Initialize mutexes */
vlc_mutex_init( &priv->timer_lock );
vlc_mutex_init( &priv->config_lock );
+ vlc_cond_init( &priv->exiting );
return p_libvlc;
}
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 )
{
* Always load the hotkeys interface if it exists
*/
libvlc_InternalAddIntf( p_libvlc, "hotkeys,none" );
-#ifdef WIN32
- libvlc_InternalAddIntf( p_libvlc, "globalhotkeys,none" );
-#endif
+ if( module_exists( "globalhotkeys" ) )
+ libvlc_InternalAddIntf( p_libvlc, "globalhotkeys,none" );
#ifdef HAVE_DBUS
/* loads dbus control interface if in one-instance mode
{
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 );
msg_Destroy( p_libvlc );
/* Destroy mutexes */
+ vlc_cond_destroy( &priv->exiting );
vlc_mutex_destroy( &priv->config_lock );
vlc_mutex_destroy( &priv->timer_lock );
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_object_internals_t *internals = vlc_internals( p_libvlc );
+
+ vlc_object_lock( p_libvlc );
+ while( vlc_object_alive( p_libvlc ) )
+ vlc_cond_wait( &priv->exiting, &internals->lock );
+ vlc_object_unlock( p_libvlc );
+}
+
+/**
+ * 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_object_kill( p_libvlc );
+ vlc_cond_signal( &priv->exiting ); /* OK, kill took care of the lock */
+}
+
#if defined( ENABLE_NLS ) && (defined (__APPLE__) || defined (WIN32)) && \
( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
/*****************************************************************************
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 );
}