satipcli: Rename flag to include client reference

We have both a satip client and server. However the nosatip flag, is for
the client. Make this more clear by renaming it to the internal variable
nosatipcli. Since we do not want to break the user facing API, we keep
the commandline argument nosatip, but add an alias for the future.

We can do better in the future with the rest of the satip reference, but
lets keep this to a minimum for now.

Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>

diff --git a/docs/markdown/cmdline_options.md b/docs/markdown/cmdline_options.md
index 01ad44ee126a850610e7e14c74865baabcee73f4..18b2098d7082700f656d335784f4b1cc576e31ef 100644 (file)
--- a/docs/markdown/cmdline_options.md
+++ b/docs/markdown/cmdline_options.md
@@ -27,7 +27,7 @@ Usage: `tvheadend [OPTIONS]`
       --satip_bindaddr        Specify bind address for SAT>IP server
       --satip_rtsp            SAT>IP RTSP port number for server
                               (default: -1 = disable, 0 = webconfig, standard port is 554)
-      --nosatip               Disable SAT>IP client
+      --nosatipcli            Disable SAT>IP client
       --satip_xml             URL with the SAT>IP server XML location
 ```
 ### Server connectivity

diff --git a/man/tvheadend.1 b/man/tvheadend.1
index fff88e9976f50e9a7b3fca2a02ed9bf8aca1836c..f203e896574c11d1dceda4b5f4d992eb7bad3ff6 100644 (file)
--- a/man/tvheadend.1
+++ b/man/tvheadend.1
@@ -66,7 +66,7 @@ Only use specified DVB adapters (comma separated, -1 == none).
 SAT>IP RTSP port number for server (default: -1 = disable, 0 = 
 webconfig, standard port is 554).
 .TP
-\fB\-\-nosatip\fR
+\fB\-\-nosatipcli\fR
 Disable SAT>IP client.
 .TP
 \fB\-\-satip_xml\fR

diff --git a/src/main.c b/src/main.c
index 306eee59595e65107adfc34afec830e685c2e15d..3b43c95347159b9d25e0485cc648a09c1f2cd72f 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -843,7 +843,7 @@ main(int argc, char **argv)
               opt_threadid     = 0,
               opt_libav        = 0,
               opt_ipv6         = 0,
-              opt_nosatip      = 0,
+              opt_nosatipcli   = 0,
               opt_satip_rtsp   = 0,
 #if ENABLE_TSFILE
               opt_tsfile_tuner = 0,
@@ -911,8 +911,10 @@ main(int argc, char **argv)
       OPT_INT, &opt_satip_rtsp },
 #endif
 #if ENABLE_SATIP_CLIENT
-    {   0, "nosatip",    N_("Disable SAT>IP client"),
-      OPT_BOOL, &opt_nosatip },
+    {   0, "nosatip",    N_("Disable SAT>IP client (deprecated flag, use nosatipcli)"),
+      OPT_BOOL, &opt_nosatipcli },
+    {   0, "nosatipcli",    N_("Disable SAT>IP client"),
+      OPT_BOOL, &opt_nosatipcli },
     {   0, "satip_xml",  N_("URL with the SAT>IP server XML location"),
       OPT_STR_LIST, &opt_satip_xml },
 #endif
@@ -1302,7 +1304,7 @@ main(int argc, char **argv)
   tvhftrace(LS_MAIN, descrambler_init);
   tvhftrace(LS_MAIN, dvb_init);
 #if ENABLE_MPEGTS
-  tvhftrace(LS_MAIN, mpegts_init, adapter_mask, opt_nosatip, &opt_satip_xml,
+  tvhftrace(LS_MAIN, mpegts_init, adapter_mask, opt_nosatipcli, &opt_satip_xml,
             &opt_tsfile, opt_tsfile_tuner);
 #endif
   tvhftrace(LS_MAIN, channel_init);