X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.c;h=842aa7270b95c376e8dec51088184c9f8476348d;hb=10a6bde56813620846826fed6979b2548a6457ea;hp=25aa921fab2f0127622fb9d9be7ac8bab9a3dc12;hpb=8923568d00bddb39e34f82ee8b62152389321b77;p=vlc diff --git a/src/libvlc.c b/src/libvlc.c index 25aa921fab..842aa7270b 100644 --- a/src/libvlc.c +++ b/src/libvlc.c @@ -1,7 +1,7 @@ /***************************************************************************** - * libvlc.c: main libvlc source + * libvlc.c: libvlc instances creation and deletion, interfaces handling ***************************************************************************** - * Copyright (C) 1998-2006 the VideoLAN team + * Copyright (C) 1998-2008 the VideoLAN team * $Id$ * * Authors: Vincent Seguin @@ -25,22 +25,28 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -/***************************************************************************** - * Pretend we are a builtin module - *****************************************************************************/ -#define MODULE_NAME main -#define MODULE_PATH main -#define __BUILTIN__ +/** \file + * This file contains functions to create and destroy libvlc instances + */ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include "control/libvlc_internal.h" +#include + +#include "modules/modules.h" +#include "config/configuration.h" +#include "interface/interface.h" #include /* ENOMEM */ #include /* sprintf() */ -#include /* strerror() */ +#include #include /* free() */ #ifndef WIN32 @@ -61,228 +67,202 @@ # include #endif +#ifdef HAVE_DBUS +/* used for one-instance mode */ +# include +#endif + #ifdef HAVE_HAL # include #endif -#include "vlc_cpu.h" /* CPU detection */ -#include "os_specific.h" +#include +#include -#include "vlc_error.h" +#include +#include "audio_output/aout_internal.h" -#include "vlc_playlist.h" -#include "vlc_interface.h" +#include -#include "audio_output.h" +#include +#include "stream_output/stream_output.h" -#include "vlc_video.h" -#include "video_output.h" - -#include "stream_output.h" -#include "charset.h" +#include #include "libvlc.h" +#include "playlist/playlist_internal.h" + +#include + +#include + /***************************************************************************** - * The evil global variable. We handle it with care, don't worry. + * The evil global variables. We handle them with care, don't worry. *****************************************************************************/ -static libvlc_global_data_t libvlc_global; -static libvlc_global_data_t * p_libvlc_global; -static libvlc_int_t * p_static_vlc; +static libvlc_int_t * p_static_vlc = NULL; +static unsigned i_instances = 0; + +static bool b_daemon = false; /***************************************************************************** - * Local prototypes + * vlc_gc_*. *****************************************************************************/ -static int AddIntfInternal( int i_object, char const *psz_module, - vlc_bool_t b_block, vlc_bool_t b_play, - int i_options, char **ppsz_options ); - -void LocaleInit( vlc_object_t * ); -void LocaleDeinit( void ); -static void SetLanguage ( char const * ); -static int GetFilenames ( libvlc_int_t *, int, char *[] ); -static void Help ( libvlc_int_t *, char const *psz_help_name ); -static void Usage ( libvlc_int_t *, char const *psz_module_name ); -static void ListModules ( libvlc_int_t * ); -static void Version ( void ); +void __vlc_gc_incref( gc_object_t * p_gc ) +{ + assert( p_gc->i_gc_refcount > 0 ); -#ifdef WIN32 -static void ShowConsole ( vlc_bool_t ); -static void PauseConsole ( void ); -#endif -static int ConsoleWidth ( void ); + /* FIXME: atomic version needed! */ + p_gc->i_gc_refcount ++; +} -static int VerboseCallback( vlc_object_t *, char const *, - vlc_value_t, vlc_value_t, void * ); +void __vlc_gc_decref( gc_object_t *p_gc ) +{ + assert( p_gc ); + assert( p_gc->i_gc_refcount > 0 ); -static void InitDeviceValues( libvlc_int_t * ); + /* FIXME: atomic version needed! */ + p_gc->i_gc_refcount -- ; -/***************************************************************************** - * 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 ) -{ - if( i_object ) + if( p_gc->i_gc_refcount == 0 ) { - return vlc_object_get( p_libvlc_global, i_object ); + p_gc->pf_destructor( p_gc ); + /* Do not use the p_gc pointer from now on ! */ } - - return p_static_vlc; } -/***************************************************************************** - * VLC_Version: return the libvlc version. - ***************************************************************************** - * This function returns full version string (numeric version and codename). - *****************************************************************************/ -char const * VLC_Version( void ) +void +__vlc_gc_init( gc_object_t * p_gc, void (*pf_destructor)( gc_object_t * ), + void * arg) { - return VERSION_MESSAGE; + p_gc->i_gc_refcount = 1; + p_gc->pf_destructor = pf_destructor; + p_gc->p_destructor_arg = arg; } /***************************************************************************** - * VLC_CompileBy, VLC_CompileHost, VLC_CompileDomain, - * VLC_Compiler, VLC_Changeset + * Local prototypes *****************************************************************************/ -#define DECLARE_VLC_VERSION( func, var ) \ -char const * VLC_##func ( void ) \ -{ \ - return VLC_##var ; \ -} - -DECLARE_VLC_VERSION( CompileBy, COMPILE_BY ); -DECLARE_VLC_VERSION( CompileHost, COMPILE_HOST ); -DECLARE_VLC_VERSION( CompileDomain, COMPILE_DOMAIN ); -DECLARE_VLC_VERSION( Compiler, COMPILER ); +#if defined( ENABLE_NLS ) && (defined (__APPLE__) || defined (WIN32)) && \ + ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) ) +static void SetLanguage ( char const * ); +#endif +static inline int LoadMessages (void); +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_module_name ); +static void ListModules ( libvlc_int_t *, bool ); +static void Version ( void ); -#ifndef HAVE_SHARED_LIBVLC -extern const char psz_vlc_changeset[]; -char const * VLC_Changeset( void ) -{ - return psz_vlc_changeset; -} +#ifdef WIN32 +static void ShowConsole ( bool ); +static void PauseConsole ( void ); #endif +static int ConsoleWidth ( void ); -/***************************************************************************** - * VLC_Error: strerror() equivalent - ***************************************************************************** - * This function returns full version string (numeric version and codename). - *****************************************************************************/ -char const * VLC_Error( int i_err ) -{ - return vlc_error( i_err ); -} +static int VerboseCallback( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); -/***************************************************************************** - * VLC_Create: allocate a vlc_t structure, and initialize libvlc if needed. - ***************************************************************************** - * This function allocates a vlc_t structure and returns a negative value - * in case of failure. Also, the thread system is initialized. - *****************************************************************************/ -int VLC_Create( void ) -{ - int i_ret; - libvlc_int_t * p_libvlc = NULL; - vlc_value_t lockval; +static void InitDeviceValues( libvlc_int_t * ); - /* &libvlc never changes, so we can safely call this multiple times. */ - p_libvlc_global = &libvlc_global; +/** + * Allocate a libvlc instance, initialize global data if needed + * It also initializes the threading system + */ +libvlc_int_t * libvlc_InternalCreate( void ) +{ + libvlc_int_t *p_libvlc; + libvlc_priv_t *priv; + char *psz_env = NULL; /* vlc_threads_init *must* be the first internal call! No other call is * allowed before the thread system has been initialized. */ - i_ret = vlc_threads_init( p_libvlc_global ); - if( i_ret < 0 ) - { - return i_ret; - } + if (vlc_threads_init ()) + return NULL; + libvlc_global_data_t *p_libvlc_global = vlc_global(); /* Now that the thread system is initialized, we don't have much, but - * at least we have var_Create */ - var_Create( p_libvlc_global, "libvlc", VLC_VAR_MUTEX ); - var_Get( p_libvlc_global, "libvlc", &lockval ); - vlc_mutex_lock( lockval.p_address ); - if( !libvlc_global.b_ready ) + * at least we have variables */ + vlc_mutex_t *lock = var_AcquireMutex( "libvlc" ); + if( i_instances == 0 ) { - char *psz_env; - /* Guess what CPU we have */ - libvlc_global.i_cpu = CPUCapabilities(); - - /* Find verbosity from VLC_VERBOSE environment variable */ - psz_env = getenv( "VLC_VERBOSE" ); - libvlc_global.i_verbose = psz_env ? atoi( psz_env ) : -1; - -#if defined( HAVE_ISATTY ) && !defined( WIN32 ) - libvlc_global.b_color = isatty( 2 ); /* 2 is for stderr */ -#else - libvlc_global.b_color = VLC_FALSE; -#endif + cpu_flags = CPUCapabilities(); + /* The module bank will be initialized later */ + p_libvlc_global->p_module_bank = NULL; + } - /* Initialize message queue */ - msg_Create( p_libvlc_global ); + /* Allocate a libvlc instance object */ + p_libvlc = vlc_custom_create( VLC_OBJECT(p_libvlc_global), + sizeof (*p_libvlc) + sizeof (libvlc_priv_t), + VLC_OBJECT_LIBVLC, "libvlc" ); + if( p_libvlc != NULL ) + i_instances++; + vlc_mutex_unlock( lock ); - /* Announce who we are */ - msg_Dbg( p_libvlc_global, COPYRIGHT_MESSAGE ); - msg_Dbg( p_libvlc_global, "libvlc was configured with %s", - CONFIGURE_LINE ); + if( p_libvlc == NULL ) + return NULL; - /* The module bank will be initialized later */ - libvlc_global.p_module_bank = NULL; + priv = libvlc_priv (p_libvlc); + priv->p_playlist = NULL; + priv->p_interaction = NULL; + priv->p_vlm = NULL; + p_libvlc->psz_object_name = strdup( "libvlc" ); - libvlc_global.b_ready = VLC_TRUE; - } - vlc_mutex_unlock( lockval.p_address ); - var_Destroy( p_libvlc_global, "libvlc" ); + /* Initialize message queue */ + msg_Create( p_libvlc ); - /* Allocate a vlc object */ - p_libvlc = vlc_object_create( p_libvlc_global, VLC_OBJECT_LIBVLC ); - if( p_libvlc == NULL ) - { - return VLC_EGENERIC; - } - p_libvlc->thread_id = 0; + /* Find verbosity from VLC_VERBOSE environment variable */ + psz_env = getenv( "VLC_VERBOSE" ); + if( psz_env != NULL ) + priv->i_verbose = atoi( psz_env ); + else + priv->i_verbose = 3; +#if defined( HAVE_ISATTY ) && !defined( WIN32 ) + priv->b_color = isatty( 2 ); /* 2 is for stderr */ +#else + priv->b_color = false; +#endif - p_libvlc->psz_object_name = "root"; + /* Announce who we are - Do it only for first instance ? */ + msg_Dbg( p_libvlc, COPYRIGHT_MESSAGE ); + msg_Dbg( p_libvlc, "libvlc was configured with %s", CONFIGURE_LINE ); /* Initialize mutexes */ - vlc_mutex_init( p_libvlc, &p_libvlc->config_lock ); -#ifdef __APPLE__ - vlc_mutex_init( p_libvlc, &p_libvlc->quicktime_lock ); - vlc_thread_set_priority( p_libvlc, VLC_THREAD_PRIORITY_LOW ); -#endif + vlc_mutex_init( &priv->timer_lock ); + vlc_mutex_init( &priv->config_lock ); - /* Store our newly allocated structure in the global list */ - vlc_object_attach( p_libvlc, p_libvlc_global ); + 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; - return p_libvlc->i_object_id; + return p_libvlc; } -/***************************************************************************** - * VLC_Init: initialize a vlc_t structure. - ***************************************************************************** - * This function initializes a previously allocated vlc_t structure: +/** + * Initialize a libvlc instance + * This function initializes a previously allocated libvlc instance: * - CPU detection * - gettext initialization * - message queue, module bank and playlist initialization * - configuration and commandline parsing - *****************************************************************************/ -int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) + */ +int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, + const char *ppsz_argv[] ) { + libvlc_global_data_t *p_libvlc_global = vlc_global(); + libvlc_priv_t *priv = libvlc_priv (p_libvlc); char p_capabilities[200]; - char * p_tmp; - char * psz_modules; - char * psz_parser; - char * psz_control; - vlc_bool_t b_exit = VLC_FALSE; + char * p_tmp = NULL; + char * psz_modules = NULL; + char * psz_parser = NULL; + char * psz_control = NULL; + bool b_exit = false; int i_ret = VLC_EEXIT; - module_t *p_help_module; - playlist_t *p_playlist; + playlist_t *p_playlist = NULL; vlc_value_t val; #if defined( ENABLE_NLS ) \ && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) ) @@ -290,43 +270,26 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) char * psz_language; #endif #endif - libvlc_int_t * p_libvlc = vlc_current_object( i_object ); - - if( !p_libvlc ) - { - return VLC_ENOOBJ; - } - /* - * System specific initialization code - */ + /* System specific initialization code */ system_Init( p_libvlc, &i_argc, ppsz_argv ); /* Get the executable name (similar to the basename command) */ - if( i_argc > 0 ) - { - p_libvlc->psz_object_name = p_tmp = ppsz_argv[ 0 ]; - while( *p_tmp ) - { - if( *p_tmp == '/' ) p_libvlc->psz_object_name = ++p_tmp; - else ++p_tmp; - } - } - else + if( i_argc > 0 && ppsz_argv[0][0] ) { - p_libvlc->psz_object_name = "vlc"; + free( p_libvlc->psz_object_name ); + + const char *psz_exe = strrchr( ppsz_argv[0], '/' ); + if( psz_exe && *(psz_exe + 1) ) + p_libvlc->psz_object_name = strdup( psz_exe + 1 ); + else + p_libvlc->psz_object_name = strdup( ppsz_argv[0] ); } /* * Support for gettext */ - SetLanguage( "" ); - - /* - * Global iconv, must be done after setlocale() - * so that vlc_current_charset() works. - */ - LocaleInit( (vlc_object_t *)p_libvlc ); + LoadMessages (); /* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */ msg_Dbg( p_libvlc, "translation test: code is \"%s\"", _("C") ); @@ -337,101 +300,61 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) * options) */ module_InitBank( p_libvlc ); - /* Hack: insert the help module here */ - p_help_module = vlc_object_create( p_libvlc, VLC_OBJECT_MODULE ); - if( p_help_module == NULL ) - { - module_EndBank( p_libvlc ); - if( i_object ) vlc_object_release( p_libvlc ); - return VLC_EGENERIC; - } - p_help_module->psz_object_name = "help"; - p_help_module->psz_longname = N_("Help options"); - config_Duplicate( p_help_module, p_help_config ); - vlc_object_attach( p_help_module, libvlc_global.p_module_bank ); - /* End hack */ - - if( config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE ) ) + if( config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true ) ) { - vlc_object_detach( p_help_module ); - config_Free( p_help_module ); - vlc_object_destroy( p_help_module ); module_EndBank( p_libvlc ); - if( i_object ) vlc_object_release( p_libvlc ); return VLC_EGENERIC; } /* Check for short help option */ - if( config_GetInt( p_libvlc, "help" ) ) + if( config_GetInt( p_libvlc, "help" ) > 0 ) { Help( p_libvlc, "help" ); - b_exit = VLC_TRUE; + b_exit = true; i_ret = VLC_EEXITSUCCESS; } /* Check for version option */ - else if( config_GetInt( p_libvlc, "version" ) ) + else if( config_GetInt( p_libvlc, "version" ) > 0 ) { Version(); - b_exit = VLC_TRUE; + b_exit = true; i_ret = VLC_EEXITSUCCESS; } /* Set the config file stuff */ - p_libvlc->psz_homedir = config_GetHomeDir(); - p_libvlc->psz_userdir = config_GetUserDir(); - if( p_libvlc->psz_userdir == NULL ) - p_libvlc->psz_userdir = strdup(p_libvlc->psz_homedir); - p_libvlc->psz_configfile = config_GetPsz( p_libvlc, "config" ); - if( p_libvlc->psz_configfile != NULL && p_libvlc->psz_configfile[0] == '~' - && p_libvlc->psz_configfile[1] == '/' ) - { - char *psz = malloc( strlen(p_libvlc->psz_userdir) - + strlen(p_libvlc->psz_configfile) ); - /* This is incomplete : we should also support the ~cmassiot/ syntax. */ - sprintf( psz, "%s/%s", p_libvlc->psz_userdir, - p_libvlc->psz_configfile + 2 ); - free( p_libvlc->psz_configfile ); - p_libvlc->psz_configfile = psz; - } + priv->psz_configfile = config_GetCustomConfigFile( p_libvlc ); /* Check for plugins cache options */ - if( config_GetInt( p_libvlc, "reset-plugins-cache" ) ) + if( config_GetInt( p_libvlc, "reset-plugins-cache" ) > 0 ) { - libvlc_global.p_module_bank->b_cache_delete = VLC_TRUE; + p_libvlc_global->p_module_bank->b_cache_delete = true; } - /* Hack: remove the help module here */ - vlc_object_detach( p_help_module ); - /* End hack */ - /* Will be re-done properly later on */ - p_libvlc->p_libvlc_global->i_verbose = config_GetInt( p_libvlc, "verbose" ); + priv->i_verbose = config_GetInt( p_libvlc, "verbose" ); /* Check for daemon mode */ #ifndef WIN32 - if( config_GetInt( p_libvlc, "daemon" ) ) + if( config_GetInt( p_libvlc, "daemon" ) > 0 ) { -#if HAVE_DAEMON +#ifdef HAVE_DAEMON + char *psz_pidfile = NULL; + if( daemon( 1, 0) != 0 ) { msg_Err( p_libvlc, "Unable to fork vlc to daemon mode" ); - b_exit = VLC_TRUE; + b_exit = true; } - - p_libvlc->p_libvlc_global->b_daemon = VLC_TRUE; + b_daemon = true; /* lets check if we need to write the pidfile */ - char * psz_pidfile = config_GetPsz( p_libvlc, "pidfile" ); - - msg_Dbg( p_libvlc, "psz_pidfile is %s", psz_pidfile ); - + psz_pidfile = config_GetPsz( p_libvlc, "pidfile" ); if( psz_pidfile != NULL ) { FILE *pidfile; pid_t i_pid = getpid (); - - msg_Dbg( p_libvlc, "our PID is %d, writing it to %s", i_pid, psz_pidfile ); - + msg_Dbg( p_libvlc, "PID is %d, writing it to %s", + i_pid, psz_pidfile ); pidfile = utf8_fopen( psz_pidfile,"w" ); if( pidfile != NULL ) { @@ -440,11 +363,10 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) } else { - msg_Err( p_libvlc, "Cannot open pid file for writing: %s, error: %s", - psz_pidfile, strerror(errno) ); + msg_Err( p_libvlc, "cannot open pid file for writing: %s (%m)", + psz_pidfile ); } } - free( psz_pidfile ); #else @@ -452,14 +374,14 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) if( ( i_pid = fork() ) < 0 ) { - msg_Err( p_libvlc, "Unable to fork vlc to daemon mode" ); - b_exit = VLC_TRUE; + msg_Err( p_libvlc, "unable to fork vlc to daemon mode" ); + b_exit = true; } else if( i_pid ) { /* This is the parent, exit right now */ msg_Dbg( p_libvlc, "closing parent process" ); - b_exit = VLC_TRUE; + b_exit = true; i_ret = VLC_EEXITSUCCESS; } else @@ -470,7 +392,7 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) close( STDOUT_FILENO ); close( STDERR_FILENO ); - p_libvlc->p_libvlc_global->b_daemon = VLC_TRUE; + b_daemon = true; } #endif } @@ -478,10 +400,7 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) if( b_exit ) { - config_Free( p_help_module ); - vlc_object_destroy( p_help_module ); module_EndBank( p_libvlc ); - if( i_object ) vlc_object_release( p_libvlc ); return i_ret; } @@ -491,14 +410,16 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) # if defined (WIN32) || defined (__APPLE__) /* This ain't really nice to have to reload the config here but it seems * the only way to do it. */ - config_LoadConfigFile( p_libvlc, "main" ); - config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE ); + + if( !config_GetInt( p_libvlc, "ignore-config" ) ) + config_LoadConfigFile( p_libvlc, "main" ); + config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true ); /* Check if the user specified a custom language */ psz_language = config_GetPsz( p_libvlc, "language" ); if( psz_language && *psz_language && strcmp( psz_language, "auto" ) ) { - vlc_bool_t b_cache_delete = libvlc_global.p_module_bank->b_cache_delete; + bool b_cache_delete = p_libvlc_global->p_module_bank->b_cache_delete; /* Reset the default domain */ SetLanguage( psz_language ); @@ -508,11 +429,12 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) module_EndBank( p_libvlc ); module_InitBank( p_libvlc ); - config_LoadConfigFile( p_libvlc, "main" ); - config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE ); - libvlc_global.p_module_bank->b_cache_delete = b_cache_delete; + if( !config_GetInt( p_libvlc, "ignore-config" ) ) + config_LoadConfigFile( p_libvlc, "main" ); + config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true ); + p_libvlc_global->p_module_bank->b_cache_delete = b_cache_delete; } - if( psz_language ) free( psz_language ); + free( psz_language ); # endif #endif @@ -526,67 +448,70 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) module_LoadPlugins( p_libvlc ); if( p_libvlc->b_die ) { - b_exit = VLC_TRUE; + b_exit = true; } msg_Dbg( p_libvlc, "module bank initialized, found %i modules", - libvlc_global.p_module_bank->i_children ); - - /* Hack: insert the help module here */ - vlc_object_attach( p_help_module, libvlc_global.p_module_bank ); - /* End hack */ + vlc_internals( p_libvlc_global->p_module_bank )->i_children ); /* Check for help on modules */ if( (p_tmp = config_GetPsz( p_libvlc, "module" )) ) { Help( p_libvlc, p_tmp ); free( p_tmp ); - b_exit = VLC_TRUE; + b_exit = true; + i_ret = VLC_EEXITSUCCESS; + } + /* Check for full help option */ + else if( config_GetInt( p_libvlc, "full-help" ) > 0 ) + { + config_PutInt( p_libvlc, "advanced", 1); + config_PutInt( p_libvlc, "help-verbose", 1); + Help( p_libvlc, "full-help" ); + b_exit = true; i_ret = VLC_EEXITSUCCESS; } /* Check for long help option */ - else if( config_GetInt( p_libvlc, "longhelp" ) ) + else if( config_GetInt( p_libvlc, "longhelp" ) > 0 ) { Help( p_libvlc, "longhelp" ); - b_exit = VLC_TRUE; + b_exit = true; i_ret = VLC_EEXITSUCCESS; } /* Check for module list option */ - else if( config_GetInt( p_libvlc, "list" ) ) + else if( config_GetInt( p_libvlc, "list" ) > 0 ) { - ListModules( p_libvlc ); - b_exit = VLC_TRUE; + ListModules( p_libvlc, false ); + b_exit = true; i_ret = VLC_EEXITSUCCESS; } - - /* Check for config file options */ - if( config_GetInt( p_libvlc, "reset-config" ) ) + else if( config_GetInt( p_libvlc, "list-verbose" ) > 0 ) { - vlc_object_detach( p_help_module ); - config_ResetAll( p_libvlc ); - config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE ); - config_SaveConfigFile( p_libvlc, NULL ); - vlc_object_attach( p_help_module, libvlc_global.p_module_bank ); + ListModules( p_libvlc, true ); + b_exit = true; + i_ret = VLC_EEXITSUCCESS; } - if( config_GetInt( p_libvlc, "save-config" ) ) + + /* Check for config file options */ + if( !config_GetInt( p_libvlc, "ignore-config" ) ) { - vlc_object_detach( p_help_module ); - config_LoadConfigFile( p_libvlc, NULL ); - config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE ); - config_SaveConfigFile( p_libvlc, NULL ); - vlc_object_attach( p_help_module, libvlc_global.p_module_bank ); + if( config_GetInt( p_libvlc, "reset-config" ) > 0 ) + { + config_ResetAll( p_libvlc ); + config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true ); + config_SaveConfigFile( p_libvlc, NULL ); + } + if( config_GetInt( p_libvlc, "save-config" ) > 0 ) + { + config_LoadConfigFile( p_libvlc, NULL ); + config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true ); + config_SaveConfigFile( p_libvlc, NULL ); + } } - /* Hack: remove the help module here */ - vlc_object_detach( p_help_module ); - /* End hack */ - if( b_exit ) { - config_Free( p_help_module ); - vlc_object_destroy( p_help_module ); module_EndBank( p_libvlc ); - if( i_object ) vlc_object_release( p_libvlc ); return i_ret; } @@ -598,49 +523,157 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) /* * Override default configuration with config file settings */ - config_LoadConfigFile( p_libvlc, NULL ); - - /* Hack: insert the help module here */ - vlc_object_attach( p_help_module, libvlc_global.p_module_bank ); - /* End hack */ + if( !config_GetInt( p_libvlc, "ignore-config" ) ) + config_LoadConfigFile( p_libvlc, NULL ); /* * Override configuration with command line settings */ - if( config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_FALSE ) ) + if( config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, false ) ) { #ifdef WIN32 - ShowConsole( VLC_FALSE ); + ShowConsole( false ); /* Pause the console because it's destroyed when we exit */ fprintf( stderr, "The command line options couldn't be loaded, check " "that they are valid.\n" ); PauseConsole(); #endif - vlc_object_detach( p_help_module ); - config_Free( p_help_module ); - vlc_object_destroy( p_help_module ); module_EndBank( p_libvlc ); - if( i_object ) vlc_object_release( p_libvlc ); return VLC_EGENERIC; } - /* Hack: remove the help module here */ - vlc_object_detach( p_help_module ); - config_Free( p_help_module ); - vlc_object_destroy( p_help_module ); - /* End hack */ - /* * System specific configuration */ system_Configure( p_libvlc, &i_argc, ppsz_argv ); +/* FIXME: could be replaced by using Unix sockets */ +#ifdef HAVE_DBUS + dbus_threads_init_default(); + + if( config_GetInt( p_libvlc, "one-instance" ) > 0 ) + { + /* Initialise D-Bus interface, check for other instances */ + DBusConnection *p_conn = NULL; + DBusError dbus_error; + + dbus_error_init( &dbus_error ); + + /* connect to the session bus */ + p_conn = dbus_bus_get( DBUS_BUS_SESSION, &dbus_error ); + if( !p_conn ) + { + msg_Err( p_libvlc, "Failed to connect to D-Bus session daemon: %s", + dbus_error.message ); + dbus_error_free( &dbus_error ); + } + else + { + /* check if VLC is available on the bus + * if not: D-Bus control is not enabled on the other + * instance and we can't pass MRLs to it */ + DBusMessage *p_test_msg = NULL; + DBusMessage *p_test_reply = NULL; + p_test_msg = dbus_message_new_method_call( + "org.mpris.vlc", "/", + "org.freedesktop.MediaPlayer", "Identity" ); + /* block until a reply arrives */ + p_test_reply = dbus_connection_send_with_reply_and_block( + p_conn, p_test_msg, -1, &dbus_error ); + dbus_message_unref( p_test_msg ); + if( p_test_reply == NULL ) + { + dbus_error_free( &dbus_error ); + msg_Dbg( p_libvlc, "No Media Player is running. " + "Continuing normally." ); + } + else + { + int i_input; + DBusMessage* p_dbus_msg = NULL; + DBusMessageIter dbus_args; + DBusPendingCall* p_dbus_pending = NULL; + dbus_bool_t b_play; + + dbus_message_unref( p_test_reply ); + msg_Warn( p_libvlc, "Another Media Player is running. Exiting"); + + for( i_input = optind;i_input < i_argc;i_input++ ) + { + msg_Dbg( p_libvlc, "Adds %s to the running Media Player", + ppsz_argv[i_input] ); + + p_dbus_msg = dbus_message_new_method_call( + "org.mpris.vlc", "/TrackList", + "org.freedesktop.MediaPlayer", "AddTrack" ); + + if ( NULL == p_dbus_msg ) + { + msg_Err( p_libvlc, "D-Bus problem" ); + system_End( p_libvlc ); + exit( VLC_ETIMEOUT ); + } + + /* append MRLs */ + dbus_message_iter_init_append( p_dbus_msg, &dbus_args ); + if ( !dbus_message_iter_append_basic( &dbus_args, + DBUS_TYPE_STRING, &ppsz_argv[i_input] ) ) + { + dbus_message_unref( p_dbus_msg ); + system_End( p_libvlc ); + exit( VLC_ENOMEM ); + } + b_play = TRUE; + if( config_GetInt( p_libvlc, "playlist-enqueue" ) > 0 ) + b_play = FALSE; + if ( !dbus_message_iter_append_basic( &dbus_args, + DBUS_TYPE_BOOLEAN, &b_play ) ) + { + dbus_message_unref( p_dbus_msg ); + system_End( p_libvlc ); + exit( VLC_ENOMEM ); + } + + /* send message and get a handle for a reply */ + if ( !dbus_connection_send_with_reply ( p_conn, + p_dbus_msg, &p_dbus_pending, -1 ) ) + { + msg_Err( p_libvlc, "D-Bus problem" ); + dbus_message_unref( p_dbus_msg ); + system_End( p_libvlc ); + exit( VLC_ETIMEOUT ); + } + + if ( NULL == p_dbus_pending ) + { + msg_Err( p_libvlc, "D-Bus problem" ); + dbus_message_unref( p_dbus_msg ); + system_End( p_libvlc ); + exit( VLC_ETIMEOUT ); + } + dbus_connection_flush( p_conn ); + dbus_message_unref( p_dbus_msg ); + /* block until we receive a reply */ + dbus_pending_call_block( p_dbus_pending ); + dbus_pending_call_unref( p_dbus_pending ); + } /* processes all command line MRLs */ + + /* bye bye */ + system_End( p_libvlc ); + exit( VLC_SUCCESS ); + } + } + /* we unreference the connection when we've finished with it */ + if( p_conn ) dbus_connection_unref( p_conn ); + } +#endif + /* * Message queue options */ var_Create( p_libvlc, "verbose", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - if( config_GetInt( p_libvlc, "quiet" ) ) + if( config_GetInt( p_libvlc, "quiet" ) > 0 ) { val.i_int = -1; var_Set( p_libvlc, "verbose", val ); @@ -648,38 +681,36 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) var_AddCallback( p_libvlc, "verbose", VerboseCallback, NULL ); var_Change( p_libvlc, "verbose", VLC_VAR_TRIGGER_CALLBACKS, NULL, NULL ); - libvlc_global.b_color = libvlc_global.b_color && - config_GetInt( p_libvlc, "color" ); + if( priv->b_color ) + priv->b_color = config_GetInt( p_libvlc, "color" ) > 0; /* * Output messages that may still be in the queue */ msg_Flush( p_libvlc ); - /* p_libvlc initialization. FIXME ? */ - if( !config_GetInt( p_libvlc, "fpu" ) ) - libvlc_global.i_cpu &= ~CPU_CAPABILITY_FPU; + cpu_flags &= ~CPU_CAPABILITY_FPU; #if defined( __i386__ ) || defined( __x86_64__ ) if( !config_GetInt( p_libvlc, "mmx" ) ) - libvlc_global.i_cpu &= ~CPU_CAPABILITY_MMX; + cpu_flags &= ~CPU_CAPABILITY_MMX; if( !config_GetInt( p_libvlc, "3dn" ) ) - libvlc_global.i_cpu &= ~CPU_CAPABILITY_3DNOW; + cpu_flags &= ~CPU_CAPABILITY_3DNOW; if( !config_GetInt( p_libvlc, "mmxext" ) ) - libvlc_global.i_cpu &= ~CPU_CAPABILITY_MMXEXT; + cpu_flags &= ~CPU_CAPABILITY_MMXEXT; if( !config_GetInt( p_libvlc, "sse" ) ) - libvlc_global.i_cpu &= ~CPU_CAPABILITY_SSE; + cpu_flags &= ~CPU_CAPABILITY_SSE; if( !config_GetInt( p_libvlc, "sse2" ) ) - libvlc_global.i_cpu &= ~CPU_CAPABILITY_SSE2; + cpu_flags &= ~CPU_CAPABILITY_SSE2; #endif #if defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc64__ ) if( !config_GetInt( p_libvlc, "altivec" ) ) - libvlc_global.i_cpu &= ~CPU_CAPABILITY_ALTIVEC; + cpu_flags &= ~CPU_CAPABILITY_ALTIVEC; #endif #define PRINT_CAPABILITY( capability, string ) \ - if( libvlc_global.i_cpu & capability ) \ + if( vlc_CPU() & capability ) \ { \ strncat( p_capabilities, string " ", \ sizeof(p_capabilities) - strlen(p_capabilities) ); \ @@ -702,54 +733,73 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) /* * Choose the best memcpy module */ - p_libvlc->p_memcpy_module = module_Need( p_libvlc, "memcpy", "$memcpy", 0 ); + priv->p_memcpy_module = module_Need( p_libvlc, "memcpy", "$memcpy", 0 ); - if( p_libvlc->pf_memcpy == NULL ) - { - p_libvlc->pf_memcpy = memcpy; - } + priv->b_stats = config_GetInt( p_libvlc, "stats" ) > 0; + priv->i_timers = 0; + priv->pp_timers = NULL; - if( p_libvlc->pf_memset == NULL ) + /* Init stats */ + p_libvlc->p_stats = (global_stats_t *)malloc( sizeof( global_stats_t ) ); + if( !p_libvlc->p_stats ) { - p_libvlc->pf_memset = memset; + vlc_object_release( p_libvlc ); + return VLC_ENOMEM; } + vlc_mutex_init( &p_libvlc->p_stats->lock ); + priv->p_stats_computer = NULL; - p_libvlc->b_stats = config_GetInt( p_libvlc, "stats" ); - p_libvlc->i_timers = 0; - p_libvlc->pp_timers = NULL; - vlc_mutex_init( p_libvlc, &p_libvlc->timer_lock ); + /* Init the array that holds every input item */ + ARRAY_INIT( priv->input_items ); + priv->i_last_input_id = 0; /* * Initialize hotkey handling */ var_Create( p_libvlc, "key-pressed", VLC_VAR_INTEGER ); - p_libvlc->p_hotkeys = malloc( sizeof(p_hotkeys) ); + var_Create( p_libvlc, "key-action", VLC_VAR_INTEGER ); + p_libvlc->p_hotkeys = malloc( libvlc_hotkeys_size ); /* Do a copy (we don't need to modify the strings) */ - memcpy( p_libvlc->p_hotkeys, p_hotkeys, sizeof(p_hotkeys) ); + memcpy( p_libvlc->p_hotkeys, libvlc_hotkeys, libvlc_hotkeys_size ); + var_AddCallback( p_libvlc, "key-pressed", vlc_key_to_action, + p_libvlc->p_hotkeys ); - /* - * Initialize playlist and get commandline files - */ - p_playlist = playlist_ThreadCreate( p_libvlc ); - if( !p_playlist ) + /* Initialize interaction */ + priv->p_interaction = interaction_Init( p_libvlc ); + + /* Initialize playlist and get commandline files */ + playlist_ThreadCreate( p_libvlc ); + if( !priv->p_playlist ) { msg_Err( p_libvlc, "playlist initialization failed" ); - if( p_libvlc->p_memcpy_module != NULL ) + if( priv->p_memcpy_module != NULL ) { - module_Unneed( p_libvlc, p_libvlc->p_memcpy_module ); + module_Unneed( p_libvlc, priv->p_memcpy_module ); } module_EndBank( p_libvlc ); - if( i_object ) vlc_object_release( p_libvlc ); return VLC_EGENERIC; } + p_playlist = priv->p_playlist; psz_modules = config_GetPsz( p_playlist, "services-discovery" ); if( psz_modules && *psz_modules ) { /* Add service discovery modules */ - playlist_AddSDModules( p_playlist, psz_modules ); + playlist_ServicesDiscoveryAdd( p_playlist, psz_modules ); + } + free( psz_modules ); + +#ifdef ENABLE_VLM + /* Initialize VLM if vlm-conf is specified */ + psz_parser = config_GetPsz( p_libvlc, "vlm-conf" ); + if( psz_parser && *psz_parser ) + { + priv->p_vlm = vlm_New( p_libvlc ); + if( !priv->p_vlm ) + msg_Err( p_libvlc, "VLM initialization failed" ); } - if( psz_modules ) free( psz_modules ); + free( psz_parser ); +#endif /* * Load background interfaces @@ -765,7 +815,7 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) } else if( psz_control && *psz_control ) { - if( psz_modules ) free( psz_modules ); + free( psz_modules ); psz_modules = strdup( psz_control ); } @@ -784,52 +834,91 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) if( psz_temp ) { sprintf( psz_temp, "%s,none", psz_module ); - VLC_AddIntf( 0, psz_temp, VLC_FALSE, VLC_FALSE ); + libvlc_InternalAddIntf( p_libvlc, psz_temp ); free( psz_temp ); } } - if ( psz_modules ) - { - free( psz_modules ); - } + free( psz_modules ); + free( psz_control ); /* * Always load the hotkeys interface if it exists */ - VLC_AddIntf( 0, "hotkeys,none", VLC_FALSE, VLC_FALSE ); + libvlc_InternalAddIntf( p_libvlc, "hotkeys,none" ); + +#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" ); + + /* 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" ); +#endif /* * If needed, load the Xscreensaver interface * Currently, only for X */ #ifdef HAVE_X11_XLIB_H - if( config_GetInt( p_libvlc, "disable-screensaver" ) == 1 ) + if( config_GetInt( p_libvlc, "disable-screensaver" ) ) { - VLC_AddIntf( 0, "screensaver,none", VLC_FALSE, VLC_FALSE ); + libvlc_InternalAddIntf( p_libvlc, "screensaver,none" ); } #endif - if( config_GetInt( p_libvlc, "file-logging" ) == 1 ) + if( config_GetInt( p_libvlc, "file-logging" ) > 0 ) { - VLC_AddIntf( 0, "logger,none", VLC_FALSE, VLC_FALSE ); + libvlc_InternalAddIntf( p_libvlc, "logger,none" ); } #ifdef HAVE_SYSLOG_H - if( config_GetInt( p_libvlc, "syslog" ) == 1 ) + if( config_GetInt( p_libvlc, "syslog" ) > 0 ) { - char *psz_logmode = "logmode=syslog"; - AddIntfInternal( 0, "logger,none", VLC_FALSE, VLC_FALSE, 1, &psz_logmode ); + char *logmode = var_CreateGetString( p_libvlc, "logmode" ); + var_SetString( p_libvlc, "logmode", "syslog" ); + libvlc_InternalAddIntf( p_libvlc, "logger,none" ); + + if( logmode ) + { + var_SetString( p_libvlc, "logmode", logmode ); + free( logmode ); + } + else + var_Destroy( p_libvlc, "logmode" ); } #endif - if( config_GetInt( p_libvlc, "show-intf" ) == 1 ) + if( config_GetInt( p_libvlc, "show-intf" ) > 0 ) + { + libvlc_InternalAddIntf( p_libvlc, "showintf,none" ); + } + + if( config_GetInt( p_libvlc, "network-synchronisation") > 0 ) { - VLC_AddIntf( 0, "showintf,none", VLC_FALSE, VLC_FALSE ); + libvlc_InternalAddIntf( p_libvlc, "netsync,none" ); } - if( config_GetInt( p_libvlc, "network-synchronisation") == 1 ) +#ifdef WIN32 + if( config_GetInt( p_libvlc, "prefer-system-codecs") > 0 ) { - VLC_AddIntf( 0, "netsync,none", VLC_FALSE, VLC_FALSE ); + char *psz_codecs = config_GetPsz( p_playlist, "codec" ); + if( psz_codecs ) + { + char *psz_morecodecs; + asprintf(&psz_morecodecs, "%s,dmo,quicktime", psz_codecs); + if( psz_morecodecs ) + { + config_PutPsz( p_libvlc, "codec", psz_morecodecs); + free( psz_morecodecs ); + } + } + else + config_PutPsz( p_libvlc, "codec", "dmo,quicktime"); + free( psz_codecs ); } +#endif /* * FIXME: kludge to use a p_libvlc-local variable for the Mozilla plugin @@ -842,1115 +931,262 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) var_Create( p_libvlc, "drawable-clip-top", VLC_VAR_INTEGER ); var_Create( p_libvlc, "drawable-clip-left", VLC_VAR_INTEGER ); var_Create( p_libvlc, "drawable-clip-bottom", VLC_VAR_INTEGER ); - var_Create( p_libvlc, "drawable-clip-right", VLC_VAR_INTEGER ); - - /* Create volume callback system. */ - var_Create( p_libvlc, "volume-change", VLC_VAR_BOOL ); - - /* - * Get input filenames given as commandline arguments - */ - GetFilenames( p_libvlc, i_argc, ppsz_argv ); - - /* - * Get --open argument - */ - var_Create( p_libvlc, "open", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); - var_Get( p_libvlc, "open", &val ); - if ( val.psz_string != NULL && *val.psz_string ) - { - VLC_AddTarget( p_libvlc->i_object_id, val.psz_string, NULL, 0, - PLAYLIST_INSERT, 0 ); - } - if ( val.psz_string != NULL ) free( val.psz_string ); - - if( i_object ) vlc_object_release( p_libvlc ); - return VLC_SUCCESS; -} - -/***************************************************************************** - * VLC_AddIntf: add an interface - ***************************************************************************** - * This function opens an interface plugin and runs it. If b_block is set - * to 0, VLC_AddIntf will return immediately and let the interface run in a - * separate thread. If b_block is set to 1, VLC_AddIntf will continue until - * user requests to quit. If b_play is set to 1, VLC_AddIntf will start playing - * the playlist when it is completely initialised. - *****************************************************************************/ -int VLC_AddIntf( int i_object, char const *psz_module, - vlc_bool_t b_block, vlc_bool_t b_play ) -{ - return AddIntfInternal( i_object, psz_module, b_block, b_play, 0, NULL ); -} - - -/***************************************************************************** - * VLC_Die: ask vlc to die. - ***************************************************************************** - * This function sets p_vlc->b_die to VLC_TRUE, but does not do any other - * task. It is your duty to call VLC_CleanUp and VLC_Destroy afterwards. - *****************************************************************************/ -int VLC_Die( int i_object ) -{ - libvlc_int_t *p_libvlc = vlc_current_object( i_object ); - - if( !p_libvlc ) - { - return VLC_ENOOBJ; - } - - p_libvlc->b_die = VLC_TRUE; - - if( i_object ) vlc_object_release( p_libvlc ); - return VLC_SUCCESS; -} - -/***************************************************************************** - * VLC_CleanUp: CleanUp all the intf, playlist, vout, aout - *****************************************************************************/ -int VLC_CleanUp( int i_object ) -{ - intf_thread_t * p_intf; - playlist_t * p_playlist; - vout_thread_t * p_vout; - aout_instance_t * p_aout; - announce_handler_t * p_announce; - libvlc_int_t *p_libvlc = vlc_current_object( i_object ); - - /* Check that the handle is valid */ - if( !p_libvlc ) - { - return VLC_ENOOBJ; - } - - /* - * Ask the interfaces to stop and destroy them - */ - msg_Dbg( p_libvlc, "removing all interfaces" ); - while( (p_intf = vlc_object_find( p_libvlc, VLC_OBJECT_INTF, FIND_CHILD )) ) - { - intf_StopThread( p_intf ); - vlc_object_detach( p_intf ); - vlc_object_release( p_intf ); - intf_Destroy( p_intf ); - } - - /* - * Free playlist - */ - msg_Dbg( p_libvlc, "removing playlist handler" ); - while( (p_playlist = vlc_object_find( p_libvlc, VLC_OBJECT_PLAYLIST, - FIND_CHILD )) ) - { - vlc_object_detach( p_playlist ); - vlc_object_release( p_playlist ); - playlist_ThreadDestroy( p_playlist ); - } - - /* - * 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 ); - } - - /* - * Free audio outputs - */ - msg_Dbg( p_libvlc, "removing all audio outputs" ); - while( (p_aout = vlc_object_find( p_libvlc, VLC_OBJECT_AOUT, FIND_CHILD )) ) - { - vlc_object_detach( (vlc_object_t *)p_aout ); - vlc_object_release( (vlc_object_t *)p_aout ); - aout_Delete( p_aout ); - } - - stats_TimersDumpAll( p_libvlc ); - stats_TimersClean( p_libvlc ); - - /* - * Free announce handler(s?) - */ - while( (p_announce = vlc_object_find( p_libvlc, VLC_OBJECT_ANNOUNCE, - FIND_CHILD ) ) ) - { - msg_Dbg( p_libvlc, "removing announce handler" ); - vlc_object_detach( p_announce ); - vlc_object_release( p_announce ); - announce_HandlerDestroy( p_announce ); - } - - if( i_object ) vlc_object_release( p_libvlc ); - return VLC_SUCCESS; -} - -/***************************************************************************** - * VLC_Destroy: Destroy everything. - ***************************************************************************** - * This function requests the running threads to finish, waits for their - * termination, and destroys their structure. - *****************************************************************************/ -int VLC_Destroy( int i_object ) -{ - libvlc_int_t *p_libvlc = vlc_current_object( i_object ); - - if( !p_libvlc ) - { - return VLC_ENOOBJ; - } - - /* - * Free allocated memory - */ - if( p_libvlc->p_memcpy_module ) - { - module_Unneed( p_libvlc, p_libvlc->p_memcpy_module ); - p_libvlc->p_memcpy_module = NULL; - } - - /* - * Free module bank ! - */ - module_EndBank( p_libvlc ); - - if( p_libvlc->psz_homedir ) - { - free( p_libvlc->psz_homedir ); - p_libvlc->psz_homedir = NULL; - } - - if( p_libvlc->psz_userdir ) - { - free( p_libvlc->psz_userdir ); - p_libvlc->psz_userdir = NULL; - } - - if( p_libvlc->psz_configfile ) - { - free( p_libvlc->psz_configfile ); - p_libvlc->psz_configfile = NULL; - } - - if( p_libvlc->p_hotkeys ) - { - free( p_libvlc->p_hotkeys ); - p_libvlc->p_hotkeys = NULL; - } - - /* - * System specific cleaning code - */ - system_End( p_libvlc ); - - /* - * Free message queue. - * Nobody shall use msg_* afterward. - */ - msg_Flush( p_libvlc ); - msg_Destroy( p_libvlc_global ); - - /* Destroy global iconv */ - LocaleDeinit(); - - /* Destroy mutexes */ - vlc_mutex_destroy( &p_libvlc->config_lock ); - - vlc_object_detach( p_libvlc ); - - /* Release object before destroying it */ - if( i_object ) vlc_object_release( p_libvlc ); - - vlc_object_destroy( p_libvlc ); - - /* Stop thread system: last one out please shut the door! */ - vlc_threads_end( p_libvlc_global ); - - return VLC_SUCCESS; -} - -/***************************************************************************** - * VLC_VariableSet: set a vlc variable - *****************************************************************************/ -int VLC_VariableSet( int i_object, char const *psz_var, vlc_value_t value ) -{ - libvlc_int_t *p_libvlc = vlc_current_object( i_object ); - int i_ret; - - if( !p_libvlc ) - { - return VLC_ENOOBJ; - } - - /* FIXME: Temporary hack for Mozilla, if variable starts with conf:: then - * we handle it as a configuration variable. Don't tell Gildas :) -- sam */ - if( !strncmp( psz_var, "conf::", 6 ) ) - { - module_config_t *p_item; - char const *psz_newvar = psz_var + 6; - - p_item = config_FindConfig( VLC_OBJECT(p_libvlc), psz_newvar ); - - if( p_item ) - { - switch( p_item->i_type ) - { - case CONFIG_ITEM_BOOL: - config_PutInt( p_libvlc, psz_newvar, value.b_bool ); - break; - case CONFIG_ITEM_INTEGER: - config_PutInt( p_libvlc, psz_newvar, value.i_int ); - break; - case CONFIG_ITEM_FLOAT: - config_PutFloat( p_libvlc, psz_newvar, value.f_float ); - break; - default: - config_PutPsz( p_libvlc, psz_newvar, value.psz_string ); - break; - } - if( i_object ) vlc_object_release( p_libvlc ); - return VLC_SUCCESS; - } - } - - i_ret = var_Set( p_libvlc, psz_var, value ); - - if( i_object ) vlc_object_release( p_libvlc ); - return i_ret; -} - -/***************************************************************************** - * VLC_VariableGet: get a vlc variable - *****************************************************************************/ -int VLC_VariableGet( int i_object, char const *psz_var, vlc_value_t *p_value ) -{ - libvlc_int_t *p_libvlc = vlc_current_object( i_object ); - int i_ret; - - if( !p_libvlc ) - { - return VLC_ENOOBJ; - } - - i_ret = var_Get( p_libvlc , psz_var, p_value ); - - if( i_object ) vlc_object_release( p_libvlc ); - return i_ret; -} - -/***************************************************************************** - * VLC_VariableType: get a vlc variable type - *****************************************************************************/ -int VLC_VariableType( int i_object, char const *psz_var, int *pi_type ) -{ - int i_type; - libvlc_int_t *p_libvlc = vlc_current_object( i_object ); - - if( !p_libvlc ) - { - return VLC_ENOOBJ; - } - - /* FIXME: Temporary hack for Mozilla, if variable starts with conf:: then - * we handle it as a configuration variable. Don't tell Gildas :) -- sam */ - if( !strncmp( psz_var, "conf::", 6 ) ) - { - module_config_t *p_item; - char const *psz_newvar = psz_var + 6; - - p_item = config_FindConfig( VLC_OBJECT(p_libvlc), psz_newvar ); - - if( p_item ) - { - switch( p_item->i_type ) - { - case CONFIG_ITEM_BOOL: - i_type = VLC_VAR_BOOL; - break; - case CONFIG_ITEM_INTEGER: - i_type = VLC_VAR_INTEGER; - break; - case CONFIG_ITEM_FLOAT: - i_type = VLC_VAR_FLOAT; - break; - default: - i_type = VLC_VAR_STRING; - break; - } - } - else - i_type = 0; - } - else - i_type = VLC_VAR_TYPE & var_Type( p_libvlc , psz_var ); - - if( i_object ) vlc_object_release( p_libvlc ); - - if( i_type > 0 ) - { - *pi_type = i_type; - return VLC_SUCCESS; - } - return VLC_ENOVAR; -} - -/***************************************************************************** - * VLC_AddTarget: adds a target for playing. - ***************************************************************************** - * This function adds psz_target to the current playlist. If a playlist does - * not exist, it will create one. - *****************************************************************************/ -int VLC_AddTarget( int i_object, char const *psz_target, - char const **ppsz_options, int i_options, - int i_mode, int i_pos ) -{ - int i_err; - playlist_t *p_playlist; - libvlc_int_t *p_libvlc = vlc_current_object( i_object ); - - if( !p_libvlc ) - { - return VLC_ENOOBJ; - } - - p_playlist = vlc_object_find( p_libvlc, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); - - if( p_playlist == NULL ) - { - msg_Dbg( p_libvlc, "no playlist present, creating one" ); - p_playlist = playlist_ThreadCreate( p_libvlc ); - - if( p_playlist == NULL ) - { - if( i_object ) vlc_object_release( p_libvlc ); - return VLC_EGENERIC; - } - - vlc_object_yield( p_playlist ); - } - - i_err = playlist_PlaylistAddExt( p_playlist, psz_target, psz_target, - i_mode, i_pos, -1, ppsz_options, i_options); - - vlc_object_release( p_playlist ); - - if( i_object ) vlc_object_release( p_libvlc ); - return i_err; -} - -/***************************************************************************** - * VLC_Play: play the playlist - *****************************************************************************/ -int VLC_Play( int i_object ) -{ - playlist_t * p_playlist; - libvlc_int_t *p_libvlc = vlc_current_object( i_object ); - - /* Check that the handle is valid */ - if( !p_libvlc ) - { - return VLC_ENOOBJ; - } - - p_playlist = vlc_object_find( p_libvlc, VLC_OBJECT_PLAYLIST, FIND_CHILD ); - - if( !p_playlist ) - { - if( i_object ) vlc_object_release( p_libvlc ); - return VLC_ENOOBJ; - } - - playlist_Play( p_playlist ); - vlc_object_release( p_playlist ); - - if( i_object ) vlc_object_release( p_libvlc ); - return VLC_SUCCESS; -} - -/***************************************************************************** - * VLC_Pause: toggle pause - *****************************************************************************/ -int VLC_Pause( int i_object ) -{ - playlist_t * p_playlist; - libvlc_int_t *p_libvlc = vlc_current_object( i_object ); - - /* Check that the handle is valid */ - if( !p_libvlc ) - { - return VLC_ENOOBJ; - } - - p_playlist = vlc_object_find( p_libvlc, VLC_OBJECT_PLAYLIST, FIND_CHILD ); - - if( !p_playlist ) - { - if( i_object ) vlc_object_release( p_libvlc ); - return VLC_ENOOBJ; - } - - playlist_Pause( p_playlist ); - vlc_object_release( p_playlist ); - - if( i_object ) vlc_object_release( p_libvlc ); - return VLC_SUCCESS; -} - -/***************************************************************************** - * VLC_Stop: stop playback - *****************************************************************************/ -int VLC_Stop( int i_object ) -{ - playlist_t * p_playlist; - libvlc_int_t *p_libvlc = vlc_current_object( i_object ); - - /* Check that the handle is valid */ - if( !p_libvlc ) - { - return VLC_ENOOBJ; - } - - p_playlist = vlc_object_find( p_libvlc, VLC_OBJECT_PLAYLIST, FIND_CHILD ); - - if( !p_playlist ) - { - if( i_object ) vlc_object_release( p_libvlc ); - return VLC_ENOOBJ; - } - - playlist_Stop( p_playlist ); - vlc_object_release( p_playlist ); - - if( i_object ) vlc_object_release( p_libvlc ); - return VLC_SUCCESS; -} - -/***************************************************************************** - * VLC_IsPlaying: Query for Playlist Status - *****************************************************************************/ -vlc_bool_t VLC_IsPlaying( int i_object ) -{ - playlist_t * p_playlist; - vlc_bool_t b_playing; - - libvlc_int_t *p_libvlc = vlc_current_object( i_object ); - - /* Check that the handle is valid */ - if( !p_libvlc ) - { - return VLC_ENOOBJ; - } - - p_playlist = vlc_object_find( p_libvlc, VLC_OBJECT_PLAYLIST, FIND_CHILD ); - - if( !p_playlist ) - { - if( i_object ) vlc_object_release( p_libvlc ); - return VLC_ENOOBJ; - } - - if( p_playlist->p_input ) - { - vlc_value_t val; - var_Get( p_playlist->p_input, "state", &val ); - b_playing = ( val.i_int == PLAYING_S ); - } - else - { - b_playing = playlist_IsPlaying( p_playlist ); - } - vlc_object_release( p_playlist ); - - if( i_object ) vlc_object_release( p_libvlc ); - return b_playing; -} - -/** - * Get the current position in a input - * - * Return the current position as a float - * \note For some inputs, this will be unknown. - * - * \param i_object a vlc object id - * \return a float in the range of 0.0 - 1.0 - */ -float VLC_PositionGet( int i_object ) -{ - input_thread_t *p_input; - vlc_value_t val; - libvlc_int_t *p_libvlc = vlc_current_object( i_object ); - - /* Check that the handle is valid */ - if( !p_libvlc ) - { - return VLC_ENOOBJ; - } - - p_input = vlc_object_find( p_libvlc, VLC_OBJECT_INPUT, FIND_CHILD ); - - if( !p_input ) - { - if( i_object ) vlc_object_release( p_libvlc ); - return VLC_ENOOBJ; - } - - var_Get( p_input, "position", &val ); - vlc_object_release( p_input ); - - if( i_object ) vlc_object_release( p_libvlc ); - return val.f_float; -} - -/** - * Set the current position in a input - * - * Set the current position in a input and then return - * the current position as a float. - * \note For some inputs, this will be unknown. - * - * \param i_object a vlc object id - * \param i_position a float in the range of 0.0 - 1.0 - * \return a float in the range of 0.0 - 1.0 - */ -float VLC_PositionSet( int i_object, float i_position ) -{ - input_thread_t *p_input; - vlc_value_t val; - libvlc_int_t *p_libvlc = vlc_current_object( i_object ); - - /* Check that the handle is valid */ - if( !p_libvlc ) - { - return VLC_ENOOBJ; - } - - p_input = vlc_object_find( p_libvlc, VLC_OBJECT_INPUT, FIND_CHILD ); - - if( !p_input ) - { - if( i_object ) vlc_object_release( p_libvlc ); - return VLC_ENOOBJ; - } - - val.f_float = i_position; - var_Set( p_input, "position", val ); - var_Get( p_input, "position", &val ); - vlc_object_release( p_input ); - - if( i_object ) vlc_object_release( p_libvlc ); - return val.f_float; -} - -/** - * Get the current position in a input - * - * Return the current position in seconds from the start. - * \note For some inputs, this will be unknown. - * - * \param i_object a vlc object id - * \return the offset from 0:00 in seconds - */ -int VLC_TimeGet( int i_object ) -{ - input_thread_t *p_input; - vlc_value_t val; - libvlc_int_t *p_libvlc = vlc_current_object( i_object ); - - /* Check that the handle is valid */ - if( !p_libvlc ) - { - return VLC_ENOOBJ; - } - - p_input = vlc_object_find( p_libvlc, VLC_OBJECT_INPUT, FIND_CHILD ); - - if( !p_input ) - { - if( i_object ) vlc_object_release( p_libvlc ); - return VLC_ENOOBJ; - } - - var_Get( p_input, "time", &val ); - vlc_object_release( p_input ); - - if( i_object ) vlc_object_release( p_libvlc ); - return val.i_time / 1000000; -} - -/** - * Seek to a position in the current input - * - * Seek i_seconds in the current input. If b_relative is set, - * then the seek will be relative to the current position, otherwise - * it will seek to i_seconds from the beginning of the input. - * \note For some inputs, this will be unknown. - * - * \param i_object a vlc object id - * \param i_seconds seconds from current position or from beginning of input - * \param b_relative seek relative from current position - * \return VLC_SUCCESS on success - */ -int VLC_TimeSet( int i_object, int i_seconds, vlc_bool_t b_relative ) -{ - input_thread_t *p_input; - vlc_value_t val; - libvlc_int_t *p_libvlc = vlc_current_object( i_object ); - - /* Check that the handle is valid */ - if( !p_libvlc ) - { - return VLC_ENOOBJ; - } - - p_input = vlc_object_find( p_libvlc, VLC_OBJECT_INPUT, FIND_CHILD ); - - if( !p_input ) - { - if( i_object ) vlc_object_release( p_libvlc ); - return VLC_ENOOBJ; - } - - if( b_relative ) - { - val.i_time = i_seconds; - val.i_time = val.i_time * 1000000L; - var_Set( p_input, "time-offset", val ); - } - else - { - val.i_time = i_seconds; - val.i_time = val.i_time * 1000000L; - var_Set( p_input, "time", val ); - } - vlc_object_release( p_input ); - - if( i_object ) vlc_object_release( p_libvlc ); - return VLC_SUCCESS; -} - -/** - * Get the total length of a input - * - * Return the total length in seconds from the current input. - * \note For some inputs, this will be unknown. - * - * \param i_object a vlc object id - * \return the length in seconds - */ -int VLC_LengthGet( int i_object ) -{ - input_thread_t *p_input; - vlc_value_t val; - libvlc_int_t *p_libvlc = vlc_current_object( i_object ); - - /* Check that the handle is valid */ - if( !p_libvlc ) - { - return VLC_ENOOBJ; - } - - p_input = vlc_object_find( p_libvlc, VLC_OBJECT_INPUT, FIND_CHILD ); - - if( !p_input ) - { - if( i_object ) vlc_object_release( p_libvlc ); - return VLC_ENOOBJ; - } - - var_Get( p_input, "length", &val ); - vlc_object_release( p_input ); - - if( i_object ) vlc_object_release( p_libvlc ); - return val.i_time / 1000000L; -} - -/** - * Play the input faster than realtime - * - * 2x, 4x, 8x faster than realtime - * \note For some inputs, this will be impossible. - * - * \param i_object a vlc object id - * \return the current speedrate - */ -float VLC_SpeedFaster( int i_object ) -{ - input_thread_t *p_input; - vlc_value_t val; - libvlc_int_t *p_libvlc = vlc_current_object( i_object ); - - /* Check that the handle is valid */ - if( !p_libvlc ) - { - return VLC_ENOOBJ; - } - - p_input = vlc_object_find( p_libvlc, VLC_OBJECT_INPUT, FIND_CHILD ); - - if( !p_input ) - { - if( i_object ) vlc_object_release( p_libvlc ); - return VLC_ENOOBJ; - } - - val.b_bool = VLC_TRUE; - var_Set( p_input, "rate-faster", val ); - var_Get( p_input, "rate", &val ); - vlc_object_release( p_input ); - - if( i_object ) vlc_object_release( p_libvlc ); - return val.f_float / INPUT_RATE_DEFAULT; -} - -/** - * Play the input slower than realtime - * - * 1/2x, 1/4x, 1/8x slower than realtime - * \note For some inputs, this will be impossible. - * - * \param i_object a vlc object id - * \return the current speedrate - */ -float VLC_SpeedSlower( int i_object ) -{ - input_thread_t *p_input; - vlc_value_t val; - libvlc_int_t *p_libvlc = vlc_current_object( i_object ); - - /* Check that the handle is valid */ - if( !p_libvlc ) - { - return VLC_ENOOBJ; - } - - p_input = vlc_object_find( p_libvlc, VLC_OBJECT_INPUT, FIND_CHILD ); - - if( !p_input ) - { - if( i_object ) vlc_object_release( p_libvlc ); - return VLC_ENOOBJ; - } - - val.b_bool = VLC_TRUE; - var_Set( p_input, "rate-slower", val ); - var_Get( p_input, "rate", &val ); - vlc_object_release( p_input ); - - if( i_object ) vlc_object_release( p_libvlc ); - return val.f_float / INPUT_RATE_DEFAULT; -} - -/** - * Return the current playlist item - * - * Returns the index of the playlistitem that is currently selected for play. - * This is valid even if nothing is currently playing. - * - * \param i_object a vlc object id - * \return the current index - */ -int VLC_PlaylistIndex( int i_object ) -{ - printf( "This function is deprecated and should not be used anymore" ); - return -1; -} - -/** - * Total amount of items in the playlist - * - * \param i_object a vlc object id - * \return amount of playlist items - */ -int VLC_PlaylistNumberOfItems( int i_object ) -{ - int i_size; - playlist_t * p_playlist; - libvlc_int_t *p_libvlc = vlc_current_object( i_object ); - - /* Check that the handle is valid */ - if( !p_libvlc ) - { - return VLC_ENOOBJ; - } - - p_playlist = vlc_object_find( p_libvlc, VLC_OBJECT_PLAYLIST, FIND_CHILD ); - - if( !p_playlist ) - { - if( i_object ) vlc_object_release( p_libvlc ); - return VLC_ENOOBJ; - } - - i_size = p_playlist->i_size; - vlc_object_release( p_playlist ); + var_Create( p_libvlc, "drawable-clip-right", VLC_VAR_INTEGER ); - if( i_object ) vlc_object_release( p_libvlc ); - return i_size; -} + /* Create volume callback system. */ + var_Create( p_libvlc, "volume-change", VLC_VAR_BOOL ); -/** - * Next playlist item - * - * Skip to the next playlistitem and play it. - * - * \param i_object a vlc object id - * \return VLC_SUCCESS on success - */ -int VLC_PlaylistNext( int i_object ) -{ - playlist_t * p_playlist; - libvlc_int_t *p_libvlc = vlc_current_object( i_object ); + /* 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 ); - /* Check that the handle is valid */ - if( !p_libvlc ) - { - return VLC_ENOOBJ; - } + var_Create( p_libvlc, "intf-popupmenu", VLC_VAR_BOOL ); - p_playlist = vlc_object_find( p_libvlc, VLC_OBJECT_PLAYLIST, FIND_CHILD ); + /* + * Get input filenames given as commandline arguments + */ + GetFilenames( p_libvlc, i_argc, ppsz_argv ); - if( !p_playlist ) + /* + * Get --open argument + */ + var_Create( p_libvlc, "open", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + var_Get( p_libvlc, "open", &val ); + if ( val.psz_string != NULL && *val.psz_string ) { - if( i_object ) vlc_object_release( p_libvlc ); - return VLC_ENOOBJ; + playlist_t *p_playlist = pl_Yield( p_libvlc ); + playlist_AddExt( p_playlist, val.psz_string, NULL, PLAYLIST_INSERT, 0, + -1, NULL, 0, true, pl_Unlocked ); + pl_Release( p_libvlc ); } + free( val.psz_string ); - playlist_Next( p_playlist ); - vlc_object_release( p_playlist ); - - if( i_object ) vlc_object_release( p_libvlc ); return VLC_SUCCESS; } /** - * Previous playlist item - * - * Skip to the previous playlistitem and play it. - * - * \param i_object a vlc object id - * \return VLC_SUCCESS on success + * Cleanup a libvlc instance. The instance is not completely deallocated + * \param p_libvlc the instance to clean */ -int VLC_PlaylistPrev( int i_object ) +int libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) { - playlist_t * p_playlist; - libvlc_int_t *p_libvlc = vlc_current_object( i_object ); + intf_thread_t * p_intf = NULL; + libvlc_priv_t *priv = libvlc_priv (p_libvlc); - /* Check that the handle is valid */ - if( !p_libvlc ) + /* Ask the interfaces to stop and destroy them */ + msg_Dbg( p_libvlc, "removing all interfaces" ); + while( (p_intf = vlc_object_find( p_libvlc, VLC_OBJECT_INTF, FIND_CHILD )) ) { - return VLC_ENOOBJ; + intf_StopThread( p_intf ); + vlc_object_detach( p_intf ); + vlc_object_release( p_intf ); /* for intf_Create() */ + vlc_object_release( p_intf ); /* for vlc_object_find() */ } - p_playlist = vlc_object_find( p_libvlc, VLC_OBJECT_PLAYLIST, FIND_CHILD ); - - if( !p_playlist ) +#ifdef ENABLE_VLM + /* Destroy VLM if created in libvlc_InternalInit */ + if( priv->p_vlm ) { - if( i_object ) vlc_object_release( p_libvlc ); - return VLC_ENOOBJ; + vlm_Delete( priv->p_vlm ); } +#endif - playlist_Prev( p_playlist ); + 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" ); + priv->p_playlist = NULL; + vlc_object_kill( p_playlist ); /* <-- memory barrier for pl_Yield() */ + vlc_thread_join( p_playlist ); vlc_object_release( p_playlist ); - if( i_object ) vlc_object_release( p_libvlc ); - return VLC_SUCCESS; -} + /* 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); -/***************************************************************************** - * VLC_PlaylistClear: Empty the playlist - *****************************************************************************/ -int VLC_PlaylistClear( int i_object ) -{ - playlist_t * p_playlist; - libvlc_int_t *p_libvlc = vlc_current_object( i_object ); + stats_TimersDumpAll( p_libvlc ); + stats_TimersCleanAll( p_libvlc ); - /* Check that the handle is valid */ - if( !p_libvlc ) +#ifdef ENABLE_SOUT + announce_handler_t * p_announce; + + /* Free announce handler(s?) */ + while( (p_announce = vlc_object_find( p_libvlc, VLC_OBJECT_ANNOUNCE, + FIND_CHILD ) ) ) { - return VLC_ENOOBJ; + msg_Dbg( p_libvlc, "removing announce handler" ); + vlc_object_detach( p_announce ); + vlc_object_release( p_announce ); + announce_HandlerDestroy( p_announce ); } +#endif - p_playlist = vlc_object_find( p_libvlc, VLC_OBJECT_PLAYLIST, FIND_CHILD ); - - if( !p_playlist ) + /* 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) { - if( i_object ) vlc_object_release( p_libvlc ); - return VLC_ENOOBJ; + 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); - playlist_Clear( p_playlist ); + 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", + p_del, p_del->i_gc_refcount, p_del->psz_name ? p_del->psz_name : "(null)" ); + b_clean = false; + FOREACH_END(); + assert( b_clean ); + ARRAY_RESET( priv->input_items ); - vlc_object_release( p_playlist ); + msg_Dbg( p_libvlc, "removing stats" ); + vlc_mutex_destroy( &p_libvlc->p_stats->lock ); + FREENULL( p_libvlc->p_stats ); - if( i_object ) vlc_object_release( p_libvlc ); return VLC_SUCCESS; } /** - * Change the volume - * - * \param i_object a vlc object id - * \param i_volume something in a range from 0-200 - * \return the new volume (range 0-200 %) + * 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 VLC_VolumeSet( int i_object, int i_volume ) +int libvlc_InternalDestroy( libvlc_int_t *p_libvlc ) { - audio_volume_t i_vol = 0; - libvlc_int_t *p_libvlc = vlc_current_object( i_object ); - - /* Check that the handle is valid */ if( !p_libvlc ) - { - return VLC_ENOOBJ; - } - - if( i_volume >= 0 && i_volume <= 200 ) - { - i_vol = i_volume * AOUT_VOLUME_MAX / 200; - aout_VolumeSet( p_libvlc, i_vol ); - } + return VLC_EGENERIC; - if( i_object ) vlc_object_release( p_libvlc ); - return i_vol * 200 / AOUT_VOLUME_MAX; -} + libvlc_priv_t *priv = libvlc_priv (p_libvlc); -/** - * Get the current volume - * - * Retrieve the current volume. - * - * \param i_object a vlc object id - * \return the current volume (range 0-200 %) - */ -int VLC_VolumeGet( int i_object ) -{ - audio_volume_t i_volume; - libvlc_int_t *p_libvlc = vlc_current_object( i_object ); +#ifndef WIN32 + char* psz_pidfile = NULL; - /* Check that the handle is valid */ - if( !p_libvlc ) + if( b_daemon ) { - return VLC_ENOOBJ; + psz_pidfile = config_GetPsz( p_libvlc, "pidfile" ); + if( psz_pidfile != NULL ) + { + msg_Dbg( p_libvlc, "removing pid file %s", psz_pidfile ); + if( unlink( psz_pidfile ) == -1 ) + { + msg_Dbg( p_libvlc, "removing pid file %s: %m", + psz_pidfile ); + } + } + free( psz_pidfile ); } +#endif - aout_VolumeGet( p_libvlc, &i_volume ); - - if( i_object ) vlc_object_release( p_libvlc ); - return i_volume*200/AOUT_VOLUME_MAX; -} - -/** - * Mute/Unmute the volume - * - * \param i_object a vlc object id - * \return VLC_SUCCESS on success - */ -int VLC_VolumeMute( int i_object ) -{ - libvlc_int_t *p_libvlc = vlc_current_object( i_object ); - - /* Check that the handle is valid */ - if( !p_libvlc ) + if( priv->p_memcpy_module ) { - return VLC_ENOOBJ; + module_Unneed( p_libvlc, priv->p_memcpy_module ); + priv->p_memcpy_module = NULL; } - aout_VolumeMute( p_libvlc, NULL ); + /* Free module bank. It is refcounted, so we call this each time */ + module_EndBank( p_libvlc ); - if( i_object ) vlc_object_release( p_libvlc ); - return VLC_SUCCESS; -} + FREENULL( priv->psz_configfile ); + var_DelCallback( p_libvlc, "key-pressed", vlc_key_to_action, + p_libvlc->p_hotkeys ); + FREENULL( p_libvlc->p_hotkeys ); -/***************************************************************************** - * VLC_FullScreen: toggle fullscreen mode - *****************************************************************************/ -int VLC_FullScreen( int i_object ) -{ - vout_thread_t *p_vout; - libvlc_int_t *p_libvlc = vlc_current_object( i_object ); + vlc_mutex_t *lock = var_AcquireMutex( "libvlc" ); + i_instances--; - if( !p_libvlc ) + if( i_instances == 0 ) { - return VLC_ENOOBJ; + /* System specific cleaning code */ + system_End( p_libvlc ); } + vlc_mutex_unlock( lock ); - p_vout = vlc_object_find( p_libvlc, VLC_OBJECT_VOUT, FIND_CHILD ); + msg_Flush( p_libvlc ); + msg_Destroy( p_libvlc ); - if( !p_vout ) - { - if( i_object ) vlc_object_release( p_libvlc ); - return VLC_ENOOBJ; - } + /* 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); + + vlc_object_release( p_libvlc ); + p_libvlc = NULL; - p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE; - vlc_object_release( p_vout ); + /* Stop thread system: last one out please shut the door! + * The number of initializations of the thread system is counted, we + * can call this each time */ + vlc_threads_end (); - if( i_object ) vlc_object_release( p_libvlc ); return VLC_SUCCESS; } -/* following functions are local */ - - -static int AddIntfInternal( int i_object, char const *psz_module, - vlc_bool_t b_block, vlc_bool_t b_play, - int i_options, char **ppsz_options ) +/** + * Add an interface plugin and run it + */ +int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, char const *psz_module ) { int i_err; - intf_thread_t *p_intf; - libvlc_int_t *p_libvlc = vlc_current_object( i_object ); + intf_thread_t *p_intf = NULL; if( !p_libvlc ) - { - return VLC_ENOOBJ; - } + return VLC_EGENERIC; -#ifndef WIN32 - if( p_libvlc->p_libvlc_global->b_daemon && b_block && !psz_module ) + if( !psz_module ) /* requesting the default interface */ { - /* Daemon mode hack. - * We prefer the dummy interface if none is specified. */ char *psz_interface = config_GetPsz( p_libvlc, "intf" ); - if( !psz_interface || !*psz_interface ) psz_module = "dummy"; - if( psz_interface ) free( psz_interface ); - } + if( !psz_interface || !*psz_interface ) /* "intf" has not been set */ + { +#ifndef WIN32 + if( b_daemon ) + /* Daemon mode hack. + * We prefer the dummy interface if none is specified. */ + psz_module = "dummy"; + else #endif + msg_Info( p_libvlc, _("Running vlc with the default interface. Use 'cvlc' to use vlc without interface.") ); + } + free( psz_interface ); + } /* Try to create the interface */ - p_intf = intf_Create( p_libvlc, psz_module ? psz_module : "$intf", - i_options, ppsz_options ); - + p_intf = intf_Create( p_libvlc, psz_module ? psz_module : "$intf" ); if( p_intf == NULL ) { - msg_Err( p_libvlc, "interface \"%s\" initialization failed", psz_module ); - if( i_object ) vlc_object_release( p_libvlc ); + msg_Err( p_libvlc, "interface \"%s\" initialization failed", + psz_module ); return VLC_EGENERIC; } - /* Interface doesn't handle play on start so do it ourselves */ - if( !p_intf->b_play && b_play ) VLC_Play( i_object ); - /* Try to run the interface */ - p_intf->b_play = b_play; - p_intf->b_block = b_block; i_err = intf_RunThread( p_intf ); if( i_err ) { vlc_object_detach( p_intf ); - intf_Destroy( p_intf ); - if( i_object ) vlc_object_release( p_libvlc ); + vlc_object_release( p_intf ); return i_err; } - if( i_object ) vlc_object_release( p_libvlc ); return VLC_SUCCESS; }; - +#if defined( ENABLE_NLS ) && (defined (__APPLE__) || defined (WIN32)) && \ + ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) ) /***************************************************************************** * SetLanguage: set the interface language. ***************************************************************************** @@ -1958,61 +1194,67 @@ static int AddIntfInternal( int i_object, char const *psz_module, * as well as the LC_CTYPE category for string sorting and possible wide * character support. *****************************************************************************/ -static void SetLanguage ( char const *psz_lang ) +static void SetLanguage ( const char *psz_lang ) { -#if defined( ENABLE_NLS ) \ - && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) ) +#ifdef __APPLE__ + /* I need that under Darwin, please check it doesn't disturb + * other platforms. --Meuuh */ + setenv( "LANG", psz_lang, 1 ); - char * psz_path; -#if defined( __APPLE__ ) || defined ( WIN32 ) || defined( SYS_BEOS ) - char psz_tmp[1024]; +#else + /* We set LC_ALL manually because it is the only way to set + * the language at runtime under eg. Windows. Beware that this + * makes the environment unconsistent when libvlc is unloaded and + * should probably be moved to a safer place like vlc.c. */ + setenv( "LC_ALL", psz_lang, 1 ); #endif - if( psz_lang && !*psz_lang ) - { -# if defined( HAVE_LC_MESSAGES ) - setlocale( LC_MESSAGES, psz_lang ); -# endif - setlocale( LC_CTYPE, psz_lang ); - } - else if( psz_lang ) - { -#ifdef __APPLE__ - /* I need that under Darwin, please check it doesn't disturb - * other platforms. --Meuuh */ - setenv( "LANG", psz_lang, 1 ); - -#elif defined( SYS_BEOS ) || defined( WIN32 ) - /* We set LC_ALL manually because it is the only way to set - * the language at runtime under eg. Windows. Beware that this - * makes the environment unconsistent when libvlc is unloaded and - * should probably be moved to a safer place like vlc.c. */ - static char psz_lcall[20]; - snprintf( psz_lcall, 19, "LC_ALL=%s", psz_lang ); - psz_lcall[19] = '\0'; - putenv( psz_lcall ); + setlocale( LC_ALL, psz_lang ); +} #endif - setlocale( LC_ALL, psz_lang ); - } +static inline int LoadMessages (void) +{ +#if defined( ENABLE_NLS ) \ + && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) ) /* Specify where to find the locales for current domain */ #if !defined( __APPLE__ ) && !defined( WIN32 ) && !defined( SYS_BEOS ) - psz_path = LOCALEDIR; + static const char psz_path[] = LOCALEDIR; #else - snprintf( psz_tmp, sizeof(psz_tmp), "%s/%s", libvlc_global.psz_vlcpath, - "locale" ); - psz_path = psz_tmp; + char psz_path[1024]; + if (snprintf (psz_path, sizeof (psz_path), "%s" DIR_SEP "%s", + config_GetDataDir(), "locale") + >= (int)sizeof (psz_path)) + return -1; + #endif - if( !bindtextdomain( PACKAGE_NAME, psz_path ) ) + if (bindtextdomain (PACKAGE_NAME, psz_path) == NULL) + { + fprintf (stderr, "Warning: cannot bind text domain "PACKAGE_NAME + " to directory %s\n", psz_path); + return -1; + } + + /* LibVLC wants all messages in UTF-8. + * Unfortunately, we cannot ask UTF-8 for strerror_r(), strsignal_r() + * and other functions that are not part of our text domain. + */ + if (bind_textdomain_codeset (PACKAGE_NAME, "UTF-8") == NULL) { - fprintf( stderr, "warning: couldn't bind domain %s in directory %s\n", - PACKAGE_NAME, psz_path ); + fprintf (stderr, "Error: cannot set Unicode encoding for text domain " + PACKAGE_NAME"\n"); + // Unbinds the text domain to avoid broken encoding + bindtextdomain (PACKAGE_NAME, "DOES_NOT_EXIST"); + return -1; } - /* Set the default domain */ - bind_textdomain_codeset( PACKAGE_NAME, "UTF-8" ); + /* LibVLC does NOT set the default textdomain, since it is a library. + * This could otherwise break programs using LibVLC (other than VLC). + * textdomain (PACKAGE_NAME); + */ #endif + return 0; } /***************************************************************************** @@ -2021,7 +1263,7 @@ static void SetLanguage ( char const *psz_lang ) * Parse command line for input files as well as their associated options. * An option always follows its associated input and begins with a ":". *****************************************************************************/ -static int GetFilenames( libvlc_int_t *p_vlc, int i_argc, char *ppsz_argv[] ) +static int GetFilenames( libvlc_int_t *p_vlc, int i_argc, const char *ppsz_argv[] ) { int i_opt, i_options; @@ -2029,7 +1271,6 @@ static int GetFilenames( libvlc_int_t *p_vlc, int i_argc, char *ppsz_argv[] ) * and their input options */ for( i_opt = i_argc - 1; i_opt >= optind; i_opt-- ) { - const char *psz_target; i_options = 0; /* Count the input options */ @@ -2041,13 +1282,12 @@ static int GetFilenames( libvlc_int_t *p_vlc, int i_argc, char *ppsz_argv[] ) /* TODO: write an internal function of this one, to avoid * unnecessary lookups. */ - /* FIXME: should we convert options to UTF-8 as well ?? */ - psz_target = FromLocale( ppsz_argv[ i_opt ] ); - VLC_AddTarget( p_vlc->i_object_id, psz_target, - (char const **)( i_options ? &ppsz_argv[i_opt + 1] : - NULL ), i_options, - PLAYLIST_INSERT, 0 ); - LocaleFree( psz_target ); + + playlist_t *p_playlist = pl_Yield( 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 ); + pl_Release( p_vlc ); } return VLC_SUCCESS; @@ -2058,21 +1298,34 @@ static int GetFilenames( libvlc_int_t *p_vlc, int i_argc, char *ppsz_argv[] ) ***************************************************************************** * Print a short inline help. Message interface is initialized at this stage. *****************************************************************************/ +static inline void print_help_on_full_help( void ) +{ + utf8_fprintf( stdout, "\n" ); + utf8_fprintf( stdout, "%s\n", _("To get exhaustive help, use '-H'.") ); +} + static void Help( libvlc_int_t *p_this, char const *psz_help_name ) { #ifdef WIN32 - ShowConsole( VLC_TRUE ); + ShowConsole( true ); #endif if( psz_help_name && !strcmp( psz_help_name, "help" ) ) { - utf8_fprintf( stdout, VLC_USAGE, p_this->psz_object_name ); + utf8_fprintf( stdout, vlc_usage, p_this->psz_object_name ); Usage( p_this, "help" ); Usage( p_this, "main" ); + print_help_on_full_help(); } else if( psz_help_name && !strcmp( psz_help_name, "longhelp" ) ) { - utf8_fprintf( stdout, VLC_USAGE, p_this->psz_object_name ); + utf8_fprintf( stdout, vlc_usage, p_this->psz_object_name ); + Usage( p_this, NULL ); + print_help_on_full_help(); + } + else if( psz_help_name && !strcmp( psz_help_name, "full-help" ) ) + { + utf8_fprintf( stdout, vlc_usage, p_this->psz_object_name ); Usage( p_this, NULL ); } else if( psz_help_name ) @@ -2090,56 +1343,124 @@ static void Help( libvlc_int_t *p_this, char const *psz_help_name ) ***************************************************************************** * Print a short inline help. Message interface is initialized at this stage. *****************************************************************************/ +# define COL(x) "\033[" #x ";1m" +# define RED COL(31) +# define GREEN COL(32) +# define YELLOW COL(33) +# define BLUE COL(34) +# define MAGENTA COL(35) +# define CYAN COL(36) +# define WHITE COL(0) +# define GRAY "\033[0m" +static void print_help_section( module_config_t *p_item, bool b_color, bool b_description ) +{ + if( !p_item ) return; + if( b_color ) + { + utf8_fprintf( stdout, RED" %s:\n"GRAY, + p_item->psz_text ); + if( b_description && p_item->psz_longtext ) + utf8_fprintf( stdout, MAGENTA" %s\n"GRAY, + p_item->psz_longtext ); + } + else + { + utf8_fprintf( stdout, " %s:\n", p_item->psz_text ); + if( b_description && p_item->psz_longtext ) + utf8_fprintf( stdout, " %s\n", p_item->psz_longtext ); + } +} + static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) { #define FORMAT_STRING " %s --%s%s%s%s%s%s%s " - /* short option ------' | | | | | | | - * option name ------------' | | | | | | - * -----------------------------' | | | - * padding spaces ---------------------' | | - * comment -------------------------------' | - * comment suffix --------------------------' + /* short option ------' | | | | | | | + * option name ------------' | | | | | | + * -------------------------' | | | + * padding spaces -----------------' | | + * comment --------------------------' | + * comment suffix ---------------------' * * The purpose of having bra and ket is that we might i18n them as well. */ + +#define COLOR_FORMAT_STRING (WHITE" %s --%s"YELLOW"%s%s%s%s%s%s "GRAY) +#define COLOR_FORMAT_STRING_BOOL (WHITE" %s --%s%s%s%s%s%s%s "GRAY) + #define LINE_START 8 #define PADDING_SPACES 25 - vlc_list_t *p_list; - module_t *p_parser; - module_config_t *p_item; +#ifdef WIN32 +# define OPTION_VALUE_SEP "=" +#else +# define OPTION_VALUE_SEP " " +#endif + vlc_list_t *p_list = NULL; char psz_spaces_text[PADDING_SPACES+LINE_START+1]; char psz_spaces_longtext[LINE_START+3]; - char psz_format[sizeof(FORMAT_STRING)]; + char psz_format[sizeof(COLOR_FORMAT_STRING)]; + char psz_format_bool[sizeof(COLOR_FORMAT_STRING_BOOL)]; char psz_buffer[10000]; char psz_short[4]; int i_index; int i_width = ConsoleWidth() - (PADDING_SPACES+LINE_START+1); - vlc_bool_t b_advanced = config_GetInt( p_this, "advanced" ); - vlc_bool_t b_description; + int i_width_description = i_width + PADDING_SPACES - 1; + bool b_advanced = config_GetInt( p_this, "advanced" ) > 0; + bool b_description = config_GetInt( p_this, "help-verbose" ) > 0; + bool b_description_hack; + bool b_color = config_GetInt( p_this, "color" ) > 0; + bool b_has_advanced = false; memset( psz_spaces_text, ' ', PADDING_SPACES+LINE_START ); psz_spaces_text[PADDING_SPACES+LINE_START] = '\0'; memset( psz_spaces_longtext, ' ', LINE_START+2 ); psz_spaces_longtext[LINE_START+2] = '\0'; +#ifndef WIN32 + if( !isatty( 1 ) ) +#endif + b_color = false; // don't put color control codes in a .txt file - strcpy( psz_format, FORMAT_STRING ); + if( b_color ) + { + strcpy( psz_format, COLOR_FORMAT_STRING ); + strcpy( psz_format_bool, COLOR_FORMAT_STRING_BOOL ); + } + else + { + strcpy( psz_format, FORMAT_STRING ); + strcpy( psz_format_bool, FORMAT_STRING ); + } /* List all modules */ p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE ); + /* Ugly hack to make sure that the help options always come first + * (part 1) */ + if( !psz_module_name ) + Usage( p_this, "help" ); + /* Enumerate the config for each module */ for( i_index = 0; i_index < p_list->i_count; i_index++ ) { - vlc_bool_t b_help_module; - - p_parser = (module_t *)p_list->p_values[i_index].p_object ; + bool b_help_module; + module_t *p_parser = (module_t *)p_list->p_values[i_index].p_object; + module_config_t *p_item = NULL; + module_config_t *p_section = NULL; + module_config_t *p_end = p_parser->p_config + p_parser->confsize; if( psz_module_name && strcmp( psz_module_name, p_parser->psz_object_name ) ) { - continue; + char *const *pp_shortcut = p_parser->pp_shortcuts; + while( *pp_shortcut ) + { + if( !strcmp( psz_module_name, *pp_shortcut ) ) + break; + pp_shortcut ++; + } + if( !*pp_shortcut ) + continue; } /* Ignore modules without config options */ @@ -2148,43 +1469,61 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) continue; } + b_help_module = !strcmp( "help", p_parser->psz_object_name ); + /* Ugly hack to make sure that the help options always come first + * (part 2) */ + if( !psz_module_name && b_help_module ) + continue; + /* Ignore modules with only advanced config options if requested */ if( !b_advanced ) { for( p_item = p_parser->p_config; - p_item->i_type != CONFIG_HINT_END; + p_item < p_end; p_item++ ) { if( (p_item->i_type & CONFIG_ITEM) && !p_item->b_advanced ) break; } - if( p_item->i_type == CONFIG_HINT_END ) continue; } /* Print name of module */ if( strcmp( "main", p_parser->psz_object_name ) ) - utf8_fprintf( stdout, "\n %s\n", p_parser->psz_longname ); - - b_help_module = !strcmp( "help", p_parser->psz_object_name ); + { + if( b_color ) + utf8_fprintf( stdout, "\n " GREEN "%s" GRAY "\n", + p_parser->psz_longname ); + else + utf8_fprintf( stdout, "\n %s\n", p_parser->psz_longname ); + } + if( p_parser->psz_help ) + { + if( b_color ) + utf8_fprintf( stdout, CYAN" %s\n"GRAY, p_parser->psz_help ); + else + utf8_fprintf( stdout, " %s\n", p_parser->psz_help ); + } /* Print module options */ for( p_item = p_parser->p_config; - p_item->i_type != CONFIG_HINT_END; + p_item < p_end; p_item++ ) { char *psz_text, *psz_spaces = psz_spaces_text; - char *psz_bra = NULL, *psz_type = NULL, *psz_ket = NULL; - char *psz_suf = "", *psz_prefix = NULL; + const char *psz_bra = NULL, *psz_type = NULL, *psz_ket = NULL; + const char *psz_suf = "", *psz_prefix = NULL; signed int i; + size_t i_cur_width; - /* Skip deprecated options */ - if( p_item->psz_current ) + /* Skip removed options */ + if( p_item->b_removed ) { continue; } /* Skip advanced options if requested */ if( p_item->b_advanced && !b_advanced ) { + b_has_advanced = true; continue; } @@ -2193,7 +1532,28 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) case CONFIG_HINT_CATEGORY: case CONFIG_HINT_USAGE: if( !strcmp( "main", p_parser->psz_object_name ) ) - utf8_fprintf( stdout, "\n %s\n", p_item->psz_text ); + { + if( b_color ) + utf8_fprintf( stdout, GREEN "\n %s\n" GRAY, + p_item->psz_text ); + else + utf8_fprintf( stdout, "\n %s\n", p_item->psz_text ); + } + if( b_description && p_item->psz_longtext ) + { + if( b_color ) + utf8_fprintf( stdout, CYAN " %s\n" GRAY, + p_item->psz_longtext ); + else + utf8_fprintf( stdout, " %s\n", p_item->psz_longtext ); + } + break; + + case CONFIG_HINT_SUBCATEGORY: + if( strcmp( "main", p_parser->psz_object_name ) ) + break; + case CONFIG_SECTION: + p_section = p_item; break; case CONFIG_ITEM_STRING: @@ -2203,34 +1563,51 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) case CONFIG_ITEM_MODULE_CAT: case CONFIG_ITEM_MODULE_LIST: case CONFIG_ITEM_MODULE_LIST_CAT: - psz_bra = " <"; psz_type = _("string"); psz_ket = ">"; + case CONFIG_ITEM_FONT: + case CONFIG_ITEM_PASSWORD: + print_help_section( p_section, b_color, b_description ); + p_section = NULL; + psz_bra = OPTION_VALUE_SEP "<"; + psz_type = _("string"); + psz_ket = ">"; if( p_item->ppsz_list ) { - psz_bra = " {"; + psz_bra = OPTION_VALUE_SEP "{"; psz_type = psz_buffer; - psz_type[0] = '\0'; + psz_buffer[0] = '\0'; for( i = 0; p_item->ppsz_list[i]; i++ ) { - if( i ) strcat( psz_type, "," ); - strcat( psz_type, p_item->ppsz_list[i] ); + if( i ) strcat( psz_buffer, "," ); + strcat( psz_buffer, p_item->ppsz_list[i] ); } psz_ket = "}"; } break; case CONFIG_ITEM_INTEGER: case CONFIG_ITEM_KEY: /* FIXME: do something a bit more clever */ - psz_bra = " <"; psz_type = _("integer"); psz_ket = ">"; + print_help_section( p_section, b_color, b_description ); + p_section = NULL; + psz_bra = OPTION_VALUE_SEP "<"; + psz_type = _("integer"); + psz_ket = ">"; + + if( p_item->min.i || p_item->max.i ) + { + sprintf( psz_buffer, "%s [%i .. %i]", psz_type, + p_item->min.i, p_item->max.i ); + psz_type = psz_buffer; + } if( p_item->i_list ) { - psz_bra = " {"; + psz_bra = OPTION_VALUE_SEP "{"; psz_type = psz_buffer; - psz_type[0] = '\0'; + psz_buffer[0] = '\0'; for( i = 0; p_item->ppsz_list_text[i]; i++ ) { - if( i ) strcat( psz_type, ", " ); - sprintf( psz_type + strlen(psz_type), "%i (%s)", + if( i ) strcat( psz_buffer, ", " ); + sprintf( psz_buffer + strlen(psz_buffer), "%i (%s)", p_item->pi_list[i], p_item->ppsz_list_text[i] ); } @@ -2238,13 +1615,25 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) } break; case CONFIG_ITEM_FLOAT: - psz_bra = " <"; psz_type = _("float"); psz_ket = ">"; + print_help_section( p_section, b_color, b_description ); + p_section = NULL; + psz_bra = OPTION_VALUE_SEP "<"; + psz_type = _("float"); + psz_ket = ">"; + if( p_item->min.f || p_item->max.f ) + { + sprintf( psz_buffer, "%s [%f .. %f]", psz_type, + p_item->min.f, p_item->max.f ); + psz_type = psz_buffer; + } break; case CONFIG_ITEM_BOOL: + print_help_section( p_section, b_color, b_description ); + p_section = NULL; psz_bra = ""; psz_type = ""; psz_ket = ""; if( !b_help_module ) { - psz_suf = p_item->i_value ? _(" (default enabled)") : + psz_suf = p_item->value.i ? _(" (default enabled)") : _(" (default disabled)"); } break; @@ -2287,9 +1676,9 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) if( p_item->i_type == CONFIG_ITEM_BOOL && !b_help_module ) { - utf8_fprintf( stdout, psz_format, psz_short, p_item->psz_name, - psz_prefix, p_item->psz_name, psz_bra, psz_type, - psz_ket, psz_spaces ); + utf8_fprintf( stdout, psz_format_bool, psz_short, + p_item->psz_name, psz_prefix, p_item->psz_name, + psz_bra, psz_type, psz_ket, psz_spaces ); } else { @@ -2301,19 +1690,32 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) /* We wrap the rest of the output */ sprintf( psz_buffer, "%s%s", p_item->psz_text, psz_suf ); - b_description = config_GetInt( p_this, "help-verbose" ); + b_description_hack = b_description; description: psz_text = psz_buffer; + i_cur_width = b_description && !b_description_hack + ? i_width_description + : i_width; while( *psz_text ) { char *psz_parser, *psz_word; size_t i_end = strlen( psz_text ); /* If the remaining text fits in a line, print it. */ - if( i_end <= (size_t)i_width ) + if( i_end <= i_cur_width ) { - utf8_fprintf( stdout, "%s\n", psz_text ); + if( b_color ) + { + if( !b_description || b_description_hack ) + utf8_fprintf( stdout, BLUE"%s\n"GRAY, psz_text ); + else + utf8_fprintf( stdout, "%s\n", psz_text ); + } + else + { + utf8_fprintf( stdout, "%s\n", psz_text ); + } break; } @@ -2328,7 +1730,7 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) psz_parser = psz_parser ? psz_parser + 1 : psz_text + i_end; - } while( psz_parser - psz_text <= i_width ); + } while( (size_t)(psz_parser - psz_text) <= i_cur_width ); /* We cut a word in one of these cases: * - it's the only word in the line and it's too long. @@ -2336,27 +1738,51 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) * going to wrap is longer than 40% of the width, and even * if the word would have fit in the next line. */ if( psz_word == psz_text - || ( psz_word - psz_text < 80 * i_width / 100 - && psz_parser - psz_word > 40 * i_width / 100 ) ) + || ( (size_t)(psz_word - psz_text) < 80 * i_cur_width / 100 + && (size_t)(psz_parser - psz_word) > 40 * i_cur_width / 100 ) ) { - char c = psz_text[i_width]; - psz_text[i_width] = '\0'; - utf8_fprintf( stdout, "%s\n%s", psz_text, psz_spaces ); - psz_text += i_width; + char c = psz_text[i_cur_width]; + psz_text[i_cur_width] = '\0'; + if( b_color ) + { + if( !b_description || b_description_hack ) + utf8_fprintf( stdout, BLUE"%s\n%s"GRAY, + psz_text, psz_spaces ); + else + utf8_fprintf( stdout, "%s\n%s", + psz_text, psz_spaces ); + } + else + { + utf8_fprintf( stdout, "%s\n%s", psz_text, psz_spaces ); + } + psz_text += i_cur_width; psz_text[0] = c; } else { psz_word[-1] = '\0'; - utf8_fprintf( stdout, "%s\n%s", psz_text, psz_spaces ); + if( b_color ) + { + if( !b_description || b_description_hack ) + utf8_fprintf( stdout, BLUE"%s\n%s"GRAY, + psz_text, psz_spaces ); + else + utf8_fprintf( stdout, "%s\n%s", + psz_text, psz_spaces ); + } + else + { + utf8_fprintf( stdout, "%s\n%s", psz_text, psz_spaces ); + } psz_text = psz_word; } } - if( b_description && p_item->psz_longtext ) + if( b_description_hack && p_item->psz_longtext ) { sprintf( psz_buffer, "%s%s", p_item->psz_longtext, psz_suf ); - b_description = VLC_FALSE; + b_description_hack = false; psz_spaces = psz_spaces_longtext; utf8_fprintf( stdout, "%s", psz_spaces ); goto description; @@ -2364,6 +1790,16 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) } } + if( b_has_advanced ) + { + if( b_color ) + utf8_fprintf( stdout, "\n" WHITE "%s" GRAY " %s\n", _( "Note:" ), + _( "add --advanced to your command line to see advanced options.")); + else + utf8_fprintf( stdout, "\n %s %s\n", _( "Note:" ), + _( "add --advanced to your command line to see advanced options.")); + } + /* Release the module list */ vlc_list_release( p_list ); } @@ -2374,17 +1810,19 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) * Print a list of all available modules (builtins and plugins) and a short * description for each one. *****************************************************************************/ -static void ListModules( libvlc_int_t *p_this ) +static void ListModules( libvlc_int_t *p_this, bool b_verbose ) { - vlc_list_t *p_list; - module_t *p_parser; + vlc_list_t *p_list = NULL; + module_t *p_parser = NULL; char psz_spaces[22]; int i_index; + bool b_color = config_GetInt( p_this, "color" ) > 0; + memset( psz_spaces, ' ', 22 ); #ifdef WIN32 - ShowConsole( VLC_TRUE ); + ShowConsole( true ); #endif /* List all modules */ @@ -2403,8 +1841,44 @@ static void ListModules( libvlc_int_t *p_this ) if( i < 0 ) i = 0; psz_spaces[i] = 0; - utf8_fprintf( stdout, " %s%s %s\n", p_parser->psz_object_name, - psz_spaces, p_parser->psz_longname ); + if( b_color ) + utf8_fprintf( stdout, GREEN" %s%s "WHITE"%s\n"GRAY, + p_parser->psz_object_name, + psz_spaces, + p_parser->psz_longname ); + else + utf8_fprintf( stdout, " %s%s %s\n", + p_parser->psz_object_name, + psz_spaces, p_parser->psz_longname ); + + if( b_verbose ) + { + char *const *pp_shortcut = p_parser->pp_shortcuts; + while( *pp_shortcut ) + { + if( strcmp( *pp_shortcut, p_parser->psz_object_name ) ) + { + if( b_color ) + utf8_fprintf( stdout, CYAN" s %s\n"GRAY, + *pp_shortcut ); + else + utf8_fprintf( stdout, " s %s\n", + *pp_shortcut ); + } + pp_shortcut++; + } + if( p_parser->psz_capability ) + { + if( b_color ) + utf8_fprintf( stdout, MAGENTA" c %s (%d)\n"GRAY, + p_parser->psz_capability, + p_parser->i_score ); + else + utf8_fprintf( stdout, " c %s (%d)\n", + p_parser->psz_capability, + p_parser->i_score ); + } + } psz_spaces[i] = ' '; } @@ -2424,18 +1898,16 @@ static void ListModules( libvlc_int_t *p_this ) static void Version( void ) { #ifdef WIN32 - ShowConsole( VLC_TRUE ); + ShowConsole( true ); #endif utf8_fprintf( stdout, _("VLC version %s\n"), VLC_Version() ); utf8_fprintf( stdout, _("Compiled by %s@%s.%s\n"), VLC_CompileBy(), VLC_CompileHost(), VLC_CompileDomain() ); utf8_fprintf( stdout, _("Compiler: %s\n"), VLC_Compiler() ); -#ifndef HAVE_SHARED_LIBVLC if( strcmp( VLC_Changeset(), "exported" ) ) - utf8_fprintf( stdout, _("Based upon svn changeset [%s]\n"), + utf8_fprintf( stdout, _("Based upon Git commit [%s]\n"), VLC_Changeset() ); -#endif utf8_fprintf( stdout, LICENSE_MSG ); #ifdef WIN32 /* Pause the console because it's destroyed when we exit */ @@ -2449,14 +1921,19 @@ static void Version( void ) * This function is useful only on Win32. *****************************************************************************/ #ifdef WIN32 /* */ -static void ShowConsole( vlc_bool_t b_dofile ) +static void ShowConsole( bool b_dofile ) { # ifndef UNDER_CE - FILE *f_help; + FILE *f_help = NULL; if( getenv( "PWD" ) && getenv( "PS1" ) ) return; /* cygwin shell */ AllocConsole(); + /* Use the ANSI code page (e.g. Windows-1252) as expected by the LibVLC + * Unicode/locale subsystem. By default, we have the obsolecent OEM code + * page (e.g. CP437 or CP850). */ + SetConsoleOutputCP (GetACP ()); + SetConsoleTitle ("VLC media player version "PACKAGE_VERSION); freopen( "CONOUT$", "w", stderr ); freopen( "CONIN$", "r", stdin ); @@ -2467,7 +1944,6 @@ static void ShowConsole( vlc_bool_t b_dofile ) freopen( "vlc-help.txt", "wt", stdout ); utf8_fprintf( stderr, _("\nDumped content to vlc-help.txt file.\n") ); } - else freopen( "CONOUT$", "w", stdout ); # endif @@ -2502,33 +1978,21 @@ static void PauseConsole( void ) *****************************************************************************/ static int ConsoleWidth( void ) { - int i_width = 80; + unsigned i_width = 80; #ifndef WIN32 - char buf[20], *psz_parser; - FILE *file; - int i_ret; - - file = popen( "stty size 2>/dev/null", "r" ); - if( file ) + FILE *file = popen( "stty size 2>/dev/null", "r" ); + if (file != NULL) { - i_ret = fread( buf, 1, 20, file ); - if( i_ret > 0 ) - { - buf[19] = '\0'; - psz_parser = strchr( buf, ' ' ); - if( psz_parser ) - { - i_ret = atoi( psz_parser + 1 ); - if( i_ret >= 80 ) - { - i_width = i_ret; - } - } - } - + if (fscanf (file, "%*u %u", &i_width) <= 0) + i_width = 80; pclose( file ); } +#else + CONSOLE_SCREEN_BUFFER_INFO buf; + + if (GetConsoleScreenBufferInfo (GetStdHandle (STD_OUTPUT_HANDLE), &buf)) + i_width = buf.dwSize.X; #endif return i_width; @@ -2537,11 +2001,14 @@ static int ConsoleWidth( void ) 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_vlc = (libvlc_int_t *)p_this; + libvlc_int_t *p_libvlc = (libvlc_int_t *)p_this; + (void)psz_variable; + (void)old_val; + (void)param; if( new_val.i_int >= -1 ) { - p_vlc->p_libvlc_global->i_verbose = __MIN( new_val.i_int, 2 ); + libvlc_priv (p_libvlc)->i_verbose = __MIN( new_val.i_int, 2 ); } return VLC_SUCCESS; } @@ -2554,59 +2021,41 @@ static int VerboseCallback( vlc_object_t *p_this, const char *psz_variable, static void InitDeviceValues( libvlc_int_t *p_vlc ) { #ifdef HAVE_HAL - LibHalContext * ctx; + LibHalContext * ctx = NULL; int i, i_devices; - char **devices; - char *block_dev; + char **devices = NULL; + char *block_dev = NULL; dbus_bool_t b_dvd; - DBusConnection *p_connection; + + DBusConnection *p_connection = NULL; DBusError error; -#ifdef HAVE_HAL_1 - ctx = libhal_ctx_new(); + ctx = libhal_ctx_new(); if( !ctx ) return; dbus_error_init( &error ); p_connection = dbus_bus_get ( DBUS_BUS_SYSTEM, &error ); - if( dbus_error_is_set( &error ) ) + if( dbus_error_is_set( &error ) || !p_connection ) { + libhal_ctx_free( ctx ); dbus_error_free( &error ); return; } libhal_ctx_set_dbus_connection( ctx, p_connection ); if( libhal_ctx_init( ctx, &error ) ) -#else - if( ( ctx = hal_initialize( NULL, FALSE ) ) ) -#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 ); @@ -2614,28 +2063,19 @@ 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 ); -#else - hal_shutdown( ctx ); -#endif + dbus_connection_unref( p_connection ); + libhal_ctx_free( ctx ); } else { msg_Warn( p_vlc, "Unable to get HAL device properties" ); } -#endif +#else + (void)p_vlc; +#endif /* HAVE_HAL */ }