Merge pull request #48 from AlwinEsch/Matrix-change

[Matrix] API change update / cleanups

.gitignore

@@ -43,3 +43,8 @@ obj-x86_64-linux-gnu/
 
 # to prevent add if project code opened by Visual Studio over CMake file
 .vs/
+
+# General MacOS
+.DS_Store
+.AppleDouble
+.LSOverride

README.md

@@ -1,4 +1,4 @@
-[![License: GPL v2+](https://img.shields.io/badge/License-GPL%20v2+-blue.svg)](LICENSE.md)
+[![License: GPL-2.0-or-later](https://img.shields.io/badge/License-GPL%20v2+-blue.svg)](LICENSE.md)
 [![Build Status](https://jenkins.kodi.tv/view/Addons/job/kodi-pvr/job/pvr.teleboy/job/Matrix/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/rbuehlma%2Fpvr.teleboy/branches/)
 
 # Teleboy PVR addon for Kodi

pvr.teleboy/addon.xml.in

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon id="pvr.teleboy"
-       version="19.4.6"
+       version="19.4.7"
        name="Teleboy PVR Client"
        provider-name="rbuehlma">
   <requires>
@@ -25,13 +25,16 @@
     <disclaimer lang="en_NZ">The authors are in no way responsible for failed recordings, incorrect timers, wasted hours, or any other undesirable effects..</disclaimer>
     <disclaimer lang="en_US">The authors are in no way responsible for failed recordings, incorrect timers, wasted hours, or any other undesirable effects..</disclaimer>
     <platform>@PLATFORM@</platform>
-    <license>GPL-2.0</license>
+    <license>GPL-2.0-or-later</license>
     <source>https://github.com/rbuehlma/pvr.teleboy</source>
     <assets>
       <icon>icon.png</icon>
       <fanart>fanart.jpg</fanart>
     </assets>
     <news>
+v19.4.7
+- Update PVR API 6.4.0
+- Correct license name on addon.xml
 v19.4.6
  - Rebuild of 19.4.5
 v19.4.5

src/Cache.cpp

@@ -1,7 +1,7 @@
 #include "Cache.h"
 #include "client.h"
 #include "Utils.h"
-#include "kodi_vfs_types.h"
+#include "libXBMC_addon.h"
 #include "rapidjson/writer.h"
 #include "rapidjson/stringbuffer.h"
 

src/TeleBoy.cpp

@@ -154,7 +154,7 @@ TeleBoy::TeleBoy(bool favoritesOnly, bool enableDolby) :
     username(""), password(""), maxRecallSeconds(60 * 60 * 24 * 7), cinergySCookies(
         ""), isPlusMember(false), isComfortMember(false)
 {
-  XBMC->Log(LOG_NOTICE, "Using useragent: %s", user_agent.c_str());
+  XBMC->Log(LOG_INFO, "Using useragent: %s", user_agent.c_str());
   ReadDataJson();
   this->favoritesOnly = favoritesOnly;
   this->enableDolby = enableDolby;
@@ -187,7 +187,7 @@ bool TeleBoy::Login(string u, string p)
     string location = curl.GetLocation();
     if (location.find("t.teleboy.ch") != string::npos)
     {
-      XBMC->Log(LOG_NOTICE, "Using t.teleboy.ch.");
+      XBMC->Log(LOG_INFO, "Using t.teleboy.ch.");
       tbUrl = "https://t.teleboy.ch";
       HttpGet(curl, tbUrl + "/login");
     }
@@ -253,7 +253,7 @@ bool TeleBoy::Login(string u, string p)
   isComfortMember = result.find("setIsComfortMember(1", endPos)
       != std::string::npos;
   if (!isPlusMember) {
-    XBMC->Log(LOG_NOTICE, "Free accounts are not supported.", userId.c_str());
+    XBMC->Log(LOG_INFO, "Free accounts are not supported.", userId.c_str());
     XBMC->QueueNotification(QUEUE_ERROR, XBMC->GetLocalizedString(30102));
     return false;
   }

src/categories.cpp

@@ -75,7 +75,7 @@ int Categories::Category(const std::string& category) const
   auto it = m_categoriesByName.find(category);
   if (it != m_categoriesByName.end())
     return it->second;
-  XBMC->Log(LOG_NOTICE, "Missing category: %s", category.c_str());
+  XBMC->Log(LOG_INFO, "Missing category: %s", category.c_str());
   return 0;
 }
 

src/client.cpp

@@ -100,7 +100,7 @@ ADDON_STATUS ADDON_Create(void *hdl, void *props)
   ADDON_ReadSettings();
 
   if (teleboyUsername.empty() || teleboyPassword.empty()) {
-    XBMC->Log(LOG_NOTICE, "Username or password not set.");
+    XBMC->Log(LOG_INFO, "Username or password not set.");
     XBMC->QueueNotification(QUEUE_WARNING, XBMC->GetLocalizedString(30100));
     return m_CurStatus;
   }
@@ -132,7 +132,7 @@ void ADDON_Destroy()
   int waitCount = 10;
   while (runningRequests > 0 && waitCount > 0)
   {
-    XBMC->Log(LOG_NOTICE, "Wait for %d requests to finish for %d seconds.", runningRequests, waitCount);
+    XBMC->Log(LOG_INFO, "Wait for %d requests to finish for %d seconds.", runningRequests, waitCount);
     std::this_thread::sleep_for(std::chrono::seconds(1));
     waitCount--;
   }
@@ -346,7 +346,7 @@ void setStreamProperty(PVR_NAMED_VALUE* properties, unsigned int* propertiesCoun
 void setStreamProperties(PVR_NAMED_VALUE* properties, unsigned int* propertiesCount, std::string url)
 {
   setStreamProperty(properties, propertiesCount, PVR_STREAM_PROPERTY_STREAMURL, url);
-  setStreamProperty(properties, propertiesCount, PVR_STREAM_PROPERTY_INPUTSTREAMADDON, "inputstream.adaptive");
+  setStreamProperty(properties, propertiesCount, PVR_STREAM_PROPERTY_INPUTSTREAM, "inputstream.adaptive");
   setStreamProperty(properties, propertiesCount, "inputstream.adaptive.manifest_type", "mpd");
   setStreamProperty(properties, propertiesCount, "inputstream.adaptive.manifest_update_parameter", "full");
   setStreamProperty(properties, propertiesCount, PVR_STREAM_PROPERTY_MIMETYPE, "application/xml+dash");