Fixed compilation with VDR 2.2.0

5 files changed, 20 insertions, 0 deletions

diff --git a/pages/channels_widget.ecpp b/pages/channels_widget.ecpp
index c71506d..64dc3c9 100644
--- a/pages/channels_widget.ecpp
+++ b/pages/channels_widget.ecpp
@@ -3,6 +3,10 @@
 #include <exception.h>
 #include <setup.h>
 
+#if VDRVERSNUM < 20300
+#include <tools.h>  // ReadLock
+#endif
+
 using namespace vdrlive;
 
 </%pre>
diff --git a/recman.cpp b/recman.cpp
index 082bf61..fe0bc72 100644
--- a/recman.cpp
+++ b/recman.cpp
@@ -26,8 +26,12 @@ namespace vdrlive {
 	std::tr1::shared_ptr< RecordingsTree > RecordingsManager::m_recTree;
 	std::tr1::shared_ptr< RecordingsList > RecordingsManager::m_recList;
 	std::tr1::shared_ptr< DirectoryList > RecordingsManager::m_recDirs;
+#if VDRVERSNUM >= 20301
 	time_t RecordingsManager::m_recordingsState = 0;
 	string RecordingsManager::m_UpdateFileName;
+#else
+	int RecordingsManager::m_recordingsState = 0;
+#endif
 
 	// The RecordingsManager holds a VDR lock on the
 	// Recordings. Additionally the singleton instance of
diff --git a/recman.h b/recman.h
index 32981ae..75f2adf 100644
--- a/recman.h
+++ b/recman.h
@@ -122,15 +122,21 @@ namespace vdrlive {
 		private:
 			RecordingsManager();
 
+#if VDRVERSNUM >= 20301
 			static bool StateChanged (time_t& tm);
+#endif
 			static RecordingsManagerPtr EnsureValidData();
 
 			static std::tr1::weak_ptr< RecordingsManager > m_recMan;
 			static std::tr1::shared_ptr< RecordingsTree > m_recTree;
 			static std::tr1::shared_ptr< RecordingsList > m_recList;
 			static std::tr1::shared_ptr< DirectoryList > m_recDirs;
+#if VDRVERSNUM >= 20301
 			static time_t m_recordingsState;
 			static std::string m_UpdateFileName;
+#else
+			static int m_recordingsState;
+#endif
 
 			cThreadLock m_recordingsLock;
 	};
diff --git a/tasks.cpp b/tasks.cpp
index dfa0baf..350af2e 100644
--- a/tasks.cpp
+++ b/tasks.cpp
@@ -4,6 +4,10 @@
 #include "stdext.h"
 #include "recman.h"
 
+#if VDRVERSNUM < 20300
+#include "tools.h"  // ReadLock
+#endif
+
 // STL headers need to be before VDR tools.h (included by <vdr/menu.h>)
 #include <algorithm>
 
diff --git a/timers.cpp b/timers.cpp
index 30ccc41..bf954fc 100644
--- a/timers.cpp
+++ b/timers.cpp
@@ -140,6 +140,7 @@ namespace vdrlive {
 		return info.str();
 	}
 
+#if VDRVERSNUM >= 20301
 	bool SortedTimers::Modified()
 	{
 		// the global(!) list of known timers
@@ -173,6 +174,7 @@ namespace vdrlive {
 
 		return modified;
 	}
+#endif
 
 	TimerManager::TimerManager()
 	{