X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Flibvlc.c;h=a006aae9c3ac0587c96236faf1b1c39d15654de5;hb=2242665b9b86102477ac0e2299a73bd6b1f6e342;hp=b09edba64d3c77f395271a88c2e53ef4c3847930;hpb=f3112de7dcd678e5d2998460f68101f0cb2fb275;p=vlc diff --git a/src/libvlc.c b/src/libvlc.c index b09edba64d..a006aae9c3 100644 --- a/src/libvlc.c +++ b/src/libvlc.c @@ -1,13 +1,14 @@ /***************************************************************************** * libvlc.c: main libvlc source ***************************************************************************** - * Copyright (C) 1998-2004 the VideoLAN team + * 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 @@ -96,8 +97,8 @@ 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 ); +void LocaleInit( vlc_object_t * ); +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 ); @@ -106,7 +107,7 @@ static void ListModules ( vlc_t * ); static void Version ( void ); #ifdef WIN32 -static void ShowConsole ( void ); +static void ShowConsole ( vlc_bool_t ); static void PauseConsole ( void ); #endif static int ConsoleWidth ( void ); @@ -157,11 +158,13 @@ DECLARE_VLC_VERSION( CompileHost, COMPILE_HOST ); DECLARE_VLC_VERSION( CompileDomain, COMPILE_DOMAIN ); DECLARE_VLC_VERSION( Compiler, COMPILER ); +#ifndef HAVE_SHARED_LIBVLC extern const char psz_vlc_changeset[]; char const * VLC_Changeset( void ) { return psz_vlc_changeset; } +#endif /***************************************************************************** * VLC_Error: strerror() equivalent @@ -229,9 +232,6 @@ 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" ); @@ -248,7 +248,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 @@ -286,7 +286,9 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) vlc_value_t val; #if defined( ENABLE_NLS ) \ && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) ) +# if defined (WIN32) || defined (__APPLE__) char * psz_language; +#endif #endif if( !p_vlc ) @@ -323,7 +325,7 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) * Global iconv, must be done after setlocale() * so that vlc_current_charset() works. */ - LocaleInit(); + LocaleInit( (vlc_object_t *)p_vlc ); /* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */ msg_Dbg( p_vlc, "translation test: code is \"%s\"", _("C") ); @@ -417,6 +419,33 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) p_vlc->p_libvlc->b_daemon = VLC_TRUE; + /* lets check if we need to write the pidfile */ + char * psz_pidfile = config_GetPsz( p_vlc, "pidfile" ); + + msg_Dbg( p_vlc, "psz_pidfile is %s", psz_pidfile ); + + if( psz_pidfile != NULL ) + { + FILE *pidfile; + pid_t i_pid = getpid (); + + msg_Dbg( p_vlc, "our PID is %d, writing it to %s", i_pid, psz_pidfile ); + + pidfile = utf8_fopen( psz_pidfile,"w" ); + if( pidfile != NULL ) + { + utf8_fprintf( pidfile, "%d", (int)i_pid ); + fclose( pidfile ); + } + else + { + msg_Err( p_vlc, "Cannot open pid file for writing: %s, error: %s", + psz_pidfile, strerror(errno) ); + } + } + + free( psz_pidfile ); + #else pid_t i_pid; @@ -458,7 +487,7 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) /* Check for translation config option */ #if defined( ENABLE_NLS ) \ && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) ) - +# if defined (WIN32) || defined (__APPLE__) /* This ain't really nice to have to reload the config here but it seems * the only way to do it. */ config_LoadConfigFile( p_vlc, "main" ); @@ -472,8 +501,6 @@ 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") ); @@ -485,6 +512,7 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) libvlc.p_module_bank->b_cache_delete = b_cache_delete; } if( psz_language ) free( psz_language ); +# endif #endif /* @@ -581,7 +609,7 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) if( config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, VLC_FALSE ) ) { #ifdef WIN32 - ShowConsole(); + ShowConsole( VLC_FALSE ); /* 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.\n" ); @@ -643,7 +671,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 @@ -685,6 +713,9 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) } libvlc.b_stats = config_GetInt( p_vlc, "stats" ); + libvlc.i_timers = 0; + libvlc.pp_timers = NULL; + vlc_mutex_init( p_vlc, &libvlc.timer_lock ); /* * Initialize hotkey handling @@ -697,7 +728,7 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) /* * Initialize playlist and get commandline files */ - p_playlist = playlist_Create( p_vlc ); + p_playlist = playlist_ThreadCreate( p_vlc ); if( !p_playlist ) { msg_Err( p_vlc, "playlist initialization failed" ); @@ -772,45 +803,44 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) #ifdef HAVE_X11_XLIB_H if( config_GetInt( p_vlc, "disable-screensaver" ) == 1 ) { - VLC_AddIntf( 0, "screensaver", VLC_FALSE, VLC_FALSE ); + VLC_AddIntf( 0, "screensaver,none", VLC_FALSE, VLC_FALSE ); } #endif if( config_GetInt( p_vlc, "file-logging" ) == 1 ) { - VLC_AddIntf( 0, "logger", VLC_FALSE, VLC_FALSE ); + VLC_AddIntf( 0, "logger,none", 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 ); + AddIntfInternal( 0, "logger,none", VLC_FALSE, VLC_FALSE, 1, &psz_logmode ); } +#endif if( config_GetInt( p_vlc, "show-intf" ) == 1 ) { - VLC_AddIntf( 0, "showintf", VLC_FALSE, VLC_FALSE ); + VLC_AddIntf( 0, "showintf,none", VLC_FALSE, VLC_FALSE ); } if( config_GetInt( p_vlc, "network-synchronisation") == 1 ) { - VLC_AddIntf( 0, "netsync", VLC_FALSE, VLC_FALSE ); + VLC_AddIntf( 0, "netsync,none", VLC_FALSE, VLC_FALSE ); } /* * FIXME: kludge to use a p_vlc-local variable for the Mozilla plugin */ var_Create( p_vlc, "drawable", VLC_VAR_INTEGER ); - var_Create( p_vlc, "drawableredraw", VLC_VAR_INTEGER ); - var_Create( p_vlc, "drawablet", VLC_VAR_INTEGER ); - var_Create( p_vlc, "drawablel", VLC_VAR_INTEGER ); - var_Create( p_vlc, "drawableb", VLC_VAR_INTEGER ); - var_Create( p_vlc, "drawabler", VLC_VAR_INTEGER ); - var_Create( p_vlc, "drawablex", VLC_VAR_INTEGER ); - var_Create( p_vlc, "drawabley", VLC_VAR_INTEGER ); - var_Create( p_vlc, "drawablew", VLC_VAR_INTEGER ); - 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, "drawable-view-top", VLC_VAR_INTEGER ); + var_Create( p_vlc, "drawable-view-left", VLC_VAR_INTEGER ); + var_Create( p_vlc, "drawable-view-bottom", VLC_VAR_INTEGER ); + var_Create( p_vlc, "drawable-view-right", VLC_VAR_INTEGER ); + var_Create( p_vlc, "drawable-clip-top", VLC_VAR_INTEGER ); + var_Create( p_vlc, "drawable-clip-left", VLC_VAR_INTEGER ); + var_Create( p_vlc, "drawable-clip-bottom", VLC_VAR_INTEGER ); + var_Create( p_vlc, "drawable-clip-right", VLC_VAR_INTEGER ); /* Create volume callback system. */ var_Create( p_vlc, "volume-change", VLC_VAR_BOOL ); @@ -883,7 +913,6 @@ 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 */ @@ -913,7 +942,7 @@ int VLC_CleanUp( int i_object ) { vlc_object_detach( p_playlist ); vlc_object_release( p_playlist ); - playlist_Destroy( p_playlist ); + playlist_ThreadDestroy( p_playlist ); } /* @@ -938,14 +967,8 @@ 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 - } + stats_TimersDumpAll( p_vlc ); + stats_TimersClean( p_vlc ); /* * Free announce handler(s?) @@ -1196,7 +1219,7 @@ int VLC_AddTarget( int i_object, char const *psz_target, if( p_playlist == NULL ) { msg_Dbg( p_vlc, "no playlist present, creating one" ); - p_playlist = playlist_Create( p_vlc ); + p_playlist = playlist_ThreadCreate( p_vlc ); if( p_playlist == NULL ) { @@ -1207,7 +1230,7 @@ int VLC_AddTarget( int i_object, char const *psz_target, vlc_object_yield( p_playlist ); } - i_err = playlist_AddExt( p_playlist, psz_target, psz_target, + i_err = playlist_PlaylistAddExt( p_playlist, psz_target, psz_target, i_mode, i_pos, -1, ppsz_options, i_options); vlc_object_release( p_playlist ); @@ -1275,7 +1298,7 @@ int VLC_Pause( int i_object ) } /***************************************************************************** - * VLC_Pause: toggle pause + * VLC_Stop: stop playback *****************************************************************************/ int VLC_Stop( int i_object ) { @@ -1335,7 +1358,6 @@ vlc_bool_t VLC_IsPlaying( int i_object ) } else { - msg_Dbg(p_vlc, "polling playlist_IsPlaying"); b_playing = playlist_IsPlaying( p_playlist ); } vlc_object_release( p_playlist ); @@ -1630,29 +1652,8 @@ float VLC_SpeedSlower( int i_object ) */ 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 i_index; + printf( "This function is deprecated and should not be used anymore" ); + return -1; } /** @@ -1762,7 +1763,6 @@ int VLC_PlaylistPrev( int i_object ) *****************************************************************************/ int VLC_PlaylistClear( int i_object ) { - int i_err; playlist_t * p_playlist; vlc_t *p_vlc = vlc_current_object( i_object ); @@ -1780,12 +1780,12 @@ int VLC_PlaylistClear( int i_object ) return VLC_ENOOBJ; } - i_err = playlist_Clear( p_playlist ); + playlist_Clear( p_playlist ); vlc_object_release( p_playlist ); if( i_object ) vlc_object_release( p_vlc ); - return i_err; + return VLC_SUCCESS; } /** @@ -1898,7 +1898,7 @@ 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; + int i_err; intf_thread_t *p_intf; vlc_t *p_vlc = vlc_current_object( i_object ); @@ -1944,57 +1944,10 @@ static int AddIntfInternal( int i_object, char const *psz_module, 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. @@ -2009,7 +1962,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 @@ -2022,7 +1975,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 ); @@ -2039,14 +1992,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 */ -#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, @@ -2060,7 +2009,6 @@ static void SetLanguage ( char const *psz_lang ) } /* Set the default domain */ - textdomain( PACKAGE_NAME ); bind_textdomain_codeset( PACKAGE_NAME, "UTF-8" ); #endif } @@ -2111,18 +2059,18 @@ static int GetFilenames( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] ) static void Help( vlc_t *p_this, char const *psz_help_name ) { #ifdef WIN32 - ShowConsole(); + ShowConsole( VLC_TRUE ); #endif if( psz_help_name && !strcmp( psz_help_name, "help" ) ) { - fprintf( stdout, VLC_USAGE, p_this->psz_object_name ); + utf8_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 ); + utf8_fprintf( stdout, VLC_USAGE, p_this->psz_object_name ); Usage( p_this, NULL ); } else if( psz_help_name ) @@ -2213,7 +2161,7 @@ static void Usage( vlc_t *p_this, char const *psz_module_name ) /* Print name of module */ if( strcmp( "main", p_parser->psz_object_name ) ) - fprintf( stdout, "\n %s\n", p_parser->psz_longname ); + utf8_fprintf( stdout, "\n %s\n", p_parser->psz_longname ); b_help_module = !strcmp( "help", p_parser->psz_object_name ); @@ -2243,7 +2191,7 @@ static void Usage( vlc_t *p_this, char const *psz_module_name ) case CONFIG_HINT_CATEGORY: case CONFIG_HINT_USAGE: if( !strcmp( "main", p_parser->psz_object_name ) ) - fprintf( stdout, "\n %s\n", p_item->psz_text ); + utf8_fprintf( stdout, "\n %s\n", p_item->psz_text ); break; case CONFIG_ITEM_STRING: @@ -2337,13 +2285,13 @@ static void Usage( vlc_t *p_this, char const *psz_module_name ) if( p_item->i_type == CONFIG_ITEM_BOOL && !b_help_module ) { - fprintf( stdout, psz_format, psz_short, p_item->psz_name, + utf8_fprintf( stdout, psz_format, psz_short, p_item->psz_name, psz_prefix, p_item->psz_name, psz_bra, psz_type, psz_ket, psz_spaces ); } else { - fprintf( stdout, psz_format, psz_short, p_item->psz_name, + utf8_fprintf( stdout, psz_format, psz_short, p_item->psz_name, "", "", psz_bra, psz_type, psz_ket, psz_spaces ); } @@ -2363,7 +2311,7 @@ static void Usage( vlc_t *p_this, char const *psz_module_name ) /* If the remaining text fits in a line, print it. */ if( i_end <= (size_t)i_width ) { - fprintf( stdout, "%s\n", psz_text ); + utf8_fprintf( stdout, "%s\n", psz_text ); break; } @@ -2391,14 +2339,14 @@ static void Usage( vlc_t *p_this, char const *psz_module_name ) { char c = psz_text[i_width]; psz_text[i_width] = '\0'; - fprintf( stdout, "%s\n%s", psz_text, psz_spaces ); + utf8_fprintf( stdout, "%s\n%s", psz_text, psz_spaces ); psz_text += i_width; psz_text[0] = c; } else { psz_word[-1] = '\0'; - fprintf( stdout, "%s\n%s", psz_text, psz_spaces ); + utf8_fprintf( stdout, "%s\n%s", psz_text, psz_spaces ); psz_text = psz_word; } } @@ -2408,7 +2356,7 @@ static void Usage( vlc_t *p_this, char const *psz_module_name ) 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 ); + utf8_fprintf( stdout, "%s", psz_spaces ); goto description; } } @@ -2434,7 +2382,7 @@ static void ListModules( vlc_t *p_this ) memset( psz_spaces, ' ', 22 ); #ifdef WIN32 - ShowConsole(); + ShowConsole( VLC_TRUE ); #endif /* List all modules */ @@ -2453,7 +2401,7 @@ static void ListModules( vlc_t *p_this ) if( i < 0 ) i = 0; psz_spaces[i] = 0; - fprintf( stdout, " %s%s %s\n", p_parser->psz_object_name, + utf8_fprintf( stdout, " %s%s %s\n", p_parser->psz_object_name, psz_spaces, p_parser->psz_longname ); psz_spaces[i] = ' '; @@ -2474,17 +2422,19 @@ static void ListModules( vlc_t *p_this ) static void Version( void ) { #ifdef WIN32 - ShowConsole(); + ShowConsole( VLC_TRUE ); #endif - fprintf( stdout, _("VLC version %s\n"), VLC_Version() ); - fprintf( stdout, _("Compiled by %s@%s.%s\n"), + utf8_fprintf( stdout, _("VLC version %s\n"), VLC_Version() ); + utf8_fprintf( stdout, _("Compiled by %s@%s.%s\n"), VLC_CompileBy(), VLC_CompileHost(), VLC_CompileDomain() ); - fprintf( stdout, _("Compiler: %s\n"), VLC_Compiler() ); + utf8_fprintf( stdout, _("Compiler: %s\n"), VLC_Compiler() ); +#ifndef HAVE_SHARED_LIBVLC if( strcmp( VLC_Changeset(), "exported" ) ) - fprintf( stdout, _("Based upon svn changeset [%s]\n"), + utf8_fprintf( stdout, _("Based upon svn changeset [%s]\n"), VLC_Changeset() ); - fprintf( stdout, LICENSE_MSG ); +#endif + utf8_fprintf( stdout, LICENSE_MSG ); #ifdef WIN32 /* Pause the console because it's destroyed when we exit */ PauseConsole(); @@ -2497,7 +2447,7 @@ static void Version( void ) * This function is useful only on Win32. *****************************************************************************/ #ifdef WIN32 /* */ -static void ShowConsole( void ) +static void ShowConsole( vlc_bool_t b_dofile ) { # ifndef UNDER_CE FILE *f_help; @@ -2509,11 +2459,11 @@ static void ShowConsole( void ) freopen( "CONOUT$", "w", stderr ); freopen( "CONIN$", "r", stdin ); - if( (f_help = fopen( "vlc-help.txt", "wt" )) ) + if( b_dofile && (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") ); + utf8_fprintf( stderr, _("\nDumped content to vlc-help.txt file.\n") ); } else freopen( "CONOUT$", "w", stdout ); @@ -2534,7 +2484,7 @@ static void PauseConsole( void ) if( getenv( "PWD" ) && getenv( "PS1" ) ) return; /* cygwin shell */ - fprintf( stderr, _("\nPress the RETURN key to continue...\n") ); + utf8_fprintf( stderr, _("\nPress the RETURN key to continue...\n") ); getchar(); fclose( stdout ); @@ -2687,92 +2637,3 @@ static void InitDeviceValues( vlc_t *p_vlc ) } #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 ); -}