/*****************************************************************************
- * libvlc.c: main libvlc source
+ * libvlc.c: libvlc instances creation and deletion, interfaces handling
*****************************************************************************
- * Copyright (C) 1998-2002 VideoLAN
- * $Id: libvlc.c,v 1.32 2002/09/26 22:40:24 massiot Exp $
+ * Copyright (C) 1998-2008 the VideoLAN team
+ * $Id$
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
- * Gildas Bazin <gbazin@netcourrier.com>
+ * Gildas Bazin <gbazin@videolan.org>
+ * Derk-Jan Hartman <hartman at videolan dot org>
+ * Rémi Denis-Courmont <rem # videolan : org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * 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
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include "control/libvlc_internal.h"
+#include <vlc_input.h>
+
+#include "modules/modules.h"
+#include "config/configuration.h"
+#include "interface/interface.h"
+
#include <errno.h> /* ENOMEM */
#include <stdio.h> /* sprintf() */
-#include <string.h> /* strerror() */
+#include <string.h>
#include <stdlib.h> /* free() */
-#include <vlc/vlc.h>
-
#ifndef WIN32
# include <netinet/in.h> /* BSD: struct in_addr */
#endif
#ifdef HAVE_UNISTD_H
# include <unistd.h>
-#elif defined( _MSC_VER ) && defined( _WIN32 )
+#elif defined( WIN32 ) && !defined( UNDER_CE )
# include <io.h>
#endif
#ifdef WIN32 /* optind, getopt(), included in unistd.h */
-# include "GNUgetopt/getopt.h"
+# include "extras/getopt.h"
#endif
#ifdef HAVE_LOCALE_H
# include <locale.h>
#endif
-#include "vlc_cpu.h" /* CPU detection */
-#include "os_specific.h"
+#ifdef HAVE_DBUS
+/* used for one-instance mode */
+# include <dbus/dbus.h>
+#endif
+
+#ifdef HAVE_HAL
+# include <hal/libhal.h>
+#endif
-#include "netutils.h" /* network_ChannelJoin */
+#include <vlc_playlist.h>
+#include <vlc_interface.h>
-#include "stream_control.h"
-#include "input_ext-intf.h"
+#include <vlc_aout.h>
+#include "audio_output/aout_internal.h"
-#include "vlc_playlist.h"
-#include "interface.h"
+#include <vlc_vout.h>
-#include "audio_output.h"
+#include <vlc_sout.h>
+#include "stream_output/stream_output.h"
-#include "video.h"
-#include "video_output.h"
+#include <vlc_charset.h>
#include "libvlc.h"
-/*****************************************************************************
- * The evil global variables. We handle them with care, don't worry.
- *****************************************************************************/
+#include "playlist/playlist_internal.h"
-/* This global lock is used for critical sections - don't abuse it! */
-static vlc_mutex_t global_lock;
-void * p_global_data;
+#include <vlc_vlm.h>
-/* A list of all the currently allocated vlc objects */
-static int volatile i_vlc = 0;
-static vlc_t ** volatile pp_vlc = NULL;
+#include <assert.h>
/*****************************************************************************
- * Local prototypes
+ * The evil global variables. We handle them with care, don't worry.
*****************************************************************************/
-static int GetFilenames ( vlc_t *, int, char *[] );
-static void Usage ( vlc_t *, const char *psz_module_name );
-static void ListModules ( vlc_t * );
-static void Version ( void );
+static libvlc_int_t * p_static_vlc = NULL;
+static unsigned i_instances = 0;
-#ifdef WIN32
-static void ShowConsole ( void );
-#endif
+static bool b_daemon = false;
/*****************************************************************************
- * vlc_create: allocate a vlc_t structure, and initialize libvlc if needed.
- *****************************************************************************
- * This function allocates a vlc_t structure and returns NULL in case of
- * failure. Also, the thread system is initialized.
+ * vlc_gc_*.
*****************************************************************************/
-vlc_error_t vlc_create( void )
+void __vlc_gc_incref( gc_object_t * p_gc )
{
- vlc_t * p_vlc;
- vlc_bool_t b_failed = VLC_FALSE;
-
- /* This gives us a rather good protection against concurrent calls, but
- * an additional check will be necessary for complete thread safety. */
- if( i_vlc )
- {
- return VLC_EGENERIC;
- }
+ assert( p_gc->i_gc_refcount > 0 );
- p_vlc = vlc_create_r();
+ /* FIXME: atomic version needed! */
+ p_gc->i_gc_refcount ++;
+}
- if( p_vlc == NULL )
- {
- return VLC_EGENERIC;
- }
+void __vlc_gc_decref( gc_object_t *p_gc )
+{
+ assert( p_gc );
+ assert( p_gc->i_gc_refcount > 0 );
- /* We have created an object, which ensures us that p_global_lock has
- * been properly initialized. We can now atomically check that we are
- * the only p_vlc object. */
- vlc_mutex_lock( p_vlc->p_global_lock );
- if( i_vlc != 1 )
- {
- b_failed = VLC_TRUE;
- }
- vlc_mutex_unlock( p_vlc->p_global_lock );
+ /* FIXME: atomic version needed! */
+ p_gc->i_gc_refcount -- ;
- /* There can be only one */
- if( b_failed )
+ if( p_gc->i_gc_refcount == 0 )
{
- vlc_destroy_r( p_vlc );
- return VLC_EGENERIC;
+ p_gc->pf_destructor( p_gc );
+ /* Do not use the p_gc pointer from now on ! */
}
+}
- return VLC_SUCCESS;
+void
+__vlc_gc_init( gc_object_t * p_gc, void (*pf_destructor)( gc_object_t * ),
+ void * arg)
+{
+ p_gc->i_gc_refcount = 1;
+ p_gc->pf_destructor = pf_destructor;
+ p_gc->p_destructor_arg = arg;
}
-vlc_t * vlc_create_r( void )
+/*****************************************************************************
+ * Local prototypes
+ *****************************************************************************/
+#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 );
+
+#ifdef WIN32
+static void ShowConsole ( bool );
+static void PauseConsole ( void );
+#endif
+static int ConsoleWidth ( void );
+
+static int VerboseCallback( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
+
+static void InitDeviceValues( libvlc_int_t * );
+
+/**
+ * Allocate a libvlc instance, initialize global data if needed
+ * It also initializes the threading system
+ */
+libvlc_int_t * libvlc_InternalCreate( void )
{
- static int i_instance = 0;
- vlc_t * p_vlc = NULL;
+ libvlc_int_t *p_libvlc;
+ libvlc_priv_t *priv;
+ char *psz_env = NULL;
- /* Allocate the main structure */
- p_vlc = vlc_object_create( p_vlc, VLC_OBJECT_ROOT );
- if( p_vlc == NULL )
- {
+ /* vlc_threads_init *must* be the first internal call! No other call is
+ * allowed before the thread system has been initialized. */
+ 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 variables */
+ vlc_mutex_t *lock = var_AcquireMutex( "libvlc" );
+ if( i_instances == 0 )
+ {
+ /* Guess what CPU we have */
+ cpu_flags = CPUCapabilities();
+ /* The module bank will be initialized later */
+ p_libvlc_global->p_module_bank = NULL;
}
- p_vlc->psz_object_name = "root";
+ /* 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 );
- p_vlc->p_global_lock = &global_lock;
- p_vlc->pp_global_data = &p_global_data;
+ if( p_libvlc == NULL )
+ return 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" );
- p_vlc->b_verbose = VLC_FALSE;
- p_vlc->b_quiet = VLC_FALSE; /* FIXME: delay message queue output! */
+ /* Initialize message queue */
+ msg_Create( p_libvlc );
+
+ /* 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
- /* Initialize the threads system */
- vlc_threads_init( p_vlc );
+ /* 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_vlc, &p_vlc->config_lock );
- vlc_mutex_init( p_vlc, &p_vlc->structure_lock );
-
- /* Store our newly allocated structure in the global list */
- vlc_mutex_lock( p_vlc->p_global_lock );
- pp_vlc = realloc( pp_vlc, (i_vlc+1) * sizeof( vlc_t * ) );
- pp_vlc[ i_vlc ] = p_vlc;
- i_vlc++;
- p_vlc->i_instance = i_instance;
- i_instance++;
- vlc_mutex_unlock( p_vlc->p_global_lock );
-
- /* Update the handle status */
- p_vlc->i_status = VLC_STATUS_CREATED;
-
- return p_vlc;
+ vlc_mutex_init( &priv->timer_lock );
+ vlc_mutex_init( &priv->config_lock );
+
+ 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;
}
-/*****************************************************************************
- * 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
- *****************************************************************************/
-vlc_error_t vlc_init( int i_argc, char *ppsz_argv[] )
-{
- return vlc_init_r( ( i_vlc == 1 ) ? pp_vlc[0] : NULL, i_argc, ppsz_argv );
-}
-
-vlc_error_t vlc_init_r( vlc_t *p_vlc, 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;
- vlc_bool_t b_exit;
- module_t *p_help_module;
- playlist_t *p_playlist;
+ 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;
+ playlist_t *p_playlist = NULL;
+ vlc_value_t val;
+#if defined( ENABLE_NLS ) \
+ && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
+# if defined (WIN32) || defined (__APPLE__)
+ char * psz_language;
+#endif
+#endif
- /* Check that the handle is valid */
- if( !p_vlc || p_vlc->i_status != VLC_STATUS_CREATED )
+ /* 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 && ppsz_argv[0][0] )
{
- fprintf( stderr, "error: invalid status (!CREATED)\n" );
- return VLC_ESTATUS;
- }
+ free( p_libvlc->psz_object_name );
- /* Guess what CPU we have */
- p_vlc->i_cpu = CPUCapabilities( p_vlc );
+ 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
*/
-#if defined( ENABLE_NLS ) && defined ( HAVE_GETTEXT )
-# if defined( HAVE_LOCALE_H ) && defined( HAVE_LC_MESSAGES )
- if( !setlocale( LC_MESSAGES, "" ) )
+ LoadMessages ();
+
+ /* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */
+ msg_Dbg( p_libvlc, "translation test: code is \"%s\"", _("C") );
+
+ /* Initialize the module bank and load the configuration of the
+ * main module. We need to do this at this stage to be able to display
+ * a short help if required by the user. (short help == main module
+ * options) */
+ module_InitBank( p_libvlc );
+
+ if( config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true ) )
{
- fprintf( stderr, "warning: unsupported locale settings\n" );
+ module_EndBank( p_libvlc );
+ return VLC_EGENERIC;
}
- setlocale( LC_CTYPE, "" );
-# endif
-
- if( !bindtextdomain( PACKAGE, LOCALEDIR ) )
+ /* Check for short help option */
+ if( config_GetInt( p_libvlc, "help" ) > 0 )
{
- fprintf( stderr, "warning: no domain %s in directory %s\n",
- PACKAGE, LOCALEDIR );
+ Help( p_libvlc, "help" );
+ b_exit = true;
+ i_ret = VLC_EEXITSUCCESS;
+ }
+ /* Check for version option */
+ else if( config_GetInt( p_libvlc, "version" ) > 0 )
+ {
+ Version();
+ b_exit = true;
+ i_ret = VLC_EEXITSUCCESS;
}
- textdomain( PACKAGE );
-#endif
+ /* Set the config file stuff */
+ priv->psz_configfile = config_GetCustomConfigFile( p_libvlc );
- /*
- * Initialize message queue
- */
- msg_Create( p_vlc );
+ /* Check for plugins cache options */
+ if( config_GetInt( p_libvlc, "reset-plugins-cache" ) > 0 )
+ {
+ p_libvlc_global->p_module_bank->b_cache_delete = true;
+ }
- /*
- * System specific initialization code
- */
- system_Init( p_vlc, &i_argc, ppsz_argv );
+ /* Will be re-done properly later on */
+ priv->i_verbose = config_GetInt( p_libvlc, "verbose" );
- /* Get the executable name (similar to the basename command) */
- if( i_argc > 0 )
+ /* Check for daemon mode */
+#ifndef WIN32
+ if( config_GetInt( p_libvlc, "daemon" ) > 0 )
{
- p_vlc->psz_object_name = p_tmp = ppsz_argv[ 0 ];
- while( *p_tmp )
+#ifdef HAVE_DAEMON
+ char *psz_pidfile = NULL;
+
+ if( daemon( 1, 0) != 0 )
{
- if( *p_tmp == '/' ) p_vlc->psz_object_name = ++p_tmp;
- else ++p_tmp;
+ msg_Err( p_libvlc, "Unable to fork vlc to daemon mode" );
+ b_exit = true;
}
- }
- else
- {
- p_vlc->psz_object_name = "vlc";
- }
+ b_daemon = true;
+
+ /* lets check if we need to write the pidfile */
+ psz_pidfile = config_GetPsz( p_libvlc, "pidfile" );
+ if( psz_pidfile != NULL )
+ {
+ FILE *pidfile;
+ pid_t i_pid = getpid ();
+ msg_Dbg( p_libvlc, "PID is %d, writing it to %s",
+ i_pid, psz_pidfile );
+ pidfile = utf8_fopen( psz_pidfile,"w" );
+ if( pidfile != NULL )
+ {
+ utf8_fprintf( pidfile, "%d", (int)i_pid );
+ fclose( pidfile );
+ }
+ else
+ {
+ msg_Err( p_libvlc, "cannot open pid file for writing: %s (%m)",
+ psz_pidfile );
+ }
+ }
+ free( psz_pidfile );
- /* Announce who we are */
- msg_Dbg( p_vlc, COPYRIGHT_MESSAGE );
- msg_Dbg( p_vlc, "libvlc was configured with %s", CONFIGURE_LINE );
+#else
+ pid_t i_pid;
- /*
- * Initialize the module bank and and load the configuration of the main
- * module. We need to do this at this stage to be able to display a short
- * help if required by the user. (short help == main module options)
- */
- module_InitBank( p_vlc );
- module_LoadMain( p_vlc );
+ if( ( i_pid = fork() ) < 0 )
+ {
+ 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 = true;
+ i_ret = VLC_EEXITSUCCESS;
+ }
+ else
+ {
+ /* We are the child */
+ msg_Dbg( p_libvlc, "daemon spawned" );
+ close( STDIN_FILENO );
+ close( STDOUT_FILENO );
+ close( STDERR_FILENO );
- /* Hack: insert the help module here */
- p_help_module = vlc_object_create( p_vlc, VLC_OBJECT_MODULE );
- if( p_help_module == NULL )
- {
- module_EndBank( p_vlc );
- msg_Destroy( p_vlc );
- return VLC_EGENERIC;
+ b_daemon = true;
+ }
+#endif
}
- p_help_module->psz_object_name = "help";
- config_Duplicate( p_help_module, p_help_config );
- vlc_object_attach( p_help_module, p_vlc->p_module_bank );
- /* End hack */
+#endif
- if( config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, VLC_TRUE ) )
+ if( b_exit )
{
- vlc_object_detach( p_help_module );
- config_Free( p_help_module );
- vlc_object_destroy( p_help_module );
- module_EndBank( p_vlc );
- msg_Destroy( p_vlc );
- return VLC_EGENERIC;
+ module_EndBank( p_libvlc );
+ return i_ret;
}
- b_exit = VLC_FALSE;
+ /* Check for translation config option */
+#if defined( ENABLE_NLS ) \
+ && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
+# 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. */
- /* Check for short help option */
- if( config_GetInt( p_vlc, "help" ) )
- {
- fprintf( stderr, _("Usage: %s [options] [parameters] [files]...\n\n"),
- p_vlc->psz_object_name );
- Usage( p_vlc, "main" );
- Usage( p_vlc, "help" );
- b_exit = VLC_TRUE;
- }
- /* Check for version option */
- else if( config_GetInt( p_vlc, "version" ) )
+ 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" ) )
{
- Version();
- b_exit = VLC_TRUE;
- }
+ bool b_cache_delete = p_libvlc_global->p_module_bank->b_cache_delete;
- /* Hack: remove the help module here */
- vlc_object_detach( p_help_module );
- /* End hack */
+ /* Reset the default domain */
+ SetLanguage( psz_language );
- if( b_exit )
- {
- config_Free( p_help_module );
- vlc_object_destroy( p_help_module );
- module_EndBank( p_vlc );
- msg_Destroy( p_vlc );
- return VLC_EEXIT;
+ /* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */
+ msg_Dbg( p_libvlc, "translation test: code is \"%s\"", _("C") );
+
+ module_EndBank( p_libvlc );
+ module_InitBank( p_libvlc );
+ 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;
}
+ free( psz_language );
+# endif
+#endif
/*
* Load the builtins and plugins into the module_bank.
* list of configuration options exported by each module and loads their
* default values.
*/
- module_LoadBuiltins( p_vlc );
- module_LoadPlugins( p_vlc );
- msg_Dbg( p_vlc, "module bank initialized, found %i modules",
- p_vlc->p_module_bank->i_children );
+ module_LoadBuiltins( p_libvlc );
+ module_LoadPlugins( p_libvlc );
+ if( p_libvlc->b_die )
+ {
+ b_exit = true;
+ }
- /* Hack: insert the help module here */
- vlc_object_attach( p_help_module, p_vlc->p_module_bank );
- /* End hack */
+ msg_Dbg( p_libvlc, "module bank initialized, found %i modules",
+ vlc_internals( p_libvlc_global->p_module_bank )->i_children );
/* Check for help on modules */
- if( (p_tmp = config_GetPsz( p_vlc, "module" )) )
+ if( (p_tmp = config_GetPsz( p_libvlc, "module" )) )
{
- Usage( p_vlc, p_tmp );
+ 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_vlc, "longhelp" ) )
+ else if( config_GetInt( p_libvlc, "longhelp" ) > 0 )
{
- Usage( p_vlc, NULL );
- b_exit = VLC_TRUE;
+ Help( p_libvlc, "longhelp" );
+ b_exit = true;
+ i_ret = VLC_EEXITSUCCESS;
}
/* Check for module list option */
- else if( config_GetInt( p_vlc, "list" ) )
+ else if( config_GetInt( p_libvlc, "list" ) > 0 )
{
- ListModules( p_vlc );
- b_exit = VLC_TRUE;
+ ListModules( p_libvlc, false );
+ b_exit = true;
+ i_ret = VLC_EEXITSUCCESS;
+ }
+ else if( config_GetInt( p_libvlc, "list-verbose" ) > 0 )
+ {
+ ListModules( p_libvlc, true );
+ b_exit = true;
+ i_ret = VLC_EEXITSUCCESS;
}
- /* 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 */
+ /* Check for config file options */
+ if( !config_GetInt( p_libvlc, "ignore-config" ) )
+ {
+ 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 );
+ }
+ }
if( b_exit )
{
- module_EndBank( p_vlc );
- msg_Destroy( p_vlc );
- return VLC_EEXIT;
+ module_EndBank( p_libvlc );
+ return i_ret;
}
+ /*
+ * Init device values
+ */
+ InitDeviceValues( p_libvlc );
+
/*
* Override default configuration with config file settings
*/
- p_vlc->psz_homedir = config_GetHomeDir();
- config_LoadConfigFile( p_vlc, NULL );
+ if( !config_GetInt( p_libvlc, "ignore-config" ) )
+ config_LoadConfigFile( p_libvlc, NULL );
/*
* Override configuration with command line settings
*/
- if( config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, VLC_FALSE ) )
+ if( config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, false ) )
{
#ifdef WIN32
- ShowConsole();
+ 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.\nPress the RETURN key to continue..." );
- getchar();
+ "that they are valid.\n" );
+ PauseConsole();
#endif
- module_EndBank( p_vlc );
- msg_Destroy( p_vlc );
+ module_EndBank( p_libvlc );
return VLC_EGENERIC;
}
/*
* System specific configuration
*/
- system_Configure( p_vlc );
+ 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" ) > 0 )
+ {
+ val.i_int = -1;
+ var_Set( p_libvlc, "verbose", val );
+ }
+ var_AddCallback( p_libvlc, "verbose", VerboseCallback, NULL );
+ var_Change( p_libvlc, "verbose", VLC_VAR_TRIGGER_CALLBACKS, NULL, NULL );
+
+ if( priv->b_color )
+ priv->b_color = config_GetInt( p_libvlc, "color" ) > 0;
/*
* Output messages that may still be in the queue
*/
- p_vlc->b_verbose = config_GetInt( p_vlc, "verbose" );
- p_vlc->b_quiet = config_GetInt( p_vlc, "quiet" );
- p_vlc->b_color = config_GetInt( p_vlc, "color" );
- msg_Flush( p_vlc );
-
- /* p_vlc inititalization. FIXME ? */
- p_vlc->i_desync = config_GetInt( p_vlc, "desync" ) * (mtime_t)1000;
-#if defined( __i386__ )
- if( !config_GetInt( p_vlc, "mmx" ) )
- p_vlc->i_cpu &= ~CPU_CAPABILITY_MMX;
- if( !config_GetInt( p_vlc, "3dn" ) )
- p_vlc->i_cpu &= ~CPU_CAPABILITY_3DNOW;
- if( !config_GetInt( p_vlc, "mmxext" ) )
- p_vlc->i_cpu &= ~CPU_CAPABILITY_MMXEXT;
- if( !config_GetInt( p_vlc, "sse" ) )
- p_vlc->i_cpu &= ~CPU_CAPABILITY_SSE;
+ msg_Flush( p_libvlc );
+
+ if( !config_GetInt( p_libvlc, "fpu" ) )
+ cpu_flags &= ~CPU_CAPABILITY_FPU;
+
+#if defined( __i386__ ) || defined( __x86_64__ )
+ if( !config_GetInt( p_libvlc, "mmx" ) )
+ cpu_flags &= ~CPU_CAPABILITY_MMX;
+ if( !config_GetInt( p_libvlc, "3dn" ) )
+ cpu_flags &= ~CPU_CAPABILITY_3DNOW;
+ if( !config_GetInt( p_libvlc, "mmxext" ) )
+ cpu_flags &= ~CPU_CAPABILITY_MMXEXT;
+ if( !config_GetInt( p_libvlc, "sse" ) )
+ cpu_flags &= ~CPU_CAPABILITY_SSE;
+ if( !config_GetInt( p_libvlc, "sse2" ) )
+ cpu_flags &= ~CPU_CAPABILITY_SSE2;
#endif
-#if defined( __powerpc__ ) || defined( SYS_DARWIN )
- if( !config_GetInt( p_vlc, "altivec" ) )
- p_vlc->i_cpu &= ~CPU_CAPABILITY_ALTIVEC;
+#if defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc64__ )
+ if( !config_GetInt( p_libvlc, "altivec" ) )
+ cpu_flags &= ~CPU_CAPABILITY_ALTIVEC;
#endif
#define PRINT_CAPABILITY( capability, string ) \
- if( p_vlc->i_cpu & capability ) \
+ if( vlc_CPU() & capability ) \
{ \
strncat( p_capabilities, string " ", \
sizeof(p_capabilities) - strlen(p_capabilities) ); \
PRINT_CAPABILITY( CPU_CAPABILITY_3DNOW, "3DNow!" );
PRINT_CAPABILITY( CPU_CAPABILITY_MMXEXT, "MMXEXT" );
PRINT_CAPABILITY( CPU_CAPABILITY_SSE, "SSE" );
+ PRINT_CAPABILITY( CPU_CAPABILITY_SSE2, "SSE2" );
PRINT_CAPABILITY( CPU_CAPABILITY_ALTIVEC, "AltiVec" );
PRINT_CAPABILITY( CPU_CAPABILITY_FPU, "FPU" );
- msg_Dbg( p_vlc, "CPU has capabilities %s", p_capabilities );
+ msg_Dbg( p_libvlc, "CPU has capabilities %s", p_capabilities );
/*
* Choose the best memcpy module
*/
- p_vlc->p_memcpy_module = module_Need( p_vlc, "memcpy", "$memcpy" );
+ priv->p_memcpy_module = module_Need( p_libvlc, "memcpy", "$memcpy", 0 );
- if( p_vlc->pf_memcpy == NULL )
- {
- p_vlc->pf_memcpy = memcpy;
- }
+ priv->b_stats = config_GetInt( p_libvlc, "stats" ) > 0;
+ priv->i_timers = 0;
+ priv->pp_timers = NULL;
- if( p_vlc->pf_memset == NULL )
+ /* Init stats */
+ p_libvlc->p_stats = (global_stats_t *)malloc( sizeof( global_stats_t ) );
+ if( !p_libvlc->p_stats )
{
- p_vlc->pf_memset = memset;
+ vlc_object_release( p_libvlc );
+ return VLC_ENOMEM;
}
+ vlc_mutex_init( &p_libvlc->p_stats->lock );
+ priv->p_stats_computer = NULL;
- /*
- * Initialize shared resources and libraries
- */
- if( config_GetInt( p_vlc, "network-channel" )
- && network_ChannelCreate( p_vlc ) )
- {
- /* On error during Channels initialization, switch off channels */
- msg_Warn( p_vlc,
- "channels initialization failed, deactivating channels" );
- config_PutInt( p_vlc, "network-channel", VLC_FALSE );
- }
+ /* Init the array that holds every input item */
+ ARRAY_INIT( priv->input_items );
+ priv->i_last_input_id = 0;
/*
- * Initialize playlist and get commandline files
+ * Initialize hotkey handling
*/
- p_playlist = playlist_Create( p_vlc );
- if( !p_playlist )
+ var_Create( p_libvlc, "key-pressed", VLC_VAR_INTEGER );
+ 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, libvlc_hotkeys, libvlc_hotkeys_size );
+ var_AddCallback( p_libvlc, "key-pressed", vlc_key_to_action,
+ p_libvlc->p_hotkeys );
+
+ /* 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_vlc, "playlist initialization failed" );
- if( p_vlc->p_memcpy_module != NULL )
+ msg_Err( p_libvlc, "playlist initialization failed" );
+ if( priv->p_memcpy_module != NULL )
{
- module_Unneed( p_vlc, p_vlc->p_memcpy_module );
+ module_Unneed( p_libvlc, priv->p_memcpy_module );
}
- module_EndBank( p_vlc );
- msg_Destroy( p_vlc );
+ module_EndBank( 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_ServicesDiscoveryAdd( p_playlist, psz_modules );
+ }
+ free( psz_modules );
- /* Update the handle status */
- p_vlc->i_status = VLC_STATUS_STOPPED;
+#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" );
+ }
+ free( psz_parser );
+#endif
/*
- * Get input filenames given as commandline arguments
+ * Load background interfaces
*/
- GetFilenames( p_vlc, i_argc, ppsz_argv );
-
- return VLC_SUCCESS;
-}
-
-/*****************************************************************************
- * vlc_run: run vlc
- *****************************************************************************
- * XXX: This function opens an interface plugin and runs it. If b_block is set
- * to 0, vlc_add_intf will return immediately and let the interface run in a
- * separate thread. If b_block is set to 1, vlc_add_intf will continue until
- * user requests to quit.
- *****************************************************************************/
-vlc_error_t vlc_run( void )
-{
- return vlc_run_r( ( i_vlc == 1 ) ? pp_vlc[0] : NULL );
-}
+ psz_modules = config_GetPsz( p_libvlc, "extraintf" );
+ psz_control = config_GetPsz( p_libvlc, "control" );
-vlc_error_t vlc_run_r( vlc_t *p_vlc )
-{
- /* Check that the handle is valid */
- if( !p_vlc || p_vlc->i_status != VLC_STATUS_STOPPED )
+ if( psz_modules && *psz_modules && psz_control && *psz_control )
{
- fprintf( stderr, "error: invalid status (!STOPPED)\n" );
- return VLC_ESTATUS;
+ psz_modules = (char *)realloc( psz_modules, strlen( psz_modules ) +
+ strlen( psz_control ) + 1 );
+ sprintf( psz_modules, "%s:%s", psz_modules, psz_control );
+ }
+ else if( psz_control && *psz_control )
+ {
+ free( psz_modules );
+ psz_modules = strdup( psz_control );
}
- /* Update the handle status */
- p_vlc->i_status = VLC_STATUS_RUNNING;
-
- return VLC_SUCCESS;
-}
-
-/*****************************************************************************
- * vlc_add_intf: add an interface
- *****************************************************************************
- * This function opens an interface plugin and runs it. If b_block is set
- * to 0, vlc_add_intf will return immediately and let the interface run in a
- * separate thread. If b_block is set to 1, vlc_add_intf will continue until
- * user requests to quit.
- *****************************************************************************/
-vlc_error_t vlc_add_intf( const char *psz_module, vlc_bool_t b_block )
-{
- return vlc_add_intf_r( ( i_vlc == 1 ) ? pp_vlc[0] : NULL,
- psz_module, b_block );
-}
+ psz_parser = psz_modules;
+ while ( psz_parser && *psz_parser )
+ {
+ char *psz_module, *psz_temp;
+ psz_module = psz_parser;
+ psz_parser = strchr( psz_module, ':' );
+ if ( psz_parser )
+ {
+ *psz_parser = '\0';
+ psz_parser++;
+ }
+ psz_temp = (char *)malloc( strlen(psz_module) + sizeof(",none") );
+ if( psz_temp )
+ {
+ sprintf( psz_temp, "%s,none", psz_module );
+ libvlc_InternalAddIntf( p_libvlc, psz_temp );
+ free( psz_temp );
+ }
+ }
+ free( psz_modules );
+ free( psz_control );
-vlc_error_t vlc_add_intf_r( vlc_t *p_vlc, const char *psz_module,
- vlc_bool_t b_block )
-{
- vlc_error_t err;
- intf_thread_t *p_intf;
- char *psz_oldmodule = NULL;
+ /*
+ * Always load the hotkeys interface if it exists
+ */
+ 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
- /* Check that the handle is valid */
- if( !p_vlc || p_vlc->i_status != VLC_STATUS_RUNNING )
+ /*
+ * If needed, load the Xscreensaver interface
+ * Currently, only for X
+ */
+#ifdef HAVE_X11_XLIB_H
+ if( config_GetInt( p_libvlc, "disable-screensaver" ) )
{
- fprintf( stderr, "error: invalid status (!RUNNING)\n" );
- return VLC_ESTATUS;
+ libvlc_InternalAddIntf( p_libvlc, "screensaver,none" );
}
+#endif
- if( psz_module )
+ if( config_GetInt( p_libvlc, "file-logging" ) > 0 )
{
- psz_oldmodule = config_GetPsz( p_vlc, "intf" );
- config_PutPsz( p_vlc, "intf", psz_module );
+ libvlc_InternalAddIntf( p_libvlc, "logger,none" );
}
-
- /* Try to create the interface */
- p_intf = intf_Create( p_vlc );
-
- if( psz_module )
+#ifdef HAVE_SYSLOG_H
+ if( config_GetInt( p_libvlc, "syslog" ) > 0 )
{
- config_PutPsz( p_vlc, "intf", psz_oldmodule );
- if( psz_oldmodule )
+ char *logmode = var_CreateGetString( p_libvlc, "logmode" );
+ var_SetString( p_libvlc, "logmode", "syslog" );
+ libvlc_InternalAddIntf( p_libvlc, "logger,none" );
+
+ if( logmode )
{
- free( psz_oldmodule );
+ var_SetString( p_libvlc, "logmode", logmode );
+ free( logmode );
}
+ else
+ var_Destroy( p_libvlc, "logmode" );
}
+#endif
- if( p_intf == NULL )
+ if( config_GetInt( p_libvlc, "show-intf" ) > 0 )
{
- msg_Err( p_vlc, "interface initialization failed" );
- return VLC_EGENERIC;
+ libvlc_InternalAddIntf( p_libvlc, "showintf,none" );
}
- /* Try to run the interface */
- p_intf->b_block = b_block;
- err = intf_RunThread( p_intf );
- if( err )
+ if( config_GetInt( p_libvlc, "network-synchronisation") > 0 )
{
- vlc_object_detach( p_intf );
- intf_Destroy( p_intf );
- return err;
+ libvlc_InternalAddIntf( p_libvlc, "netsync,none" );
}
- return VLC_SUCCESS;
-}
-
-/*****************************************************************************
- * vlc_destroy: stop playing and destroy everything.
- *****************************************************************************
- * This function requests the running threads to finish, waits for their
- * termination, and destroys their structure.
- *****************************************************************************/
-vlc_error_t vlc_destroy( void )
-{
- return vlc_destroy_r( ( i_vlc == 1 ) ? pp_vlc[0] : NULL );
-}
-
-vlc_error_t vlc_destroy_r( vlc_t *p_vlc )
-{
- int i_index;
- intf_thread_t * p_intf;
- playlist_t * p_playlist;
- vout_thread_t * p_vout;
- aout_instance_t * p_aout;
-
- /* Check that the handle is valid */
- if( !p_vlc || (p_vlc->i_status != VLC_STATUS_RUNNING
- && p_vlc->i_status != VLC_STATUS_STOPPED
- && p_vlc->i_status != VLC_STATUS_CREATED) )
- {
- fprintf( stderr, "error: invalid status "
- "(!RUNNING&&!STOPPED&&!CREATED)\n" );
- return VLC_ESTATUS;
- }
-
- if( p_vlc->i_status == VLC_STATUS_RUNNING )
- {
- /*
- * Ask the interfaces to stop and destroy them
- */
- msg_Dbg( p_vlc, "removing all interfaces" );
- while( (p_intf = vlc_object_find( p_vlc, VLC_OBJECT_INTF,
- FIND_CHILD )) )
+#ifdef WIN32
+ if( config_GetInt( p_libvlc, "prefer-system-codecs") > 0 )
+ {
+ char *psz_codecs = config_GetPsz( p_playlist, "codec" );
+ if( psz_codecs )
{
- intf_StopThread( p_intf );
- vlc_object_detach( p_intf );
- vlc_object_release( p_intf );
- intf_Destroy( p_intf );
+ 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
- /*
- * Free playlists
- */
- msg_Dbg( p_vlc, "removing all playlists" );
- while( (p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST,
- FIND_CHILD )) )
- {
- vlc_object_detach( p_playlist );
- vlc_object_release( p_playlist );
- playlist_Destroy( p_playlist );
- }
+ /*
+ * FIXME: kludge to use a p_libvlc-local variable for the Mozilla plugin
+ */
+ var_Create( p_libvlc, "drawable", VLC_VAR_INTEGER );
+ var_Create( p_libvlc, "drawable-view-top", VLC_VAR_INTEGER );
+ var_Create( p_libvlc, "drawable-view-left", VLC_VAR_INTEGER );
+ var_Create( p_libvlc, "drawable-view-bottom", VLC_VAR_INTEGER );
+ var_Create( p_libvlc, "drawable-view-right", VLC_VAR_INTEGER );
+ 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 );
- /*
- * Free video outputs
- */
- msg_Dbg( p_vlc, "removing all video outputs" );
- while( (p_vout = vlc_object_find( p_vlc, VLC_OBJECT_VOUT,
- FIND_CHILD )) )
- {
- vlc_object_detach( p_vout );
- vlc_object_release( p_vout );
- vout_DestroyThread( p_vout );
- }
+ /* Create volume callback system. */
+ var_Create( p_libvlc, "volume-change", VLC_VAR_BOOL );
- /*
- * Free audio outputs
- */
- msg_Dbg( p_vlc, "removing all audio outputs" );
- while( (p_aout = vlc_object_find( p_vlc, 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 );
- }
+ /* 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 );
- /* Update the handle status */
- p_vlc->i_status = VLC_STATUS_STOPPED;
- }
+ var_Create( p_libvlc, "intf-popupmenu", VLC_VAR_BOOL );
+
+ /*
+ * Get input filenames given as commandline arguments
+ */
+ GetFilenames( p_libvlc, i_argc, ppsz_argv );
- if( p_vlc->i_status == VLC_STATUS_STOPPED )
+ /*
+ * 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 )
{
- /*
- * Go back into channel 0 which is the network
- */
- if( config_GetInt( p_vlc, "network-channel" ) && p_vlc->p_channel )
- {
- network_ChannelJoin( p_vlc, COMMON_CHANNEL );
- }
-
- /*
- * Free allocated memory
- */
- if( p_vlc->p_memcpy_module != NULL )
- {
- module_Unneed( p_vlc, p_vlc->p_memcpy_module );
- }
-
- free( p_vlc->psz_homedir );
-
- /*
- * Free module bank
- */
- module_EndBank( p_vlc );
-
- /*
- * System specific cleaning code
- */
- system_End( p_vlc );
-
- /*
- * Terminate messages interface and program
- */
- msg_Destroy( p_vlc );
-
- /* Update the handle status */
- p_vlc->i_status = VLC_STATUS_CREATED;
- }
-
- /* Update the handle status, just in case */
- p_vlc->i_status = VLC_STATUS_NONE;
-
- /* Remove our structure from the global list */
- vlc_mutex_lock( p_vlc->p_global_lock );
- for( i_index = 0 ; i_index < i_vlc ; i_index++ )
- {
- if( pp_vlc[ i_index ] == p_vlc )
- {
- break;
- }
+ 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 );
+
+ return VLC_SUCCESS;
+}
- if( i_index == i_vlc )
+/**
+ * Cleanup a libvlc instance. The instance is not completely deallocated
+ * \param p_libvlc the instance to clean
+ */
+int libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
+{
+ intf_thread_t * p_intf = NULL;
+ libvlc_priv_t *priv = libvlc_priv (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 )) )
{
- fprintf( stderr, "error: trying to unregister %p which is not in "
- "the list\n", (void *)p_vlc );
- vlc_mutex_unlock( p_vlc->p_global_lock );
- vlc_object_destroy( p_vlc );
- return VLC_EGENERIC;
+ 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() */
}
- for( i_index++ ; i_index < i_vlc ; i_index++ )
+#ifdef ENABLE_VLM
+ /* Destroy VLM if created in libvlc_InternalInit */
+ if( priv->p_vlm )
{
- pp_vlc[ i_index - 1 ] = pp_vlc[ i_index ];
+ vlm_Delete( priv->p_vlm );
}
+#endif
- i_vlc--;
- if( i_vlc )
+ 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 );
+
+ /* Free interaction */
+ msg_Dbg( p_libvlc, "removing interaction" );
+ interaction_Destroy( priv->p_interaction );
+
+ /* Free video outputs */
+ msg_Dbg( p_libvlc, "removing all video outputs" );
+ vlc_list_t *list = vlc_list_find (p_libvlc, VLC_OBJECT_VOUT, FIND_CHILD);
+ for (int i = 0; i < list->i_count; i++)
+ vlc_object_release (list->p_values[i].p_object);
+ vlc_list_release (list);
+
+ stats_TimersDumpAll( p_libvlc );
+ stats_TimersCleanAll( p_libvlc );
+
+#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 ) ) )
{
- pp_vlc = realloc( pp_vlc, i_vlc * sizeof( vlc_t * ) );
+ msg_Dbg( p_libvlc, "removing announce handler" );
+ vlc_object_detach( p_announce );
+ vlc_object_release( p_announce );
+ announce_HandlerDestroy( p_announce );
}
- else
+#endif
+
+ /* 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)
{
- free( pp_vlc );
- pp_vlc = NULL;
+ msg_Dbg (p_libvlc, "waiting for %u remaining threads",
+ priv->threads_count);
+ vlc_cond_wait (&priv->threads_wait, &priv->threads_lock);
}
- vlc_mutex_unlock( p_vlc->p_global_lock );
+ vlc_mutex_unlock (&priv->threads_lock);
- /* Stop thread system: last one out please shut the door! */
- vlc_threads_end( p_vlc );
+ 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 );
- /* Destroy mutexes */
- vlc_mutex_destroy( &p_vlc->structure_lock );
- vlc_mutex_destroy( &p_vlc->config_lock );
-
- vlc_object_destroy( p_vlc );
+ msg_Dbg( p_libvlc, "removing stats" );
+ vlc_mutex_destroy( &p_libvlc->p_stats->lock );
+ FREENULL( p_libvlc->p_stats );
return VLC_SUCCESS;
}
-/*****************************************************************************
- * 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_end and vlc_destroy afterwards.
- *****************************************************************************/
-vlc_error_t vlc_die( void )
+/**
+ * Destroy everything.
+ * This function requests the running threads to finish, waits for their
+ * termination, and destroys their structure.
+ * It stops the thread systems: no instance can run after this has run
+ * \param p_libvlc the instance to destroy
+ */
+int libvlc_InternalDestroy( libvlc_int_t *p_libvlc )
{
- return vlc_die_r( ( i_vlc == 1 ) ? pp_vlc[0] : NULL );
-}
+ if( !p_libvlc )
+ return VLC_EGENERIC;
-vlc_error_t vlc_die_r( vlc_t *p_vlc )
-{
- if( !p_vlc )
+ libvlc_priv_t *priv = libvlc_priv (p_libvlc);
+
+#ifndef WIN32
+ char* psz_pidfile = NULL;
+
+ if( b_daemon )
{
- fprintf( stderr, "error: invalid status (!EXIST)\n" );
- return VLC_ESTATUS;
+ 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
- p_vlc->b_die = VLC_TRUE;
+ if( priv->p_memcpy_module )
+ {
+ module_Unneed( p_libvlc, priv->p_memcpy_module );
+ priv->p_memcpy_module = NULL;
+ }
- return VLC_SUCCESS;
-}
+ /* Free module bank. It is refcounted, so we call this each time */
+ module_EndBank( p_libvlc );
-/*****************************************************************************
- * vlc_status: return the current vlc status.
- *****************************************************************************
- * This function returns the current value of p_vlc->i_status.
- *****************************************************************************/
-vlc_status_t vlc_status( void )
-{
- return vlc_status_r( ( i_vlc == 1 ) ? pp_vlc[0] : NULL );
-}
+ FREENULL( priv->psz_configfile );
+ var_DelCallback( p_libvlc, "key-pressed", vlc_key_to_action,
+ p_libvlc->p_hotkeys );
+ FREENULL( p_libvlc->p_hotkeys );
-vlc_status_t vlc_status_r( vlc_t *p_vlc )
-{
- if( !p_vlc )
+ vlc_mutex_t *lock = var_AcquireMutex( "libvlc" );
+ i_instances--;
+
+ if( i_instances == 0 )
{
- return VLC_STATUS_NONE;
+ /* System specific cleaning code */
+ system_End( p_libvlc );
}
+ vlc_mutex_unlock( lock );
- return p_vlc->i_status;
-}
+ msg_Flush( p_libvlc );
+ msg_Destroy( p_libvlc );
-/*****************************************************************************
- * vlc_add_target: adds a target for playing.
- *****************************************************************************
- * This function adds psz_target to the current playlist. If a playlist does
- * not exist, it will create one.
- *****************************************************************************/
-vlc_error_t vlc_add_target( const char *psz_target, int i_mode, int i_pos )
-{
- return vlc_add_target_r( ( i_vlc == 1 ) ? pp_vlc[0] : NULL,
- psz_target, i_mode, i_pos );
+ /* 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;
+
+ /* 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 ();
+
+ return VLC_SUCCESS;
}
-vlc_error_t vlc_add_target_r( vlc_t *p_vlc, const char *psz_target,
- int i_mode, int i_pos )
+/**
+ * Add an interface plugin and run it
+ */
+int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, char const *psz_module )
{
- vlc_error_t err;
- playlist_t *p_playlist;
-
- if( !p_vlc || ( p_vlc->i_status != VLC_STATUS_STOPPED
- && p_vlc->i_status != VLC_STATUS_RUNNING ) )
- {
- fprintf( stderr, "error: invalid status (!STOPPED&&!RUNNING)\n" );
- return VLC_ESTATUS;
- }
+ int i_err;
+ intf_thread_t *p_intf = NULL;
- p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+ if( !p_libvlc )
+ return VLC_EGENERIC;
- if( p_playlist == NULL )
+ if( !psz_module ) /* requesting the default interface */
{
- msg_Dbg( p_vlc, "no playlist present, creating one" );
- p_playlist = playlist_Create( p_vlc );
-
- if( p_playlist == NULL )
+ char *psz_interface = config_GetPsz( p_libvlc, "intf" );
+ if( !psz_interface || !*psz_interface ) /* "intf" has not been set */
{
- return VLC_EGENERIC;
+#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.") );
}
-
- vlc_object_yield( p_playlist );
+ free( psz_interface );
}
- err = playlist_Add( p_playlist, psz_target, i_mode, i_pos );
+ /* Try to create the interface */
+ 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 );
+ return VLC_EGENERIC;
+ }
- vlc_object_release( p_playlist );
+ /* Try to run the interface */
+ i_err = intf_RunThread( p_intf );
+ if( i_err )
+ {
+ vlc_object_detach( p_intf );
+ vlc_object_release( p_intf );
+ return i_err;
+ }
- return err;
-}
+ return VLC_SUCCESS;
+};
+#if defined( ENABLE_NLS ) && (defined (__APPLE__) || defined (WIN32)) && \
+ ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
/*****************************************************************************
- * vlc_set: set a vlc variable
+ * SetLanguage: set the interface language.
*****************************************************************************
- *
+ * We set the LC_MESSAGES locale category for interface messages and buttons,
+ * as well as the LC_CTYPE category for string sorting and possible wide
+ * character support.
*****************************************************************************/
-vlc_error_t vlc_set( const char *psz_var, const char *psz_val )
+static void SetLanguage ( const char *psz_lang )
{
- return vlc_set_r( ( i_vlc == 1 ) ? pp_vlc[0] : NULL, psz_var, psz_val );
+#ifdef __APPLE__
+ /* I need that under Darwin, please check it doesn't disturb
+ * other platforms. --Meuuh */
+ setenv( "LANG", psz_lang, 1 );
+
+#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. */
+ static char psz_lcall[20];
+ snprintf( psz_lcall, 19, "LC_ALL=%s", psz_lang );
+ psz_lcall[19] = '\0';
+ putenv( psz_lcall );
+#endif
+
+ setlocale( LC_ALL, psz_lang );
}
+#endif
-vlc_error_t vlc_set_r( vlc_t *p_vlc, const char *psz_var, const char *psz_val )
+
+static inline int LoadMessages (void)
{
- module_config_t *p_config;
+#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 )
+ static const char psz_path[] = LOCALEDIR;
+#else
+ char psz_path[1024];
+ if (snprintf (psz_path, sizeof (psz_path), "%s" DIR_SEP "%s",
+ config_GetDataDir(), "locale")
+ >= (int)sizeof (psz_path))
+ return -1;
- if( !p_vlc )
+#endif
+ if (bindtextdomain (PACKAGE_NAME, psz_path) == NULL)
{
- fprintf( stderr, "error: invalid status\n" );
- return VLC_ESTATUS;
+ fprintf (stderr, "Warning: cannot bind text domain "PACKAGE_NAME
+ " to directory %s\n", psz_path);
+ return -1;
}
- p_config = config_FindConfig( VLC_OBJECT(p_vlc), psz_var );
-
- if( !p_config )
+ /* 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)
{
- msg_Err( p_vlc, "option %s does not exist", psz_var );
- return VLC_EGENERIC;
+ 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;
}
- vlc_mutex_lock( p_config->p_lock );
+ /* 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;
+}
+
+/*****************************************************************************
+ * GetFilenames: parse command line options which are not flags
+ *****************************************************************************
+ * 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, const char *ppsz_argv[] )
+{
+ int i_opt, i_options;
- switch( p_config->i_type )
+ /* We assume that the remaining parameters are filenames
+ * and their input options */
+ for( i_opt = i_argc - 1; i_opt >= optind; i_opt-- )
{
- case CONFIG_ITEM_BOOL:
- if( psz_val && *psz_val )
- {
- if( !strcmp( psz_val, "off" ) || !strcmp( psz_val, "no" ) )
- {
- p_config->i_value = VLC_FALSE;
- }
- else
- {
- p_config->i_value = atoi( psz_val );
- }
- }
- else
- {
- p_config->i_value = VLC_TRUE;
- }
- break;
- case CONFIG_ITEM_INTEGER:
- if( psz_val && *psz_val )
- {
- p_config->i_value = atoi( psz_val );
- }
- else
- {
- p_config->i_value = 0;
- }
- break;
- case CONFIG_ITEM_FLOAT:
- if( psz_val && *psz_val )
- {
- p_config->f_value = (float)atof( psz_val );
- }
- else
- {
- p_config->f_value = 0.0;
- }
- break;
- case CONFIG_ITEM_STRING:
- case CONFIG_ITEM_FILE:
- case CONFIG_ITEM_MODULE:
- default:
- if( p_config->psz_value )
- {
- free( p_config->psz_value );
- }
+ i_options = 0;
- if( psz_val )
- {
- p_config->psz_value = strdup( psz_val );
- }
- else
+ /* Count the input options */
+ while( *ppsz_argv[ i_opt ] == ':' && i_opt > optind )
{
- p_config->psz_value = NULL;
+ i_options++;
+ i_opt--;
}
- break;
- }
- if( p_config->pf_callback )
- {
- vlc_mutex_unlock( p_config->p_lock );
- p_config->pf_callback( VLC_OBJECT(p_vlc) );
- }
- else
- {
- vlc_mutex_unlock( p_config->p_lock );
+ /* TODO: write an internal function of this one, to avoid
+ * unnecessary lookups. */
+
+ 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;
}
-/* following functions are local */
-
/*****************************************************************************
- * GetFilenames: parse command line options which are not flags
+ * Help: print program help
*****************************************************************************
- * Parse command line for input files.
+ * Print a short inline help. Message interface is initialized at this stage.
*****************************************************************************/
-static int GetFilenames( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] )
+static inline void print_help_on_full_help( void )
{
- int i_opt;
+ utf8_fprintf( stdout, "\n" );
+ utf8_fprintf( stdout, "%s\n", _("To get exhaustive help, use '-H'.") );
+}
- /* We assume that the remaining parameters are filenames */
- for( i_opt = optind; i_opt < i_argc; i_opt++ )
+static void Help( libvlc_int_t *p_this, char const *psz_help_name )
+{
+#ifdef WIN32
+ ShowConsole( true );
+#endif
+
+ if( psz_help_name && !strcmp( psz_help_name, "help" ) )
+ {
+ 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 );
+ Usage( p_this, NULL );
+ print_help_on_full_help();
+ }
+ else if( psz_help_name && !strcmp( psz_help_name, "full-help" ) )
{
- vlc_add_target_r( p_vlc, ppsz_argv[ i_opt ],
- PLAYLIST_APPEND, PLAYLIST_END );
+ utf8_fprintf( stdout, vlc_usage, p_this->psz_object_name );
+ Usage( p_this, NULL );
+ }
+ else if( psz_help_name )
+ {
+ Usage( p_this, psz_help_name );
}
- return VLC_SUCCESS;
+#ifdef WIN32 /* Pause the console because it's destroyed when we exit */
+ PauseConsole();
+#endif
}
/*****************************************************************************
- * Usage: print program usage
+ * Usage: print module usage
*****************************************************************************
* Print a short inline help. Message interface is initialized at this stage.
*****************************************************************************/
-static void Usage( vlc_t *p_this, const char *psz_module_name )
+# 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 )
{
-#define FORMAT_STRING " --%s%s%s%s%s%s%s %s%s\n"
- /* option name -------------' | | | | | |
- * <bra --------------------------' | | | | |
- * option type or "" ---------------' | | | |
- * ket> ------------------------------' | | |
- * padding spaces ----------------------' | |
- * comment --------------------------------' |
- * comment suffix ---------------------------'
+ 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 ------------' | | | | | |
+ * <bra ---------------------' | | | | |
+ * option type or "" ----------' | | | |
+ * ket> -------------------------' | | |
+ * padding spaces -----------------' | |
+ * comment --------------------------' |
+ * comment suffix ---------------------'
*
* The purpose of having bra and ket is that we might i18n them as well.
*/
-#define LINE_START 8
-#define PADDING_SPACES 25
- vlc_list_t *p_list;
- module_t **pp_parser;
- module_config_t *p_item;
- char psz_spaces[PADDING_SPACES+LINE_START+1];
- char psz_format[sizeof(FORMAT_STRING)];
- memset( psz_spaces, ' ', PADDING_SPACES+LINE_START );
- psz_spaces[PADDING_SPACES+LINE_START] = '\0';
-
- strcpy( psz_format, FORMAT_STRING );
+#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
#ifdef WIN32
- ShowConsole();
+# 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(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);
+ 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
+
+ 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( pp_parser = (module_t **)p_list->pp_objects ;
- *pp_parser ;
- pp_parser++ )
+ for( i_index = 0; i_index < p_list->i_count; i_index++ )
{
- vlc_bool_t b_help_module;
+ 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,
- (*pp_parser)->psz_object_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 */
- if( !(*pp_parser)->i_config_items )
+ if( !p_parser->i_config_items )
{
continue;
}
- b_help_module = !strcmp( "help", (*pp_parser)->psz_object_name );
+ 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 < p_end;
+ p_item++ )
+ {
+ if( (p_item->i_type & CONFIG_ITEM) &&
+ !p_item->b_advanced ) break;
+ }
+ }
+
+ /* Print name of module */
+ if( strcmp( "main", 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 = (*pp_parser)->p_config;
- p_item->i_type != CONFIG_HINT_END;
+ for( p_item = p_parser->p_config;
+ p_item < p_end;
p_item++ )
{
- char *psz_bra = NULL, *psz_type = NULL, *psz_ket = NULL;
- char *psz_suf = "", *psz_prefix = NULL;
- int i;
+ char *psz_text, *psz_spaces = psz_spaces_text;
+ 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 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;
+ }
switch( p_item->i_type )
{
case CONFIG_HINT_CATEGORY:
case CONFIG_HINT_USAGE:
- fprintf( stderr, " %s\n", p_item->psz_text );
+ if( !strcmp( "main", p_parser->psz_object_name ) )
+ {
+ 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:
case CONFIG_ITEM_FILE:
+ case CONFIG_ITEM_DIRECTORY:
case CONFIG_ITEM_MODULE: /* We could also have "=<" here */
- if( !p_item->ppsz_list )
+ case CONFIG_ITEM_MODULE_CAT:
+ case CONFIG_ITEM_MODULE_LIST:
+ case CONFIG_ITEM_MODULE_LIST_CAT:
+ 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_type = _("string"); psz_ket = ">";
- break;
+ psz_bra = OPTION_VALUE_SEP "{";
+ psz_type = psz_buffer;
+ psz_buffer[0] = '\0';
+ for( i = 0; p_item->ppsz_list[i]; i++ )
+ {
+ if( i ) strcat( psz_buffer, "," );
+ strcat( psz_buffer, p_item->ppsz_list[i] );
+ }
+ psz_ket = "}";
}
- else
+ break;
+ case CONFIG_ITEM_INTEGER:
+ case CONFIG_ITEM_KEY: /* FIXME: do something a bit more clever */
+ 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_type = malloc( 1000 );
- memset( psz_type, 0, 1000 );
- for( i=0; p_item->ppsz_list[i]; i++ )
+ psz_bra = OPTION_VALUE_SEP "{";
+ psz_type = psz_buffer;
+ psz_buffer[0] = '\0';
+ for( i = 0; p_item->ppsz_list_text[i]; i++ )
{
- strcat( psz_type, p_item->ppsz_list[i] );
- strcat( psz_type, "|" );
+ if( i ) strcat( psz_buffer, ", " );
+ sprintf( psz_buffer + strlen(psz_buffer), "%i (%s)",
+ p_item->pi_list[i],
+ p_item->ppsz_list_text[i] );
}
- psz_type[ strlen( psz_type ) - 1 ] = '\0';
- psz_ket = "]";
- break;
+ psz_ket = "}";
}
- case CONFIG_ITEM_INTEGER:
- psz_bra = " <"; psz_type = _("integer"); psz_ket = ">";
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;
}
+ if( !psz_type )
+ {
+ continue;
+ }
+
/* Add short option if any */
if( p_item->i_short )
{
- psz_format[2] = '-';
- psz_format[3] = p_item->i_short;
- psz_format[4] = ',';
+ sprintf( psz_short, "-%c,", p_item->i_short );
}
else
{
- psz_format[2] = ' ';
- psz_format[3] = ' ';
- psz_format[4] = ' ';
+ strcpy( psz_short, " " );
}
- if( psz_type )
+ i = PADDING_SPACES - strlen( p_item->psz_name )
+ - strlen( psz_bra ) - strlen( psz_type )
+ - strlen( psz_ket ) - 1;
+
+ if( p_item->i_type == CONFIG_ITEM_BOOL && !b_help_module )
{
- i = PADDING_SPACES - strlen( p_item->psz_name )
- - strlen( psz_bra ) - strlen( psz_type )
- - strlen( psz_ket ) - 1;
- if( p_item->i_type == CONFIG_ITEM_BOOL
- && !b_help_module )
- {
- /* If option is of type --foo-bar, we print its counterpart
- * as --no-foo-bar, but if it is of type --foobar (without
- * dashes in the name) we print it as --nofoobar. Both
- * values are of course valid, only the display changes. */
- vlc_bool_t b_dash = VLC_FALSE;
- psz_prefix = p_item->psz_name;
- while( *psz_prefix )
- {
- if( *psz_prefix++ == '-' )
- {
- b_dash = VLC_TRUE;
- break;
- }
- }
+ psz_prefix = ", --no-";
+ i -= strlen( p_item->psz_name ) + strlen( psz_prefix );
+ }
+
+ if( i < 0 )
+ {
+ psz_spaces[0] = '\n';
+ i = 0;
+ }
+ else
+ {
+ psz_spaces[i] = '\0';
+ }
+
+ if( p_item->i_type == CONFIG_ITEM_BOOL && !b_help_module )
+ {
+ 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
+ {
+ utf8_fprintf( stdout, psz_format, psz_short, p_item->psz_name,
+ "", "", psz_bra, psz_type, psz_ket, psz_spaces );
+ }
+
+ psz_spaces[i] = ' ';
+
+ /* We wrap the rest of the output */
+ sprintf( psz_buffer, "%s%s", p_item->psz_text, psz_suf );
+ b_description_hack = b_description;
- if( b_dash )
+ 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 <= i_cur_width )
+ {
+ if( b_color )
{
- psz_prefix = ", --no-";
- i -= strlen( p_item->psz_name ) + strlen( ", --no-" );
+ if( !b_description || b_description_hack )
+ utf8_fprintf( stdout, BLUE"%s\n"GRAY, psz_text );
+ else
+ utf8_fprintf( stdout, "%s\n", psz_text );
}
else
{
- psz_prefix = ", --no";
- i -= strlen( p_item->psz_name ) + strlen( ", --no" );
+ utf8_fprintf( stdout, "%s\n", psz_text );
}
+ break;
}
- if( i < 0 )
- {
- i = 0;
- psz_spaces[i] = '\n';
- }
- else
+ /* Otherwise, eat as many words as possible */
+ psz_parser = psz_text;
+ do
{
- psz_spaces[i] = '\0';
- }
-
- if( p_item->i_type == CONFIG_ITEM_BOOL &&
- !b_help_module )
+ psz_word = psz_parser;
+ psz_parser = strchr( psz_word, ' ' );
+ /* If no space was found, we reached the end of the text
+ * block; otherwise, we skip the space we just found. */
+ psz_parser = psz_parser ? psz_parser + 1
+ : psz_text + i_end;
+
+ } 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.
+ * - we used less than 80% of the width and the word we are
+ * 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
+ || ( (size_t)(psz_word - psz_text) < 80 * i_cur_width / 100
+ && (size_t)(psz_parser - psz_word) > 40 * i_cur_width / 100 ) )
{
- fprintf( stderr, psz_format, p_item->psz_name, psz_prefix,
- p_item->psz_name, psz_bra, psz_type, psz_ket,
- psz_spaces, p_item->psz_text, psz_suf );
+ 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
{
- fprintf( stderr, psz_format, p_item->psz_name, "", "",
- psz_bra, psz_type, psz_ket, psz_spaces,
- p_item->psz_text, psz_suf );
- }
- psz_spaces[i] = ' ';
- if ( p_item->ppsz_list )
- {
- free( psz_type );
+ psz_word[-1] = '\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 = psz_word;
}
}
+
+ if( b_description_hack && p_item->psz_longtext )
+ {
+ sprintf( psz_buffer, "%s%s", p_item->psz_longtext, psz_suf );
+ b_description_hack = false;
+ psz_spaces = psz_spaces_longtext;
+ utf8_fprintf( stdout, "%s", psz_spaces );
+ goto description;
+ }
}
}
+ 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 );
-
-#ifdef WIN32 /* Pause the console because it's destroyed when we exit */
- fprintf( stderr, _("\nPress the RETURN key to continue...\n") );
- getchar();
-#endif
}
/*****************************************************************************
* Print a list of all available modules (builtins and plugins) and a short
* description for each one.
*****************************************************************************/
-static void ListModules( vlc_t *p_this )
+static void ListModules( libvlc_int_t *p_this, bool b_verbose )
{
- vlc_list_t *p_list;
- module_t **pp_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();
+ ShowConsole( true );
#endif
- /* Usage */
- fprintf( stderr, _("Usage: %s [options] [parameters] [files]...\n\n"),
- p_this->p_vlc->psz_object_name );
-
- fprintf( stderr, _("[module] [description]\n") );
-
/* List all modules */
p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
/* Enumerate each module */
- for( pp_parser = (module_t **)p_list->pp_objects ;
- *pp_parser ;
- pp_parser++ )
+ for( i_index = 0; i_index < p_list->i_count; i_index++ )
{
int i;
+ p_parser = (module_t *)p_list->p_values[i_index].p_object ;
+
/* Nasty hack, but right now I'm too tired to think about a nice
* solution */
- i = 22 - strlen( (*pp_parser)->psz_object_name ) - 1;
+ i = 22 - strlen( p_parser->psz_object_name ) - 1;
if( i < 0 ) i = 0;
psz_spaces[i] = 0;
- fprintf( stderr, " %s%s %s\n", (*pp_parser)->psz_object_name,
- psz_spaces, (*pp_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] = ' ';
}
vlc_list_release( p_list );
#ifdef WIN32 /* Pause the console because it's destroyed when we exit */
- fprintf( stderr, _("\nPress the RETURN key to continue...\n") );
- getchar();
+ PauseConsole();
#endif
}
static void Version( void )
{
#ifdef WIN32
- ShowConsole();
+ ShowConsole( true );
#endif
- fprintf( stderr, VERSION_MESSAGE "\n" );
- fprintf( stderr,
- _("This program comes with NO WARRANTY, to the extent permitted by "
- "law.\nYou may redistribute it under the terms of the GNU General "
- "Public License;\nsee the file named COPYING for details.\n"
- "Written by the VideoLAN team at Ecole Centrale, Paris.\n") );
+ 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() );
+ if( strcmp( VLC_Changeset(), "exported" ) )
+ utf8_fprintf( stdout, _("Based upon Git commit [%s]\n"),
+ VLC_Changeset() );
+ utf8_fprintf( stdout, LICENSE_MSG );
#ifdef WIN32 /* Pause the console because it's destroyed when we exit */
- fprintf( stderr, _("\nPress the RETURN key to continue...\n") );
- getchar();
+ PauseConsole();
#endif
}
* This function is useful only on Win32.
*****************************************************************************/
#ifdef WIN32 /* */
-static void ShowConsole( void )
+static void ShowConsole( bool b_dofile )
{
+# ifndef UNDER_CE
+ FILE *f_help = NULL;
+
+ if( getenv( "PWD" ) && getenv( "PS1" ) ) return; /* cygwin shell */
+
AllocConsole();
- freopen( "CONOUT$", "w", stdout );
+ /* 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 );
- return;
+
+ if( b_dofile && (f_help = fopen( "vlc-help.txt", "wt" )) )
+ {
+ fclose( f_help );
+ freopen( "vlc-help.txt", "wt", stdout );
+ utf8_fprintf( stderr, _("\nDumped content to vlc-help.txt file.\n") );
+ }
+ else freopen( "CONOUT$", "w", stdout );
+
+# endif
}
#endif
+/*****************************************************************************
+ * PauseConsole: On Win32, wait for a key press before closing the console
+ *****************************************************************************
+ * This function is useful only on Win32.
+ *****************************************************************************/
+#ifdef WIN32 /* */
+static void PauseConsole( void )
+{
+# ifndef UNDER_CE
+
+ if( getenv( "PWD" ) && getenv( "PS1" ) ) return; /* cygwin shell */
+
+ utf8_fprintf( stderr, _("\nPress the RETURN key to continue...\n") );
+ getchar();
+ fclose( stdout );
+
+# endif
+}
+#endif
+
+/*****************************************************************************
+ * ConsoleWidth: Return the console width in characters
+ *****************************************************************************
+ * We use the stty shell command to get the console width; if this fails or
+ * if the width is less than 80, we default to 80.
+ *****************************************************************************/
+static int ConsoleWidth( void )
+{
+ unsigned i_width = 80;
+
+#ifndef WIN32
+ FILE *file = popen( "stty size 2>/dev/null", "r" );
+ if (file != NULL)
+ {
+ 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;
+}
+
+static int VerboseCallback( vlc_object_t *p_this, const char *psz_variable,
+ vlc_value_t old_val, vlc_value_t new_val, void *param)
+{
+ libvlc_int_t *p_libvlc = (libvlc_int_t *)p_this;
+ (void)psz_variable;
+ (void)old_val;
+ (void)param;
+
+ if( new_val.i_int >= -1 )
+ {
+ libvlc_priv (p_libvlc)->i_verbose = __MIN( new_val.i_int, 2 );
+ }
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * InitDeviceValues: initialize device values
+ *****************************************************************************
+ * This function inits the dvd, vcd and cd-audio values
+ *****************************************************************************/
+static void InitDeviceValues( libvlc_int_t *p_vlc )
+{
+#ifdef HAVE_HAL
+ LibHalContext * ctx = NULL;
+ int i, i_devices;
+ char **devices = NULL;
+ char *block_dev = NULL;
+ dbus_bool_t b_dvd;
+
+ DBusConnection *p_connection = NULL;
+ DBusError error;
+
+ 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 ) || !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 ) )
+ {
+ if( ( devices = libhal_get_all_devices( ctx, &i_devices, NULL ) ) )
+ {
+ for( i = 0; i < i_devices; i++ )
+ {
+ if( !libhal_device_property_exists( ctx, devices[i],
+ "storage.cdrom.dvd", NULL ) )
+ {
+ continue;
+ }
+ 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 );
+ if( b_dvd )
+ {
+ config_PutPsz( p_vlc, "dvd", block_dev );
+ }
+
+ config_PutPsz( p_vlc, "vcd", block_dev );
+ config_PutPsz( p_vlc, "cd-audio", block_dev );
+ libhal_free_string( block_dev );
+ }
+ libhal_free_string_array( devices );
+ }
+ libhal_ctx_shutdown( ctx, NULL );
+ dbus_connection_unref( p_connection );
+ libhal_ctx_free( ctx );
+ }
+ else
+ {
+ msg_Warn( p_vlc, "Unable to get HAL device properties" );
+ }
+#else
+ (void)p_vlc;
+#endif /* HAVE_HAL */
+}
projects / vlc / blobdiff