/*****************************************************************************
* libvlc.c: main libvlc source
*****************************************************************************
- * Copyright (C) 1998-2002 VideoLAN
- * $Id: libvlc.c,v 1.71 2003/03/26 00:56:22 gbazin Exp $
+ * Copyright (C) 1998-2004 VideoLAN
+ * $Id$
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
- * Gildas Bazin <gbazin@netcourrier.com>
+ * Gildas Bazin <gbazin@videolan.org>
+ * Derk-Jan Hartman <hartman at videolan dot org>
*
* 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
* Preamble
*****************************************************************************/
#include <vlc/vlc.h>
+#include <vlc/input.h>
#ifdef HAVE_ERRNO_H
# include <errno.h> /* ENOMEM */
# include <locale.h>
#endif
+#ifdef HAVE_HAL
+# include <hal/libhal.h>
+#endif
+
#include "vlc_cpu.h" /* CPU detection */
#include "os_specific.h"
-#include "error.h"
-#include "netutils.h" /* network_ChannelJoin */
-
-#include "stream_control.h"
-#include "input_ext-intf.h"
+#include "vlc_error.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 "stream_output.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;
+static libvlc_t libvlc;
+static libvlc_t * p_libvlc;
+static vlc_t * p_static_vlc;
/*****************************************************************************
* Local prototypes
#endif
static int ConsoleWidth ( void );
+static int VerboseCallback( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
+
+static void InitDeviceValues( vlc_t * );
+
+/*****************************************************************************
+ * 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.
*****************************************************************************
vlc_t * p_vlc = NULL;
vlc_value_t lockval;
+ /* &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( &libvlc );
+ i_ret = vlc_threads_init( p_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 );
+ var_Create( p_libvlc, "libvlc", VLC_VAR_MUTEX );
+ var_Get( p_libvlc, "libvlc", &lockval );
vlc_mutex_lock( lockval.p_address );
if( !libvlc.b_ready )
{
psz_env = getenv( "VLC_VERBOSE" );
libvlc.i_verbose = psz_env ? atoi( psz_env ) : -1;
-#ifdef HAVE_ISATTY
+#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( &libvlc );
+ msg_Create( p_libvlc );
/* Announce who we are */
- msg_Dbg( &libvlc, COPYRIGHT_MESSAGE );
- msg_Dbg( &libvlc, "libvlc was configured with %s", CONFIGURE_LINE );
+ 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( &libvlc, "libvlc" );
+ var_Destroy( p_libvlc, "libvlc" );
/* Allocate a vlc object */
- p_vlc = vlc_object_create( &libvlc, VLC_OBJECT_VLC );
+ p_vlc = vlc_object_create( p_libvlc, VLC_OBJECT_VLC );
if( p_vlc == NULL )
{
return VLC_EGENERIC;
}
+ p_vlc->thread_id = 0;
vlc_thread_set_priority( p_vlc, VLC_THREAD_PRIORITY_LOW );
p_vlc->psz_object_name = "root";
/* Initialize mutexes */
vlc_mutex_init( p_vlc, &p_vlc->config_lock );
+#ifdef SYS_DARWIN
+ vlc_mutex_init( p_vlc, &p_vlc->quicktime_lock );
+#endif
/* Store our newly allocated structure in the global list */
- vlc_object_attach( p_vlc, &libvlc );
+ vlc_object_attach( p_vlc, p_libvlc );
/* Store data for the non-reentrant API */
p_static_vlc = p_vlc;
char * p_tmp;
char * psz_modules;
char * psz_parser;
+ char * psz_language;
vlc_bool_t b_exit = VLC_FALSE;
- vlc_t * p_vlc;
+ vlc_t * p_vlc = vlc_current_object( i_object );
module_t *p_help_module;
playlist_t *p_playlist;
- vlc_value_t lockval;
-
- p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
if( !p_vlc )
{
* 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( &libvlc, "libvlc", VLC_VAR_MUTEX );
- var_Get( &libvlc, "libvlc", &lockval );
- vlc_mutex_lock( lockval.p_address );
- if( libvlc.p_module_bank == NULL )
- {
- module_InitBank( &libvlc );
- module_LoadMain( &libvlc );
- }
- vlc_mutex_unlock( lockval.p_address );
- var_Destroy( &libvlc, "libvlc" );
+ module_InitBank( p_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 );
+ module_EndBank( p_vlc );
if( i_object ) vlc_object_release( p_vlc );
return VLC_EGENERIC;
}
p_help_module->psz_object_name = "help";
+ p_help_module->psz_longname = N_("Help options");
config_Duplicate( p_help_module, p_help_config );
vlc_object_attach( p_help_module, libvlc.p_module_bank );
/* End hack */
vlc_object_detach( p_help_module );
config_Free( p_help_module );
vlc_object_destroy( p_help_module );
- //module_EndBank( 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( stdout, _("Usage: %s [options] [items]...\n\n"),
+ fprintf( stdout, _("Usage: %s [options] [items]...\n"),
p_vlc->psz_object_name );
Usage( p_vlc, "main" );
Usage( p_vlc, "help" );
b_exit = VLC_TRUE;
}
+ /* Set the config file stuff */
+ p_vlc->psz_homedir = config_GetHomeDir();
+ p_vlc->psz_configfile = config_GetPsz( p_vlc, "config" );
+
+ /* Check for plugins cache options */
+ if( config_GetInt( p_vlc, "reset-plugins-cache" ) )
+ {
+ libvlc.p_module_bank->b_cache_delete = VLC_TRUE;
+ }
+
/* Hack: remove the help module here */
vlc_object_detach( p_help_module );
/* End hack */
+ /* Will be re-done properly later on */
+ p_vlc->p_libvlc->i_verbose = config_GetInt( p_vlc, "verbose" );
+
+ /* Check for daemon mode */
+#ifndef WIN32
+ if( config_GetInt( p_vlc, "daemon" ) )
+ {
+#if HAVE_DAEMON
+ if( daemon( 0, 0) != 0 )
+ {
+ msg_Err( p_vlc, "Unable to fork vlc to daemon mode" );
+ b_exit = VLC_TRUE;
+ }
+
+ p_vlc->p_libvlc->b_daemon = VLC_TRUE;
+
+#else
+ pid_t i_pid;
+
+ if( ( i_pid = fork() ) < 0 )
+ {
+ msg_Err( p_vlc, "Unable to fork vlc to daemon mode" );
+ b_exit = VLC_TRUE;
+ }
+ else if( i_pid )
+ {
+ /* This is the parent, exit right now */
+ msg_Dbg( p_vlc, "closing parent process" );
+ b_exit = VLC_TRUE;
+ }
+ else
+ {
+ /* We are the child */
+ msg_Dbg( p_vlc, "daemon spawned" );
+ close( STDIN_FILENO );
+ close( STDOUT_FILENO );
+ close( STDERR_FILENO );
+
+ p_vlc->p_libvlc->b_daemon = VLC_TRUE;
+ }
+#endif
+ }
+#endif
+
if( b_exit )
{
config_Free( p_help_module );
vlc_object_destroy( p_help_module );
- //module_EndBank( p_vlc );
+ module_EndBank( p_vlc );
if( i_object ) vlc_object_release( p_vlc );
return VLC_EEXIT;
}
/* Check for translation config option */
- if( !config_GetInt( p_vlc, "translation" ) )
+#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" ) )
{
+ vlc_bool_t b_cache_delete = libvlc.p_module_bank->b_cache_delete;
+
/* Reset the default domain */
- SetLanguage( "C" );
+ SetLanguage( psz_language );
-#if defined( ENABLE_NLS ) \
- && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
- textdomain( "dummy" );
+ /* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */
+ msg_Dbg( p_vlc, "translation test: code is \"%s\"", _("C") );
+
+ textdomain( PACKAGE_NAME );
+
+#if defined( ENABLE_UTF8 )
+ bind_textdomain_codeset( PACKAGE_NAME, "UTF-8" );
#endif
+
+ module_EndBank( p_vlc );
+ module_InitBank( p_vlc );
+ config_LoadConfigFile( p_vlc, "main" );
+ config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, VLC_TRUE );
+ libvlc.p_module_bank->b_cache_delete = b_cache_delete;
}
+ if( psz_language ) free( psz_language );
+#endif
/*
* Load the builtins and plugins into the module_bank.
* list of configuration options exported by each module and loads their
* default values.
*/
- module_LoadBuiltins( &libvlc );
- module_LoadPlugins( &libvlc );
+ 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",
libvlc.p_module_bank->i_children );
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 */
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 );
+ 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;
}
+ /*
+ * Init device values
+ */
+ InitDeviceValues( p_vlc );
+
/*
* 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
*/
"that they are valid.\nPress the RETURN key to continue..." );
getchar();
#endif
- //module_EndBank( 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
*/
+
+ var_Create( p_vlc, "verbose", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
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 );
- }
+ vlc_value_t val;
+ val.i_int = -1;
+ var_Set( p_vlc, "verbose", val );
}
- libvlc.b_color = libvlc.b_color || config_GetInt( p_vlc, "color" );
+ var_AddCallback( p_vlc, "verbose", VerboseCallback, NULL );
+ var_Change( p_vlc, "verbose", VLC_VAR_TRIGGER_CALLBACKS, NULL, NULL );
+
+ 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 initialization. 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_MMXEXT;
if( !config_GetInt( p_vlc, "sse" ) )
libvlc.i_cpu &= ~CPU_CAPABILITY_SSE;
+ if( !config_GetInt( p_vlc, "sse2" ) )
+ libvlc.i_cpu &= ~CPU_CAPABILITY_SSE2;
#endif
#if defined( __powerpc__ ) || defined( SYS_DARWIN )
if( !config_GetInt( p_vlc, "altivec" ) )
PRINT_CAPABILITY( CPU_CAPABILITY_3DNOW, "3DNow!" );
PRINT_CAPABILITY( CPU_CAPABILITY_MMXEXT, "MMXEXT" );
PRINT_CAPABILITY( CPU_CAPABILITY_SSE, "SSE" );
+ PRINT_CAPABILITY( CPU_CAPABILITY_SSE2, "SSE2" );
PRINT_CAPABILITY( CPU_CAPABILITY_ALTIVEC, "AltiVec" );
PRINT_CAPABILITY( CPU_CAPABILITY_FPU, "FPU" );
msg_Dbg( p_vlc, "CPU has capabilities %s", p_capabilities );
/*
* Choose the best memcpy module
*/
- p_vlc->p_memcpy_module = module_Need( p_vlc, "memcpy", "$memcpy" );
+ p_vlc->p_memcpy_module = module_Need( p_vlc, "memcpy", "$memcpy", 0 );
if( p_vlc->pf_memcpy == NULL )
{
}
/*
- * Initialize shared resources and libraries
+ * Initialize hotkey handling
*/
- 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 );
- }
+ 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
{
module_Unneed( p_vlc, p_vlc->p_memcpy_module );
}
- //module_EndBank( p_vlc );
+ module_EndBank( p_vlc );
if( i_object ) vlc_object_release( p_vlc );
return VLC_EGENERIC;
}
psz_parser = psz_modules;
while ( psz_parser && *psz_parser )
{
- char *psz_module;
+ char *psz_module, *psz_temp;
psz_module = psz_parser;
psz_parser = strchr( psz_module, ',' );
if ( psz_parser )
*psz_parser = '\0';
psz_parser++;
}
- VLC_AddIntf( 0, psz_module, VLC_FALSE );
+ 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, 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, 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
* 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;
-
- p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+ vlc_t *p_vlc = vlc_current_object( i_object );
if( !p_vlc )
{
return VLC_ENOOBJ;
}
+#ifndef WIN32
+ if( p_vlc->p_libvlc->b_daemon && b_block && !psz_module )
+ {
+ /* Daemon mode hack.
+ * We prefer the dummy interface if none is specified. */
+ char *psz_interface = config_GetPsz( p_vlc, "intf" );
+ if( !psz_interface || !*psz_interface ) psz_module = "dummy";
+ if( psz_interface ) free( psz_interface );
+ }
+#endif
+
/* 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 initialization failed" );
+ msg_Err( p_vlc, "interface \"%s\" initialization failed", psz_module );
if( i_object ) vlc_object_release( p_vlc );
return VLC_EGENERIC;
}
+ /* Interface doesn't handle play on start so do it ourselves */
+ if( !p_intf->b_play && b_play ) VLC_Play( i_object );
+
/* Try to run the interface */
+ p_intf->b_play = b_play;
p_intf->b_block = b_block;
i_err = intf_RunThread( p_intf );
if( i_err )
}
/*****************************************************************************
- * 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_vlc->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;
+ 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;
+}
- p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+/*****************************************************************************
+ * VLC_CleanUp: CleanUp all the intf, playlist, vout, aout
+ *****************************************************************************/
+int VLC_CleanUp( int i_object )
+{
+ intf_thread_t * p_intf;
+ playlist_t * p_playlist;
+ vout_thread_t * p_vout;
+ aout_instance_t * p_aout;
+ announce_handler_t * p_announce;
+ vlc_t *p_vlc = vlc_current_object( i_object );
+ /* Check that the handle is valid */
if( !p_vlc )
{
return VLC_ENOOBJ;
}
/*
- * Go back into channel 0 which is the network
+ * Ask the interfaces to stop and destroy them
*/
- if( config_GetInt( p_vlc, "network-channel" ) && p_vlc->p_channel )
+ msg_Dbg( p_vlc, "removing all interfaces" );
+ while( (p_intf = vlc_object_find( p_vlc, VLC_OBJECT_INTF, FIND_CHILD )) )
{
- network_ChannelJoin( p_vlc, COMMON_CHANNEL );
+ intf_StopThread( p_intf );
+ vlc_object_detach( p_intf );
+ vlc_object_release( p_intf );
+ intf_Destroy( p_intf );
}
/*
- * Free allocated memory
+ * Free playlists
*/
- if( p_vlc->p_memcpy_module )
+ msg_Dbg( p_vlc, "removing all playlists" );
+ while( (p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST,
+ FIND_CHILD )) )
{
- module_Unneed( p_vlc, p_vlc->p_memcpy_module );
- p_vlc->p_memcpy_module = NULL;
+ vlc_object_detach( p_playlist );
+ vlc_object_release( p_playlist );
+ playlist_Destroy( p_playlist );
}
- if( p_vlc->psz_homedir )
+ /*
+ * Free video outputs
+ */
+ msg_Dbg( p_vlc, "removing all video outputs" );
+ while( (p_vout = vlc_object_find( p_vlc, VLC_OBJECT_VOUT, FIND_CHILD )) )
{
- free( p_vlc->psz_homedir );
- p_vlc->psz_homedir = NULL;
+ vlc_object_detach( p_vout );
+ vlc_object_release( p_vout );
+ vout_Destroy( p_vout );
}
/*
- * XXX: Free module bank !
+ * Free audio outputs
*/
- //module_EndBank( 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( (vlc_object_t *)p_aout );
+ vlc_object_release( (vlc_object_t *)p_aout );
+ aout_Delete( p_aout );
+ }
/*
- * System specific cleaning code
+ * Free announce handler(s?)
*/
- system_End( p_vlc );
-
- /* Destroy mutexes */
- vlc_mutex_destroy( &p_vlc->config_lock );
-
- vlc_object_detach( p_vlc );
+ msg_Dbg( p_vlc, "removing announce handler" );
+ while( (p_announce = vlc_object_find( p_vlc, VLC_OBJECT_ANNOUNCE,
+ FIND_CHILD ) ) )
+ {
+ vlc_object_detach( p_announce );
+ vlc_object_release( p_announce );
+ announce_HandlerDestroy( p_announce );
+ }
- /* 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( &libvlc );
-
return VLC_SUCCESS;
}
/*****************************************************************************
- * VLC_Die: ask vlc to die.
+ * VLC_Destroy: Destroy everything.
*****************************************************************************
- * 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.
+ * This function requests the running threads to finish, waits for their
+ * termination, and destroys their structure.
*****************************************************************************/
-int VLC_Die( int i_object )
+int VLC_Destroy( int i_object )
{
- vlc_t *p_vlc;
-
- p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+ vlc_t *p_vlc = vlc_current_object( i_object );
if( !p_vlc )
{
return VLC_ENOOBJ;
}
- p_vlc->b_die = VLC_TRUE;
+ /*
+ * 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( i_object ) vlc_object_release( p_vlc );
- return VLC_SUCCESS;
-}
+ /*
+ * Free module bank !
+ */
+ module_EndBank( p_vlc );
-/*****************************************************************************
- * 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, int i_mode, int i_pos )
-{
- int i_err;
- playlist_t *p_playlist;
- vlc_t *p_vlc;
+ if( p_vlc->psz_homedir )
+ {
+ free( p_vlc->psz_homedir );
+ p_vlc->psz_homedir = NULL;
+ }
- p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+ if( p_vlc->psz_configfile )
+ {
+ free( p_vlc->psz_configfile );
+ p_vlc->psz_configfile = NULL;
+ }
- if( !p_vlc )
+ if( p_vlc->p_hotkeys )
{
- return VLC_ENOOBJ;
+ free( p_vlc->p_hotkeys );
+ p_vlc->p_hotkeys = NULL;
}
- p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+ /*
+ * System specific cleaning code
+ */
+ system_End( p_vlc );
- if( p_playlist == NULL )
- {
- msg_Dbg( p_vlc, "no playlist present, creating one" );
- p_playlist = playlist_Create( p_vlc );
+ /* Destroy mutexes */
+ vlc_mutex_destroy( &p_vlc->config_lock );
- if( p_playlist == NULL )
- {
- if( i_object ) vlc_object_release( p_vlc );
- return VLC_EGENERIC;
- }
+ vlc_object_detach( p_vlc );
- vlc_object_yield( p_playlist );
- }
+ /* Release object before destroying it */
+ if( i_object ) vlc_object_release( p_vlc );
- i_err = playlist_Add( p_playlist, psz_target, i_mode, i_pos );
+ vlc_object_destroy( p_vlc );
- vlc_object_release( p_playlist );
+ /* Stop thread system: last one out please shut the door! */
+ vlc_threads_end( p_libvlc );
- if( i_object ) vlc_object_release( p_vlc );
- return i_err;
+ return VLC_SUCCESS;
}
/*****************************************************************************
- * VLC_Set: set a vlc variable
- *****************************************************************************
- *
+ * VLC_VariableSet: set a vlc variable
*****************************************************************************/
-int VLC_Set( int i_object, char const *psz_var, vlc_value_t value )
+int VLC_VariableSet( int i_object, char const *psz_var, vlc_value_t value )
{
- vlc_t *p_vlc;
+ vlc_t *p_vlc = vlc_current_object( i_object );
int i_ret;
- p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
-
if( !p_vlc )
{
return VLC_ENOOBJ;
}
/*****************************************************************************
- * VLC_Get: get a vlc variable
- *****************************************************************************
- *
+ * VLC_VariableGet: get a vlc variable
*****************************************************************************/
-int VLC_Get( int i_object, char const *psz_var, vlc_value_t *p_value )
+int VLC_VariableGet( int i_object, char const *psz_var, vlc_value_t *p_value )
{
- vlc_t *p_vlc;
+ vlc_t *p_vlc = vlc_current_object( i_object );
int i_ret;
- p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
-
if( !p_vlc )
{
return VLC_ENOOBJ;
}
- i_ret = var_Get( p_vlc, psz_var, p_value );
+ i_ret = var_Get( p_vlc , psz_var, p_value );
if( i_object ) vlc_object_release( p_vlc );
return i_ret;
}
-/* FIXME: temporary hacks */
-
/*****************************************************************************
- * VLC_Play: play
+ * 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_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_AddExt( p_playlist, psz_target, psz_target,
+ i_mode, i_pos, -1, ppsz_options, i_options);
+
+ vlc_object_release( p_playlist );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return i_err;
+}
+
+/*****************************************************************************
+ * VLC_Play: play
*****************************************************************************/
int VLC_Play( int i_object )
{
- playlist_t * p_playlist;
- 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 )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
+
+ if( !p_playlist )
+ {
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_ENOOBJ;
+ }
+
+ playlist_Play( p_playlist );
+ vlc_object_release( p_playlist );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * VLC_Pause: toggle pause
+ *****************************************************************************/
+int VLC_Pause( int i_object )
+{
+ playlist_t * p_playlist;
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ /* Check that the handle is valid */
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
+
+ if( !p_playlist )
+ {
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_ENOOBJ;
+ }
+
+ playlist_Pause( p_playlist );
+ vlc_object_release( p_playlist );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * VLC_Pause: toggle pause
+ *****************************************************************************/
+int VLC_Stop( int i_object )
+{
+ playlist_t * p_playlist;
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ /* Check that the handle is valid */
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
+
+ if( !p_playlist )
+ {
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_ENOOBJ;
+ }
+
+ playlist_Stop( p_playlist );
+ vlc_object_release( p_playlist );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * VLC_IsPlaying: Query for Playlist Status
+ *****************************************************************************/
+vlc_bool_t VLC_IsPlaying( int i_object )
+{
+ playlist_t * p_playlist;
+ vlc_bool_t b_playing;
+
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ /* Check that the handle is valid */
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
+
+ if( !p_playlist )
+ {
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_ENOOBJ;
+ }
+
+ b_playing = playlist_IsPlaying( p_playlist );
+ vlc_object_release( p_playlist );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ 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;
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ /* Check that the handle is valid */
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ p_input = vlc_object_find( p_vlc, VLC_OBJECT_INPUT, FIND_CHILD );
+
+ if( !p_input )
+ {
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_ENOOBJ;
+ }
+
+ var_Get( p_input, "position", &val );
+ vlc_object_release( p_input );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ 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;
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ /* Check that the handle is valid */
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ p_input = vlc_object_find( p_vlc, VLC_OBJECT_INPUT, FIND_CHILD );
+
+ if( !p_input )
+ {
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_ENOOBJ;
+ }
+
+ val.f_float = i_position;
+ var_Set( p_input, "position", val );
+ var_Get( p_input, "position", &val );
+ vlc_object_release( p_input );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return val.f_float;
+}
+
+/**
+ * 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 )
+{
+ input_thread_t *p_input;
+ vlc_value_t val;
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ /* Check that the handle is valid */
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ p_input = vlc_object_find( p_vlc, VLC_OBJECT_INPUT, FIND_CHILD );
+
+ if( !p_input )
+ {
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_ENOOBJ;
+ }
+
+ var_Get( p_input, "time", &val );
+ vlc_object_release( p_input );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ 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;
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ /* Check that the handle is valid */
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ p_input = vlc_object_find( p_vlc, VLC_OBJECT_INPUT, FIND_CHILD );
+
+ if( !p_input )
+ {
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_ENOOBJ;
+ }
+
+ if( b_relative )
+ {
+ val.i_time = i_seconds * 1000000;
+ var_Set( p_input, "time-offset", val );
+ }
+ else
+ {
+ val.i_time = i_seconds * 1000000;
+ var_Set( p_input, "time", val );
+ }
+ vlc_object_release( p_input );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_SUCCESS;
+}
+
+/**
+ * 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_value_t val;
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ /* Check that the handle is valid */
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ p_input = vlc_object_find( p_vlc, VLC_OBJECT_INPUT, FIND_CHILD );
+
+ if( !p_input )
+ {
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_ENOOBJ;
+ }
+
+ var_Get( p_input, "length", &val );
+ vlc_object_release( p_input );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return val.i_time / 1000000;
+}
+
+/**
+ * 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 )
+{
+ input_thread_t *p_input;
+ vlc_value_t val;
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ /* Check that the handle is valid */
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ p_input = vlc_object_find( p_vlc, VLC_OBJECT_INPUT, FIND_CHILD );
+
+ if( !p_input )
+ {
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_ENOOBJ;
+ }
+
+ val.b_bool = VLC_TRUE;
+ var_Set( p_input, "rate-faster", val );
+ var_Get( p_input, "rate", &val );
+ vlc_object_release( p_input );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return val.f_float / INPUT_RATE_DEFAULT;
+}
+
+/**
+ * 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 )
+{
+ input_thread_t *p_input;
+ vlc_value_t val;
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ /* Check that the handle is valid */
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ p_input = vlc_object_find( p_vlc, VLC_OBJECT_INPUT, FIND_CHILD );
+
+ if( !p_input )
+ {
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_ENOOBJ;
+ }
+
+ val.b_bool = VLC_TRUE;
+ var_Set( p_input, "rate-slower", val );
+ var_Get( p_input, "rate", &val );
+ vlc_object_release( p_input );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return val.f_float / INPUT_RATE_DEFAULT;
+}
- p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+/**
+ * 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 )
+{
+ int i_index;
+ playlist_t * p_playlist;
+ vlc_t *p_vlc = vlc_current_object( i_object );
/* Check that the handle is valid */
if( !p_vlc )
return VLC_ENOOBJ;
}
- vlc_mutex_lock( &p_playlist->object_lock );
- if( p_playlist->i_size )
+ i_index = p_playlist->i_index;
+ vlc_object_release( p_playlist );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return i_index;
+}
+
+/**
+ * Total amount 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;
+ playlist_t * p_playlist;
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ /* Check that the handle is valid */
+ if( !p_vlc )
{
- vlc_mutex_unlock( &p_playlist->object_lock );
- playlist_Play( p_playlist );
+ return VLC_ENOOBJ;
}
- else
+
+ p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
+
+ if( !p_playlist )
{
- vlc_mutex_unlock( &p_playlist->object_lock );
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_ENOOBJ;
}
+ i_size = p_playlist->i_size;
vlc_object_release( p_playlist );
if( i_object ) vlc_object_release( p_vlc );
- return VLC_SUCCESS;
+ return i_size;
}
-/*****************************************************************************
- * VLC_Stop: stop
- *****************************************************************************/
-int VLC_Stop( int i_object )
+/**
+ * Next playlist item
+ *
+ * Skip to the next playlistitem and play it.
+ *
+ * \param i_object a vlc object id
+ * \return VLC_SUCCESS on success
+ */
+int VLC_PlaylistNext( 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;
+ playlist_t * p_playlist;
+ vlc_t *p_vlc = vlc_current_object( i_object );
/* Check that the handle is valid */
if( !p_vlc )
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( p_intf );
- vlc_object_release( p_intf );
- intf_Destroy( p_intf );
- }
+ p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
- /*
- * Free playlists
- */
- msg_Dbg( p_vlc, "removing all playlists" );
- while( (p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST,
- FIND_CHILD )) )
+ if( !p_playlist )
{
- vlc_object_detach( p_playlist );
- vlc_object_release( p_playlist );
- playlist_Destroy( p_playlist );
+ if( i_object ) vlc_object_release( p_vlc );
+ 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 )) )
+ playlist_Next( p_playlist );
+ vlc_object_release( p_playlist );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_SUCCESS;
+}
+
+/**
+ * Previous playlist item
+ *
+ * Skip to the previous playlistitem and play it.
+ *
+ * \param i_object a vlc object id
+ * \return VLC_SUCCESS on success
+ */
+int VLC_PlaylistPrev( int i_object )
+{
+ playlist_t * p_playlist;
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ /* Check that the handle is valid */
+ if( !p_vlc )
{
- vlc_object_detach( p_vout );
- vlc_object_release( p_vout );
- vout_Destroy( p_vout );
+ 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 )) )
+ p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
+
+ if( !p_playlist )
{
- vlc_object_detach( (vlc_object_t *)p_aout );
- vlc_object_release( (vlc_object_t *)p_aout );
- aout_Delete( p_aout );
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_ENOOBJ;
}
+ playlist_Prev( p_playlist );
+ vlc_object_release( p_playlist );
+
if( i_object ) vlc_object_release( p_vlc );
return VLC_SUCCESS;
}
+
/*****************************************************************************
- * VLC_Pause: toggle pause
+ * VLC_PlaylistClear: Empty the playlist
*****************************************************************************/
-int VLC_Pause( int i_object )
+int VLC_PlaylistClear( int i_object )
{
- input_thread_t *p_input;
- vlc_t *p_vlc;
-
- p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+ int i_err;
+ playlist_t * p_playlist;
+ vlc_t *p_vlc = vlc_current_object( i_object );
+ /* Check that the handle is valid */
if( !p_vlc )
{
return VLC_ENOOBJ;
}
- p_input = vlc_object_find( p_vlc, VLC_OBJECT_INPUT, FIND_CHILD );
+ p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
- if( !p_input )
+ if( !p_playlist )
{
if( i_object ) vlc_object_release( p_vlc );
return VLC_ENOOBJ;
}
- input_SetStatus( p_input, INPUT_STATUS_PAUSE );
- vlc_object_release( p_input );
+ i_err = playlist_Clear( p_playlist );
+
+ vlc_object_release( p_playlist );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return i_err;
+}
+
+/**
+ * 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;
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ /* Check that the handle is valid */
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ if( i_volume >= 0 && i_volume <= 200 )
+ {
+ i_vol = i_volume * AOUT_VOLUME_MAX / 200;
+ aout_VolumeSet( p_vlc, i_vol );
+ }
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return i_vol * 200 / AOUT_VOLUME_MAX;
+}
+
+/**
+ * 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 )
+{
+ audio_volume_t i_volume;
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ /* Check that the handle is valid */
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ aout_VolumeGet( p_vlc, &i_volume );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return i_volume*200/AOUT_VOLUME_MAX;
+}
+
+/**
+ * Mute/Unmute the volume
+ *
+ * \param i_object a vlc object id
+ * \return VLC_SUCCESS on success
+ */
+int VLC_VolumeMute( int i_object )
+{
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ /* Check that the handle is valid */
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ aout_VolumeMute( p_vlc, NULL );
if( i_object ) vlc_object_release( p_vlc );
return VLC_SUCCESS;
int VLC_FullScreen( int i_object )
{
vout_thread_t *p_vout;
- vlc_t *p_vlc;
-
- p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+ vlc_t *p_vlc = vlc_current_object( i_object );
if( !p_vlc )
{
&& ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
char * psz_path;
-#if defined( SYS_DARWIN ) || defined ( WIN32 )
+#if defined( SYS_DARWIN ) || defined ( WIN32 ) || defined( SYS_BEOS )
char psz_tmp[1024];
#endif
-# if defined( HAVE_INCLUDED_GETTEXT ) && !defined( HAVE_LC_MESSAGES )
- if( *psz_lang )
+ if( psz_lang && !*psz_lang )
+ {
+# if defined( HAVE_LC_MESSAGES )
+ setlocale( LC_MESSAGES, psz_lang );
+# endif
+ setlocale( LC_CTYPE, psz_lang );
+ }
+ else if( psz_lang )
{
+#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
snprintf( psz_lcall, 19, "LC_ALL=%s", psz_lang );
psz_lcall[19] = '\0';
putenv( psz_lcall );
- }
-# endif
+#endif
- if( psz_lang && !*psz_lang )
- {
-# if defined( HAVE_LC_MESSAGES )
- setlocale( LC_MESSAGES, psz_lang );
-# endif
- setlocale( LC_CTYPE, psz_lang );
- }
- else
- {
setlocale( LC_ALL, psz_lang );
}
/* Specify where to find the locales for current domain */
-#if !defined( SYS_DARWIN ) && !defined( WIN32 )
+#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 ) )
+ if( !bindtextdomain( PACKAGE_NAME, psz_path ) )
{
fprintf( stderr, "warning: no domain %s in directory %s\n",
- PACKAGE, psz_path );
+ PACKAGE_NAME, psz_path );
}
/* Set the default domain */
- textdomain( PACKAGE );
+ textdomain( PACKAGE_NAME );
+
+#if defined( ENABLE_UTF8 )
+ bind_textdomain_codeset( PACKAGE_NAME, "UTF-8" );
+#endif
+
#endif
}
/*****************************************************************************
* 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 = i_argc - 1; i_opt > optind; 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-- )
{
+ 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, 0 );
}
- /* If there is at least one target, play it */
- if( i_argc > optind )
- {
- VLC_AddTarget( p_vlc->i_object_id, ppsz_argv[ optind ],
- PLAYLIST_INSERT | PLAYLIST_GO, 0 );
- }
-
return VLC_SUCCESS;
}
char psz_short[4];
int i_index;
int i_width = ConsoleWidth() - (PADDING_SPACES+LINE_START+1);
+ vlc_bool_t b_advanced = config_GetInt( p_this, "advanced" );
memset( psz_spaces, ' ', PADDING_SPACES+LINE_START );
psz_spaces[PADDING_SPACES+LINE_START] = '\0';
continue;
}
+ /* Ignore modules with only advanced config options if requested */
+ if( !b_advanced )
+ {
+ for( p_item = p_parser->p_config;
+ p_item->i_type != CONFIG_HINT_END;
+ p_item++ )
+ {
+ if( (p_item->i_type & CONFIG_ITEM) &&
+ !p_item->b_advanced ) break;
+ }
+ if( p_item->i_type == CONFIG_HINT_END ) continue;
+ }
+
+ /* Print name of module */
+ if( strcmp( "main", p_parser->psz_object_name ) )
+ fprintf( stdout, "\n %s\n", p_parser->psz_longname );
+
b_help_module = !strcmp( "help", p_parser->psz_object_name );
/* Print module options */
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" ))
+
+ /* Skip advanced options if requested */
+ if( p_item->b_advanced && !b_advanced )
{
continue;
}
+
switch( p_item->i_type )
{
case CONFIG_HINT_CATEGORY:
case CONFIG_HINT_USAGE:
- fprintf( stdout, " %s\n", p_item->psz_text );
+ if( !strcmp( "main", p_parser->psz_object_name ) )
+ 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 )
{
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:
_("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( stdout, _("\nPress the RETURN key to continue...\n") );
static void ShowConsole( void )
{
# ifndef UNDER_CE
+
+ if( getenv( "PWD" ) && getenv( "PS1" ) ) return; /* cygwin shell */
+
AllocConsole();
freopen( "CONOUT$", "w", stdout );
freopen( "CONOUT$", "w", stderr );
freopen( "CONIN$", "r", stdin );
# endif
+
return;
}
#endif
return i_width;
}
+
+static int VerboseCallback( vlc_object_t *p_this, const char *psz_variable,
+ vlc_value_t old_val, vlc_value_t new_val, void *param)
+{
+ vlc_t *p_vlc = (vlc_t *)p_this;
+
+ if( new_val.i_int >= -1 )
+ {
+ p_vlc->p_libvlc->i_verbose = __MIN( new_val.i_int, 2 );
+ }
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * InitDeviceValues: initialize device values
+ *****************************************************************************
+ * This function inits the dvd, vcd and cd-audio values
+ *****************************************************************************/
+static void InitDeviceValues( vlc_t *p_vlc )
+{
+#ifdef HAVE_HAL
+ LibHalContext * ctx;
+ int i, i_devices;
+ char **devices;
+ char *block_dev;
+ dbus_bool_t b_dvd;
+
+ if( ( ctx = hal_initialize( NULL, FALSE ) ) )
+ {
+ if( ( devices = hal_get_all_devices( ctx, &i_devices ) ) )
+ {
+ for( i = 0; i < i_devices; i++ )
+ {
+ if( !hal_device_property_exists( ctx, devices[ i ],
+ "storage.cdrom.dvd" ) )
+ {
+ continue;
+ }
+
+ b_dvd = hal_device_get_property_bool( ctx, devices[ i ],
+ "storage.cdrom.dvd" );
+ block_dev = hal_device_get_property_string( ctx, devices[ i ],
+ "block.device" );
+
+ if( b_dvd )
+ {
+ config_PutPsz( p_vlc, "dvd", block_dev );
+ }
+
+ config_PutPsz( p_vlc, "vcd", block_dev );
+ config_PutPsz( p_vlc, "cd-audio", block_dev );
+
+ hal_free_string( block_dev );
+ }
+ }
+
+ hal_shutdown( ctx );
+ }
+#endif
+}
projects / vlc / blobdiff