Merge pull request #148 from AlwinEsch/Matrix-change

[Matrix] API change updates
janbar · May 1, 2020 · 15a5919 · 15a5919
2 parents 92f8b3c + 1f0e588
commit 15a5919
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 15 deletions.
diff --git a/pvr.mythtv/addon.xml.in b/pvr.mythtv/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.mythtv"
-  version="6.4.2"
+  version="6.4.3"
   name="MythTV PVR Client"
   provider-name="Christian Fetzer, Jean-Luc Barrière">
   <requires>@ADDON_DEPENDS@</requires>

diff --git a/pvr.mythtv/changelog.txt b/pvr.mythtv/changelog.txt
@@ -1,3 +1,6 @@
+v6.4.3
+- Update PVR API 6.5.0
+
 v6.4.2
 - Update PVR API 6.4.0
 

diff --git a/src/client.cpp b/src/client.cpp
@@ -113,7 +113,7 @@ ADDON_STATUS ADDON_Create(void *hdl, void *props)
     return ADDON_STATUS_PERMANENT_FAILURE;
   }
   XBMC->Log(LOG_DEBUG, "Checking props...done");
-  PVR_PROPERTIES* pvrprops = (PVR_PROPERTIES*)props;
+  AddonProperties_PVR* pvrprops = (AddonProperties_PVR*)props;
 
   XBMC->Log(LOG_DEBUG, "Register handle @ libXBMC_pvr...");
   PVR = new CHelper_libXBMC_pvr;
@@ -710,7 +710,7 @@ ADDON_STATUS ADDON_SetSetting(const char *settingName, const void *settingValue)
  * PVR Client AddOn specific public library functions
  ***********************************************************/
 
-PVR_ERROR GetAddonCapabilities(PVR_ADDON_CAPABILITIES *pCapabilities)
+PVR_ERROR GetCapabilities(PVR_ADDON_CAPABILITIES *pCapabilities)
 {
   if (g_client != NULL)
   {
@@ -1061,12 +1061,12 @@ int ReadLiveStream(unsigned char *pBuffer, unsigned int iBufferSize)
   return dataread;
 }
 
-PVR_ERROR SignalStatus(PVR_SIGNAL_STATUS &signalStatus)
+PVR_ERROR GetSignalStatus(int channelUid, PVR_SIGNAL_STATUS *signalStatus)
 {
   if (g_client == NULL)
     return PVR_ERROR_SERVER_ERROR;
 
-  return g_client->SignalStatus(signalStatus);
+  return g_client->GetSignalStatus(signalStatus);
 }
 
 void PauseStream(bool bPaused)
@@ -1174,7 +1174,7 @@ void DemuxReset() {}
 void FillBuffer(bool mode) {}
 void SetSpeed(int) {};
 PVR_ERROR SetEPGTimeFrame(int) { return PVR_ERROR_NOT_IMPLEMENTED; }
-PVR_ERROR GetDescrambleInfo(PVR_DESCRAMBLE_INFO*) { return PVR_ERROR_NOT_IMPLEMENTED; }
+PVR_ERROR GetDescrambleInfo(int, PVR_DESCRAMBLE_INFO*) { return PVR_ERROR_NOT_IMPLEMENTED; }
 PVR_ERROR SetRecordingLifetime(const PVR_RECORDING*) { return PVR_ERROR_NOT_IMPLEMENTED; }
 PVR_ERROR GetChannelStreamProperties(const PVR_CHANNEL*, PVR_NAMED_VALUE*, unsigned int*) { return PVR_ERROR_NOT_IMPLEMENTED; }
 PVR_ERROR GetRecordingStreamProperties(const PVR_RECORDING*, PVR_NAMED_VALUE*, unsigned int*) { return PVR_ERROR_NOT_IMPLEMENTED; }

diff --git a/src/pvrclient-mythtv.cpp b/src/pvrclient-mythtv.cpp
@@ -2254,7 +2254,7 @@ long long PVRClientMythTV::LengthLiveStream()
   return retval;
 }
 
-PVR_ERROR PVRClientMythTV::SignalStatus(PVR_SIGNAL_STATUS &signalStatus)
+PVR_ERROR PVRClientMythTV::GetSignalStatus(PVR_SIGNAL_STATUS *signalStatus)
 {
   if (g_bExtraDebug)
     XBMC->Log(LOG_DEBUG, "%s", __FUNCTION__);
@@ -2265,18 +2265,18 @@ PVR_ERROR PVRClientMythTV::SignalStatus(PVR_SIGNAL_STATUS &signalStatus)
 
   char buf[50];
   sprintf(buf, "Myth Recorder %u", (unsigned)m_liveStream->GetCardId());
-  PVR_STRCPY(signalStatus.strAdapterName, buf);
+  PVR_STRCPY(signalStatus->strAdapterName, buf);
   Myth::SignalStatusPtr signal = m_liveStream->GetSignal();
   if (signal)
   {
     if (signal->lock)
-      PVR_STRCPY(signalStatus.strAdapterStatus, "Locked");
+      PVR_STRCPY(signalStatus->strAdapterStatus, "Locked");
     else
-      PVR_STRCPY(signalStatus.strAdapterStatus, "No lock");
-    signalStatus.iSignal = signal->signal;
-    signalStatus.iBER = signal->ber;
-    signalStatus.iSNR = signal->snr;
-    signalStatus.iUNC = signal->ucb;
+      PVR_STRCPY(signalStatus->strAdapterStatus, "No lock");
+    signalStatus->iSignal = signal->signal;
+    signalStatus->iBER = signal->ber;
+    signalStatus->iSNR = signal->snr;
+    signalStatus->iUNC = signal->ucb;
   }
 
   if (g_bExtraDebug)

diff --git a/src/pvrclient-mythtv.h b/src/pvrclient-mythtv.h
@@ -119,7 +119,7 @@ class PVRClientMythTV : public Myth::EventSubscriber
   int ReadLiveStream(unsigned char *pBuffer, unsigned int iBufferSize);
   long long SeekLiveStream(long long iPosition, int iWhence);
   long long LengthLiveStream();
-  PVR_ERROR SignalStatus(PVR_SIGNAL_STATUS &signalStatus);
+  PVR_ERROR GetSignalStatus(PVR_SIGNAL_STATUS *signalStatus);
   bool IsRealTimeStream() const { return m_liveStream ? true : false; }
   PVR_ERROR GetStreamTimes(PVR_STREAM_TIMES *pStreamTimes);