From fe010ab72ca9e25b0104f8dea092bce9752aaa6e Mon Sep 17 00:00:00 2001
From: Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>
Date: Thu, 9 Apr 2015 21:36:13 +0300
Subject: [PATCH] Added a more flexible OPER command in the SVDRP interface.

---
 HISTORY     |  5 +++++
 po/ca_ES.po |  2 +-
 po/de_DE.po |  2 +-
 po/es_ES.po |  2 +-
 po/fi_FI.po |  2 +-
 satip.c     | 21 ++++++++++++++++-----
 6 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/HISTORY b/HISTORY
index 9cee659..790b2cb 100644
--- a/HISTORY
+++ b/HISTORY
@@ -130,3 +130,8 @@ VDR Plugin 'satip' Revision History
   (Thanks to Oliver Endriss).
 - Updated against SAT>IP protocol specification
   version 1.2.2.
+
+2015-XX-XX: Version 2.2.2
+
+- Added a more flexible OPER command in the SVDRP
+  interface.
diff --git a/po/ca_ES.po b/po/ca_ES.po
index a39cc70..305a304 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-satip 2.2.1\n"
+"Project-Id-Version: vdr-satip 2.2.2\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2015-04-04 04:04+0300\n"
 "PO-Revision-Date: 2015-04-04 04:04+0300\n"
diff --git a/po/de_DE.po b/po/de_DE.po
index 1f5be1e..11507b3 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-satip 2.2.1\n"
+"Project-Id-Version: vdr-satip 2.2.2\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2015-04-04 04:04+0300\n"
 "PO-Revision-Date: 2015-04-04 04:04+0300\n"
diff --git a/po/es_ES.po b/po/es_ES.po
index 4e0d772..952a376 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-satip 2.2.1\n"
+"Project-Id-Version: vdr-satip 2.2.2\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2015-04-04 04:04+0300\n"
 "PO-Revision-Date: 2015-04-04 04:04+0300\n"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 94608f5..9912911 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-satip 2.2.1\n"
+"Project-Id-Version: vdr-satip 2.2.2\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2015-04-04 04:04+0300\n"
 "PO-Revision-Date: 2015-04-04 04:04+0300\n"
diff --git a/satip.c b/satip.c
index 6b58e72..11ea6cf 100644
--- a/satip.c
+++ b/satip.c
@@ -27,7 +27,7 @@
 #define GITVERSION ""
 #endif
 
-       const char VERSION[]     = "2.2.1" GITVERSION;
+       const char VERSION[]     = "2.2.2" GITVERSION;
 static const char DESCRIPTION[] = trNOOP("SAT>IP Devices");
 
 class cPluginSatip : public cPlugin {
@@ -366,8 +366,8 @@ const char **cPluginSatip::SVDRPHelpPages(void)
     "    Lists status information of SAT>IP devices.\n",
     "CONT\n"
     "    Shows SAT>IP device count.\n",
-    "OPER\n"
-    "    Toggles operating mode of SAT>IP devices.\n",
+    "OPER [ off | low | normal | high ]\n"
+    "    Gets and(or sets operating mode of SAT>IP devices.\n",
     "TRAC [ <mode> ]\n"
     "    Gets and/or sets used tracing mode.\n",
     NULL
@@ -434,8 +434,19 @@ cString cPluginSatip::SVDRPCommand(const char *commandP, const char *optionP, in
      }
   else if (strcasecmp(commandP, "OPER") == 0) {
      cString mode;
-     SatipConfig.ToggleOperatingMode();
-     switch (SatipConfig.GetOperatingMode()) {
+     unsigned int oper = SatipConfig.GetOperatingMode();
+     if (optionP && *optionP) {
+        if (strcasecmp(optionP, "off") == 0)
+           oper = cSatipConfig::eOperatingModeOff;
+        else if (strcasecmp(optionP, "low") == 0)
+           oper = cSatipConfig::eOperatingModeLow;
+        else if (strcasecmp(optionP, "normal") == 0)
+           oper = cSatipConfig::eOperatingModeNormal;
+        else if (strcasecmp(optionP, "high") == 0)
+           oper = cSatipConfig::eOperatingModeHigh;
+        SatipConfig.SetOperatingMode(oper);
+     }
+     switch (oper) {
        case cSatipConfig::eOperatingModeOff:
             mode = "off";
             break;