# include <locale.h>
#endif
-#ifdef HAVE_DBUS_3
+#ifdef HAVE_DBUS
/* used for one-instance mode */
# include <dbus/dbus.h>
#endif
system_Configure( p_libvlc, &i_argc, ppsz_argv );
/* FIXME: could be replaced by using Unix sockets */
-#ifdef HAVE_DBUS_3
+#ifdef HAVE_DBUS
dbus_threads_init_default();
if( config_GetInt( p_libvlc, "one-instance" ) > 0 )
if( psz_temp )
{
sprintf( psz_temp, "%s,none", psz_module );
- libvlc_InternalAddIntf( p_libvlc, psz_temp, false );
+ libvlc_InternalAddIntf( p_libvlc, psz_temp );
free( psz_temp );
}
}
/*
* Always load the hotkeys interface if it exists
*/
- libvlc_InternalAddIntf( p_libvlc, "hotkeys,none", false );
+ libvlc_InternalAddIntf( p_libvlc, "hotkeys,none" );
-#ifdef HAVE_DBUS_3
+#ifdef HAVE_DBUS
/* loads dbus control interface if in one-instance mode
* we do it only when playlist exists, because dbus module needs it */
if( config_GetInt( p_libvlc, "one-instance" ) > 0 )
- libvlc_InternalAddIntf( p_libvlc, "dbus,none", false );
+ libvlc_InternalAddIntf( p_libvlc, "dbus,none" );
/* Prevents the power management daemon from suspending the system
* when VLC is active */
if( config_GetInt( p_libvlc, "inhibit" ) > 0 )
- libvlc_InternalAddIntf( p_libvlc, "inhibit,none", false );
+ libvlc_InternalAddIntf( p_libvlc, "inhibit,none" );
#endif
/*
#ifdef HAVE_X11_XLIB_H
if( config_GetInt( p_libvlc, "disable-screensaver" ) )
{
- libvlc_InternalAddIntf( p_libvlc, "screensaver,none", false );
+ libvlc_InternalAddIntf( p_libvlc, "screensaver,none" );
}
#endif
if( config_GetInt( p_libvlc, "file-logging" ) > 0 )
{
- libvlc_InternalAddIntf( p_libvlc, "logger,none", false );
+ libvlc_InternalAddIntf( p_libvlc, "logger,none" );
}
#ifdef HAVE_SYSLOG_H
if( config_GetInt( p_libvlc, "syslog" ) > 0 )
{
char *logmode = var_CreateGetString( p_libvlc, "logmode" );
var_SetString( p_libvlc, "logmode", "syslog" );
- libvlc_InternalAddIntf( p_libvlc, "logger,none", false );
+ libvlc_InternalAddIntf( p_libvlc, "logger,none" );
if( logmode )
{
if( config_GetInt( p_libvlc, "show-intf" ) > 0 )
{
- libvlc_InternalAddIntf( p_libvlc, "showintf,none", false );
+ libvlc_InternalAddIntf( p_libvlc, "showintf,none" );
}
if( config_GetInt( p_libvlc, "network-synchronisation") > 0 )
{
- libvlc_InternalAddIntf( p_libvlc, "netsync,none", false );
+ libvlc_InternalAddIntf( p_libvlc, "netsync,none" );
}
#ifdef WIN32
/* Create volume callback system. */
var_Create( p_libvlc, "volume-change", VLC_VAR_BOOL );
+ /* Create a variable for showing the interface (moved from playlist). */
+ var_Create( p_playlist, "intf-show", VLC_VAR_BOOL );
+ var_SetBool( p_playlist, "intf-show", true );
+
/*
* Get input filenames given as commandline arguments
*/
vlc_object_release( p_intf ); /* for vlc_object_find() */
}
- /* Free video outputs */
- msg_Dbg( p_libvlc, "removing all video outputs" );
- while( (p_vout = vlc_object_find( p_libvlc, VLC_OBJECT_VOUT, FIND_CHILD )) )
- {
- vlc_object_detach( p_vout );
- vlc_object_release( p_vout );
- vout_Destroy( p_vout );
- }
-
#ifdef ENABLE_SOUT
playlist_t * p_playlist;
sout_instance_t * p_sout;
msg_Dbg( p_libvlc, "removing interaction" );
vlc_object_release( priv->p_interaction );
+ /* Free video outputs */
+ msg_Dbg( p_libvlc, "removing all video outputs" );
+ while( (p_vout = vlc_object_find( p_libvlc, VLC_OBJECT_VOUT, FIND_CHILD )) )
+ {
+ vlc_object_detach( p_vout );
+ vlc_object_release( p_vout );
+ vlc_object_release( p_vout );
+ }
+
stats_TimersDumpAll( p_libvlc );
stats_TimersCleanAll( p_libvlc );
/**
* Add an interface plugin and run it
*/
-int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, char const *psz_module,
- bool b_play )
+int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, char const *psz_module )
{
int i_err;
intf_thread_t *p_intf = NULL;
return VLC_EGENERIC;
}
- /* Interface doesn't handle play on start so do it ourselves */
- if( !p_intf->b_play && b_play )
- playlist_Play( libvlc_priv(p_libvlc)->p_playlist );
-
/* Try to run the interface */
- p_intf->b_play = b_play;
+ p_intf->b_play = false; /* TODO: remove b_play completely */
i_err = intf_RunThread( p_intf );
if( i_err )
{
char *block_dev = NULL;
dbus_bool_t b_dvd;
-#ifdef HAVE_HAL_1
DBusConnection *p_connection = NULL;
DBusError error;
}
libhal_ctx_set_dbus_connection( ctx, p_connection );
if( libhal_ctx_init( ctx, &error ) )
-#else
- ctx = hal_initialize( NULL, FALSE );
- if( ctx )
-#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 );
dbus_connection_unref( p_connection );
libhal_ctx_free( ctx );
-#else
- hal_shutdown( ctx );
-#endif
}
else
{
projects / vlc / blobdiff