1 files changed, 13 insertions, 4 deletions
diff --git a/p2pvr/daemon/recorder.h b/p2pvr/daemon/recorder.h
index 6a6940e..e6ff42a 100644
--- a/p2pvr/daemon/recorder.h
+++ b/p2pvr/daemon/recorder.h
@@ -8,9 +8,20 @@
 #include <mutex>
 #include "serviceStreamer.h"
 #include <visibility.h>
+#include <logger.h>
 
 class DLL_PUBLIC Recorder : public P2PVR::Recorder {
 	public:
+		class Options : public IceTray::Options {
+			public:
+				Options();
+
+				ICETRAY_OPTIONS_DECLARE;
+
+				std::string extension;
+				std::string muxerCommand;
+		};
+
 		typedef std::vector<IceUtil::TimerTaskPtr> Pendings;
 
 		class Current {
@@ -30,8 +41,6 @@ class DLL_PUBLIC Recorder : public P2PVR::Recorder {
 
 		void RefreshSchedules(const Ice::Current &);
 
-		INITOPTIONS;
-
 	private:
 		DLL_PRIVATE void StartRecording(P2PVR::SchedulePtr schedule, DVBSI::ServicePtr service, P2PVR::EventPtr event);
 		DLL_PRIVATE void StopRecording(CurrentPtr);
@@ -43,8 +52,8 @@ class DLL_PUBLIC Recorder : public P2PVR::Recorder {
 		Pendings pendingRecordings;
 		std::mutex lock;
 
-		static std::string extension;
-		static std::string muxerCommand;
+		IceTray::OptionsResolver<Options> options;
+		static IceTray::Logging::LoggerPtr logger;
 };
 
 #endif