[dvblast-devel] Allow PMT filters to be disabled even when config file is used.

[Georgi Chorbadzhiyski]

dvblast | branch: master | Georgi Chorbadzhiyski <gf at unixsol.org> | Fri Oct 25 20:01:28 2013 +0300| [958c1aa2bbb01c231ae0c27f8fb45f923ec39d52] | committer: Georgi Chorbadzhiyski

Allow PMT filters to be disabled even when config file is used.

Commit 77382fc5 enabled PMT filters when config file was used.

This commit allows PMT filters to be disabled by using --select-pmts (-w)
option after the config file is set.

Now running 'dvblast [opts] --config-file file.conf --select-pmts'
instructs dvblast to *NOT* set filters for all PMTs.

> http://git.videolan.org/gitweb.cgi/dvblast.git/?a=commit;h=958c1aa2bbb01c231ae0c27f8fb45f923ec39d52
---

 dvblast.1 |    5 ++++-
 dvblast.c |    4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dvblast.1 b/dvblast.1
index de2b067..537e299 100644
--- a/dvblast.1
+++ b/dvblast.1
@@ -191,7 +191,10 @@ Voltage to apply to the LNB (QPSK)
 Only display the version
 .TP
 \fB\-w\fR, \fB\-\-select-pmts\fR
-set a PID filter on all PMTs
+Set a PID filter on all PMTs. This option is automatically enabled
+when config file is used. To disable setting PMT filters in case of
+config file is used, add \-\-select-pmts \fBafter\fR \-\-config\-file <file>
+parameter.
 .TP
 \fB\-x\fR, \fB\-\-print\fR
 Print interesting events on stdout in a given format
diff --git a/dvblast.c b/dvblast.c
index 5412307..8bc2b7e 100644
--- a/dvblast.c
+++ b/dvblast.c
@@ -538,7 +538,7 @@ void usage()
     msg_Raw( NULL, "  -k --uncommitted      port number for uncommitted diseqc (0: no uncommitted diseqc, 1-4)" );
     msg_Raw( NULL, "  -u --budget-mode      turn on budget mode (no hardware PID filtering)" );
     msg_Raw( NULL, "  -v --voltage          voltage to apply to the LNB (QPSK)" );
-    msg_Raw( NULL, "  -w --select-pmts      set a PID filter on all PMTs" );
+    msg_Raw( NULL, "  -w --select-pmts      set a PID filter on all PMTs (auto on, when config file is used)" );
     msg_Raw( NULL, "  -O --lock-timeout     timeout for the lock operation (in ms)" );
     msg_Raw( NULL, "  -y --ca-number <ca_device_number>" );
 #endif
@@ -823,7 +823,7 @@ int main( int i_argc, char **pp_argv )
             break;
 
         case 'w':
-            b_select_pmts = 1;
+            b_select_pmts = !b_select_pmts;
             break;
 
         case 'U':