summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasmin Jessich <jasmin@anw.at>2017-05-21 02:07:46 (GMT)
committerJasmin Jessich <jasmin@anw.at>2017-05-21 02:08:34 (GMT)
commit30fef3dda362173844b4edb50294803e02308269 (patch)
tree5eb370c1bdb54a11f292096e65eb8e24a251b1db
parent5f457e6d67133e2b7e7269efedbbe758227b44e3 (diff)
downloadvdr-plugin-live-30fef3dda362173844b4edb50294803e02308269.tar.gz
vdr-plugin-live-30fef3dda362173844b4edb50294803e02308269.tar.bz2
Fixed compilation with VDR 2.2.0
-rw-r--r--pages/channels_widget.ecpp4
-rw-r--r--recman.cpp4
-rw-r--r--recman.h6
-rw-r--r--tasks.cpp4
-rw-r--r--timers.cpp2
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()
{