X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.c;h=9b378c5e95159c9d666dcd590bb385469f6e37f2;hb=e05cc444b50130882db734445223a58bad2947a9;hp=ac5142d45ba144fcfbf124ee6849f2418af14d3d;hpb=9ec1b8a0275afa50e0f161b38932d2425970451b;p=vlc diff --git a/src/libvlc.c b/src/libvlc.c index ac5142d45b..9b378c5e95 100644 --- a/src/libvlc.c +++ b/src/libvlc.c @@ -1,12 +1,13 @@ /***************************************************************************** * libvlc.c: main libvlc source ***************************************************************************** - * Copyright (C) 1998-2002 VideoLAN - * $Id: libvlc.c,v 1.99 2003/10/26 12:46:55 sigmunau Exp $ + * Copyright (C) 1998-2004 VideoLAN + * $Id$ * * Authors: Vincent Seguin * Samuel Hocevar - * Gildas Bazin + * Gildas Bazin + * Derk-Jan Hartman * * 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 @@ -34,10 +35,9 @@ * Preamble *****************************************************************************/ #include +#include -#ifdef HAVE_ERRNO_H -# include /* ENOMEM */ -#endif +#include /* ENOMEM */ #include /* sprintf() */ #include /* strerror() */ #include /* free() */ @@ -60,14 +60,15 @@ # include #endif +#ifdef HAVE_HAL +# include +#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" @@ -76,6 +77,8 @@ #include "vlc_video.h" #include "video_output.h" +#include "stream_output.h" + #include "libvlc.h" /***************************************************************************** @@ -96,9 +99,14 @@ 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. @@ -202,7 +210,7 @@ int VLC_Create( void ) { return VLC_EGENERIC; } - vlc_thread_set_priority( p_vlc, VLC_THREAD_PRIORITY_LOW ); + p_vlc->thread_id = 0; p_vlc->psz_object_name = "root"; @@ -210,6 +218,7 @@ int VLC_Create( void ) 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 */ @@ -241,7 +250,6 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) 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 ) { @@ -280,26 +288,18 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) * 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_libvlc ); - module_LoadMain( p_libvlc ); - } - 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; } 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 */ @@ -309,7 +309,7 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) 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; } @@ -317,7 +317,7 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) /* 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" ); @@ -334,15 +334,65 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) 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; } @@ -360,25 +410,25 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) 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( SYS_BEOS ) || defined ( SYS_DARWIN ) || \ - ( defined( WIN32 ) && !defined( HAVE_INCLUDED_GETTEXT ) ) - /* BeOS only support UTF8 strings */ - /* Mac OS X prefers UTF8 */ - bind_textdomain_codeset( PACKAGE, "UTF-8" ); +#if defined( ENABLE_UTF8 ) + bind_textdomain_codeset( PACKAGE_NAME, "UTF-8" ); #endif module_EndBank( p_vlc ); - module_InitBank( p_libvlc ); - module_LoadMain( p_libvlc ); + 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 @@ -389,8 +439,13 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) * 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 ); @@ -444,11 +499,16 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) { 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 */ @@ -467,13 +527,13 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) 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; } @@ -492,18 +552,17 @@ int VLC_Init( int i_object, int i_argc, char *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 ); } + 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" ); /* @@ -512,7 +571,6 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) 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" ) ) @@ -523,6 +581,8 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) 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" ) ) @@ -545,6 +605,7 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) 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 ); @@ -552,7 +613,7 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) /* * 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 ) { @@ -568,6 +629,10 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) * 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 */ @@ -579,7 +644,7 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) { 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; } @@ -603,7 +668,7 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) 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 ); } } @@ -615,7 +680,7 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) /* * 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 @@ -648,9 +713,11 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) * This function opens an interface plugin and runs it. If b_block is set * to 0, VLC_AddIntf will return immediately and let the interface run in a * separate thread. If b_block is set to 1, VLC_AddIntf will continue until - * user requests to quit. + * user requests to quit. If b_play is set to 1, VLC_AddIntf will start playing + * the playlist when it is completely initialised. *****************************************************************************/ -int VLC_AddIntf( int i_object, char const *psz_module, vlc_bool_t b_block ) +int VLC_AddIntf( int i_object, char const *psz_module, + vlc_bool_t b_block, vlc_bool_t b_play ) { int i_err; intf_thread_t *p_intf; @@ -661,6 +728,17 @@ int VLC_AddIntf( int i_object, char const *psz_module, vlc_bool_t b_block ) 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" ); @@ -671,7 +749,11 @@ int VLC_AddIntf( int i_object, char const *psz_module, vlc_bool_t b_block ) 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 ) @@ -687,77 +769,113 @@ int VLC_AddIntf( int i_object, char const *psz_module, vlc_bool_t b_block ) } /***************************************************************************** - * 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_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; } /* - * Free allocated memory + * Ask the interfaces to stop and destroy them */ - if( p_vlc->p_memcpy_module ) + msg_Dbg( p_vlc, "removing all interfaces" ); + while( (p_intf = vlc_object_find( p_vlc, VLC_OBJECT_INTF, FIND_CHILD )) ) { - module_Unneed( p_vlc, p_vlc->p_memcpy_module ); - p_vlc->p_memcpy_module = NULL; + intf_StopThread( p_intf ); + vlc_object_detach( p_intf ); + vlc_object_release( p_intf ); + intf_Destroy( p_intf ); } - if( p_vlc->psz_homedir ) + /* + * Free playlists + */ + msg_Dbg( p_vlc, "removing all playlists" ); + while( (p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, + FIND_CHILD )) ) { - free( p_vlc->psz_homedir ); - p_vlc->psz_homedir = NULL; + vlc_object_detach( p_playlist ); + vlc_object_release( p_playlist ); + playlist_Destroy( p_playlist ); } - if( p_vlc->psz_configfile ) + /* + * 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_configfile ); - p_vlc->psz_configfile = 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 ); -#ifdef SYS_DARWIN - vlc_mutex_destroy( &p_vlc->quicktime_lock ); -#endif - - 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( p_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 = vlc_current_object( i_object ); @@ -766,62 +884,63 @@ int VLC_Die( int i_object ) 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 ) + /* + * Free allocated memory + */ + if( p_vlc->p_memcpy_module ) { - return VLC_ENOOBJ; + module_Unneed( p_vlc, p_vlc->p_memcpy_module ); + p_vlc->p_memcpy_module = NULL; } - p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); + /* + * Free module bank ! + */ + module_EndBank( p_vlc ); - if( p_playlist == NULL ) + if( p_vlc->psz_homedir ) { - msg_Dbg( p_vlc, "no playlist present, creating one" ); - p_playlist = playlist_Create( p_vlc ); + free( p_vlc->psz_homedir ); + p_vlc->psz_homedir = NULL; + } - if( p_playlist == NULL ) - { - if( i_object ) vlc_object_release( p_vlc ); - return VLC_EGENERIC; - } + if( p_vlc->psz_configfile ) + { + free( p_vlc->psz_configfile ); + p_vlc->psz_configfile = NULL; + } - vlc_object_yield( p_playlist ); + if( p_vlc->p_hotkeys ) + { + free( p_vlc->p_hotkeys ); + p_vlc->p_hotkeys = NULL; } - i_err = playlist_Add( p_playlist, psz_target, ppsz_options, i_options, - i_mode, i_pos ); + /* + * System specific cleaning code + */ + system_End( p_vlc ); - vlc_object_release( p_playlist ); + /* Destroy mutexes */ + vlc_mutex_destroy( &p_vlc->config_lock ); + + vlc_object_detach( p_vlc ); + /* Release object before destroying it */ if( i_object ) vlc_object_release( p_vlc ); - return i_err; + + vlc_object_destroy( p_vlc ); + + /* Stop thread system: last one out please shut the door! */ + vlc_threads_end( p_libvlc ); + + 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_current_object( i_object ); int i_ret; @@ -869,11 +988,9 @@ int VLC_Set( int i_object, char const *psz_var, vlc_value_t value ) } /***************************************************************************** - * 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; @@ -883,62 +1000,493 @@ int VLC_Get( int i_object, char const *psz_var, vlc_value_t *p_value ) 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_Play( int i_object ) +int VLC_AddTarget( int i_object, char const *psz_target, + char const **ppsz_options, int i_options, + int i_mode, int i_pos ) { - playlist_t * p_playlist; + 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_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_CHILD ); + p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); - if( !p_playlist ) + if( p_playlist == NULL ) { - if( i_object ) vlc_object_release( p_vlc ); - return VLC_ENOOBJ; - } + msg_Dbg( p_vlc, "no playlist present, creating one" ); + p_playlist = playlist_Create( p_vlc ); - vlc_mutex_lock( &p_playlist->object_lock ); - if( p_playlist->i_size ) - { - vlc_mutex_unlock( &p_playlist->object_lock ); - playlist_Play( p_playlist ); + 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 * 1000000; + var_Set( p_input, "time-offset", val ); } else { - vlc_mutex_unlock( &p_playlist->object_lock ); + 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; +} + +/** + * 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; + } + + 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; } + i_index = p_playlist->i_index; vlc_object_release( p_playlist ); if( i_object ) vlc_object_release( p_vlc ); - return VLC_SUCCESS; + return i_index; } -/***************************************************************************** - * VLC_Stop: stop - *****************************************************************************/ -int VLC_Stop( int i_object ) +/** + * 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 ) { - intf_thread_t * p_intf; - playlist_t * p_playlist; - vout_thread_t * p_vout; - aout_instance_t * p_aout; + int i_size; + playlist_t * p_playlist; vlc_t *p_vlc = vlc_current_object( i_object ); /* Check that the handle is valid */ @@ -947,81 +1495,191 @@ int VLC_Stop( int i_object ) 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 - */ - - msg_Dbg( p_vlc, "removing all playlists" ); - while( (p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, - FIND_CHILD )) ) + 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 ); + + /* Check that the handle is valid */ + if( !p_vlc ) { - vlc_object_detach( p_playlist ); - vlc_object_release( p_playlist ); - playlist_Destroy( p_playlist ); + return VLC_ENOOBJ; } - - /* - * Free video outputs - */ - msg_Dbg( p_vlc, "removing all video outputs" ); - while( (p_vout = vlc_object_find( p_vlc, VLC_OBJECT_VOUT, FIND_CHILD )) ) + + p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_CHILD ); + + if( !p_playlist ) { - vlc_object_detach( p_vout ); - vlc_object_release( p_vout ); - vout_Destroy( p_vout ); + if( i_object ) vlc_object_release( p_vlc ); + 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 )) ) + 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( (vlc_object_t *)p_aout ); - vlc_object_release( (vlc_object_t *)p_aout ); - aout_Delete( p_aout ); + 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_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; + 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; @@ -1110,20 +1768,17 @@ static void SetLanguage ( char const *psz_lang ) "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( SYS_BEOS ) || defined ( SYS_DARWIN ) || \ - ( defined( WIN32 ) && !defined( HAVE_INCLUDED_GETTEXT ) ) - /* BeOS only support UTF8 strings */ - /* Mac OS X prefers UTF8 */ - bind_textdomain_codeset( PACKAGE, "UTF-8" ); +#if defined( ENABLE_UTF8 ) + bind_textdomain_codeset( PACKAGE_NAME, "UTF-8" ); #endif #endif @@ -1157,8 +1812,7 @@ static int GetFilenames( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] ) 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; @@ -1194,6 +1848,7 @@ static void Usage( vlc_t *p_this, char const *psz_module_name ) 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'; @@ -1226,6 +1881,23 @@ static void Usage( vlc_t *p_this, char const *psz_module_name ) 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 */ @@ -1237,19 +1909,24 @@ static void Usage( vlc_t *p_this, char const *psz_module_name ) 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 ) { @@ -1270,6 +1947,7 @@ static void Usage( vlc_t *p_this, char const *psz_module_name ) 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: @@ -1396,8 +2074,7 @@ static void Usage( vlc_t *p_this, char const *psz_module_name ) 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 } @@ -1451,8 +2128,7 @@ static void ListModules( vlc_t *p_this ) 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 } @@ -1472,11 +2148,10 @@ static void Version( void ) _("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") ); - getchar(); + PauseConsole(); #endif } @@ -1489,12 +2164,33 @@ static void Version( void ) 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 @@ -1537,3 +2233,63 @@ static int ConsoleWidth( void ) 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 +}