Merge pull request #98 from AlwinEsch/Matrix-change

[Matrix] API change update / cleanups
kodi-pvr · Apr 24, 2020 · bd60a22 · bd60a22
2 parents 3f0780a + f30bf72
commit bd60a22
Show file tree

Hide file tree

Showing 12 changed files with 54 additions and 159 deletions.
diff --git 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
diff --git 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.filmon.svg?branch=Matrix)](https://travis-ci.org/kodi-pvr/pvr.filmon/branches)
 [![Build Status](https://dev.azure.com/teamkodi/kodi-pvr/_apis/build/status/kodi-pvr.pvr.filmon?branchName=Matrix)](https://dev.azure.com/teamkodi/kodi-pvr/_build/latest?definitionId=60&branchName=Matrix)
 [![Build Status](https://jenkins.kodi.tv/view/Addons/job/kodi-pvr/job/pvr.filmon/job/Matrix/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/kodi-pvr%2Fpvr.filmon/branches/)
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/5120/badge.svg)](https://scan.coverity.com/projects/5120)
 
 # Filmon PVR
-Filmon PVR client addon for [Kodi] (https://kodi.tv)
+Filmon PVR client addon for [Kodi](https://kodi.tv)
 
 ## Build instructions
 
@@ -23,5 +23,5 @@ Also make sure you follow this README from the branch in question.
 
 ##### Useful links
 
-* [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)
+* [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)
diff --git a/pvr.filmon/addon.xml.in b/pvr.filmon/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.filmon"
-  version="3.2.1"
+  version="3.2.2"
   name="PVR Filmon Client"
   provider-name="Stephen Denham">
   <requires>@ADDON_DEPENDS@</requires>
@@ -117,8 +117,9 @@
     <description lang="zh_CN">Filmon 前端。支持直播电视、录像、电子节目单。需要有 Filmon 订阅。激活前：(a) 在 Filmon 中设置喜爱的频道以便在 Kodi 中看到 (b) 在本插件的设置中输入你的用户名和密码。注意：录像要在完成后几分钟后才能看到。</description>
     <description lang="zh_TW">Filmon 前端介面。支援即時電視節目，錄影，電子節目表。需有訂閱Filmon。在開啟前：(a) 在 Filmon 中設定喜愛頻道後，才能在Kodi中看到 (b) 在本附加元件的設定中輸入使用者名稱及密碼。注意：錄影檔可能會在錄影完成幾分鐘之後才看得到。</description>
     <platform>@PLATFORM@</platform>
-    <license>GPL-2.0</license>
+    <license>GPL-2.0-or-later</license>
     <source>https://github.com/kodi-pvr/pvr.filmon</source>
+    <forum>https://forum.kodi.tv/forumdisplay.php?fid=227</forum>
     <assets>
       <icon>icon.png</icon>
     </assets>

diff --git a/pvr.filmon/changelog.txt b/pvr.filmon/changelog.txt
@@ -1,3 +1,9 @@
+3.2.2:
+- Update PVR API 6.4.0
+- Update license name and add forum url on addon.xml
+- Change source license to use SPDX
+- Minor cleanups
+
 3.2.1
 - Update PVR API 6.3.0
 

diff --git a/src/FilmonAPI.cpp b/src/FilmonAPI.cpp
@@ -1,21 +1,9 @@
 /*
- *    Copyright (C) 2014 Stephen Denham
- *
- *  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) 2014-2020 Team Kodi (https://kodi.tv)
+ *  Copyright (C) 2014 Stephen Denham
  *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSE.md for more information.
  */
 
 #define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1

diff --git a/src/FilmonAPI.h b/src/FilmonAPI.h
@@ -1,45 +1,16 @@
 /*
- *    Copyright (C) 2014 Stephen Denham
- *
- *  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) 2014-2020 Team Kodi (https://kodi.tv)
+ *  Copyright (C) 2014 Stephen Denham
  *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSE.md for more information.
  */
 
 #pragma once
 
 #include <string>
 #include <vector>
 
-/* These IDs come from the DVB-SI EIT table "content descriptor"
- * Also known under the name "E-book genre assignments"
- */
-#define EPG_EVENT_CONTENTMASK_UNDEFINED 0x00
-#define EPG_EVENT_CONTENTMASK_MOVIEDRAMA 0x10
-#define EPG_EVENT_CONTENTMASK_NEWSCURRENTAFFAIRS 0x20
-#define EPG_EVENT_CONTENTMASK_SHOW 0x30
-#define EPG_EVENT_CONTENTMASK_SPORTS 0x40
-#define EPG_EVENT_CONTENTMASK_CHILDRENYOUTH 0x50
-#define EPG_EVENT_CONTENTMASK_MUSICBALLETDANCE 0x60
-#define EPG_EVENT_CONTENTMASK_ARTSCULTURE 0x70
-#define EPG_EVENT_CONTENTMASK_SOCIALPOLITICALECONOMICS 0x80
-#define EPG_EVENT_CONTENTMASK_EDUCATIONALSCIENCE 0x90
-#define EPG_EVENT_CONTENTMASK_LEISUREHOBBIES 0xA0
-#define EPG_EVENT_CONTENTMASK_SPECIAL 0xB0
-#define EPG_EVENT_CONTENTMASK_USERDEFINED 0xF0
-
 typedef enum
 {
   FILMON_TIMER_STATE_NEW = 0,

diff --git a/src/PVRFilmonData.cpp b/src/PVRFilmonData.cpp
@@ -1,23 +1,10 @@
 /*
- *      Copyright (C) 2011 Pulse-Eight
- *      http://www.pulse-eight.com/
- *    Copyright (C) 2014 Stephen Denham
- *
- *  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/)
+ *  Copyright (C) 2014 Stephen Denham
  *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSE.md for more information.
  */
 
 #include "PVRFilmonData.h"

diff --git a/src/PVRFilmonData.h b/src/PVRFilmonData.h
@@ -1,23 +1,10 @@
 /*
- *      Copyright (C) 2011 Pulse-Eight
- *      http://www.pulse-eight.com/
- *    Copyright (C) 2014 Stephen Denham
- *
- *  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/)
+ *  Copyright (C) 2014 Stephen Denham
  *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSE.md for more information.
  */
 
 #pragma once

diff --git a/src/client.cpp b/src/client.cpp
@@ -1,23 +1,10 @@
 /*
- *      Copyright (C) 2011 Pulse-Eight
- *      http://www.pulse-eight.com/
- *    Copyright (C) 2014 Stephen Denham
- *
- *  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/)
+ *  Copyright (C) 2014 Stephen Denham
  *
+ *  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
@@ -1,25 +1,14 @@
-#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/)
+ *  Copyright (C) 2014 Stephen Denham
  *
+ *  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"
 

diff --git a/src/md5.cpp b/src/md5.cpp
@@ -1,21 +1,8 @@
 /*
- *      Copyright (C) 2009-2013 Team XBMC
- *      http://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 XBMC; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
+ *  Copyright (C) 2009-2020 Team Kodi (https://kodi.tv)
  *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSE.md for more information.
  */
 
 #include "md5.h"

diff --git a/src/md5.h b/src/md5.h
@@ -1,21 +1,8 @@
 /*
- *      Copyright (C) 2009-2013 Team XBMC
- *      http://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 XBMC; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
+ *  Copyright (C) 2009-2020 Team Kodi (https://kodi.tv)
  *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSE.md for more information.
  */
 
 #ifndef _MD5_H_