[Matrix] API change update / cleanups

.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

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.mediaportal.tvserver.svg?branch=Matrix)](https://travis-ci.org/kodi-pvr/pvr.mediaportal.tvserver/branches)
 [![Build Status](https://dev.azure.com/teamkodi/kodi-pvr/_apis/build/status/kodi-pvr.pvr.mediaportal.tvserver?branchName=Matrix)](https://dev.azure.com/teamkodi/kodi-pvr/_build/latest?definitionId=63&branchName=Matrix)
 [![Build Status](https://jenkins.kodi.tv/view/Addons/job/kodi-pvr/job/pvr.mediaportal.tvserver/job/Matrix/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/kodi-pvr%2Fpvr.mediaportal.tvserver/branches/)
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/5120/badge.svg)](https://scan.coverity.com/projects/5120)
 
 # MediaPortal TVServer PVR
-MediaPortal TVServer PVR client addon for [Kodi] (https://kodi.tv)
+MediaPortal TVServer PVR client addon for [Kodi](https://kodi.tv)
 
 ## Build instructions
 
@@ -19,5 +19,5 @@ MediaPortal TVServer PVR client addon for [Kodi] (https://kodi.tv)
 
 ##### Useful links
 
-* [Kodi's PVR user support] (https://forum.kodi.tv/forumdisplay.php?fid=171)
-* [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=171)
+* [Kodi's PVR development support](https://forum.kodi.tv/forumdisplay.php?fid=136)

pvr.mediaportal.tvserver/addon.xml.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.mediaportal.tvserver"
-  version="4.2.6"
+  version="4.2.7"
   name="MediaPortal PVR Client"
   provider-name="Marcel Groothuis">
   <requires>@ADDON_DEPENDS@</requires>
@@ -169,7 +169,7 @@
     <disclaimer lang="zh_CN">作者不对录像失败、错误定时造成时间浪费或其它不良影响负责。</disclaimer>
     <disclaimer lang="zh_TW">這是測試版軟體！其原創作者並無法對於以下情況負責，包含：錄影失敗，不正確的定時設定，多餘時數，或任何產生的其它不良影響...</disclaimer>
     <platform>@PLATFORM@</platform>
-    <license>GPL-2.0+</license>
+    <license>GPL-2.0-or-later</license>
     <source>https://github.com/kodi-pvr/pvr.mediaportal.tvserver</source>
     <forum>https://forum.kodi.tv/forumdisplay.php?fid=171</forum>
     <assets>

pvr.mediaportal.tvserver/changelog.txt

@@ -1,3 +1,8 @@
+v4.2.7:
+- Update PVR API 6.4.0
+- Change source copyright to match SPDX
+- Minor cleanups
+
 V4.2.6:
 - Fixed: Wrong github URL
 

src/Cards.cpp

@@ -1,20 +1,8 @@
 /*
- *      Copyright (C) 2005-2011 Team Kodi
- *      https://kodi.tv
- *
- *  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/>.
+ *  Copyright (C) 2005-2020 Team Kodi (https://kodi.tv)
  *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSE.md for more information.
  */
 
 #include <stdlib.h>
@@ -95,11 +83,11 @@ bool CCards::ParseLines(vector<string>& lines)
         card.TimeshiftFolderUNC = fields[18];
         if (card.RecordingFolderUNC.empty())
         {
-          KODI->Log(LOG_NOTICE, "Warning: no recording share defined in the TVServerKodi settings for card '%s'", card.Name.c_str());
+          KODI->Log(LOG_WARNING, "no recording share defined in the TVServerKodi settings for card '%s'", card.Name.c_str());
         }
         if (card.TimeshiftFolderUNC.empty())
         {
-          KODI->Log(LOG_NOTICE, "Warning: no timeshift share defined in the TVServerKodi settings for card '%s'", card.Name.c_str());
+          KODI->Log(LOG_WARNING, "no timeshift share defined in the TVServerKodi settings for card '%s'", card.Name.c_str());
         }
       }
       else

src/Cards.h

@@ -1,23 +1,12 @@
-#pragma once
 /*
- *      Copyright (C) 2005-2011 Team Kodi
- *      https://kodi.tv
- *
- *  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/>.
+ *  Copyright (C) 2005-2020 Team Kodi (https://kodi.tv)
  *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSE.md for more information.
  */
 
+#pragma once
+
 #include <vector>
 #include <string>
 #include "DateTime.h"

src/DateTime.cpp

@@ -1,20 +1,8 @@
 /*
- *      Copyright (C) 2005-2013 Team Kodi
- *      https://kodi.tv
- *
- *  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/>.
+ *  Copyright (C) 2005-2020 Team Kodi (https://kodi.tv)
  *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSE.md for more information.
  */
 
 #include <ctime>

src/DateTime.h

@@ -1,23 +1,12 @@
-#pragma once
 /*
- *      Copyright (C) 2005-2013 Team Kodi
- *      https://kodi.tv
- *
- *  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/>.
+ *  Copyright (C) 2005-2020 Team Kodi (https://kodi.tv)
  *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSE.md for more information.
  */
 
+#pragma once
+
 #include <ctime>
 #include <string>
 

src/FileUtils.h

@@ -1,23 +1,12 @@
-#pragma once
 /*
- *      Copyright (C) 2005-2014 Team XBMC
- *      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/>.
+ *  Copyright (C) 2005-2020 Team Kodi (https://kodi.tv)
  *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSE.md for more information.
  */
 
+#pragma once
+
 #include <string>
 
 namespace OS

src/GUIDialogRecordSettings.cpp

@@ -1,23 +1,8 @@
 /*
- *      Copyright (C) 2005-2013 Team Kodi
- *      http://kodi.tv
- *
- *  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 Kodi; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
- *  MA 02110-1335  USA
- *  http://www.gnu.org/copyleft/gpl.html
+ *  Copyright (C) 2005-2020 Team Kodi (https://kodi.tv)
  *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSE.md for more information.
  */
 
 #include "client.h"

src/GUIDialogRecordSettings.h

@@ -1,28 +1,13 @@
-#pragma once
-
 /*
- *      Copyright (C) 2013 Marcel Groothuis
- *      Copyright (C) 2005-2013 Team Kodi
- *      http://kodi.tv
- *
- *  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 Kodi; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
- *  MA 02110-1335  USA
- *  http://www.gnu.org/copyleft/gpl.html
+ *  Copyright (C) 2005-2020 Team Kodi (https://kodi.tv)
+ *  Copyright (C) 2013 Marcel Groothuis
  *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSE.md for more information.
  */
 
+#pragma once
+
 #include "client.h"
 #include "timers.h"
 

src/GenreTable.cpp

@@ -1,20 +1,8 @@
 /*
- *      Copyright (C) 2005-2012 Team Kodi
- *      https://kodi.tv
- *
- *  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/>.
+ *  Copyright (C) 2005-2020 Team Kodi (https://kodi.tv)
  *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSE.md for more information.
  */
 
 #include <algorithm>
@@ -34,7 +22,7 @@ bool CGenreTable::LoadGenreXML(const std::string &filename)
     return false;
   }
 
-  KODI->Log(LOG_NOTICE, "Opened %s to read genre string to type/subtype translation table", filename.c_str());
+  KODI->Log(LOG_INFO, "Opened %s to read genre string to type/subtype translation table", filename.c_str());
 
   TiXmlHandle hDoc(&xmlDoc);
   TiXmlElement* pElem;

src/GenreTable.h

@@ -1,22 +1,12 @@
-#pragma once
 /*
- *      Copyright (C) 2005-2012 Team Kodi
- *      https://kodi.tv
- *
- *  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.
+ *  Copyright (C) 2005-2020 Team Kodi (https://kodi.tv)
  *
- *  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 <map>
 #include <string>
 

src/Socket.cpp

@@ -1,21 +1,10 @@
 /*
- *      Copyright (C) 2005-2011 Team Kodi
- *      https://kodi.tv
- *
- *  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/>.
+ *  Copyright (C) 2005-2020 Team Kodi (https://kodi.tv)
  *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSE.md for more information.
  */
+
 #include "kodi/libXBMC_addon.h"
 #include "utils.h"
 #include <string>

src/Socket.h

@@ -1,21 +1,10 @@
 /*
- *      Copyright (C) 2005-2011 Team Kodi
- *      https://kodi.tv
- *
- *  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/>.
+ *  Copyright (C) 2005-2020 Team Kodi (https://kodi.tv)
  *
+ *  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: