[SCM] kodi-pvr-hts/master: Fix includes

tiber-guest at users.alioth.debian.org tiber-guest at users.alioth.debian.org
Fri Nov 4 23:23:40 UTC 2016


The following commit has been merged in the master branch:
commit 2cf8c84078bc49251202c549cc5f250d87824e42
Author: h.udo <hudokkow at gmail.com>
Date:   Fri May 13 11:41:53 2016 +0100

    Fix includes

diff --git a/src/AutoRecordings.h b/src/AutoRecordings.h
index 4a97bba..b5d4cc4 100644
--- a/src/AutoRecordings.h
+++ b/src/AutoRecordings.h
@@ -29,7 +29,7 @@ extern "C"
 #include "libhts/htsmsg.h"
 }
 
-#include "kodi/libXBMC_pvr.h"
+#include "libXBMC_pvr.h"
 #include "tvheadend/entity/AutoRecording.h"
 
 class CHTSPConnection;
diff --git a/src/TimeRecordings.h b/src/TimeRecordings.h
index 3d76ca9..d413528 100644
--- a/src/TimeRecordings.h
+++ b/src/TimeRecordings.h
@@ -29,7 +29,7 @@ extern "C"
 #include "libhts/htsmsg.h"
 }
 
-#include "kodi/libXBMC_pvr.h"
+#include "libXBMC_pvr.h"
 #include "tvheadend/entity/TimeRecording.h"
 
 class CHTSPConnection;
diff --git a/src/Tvheadend.h b/src/Tvheadend.h
index ca26a67..908d989 100644
--- a/src/Tvheadend.h
+++ b/src/Tvheadend.h
@@ -26,8 +26,8 @@
 #include "p8-platform/threads/threads.h"
 #include "p8-platform/threads/mutex.h"
 #include "p8-platform/util/buffer.h"
-#include "kodi/xbmc_codec_types.h"
-#include "kodi/libXBMC_addon.h"
+#include "xbmc_codec_types.h"
+#include "libXBMC_addon.h"
 #include "tvheadend/Settings.h"
 #include "HTSPTypes.h"
 #include "tvheadend/ChannelTuningPredictor.h"
diff --git a/src/client.cpp b/src/client.cpp
index bdf1ecc..8888207 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -20,8 +20,8 @@
  */
 
 #include "client.h"
-#include "kodi/xbmc_pvr_dll.h"
-#include "kodi/libKODI_guilib.h"
+#include "xbmc_pvr_dll.h"
+#include "libKODI_guilib.h"
 #include "p8-platform/util/util.h"
 #include "Tvheadend.h"
 #include "tvheadend/Settings.h"
diff --git a/src/client.h b/src/client.h
index a10659b..5173db2 100644
--- a/src/client.h
+++ b/src/client.h
@@ -22,9 +22,9 @@
 
 #include "p8-platform/os.h"
 #include "p8-platform/threads/mutex.h"
-#include "kodi/libXBMC_addon.h"
-#include "kodi/libXBMC_pvr.h"
-#include "kodi/libXBMC_codec.h"
+#include "libXBMC_addon.h"
+#include "libXBMC_pvr.h"
+#include "libXBMC_codec.h"
 
 extern ADDON::CHelper_libXBMC_addon*  XBMC;
 extern CHelper_libXBMC_pvr*           PVR;
diff --git a/src/tvheadend/Settings.h b/src/tvheadend/Settings.h
index c6f50d9..977292f 100644
--- a/src/tvheadend/Settings.h
+++ b/src/tvheadend/Settings.h
@@ -24,7 +24,7 @@
 #include "../HTSPTypes.h"
 #include <string>
 
-#include "kodi/xbmc_addon_types.h"
+#include "xbmc_addon_types.h"
 
 namespace tvheadend {
 
diff --git a/src/tvheadend/entity/Recording.h b/src/tvheadend/entity/Recording.h
index 5e22538..e66ad87 100644
--- a/src/tvheadend/entity/Recording.h
+++ b/src/tvheadend/entity/Recording.h
@@ -24,7 +24,7 @@
 #include <algorithm>
 #include <map>
 #include <string>
-#include "kodi/xbmc_pvr_types.h"
+#include "xbmc_pvr_types.h"
 #include "Entity.h"
 
 // Timer types

-- 
kodi-pvr-hts packaging



More information about the pkg-multimedia-commits mailing list