#include <vlc_aout.h>
#include "audio_output/aout_internal.h"
-#include <vlc_vout.h>
-#include <vlc_sout.h>
#include <vlc_charset.h>
#include "libvlc.h"
/*****************************************************************************
* 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
{
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);
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);
#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;
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;
}
*/
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
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 );
+ /* 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 )
{
/* Check for plugins cache options */
bool b_cache_delete = config_GetInt( p_libvlc, "reset-plugins-cache" ) > 0;
- /* Will be re-done properly later on */
- priv->i_verbose = config_GetInt( p_libvlc, "verbose" );
-
/* Check for daemon mode */
#ifndef WIN32
if( config_GetInt( p_libvlc, "daemon" ) > 0 )
if( b_exit )
{
+ free( priv->psz_configfile );
module_EndBank( p_libvlc );
return i_ret;
}
if( b_exit )
{
+ free( priv->psz_configfile );
module_EndBank( p_libvlc );
return i_ret;
}
"that they are valid.\n" );
PauseConsole();
#endif
+ free( priv->psz_configfile );
module_EndBank( p_libvlc );
return VLC_EGENERIC;
}
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 change 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;
/*
* 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;
if( !p_libvlc->p_stats )
{
vlc_object_release( p_libvlc );
- return VLC_ENOMEM;
+ return VLC_ENOMEM; /* FIXME: leaks */
}
vlc_mutex_init( &p_libvlc->p_stats->lock );
priv->p_stats_computer = NULL;
priv->p_interaction = interaction_Init( p_libvlc );
/* 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 );
+ free( priv->psz_configfile );
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 );
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 )
{
*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 );
free( psz_temp );
}
* Always load the hotkeys interface if it exists
*/
libvlc_InternalAddIntf( p_libvlc, "hotkeys,none" );
+ if( module_exists( "globalhotkeys" ) )
+ libvlc_InternalAddIntf( p_libvlc, "globalhotkeys,none" );
#ifdef HAVE_DBUS
/* loads dbus control interface if in one-instance mode
/*
* FIXME: kludge to use a p_libvlc-local variable for the Mozilla plugin
*/
+ var_Create( p_libvlc, "drawable-xid", VLC_VAR_INTEGER );
+ var_Create( p_libvlc, "drawable-hwnd", VLC_VAR_ADDRESS );
+#ifdef __APPLE__
var_Create( p_libvlc, "drawable", VLC_VAR_INTEGER );
+#endif
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 );
{
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 );
* 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" );
+ intf_thread_t *p_intf;
while( (p_intf = vlc_object_find( p_libvlc, VLC_OBJECT_INTF, FIND_CHILD )) )
{
intf_StopThread( p_intf );
}
#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 );
+
+ libvlc_priv(p_playlist->p_libvlc)->p_playlist = NULL;
+ barrier(); /* FIXME is that correct ? */
+
vlc_object_release( p_playlist );
/* Free interaction */
msg_Dbg( p_libvlc, "removing 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 (int i = 0; i < list->i_count; i++)
- vlc_object_release (list->p_values[i].p_object);
- vlc_list_release (list);
-
stats_TimersDumpAll( p_libvlc );
stats_TimersCleanAll( p_libvlc );
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;
var_DelCallback( p_libvlc, "key-pressed", vlc_key_to_action,
p_libvlc->p_hotkeys );
FREENULL( p_libvlc->p_hotkeys );
+}
+
+/**
+ * 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--;
msg_Destroy( p_libvlc );
/* Destroy mutexes */
+ vlc_cond_destroy( &priv->exiting );
vlc_mutex_destroy( &priv->config_lock );
vlc_mutex_destroy( &priv->timer_lock );
vlc_object_release( p_libvlc );
- p_libvlc = NULL;
-
- return VLC_SUCCESS;
}
/**
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 );
}
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 );
#ifdef WIN32 /* Pause the console because it's destroyed when we exit */
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
*****************************************************************************