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
*****************************************************************************
/* 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" ) )
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;
/* 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" );
}
/*
- * 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
*/
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 );
{
playlist_t * p_playlist;
vlc_bool_t b_playing;
+ vlc_value_t val;
vlc_t *p_vlc = vlc_current_object( 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 );
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 !
+ /* 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);
}
}
#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 */
/* Set the default domain */
textdomain( PACKAGE_NAME );
-
bind_textdomain_codeset( PACKAGE_NAME, "UTF-8" );
#endif
}
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 "
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
# 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
}
while( vlc_iconv( libvlc.from_locale, &iptr, &inb, &optr, &outb )
== (size_t)-1 )
{
- *optr++ = '?';
- *iptr++;
+ *optr = '?';
+ optr++;
+ iptr++;
vlc_iconv( libvlc.from_locale, NULL, NULL, NULL, NULL );
}
vlc_mutex_unlock( &libvlc.from_locale_lock );
while( vlc_iconv( libvlc.to_locale, &iptr, &inb, &optr, &outb )
== (size_t)-1 )
{
- *optr++ = '?'; /* should not happen, and yes, it sucks */
- *iptr++;
+ *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 );
projects / vlc / blobdiff