#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);
vlc_mutex_init( &priv->timer_lock );
vlc_mutex_init( &priv->config_lock );
- /* Store data for the non-reentrant API */
- p_static_vlc = p_libvlc;
-
return p_libvlc;
}
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;
}
"-dontprintthatone\n"
"(keyword 'all' to applies to all objects)\n");
free( psz_verbose_objects );
+ /* FIXME: leaks!!!! */
return VLC_EGENERIC;
}
}
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;
module_unneed( p_libvlc, priv->p_memcpy_module );
}
module_EndBank( p_libvlc );
+ free( priv->psz_configfile );
return VLC_EGENERIC;
}
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 );
* Always load the hotkeys interface if it exists
*/
libvlc_InternalAddIntf( p_libvlc, "hotkeys,none" );
+#ifdef WIN32
+ libvlc_InternalAddIntf( p_libvlc, "globalhotkeys,none" );
+#endif
#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 );
* 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 )
{
libvlc_priv_t *priv = libvlc_priv (p_libvlc);
playlist_t *p_playlist = priv->p_playlist;
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--;
vlc_mutex_destroy( &priv->timer_lock );
vlc_object_release( p_libvlc );
- p_libvlc = NULL;
-
- return VLC_SUCCESS;
}
/**
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 );
}
projects / vlc / blobdiff