#include "audio_output/aout_internal.h"
#include <vlc_charset.h>
+#include <vlc_fs.h>
#include <vlc_cpu.h>
#include <vlc_url.h>
/*****************************************************************************
* Local prototypes
*****************************************************************************/
+#if defined( ENABLE_NLS ) && (defined (__APPLE__) || defined (WIN32)) && \
+ ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
+static void SetLanguage ( char const * );
+#endif
static int GetFilenames ( libvlc_int_t *, int, const char *[] );
static void Help ( libvlc_int_t *, char const *psz_help_name );
static void Usage ( libvlc_int_t *, char const *psz_search );
}
/* Allocate a libvlc instance object */
- p_libvlc = __vlc_custom_create( NULL, sizeof (*priv),
+ p_libvlc = vlc_custom_create( (vlc_object_t *)NULL, sizeof (*priv),
VLC_OBJECT_GENERIC, "libvlc" );
if( p_libvlc != NULL )
i_instances++;
priv->p_vlm = NULL;
/* Initialize message queue */
- msg_Create( p_libvlc );
+ priv->msg_bank = msg_Create ();
+ if (unlikely(priv->msg_bank == NULL))
+ goto error;
/* Find verbosity from VLC_VERBOSE environment variable */
psz_env = getenv( "VLC_VERBOSE" );
vlc_mutex_init( &priv->timer_lock );
return p_libvlc;
+error:
+ vlc_object_release (p_libvlc);
+ return NULL;
}
/**
i_ret = VLC_EEXITSUCCESS;
}
- /* Check for plugins cache options */
- bool b_cache_delete = var_InheritBool( p_libvlc, "reset-plugins-cache" );
-
/* Check for daemon mode */
#ifndef WIN32
if( var_InheritBool( p_libvlc, "daemon" ) )
pid_t i_pid = getpid ();
msg_Dbg( p_libvlc, "PID is %d, writing it to %s",
i_pid, psz_pidfile );
- pidfile = utf8_fopen( psz_pidfile,"w" );
+ pidfile = vlc_fopen( psz_pidfile,"w" );
if( pidfile != NULL )
{
utf8_fprintf( pidfile, "%d", (int)i_pid );
* list of configuration options exported by each module and loads their
* default values.
*/
- module_LoadPlugins( p_libvlc, b_cache_delete );
+ module_LoadPlugins( p_libvlc );
if( p_libvlc->b_die )
{
b_exit = true;
*/
vlc_InitActions( p_libvlc );
+ /* Create a variable for showing the fullscreen interface */
+ var_Create( p_libvlc, "intf-show", VLC_VAR_BOOL );
+ var_SetBool( p_libvlc, "intf-show", true );
+
+ /* Create a variable for showing the right click menu */
+ var_Create( p_libvlc, "intf-popupmenu", VLC_VAR_BOOL );
+
/* variables for signalling creation of new files */
var_Create( p_libvlc, "snapshot-file", VLC_VAR_STRING );
var_Create( p_libvlc, "record-file", VLC_VAR_STRING );
module_EndBank( p_libvlc, true );
return VLC_EGENERIC;
}
- playlist_Activate( p_playlist );
/* Add service discovery modules */
- psz_modules = var_CreateGetNonEmptyString( p_playlist, "services-discovery" );
+ psz_modules = var_InheritString( p_libvlc, "services-discovery" );
if( psz_modules )
{
char *p = psz_modules, *m;
while( ( m = strsep( &p, " :," ) ) != NULL )
playlist_ServicesDiscoveryAdd( p_playlist, m );
+ free( psz_modules );
}
- free( psz_modules );
#ifdef ENABLE_VLM
/* Initialize VLM if vlm-conf is specified */
/*
* Load background interfaces
*/
- /* Create volume callback system. (this variable must be created before
- all interfaces as they can use it) */
- var_Create( p_libvlc, "volume-change", VLC_VAR_VOID );
- var_Create( p_libvlc, "volume-muted", VLC_VAR_BOOL );
-
psz_modules = var_CreateGetNonEmptyString( p_libvlc, "extraintf" );
psz_control = var_CreateGetNonEmptyString( p_libvlc, "control" );
#ifdef WIN32
if( var_InheritBool( p_libvlc, "prefer-system-codecs") )
{
- char *psz_codecs = var_CreateGetNonEmptyString( p_playlist, "codec" );
+ char *psz_codecs = var_CreateGetNonEmptyString( p_libvlc, "codec" );
if( psz_codecs )
{
char *psz_morecodecs;
var_Create( p_libvlc, "drawable-clip-right", VLC_VAR_INTEGER );
- /* Create a variable for showing the fullscreen interface from hotkeys */
- var_Create( p_libvlc, "intf-show", VLC_VAR_BOOL );
- var_SetBool( p_libvlc, "intf-show", true );
-
- /* Create a variable for showing the right click menu */
- var_Create( p_libvlc, "intf-popupmenu", VLC_VAR_BOOL );
-
/*
* Get input filenames given as commandline arguments
*/
/*
* Get --open argument
*/
- psz_val = var_CreateGetNonEmptyString( p_libvlc, "open" );
+ psz_val = var_InheritString( p_libvlc, "open" );
if ( psz_val != NULL )
{
- playlist_t *p_playlist = pl_Hold( p_libvlc );
playlist_AddExt( p_playlist, psz_val, NULL, PLAYLIST_INSERT, 0,
-1, 0, NULL, 0, true, pl_Unlocked );
- pl_Release( p_libvlc );
+ free( psz_val );
}
- free( psz_val );
return VLC_SUCCESS;
}
void libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
{
libvlc_priv_t *priv = libvlc_priv (p_libvlc);
- playlist_t *p_playlist = priv->p_playlist;
+ playlist_t *p_playlist = libvlc_priv (p_libvlc)->p_playlist;
/* Deactivate the playlist */
msg_Dbg( p_libvlc, "deactivating the playlist" );
- playlist_Deactivate( p_playlist );
+ pl_Deactivate( p_libvlc );
/* Remove all services discovery */
msg_Dbg( p_libvlc, "removing all services discovery tasks" );
}
#endif
- /* Free playlist */
- /* Any thread still running must not assume pl_Hold() succeeds. */
- msg_Dbg( p_libvlc, "removing playlist" );
-
- libvlc_priv(p_libvlc)->p_playlist = NULL;
- barrier(); /* FIXME is that correct ? */
-
- vlc_object_release( p_playlist );
+ /* Free playlist now, all threads are gone */
+ playlist_Destroy( p_playlist );
stats_TimersDumpAll( p_libvlc );
stats_TimersCleanAll( p_libvlc );
}
vlc_mutex_unlock( &global_lock );
- msg_Destroy( p_libvlc );
+ msg_Destroy (priv->msg_bank);
/* Destroy mutexes */
vlc_mutex_destroy( &priv->timer_lock );
if( !mrl )
continue;
- playlist_t *p_playlist = pl_Hold( p_vlc );
- playlist_AddExt( p_playlist, mrl, NULL, PLAYLIST_INSERT,
+ playlist_AddExt( pl_Get( p_vlc ), mrl, NULL, PLAYLIST_INSERT,
0, -1, i_options, ( i_options ? &ppsz_argv[i_opt + 1] : NULL ),
VLC_INPUT_OPTION_TRUSTED, true, pl_Unlocked );
- pl_Release( p_vlc );
free( mrl );
}
projects / vlc / blobdiff