summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2015-01-18 18:45:20 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2015-06-13 17:29:47 +0100
commitb50f6e06c169a58617af3ff4013e1261ae044814 (patch)
treed9c93c21b701c6b88c824450b7ed881019285f8c
parentFix exception spec on tuner interfaces and add covering tests (diff)
downloadp2pvr-b50f6e06c169a58617af3ff4013e1261ae044814.tar.bz2
p2pvr-b50f6e06c169a58617af3ff4013e1261ae044814.tar.xz
p2pvr-b50f6e06c169a58617af3ff4013e1261ae044814.zip
Move the conversion specification from the member onto the type
-rw-r--r--p2pvr/ice/common.ice2
-rw-r--r--p2pvr/ice/dvbsi.ice2
-rw-r--r--p2pvr/ice/p2pvr.ice4
3 files changed, 2 insertions, 6 deletions
diff --git a/p2pvr/ice/common.ice b/p2pvr/ice/common.ice
index c4be4ce..47868cd 100644
--- a/p2pvr/ice/common.ice
+++ b/p2pvr/ice/common.ice
@@ -2,6 +2,7 @@
#define COMMON_ICE
module Common {
+ [ "slicer:conversion:boost.posix_time.ptime:ptimeToDateTime:dateTimeToPTime" ]
struct DateTime {
short Year;
short Month;
@@ -10,6 +11,7 @@ module Common {
short Minute;
};
+ [ "slicer:conversion:boost.posix_time.time_duration:timedurationToDuration:durationToTimeDuration" ]
struct Duration {
short Hours = 0;
short Minutes = 0;
diff --git a/p2pvr/ice/dvbsi.ice b/p2pvr/ice/dvbsi.ice
index bfe1015..9c3d74b 100644
--- a/p2pvr/ice/dvbsi.ice
+++ b/p2pvr/ice/dvbsi.ice
@@ -152,9 +152,7 @@ module DVBSI {
optional(1) string Subtitle;
optional(2) string Description;
optional(3) string DescriptionLang;
- [ "slicer:conversion:boost.posix_time.ptime:ptimeToDateTime:dateTimeToPTime" ]
Common::DateTime StartTime;
- [ "slicer:conversion:boost.posix_time.ptime:ptimeToDateTime:dateTimeToPTime" ]
Common::DateTime StopTime;
optional(4) short Episode;
optional(5) short Episodes;
diff --git a/p2pvr/ice/p2pvr.ice b/p2pvr/ice/p2pvr.ice
index 2d9cde2..c384651 100644
--- a/p2pvr/ice/p2pvr.ice
+++ b/p2pvr/ice/p2pvr.ice
@@ -36,9 +36,7 @@ module P2PVR {
optional(3) string Title;
optional(4) string Search;
int Priority = 0;
- [ "slicer:conversion:boost.posix_time.time_duration:timedurationToDuration:durationToTimeDuration" ]
Common::Duration Early;
- [ "slicer:conversion:boost.posix_time.time_duration:timedurationToDuration:durationToTimeDuration" ]
Common::Duration Late;
bool Repeats = false;
};
@@ -77,9 +75,7 @@ module P2PVR {
string What;
int EventUid;
int TransportStreamId;
- [ "slicer:conversion:boost.posix_time.ptime:ptimeToDateTime:dateTimeToPTime" ]
Common::DateTime StartTime;
- [ "slicer:conversion:boost.posix_time.ptime:ptimeToDateTime:dateTimeToPTime" ]
Common::DateTime StopTime;
int Priority;
int ScheduleId;