X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Flibvlc.c;h=a81ba730e607ca0dc145e0be03652619bab888ac;hb=828cabe7f4461983c4a4e35b8680adfd2ef25959;hp=60189bb2f185f30ae23153a6c667289acd14d3c6;hpb=a1ee749f1d458a1a38f7632e69bb880d38a89571;p=vlc diff --git a/src/libvlc.c b/src/libvlc.c index 60189bb2f1..a81ba730e6 100644 --- a/src/libvlc.c +++ b/src/libvlc.c @@ -1,13 +1,14 @@ /***************************************************************************** * libvlc.c: main libvlc source ***************************************************************************** - * Copyright (C) 1998-2004 VideoLAN + * Copyright (C) 1998-2006 the VideoLAN team * $Id$ * * Authors: Vincent Seguin * Samuel Hocevar * Gildas Bazin * Derk-Jan Hartman + * Rémi Denis-Courmont * * 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 @@ -21,7 +22,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -41,6 +42,11 @@ #include /* sprintf() */ #include /* strerror() */ #include /* free() */ +#ifdef HAVE_ASSERT +# include +#else +# define assert( c ) ((void)0) +#endif #ifndef WIN32 # include /* BSD: struct in_addr */ @@ -78,6 +84,7 @@ #include "video_output.h" #include "stream_output.h" +#include "charset.h" #include "libvlc.h" @@ -91,6 +98,12 @@ static vlc_t * p_static_vlc; /***************************************************************************** * Local prototypes *****************************************************************************/ +static int AddIntfInternal( int i_object, char const *psz_module, + vlc_bool_t b_block, vlc_bool_t b_play, + int i_options, char **ppsz_options ); + +static void LocaleInit( void ); +static void LocaleDeinit( void ); static void SetLanguage ( char const * ); static int GetFilenames ( vlc_t *, int, char *[] ); static void Help ( vlc_t *, char const *psz_help_name ); @@ -135,6 +148,27 @@ char const * VLC_Version( void ) return VERSION_MESSAGE; } +/***************************************************************************** + * VLC_CompileBy, VLC_CompileHost, VLC_CompileDomain, + * VLC_Compiler, VLC_Changeset + *****************************************************************************/ +#define DECLARE_VLC_VERSION( func, var ) \ +char const * VLC_##func ( void ) \ +{ \ + return VLC_##var ; \ +} + +DECLARE_VLC_VERSION( CompileBy, COMPILE_BY ); +DECLARE_VLC_VERSION( CompileHost, COMPILE_HOST ); +DECLARE_VLC_VERSION( CompileDomain, COMPILE_DOMAIN ); +DECLARE_VLC_VERSION( Compiler, COMPILER ); + +extern const char psz_vlc_changeset[]; +char const * VLC_Changeset( void ) +{ + return psz_vlc_changeset; +} + /***************************************************************************** * VLC_Error: strerror() equivalent ***************************************************************************** @@ -201,6 +235,9 @@ int VLC_Create( void ) libvlc.p_module_bank = NULL; libvlc.b_ready = VLC_TRUE; + + /* UTF-8 convertor are initialized after the locale */ + libvlc.from_locale = libvlc.to_locale = (vlc_iconv_t)(-1); } vlc_mutex_unlock( lockval.p_address ); var_Destroy( p_libvlc, "libvlc" ); @@ -217,7 +254,7 @@ int VLC_Create( void ) /* Initialize mutexes */ vlc_mutex_init( p_vlc, &p_vlc->config_lock ); -#ifdef SYS_DARWIN +#ifdef __APPLE__ vlc_mutex_init( p_vlc, &p_vlc->quicktime_lock ); vlc_thread_set_priority( p_vlc, VLC_THREAD_PRIORITY_LOW ); #endif @@ -247,11 +284,16 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) char * psz_modules; char * psz_parser; char * psz_control; - char * psz_language; vlc_bool_t b_exit = VLC_FALSE; + int i_ret = VLC_EEXIT; vlc_t * p_vlc = vlc_current_object( i_object ); module_t *p_help_module; playlist_t *p_playlist; + vlc_value_t val; +#if defined( ENABLE_NLS ) \ + && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) ) + char * psz_language; +#endif if( !p_vlc ) { @@ -283,6 +325,12 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) */ SetLanguage( "" ); + /* + * Global iconv, must be done after setlocale() + * so that vlc_current_charset() works. + */ + LocaleInit(); + /* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */ msg_Dbg( p_vlc, "translation test: code is \"%s\"", _("C") ); @@ -321,17 +369,33 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) { Help( p_vlc, "help" ); b_exit = VLC_TRUE; + i_ret = VLC_EEXITSUCCESS; } /* Check for version option */ else if( config_GetInt( p_vlc, "version" ) ) { Version(); b_exit = VLC_TRUE; + i_ret = VLC_EEXITSUCCESS; } /* Set the config file stuff */ p_vlc->psz_homedir = config_GetHomeDir(); + p_vlc->psz_userdir = config_GetUserDir(); + if( p_vlc->psz_userdir == NULL ) + p_vlc->psz_userdir = strdup(p_vlc->psz_homedir); p_vlc->psz_configfile = config_GetPsz( p_vlc, "config" ); + if( p_vlc->psz_configfile != NULL && p_vlc->psz_configfile[0] == '~' + && p_vlc->psz_configfile[1] == '/' ) + { + char *psz = malloc( strlen(p_vlc->psz_userdir) + + strlen(p_vlc->psz_configfile) ); + /* This is incomplete : we should also support the ~cmassiot/ syntax. */ + sprintf( psz, "%s/%s", p_vlc->psz_userdir, + p_vlc->psz_configfile + 2 ); + free( p_vlc->psz_configfile ); + p_vlc->psz_configfile = psz; + } /* Check for plugins cache options */ if( config_GetInt( p_vlc, "reset-plugins-cache" ) ) @@ -351,7 +415,7 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) if( config_GetInt( p_vlc, "daemon" ) ) { #if HAVE_DAEMON - if( daemon( 0, 0) != 0 ) + if( daemon( 1, 0) != 0 ) { msg_Err( p_vlc, "Unable to fork vlc to daemon mode" ); b_exit = VLC_TRUE; @@ -372,6 +436,7 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) /* This is the parent, exit right now */ msg_Dbg( p_vlc, "closing parent process" ); b_exit = VLC_TRUE; + i_ret = VLC_EEXITSUCCESS; } else { @@ -393,7 +458,7 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) vlc_object_destroy( p_help_module ); module_EndBank( p_vlc ); if( i_object ) vlc_object_release( p_vlc ); - return VLC_EEXIT; + return i_ret; } /* Check for translation config option */ @@ -413,16 +478,12 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) /* Reset the default domain */ SetLanguage( psz_language ); + LocaleDeinit(); + LocaleInit(); /* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */ msg_Dbg( p_vlc, "translation test: code is \"%s\"", _("C") ); - textdomain( PACKAGE_NAME ); - -#if defined( ENABLE_UTF8 ) - bind_textdomain_codeset( PACKAGE_NAME, "UTF-8" ); -#endif - module_EndBank( p_vlc ); module_InitBank( p_vlc ); config_LoadConfigFile( p_vlc, "main" ); @@ -458,18 +519,21 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) Help( p_vlc, p_tmp ); free( p_tmp ); b_exit = VLC_TRUE; + i_ret = VLC_EEXITSUCCESS; } /* Check for long help option */ else if( config_GetInt( p_vlc, "longhelp" ) ) { Help( p_vlc, "longhelp" ); b_exit = VLC_TRUE; + i_ret = VLC_EEXITSUCCESS; } /* Check for module list option */ else if( config_GetInt( p_vlc, "list" ) ) { ListModules( p_vlc ); b_exit = VLC_TRUE; + i_ret = VLC_EEXITSUCCESS; } /* Check for config file options */ @@ -500,7 +564,7 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) vlc_object_destroy( p_help_module ); module_EndBank( p_vlc ); if( i_object ) vlc_object_release( p_vlc ); - return VLC_EEXIT; + return i_ret; } /* @@ -555,7 +619,6 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) var_Create( p_vlc, "verbose", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); if( config_GetInt( p_vlc, "quiet" ) ) { - vlc_value_t val; val.i_int = -1; var_Set( p_vlc, "verbose", val ); } @@ -574,7 +637,7 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) if( !config_GetInt( p_vlc, "fpu" ) ) libvlc.i_cpu &= ~CPU_CAPABILITY_FPU; -#if defined( __i386__ ) +#if defined( __i386__ ) || defined( __x86_64__ ) if( !config_GetInt( p_vlc, "mmx" ) ) libvlc.i_cpu &= ~CPU_CAPABILITY_MMX; if( !config_GetInt( p_vlc, "3dn" ) ) @@ -586,7 +649,7 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) if( !config_GetInt( p_vlc, "sse2" ) ) libvlc.i_cpu &= ~CPU_CAPABILITY_SSE2; #endif -#if defined( __powerpc__ ) || defined( SYS_DARWIN ) +#if defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc64__ ) if( !config_GetInt( p_vlc, "altivec" ) ) libvlc.i_cpu &= ~CPU_CAPABILITY_ALTIVEC; #endif @@ -627,6 +690,9 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) p_vlc->pf_memset = memset; } + libvlc.b_stats = config_GetInt( p_vlc, "stats" ); + libvlc.p_stats = NULL; + /* * Initialize hotkey handling */ @@ -669,7 +735,7 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) { psz_modules = (char *)realloc( psz_modules, strlen( psz_modules ) + strlen( psz_control ) + 1 ); - sprintf( psz_modules, "%s,%s", psz_modules, psz_control ); + sprintf( psz_modules, "%s:%s", psz_modules, psz_control ); } else if( psz_control && *psz_control ) { @@ -682,7 +748,7 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) { char *psz_module, *psz_temp; psz_module = psz_parser; - psz_parser = strchr( psz_module, ',' ); + psz_parser = strchr( psz_module, ':' ); if ( psz_parser ) { *psz_parser = '\0'; @@ -702,10 +768,43 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) } /* - * Allways load the hotkeys interface if it exists + * Always load the hotkeys interface if it exists */ VLC_AddIntf( 0, "hotkeys,none", VLC_FALSE, VLC_FALSE ); + /* + * If needed, load the Xscreensaver interface + * Currently, only for X + */ +#ifdef HAVE_X11_XLIB_H + if( config_GetInt( p_vlc, "disable-screensaver" ) == 1 ) + { + VLC_AddIntf( 0, "screensaver", VLC_FALSE, VLC_FALSE ); + } +#endif + + if( config_GetInt( p_vlc, "file-logging" ) == 1 ) + { + VLC_AddIntf( 0, "logger", VLC_FALSE, VLC_FALSE ); + } +#ifdef HAVE_SYSLOG_H + if( config_GetInt( p_vlc, "syslog" ) == 1 ) + { + char *psz_logmode = "logmode=syslog"; + AddIntfInternal( 0, "logger", VLC_FALSE, VLC_FALSE, 1, &psz_logmode ); + } +#endif + + if( config_GetInt( p_vlc, "show-intf" ) == 1 ) + { + VLC_AddIntf( 0, "showintf", VLC_FALSE, VLC_FALSE ); + } + + if( config_GetInt( p_vlc, "network-synchronisation") == 1 ) + { + VLC_AddIntf( 0, "netsync", VLC_FALSE, VLC_FALSE ); + } + /* * FIXME: kludge to use a p_vlc-local variable for the Mozilla plugin */ @@ -722,11 +821,26 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) var_Create( p_vlc, "drawableportx", VLC_VAR_INTEGER ); var_Create( p_vlc, "drawableporty", VLC_VAR_INTEGER ); + /* Create volume callback system. */ + var_Create( p_vlc, "volume-change", VLC_VAR_BOOL ); + /* * Get input filenames given as commandline arguments */ GetFilenames( p_vlc, i_argc, ppsz_argv ); + /* + * Get --open argument + */ + var_Create( p_vlc, "open", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + var_Get( p_vlc, "open", &val ); + if ( val.psz_string != NULL && *val.psz_string ) + { + VLC_AddTarget( p_vlc->i_object_id, val.psz_string, NULL, 0, + PLAYLIST_INSERT, 0 ); + } + if ( val.psz_string != NULL ) free( val.psz_string ); + if( i_object ) vlc_object_release( p_vlc ); return VLC_SUCCESS; } @@ -743,55 +857,10 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) int VLC_AddIntf( int i_object, char const *psz_module, vlc_bool_t b_block, vlc_bool_t b_play ) { - int i_err; - intf_thread_t *p_intf; - vlc_t *p_vlc = vlc_current_object( i_object ); - - if( !p_vlc ) - { - return VLC_ENOOBJ; - } - -#ifndef WIN32 - if( p_vlc->p_libvlc->b_daemon && b_block && !psz_module ) - { - /* Daemon mode hack. - * We prefer the dummy interface if none is specified. */ - char *psz_interface = config_GetPsz( p_vlc, "intf" ); - if( !psz_interface || !*psz_interface ) psz_module = "dummy"; - if( psz_interface ) free( psz_interface ); - } -#endif - - /* Try to create the interface */ - p_intf = intf_Create( p_vlc, psz_module ? psz_module : "$intf" ); - - if( p_intf == NULL ) - { - msg_Err( p_vlc, "interface \"%s\" initialization failed", psz_module ); - if( i_object ) vlc_object_release( p_vlc ); - return VLC_EGENERIC; - } - - /* Interface doesn't handle play on start so do it ourselves */ - if( !p_intf->b_play && b_play ) VLC_Play( i_object ); - - /* Try to run the interface */ - p_intf->b_play = b_play; - p_intf->b_block = b_block; - i_err = intf_RunThread( p_intf ); - if( i_err ) - { - vlc_object_detach( p_intf ); - intf_Destroy( p_intf ); - if( i_object ) vlc_object_release( p_vlc ); - return i_err; - } - - if( i_object ) vlc_object_release( p_vlc ); - return VLC_SUCCESS; + return AddIntfInternal( i_object, psz_module, b_block, b_play, 0, NULL ); } + /***************************************************************************** * VLC_Die: ask vlc to die. ***************************************************************************** @@ -823,6 +892,7 @@ int VLC_CleanUp( int i_object ) vout_thread_t * p_vout; aout_instance_t * p_aout; announce_handler_t * p_announce; + stats_handler_t * p_stats; vlc_t *p_vlc = vlc_current_object( i_object ); /* Check that the handle is valid */ @@ -844,9 +914,9 @@ int VLC_CleanUp( int i_object ) } /* - * Free playlists + * Free playlist */ - msg_Dbg( p_vlc, "removing all playlists" ); + msg_Dbg( p_vlc, "removing playlist handler" ); while( (p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_CHILD )) ) { @@ -877,17 +947,26 @@ int VLC_CleanUp( int i_object ) aout_Delete( p_aout ); } + while( ( p_stats = vlc_object_find( p_vlc, VLC_OBJECT_STATS, FIND_CHILD) )) + { + stats_TimersDumpAll( p_vlc ); + stats_HandlerDestroy( p_stats ); + vlc_object_detach( (vlc_object_t*) p_stats ); + vlc_object_release( (vlc_object_t *)p_stats ); + // TODO: Delete it + } + /* * Free announce handler(s?) */ - msg_Dbg( p_vlc, "removing announce handler" ); while( (p_announce = vlc_object_find( p_vlc, VLC_OBJECT_ANNOUNCE, FIND_CHILD ) ) ) - { + { + msg_Dbg( p_vlc, "removing announce handler" ); 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; @@ -928,6 +1007,12 @@ int VLC_Destroy( int i_object ) p_vlc->psz_homedir = NULL; } + if( p_vlc->psz_userdir ) + { + free( p_vlc->psz_userdir ); + p_vlc->psz_userdir = NULL; + } + if( p_vlc->psz_configfile ) { free( p_vlc->psz_configfile ); @@ -945,6 +1030,16 @@ int VLC_Destroy( int i_object ) */ system_End( p_vlc ); + /* + * Free message queue. + * Nobody shall use msg_* afterward. + */ + msg_Flush( p_vlc ); + msg_Destroy( p_libvlc ); + + /* Destroy global iconv */ + LocaleDeinit(); + /* Destroy mutexes */ vlc_mutex_destroy( &p_vlc->config_lock ); @@ -1030,6 +1125,62 @@ int VLC_VariableGet( int i_object, char const *psz_var, vlc_value_t *p_value ) return i_ret; } +/***************************************************************************** + * VLC_VariableType: get a vlc variable type + *****************************************************************************/ +int VLC_VariableType( int i_object, char const *psz_var, int *pi_type ) +{ + int i_type; + vlc_t *p_vlc = vlc_current_object( i_object ); + + if( !p_vlc ) + { + return VLC_ENOOBJ; + } + + /* 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 ) ) + { + module_config_t *p_item; + char const *psz_newvar = psz_var + 6; + + p_item = config_FindConfig( VLC_OBJECT(p_vlc), psz_newvar ); + + 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. ***************************************************************************** @@ -1075,7 +1226,7 @@ int VLC_AddTarget( int i_object, char const *psz_target, } /***************************************************************************** - * VLC_Play: play + * VLC_Play: play the playlist *****************************************************************************/ int VLC_Play( int i_object ) { @@ -1185,7 +1336,17 @@ vlc_bool_t VLC_IsPlaying( int i_object ) return VLC_ENOOBJ; } - b_playing = playlist_IsPlaying( p_playlist ); + if( p_playlist->p_input ) + { + vlc_value_t val; + var_Get( p_playlist->p_input, "state", &val ); + b_playing = ( val.i_int == PLAYING_S ); + } + else + { + msg_Dbg(p_vlc, "polling playlist_IsPlaying"); + b_playing = playlist_IsPlaying( p_playlist ); + } vlc_object_release( p_playlist ); if( i_object ) vlc_object_release( p_vlc ); @@ -1339,12 +1500,14 @@ int VLC_TimeSet( int i_object, int i_seconds, vlc_bool_t b_relative ) if( b_relative ) { - val.i_time = i_seconds * 1000000; + 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 * 1000000; + val.i_time = i_seconds; + val.i_time = val.i_time * 1000000L; var_Set( p_input, "time", val ); } vlc_object_release( p_input ); @@ -1386,7 +1549,7 @@ int VLC_LengthGet( int i_object ) vlc_object_release( p_input ); if( i_object ) vlc_object_release( p_vlc ); - return val.i_time / 1000000; + return val.i_time / 1000000L; } /** @@ -1739,6 +1902,109 @@ int VLC_FullScreen( int i_object ) /* following functions are local */ + +static int AddIntfInternal( int i_object, char const *psz_module, + vlc_bool_t b_block, vlc_bool_t b_play, + int i_options, char **ppsz_options ) +{ + int i_err,i; + intf_thread_t *p_intf; + vlc_t *p_vlc = vlc_current_object( i_object ); + + if( !p_vlc ) + { + return VLC_ENOOBJ; + } + +#ifndef WIN32 + if( p_vlc->p_libvlc->b_daemon && b_block && !psz_module ) + { + /* Daemon mode hack. + * We prefer the dummy interface if none is specified. */ + char *psz_interface = config_GetPsz( p_vlc, "intf" ); + if( !psz_interface || !*psz_interface ) psz_module = "dummy"; + if( psz_interface ) free( psz_interface ); + } +#endif + + /* Try to create the interface */ + p_intf = intf_Create( p_vlc, psz_module ? psz_module : "$intf", + i_options, ppsz_options ); + + if( p_intf == NULL ) + { + msg_Err( p_vlc, "interface \"%s\" initialization failed", psz_module ); + if( i_object ) vlc_object_release( p_vlc ); + return VLC_EGENERIC; + } + + /* Interface doesn't handle play on start so do it ourselves */ + if( !p_intf->b_play && b_play ) VLC_Play( i_object ); + + /* Try to run the interface */ + p_intf->b_play = b_play; + p_intf->b_block = b_block; + i_err = intf_RunThread( p_intf ); + if( i_err ) + { + vlc_object_detach( p_intf ); + intf_Destroy( p_intf ); + if( i_object ) vlc_object_release( p_vlc ); + return i_err; + } + + for( i = 0 ; i< i_options ; i++ ) + { + + } + + if( i_object ) vlc_object_release( p_vlc ); + return VLC_SUCCESS; +}; + +static void LocaleInit( void ) +{ + char *psz_charset; + + if( !vlc_current_charset( &psz_charset ) ) + { + char *psz_conv = psz_charset; + + /* + * Still allow non-ASCII characters when the locale is not set. + * Western Europeans are being favored for historical reasons. + */ + psz_conv = strcmp( psz_charset, "ASCII" ) + ? psz_charset + : "ISO-8859-15"; + + vlc_mutex_init( p_libvlc, &libvlc.from_locale_lock ); + vlc_mutex_init( p_libvlc, &libvlc.to_locale_lock ); + libvlc.from_locale = vlc_iconv_open( "UTF-8", psz_charset ); + libvlc.to_locale = vlc_iconv_open( psz_charset, "UTF-8" ); + if( !libvlc.to_locale ) + { + /* Not sure it is the right thing to do, but at least it + doesn't make vlc crash with msvc ! */ + libvlc.to_locale = (vlc_iconv_t)(-1); + } + } + else + libvlc.from_locale = libvlc.to_locale = (vlc_iconv_t)(-1); + free( psz_charset ); +} + +static void LocaleDeinit( void ) +{ + if( libvlc.to_locale != (vlc_iconv_t)(-1) ) + { + vlc_mutex_destroy( &libvlc.from_locale_lock ); + vlc_mutex_destroy( &libvlc.to_locale_lock ); + vlc_iconv_close( libvlc.from_locale ); + vlc_iconv_close( libvlc.to_locale ); + } +} + /***************************************************************************** * SetLanguage: set the interface language. ***************************************************************************** @@ -1752,7 +2018,7 @@ static void SetLanguage ( char const *psz_lang ) && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) ) char * psz_path; -#if defined( SYS_DARWIN ) || defined ( WIN32 ) || defined( SYS_BEOS ) +#if defined( __APPLE__ ) || defined ( WIN32 ) || defined( SYS_BEOS ) char psz_tmp[1024]; #endif @@ -1765,7 +2031,7 @@ static void SetLanguage ( char const *psz_lang ) } else if( psz_lang ) { -#ifdef SYS_DARWIN +#ifdef __APPLE__ /* I need that under Darwin, please check it doesn't disturb * other platforms. --Meuuh */ setenv( "LANG", psz_lang, 1 ); @@ -1782,10 +2048,14 @@ static void SetLanguage ( char const *psz_lang ) #endif setlocale( LC_ALL, psz_lang ); + /* many code paths assume that float numbers are formatted according + * to the US standard (ie. with dot as decimal point), so we keep + * C for LC_NUMERIC. */ + setlocale(LC_NUMERIC, "C" ); } /* Specify where to find the locales for current domain */ -#if !defined( SYS_DARWIN ) && !defined( WIN32 ) && !defined( SYS_BEOS ) +#if !defined( __APPLE__ ) && !defined( WIN32 ) && !defined( SYS_BEOS ) psz_path = LOCALEDIR; #else snprintf( psz_tmp, sizeof(psz_tmp), "%s/%s", libvlc.psz_vlcpath, @@ -1794,18 +2064,14 @@ static void SetLanguage ( char const *psz_lang ) #endif if( !bindtextdomain( PACKAGE_NAME, psz_path ) ) { - fprintf( stderr, "warning: no domain %s in directory %s\n", + fprintf( stderr, "warning: couldn't bind domain %s in directory %s\n", PACKAGE_NAME, psz_path ); } /* Set the default domain */ textdomain( PACKAGE_NAME ); - -#if defined( ENABLE_UTF8 ) bind_textdomain_codeset( PACKAGE_NAME, "UTF-8" ); #endif - -#endif } /***************************************************************************** @@ -1822,6 +2088,7 @@ static int GetFilenames( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] ) * and their input options */ for( i_opt = i_argc - 1; i_opt >= optind; i_opt-- ) { + const char *psz_target; i_options = 0; /* Count the input options */ @@ -1833,10 +2100,13 @@ static int GetFilenames( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] ) /* TODO: write an internal function of this one, to avoid * unnecessary lookups. */ - VLC_AddTarget( p_vlc->i_object_id, ppsz_argv[ i_opt ], + /* FIXME: should we convert options to UTF-8 as well ?? */ + psz_target = FromLocale( ppsz_argv[ i_opt ] ); + VLC_AddTarget( p_vlc->i_object_id, psz_target, (char const **)( i_options ? &ppsz_argv[i_opt + 1] : NULL ), i_options, PLAYLIST_INSERT, 0 ); + LocaleFree( psz_target ); } return VLC_SUCCESS; @@ -1964,8 +2234,13 @@ static void Usage( vlc_t *p_this, char const *psz_module_name ) 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; + signed int i; + /* Skip deprecated options */ + if( p_item->psz_current ) + { + continue; + } /* Skip advanced options if requested */ if( p_item->b_advanced && !b_advanced ) { @@ -2055,12 +2330,7 @@ static void Usage( vlc_t *p_this, char const *psz_module_name ) if( p_item->i_type == CONFIG_ITEM_BOOL && !b_help_module ) { - /* If option is of type --foo-bar, we print its counterpart - * as --no-foo-bar, but if it is of type --foobar (without - * dashes in the name) we print it as --nofoobar. Both - * values are of course valid, only the display changes. */ - psz_prefix = strchr( p_item->psz_name, '-' ) ? ", --no-" - : ", --no"; + psz_prefix = ", --no-"; i -= strlen( p_item->psz_name ) + strlen( psz_prefix ); } @@ -2097,10 +2367,10 @@ static void Usage( vlc_t *p_this, char const *psz_module_name ) while( *psz_text ) { char *psz_parser, *psz_word; - int i_end = strlen( psz_text ); + size_t i_end = strlen( psz_text ); /* If the remaining text fits in a line, print it. */ - if( i_end <= i_width ) + if( i_end <= (size_t)i_width ) { fprintf( stdout, "%s\n", psz_text ); break; @@ -2216,12 +2486,14 @@ static void Version( void ) ShowConsole(); #endif - fprintf( stdout, VERSION_MESSAGE "\n" ); - fprintf( stdout, - _("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; see the AUTHORS file.\n") ); + fprintf( stdout, _("VLC version %s\n"), VLC_Version() ); + fprintf( stdout, _("Compiled by %s@%s.%s\n"), + VLC_CompileBy(), VLC_CompileHost(), VLC_CompileDomain() ); + fprintf( stdout, _("Compiler: %s\n"), VLC_Compiler() ); + if( strcmp( VLC_Changeset(), "exported" ) ) + fprintf( stdout, _("Based upon svn changeset [%s]\n"), + VLC_Changeset() ); + fprintf( stdout, LICENSE_MSG ); #ifdef WIN32 /* Pause the console because it's destroyed when we exit */ PauseConsole(); @@ -2237,14 +2509,24 @@ static void Version( void ) static void ShowConsole( void ) { # ifndef UNDER_CE + FILE *f_help; if( getenv( "PWD" ) && getenv( "PS1" ) ) return; /* cygwin shell */ AllocConsole(); - freopen( "CONOUT$", "w", stdout ); + freopen( "CONOUT$", "w", stderr ); freopen( "CONIN$", "r", stdin ); + if( (f_help = fopen( "vlc-help.txt", "wt" )) ) + { + fclose( f_help ); + freopen( "vlc-help.txt", "wt", stdout ); + fprintf( stderr, _("\nDumped content to vlc-help.txt file.\n") ); + } + + else freopen( "CONOUT$", "w", stdout ); + # endif } #endif @@ -2260,8 +2542,10 @@ static void PauseConsole( void ) # ifndef UNDER_CE if( getenv( "PWD" ) && getenv( "PS1" ) ) return; /* cygwin shell */ - fprintf( stdout, _("\nPress the RETURN key to continue...\n") ); + + fprintf( stderr, _("\nPress the RETURN key to continue...\n") ); getchar(); + fclose( stdout ); # endif } @@ -2332,24 +2616,54 @@ static void InitDeviceValues( vlc_t *p_vlc ) char **devices; char *block_dev; dbus_bool_t b_dvd; + DBusConnection *p_connection; + DBusError error; +#ifdef HAVE_HAL_1 + ctx = libhal_ctx_new(); + if( !ctx ) return; + dbus_error_init( &error ); + p_connection = dbus_bus_get ( DBUS_BUS_SYSTEM, &error ); + if( dbus_error_is_set( &error ) ) + { + dbus_error_free( &error ); + return; + } + libhal_ctx_set_dbus_connection( ctx, p_connection ); + if( libhal_ctx_init( ctx, &error ) ) +#else if( ( ctx = hal_initialize( NULL, FALSE ) ) ) +#endif { +#ifdef HAVE_HAL_1 + if( ( devices = libhal_get_all_devices( ctx, &i_devices, NULL ) ) ) +#else if( ( devices = hal_get_all_devices( ctx, &i_devices ) ) ) +#endif { for( i = 0; i < i_devices; i++ ) { +#ifdef HAVE_HAL_1 + if( !libhal_device_property_exists( ctx, devices[i], + "storage.cdrom.dvd", NULL ) ) +#else if( !hal_device_property_exists( ctx, devices[ i ], "storage.cdrom.dvd" ) ) +#endif { continue; } - +#ifdef HAVE_HAL_1 + b_dvd = libhal_device_get_property_bool( ctx, devices[ i ], + "storage.cdrom.dvd", NULL ); + block_dev = libhal_device_get_property_string( ctx, + devices[ i ], "block.device" , NULL ); +#else 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" ); - +#endif if( b_dvd ) { config_PutPsz( p_vlc, "dvd", block_dev ); @@ -2357,12 +2671,127 @@ static void InitDeviceValues( vlc_t *p_vlc ) config_PutPsz( p_vlc, "vcd", block_dev ); config_PutPsz( p_vlc, "cd-audio", block_dev ); - +#ifdef HAVE_HAL_1 + libhal_free_string( block_dev ); +#else hal_free_string( block_dev ); +#endif } +#ifdef HAVE_HAL_1 + libhal_free_string_array( devices ); +#else + hal_free_string_array( devices ); +#endif } +#ifdef HAVE_HAL_1 + libhal_ctx_shutdown( ctx, NULL ); +#else hal_shutdown( ctx ); +#endif + } + else + { + msg_Warn( p_vlc, "Unable to get HAL device properties" ); } #endif } + +/***************************************************************************** + * FromLocale: converts a locale string to UTF-8 + *****************************************************************************/ +char *FromLocale( const char *locale ) +{ + if( locale == NULL ) + return NULL; + + if( libvlc.from_locale != (vlc_iconv_t)(-1) ) + { + char *iptr = (char *)locale, *output, *optr; + size_t inb, outb; + + /* + * We are not allowed to modify the locale pointer, even if we cast it + * to non-const. + */ + inb = strlen( locale ); + /* FIXME: I'm not sure about the value for the multiplication + * (for western people, multiplication by 3 (Latin9) is sufficient) */ + outb = inb * 6 + 1; + + optr = output = calloc( outb , 1); + + vlc_mutex_lock( &libvlc.from_locale_lock ); + vlc_iconv( libvlc.from_locale, NULL, NULL, NULL, NULL ); + + while( vlc_iconv( libvlc.from_locale, &iptr, &inb, &optr, &outb ) + == (size_t)-1 ) + { + *optr++ = '?'; + outb--; + iptr++; + inb--; + vlc_iconv( libvlc.from_locale, NULL, NULL, NULL, NULL ); + } + vlc_mutex_unlock( &libvlc.from_locale_lock ); + + assert (inb == 0); + assert (*iptr == '\0'); + assert (*optr == '\0'); + assert (strlen( output ) == (size_t)(optr - output)); + return realloc( output, optr - output + 1 ); + } + return (char *)locale; +} + +/***************************************************************************** + * ToLocale: converts an UTF-8 string to locale + *****************************************************************************/ +char *ToLocale( const char *utf8 ) +{ + if( utf8 == NULL ) + return NULL; + + if( libvlc.to_locale != (vlc_iconv_t)(-1) ) + { + char *iptr = (char *)utf8, *output, *optr; + size_t inb, outb; + + /* + * We are not allowed to modify the locale pointer, even if we cast it + * to non-const. + */ + inb = strlen( utf8 ); + /* FIXME: I'm not sure about the value for the multiplication + * (for western people, multiplication is not needed) */ + outb = inb * 2 + 1; + + optr = output = calloc( outb, 1 ); + vlc_mutex_lock( &libvlc.to_locale_lock ); + vlc_iconv( libvlc.to_locale, NULL, NULL, NULL, NULL ); + + while( vlc_iconv( libvlc.to_locale, &iptr, &inb, &optr, &outb ) + == (size_t)-1 ) + { + *optr++ = '?'; /* should not happen, and yes, it sucks */ + outb--; + iptr++; + inb--; + vlc_iconv( libvlc.to_locale, NULL, NULL, NULL, NULL ); + } + vlc_mutex_unlock( &libvlc.to_locale_lock ); + + assert (inb == 0); + assert (*iptr == '\0'); + assert (*optr == '\0'); + assert (strlen( output ) == (size_t)(optr - output)); + return realloc( output, optr - output + 1 ); + } + return (char *)utf8; +} + +void LocaleFree( const char *str ) +{ + if( ( str != NULL ) && ( libvlc.to_locale != (vlc_iconv_t)(-1) ) ) + free( (char *)str ); +}