Merge pull request #4 from hudokkow/platform

Switch to libplatform
kodi-pvr · May 5, 2015 · cf13773 · cf13773
2 parents bd2c01f + c56fef4
commit cf13773
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,8 +9,10 @@ enable_language(CXX)
 find_package(TinyXML REQUIRED)
 find_package(kodi REQUIRED)
 find_package(kodiplatform REQUIRED)
+find_package(platform REQUIRED)
 
 include_directories(${kodiplatform_INCLUDE_DIRS}
+                    ${platform_INCLUDE_DIRS}
                     ${KODI_INCLUDE_DIR}
                     ${TINYXML_INCLUDE_DIRS})
 
@@ -21,7 +23,7 @@ set(DVBVIEWER_SOURCES src/client.cpp
                       src/RecordingReader.cpp
                       src/TimeshiftBuffer.cpp)
 
-set(DEPLIBS ${kodiplatform_LIBRARIES} ${TINYXML_LIBRARIES})
+set(DEPLIBS ${platform_LIBRARIES} ${TINYXML_LIBRARIES})
 
 build_addon(pvr.dvbviewer DVBVIEWER DEPLIBS)
 

diff --git a/debian/control b/debian/control
@@ -2,7 +2,7 @@ Source: kodi-pvr-dvbviewer
 Priority: extra
 Maintainer: Manuel Mausz <manuel-kodi@mausz.at>
 Build-Depends: debhelper (>= 9.0.0), cmake, kodi-pvr-dev,
-               libkodiplatform-dev, kodi-addon-dev
+               libkodiplatform-dev (>= 16.0.0), kodi-addon-dev
 Standards-Version: 3.9.4
 Section: libs
 

diff --git a/pvr.dvbviewer/addon.xml b/pvr.dvbviewer/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.dvbviewer"
-  version="1.10.31"
+  version="1.10.32"
   name="DVBViewer Client"
   provider-name="A600, Manuel Mausz">
   <requires>

diff --git a/pvr.dvbviewer/changelog.txt b/pvr.dvbviewer/changelog.txt
@@ -1,3 +1,6 @@
+1.10.32
+[updated] to use new libplatform-dev
+
 1.10.31
 [fixed] Authentication credentials with symbols.
 [fixed] Playback of ongoing recordings didn't work if the channel has been renamed

diff --git a/src/DvbData.cpp b/src/DvbData.cpp
@@ -1,6 +1,6 @@
 #include "DvbData.h"
 #include "client.h"
-#include "kodi/util/util.h"
+#include "platform/util/util.h"
 #include "kodi/util/XMLUtils.h"
 #include <tinyxml.h>
 #include <inttypes.h>

diff --git a/src/DvbData.h b/src/DvbData.h
@@ -5,8 +5,8 @@
 
 #include "client.h"
 #include "RecordingReader.h"
-#include "kodi/util/StdString.h"
-#include "kodi/threads/threads.h"
+#include "platform/util/StdString.h"
+#include "platform/threads/threads.h"
 #include <list>
 #include <functional>
 

diff --git a/src/RecordingReader.cpp b/src/RecordingReader.cpp
@@ -1,7 +1,7 @@
 #include "RecordingReader.h"
 #include "client.h"
-#include "kodi/util/util.h"
-#include "kodi/threads/mutex.h"
+#include "platform/util/util.h"
+#include "platform/threads/mutex.h"
 
 #define REOPEN_INTERVAL      30
 #define REOPEN_INTERVAL_FAST 10

diff --git a/src/RecordingReader.h b/src/RecordingReader.h
@@ -3,7 +3,7 @@
 #ifndef PVR_DVBVIEWER_RECORDINGREADER_H
 #define PVR_DVBVIEWER_RECORDINGREADER_H
 
-#include "kodi/util/StdString.h"
+#include "platform/util/StdString.h"
 
 class RecordingReader
 {

diff --git a/src/TimeshiftBuffer.cpp b/src/TimeshiftBuffer.cpp
@@ -1,6 +1,6 @@
 #include "TimeshiftBuffer.h"
 #include "client.h"
-#include "kodi/util/util.h"
+#include "platform/util/util.h"
 
 #define STREAM_READ_BUFFER_SIZE   32768
 #define BUFFER_READ_TIMEOUT       10000

diff --git a/src/TimeshiftBuffer.h b/src/TimeshiftBuffer.h
@@ -3,8 +3,8 @@
 #ifndef PVR_DVBVIEWER_TIMESHIFTBUFFER_H
 #define PVR_DVBVIEWER_TIMESHIFTBUFFER_H
 
-#include "kodi/util/StdString.h"
-#include "kodi/threads/threads.h"
+#include "platform/util/StdString.h"
+#include "platform/threads/threads.h"
 
 class TimeshiftBuffer
   : public PLATFORM::CThread

diff --git a/src/client.cpp b/src/client.cpp
@@ -24,7 +24,7 @@
 #include "RecordingReader.h"
 #include "kodi/xbmc_pvr_dll.h"
 #include "kodi/libKODI_guilib.h"
-#include "kodi/util/util.h"
+#include "platform/util/util.h"
 #include <stdlib.h>
 
 using namespace ADDON;

diff --git a/src/client.h b/src/client.h
@@ -24,7 +24,7 @@
 
 #include "kodi/libXBMC_addon.h"
 #include "kodi/libXBMC_pvr.h"
-#include "kodi/util/StdString.h"
+#include "platform/util/StdString.h"
 
 #ifndef _UNUSED
 #if defined(__GNUC__)