videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

Start dbus always, move inhibit and dbus startup to vlc

This commit is contained in:
Rémi Denis-Courmont 2012-02-06 22:40:48 +02:00
parent 63b3ed339d
commit db36045cd9
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/vlc.c
View File

@ -208,6 +208,10 @@ int main( int i_argc, const char *ppsz_argv[] )
#if !defined (HAVE_MAEMO) && !defined __APPLE__ && !defined (__OS2__)
libvlc_add_intf (vlc, "globalhotkeys,none");
#endif
#ifdef HAVE_DBUS
libvlc_add_intf (vlc, "dbus,none");
libvlc_add_intf (vlc, "inhibit,none");
#endif
if (libvlc_add_intf (vlc, NULL))
goto out;

16
src/libvlc.c
View File

@ -646,22 +646,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
*/
intf_Create( p_libvlc, "hotkeys,none" );
#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( var_InheritBool( p_libvlc, "one-instance" )
|| ( var_InheritBool( p_libvlc, "one-instance-when-started-from-file" )
&& var_InheritBool( p_libvlc, "started-from-file" ) ) )
intf_Create( p_libvlc, "dbus,none" );
# if !defined (HAVE_MAEMO)
/* Prevents the power management daemon from suspending the system
* when VLC is active */
if( var_InheritBool( p_libvlc, "inhibit" ) > 0 )
intf_Create( p_libvlc, "inhibit,none" );
# endif
#endif
if( var_InheritBool( p_libvlc, "file-logging" )
#ifdef HAVE_SYSLOG_H
&& !var_InheritBool( p_libvlc, "syslog" )