Changes for LOCKING

This commit is contained in:
kamel5 2018-04-01 13:39:31 +02:00 committed by kamel5
parent 8f1f2dea33
commit 39dfe767fc
2 changed files with 33 additions and 24 deletions

View File

@ -43,8 +43,11 @@ void cChannelColumn::drawHeader() {
bool cChannelColumn::readGrids() { bool cChannelColumn::readGrids() {
#if VDRVERSNUM >= 20301 #if VDRVERSNUM >= 20301
const cSchedules* schedules;
{
LOCK_SCHEDULES_READ; LOCK_SCHEDULES_READ;
const cSchedules* schedules = Schedules; schedules = Schedules;
}
#else #else
schedules = cSchedules::Schedules(*schedulesLock); schedules = cSchedules::Schedules(*schedulesLock);
#endif #endif
@ -201,8 +204,11 @@ void cChannelColumn::AddNewGridsAtStart() {
} }
//if not, i have to add new ones to the list //if not, i have to add new ones to the list
#if VDRVERSNUM >= 20301 #if VDRVERSNUM >= 20301
const cSchedules* schedules;
{
LOCK_SCHEDULES_READ; LOCK_SCHEDULES_READ;
const cSchedules* schedules = Schedules; schedules = Schedules;
}
#else #else
schedules = cSchedules::Schedules(*schedulesLock); schedules = cSchedules::Schedules(*schedulesLock);
#endif #endif
@ -254,8 +260,11 @@ void cChannelColumn::AddNewGridsAtEnd() {
} }
//if not, i have to add new ones to the list //if not, i have to add new ones to the list
#if VDRVERSNUM >= 20301 #if VDRVERSNUM >= 20301
const cSchedules* schedules;
{
LOCK_SCHEDULES_READ; LOCK_SCHEDULES_READ;
const cSchedules* schedules = Schedules; schedules = Schedules;
}
#else #else
schedules = cSchedules::Schedules(*schedulesLock); schedules = cSchedules::Schedules(*schedulesLock);
#endif #endif

View File

@ -71,8 +71,8 @@ cTimer *cRecManager::GetTimerForEvent(const cEvent *event) {
#if VDRVERSNUM >= 20301 #if VDRVERSNUM >= 20301
return timer; return timer;
} }
LOCK_TIMERS_READ; LOCK_TIMERS_READ;
timer = Timers->GetMatch(event); timer = Timers->GetMatch(event);
#else #else
} else } else
timer = Timers.GetMatch(event); timer = Timers.GetMatch(event);