diff -pruN 19.0.1+ds1-1/appveyor.yml 20.2.1+ds1-1/appveyor.yml --- 19.0.1+ds1-1/appveyor.yml 2021-12-24 11:07:07.000000000 +0000 +++ 20.2.1+ds1-1/appveyor.yml 2022-08-04 08:09:26.000000000 +0000 @@ -23,7 +23,7 @@ environment: build_script: - cd .. - - git clone --branch Matrix --depth=1 https://github.com/xbmc/xbmc.git + - git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git - cd %app_id% - mkdir build - cd build diff -pruN 19.0.1+ds1-1/azure-pipelines.yml 20.2.1+ds1-1/azure-pipelines.yml --- 19.0.1+ds1-1/azure-pipelines.yml 2021-12-24 11:07:07.000000000 +0000 +++ 20.2.1+ds1-1/azure-pipelines.yml 2022-08-04 08:09:26.000000000 +0000 @@ -4,7 +4,7 @@ variables: trigger: branches: include: - - Matrix + - Nexus - releases/* paths: include: @@ -16,25 +16,25 @@ jobs: - job: Windows pool: - vmImage: 'VS2017-Win2016' + vmImage: 'windows-2022' strategy: matrix: Win32: - GENERATOR: "Visual Studio 15 2017" + GENERATOR: "Visual Studio 17 2022" ARCHITECTURE: Win32 CONFIGURATION: Release Win64: - GENERATOR: "Visual Studio 15 2017" + GENERATOR: "Visual Studio 17 2022" ARCHITECTURE: x64 CONFIGURATION: Release Win64-UWP: - GENERATOR: "Visual Studio 15 2017" + GENERATOR: "Visual Studio 17 2022" ARCHITECTURE: x64 CONFIGURATION: Release WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0" ARM64-UWP: - GENERATOR: "Visual Studio 15 2017" + GENERATOR: "Visual Studio 17 2022" ARCHITECTURE: ARM64 CONFIGURATION: Release WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0" @@ -46,7 +46,7 @@ jobs: - script: | cd .. - git clone --branch Matrix --depth=1 https://github.com/xbmc/xbmc.git kodi + git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git kodi cd $(Build.SourcesDirectory) mkdir build cd build diff -pruN 19.0.1+ds1-1/debian/changelog 20.2.1+ds1-1/debian/changelog --- 19.0.1+ds1-1/debian/changelog 2022-03-21 17:51:24.000000000 +0000 +++ 20.2.1+ds1-1/debian/changelog 2022-08-04 09:57:34.000000000 +0000 @@ -1,3 +1,10 @@ +kodi-inputstream-rtmp (20.2.1+ds1-1) unstable; urgency=medium + + * New upstream version 20.2.1+ds1 + * Prepare for v20 in unstable + + -- Vasyl Gello Thu, 04 Aug 2022 09:57:34 +0000 + kodi-inputstream-rtmp (19.0.1+ds1-1) unstable; urgency=medium * New upstream version 19.0.1+ds1 diff -pruN 19.0.1+ds1-1/debian/control 20.2.1+ds1-1/debian/control --- 19.0.1+ds1-1/debian/control 2022-03-21 17:51:24.000000000 +0000 +++ 20.2.1+ds1-1/debian/control 2022-08-04 09:57:34.000000000 +0000 @@ -3,13 +3,13 @@ Priority: optional Section: video Maintainer: Debian Multimedia Maintainers Uploaders: Vasyl Gello -Standards-Version: 4.6.0 +Standards-Version: 4.6.1 Rules-Requires-Root: no Vcs-Browser: https://salsa.debian.org/multimedia-team/kodi-media-center/kodi-inputstream-rtmp Vcs-Git: https://salsa.debian.org/multimedia-team/kodi-media-center/kodi-inputstream-rtmp.git Homepage: https://kodi.tv/ Build-Depends: debhelper-compat (= 13) -Build-Depends-Arch: dh-sequence-kodiaddon (>= 2:19~), +Build-Depends-Arch: dh-sequence-kodiaddon (>= 2:20~), cmake, librtmp-dev, pkg-config, diff -pruN 19.0.1+ds1-1/debian/copyright 20.2.1+ds1-1/debian/copyright --- 19.0.1+ds1-1/debian/copyright 2021-01-20 07:07:41.000000000 +0000 +++ 20.2.1+ds1-1/debian/copyright 2022-08-04 09:57:34.000000000 +0000 @@ -9,13 +9,13 @@ License: GPL-2+ Files: debian/* Copyright: 2017-2020 Christian Marillat - 2020-2021 Vasyl Gello + 2020-2022 Vasyl Gello License: GPL-2+ Files: src/RTMPStream.cpp Copyright: 2016-2021 Arne Morten Kvarving 2005-2013 Team XBMC - 2013-2021 Team Kodi + 2013-2022 Team Kodi License: GPL-2+ License: GPL-2+ diff -pruN 19.0.1+ds1-1/debian/watch 20.2.1+ds1-1/debian/watch --- 19.0.1+ds1-1/debian/watch 2021-08-26 10:20:45.000000000 +0000 +++ 20.2.1+ds1-1/debian/watch 2022-08-04 09:57:34.000000000 +0000 @@ -5,4 +5,4 @@ opts="repack, \ repacksuffix=+ds1, \ dversionmangle=auto" \ https://github.com/xbmc/inputstream.rtmp/releases \ -/xbmc/inputstream.rtmp/archive/refs/tags/?(\d\S*)-Matrix\.tar\.gz +/xbmc/inputstream.rtmp/archive/refs/tags/?(\d\S*)-Nexus\.tar\.gz diff -pruN 19.0.1+ds1-1/.github/workflows/sync-addon-metadata-translations.yml 20.2.1+ds1-1/.github/workflows/sync-addon-metadata-translations.yml --- 19.0.1+ds1-1/.github/workflows/sync-addon-metadata-translations.yml 2021-12-24 11:07:07.000000000 +0000 +++ 20.2.1+ds1-1/.github/workflows/sync-addon-metadata-translations.yml 2022-08-04 08:09:26.000000000 +0000 @@ -12,12 +12,6 @@ jobs: if: github.repository == 'xbmc/inputstream.rtmp' runs-on: ubuntu-latest - strategy: - - fail-fast: false - matrix: - python-version: [ 3.9 ] - steps: - name: Checkout repository @@ -25,21 +19,15 @@ jobs: with: path: project - - name: Checkout sync_addon_metadata_translations repository - uses: actions/checkout@v2 - with: - repository: xbmc/sync_addon_metadata_translations - path: sync_addon_metadata_translations - - - name: Set up Python ${{ matrix.python-version }} + - name: Set up Python uses: actions/setup-python@v2 with: - python-version: ${{ matrix.python-version }} + python-version: '3.9' - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install sync_addon_metadata_translations/ + python -m pip install git+https://github.com/xbmc/sync_addon_metadata_translations.git - name: Run sync-addon-metadata-translations run: | diff -pruN 19.0.1+ds1-1/inputstream.rtmp/addon.xml.in 20.2.1+ds1-1/inputstream.rtmp/addon.xml.in --- 19.0.1+ds1-1/inputstream.rtmp/addon.xml.in 2021-12-24 11:07:07.000000000 +0000 +++ 20.2.1+ds1-1/inputstream.rtmp/addon.xml.in 2022-08-04 08:09:26.000000000 +0000 @@ -1,7 +1,7 @@ @ADDON_DEPENDS@ @@ -18,67 +18,9 @@ icon.png - v19.0.1 -- Translation updates by Weblate - -v19.0.0 -- Changed test builds to released 'Kodi 19 Matrix' -- Prepared for new language translation by Weblate -- Increased version to 19.0.0 - - With start of Kodi 20 Nexus, takes addon as major the same version number as Kodi. - This done to know easier to which Kodi the addon works. - -v3.4.0 -- Update: inputstream API 3.0.1 - - Fix wrong flags bit shift - -v3.3.0 -- Update inputstream API 3.0.0 -- Fix and allow use of stream values: - - SWFPlayer - - swfurl (same as SWFPlayer) - - PageURL - - PlayPath - - TcUrl - - IsLive - - swfvfy - -v3.2.0 -- Matrix API change inputstream API 2.3.4 -- Add german translation -- Improve debian package build and add test to Travis CI - -v3.1.1 -- Bump verion for PPA build Global API 1.2.0 and inputstream API 2.3.1 - -v3.1.0 -- Matrix API change inputstream API 2.3.1 -- Matrix APi change Global API 1.2.0 - -v3.0.5 -- Matrix API change to v2.3.0 - Re-release API change - -v3.0.4 -- Matrix API change to v2.3.0 - Pass mime type to inputstreams if available - -v3.0.3 -- Matrix API change to v2.2.0 - Allows upto 256 streams - - Klient til RTMP-streams Client für RTMP-Streams Client for RTMP streams - Cliente para flujos RTMP - Asiakasohjelma RTMP-streameille - RTMP 스트림용 클라이언트 - Klient strumieni RTMP - RTMP 流的客户端 - Real Time Messaging Protocol (RTMP) er en proprietær netværksprotokol udviklet af Adobe Inc. til at overføre lyd, video og andre data via internettet fra en medieserver til en flashafspiller.[CR][CR]Dette add-on implementerer RTMP-understøttelse af streaming til Kodi og installerede add-ons. Das Real Time Messaging Protocol (RTMP) ist ein proprietäres Netzwerkprotokoll, das von Adobe Inc. entwickelt wurde, um Audio-, Video- und andere Daten über das Internet von einem Medienserver zu einem Flash Player zu übertragen.[CR][CR]Dieses Addon implementiert die RTMP-Streaming-Unterstützung für Kodi und installierte Add-Ons. The Real Time Messaging Protocol (RTMP) is a proprietary network protocol developed by Adobe Inc. to transmit audio, video and other data over the Internet from a media server to a flash player.[CR][CR]This addon implements RTMP streaming support for Kodi and installed add-ons. - El Protocolo de Mensajería en Tiempo Real (RTMP) es un protocolo de red propietario desarrollado por Adobe Inc. para transmitir audio, video y otros datos por internet desde un servidor de medios a un reproductor flash.[CR][CR]Este complemento implementa el soporte de reproducción RTMP para Kodi y para cualquier complemento instalado. - Real Time Messaging Protocol (RTMP) on Adobe Inc:n kehittämä verkkoprotokolla äänen, videon ja muun tiedon siirtämiseen Internetin kautta mediapalvelimelta flash-soittimeen.[CR][CR]Tämä lisäosa toteuttaa RTMP-suoratoistotuen Kodille ja asennetuille lisäosille. - 실시간 메시징 프로토콜(RTMP)은 인터넷을 통해 미디어 서버에서 플래시 플레이어로 오디오, 비디오 및 기타 데이터를 전송하기 위해 Adobe Inc.에서 개발한 독점 네트워크 프로토콜입니다.[CR][CR]이 애드온은 Kodi와 설치된 애드온을 위한 RTMP 스트리밍 지원을 구현합니다. - Protokół RTMP (Real Time Messaging Protocol) to własnościowy protokół sieciowy opracowany przez firmę Adobe Inc. do przesyłania dźwięku, obrazu i innych danych przez Internet z serwera multimediów do odtwarzacza Flash.[CR][CR]Ten dodatek implementuje obsługę przesyłania strumieniowego RTMP dla Kodi i zainstalowanych dodatków. - 实时消息协议（RTMP）是 Adobe Inc. 开发的一种专有网络协议，用于通过互联网将音频、视频和其他数据从媒体服务器传输到 flash 播放器。[CR][CR]此插件实现对 Kodi 和已安装插件的 RTMP 流支持。 diff -pruN 19.0.1+ds1-1/inputstream.rtmp/changelog.txt 20.2.1+ds1-1/inputstream.rtmp/changelog.txt --- 19.0.1+ds1-1/inputstream.rtmp/changelog.txt 1970-01-01 00:00:00.000000000 +0000 +++ 20.2.1+ds1-1/inputstream.rtmp/changelog.txt 2022-08-04 08:09:26.000000000 +0000 @@ -0,0 +1,52 @@ +v20.2.1: +- Support osx-amd64 OpenSSL dependency + +v20.2.0: +- Version bump because of inputstream API bump + +v20.1.0: +- Translation updates by Weblate +- Kodi main API update to version 2.0.0 + +v20.0.0 +- Changed test builds to 'Kodi 20 Nexus' +- Prepared for new language translation by Weblate +- Increased version to 20.0.0 + - With start of Kodi 20 Nexus, takes addon as major the same version number as Kodi. + This done to know easier to which Kodi the addon works. + +v3.4.0 +- Update: inputstream API 3.0.1 + - Fix wrong flags bit shift + +v3.3.0 +- Update inputstream API 3.0.0 +- Fix and allow use of stream values: + - SWFPlayer + - swfurl (same as SWFPlayer) + - PageURL + - PlayPath + - TcUrl + - IsLive + - swfvfy + +v3.2.0 +- Matrix API change inputstream API 2.3.4 +- Add german translation +- Improve debian package build and add test to Travis CI + +v3.1.1 +- Bump verion for PPA build Global API 1.2.0 and inputstream API 2.3.1 + +v3.1.0 +- Matrix API change inputstream API 2.3.1 +- Matrix APi change Global API 1.2.0 + +v3.0.5 +- Matrix API change to v2.3.0 - Re-release API change + +v3.0.4 +- Matrix API change to v2.3.0 - Pass mime type to inputstreams if available + +v3.0.3 +- Matrix API change to v2.2.0 - Allows upto 256 streams diff -pruN 19.0.1+ds1-1/inputstream.rtmp/resources/language/resource.language.da_dk/strings.po 20.2.1+ds1-1/inputstream.rtmp/resources/language/resource.language.da_dk/strings.po --- 19.0.1+ds1-1/inputstream.rtmp/resources/language/resource.language.da_dk/strings.po 2021-12-24 11:07:07.000000000 +0000 +++ 20.2.1+ds1-1/inputstream.rtmp/resources/language/resource.language.da_dk/strings.po 2022-08-04 08:09:26.000000000 +0000 @@ -5,22 +5,21 @@ msgid "" msgstr "" "Project-Id-Version: KODI Addons\n" -"Report-Msgid-Bugs-To: translations@kodi.tv\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/inputstream.rtmp/issues/\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: 2021-10-03 10:58+0000\n" -"Last-Translator: Christian Gade \n" -"Language-Team: Danish \n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" "Language: da_dk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.8\n" msgctxt "Addon Summary" msgid "Client for RTMP streams" -msgstr "Klient til RTMP-streams" +msgstr "" msgctxt "Addon Description" msgid "The Real Time Messaging Protocol (RTMP) is a proprietary network protocol developed by Adobe Inc. to transmit audio, video and other data over the Internet from a media server to a flash player.[CR][CR]This addon implements RTMP streaming support for Kodi and installed add-ons." -msgstr "Real Time Messaging Protocol (RTMP) er en proprietær netværksprotokol udviklet af Adobe Inc. til at overføre lyd, video og andre data via internettet fra en medieserver til en flashafspiller.[CR][CR]Dette add-on implementerer RTMP-understøttelse af streaming til Kodi og installerede add-ons." +msgstr "" diff -pruN 19.0.1+ds1-1/inputstream.rtmp/resources/language/resource.language.de_de/strings.po 20.2.1+ds1-1/inputstream.rtmp/resources/language/resource.language.de_de/strings.po --- 19.0.1+ds1-1/inputstream.rtmp/resources/language/resource.language.de_de/strings.po 2021-12-24 11:07:07.000000000 +0000 +++ 20.2.1+ds1-1/inputstream.rtmp/resources/language/resource.language.de_de/strings.po 2022-08-04 08:09:26.000000000 +0000 @@ -5,17 +5,16 @@ msgid "" msgstr "" "Project-Id-Version: KODI Addons\n" -"Report-Msgid-Bugs-To: translations@kodi.tv\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/inputstream.rtmp/issues/\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: 2021-10-02 17:30+0000\n" -"Last-Translator: Kai Sommerfeld \n" -"Language-Team: German \n" -"Language: de_de\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Kodi Translation Team\n" +"Language-Team: German (Germany) (https://kodi.weblate.cloud/languages/de_de/)\n" +"Language: de_DE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.8\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" msgctxt "Addon Summary" msgid "Client for RTMP streams" diff -pruN 19.0.1+ds1-1/inputstream.rtmp/resources/language/resource.language.es_mx/strings.po 20.2.1+ds1-1/inputstream.rtmp/resources/language/resource.language.es_mx/strings.po --- 19.0.1+ds1-1/inputstream.rtmp/resources/language/resource.language.es_mx/strings.po 2021-12-24 11:07:07.000000000 +0000 +++ 20.2.1+ds1-1/inputstream.rtmp/resources/language/resource.language.es_mx/strings.po 2022-08-04 08:09:26.000000000 +0000 @@ -5,22 +5,21 @@ msgid "" msgstr "" "Project-Id-Version: KODI Addons\n" -"Report-Msgid-Bugs-To: translations@kodi.tv\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/inputstream.rtmp/issues/\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: 2021-10-02 17:30+0000\n" -"Last-Translator: Edson Armando \n" -"Language-Team: Spanish (Mexico) \n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" "Language: es_mx\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.8\n" msgctxt "Addon Summary" msgid "Client for RTMP streams" -msgstr "Cliente para flujos RTMP" +msgstr "" msgctxt "Addon Description" msgid "The Real Time Messaging Protocol (RTMP) is a proprietary network protocol developed by Adobe Inc. to transmit audio, video and other data over the Internet from a media server to a flash player.[CR][CR]This addon implements RTMP streaming support for Kodi and installed add-ons." -msgstr "El Protocolo de Mensajería en Tiempo Real (RTMP) es un protocolo de red propietario desarrollado por Adobe Inc. para transmitir audio, video y otros datos por internet desde un servidor de medios a un reproductor flash.[CR][CR]Este complemento implementa el soporte de reproducción RTMP para Kodi y para cualquier complemento instalado." +msgstr "" diff -pruN 19.0.1+ds1-1/inputstream.rtmp/resources/language/resource.language.fi_fi/strings.po 20.2.1+ds1-1/inputstream.rtmp/resources/language/resource.language.fi_fi/strings.po --- 19.0.1+ds1-1/inputstream.rtmp/resources/language/resource.language.fi_fi/strings.po 2021-12-24 11:07:07.000000000 +0000 +++ 20.2.1+ds1-1/inputstream.rtmp/resources/language/resource.language.fi_fi/strings.po 2022-08-04 08:09:26.000000000 +0000 @@ -5,22 +5,21 @@ msgid "" msgstr "" "Project-Id-Version: KODI Addons\n" -"Report-Msgid-Bugs-To: translations@kodi.tv\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/inputstream.rtmp/issues/\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: 2021-12-04 14:13+0000\n" -"Last-Translator: G0mez82 \n" -"Language-Team: Finnish \n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" "Language: fi_fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.9.1\n" msgctxt "Addon Summary" msgid "Client for RTMP streams" -msgstr "Asiakasohjelma RTMP-streameille" +msgstr "" msgctxt "Addon Description" msgid "The Real Time Messaging Protocol (RTMP) is a proprietary network protocol developed by Adobe Inc. to transmit audio, video and other data over the Internet from a media server to a flash player.[CR][CR]This addon implements RTMP streaming support for Kodi and installed add-ons." -msgstr "Real Time Messaging Protocol (RTMP) on Adobe Inc:n kehittämä verkkoprotokolla äänen, videon ja muun tiedon siirtämiseen Internetin kautta mediapalvelimelta flash-soittimeen.[CR][CR]Tämä lisäosa toteuttaa RTMP-suoratoistotuen Kodille ja asennetuille lisäosille." +msgstr "" diff -pruN 19.0.1+ds1-1/inputstream.rtmp/resources/language/resource.language.ko_kr/strings.po 20.2.1+ds1-1/inputstream.rtmp/resources/language/resource.language.ko_kr/strings.po --- 19.0.1+ds1-1/inputstream.rtmp/resources/language/resource.language.ko_kr/strings.po 2021-12-24 11:07:07.000000000 +0000 +++ 20.2.1+ds1-1/inputstream.rtmp/resources/language/resource.language.ko_kr/strings.po 2022-08-04 08:09:26.000000000 +0000 @@ -5,22 +5,21 @@ msgid "" msgstr "" "Project-Id-Version: KODI Addons\n" -"Report-Msgid-Bugs-To: translations@kodi.tv\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/inputstream.rtmp/issues/\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: 2021-09-17 04:12+0000\n" -"Last-Translator: Minho Park \n" -"Language-Team: Korean \n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" "Language: ko_kr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 4.8\n" msgctxt "Addon Summary" msgid "Client for RTMP streams" -msgstr "RTMP 스트림용 클라이언트" +msgstr "" msgctxt "Addon Description" msgid "The Real Time Messaging Protocol (RTMP) is a proprietary network protocol developed by Adobe Inc. to transmit audio, video and other data over the Internet from a media server to a flash player.[CR][CR]This addon implements RTMP streaming support for Kodi and installed add-ons." -msgstr "실시간 메시징 프로토콜(RTMP)은 인터넷을 통해 미디어 서버에서 플래시 플레이어로 오디오, 비디오 및 기타 데이터를 전송하기 위해 Adobe Inc.에서 개발한 독점 네트워크 프로토콜입니다.[CR][CR]이 애드온은 Kodi와 설치된 애드온을 위한 RTMP 스트리밍 지원을 구현합니다." +msgstr "" diff -pruN 19.0.1+ds1-1/inputstream.rtmp/resources/language/resource.language.pl_pl/strings.po 20.2.1+ds1-1/inputstream.rtmp/resources/language/resource.language.pl_pl/strings.po --- 19.0.1+ds1-1/inputstream.rtmp/resources/language/resource.language.pl_pl/strings.po 2021-12-24 11:07:07.000000000 +0000 +++ 20.2.1+ds1-1/inputstream.rtmp/resources/language/resource.language.pl_pl/strings.po 2022-08-04 08:09:26.000000000 +0000 @@ -5,22 +5,21 @@ msgid "" msgstr "" "Project-Id-Version: KODI Addons\n" -"Report-Msgid-Bugs-To: translations@kodi.tv\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/inputstream.rtmp/issues/\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: 2021-09-17 04:12+0000\n" -"Last-Translator: Marek Adamski \n" -"Language-Team: Polish \n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" "Language: pl_pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 4.8\n" msgctxt "Addon Summary" msgid "Client for RTMP streams" -msgstr "Klient strumieni RTMP" +msgstr "" msgctxt "Addon Description" msgid "The Real Time Messaging Protocol (RTMP) is a proprietary network protocol developed by Adobe Inc. to transmit audio, video and other data over the Internet from a media server to a flash player.[CR][CR]This addon implements RTMP streaming support for Kodi and installed add-ons." -msgstr "Protokół RTMP (Real Time Messaging Protocol) to własnościowy protokół sieciowy opracowany przez firmę Adobe Inc. do przesyłania dźwięku, obrazu i innych danych przez Internet z serwera multimediów do odtwarzacza Flash.[CR][CR]Ten dodatek implementuje obsługę przesyłania strumieniowego RTMP dla Kodi i zainstalowanych dodatków." +msgstr "" diff -pruN 19.0.1+ds1-1/inputstream.rtmp/resources/language/resource.language.zh_cn/strings.po 20.2.1+ds1-1/inputstream.rtmp/resources/language/resource.language.zh_cn/strings.po --- 19.0.1+ds1-1/inputstream.rtmp/resources/language/resource.language.zh_cn/strings.po 2021-12-24 11:07:07.000000000 +0000 +++ 20.2.1+ds1-1/inputstream.rtmp/resources/language/resource.language.zh_cn/strings.po 2022-08-04 08:09:26.000000000 +0000 @@ -5,22 +5,21 @@ msgid "" msgstr "" "Project-Id-Version: KODI Addons\n" -"Report-Msgid-Bugs-To: translations@kodi.tv\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/inputstream.rtmp/issues/\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: 2021-10-18 03:30+0000\n" -"Last-Translator: taxigps \n" -"Language-Team: Chinese (China) \n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" "Language: zh_cn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.8\n" msgctxt "Addon Summary" msgid "Client for RTMP streams" -msgstr "RTMP 流的客户端" +msgstr "" msgctxt "Addon Description" msgid "The Real Time Messaging Protocol (RTMP) is a proprietary network protocol developed by Adobe Inc. to transmit audio, video and other data over the Internet from a media server to a flash player.[CR][CR]This addon implements RTMP streaming support for Kodi and installed add-ons." -msgstr "实时消息协议（RTMP）是 Adobe Inc. 开发的一种专有网络协议，用于通过互联网将音频、视频和其他数据从媒体服务器传输到 flash 播放器。[CR][CR]此插件实现对 Kodi 和已安装插件的 RTMP 流支持。" +msgstr "" diff -pruN 19.0.1+ds1-1/Jenkinsfile 20.2.1+ds1-1/Jenkinsfile --- 19.0.1+ds1-1/Jenkinsfile 2021-12-24 11:07:07.000000000 +0000 +++ 20.2.1+ds1-1/Jenkinsfile 2022-08-04 08:09:26.000000000 +0000 @@ -1 +1 @@ -buildPlugin(version: "Matrix") +buildPlugin(version: "Nexus") diff -pruN 19.0.1+ds1-1/README.md 20.2.1+ds1-1/README.md --- 19.0.1+ds1-1/README.md 2021-12-24 11:07:07.000000000 +0000 +++ 20.2.1+ds1-1/README.md 2022-08-04 08:09:26.000000000 +0000 @@ -3,14 +3,14 @@ This is a [Kodi](https://kodi.tv) input stream addon for RTMP. [![License: GPL-2.0-or-later](https://img.shields.io/badge/License-GPL%20v2+-blue.svg)](LICENSE.md) -[![Build Status](https://dev.azure.com/teamkodi/binary-addons/_apis/build/status/xbmc.inputstream.rtmp?branchName=Matrix)](https://dev.azure.com/teamkodi/binary-addons/_build/latest?definitionId=29&branchName=Matrix) -[![Build Status](https://jenkins.kodi.tv/view/Addons/job/xbmc/job/inputstream.rtmp/job/Matrix/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/xbmc%2Finputstream.rtmp/branches/) - +[![Build Status](https://dev.azure.com/teamkodi/binary-addons/_apis/build/status/xbmc.inputstream.rtmp?branchName=Nexus)](https://dev.azure.com/teamkodi/binary-addons/_build/latest?definitionId=29&branchName=Nexus) +[![Build Status](https://jenkins.kodi.tv/view/Addons/job/xbmc/job/inputstream.rtmp/job/Nexus/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/xbmc%2Finputstream.rtmp/branches/) + ## Build instructions When building the addon you have to use the correct branch depending on which version of Kodi you're building against. -If you want to build the addon to be compatible with the latest kodi `Matrix` commit, you need to checkout the branch with the current kodi codename. +If you want to build the addon to be compatible with the latest kodi `master` commit, you need to checkout the branch with the current kodi codename. Also make sure you follow this README from the branch in question. ### Linux @@ -18,8 +18,8 @@ Also make sure you follow this README fr The following instructions assume you will have built Kodi already in the `kodi-build` directory suggested by the README. -1. `git clone --branch Matrix https://github.com/xbmc/xbmc.git` -2. `git clone --branch Matrix https://github.com/xbmc/inputstream.rtmp.git` +1. `git clone --branch master https://github.com/xbmc/xbmc.git` +2. `git clone --branch Nexus https://github.com/xbmc/inputstream.rtmp.git` 3. `cd inputstream.rtmp && mkdir build && cd build` 4. `cmake -DADDONS_TO_BUILD=inputstream.rtmp -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/kodi-build/addons -DPACKAGE_ZIP=1 ../../xbmc/cmake/addons` 5. `make` diff -pruN 19.0.1+ds1-1/src/RTMPStream.cpp 20.2.1+ds1-1/src/RTMPStream.cpp --- 19.0.1+ds1-1/src/RTMPStream.cpp 2021-12-24 11:07:07.000000000 +0000 +++ 20.2.1+ds1-1/src/RTMPStream.cpp 2022-08-04 08:09:26.000000000 +0000 @@ -39,12 +39,12 @@ std::map options = { "inputstream.rtmp.swfvfy", AVC("swfVfy") }}; } -class ATTRIBUTE_HIDDEN CInputStreamRTMP +class ATTR_DLL_LOCAL CInputStreamRTMP : public kodi::addon::CInstanceInputStream, public rtmpstream::ITimerCallback { public: - CInputStreamRTMP(KODI_HANDLE instance, const std::string& kodiVersion); + CInputStreamRTMP(const kodi::addon::IInstanceInfo& instance); bool Open(const kodi::addon::InputstreamProperty& props) override; void Close() override; @@ -63,8 +63,8 @@ private: rtmpstream::CTimer m_readPauseDetectTimer; }; -CInputStreamRTMP::CInputStreamRTMP(KODI_HANDLE instance, const std::string& kodiVersion) - : CInstanceInputStream(instance, kodiVersion), +CInputStreamRTMP::CInputStreamRTMP(const kodi::addon::IInstanceInfo& instance) + : CInstanceInputStream(instance), m_readPauseDetectTimer(this) { } @@ -162,21 +162,18 @@ bool CInputStreamRTMP::PosTime(int ms) /*****************************************************************************************************/ -class ATTRIBUTE_HIDDEN CMyAddon +class ATTR_DLL_LOCAL CMyAddon : public kodi::addon::CAddonBase { public: CMyAddon() = default; - ADDON_STATUS CreateInstance(int instanceType, - const std::string& instanceID, - KODI_HANDLE instance, - const std::string& version, - KODI_HANDLE& addonInstance) override + ADDON_STATUS CreateInstance(const kodi::addon::IInstanceInfo& instance, + KODI_ADDON_INSTANCE_HDL& hdl) override { - if (instanceType == ADDON_INSTANCE_INPUTSTREAM) + if (instance.IsType(ADDON_INSTANCE_INPUTSTREAM)) { - addonInstance = new CInputStreamRTMP(instance, version); + hdl = new CInputStreamRTMP(instance); return ADDON_STATUS_OK; } return ADDON_STATUS_NOT_IMPLEMENTED; diff -pruN 19.0.1+ds1-1/src/timer/Timer.h 20.2.1+ds1-1/src/timer/Timer.h --- 19.0.1+ds1-1/src/timer/Timer.h 2021-12-24 11:07:07.000000000 +0000 +++ 20.2.1+ds1-1/src/timer/Timer.h 2022-08-04 08:09:26.000000000 +0000 @@ -14,7 +14,7 @@ namespace rtmpstream { -class ATTRIBUTE_HIDDEN ITimerCallback +class ATTR_DLL_LOCAL ITimerCallback { public: virtual ~ITimerCallback() = default; @@ -22,7 +22,7 @@ public: virtual void OnTimeout() = 0; }; -class ATTRIBUTE_HIDDEN CTimer +class ATTR_DLL_LOCAL CTimer { public: explicit CTimer(ITimerCallback *callback); diff -pruN 19.0.1+ds1-1/src/timer/TimerHelper.h 20.2.1+ds1-1/src/timer/TimerHelper.h --- 19.0.1+ds1-1/src/timer/TimerHelper.h 2021-12-24 11:07:07.000000000 +0000 +++ 20.2.1+ds1-1/src/timer/TimerHelper.h 2022-08-04 08:09:26.000000000 +0000 @@ -25,7 +25,7 @@ inline std::string NowToString() return std::ctime(&t); } -class ATTRIBUTE_HIDDEN CTimeout +class ATTR_DLL_LOCAL CTimeout { public: CTimeout(void) : m_iTarget(0) @@ -60,7 +60,7 @@ private: typedef bool (*PredicateCallback) (void *param); template -class ATTRIBUTE_HIDDEN CCondition +class ATTR_DLL_LOCAL CCondition { private: static bool _PredicateCallbackDefault ( void *param ) @@ -119,7 +119,7 @@ private: std::condition_variable_any m_condition; }; -class ATTRIBUTE_HIDDEN CEvent +class ATTR_DLL_LOCAL CEvent { public: CEvent(bool bAutoReset = true) : diff -pruN 19.0.1+ds1-1/src/utils/Log.h 20.2.1+ds1-1/src/utils/Log.h --- 19.0.1+ds1-1/src/utils/Log.h 2021-12-24 11:07:07.000000000 +0000 +++ 20.2.1+ds1-1/src/utils/Log.h 2022-08-04 08:09:26.000000000 +0000 @@ -12,7 +12,7 @@ namespace rtmpstream { -inline const char* kodiTranslateLogLevel(const AddonLog logLevel) +inline const char* kodiTranslateLogLevel(const ADDON_LOG logLevel) { switch (logLevel) { @@ -32,7 +32,7 @@ inline const char* kodiTranslateLogLevel return "LOG_UNKNOWN: "; } -inline void Log(const AddonLog logLevel, const char* format, ...) +inline void Log(const ADDON_LOG logLevel, const char* format, ...) { char buffer[16384]; va_list args; diff -pruN 19.0.1+ds1-1/.travis.yml 20.2.1+ds1-1/.travis.yml --- 19.0.1+ds1-1/.travis.yml 2021-12-24 11:07:07.000000000 +0000 +++ 20.2.1+ds1-1/.travis.yml 2022-08-04 08:09:26.000000000 +0000 @@ -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 install fakeroot; fi # @@ -40,12 +40,12 @@ before_install: # before_script: - if [[ $DEBIAN_BUILD != true ]]; then cd $TRAVIS_BUILD_DIR/..; fi - - if [[ $DEBIAN_BUILD != true ]]; then git clone --branch Matrix --depth=1 https://github.com/xbmc/xbmc.git; fi + - if [[ $DEBIAN_BUILD != true ]]; then git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git; fi - if [[ $DEBIAN_BUILD != true ]]; then cd ${app_id} && mkdir build && cd build; fi - if [[ $DEBIAN_BUILD != true ]]; then mkdir -p definition/${app_id}; fi - if [[ $DEBIAN_BUILD != true ]]; then echo ${app_id} $TRAVIS_BUILD_DIR $TRAVIS_COMMIT > definition/${app_id}/${app_id}.txt; fi - if [[ $DEBIAN_BUILD != true ]]; then cmake -DADDONS_TO_BUILD=${app_id} -DADDON_SRC_PREFIX=$TRAVIS_BUILD_DIR/.. -DADDONS_DEFINITION_DIR=$TRAVIS_BUILD_DIR/build/definition -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/../xbmc/addons -DPACKAGE_ZIP=1 $TRAVIS_BUILD_DIR/../xbmc/cmake/addons; fi - - if [[ $DEBIAN_BUILD == true ]]; then wget https://raw.githubusercontent.com/xbmc/xbmc/Matrix/xbmc/addons/kodi-dev-kit/tools/debian-addon-package-test.sh && chmod +x ./debian-addon-package-test.sh; fi + - 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: