vlc_opendir: simplify and partly revert previous commit

[vlc] / src / libvlc.c

diff --git a/src/libvlc.c b/src/libvlc.c
index 04aeb2e72eded1ce8d8af9c326c825a8a80789c5..9eb08cf16d72676ac3ac39517ad8b5e7be64f399 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -66,9 +66,6 @@
 #include <vlc_playlist.h>
 #include <vlc_interface.h>
 
-#include <vlc_aout.h>
-#include "audio_output/aout_internal.h"
-
 #include <vlc_charset.h>
 #include <vlc_fs.h>
 #include <vlc_cpu.h>
@@ -646,24 +643,11 @@ 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
+    if( var_InheritBool( p_libvlc, "file-logging" )
+#ifdef HAVE_SYSLOG_H
+        && !var_InheritBool( p_libvlc, "syslog" )
 #endif
-
-    if( var_InheritBool( p_libvlc, "file-logging" ) &&
-        !var_InheritBool( p_libvlc, "syslog" ) )
+        )
     {
         intf_Create( p_libvlc, "logger,none" );
     }