Attempt to fix C++ compilation

[vlc] / src / libvlc.h

diff --git a/src/libvlc.h b/src/libvlc.h
index 5862efb14d4d8273c363de3a94710bee98552f11..3c79633a152542476b2b2cde728650269eba84ea 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -753,7 +753,6 @@ static const char *ppsz_clock_descriptions[] =
     "When the SAP flow control is disabled, " \
     "this lets you set the fixed interval between SAP announcements." )
 
-
 /*****************************************************************************
  * Advanced
  ****************************************************************************/
@@ -876,14 +875,24 @@ static const char *ppsz_clock_descriptions[] =
 #define SYSLOG_LONGTEXT N_( \
     "Log all VLC messages to syslog (UNIX systems)." )
 
-#define ONEINSTANCE_TEXT N_("Allow only one running instance")
-#define ONEINSTANCE_LONGTEXT N_( \
+#define ONEINSTANCE_WIN_TEXT N_("Allow only one running instance")
+#define ONEINSTANCE_WIN_LONGTEXT N_( \
     "Allowing only one running instance of VLC can sometimes be useful, " \
     "for example if you associated VLC with some media types and you " \
     "don't want a new instance of VLC to be opened each time you " \
     "double-click on a file in the explorer. This option will allow you " \
     "to play the file with the already running instance or enqueue it.")
 
+#define ONEINSTANCE_DBUS_TEXT ONEINSTANCE_WIN_TEXT
+#define ONEINSTANCE_DBUS_LONGTEXT N_( \
+    "Allowing only one running instance of VLC can sometimes be useful, " \
+    "for example if you associated VLC with some media types and you " \
+    "don't want a new instance of VLC to be opened each time you " \
+    "open a file in your file manager. This option will allow you " \
+    "to play the file with the already running instance or enqueue it." \
+    "This option require the D-Bus session daemon to be active " \
+    "and the running instance of VLC to use D-Bus control interface.")
+
 #define STARTEDFROMFILE_TEXT N_("VLC is started from file association")
 #define STARTEDFROMFILE_LONGTEXT N_( \
     "Tell VLC that it is being launched due to a file association in the OS" )
@@ -1553,6 +1562,7 @@ vlc_module_begin();
                                ANN_SAPCTRL_LONGTEXT, VLC_TRUE );
     add_integer( "sap-interval", 5, NULL, ANN_SAPINTV_TEXT,
                                ANN_SAPINTV_LONGTEXT, VLC_TRUE );
+
     set_subcategory( SUBCAT_SOUT_VOD );
 
 /* CPU options */
@@ -1612,11 +1622,19 @@ vlc_module_begin();
         change_need_restart();
 #endif
 
+#if defined(HAVE_DBUS_3)
+    add_bool( "one-instance", 0, NULL, ONEINSTANCE_DBUS_TEXT,
+              ONEINSTANCE_DBUS_LONGTEXT, VLC_TRUE );
+    add_bool( "playlist-enqueue", 0, NULL, PLAYLISTENQUEUE_TEXT,
+              PLAYLISTENQUEUE_LONGTEXT, VLC_TRUE );
+#endif
+
 #if defined(WIN32)
-    add_bool( "one-instance", 0, NULL, ONEINSTANCE_TEXT,
-              ONEINSTANCE_LONGTEXT, VLC_TRUE );
+    add_bool( "one-instance", 0, NULL, ONEINSTANCE_WIN_TEXT,
+              ONEINSTANCE_WIN_LONGTEXT, VLC_TRUE );
     add_bool( "started-from-file", 0, NULL, STARTEDFROMFILE_TEXT,
               STARTEDFROMFILE_LONGTEXT, VLC_TRUE );
+        change_unsaveable();
     add_bool( "one-instance-when-started-from-file", 1, NULL,
               ONEINSTANCEWHENSTARTEDFROMFILE_TEXT,
               ONEINSTANCEWHENSTARTEDFROMFILE_LONGTEXT, VLC_TRUE );
@@ -2195,8 +2213,7 @@ static module_config_t p_help_config[] =
         .i_type   = CONFIG_ITEM_BOOL,
         .psz_name = "version",
         .psz_text = N_("print version information")
-    },
-    { .i_type = CONFIG_HINT_END }
+    }
 };
 
 /*****************************************************************************