From 258155b805a2fed54be46df4ea6b6c37f80757d3 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Mon, 30 Mar 2020 02:32:50 +0200 Subject: [PATCH 1/6] add source url, forum url and license to addon.xml --- pvr.demo/addon.xml.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pvr.demo/addon.xml.in b/pvr.demo/addon.xml.in index 27bdb33..a0594bc 100644 --- a/pvr.demo/addon.xml.in +++ b/pvr.demo/addon.xml.in @@ -191,5 +191,8 @@ 只包含存根 只包含 Stubs @PLATFORM@ + GPL-2.0-or-later + https://github.com/kodi-pvr/pvr.demo + https://forum.kodi.tv/forumdisplay.php?fid=173 From 36ec1628248f2c691f3e419e1cda537dae8d21af Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Mon, 30 Mar 2020 02:33:36 +0200 Subject: [PATCH 2/6] updated .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 c95bbdf13857959294769679e824406047bdf493 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Mon, 30 Mar 2020 02:34:32 +0200 Subject: [PATCH 3/6] update README.md links to match Markdown --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 7538c02..68b92c0 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -[![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://travis-ci.org/kodi-pvr/pvr.demo.svg?branch=Matrix)](https://travis-ci.org/kodi-pvr/pvr.demo/branches) [![Build Status](https://dev.azure.com/teamkodi/kodi-pvr/_apis/build/status/kodi-pvr.pvr.demo?branchName=Matrix)](https://dev.azure.com/teamkodi/kodi-pvr/_build/latest?definitionId=56&branchName=Matrix) [![Build Status](https://jenkins.kodi.tv/view/Addons/job/kodi-pvr/job/pvr.demo/job/Matrix/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/kodi-pvr%2Fpvr.demo/branches/) [![Coverity Scan Build Status](https://scan.coverity.com/projects/5120/badge.svg)](https://scan.coverity.com/projects/5120) # Demo PVR -Demo PVR client addon for [Kodi] (http://kodi.tv) +Demo PVR client addon for [Kodi](https://kodi.tv) ## Build instructions @@ -19,5 +19,5 @@ Demo PVR client addon for [Kodi] (http://kodi.tv) ##### Useful links -* [Kodi's PVR user support] (http://forum.kodi.tv/forumdisplay.php?fid=167) -* [Kodi's PVR development support] (http://forum.kodi.tv/forumdisplay.php?fid=136) +* [Kodi's PVR user support](https://forum.kodi.tv/forumdisplay.php?fid=167) +* [Kodi's PVR development support](https://forum.kodi.tv/forumdisplay.php?fid=136) From ce127b25fdb0490e68fcf04713816a6a8f9f9188 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Mon, 30 Mar 2020 17:44:26 +0200 Subject: [PATCH 4/6] update source license to use SPDX --- src/PVRDemoData.cpp | 21 ++++----------------- src/PVRDemoData.h | 24 ++++++------------------ src/client.cpp | 21 ++++----------------- src/client.h | 24 ++++++------------------ 4 files changed, 20 insertions(+), 70 deletions(-) diff --git a/src/PVRDemoData.cpp b/src/PVRDemoData.cpp index ffdb458..2dd61f1 100644 --- a/src/PVRDemoData.cpp +++ b/src/PVRDemoData.cpp @@ -1,22 +1,9 @@ /* - * Copyright (C) 2011 Pulse-Eight - * http://www.pulse-eight.com/ - * - * 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 XBMC; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * http://www.gnu.org/copyleft/gpl.html + * Copyright (C) 2011-2020 Team Kodi (https://kodi.tv) + * Copyright (C) 2011 Pulse-Eight (http://www.pulse-eight.com/) * + * SPDX-License-Identifier: GPL-2.0-or-later + * See LICENSE.md for more information. */ #include "util/XMLUtils.h" diff --git a/src/PVRDemoData.h b/src/PVRDemoData.h index 66826a6..37ea783 100644 --- a/src/PVRDemoData.h +++ b/src/PVRDemoData.h @@ -1,25 +1,13 @@ -#pragma once /* - * Copyright (C) 2011 Pulse-Eight - * http://www.pulse-eight.com/ - * - * 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 XBMC; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * http://www.gnu.org/copyleft/gpl.html + * Copyright (C) 2011-2020 Team Kodi (https://kodi.tv) + * Copyright (C) 2011 Pulse-Eight (http://www.pulse-eight.com/) * + * SPDX-License-Identifier: GPL-2.0-or-later + * See LICENSE.md for more information. */ +#pragma once + #include #include "p8-platform/os.h" #include "client.h" diff --git a/src/client.cpp b/src/client.cpp index c670ee0..9f5011d 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -1,22 +1,9 @@ /* - * Copyright (C) 2011 Pulse-Eight - * http://www.pulse-eight.com/ - * - * 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 XBMC; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * http://www.gnu.org/copyleft/gpl.html + * Copyright (C) 2011-2020 Team Kodi (https://kodi.tv) + * Copyright (C) 2011 Pulse-Eight (http://www.pulse-eight.com/) * + * SPDX-License-Identifier: GPL-2.0-or-later + * See LICENSE.md for more information. */ #include "client.h" diff --git a/src/client.h b/src/client.h index 7e4f957..127d9aa 100644 --- a/src/client.h +++ b/src/client.h @@ -1,25 +1,13 @@ -#pragma once /* - * Copyright (C) 2011 Pulse-Eight - * http://www.pulse-eight.com/ - * - * 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 XBMC; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * http://www.gnu.org/copyleft/gpl.html + * Copyright (C) 2011-2020 Team Kodi (https://kodi.tv) + * Copyright (C) 2011 Pulse-Eight (http://www.pulse-eight.com/) * + * SPDX-License-Identifier: GPL-2.0-or-later + * See LICENSE.md for more information. */ +#pragma once + #include "kodi/libXBMC_addon.h" #include "kodi/libXBMC_pvr.h" From baf4a12212a9656f84e99655035e1b5d74b6d2a1 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Thu, 23 Apr 2020 17:09:33 +0200 Subject: [PATCH 5/6] [API related] remove namespace from QueueMessage value --- src/client.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client.cpp b/src/client.cpp index 9f5011d..78571cc 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -355,7 +355,7 @@ PVR_ERROR CallMenuHook(const PVR_MENUHOOK& menuhook, const PVR_MENUHOOK_DATA&) return PVR_ERROR_INVALID_PARAMETERS; } char* msg = XBMC->GetLocalizedString(iMsg); - XBMC->QueueNotification(ADDON::QUEUE_INFO, msg); + XBMC->QueueNotification(QUEUE_INFO, msg); XBMC->FreeString(msg); return PVR_ERROR_NO_ERROR; From a7ddd5d3a660cc2854ca062bcb9bc68a7e37e0f0 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Mon, 30 Mar 2020 17:45:43 +0200 Subject: [PATCH 6/6] increase version to 4.1.4 --- pvr.demo/addon.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pvr.demo/addon.xml.in b/pvr.demo/addon.xml.in index a0594bc..14886ab 100644 --- a/pvr.demo/addon.xml.in +++ b/pvr.demo/addon.xml.in @@ -1,7 +1,7 @@ @ADDON_DEPENDS@