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;
{
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_homedir)
+ 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_homedir,
+ sprintf( psz, "%s/%s", p_vlc->psz_userdir,
p_vlc->psz_configfile + 2 );
free( p_vlc->psz_configfile );
p_vlc->psz_configfile = psz;
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 */
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;
}
/*
}
/*
- * 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, "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 );
+
+ /* Create volume callback system. */
+ var_Create( p_vlc, "volume-change", VLC_VAR_BOOL );
/*
* Get input filenames given as commandline arguments
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 );
}
/*****************************************************************************
- * VLC_Play: play
+ * VLC_Play: play the playlist
*****************************************************************************/
int VLC_Play( 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 );
if( i_object ) vlc_object_release( p_vlc );
return VLC_ENOOBJ;
}
- if( !p_playlist->p_input )
+
+ if( p_playlist->p_input )
{
- if( i_object ) vlc_object_release( p_vlc );
- return VLC_ENOOBJ;
+ 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 );
}
- 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 );
#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 );
}
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 "
- "Public License;\nsee the file named COPYING for details.\n"
- "Written by the VideoLAN team; see the AUTHORS file.\n") );
+ 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
}
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