*
* 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.
*****************************************************************************/
/*****************************************************************************
/*****************************************************************************
* 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 );
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
*****************************************************************************
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" );
char * psz_parser;
char * psz_control;
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 )
{
*/
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") );
{
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" ) )
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;
/* This is the parent, exit right now */
msg_Dbg( p_vlc, "closing parent process" );
b_exit = VLC_TRUE;
+ i_ret = VLC_EEXITSUCCESS;
}
else
{
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 */
/* 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" );
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 */
vlc_object_destroy( p_help_module );
module_EndBank( p_vlc );
if( i_object ) vlc_object_release( p_vlc );
- return VLC_EEXIT;
+ return i_ret;
}
/*
p_vlc->pf_memset = memset;
}
+ libvlc.b_stats = config_GetInt( p_vlc, "stats" );
+
/*
* Initialize hotkey handling
*/
}
/*
- * 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
*/
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
*/
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 */
}
/*
- * 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 )) )
{
aout_Delete( p_aout );
}
+ while( ( p_stats = vlc_object_find( p_vlc, VLC_OBJECT_STATS, FIND_CHILD) ))
+ {
+ 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;
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 );
msg_Flush( p_vlc );
msg_Destroy( p_libvlc );
+ /* Destroy global iconv */
+ LocaleDeinit();
+
/* Destroy mutexes */
vlc_mutex_destroy( &p_vlc->config_lock );
}
/*****************************************************************************
- * VLC_Play: play
+ * VLC_Play: play the playlist
*****************************************************************************/
int VLC_Play( 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 );
/* 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.
*****************************************************************************
#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 */
#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 );
-
bind_textdomain_codeset( PACKAGE_NAME, "UTF-8" );
#endif
}
-/*****************************************************************************
- * FromLocale: converts a locale string to UTF-8
- *****************************************************************************/
-/* FIXME FIXME: it really has to be made quicker */
-char *FromLocale( const char *locale )
-{
- char *psz_charset;
-
- if( locale == NULL )
- return NULL;
-
- if( !vlc_current_charset( &psz_charset ) )
- {
- char *iptr = (char *)locale, *output, *optr;
- size_t inb, outb;
-
- /* cannot fail (unless vlc_current_charset sucks) */
- vlc_iconv_t hd = vlc_iconv_open( "UTF-8", psz_charset );
- free( psz_charset );
-
- /*
- * 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);
- while( vlc_iconv( hd, &iptr, &inb, &optr, &outb ) == (size_t)-1 )
- *iptr = '?'; /* should not happen, and yes, it sucks */
-
- vlc_iconv_close( hd );
- return realloc( output, strlen( output ) + 1 );
- }
- free( psz_charset );
- return (char *)locale;
-}
-
-/*****************************************************************************
- * ToLocale: converts an UTF-8 string to locale
- *****************************************************************************/
-/* FIXME FIXME: it really has to be made quicker */
-char *ToLocale( const char *utf8 )
-{
- char *psz_charset;
-
- if( utf8 == NULL )
- return NULL;
-
- if( !vlc_current_charset( &psz_charset ) )
- {
- char *iptr = (char *)utf8, *output, *optr;
- size_t inb, outb;
-
- /* cannot fail (unless vlc_current_charset sucks) */
- vlc_iconv_t hd = vlc_iconv_open( psz_charset, "UTF-8" );
- free( psz_charset );
-
- /*
- * 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 );
- while( vlc_iconv( hd, &iptr, &inb, &optr, &outb ) == (size_t)-1 )
- *iptr = '?'; /* should not happen, and yes, it sucks */
-
- vlc_iconv_close( hd );
- return realloc( output, strlen( output ) + 1 );
- }
- free( psz_charset );
- return (char *)utf8;
-}
-
-void LocaleFree( const char *str )
-{
- if( str != NULL )
- {
- /* FIXME: this deserve a price for the most inefficient peice of code */
- char *psz_charset;
-
- if( !vlc_current_charset( &psz_charset ) )
- free( (char *)str );
-
- free( psz_charset );
- }
-}
-
-/* FIXME: don't use iconv at all */
-char *EnsureUTF8( char *str )
-{
- vlc_iconv_t hd;
- size_t inb, outb;
- char *ostr, *istr;
-
- if( str == NULL )
- return NULL;
-
- ostr = istr = str;
-
- inb = outb = strlen( str );
- hd = vlc_iconv_open( "UTF-8", "UTF-8" );
- while( vlc_iconv( hd, &istr, &inb, &ostr, &outb ) == (size_t)-1 )
- *istr = '?';
-
- vlc_iconv_close( hd );
- return str;
-}
-
/*****************************************************************************
* GetFilenames: parse command line options which are not flags
*****************************************************************************
char *psz_text, *psz_spaces = psz_spaces_text;
char *psz_bra = NULL, *psz_type = NULL, *psz_ket = NULL;
char *psz_suf = "", *psz_prefix = NULL;
- size_t i;
+ signed int i;
/* Skip deprecated options */
if( p_item->psz_current )
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();
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
}
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 );
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 );
+ 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 );
+}
projects / vlc / blobdiff