/*****************************************************************************
* libvlc.c: main libvlc source
*****************************************************************************
- * Copyright (C) 1998-2002 VideoLAN
- * $Id: libvlc.c,v 1.96 2003/09/24 21:31:54 gbazin Exp $
+ * Copyright (C) 1998-2004 VideoLAN
+ * $Id: libvlc.c,v 1.109 2004/01/06 12:02:05 zorglub Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
#endif
static int ConsoleWidth ( void );
+
+/*****************************************************************************
+ * vlc_current_object: return the current object.
+ *****************************************************************************
+ * If i_object is non-zero, return the corresponding object. Otherwise,
+ * return the statically allocated p_vlc object.
+ *****************************************************************************/
+vlc_t * vlc_current_object( int i_object )
+{
+ if( i_object )
+ {
+ return vlc_object_get( p_libvlc, i_object );
+ }
+
+ return p_static_vlc;
+}
+
/*****************************************************************************
* VLC_Version: return the libvlc version.
*****************************************************************************
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( p_libvlc, i_object ) : p_static_vlc;
-
if( !p_vlc )
{
return VLC_ENOOBJ;
vlc_mutex_lock( lockval.p_address );
if( libvlc.p_module_bank == NULL )
{
- module_InitBank( p_libvlc );
- module_LoadMain( p_libvlc );
+ module_InitBank( p_vlc );
+ module_LoadMain( p_vlc );
}
vlc_mutex_unlock( lockval.p_address );
var_Destroy( p_libvlc, "libvlc" );
/* 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" );
#endif
module_EndBank( p_vlc );
- module_InitBank( p_libvlc );
- module_LoadMain( p_libvlc );
+ module_InitBank( p_vlc );
+ module_LoadMain( p_vlc );
config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, VLC_TRUE );
}
if( psz_language ) free( psz_language );
* list of configuration options exported by each module and loads their
* default values.
*/
- module_LoadBuiltins( p_libvlc );
- module_LoadPlugins( p_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 );
/*
* System specific configuration
*/
- system_Configure( p_vlc );
+ system_Configure( p_vlc, &i_argc, ppsz_argv );
/*
* Message queue options
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" ) )
p_vlc->pf_memset = memset;
}
+ /*
+ * Initialize hotkey handling
+ */
+ var_Create( p_vlc, "key-pressed", VLC_VAR_INTEGER );
+ p_vlc->p_hotkeys = malloc( sizeof(p_hotkeys) );
+ /* Do a copy (we don't need to modify the strings) */
+ memcpy( p_vlc->p_hotkeys, p_hotkeys, sizeof(p_hotkeys) );
+
/*
* Initialize playlist and get commandline files
*/
free( psz_modules );
}
+ /*
+ * Allways load the hotkeys interface if it exists
+ */
+ VLC_AddIntf( 0, "hotkeys,none", VLC_FALSE );
+
/*
* FIXME: kludge to use a p_vlc-local variable for the Mozilla plugin
*/
var_Create( p_vlc, "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
*/
{
int i_err;
intf_thread_t *p_intf;
- vlc_t *p_vlc;
-
- p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
+ vlc_t *p_vlc = vlc_current_object( i_object );
if( !p_vlc )
{
*****************************************************************************/
int VLC_Destroy( int i_object )
{
- vlc_t *p_vlc;
-
- p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
+ vlc_t *p_vlc = vlc_current_object( i_object );
if( !p_vlc )
{
p_vlc->psz_configfile = NULL;
}
+ if( p_vlc->p_hotkeys )
+ {
+ free( p_vlc->p_hotkeys );
+ p_vlc->p_hotkeys = NULL;
+ }
+
/*
* XXX: Free module bank !
*/
* VLC_Die: ask vlc to die.
*****************************************************************************
* This function sets p_vlc->b_die to VLC_TRUE, but does not do any other
- * task. It is your duty to call vlc_end and VLC_Destroy afterwards.
+ * task. It is your duty to call VLC_End and VLC_Destroy afterwards.
*****************************************************************************/
int VLC_Die( int i_object )
{
- vlc_t *p_vlc;
-
- p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
+ vlc_t *p_vlc = vlc_current_object( i_object );
if( !p_vlc )
{
char const **ppsz_options, int i_options,
int i_mode, int i_pos )
{
+ int i;
int i_err;
playlist_t *p_playlist;
- vlc_t *p_vlc;
-
- p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
+ vlc_t *p_vlc = vlc_current_object( i_object );
if( !p_vlc )
{
vlc_object_yield( p_playlist );
}
- i_err = playlist_Add( p_playlist, psz_target, ppsz_options, i_options,
+ i_err = playlist_Add( p_playlist, psz_target, psz_target,
i_mode, i_pos );
+ for( i = 0 ; i< i_options ; i++ )
+ {
+ playlist_AddOption( p_playlist, i_err , ppsz_options[i] );
+ }
+
vlc_object_release( p_playlist );
if( i_object ) vlc_object_release( p_vlc );
*****************************************************************************/
int VLC_Set( 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( p_libvlc, i_object ) : p_static_vlc;
-
if( !p_vlc )
{
return VLC_ENOOBJ;
*****************************************************************************/
int VLC_Get( 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( p_libvlc, i_object ) : p_static_vlc;
-
if( !p_vlc )
{
return VLC_ENOOBJ;
/* FIXME: temporary hacks */
+
+/*****************************************************************************
+ * VLC_IsPlaying: Query for Playlist Status
+ *****************************************************************************/
+vlc_bool_t VLC_IsPlaying( int i_object )
+{
+
+ playlist_t * p_playlist;
+ vlc_bool_t playing;
+
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ /* Check that the handle is valid */
+ if( !p_vlc )
+ {
+ 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;
+ }
+
+ playing = playlist_IsPlaying( p_playlist );
+
+ vlc_object_release( p_playlist );
+
+ if( i_object ) vlc_object_release( p_vlc );
+
+ return playing;
+
+}
+
+
+/*****************************************************************************
+ * VLC_ClearPlaylist: Query for Playlist Status
+ *
+ * return: 0
+ *****************************************************************************/
+int VLC_ClearPlaylist( 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_Clear(p_playlist);
+
+ vlc_object_release( p_playlist );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return 0;
+}
+
+
/*****************************************************************************
* VLC_Play: play
*****************************************************************************/
int VLC_Play( int i_object )
{
playlist_t * p_playlist;
- vlc_t *p_vlc;
-
- p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
+ vlc_t *p_vlc = vlc_current_object( i_object );
/* Check that the handle is valid */
if( !p_vlc )
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( p_libvlc, i_object ) : p_static_vlc;
+ vlc_t *p_vlc = vlc_current_object( i_object );
/* Check that the handle is valid */
if( !p_vlc )
int VLC_Pause( int i_object )
{
input_thread_t *p_input;
- vlc_t *p_vlc;
-
- p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
+ vlc_t *p_vlc = vlc_current_object( i_object );
if( !p_vlc )
{
int VLC_FullScreen( int i_object )
{
vout_thread_t *p_vout;
- vlc_t *p_vlc;
-
- p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
+ vlc_t *p_vlc = vlc_current_object( i_object );
if( !p_vlc )
{
{
case CONFIG_HINT_CATEGORY:
case CONFIG_HINT_USAGE:
- fprintf( stdout, " %s\n", p_item->psz_text );
+ fprintf( stdout, "\n %s\n", p_item->psz_text );
break;
case CONFIG_ITEM_STRING:
case CONFIG_ITEM_FILE:
+ case CONFIG_ITEM_DIRECTORY:
case CONFIG_ITEM_MODULE: /* We could also have "=<" here */
if( !p_item->ppsz_list )
{
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") );
projects / vlc / blobdiff