* libvlc.c: main libvlc source
*****************************************************************************
* Copyright (C) 1998-2002 VideoLAN
- * $Id: libvlc.c,v 1.34 2002/10/03 13:21:55 sam Exp $
+ * $Id: libvlc.c,v 1.55 2002/12/27 00:17:48 massiot Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <errno.h> /* ENOMEM */
+#include <vlc/vlc.h>
+
+#ifdef HAVE_ERRNO_H
+# include <errno.h> /* ENOMEM */
+#endif
#include <stdio.h> /* sprintf() */
#include <string.h> /* strerror() */
#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( _MSC_VER ) && defined( _WIN32 ) && !defined( UNDER_CE )
# include <io.h>
#endif
#ifdef WIN32 /* optind, getopt(), included in unistd.h */
-# include "extras/GNUgetopt/getopt.h"
+# include "extras/getopt.h"
#endif
#ifdef HAVE_LOCALE_H
#include "vlc_cpu.h" /* CPU detection */
#include "os_specific.h"
+#include "error.h"
#include "netutils.h" /* network_ChannelJoin */
#include "stream_control.h"
* The evil global variable. We handle it with care, don't worry.
*****************************************************************************/
static libvlc_t libvlc;
-
-//#define GLOBAL_VLC NULL
-#define GLOBAL_VLC ((vlc_t*)libvlc.pp_children[1])
+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 );
#endif
/*****************************************************************************
- * vlc_create: allocate a vlc_t structure, and initialize libvlc if needed.
+ * VLC_Version: return the libvlc version.
*****************************************************************************
- * This function allocates a vlc_t structure and returns NULL in case of
- * failure. Also, the thread system is initialized.
+ * This function returns full version string (numeric version and codename).
*****************************************************************************/
-vlc_error_t vlc_create( void )
+char const * VLC_Version( void )
{
- vlc_t * p_vlc;
- vlc_bool_t b_failed = VLC_FALSE;
-
- /* This call should be thread-safe, but an additional check will be
- * necessary afterwards to check that only one p_vlc is created. */
- p_vlc = vlc_create_r();
-
- if( p_vlc == NULL )
- {
- return VLC_EGENERIC;
- }
-
- /* 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. */
-#if 0
- vlc_mutex_lock( libvlc.p_global_lock );
- if( libvlc.i_children != 1 ) /* FIXME !!! FIXME */
- {
- b_failed = VLC_TRUE;
- }
- vlc_mutex_unlock( libvlc.p_global_lock );
-#endif
-
- /* There can be only one */
- if( b_failed )
- {
- vlc_destroy_r( p_vlc );
- return VLC_EGENERIC;
- }
+ return VERSION_MESSAGE;
+}
- return VLC_SUCCESS;
+/*****************************************************************************
+ * VLC_Error: strerror() equivalent
+ *****************************************************************************
+ * This function returns full version string (numeric version and codename).
+ *****************************************************************************/
+char const * VLC_Error( int i_err )
+{
+ return vlc_error( i_err );
}
-vlc_t * vlc_create_r( void )
+/*****************************************************************************
+ * VLC_Create: allocate a vlc_t structure, and initialize libvlc if needed.
+ *****************************************************************************
+ * This function allocates a vlc_t structure and returns a negative value
+ * in case of failure. Also, the thread system is initialized.
+ *****************************************************************************/
+int VLC_Create( void )
{
int i_ret;
vlc_t * p_vlc = NULL;
+ vlc_value_t lockval;
/* 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 )
+ if( i_ret < 0 )
{
- return NULL;
+ return i_ret;
}
/* Now that the thread system is initialized, we don't have much, but
- * at least we have libvlc.global_lock */
- vlc_mutex_lock( &libvlc.global_lock );
+ * 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 )
{
- vlc_mutex_init( &libvlc, &libvlc.structure_lock );
- libvlc.p_global_data = NULL;
- libvlc.b_ready = VLC_TRUE;
+ 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;
+
+#ifdef HAVE_ISATTY
+ libvlc.b_color = isatty( 2 ); /* 2 is for stderr */
+#else
+ libvlc.b_color = VLC_FALSE;
+#endif
+
/* Initialize message queue */
msg_Create( &libvlc );
msg_Dbg( &libvlc, COPYRIGHT_MESSAGE );
msg_Dbg( &libvlc, "libvlc was configured with %s", CONFIGURE_LINE );
- /* Initialize the module bank and and load the configuration of the
+ /* 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( &libvlc.global_lock );
+ 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 NULL;
+ return VLC_EGENERIC;
}
p_vlc->psz_object_name = "root";
- p_vlc->b_verbose = VLC_TRUE;
- p_vlc->b_quiet = VLC_FALSE; /* FIXME: delay message queue output! */
-
/* Initialize mutexes */
vlc_mutex_init( p_vlc, &p_vlc->config_lock );
/* Store our newly allocated structure in the global list */
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( int i_argc, char *ppsz_argv[] )
-{
- return vlc_init_r( GLOBAL_VLC, i_argc, ppsz_argv );
-}
-
-vlc_error_t vlc_init_r( 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 * p_tmp;
vlc_bool_t b_exit;
+ vlc_t * p_vlc;
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 (!CREATED)\n" );
- return VLC_ESTATUS;
- }
+ p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_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" );
- }
-
- setlocale( LC_CTYPE, "" );
-# endif
-
- 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
*/
p_vlc->psz_object_name = "vlc";
}
+ /*
+ * Support for gettext
+ */
+ SetLanguage( "" );
+ 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 );
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_EGENERIC;
}
p_help_module->psz_object_name = "help";
config_Free( p_help_module );
vlc_object_destroy( p_help_module );
//module_EndBank( p_vlc );
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_EGENERIC;
}
/* Check for short help option */
if( config_GetInt( p_vlc, "help" ) )
{
- fprintf( stderr, _("Usage: %s [options] [items]...\n\n"),
+ fprintf( stdout, _("Usage: %s [options] [items]...\n\n"),
p_vlc->psz_object_name );
Usage( p_vlc, "main" );
Usage( p_vlc, "help" );
config_Free( p_help_module );
vlc_object_destroy( p_help_module );
//module_EndBank( p_vlc );
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_EEXIT;
}
if( b_exit )
{
//module_EndBank( p_vlc );
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_EEXIT;
}
getchar();
#endif
//module_EndBank( p_vlc );
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_EGENERIC;
}
*/
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
*/
- 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;
- p_vlc->i_cpu = libvlc.i_cpu;
-
#if defined( __i386__ )
if( !config_GetInt( p_vlc, "mmx" ) )
- p_vlc->i_cpu &= ~CPU_CAPABILITY_MMX;
+ libvlc.i_cpu &= ~CPU_CAPABILITY_MMX;
if( !config_GetInt( p_vlc, "3dn" ) )
- p_vlc->i_cpu &= ~CPU_CAPABILITY_3DNOW;
+ libvlc.i_cpu &= ~CPU_CAPABILITY_3DNOW;
if( !config_GetInt( p_vlc, "mmxext" ) )
- p_vlc->i_cpu &= ~CPU_CAPABILITY_MMXEXT;
+ libvlc.i_cpu &= ~CPU_CAPABILITY_MMXEXT;
if( !config_GetInt( p_vlc, "sse" ) )
- p_vlc->i_cpu &= ~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 &= ~CPU_CAPABILITY_ALTIVEC;
+ libvlc.i_cpu &= ~CPU_CAPABILITY_ALTIVEC;
#endif
#define PRINT_CAPABILITY( capability, string ) \
- if( p_vlc->i_cpu & capability ) \
+ if( libvlc.i_cpu & capability ) \
{ \
strncat( p_capabilities, string " ", \
sizeof(p_capabilities) - strlen(p_capabilities) ); \
module_Unneed( p_vlc, p_vlc->p_memcpy_module );
}
//module_EndBank( p_vlc );
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_EGENERIC;
}
- /* Update the handle status */
- p_vlc->i_status = VLC_STATUS_STOPPED;
-
/*
* Get input filenames given as commandline arguments
*/
GetFilenames( p_vlc, i_argc, ppsz_argv );
+ if( i_object ) vlc_object_release( p_vlc );
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( const char *psz_module, vlc_bool_t b_block )
-{
- return vlc_add_intf_r( GLOBAL_VLC,
- psz_module, b_block );
-}
-
-vlc_error_t vlc_add_intf_r( vlc_t *p_vlc, const 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 (!RUNNING)\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_destroy: stop playing and destroy everything.
+ * 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 )
+int VLC_Destroy( int i_object )
{
- return vlc_destroy_r( GLOBAL_VLC );
-}
+ vlc_t *p_vlc;
-vlc_error_t vlc_destroy_r( vlc_t *p_vlc )
-{
- /* Check that the handle is valid */
- if( !p_vlc || (p_vlc->i_status != VLC_STATUS_STOPPED
- && 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 "
- "(!STOPPED&&!CREATED)\n" );
- return VLC_ESTATUS;
+ return VLC_ENOOBJ;
}
- if( p_vlc->i_status == VLC_STATUS_STOPPED )
+ /*
+ * Go back into channel 0 which is the network
+ */
+ if( config_GetInt( p_vlc, "network-channel" ) && p_vlc->p_channel )
{
- /*
- * 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 );
-
- /*
- * XXX: Free module bank !
- */
- //module_EndBank( p_vlc );
-
- /*
- * System specific cleaning code
- */
- system_End( p_vlc );
+ network_ChannelJoin( p_vlc, COMMON_CHANNEL );
+ }
- /* Update the handle status */
- p_vlc->i_status = VLC_STATUS_CREATED;
+ /*
+ * Free allocated memory
+ */
+ if( p_vlc->p_memcpy_module )
+ {
+ module_Unneed( p_vlc, p_vlc->p_memcpy_module );
+ p_vlc->p_memcpy_module = NULL;
}
- /* Update the handle status, just in case */
- p_vlc->i_status = VLC_STATUS_NONE;
+ if( p_vlc->psz_homedir )
+ {
+ free( p_vlc->psz_homedir );
+ p_vlc->psz_homedir = NULL;
+ }
+ /*
+ * XXX: Free module bank !
+ */
+ //module_EndBank( p_vlc );
+
+ /*
+ * System specific cleaning code
+ */
+ system_End( p_vlc );
+
/* Destroy mutexes */
vlc_mutex_destroy( &p_vlc->config_lock );
/* 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.
+ * 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.
+ * task. It is your duty to call vlc_end and VLC_Destroy afterwards.
*****************************************************************************/
-vlc_error_t vlc_die( void )
+int VLC_Die( int i_object )
{
- return vlc_die_r( GLOBAL_VLC );
-}
+ vlc_t *p_vlc;
+
+ p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
-vlc_error_t vlc_die_r( vlc_t *p_vlc )
-{
if( !p_vlc )
{
- fprintf( stderr, "error: invalid status (!EXIST)\n" );
- return VLC_ESTATUS;
+ return VLC_ENOOBJ;
}
p_vlc->b_die = VLC_TRUE;
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_SUCCESS;
}
/*****************************************************************************
- * 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( GLOBAL_VLC );
-}
-
-vlc_status_t vlc_status_r( vlc_t *p_vlc )
-{
- if( !p_vlc )
- {
- return VLC_STATUS_NONE;
- }
-
- return p_vlc->i_status;
-}
-
-/*****************************************************************************
- * vlc_add_target: adds a target for playing.
+ * VLC_AddTarget: adds a target for playing.
*****************************************************************************
* This function adds psz_target to the current playlist. If a playlist does
* not exist, it will create one.
*****************************************************************************/
-vlc_error_t vlc_add_target( const char *psz_target, int i_mode, int i_pos )
-{
- return vlc_add_target_r( GLOBAL_VLC,
- psz_target, i_mode, i_pos );
-}
-
-vlc_error_t vlc_add_target_r( vlc_t *p_vlc, const char *psz_target,
- int i_mode, int i_pos )
+int VLC_AddTarget( int i_object, char const *psz_target, int i_mode, int i_pos )
{
- vlc_error_t err;
+ int i_err;
playlist_t *p_playlist;
+ vlc_t *p_vlc;
- if( !p_vlc || ( p_vlc->i_status != VLC_STATUS_STOPPED
- && 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 (!STOPPED&&!RUNNING)\n" );
- return VLC_ESTATUS;
+ return VLC_ENOOBJ;
}
p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( p_playlist == NULL )
{
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_EGENERIC;
}
vlc_object_yield( p_playlist );
}
- err = playlist_Add( p_playlist, psz_target, i_mode, i_pos );
+ i_err = playlist_Add( p_playlist, psz_target, i_mode, i_pos );
vlc_object_release( p_playlist );
- return err;
+ if( i_object ) vlc_object_release( p_vlc );
+ return i_err;
}
/*****************************************************************************
- * vlc_set: set a vlc variable
+ * VLC_Set: set a vlc variable
*****************************************************************************
*
*****************************************************************************/
-vlc_error_t vlc_set( const char *psz_var, const char *psz_val )
+int VLC_Set( int i_object, char const *psz_var, vlc_value_t value )
{
- return vlc_set_r( GLOBAL_VLC, psz_var, psz_val );
-}
+ vlc_t *p_vlc;
+ int i_ret;
-vlc_error_t vlc_set_r( vlc_t *p_vlc, const char *psz_var, const char *psz_val )
-{
- module_config_t *p_config;
+ 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;
}
- p_config = config_FindConfig( VLC_OBJECT(p_vlc), psz_var );
-
- if( !p_config )
+ /* 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 ) )
{
- msg_Err( p_vlc, "option %s does not exist", psz_var );
- return VLC_EGENERIC;
- }
+ module_config_t *p_item;
+ char const *psz_newvar = psz_var + 6;
- vlc_mutex_lock( p_config->p_lock );
+ p_item = config_FindConfig( VLC_OBJECT(p_vlc), psz_newvar );
- switch( p_config->i_type )
- {
- case CONFIG_ITEM_BOOL:
- if( psz_val && *psz_val )
+ if( p_item )
{
- if( !strcmp( psz_val, "off" ) || !strcmp( psz_val, "no" ) )
- {
- p_config->i_value = VLC_FALSE;
- }
- else
+ switch( p_item->i_type )
{
- p_config->i_value = atoi( psz_val );
+ 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;
}
- 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 );
- }
-
- if( psz_val )
- {
- p_config->psz_value = strdup( psz_val );
- }
- else
- {
- p_config->psz_value = NULL;
- }
- 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 );
- }
+ i_ret = var_Set( p_vlc, psz_var, value );
- return VLC_SUCCESS;
+ if( i_object ) vlc_object_release( p_vlc );
+ return i_ret;
}
-/* XXX: temporary hacks */
-
/*****************************************************************************
- * vlc_play: play
+ * VLC_Get: get a vlc variable
+ *****************************************************************************
+ *
*****************************************************************************/
-vlc_error_t vlc_play( )
+int VLC_Get( int i_object, char const *psz_var, vlc_value_t *p_value )
{
- return vlc_play_r( GLOBAL_VLC );
+ vlc_t *p_vlc;
+ int i_ret;
+
+ p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ i_ret = var_Get( p_vlc, psz_var, p_value );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return i_ret;
}
-vlc_error_t vlc_play_r( vlc_t *p_vlc )
+/* 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;
/* Check that the handle is valid */
- if( !p_vlc || p_vlc->i_status != VLC_STATUS_STOPPED )
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ /* add pseudo sap interface; non blocking */
+ if( config_GetInt( p_vlc, "sap" ) )
{
- fprintf( stderr, "error: invalid status (!STOPPED)\n" );
- return VLC_ESTATUS;
+ msg_Dbg( p_vlc, "adding sap interface" );
+ VLC_AddIntf( 0, "sap", VLC_FALSE );
}
- /* Update the handle status */
- p_vlc->i_status = VLC_STATUS_RUNNING;
+ 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 )
{
- return VLC_EOBJECT;
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_ENOOBJ;
}
vlc_mutex_lock( &p_playlist->object_lock );
vlc_object_release( p_playlist );
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_SUCCESS;
}
/*****************************************************************************
- * vlc_stop: stop
+ * VLC_Stop: stop
*****************************************************************************/
-vlc_error_t vlc_stop( )
-{
- return vlc_stop_r( GLOBAL_VLC );
-}
-
-vlc_error_t vlc_stop_r( vlc_t *p_vlc )
+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 || ( p_vlc->i_status != VLC_STATUS_STOPPED
- && p_vlc->i_status != VLC_STATUS_RUNNING ) )
+ if( !p_vlc )
{
- fprintf( stderr, "error: invalid status (!STOPPED&&!RUNNING)\n" );
- return VLC_ESTATUS;
+ return VLC_ENOOBJ;
}
/*
{
vlc_object_detach( p_vout );
vlc_object_release( p_vout );
- vout_DestroyThread( p_vout );
+ vout_Destroy( p_vout );
}
/*
aout_Delete( p_aout );
}
- /* Update the handle status */
- p_vlc->i_status = VLC_STATUS_STOPPED;
-
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_SUCCESS;
}
/*****************************************************************************
- * vlc_pause: toggle pause
+ * VLC_Pause: toggle pause
*****************************************************************************/
-vlc_error_t vlc_pause( )
-{
- return vlc_pause_r( GLOBAL_VLC );
-}
-
-vlc_error_t vlc_pause_r( vlc_t *p_vlc )
+int VLC_Pause( int i_object )
{
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 )
+ {
+ return VLC_ENOOBJ;
+ }
p_input = vlc_object_find( p_vlc, VLC_OBJECT_INPUT, FIND_CHILD );
if( !p_input )
{
- return VLC_EOBJECT;
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_ENOOBJ;
}
input_SetStatus( p_input, INPUT_STATUS_PAUSE );
vlc_object_release( p_input );
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_SUCCESS;
}
/*****************************************************************************
- * vlc_fullscreen: toggle fullscreen mode
+ * VLC_FullScreen: toggle fullscreen mode
*****************************************************************************/
-vlc_error_t vlc_fullscreen( )
-{
- return vlc_fullscreen_r( GLOBAL_VLC );
-}
-
-vlc_error_t vlc_fullscreen_r( vlc_t *p_vlc )
+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;
+ }
p_vout = vlc_object_find( p_vlc, VLC_OBJECT_VOUT, FIND_CHILD );
if( !p_vout )
{
- return VLC_EOBJECT;
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_ENOOBJ;
}
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-- )
{
- vlc_add_target_r( p_vlc, ppsz_argv[ i_opt ],
- PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END );
+ /* 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_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
- vlc_list_t *p_list;
- module_t **pp_parser;
+ 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';
#endif
/* List all modules */
- p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+ list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
/* 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 < list.i_count; i_index++ )
{
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,
- (*pp_parser)->psz_object_name ) )
+ p_parser->psz_object_name ) )
{
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 );
/* Print module options */
- for( p_item = (*pp_parser)->p_config;
+ for( p_item = p_parser->p_config;
p_item->i_type != CONFIG_HINT_END;
p_item++ )
{
{
case CONFIG_HINT_CATEGORY:
case CONFIG_HINT_USAGE:
- fprintf( stderr, " %s\n", p_item->psz_text );
+ fprintf( stdout, " %s\n", p_item->psz_text );
break;
case CONFIG_ITEM_STRING:
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 );
}
}
/* Release the module list */
- vlc_list_release( p_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 )
{
- vlc_list_t *p_list;
- module_t **pp_parser;
+ 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] [items]...\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 */
- p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+ 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 < 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( (*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 );
+ fprintf( stdout, " %s%s %s\n", p_parser->psz_object_name,
+ psz_spaces, p_parser->psz_longname );
psz_spaces[i] = ' ';
}
- vlc_list_release( p_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
}
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") );
+ 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
-
projects / vlc / blobdiff