summaryrefslogtreecommitdiff
path: root/p2pvr/ice
diff options
context:
space:
mode:
Diffstat (limited to 'p2pvr/ice')
-rw-r--r--p2pvr/ice/Jamfile.jam2
-rw-r--r--p2pvr/ice/converters.cpp30
-rw-r--r--p2pvr/ice/dvb.ice3
-rw-r--r--p2pvr/ice/dvbsi.ice40
-rw-r--r--p2pvr/ice/p2pvr.ice26
5 files changed, 22 insertions, 79 deletions
diff --git a/p2pvr/ice/Jamfile.jam b/p2pvr/ice/Jamfile.jam
index ca27324..2283438 100644
--- a/p2pvr/ice/Jamfile.jam
+++ b/p2pvr/ice/Jamfile.jam
@@ -8,9 +8,7 @@ lib p2pvrice :
<library>Ice
<library>IceUtil
<library>pthread
- <library>..//p2common
<library>..//adhocutil
- <library>..//p2ice
<library>slicer
<slicer>yes
: :
diff --git a/p2pvr/ice/converters.cpp b/p2pvr/ice/converters.cpp
index 2b5f653..c4e9332 100644
--- a/p2pvr/ice/converters.cpp
+++ b/p2pvr/ice/converters.cpp
@@ -1,36 +1,6 @@
-#include <variableType.h>
#include <common.h>
-#include <iceConvert.h>
#include "commonHelpers.h"
-template<>
-VariableType
-DLL_PUBLIC IceConvert<Common::DateTime>::ToVariable(const Common::DateTime & dt)
-{
- return *dt;
-}
-
-template<>
-VariableType
-DLL_PUBLIC IceConvert<Common::Duration>::ToVariable(const Common::Duration & d)
-{
- return *d;
-}
-
-template<>
-Common::DateTime
-DLL_PUBLIC IceConvert<Common::DateTime>::FromVariable(const VariableType & dt)
-{
- return *dt.as<boost::posix_time::ptime>();
-}
-
-template<>
-Common::Duration
-DLL_PUBLIC IceConvert<Common::Duration>::FromVariable(const VariableType & d)
-{
- return *d.as<boost::posix_time::time_duration>();
-}
-
namespace Slicer {
Common::DateTime
DLL_PUBLIC ptimeToDateTime(boost::posix_time::ptime const & p)
diff --git a/p2pvr/ice/dvb.ice b/p2pvr/ice/dvb.ice
index 7565d33..b306d1e 100644
--- a/p2pvr/ice/dvb.ice
+++ b/p2pvr/ice/dvb.ice
@@ -41,7 +41,7 @@ module P2PVR {
idempotent void TuneTo(DVBSI::Delivery d) throws DeviceError;
idempotent void ScanAndSendNetworkInformation(RawDataClient * client) throws DeviceError, DataHandlingException;
};
-
+
exception NoSuitableDeviceAvailable { };
interface Devices {
@@ -65,7 +65,6 @@ module P2PVR {
// Remove a device
idempotent void Remove(string frontend);
};
-
};
#endif
diff --git a/p2pvr/ice/dvbsi.ice b/p2pvr/ice/dvbsi.ice
index aae3fd2..732aa00 100644
--- a/p2pvr/ice/dvbsi.ice
+++ b/p2pvr/ice/dvbsi.ice
@@ -10,7 +10,7 @@
module DVBSI {
// Descriptors
class Delivery {
- [ "slicer:merge:key" ]
+ [ "slicer:db:pkey" ]
int TransportStreamId;
long Frequency;
};
@@ -48,7 +48,7 @@ module DVBSI {
};
struct NetworkService {
- [ "slicer:merge:key" ]
+ [ "slicer:db:pkey" ]
int ServiceId;
int TransportStreamId;
short Type;
@@ -57,51 +57,50 @@ module DVBSI {
class NetworkTransportStream {
int NetworkId;
- [ "slicer:merge:key" ]
+ [ "slicer:db:pkey" ]
int TransportStreamId;
int OriginalNetworkId;
- [ "slicer:merge:omit" ]
+ [ "slicer:db:ignore" ]
SatelliteDelivery Satellite;
- [ "slicer:merge:omit" ]
+ [ "slicer:db:ignore" ]
CableDelivery Cable;
- [ "slicer:merge:omit" ]
+ [ "slicer:db:ignore" ]
TerrestrialDelivery Terrestrial;
- [ "slicer:merge:omit" ]
+ [ "slicer:db:ignore" ]
NetworkServiceList Services;
};
sequence<NetworkTransportStream> NetworkTransportStreams;
class Network {
- [ "slicer:merge:key" ]
+ [ "slicer:db:pkey" ]
int NetworkId;
optional(1) string Name;
- [ "slicer:merge:omit" ]
+ [ "slicer:db:ignore" ]
NetworkTransportStreams TransportStreams;
};
sequence<Network> Networks;
class BouquetTransportStream {
- [ "slicer:merge:key" ]
+ [ "slicer:db:pkey" ]
int TransportStreamId;
- [ "slicer:merge:key" ]
+ [ "slicer:db:pkey" ]
int OriginalNetworkId;
};
sequence <BouquetTransportStream> BouquetTransportStreamList;
class Bouquet {
- [ "slicer:merge:key" ]
+ [ "slicer:db:pkey" ]
int BouquetId;
optional(1) string Name;
optional(2) string DefaultAuthority;
- [ "slicer:merge:omit" ]
+ [ "slicer:db:ignore" ]
BouquetTransportStreamList Streams;
};
- ["project2:type"]
class Service {
- [ "slicer:merge:key" ]
+ [ "slicer:db:pkey" ]
int ServiceId;
- [ "slicer:merge:key" ]
+ [ "slicer:db:pkey" ]
int TransportStreamId;
bool EitSchedule;
bool EitPresentFollowing;
@@ -115,10 +114,10 @@ module DVBSI {
sequence<Service> ServiceList;
class TransportStream {
- [ "slicer:merge:key" ]
+ [ "slicer:db:pkey" ]
int TransportStreamId;
int OriginalNetworkId;
- [ "slicer:merge:omit" ]
+ [ "slicer:db:ignore" ]
ServiceList Services;
};
@@ -140,11 +139,10 @@ module DVBSI {
int OriginalNetworkId;
};
- ["project2:type"]
class Event {
- [ "slicer:merge:key" ]
+ [ "slicer:db:pkey" ]
int ServiceId;
- [ "slicer:merge:key" ]
+ [ "slicer:db:pkey" ]
int EventId;
string Title;
string TitleLang;
diff --git a/p2pvr/ice/p2pvr.ice b/p2pvr/ice/p2pvr.ice
index 0c9cce3..2d3a7a5 100644
--- a/p2pvr/ice/p2pvr.ice
+++ b/p2pvr/ice/p2pvr.ice
@@ -6,19 +6,16 @@
#include "dvbsi.ice"
module P2PVR {
- ["project2:type"]
class Event extends DVBSI::Event {
- ["slicer:db:auto","slicer:db:pkey"]
+ ["slicer:db:auto"]
int EventUid;
bool Current = true;
};
sequence<Event> Events;
- ["project2:type"]
exception NotFound { };
// Something that we have recorded.
- ["project2:type"]
class Recording {
["slicer:db:auto","slicer:db:pkey"]
int RecordingId;
@@ -30,7 +27,6 @@ module P2PVR {
sequence<Recording> RecordingList;
// Something that defines what we would like to record.
- ["project2:type"]
class Schedule {
["slicer:db:auto","slicer:db:pkey"]
int ScheduleId = 0;
@@ -52,9 +48,8 @@ module P2PVR {
};
// Ids for something to record
- ["project2:type"]
class ScheduledToRecord {
- [ "slicer:merge:key" ]
+ [ "slicer:db:pkey" ]
int EventUid;
RecordStatuses RecordStatus;
int ScheduleId;
@@ -68,7 +63,6 @@ module P2PVR {
idempotent void UpdateEvents();
};
- ["project2:type"]
exception StorageException {
string path;
string message;
@@ -84,24 +78,17 @@ module P2PVR {
interface Recordings {
idempotent int NewRecording(Recording rec);
- ["project2:task"]
idempotent void DeleteRecording(int recordingId);
- ["project2:rows"]
idempotent RecordingList GetRecordings();
};
interface Schedules {
- ["project2:task"]
idempotent void DeleteSchedule(int scheduleId);
- ["project2:rows"]
idempotent Schedule GetSchedule(int scheduleId) throws NotFound;
- ["project2:rows"]
idempotent ScheduleList GetSchedules();
- ["project2:rows"]
idempotent ScheduledToRecordList GetScheduledToRecord();
idempotent int NewSchedule(Schedule newSchedule);
idempotent void UpdateSchedule(Schedule newSchedule);
- ["project2:task"]
idempotent void DoReschedule();
};
@@ -116,28 +103,19 @@ module P2PVR {
idempotent DVBSI::Delivery GetDeliveryForTransport(int id) throws NotFound;
idempotent DVBSI::Delivery GetDeliveryForSi();
// Get services
- ["project2:rows"]
idempotent DVBSI::ServiceList GetServices();
- ["project2:rows"]
idempotent DVBSI::Service GetService(int id) throws NotFound;
// Get events
idempotent Events GetEvents(IntSequence eventUids) throws NotFound;
- ["project2:rows"]
idempotent Event GetEvent(int serviceId, int eventId) throws NotFound;
- ["project2:rows"]
idempotent Events EventsOnNow();
- ["project2:rows"]
idempotent Events EventsInSchedules();
- ["project2:rows"]
idempotent Events EventsInSchedule(int scheduleId);
- ["project2:rows"]
idempotent Events EventsInRange(Common::DateTime from, Common::DateTime to);
- ["project2:rows"]
idempotent Events EventSearch(optional(1) string keywords, optional(2) int serviceId, optional(3) Common::DateTime from, optional(4) Common::DateTime to);
};
interface Recorder {
- ["project2:task"]
idempotent void RefreshSchedules();
};
};
generated by cgit v1.2.3 (git 2.46.0) at 2025-04-04 18:48:36 +0000