X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.c;h=85046e2e8dd6d452ee63534060b34db4ac98f3f3;hb=91c268c59fc39bbe287cb54edd77b6657679ddfb;hp=19f0abe70890773144b5a15b190b496a2925bddd;hpb=aadabf1c2cb58db8bafeefcfcfa42b2ec130ff0c;p=vlc diff --git a/src/libvlc.c b/src/libvlc.c index 19f0abe708..85046e2e8d 100644 --- a/src/libvlc.c +++ b/src/libvlc.c @@ -1,7 +1,7 @@ /***************************************************************************** * libvlc.c: main libvlc source ***************************************************************************** - * Copyright (C) 1998-2004 VideoLAN + * Copyright (C) 1998-2004 the VideoLAN team * $Id$ * * Authors: Vincent Seguin @@ -78,6 +78,7 @@ #include "video_output.h" #include "stream_output.h" +#include "charset.h" #include "libvlc.h" @@ -91,8 +92,11 @@ static vlc_t * p_static_vlc; /***************************************************************************** * Local prototypes *****************************************************************************/ +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 ); static void Usage ( vlc_t *, char const *psz_module_name ); static void ListModules ( vlc_t * ); static void Version ( void ); @@ -134,6 +138,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 ***************************************************************************** @@ -200,6 +225,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" ); @@ -246,11 +274,15 @@ 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; 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 ) { @@ -282,6 +314,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") ); @@ -318,10 +356,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"), - 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 */ @@ -333,7 +368,21 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) /* 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" ) ) @@ -353,7 +402,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; @@ -415,16 +464,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" ); @@ -457,14 +502,14 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) /* 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 */ @@ -557,7 +602,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 ); } @@ -573,7 +617,10 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) /* 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" ) ) @@ -650,9 +697,13 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) return VLC_EGENERIC; } - /* Add service discovery modules */ - playlist_AddSDModules( p_playlist, - config_GetPsz( p_playlist, "services-discovery" ) ); + 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 @@ -664,7 +715,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 ) { @@ -677,7 +728,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'; @@ -697,10 +748,21 @@ 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 + /* * FIXME: kludge to use a p_vlc-local variable for the Mozilla plugin */ @@ -716,12 +778,26 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) var_Create( p_vlc, "drawableh", VLC_VAR_INTEGER ); var_Create( p_vlc, "drawableportx", VLC_VAR_INTEGER ); var_Create( p_vlc, "drawableporty", VLC_VAR_INTEGER ); + var_Create( p_vlc, "width", VLC_VAR_INTEGER ); + var_Create( p_vlc, "height", VLC_VAR_INTEGER ); /* * 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; } @@ -923,6 +999,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 ); @@ -940,6 +1022,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 ); @@ -1025,6 +1117,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. ***************************************************************************** @@ -1163,6 +1311,7 @@ vlc_bool_t VLC_IsPlaying( int i_object ) { playlist_t * p_playlist; vlc_bool_t b_playing; + vlc_value_t val; vlc_t *p_vlc = vlc_current_object( i_object ); @@ -1179,8 +1328,13 @@ vlc_bool_t VLC_IsPlaying( int i_object ) if( i_object ) vlc_object_release( p_vlc ); return VLC_ENOOBJ; } - - b_playing = playlist_IsPlaying( p_playlist ); + if( !p_playlist->p_input ) + { + if( i_object ) vlc_object_release( p_vlc ); + return VLC_ENOOBJ; + } + var_Get( p_playlist->p_input, "state", &val ); + b_playing = ( val.i_int == PLAYING_S ); vlc_object_release( p_playlist ); if( i_object ) vlc_object_release( p_vlc ); @@ -1334,12 +1488,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 ); @@ -1381,7 +1537,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; } /** @@ -1734,6 +1890,49 @@ int VLC_FullScreen( int i_object ) /* following functions are local */ +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. ***************************************************************************** @@ -1777,6 +1976,10 @@ 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 */ @@ -1795,12 +1998,8 @@ static void SetLanguage ( char const *psz_lang ) /* Set the default domain */ textdomain( PACKAGE_NAME ); - -#if defined( ENABLE_UTF8 ) bind_textdomain_codeset( PACKAGE_NAME, "UTF-8" ); #endif - -#endif } /***************************************************************************** @@ -1817,6 +2016,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 */ @@ -1828,17 +2028,52 @@ 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; } /***************************************************************************** - * 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. *****************************************************************************/ @@ -1861,23 +2096,23 @@ static void Usage( vlc_t *p_this, char const *psz_module_name ) 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 ); @@ -1924,11 +2159,16 @@ static void Usage( vlc_t *p_this, char const *psz_module_name ) 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; + signed int i; + /* Skip deprecated options */ + if( p_item->psz_current ) + { + continue; + } /* Skip advanced options if requested */ if( p_item->b_advanced && !b_advanced ) { @@ -2018,12 +2258,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 ); } @@ -2053,14 +2288,17 @@ static void Usage( vlc_t *p_this, char const *psz_module_name ) /* 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 ) { 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; @@ -2101,15 +2339,20 @@ static void Usage( vlc_t *p_this, char const *psz_module_name ) 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 */ - PauseConsole(); -#endif } /***************************************************************************** @@ -2131,12 +2374,6 @@ static void ListModules( vlc_t *p_this ) 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 ); @@ -2177,7 +2414,13 @@ static void Version( void ) ShowConsole(); #endif - fprintf( stdout, VERSION_MESSAGE "\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, _("This program comes with NO WARRANTY, to the extent permitted by " "law.\nYou may redistribute it under the terms of the GNU General " @@ -2198,11 +2441,21 @@ 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 ); + + 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 ); + freopen( "CONOUT$", "w", stderr ); freopen( "CONIN$", "r", stdin ); @@ -2221,8 +2474,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 } @@ -2321,9 +2576,99 @@ static void InitDeviceValues( vlc_t *p_vlc ) hal_free_string( block_dev ); } + hal_free_string_array( devices ); } hal_shutdown( ctx ); } #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 ); + outb = inb * 6 + 1; + + /* FIXME: I'm not sure about the value for the multiplication + * (for western people, multiplication by 3 (Latin9) is sufficient) */ + 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 = '?'; + optr++; + iptr++; + vlc_iconv( libvlc.from_locale, NULL, NULL, NULL, NULL ); + } + vlc_mutex_unlock( &libvlc.from_locale_lock ); + + return realloc( output, strlen( 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 */ + optr++; + iptr++; + vlc_iconv( libvlc.to_locale, NULL, NULL, NULL, NULL ); + } + vlc_mutex_unlock( &libvlc.to_locale_lock ); + + return realloc( output, strlen( output ) + 1 ); + } + return (char *)utf8; +} + +void LocaleFree( const char *str ) +{ + if( ( str != NULL ) && ( libvlc.to_locale != (vlc_iconv_t)(-1) ) ) + free( (char *)str ); +}