/*****************************************************************************
* libvlc.c: main libvlc source
- * Includes the main() function for vlc. Parses command line, starts playlist
- * and spawns threads.
*****************************************************************************
- * Copyright (C) 1998-2001 VideoLAN
- * $Id: libvlc.c,v 1.8 2002/06/07 14:30:41 sam Exp $
+ * Copyright (C) 1998-2002 VideoLAN
+ * $Id: libvlc.c,v 1.56 2003/01/07 13:26:22 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
* Pretend we are a builtin module
*****************************************************************************/
#define MODULE_NAME main
+#define MODULE_PATH main
#define __BUILTIN__
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <errno.h> /* ENOMEM */
-#include <stdio.h> /* sprintf() */
-#include <string.h> /* strerror() */
-#include <stdlib.h> /* free() */
-#include <signal.h> /* SIGHUP, SIGINT, SIGKILL */
-
#include <vlc/vlc.h>
-#ifdef HAVE_GETOPT_LONG
-# ifdef HAVE_GETOPT_H
-# include <getopt.h> /* getopt() */
-# endif
-#else
-# include "GNUgetopt/getopt.h"
+#ifdef HAVE_ERRNO_H
+# include <errno.h> /* ENOMEM */
#endif
+#include <stdio.h> /* sprintf() */
+#include <string.h> /* strerror() */
+#include <stdlib.h> /* free() */
#ifndef WIN32
# include <netinet/in.h> /* BSD: struct in_addr */
#ifdef HAVE_UNISTD_H
# include <unistd.h>
-#elif defined( _MSC_VER ) && defined( _WIN32 )
+#elif defined( _MSC_VER ) && defined( _WIN32 ) && !defined( UNDER_CE )
# include <io.h>
#endif
+#ifdef WIN32 /* optind, getopt(), included in unistd.h */
+# include "extras/getopt.h"
+#endif
+
#ifdef HAVE_LOCALE_H
# include <locale.h>
#endif
#include "vlc_cpu.h" /* CPU detection */
#include "os_specific.h"
+#include "error.h"
#include "netutils.h" /* network_ChannelJoin */
#include "stream_control.h"
#include "input_ext-intf.h"
-#include "playlist.h"
+#include "vlc_playlist.h"
#include "interface.h"
#include "audio_output.h"
#include "libvlc.h"
/*****************************************************************************
- * The evil global variables. We handle them with care, don't worry.
+ * The evil global variable. We handle it with care, don't worry.
*****************************************************************************/
-
-/* This global lock is used for critical sections - don't abuse it! */
-static vlc_mutex_t global_lock;
-void * p_global_data;
-
-/* A list of all the currently allocated vlc objects */
-static volatile int i_vlc = 0;
-static volatile vlc_t **pp_vlc = NULL;
+static libvlc_t libvlc;
+static vlc_t * p_static_vlc;
/*****************************************************************************
* Local prototypes
*****************************************************************************/
+static void SetLanguage ( char const * );
static int GetFilenames ( vlc_t *, int, char *[] );
-static void Usage ( vlc_t *, const char *psz_module_name );
+static void Usage ( vlc_t *, char const *psz_module_name );
static void ListModules ( vlc_t * );
static void Version ( void );
-static void Build ( void );
-
-#ifndef WIN32
-static void InitSignalHandler ( void );
-static void SimpleSignalHandler ( int i_signal );
-static void FatalSignalHandler ( int i_signal );
-#endif
#ifdef WIN32
static void ShowConsole ( void );
#endif
/*****************************************************************************
- * vlc_create: allocate a vlc_t structure, and initialize libvlc if needed.
+ * VLC_Version: return the libvlc version.
+ *****************************************************************************
+ * This function returns full version string (numeric version and codename).
+ *****************************************************************************/
+char const * VLC_Version( void )
+{
+ return VERSION_MESSAGE;
+}
+
+/*****************************************************************************
+ * VLC_Error: strerror() equivalent
*****************************************************************************
- * This function allocates a vlc_t structure and returns NULL in case of
- * failure. Also, the thread system and the signal handlers are initialized.
+ * This function returns full version string (numeric version and codename).
*****************************************************************************/
-vlc_t * vlc_create( void )
+char const * VLC_Error( int i_err )
{
+ return vlc_error( i_err );
+}
+
+/*****************************************************************************
+ * 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;
vlc_t * p_vlc = NULL;
+ vlc_value_t lockval;
- /* 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. */
+ i_ret = vlc_threads_init( &libvlc );
+ if( i_ret < 0 )
{
- return NULL;
+ return i_ret;
}
- p_vlc->psz_object_name = "root";
+ /* Now that the thread system is initialized, we don't have much, but
+ * at least we have var_Create */
+ var_Create( &libvlc, "libvlc", VLC_VAR_MUTEX );
+ var_Get( &libvlc, "libvlc", &lockval );
+ vlc_mutex_lock( lockval.p_address );
+ if( !libvlc.b_ready )
+ {
+ char *psz_env;
+
+ /* Guess what CPU we have */
+ libvlc.i_cpu = CPUCapabilities();
+
+ /* Find verbosity from VLC_VERBOSE environment variable */
+ psz_env = getenv( "VLC_VERBOSE" );
+ libvlc.i_verbose = psz_env ? atoi( psz_env ) : -1;
- p_vlc->p_global_lock = &global_lock;
- p_vlc->pp_global_data = &p_global_data;
+#ifdef HAVE_ISATTY
+ libvlc.b_color = isatty( 2 ); /* 2 is for stderr */
+#else
+ libvlc.b_color = VLC_FALSE;
+#endif
- p_vlc->b_verbose = VLC_FALSE;
- p_vlc->b_quiet = VLC_FALSE; /* FIXME: delay message queue output! */
+ /* Initialize message queue */
+ msg_Create( &libvlc );
- /* Initialize the threads system */
- vlc_threads_init( p_vlc );
+ /* Announce who we are */
+ msg_Dbg( &libvlc, COPYRIGHT_MESSAGE );
+ msg_Dbg( &libvlc, "libvlc was configured with %s", CONFIGURE_LINE );
+
+ /* 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( &libvlc );
+ module_LoadMain( &libvlc );
+
+ libvlc.b_ready = VLC_TRUE;
+ }
+ vlc_mutex_unlock( lockval.p_address );
+ var_Destroy( &libvlc, "libvlc" );
+
+ /* Allocate a vlc object */
+ p_vlc = vlc_object_create( &libvlc, VLC_OBJECT_VLC );
+ if( p_vlc == NULL )
+ {
+ return VLC_EGENERIC;
+ }
+
+ p_vlc->psz_object_name = "root";
/* Initialize mutexes */
vlc_mutex_init( p_vlc, &p_vlc->config_lock );
- vlc_mutex_init( p_vlc, &p_vlc->structure_lock );
-
- /* Set signal handling policy for all threads */
-#ifndef WIN32
- InitSignalHandler( );
-#endif
/* 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++;
- vlc_mutex_unlock( p_vlc->p_global_lock );
+ vlc_object_attach( p_vlc, &libvlc );
- /* Update the handle status */
- p_vlc->i_status = VLC_STATUS_CREATED;
+ /* Store data for the non-reentrant API */
+ p_static_vlc = p_vlc;
- return p_vlc;
+ return p_vlc->i_object_id;
}
/*****************************************************************************
- * vlc_init: initialize a vlc_t structure.
+ * VLC_Init: initialize a vlc_t structure.
*****************************************************************************
* This function initializes a previously allocated vlc_t structure:
* - CPU detection
* - message queue, module bank and playlist initialization
* - configuration and commandline parsing
*****************************************************************************/
-vlc_error_t vlc_init( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] )
+int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] )
{
- char p_capabilities[200];
- char *psz_module;
- char *p_tmp;
- module_t *p_help_module;
- playlist_t *p_playlist;
-
- /* Check that the handle is valid */
- if( !p_vlc || p_vlc->i_status != VLC_STATUS_CREATED )
- {
- fprintf( stderr, "error: invalid status\n" );
- return VLC_ESTATUS;
- }
-
- fprintf( stderr, COPYRIGHT_MESSAGE "\n" );
-
- /* Guess what CPU we have */
- p_vlc->i_cpu_capabilities = CPUCapabilities( p_vlc );
-
- /*
- * Support for gettext
- */
-#if defined( ENABLE_NLS ) && defined ( HAVE_GETTEXT )
-# if defined( HAVE_LOCALE_H ) && defined( HAVE_LC_MESSAGES )
- if( !setlocale( LC_MESSAGES, "" ) )
- {
- fprintf( stderr, "warning: unsupported locale settings\n" );
- }
+ char p_capabilities[200];
+ char * p_tmp;
+ vlc_bool_t b_exit;
+ vlc_t * p_vlc;
+ module_t *p_help_module;
+ playlist_t *p_playlist;
- setlocale( LC_CTYPE, "" );
-# endif
+ p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
- if( !bindtextdomain( PACKAGE, LOCALEDIR ) )
+ if( !p_vlc )
{
- fprintf( stderr, "warning: no domain %s in directory %s\n",
- PACKAGE, LOCALEDIR );
+ return VLC_ENOOBJ;
}
- textdomain( PACKAGE );
-#endif
-
/*
* System specific initialization code
*/
system_Init( p_vlc, &i_argc, ppsz_argv );
- /*
- * Initialize message queue
- */
- msg_Create( p_vlc );
-
/* Get the executable name (similar to the basename command) */
if( i_argc > 0 )
{
p_vlc->psz_object_name = "vlc";
}
- /* Announce who we are */
- msg_Dbg( p_vlc, COPYRIGHT_MESSAGE );
- msg_Dbg( p_vlc, "libvlc was configured with %s", CONFIGURE_LINE );
-
/*
- * 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)
+ * Support for gettext
*/
- module_InitBank( p_vlc );
- module_LoadMain( p_vlc );
+ SetLanguage( "" );
+
+ /* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */
+ msg_Dbg( p_vlc, "translation test: code is \"%s\"", _("C") );
/* 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 );
+ //module_EndBank( p_vlc );
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_EGENERIC;
}
p_help_module->psz_object_name = "help";
config_Duplicate( p_help_module, p_help_config );
- p_help_module->next = p_vlc->module_bank.first;
- p_vlc->module_bank.first = p_help_module;
+ vlc_object_attach( p_help_module, libvlc.p_module_bank );
/* End hack */
if( config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, VLC_TRUE ) )
{
- p_vlc->module_bank.first = p_help_module->next;
+ 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 );
+ //module_EndBank( p_vlc );
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_EGENERIC;
}
+ b_exit = VLC_FALSE;
+
/* Check for short help option */
if( config_GetInt( p_vlc, "help" ) )
{
- fprintf( stderr, _("Usage: %s [options] [parameters] [file]...\n"),
+ fprintf( stdout, _("Usage: %s [options] [items]...\n\n"),
p_vlc->psz_object_name );
-
- Usage( p_vlc, "help" );
Usage( p_vlc, "main" );
- p_vlc->module_bank.first = p_help_module->next;
- config_Free( p_help_module );
- vlc_object_destroy( p_help_module );
- module_EndBank( p_vlc );
- msg_Destroy( p_vlc );
- return VLC_EEXIT;
+ Usage( p_vlc, "help" );
+ b_exit = VLC_TRUE;
}
-
/* Check for version option */
- if( config_GetInt( p_vlc, "version" ) )
+ else if( config_GetInt( p_vlc, "version" ) )
{
Version();
- p_vlc->module_bank.first = p_help_module->next;
- config_Free( p_help_module );
- vlc_object_destroy( p_help_module );
- module_EndBank( p_vlc );
- msg_Destroy( p_vlc );
- return VLC_EEXIT;
+ b_exit = VLC_TRUE;
}
- /* Check for build option */
- if( config_GetInt( p_vlc, "build" ) )
+ /* Hack: remove the help module here */
+ vlc_object_detach( p_help_module );
+ /* End hack */
+
+ if( b_exit )
{
- Build();
- p_vlc->module_bank.first = p_help_module->next;
config_Free( p_help_module );
vlc_object_destroy( p_help_module );
- module_EndBank( p_vlc );
- msg_Destroy( p_vlc );
+ //module_EndBank( p_vlc );
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_EEXIT;
}
- /* Hack: remove the help module here */
- p_vlc->module_bank.first = p_help_module->next;
- /* End hack */
-
/*
* Load the builtins and plugins into the module_bank.
* We have to do it before config_Load*() because this also gets the
* list of configuration options exported by each module and loads their
* default values.
*/
- module_LoadBuiltins( p_vlc );
- module_LoadPlugins( p_vlc );
+ module_LoadBuiltins( &libvlc );
+ module_LoadPlugins( &libvlc );
msg_Dbg( p_vlc, "module bank initialized, found %i modules",
- p_vlc->module_bank.i_count );
+ libvlc.p_module_bank->i_children );
/* Hack: insert the help module here */
- p_help_module->next = p_vlc->module_bank.first;
- p_vlc->module_bank.first = p_help_module;
+ vlc_object_attach( p_help_module, libvlc.p_module_bank );
/* End hack */
/* Check for help on modules */
{
Usage( p_vlc, p_tmp );
free( p_tmp );
- p_vlc->module_bank.first = p_help_module->next;
- config_Free( p_help_module );
- vlc_object_destroy( p_help_module );
- module_EndBank( p_vlc );
- msg_Destroy( p_vlc );
- return VLC_EGENERIC;
+ b_exit = VLC_TRUE;
}
-
/* Check for long help option */
- if( config_GetInt( p_vlc, "longhelp" ) )
+ else if( config_GetInt( p_vlc, "longhelp" ) )
{
Usage( p_vlc, NULL );
- p_vlc->module_bank.first = p_help_module->next;
- config_Free( p_help_module );
- vlc_object_destroy( p_help_module );
- module_EndBank( p_vlc );
- msg_Destroy( p_vlc );
- return VLC_EEXIT;
+ b_exit = VLC_TRUE;
}
-
/* Check for module list option */
- if( config_GetInt( p_vlc, "list" ) )
+ else if( config_GetInt( p_vlc, "list" ) )
{
ListModules( p_vlc );
- p_vlc->module_bank.first = p_help_module->next;
- config_Free( p_help_module );
- vlc_object_destroy( p_help_module );
- module_EndBank( p_vlc );
- msg_Destroy( p_vlc );
- return VLC_EEXIT;
+ b_exit = VLC_TRUE;
}
/* Hack: remove the help module here */
- p_vlc->module_bank.first = p_help_module->next;
+ vlc_object_detach( p_help_module );
config_Free( p_help_module );
vlc_object_destroy( p_help_module );
/* End hack */
+ if( b_exit )
+ {
+ //module_EndBank( p_vlc );
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_EEXIT;
+ }
+
/*
* Override default configuration with config file settings
*/
"that they are valid.\nPress the RETURN key to continue..." );
getchar();
#endif
- module_EndBank( p_vlc );
- msg_Destroy( p_vlc );
+ //module_EndBank( p_vlc );
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_EGENERIC;
}
-
/*
* System specific configuration
*/
system_Configure( p_vlc );
+ /*
+ * Message queue options
+ */
+ if( config_GetInt( p_vlc, "quiet" ) )
+ {
+ libvlc.i_verbose = -1;
+ }
+ else
+ {
+ int i_tmp = config_GetInt( p_vlc, "verbose" );
+ if( i_tmp >= 0 )
+ {
+ libvlc.i_verbose = __MIN( i_tmp, 2 );
+ }
+ }
+ libvlc.b_color = libvlc.b_color || config_GetInt( p_vlc, "color" );
+
+ /*
+ * Output messages that may still be in the queue
+ */
+ msg_Flush( p_vlc );
+
/* p_vlc inititalization. FIXME ? */
p_vlc->i_desync = config_GetInt( p_vlc, "desync" ) * (mtime_t)1000;
- 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" );
+
+#if defined( __i386__ )
if( !config_GetInt( p_vlc, "mmx" ) )
- p_vlc->i_cpu_capabilities &= ~CPU_CAPABILITY_MMX;
+ libvlc.i_cpu &= ~CPU_CAPABILITY_MMX;
if( !config_GetInt( p_vlc, "3dn" ) )
- p_vlc->i_cpu_capabilities &= ~CPU_CAPABILITY_3DNOW;
+ libvlc.i_cpu &= ~CPU_CAPABILITY_3DNOW;
if( !config_GetInt( p_vlc, "mmxext" ) )
- p_vlc->i_cpu_capabilities &= ~CPU_CAPABILITY_MMXEXT;
+ libvlc.i_cpu &= ~CPU_CAPABILITY_MMXEXT;
if( !config_GetInt( p_vlc, "sse" ) )
- p_vlc->i_cpu_capabilities &= ~CPU_CAPABILITY_SSE;
+ libvlc.i_cpu &= ~CPU_CAPABILITY_SSE;
+#endif
+#if defined( __powerpc__ ) || defined( SYS_DARWIN )
if( !config_GetInt( p_vlc, "altivec" ) )
- p_vlc->i_cpu_capabilities &= ~CPU_CAPABILITY_ALTIVEC;
+ libvlc.i_cpu &= ~CPU_CAPABILITY_ALTIVEC;
+#endif
#define PRINT_CAPABILITY( capability, string ) \
- if( p_vlc->i_cpu_capabilities & capability ) \
+ if( libvlc.i_cpu & capability ) \
{ \
strncat( p_capabilities, string " ", \
sizeof(p_capabilities) - strlen(p_capabilities) ); \
/*
* Choose the best memcpy module
*/
- psz_module = config_GetPsz( p_vlc, "memcpy" );
- p_vlc->p_memcpy_module =
- module_Need( p_vlc, MODULE_CAPABILITY_MEMCPY, psz_module, NULL );
- if( psz_module ) free( psz_module );
- if( p_vlc->p_memcpy_module == NULL )
+ p_vlc->p_memcpy_module = module_Need( p_vlc, "memcpy", "$memcpy" );
+
+ if( p_vlc->pf_memcpy == NULL )
{
- msg_Err( p_vlc, "no suitable memcpy module, using libc default" );
p_vlc->pf_memcpy = memcpy;
}
- else
+
+ if( p_vlc->pf_memset == NULL )
{
- p_vlc->pf_memcpy = p_vlc->p_memcpy_module->p_functions
- ->memcpy.functions.memcpy.pf_memcpy;
+ p_vlc->pf_memset = memset;
}
/*
&& network_ChannelCreate( p_vlc ) )
{
/* On error during Channels initialization, switch off channels */
- msg_Err( p_vlc,
- "channels initialization failed, deactivating channels" );
+ msg_Warn( p_vlc,
+ "channels initialization failed, deactivating channels" );
config_PutInt( p_vlc, "network-channel", VLC_FALSE );
}
- /* Update the handle status */
- p_vlc->i_status = VLC_STATUS_STOPPED;
-
-/* XXX XXX XXX XXX XXX XXX XXX XXX */
-/* XXX XXX XXX XXX XXX XXX XXX XXX */
-/* XXX XXX XXX XXX XXX XXX XXX XXX */
/*
* Initialize playlist and get commandline files
*/
if( !p_playlist )
{
msg_Err( p_vlc, "playlist initialization failed" );
- module_EndBank( p_vlc );
- msg_Destroy( p_vlc );
+ if( p_vlc->p_memcpy_module != NULL )
+ {
+ module_Unneed( p_vlc, p_vlc->p_memcpy_module );
+ }
+ //module_EndBank( p_vlc );
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_EGENERIC;
}
* Get input filenames given as commandline arguments
*/
GetFilenames( p_vlc, i_argc, ppsz_argv );
-/* XXX XXX XXX XXX XXX XXX XXX XXX */
-/* XXX XXX XXX XXX XXX XXX XXX XXX */
-/* XXX XXX XXX XXX XXX XXX XXX XXX */
+ if( i_object ) vlc_object_release( p_vlc );
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( vlc_t *p_vlc )
-{
- /* Check that the handle is valid */
- if( !p_vlc || p_vlc->i_status != VLC_STATUS_STOPPED )
- {
- fprintf( stderr, "error: invalid status\n" );
- return VLC_ESTATUS;
- }
-
- /* Update the handle status */
- p_vlc->i_status = VLC_STATUS_RUNNING;
-
- return VLC_SUCCESS;
-}
-
-/*****************************************************************************
- * vlc_add_intf: add an interface
+ * VLC_AddIntf: 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
+ * 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.
*****************************************************************************/
-vlc_error_t vlc_add_intf( vlc_t *p_vlc, char *psz_module, vlc_bool_t b_block )
+int VLC_AddIntf( int i_object, char const *psz_module, vlc_bool_t b_block )
{
- vlc_error_t err;
+ int i_err;
intf_thread_t *p_intf;
+ vlc_t *p_vlc;
char *psz_oldmodule = NULL;
- /* Check that the handle is valid */
- if( !p_vlc || p_vlc->i_status != VLC_STATUS_RUNNING )
+ p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+
+ if( !p_vlc )
{
- fprintf( stderr, "error: invalid status\n" );
- return VLC_ESTATUS;
+ return VLC_ENOOBJ;
}
if( psz_module )
if( p_intf == NULL )
{
msg_Err( p_vlc, "interface initialization failed" );
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_EGENERIC;
}
/* Try to run the interface */
p_intf->b_block = b_block;
- err = intf_RunThread( p_intf );
- if( err )
+ i_err = intf_RunThread( p_intf );
+ if( i_err )
{
+ vlc_object_detach( p_intf );
intf_Destroy( p_intf );
- return err;
+ if( i_object ) vlc_object_release( p_vlc );
+ return i_err;
}
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_SUCCESS;
}
/*****************************************************************************
- * vlc_stop: stop playing.
+ * VLC_Destroy: stop playing and destroy everything.
*****************************************************************************
- * This function requests the interface threads to finish, waits for their
+ * This function requests the running threads to finish, waits for their
* termination, and destroys their structure.
*****************************************************************************/
-vlc_error_t vlc_stop( vlc_t *p_vlc )
+int VLC_Destroy( int i_object )
{
- intf_thread_t *p_intf;
- playlist_t *p_playlist;
- vout_thread_t *p_vout;
- aout_thread_t *p_aout;
+ vlc_t *p_vlc;
- /* Check that the handle is valid */
- if( !p_vlc || p_vlc->i_status != VLC_STATUS_RUNNING )
+ p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+
+ if( !p_vlc )
{
- fprintf( stderr, "error: invalid status\n" );
- return VLC_ESTATUS;
+ return VLC_ENOOBJ;
}
/*
- * Ask the interfaces to stop and destroy them
+ * Go back into channel 0 which is the network
*/
- msg_Dbg( p_vlc, "removing all interfaces" );
- while( (p_intf = vlc_object_find( p_vlc, VLC_OBJECT_INTF, FIND_CHILD )) )
+ if( config_GetInt( p_vlc, "network-channel" ) && p_vlc->p_channel )
{
- intf_StopThread( p_intf );
- vlc_object_detach_all( p_intf );
- vlc_object_release( p_intf );
- intf_Destroy( p_intf );
+ network_ChannelJoin( p_vlc, COMMON_CHANNEL );
}
-
+
/*
- * Free playlists
+ * Free allocated memory
*/
- msg_Dbg( p_vlc, "removing all playlists" );
- while( (p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST,
- FIND_CHILD )) )
+ if( p_vlc->p_memcpy_module )
{
- vlc_object_detach_all( p_playlist );
- vlc_object_release( p_playlist );
- playlist_Destroy( p_playlist );
+ module_Unneed( p_vlc, p_vlc->p_memcpy_module );
+ p_vlc->p_memcpy_module = NULL;
}
- /*
- * Free video outputs
- */
- msg_Dbg( p_vlc, "removing all video outputs" );
- while( (p_vout = vlc_object_find( p_vlc, VLC_OBJECT_VOUT, FIND_CHILD )) )
+ if( p_vlc->psz_homedir )
{
- vlc_object_detach_all( p_vout );
- vlc_object_release( p_vout );
- vout_DestroyThread( p_vout );
+ free( p_vlc->psz_homedir );
+ p_vlc->psz_homedir = NULL;
}
/*
- * Free audio outputs
+ * XXX: Free module bank !
*/
- msg_Dbg( p_vlc, "removing all audio outputs" );
- while( (p_aout = vlc_object_find( p_vlc, VLC_OBJECT_AOUT, FIND_CHILD )) )
+ //module_EndBank( p_vlc );
+
+ /*
+ * System specific cleaning code
+ */
+ system_End( p_vlc );
+
+ /* Destroy mutexes */
+ vlc_mutex_destroy( &p_vlc->config_lock );
+
+ vlc_object_detach( p_vlc );
+
+ vlc_object_destroy( p_vlc );
+
+ /* Stop thread system: last one out please shut the door! */
+ vlc_threads_end( &libvlc );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ 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.
+ *****************************************************************************/
+int VLC_Die( int i_object )
+{
+ vlc_t *p_vlc;
+
+ p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+
+ if( !p_vlc )
{
- vlc_object_detach_all( p_aout );
- vlc_object_release( p_aout );
- aout_DestroyThread( p_aout );
+ return VLC_ENOOBJ;
}
- /* Update the handle status */
- p_vlc->i_status = VLC_STATUS_STOPPED;
+ p_vlc->b_die = VLC_TRUE;
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_SUCCESS;
}
/*****************************************************************************
- * vlc_end: uninitialize everything.
+ * VLC_AddTarget: adds a target for playing.
*****************************************************************************
- * This function uninitializes every vlc component that was activated in
- * vlc_init: audio and video outputs, playlist, module bank and message queue.
+ * This function adds psz_target to the current playlist. If a playlist does
+ * not exist, it will create one.
*****************************************************************************/
-vlc_error_t vlc_end( vlc_t *p_vlc )
+int VLC_AddTarget( int i_object, char const *psz_target, int i_mode, int i_pos )
{
- /* Check that the handle is valid */
- if( !p_vlc || p_vlc->i_status != VLC_STATUS_STOPPED )
+ int i_err;
+ playlist_t *p_playlist;
+ vlc_t *p_vlc;
+
+ p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+
+ if( !p_vlc )
{
- fprintf( stderr, "error: invalid status\n" );
- return VLC_ESTATUS;
+ return VLC_ENOOBJ;
}
- /*
- * Go back into channel 0 which is the network
- */
- if( config_GetInt( p_vlc, "network-channel" ) && p_vlc->p_channel )
+ p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+
+ if( p_playlist == NULL )
{
- network_ChannelJoin( p_vlc, COMMON_CHANNEL );
+ msg_Dbg( p_vlc, "no playlist present, creating one" );
+ p_playlist = playlist_Create( p_vlc );
+
+ if( p_playlist == NULL )
+ {
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_EGENERIC;
+ }
+
+ vlc_object_yield( p_playlist );
}
- /*
- * Free allocated memory
- */
- if( p_vlc->p_memcpy_module != NULL )
+ i_err = playlist_Add( p_playlist, psz_target, i_mode, i_pos );
+
+ vlc_object_release( p_playlist );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return i_err;
+}
+
+/*****************************************************************************
+ * VLC_Set: set a vlc variable
+ *****************************************************************************
+ *
+ *****************************************************************************/
+int VLC_Set( int i_object, char const *psz_var, vlc_value_t value )
+{
+ vlc_t *p_vlc;
+ int i_ret;
+
+ p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+
+ if( !p_vlc )
{
- module_Unneed( p_vlc->p_memcpy_module );
+ return VLC_ENOOBJ;
}
- free( p_vlc->psz_homedir );
+ /* 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;
- /*
- * Free module bank
- */
- module_EndBank( p_vlc );
+ p_item = config_FindConfig( VLC_OBJECT(p_vlc), psz_newvar );
- /*
- * System specific cleaning code
- */
- system_End( p_vlc );
-
- /*
- * Terminate messages interface and program
- */
- msg_Destroy( p_vlc );
+ if( p_item )
+ {
+ switch( p_item->i_type )
+ {
+ case CONFIG_ITEM_BOOL:
+ config_PutInt( p_vlc, psz_newvar, value.b_bool );
+ break;
+ case CONFIG_ITEM_INTEGER:
+ config_PutInt( p_vlc, psz_newvar, value.i_int );
+ break;
+ case CONFIG_ITEM_FLOAT:
+ config_PutFloat( p_vlc, psz_newvar, value.f_float );
+ break;
+ default:
+ config_PutPsz( p_vlc, psz_newvar, value.psz_string );
+ break;
+ }
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_SUCCESS;
+ }
+ }
- /* Update the handle status */
- p_vlc->i_status = VLC_STATUS_CREATED;
+ i_ret = var_Set( p_vlc, psz_var, value );
- return VLC_SUCCESS;
+ if( i_object ) vlc_object_release( p_vlc );
+ return i_ret;
}
/*****************************************************************************
- * vlc_destroy: free allocated resources.
+ * VLC_Get: get a vlc variable
*****************************************************************************
- * This function frees the previously allocated vlc_t structure.
+ *
*****************************************************************************/
-vlc_error_t vlc_destroy( vlc_t *p_vlc )
+int VLC_Get( int i_object, char const *psz_var, vlc_value_t *p_value )
{
- int i_index;
+ vlc_t *p_vlc;
+ int i_ret;
- /* Check that the handle is valid */
- if( !p_vlc || p_vlc->i_status != VLC_STATUS_CREATED )
+ p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+
+ if( !p_vlc )
{
- fprintf( stderr, "error: invalid status\n" );
- return VLC_ESTATUS;
+ return VLC_ENOOBJ;
}
- /* Update the handle status, just in case */
- p_vlc->i_status = VLC_STATUS_NONE;
+ i_ret = var_Get( p_vlc, psz_var, p_value );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return i_ret;
+}
+
+/* FIXME: temporary hacks */
+
+/*****************************************************************************
+ * VLC_Play: play
+ *****************************************************************************/
+int VLC_Play( int i_object )
+{
+ playlist_t * p_playlist;
+ vlc_t *p_vlc;
+
+ p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
- /* 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++ )
+ /* Check that the handle is valid */
+ if( !p_vlc )
{
- if( pp_vlc[ i_index ] == p_vlc )
- {
- break;
- }
+ return VLC_ENOOBJ;
}
-
- if( i_index == i_vlc )
+
+ /* add pseudo sap interface; non blocking */
+ if( config_GetInt( p_vlc, "sap" ) )
{
- fprintf( stderr, "error: trying to unregister %p which is not in "
- "the list\n", p_vlc );
- vlc_mutex_unlock( p_vlc->p_global_lock );
- vlc_object_destroy( p_vlc );
- return VLC_EGENERIC;
+ msg_Dbg( p_vlc, "adding sap interface" );
+ VLC_AddIntf( 0, "sap", VLC_FALSE );
}
- for( i_index++ ; i_index < i_vlc ; i_index++ )
+ vlc_thread_set_priority( p_vlc, VLC_THREAD_PRIORITY_LOW );
+
+ p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
+
+ if( !p_playlist )
{
- pp_vlc[ i_index - 1 ] = pp_vlc[ i_index ];
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_ENOOBJ;
}
- i_vlc--;
- if( i_vlc )
+ vlc_mutex_lock( &p_playlist->object_lock );
+ if( p_playlist->i_size )
{
- pp_vlc = realloc( pp_vlc, i_vlc * sizeof( vlc_t * ) );
+ vlc_mutex_unlock( &p_playlist->object_lock );
+ playlist_Play( p_playlist );
}
else
{
- free( pp_vlc );
- pp_vlc = NULL;
+ vlc_mutex_unlock( &p_playlist->object_lock );
}
- vlc_mutex_unlock( p_vlc->p_global_lock );
- /* Stop thread system FIXME: last one out please shut the door! */
- //vlc_threads_end( );
-
- /* Destroy mutexes */
- vlc_mutex_destroy( &p_vlc->structure_lock );
- vlc_mutex_destroy( &p_vlc->config_lock );
-
- vlc_object_destroy( p_vlc );
+ vlc_object_release( p_playlist );
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_SUCCESS;
}
-vlc_status_t vlc_status( vlc_t *p_vlc )
+/*****************************************************************************
+ * VLC_Stop: stop
+ *****************************************************************************/
+int VLC_Stop( int i_object )
{
+ intf_thread_t * p_intf;
+ playlist_t * p_playlist;
+ vout_thread_t * p_vout;
+ aout_instance_t * p_aout;
+ vlc_t *p_vlc;
+
+ p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+
+ /* Check that the handle is valid */
if( !p_vlc )
{
- return VLC_STATUS_NONE;
+ return VLC_ENOOBJ;
}
- return p_vlc->i_status;
+ /*
+ * 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 )) )
+ {
+ intf_StopThread( p_intf );
+ vlc_object_detach( p_intf );
+ vlc_object_release( p_intf );
+ intf_Destroy( p_intf );
+ }
+
+ /*
+ * 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 );
+ }
+
+ /*
+ * 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_Destroy( p_vout );
+ }
+
+ /*
+ * 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 );
+ }
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_SUCCESS;
}
-vlc_error_t vlc_add_target( vlc_t *p_vlc, char *psz_target,
- int i_mode, int i_pos )
+/*****************************************************************************
+ * VLC_Pause: toggle pause
+ *****************************************************************************/
+int VLC_Pause( int i_object )
{
- vlc_error_t err;
- playlist_t *p_playlist;
+ input_thread_t *p_input;
+ vlc_t *p_vlc;
+
+ p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
- if( !p_vlc || ( p_vlc->i_status != VLC_STATUS_STOPPED
- && p_vlc->i_status != VLC_STATUS_RUNNING ) )
+ if( !p_vlc )
{
- fprintf( stderr, "error: invalid status\n" );
- return VLC_ESTATUS;
+ return VLC_ENOOBJ;
}
- p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+ p_input = vlc_object_find( p_vlc, VLC_OBJECT_INPUT, FIND_CHILD );
- if( p_playlist == NULL )
+ if( !p_input )
{
- msg_Dbg( p_vlc, "no playlist present, creating one" );
- p_playlist = playlist_Create( p_vlc );
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_ENOOBJ;
+ }
- if( p_playlist == NULL )
- {
- return VLC_EGENERIC;
- }
+ input_SetStatus( p_input, INPUT_STATUS_PAUSE );
+ vlc_object_release( p_input );
- vlc_object_yield( p_playlist );
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * VLC_FullScreen: toggle fullscreen mode
+ *****************************************************************************/
+int VLC_FullScreen( int i_object )
+{
+ vout_thread_t *p_vout;
+ vlc_t *p_vlc;
+
+ p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
}
- err = playlist_Add( p_playlist, psz_target, i_mode, i_pos );
+ p_vout = vlc_object_find( p_vlc, VLC_OBJECT_VOUT, FIND_CHILD );
- vlc_object_release( p_playlist );
+ if( !p_vout )
+ {
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_ENOOBJ;
+ }
- return err;
+ p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
+ vlc_object_release( p_vout );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_SUCCESS;
}
/* following functions are local */
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+static void SetLanguage ( char const *psz_lang )
+{
+#if defined( ENABLE_NLS ) \
+ && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
+
+ char * psz_path;
+#ifdef SYS_DARWIN
+ char * psz_vlcpath = system_GetProgramPath();
+ char psz_tmp[1024];
+#endif
+
+# if defined( HAVE_INCLUDED_GETTEXT ) && !defined( HAVE_LC_MESSAGES )
+ if( *psz_lang )
+ {
+ /* 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
+
+# if defined( HAVE_LC_MESSAGES )
+ setlocale( LC_MESSAGES, psz_lang );
+# endif
+ setlocale( LC_CTYPE, psz_lang );
+
+ /* Specify where to find the locales for current domain */
+#ifndef SYS_DARWIN
+ psz_path = LOCALEDIR;
+#else
+ snprintf( psz_tmp, sizeof(psz_tmp), "%s/%s", psz_vlcpath,
+ "locale" );
+ psz_path = psz_tmp;
+#endif
+ if( !bindtextdomain( PACKAGE, psz_path ) )
+ {
+ fprintf( stderr, "warning: no domain %s in directory %s\n",
+ PACKAGE, psz_path );
+ }
+
+ /* Set the default domain */
+ textdomain( PACKAGE );
+#endif
+}
+
/*****************************************************************************
* GetFilenames: parse command line options which are not flags
*****************************************************************************
int i_opt;
/* We assume that the remaining parameters are filenames */
- for( i_opt = optind; i_opt < i_argc; i_opt++ )
+ for( i_opt = i_argc - 1; i_opt > optind; i_opt-- )
+ {
+ /* TODO: write an internal function of this one, to avoid
+ * unnecessary lookups. */
+ VLC_AddTarget( p_vlc->i_object_id, ppsz_argv[ i_opt ],
+ PLAYLIST_INSERT, 0 );
+ }
+
+ /* If there is at least one target, play it */
+ if( i_argc > optind )
{
- vlc_add_target( p_vlc, ppsz_argv[ i_opt ],
- PLAYLIST_APPEND, PLAYLIST_END );
+ VLC_AddTarget( p_vlc->i_object_id, ppsz_argv[ optind ],
+ PLAYLIST_INSERT | PLAYLIST_GO, 0 );
}
return VLC_SUCCESS;
*****************************************************************************
* Print a short inline help. Message interface is initialized at this stage.
*****************************************************************************/
-static void Usage( vlc_t *p_this, const char *psz_module_name )
+static void Usage( vlc_t *p_this, char const *psz_module_name )
{
#define FORMAT_STRING " --%s%s%s%s%s%s%s %s%s\n"
/* option name -------------' | | | | | |
*/
#define LINE_START 8
#define PADDING_SPACES 25
- module_t *p_module;
+ vlc_list_t list;
+ module_t *p_parser;
module_config_t *p_item;
char psz_spaces[PADDING_SPACES+LINE_START+1];
char psz_format[sizeof(FORMAT_STRING)];
+ int i_index;
memset( psz_spaces, ' ', PADDING_SPACES+LINE_START );
psz_spaces[PADDING_SPACES+LINE_START] = '\0';
ShowConsole();
#endif
+ /* List all modules */
+ list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+
/* Enumerate the config for each module */
- for( p_module = p_this->p_vlc->module_bank.first ;
- p_module != NULL ;
- p_module = p_module->next )
+ for( i_index = 0; i_index < list.i_count; i_index++ )
{
- vlc_bool_t b_help_module = !strcmp( "help", p_module->psz_object_name );
+ vlc_bool_t b_help_module;
+
+ p_parser = (module_t *)list.p_values[i_index].p_object ;
if( psz_module_name && strcmp( psz_module_name,
- p_module->psz_object_name ) )
+ p_parser->psz_object_name ) )
{
continue;
}
/* Ignore modules without config options */
- if( !p_module->i_config_items )
+ if( !p_parser->i_config_items )
{
continue;
}
- /* Print module name */
- fprintf( stderr, _("%s module options:\n\n"),
- p_module->psz_object_name );
+ b_help_module = !strcmp( "help", p_parser->psz_object_name );
- for( p_item = p_module->p_config;
- p_item->i_type != MODULE_CONFIG_HINT_END;
+ /* Print module options */
+ for( p_item = p_parser->p_config;
+ p_item->i_type != CONFIG_HINT_END;
p_item++ )
{
char *psz_bra = NULL, *psz_type = NULL, *psz_ket = NULL;
switch( p_item->i_type )
{
- case MODULE_CONFIG_HINT_CATEGORY:
- fprintf( stderr, " %s\n", p_item->psz_text );
+ case CONFIG_HINT_CATEGORY:
+ case CONFIG_HINT_USAGE:
+ fprintf( stdout, " %s\n", p_item->psz_text );
break;
- case MODULE_CONFIG_ITEM_STRING:
- case MODULE_CONFIG_ITEM_FILE:
- case MODULE_CONFIG_ITEM_MODULE: /* We could also have "=<" here */
- psz_bra = " <"; psz_type = _("string"); psz_ket = ">";
- break;
- case MODULE_CONFIG_ITEM_INTEGER:
+ case CONFIG_ITEM_STRING:
+ case CONFIG_ITEM_FILE:
+ case CONFIG_ITEM_MODULE: /* We could also have "=<" here */
+ if( !p_item->ppsz_list )
+ {
+ psz_bra = " <"; psz_type = _("string"); psz_ket = ">";
+ break;
+ }
+ else
+ {
+ psz_bra = " [";
+ psz_type = malloc( 1000 );
+ memset( psz_type, 0, 1000 );
+ for( i=0; p_item->ppsz_list[i]; i++ )
+ {
+ strcat( psz_type, p_item->ppsz_list[i] );
+ strcat( psz_type, "|" );
+ }
+ psz_type[ strlen( psz_type ) - 1 ] = '\0';
+ psz_ket = "]";
+ break;
+ }
+ case CONFIG_ITEM_INTEGER:
psz_bra = " <"; psz_type = _("integer"); psz_ket = ">";
break;
- case MODULE_CONFIG_ITEM_FLOAT:
+ case CONFIG_ITEM_FLOAT:
psz_bra = " <"; psz_type = _("float"); psz_ket = ">";
break;
- case MODULE_CONFIG_ITEM_BOOL:
+ case CONFIG_ITEM_BOOL:
psz_bra = ""; psz_type = ""; psz_ket = "";
if( !b_help_module )
{
break;
}
- /* Add short option */
+ /* Add short option if any */
if( p_item->i_short )
{
psz_format[2] = '-';
i = PADDING_SPACES - strlen( p_item->psz_name )
- strlen( psz_bra ) - strlen( psz_type )
- strlen( psz_ket ) - 1;
- if( p_item->i_type == MODULE_CONFIG_ITEM_BOOL
+ 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 )
psz_spaces[i] = '\0';
}
- if( p_item->i_type == MODULE_CONFIG_ITEM_BOOL &&
+ if( p_item->i_type == CONFIG_ITEM_BOOL &&
!b_help_module )
{
- fprintf( stderr, psz_format, p_item->psz_name, psz_prefix,
+ fprintf( stdout, 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 );
}
else
{
- fprintf( stderr, psz_format, p_item->psz_name, "", "",
+ fprintf( stdout, 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 );
+ }
}
}
-
- /* Yet another nasty hack.
- * Maybe we could use MODULE_CONFIG_ITEM_END to display tail messages
- * for each module?? */
- if( !strcmp( "main", p_module->psz_object_name ) )
- {
- fprintf( stderr, _("\nPlaylist items:"
- "\n *.mpg, *.vob plain MPEG-1/2 files"
- "\n [dvd:][device][@raw_device][@[title][,[chapter][,angle]]]"
- "\n DVD device"
- "\n [vcd:][device][@[title][,[chapter]]"
- "\n VCD device"
- "\n udpstream:[@[<bind address>][:<bind port>]]"
- "\n UDP stream sent by VLS"
- "\n vlc:loop loop execution of the "
- "playlist"
- "\n vlc:pause pause execution of "
- "playlist items"
- "\n vlc:quit quit VLC"
- "\n") );
- }
-
- fprintf( stderr, "\n" );
-
}
+ /* Release the module list */
+ vlc_list_release( &list );
+
#ifdef WIN32 /* Pause the console because it's destroyed when we exit */
- fprintf( stderr, _("\nPress the RETURN key to continue...\n") );
+ fprintf( stdout, _("\nPress the RETURN key to continue...\n") );
getchar();
#endif
}
*****************************************************************************/
static void ListModules( vlc_t *p_this )
{
- module_t *p_module;
+ vlc_list_t list;
+ module_t *p_parser;
char psz_spaces[22];
+ int i_index;
memset( psz_spaces, ' ', 22 );
#endif
/* Usage */
- fprintf( stderr, _("Usage: %s [options] [parameters] [file]...\n\n"),
+ fprintf( stdout, _("Usage: %s [options] [items]...\n\n"),
p_this->p_vlc->psz_object_name );
- fprintf( stderr, _("[module] [description]\n") );
+ fprintf( stdout, _("[module] [description]\n") );
+
+ /* List all modules */
+ list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
/* Enumerate each module */
- for( p_module = p_this->p_vlc->module_bank.first ;
- p_module != NULL ;
- p_module = p_module->next )
+ for( i_index = 0; i_index < list.i_count; i_index++ )
{
int i;
+ p_parser = (module_t *)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( p_module->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", p_module->psz_object_name, psz_spaces,
- p_module->psz_longname );
+ fprintf( stdout, " %s%s %s\n", p_parser->psz_object_name,
+ psz_spaces, p_parser->psz_longname );
psz_spaces[i] = ' ';
-
}
+ vlc_list_release( &list );
+
#ifdef WIN32 /* Pause the console because it's destroyed when we exit */
- fprintf( stderr, _("\nPress the RETURN key to continue...\n") );
- getchar();
+ fprintf( stdout, _("\nPress the RETURN key to continue...\n") );
+ getchar();
#endif
}
ShowConsole();
#endif
- fprintf( stderr, VERSION_MESSAGE "\n" );
- fprintf( stderr,
+ fprintf( stdout, VERSION_MESSAGE "\n" );
+ fprintf( stdout,
_("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") );
#ifdef WIN32 /* Pause the console because it's destroyed when we exit */
- fprintf( stderr, _("\nPress the RETURN key to continue...\n") );
- getchar();
-#endif
-}
-
-/*****************************************************************************
- * Build: print information about the vlc build
- *****************************************************************************
- * Print the ./configure command line and other information.
- *****************************************************************************/
-static void Build( void )
-{
-#ifdef WIN32
- ShowConsole();
-#endif
-
- fprintf( stderr, "configured with %s\n", CONFIGURE_LINE );
-
-#ifdef WIN32 /* Pause the console because it's destroyed when we exit */
- fprintf( stderr, _("\nPress the RETURN key to continue...\n") );
+ fprintf( stdout, _("\nPress the RETURN key to continue...\n") );
getchar();
#endif
}
#ifdef WIN32 /* */
static void ShowConsole( void )
{
+# ifndef UNDER_CE
AllocConsole();
freopen( "CONOUT$", "w", stdout );
freopen( "CONOUT$", "w", stderr );
freopen( "CONIN$", "r", stdin );
+# endif
return;
}
#endif
-
-#ifndef WIN32
-/*****************************************************************************
- * InitSignalHandler: system signal handler initialization
- *****************************************************************************
- * Set the signal handlers. SIGTERM is not intercepted, because we need at
- * at least a method to kill the program when all other methods failed, and
- * when we don't want to use SIGKILL.
- *****************************************************************************/
-static void InitSignalHandler( void )
-{
- /* Termination signals */
- signal( SIGINT, FatalSignalHandler );
- signal( SIGHUP, FatalSignalHandler );
- signal( SIGQUIT, FatalSignalHandler );
-
- /* Other signals */
- signal( SIGALRM, SimpleSignalHandler );
- signal( SIGPIPE, SimpleSignalHandler );
-}
-
-/*****************************************************************************
- * SimpleSignalHandler: system signal handler
- *****************************************************************************
- * This function is called when a non fatal signal is received by the program.
- *****************************************************************************/
-static void SimpleSignalHandler( int i_signal )
-{
- int i_index;
-
- /* Acknowledge the signal received and warn all the p_vlc structures */
- vlc_mutex_lock( &global_lock );
- for( i_index = 0 ; i_index < i_vlc ; i_index++ )
- {
- msg_Warn( pp_vlc[ i_index ], "ignoring signal %d", i_signal );
- }
- vlc_mutex_unlock( &global_lock );
-}
-
-/*****************************************************************************
- * FatalSignalHandler: system signal handler
- *****************************************************************************
- * This function is called when a fatal signal is received by the program.
- * It tries to end the program in a clean way.
- *****************************************************************************/
-static void FatalSignalHandler( int i_signal )
-{
- static mtime_t abort_time = 0;
- static volatile vlc_bool_t b_die = VLC_FALSE;
- int i_index;
-
- /* Once a signal has been trapped, the termination sequence will be
- * armed and following signals will be ignored to avoid sending messages
- * to an interface having been destroyed */
-
- vlc_mutex_lock( &global_lock );
- if( !b_die )
- {
- b_die = VLC_TRUE;
- abort_time = mdate();
-
- /* Try to terminate everything - this is done by requesting the end of
- * all the p_vlc structures */
- for( i_index = 0 ; i_index < i_vlc ; i_index++ )
- {
- /* Acknowledge the signal received */
- msg_Err( pp_vlc[ i_index ], "signal %d received, exiting - do it "
- "again in case vlc gets stuck", i_signal );
- pp_vlc[ i_index ]->b_die = VLC_TRUE;
- }
- }
- else if( mdate() > abort_time + 1000000 )
- {
- /* If user asks again 1 second later, die badly */
- signal( SIGINT, SIG_IGN );
- signal( SIGHUP, SIG_IGN );
- signal( SIGQUIT, SIG_IGN );
-
- for( i_index = 0 ; i_index < i_vlc ; i_index++ )
- {
- msg_Err( pp_vlc[ i_index ], "user insisted too much, dying badly" );
- }
-
- vlc_mutex_unlock( &global_lock );
- exit( 1 );
- }
-
- vlc_mutex_unlock( &global_lock );
-}
-#endif
-
projects / vlc / blobdiff