From 8e8b0de4cc2a4cf28e590af2240c5144551f2508 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Mon, 20 Apr 2020 21:59:47 +0200 Subject: [PATCH 1/6] [API related] remove deprecated PVR_STREAM_PROPERTY_INPUTSTREAMADDON --- src/client.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client.cpp b/src/client.cpp index 4acd7ce..7af5396 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -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"); From bacd86a9778682384b24b78bc15bd6b2efc1c086 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Wed, 1 Apr 2020 11:37:32 +0200 Subject: [PATCH 2/6] [API related] remove use of kodi_vfs_types.h --- src/Cache.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cache.cpp b/src/Cache.cpp index fe8175c..8f2994d 100644 --- a/src/Cache.cpp +++ b/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" From 9d26c4cb25e051d6c1fb05f92149bf2fa6cda3f9 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Sun, 29 Mar 2020 22:57:57 +0200 Subject: [PATCH 3/6] update .gitignore --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index 79abccf..b8b8fd2 100644 --- a/.gitignore +++ b/.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 From 6d57321041d7887fb310fdd921fbcfed79504749 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Sun, 29 Mar 2020 23:00:23 +0200 Subject: [PATCH 4/6] change to use GPL-2.0-or-later --- README.md | 2 +- pvr.teleboy/addon.xml.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e021a71..3b4ff15 100644 --- a/README.md +++ b/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 diff --git a/pvr.teleboy/addon.xml.in b/pvr.teleboy/addon.xml.in index 86ed2ad..032b46d 100644 --- a/pvr.teleboy/addon.xml.in +++ b/pvr.teleboy/addon.xml.in @@ -25,7 +25,7 @@ The authors are in no way responsible for failed recordings, incorrect timers, wasted hours, or any other undesirable effects.. The authors are in no way responsible for failed recordings, incorrect timers, wasted hours, or any other undesirable effects.. @PLATFORM@ - GPL-2.0 + GPL-2.0-or-later https://github.com/rbuehlma/pvr.teleboy icon.png From ecd249bbf9b99dea70401210b7114ef4851b2636 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Thu, 23 Apr 2020 18:05:53 +0200 Subject: [PATCH 5/6] [API related] change LOG_NOTICE to LOG_INFO --- src/TeleBoy.cpp | 6 +++--- src/categories.cpp | 2 +- src/client.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/TeleBoy.cpp b/src/TeleBoy.cpp index ea23369..5abf6b1 100644 --- a/src/TeleBoy.cpp +++ b/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; } diff --git a/src/categories.cpp b/src/categories.cpp index 97186b9..383a114 100644 --- a/src/categories.cpp +++ b/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; } diff --git a/src/client.cpp b/src/client.cpp index 7af5396..2050fdc 100644 --- a/src/client.cpp +++ b/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--; } From 24834eae312c937dd048025574b52f5917c927d3 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Tue, 31 Mar 2020 11:04:56 +0200 Subject: [PATCH 6/6] increase version to 19.4.7 --- pvr.teleboy/addon.xml.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pvr.teleboy/addon.xml.in b/pvr.teleboy/addon.xml.in index 032b46d..edb0e17 100644 --- a/pvr.teleboy/addon.xml.in +++ b/pvr.teleboy/addon.xml.in @@ -1,6 +1,6 @@ @@ -32,6 +32,9 @@ fanart.jpg +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