Tuners and signal status

CMakeLists.txt

@@ -76,7 +76,9 @@ set(VUPLUS_HEADERS src/client.h
                    src/enigma2/utilities/LocalizedString.h
                    src/enigma2/utilities/UpdateState.h
                    src/enigma2/utilities/FileUtils.h
+                   src/enigma2/utilities/json.hpp
                    src/enigma2/utilities/Logger.h
+                   src/enigma2/utilities/Tuner.h
                    src/enigma2/utilities/WebUtils.h)
 
 set(DEPLIBS ${kodiplatform_LIBRARIES}

README.md

@@ -44,6 +44,7 @@ Within this tab general options are configured.
 
 * **Fetch picons from web interface**: Fetch the picons straight from the Enigma 2 set-top box.
 * **Use picons.eu file formate**: Assume all picons files fetched from the set-top box start with `1_1_1_` and end with `_0_0_0`
+* **Use OpenWebIf picon path**: Fetch the picon path from OpenWebIf instead of constructing from ServiceRef. Requires OpenWebIf 1.3.x or higher.
 * **Icon path**: In order to have Kodi display channel logos you have to copy the picons from your set-top box onto your OpenELEC machine. You then need to specify this path in this property.
 * **Update interval**: As the set-top box can also be used to modify timers, delete recordings etc. and the set-top box does not notify the Kodi installation, the addon needs to regularly check for updates (new channels, new/changed/deletes timers, deleted recordings, etc.) This property defines how often the addon checks for updates.
 * **Update mode**: The mode used when the update interval is reached. Note that if there is any timer change detected a recordings update will always occur regardless of the update mode. Choose from one of the following two modes:

pvr.vuplus/addon.xml.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.vuplus"
-  version="3.15.5"
+  version="3.16.0"
   name="Enigma2 Client"
   provider-name="Joerg Dembski and Ross Nicholson">
   <requires>@ADDON_DEPENDS@</requires>
@@ -175,6 +175,14 @@
     <disclaimer lang="zh_TW">這是測試版軟體！其原創作者並無法對於以下情況負責，包含：錄影失敗，不正確的定時設定，多餘時數，或任何產生的其它不良影響...</disclaimer>
     <platform>@PLATFORM@</platform>
     <news>
+v3.16.0
+- Added: Tuners and SignalStatus
+- Added: Use Picon Path from OpenWebIf
+- Fixed: Change startup issue log statements from Debug to Error, fixes #157
+
+v3.15.5
+- Added: updated language files from Transifex
+
 v3.15.4
 - Fixed: In 3.15.2 WebIf that is not OpenWebIf does not support auto timer API - Addon won't load Newnigma2 image, fixes #151
 

pvr.vuplus/changelog.txt

@@ -1,3 +1,11 @@
+v3.16.0
+- Added: Tuners and SignalStatus
+- Added: Use Picon Path from OpenWebIf
+- Fixed: Change startup issue log statements from Debug to Error, fixes #157
+
+v3.15.5
+- Added: updated language files from Transifex
+
 v3.15.4
 - Fixed: In 3.15.2 WebIf that is not OpenWebIf does not support auto timer API - Addon won't load Newnigma2 image, fixes #151
 

pvr.vuplus/resources/language/resource.language.en_gb/strings.po

@@ -428,7 +428,11 @@ msgctxt "#30102"
 msgid "Timers only"
 msgstr ""
 
-#empty strings from id 30103 to 30409
+msgctxt "#30103"
+msgid "Use OpenWebIf picon path"
+msgstr ""
+
+#empty strings from id 30104 to 30409
 
 msgctxt "#30410"
 msgid "Automatic"
@@ -478,3 +482,15 @@ msgstr ""
 msgctxt "#30514"
 msgid "Timeshift buffer path does not exist"
 msgstr ""
+
+msgctxt "#30515"
+msgid "Enigma2: Could not reach web interface"
+msgstr ""
+
+msgctxt "#30516"
+msgid "Enigma2: No channel groups found"
+msgstr ""
+
+msgctxt "#30517"
+msgid "Enigma2: No channels found"
+msgstr ""

pvr.vuplus/resources/settings.xml

@@ -100,6 +100,14 @@
           </dependencies>
           <control type="toggle" />
         </setting>
+        <setting id="useopenwebifpiconpath" type="boolean" parent="onlinepicons" label="30103">
+          <level>0</level>
+          <default>false</default>
+          <dependencies>
+            <dependency type="enable" setting="onlinepicons">true</dependency>
+          </dependencies>
+          <control type="toggle" />
+        </setting>
         <setting id="iconpath" type="path" label="30008">
           <level>0</level>
           <default></default>

src/Enigma2.cpp

@@ -101,6 +101,7 @@ bool Enigma2::Open()
   if (!m_isConnected)
   {
     Logger::Log(LEVEL_ERROR, "%s It seem's that the webinterface cannot be reached. Make sure that you set the correct configuration options in the addon settings!", __FUNCTION__);
+    XBMC->QueueNotification(QUEUE_ERROR, LocalizedString(30515).c_str());
     return false;
   }
 
@@ -113,11 +114,20 @@ bool Enigma2::Open()
   {
     // Load the TV channels - close connection if no channels are found
     if (!m_channelGroups.LoadChannelGroups())
+    {
+      Logger::Log(LEVEL_ERROR, "%s No channel groups (bouquets) found, please check the addon channel settings, exiting", __FUNCTION__);
+      XBMC->QueueNotification(QUEUE_ERROR, LocalizedString(30516).c_str());
+
       return false;
+    }
 
     if (!m_channels.LoadChannels(m_channelGroups))
-      return false;
+    {
+      Logger::Log(LEVEL_ERROR, "%s No channels found, please check the addon channel settings, exiting", __FUNCTION__);
+      XBMC->QueueNotification(QUEUE_ERROR, LocalizedString(30517).c_str());
 
+      return false;
+    }
   }
   m_timers.AddTimerChangeWatcher(&m_dueRecordingUpdate);
   m_timers.TimerUpdates();
@@ -464,4 +474,17 @@ PVR_ERROR Enigma2::DeleteTimer(const PVR_TIMER &timer)
 PVR_ERROR Enigma2::GetDriveSpace(long long *iTotal, long long *iUsed)
 {
   return m_admin.GetDriveSpace(iTotal, iUsed, m_locations);
+}
+
+PVR_ERROR Enigma2::GetTunerSignal(PVR_SIGNAL_STATUS &signalStatus)
+{
+  if (m_currentChannel >= 0)
+  {
+    const std::shared_ptr<Channel> channel = m_channels.GetChannel(m_currentChannel);
+
+    strncpy(signalStatus.strServiceName, channel->GetChannelName().c_str(), sizeof(signalStatus.strServiceName) - 1);
+    strncpy(signalStatus.strProviderName, channel->GetProviderName().c_str(), sizeof(signalStatus.strProviderName) - 1);
+  }
+
+  return m_admin.GetTunerSignal(signalStatus);
 }

src/Enigma2.h

@@ -80,6 +80,7 @@ class Enigma2  : public P8PLATFORM::CThread
   PVR_ERROR UpdateTimer(const PVR_TIMER &timer);
   PVR_ERROR DeleteTimer(const PVR_TIMER &timer);
   PVR_ERROR GetDriveSpace(long long *iTotal, long long *iUsed);
+  PVR_ERROR GetTunerSignal(PVR_SIGNAL_STATUS &signalStatus);
 
 protected:
   virtual void *Process(void);

src/client.cpp

@@ -245,14 +245,23 @@ PVR_ERROR GetDriveSpace(long long *iTotal, long long *iUsed)
 
 PVR_ERROR SignalStatus(PVR_SIGNAL_STATUS &signalStatus)
 {
-  // the RS api doesn't provide information about signal quality (yet)
+  // SNR = Signal to Noise Ratio - which means signal quality
+  // AGC = Automatic Gain Control - which means signal strength
+  // BER = Bit Error Rate - which shows the error rate of the signal.
+  // UNC = There is not notion of UNC on enigma devices
+
+  // So, SNR and AGC should be as high as possible.
+  // BER should be as low as possible, like 0. It can be higher, if your other values are higher.
+
+  enigma->GetTunerSignal(signalStatus);
+
+  Logger::Log(LEVEL_DEBUG, "%s Tuner Details - name: %s, status: %s", __FUNCTION__, signalStatus.strAdapterName, signalStatus.strAdapterStatus);
+  Logger::Log(LEVEL_DEBUG, "%s Service Details - service: %s, provider: %s", __FUNCTION__, signalStatus.strServiceName, signalStatus.strProviderName);
+  Logger::Log(LEVEL_DEBUG, "%s Signal - snrPercent: %d, ber: %u, signal strength: %d", __FUNCTION__, signalStatus.iSNR, signalStatus.iBER, signalStatus.iSignal);
 
-  PVR_STRCPY(signalStatus.strAdapterName, LocalizedString(60084).c_str()); //Enigma2 Media Server
-  PVR_STRCPY(signalStatus.strAdapterStatus, LocalizedString(60085).c_str()); //OK
   return PVR_ERROR_NO_ERROR;
 }
 
-
 /***************************************************************************
  * ChannelGroups
  **************************************************************************/