diff options
Diffstat (limited to 'p2pvr/daemon/recorder.h')
| -rw-r--r-- | p2pvr/daemon/recorder.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/p2pvr/daemon/recorder.h b/p2pvr/daemon/recorder.h index e6ff42a..6effb07 100644 --- a/p2pvr/daemon/recorder.h +++ b/p2pvr/daemon/recorder.h @@ -10,7 +10,8 @@ #include <visibility.h> #include <logger.h> -class DLL_PUBLIC Recorder : public P2PVR::Recorder { +namespace P2PVR { +class DLL_PUBLIC RecorderI : public Recorder { public: class Options : public IceTray::Options { public: @@ -26,23 +27,23 @@ class DLL_PUBLIC Recorder : public P2PVR::Recorder { class Current { public: - P2PVR::RawDataClientPrx muxer; - P2PVR::RawDataClientPrx store; + RawDataClientPrx muxer; + RawDataClientPrx store; ServiceStreamerPtr stream; - P2PVR::SchedulePtr schedule; - DVBSI::ServicePtr service; - P2PVR::EventPtr event; + SchedulePtr schedule; + ::DVBSI::ServicePtr service; + EventPtr event; IceUtil::TimerTaskPtr stopTimer; }; typedef boost::shared_ptr<Current> CurrentPtr; typedef std::set<CurrentPtr> Currents; - Recorder(Ice::ObjectAdapterPtr a, IceUtil::TimerPtr); + RecorderI(Ice::ObjectAdapterPtr a, IceUtil::TimerPtr); void RefreshSchedules(const Ice::Current &); private: - DLL_PRIVATE void StartRecording(P2PVR::SchedulePtr schedule, DVBSI::ServicePtr service, P2PVR::EventPtr event); + DLL_PRIVATE void StartRecording(SchedulePtr schedule, ::DVBSI::ServicePtr service, EventPtr event); DLL_PRIVATE void StopRecording(CurrentPtr); Ice::ObjectAdapterPtr adapter; @@ -55,6 +56,7 @@ class DLL_PUBLIC Recorder : public P2PVR::Recorder { IceTray::OptionsResolver<Options> options; static IceTray::Logging::LoggerPtr logger; }; +} #endif |