[SCM] kodi-pvr-hts/master: move timer type definitions to Recording.h

[tiber-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d611bccb6f704782ddeced94804baff57d7ebe4e
Author: Sam Stenvall <neggelandia at gmail.com>
Date:   Sun Jul 26 19:46:52 2015 +0300

    move timer type definitions to Recording.h

diff --git a/src/tvheadend/entity/Recording.h b/src/tvheadend/entity/Recording.h
index 5d6beb6..eb71399 100644
--- a/src/tvheadend/entity/Recording.h
+++ b/src/tvheadend/entity/Recording.h
@@ -26,6 +26,14 @@
 #include "kodi/xbmc_pvr_types.h"
 #include "Entity.h"
 
+// Timer types
+#define TIMER_ONCE_MANUAL             (PVR_TIMER_TYPE_NONE + 1)
+#define TIMER_ONCE_EPG                (PVR_TIMER_TYPE_NONE + 2)
+#define TIMER_ONCE_CREATED_BY_TIMEREC (PVR_TIMER_TYPE_NONE + 3)
+#define TIMER_ONCE_CREATED_BY_AUTOREC (PVR_TIMER_TYPE_NONE + 4)
+#define TIMER_REPEATING_MANUAL        (PVR_TIMER_TYPE_NONE + 5)
+#define TIMER_REPEATING_EPG           (PVR_TIMER_TYPE_NONE + 6)
+
 namespace tvheadend
 {
   namespace entity

-- 
kodi-pvr-hts packaging