/*****************************************************************************
* libvlc.c: main libvlc source
*****************************************************************************
- * Copyright (C) 1998-2002 VideoLAN
- * $Id: libvlc.c,v 1.98 2003/10/23 16:43:37 sam Exp $
+ * Copyright (C) 1998-2004 VideoLAN
+ * $Id: libvlc.c,v 1.118 2004/03/03 20:39:52 gbazin Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
#endif
static int ConsoleWidth ( void );
+static int VerboseCallback( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
/*****************************************************************************
* vlc_current_object: return the current object.
{
return VLC_EGENERIC;
}
+ p_vlc->thread_id = 0;
vlc_thread_set_priority( p_vlc, VLC_THREAD_PRIORITY_LOW );
p_vlc->psz_object_name = "root";
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" );
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 */
/* 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" );
textdomain( PACKAGE );
-#if defined( SYS_BEOS ) || defined ( SYS_DARWIN ) || \
- ( defined( WIN32 ) && !defined( HAVE_INCLUDED_GETTEXT ) )
- /* BeOS only support UTF8 strings */
- /* Mac OS X prefers UTF8 */
+#if defined( ENABLE_UTF8 )
bind_textdomain_codeset( PACKAGE, "UTF-8" );
#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 );
/*
* 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 );
}
+ 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" );
/*
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 )
{
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
*/
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_object_yield( p_playlist );
}
- i_err = playlist_Add( p_playlist, psz_target, ppsz_options, i_options,
- i_mode, i_pos );
+ i_err = playlist_AddExt( p_playlist, psz_target, psz_target,
+ i_mode, i_pos, -1, ppsz_options, i_options);
vlc_object_release( p_playlist );
/* 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
*****************************************************************************/
/*
* Free playlists
*/
-
+
msg_Dbg( p_vlc, "removing all playlists" );
while( (p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST,
FIND_CHILD )) )
vlc_object_release( p_playlist );
playlist_Destroy( p_playlist );
}
-
+
/*
* Free video outputs
*/
/* Set the default domain */
textdomain( PACKAGE );
-#if defined( SYS_BEOS ) || defined ( SYS_DARWIN ) || \
- ( defined( WIN32 ) && !defined( HAVE_INCLUDED_GETTEXT ) )
- /* BeOS only support UTF8 strings */
- /* Mac OS X prefers UTF8 */
+#if defined( ENABLE_UTF8 )
bind_textdomain_codeset( PACKAGE, "UTF-8" );
#endif
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") );
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;
+}
projects / vlc / blobdiff