mirror of
https://projects.vdr-developer.org/git/vdr-plugin-tvguide.git
synced 2023-10-05 15:01:48 +02:00
Compile again with VDR < 2.3.0
This commit is contained in:
parent
4474b5f5b5
commit
7ca598f64e
@ -145,12 +145,16 @@ void cEpgGrid::drawText() {
|
|||||||
drawIcon("Switch", theme.Color(clrButtonYellow));
|
drawIcon("Switch", theme.Color(clrButtonYellow));
|
||||||
if (hasTimer) {
|
if (hasTimer) {
|
||||||
const cTimer *timer = NULL;
|
const cTimer *timer = NULL;
|
||||||
|
#if VDRVERSNUM >= 20301
|
||||||
{
|
{
|
||||||
LOCK_TIMERS_READ;
|
LOCK_TIMERS_READ;
|
||||||
timer = Timers->GetMatch(event);
|
timer = Timers->GetMatch(event);
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
timer = Timers.GetMatch(event);
|
||||||
|
#endif
|
||||||
if (timer)
|
if (timer)
|
||||||
#ifdef USE_SWITCHONLY
|
#ifdef SWITCHONLYPATCH
|
||||||
if (timer->HasFlags(tfSwitchOnly))
|
if (timer->HasFlags(tfSwitchOnly))
|
||||||
drawIcon("Switch", theme.Color(clrButtonYellow));
|
drawIcon("Switch", theme.Color(clrButtonYellow));
|
||||||
else if (timer->HasFlags(tfActive))
|
else if (timer->HasFlags(tfActive))
|
||||||
|
@ -764,10 +764,14 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
|
|||||||
if (cRecMenuEditTimer *menu = dynamic_cast<cRecMenuEditTimer*>(activeMenu)) {
|
if (cRecMenuEditTimer *menu = dynamic_cast<cRecMenuEditTimer*>(activeMenu)) {
|
||||||
timer = menu->GetOriginalTimer();
|
timer = menu->GetOriginalTimer();
|
||||||
} else break;
|
} else break;
|
||||||
|
#if VDRVERSNUM >= 20301
|
||||||
{
|
{
|
||||||
LOCK_TIMERS_WRITE;
|
LOCK_TIMERS_WRITE;
|
||||||
recManager->DeleteTimer(Timers->GetTimer(timer));
|
recManager->DeleteTimer(Timers->GetTimer(timer));
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
recManager->DeleteTimer(Timers.GetTimer(timer));
|
||||||
|
#endif
|
||||||
delete activeMenu;
|
delete activeMenu;
|
||||||
if (timerConflicts) {
|
if (timerConflicts) {
|
||||||
delete timerConflicts;
|
delete timerConflicts;
|
||||||
|
Loading…
Reference in New Issue
Block a user