* libvlc.c: main libvlc source
*****************************************************************************
* Copyright (C) 1998-2004 VideoLAN
- * $Id: libvlc.c,v 1.117 2004/02/22 15:41:27 massiot Exp $
+ * $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 */
-#endif
+#include <errno.h> /* ENOMEM */
#include <stdio.h> /* sprintf() */
#include <string.h> /* strerror() */
#include <stdlib.h> /* free() */
# include <locale.h>
#endif
+#ifdef HAVE_HAL
+# include <hal/libhal.h>
+#endif
+
#include "vlc_cpu.h" /* CPU detection */
#include "os_specific.h"
#include "vlc_error.h"
-#include "stream_control.h"
-#include "input_ext-intf.h"
-
#include "vlc_playlist.h"
#include "vlc_interface.h"
#include "vlc_video.h"
#include "video_output.h"
+#include "stream_output.h"
+
#include "libvlc.h"
/*****************************************************************************
*****************************************************************************/
static void SetLanguage ( char const * );
static int GetFilenames ( vlc_t *, int, char *[] );
+static void Help ( vlc_t *, char const *psz_help_name );
static void Usage ( vlc_t *, char const *psz_module_name );
static void ListModules ( vlc_t * );
static void Version ( void );
#ifdef WIN32
static void ShowConsole ( void );
+static void PauseConsole ( void );
#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.
*****************************************************************************
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_init( p_vlc, &p_vlc->config_lock );
#ifdef SYS_DARWIN
vlc_mutex_init( p_vlc, &p_vlc->quicktime_lock );
+ vlc_thread_set_priority( p_vlc, VLC_THREAD_PRIORITY_LOW );
#endif
/* Store our newly allocated structure in the global list */
char * p_tmp;
char * psz_modules;
char * psz_parser;
+ char * psz_control;
char * psz_language;
vlc_bool_t b_exit = VLC_FALSE;
vlc_t * p_vlc = vlc_current_object( i_object );
module_t *p_help_module;
playlist_t *p_playlist;
- vlc_value_t lockval;
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( p_libvlc, "libvlc", VLC_VAR_MUTEX );
- var_Get( p_libvlc, "libvlc", &lockval );
- vlc_mutex_lock( lockval.p_address );
- if( libvlc.p_module_bank == NULL )
- {
- module_InitBank( p_vlc );
- module_LoadMain( p_vlc );
- }
- vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_libvlc, "libvlc" );
+ 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;
}
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"),
- p_vlc->psz_object_name );
- Usage( p_vlc, "main" );
- Usage( p_vlc, "help" );
+ Help( p_vlc, "help" );
b_exit = VLC_TRUE;
}
/* Check for version option */
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;
}
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( psz_language );
/* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */
msg_Dbg( p_vlc, "translation test: code is \"%s\"", _("C") );
- textdomain( PACKAGE );
+ textdomain( PACKAGE_NAME );
#if defined( ENABLE_UTF8 )
- bind_textdomain_codeset( PACKAGE, "UTF-8" );
+ bind_textdomain_codeset( PACKAGE_NAME, "UTF-8" );
#endif
module_EndBank( p_vlc );
module_InitBank( p_vlc );
- module_LoadMain( 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
/* Check for help on modules */
if( (p_tmp = config_GetPsz( p_vlc, "module" )) )
{
- Usage( p_vlc, p_tmp );
+ Help( 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 );
+ Help( p_vlc, "longhelp" );
b_exit = VLC_TRUE;
}
/* Check for module list option */
{
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;
}
+ /*
+ * Init device values
+ */
+ InitDeviceValues( p_vlc );
+
/*
* Override default configuration with config file settings
*/
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();
+ "that they are valid.\n" );
+ PauseConsole();
#endif
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;
}
/* p_vlc initialization. FIXME ? */
-#if defined( __i386__ )
+ if( !config_GetInt( p_vlc, "fpu" ) )
+ libvlc.i_cpu &= ~CPU_CAPABILITY_FPU;
+
+#if defined( __i386__ ) || defined( __x86_64__ )
if( !config_GetInt( p_vlc, "mmx" ) )
libvlc.i_cpu &= ~CPU_CAPABILITY_MMX;
if( !config_GetInt( p_vlc, "3dn" ) )
/*
* 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 )
{
{
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_modules = config_GetPsz( p_playlist, "services-discovery" );
+ if( psz_modules && *psz_modules )
+ {
+ /* Add service discovery modules */
+ playlist_AddSDModules( p_playlist, psz_modules );
+ }
+ if( psz_modules ) free( psz_modules );
+
/*
* Load background interfaces
*/
psz_modules = config_GetPsz( p_vlc, "extraintf" );
+ psz_control = config_GetPsz( p_vlc, "control" );
+
+ if( psz_modules && *psz_modules && psz_control && *psz_control )
+ {
+ psz_modules = (char *)realloc( psz_modules, strlen( psz_modules ) +
+ strlen( psz_control ) + 1 );
+ sprintf( psz_modules, "%s:%s", psz_modules, psz_control );
+ }
+ else if( psz_control && *psz_control )
+ {
+ if( psz_modules ) free( psz_modules );
+ psz_modules = strdup( psz_control );
+ }
+
psz_parser = psz_modules;
+ if( psz_parser && *psz_parser &&
+ strstr( psz_parser, ",") && !strstr(psz_parser, ":" ) )
+ {
+ msg_Info( p_vlc, "Warning: you are using a deprecated syntax for "
+ "extraintf / control." );
+ msg_Info( p_vlc, "You must now use ':' as separator instead of ','." );
+ }
while ( psz_parser && *psz_parser )
{
char *psz_module, *psz_temp;
psz_module = psz_parser;
- psz_parser = strchr( psz_module, ',' );
+ psz_parser = strchr( psz_module, ':' );
+ if( !psz_parser ) psz_parser = strchr( psz_module, ',' );
if ( psz_parser )
{
*psz_parser = '\0';
if( psz_temp )
{
sprintf( psz_temp, "%s,none", psz_module );
- VLC_AddIntf( 0, psz_temp, VLC_FALSE );
+ VLC_AddIntf( 0, psz_temp, VLC_FALSE, VLC_FALSE );
free( psz_temp );
}
}
/*
* Allways load the hotkeys interface if it exists
*/
- VLC_AddIntf( 0, "hotkeys,none", VLC_FALSE );
+ VLC_AddIntf( 0, "hotkeys,none", VLC_FALSE, VLC_FALSE );
/*
* FIXME: kludge to use a p_vlc-local variable for the Mozilla plugin
* 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;
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" );
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 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_Die( int i_object )
+{
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ p_vlc->b_die = VLC_TRUE;
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * VLC_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;
+ }
+
+ /*
+ * 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 );
+ }
+
+ /*
+ * Free playlists
+ */
+ msg_Dbg( p_vlc, "removing all playlists" );
+ while( (p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST,
+ FIND_CHILD )) )
+ {
+ vlc_object_detach( p_playlist );
+ vlc_object_release( p_playlist );
+ playlist_Destroy( p_playlist );
+ }
+
+ /*
+ * Free video outputs
+ */
+ msg_Dbg( p_vlc, "removing all video outputs" );
+ while( (p_vout = vlc_object_find( p_vlc, VLC_OBJECT_VOUT, FIND_CHILD )) )
+ {
+ vlc_object_detach( p_vout );
+ vlc_object_release( p_vout );
+ vout_Destroy( p_vout );
+ }
+
+ /*
+ * Free audio outputs
+ */
+ 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 );
+ }
+
+ /*
+ * Free announce handler(s?)
+ */
+ 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 );
+ }
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * VLC_Destroy: Destroy everything.
*****************************************************************************
* This function requests the running threads to finish, waits for their
* termination, and destroys their structure.
p_vlc->p_memcpy_module = NULL;
}
+ /*
+ * Free module bank !
+ */
+ module_EndBank( p_vlc );
+
if( p_vlc->psz_homedir )
{
free( p_vlc->psz_homedir );
p_vlc->p_hotkeys = NULL;
}
- /*
- * XXX: Free module bank !
- */
- /*module_EndBank( p_vlc );*/
-
/*
* System specific cleaning code
*/
/* Destroy mutexes */
vlc_mutex_destroy( &p_vlc->config_lock );
-#ifdef SYS_DARWIN
- vlc_mutex_destroy( &p_vlc->quicktime_lock );
-#endif
vlc_object_detach( p_vlc );
}
/*****************************************************************************
- * VLC_Die: ask vlc to die.
- *****************************************************************************
- * This function sets p_vlc->b_die to VLC_TRUE, but does not do any other
- * task. It is your duty to call VLC_End and VLC_Destroy afterwards.
- *****************************************************************************/
-int VLC_Die( int i_object )
-{
- vlc_t *p_vlc = vlc_current_object( i_object );
-
- if( !p_vlc )
- {
- return VLC_ENOOBJ;
- }
-
- p_vlc->b_die = VLC_TRUE;
-
- if( i_object ) vlc_object_release( p_vlc );
- return VLC_SUCCESS;
-}
-
-/*****************************************************************************
- * VLC_AddTarget: adds a target for playing.
- *****************************************************************************
- * This function adds psz_target to the current playlist. If a playlist does
- * not exist, it will create one.
- *****************************************************************************/
-int VLC_AddTarget( int i_object, char const *psz_target,
- char const **ppsz_options, int i_options,
- int i_mode, int i_pos )
-{
- int i_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_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_current_object( i_object );
int i_ret;
}
/*****************************************************************************
- * 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_current_object( i_object );
int i_ret;
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_IsPlaying: Query for Playlist Status
+ * VLC_VariableType: get a vlc variable type
*****************************************************************************/
-vlc_bool_t VLC_IsPlaying( int i_object )
+int VLC_VariableType( int i_object, char const *psz_var, int *pi_type )
{
-
- playlist_t * p_playlist;
- vlc_bool_t playing;
-
+ int i_type;
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 )
+ /* 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 ) )
{
- 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;
-
-}
+ module_config_t *p_item;
+ char const *psz_newvar = psz_var + 6;
+ p_item = config_FindConfig( VLC_OBJECT(p_vlc), psz_newvar );
-/*****************************************************************************
- * VLC_ClearPlaylist: Query for Playlist Status
+ if( p_item )
+ {
+ switch( p_item->i_type )
+ {
+ case CONFIG_ITEM_BOOL:
+ i_type = VLC_VAR_BOOL;
+ break;
+ case CONFIG_ITEM_INTEGER:
+ i_type = VLC_VAR_INTEGER;
+ break;
+ case CONFIG_ITEM_FLOAT:
+ i_type = VLC_VAR_FLOAT;
+ break;
+ default:
+ i_type = VLC_VAR_STRING;
+ break;
+ }
+ }
+ else
+ i_type = 0;
+ }
+ else
+ i_type = VLC_VAR_TYPE & var_Type( p_vlc , psz_var );
+
+ if( i_object ) vlc_object_release( p_vlc );
+
+ if( i_type > 0 )
+ {
+ *pi_type = i_type;
+ return VLC_SUCCESS;
+ }
+ return VLC_ENOVAR;
+}
+
+/*****************************************************************************
+ * 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 = 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;
+ val.i_time = val.i_time * 1000000L;
+ var_Set( p_input, "time-offset", val );
+ }
+ else
+ {
+ 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_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 / 1000000L;
+}
+
+/**
+ * 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
*
- * return: 0
- *****************************************************************************/
-int VLC_ClearPlaylist( int i_object )
+ * 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;
+}
+/**
+ * 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 );
return VLC_ENOOBJ;
}
- playlist_Clear(p_playlist);
-
+ i_index = p_playlist->i_index;
vlc_object_release( p_playlist );
if( i_object ) vlc_object_release( p_vlc );
- return 0;
+ 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 )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
-/*****************************************************************************
- * VLC_Play: play
- *****************************************************************************/
-int VLC_Play( int i_object )
+ if( !p_playlist )
+ {
+ 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 i_size;
+}
+
+/**
+ * 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 )
{
playlist_t * p_playlist;
vlc_t *p_vlc = vlc_current_object( i_object );
return VLC_ENOOBJ;
}
- vlc_mutex_lock( &p_playlist->object_lock );
- if( p_playlist->i_size )
+ 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_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;
}
+ playlist_Prev( p_playlist );
vlc_object_release( p_playlist );
if( i_object ) vlc_object_release( p_vlc );
return VLC_SUCCESS;
}
+
/*****************************************************************************
- * VLC_Stop: stop
+ * VLC_PlaylistClear: Empty the playlist
*****************************************************************************/
-int VLC_Stop( int i_object )
+int VLC_PlaylistClear( int i_object )
{
- intf_thread_t * p_intf;
- playlist_t * p_playlist;
- vout_thread_t * p_vout;
- aout_instance_t * p_aout;
+ int i_err;
+ playlist_t * p_playlist;
vlc_t *p_vlc = vlc_current_object( i_object );
/* Check that the handle is valid */
return VLC_ENOOBJ;
}
- /*
- * Ask the interfaces to stop and destroy them
- */
- msg_Dbg( p_vlc, "removing all interfaces" );
+ p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
- while( (p_intf = vlc_object_find( p_vlc, VLC_OBJECT_INTF, FIND_CHILD )) )
+ if( !p_playlist )
{
- 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_vlc );
+ return VLC_ENOOBJ;
}
- /*
- * Free playlists
- */
+ i_err = playlist_Clear( p_playlist );
- msg_Dbg( p_vlc, "removing all playlists" );
- while( (p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST,
- FIND_CHILD )) )
- {
- vlc_object_detach( p_playlist );
- vlc_object_release( p_playlist );
- playlist_Destroy( p_playlist );
- }
+ vlc_object_release( p_playlist );
- /*
- * Free video outputs
- */
- msg_Dbg( p_vlc, "removing all video outputs" );
- while( (p_vout = vlc_object_find( p_vlc, VLC_OBJECT_VOUT, FIND_CHILD )) )
+ 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 )
{
- 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 )) )
+ if( i_volume >= 0 && i_volume <= 200 )
{
- vlc_object_detach( (vlc_object_t *)p_aout );
- vlc_object_release( (vlc_object_t *)p_aout );
- aout_Delete( p_aout );
+ i_vol = i_volume * AOUT_VOLUME_MAX / 200;
+ aout_VolumeSet( p_vlc, i_vol );
}
if( i_object ) vlc_object_release( p_vlc );
- return VLC_SUCCESS;
+ return i_vol * 200 / AOUT_VOLUME_MAX;
}
-/*****************************************************************************
- * VLC_Pause: toggle pause
- *****************************************************************************/
-int VLC_Pause( int i_object )
+/**
+ * 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 )
{
- input_thread_t *p_input;
+ 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;
}
- p_input = vlc_object_find( p_vlc, VLC_OBJECT_INPUT, FIND_CHILD );
+ aout_VolumeGet( p_vlc, &i_volume );
- if( !p_input )
+ 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 )
{
- if( i_object ) vlc_object_release( p_vlc );
return VLC_ENOOBJ;
}
- input_SetStatus( p_input, INPUT_STATUS_PAUSE );
- vlc_object_release( p_input );
+ aout_VolumeMute( p_vlc, NULL );
if( i_object ) vlc_object_release( p_vlc );
return VLC_SUCCESS;
"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, "UTF-8" );
+ bind_textdomain_codeset( PACKAGE_NAME, "UTF-8" );
#endif
#endif
VLC_AddTarget( p_vlc->i_object_id, ppsz_argv[ i_opt ],
(char const **)( i_options ? &ppsz_argv[i_opt + 1] :
NULL ), i_options,
- PLAYLIST_INSERT | (i_opt == optind ? PLAYLIST_GO : 0),
- 0 );
+ PLAYLIST_INSERT, 0 );
}
return VLC_SUCCESS;
}
/*****************************************************************************
- * Usage: print program usage
+ * Help: print program help
+ *****************************************************************************
+ * Print a short inline help. Message interface is initialized at this stage.
+ *****************************************************************************/
+static void Help( vlc_t *p_this, char const *psz_help_name )
+{
+#ifdef WIN32
+ ShowConsole();
+#endif
+
+ if( psz_help_name && !strcmp( psz_help_name, "help" ) )
+ {
+ fprintf( stdout, VLC_USAGE, p_this->psz_object_name );
+ Usage( p_this, "help" );
+ Usage( p_this, "main" );
+ }
+ else if( psz_help_name && !strcmp( psz_help_name, "longhelp" ) )
+ {
+ fprintf( stdout, VLC_USAGE, p_this->psz_object_name );
+ Usage( p_this, NULL );
+ }
+ else if( psz_help_name )
+ {
+ Usage( p_this, psz_help_name );
+ }
+
+#ifdef WIN32 /* Pause the console because it's destroyed when we exit */
+ PauseConsole();
+#endif
+}
+
+/*****************************************************************************
+ * Usage: print module usage
*****************************************************************************
* Print a short inline help. Message interface is initialized at this stage.
*****************************************************************************/
vlc_list_t *p_list;
module_t *p_parser;
module_config_t *p_item;
- char psz_spaces[PADDING_SPACES+LINE_START+1];
+ char psz_spaces_text[PADDING_SPACES+LINE_START+1];
+ char psz_spaces_longtext[LINE_START+3];
char psz_format[sizeof(FORMAT_STRING)];
- char psz_buffer[1000];
+ char psz_buffer[10000];
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" );
+ vlc_bool_t b_description;
- memset( psz_spaces, ' ', PADDING_SPACES+LINE_START );
- psz_spaces[PADDING_SPACES+LINE_START] = '\0';
+ memset( psz_spaces_text, ' ', PADDING_SPACES+LINE_START );
+ psz_spaces_text[PADDING_SPACES+LINE_START] = '\0';
+ memset( psz_spaces_longtext, ' ', LINE_START+2 );
+ psz_spaces_longtext[LINE_START+2] = '\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_item->i_type != CONFIG_HINT_END;
p_item++ )
{
- char *psz_text;
+ char *psz_text, *psz_spaces = psz_spaces_text;
char *psz_bra = NULL, *psz_type = NULL, *psz_ket = NULL;
char *psz_suf = "", *psz_prefix = NULL;
int i;
case CONFIG_ITEM_FILE:
case CONFIG_ITEM_DIRECTORY:
case CONFIG_ITEM_MODULE: /* We could also have "=<" here */
- if( !p_item->ppsz_list )
- {
- psz_bra = " <"; psz_type = _("string"); psz_ket = ">";
- break;
- }
- else
+ case CONFIG_ITEM_MODULE_CAT:
+ case CONFIG_ITEM_MODULE_LIST:
+ case CONFIG_ITEM_MODULE_LIST_CAT:
+ psz_bra = " <"; psz_type = _("string"); psz_ket = ">";
+
+ if( p_item->ppsz_list )
{
psz_bra = " {";
psz_type = psz_buffer;
strcat( psz_type, p_item->ppsz_list[i] );
}
psz_ket = "}";
- break;
}
+ break;
case CONFIG_ITEM_INTEGER:
case CONFIG_ITEM_KEY: /* FIXME: do something a bit more clever */
psz_bra = " <"; psz_type = _("integer"); psz_ket = ">";
+
+ if( p_item->i_list )
+ {
+ psz_bra = " {";
+ psz_type = psz_buffer;
+ psz_type[0] = '\0';
+ for( i = 0; p_item->ppsz_list_text[i]; i++ )
+ {
+ if( i ) strcat( psz_type, ", " );
+ sprintf( psz_type + strlen(psz_type), "%i (%s)",
+ p_item->pi_list[i],
+ p_item->ppsz_list_text[i] );
+ }
+ psz_ket = "}";
+ }
break;
case CONFIG_ITEM_FLOAT:
psz_bra = " <"; psz_type = _("float"); psz_ket = ">";
/* We wrap the rest of the output */
sprintf( psz_buffer, "%s%s", p_item->psz_text, psz_suf );
+ b_description = config_GetInt( p_this, "help-verbose" );
+
+ description:
psz_text = psz_buffer;
while( *psz_text )
{
psz_text = psz_word;
}
}
+
+ if( b_description && p_item->psz_longtext )
+ {
+ sprintf( psz_buffer, "%s%s", p_item->psz_longtext, psz_suf );
+ b_description = VLC_FALSE;
+ psz_spaces = psz_spaces_longtext;
+ fprintf( stdout, "%s", psz_spaces );
+ goto description;
+ }
}
}
/* Release the module list */
vlc_list_release( p_list );
-
-#ifdef WIN32 /* Pause the console because it's destroyed when we exit */
- fprintf( stdout, _("\nPress the RETURN key to continue...\n") );
- getchar();
-#endif
}
/*****************************************************************************
ShowConsole();
#endif
- /* Usage */
- fprintf( stdout, _("Usage: %s [options] [items]...\n\n"),
- p_this->p_vlc->psz_object_name );
-
- fprintf( stdout, _("[module] [description]\n") );
-
/* List all modules */
p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
vlc_list_release( p_list );
#ifdef WIN32 /* Pause the console because it's destroyed when we exit */
- fprintf( stdout, _("\nPress the RETURN key to continue...\n") );
- getchar();
+ PauseConsole();
#endif
}
"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") );
- getchar();
+ PauseConsole();
#endif
}
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
+}
+#endif
+
+/*****************************************************************************
+ * PauseConsole: On Win32, wait for a key press before closing the console
+ *****************************************************************************
+ * This function is useful only on Win32.
+ *****************************************************************************/
+#ifdef WIN32 /* */
+static void PauseConsole( void )
+{
+# ifndef UNDER_CE
+
+ if( getenv( "PWD" ) && getenv( "PS1" ) ) return; /* cygwin shell */
+ fprintf( stdout, _("\nPress the RETURN key to continue...\n") );
+ getchar();
+
# endif
- return;
}
#endif
}
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_free_string_array( devices );
+ }
+
+ hal_shutdown( ctx );
+ }
+#endif
+}
projects / vlc / blobdiff