summaryrefslogtreecommitdiff
path: root/p2pvr/daemon
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2015-01-28 19:54:58 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2015-06-13 17:29:49 +0100
commit389b4e15e9881cd215c15a6daab4ec953e06bcbb (patch)
treec4c3475ee967196bb1305b4a1954b4a41ec0b03d /p2pvr/daemon
parentCorrect location of cpp:include directive for datetime conversions (diff)
downloadp2pvr-389b4e15e9881cd215c15a6daab4ec953e06bcbb.tar.bz2
p2pvr-389b4e15e9881cd215c15a6daab4ec953e06bcbb.tar.xz
p2pvr-389b4e15e9881cd215c15a6daab4ec953e06bcbb.zip
Move some internal only ice parts into daemon
Diffstat (limited to 'p2pvr/daemon')
-rw-r--r--p2pvr/daemon/Jamfile.jam3
-rw-r--r--p2pvr/daemon/p2pvr-int.ice16
-rw-r--r--p2pvr/daemon/schedules.cpp1
3 files changed, 19 insertions, 1 deletions
diff --git a/p2pvr/daemon/Jamfile.jam b/p2pvr/daemon/Jamfile.jam
index 8a9bc7f..4e97ef0 100644
--- a/p2pvr/daemon/Jamfile.jam
+++ b/p2pvr/daemon/Jamfile.jam
@@ -11,7 +11,7 @@ cpp-pch pch : pch.hpp :
lib p2pvrdaemon :
pch
- [ glob-tree *.cpp *.sql : unittests ]
+ [ glob-tree *.ice *.cpp *.sql : unittests ]
:
<library>../ice//p2pvrice
<library>../lib//p2pvrlib
@@ -22,6 +22,7 @@ lib p2pvrdaemon :
<library>../daemonbase//p2pvrdaemonbase
<implicit-dependency>../../libtmdb//tmdb
<library>slicer
+ <slicer>yes
<include>.
: :
<include>.
diff --git a/p2pvr/daemon/p2pvr-int.ice b/p2pvr/daemon/p2pvr-int.ice
new file mode 100644
index 0000000..1dfaf17
--- /dev/null
+++ b/p2pvr/daemon/p2pvr-int.ice
@@ -0,0 +1,16 @@
+#include <common.ice>
+
+module P2PVR {
+ class ScheduleCandidate {
+ string What;
+ int EventUid;
+ int TransportStreamId;
+ Common::DateTime StartTime;
+ Common::DateTime StopTime;
+ int Priority;
+ int ScheduleId;
+ };
+ sequence<ScheduleCandidate> ScheduleCandidates;
+
+};
+
diff --git a/p2pvr/daemon/schedules.cpp b/p2pvr/daemon/schedules.cpp
index 267e1dd..674dd87 100644
--- a/p2pvr/daemon/schedules.cpp
+++ b/p2pvr/daemon/schedules.cpp
@@ -13,6 +13,7 @@
#include <instanceStore.impl.h>
#include "sqlSelectDeserializer.h"
#include <slicer/slicer.h>
+#include <p2pvr-int.h>
ResourceString(Schedules_getCandidates, sql_Schedules_getCandidates);
ResourceString(Schedules_insert, sql_Schedules_insert);