Merge pull request #19 from AlwinEsch/Nexus-change

[Nexus] API related update

.github/workflows/build.yml

@@ -27,7 +27,7 @@ jobs:
       env:
         DEBIAN_BUILD: ${{ matrix.DEBIAN_BUILD }}
       run: |
-        if [[ $DEBIAN_BUILD == true ]]; then sudo add-apt-repository -y ppa:team-xbmc/ppa; fi
+        if [[ $DEBIAN_BUILD == true ]]; then sudo add-apt-repository -y ppa:team-xbmc/xbmc-nightly; fi
         if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get update; fi
         if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get install fakeroot; fi
     - name: Checkout Kodi repo
@@ -36,7 +36,7 @@ jobs:
         repository: xbmc/xbmc
         ref: master
         path: xbmc
-    - name: Checkout pvr.hts repo
+    - name: Checkout pvr.plutotv repo
       uses: actions/checkout@v2
       with:
         path: ${{ env.app_id }}

.travis.yml

@@ -31,7 +31,7 @@ matrix:
       osx_image: xcode10.2
 
 before_install:
-  - if [[ $DEBIAN_BUILD == true ]]; then sudo add-apt-repository -y ppa:team-xbmc/ppa; fi
+  - if [[ $DEBIAN_BUILD == true ]]; then sudo add-apt-repository -y ppa:team-xbmc/xbmc-nightly; fi
   - if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get update; fi
   - if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get install fakeroot; fi
 
@@ -49,6 +49,6 @@ before_script:
   - if [[ $DEBIAN_BUILD == true ]]; then wget https://raw.githubusercontent.com/xbmc/xbmc/master/xbmc/addons/kodi-dev-kit/tools/debian-addon-package-test.sh && chmod +x ./debian-addon-package-test.sh; fi
   - if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get build-dep $TRAVIS_BUILD_DIR; fi
 
-script:
+script: 
   - if [[ $DEBIAN_BUILD != true ]]; then make; fi
   - if [[ $DEBIAN_BUILD == true ]]; then ./debian-addon-package-test.sh $TRAVIS_BUILD_DIR; fi

depends/common/rapidjson/flags.txt

@@ -1 +1 @@
--DRAPIDJSON_HAS_STDSTRING=ON -DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF -DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF
+-DRAPIDJSON_HAS_STDSTRING=ON -DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF -DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF -DRAPIDJSON_BUILD_CXX17=ON

depends/common/rapidjson/rapidjson.sha256

@@ -1 +1 @@
-bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e
+c8ed60cbf2976aa94491af7d6024d029a5232e23f21998a78bbc0725188cf3aa

depends/common/rapidjson/rapidjson.txt

@@ -1 +1 @@
-rapidjson http://mirrors.kodi.tv/build-deps/sources/rapidjson-1.1.0.tar.gz
+rapidjson https://github.com/Tencent/rapidjson/archive/fd3dc29a5.tar.gz

pvr.plutotv/addon.xml.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.plutotv"
-  version="20.0.3"
+  version="20.1.0"
   name="Pluto.tv PVR Client"
   provider-name="Team Kodi, flubshi">
   <requires>@ADDON_DEPENDS@

pvr.plutotv/changelog.txt

@@ -1,3 +1,6 @@
+v20.1.0
+- Kodi main API update to version 2.0.0
+
 v20.0.3
 - Fix creation of broadcast and channel uid
 

src/PlutotvData.cpp

@@ -41,7 +41,7 @@ ADDON_STATUS PlutotvData::Create()
 }
 
 ADDON_STATUS PlutotvData::SetSetting(const std::string& settingName,
-                                     const kodi::CSettingValue& settingValue)
+                                     const kodi::addon::CSettingValue& settingValue)
 {
   return ADDON_STATUS_OK;
 }
@@ -252,12 +252,12 @@ PVR_ERROR PlutotvData::GetChannelStreamProperties(
 
 std::string PlutotvData::GetSettingsUUID(const std::string& setting)
 {
-  std::string uuid = kodi::GetSettingString(setting);
+  std::string uuid = kodi::addon::GetSettingString(setting);
   if (uuid.empty())
   {
     uuid = Utils::CreateUUID();
     kodi::Log(ADDON_LOG_DEBUG, "uuid (generated): %s", uuid.c_str());
-    kodi::SetSettingString(setting, uuid);
+    kodi::addon::SetSettingString(setting, uuid);
   }
   return uuid;
 }

src/PlutotvData.h

@@ -20,8 +20,8 @@
 static const std::string PLUTOTV_USER_AGENT =
     "Mozilla/5.0 (Windows NT 6.2; rv:24.0) Gecko/20100101 Firefox/24.0";
 
-class ATTRIBUTE_HIDDEN PlutotvData : public kodi::addon::CAddonBase,
-                                     public kodi::addon::CInstancePVRClient
+class ATTR_DLL_LOCAL PlutotvData : public kodi::addon::CAddonBase,
+                                   public kodi::addon::CInstancePVRClient
 {
 public:
   PlutotvData() = default;
@@ -32,7 +32,7 @@ class ATTRIBUTE_HIDDEN PlutotvData : public kodi::addon::CAddonBase,
 
   ADDON_STATUS Create() override;
   ADDON_STATUS SetSetting(const std::string& settingName,
-                          const kodi::CSettingValue& settingValue) override;
+                          const kodi::addon::CSettingValue& settingValue) override;
 
   PVR_ERROR GetCapabilities(kodi::addon::PVRCapabilities& capabilities) override;
   PVR_ERROR GetBackendName(std::string& name) override;