From 389b4e15e9881cd215c15a6daab4ec953e06bcbb Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Wed, 28 Jan 2015 19:54:58 +0000
Subject: Move some internal only ice parts into daemon

---
 p2pvr/daemon/Jamfile.jam   |  3 ++-
 p2pvr/daemon/p2pvr-int.ice | 16 ++++++++++++++++
 p2pvr/daemon/schedules.cpp |  1 +
 p2pvr/ice/p2pvr.ice        | 11 -----------
 4 files changed, 19 insertions(+), 12 deletions(-)
 create mode 100644 p2pvr/daemon/p2pvr-int.ice

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);
diff --git a/p2pvr/ice/p2pvr.ice b/p2pvr/ice/p2pvr.ice
index 492ef88..701bfb8 100644
--- a/p2pvr/ice/p2pvr.ice
+++ b/p2pvr/ice/p2pvr.ice
@@ -79,17 +79,6 @@ module P2PVR {
 		void Send(string guid, RawDataClient * target, long start, long len) throws StorageException;
 	};
 
-	class ScheduleCandidate {
-		string What;
-		int EventUid;
-		int TransportStreamId;
-		Common::DateTime StartTime;
-		Common::DateTime StopTime;
-		int Priority;
-		int ScheduleId;
-	};
-	sequence<ScheduleCandidate> ScheduleCandidates;
-
 	interface Recordings {
 		idempotent int NewRecording(Recording rec);
 		["project2:task"]
-- 
cgit v1.2.3