summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhorchi <vdr@jwendel.de>2017-06-11 15:49:06 (GMT)
committerhorchi <vdr@jwendel.de>2017-06-11 15:49:06 (GMT)
commit62b7aaad6475576fa8f0b415612054d36da74fc3 (patch)
treed095e4e878570d031608d499251a9da8839e5784
parent5e865739392dba0929e8b416f18f9688a56c86e7 (diff)
downloadvdr-plugin-epg2vdr-62b7aaad6475576fa8f0b415612054d36da74fc3.tar.gz
vdr-plugin-epg2vdr-62b7aaad6475576fa8f0b415612054d36da74fc3.tar.bz2
2017-06-11: version 1.1.67 (horchi)\n - change: Porting to VDR 2.3.7\n\n1.1.67
-rw-r--r--HISTORY.h7
-rw-r--r--menusched.c6
-rw-r--r--menusearchtimer.c6
-rw-r--r--recording.c12
-rw-r--r--status.c6
-rw-r--r--timer.c18
6 files changed, 37 insertions, 18 deletions
diff --git a/HISTORY.h b/HISTORY.h
index 0ef410d..af41e84 100644
--- a/HISTORY.h
+++ b/HISTORY.h
@@ -5,8 +5,8 @@
*
*/
-#define _VERSION "1.1.66"
-#define VERSION_DATE "10.06.2017"
+#define _VERSION "1.1.67"
+#define VERSION_DATE "11.06.2017"
#define DB_API 4
@@ -19,6 +19,9 @@
/*
* ------------------------------------
+2017-06-11: version 1.1.67 (horchi)
+ - change: Porting to VDR 2.3.7
+
2017-06-10: version 1.1.66 (horchi)
- Bugfix: Fixed vdr 2.2.0 compile problem (thx to Alexander Grothe)
diff --git a/menusched.c b/menusched.c
index 1b66c60..bcbb3fe 100644
--- a/menusched.c
+++ b/menusched.c
@@ -739,8 +739,10 @@ int cMenuEpgWhatsOn::LoadSearch(const cUserTimes::UserTime* userTime)
return fail;
#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
- cChannelsLock channelsLock(false);
- const cChannels* channels = channelsLock.Channels();
+ LOCK_CHANNELS_READ;
+ const cChannels* channels = Channels;
+ // cChannelsLock channelsLock(false);
+ // const cChannels* channels = channelsLock.Channels();
#else
cChannels* channels = &Channels;
#endif
diff --git a/menusearchtimer.c b/menusearchtimer.c
index dd59c1b..cae3e42 100644
--- a/menusearchtimer.c
+++ b/menusearchtimer.c
@@ -146,8 +146,10 @@ int cEpgMenuSearchResult::refresh(long id)
return fail;
#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
- cChannelsLock channelsLock(false);
- const cChannels* channels = channelsLock.Channels();
+ LOCK_CHANNELS_READ;
+ const cChannels* channels = Channels;
+ // cChannelsLock channelsLock(false);
+ // const cChannels* channels = channelsLock.Channels();
#else
cChannels* channels = &Channels;
#endif
diff --git a/recording.c b/recording.c
index c3d5ac4..03d5e66 100644
--- a/recording.c
+++ b/recording.c
@@ -324,15 +324,19 @@ int cUpdate::updateRecordingTable(int fullReload)
// get channel and recordings lock
#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
- cChannelsLock channelsLock(false);
- const cChannels* channels = channelsLock.Channels();
+ LOCK_CHANNELS_READ;
+ const cChannels* channels = Channels;
+ // cChannelsLock channelsLock(false);
+ // const cChannels* channels = channelsLock.Channels();
#else
cChannels* channels = &Channels;
#endif
#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
- cRecordingsLock recordingsLock(false);
- const cRecordings* recordings = recordingsLock.Recordings();
+ LOCK_RECORDINGS_READ;
+ const cRecordings* recordings = Recordings;
+ // cRecordingsLock recordingsLock(false);
+ // const cRecordings* recordings = recordingsLock.Recordings();
#else
const cRecordings* recordings = &Recordings;
#endif
diff --git a/status.c b/status.c
index 7134468..329b852 100644
--- a/status.c
+++ b/status.c
@@ -129,8 +129,10 @@ void cUpdate::Recording(const cDevice* Device, const char* Name, const char* Fil
// get timers lock
#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
- cTimersLock timersLock(false);
- const cTimers* timers = timersLock.Timers();
+ LOCK_TIMERS_READ;
+ const cTimers* timers = Timers;
+ // cTimersLock timersLock(false);
+ // const cTimers* timers = timersLock.Timers();
#else
const cTimers* timers = &Timers;
#endif
diff --git a/timer.c b/timer.c
index 9cc3e62..de44862 100644
--- a/timer.c
+++ b/timer.c
@@ -69,8 +69,10 @@ int cUpdate::performTimerJobs()
// get timers lock
#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
- cTimersLock timersLock(true);
- cTimers* timers = timersLock.Timers();
+ LOCK_TIMERS_WRITE;
+ cTimers* timers = Timers;
+ // cTimersLock timersLock(true);
+ // cTimers* timers = timersLock.Timers();
#else
cTimers* timers = &Timers;
#endif
@@ -78,8 +80,10 @@ int cUpdate::performTimerJobs()
// get channels lock
#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
- cChannelsLock channelsLock(false);
- const cChannels* channels = channelsLock.Channels();
+ LOCK_CHANNELS_WRITE;
+ const cChannels* channels = Channels;
+ // cChannelsLock channelsLock(false);
+ // const cChannels* channels = channelsLock.Channels();
#else
cChannels* channels = &Channels;
#endif
@@ -436,8 +440,10 @@ int cUpdate::updateTimerTable()
// get timers lock
#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
- cTimersLock timersLock(true);
- cTimers* timers = timersLock.Timers();
+ LOCK_TIMERS_WRITE;
+ cTimers* timers = Timers;
+ // cTimersLock timersLock(true);
+ // cTimers* timers = timersLock.Timers();
#else
cTimers* timers = &Timers;
#endif