[vlc-devel] [PATCH 4/5] netsync: appropriate --network-synchronisation

[remi at remlab.net]

From: Rémi Denis-Courmont <remi at remlab.net>

---
 modules/control/netsync.c | 7 +++++++
 src/libvlc-module.c       | 8 --------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/modules/control/netsync.c b/modules/control/netsync.c
index 05003a0121..daca7c4230 100644
--- a/modules/control/netsync.c
+++ b/modules/control/netsync.c
@@ -51,6 +51,11 @@
 static int  Open (vlc_object_t *);
 static void Close(vlc_object_t *);
 
+#define NETSYNC_TEXT N_("Network synchronisation" )
+#define NETSYNC_LONGTEXT N_( "This allows you to remotely " \
+        "synchronise clocks for server and client. The detailed settings " \
+        "are available in Advanced / Network Sync." )
+
 #define NETSYNC_TEXT N_("Network master clock")
 #define NETSYNC_LONGTEXT N_("When set, " \
   "this VLC instance will act as the master clock for synchronization " \
@@ -76,6 +81,8 @@ vlc_module_begin()
     set_category(CAT_ADVANCED)
     set_subcategory(SUBCAT_ADVANCED_MISC)
 
+    add_bool("network-synchronisation", false, NETSYNC_TEXT, NETSYNC_LONGTEXT,
+             true)
     add_bool("netsync-master", false,
               NETSYNC_TEXT, NETSYNC_LONGTEXT, true)
     add_string("netsync-master-ip", NULL, MIP_TEXT, MIP_LONGTEXT,
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index aea70ed995..7f37b13e27 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -547,11 +547,6 @@ static const char *const ppsz_clock_master_descriptions[] = {
     N_("Monotonic")
 };
 
-#define NETSYNC_TEXT N_("Network synchronisation" )
-#define NETSYNC_LONGTEXT N_( "This allows you to remotely " \
-        "synchronise clocks for server and client. The detailed settings " \
-        "are available in Advanced / Network Sync." )
-
 static const int pi_clock_values[] = { -1, 0, 1 };
 static const char *const ppsz_clock_descriptions[] =
 { N_("Default"), N_("Disable"), N_("Enable") };
@@ -1994,9 +1989,6 @@ vlc_module_begin ()
                  CLOCK_MASTER_TEXT, NULL, true )
         change_integer_list( pi_clock_master_values, ppsz_clock_master_descriptions )
 
-    add_bool( "network-synchronisation", false, NETSYNC_TEXT,
-              NETSYNC_LONGTEXT, true )
-
     add_directory("input-record-path", NULL,
                   INPUT_RECORD_PATH_TEXT, INPUT_RECORD_PATH_LONGTEXT)
     add_bool( "input-record-native", true, INPUT_RECORD_NATIVE_TEXT,
-- 
2.29.2