diff options
Diffstat (limited to 'p2pvr/daemon/si.h')
| -rw-r--r-- | p2pvr/daemon/si.h | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/p2pvr/daemon/si.h b/p2pvr/daemon/si.h index c9080ab..4ee7629 100644 --- a/p2pvr/daemon/si.h +++ b/p2pvr/daemon/si.h @@ -6,12 +6,13 @@ #include <visibility.h> #include <logger.h> -class DLL_PUBLIC SI : public P2PVR::SI, public IceTray::AbstractDatabaseClient { +namespace P2PVR { +class DLL_PUBLIC SII : public SI, public IceTray::AbstractDatabaseClient { public: - SI(IceTray::DatabasePoolPtr); + SII(IceTray::DatabasePoolPtr); DVBSI::Networks GetNetworks(const Ice::Current &); - P2PVR::Deliveries GetAllDeliveries(const Ice::Current &); + Deliveries GetAllDeliveries(const Ice::Current &); DVBSI::DeliveryPtr GetDeliveryForService(int id, const Ice::Current &); DVBSI::DeliveryPtr GetDeliveryForTransport(int id, const Ice::Current &); DVBSI::DeliveryPtr GetDeliveryForSi(const Ice::Current &); @@ -19,16 +20,17 @@ class DLL_PUBLIC SI : public P2PVR::SI, public IceTray::AbstractDatabaseClient { DVBSI::ServiceList GetServices(const Ice::Current &); DVBSI::ServicePtr GetService(int id, const Ice::Current &); - P2PVR::Events GetEvents(const P2PVR::IntSequence & eventUids, const Ice::Current &); - P2PVR::EventPtr GetEvent(int serviceId, int eventId, const Ice::Current &); - P2PVR::Events EventsOnNow(const Ice::Current &); - P2PVR::Events EventsInSchedules(const Ice::Current &); - P2PVR::Events EventsInSchedule(int scheduleId, const Ice::Current &); - P2PVR::Events EventsInRange(const Common::DateTime &, const Common::DateTime &, const Ice::Current &); - P2PVR::Events EventSearch(const IceUtil::Optional<std::string> & keywords, const IceUtil::Optional<Ice::Int> & serviceId, const IceUtil::Optional<Common::DateTime> & from, const IceUtil::Optional<Common::DateTime> & to, const Ice::Current &); + Events GetEvents(const IntSequence & eventUids, const Ice::Current &); + EventPtr GetEvent(int serviceId, int eventId, const Ice::Current &); + Events EventsOnNow(const Ice::Current &); + Events EventsInSchedules(const Ice::Current &); + Events EventsInSchedule(int scheduleId, const Ice::Current &); + Events EventsInRange(const Common::DateTime &, const Common::DateTime &, const Ice::Current &); + Events EventSearch(const IceUtil::Optional<std::string> & keywords, const IceUtil::Optional<Ice::Int> & serviceId, const IceUtil::Optional<Common::DateTime> & from, const IceUtil::Optional<Common::DateTime> & to, const Ice::Current &); static IceTray::Logging::LoggerPtr logger; }; +} #endif |