Automatically loads dbus control interface in one-instance mode

Adds one instance in NEWS

diff --git a/NEWS b/NEWS
index 278470e0a67147f7313ac40b2c752469ea0feab3..ad619e72f6e946461f88507e1fe8a38e36b527d1 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -69,6 +69,8 @@ Interfaces:
    * Brand new interface for Linux and Windows, based on the Qt toolkit
  * All
    * Improved user interaction
+ * Unix
+   * Allow only one running instance, using D-Bus interface (experimental).
 
 
 Changes between 0.8.6a and 0.8.6-bugfix (not yet released):

diff --git a/src/libvlc-common.c b/src/libvlc-common.c
index 7f41a0e76728f16cea25fbf2cfdf71f568883e7a..31bbc0f9cfad5963b13d3c15a3da70eae6a094a5 100644 (file)
--- a/src/libvlc-common.c
+++ b/src/libvlc-common.c
@@ -859,6 +859,11 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] )
      */
     VLC_AddIntf( 0, "hotkeys,none", VLC_FALSE, VLC_FALSE );
 
+    /* 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" ) )
+        VLC_AddIntf( 0, "dbus,none", VLC_FALSE, VLC_FALSE );
+
     /*
      * If needed, load the Xscreensaver interface
      * Currently, only for X