X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.c;h=6d7ce25b6790b735202c3c41100d4bd504ccc172;hb=2c39a2615b85507b7da400c395d3767179570721;hp=1f1d4d8958d8e9c4606d0f74f8bd5bf7e9a1e80f;hpb=3ca7825a92ed7e8de3bbccc274aa41045e8816b4;p=vlc diff --git a/src/libvlc.c b/src/libvlc.c index 1f1d4d8958..6d7ce25b67 100644 --- a/src/libvlc.c +++ b/src/libvlc.c @@ -1,12 +1,14 @@ /***************************************************************************** - * libvlc.c: main libvlc source + * libvlc.c: Implementation of the old libvlc API ***************************************************************************** - * Copyright (C) 1998-2002 VideoLAN - * $Id: libvlc.c,v 1.40 2002/10/15 08:35:24 sam Exp $ + * Copyright (C) 1998-2007 the VideoLAN team + * $Id$ * * Authors: Vincent Seguin * Samuel Hocevar - * Gildas Bazin + * Gildas Bazin + * Derk-Jan Hartman + * Rémi Denis-Courmont * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +22,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -33,67 +35,19 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* ENOMEM */ -#include /* sprintf() */ -#include /* strerror() */ -#include /* free() */ - -#include - -#ifndef WIN32 -# include /* BSD: struct in_addr */ -#endif - -#ifdef HAVE_UNISTD_H -# include -#elif defined( _MSC_VER ) && defined( _WIN32 ) -# include -#endif - -#ifdef WIN32 /* optind, getopt(), included in unistd.h */ -# include "extras/GNUgetopt/getopt.h" +#ifdef HAVE_CONFIG_H +# include "config.h" #endif -#ifdef HAVE_LOCALE_H -# include -#endif - -#include "vlc_cpu.h" /* CPU detection */ -#include "os_specific.h" - -#include "error.h" -#include "netutils.h" /* network_ChannelJoin */ - -#include "stream_control.h" -#include "input_ext-intf.h" - -#include "vlc_playlist.h" -#include "interface.h" - -#include "audio_output.h" - -#include "video.h" -#include "video_output.h" +#include +#include "control/libvlc_internal.h" #include "libvlc.h" -/***************************************************************************** - * The evil global variable. We handle it with care, don't worry. - *****************************************************************************/ -static libvlc_t libvlc; -static vlc_t * p_static_vlc; - -/***************************************************************************** - * Local prototypes - *****************************************************************************/ -static int GetFilenames ( vlc_t *, int, char *[] ); -static void Usage ( vlc_t *, char const *psz_module_name ); -static void ListModules ( vlc_t * ); -static void Version ( void ); +#include -#ifdef WIN32 -static void ShowConsole ( void ); -#endif +#include +#include /***************************************************************************** * VLC_Version: return the libvlc version. @@ -105,6 +59,27 @@ char const * VLC_Version( void ) return VERSION_MESSAGE; } +/***************************************************************************** + * VLC_CompileBy, VLC_CompileHost, VLC_CompileDomain, + * VLC_Compiler, VLC_Changeset + *****************************************************************************/ +#define DECLARE_VLC_VERSION( func, var ) \ +char const * VLC_##func ( void ) \ +{ \ + return VLC_##var ; \ +} + +DECLARE_VLC_VERSION( CompileBy, COMPILE_BY ); +DECLARE_VLC_VERSION( CompileHost, COMPILE_HOST ); +DECLARE_VLC_VERSION( CompileDomain, COMPILE_DOMAIN ); +DECLARE_VLC_VERSION( Compiler, COMPILER ); + +extern const char psz_vlc_changeset[]; +const char* VLC_Changeset( void ) +{ + return psz_vlc_changeset; +} + /***************************************************************************** * VLC_Error: strerror() equivalent ***************************************************************************** @@ -116,385 +91,41 @@ char const * VLC_Error( int i_err ) } /***************************************************************************** - * VLC_Create: allocate a vlc_t structure, and initialize libvlc if needed. + * VLC_Create: allocate a libvlc instance and intialize global libvlc stuff if needed ***************************************************************************** - * This function allocates a vlc_t structure and returns a negative value + * This function allocates a libvlc instance 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 < 0 ) - { - return i_ret; - } - - /* Now that the thread system is initialized, we don't have much, but - * at least we have var_Create */ - var_Create( &libvlc, "libvlc", VLC_VAR_MUTEX ); - var_Get( &libvlc, "libvlc", &lockval ); - vlc_mutex_lock( lockval.p_address ); - if( !libvlc.b_ready ) - { - char *psz_env; - - /* Guess what CPU we have */ - libvlc.i_cpu = CPUCapabilities(); - - /* Find verbosity from VLC_VERBOSE environment variable */ - psz_env = getenv( "VLC_VERBOSE" ); - libvlc.i_verbose = psz_env ? atoi( psz_env ) : -1; - -#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 ); - - /* Announce who we are */ - msg_Dbg( &libvlc, COPYRIGHT_MESSAGE ); - msg_Dbg( &libvlc, "libvlc was configured with %s", CONFIGURE_LINE ); - - /* Initialize the module bank and load the configuration of the - * main module. We need to do this at this stage to be able to display - * a short help if required by the user. (short help == main module - * options) */ - module_InitBank( &libvlc ); - module_LoadMain( &libvlc ); - - libvlc.b_ready = VLC_TRUE; - } - vlc_mutex_unlock( lockval.p_address ); - var_Destroy( &libvlc, "libvlc" ); - - /* Allocate a vlc object */ - p_vlc = vlc_object_create( &libvlc, VLC_OBJECT_VLC ); - if( p_vlc == NULL ) - { - return VLC_EGENERIC; - } - - p_vlc->psz_object_name = "root"; - - /* Initialize mutexes */ - vlc_mutex_init( p_vlc, &p_vlc->config_lock ); - - /* Store our newly allocated structure in the global list */ - vlc_object_attach( p_vlc, &libvlc ); + libvlc_int_t *p_object = libvlc_InternalCreate(); + if( p_object ) return p_object->i_object_id; + return VLC_ENOOBJ; +} - /* Store data for the non-reentrant API */ - p_static_vlc = p_vlc; +#define LIBVLC_FUNC \ + libvlc_int_t * p_libvlc = vlc_current_object( i_object ); \ + if( !p_libvlc ) return VLC_ENOOBJ; +#define LIBVLC_FUNC_END \ + if( i_object ) vlc_object_release( p_libvlc ); - return p_vlc->i_object_id; -} /***************************************************************************** - * VLC_Init: initialize a vlc_t structure. + * VLC_Init: initialize a libvlc instance ***************************************************************************** - * This function initializes a previously allocated vlc_t structure: + * This function initializes a previously allocated libvlc instance: * - CPU detection * - gettext initialization * - message queue, module bank and playlist initialization * - configuration and commandline parsing *****************************************************************************/ -int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) +int VLC_Init( int i_object, int i_argc, const 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; - - p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc; - - if( !p_vlc ) - { - return VLC_ENOOBJ; - } - - /* 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 ) ) - { - fprintf( stderr, "warning: no domain %s in directory %s\n", - PACKAGE, LOCALEDIR ); - } - - textdomain( PACKAGE ); -#endif - - /* - * System specific initialization code - */ - system_Init( p_vlc, &i_argc, ppsz_argv ); - - /* Get the executable name (similar to the basename command) */ - if( i_argc > 0 ) - { - p_vlc->psz_object_name = p_tmp = ppsz_argv[ 0 ]; - while( *p_tmp ) - { - if( *p_tmp == '/' ) p_vlc->psz_object_name = ++p_tmp; - else ++p_tmp; - } - } - else - { - p_vlc->psz_object_name = "vlc"; - } - - /* 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 ); - return VLC_EGENERIC; - } - p_help_module->psz_object_name = "help"; - config_Duplicate( p_help_module, p_help_config ); - vlc_object_attach( p_help_module, libvlc.p_module_bank ); - /* End hack */ - - if( config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, VLC_TRUE ) ) - { - vlc_object_detach( p_help_module ); - config_Free( p_help_module ); - vlc_object_destroy( p_help_module ); - //module_EndBank( p_vlc ); - return VLC_EGENERIC; - } - - b_exit = VLC_FALSE; - - /* Check for short help option */ - if( config_GetInt( p_vlc, "help" ) ) - { - fprintf( stderr, _("Usage: %s [options] [items]...\n\n"), - p_vlc->psz_object_name ); - Usage( p_vlc, "main" ); - Usage( p_vlc, "help" ); - b_exit = VLC_TRUE; - } - /* Check for version option */ - else if( config_GetInt( p_vlc, "version" ) ) - { - Version(); - b_exit = VLC_TRUE; - } - - /* 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 ); - return VLC_EEXIT; - } - - /* - * Load the builtins and plugins into the module_bank. - * We have to do it before config_Load*() because this also gets the - * list of configuration options exported by each module and loads their - * default values. - */ - module_LoadBuiltins( &libvlc ); - module_LoadPlugins( &libvlc ); - msg_Dbg( p_vlc, "module bank initialized, found %i modules", - libvlc.p_module_bank->i_children ); - - /* Hack: insert the help module here */ - vlc_object_attach( p_help_module, libvlc.p_module_bank ); - /* End hack */ - - /* Check for help on modules */ - if( (p_tmp = config_GetPsz( p_vlc, "module" )) ) - { - Usage( p_vlc, p_tmp ); - free( p_tmp ); - b_exit = VLC_TRUE; - } - /* Check for long help option */ - else if( config_GetInt( p_vlc, "longhelp" ) ) - { - Usage( p_vlc, NULL ); - b_exit = VLC_TRUE; - } - /* Check for module list option */ - else if( config_GetInt( p_vlc, "list" ) ) - { - ListModules( p_vlc ); - b_exit = VLC_TRUE; - } - - /* 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 */ - - if( b_exit ) - { - //module_EndBank( p_vlc ); - return VLC_EEXIT; - } - - /* - * Override default configuration with config file settings - */ - p_vlc->psz_homedir = config_GetHomeDir(); - config_LoadConfigFile( p_vlc, NULL ); - - /* - * Override configuration with command line settings - */ - if( config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, VLC_FALSE ) ) - { -#ifdef WIN32 - ShowConsole(); - /* Pause the console because it's destroyed when we exit */ - fprintf( stderr, "The command line options couldn't be loaded, check " - "that they are valid.\nPress the RETURN key to continue..." ); - getchar(); -#endif - //module_EndBank( p_vlc ); - return VLC_EGENERIC; - } - - /* - * System specific configuration - */ - system_Configure( p_vlc ); - - /* - * Message queue options - */ - if( config_GetInt( p_vlc, "quiet" ) ) - { - libvlc.i_verbose = -1; - } - else - { - int i_tmp = config_GetInt( p_vlc, "verbose" ); - if( i_tmp >= 0 ) - { - libvlc.i_verbose = __MIN( i_tmp, 2 ); - } - } - libvlc.b_color = libvlc.b_color || config_GetInt( p_vlc, "color" ); - - /* - * Output messages that may still be in the queue - */ - msg_Flush( p_vlc ); - - /* p_vlc inititalization. FIXME ? */ - p_vlc->i_desync = config_GetInt( p_vlc, "desync" ) * (mtime_t)1000; - -#if defined( __i386__ ) - if( !config_GetInt( p_vlc, "mmx" ) ) - libvlc.i_cpu &= ~CPU_CAPABILITY_MMX; - if( !config_GetInt( p_vlc, "3dn" ) ) - libvlc.i_cpu &= ~CPU_CAPABILITY_3DNOW; - if( !config_GetInt( p_vlc, "mmxext" ) ) - libvlc.i_cpu &= ~CPU_CAPABILITY_MMXEXT; - if( !config_GetInt( p_vlc, "sse" ) ) - libvlc.i_cpu &= ~CPU_CAPABILITY_SSE; -#endif -#if defined( __powerpc__ ) || defined( SYS_DARWIN ) - if( !config_GetInt( p_vlc, "altivec" ) ) - libvlc.i_cpu &= ~CPU_CAPABILITY_ALTIVEC; -#endif - -#define PRINT_CAPABILITY( capability, string ) \ - if( libvlc.i_cpu & capability ) \ - { \ - strncat( p_capabilities, string " ", \ - sizeof(p_capabilities) - strlen(p_capabilities) ); \ - p_capabilities[sizeof(p_capabilities) - 1] = '\0'; \ - } - - p_capabilities[0] = '\0'; - PRINT_CAPABILITY( CPU_CAPABILITY_486, "486" ); - PRINT_CAPABILITY( CPU_CAPABILITY_586, "586" ); - PRINT_CAPABILITY( CPU_CAPABILITY_PPRO, "Pentium Pro" ); - PRINT_CAPABILITY( CPU_CAPABILITY_MMX, "MMX" ); - PRINT_CAPABILITY( CPU_CAPABILITY_3DNOW, "3DNow!" ); - PRINT_CAPABILITY( CPU_CAPABILITY_MMXEXT, "MMXEXT" ); - PRINT_CAPABILITY( CPU_CAPABILITY_SSE, "SSE" ); - PRINT_CAPABILITY( CPU_CAPABILITY_ALTIVEC, "AltiVec" ); - PRINT_CAPABILITY( CPU_CAPABILITY_FPU, "FPU" ); - msg_Dbg( p_vlc, "CPU has capabilities %s", p_capabilities ); - - /* - * Choose the best memcpy module - */ - p_vlc->p_memcpy_module = module_Need( p_vlc, "memcpy", "$memcpy" ); - - if( p_vlc->pf_memcpy == NULL ) - { - p_vlc->pf_memcpy = memcpy; - } - - if( p_vlc->pf_memset == NULL ) - { - p_vlc->pf_memset = memset; - } - - /* - * Initialize shared resources and libraries - */ - if( config_GetInt( p_vlc, "network-channel" ) - && network_ChannelCreate( p_vlc ) ) - { - /* On error during Channels initialization, switch off channels */ - msg_Warn( p_vlc, - "channels initialization failed, deactivating channels" ); - config_PutInt( p_vlc, "network-channel", VLC_FALSE ); - } - - /* - * 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 ); - return VLC_EGENERIC; - } - - /* - * Get input filenames given as commandline arguments - */ - GetFilenames( p_vlc, i_argc, ppsz_argv ); - - return VLC_SUCCESS; + int i_ret; + LIBVLC_FUNC; + i_ret = libvlc_InternalInit( p_libvlc, i_argc, ppsz_argv ); + LIBVLC_FUNC_END; + return i_ret; } /***************************************************************************** @@ -503,201 +134,123 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) * 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. + * user requests to quit. If b_play is set to 1, VLC_AddIntf will start playing + * the playlist when it is completely initialised. *****************************************************************************/ -int VLC_AddIntf( int i_object, char const *psz_module, vlc_bool_t b_block ) +int VLC_AddIntf( int i_object, char const *psz_module, + vlc_bool_t b_block, vlc_bool_t b_play ) { - int i_err; - intf_thread_t *p_intf; - vlc_t *p_vlc; - char *psz_oldmodule = NULL; - - p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc; - - if( !p_vlc ) - { - return VLC_ENOOBJ; - } - - if( psz_module ) - { - psz_oldmodule = config_GetPsz( p_vlc, "intf" ); - config_PutPsz( p_vlc, "intf", psz_module ); - } - - /* Try to create the interface */ - p_intf = intf_Create( p_vlc ); - - if( psz_module ) - { - config_PutPsz( p_vlc, "intf", psz_oldmodule ); - if( psz_oldmodule ) - { - free( psz_oldmodule ); - } - } - - if( p_intf == NULL ) - { - msg_Err( p_vlc, "interface initialization failed" ); - 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 ); - return i_err; - } - - return VLC_SUCCESS; + int i_ret; + LIBVLC_FUNC; + i_ret = libvlc_InternalAddIntf( p_libvlc, psz_module, b_block, b_play, + 0, NULL ); + LIBVLC_FUNC_END; + return i_ret; } + /***************************************************************************** - * VLC_Destroy: stop playing and destroy everything. + * VLC_Die: ask vlc to die. ***************************************************************************** - * This function requests the running threads to finish, waits for their - * termination, and destroys their structure. + * This function sets p_libvlc->b_die to VLC_TRUE, but does not do any other + * task. It is your duty to call VLC_CleanUp and VLC_Destroy afterwards. *****************************************************************************/ -int VLC_Destroy( int i_object ) +int VLC_Die( int i_object ) { - vlc_t *p_vlc; - - p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc; - - if( !p_vlc ) - { - 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 ); - } - - /* - * 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; - } - - /* - * 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 ); - - vlc_object_detach( p_vlc ); - - vlc_object_destroy( p_vlc ); - - /* Stop thread system: last one out please shut the door! */ - vlc_threads_end( &libvlc ); - + LIBVLC_FUNC; + vlc_object_kill( p_libvlc ); + LIBVLC_FUNC_END; return VLC_SUCCESS; } /***************************************************************************** - * VLC_Die: ask vlc to die. - ***************************************************************************** - * This function sets p_vlc->b_die to VLC_TRUE, but does not do any other - * task. It is your duty to call vlc_end and VLC_Destroy afterwards. + * VLC_CleanUp: CleanUp all the intf, playlist, vout, aout *****************************************************************************/ -int VLC_Die( int i_object ) +int VLC_CleanUp( int i_object ) { - vlc_t *p_vlc; - - p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc; - - if( !p_vlc ) - { - return VLC_ENOOBJ; - } - - p_vlc->b_die = VLC_TRUE; - - return VLC_SUCCESS; + int i_ret; + LIBVLC_FUNC; + i_ret = libvlc_InternalCleanup( p_libvlc ); + LIBVLC_FUNC_END; + return i_ret; } /***************************************************************************** - * VLC_AddTarget: adds a target for playing. + * VLC_Destroy: Destroy everything. ***************************************************************************** - * This function adds psz_target to the current playlist. If a playlist does - * not exist, it will create one. + * This function requests the running threads to finish, waits for their + * termination, and destroys their structure. *****************************************************************************/ -int VLC_AddTarget( int i_object, char const *psz_target, int i_mode, int i_pos ) +int VLC_Destroy( int i_object ) { - int i_err; - playlist_t *p_playlist; - vlc_t *p_vlc; + LIBVLC_FUNC; + return libvlc_InternalDestroy( p_libvlc, i_object ? VLC_TRUE : VLC_FALSE ); +} - p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc; +/***************************************************************************** + * VLC_VariableSet: set a vlc variable + *****************************************************************************/ +int VLC_VariableSet( int i_object, char const *psz_var, vlc_value_t value ) +{ + int i_ret; + LIBVLC_FUNC; - if( !p_vlc ) + /* 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 ) ) { - return VLC_ENOOBJ; - } + module_config_t *p_item; + char const *psz_newvar = psz_var + 6; - p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); + p_item = config_FindConfig( VLC_OBJECT(p_libvlc), psz_newvar ); - if( p_playlist == NULL ) - { - msg_Dbg( p_vlc, "no playlist present, creating one" ); - p_playlist = playlist_Create( p_vlc ); - - if( p_playlist == NULL ) + if( p_item ) { - return VLC_EGENERIC; + switch( p_item->i_type ) + { + case CONFIG_ITEM_BOOL: + config_PutInt( p_libvlc, psz_newvar, value.b_bool ); + break; + case CONFIG_ITEM_INTEGER: + config_PutInt( p_libvlc, psz_newvar, value.i_int ); + break; + case CONFIG_ITEM_FLOAT: + config_PutFloat( p_libvlc, psz_newvar, value.f_float ); + break; + default: + config_PutPsz( p_libvlc, psz_newvar, value.psz_string ); + break; + } + if( i_object ) vlc_object_release( p_libvlc ); + return VLC_SUCCESS; } - - vlc_object_yield( p_playlist ); } - i_err = playlist_Add( p_playlist, psz_target, i_mode, i_pos ); - - vlc_object_release( p_playlist ); + i_ret = var_Set( p_libvlc, psz_var, value ); - return i_err; + LIBVLC_FUNC_END; + return i_ret; } /***************************************************************************** - * VLC_Set: set a vlc variable - ***************************************************************************** - * + * VLC_VariableGet: get a vlc variable *****************************************************************************/ -int VLC_Set( int i_object, char const *psz_var, vlc_value_t value ) +int VLC_VariableGet( int i_object, char const *psz_var, vlc_value_t *p_value ) { - vlc_t *p_vlc; - - p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc; - - if( !p_vlc ) - { - return VLC_ENOOBJ; - } + int i_ret; + LIBVLC_FUNC; + i_ret = var_Get( p_libvlc , psz_var, p_value ); + LIBVLC_FUNC_END; + return i_ret; +} +/***************************************************************************** + * VLC_VariableType: get a vlc variable type + *****************************************************************************/ +int VLC_VariableType( int i_object, char const *psz_var, int *pi_type ) +{ + int i_type; + LIBVLC_FUNC; /* 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 ) ) @@ -705,533 +258,531 @@ int VLC_Set( int i_object, char const *psz_var, vlc_value_t value ) module_config_t *p_item; char const *psz_newvar = psz_var + 6; - p_item = config_FindConfig( VLC_OBJECT(p_vlc), psz_newvar ); + p_item = config_FindConfig( VLC_OBJECT(p_libvlc), psz_newvar ); if( p_item ) { switch( p_item->i_type ) { case CONFIG_ITEM_BOOL: - config_PutInt( p_vlc, psz_newvar, value.b_bool ); + i_type = VLC_VAR_BOOL; break; case CONFIG_ITEM_INTEGER: - config_PutInt( p_vlc, psz_newvar, value.i_int ); + i_type = VLC_VAR_INTEGER; break; case CONFIG_ITEM_FLOAT: - config_PutFloat( p_vlc, psz_newvar, value.f_float ); + i_type = VLC_VAR_FLOAT; break; default: - config_PutPsz( p_vlc, psz_newvar, value.psz_string ); + i_type = VLC_VAR_STRING; break; } - return VLC_SUCCESS; } + else + i_type = 0; } + else + i_type = VLC_VAR_TYPE & var_Type( p_libvlc , psz_var ); + + LIBVLC_FUNC_END; - return var_Set( p_vlc, psz_var, value ); + if( i_type > 0 ) + { + *pi_type = i_type; + return VLC_SUCCESS; + } + return VLC_ENOVAR; } +#define LIBVLC_PLAYLIST_FUNC \ + libvlc_int_t *p_libvlc = vlc_current_object( i_object );\ + if( !p_libvlc || !p_libvlc->p_playlist ) return VLC_ENOOBJ; \ + vlc_object_yield( p_libvlc->p_playlist ); + +#define LIBVLC_PLAYLIST_FUNC_END \ + vlc_object_release( p_libvlc->p_playlist ); \ + if( i_object ) vlc_object_release( p_libvlc ); + /***************************************************************************** - * VLC_Get: get a vlc variable + * VLC_AddTarget: adds a target for playing. ***************************************************************************** - * + * This function adds psz_target to the playlist *****************************************************************************/ -int VLC_Get( int i_object, char const *psz_var, vlc_value_t *p_value ) -{ - vlc_t *p_vlc; - p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc; - - if( !p_vlc ) - { - return VLC_ENOOBJ; - } +int VLC_AddTarget( int i_object, char const *psz_target, + char const **ppsz_options, int i_options, + int i_mode, int i_pos ) +{ + int i_err; + LIBVLC_PLAYLIST_FUNC; + i_err = playlist_AddExt( p_libvlc->p_playlist, psz_target, + NULL, i_mode, i_pos, -1, + ppsz_options, i_options, VLC_TRUE, VLC_FALSE ); + LIBVLC_PLAYLIST_FUNC_END; + return i_err; +} - return var_Get( p_vlc, psz_var, p_value ); +/***************************************************************************** + * VLC_Play: play the playlist + *****************************************************************************/ +int VLC_Play( int i_object ) +{ + LIBVLC_PLAYLIST_FUNC; + playlist_Play( p_libvlc->p_playlist ); + LIBVLC_PLAYLIST_FUNC_END; + return VLC_SUCCESS; } -/* FIXME: temporary hacks */ +/***************************************************************************** + * VLC_Pause: toggle pause + *****************************************************************************/ +int VLC_Pause( int i_object ) +{ + LIBVLC_PLAYLIST_FUNC; + playlist_Pause( p_libvlc->p_playlist ); + LIBVLC_PLAYLIST_FUNC_END; + return VLC_SUCCESS; +} /***************************************************************************** - * VLC_Play: play + * VLC_Stop: stop playback *****************************************************************************/ -int VLC_Play( int i_object ) +int VLC_Stop( int i_object ) { - playlist_t * p_playlist; - vlc_t *p_vlc; + LIBVLC_PLAYLIST_FUNC; + playlist_Stop( p_libvlc->p_playlist ); + LIBVLC_PLAYLIST_FUNC_END; + return VLC_SUCCESS; +} - p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc; +/***************************************************************************** + * VLC_IsPlaying: Query for Playlist Status + *****************************************************************************/ +vlc_bool_t VLC_IsPlaying( int i_object ) +{ + vlc_bool_t b_playing; - /* Check that the handle is valid */ - if( !p_vlc ) + LIBVLC_PLAYLIST_FUNC; + if( p_libvlc->p_playlist->p_input ) { - return VLC_ENOOBJ; + vlc_value_t val; + var_Get( p_libvlc->p_playlist->p_input, "state", &val ); + b_playing = ( val.i_int == PLAYING_S ); } + else + { + b_playing = playlist_IsPlaying( p_libvlc->p_playlist ); + } + LIBVLC_PLAYLIST_FUNC_END; + return b_playing; +} + +/** + * Get the current position in a input + * + * Return the current position as a float + * \note For some inputs, this will be unknown. + * + * \param i_object a vlc object id + * \return a float in the range of 0.0 - 1.0 + */ +float VLC_PositionGet( int i_object ) +{ + input_thread_t *p_input; + vlc_value_t val; + LIBVLC_FUNC; - p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_CHILD ); + p_input = vlc_object_find( p_libvlc, VLC_OBJECT_INPUT, FIND_CHILD ); - if( !p_playlist ) + if( !p_input ) { + if( i_object ) vlc_object_release( p_libvlc ); return VLC_ENOOBJ; } - vlc_mutex_lock( &p_playlist->object_lock ); - if( p_playlist->i_size ) + var_Get( p_input, "position", &val ); + vlc_object_release( p_input ); + + LIBVLC_FUNC_END; + return val.f_float; +} + +/** + * Set the current position in a input + * + * Set the current position in a input and then return + * the current position as a float. + * \note For some inputs, this will be unknown. + * + * \param i_object a vlc object id + * \param i_position a float in the range of 0.0 - 1.0 + * \return a float in the range of 0.0 - 1.0 + */ +float VLC_PositionSet( int i_object, float i_position ) +{ + input_thread_t *p_input; + vlc_value_t val; + libvlc_int_t *p_libvlc = vlc_current_object( i_object ); + + /* Check that the handle is valid */ + if( !p_libvlc ) { - vlc_mutex_unlock( &p_playlist->object_lock ); - playlist_Play( p_playlist ); + return VLC_ENOOBJ; } - else + + p_input = vlc_object_find( p_libvlc, VLC_OBJECT_INPUT, FIND_CHILD ); + + if( !p_input ) { - vlc_mutex_unlock( &p_playlist->object_lock ); + if( i_object ) vlc_object_release( p_libvlc ); + return VLC_ENOOBJ; } - vlc_object_release( p_playlist ); + val.f_float = i_position; + var_Set( p_input, "position", val ); + var_Get( p_input, "position", &val ); + vlc_object_release( p_input ); - return VLC_SUCCESS; + if( i_object ) vlc_object_release( p_libvlc ); + return val.f_float; } -/***************************************************************************** - * VLC_Stop: stop - *****************************************************************************/ -int VLC_Stop( int i_object ) +/** + * Get the current position in a input + * + * Return the current position in seconds from the start. + * \note For some inputs, this will be unknown. + * + * \param i_object a vlc object id + * \return the offset from 0:00 in seconds + */ +int VLC_TimeGet( int i_object ) { - 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; + input_thread_t *p_input; + vlc_value_t val; + libvlc_int_t *p_libvlc = vlc_current_object( i_object ); /* Check that the handle is valid */ - if( !p_vlc ) + if( !p_libvlc ) { 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 )) ) + p_input = vlc_object_find( p_libvlc, VLC_OBJECT_INPUT, FIND_CHILD ); + + if( !p_input ) { - intf_StopThread( p_intf ); - vlc_object_detach( p_intf ); - vlc_object_release( p_intf ); - intf_Destroy( p_intf ); + if( i_object ) vlc_object_release( p_libvlc ); + return VLC_ENOOBJ; } - /* - * Free playlists - */ - msg_Dbg( p_vlc, "removing all playlists" ); - while( (p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, - FIND_CHILD )) ) + var_Get( p_input, "time", &val ); + vlc_object_release( p_input ); + + if( i_object ) vlc_object_release( p_libvlc ); + return val.i_time / 1000000; +} + +/** + * Seek to a position in the current input + * + * Seek i_seconds in the current input. If b_relative is set, + * then the seek will be relative to the current position, otherwise + * it will seek to i_seconds from the beginning of the input. + * \note For some inputs, this will be unknown. + * + * \param i_object a vlc object id + * \param i_seconds seconds from current position or from beginning of input + * \param b_relative seek relative from current position + * \return VLC_SUCCESS on success + */ +int VLC_TimeSet( int i_object, int i_seconds, vlc_bool_t b_relative ) +{ + input_thread_t *p_input; + vlc_value_t val; + libvlc_int_t *p_libvlc = vlc_current_object( i_object ); + + /* Check that the handle is valid */ + if( !p_libvlc ) { - vlc_object_detach( p_playlist ); - vlc_object_release( p_playlist ); - playlist_Destroy( p_playlist ); + return VLC_ENOOBJ; } - /* - * Free video outputs - */ - msg_Dbg( p_vlc, "removing all video outputs" ); - while( (p_vout = vlc_object_find( p_vlc, VLC_OBJECT_VOUT, FIND_CHILD )) ) + p_input = vlc_object_find( p_libvlc, VLC_OBJECT_INPUT, FIND_CHILD ); + + if( !p_input ) { - vlc_object_detach( p_vout ); - vlc_object_release( p_vout ); - vout_DestroyThread( p_vout ); + if( i_object ) vlc_object_release( p_libvlc ); + return VLC_ENOOBJ; } - /* - * Free audio outputs - */ - msg_Dbg( p_vlc, "removing all audio outputs" ); - while( (p_aout = vlc_object_find( p_vlc, VLC_OBJECT_AOUT, FIND_CHILD )) ) + if( b_relative ) + { + val.i_time = i_seconds; + val.i_time = val.i_time * 1000000L; + var_Set( p_input, "time-offset", val ); + } + else { - vlc_object_detach( (vlc_object_t *)p_aout ); - vlc_object_release( (vlc_object_t *)p_aout ); - aout_Delete( p_aout ); + val.i_time = i_seconds; + val.i_time = val.i_time * 1000000L; + var_Set( p_input, "time", val ); } + vlc_object_release( p_input ); + if( i_object ) vlc_object_release( p_libvlc ); return VLC_SUCCESS; } -/***************************************************************************** - * VLC_Pause: toggle pause - *****************************************************************************/ -int VLC_Pause( int i_object ) +/** + * Get the total length of a input + * + * Return the total length in seconds from the current input. + * \note For some inputs, this will be unknown. + * + * \param i_object a vlc object id + * \return the length in seconds + */ +int VLC_LengthGet( int i_object ) { input_thread_t *p_input; - vlc_t *p_vlc; + vlc_value_t val; + libvlc_int_t *p_libvlc = vlc_current_object( i_object ); - p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc; - - if( !p_vlc ) + /* Check that the handle is valid */ + if( !p_libvlc ) { return VLC_ENOOBJ; } - p_input = vlc_object_find( p_vlc, VLC_OBJECT_INPUT, FIND_CHILD ); + p_input = vlc_object_find( p_libvlc, VLC_OBJECT_INPUT, FIND_CHILD ); if( !p_input ) { + if( i_object ) vlc_object_release( p_libvlc ); return VLC_ENOOBJ; } - input_SetStatus( p_input, INPUT_STATUS_PAUSE ); + var_Get( p_input, "length", &val ); vlc_object_release( p_input ); - return VLC_SUCCESS; + if( i_object ) vlc_object_release( p_libvlc ); + return val.i_time / 1000000L; } -/***************************************************************************** - * VLC_FullScreen: toggle fullscreen mode - *****************************************************************************/ -int VLC_FullScreen( int i_object ) +/** + * Play the input faster than realtime + * + * 2x, 4x, 8x faster than realtime + * \note For some inputs, this will be impossible. + * + * \param i_object a vlc object id + * \return the current speedrate + */ +float VLC_SpeedFaster( int i_object ) { - vout_thread_t *p_vout; - vlc_t *p_vlc; - - p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc; + input_thread_t *p_input; + vlc_value_t val; + libvlc_int_t *p_libvlc = vlc_current_object( i_object ); - if( !p_vlc ) + /* Check that the handle is valid */ + if( !p_libvlc ) { return VLC_ENOOBJ; } - p_vout = vlc_object_find( p_vlc, VLC_OBJECT_VOUT, FIND_CHILD ); + p_input = vlc_object_find( p_libvlc, VLC_OBJECT_INPUT, FIND_CHILD ); - if( !p_vout ) + if( !p_input ) { + if( i_object ) vlc_object_release( p_libvlc ); return VLC_ENOOBJ; } - p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE; - vlc_object_release( p_vout ); + val.b_bool = VLC_TRUE; + var_Set( p_input, "rate-faster", val ); + var_Get( p_input, "rate", &val ); + vlc_object_release( p_input ); - return VLC_SUCCESS; + if( i_object ) vlc_object_release( p_libvlc ); + return val.f_float / INPUT_RATE_DEFAULT; } -/* following functions are local */ - -/***************************************************************************** - * GetFilenames: parse command line options which are not flags - ***************************************************************************** - * Parse command line for input files. - *****************************************************************************/ -static int GetFilenames( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] ) +/** + * Play the input slower than realtime + * + * 1/2x, 1/4x, 1/8x slower than realtime + * \note For some inputs, this will be impossible. + * + * \param i_object a vlc object id + * \return the current speedrate + */ +float VLC_SpeedSlower( int i_object ) { - int i_opt; + input_thread_t *p_input; + vlc_value_t val; + libvlc_int_t *p_libvlc = vlc_current_object( i_object ); - /* We assume that the remaining parameters are filenames */ - for( i_opt = optind; i_opt < i_argc; i_opt++ ) + /* Check that the handle is valid */ + if( !p_libvlc ) { - /* TODO: write an internal function of this one, to avoid - * unnecessary lookups. */ - VLC_AddTarget( p_vlc->i_object_id, ppsz_argv[ i_opt ], - PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END ); + return VLC_ENOOBJ; } - return VLC_SUCCESS; -} - -/***************************************************************************** - * Usage: print program usage - ***************************************************************************** - * Print a short inline help. Message interface is initialized at this stage. - *****************************************************************************/ -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 ---------------------------' - * - * The purpose of having bra and ket is that we might i18n them as well. - */ -#define LINE_START 8 -#define PADDING_SPACES 25 - vlc_list_t *p_list; - module_t **pp_parser; - module_config_t *p_item; - char psz_spaces[PADDING_SPACES+LINE_START+1]; - char psz_format[sizeof(FORMAT_STRING)]; - - memset( psz_spaces, ' ', PADDING_SPACES+LINE_START ); - psz_spaces[PADDING_SPACES+LINE_START] = '\0'; - - strcpy( psz_format, FORMAT_STRING ); - -#ifdef WIN32 - ShowConsole(); -#endif - - /* List all modules */ - p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE ); + p_input = vlc_object_find( p_libvlc, VLC_OBJECT_INPUT, FIND_CHILD ); - /* Enumerate the config for each module */ - for( pp_parser = (module_t **)p_list->pp_objects ; - *pp_parser ; - pp_parser++ ) + if( !p_input ) { - vlc_bool_t b_help_module; - - if( psz_module_name && strcmp( psz_module_name, - (*pp_parser)->psz_object_name ) ) - { - continue; - } - - /* Ignore modules without config options */ - if( !(*pp_parser)->i_config_items ) - { - continue; - } - - b_help_module = !strcmp( "help", (*pp_parser)->psz_object_name ); - - /* Print module options */ - for( p_item = (*pp_parser)->p_config; - p_item->i_type != CONFIG_HINT_END; - p_item++ ) - { - char *psz_bra = NULL, *psz_type = NULL, *psz_ket = NULL; - char *psz_suf = "", *psz_prefix = NULL; - int i; - - switch( p_item->i_type ) - { - case CONFIG_HINT_CATEGORY: - case CONFIG_HINT_USAGE: - fprintf( stderr, " %s\n", p_item->psz_text ); - break; - - case CONFIG_ITEM_STRING: - case CONFIG_ITEM_FILE: - case CONFIG_ITEM_MODULE: /* We could also have "=<" here */ - if( !p_item->ppsz_list ) - { - psz_bra = " <"; psz_type = _("string"); psz_ket = ">"; - break; - } - else - { - psz_bra = " ["; - psz_type = malloc( 1000 ); - memset( psz_type, 0, 1000 ); - for( i=0; p_item->ppsz_list[i]; i++ ) - { - strcat( psz_type, p_item->ppsz_list[i] ); - strcat( psz_type, "|" ); - } - psz_type[ strlen( psz_type ) - 1 ] = '\0'; - psz_ket = "]"; - break; - } - case CONFIG_ITEM_INTEGER: - psz_bra = " <"; psz_type = _("integer"); psz_ket = ">"; - break; - case CONFIG_ITEM_FLOAT: - psz_bra = " <"; psz_type = _("float"); psz_ket = ">"; - break; - case CONFIG_ITEM_BOOL: - psz_bra = ""; psz_type = ""; psz_ket = ""; - if( !b_help_module ) - { - psz_suf = p_item->i_value ? _(" (default enabled)") : - _(" (default disabled)"); - } - break; - } - - /* Add short option if any */ - if( p_item->i_short ) - { - psz_format[2] = '-'; - psz_format[3] = p_item->i_short; - psz_format[4] = ','; - } - else - { - psz_format[2] = ' '; - psz_format[3] = ' '; - psz_format[4] = ' '; - } - - 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 ) - { - /* If option is of type --foo-bar, we print its counterpart - * as --no-foo-bar, but if it is of type --foobar (without - * dashes in the name) we print it as --nofoobar. Both - * values are of course valid, only the display changes. */ - vlc_bool_t b_dash = VLC_FALSE; - psz_prefix = p_item->psz_name; - while( *psz_prefix ) - { - if( *psz_prefix++ == '-' ) - { - b_dash = VLC_TRUE; - break; - } - } - - 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 ) - { - i = 0; - psz_spaces[i] = '\n'; - } - else - { - psz_spaces[i] = '\0'; - } - - if( p_item->i_type == CONFIG_ITEM_BOOL && - !b_help_module ) - { - 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 - { - fprintf( stderr, psz_format, p_item->psz_name, "", "", - psz_bra, psz_type, psz_ket, psz_spaces, - p_item->psz_text, psz_suf ); - } - psz_spaces[i] = ' '; - if ( p_item->ppsz_list ) - { - free( psz_type ); - } - } - } + if( i_object ) vlc_object_release( p_libvlc ); + return VLC_ENOOBJ; } - /* Release the module list */ - vlc_list_release( p_list ); + val.b_bool = VLC_TRUE; + var_Set( p_input, "rate-slower", val ); + var_Get( p_input, "rate", &val ); + vlc_object_release( p_input ); -#ifdef WIN32 /* Pause the console because it's destroyed when we exit */ - fprintf( stderr, _("\nPress the RETURN key to continue...\n") ); - getchar(); -#endif + if( i_object ) vlc_object_release( p_libvlc ); + return val.f_float / INPUT_RATE_DEFAULT; } -/***************************************************************************** - * ListModules: list the available modules with their description - ***************************************************************************** - * Print a list of all available modules (builtins and plugins) and a short - * description for each one. - *****************************************************************************/ -static void ListModules( vlc_t *p_this ) +/** + * Return the current playlist item + * + * Returns the index of the playlistitem that is currently selected for play. + * This is valid even if nothing is currently playing. + * + * \param i_object a vlc object id + * \return the current index + */ +int VLC_PlaylistIndex( int i_object ) { - vlc_list_t *p_list; - module_t **pp_parser; - char psz_spaces[22]; + (void)i_object; + printf( "This function is deprecated and should not be used anymore" ); + return -1; +} - memset( psz_spaces, ' ', 22 ); +/** + * Total number of items in the playlist + * + * \param i_object a vlc object id + * \return amount of playlist items + */ +int VLC_PlaylistNumberOfItems( int i_object ) +{ + int i_size; + LIBVLC_PLAYLIST_FUNC; + i_size = p_libvlc->p_playlist->items.i_size; + LIBVLC_PLAYLIST_FUNC_END; + return i_size; +} -#ifdef WIN32 - ShowConsole(); -#endif +/** + * Go to next playlist item + * \param i_object a vlc object id + * \return VLC_SUCCESS on success + */ +int VLC_PlaylistNext( int i_object ) +{ + LIBVLC_PLAYLIST_FUNC; + playlist_Next( p_libvlc->p_playlist ); + LIBVLC_PLAYLIST_FUNC_END; + return VLC_SUCCESS; +} - /* Usage */ - fprintf( stderr, _("Usage: %s [options] [items]...\n\n"), - p_this->p_vlc->psz_object_name ); +/** + * Go to previous playlist item + * \param i_object a vlc object id + * \return VLC_SUCCESS on success + */ +int VLC_PlaylistPrev( int i_object ) +{ + LIBVLC_PLAYLIST_FUNC; + playlist_Prev( p_libvlc->p_playlist ); + LIBVLC_PLAYLIST_FUNC_END; + return VLC_SUCCESS; +} - fprintf( stderr, _("[module] [description]\n") ); +/** + * Empty the playlist + */ +int VLC_PlaylistClear( int i_object ) +{ + LIBVLC_PLAYLIST_FUNC; + playlist_Clear( p_libvlc->p_playlist, VLC_TRUE ); + LIBVLC_PLAYLIST_FUNC_END; + return VLC_SUCCESS; +} - /* List all modules */ - p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE ); +/** + * Change the volume + * + * \param i_object a vlc object id + * \param i_volume something in a range from 0-200 + * \return the new volume (range 0-200 %) + */ +int VLC_VolumeSet( int i_object, int i_volume ) +{ + audio_volume_t i_vol = 0; + LIBVLC_FUNC; - /* Enumerate each module */ - for( pp_parser = (module_t **)p_list->pp_objects ; - *pp_parser ; - pp_parser++ ) + if( i_volume >= 0 && i_volume <= 200 ) { - int i; - - /* Nasty hack, but right now I'm too tired to think about a nice - * solution */ - i = 22 - strlen( (*pp_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 ); - - psz_spaces[i] = ' '; + i_vol = i_volume * AOUT_VOLUME_MAX / 200; + aout_VolumeSet( p_libvlc, i_vol ); } - - vlc_list_release( p_list ); - -#ifdef WIN32 /* Pause the console because it's destroyed when we exit */ - fprintf( stderr, _("\nPress the RETURN key to continue...\n") ); - getchar(); -#endif + LIBVLC_FUNC_END; + return i_vol * 200 / AOUT_VOLUME_MAX; } -/***************************************************************************** - * Version: print complete program version - ***************************************************************************** - * Print complete program version and build number. - *****************************************************************************/ -static void Version( void ) +/** + * Get the current volume + * + * Retrieve the current volume. + * + * \param i_object a vlc object id + * \return the current volume (range 0-200 %) + */ +int VLC_VolumeGet( int i_object ) { -#ifdef WIN32 - ShowConsole(); -#endif - - fprintf( stderr, VERSION_MESSAGE "\n" ); - fprintf( stderr, - _("This program comes with NO WARRANTY, to the extent permitted by " - "law.\nYou may redistribute it under the terms of the GNU General " - "Public License;\nsee the file named COPYING for details.\n" - "Written by the VideoLAN team at Ecole Centrale, Paris.\n") ); + audio_volume_t i_volume; + LIBVLC_FUNC; + aout_VolumeGet( p_libvlc, &i_volume ); + LIBVLC_FUNC_END; + return i_volume*200/AOUT_VOLUME_MAX; +} -#ifdef WIN32 /* Pause the console because it's destroyed when we exit */ - fprintf( stderr, _("\nPress the RETURN key to continue...\n") ); - getchar(); -#endif +/** + * Mute/Unmute the volume + * + * \param i_object a vlc object id + * \return VLC_SUCCESS on success + */ +int VLC_VolumeMute( int i_object ) +{ + LIBVLC_FUNC; + aout_VolumeMute( p_libvlc, NULL ); + LIBVLC_FUNC_END; + return VLC_SUCCESS; } /***************************************************************************** - * ShowConsole: On Win32, create an output console for debug messages - ***************************************************************************** - * This function is useful only on Win32. + * VLC_FullScreen: toggle fullscreen mode *****************************************************************************/ -#ifdef WIN32 /* */ -static void ShowConsole( void ) +int VLC_FullScreen( int i_object ) { - AllocConsole(); - freopen( "CONOUT$", "w", stdout ); - freopen( "CONOUT$", "w", stderr ); - freopen( "CONIN$", "r", stdin ); - return; -} -#endif + vout_thread_t *p_vout; + LIBVLC_FUNC; + p_vout = vlc_object_find( p_libvlc, VLC_OBJECT_VOUT, FIND_CHILD ); + + if( !p_vout ) + { + if( i_object ) vlc_object_release( p_libvlc ); + return VLC_ENOOBJ; + } + p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE; + vlc_object_release( p_vout ); + LIBVLC_FUNC_END; + return VLC_SUCCESS; +}