Merge pull request #32 from AlwinEsch/Leia-change

[Leia] update CMakeLists.txt to 3.5 and change include way

.gitignore

@@ -1,50 +1,2 @@
-# build artifacts
+/build
-build/
+pvr.octonet/addon.xml
-pvr.*/addon.xml
-
-# Debian build files
-debian/changelog
-debian/files
-debian/*.log
-debian/*.substvars
-debian/.debhelper/
-debian/tmp/
-debian/kodi-pvr-*/
-obj-x86_64-linux-gnu/
-
-# commonly used editors
-# vim
-*.swp
-
-# Eclipse
-*.project
-*.cproject
-.classpath
-*.sublime-*
-.settings/
-
-# KDevelop 4
-*.kdev4
-
-# gedit
-*~
-
-# CLion
-/.idea
-
-# clion
-.idea/
-
-# to prevent add after a "git format-patch VALUE" and "git add ." call
-/*.patch
-
-# Visual Studio Code
-.vscode
-
-# to prevent add if project code opened by Visual Studio over CMake file
-.vs/
-
-# General MacOS
-.DS_Store
-.AppleDouble
-.LSOverride

.travis.yml

@@ -22,7 +22,9 @@ matrix:
       sudo: required
       compiler: clang
     - os: osx
-      osx_image: xcode10.2
+      osx_image: xcode9
+    - os: osx
+      osx_image: xcode9.4
 
 #
 # The addon source is automatically checked out in $TRAVIS_BUILD_DIR,
@@ -30,7 +32,7 @@ matrix:
 #
 before_script:
   - cd $TRAVIS_BUILD_DIR/..
-  - git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git
+  - git clone --branch Leia --depth=1 https://github.com/xbmc/xbmc.git
   - cd ${app_id} && mkdir build && cd build
   - mkdir -p definition/${app_id}
   - echo ${app_id} $TRAVIS_BUILD_DIR $TRAVIS_COMMIT > definition/${app_id}/${app_id}.txt

CMakeLists.txt

@@ -4,10 +4,12 @@ project(pvr.octonet)
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
 
 find_package(Kodi REQUIRED)
+find_package(kodiplatform REQUIRED)
 find_package(p8-platform REQUIRED)
 find_package(JsonCpp REQUIRED)
 
 include_directories(
+	${kodiplatform_INCLUDE_DIRS}
 	${p8-platform_INCLUDE_DIRS}
 	${KODI_INCLUDE_DIR}/.. # Hack way with "/..", need bigger Kodi cmake rework to match right include ways
 	${JSONCPP_INCLUDE_DIRS})

Jenkinsfile

@@ -1 +1 @@
-buildPlugin(version: "Matrix")
+buildPlugin(version: "Leia")

LICENSE.md

@@ -1,264 +0,0 @@
-The GNU General Public License, Version 2, June 1991 (GPLv2)
-============================================================
-
-> Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-> 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-
-Everyone is permitted to copy and distribute verbatim copies of this license
-document, but changing it is not allowed.
-
-
-Preamble
---------
-
-The licenses for most software are designed to take away your freedom to share
-and change it. By contrast, the GNU General Public License is intended to
-guarantee your freedom to share and change free software--to make sure the
-software is free for all its users. This General Public License applies to most
-of the Free Software Foundation's software and to any other program whose
-authors commit to using it. (Some other Free Software Foundation software is
-covered by the GNU Lesser General Public License instead.) You can apply it to
-your programs, too.
-
-When we speak of free software, we are referring to freedom, not price. Our
-General Public Licenses are designed to make sure that you have the freedom to
-distribute copies of free software (and charge for this service if you wish),
-that you receive source code or can get it if you want it, that you can change
-the software or use pieces of it in new free programs; and that you know you can
-do these things.
-
-To protect your rights, we need to make restrictions that forbid anyone to deny
-you these rights or to ask you to surrender the rights. These restrictions
-translate to certain responsibilities for you if you distribute copies of the
-software, or if you modify it.
-
-For example, if you distribute copies of such a program, whether gratis or for a
-fee, you must give the recipients all the rights that you have. You must make
-sure that they, too, receive or can get the source code. And you must show them
-these terms so they know their rights.
-
-We protect your rights with two steps: (1) copyright the software, and (2) offer
-you this license which gives you legal permission to copy, distribute and/or
-modify the software.
-
-Also, for each author's protection and ours, we want to make certain that
-everyone understands that there is no warranty for this free software. If the
-software is modified by someone else and passed on, we want its recipients to
-know that what they have is not the original, so that any problems introduced by
-others will not reflect on the original authors' reputations.
-
-Finally, any free program is threatened constantly by software patents. We wish
-to avoid the danger that redistributors of a free program will individually
-obtain patent licenses, in effect making the program proprietary. To prevent
-this, we have made it clear that any patent must be licensed for everyone's free
-use or not licensed at all.
-
-The precise terms and conditions for copying, distribution and modification
-follow.
-
-
-Terms And Conditions For Copying, Distribution And Modification
----------------------------------------------------------------
-
-**0.** This License applies to any program or other work which contains a notice
-placed by the copyright holder saying it may be distributed under the terms of
-this General Public License. The "Program", below, refers to any such program or
-work, and a "work based on the Program" means either the Program or any
-derivative work under copyright law: that is to say, a work containing the
-Program or a portion of it, either verbatim or with modifications and/or
-translated into another language. (Hereinafter, translation is included without
-limitation in the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not covered by
-this License; they are outside its scope. The act of running the Program is not
-restricted, and the output from the Program is covered only if its contents
-constitute a work based on the Program (independent of having been made by
-running the Program). Whether that is true depends on what the Program does.
-
-**1.** You may copy and distribute verbatim copies of the Program's source code
-as you receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice and
-disclaimer of warranty; keep intact all the notices that refer to this License
-and to the absence of any warranty; and give any other recipients of the Program
-a copy of this License along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and you may at
-your option offer warranty protection in exchange for a fee.
-
-**2.** You may modify your copy or copies of the Program or any portion of it,
-thus forming a work based on the Program, and copy and distribute such
-modifications or work under the terms of Section 1 above, provided that you also
-meet all of these conditions:
-
-*   **a)** You must cause the modified files to carry prominent notices stating
-    that you changed the files and the date of any change.
-
-*   **b)** You must cause any work that you distribute or publish, that in whole
-    or in part contains or is derived from the Program or any part thereof, to
-    be licensed as a whole at no charge to all third parties under the terms of
-    this License.
-
-*   **c)** If the modified program normally reads commands interactively when
-    run, you must cause it, when started running for such interactive use in the
-    most ordinary way, to print or display an announcement including an
-    appropriate copyright notice and a notice that there is no warranty (or
-    else, saying that you provide a warranty) and that users may redistribute
-    the program under these conditions, and telling the user how to view a copy
-    of this License. (Exception: if the Program itself is interactive but does
-    not normally print such an announcement, your work based on the Program is
-    not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If identifiable
-sections of that work are not derived from the Program, and can be reasonably
-considered independent and separate works in themselves, then this License, and
-its terms, do not apply to those sections when you distribute them as separate
-works. But when you distribute the same sections as part of a whole which is a
-work based on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the entire whole,
-and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest your
-rights to work written entirely by you; rather, the intent is to exercise the
-right to control the distribution of derivative or collective works based on the
-Program.
-
-In addition, mere aggregation of another work not based on the Program with the
-Program (or with a work based on the Program) on a volume of a storage or
-distribution medium does not bring the other work under the scope of this
-License.
-
-**3.** You may copy and distribute the Program (or a work based on it, under
-Section 2) in object code or executable form under the terms of Sections 1 and 2
-above provided that you also do one of the following:
-
-*   **a)** Accompany it with the complete corresponding machine-readable source
-    code, which must be distributed under the terms of Sections 1 and 2 above on
-    a medium customarily used for software interchange; or,
-
-*   **b)** Accompany it with a written offer, valid for at least three years, to
-    give any third party, for a charge no more than your cost of physically
-    performing source distribution, a complete machine-readable copy of the
-    corresponding source code, to be distributed under the terms of Sections 1
-    and 2 above on a medium customarily used for software interchange; or,
-
-*   **c)** Accompany it with the information you received as to the offer to
-    distribute corresponding source code. (This alternative is allowed only for
-    noncommercial distribution and only if you received the program in object
-    code or executable form with such an offer, in accord with Subsection b
-    above.)
-
-The source code for a work means the preferred form of the work for making
-modifications to it. For an executable work, complete source code means all the
-source code for all modules it contains, plus any associated interface
-definition files, plus the scripts used to control compilation and installation
-of the executable. However, as a special exception, the source code distributed
-need not include anything that is normally distributed (in either source or
-binary form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component itself
-accompanies the executable.
-
-If distribution of executable or object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the source code
-from the same place counts as distribution of the source code, even though third
-parties are not compelled to copy the source along with the object code.
-
-**4.** You may not copy, modify, sublicense, or distribute the Program except as
-expressly provided under this License. Any attempt otherwise to copy, modify,
-sublicense or distribute the Program is void, and will automatically terminate
-your rights under this License. However, parties who have received copies, or
-rights, from you under this License will not have their licenses terminated so
-long as such parties remain in full compliance.
-
-**5.** You are not required to accept this License, since you have not signed
-it. However, nothing else grants you permission to modify or distribute the
-Program or its derivative works. These actions are prohibited by law if you do
-not accept this License. Therefore, by modifying or distributing the Program (or
-any work based on the Program), you indicate your acceptance of this License to
-do so, and all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-**6.** Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the original
-licensor to copy, distribute or modify the Program subject to these terms and
-conditions. You may not impose any further restrictions on the recipients'
-exercise of the rights granted herein. You are not responsible for enforcing
-compliance by third parties to this License.
-
-**7.** If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues), conditions
-are imposed on you (whether by court order, agreement or otherwise) that
-contradict the conditions of this License, they do not excuse you from the
-conditions of this License. If you cannot distribute so as to satisfy
-simultaneously your obligations under this License and any other pertinent
-obligations, then as a consequence you may not distribute the Program at all.
-For example, if a patent license would not permit royalty-free redistribution of
-the Program by all those who receive copies directly or indirectly through you,
-then the only way you could satisfy both it and this License would be to refrain
-entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply and the
-section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any patents or
-other property right claims or to contest validity of any such claims; this
-section has the sole purpose of protecting the integrity of the free software
-distribution system, which is implemented by public license practices. Many
-people have made generous contributions to the wide range of software
-distributed through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing to
-distribute software through any other system and a licensee cannot impose that
-choice.
-
-This section is intended to make thoroughly clear what is believed to be a
-consequence of the rest of this License.
-
-**8.** If the distribution and/or use of the Program is restricted in certain
-countries either by patents or by copyrighted interfaces, the original copyright
-holder who places the Program under this License may add an explicit
-geographical distribution limitation excluding those countries, so that
-distribution is permitted only in or among countries not thus excluded. In such
-case, this License incorporates the limitation as if written in the body of this
-License.
-
-**9.** The Free Software Foundation may publish revised and/or new versions of
-the General Public License from time to time. Such new versions will be similar
-in spirit to the present version, but may differ in detail to address new
-problems or concerns.
-
-Each version is given a distinguishing version number. If the Program specifies
-a version number of this License which applies to it and "any later version",
-you have the option of following the terms and conditions either of that version
-or of any later version published by the Free Software Foundation. If the
-Program does not specify a version number of this License, you may choose any
-version ever published by the Free Software Foundation.
-
-**10.** If you wish to incorporate parts of the Program into other free programs
-whose distribution conditions are different, write to the author to ask for
-permission. For software which is copyrighted by the Free Software Foundation,
-write to the Free Software Foundation; we sometimes make exceptions for this.
-Our decision will be guided by the two goals of preserving the free status of
-all derivatives of our free software and of promoting the sharing and reuse of
-software generally.
-
-
-No Warranty
------------
-
-**11.** BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
-THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
-STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM
-"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-**12.** IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
-INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA
-BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER
-OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

README.md

@@ -20,7 +20,7 @@ $ git clone https://github.com/DigitalDevices/pvr.octonet.git
 Clone the Kodi repository:
 
 ```
-$ git clone --branch master https://github.com/xbmc/xbmc.git
+$ git clone --branch Leia https://github.com/xbmc/xbmc.git
 ```
 
 ```

appveyor.yml

@@ -29,7 +29,7 @@ artifacts:
 build_script:
   - cd ..
   - set ROOT=%cd%
-  - git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git
+  - git clone --branch Leia --depth=1 https://github.com/xbmc/xbmc.git
   - mkdir xbmc\cmake\addons\addons\pvr.octonet
   - echo pvr.octonet https://github.com/DigitalDevices/pvr.octonet master > xbmc\cmake\addons\addons\pvr.octonet\pvr.octonet.txt
   - cd %ADDON%

debian/control

@@ -2,8 +2,8 @@ Source: kodi-pvr-octonet
 Priority: extra
 Maintainer: Julian Scheel <julian@jusst.de>
 Build-Depends: debhelper (>= 9.0.0), cmake, libjsoncpp-dev,
-               libp8-platform-dev, kodi-addon-dev
+               libkodiplatform-dev (>= 16.0.0), kodi-addon-dev
-Standards-Version: 4.1.2
+Standards-Version: 3.9.4
 Section: libs
 Homepage: https://github.com/DigitalDevices/pvr.octonet
 

debian/copyright

@@ -5,7 +5,7 @@ Source: https://github.com/DigitalDevices/pvr.octonet
 Files: *
 Copyright: 2015-2016 Julian Scheel
            2015-2016 jusst technologies GmbH
-           2005-2020 Team Kodi
+           2005-2013 Team XBMC
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -24,8 +24,7 @@ License: GPL-2+
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
 Files: debian/*
-Copyright: 2020 Team Kodi
+Copyright: 2016 Julian Scheel <julian@jusst.de>
-           2016 Julian Scheel <julian@jusst.de>
            2015 Jean-Luc Barriere
            2015 wsnipex <wsnipex@a1.net>
 License: GPL-2+

depends/common/p8-platform/p8-platform.txt

@@ -1 +0,0 @@
-p8-platform https://github.com/xbmc/platform.git cee64e9dc0b69e8d286dc170a78effaabfa09c44

depends/windowsstore/p8-platform/p8-platform.txt

@@ -1 +0,0 @@
-p8-platform https://github.com/afedchin/platform.git win10

pvr.octonet/addon.xml.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
 	id="pvr.octonet"
-	version="1.2.6"
+	version="0.7.1"
 	name="Digital Devices Octopus NET Client"
 	provider-name="digitaldevices">
 	<requires>@ADDON_DEPENDS@</requires>
@@ -12,7 +12,5 @@
 		<summary lang="de_DE">Kodi PVR Addon für Digital Devices Octopus NET Streams</summary>
 		<summary lang="en_US">Kodi PVR Addon for Digital Devices Octopus NET Streams</summary>
 		<platform>@PLATFORM@</platform>
-		<license>GPL-2.0-or-later</license>
-		<source>https://github.com/DigitalDevices/pvr.octonet</source>
 	</extension>
 </addon>

src/OctonetData.cpp

@@ -1,10 +1,22 @@
 /*
- *  Copyright (C) 2015 Julian Scheel <julian@jusst.de>
+ * Copyright (C) 2015 Julian Scheel <julian@jusst.de>
- *  Copyright (C) 2015 jusst technologies GmbH
+ * Copyright (C) 2015 jusst technologies GmbH
- *  Copyright (C) 2015 Digital Devices GmbH
+ * Copyright (C) 2015 Digital Devices GmbH
  *
- *  SPDX-License-Identifier: GPL-2.0-or-later
+ * This program is free software; you can redistribute it and/or
- *  See LICENSE.md for more information.
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+ * USA.
  *
  */
 
@@ -215,12 +227,12 @@ PVR_ERROR OctonetData::getChannels(ADDON_HANDLE handle, bool bRadio)
 	return PVR_ERROR_NO_ERROR;
 }
 
-PVR_ERROR OctonetData::getEPG(ADDON_HANDLE handle, int iChannelUid, time_t start, time_t end)
+PVR_ERROR OctonetData::getEPG(ADDON_HANDLE handle, const PVR_CHANNEL &channel, time_t start, time_t end)
 {
 	for (unsigned int i = 0; i < channels.size(); i++)
 	{
 		OctonetChannel &chan = channels.at(i);
-		if (iChannelUid != chan.id)
+		if (channel.iUniqueId != chan.id)
 			continue;
 
 		if(chan.epg.empty()) {
@@ -241,9 +253,6 @@ PVR_ERROR OctonetData::getEPG(ADDON_HANDLE handle, int iChannelUid, time_t start
 
 			EPG_TAG entry;
 			memset(&entry, 0, sizeof(EPG_TAG));
-			entry.iSeriesNumber = EPG_TAG_INVALID_SERIES_EPISODE;
-			entry.iEpisodeNumber = EPG_TAG_INVALID_SERIES_EPISODE;
-			entry.iEpisodePartNumber = EPG_TAG_INVALID_SERIES_EPISODE;
 
 			entry.iUniqueChannelId = chan.id;
 			entry.iUniqueBroadcastId = it->id;
@@ -265,9 +274,6 @@ PVR_ERROR OctonetData::getEPG(ADDON_HANDLE handle, int iChannelUid, time_t start
 
 			EPG_TAG entry;
 			memset(&entry, 0, sizeof(EPG_TAG));
-			entry.iSeriesNumber = EPG_TAG_INVALID_SERIES_EPISODE;
-			entry.iEpisodeNumber = EPG_TAG_INVALID_SERIES_EPISODE;
-			entry.iEpisodePartNumber = EPG_TAG_INVALID_SERIES_EPISODE;
 
 			entry.iUniqueChannelId = chan.id;
 			entry.iUniqueBroadcastId = it->id;

src/OctonetData.h

@@ -1,15 +1,27 @@
+#pragma once
+
 /*
- *  Copyright (C) 2015 Julian Scheel <julian@jusst.de>
+ * Copyright (C) 2015 Julian Scheel <julian@jusst.de>
- *  Copyright (C) 2015 jusst technologies GmbH
+ * Copyright (C) 2015 jusst technologies GmbH
- *  Copyright (C) 2015 Digital Devices GmbH
+ * Copyright (C) 2015 Digital Devices GmbH
  *
- *  SPDX-License-Identifier: GPL-2.0-or-later
+ * This program is free software; you can redistribute it and/or
- *  See LICENSE.md for more information.
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+ * USA.
  *
  */
 
-#pragma once
-
 #include <vector>
 
 #include "p8-platform/threads/threads.h"
@@ -56,7 +68,7 @@ class OctonetData : public P8PLATFORM::CThread
 		virtual PVR_ERROR getGroups(ADDON_HANDLE handle, bool bRadio);
 		virtual PVR_ERROR getGroupMembers(ADDON_HANDLE handle, const PVR_CHANNEL_GROUP &group);
 
-		virtual PVR_ERROR getEPG(ADDON_HANDLE handle, int iChannelUid, time_t start, time_t end);
+		virtual PVR_ERROR getEPG(ADDON_HANDLE handle, const PVR_CHANNEL &channel, time_t start, time_t end);
 		const std::string& getUrl(int id) const;
 		const std::string& getName(int id) const;
 

src/Socket.cpp

@@ -1,11 +1,21 @@
 /*
- *  Copyright (C) 2005-2020 Team Kodi
+ *      Copyright (C) 2005-2011 Team XBMC
- *  https://kodi.tv
+ *      http://www.xbmc.org
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSE.md for more information.
  */
-
 #include "kodi/libXBMC_addon.h"
 #include <string>
 #include "p8-platform/os.h"

src/Socket.h

@@ -1,11 +1,21 @@
 /*
- *  Copyright (C) 2005-2020 Team Kodi
+ *      Copyright (C) 2005-2011 Team XBMC
- *  https://kodi.tv
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSE.md for more information.
  */
-
 #pragma once
 
 //Include platform specific datatypes, header files, defines and constants:

src/client.cpp

@@ -1,10 +1,22 @@
 /*
- *  Copyright (C) 2015 Julian Scheel <julian@jusst.de>
+ * Copyright (C) 2015 Julian Scheel <julian@jusst.de>
- *  Copyright (C) 2015 jusst technologies GmbH
+ * Copyright (C) 2015 jusst technologies GmbH
- *  Copyright (C) 2015 Digital Devices GmbH
+ * Copyright (C) 2015 Digital Devices GmbH
  *
- *  SPDX-License-Identifier: GPL-2.0-or-later
+ * This program is free software; you can redistribute it and/or
- *  See LICENSE.md for more information.
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+ * USA.
  *
  */
 
@@ -12,6 +24,7 @@
 #include <kodi/xbmc_pvr_dll.h>
 #include <kodi/libXBMC_addon.h>
 #include <p8-platform/util/util.h>
+#include <kodi/libKODI_guilib.h>
 
 #include "OctonetData.h"
 #include "rtsp_client.hpp"
@@ -45,7 +58,7 @@ ADDON_STATUS ADDON_Create(void *callbacks, void* props)
 	if (callbacks == NULL || props == NULL)
 		return ADDON_STATUS_UNKNOWN;
 
-	AddonProperties_PVR *pvrprops = (AddonProperties_PVR*)props;
+	PVR_PROPERTIES *pvrprops = (PVR_PROPERTIES*)props;
 	libKodi = new CHelper_libXBMC_addon;
 	if (!libKodi->RegisterMe(callbacks)) {
 		libKodi->Log(LOG_ERROR, "%s: Failed to register octonet addon", __func__);
@@ -97,7 +110,7 @@ ADDON_STATUS ADDON_SetSetting(const char *settingName, const void *settingValue)
 extern "C"
 {
 
-PVR_ERROR GetCapabilities(PVR_ADDON_CAPABILITIES *pCapabilities)
+PVR_ERROR GetAddonCapabilities(PVR_ADDON_CAPABILITIES *pCapabilities)
 {
 	pCapabilities->bSupportsTV = true;
 	pCapabilities->bSupportsRadio = true;
@@ -143,9 +156,9 @@ void OnPowerSavingActivated() {}
 void OnPowerSavingDeactivated() {}
 
 /* EPG */
-PVR_ERROR GetEPGForChannel(ADDON_HANDLE handle, int iChannelUid, time_t iStart, time_t iEnd)
+PVR_ERROR GetEPGForChannel(ADDON_HANDLE handle, const PVR_CHANNEL& channel, time_t iStart, time_t iEnd)
 {
-	return data->getEPG(handle, iChannelUid, iStart, iEnd);
+	return data->getEPG(handle, channel, iStart, iEnd);
 }
 
 PVR_ERROR IsEPGTagRecordable(const EPG_TAG*, bool*) { return PVR_ERROR_NOT_IMPLEMENTED; }
@@ -197,7 +210,6 @@ PVR_ERROR SetRecordingPlayCount(const PVR_RECORDING& recording, int count) { ret
 PVR_ERROR SetRecordingLastPlayedPosition(const PVR_RECORDING& recording, int lastplayedposition) { return PVR_ERROR_NOT_IMPLEMENTED; }
 int GetRecordingLastPlayedPosition(const PVR_RECORDING& recording) { return PVR_ERROR_NOT_IMPLEMENTED; }
 PVR_ERROR GetRecordingEdl(const PVR_RECORDING&, PVR_EDL_ENTRY edl[], int *size) { return PVR_ERROR_NOT_IMPLEMENTED; }
-PVR_ERROR GetRecordingSize(const PVR_RECORDING* recording, int64_t* sizeInBytes) { return PVR_ERROR_NOT_IMPLEMENTED; }
 PVR_ERROR GetTimerTypes(PVR_TIMER_TYPE types[], int *size) { return PVR_ERROR_NOT_IMPLEMENTED; }
 int GetTimersAmount(void) { return PVR_ERROR_NOT_IMPLEMENTED; }
 PVR_ERROR GetTimers(ADDON_HANDLE handle) { return PVR_ERROR_NOT_IMPLEMENTED; }
@@ -231,15 +243,15 @@ long long SeekLiveStream(long long iPosition, int iWhence) { return -1; }
 long long LengthLiveStream(void) { return -1; }
 bool IsRealTimeStream(void) { return true; }
 
-PVR_ERROR GetSignalStatus(int channelUid, PVR_SIGNAL_STATUS* signalStatus) {
+PVR_ERROR SignalStatus(PVR_SIGNAL_STATUS& signalStatus) {
-	memset(signalStatus, 0, sizeof(PVR_SIGNAL_STATUS));
+	memset(&signalStatus, 0, sizeof(PVR_SIGNAL_STATUS));
 	rtsp_fill_signal_status(signalStatus);
 	return PVR_ERROR_NO_ERROR;
 }
 
 PVR_ERROR GetStreamTimes(PVR_STREAM_TIMES *times) { return PVR_ERROR_NOT_IMPLEMENTED; }
 PVR_ERROR GetStreamProperties(PVR_STREAM_PROPERTIES* pProperties) { return PVR_ERROR_NOT_IMPLEMENTED; }
-PVR_ERROR GetDescrambleInfo(int, PVR_DESCRAMBLE_INFO*) { return PVR_ERROR_NOT_IMPLEMENTED; }
+PVR_ERROR GetDescrambleInfo(PVR_DESCRAMBLE_INFO*) { return PVR_ERROR_NOT_IMPLEMENTED; }
 
 /* Recording stream handling */
 bool OpenRecordedStream(const PVR_RECORDING& recording) { return false; }
@@ -254,9 +266,9 @@ void DemuxReset(void) {}
 void DemuxAbort(void) {}
 void DemuxFlush(void) {}
 DemuxPacket* DemuxRead(void) { return NULL; }
-void FillBuffer(bool mode) {}
 
 /* Various helper functions */
+bool IsTimeshifting(void) { return false; }
 bool CanPauseStream() { return false; }
 bool CanSeekStream() { return false; }
 

src/client.h

@@ -1,15 +1,26 @@
+#pragma once
 /*
- *  Copyright (C) 2015 Julian Scheel <julian@jusst.de>
+ * Copyright (C) 2015 Julian Scheel <julian@jusst.de>
- *  Copyright (C) 2015 jusst technologies GmbH
+ * Copyright (C) 2015 jusst technologies GmbH
- *  Copyright (C) 2015 Digital Devices GmbH
+ * Copyright (C) 2015 Digital Devices GmbH
  *
- *  SPDX-License-Identifier: GPL-2.0-or-later
+ * This program is free software; you can redistribute it and/or
- *  See LICENSE.md for more information.
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+ * USA.
  *
  */
 
-#pragma once
-
 #include "kodi/libXBMC_addon.h"
 #include "kodi/libXBMC_pvr.h"
 

src/rtsp_client.cpp

@@ -471,10 +471,10 @@ void rtsp_close()
 	}
 }
 
-void rtsp_fill_signal_status(PVR_SIGNAL_STATUS* signal_status) {
+void rtsp_fill_signal_status(PVR_SIGNAL_STATUS& signal_status) {
 	if(rtsp) {
-		strncpy(signal_status->strServiceName, rtsp->name.c_str(), PVR_ADDON_NAME_STRING_LENGTH - 1);
+		strncpy(signal_status.strServiceName, rtsp->name.c_str(), PVR_ADDON_NAME_STRING_LENGTH - 1);
-		signal_status->iSNR = 0x1111 * rtsp->quality;
+		signal_status.iSNR = 0x1111 * rtsp->quality;
-		signal_status->iSignal = 0x101 * rtsp->level;
+		signal_status.iSignal = 0x101 * rtsp->level;
 	}
 }

src/rtsp_client.hpp

@@ -7,6 +7,6 @@
 bool rtsp_open(const std::string& name, const std::string& url_str);
 void rtsp_close();
 int rtsp_read(void *buf, unsigned buf_size);
-void rtsp_fill_signal_status(PVR_SIGNAL_STATUS* signal_status);
+void rtsp_fill_signal_status(PVR_SIGNAL_STATUS& signal_status);
 
 #endif