X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.c;h=4c5e51ad703eb653d96fa32f7464deca290c3ec6;hb=25cd1327a67705cdecbb8754f405be01557a175b;hp=6d0bef06065264d3616f5e9abcab186da3bb2bbc;hpb=7689bc9224e3d9516c56126980cb68eadca6fcaf;p=vlc diff --git a/src/libvlc.c b/src/libvlc.c index 6d0bef0606..4c5e51ad70 100644 --- a/src/libvlc.c +++ b/src/libvlc.c @@ -1,8 +1,8 @@ /***************************************************************************** * libvlc.c: main libvlc source ***************************************************************************** - * Copyright (C) 1998-2002 VideoLAN - * $Id: libvlc.c,v 1.22 2002/08/08 00:35:11 sam Exp $ + * Copyright (C) 1998-2004 VideoLAN + * $Id: libvlc.c,v 1.109 2004/01/06 12:02:05 zorglub Exp $ * * Authors: Vincent Seguin * Samuel Hocevar @@ -27,26 +27,20 @@ * Pretend we are a builtin module *****************************************************************************/ #define MODULE_NAME main +#define MODULE_PATH main #define __BUILTIN__ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* ENOMEM */ -#include /* sprintf() */ -#include /* strerror() */ -#include /* free() */ -#include /* SIGHUP, SIGINT, SIGKILL */ - #include -#ifdef HAVE_GETOPT_LONG -# ifdef HAVE_GETOPT_H -# include /* getopt() */ -# endif -#else -# include "GNUgetopt/getopt.h" +#ifdef HAVE_ERRNO_H +# include /* ENOMEM */ #endif +#include /* sprintf() */ +#include /* strerror() */ +#include /* free() */ #ifndef WIN32 # include /* BSD: struct in_addr */ @@ -54,10 +48,14 @@ #ifdef HAVE_UNISTD_H # include -#elif defined( _MSC_VER ) && defined( _WIN32 ) +#elif defined( WIN32 ) && !defined( UNDER_CE ) # include #endif +#ifdef WIN32 /* optind, getopt(), included in unistd.h */ +# include "extras/getopt.h" +#endif + #ifdef HAVE_LOCALE_H # include #endif @@ -65,112 +63,166 @@ #include "vlc_cpu.h" /* CPU detection */ #include "os_specific.h" -#include "netutils.h" /* network_ChannelJoin */ +#include "vlc_error.h" #include "stream_control.h" #include "input_ext-intf.h" #include "vlc_playlist.h" -#include "interface.h" +#include "vlc_interface.h" #include "audio_output.h" -#include "video.h" +#include "vlc_video.h" #include "video_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 int volatile i_vlc = 0; -static int volatile i_unique = 0; -static vlc_t ** volatile pp_vlc = NULL; +static libvlc_t libvlc; +static libvlc_t * p_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 ); -#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 +static int ConsoleWidth ( void ); + + +/***************************************************************************** + * vlc_current_object: return the current object. + ***************************************************************************** + * If i_object is non-zero, return the corresponding object. Otherwise, + * return the statically allocated p_vlc object. + *****************************************************************************/ +vlc_t * vlc_current_object( int i_object ) +{ + if( i_object ) + { + return vlc_object_get( p_libvlc, i_object ); + } + + return p_static_vlc; +} + +/***************************************************************************** + * VLC_Version: return the libvlc version. + ***************************************************************************** + * This function returns full version string (numeric version and codename). + *****************************************************************************/ +char const * VLC_Version( void ) +{ + return VERSION_MESSAGE; +} /***************************************************************************** - * vlc_create: allocate a vlc_t structure, and initialize libvlc if needed. + * 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_error_t vlc_create( void ) +char const * VLC_Error( int i_err ) { - vlc_t * p_vlc = vlc_create_r(); - return p_vlc ? VLC_SUCCESS : VLC_EGENERIC; + 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; - /* Allocate the main structure */ - p_vlc = vlc_object_create( p_vlc, VLC_OBJECT_ROOT ); - if( p_vlc == NULL ) + /* &libvlc never changes, so we can safely call this multiple times. */ + p_libvlc = &libvlc; + + /* vlc_threads_init *must* be the first internal call! No other call is + * allowed before the thread system has been initialized. */ + i_ret = vlc_threads_init( p_libvlc ); + 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( p_libvlc, "libvlc", VLC_VAR_MUTEX ); + var_Get( p_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; + +#if defined( HAVE_ISATTY ) && !defined( WIN32 ) + libvlc.b_color = isatty( 2 ); /* 2 is for stderr */ +#else + libvlc.b_color = VLC_FALSE; +#endif + + /* Initialize message queue */ + msg_Create( p_libvlc ); - p_vlc->p_global_lock = &global_lock; - p_vlc->pp_global_data = &p_global_data; + /* Announce who we are */ + msg_Dbg( p_libvlc, COPYRIGHT_MESSAGE ); + msg_Dbg( p_libvlc, "libvlc was configured with %s", CONFIGURE_LINE ); + + /* The module bank will be initialized later */ + libvlc.p_module_bank = NULL; + + libvlc.b_ready = VLC_TRUE; + } + vlc_mutex_unlock( lockval.p_address ); + var_Destroy( p_libvlc, "libvlc" ); - p_vlc->b_verbose = VLC_FALSE; - p_vlc->b_quiet = VLC_FALSE; /* FIXME: delay message queue output! */ + /* Allocate a vlc object */ + p_vlc = vlc_object_create( p_libvlc, VLC_OBJECT_VLC ); + if( p_vlc == NULL ) + { + return VLC_EGENERIC; + } + vlc_thread_set_priority( p_vlc, VLC_THREAD_PRIORITY_LOW ); - /* Initialize the threads system */ - vlc_threads_init( p_vlc ); + 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( ); +#ifdef SYS_DARWIN + vlc_mutex_init( p_vlc, &p_vlc->quicktime_lock ); #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++; - p_vlc->i_unique = i_unique; - i_unique++; - vlc_mutex_unlock( p_vlc->p_global_lock ); - - /* Update the handle status */ - p_vlc->i_status = VLC_STATUS_CREATED; - - return p_vlc; + vlc_object_attach( p_vlc, p_libvlc ); + + /* Store data for the non-reentrant API */ + p_static_vlc = 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 @@ -178,62 +230,29 @@ vlc_t * vlc_create_r( void ) * - 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 : NULL, 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; - 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; - } - - fprintf( stderr, COPYRIGHT_MESSAGE "\n" ); - - /* Guess what CPU we have */ - p_vlc->i_cpu = 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; + char * psz_modules; + char * psz_parser; + char * psz_language; + vlc_bool_t b_exit = VLC_FALSE; + vlc_t * p_vlc = vlc_current_object( i_object ); + module_t *p_help_module; + playlist_t *p_playlist; + vlc_value_t lockval; - 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 */ 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 ) { @@ -249,73 +268,120 @@ vlc_error_t vlc_init_r( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] ) 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") ); + + /* 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) */ + var_Create( p_libvlc, "libvlc", VLC_VAR_MUTEX ); + var_Get( p_libvlc, "libvlc", &lockval ); + vlc_mutex_lock( lockval.p_address ); + if( libvlc.p_module_bank == NULL ) + { + module_InitBank( p_vlc ); + module_LoadMain( p_vlc ); + } + vlc_mutex_unlock( lockval.p_address ); + var_Destroy( p_libvlc, "libvlc" ); /* 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->p_module_bank->first; - p_vlc->p_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->p_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; } /* 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"), p_vlc->psz_object_name ); - - Usage( p_vlc, "help" ); Usage( p_vlc, "main" ); - p_vlc->p_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->p_module_bank->first = p_help_module->next; + b_exit = VLC_TRUE; + } + + /* Set the config file stuff */ + p_vlc->psz_homedir = config_GetHomeDir(); + p_vlc->psz_configfile = config_GetPsz( p_vlc, "config" ); + + /* Hack: remove the help module here */ + vlc_object_detach( p_help_module ); + /* End hack */ + + if( b_exit ) + { config_Free( p_help_module ); vlc_object_destroy( p_help_module ); - module_EndBank( p_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->p_module_bank->first = p_help_module->next; - /* End hack */ + /* Check for translation config option */ +#if defined( ENABLE_NLS ) \ + && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) ) + + /* This ain't really nice to have to reload the config here but it seems + * the only way to do it. */ + config_LoadConfigFile( p_vlc, "main" ); + config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, VLC_TRUE ); + + /* Check if the user specified a custom language */ + psz_language = config_GetPsz( p_vlc, "language" ); + if( psz_language && *psz_language && strcmp( psz_language, "auto" ) ) + { + /* Reset the default domain */ + SetLanguage( psz_language ); + + /* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */ + msg_Dbg( p_vlc, "translation test: code is \"%s\"", _("C") ); + + textdomain( PACKAGE ); + +#if defined( SYS_BEOS ) || defined ( SYS_DARWIN ) || \ + ( defined( WIN32 ) && !defined( HAVE_INCLUDED_GETTEXT ) ) + /* BeOS only support UTF8 strings */ + /* Mac OS X prefers UTF8 */ + bind_textdomain_codeset( PACKAGE, "UTF-8" ); +#endif + + module_EndBank( p_vlc ); + module_InitBank( p_vlc ); + module_LoadMain( p_vlc ); + config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, VLC_TRUE ); + } + if( psz_language ) free( psz_language ); +#endif /* * Load the builtins and plugins into the module_bank. @@ -325,12 +391,16 @@ vlc_error_t vlc_init_r( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] ) */ module_LoadBuiltins( p_vlc ); module_LoadPlugins( p_vlc ); + if( p_vlc->b_die ) + { + b_exit = VLC_TRUE; + } + msg_Dbg( p_vlc, "module bank initialized, found %i modules", - p_vlc->p_module_bank->i_count ); + libvlc.p_module_bank->i_children ); /* Hack: insert the help module here */ - p_help_module->next = p_vlc->p_module_bank->first; - p_vlc->p_module_bank->first = p_help_module; + vlc_object_attach( p_help_module, libvlc.p_module_bank ); /* End hack */ /* Check for help on modules */ @@ -338,50 +408,61 @@ vlc_error_t vlc_init_r( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] ) { Usage( p_vlc, p_tmp ); free( p_tmp ); - p_vlc->p_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->p_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->p_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 config file options */ + if( config_GetInt( p_vlc, "reset-config" ) ) + { + vlc_object_detach( p_help_module ); + config_ResetAll( p_vlc ); + config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, VLC_TRUE ); + config_SaveConfigFile( p_vlc, NULL ); + vlc_object_attach( p_help_module, libvlc.p_module_bank ); + } + if( config_GetInt( p_vlc, "save-config" ) ) + { + vlc_object_detach( p_help_module ); + config_LoadConfigFile( p_vlc, NULL ); + config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, VLC_TRUE ); + config_SaveConfigFile( p_vlc, NULL ); + vlc_object_attach( p_help_module, libvlc.p_module_bank ); } /* Hack: remove the help module here */ - p_vlc->p_module_bank->first = p_help_module->next; - config_Free( p_help_module ); - vlc_object_destroy( p_help_module ); + vlc_object_detach( p_help_module ); /* End hack */ + if( b_exit ) + { + config_Free( p_help_module ); + vlc_object_destroy( p_help_module ); + /*module_EndBank( p_vlc );*/ + if( i_object ) vlc_object_release( p_vlc ); + return VLC_EEXIT; + } + /* * Override default configuration with config file settings */ - p_vlc->psz_homedir = config_GetHomeDir(); config_LoadConfigFile( p_vlc, NULL ); + /* Hack: insert the help module here */ + vlc_object_attach( p_help_module, libvlc.p_module_bank ); + /* End hack */ + /* * Override configuration with command line settings */ @@ -394,43 +475,66 @@ vlc_error_t vlc_init_r( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] ) "that they are valid.\nPress the RETURN key to continue..." ); getchar(); #endif - module_EndBank( p_vlc ); - msg_Destroy( p_vlc ); + vlc_object_detach( p_help_module ); + 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; } + /* Hack: remove the help module here */ + vlc_object_detach( p_help_module ); + config_Free( p_help_module ); + vlc_object_destroy( p_help_module ); + /* End hack */ + /* * System specific configuration */ - system_Configure( p_vlc ); + system_Configure( p_vlc, &i_argc, ppsz_argv ); + + /* + * 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 initialization. FIXME ? */ + #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) ); \ @@ -454,177 +558,495 @@ vlc_error_t vlc_init_r( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] ) */ p_vlc->p_memcpy_module = module_Need( p_vlc, "memcpy", "$memcpy" ); - if( p_vlc->p_memcpy_module == NULL ) + if( p_vlc->pf_memcpy == NULL ) { - msg_Warn( p_vlc, "no suitable memcpy module, using libc default" ); p_vlc->pf_memcpy = memcpy; } + if( p_vlc->pf_memset == NULL ) + { + p_vlc->pf_memset = memset; + } + + /* + * Initialize hotkey handling + */ + var_Create( p_vlc, "key-pressed", VLC_VAR_INTEGER ); + p_vlc->p_hotkeys = malloc( sizeof(p_hotkeys) ); + /* Do a copy (we don't need to modify the strings) */ + memcpy( p_vlc->p_hotkeys, p_hotkeys, sizeof(p_hotkeys) ); + + /* + * Initialize playlist and get commandline files + */ + p_playlist = playlist_Create( p_vlc ); + if( !p_playlist ) + { + msg_Err( p_vlc, "playlist initialization failed" ); + 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; + } + /* - * Initialize shared resources and libraries + * Load background interfaces */ - if( config_GetInt( p_vlc, "network-channel" ) - && network_ChannelCreate( p_vlc ) ) + psz_modules = config_GetPsz( p_vlc, "extraintf" ); + 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 ); + VLC_AddIntf( 0, psz_temp, VLC_FALSE ); + free( psz_temp ); + } + } + if ( psz_modules ) + { + free( psz_modules ); + } + + /* + * Allways load the hotkeys interface if it exists + */ + VLC_AddIntf( 0, "hotkeys,none", VLC_FALSE ); + + /* + * FIXME: kludge to use a p_vlc-local variable for the Mozilla plugin + */ + var_Create( p_vlc, "drawable", VLC_VAR_INTEGER ); + var_Create( p_vlc, "drawableredraw", VLC_VAR_INTEGER ); + var_Create( p_vlc, "drawablet", VLC_VAR_INTEGER ); + var_Create( p_vlc, "drawablel", VLC_VAR_INTEGER ); + var_Create( p_vlc, "drawableb", VLC_VAR_INTEGER ); + var_Create( p_vlc, "drawabler", VLC_VAR_INTEGER ); + var_Create( p_vlc, "drawablex", VLC_VAR_INTEGER ); + var_Create( p_vlc, "drawabley", VLC_VAR_INTEGER ); + var_Create( p_vlc, "drawablew", VLC_VAR_INTEGER ); + var_Create( p_vlc, "drawableh", VLC_VAR_INTEGER ); + var_Create( p_vlc, "drawableportx", VLC_VAR_INTEGER ); + var_Create( p_vlc, "drawableporty", VLC_VAR_INTEGER ); + + /* + * 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_AddIntf: add an interface + ***************************************************************************** + * This function opens an interface plugin and runs it. If b_block is set + * to 0, VLC_AddIntf will return immediately and let the interface run in a + * separate thread. If b_block is set to 1, VLC_AddIntf will continue until + * user requests to quit. + *****************************************************************************/ +int VLC_AddIntf( int i_object, char const *psz_module, vlc_bool_t b_block ) +{ + int i_err; + intf_thread_t *p_intf; + vlc_t *p_vlc = vlc_current_object( i_object ); + + if( !p_vlc ) + { + return VLC_ENOOBJ; + } + + /* Try to create the interface */ + p_intf = intf_Create( p_vlc, psz_module ? psz_module : "$intf" ); + + if( p_intf == NULL ) + { + msg_Err( p_vlc, "interface \"%s\" initialization failed", psz_module ); + if( i_object ) vlc_object_release( p_vlc ); + return VLC_EGENERIC; + } + + /* Try to run the interface */ + p_intf->b_block = b_block; + i_err = intf_RunThread( p_intf ); + if( i_err ) + { + vlc_object_detach( p_intf ); + intf_Destroy( p_intf ); + if( i_object ) vlc_object_release( p_vlc ); + return i_err; + } + + if( i_object ) vlc_object_release( p_vlc ); + 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. + *****************************************************************************/ +int VLC_Destroy( int i_object ) +{ + vlc_t *p_vlc = vlc_current_object( i_object ); + + if( !p_vlc ) + { + return VLC_ENOOBJ; + } + + /* + * Free allocated memory + */ + if( p_vlc->p_memcpy_module ) + { + module_Unneed( p_vlc, p_vlc->p_memcpy_module ); + p_vlc->p_memcpy_module = NULL; + } + + if( p_vlc->psz_homedir ) + { + free( p_vlc->psz_homedir ); + p_vlc->psz_homedir = NULL; + } + + if( p_vlc->psz_configfile ) + { + free( p_vlc->psz_configfile ); + p_vlc->psz_configfile = NULL; + } + + if( p_vlc->p_hotkeys ) + { + free( p_vlc->p_hotkeys ); + p_vlc->p_hotkeys = 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 ); +#ifdef SYS_DARWIN + vlc_mutex_destroy( &p_vlc->quicktime_lock ); +#endif + + vlc_object_detach( p_vlc ); + + /* Release object before destroying it */ + if( i_object ) vlc_object_release( p_vlc ); + + vlc_object_destroy( p_vlc ); + + /* Stop thread system: last one out please shut the door! */ + vlc_threads_end( p_libvlc ); + + 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 = vlc_current_object( i_object ); + + if( !p_vlc ) + { + return VLC_ENOOBJ; + } + + p_vlc->b_die = VLC_TRUE; + + if( i_object ) vlc_object_release( p_vlc ); + return VLC_SUCCESS; +} + +/***************************************************************************** + * VLC_AddTarget: adds a target for playing. + ***************************************************************************** + * This function adds psz_target to the current playlist. If a playlist does + * not exist, it will create one. + *****************************************************************************/ +int VLC_AddTarget( int i_object, char const *psz_target, + char const **ppsz_options, int i_options, + int i_mode, int i_pos ) +{ + int i; + int i_err; + playlist_t *p_playlist; + vlc_t *p_vlc = vlc_current_object( i_object ); + + if( !p_vlc ) + { + return VLC_ENOOBJ; + } + + p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); + + if( p_playlist == NULL ) + { + 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 ); + } + + i_err = playlist_Add( p_playlist, psz_target, psz_target, + i_mode, i_pos ); + + for( i = 0 ; i< i_options ; i++ ) + { + playlist_AddOption( p_playlist, i_err , ppsz_options[i] ); + } + + 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 = vlc_current_object( i_object ); + int i_ret; + + if( !p_vlc ) + { + return VLC_ENOOBJ; + } + + /* FIXME: Temporary hack for Mozilla, if variable starts with conf:: then + * we handle it as a configuration variable. Don't tell Gildas :) -- sam */ + if( !strncmp( psz_var, "conf::", 6 ) ) + { + module_config_t *p_item; + char const *psz_newvar = psz_var + 6; + + p_item = config_FindConfig( VLC_OBJECT(p_vlc), psz_newvar ); + + 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; + } + } + + i_ret = var_Set( p_vlc, psz_var, value ); + + if( i_object ) vlc_object_release( p_vlc ); + return i_ret; +} + +/***************************************************************************** + * VLC_Get: get a vlc variable + ***************************************************************************** + * + *****************************************************************************/ +int VLC_Get( int i_object, char const *psz_var, vlc_value_t *p_value ) +{ + vlc_t *p_vlc = vlc_current_object( i_object ); + int i_ret; + + 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; +} + +/* FIXME: temporary hacks */ + + +/***************************************************************************** + * VLC_IsPlaying: Query for Playlist Status + *****************************************************************************/ +vlc_bool_t VLC_IsPlaying( int i_object ) +{ + + playlist_t * p_playlist; + vlc_bool_t playing; + + vlc_t *p_vlc = vlc_current_object( i_object ); + + /* Check that the handle is valid */ + if( !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 ); + return VLC_ENOOBJ; } - /* - * Initialize playlist and get commandline files - */ - p_playlist = playlist_Create( p_vlc ); + p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_CHILD ); + if( !p_playlist ) { - msg_Err( p_vlc, "playlist initialization failed" ); - if( p_vlc->p_memcpy_module != NULL ) - { - module_Unneed( p_vlc, p_vlc->p_memcpy_module ); - } - module_EndBank( p_vlc ); - msg_Destroy( p_vlc ); - return VLC_EGENERIC; + if( i_object ) vlc_object_release( p_vlc ); + return VLC_ENOOBJ; } - /* Update the handle status */ - p_vlc->i_status = VLC_STATUS_STOPPED; + playing = playlist_IsPlaying( p_playlist ); - /* - * Get input filenames given as commandline arguments - */ - GetFilenames( p_vlc, i_argc, ppsz_argv ); + vlc_object_release( p_playlist ); + + if( i_object ) vlc_object_release( p_vlc ); + + return playing; - 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_ClearPlaylist: Query for Playlist Status + * + * return: 0 *****************************************************************************/ -vlc_error_t vlc_run( void ) +int VLC_ClearPlaylist( int i_object ) { - return vlc_run_r( ( i_vlc == 1 ) ? *pp_vlc : NULL ); -} -vlc_error_t vlc_run_r( vlc_t *p_vlc ) -{ + playlist_t * p_playlist; + vlc_t *p_vlc = vlc_current_object( i_object ); + /* Check that the handle is valid */ - if( !p_vlc || p_vlc->i_status != VLC_STATUS_STOPPED ) + if( !p_vlc ) { - fprintf( stderr, "error: invalid status (!STOPPED)\n" ); - return VLC_ESTATUS; + return VLC_ENOOBJ; } - /* Update the handle status */ - p_vlc->i_status = VLC_STATUS_RUNNING; + p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_CHILD ); - return VLC_SUCCESS; + if( !p_playlist ) + { + if( i_object ) vlc_object_release( p_vlc ); + return VLC_ENOOBJ; + } + + playlist_Clear(p_playlist); + + vlc_object_release( p_playlist ); + + if( i_object ) vlc_object_release( p_vlc ); + return 0; } + /***************************************************************************** - * 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_Play: play *****************************************************************************/ -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 : NULL, - 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_Play( int i_object ) { - vlc_error_t err; - intf_thread_t *p_intf; - char *psz_oldmodule = NULL; + playlist_t * p_playlist; + vlc_t *p_vlc = vlc_current_object( i_object ); /* Check that the handle is valid */ - if( !p_vlc || p_vlc->i_status != VLC_STATUS_RUNNING ) - { - fprintf( stderr, "error: invalid status (!RUNNING)\n" ); - return VLC_ESTATUS; - } - - if( psz_module ) + if( !p_vlc ) { - psz_oldmodule = config_GetPsz( p_vlc, "intf" ); - config_PutPsz( p_vlc, "intf", psz_module ); + return VLC_ENOOBJ; } - /* Try to create the interface */ - p_intf = intf_Create( p_vlc ); + p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_CHILD ); - if( psz_module ) + if( !p_playlist ) { - config_PutPsz( p_vlc, "intf", psz_oldmodule ); - if( psz_oldmodule ) - { - free( psz_oldmodule ); - } + if( i_object ) vlc_object_release( p_vlc ); + return VLC_ENOOBJ; } - if( p_intf == NULL ) + vlc_mutex_lock( &p_playlist->object_lock ); + if( p_playlist->i_size ) { - msg_Err( p_vlc, "interface initialization failed" ); - return VLC_EGENERIC; + vlc_mutex_unlock( &p_playlist->object_lock ); + playlist_Play( p_playlist ); } - - /* Try to run the interface */ - p_intf->b_block = b_block; - err = intf_RunThread( p_intf ); - if( err ) + else { - vlc_object_detach_all( p_intf ); - intf_Destroy( p_intf ); - return err; + vlc_mutex_unlock( &p_playlist->object_lock ); } + vlc_object_release( p_playlist ); + + if( i_object ) vlc_object_release( p_vlc ); return VLC_SUCCESS; } /***************************************************************************** - * vlc_stop: stop playing. - ***************************************************************************** - * This function requests the interface threads to finish, waits for their - * termination, and destroys their structure. + * VLC_Stop: stop *****************************************************************************/ -vlc_error_t vlc_stop( void ) -{ - return vlc_stop_r( ( i_vlc == 1 ) ? *pp_vlc : NULL ); -} - -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; + intf_thread_t * p_intf; + playlist_t * p_playlist; + vout_thread_t * p_vout; + aout_instance_t * p_aout; + vlc_t *p_vlc = vlc_current_object( i_object ); /* Check that the handle is valid */ - if( !p_vlc || p_vlc->i_status != VLC_STATUS_RUNNING ) + if( !p_vlc ) { - fprintf( stderr, "error: invalid status (!RUNNING)\n" ); - return VLC_ESTATUS; + return VLC_ENOOBJ; } /* * 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_all( p_intf ); + vlc_object_detach( p_intf ); vlc_object_release( p_intf ); intf_Destroy( p_intf ); } @@ -632,24 +1054,25 @@ vlc_error_t vlc_stop_r( vlc_t *p_vlc ) /* * 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_all( p_playlist ); + 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_all( p_vout ); + vlc_object_detach( p_vout ); vlc_object_release( p_vout ); - vout_DestroyThread( p_vout ); + vout_Destroy( p_vout ); } /* @@ -658,220 +1081,175 @@ vlc_error_t vlc_stop_r( vlc_t *p_vlc ) msg_Dbg( p_vlc, "removing all audio outputs" ); while( (p_aout = vlc_object_find( p_vlc, VLC_OBJECT_AOUT, FIND_CHILD )) ) { - vlc_object_detach_all( (vlc_object_t *)p_aout ); + vlc_object_detach( (vlc_object_t *)p_aout ); vlc_object_release( (vlc_object_t *)p_aout ); - aout_DeleteInstance( p_aout ); + 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_end: uninitialize everything. - ***************************************************************************** - * This function uninitializes every vlc component that was activated in - * vlc_init: audio and video outputs, playlist, module bank and message queue. + * VLC_Pause: toggle pause *****************************************************************************/ -vlc_error_t vlc_end( void ) +int VLC_Pause( int i_object ) { - return vlc_end_r( ( i_vlc == 1 ) ? *pp_vlc : NULL ); -} + input_thread_t *p_input; + vlc_t *p_vlc = vlc_current_object( i_object ); -vlc_error_t vlc_end_r( vlc_t *p_vlc ) -{ - /* Check that the handle is valid */ - if( !p_vlc || p_vlc->i_status != VLC_STATUS_STOPPED ) + if( !p_vlc ) { - fprintf( stderr, "error: invalid status (!STOPPED)\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 ) - { - network_ChannelJoin( p_vlc, COMMON_CHANNEL ); - } + p_input = vlc_object_find( p_vlc, VLC_OBJECT_INPUT, FIND_CHILD ); - /* - * Free allocated memory - */ - if( p_vlc->p_memcpy_module != NULL ) + if( !p_input ) { - module_Unneed( p_vlc, p_vlc->p_memcpy_module ); + if( i_object ) vlc_object_release( p_vlc ); + return VLC_ENOOBJ; } - 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; + input_SetStatus( p_input, INPUT_STATUS_PAUSE ); + vlc_object_release( p_input ); + if( i_object ) vlc_object_release( p_vlc ); return VLC_SUCCESS; } /***************************************************************************** - * vlc_destroy: free allocated resources. - ***************************************************************************** - * This function frees the previously allocated vlc_t structure. + * VLC_FullScreen: toggle fullscreen mode *****************************************************************************/ -vlc_error_t vlc_destroy( void ) +int VLC_FullScreen( int i_object ) { - return vlc_destroy_r( ( i_vlc == 1 ) ? *pp_vlc : NULL ); -} - -vlc_error_t vlc_destroy_r( vlc_t *p_vlc ) -{ - int i_index; - - /* 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; - } - - /* 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; - } - } + vout_thread_t *p_vout; + vlc_t *p_vlc = vlc_current_object( i_object ); - if( i_index == i_vlc ) + if( !p_vlc ) { - 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; + return VLC_ENOOBJ; } - for( i_index++ ; i_index < i_vlc ; i_index++ ) - { - pp_vlc[ i_index - 1 ] = pp_vlc[ i_index ]; - } + p_vout = vlc_object_find( p_vlc, VLC_OBJECT_VOUT, FIND_CHILD ); - i_vlc--; - if( i_vlc ) - { - pp_vlc = realloc( pp_vlc, i_vlc * sizeof( vlc_t * ) ); - } - else + if( !p_vout ) { - free( pp_vlc ); - pp_vlc = NULL; + if( i_object ) vlc_object_release( p_vlc ); + return VLC_ENOOBJ; } - vlc_mutex_unlock( p_vlc->p_global_lock ); - - /* Stop thread system: last one out please shut the door! */ - vlc_threads_end( p_vlc ); - /* Destroy mutexes */ - vlc_mutex_destroy( &p_vlc->structure_lock ); - vlc_mutex_destroy( &p_vlc->config_lock ); - - vlc_object_destroy( p_vlc ); + p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE; + vlc_object_release( p_vout ); + if( i_object ) vlc_object_release( p_vlc ); return VLC_SUCCESS; } -vlc_status_t vlc_status( void ) -{ - return vlc_status_r( ( i_vlc == 1 ) ? *pp_vlc : NULL ); -} - -vlc_status_t vlc_status_r( vlc_t *p_vlc ) -{ - if( !p_vlc ) - { - return VLC_STATUS_NONE; - } - - return p_vlc->i_status; -} +/* following functions are local */ -vlc_error_t vlc_add_target( const char *psz_target, int i_mode, int i_pos ) +/***************************************************************************** + * 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 ) { - return vlc_add_target_r( ( i_vlc == 1 ) ? *pp_vlc : NULL, - psz_target, i_mode, i_pos ); -} +#if defined( ENABLE_NLS ) \ + && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) ) -vlc_error_t vlc_add_target_r( vlc_t *p_vlc, const char *psz_target, - int i_mode, int i_pos ) -{ - vlc_error_t err; - playlist_t *p_playlist; + char * psz_path; +#if defined( SYS_DARWIN ) || defined ( WIN32 ) || defined( SYS_BEOS ) + char psz_tmp[1024]; +#endif - if( !p_vlc || ( p_vlc->i_status != VLC_STATUS_STOPPED - && p_vlc->i_status != VLC_STATUS_RUNNING ) ) + if( psz_lang && !*psz_lang ) { - fprintf( stderr, "error: invalid status (!STOPPED&&!RUNNING)\n" ); - return VLC_ESTATUS; +# if defined( HAVE_LC_MESSAGES ) + setlocale( LC_MESSAGES, psz_lang ); +# endif + setlocale( LC_CTYPE, psz_lang ); } - - p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); - - if( p_playlist == NULL ) + else if( psz_lang ) { - msg_Dbg( p_vlc, "no playlist present, creating one" ); - p_playlist = playlist_Create( p_vlc ); +#ifdef SYS_DARWIN + /* I need that under Darwin, please check it doesn't disturb + * other platforms. --Meuuh */ + setenv( "LANG", psz_lang, 1 ); + +#elif defined( SYS_BEOS ) || defined( WIN32 ) + /* We set LC_ALL manually because it is the only way to set + * the language at runtime under eg. Windows. Beware that this + * makes the environment unconsistent when libvlc is unloaded and + * should probably be moved to a safer place like vlc.c. */ + static char psz_lcall[20]; + snprintf( psz_lcall, 19, "LC_ALL=%s", psz_lang ); + psz_lcall[19] = '\0'; + putenv( psz_lcall ); +#endif - if( p_playlist == NULL ) - { - return VLC_EGENERIC; - } + setlocale( LC_ALL, psz_lang ); + } - vlc_object_yield( p_playlist ); + /* Specify where to find the locales for current domain */ +#if !defined( SYS_DARWIN ) && !defined( WIN32 ) && !defined( SYS_BEOS ) + psz_path = LOCALEDIR; +#else + snprintf( psz_tmp, sizeof(psz_tmp), "%s/%s", libvlc.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 ); } - err = playlist_Add( p_playlist, psz_target, i_mode, i_pos ); + /* Set the default domain */ + textdomain( PACKAGE ); - vlc_object_release( p_playlist ); +#if defined( SYS_BEOS ) || defined ( SYS_DARWIN ) || \ + ( defined( WIN32 ) && !defined( HAVE_INCLUDED_GETTEXT ) ) + /* BeOS only support UTF8 strings */ + /* Mac OS X prefers UTF8 */ + bind_textdomain_codeset( PACKAGE, "UTF-8" ); +#endif - return err; +#endif } -/* following functions are local */ - /***************************************************************************** * GetFilenames: parse command line options which are not flags ***************************************************************************** - * Parse command line for input files. + * 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( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] ) { - int i_opt; + int i_opt, i_options; - /* We assume that the remaining parameters are filenames */ - for( i_opt = optind; i_opt < i_argc; i_opt++ ) + /* We assume that the remaining parameters are filenames + * and their input options */ + for( i_opt = i_argc - 1; i_opt >= optind; i_opt-- ) { - vlc_add_target_r( p_vlc, ppsz_argv[ i_opt ], - PLAYLIST_APPEND, PLAYLIST_END ); + i_options = 0; + + /* Count the input options */ + while( *ppsz_argv[ i_opt ] == ':' && i_opt > optind ) + { + i_options++; + 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 ], + (char const **)( i_options ? &ppsz_argv[i_opt + 1] : + NULL ), i_options, + PLAYLIST_INSERT | (i_opt == optind ? PLAYLIST_GO : 0), + 0 ); } return VLC_SUCCESS; @@ -882,25 +1260,31 @@ static int GetFilenames( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] ) ***************************************************************************** * 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 -------------' | | | | | | - * ------------------------------' | | | - * padding spaces ----------------------' | | - * comment --------------------------------' | - * comment suffix ---------------------------' +#define FORMAT_STRING " %s --%s%s%s%s%s%s%s " + /* short option ------' | | | | | | | + * option name ------------' | | | | | | + * -----------------------------' | | | + * padding spaces ---------------------' | | + * comment -------------------------------' | + * comment suffix --------------------------' * * The purpose of having bra and ket is that we might i18n them as well. */ #define LINE_START 8 #define PADDING_SPACES 25 - module_t *p_module; + vlc_list_t *p_list; + module_t *p_parser; module_config_t *p_item; char psz_spaces[PADDING_SPACES+LINE_START+1]; char psz_format[sizeof(FORMAT_STRING)]; + char psz_buffer[1000]; + char psz_short[4]; + int i_index; + int i_width = ConsoleWidth() - (PADDING_SPACES+LINE_START+1); memset( psz_spaces, ' ', PADDING_SPACES+LINE_START ); psz_spaces[PADDING_SPACES+LINE_START] = '\0'; @@ -911,46 +1295,53 @@ static void Usage( vlc_t *p_this, const char *psz_module_name ) ShowConsole(); #endif + /* List all modules */ + p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE ); + /* Enumerate the config for each module */ - for( p_module = p_this->p_vlc->p_module_bank->first ; - p_module != NULL ; - p_module = p_module->next ) + for( i_index = 0; i_index < p_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 *)p_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; + /* Print module options */ + for( p_item = p_parser->p_config; p_item->i_type != CONFIG_HINT_END; p_item++ ) { + char *psz_text; char *psz_bra = NULL, *psz_type = NULL, *psz_ket = NULL; char *psz_suf = "", *psz_prefix = NULL; int i; - + if ( p_item->b_advanced && !config_GetInt( p_this, "advanced" )) + { + continue; + } switch( p_item->i_type ) { case CONFIG_HINT_CATEGORY: case CONFIG_HINT_USAGE: - fprintf( stderr, " %s\n", p_item->psz_text ); + fprintf( stdout, "\n %s\n", p_item->psz_text ); 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 ) { @@ -959,19 +1350,19 @@ static void Usage( vlc_t *p_this, const char *psz_module_name ) } else { - psz_bra = " ["; - psz_type = malloc( 1000 ); - memset( psz_type, 0, 1000 ); - for( i=0; p_item->ppsz_list[i]; i++ ) + psz_bra = " {"; + psz_type = psz_buffer; + psz_type[0] = '\0'; + for( i = 0; p_item->ppsz_list[i]; i++ ) { + if( i ) strcat( psz_type, "," ); strcat( psz_type, p_item->ppsz_list[i] ); - strcat( psz_type, "|" ); } - psz_type[ strlen( psz_type ) - 1 ] = '\0'; - psz_ket = "]"; + psz_ket = "}"; break; } case CONFIG_ITEM_INTEGER: + case CONFIG_ITEM_KEY: /* FIXME: do something a bit more clever */ psz_bra = " <"; psz_type = _("integer"); psz_ket = ">"; break; case CONFIG_ITEM_FLOAT: @@ -987,89 +1378,119 @@ static void Usage( vlc_t *p_this, const char *psz_module_name ) break; } - /* Add short option */ + 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 ) - { - vlc_bool_t b_dash = VLC_FALSE; - psz_prefix = p_item->psz_name; - while( *psz_prefix ) - { - if( *psz_prefix++ == '-' ) - { - b_dash = VLC_TRUE; - break; - } - } + /* 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. */ + psz_prefix = strchr( p_item->psz_name, '-' ) ? ", --no-" + : ", --no"; + i -= strlen( p_item->psz_name ) + strlen( psz_prefix ); + } - if( b_dash ) - { - psz_prefix = ", --no-"; - i -= strlen( p_item->psz_name ) + strlen( ", --no-" ); - } - else - { - psz_prefix = ", --no"; - i -= strlen( p_item->psz_name ) + strlen( ", --no" ); - } - } + if( i < 0 ) + { + psz_spaces[0] = '\n'; + i = 0; + } + else + { + psz_spaces[i] = '\0'; + } - if( i < 0 ) - { - i = 0; - psz_spaces[i] = '\n'; - } - else + if( p_item->i_type == CONFIG_ITEM_BOOL && !b_help_module ) + { + fprintf( stdout, psz_format, psz_short, p_item->psz_name, + psz_prefix, p_item->psz_name, psz_bra, psz_type, + psz_ket, psz_spaces ); + } + else + { + 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 ); + psz_text = psz_buffer; + while( *psz_text ) + { + char *psz_parser, *psz_word; + int i_end = strlen( psz_text ); + + /* If the remaining text fits in a line, print it. */ + if( i_end <= i_width ) { - psz_spaces[i] = '\0'; + fprintf( stdout, "%s\n", psz_text ); + break; } - if( p_item->i_type == CONFIG_ITEM_BOOL && - !b_help_module ) + /* Otherwise, eat as many words as possible */ + psz_parser = psz_text; + do { - 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 ); - } - else + 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( psz_parser - psz_text <= i_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 + || ( psz_word - psz_text < 80 * i_width / 100 + && psz_parser - psz_word > 40 * i_width / 100 ) ) { - fprintf( stderr, psz_format, p_item->psz_name, "", "", - psz_bra, psz_type, psz_ket, psz_spaces, - p_item->psz_text, psz_suf ); + char c = psz_text[i_width]; + psz_text[i_width] = '\0'; + fprintf( stdout, "%s\n%s", psz_text, psz_spaces ); + psz_text += i_width; + psz_text[0] = c; } - psz_spaces[i] = ' '; - if ( p_item->ppsz_list ) + else { - free( psz_type ); + psz_word[-1] = '\0'; + fprintf( stdout, "%s\n%s", psz_text, psz_spaces ); + psz_text = psz_word; } } } - - fprintf( stderr, "\n" ); - } + /* 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(); + fprintf( stdout, _("\nPress the RETURN key to continue...\n") ); + getchar(); #endif } @@ -1081,8 +1502,10 @@ static void Usage( vlc_t *p_this, const char *psz_module_name ) *****************************************************************************/ static void ListModules( vlc_t *p_this ) { - module_t *p_module; + vlc_list_t *p_list; + module_t *p_parser; char psz_spaces[22]; + int i_index; memset( psz_spaces, ' ', 22 ); @@ -1091,34 +1514,38 @@ static void ListModules( vlc_t *p_this ) #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 */ + p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE ); /* Enumerate each module */ - for( p_module = p_this->p_vlc->p_module_bank->first ; - p_module != NULL ; - p_module = p_module->next ) + 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( 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( p_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 } @@ -1133,15 +1560,15 @@ static void Version( void ) 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") ); + "Written by the VideoLAN team; see the AUTHORS file.\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 } @@ -1154,95 +1581,52 @@ static void Version( void ) #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 + * ConsoleWidth: Return the console width in characters ***************************************************************************** - * This function is called when a fatal signal is received by the program. - * It tries to end the program in a clean way. + * 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 void FatalSignalHandler( int i_signal ) +static int ConsoleWidth( void ) { - static mtime_t abort_time = 0; - static volatile vlc_bool_t b_die = VLC_FALSE; - int i_index; + int i_width = 80; - /* 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 */ +#ifndef WIN32 + char buf[20], *psz_parser; + FILE *file; + int i_ret; - if( !b_die ) + file = popen( "stty size 2>/dev/null", "r" ); + if( file ) { - b_die = VLC_TRUE; - abort_time = mdate(); - - fprintf( stderr, "signal %d received, terminating libvlc - do it " - "again in case your process gets stuck\n", i_signal ); - - /* 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++ ) + i_ret = fread( buf, 1, 20, file ); + if( i_ret > 0 ) { - /* Acknowledge the signal received */ - pp_vlc[ i_index ]->b_die = VLC_TRUE; + buf[19] = '\0'; + psz_parser = strchr( buf, ' ' ); + if( psz_parser ) + { + i_ret = atoi( psz_parser + 1 ); + if( i_ret >= 80 ) + { + i_width = i_ret; + } + } } - } - 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 ); - - fprintf( stderr, "user insisted too much, dying badly\n" ); - exit( 1 ); + pclose( file ); } -} #endif + return i_width; +}