Version 1.2.12

.gitignore

@@ -0,0 +1,5 @@
+*.o
+*.so
+po/*.mo
+po/*.pot
+.dependencies

HISTORY

@@ -147,3 +147,78 @@ Version 1.2.3
 - Show inactive timer in EPG grid
 - Center channel logos in EPG
 - Clock in timeline if displaymode horizontal
+
+Version 1.2.4
+
+- Add Support for new SVDRPPeering
+- Add italian translation
+- Use graphicsmagick instead of imagemagick
+- Correct a switchtimer error
+- Add "switchMinsBefore" to setup menu
+- Eliminate some warnings
+- Center channel logos in favorite view
+- Update "services/epgsearch.h"
+
+Version 1.2.5
+
+- Compile again with VDR < 2.3.0
+- Correct some x positions in EPG grid
+- Fixed a "invalid lock sequence report" in "cRecManager::PerformSearchTimerSearch"
+- Eliminate a seqfault in "cRecManager::DeleteSearchTimer"
+- Show Inactive timer in DrawHeader
+- Add "switchMode" to setup menu
+
+Version 1.2.6
+
+- Some changes for VDR < 2.3.0
+- Changes for Rec Icon in DrawHeader and Grid
+- Eliminate a compiler warning in searchtimer.c
+- Correct an error in setup page
+- Optical changes in displaymode vertical
+- Different setup parameter for displayTime in horizontal and vertical mode
+- Optimizations in setup menu
+- Add .gitignore
+- Channelgroup in cRecMenuSearchTimerEdit
+  (Create and modify of channelgroups isn't yet possible, should be done in epgsearch)
+- Change channel icon size in cRecMenuSearchTimerEdit
+
+Version 1.2.7
+
+- Eliminate a "invalid lock sequence report" in tvguideosd.c
+- Optical changes in favorites and searchtimer menu
+- Changes in README
+
+Version 1.2.8
+
+- Some refactoring
+- Update i18n
+- Add almost all search timer options to cRecMenuSearchTimerEdit,
+  only one is missing: "Use content descriptor"
+  (Create and modify of channelgroups and blacklists isn't possible,
+  because the epgsearch service interface doesn't support that, 
+  should be done in epgsearch)
+
+Version 1.2.9
+
+- Correct plugin options in README and CommandLineHelp
+- Change locking in cTVGuideSearchTimer::cTVGuideSearchTimer
+- Fixed a dayOfWeek error in RecMenuSearchTimerEdit
+
+Version 1.2.10
+
+- Update remotetimers.h
+- Simplify cRecMenuSearchTimerEdit::GetSearchTimer
+- Fixed cRecMenuItemSelectDirectory::DrawValue
+- Some rework
+
+Version 1.2.11
+
+- Fixed a segfault with graphicsmagick > 1.3.31
+- Fixed a possible deadlock in detailview
+- Optical changes in cMenuSetupImageCache
+
+Version 1.2.12
+
+- Fixed updating current time
+- Fixed updating current TimeBase
+- Diplay the current TimeBase throughout the whole timeline

Makefile

@@ -4,7 +4,8 @@
 # $Id$
 
 # External image lib to use: imagemagick, graphicsmagick	
-IMAGELIB = imagemagick
+#IMAGELIB = imagemagick
+IMAGELIB = graphicsmagick
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -59,7 +60,7 @@ endif
 
 ### The object files (add further files here):
 
-OBJS = $(PLUGIN).o channelcolumn.o channelgroup.o channelgroups.o channeljump.o config.o detailview.o dummygrid.o epggrid.o fontmanager.o footer.o geometrymanager.o grid.o headergrid.o imagecache.o imageloader.o imagemagickwrapper.o imagescaler.o osdmanager.o recmanager.o recmenu.o recmenuitem.o recmenumanager.o recmenus.o searchtimer.o setup.o statusheader.o styledpixmap.o switchtimer.o timeline.o timer.o timerconflict.o tools.o tvguideosd.o view.o
+OBJS = $(PLUGIN).o channelepg.o channelgroup.o channelgroups.o channeljump.o config.o detailview.o dummygrid.o epggrid.o fontmanager.o footer.o geometrymanager.o gridelement.o headergrid.o imagecache.o imageloader.o imagemagickwrapper.o imagescaler.o osdmanager.o recmanager.o recmenu.o recmenuitem.o recmenuview.o recmenus.o searchtimer.o setup.o statusheader.o styledpixmap.o switchtimer.o timeline.o timemanager.o timerconflict.o tools.o tvguideosd.o view.o
 
 ### The main target:
 
@@ -68,7 +69,8 @@ all: $(SOFILE) i18n
 ### Implicit rules:
 
 %.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
+	@echo CC $@
+	$(Q)$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
 
 ### Dependencies:
 

README

@@ -1,10 +1,14 @@
 This is a "plugin" for the Video Disk Recorder (VDR).
 
-Written by:                  Louis Braun <louis DOT braun AT gmx DOT de>
+TVGuide on GitLab: https://gitlab.com/kamel5/tvguide
 
-Project's homepage:          http://projects.vdr-developer.org/projects/plg-tvguide 
+Original Written by:           Louis Braun <louis DOT braun AT gmx DOT de>
 
-Latest version available at: http://projects.vdr-developer.org/projects/plg-tvguide/files
+Original Project's homepage:   http://projects.vdr-developer.org/projects/plg-tvguide 
+
+Latest version available at:   https://gitlab.com/kamel5/tvguide
+
+Original version available at: http://projects.vdr-developer.org/projects/plg-tvguide/files
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -40,13 +44,13 @@ After "normal" Plugin installation you have to care about the paths for the
 used Icons, the channel logos and epg images. The following paths can be set
 at startup:
 
--l path, --logodir=path
+-l path, --logopath=path
     Path to the logos (Default: <ResourceDirectory>/plugins/tvguide/channellogos/).
 
 -e path, --epgimages=path
     Path to the epgimages (Default: <CacheDirectory>/plugins/tvguide/epgimages/).
 
--i path, --icons=path
+-i path, --iconpath=path
     Path to the icons directory (Default: <ResourceDirectory>/plugins/tvguide/epgimages/).
 
 <ResourceDirectory> and <CacheDirectory> is taken from your VDR configuration 

channelepg.c

@@ -1,55 +1,44 @@
-#include "channelcolumn.h"
+#include "channelepg.h"
 #include "dummygrid.h"
 
-cChannelColumn::cChannelColumn(int num, const cChannel *channel, cMyTime *myTime) {
+cChannelEpg::cChannelEpg(int num, const cChannel *channel, cTimeManager *timeManager) {
     this->channel = channel;
     this->num = num;
-    this->myTime = myTime;
-#if VDRVERSNUM >= 20301
-    hasTimer = false;
-    const cSchedule *Schedule = NULL;
-    LOCK_SCHEDULES_READ;
-    const cSchedules* schedules = Schedules;
-    if (schedules) {
-	Schedule = schedules->GetSchedule(channel);
-        hasTimer = Schedule ? Schedule->HasTimer() : false;
-    }
-#else
+    this->timeManager = timeManager;
+#if VDRVERSNUM < 20301
     hasTimer = channel->HasTimer();
 #endif
     hasSwitchTimer = SwitchTimers.ChannelInSwitchList(channel);
-#if VDRVERSNUM >= 20301
-#else
+#if VDRVERSNUM < 20301
     schedulesLock = new cSchedulesLock(false, 100);
 #endif
     header = NULL;
 }
 
-cChannelColumn::~cChannelColumn(void) {
+cChannelEpg::~cChannelEpg(void) {
     if (header)
         delete header;
     grids.Clear();
-#if VDRVERSNUM >= 20301
-#else
+#if VDRVERSNUM < 20301
     delete schedulesLock;
 #endif
 }
 
-void cChannelColumn::clearGrids() {
+void cChannelEpg::clearGrids() {
     grids.Clear();
 }
 
-void cChannelColumn::createHeader() {
+void cChannelEpg::createHeader() {
     header = new cHeaderGrid();
     header->createBackground(num);
     header->drawChannel(channel);
 }
 
-void cChannelColumn::drawHeader() {
+void cChannelEpg::drawHeader() {
     header->setPosition(num);
 }
 
-bool cChannelColumn::readGrids() {
+bool cChannelEpg::readGrids() {
 #if VDRVERSNUM >= 20301
     const cSchedules* schedules;
     {
@@ -62,17 +51,17 @@ bool cChannelColumn::readGrids() {
     const cSchedule *Schedule = NULL;
     Schedule = schedules->GetSchedule(channel);
     if (!Schedule) {
-        addDummyGrid(myTime->GetStart(), myTime->GetEnd(), NULL, false);
+        addDummyGrid(timeManager->GetStart(), timeManager->GetEnd(), NULL, false);
         return true;
     }
     bool eventFound = false;
     bool dummyAtStart = false;
-    const cEvent *startEvent = Schedule->GetEventAround(myTime->GetStart());
+    const cEvent *startEvent = Schedule->GetEventAround(timeManager->GetStart());
     if (startEvent != NULL) {
         eventFound = true;
     } else {
         for (int i=1; i<6; i++) {
-            startEvent = Schedule->GetEventAround(myTime->GetStart()+i*5*60);
+            startEvent = Schedule->GetEventAround(timeManager->GetStart()+i*5*60);
             if (startEvent) {
                 eventFound = true;
                 dummyAtStart = true;
@@ -83,20 +72,20 @@ bool cChannelColumn::readGrids() {
     if (eventFound) {
         bool col = true;
         if (dummyAtStart) {
-            addDummyGrid(myTime->GetStart(), startEvent->StartTime(), NULL, col);
+            addDummyGrid(timeManager->GetStart(), startEvent->StartTime(), NULL, col);
             col = !col;
         }
         bool dummyNeeded = true;
         bool toFarInFuture = false;
-        time_t endLast = myTime->GetStart();
+        time_t endLast = timeManager->GetStart();
         const cEvent *event = startEvent;
         const cEvent *eventLast = NULL;
         for (; event; event = Schedule->Events()->Next(event)) {
             if (endLast < event->StartTime()) {
                 //gap, dummy needed
                 time_t endTime = event->StartTime();
-                if (endTime > myTime->GetEnd()) {
-                    endTime = myTime->GetEnd();
+                if (endTime > timeManager->GetEnd()) {
+                    endTime = timeManager->GetEnd();
                     toFarInFuture = true;
                 }
                 addDummyGrid(endLast, endTime, NULL, col);
@@ -108,74 +97,74 @@ bool cChannelColumn::readGrids() {
             addEpgGrid(event, NULL, col);
             col = !col;
             endLast = event->EndTime();
-            if (event->EndTime() > myTime->GetEnd()) {
+            if (event->EndTime() > timeManager->GetEnd()) {
                 dummyNeeded = false;
                 break;
             }
             eventLast = event;
         }
         if (dummyNeeded) {
-            addDummyGrid(eventLast->EndTime(), myTime->GetEnd(), NULL, col);
+            addDummyGrid(eventLast->EndTime(), timeManager->GetEnd(), NULL, col);
         }
         return true;
     } else {
-        addDummyGrid(myTime->GetStart(), myTime->GetEnd(), NULL, false);
+        addDummyGrid(timeManager->GetStart(), timeManager->GetEnd(), NULL, false);
         return true;
     }
     return false;
 }
 
-void cChannelColumn::drawGrids() {
-    for (cGrid *grid = grids.First(); grid; grid = grids.Next(grid)) {
+void cChannelEpg::drawGrids() {
+    for (cGridElement *grid = grids.First(); grid; grid = grids.Next(grid)) {
         grid->SetViewportHeight();
         grid->PositionPixmap();
         grid->Draw();
     }
 }
 
-int cChannelColumn::getX() {
+int cChannelEpg::getX() {
     return geoManager.timeLineWidth + num*geoManager.colWidth;
 }
 
-int cChannelColumn::getY() {
+int cChannelEpg::getY() {
     return geoManager.statusHeaderHeight +  geoManager.timeLineHeight + num*geoManager.rowHeight;
 }
 
-cGrid * cChannelColumn::getActive() {
-    cMyTime t;
+cGridElement *cChannelEpg::getActive() {
+    cTimeManager t;
     t.Now();
-    for (cGrid *grid = grids.First(); grid; grid = grids.Next(grid)) {
+    for (cGridElement *grid = grids.First(); grid; grid = grids.Next(grid)) {
         if (grid->Match(t.Get()))
             return grid;
     }
     return grids.First();
 }
 
-cGrid * cChannelColumn::getNext(cGrid *activeGrid) {
+cGridElement *cChannelEpg::getNext(cGridElement *activeGrid) {
     if (activeGrid == NULL)
         return NULL;
-    cGrid *next = grids.Next(activeGrid);
+    cGridElement *next = grids.Next(activeGrid);
     if (next)
         return next;
     return NULL;
 }
 
-cGrid * cChannelColumn::getPrev(cGrid *activeGrid) {
+cGridElement *cChannelEpg::getPrev(cGridElement *activeGrid) {
     if (activeGrid == NULL)
         return NULL;
-    cGrid *prev = grids.Prev(activeGrid);
+    cGridElement *prev = grids.Prev(activeGrid);
     if (prev)
         return prev;
     return NULL;
 }
 
-cGrid * cChannelColumn::getNeighbor(cGrid *activeGrid) {
+cGridElement *cChannelEpg::getNeighbor(cGridElement *activeGrid) {
     if (!activeGrid)
         return NULL;
-    cGrid *neighbor = NULL;
+    cGridElement *neighbor = NULL;
     int overlap = 0;
     int overlapNew = 0;
-    cGrid *grid = NULL;
+    cGridElement *grid = NULL;
     grid = grids.First();
     if (grid) {
         for (; grid; grid = grids.Next(grid)) {
@@ -195,19 +184,19 @@ cGrid * cChannelColumn::getNeighbor(cGrid *activeGrid) {
     return neighbor;
 }
 
-bool cChannelColumn::isFirst(cGrid *grid) {
+bool cChannelEpg::isFirst(cGridElement *grid) {
     if (grid == grids.First())
         return true;
     return false;
 }
 
-void cChannelColumn::AddNewGridsAtStart() {
-    cGrid *firstGrid = NULL;
+void cChannelEpg::AddNewGridsAtStart() {
+    cGridElement *firstGrid = NULL;
     firstGrid = grids.First();
     if (firstGrid == NULL)
         return;
     //if first event is long enough, nothing to do.
-    if (firstGrid->StartTime() <= myTime->GetStart()) {
+    if (firstGrid->StartTime() <= timeManager->GetStart()) {
         return;
     }
     //if not, i have to add new ones to the list
@@ -224,8 +213,8 @@ void cChannelColumn::AddNewGridsAtStart() {
     Schedule = schedules->GetSchedule(channel);
     if (!Schedule) {
         if (firstGrid->isDummy()) {
-            firstGrid->SetStartTime(myTime->GetStart());
-            firstGrid->SetEndTime(myTime->GetEnd());
+            firstGrid->SetStartTime(timeManager->GetStart());
+            firstGrid->SetEndTime(timeManager->GetEnd());
         }
         return;
     }
@@ -234,13 +223,13 @@ void cChannelColumn::AddNewGridsAtStart() {
     for (const cEvent *event = Schedule->GetEventAround(firstGrid->StartTime()-60); event; event = Schedule->Events()->Prev(event)) {
         if (!event)
             break;
-        if (event->EndTime() < myTime->GetStart()) {
+        if (event->EndTime() < timeManager->GetStart()) {
             break;
         }
-        cGrid *grid = addEpgGrid(event, firstGrid, col);
+        cGridElement *grid = addEpgGrid(event, firstGrid, col);
         col = !col;
         firstGrid = grid;
-        if (event->StartTime() <= myTime->GetStart()) {
+        if (event->StartTime() <= timeManager->GetStart()) {
             dummyNeeded = false;
             break;
         }
@@ -248,22 +237,22 @@ void cChannelColumn::AddNewGridsAtStart() {
     if (dummyNeeded) {
         firstGrid = grids.First();
         if (firstGrid->isDummy()) {
-            firstGrid->SetStartTime(myTime->GetStart());
-            if (firstGrid->EndTime() >= myTime->GetEnd())
-                firstGrid->SetEndTime(myTime->GetEnd());
+            firstGrid->SetStartTime(timeManager->GetStart());
+            if (firstGrid->EndTime() >= timeManager->GetEnd())
+                firstGrid->SetEndTime(timeManager->GetEnd());
         } else {
-            addDummyGrid(myTime->GetStart(), firstGrid->StartTime(), firstGrid, col);
+            addDummyGrid(timeManager->GetStart(), firstGrid->StartTime(), firstGrid, col);
         }
     }
 }
 
-void cChannelColumn::AddNewGridsAtEnd() {
-    cGrid *lastGrid = NULL;
+void cChannelEpg::AddNewGridsAtEnd() {
+    cGridElement *lastGrid = NULL;
     lastGrid = grids.Last();
     if (lastGrid == NULL)
         return;
     //if last event is long enough, nothing to do.
-    if (lastGrid->EndTime() >= myTime->GetEnd()) {
+    if (lastGrid->EndTime() >= timeManager->GetEnd()) {
         return;
     }
     //if not, i have to add new ones to the list
@@ -280,8 +269,8 @@ void cChannelColumn::AddNewGridsAtEnd() {
     Schedule = schedules->GetSchedule(channel);
     if (!Schedule) {
         if (lastGrid->isDummy()) {
-            lastGrid->SetStartTime(myTime->GetStart());
-            lastGrid->SetEndTime(myTime->GetEnd());
+            lastGrid->SetStartTime(timeManager->GetStart());
+            lastGrid->SetEndTime(timeManager->GetEnd());
         }
         return;
     }
@@ -290,12 +279,12 @@ void cChannelColumn::AddNewGridsAtEnd() {
     for (const cEvent *event = Schedule->GetEventAround(lastGrid->EndTime()+60); event; event = Schedule->Events()->Next(event)) {
         if (!event)
             break;
-        if (event->StartTime() > myTime->GetEnd()) {
+        if (event->StartTime() > timeManager->GetEnd()) {
             break;
         }
         addEpgGrid(event, NULL, col);
         col = !col;
-        if (event->EndTime() > myTime->GetEnd()) {
+        if (event->EndTime() > timeManager->GetEnd()) {
             dummyNeeded = false;
             break;
         }
@@ -303,32 +292,32 @@ void cChannelColumn::AddNewGridsAtEnd() {
     if (dummyNeeded) {
         lastGrid = grids.Last();
         if (lastGrid->isDummy()) {
-            lastGrid->SetEndTime(myTime->GetEnd());
-            if (lastGrid->StartTime() <= myTime->GetStart())
-                lastGrid->SetStartTime(myTime->GetStart());
+            lastGrid->SetEndTime(timeManager->GetEnd());
+            if (lastGrid->StartTime() <= timeManager->GetStart())
+                lastGrid->SetStartTime(timeManager->GetStart());
         } else {
-            addDummyGrid(lastGrid->EndTime(), myTime->GetEnd(), NULL, col);
+            addDummyGrid(lastGrid->EndTime(), timeManager->GetEnd(), NULL, col);
         }
     }
 }
 
-void cChannelColumn::ClearOutdatedStart() {
-    cGrid *firstGrid = NULL;
+void cChannelEpg::ClearOutdatedStart() {
+    cGridElement *firstGrid = NULL;
     while (true) {
         firstGrid = grids.First();
         if (!firstGrid)
             break;
-        if (firstGrid->EndTime() <= myTime->GetStart()) {
+        if (firstGrid->EndTime() <= timeManager->GetStart()) {
             grids.Del(firstGrid);
             firstGrid = NULL;
         } else {
             if (firstGrid->isDummy()) {
-                firstGrid->SetStartTime(myTime->GetStart());
-                cGrid *next = getNext(firstGrid);
+                firstGrid->SetStartTime(timeManager->GetStart());
+                cGridElement *next = getNext(firstGrid);
                 if (next) {
                     firstGrid->SetEndTime(next->StartTime());
                 } else {
-                    firstGrid->SetEndTime(myTime->GetEnd());
+                    firstGrid->SetEndTime(timeManager->GetEnd());
                 }
             }
             break;
@@ -336,23 +325,23 @@ void cChannelColumn::ClearOutdatedStart() {
     }
 }
 
-void cChannelColumn::ClearOutdatedEnd() {
-    cGrid *lastGrid = NULL;
+void cChannelEpg::ClearOutdatedEnd() {
+    cGridElement *lastGrid = NULL;
     while (true) {
         lastGrid = grids.Last();    
         if (!lastGrid)
             break;
-        if (lastGrid->StartTime() >= myTime->GetEnd()) {
+        if (lastGrid->StartTime() >= timeManager->GetEnd()) {
             grids.Del(lastGrid);
             lastGrid = NULL;
         } else {
             if (lastGrid->isDummy()) {
-                lastGrid->SetEndTime(myTime->GetEnd());
-                cGrid *prev = getPrev(lastGrid);
+                lastGrid->SetEndTime(timeManager->GetEnd());
+                cGridElement *prev = getPrev(lastGrid);
                 if (prev) {
                     lastGrid->SetStartTime(prev->EndTime());
                 } else {
-                    lastGrid->SetStartTime(myTime->GetStart());
+                    lastGrid->SetStartTime(timeManager->GetStart());
                 }
             }
             break;
@@ -360,8 +349,8 @@ void cChannelColumn::ClearOutdatedEnd() {
     }
 }
 
-cGrid *cChannelColumn::addEpgGrid(const cEvent *event, cGrid *firstGrid, bool color) {
-    cGrid *grid = new cEpgGrid(this, event);
+cGridElement *cChannelEpg::addEpgGrid(const cEvent *event, cGridElement *firstGrid, bool color) {
+    cGridElement *grid = new cEpgGrid(this, event);
     grid->setText();
     grid->SetColor(color);
     if (!firstGrid)
@@ -371,8 +360,8 @@ cGrid *cChannelColumn::addEpgGrid(const cEvent *event, cGrid *firstGrid, bool co
     return grid;
 }
 
-cGrid *cChannelColumn::addDummyGrid(time_t start, time_t end, cGrid *firstGrid, bool color) {
-    cGrid *dummy = new cDummyGrid(this, start, end);
+cGridElement *cChannelEpg::addDummyGrid(time_t start, time_t end, cGridElement *firstGrid, bool color) {
+    cGridElement *dummy = new cDummyGrid(this, start, end);
     dummy->setText();
     dummy->SetColor(color);
     if (!firstGrid)
@@ -382,26 +371,15 @@ cGrid *cChannelColumn::addDummyGrid(time_t start, time_t end, cGrid *firstGrid,
     return dummy;
 }
 
-void cChannelColumn::SetTimers() {
-#if VDRVERSNUM >= 20301
-    hasTimer = false;
-    const cSchedule *Schedule = NULL;
-    {
-    LOCK_SCHEDULES_READ;
-    const cSchedules* schedules = Schedules;
-    if (schedules) {
-        Schedule = schedules->GetSchedule(channel);
-        hasTimer = Schedule ? Schedule->HasTimer() : false;
-        }
-    }
-#else
+void cChannelEpg::SetTimers() {
+#if VDRVERSNUM < 20301
     hasTimer = channel->HasTimer();
 #endif
     hasSwitchTimer = SwitchTimers.ChannelInSwitchList(channel);
-    for (cGrid *grid = grids.First(); grid; grid = grids.Next(grid)) {
+    for (cGridElement *grid = grids.First(); grid; grid = grids.Next(grid)) {
         bool gridHadTimer = grid->HasTimer();
         grid->SetTimer();
-        if (gridHadTimer != grid->HasTimer())
+        if (gridHadTimer || gridHadTimer != grid->HasTimer())
             grid->SetDirty();
         bool gridHadSwitchTimer = grid->HasSwitchTimer();
         grid->SetSwitchTimer();
@@ -411,11 +389,11 @@ void cChannelColumn::SetTimers() {
     }
 }
 
-void cChannelColumn::dumpGrids() {
+void cChannelEpg::dumpGrids() {
     esyslog("tvguide: ------Channel %s %d: %d entires ---------", channel->Name(), num, grids.Count());
     int i=1;
-    for (cGrid *grid = grids.First(); grid; grid = grids.Next(grid)) {
-        esyslog("tvguide: grid %d: start: %s, stop: %s", i, *cMyTime::printTime(grid->StartTime()), *cMyTime::printTime(grid->EndTime()));
+    for (cGridElement *grid = grids.First(); grid; grid = grids.Next(grid)) {
+        esyslog("tvguide: grid %d: start: %s, stop: %s", i, *cTimeManager::printTime(grid->StartTime()), *cTimeManager::printTime(grid->EndTime()));
         i++;
     }
 }

channelepg.h

@@ -1,25 +1,25 @@
-#ifndef __TVGUIDE_CHANNELCOLUMN_H
-#define __TVGUIDE_CHANNELCOLUMN_H
+#ifndef __TVGUIDE_CHANNELEPG_H
+#define __TVGUIDE_CHANNELEPG_H
 
 #include <vdr/tools.h>
-#include "grid.h"
+#include "gridelement.h"
 #include "epggrid.h"
 #include "headergrid.h"
 #include "switchtimer.h"
 
-class cGrid;
+class cGridElement;
 class cEpgGrid;
 class cHeaderGrid;
 
-// --- cChannelColumn  -------------------------------------------------------------
+// --- cChannelEpg  -------------------------------------------------------------
 
-class cChannelColumn : public cListObject, public cStyledPixmap {
+class cChannelEpg : public cListObject, public cStyledPixmap {
 private:
-    cMyTime *myTime;
+    cTimeManager *timeManager;
     int num;
     const cChannel *channel;
     cHeaderGrid *header;
-    cList<cGrid> grids;
+    cList<cGridElement> grids;
 #if VDRVERSNUM >= 20301
 #else
     cSchedulesLock *schedulesLock;
@@ -27,26 +27,26 @@ private:
     const cSchedules *schedules;
     bool hasTimer;
     bool hasSwitchTimer;
-    cGrid *addEpgGrid(const cEvent *event, cGrid *firstGrid, bool color);
-    cGrid *addDummyGrid(time_t start, time_t end, cGrid *firstGrid, bool color);
+    cGridElement *addEpgGrid(const cEvent *event, cGridElement *firstGrid, bool color);
+    cGridElement *addDummyGrid(time_t start, time_t end, cGridElement *firstGrid, bool color);
 public:
-    cChannelColumn(int num, const cChannel *channel, cMyTime *myTime);
-    virtual ~cChannelColumn(void);
+    cChannelEpg(int num, const cChannel *channel, cTimeManager *timeManager);
+    virtual ~cChannelEpg(void);
     void createHeader();
     void drawHeader();
     bool readGrids();
     void drawGrids();
     int getX();
     int getY();
-    int Start() { return myTime->GetStart(); };
-    int Stop()  { return myTime->GetEnd(); };
+    int Start() { return timeManager->GetStart(); };
+    int Stop()  { return timeManager->GetEnd(); };
     const char* Name() { return channel->Name(); };
     const cChannel *getChannel() {return channel;}
-    cGrid * getActive();
-    cGrid * getNext(cGrid *activeGrid);
-    cGrid * getPrev(cGrid *activeGrid);
-    cGrid * getNeighbor(cGrid *activeGrid);
-    bool isFirst(cGrid *grid);
+    cGridElement *getActive();
+    cGridElement *getNext(cGridElement *activeGrid);
+    cGridElement *getPrev(cGridElement *activeGrid);
+    cGridElement *getNeighbor(cGridElement *activeGrid);
+    bool isFirst(cGridElement *grid);
     void AddNewGridsAtStart();
     void AddNewGridsAtEnd();
     void ClearOutdatedStart();
@@ -66,4 +66,4 @@ public:
     void dumpGrids();
 };
 
-#endif //__TVGUIDE_CHANNELCOLUMN_H
+#endif //__TVGUIDE_CHANNELEPG_H

channelgroup.c

@@ -36,12 +36,12 @@ void cChannelGroupGrid::SetBackground() {
 
 void cChannelGroupGrid::SetGeometry(int start, int end) {
     int x, y, width, height;
-    if (tvguideConfig.displayMode == eVertical) {
+    if (config.displayMode == eVertical) {
         x = geoManager.timeLineWidth + start*geoManager.colWidth;
         y = geoManager.statusHeaderHeight;
         width = (end - start + 1) * geoManager.colWidth;
         height = geoManager.channelGroupsHeight;
-    } else if (tvguideConfig.displayMode == eHorizontal) {
+    } else if (config.displayMode == eHorizontal) {
         x = 0;
         y = geoManager.statusHeaderHeight +  geoManager.timeLineHeight + start*geoManager.rowHeight;
         width = geoManager.channelGroupsWidth;
@@ -51,17 +51,17 @@ void cChannelGroupGrid::SetGeometry(int start, int end) {
 }
 
 void cChannelGroupGrid::Draw(void) {
-    if (tvguideConfig.style == eStyleGraphical) {
+    if (config.style == eStyleGraphical) {
         drawBackgroundGraphical(bgChannelGroup);
     } else {
         drawBackground();
         drawBorder();
     }
     tColor colorText = theme.Color(clrFont);
-    tColor colorTextBack = (tvguideConfig.style == eStyleFlat)?color:clrTransparent;
-    if (tvguideConfig.displayMode == eVertical) {
+    tColor colorTextBack = (config.style == eStyleFlat)?color:clrTransparent;
+    if (config.displayMode == eVertical) {
         DrawVertical(colorText, colorTextBack);
-    } else if (tvguideConfig.displayMode == eHorizontal) {
+    } else if (config.displayMode == eHorizontal) {
         DrawHorizontal(colorText, colorTextBack);
     }
 }

channelgroups.c

@@ -1,4 +1,5 @@
 #include <vector>
+#include "config.h"
 #include "channelgroups.h"
 
 cChannelGroups::cChannelGroups(void) {
@@ -12,19 +13,16 @@ void cChannelGroups::ReadChannelGroups(void) {
     int lastChannelNumber = 0;
 #if VDRVERSNUM >= 20301
     LOCK_CHANNELS_READ;
-    const cChannel *first = Channels->First();
+    const cChannels *channels = Channels;
 #else
-    const cChannel *first = Channels.First();
+    const cChannels *channels = &Channels;
 #endif
+    const cChannel *first = channels->First();
     if (!first->GroupSep()) {
         channelGroups.push_back(cChannelGroup(tr("Main Program")));
         setStart = true;
     }    
-#if VDRVERSNUM >= 20301
-    for (const cChannel *channel = Channels->First(); channel; channel = Channels->Next(channel)) {
-#else
-    for (const cChannel *channel = Channels.First(); channel; channel = Channels.Next(channel)) {
-#endif
+    for (const cChannel *channel = channels->First(); channel; channel = channels->Next(channel)) {
         if (setStart && (channelGroups.size() > 0)) {
             channelGroups[channelGroups.size() - 1].SetChannelStart(channel->Number());
             setStart = false;
@@ -41,7 +39,7 @@ void cChannelGroups::ReadChannelGroups(void) {
     }
     if (channelGroups.size() > 0) {
         channelGroups[channelGroups.size() - 1].SetChannelStop(lastChannelNumber);
-        if ((tvguideConfig.hideLastGroup)&&(channelGroups.size() > 1)) {
+        if ((config.hideLastGroup) && (channelGroups.size() > 1)) {
             channelGroups.pop_back();
         }
     }
@@ -69,7 +67,7 @@ const char* cChannelGroups::GetPrev(int group) {
 
 const char* cChannelGroups::GetNext(int group) {
     if (group > -1) {
-        if ((group+1) < channelGroups.size())
+        if ((group+1) < (int)channelGroups.size())
             return channelGroups[group+1].GetName();
     }
     return "";
@@ -89,14 +87,14 @@ int cChannelGroups::GetNextGroupChannelNumber(const cChannel *channel) {
     int currentGroup = GetGroup(channel);
     if (currentGroup == -1)
         return 0;
-    if ((currentGroup+1) < channelGroups.size()) {
+    if ((currentGroup+1) < (int)channelGroups.size()) {
         return channelGroups[currentGroup+1].StartChannel();
     }
     return 0;
 }
 
 bool cChannelGroups::IsInLastGroup(const cChannel *channel) {
-    if (!tvguideConfig.hideLastGroup)
+    if (!config.hideLastGroup)
         return false;
     if (channelGroups.size() > 0) {
         if (channel->Number() > channelGroups[channelGroups.size()-1].StopChannel()) {
@@ -145,9 +143,15 @@ void cChannelGroups::CreateGroupGrid(const char *name, int number, int start, in
 }
 
 int cChannelGroups::GetLastValidChannel(void) {
-    if (channelGroups.size() > 0)
+    if (config.hideLastGroup && channelGroups.size() > 0) {
         return channelGroups[channelGroups.size() - 1].StopChannel();
-    return 0;
+    }
+#if VDRVERSNUM >= 20301
+   LOCK_CHANNELS_READ;
+   return Channels->MaxNumber();
+#else
+   return Channels.MaxNumber();
+#endif
 }
 
 void cChannelGroups::DumpGroups(void) {

channelgroups.h

@@ -3,6 +3,7 @@
 
 #include <vector>
 #include <vdr/channels.h>
+#include "config.h"
 #include "channelgroup.h"
 
 // --- cChannelGroups  -------------------------------------------------------------

channeljump.c

@@ -6,22 +6,13 @@
 #include "channelgroups.h"
 #include "channeljump.h"
 
-cChannelJump::cChannelJump(cChannelGroups *channelGroups) {
+cChannelJump::cChannelJump(cChannelGroups *channelGroups, int lastValidChannel) {
     this->channelGroups = channelGroups;
     pixmapText = NULL;
     channel = 0;
-	if (!tvguideConfig.hideLastGroup) {
-#if VDRVERSNUM >= 20301
-        LOCK_CHANNELS_READ;
-        maxChannels = Channels->MaxNumber();
-#else
-        maxChannels = Channels.MaxNumber();
-#endif
-	} else {
-        maxChannels = channelGroups->GetLastValidChannel();
-    }
+    maxChannels = lastValidChannel;
     timeout = Setup.ChannelEntryTimeout;
-    startTime = cTimeMs::Now();
+    startTime = 0;
     SetPixmaps();
     Draw();
 }
@@ -41,7 +32,7 @@ void cChannelJump::SetPixmaps(void) {
 }
 
 void cChannelJump::Draw(void) {
-	if (tvguideConfig.style == eStyleGraphical) {
+	if (config.style == eStyleGraphical) {
         drawBackgroundGraphical(bgChannelJump);
 	} else {
         pixmap->Fill(theme.Color(clrBackground));

channeljump.h

@@ -10,15 +10,15 @@ private:
     int channel;
     cChannelGroups *channelGroups;
     int maxChannels;
-    int startTime;
-    int timeout;
+    long unsigned int startTime;
+    long unsigned int timeout;
     cPixmap *pixmapBack;
     cPixmap *pixmapText;
     void SetPixmaps(void);
     void Draw(void);
     cString BuildChannelString(void);
 public:
-    cChannelJump(cChannelGroups *channelGroups);
+    cChannelJump(cChannelGroups *channelGroups, int lastValidChannel);
     virtual ~cChannelJump(void);
     void Set(int num);
     void DrawText(void);

config.c

@@ -1,7 +1,7 @@
 #include <string>
 #include "config.h"
 
-cTvguideConfig::cTvguideConfig() {
+cTVGuideConfig::cTVGuideConfig() {
     debugImageLoading = 0;
     showMainMenuEntry = 1;
     replaceOriginalSchedule = 0;
@@ -10,6 +10,7 @@ cTvguideConfig::cTvguideConfig() {
     channelCols = 5;
     channelRows = 10;
     displayTime = 160;
+    displayHorizontalTime = 160;
     displayStatusHeader = 1;
     displayChannelGroups = 1;
     displayTimeBase = 1;
@@ -64,6 +65,8 @@ cTvguideConfig::cTvguideConfig() {
     favLimitChannels = 0;
     favStartChannel = 0;
     favStopChannel = 0;
+    switchMode = 0;
+    switchMinsBefore = 2;
     fontIndex = 0;
     fontNameDefault = "VDRSymbols Sans:Book";
     FontButtonDelta = 0;
@@ -109,15 +112,15 @@ cTvguideConfig::cTvguideConfig() {
     iconsPathSet = false;
 }
 
-cTvguideConfig::~cTvguideConfig() {
+cTVGuideConfig::~cTVGuideConfig() {
 }
 
-void cTvguideConfig::setDynamicValues() {
+void cTVGuideConfig::setDynamicValues() {
     numGrids = (displayMode == eVertical)?channelCols:channelRows;
     jumpChannels = numGrids;
 }
 
-bool cTvguideConfig::LoadTheme() {
+bool cTVGuideConfig::LoadTheme() {
     //is correct theme already loaded?
     if (nOpacityTheme.size() == 0)
         nOpacityTheme = Setup.OSDTheme;
@@ -175,7 +178,7 @@ bool cTvguideConfig::LoadTheme() {
 }
 
 
-void cTvguideConfig::SetStyle(void) {
+void cTVGuideConfig::SetStyle(void) {
     if (theme.Color(clrStyle) == CLR_STYLE_FLAT) {
         style = eStyleFlat;
         esyslog("tvguide: set flat style");
@@ -192,25 +195,25 @@ void cTvguideConfig::SetStyle(void) {
     
 }
 
-void cTvguideConfig::SetLogoPath(cString path) {
+void cTVGuideConfig::SetLogoPath(cString path) {
     logoPath = checkSlashAtEnd(*path);
     logoPathSet = true;
     esyslog("tvguide: Logo Path set to %s", *logoPath);
 }
 
-void cTvguideConfig::SetImagesPath(cString path) {
+void cTVGuideConfig::SetImagesPath(cString path) {
     epgImagePath = checkSlashAtEnd(*path);
     imagesPathSet = true;
     esyslog("tvguide: EPG Image Path set to %s", *epgImagePath);
 }
 
-void cTvguideConfig::SetIconsPath(cString path) {
+void cTVGuideConfig::SetIconsPath(cString path) {
     iconPath = checkSlashAtEnd(*path);
     iconsPathSet = true;
     esyslog("tvguide: Icon Path set to %s", *iconPath);
 }
 
-void cTvguideConfig::SetDefaultPathes(void) {
+void cTVGuideConfig::SetDefaultPathes(void) {
     logoPathDefault = cString::sprintf("%s/logos/", cPlugin::ResourceDirectory(PLUGIN_NAME_I18N));
     iconPathDefault = cString::sprintf("%s/icons/", cPlugin::ResourceDirectory(PLUGIN_NAME_I18N));
     epgImagePathDefault = cString::sprintf("%s/epgimages/", cPlugin::CacheDirectory(PLUGIN_NAME_I18N));
@@ -226,7 +229,7 @@ void cTvguideConfig::SetDefaultPathes(void) {
     }
 }
 
-cString cTvguideConfig::checkSlashAtEnd(std::string path) {
+cString cTVGuideConfig::checkSlashAtEnd(std::string path) {
     try {
         if (!(path.at(path.size()-1) == '/'))
             return cString::sprintf("%s/", path.c_str());
@@ -234,7 +237,7 @@ cString cTvguideConfig::checkSlashAtEnd(std::string path) {
     return path.c_str();
 }
 
-bool cTvguideConfig::SetupParse(const char *Name, const char *Value) {
+bool cTVGuideConfig::SetupParse(const char *Name, const char *Value) {
     if      (strcmp(Name, "timeFormat") == 0)               timeFormat = atoi(Value);
     else if (strcmp(Name, "debugImageLoading") == 0)        debugImageLoading = atoi(Value);
     else if (strcmp(Name, "showMainMenuEntry") == 0)        showMainMenuEntry = atoi(Value);
@@ -255,6 +258,7 @@ bool cTvguideConfig::SetupParse(const char *Name, const char *Value) {
     else if (strcmp(Name, "channelCols") == 0)              channelCols = atoi(Value);
     else if (strcmp(Name, "channelRows") == 0)              channelRows = atoi(Value);
     else if (strcmp(Name, "displayTime") == 0)              displayTime = atoi(Value);
+    else if (strcmp(Name, "displayHorizontalTime") == 0)    displayHorizontalTime = atoi(Value);
     else if (strcmp(Name, "hideChannelLogos") == 0)         hideChannelLogos = atoi(Value);
     else if (strcmp(Name, "logoExtension") == 0)            logoExtension = atoi(Value);
     else if (strcmp(Name, "logoWidthRatio") == 0)           logoWidthRatio = atoi(Value);
@@ -299,6 +303,8 @@ bool cTvguideConfig::SetupParse(const char *Name, const char *Value) {
     else if (strcmp(Name, "favLimitChannels") == 0)         favLimitChannels = atoi(Value);
     else if (strcmp(Name, "favStartChannel") == 0)          favStartChannel = atoi(Value);
     else if (strcmp(Name, "favStopChannel") == 0)           favStopChannel = atoi(Value);
+    else if (strcmp(Name, "switchMode") == 0)               switchMode = atoi(Value);
+    else if (strcmp(Name, "switchMinsBefore") == 0)         switchMinsBefore = atoi(Value);
     else if (strcmp(Name, "fontIndex") == 0)                fontIndex = atoi(Value);
     else if (strcmp(Name, "FontButtonDelta") == 0)          FontButtonDelta = atoi(Value);
     else if (strcmp(Name, "FontDetailViewDelta") == 0)      FontDetailViewDelta = atoi(Value);

config.h

@@ -43,12 +43,12 @@ enum eInstRecFolderMode {
     eFolderFixed
 };
 
-class cTvguideConfig {
+class cTVGuideConfig {
     private:
         cString checkSlashAtEnd(std::string path);
     public:
-        cTvguideConfig();
-        ~cTvguideConfig();
+        cTVGuideConfig();
+        ~cTVGuideConfig();
         int debugImageLoading;
         int showMainMenuEntry;
         int replaceOriginalSchedule;
@@ -58,6 +58,7 @@ class cTvguideConfig {
         int channelRows;
         int numGrids;
         int displayTime;
+        int displayHorizontalTime;
         int displayStatusHeader;
         int displayChannelGroups;
         int displayTimeBase;
@@ -118,6 +119,8 @@ class cTvguideConfig {
         int favLimitChannels;
         int favStartChannel;
         int favStopChannel;
+	int switchMode;
+        int switchMinsBefore;
         int fontIndex;
         const char *fontNameDefault;
         int FontButtonDelta;
@@ -172,7 +175,7 @@ class cTvguideConfig {
 };
 
 #ifdef DEFINE_CONFIG
-    cTvguideConfig tvguideConfig;
+    cTVGuideConfig config;
     cOsdManager osdManager;
     cGeometryManager geoManager;
     cFontManager fontManager;
@@ -180,7 +183,7 @@ class cTvguideConfig {
     cTheme theme;
     cPlugin* pRemoteTimers = NULL;
 #else
-    extern cTvguideConfig tvguideConfig;
+    extern cTVGuideConfig config;
     extern cOsdManager osdManager;
     extern cGeometryManager geoManager;
     extern cFontManager fontManager;

detailview.c

@@ -1,12 +1,12 @@
 #include "detailview.h"
 
-cDetailView::cDetailView(const cEvent *event, cFooter *footer) {
+cDetailView::cDetailView(const cEvent *event, cFooter *footer) : cThread("DetailView") {
     this->event = event;
     this->footer = footer;
 }
 
 cDetailView::~cDetailView(void){
-    Cancel(-1);
+    Cancel(3);
     while (Active())
         cCondWait::SleepMs(10);
 #if VDRVERSNUM >= 20301
@@ -74,8 +74,8 @@ std::string cDetailView::LoadReruns(void) {
     Epgsearch_searchresults_v1_0 data;
     std::string strQuery = event->Title();
 
-    if (tvguideConfig.displayRerunsDetailEPGView > 0) {
-        if (tvguideConfig.useSubtitleRerun == 2 && !isempty(event->ShortText())) {
+    if (config.displayRerunsDetailEPGView > 0) {
+        if (config.useSubtitleRerun == 2 && !isempty(event->ShortText())) {
             strQuery += "~";
             strQuery += event->ShortText();
         }
@@ -95,7 +95,7 @@ std::string cDetailView::LoadReruns(void) {
         if (list && (list->Count() > 1)) {
             foundRerun = true;
             int i = 0;
-            for (Epgsearch_searchresults_v1_0::cServiceSearchResult *r = list->First(); r && i < tvguideConfig.numReruns; r = list->Next(r)) {
+            for (Epgsearch_searchresults_v1_0::cServiceSearchResult *r = list->First(); r && i < config.numReruns; r = list->Next(r)) {
                 if ((event->ChannelID() == r->event->ChannelID()) && (event->StartTime() == r->event->StartTime()))
                     continue;
                 i++;

dummygrid.c

@@ -1,6 +1,6 @@
 #include "dummygrid.h"
 
-cDummyGrid::cDummyGrid(cChannelColumn *c, time_t start, time_t end) : cGrid(c) {
+cDummyGrid::cDummyGrid(cChannelEpg *c, time_t start, time_t end) : cGridElement(c) {
     this->start = start;
     this->end = end;
     strText = tr("No EPG Information available");
@@ -27,7 +27,7 @@ void cDummyGrid::SetViewportHeight() {
 
 void cDummyGrid::PositionPixmap() {
     int x0, y0;
-    if (tvguideConfig.displayMode == eVertical) {
+    if (config.displayMode == eVertical) {
         x0 = column->getX();
         y0 = geoManager.statusHeaderHeight + geoManager.channelHeaderHeight + geoManager.channelGroupsHeight;
         if ( column->Start() < StartTime() ) {
@@ -41,7 +41,7 @@ void cDummyGrid::PositionPixmap() {
         } else {
             pixmap->SetViewPort(cRect(x0, y0, geoManager.colWidth, viewportHeight));
         }
-    } else if (tvguideConfig.displayMode == eHorizontal) {
+    } else if (config.displayMode == eHorizontal) {
         x0 = geoManager.channelHeaderWidth + geoManager.channelGroupsWidth;
         y0 = column->getY();
         if ( column->Start() < StartTime() ) {
@@ -59,7 +59,7 @@ void cDummyGrid::PositionPixmap() {
 }
 
 void cDummyGrid::setText() {
-    if (tvguideConfig.displayMode == eVertical) {
+    if (config.displayMode == eVertical) {
         text->Set(*strText, fontManager.FontGrid, geoManager.colWidth-2*borderWidth);
     }
 }
@@ -67,13 +67,13 @@ void cDummyGrid::setText() {
 void cDummyGrid::drawText() {
     tColor colorText = (active)?theme.Color(clrFontActive):theme.Color(clrFont);
     tColor colorTextBack;
-    if (tvguideConfig.style == eStyleFlat)
+    if (config.style == eStyleFlat)
         colorTextBack = color;
-    else if (tvguideConfig.style == eStyleGraphical)
+    else if (config.style == eStyleGraphical)
         colorTextBack = (active)?theme.Color(clrGridActiveFontBack):theme.Color(clrGridFontBack);
     else
         colorTextBack = clrTransparent;
-    if (tvguideConfig.displayMode == eVertical) {
+    if (config.displayMode == eVertical) {
         if (Height()/geoManager.minutePixel < 6)
             return;
         int textHeight = fontManager.FontGrid->Height();
@@ -82,7 +82,7 @@ void cDummyGrid::drawText() {
             pixmap->DrawText(cPoint(borderWidth, borderWidth + i*textHeight), text->GetLine(i), colorText, colorTextBack, fontManager.FontGrid);
         
         }
-    } else if (tvguideConfig.displayMode == eHorizontal) {
+    } else if (config.displayMode == eHorizontal) {
         if (Width()/geoManager.minutePixel < 10) {
             int titleY = (geoManager.rowHeight - fontManager.FontGridHorizontal->Height())/2;
             pixmap->DrawText(cPoint(borderWidth - 2, titleY), "...", colorText, colorTextBack, fontManager.FontGridHorizontal);
@@ -103,8 +103,8 @@ cString cDummyGrid::getTimeString(void) {
 void cDummyGrid::debug() {
     esyslog("tvguide dummygrid: %s: %s, %s, viewportHeight: %d px, Duration: %ld min, active: %d", 
                 column->Name(),
-                *cMyTime::printTime(start), 
-                *cMyTime::printTime(end), 
+                *cTimeManager::printTime(start), 
+                *cTimeManager::printTime(end), 
                 viewportHeight, 
                 Duration()/60,
                 active);

dummygrid.h

@@ -1,12 +1,12 @@
 #ifndef __TVGUIDE_DUMMYGRID_H
 #define __TVGUIDE_DUMMYGRID_H
 
-#include "grid.h"
-#include "channelcolumn.h"
+#include "gridelement.h"
+#include "channelepg.h"
 
 // --- cDummyGrid  -------------------------------------------------------------
 
-class cDummyGrid : public cGrid {
+class cDummyGrid : public cGridElement {
 private:
     time_t start;
     time_t end;
@@ -14,7 +14,7 @@ private:
     void drawText();
     time_t Duration(void);
 public:
-    cDummyGrid(cChannelColumn *c, time_t start, time_t end);
+    cDummyGrid(cChannelEpg *c, time_t start, time_t end);
     virtual ~cDummyGrid(void);
     void SetViewportHeight();
     void PositionPixmap();
@@ -24,7 +24,7 @@ public:
     time_t EndTime() { return end; };
     void SetStartTime(time_t start) { this->start = start; };
     void SetEndTime(time_t end) { this->end = end; };
-    int calcOverlap(cGrid *neighbor);
+    int calcOverlap(cGridElement *neighbor);
     void setTimer() {};
     cString getText(void);
     cString getTimeString(void);

epggrid.c

@@ -1,9 +1,9 @@
 #include "services/remotetimers.h"
-#include "channelcolumn.h"
+#include "channelepg.h"
 #include "tools.h"
 #include "epggrid.h"
 
-cEpgGrid::cEpgGrid(cChannelColumn *c, const cEvent *event)  : cGrid(c) {
+cEpgGrid::cEpgGrid(cChannelEpg *c, const cEvent *event)  : cGridElement(c) {
     this->event = event;
     extText = new cTextWrapper();
     hasTimer = false;
@@ -33,7 +33,7 @@ void cEpgGrid::SetViewportHeight() {
 }
 
 void cEpgGrid::PositionPixmap() {
-    if (tvguideConfig.displayMode == eVertical) {
+    if (config.displayMode == eVertical) {
         int x0 = column->getX();
         int y0 = geoManager.statusHeaderHeight + geoManager.channelHeaderHeight + geoManager.channelGroupsHeight;
         if ( column->Start() < StartTime() ) {
@@ -45,7 +45,7 @@ void cEpgGrid::PositionPixmap() {
         } else {
             pixmap->SetViewPort(cRect(x0, y0, geoManager.colWidth, viewportHeight));
         }
-    } else if (tvguideConfig.displayMode == eHorizontal) {
+    } else if (config.displayMode == eHorizontal) {
         int x0 = geoManager.channelHeaderWidth + geoManager.channelGroupsWidth;
         int y0 = column->getY();
         if ( column->Start() < StartTime() ) {
@@ -62,22 +62,23 @@ void cEpgGrid::PositionPixmap() {
 }
 
 void cEpgGrid::SetTimer() {
-    if (tvguideConfig.useRemoteTimers && pRemoteTimers) {
+    hasTimer = false;
+    if (config.useRemoteTimers && pRemoteTimers) {
         RemoteTimers_Event_v1_0 rt;
         rt.event = event;
         if (pRemoteTimers->Service("RemoteTimers::GetTimerByEvent-v1.0", &rt))
             hasTimer = true;
-	else
-	    hasTimer = false;
-#if VDRVERSNUM >= 30400
-    } else if (event->HasTimer()) {
+#if VDRVERSNUM >= 20301
+    } else {
+        eTimerMatch TimerMatch = tmNone;
+        LOCK_TIMERS_READ;
+        const cTimers *timers = Timers;
+        if (timers->GetMatch(event, &TimerMatch) && (TimerMatch == tmFull))
             hasTimer = true;
 #else
     } else if (column->HasTimer()) {
         hasTimer = event->HasTimer();
 #endif
-    } else {
-        hasTimer = false;
     }
 }
 
@@ -90,12 +91,12 @@ void cEpgGrid::SetSwitchTimer() {
 }
 
 void cEpgGrid::setText() {
-    if (tvguideConfig.displayMode == eVertical) {
+    if (config.displayMode == eVertical) {
         cString strText;
         strText = cString::sprintf("%s - %s:\n%s", *(event->GetTimeString()), *(event->GetEndTimeString()), event->Title());
         text->Set(*(strText), fontManager.FontGrid, geoManager.colWidth-2*borderWidth);
         extText->Set(event->ShortText(), fontManager.FontGridSmall, geoManager.colWidth-2*borderWidth);
-    } else if (tvguideConfig.displayMode == eHorizontal) {
+    } else if (config.displayMode == eHorizontal) {
         timeString = cString::sprintf("%s - %s", *(event->GetTimeString()), *(event->GetEndTimeString()));
     }
 }
@@ -103,13 +104,13 @@ void cEpgGrid::setText() {
 void cEpgGrid::drawText() {
     tColor colorText = (active)?theme.Color(clrFontActive):theme.Color(clrFont);
     tColor colorTextBack;
-    if (tvguideConfig.style == eStyleFlat)
+    if (config.style == eStyleFlat)
         colorTextBack = color;
-    else if (tvguideConfig.style == eStyleGraphical)
+    else if (config.style == eStyleGraphical)
         colorTextBack = (active)?theme.Color(clrGridActiveFontBack):theme.Color(clrGridFontBack);
     else
         colorTextBack = clrTransparent;
-    if (tvguideConfig.displayMode == eVertical) {
+    if (config.displayMode == eVertical) {
         if (Height()/geoManager.minutePixel < 6)
             return;
         int textHeight = fontManager.FontGrid->Height();
@@ -125,7 +126,7 @@ void cEpgGrid::drawText() {
                 pixmap->DrawText(cPoint(borderWidth, borderWidth + offset + i*textHeight), extText->GetLine(i), colorText, colorTextBack, fontManager.FontGridSmall);
             }
         }
-    } else if (tvguideConfig.displayMode == eHorizontal) {
+    } else if (config.displayMode == eHorizontal) {
         if (Width()/geoManager.minutePixel < 10) {
             int titleY = (geoManager.rowHeight - fontManager.FontGridHorizontal->Height())/2;
             pixmap->DrawText(cPoint(borderWidth - 2, titleY), "...", colorText, colorTextBack, fontManager.FontGridHorizontal);
@@ -133,7 +134,7 @@ void cEpgGrid::drawText() {
         }
         cString strTitle = CutText(event->Title(), viewportHeight, fontManager.FontGridHorizontal).c_str();
         int titleY = 0;
-        if (tvguideConfig.showTimeInGrid) {
+        if (config.showTimeInGrid) {
             pixmap->DrawText(cPoint(borderWidth, borderWidth), *timeString, colorText, colorTextBack, fontManager.FontGridHorizontalSmall);
             titleY = fontManager.FontGridHorizontalSmall->Height() + (geoManager.rowHeight - fontManager.FontGridHorizontalSmall->Height() - fontManager.FontGridHorizontal->Height())/2;
         } else {
@@ -145,12 +146,16 @@ void cEpgGrid::drawText() {
         drawIcon("Switch", theme.Color(clrButtonYellow));
     if (hasTimer) {
         const cTimer *timer = NULL;
+#if VDRVERSNUM >= 20301
         {
         LOCK_TIMERS_READ;
         timer = Timers->GetMatch(event);
         }
+#else
+        timer = Timers.GetMatch(event);
+#endif
 	if (timer)
-#ifdef USE_SWITCHONLY
+#ifdef SWITCHONLYPATCH
            if (timer->HasFlags(tfSwitchOnly))
               drawIcon("Switch", theme.Color(clrButtonYellow));
            else if (timer->HasFlags(tfActive))
@@ -165,7 +170,7 @@ void cEpgGrid::drawText() {
 
 void cEpgGrid::drawIcon(cString iconText, tColor color) {
 
-    const cFont *font = (tvguideConfig.displayMode == eVertical)
+    const cFont *font = (config.displayMode == eVertical)
                         ?fontManager.FontGrid
                         :fontManager.FontGridHorizontalSmall;
     int textWidth = font->Width(*iconText)+2*borderWidth;

epggrid.h

@@ -2,11 +2,11 @@
 #define __TVGUIDE_EPGGRID_H
 
 #include <vdr/epg.h>
-#include "grid.h"
+#include "gridelement.h"
 
 // --- cEpgGrid  -------------------------------------------------------------
 
-class cEpgGrid : public cGrid {
+class cEpgGrid : public cGridElement {
 private:
     const cTimer *timer;
     const cEvent *event;
@@ -16,7 +16,7 @@ private:
     void drawIcon(cString iconText, tColor color);
     time_t Duration(void) { return event->Duration(); };
 public:
-    cEpgGrid(cChannelColumn *c, const cEvent *event);
+    cEpgGrid(cChannelEpg *c, const cEvent *event);
     virtual ~cEpgGrid(void);
     void SetViewportHeight();
     void PositionPixmap();

fontmanager.c

@@ -12,34 +12,34 @@ cFontManager::~cFontManager() {
 void cFontManager::SetFonts() {
     InitialiseFontType();
     //Common Fonts
-    FontButton = CreateFont(geoManager.footerHeight/3 + 4 + tvguideConfig.FontButtonDelta);
-    FontDetailView = CreateFont(geoManager.osdHeight/30 + tvguideConfig.FontDetailViewDelta);
-    FontDetailViewSmall = CreateFont(geoManager.osdHeight/40 + tvguideConfig.FontDetailViewSmallDelta);
-    FontDetailHeader = CreateFont(geoManager.osdHeight/27 + tvguideConfig.FontDetailHeaderDelta);
-    FontDetailHeaderLarge = CreateFont(geoManager.osdHeight/20 + tvguideConfig.FontDetailHeaderDelta);
-    FontMessageBox = CreateFont(geoManager.osdHeight/33 + tvguideConfig.FontMessageBoxDelta);
-    FontMessageBoxLarge = CreateFont(geoManager.osdHeight/30 + tvguideConfig.FontMessageBoxLargeDelta);    
-    FontStatusHeader = CreateFont(geoManager.statusHeaderHeight/6 - 4 + tvguideConfig.FontStatusHeaderDelta);
-    FontStatusHeaderLarge = CreateFont(geoManager.statusHeaderHeight/5 + tvguideConfig.FontStatusHeaderLargeDelta);
+    FontButton = CreateFont(geoManager.footerHeight/3 + 4 + config.FontButtonDelta);
+    FontDetailView = CreateFont(geoManager.osdHeight/30 + config.FontDetailViewDelta);
+    FontDetailViewSmall = CreateFont(geoManager.osdHeight/40 + config.FontDetailViewSmallDelta);
+    FontDetailHeader = CreateFont(geoManager.osdHeight/27 + config.FontDetailHeaderDelta);
+    FontDetailHeaderLarge = CreateFont(geoManager.osdHeight/20 + config.FontDetailHeaderDelta);
+    FontMessageBox = CreateFont(geoManager.osdHeight/33 + config.FontMessageBoxDelta);
+    FontMessageBoxLarge = CreateFont(geoManager.osdHeight/30 + config.FontMessageBoxLargeDelta);    
+    FontStatusHeader = CreateFont(geoManager.statusHeaderHeight/6 - 4 + config.FontStatusHeaderDelta);
+    FontStatusHeaderLarge = CreateFont(geoManager.statusHeaderHeight/5 + config.FontStatusHeaderLargeDelta);
     //Fonts for vertical Display 
-    FontChannelHeader = CreateFont(geoManager.colWidth/10 + tvguideConfig.FontChannelHeaderDelta);
-    FontChannelGroups = CreateFont(geoManager.colWidth/8 + tvguideConfig.FontChannelGroupsDelta);
-    FontGrid = CreateFont(geoManager.colWidth/12 + tvguideConfig.FontGridDelta);
-    FontGridSmall = CreateFont(geoManager.colWidth/12 + tvguideConfig.FontGridSmallDelta);
-    FontTimeLineWeekday = CreateFont(geoManager.timeLineWidth/3 + tvguideConfig.FontTimeLineWeekdayDelta);
-    FontTimeLineDate = CreateFont(geoManager.timeLineWidth/4 + tvguideConfig.FontTimeLineDateDelta);
-    FontTimeLineTime = CreateFont(geoManager.timeLineWidth/4 + tvguideConfig.FontTimeLineTimeDelta);
+    FontChannelHeader = CreateFont(geoManager.colWidth/10 + config.FontChannelHeaderDelta);
+    FontChannelGroups = CreateFont(geoManager.colWidth/8 + config.FontChannelGroupsDelta);
+    FontGrid = CreateFont(geoManager.colWidth/12 + config.FontGridDelta);
+    FontGridSmall = CreateFont(geoManager.colWidth/12 + config.FontGridSmallDelta);
+    FontTimeLineWeekday = CreateFont(geoManager.timeLineWidth/3 + config.FontTimeLineWeekdayDelta);
+    FontTimeLineDate = CreateFont(geoManager.timeLineWidth/4 + config.FontTimeLineDateDelta);
+    FontTimeLineTime = CreateFont(geoManager.timeLineWidth/4 + config.FontTimeLineTimeDelta);
     //Fonts for horizontal Display 
-    FontChannelHeaderHorizontal = CreateFont(geoManager.rowHeight/3 + tvguideConfig.FontChannelHeaderHorizontalDelta);
-    FontChannelGroupsHorizontal = CreateFont(geoManager.rowHeight/3 + 5 + tvguideConfig.FontChannelGroupsHorizontalDelta);
-    FontGridHorizontal = CreateFont(geoManager.rowHeight/3 + 5 + tvguideConfig.FontGridHorizontalDelta);
-    FontGridHorizontalSmall = CreateFont(geoManager.rowHeight/4 + tvguideConfig.FontGridHorizontalSmallDelta);
-    FontTimeLineDateHorizontal = CreateFont(geoManager.timeLineHeight/2 + 5 + tvguideConfig.FontTimeLineDateHorizontalDelta);
-    FontTimeLineTimeHorizontal = CreateFont(geoManager.timeLineHeight/2 + tvguideConfig.FontTimeLineTimeHorizontalDelta);
+    FontChannelHeaderHorizontal = CreateFont(geoManager.rowHeight/3 + config.FontChannelHeaderHorizontalDelta);
+    FontChannelGroupsHorizontal = CreateFont(geoManager.rowHeight/3 + 5 + config.FontChannelGroupsHorizontalDelta);
+    FontGridHorizontal = CreateFont(geoManager.rowHeight/3 + 5 + config.FontGridHorizontalDelta);
+    FontGridHorizontalSmall = CreateFont(geoManager.rowHeight/4 + config.FontGridHorizontalSmallDelta);
+    FontTimeLineDateHorizontal = CreateFont(geoManager.timeLineHeight/2 + 5 + config.FontTimeLineDateHorizontalDelta);
+    FontTimeLineTimeHorizontal = CreateFont(geoManager.timeLineHeight/2 + config.FontTimeLineTimeHorizontalDelta);
     //Fonts for RecMenu
-    FontRecMenuItem = CreateFont(geoManager.osdHeight/30 + tvguideConfig.FontRecMenuItemDelta);
-    FontRecMenuItemSmall = CreateFont(geoManager.osdHeight/40 + tvguideConfig.FontRecMenuItemSmallDelta);
-    FontRecMenuItemLarge = CreateFont(geoManager.osdHeight/25 + tvguideConfig.FontRecMenuItemLargeDelta);
+    FontRecMenuItem = CreateFont(geoManager.osdHeight/30 + config.FontRecMenuItemDelta);
+    FontRecMenuItemSmall = CreateFont(geoManager.osdHeight/40 + config.FontRecMenuItemSmallDelta);
+    FontRecMenuItemLarge = CreateFont(geoManager.osdHeight/25 + config.FontRecMenuItemLargeDelta);
 }
 
 void cFontManager::DeleteFonts() {
@@ -71,15 +71,15 @@ void cFontManager::DeleteFonts() {
 }
 
 void cFontManager::InitialiseFontType(void) {
-    if (tvguideConfig.fontIndex == 0) {
-        fontName = tvguideConfig.fontNameDefault;
+    if (config.fontIndex == 0) {
+        fontName = config.fontNameDefault;
     } else {
         cStringList availableFonts;
         cFont::GetAvailableFontNames(&availableFonts);
-        if (availableFonts[tvguideConfig.fontIndex-1]) {
-            fontName = availableFonts[tvguideConfig.fontIndex-1];
+        if (availableFonts[config.fontIndex-1]) {
+            fontName = availableFonts[config.fontIndex-1];
         } else 
-            fontName = tvguideConfig.fontNameDefault;
+            fontName = config.fontNameDefault;
     }
     cFont *test = NULL;
     test = cFont::CreateFont(*fontName, 30);

footer.c

@@ -26,7 +26,7 @@ void cFooter::drawRedButton() {
 }
 
 void cFooter::drawGreenButton() {
-    cString text = cString::sprintf("%d %s", tvguideConfig.jumpChannels, tr("Channels back"));
+    cString text = cString::sprintf("%d %s", config.jumpChannels, tr("Channels back"));
     DrawButton(*text, theme.Color(clrButtonGreen), theme.Color(clrButtonGreenBorder), oeButtonGreen, positionButtons[1]);
 }
 
@@ -36,7 +36,7 @@ void cFooter::drawGreenButton(const char *text) {
 }
 
 void cFooter::drawYellowButton() {
-    cString text = cString::sprintf("%d %s", tvguideConfig.jumpChannels, tr("Channels forward"));
+    cString text = cString::sprintf("%d %s", config.jumpChannels, tr("Channels forward"));
     DrawButton(*text, theme.Color(clrButtonYellow), theme.Color(clrButtonYellowBorder), oeButtonYellow, positionButtons[2]);
 }
 
@@ -47,14 +47,14 @@ void cFooter::drawYellowButton(const char *text) {
 
 void cFooter::drawBlueButton(bool detailedEPG) {
     cString text;
-    if (tvguideConfig.blueKeyMode == eBlueKeySwitch)
+    if (config.blueKeyMode == eBlueKeySwitch)
         text = tr("Switch to Channel");
-    else if (tvguideConfig.blueKeyMode == eBlueKeyEPG) {
+    else if (config.blueKeyMode == eBlueKeyEPG) {
         if (!detailedEPG)
             text = tr("Detailed EPG");
         else
             text = tr("Close detailed EPG");
-    } else if (tvguideConfig.blueKeyMode == eBlueKeyFavorites) {
+    } else if (config.blueKeyMode == eBlueKeyFavorites) {
         if (!detailedEPG)
             text = tr("Favorites");
         else
@@ -80,7 +80,7 @@ void cFooter::SetDetailedViewMode(bool fromRecMenu) {
     if (fromRecMenu) {
         ClearButton(positionButtons[0]);
         ClearButton(positionButtons[3]);
-    } else if (tvguideConfig.blueKeyMode != eBlueKeySwitch) {
+    } else if (config.blueKeyMode != eBlueKeySwitch) {
         ClearButton(positionButtons[3]);
         drawBlueButton(true);
     }
@@ -89,7 +89,7 @@ void cFooter::SetDetailedViewMode(bool fromRecMenu) {
 void cFooter::LeaveDetailedViewMode(const cChannel *channel) {
     drawRedButton();
     drawBlueButton();
-    if (tvguideConfig.channelJumpMode == eNumJump) {
+    if (config.channelJumpMode == eNumJump) {
         drawGreenButton();
         drawYellowButton();
     } else {
@@ -128,20 +128,20 @@ void cFooter::SetButtonPositions(void) {
 }
 
 void cFooter::DrawButton(const char *text, tColor color, tColor borderColor, eOsdElementType buttonType, int num) {
-    tColor colorTextBack = (tvguideConfig.style == eStyleFlat)?color:clrTransparent;
+    tColor colorTextBack = (config.style == eStyleFlat)?color:clrTransparent;
     int left = num * geoManager.buttonWidth + (2 * num + 1) * geoManager.buttonBorder;
 
-    if ((tvguideConfig.style == eStyleBlendingMagick) || (tvguideConfig.style == eStyleBlendingDefault)) {
+    if ((config.style == eStyleBlendingMagick) || (config.style == eStyleBlendingDefault)) {
         cImageLoader imgLoader;
         imgLoader.DrawBackground(theme.Color(clrButtonBlend), color, geoManager.buttonWidth-4, geoManager.buttonHeight-4);
         footer->DrawRectangle(cRect(left, buttonY, geoManager.buttonWidth, geoManager.buttonHeight), borderColor);
         footer->DrawImage(cPoint(left+2, buttonY+2), imgLoader.GetImage());    
-        if (tvguideConfig.roundedCorners) {
+        if (config.roundedCorners) {
             int borderRadius = 12;
             int borderWidth = 2;
             DrawRoundedCorners(footer, left, buttonY, geoManager.buttonWidth, geoManager.buttonHeight, borderRadius, borderWidth, borderColor);
         }
-    } else if (tvguideConfig.style == eStyleGraphical) {
+    } else if (config.style == eStyleGraphical) {
         cImage *button = imgCache.GetOsdElement(buttonType);
         if (button) {
             footer->DrawImage(cPoint(left, buttonY), *button);    
@@ -149,7 +149,7 @@ void cFooter::DrawButton(const char *text, tColor color, tColor borderColor, eOs
     } else {
         footer->DrawRectangle(cRect(left, buttonY, geoManager.buttonWidth, geoManager.buttonHeight), borderColor); 
         footer->DrawRectangle(cRect(left+1, buttonY+1, geoManager.buttonWidth-2, geoManager.buttonHeight-2), color);
-        if (tvguideConfig.roundedCorners) {
+        if (config.roundedCorners) {
             int borderRadius = 12;
             int borderWidth = 1;
             DrawRoundedCorners(footer, left, buttonY, geoManager.buttonWidth, geoManager.buttonHeight, borderRadius, borderWidth, borderColor);

geometrymanager.c

@@ -20,50 +20,52 @@ bool cGeometryManager::SetGeometry(int osdWidth, int osdHeight, bool force) {
 	this->osdHeight = osdHeight;
 	esyslog("tvguide: Set OSD to %d x %d px", osdWidth, osdHeight);
 
-	statusHeaderHeight = (tvguideConfig.displayStatusHeader)?(tvguideConfig.headerHeightPercent * osdHeight / 100):0;
+	statusHeaderHeight = (config.displayStatusHeader) ? (config.headerHeightPercent * osdHeight / 100):0;
     tvFrameWidth = statusHeaderHeight * 16 / 9;
-    headerContentWidth = (tvguideConfig.scaleVideo)?(osdWidth -  tvFrameWidth):osdWidth;
-    channelGroupsWidth = (tvguideConfig.displayChannelGroups)?(tvguideConfig.channelGroupsPercent * osdWidth / 100):0;
-    channelGroupsHeight = (tvguideConfig.displayChannelGroups)?(tvguideConfig.channelGroupsPercent * osdHeight / 100):0;
-    channelHeaderWidth = tvguideConfig.channelHeaderWidthPercent * osdWidth / 100;
-    channelHeaderHeight = tvguideConfig.channelHeaderHeightPercent * osdHeight / 100;
-    timeLineWidth = tvguideConfig.timeLineWidthPercent * osdWidth / 100;
-    timeLineHeight = tvguideConfig.timeLineHeightPercent * osdHeight / 100;
-    clockWidth = tvFrameWidth / 3;
-    clockHeight = timeLineHeight;
-    footerHeight = tvguideConfig.footerHeightPercent * osdHeight / 100;
+    headerContentWidth = (config.scaleVideo) ? (osdWidth -  tvFrameWidth):osdWidth;
+    channelGroupsWidth = (config.displayChannelGroups) ? (config.channelGroupsPercent * osdWidth / 100):0;
+    channelGroupsHeight = (config.displayChannelGroups) ? (config.channelGroupsPercent * osdHeight / 100):0;
+    channelHeaderWidth = config.channelHeaderWidthPercent * osdWidth / 100;
+    channelHeaderHeight = config.channelHeaderHeightPercent * osdHeight / 100;
+    timeLineWidth = config.timeLineWidthPercent * osdWidth / 100;
+    timeLineHeight = config.timeLineHeightPercent * osdHeight / 100;
+    footerHeight = config.footerHeightPercent * osdHeight / 100;
     footerY = osdHeight - footerHeight;
 
-    if (tvguideConfig.displayMode == eVertical) {
-        colWidth = (osdWidth - timeLineWidth) / tvguideConfig.channelCols;
+    if (config.displayMode == eVertical) {
+        colWidth = (osdWidth - timeLineWidth) / config.channelCols;
         rowHeight = 0;
-        minutePixel = (osdHeight - statusHeaderHeight - channelGroupsHeight - channelHeaderHeight - footerHeight) / tvguideConfig.displayTime;
+        minutePixel = (osdHeight - statusHeaderHeight - channelGroupsHeight - channelHeaderHeight - footerHeight) / config.displayTime;
         channelLogoWidth = colWidth;
         channelLogoHeight = channelHeaderHeight;
         logoWidth = channelLogoWidth / 2 - 15;
-        logoHeight = logoWidth * tvguideConfig.logoHeightRatio / tvguideConfig.logoWidthRatio;
+        logoHeight = logoWidth * config.logoHeightRatio / config.logoWidthRatio;
         timeLineGridWidth = timeLineWidth;
         timeLineGridHeight = minutePixel * 30;
         dateVieverWidth = timeLineWidth;
-        dateVieverHeight = channelHeaderHeight + channelGroupsHeight;
-    } else if (tvguideConfig.displayMode == eHorizontal) {
+        dateVieverHeight = (channelHeaderHeight + channelGroupsHeight) * 2 / 3;
+        clockWidth = dateVieverWidth;
+        clockHeight = (channelHeaderHeight + channelGroupsHeight) - dateVieverHeight;
+    } else if (config.displayMode == eHorizontal) {
         colWidth = 0;
-        rowHeight = (osdHeight - statusHeaderHeight - timeLineHeight - footerHeight) / tvguideConfig.channelRows;
-        minutePixel = (osdWidth - channelHeaderWidth - channelGroupsWidth) / tvguideConfig.displayTime;
+        rowHeight = (osdHeight - statusHeaderHeight - timeLineHeight - footerHeight) / config.channelRows;
+        minutePixel = (osdWidth - channelHeaderWidth - channelGroupsWidth) / config.displayHorizontalTime;
         channelLogoWidth = channelHeaderWidth;
         channelLogoHeight = rowHeight;
-        logoWidth = channelLogoHeight * tvguideConfig.logoWidthRatio / tvguideConfig.logoHeightRatio;
+        logoWidth = channelLogoHeight * config.logoWidthRatio / config.logoHeightRatio;
         logoHeight = channelLogoHeight;
         timeLineGridWidth = geoManager.minutePixel * 30;
         timeLineGridHeight = geoManager.timeLineHeight;
-        dateVieverWidth = channelHeaderWidth + channelGroupsWidth;
+        dateVieverWidth = (channelHeaderWidth + channelGroupsWidth) * 3 / 5;
         dateVieverHeight = timeLineHeight;
+        clockWidth = (channelHeaderWidth + channelGroupsWidth) - dateVieverWidth;
+        clockHeight = timeLineHeight;
     }
     buttonBorder = footerHeight / 6;
     buttonWidth = osdWidth / 4 - 2 * buttonBorder;
     buttonHeight = footerHeight - 3 * buttonBorder;
 
-    epgViewHeaderHeight = tvguideConfig.headerHeightPercent * osdHeight / 100;
+    epgViewHeaderHeight = config.headerHeightPercent * osdHeight / 100;
 
     borderRecMenus = 10;
 

grid.h

@@ -1,58 +0,0 @@
-#ifndef __TVGUIDE_GRID_H
-#define __TVGUIDE_GRID_H
-
-#include <vdr/tools.h>
-#include "styledpixmap.h"
-
-class cChannelColumn;
-
-// --- cEpgGrid  -------------------------------------------------------------
-
-class cGrid : public cListObject, public cStyledPixmap {
-protected:
-    cTextWrapper *text;
-    int viewportHeight;
-    int borderWidth;
-    void setBackground();
-    bool isColor1;
-    bool active;
-    bool dirty;
-    bool hasTimer;
-    bool hasSwitchTimer;
-    bool intersects(cGrid *neighbor);
-    virtual time_t Duration(void) {};
-    virtual void drawText(void) {};
-    bool dummy;
-public:
-    cGrid(cChannelColumn *c);
-    virtual ~cGrid(void);
-    cChannelColumn *column;
-    virtual void SetViewportHeight() {};
-    virtual void PositionPixmap() {};
-    virtual void setText(void) {};
-    void Draw();
-    void SetDirty() {dirty = true;};
-    void SetActive() {dirty = true; active = true;};
-    void SetInActive() {dirty = true; active = false;};
-    void SetColor(bool color) {isColor1 = color;};
-    bool IsColor1() {return isColor1;};
-    bool isFirst(void);
-    virtual const cEvent *GetEvent() {};
-    bool Match(time_t t);
-    virtual time_t StartTime() {};
-    virtual time_t EndTime() {};
-    virtual void SetStartTime(time_t start) {};
-    virtual void SetEndTime(time_t end) {};
-    int calcOverlap(cGrid *neighbor);
-    virtual void SetTimer() {};
-    virtual void SetSwitchTimer() {};
-    virtual cString getText(void) { return cString("");};
-    virtual cString getTimeString(void) { return cString("");};
-    bool Active(void) { return active; };
-    bool HasTimer() {return hasTimer;};
-    bool HasSwitchTimer() {return hasSwitchTimer;};
-    bool isDummy() { return dummy; };
-    virtual void debug() {};
-};
-
-#endif //__TVGUIDE_GRID_H

gridelement.c

@@ -1,7 +1,7 @@
-#include "channelcolumn.h"
-#include "grid.h"
+#include "channelepg.h"
+#include "gridelement.h"
 
-cGrid::cGrid(cChannelColumn *c) {
+cGridElement::cGridElement(cChannelEpg *c) {
     this->column = c;
     text = new cTextWrapper();
     dirty = true;
@@ -10,11 +10,11 @@ cGrid::cGrid(cChannelColumn *c) {
     borderWidth = 10;
 }
 
-cGrid::~cGrid(void) {
+cGridElement::~cGridElement(void) {
     delete text;
 }
 
-void cGrid::setBackground() {
+void cGridElement::setBackground() {
     if (active) {
         color = theme.Color(clrHighlight);
         colorBlending = theme.Color(clrHighlightBlending);
@@ -29,12 +29,12 @@ void cGrid::setBackground() {
     }
 }
 
-void cGrid::Draw() {
+void cGridElement::Draw() {
     if (!pixmap) {
         return;
     }
     if (dirty) {
-        if (tvguideConfig.style == eStyleGraphical) {
+        if (config.style == eStyleGraphical) {
             drawBackgroundGraphical(bgGrid, active);
             drawText();
         } else {
@@ -48,20 +48,20 @@ void cGrid::Draw() {
     }
 }
 
-bool cGrid::isFirst(void) {
+bool cGridElement::isFirst(void) {
     if (column->isFirst(this))
         return true;
     return false;
 }
 
-bool cGrid::Match(time_t t) {
+bool cGridElement::Match(time_t t) {
     if ((StartTime() < t) && (EndTime() > t))
         return true;
     else
         return false;
 }
 
-int cGrid::calcOverlap(cGrid *neighbor) {
+int cGridElement::calcOverlap(cGridElement *neighbor) {
     int overlap = 0;
     if (intersects(neighbor)) {
         if ((StartTime() <= neighbor->StartTime()) && (EndTime() <= neighbor->EndTime())) {
@@ -77,6 +77,6 @@ int cGrid::calcOverlap(cGrid *neighbor) {
     return overlap;
 }
 
-bool cGrid::intersects(cGrid *neighbor) {
+bool cGridElement::intersects(cGridElement *neighbor) {
     return ! ( (neighbor->EndTime() <= StartTime()) || (neighbor->StartTime() >= EndTime()) ); 
 }

gridelement.h

@@ -0,0 +1,58 @@
+#ifndef __TVGUIDE_GRID_H
+#define __TVGUIDE_GRID_H
+
+#include <vdr/tools.h>
+#include "styledpixmap.h"
+
+class cChannelEpg;
+
+// --- cEpgGrid  -------------------------------------------------------------
+
+class cGridElement : public cListObject, public cStyledPixmap {
+protected:
+    cTextWrapper *text;
+    int viewportHeight;
+    int borderWidth;
+    void setBackground();
+    bool isColor1;
+    bool active;
+    bool dirty;
+    bool hasTimer;
+    bool hasSwitchTimer;
+    bool intersects(cGridElement *neighbor);
+    virtual time_t Duration(void) { return 0; };
+    virtual void drawText(void) {};
+    bool dummy;
+public:
+    cGridElement(cChannelEpg *c);
+    virtual ~cGridElement(void);
+    cChannelEpg *column;
+    virtual void SetViewportHeight(void) {};
+    virtual void PositionPixmap(void) {};
+    virtual void setText(void) {};
+    void Draw(void);
+    void SetDirty(void) {dirty = true;};
+    void SetActive(void) {dirty = true; active = true;};
+    void SetInActive(void) {dirty = true; active = false;};
+    void SetColor(bool color) {isColor1 = color;};
+    bool IsColor1(void) {return isColor1;};
+    bool isFirst(void);
+    virtual const cEvent *GetEvent(void) { return NULL; };
+    bool Match(time_t t);
+    virtual time_t StartTime(void) { return 0; };
+    virtual time_t EndTime(void) { return 0; };
+    virtual void SetStartTime(time_t start) {};
+    virtual void SetEndTime(time_t end) {};
+    int calcOverlap(cGridElement *neighbor);
+    virtual void SetTimer(void) {};
+    virtual void SetSwitchTimer(void) {};
+    virtual cString getText(void) { return cString("");};
+    virtual cString getTimeString(void) { return cString("");};
+    bool Active(void) { return active; };
+    bool HasTimer(void) {return hasTimer;};
+    bool HasSwitchTimer(void) {return hasSwitchTimer;};
+    bool isDummy(void) { return dummy; };
+    virtual void debug() {};
+};
+
+#endif //__TVGUIDE_GRID_H

headergrid.c

@@ -2,7 +2,7 @@
 #include "tools.h"
 #include "headergrid.h"
 
-cHeaderGrid::cHeaderGrid(void) : cGrid(NULL) {
+cHeaderGrid::cHeaderGrid(void) : cGridElement(NULL) {
     pixmap = NULL;
     pixmapLogo = NULL;
 }
@@ -15,10 +15,10 @@ void cHeaderGrid::createBackground(int num) {
     color = theme.Color(clrHeader);
     colorBlending = theme.Color(clrHeaderBlending);
     int x, y;
-    if (tvguideConfig.displayMode == eVertical) {
+    if (config.displayMode == eVertical) {
         x = geoManager.timeLineWidth + num*geoManager.colWidth;
         y = geoManager.statusHeaderHeight + geoManager.channelGroupsHeight;
-    } else if (tvguideConfig.displayMode == eHorizontal) {
+    } else if (config.displayMode == eHorizontal) {
         x = geoManager.channelGroupsWidth;
         y = geoManager.statusHeaderHeight + geoManager.timeLineHeight + num*geoManager.rowHeight;
     }
@@ -28,7 +28,7 @@ void cHeaderGrid::createBackground(int num) {
         return;
     }
     pixmapLogo->Fill(clrTransparent);
-    if (tvguideConfig.style == eStyleGraphical) {
+    if (config.style == eStyleGraphical) {
         drawBackgroundGraphical(bgChannelHeader);
     } else {
         drawBackground();
@@ -37,9 +37,9 @@ void cHeaderGrid::createBackground(int num) {
 }
 
 void cHeaderGrid::drawChannel(const cChannel *channel) {
-    if (tvguideConfig.displayMode == eVertical) {
+    if (config.displayMode == eVertical) {
         drawChannelVertical(channel);
-    } else if (tvguideConfig.displayMode == eHorizontal) {
+    } else if (config.displayMode == eHorizontal) {
         drawChannelHorizontal(channel);
     }
 }
@@ -48,11 +48,11 @@ void cHeaderGrid::drawChannel(const cChannel *channel) {
 
 void cHeaderGrid::drawChannelHorizontal(const cChannel *channel) {
     int logoWidth = geoManager.logoWidth;
-    int logoX = tvguideConfig.displayChannelName?2:(Width()-logoWidth)/2;
+    int logoX = config.displayChannelName ? 5 : (Width() - logoWidth) / 2;
     int textX = 5;
     int textY = (Height() - fontManager.FontChannelHeaderHorizontal->Height()) / 2;
     bool logoFound = false;
-    if (!tvguideConfig.hideChannelLogos) {
+    if (!config.hideChannelLogos) {
         cImage *logo = imgCache.GetLogo(channel);
         if (logo) {
             const int logoheight = logo->Height();
@@ -64,13 +64,14 @@ void cHeaderGrid::drawChannelHorizontal(const cChannel *channel) {
     int textWidthMax = Width() - 10;
     if (!logoFound) {
         drawText = true;
-    } else  if (tvguideConfig.displayChannelName) {
+    }
+    if (config.displayChannelName) {
         drawText = true;
-        textX += logoWidth;
-        textWidthMax -= logoWidth;
+        textX += logoWidth + 5;
+        textWidthMax -= textX;
     }
     if (drawText) {
-        tColor colorTextBack = (tvguideConfig.style == eStyleFlat)?color:clrTransparent;
+        tColor colorTextBack = (config.style == eStyleFlat)?color:clrTransparent;
         cString strChannel = cString::sprintf("%d %s", channel->Number(), channel->Name());
         strChannel = CutText(*strChannel, textWidthMax, fontManager.FontChannelHeaderHorizontal).c_str();
         pixmap->DrawText(cPoint(textX, textY), *strChannel, theme.Color(clrFontHeader), colorTextBack, fontManager.FontChannelHeaderHorizontal);
@@ -89,24 +90,23 @@ void cHeaderGrid::drawChannelVertical(const cChannel *channel) {
     int lineHeight = fontManager.FontChannelHeader->Height();
     int yStart = (geoManager.channelHeaderHeight - lines * lineHeight) / 2 + 8;
     bool logoFound = false;
-    if (!tvguideConfig.hideChannelLogos) {
+    if (!config.hideChannelLogos) {
         cImage *logo = imgCache.GetLogo(channel);
         if (logo) {
-                const int logoheight = logo->Height();
-                pixmapLogo->DrawImage(cPoint((Width() - logoWidth) / 2, (geoManager.channelHeaderHeight - lineHeight - logoheight) / 2), *logo);
+                pixmapLogo->DrawImage(cPoint((Width() - logoWidth) / 2, 6), *logo);
                 logoFound = true;
         }
     }
     bool drawText = false;
     if (!logoFound) {
         drawText = true;
-    } else if (tvguideConfig.displayChannelName) {
+    } else if (config.displayChannelName) {
         drawText = true;
         yStart = logoHeight;
     }
     if (!drawText)
         return;
-    tColor colorTextBack = (tvguideConfig.style == eStyleFlat)?color:clrTransparent;
+    tColor colorTextBack = (config.style == eStyleFlat)?color:clrTransparent;
     for (int i = 0; i < lines; i++) {
         int textWidth = fontManager.FontChannelHeader->Width(tw.GetLine(i));
         int xText = (geoManager.colWidth - textWidth) / 2;
@@ -118,12 +118,12 @@ void cHeaderGrid::drawChannelVertical(const cChannel *channel) {
 
 void cHeaderGrid::setPosition(int num) {
     int x, y, width, height;
-    if (tvguideConfig.displayMode == eVertical) {
+    if (config.displayMode == eVertical) {
         x = geoManager.timeLineWidth + num*geoManager.colWidth;
         y = geoManager.statusHeaderHeight + geoManager.channelGroupsHeight;
         width = geoManager.colWidth;
         height = geoManager.channelHeaderHeight;
-    } else if (tvguideConfig.displayMode == eHorizontal) {
+    } else if (config.displayMode == eHorizontal) {
         x = geoManager.channelGroupsWidth;
         y = geoManager.statusHeaderHeight + geoManager.timeLineHeight + num*geoManager.rowHeight;
         width = geoManager.channelHeaderWidth;

headergrid.h

@@ -1,11 +1,11 @@
 #ifndef __TVGUIDE_HEADERGRID_H
 #define __TVGUIDE_HEADERGRID_H
 
-#include "grid.h"
+#include "gridelement.h"
 
 // --- cHeaderGrid  -------------------------------------------------------------
 
-class cHeaderGrid : public cGrid {
+class cHeaderGrid : public cGridElement {
 private:
     cPixmap *pixmapLogo;
     void drawChannelHorizontal(const cChannel *channel);

imagecache.c

@@ -28,7 +28,7 @@ cImageCache::~cImageCache() {
 }
 
 void cImageCache::CreateCache(void) {
-    if (tvguideConfig.style != eStyleGraphical)
+    if (config.style != eStyleGraphical)
         return;
     esyslog("tvguide: Creating Image Cache");
     int start = cTimeMs::Now();
@@ -85,7 +85,7 @@ void cImageCache::CreateOsdIconCache(void) {
         InsertIntoOsdElementCache(oeButtonBlue, geoManager.buttonWidth, geoManager.buttonHeight);
 
     //Channel Logo Background
-    if (tvguideConfig.displayMode == eHorizontal) {
+    if (config.displayMode == eHorizontal) {
         success = LoadIcon("osdElements/channellogoback_horizontal");
     } else {
         success = LoadIcon("osdElements/channellogoback_vertical");        
@@ -95,7 +95,7 @@ void cImageCache::CreateOsdIconCache(void) {
 
     //Timeline Elements
     std::string imgTimeline1, imgTimeline2, imgDateViewer;
-    if (tvguideConfig.displayMode == eHorizontal) {
+    if (config.displayMode == eHorizontal) {
         imgTimeline1 = "osdElements/timeline1_horizontal";
         imgTimeline2 = "osdElements/timeline2_horizontal";
         imgDateViewer = "osdElements/timeline2_horizontal";
@@ -129,7 +129,7 @@ void cImageCache::PrepareGridIconCache(void) {
     //Create Buffers for Background
     gridsAvailable = true;
     std::string grid, grid_active;
-    if (tvguideConfig.displayMode == eHorizontal) {
+    if (config.displayMode == eHorizontal) {
         grid = "osdElements/grid_horizontal";
         grid_active = "osdElements/grid_active_horizontal";
     } else {
@@ -158,7 +158,7 @@ void cImageCache::PrepareGridIconCache(void) {
     imgBottom = NULL;
     imgBottomActive = NULL;
 
-    if (tvguideConfig.displayMode == eHorizontal) {
+    if (config.displayMode == eHorizontal) {
         std::string left = "osdElements/grid_left";
         std::string right = "osdElements/grid_right";
         std::string left_active = "osdElements/grid_active_left";
@@ -214,7 +214,7 @@ void cImageCache::PrepareGridIconCache(void) {
 }
 
 void cImageCache::CreateGridIconCache(void) {
-    if (tvguideConfig.displayMode == eHorizontal) {
+    if (config.displayMode == eHorizontal) {
         int gridHeight = geoManager.rowHeight;
         for (int minutes = 5; minutes <= 120; minutes += 5) {
             GetGrid(minutes * geoManager.minutePixel, gridHeight, false);
@@ -233,7 +233,7 @@ void cImageCache::CreateChannelGroupCache(void) {
     groupsBottom = NULL;
     groupsLeft = NULL;
     groupsRight = NULL;
-    if (tvguideConfig.displayMode == eHorizontal) {
+    if (config.displayMode == eHorizontal) {
         std::string channelGroupHead = "osdElements/channelgroup_head";
         std::string channelGroupBottom = "osdElements/channelgroup_bottom";
         int width = geoManager.channelGroupsWidth;
@@ -249,7 +249,7 @@ void cImageCache::CreateChannelGroupCache(void) {
         if (success && heightHeadBottom) {
             groupsBottom = CreateImage(width, heightHeadBottom, false);
         }
-        for (int size = 1; size <= tvguideConfig.numGrids; ++size) {
+        for (int size = 1; size <= config.numGrids; ++size) {
             InsertIntoGroupsCacheHorizontal(size);
         }
     } else {
@@ -268,7 +268,7 @@ void cImageCache::CreateChannelGroupCache(void) {
         if (success && widthHeadBottom) {
             groupsRight = CreateImage(widthHeadBottom, height, false);
         }
-        for (int size = 1; size <= tvguideConfig.numGrids; ++size) {
+        for (int size = 1; size <= config.numGrids; ++size) {
             InsertIntoGroupsCacheVertical(size);
         }
     }
@@ -276,9 +276,9 @@ void cImageCache::CreateChannelGroupCache(void) {
 }
 
 void cImageCache::CreateLogoCache(void) {
-    if (tvguideConfig.hideChannelLogos)
+    if (config.hideChannelLogos)
         return;
-    if (tvguideConfig.numLogosInitial > 0) {
+    if (config.numLogosInitial > 0) {
         int channelsCached = 0;
 #if VDRVERSNUM >= 20301
         LOCK_CHANNELS_READ;
@@ -286,7 +286,7 @@ void cImageCache::CreateLogoCache(void) {
 #else
         for (const cChannel *channel = Channels.First(); channel; channel = Channels.Next(channel)) {
 #endif
-            if (channelsCached >= tvguideConfig.numLogosInitial)
+            if (channelsCached >= config.numLogosInitial)
                 break;
             if (!channel->GroupSep()) {
                 bool success = LoadLogo(channel);
@@ -351,7 +351,7 @@ cImage *cImageCache::GetLogo(const cChannel *channel) {
     } else {
         bool success = LoadLogo(channel);
         if (success) {
-            if ((tvguideConfig.limitLogoCache) && (logoCache.size() >= tvguideConfig.numLogosMax)) {
+            if ((config.limitLogoCache) && ((int)logoCache.size() >= config.numLogosMax)) {
             //logo cache is full, don't cache anymore
                 if (tempStaticLogo) {
                     delete tempStaticLogo;
@@ -403,7 +403,7 @@ void cImageCache::InsertIntoOsdElementCache(eOsdElementType type, int width, int
 void cImageCache::InsertIntoGridCache(std::string name, int width, int height, bool active) {
     cImage *image = CreateGrid(width, height, active);
     if (image) {
-        if (tvguideConfig.displayMode == eHorizontal) {
+        if (config.displayMode == eHorizontal) {
             AddCornersHorizontal(image, active);
         } else {
             AddCornersVertical(image, active);
@@ -553,25 +553,25 @@ void cImageCache::AddCornersGroupVertical(cImage *img) {
 
 bool cImageCache::LoadIcon(std::string name) {
     bool success = false;
-    if (tvguideConfig.iconsPathSet) {
-        cString iconPathTheme = cString::sprintf("%s%s/", *tvguideConfig.iconPath, *tvguideConfig.themeName);
+    if (config.iconsPathSet) {
+        cString iconPathTheme = cString::sprintf("%s%s/", *config.iconPath, *config.themeName);
         success = LoadImage(name, *iconPathTheme, "png");
         if (success) {
             return true;
         } else {
-            success = LoadImage(name, *tvguideConfig.iconPath, "png");
+            success = LoadImage(name, *config.iconPath, "png");
             if (success) {
                 return true;
             }
         }
     }
     if (!success) {
-        cString iconPathTheme = cString::sprintf("%s%s/", *tvguideConfig.iconPathDefault, *tvguideConfig.themeName);
+        cString iconPathTheme = cString::sprintf("%s%s/", *config.iconPathDefault, *config.themeName);
         success = LoadImage(name, *iconPathTheme, "png");
         if (success) {
             return true;
         } else {
-            success = LoadImage(name, *tvguideConfig.iconPathDefault, "png");
+            success = LoadImage(name, *config.iconPathDefault, "png");
             if (success) {
                 return true;
             }
@@ -587,24 +587,24 @@ bool cImageCache::LoadLogo(const cChannel *channel) {
     std::string logoLower = StrToLowerCase(channel->Name());
     bool success = false;
     cString extension;
-    if (tvguideConfig.logoExtension == 0) {
+    if (config.logoExtension == 0) {
         extension = "png";
-    } else if (tvguideConfig.logoExtension == 1) {
+    } else if (config.logoExtension == 1) {
         extension = "jpg";
     }
 
-    if (tvguideConfig.logoPathSet) {
-        success = LoadImage(channelID.c_str(), *tvguideConfig.logoPath, *extension);
+    if (config.logoPathSet) {
+        success = LoadImage(channelID.c_str(), *config.logoPath, *extension);
         if (success)
             return true;
-        success = LoadImage(logoLower.c_str(), *tvguideConfig.logoPath, *extension);
+        success = LoadImage(logoLower.c_str(), *config.logoPath, *extension);
         if (success)
             return true;
     }
-    success = LoadImage(channelID.c_str(), *tvguideConfig.logoPathDefault, *extension);
+    success = LoadImage(channelID.c_str(), *config.logoPathDefault, *extension);
     if (success)
         return true;
-    success = LoadImage(logoLower.c_str(), *tvguideConfig.logoPathDefault, *extension);
+    success = LoadImage(logoLower.c_str(), *config.logoPathDefault, *extension);
     return success;
 }
 

imageloader.c

@@ -11,7 +11,6 @@
 using namespace Magick;
 
 cImageLoader::cImageLoader() {
-    InitializeMagick(NULL);
 }
 
 cImageLoader::~cImageLoader() {
@@ -23,22 +22,22 @@ bool cImageLoader::LoadLogo(const cChannel *channel, int width, int height) {
     std::string channelID = StrToLowerCase(*(channel->GetChannelID().ToString()));
     std::string logoLower = StrToLowerCase(channel->Name());
     cString extension;
-    if (tvguideConfig.logoExtension == 0) {
+    if (config.logoExtension == 0) {
         extension = "png";
-    } else if (tvguideConfig.logoExtension == 1) {
+    } else if (config.logoExtension == 1) {
         extension = "jpg";
     }
     bool success = false;
-    if (tvguideConfig.logoPathSet) {
-        success = LoadImage(channelID.c_str(), *tvguideConfig.logoPath, *extension);
+    if (config.logoPathSet) {
+        success = LoadImage(channelID.c_str(), *config.logoPath, *extension);
         if (!success) {
-            success = LoadImage(logoLower.c_str(), *tvguideConfig.logoPath, *extension);
+            success = LoadImage(logoLower.c_str(), *config.logoPath, *extension);
         }
     }
     if (!success)
-        success = LoadImage(channelID.c_str(), *tvguideConfig.logoPathDefault, *extension);
+        success = LoadImage(channelID.c_str(), *config.logoPathDefault, *extension);
     if (!success)
-        success = LoadImage(logoLower.c_str(), *tvguideConfig.logoPathDefault, *extension);
+        success = LoadImage(logoLower.c_str(), *config.logoPathDefault, *extension);
     if (success)
         buffer.sample(Geometry(width, height));
     return success;
@@ -48,9 +47,9 @@ bool cImageLoader::LoadEPGImage(int eventID, int width, int height) {
     if ((width == 0)||(height==0))
         return false;
     bool success = false;
-    success = LoadImage(*cString::sprintf("%d", eventID), *tvguideConfig.epgImagePath, "jpg");
+    success = LoadImage(*cString::sprintf("%d", eventID), *config.epgImagePath, "jpg");
     if (!success)
-        success = LoadImage(*cString::sprintf("%d_0", eventID), *tvguideConfig.epgImagePath, "jpg");
+        success = LoadImage(*cString::sprintf("%d_0", eventID), *config.epgImagePath, "jpg");
     if (!success)
         return false;
     buffer.sample( Geometry(width, height));
@@ -58,12 +57,12 @@ bool cImageLoader::LoadEPGImage(int eventID, int width, int height) {
 }
 
 bool cImageLoader::LoadAdditionalEPGImage(cString name) {
-    int width = tvguideConfig.epgImageWidthLarge;
-    int height = tvguideConfig.epgImageHeightLarge;
+    int width = config.epgImageWidthLarge;
+    int height = config.epgImageHeightLarge;
     if ((width == 0)||(height==0))
         return false;
     bool success = false;
-    success = LoadImage(*name, *tvguideConfig.epgImagePath, "jpg");
+    success = LoadImage(*name, *config.epgImagePath, "jpg");
     if (!success)
         return false;
     if (height != 0 || width != 0) {
@@ -84,19 +83,19 @@ bool cImageLoader::LoadIcon(const char *cIcon, int size) {
     if (size==0)
         return false;
     bool success = false;
-    if (tvguideConfig.iconsPathSet) {
-        cString iconPathTheme = cString::sprintf("%s%s/recmenuicons/", *tvguideConfig.iconPath, *tvguideConfig.themeName);
+    if (config.iconsPathSet) {
+        cString iconPathTheme = cString::sprintf("%s%s/recmenuicons/", *config.iconPath, *config.themeName);
         success = LoadImage(cIcon, *iconPathTheme, "png");
         if (!success) {
-            cString iconPath = cString::sprintf("%srecmenuicons/", *tvguideConfig.iconPath);
+            cString iconPath = cString::sprintf("%srecmenuicons/", *config.iconPath);
             success = LoadImage(cIcon, *iconPath, "png");
         }
     }
     if (!success) {
-        cString iconPathTheme = cString::sprintf("%s%s/recmenuicons/", *tvguideConfig.iconPathDefault, *tvguideConfig.themeName);
+        cString iconPathTheme = cString::sprintf("%s%s/recmenuicons/", *config.iconPathDefault, *config.themeName);
         success = LoadImage(cIcon, *iconPathTheme, "png");
         if (!success) {
-            cString iconPath = cString::sprintf("%srecmenuicons/", *tvguideConfig.iconPathDefault);
+            cString iconPath = cString::sprintf("%srecmenuicons/", *config.iconPathDefault);
             success = LoadImage(cIcon, *iconPath, "png");
         }
     }
@@ -110,20 +109,20 @@ bool cImageLoader::LoadOsdElement(cString name, int width, int height) {
     if ((width == 0)||(height==0))
         return false;
     bool success = false;
-    if (tvguideConfig.iconsPathSet) {
-        cString path = cString::sprintf("%s%s%s", *tvguideConfig.iconPath, *tvguideConfig.themeName, "/osdElements/");
+    if (config.iconsPathSet) {
+        cString path = cString::sprintf("%s%s%s", *config.iconPath, *config.themeName, "/osdElements/");
         success = LoadImage(*name, *path, "png");
         if (!success) {
-            path = cString::sprintf("%s%s", *tvguideConfig.iconPath, "/osdElements/");
+            path = cString::sprintf("%s%s", *config.iconPath, "/osdElements/");
             success = LoadImage(*name, *path, "png");
         }
     }
     if (!success) {
-        cString path = cString::sprintf("%s%s%s", *tvguideConfig.iconPathDefault, *tvguideConfig.themeName, "/osdElements/");
+        cString path = cString::sprintf("%s%s%s", *config.iconPathDefault, *config.themeName, "/osdElements/");
         success = LoadImage(*name, *path, "png");
     }
     if (!success) {
-        cString path = cString::sprintf("%s%s", *tvguideConfig.iconPathDefault, "/osdElements/");
+        cString path = cString::sprintf("%s%s", *config.iconPathDefault, "/osdElements/");
         success = LoadImage(*name, *path, "png");
     }
     if (!success)
@@ -173,7 +172,7 @@ void cImageLoader::CreateGradient(tColor back, tColor blend, int width, int heig
     for (int x = 0; x < width; x++) {
         for (int y = 0; y < height; y++) {
             PixelPacket *pixel = pixels + y * width + x;
-            int opacity = (maxw / width * x + maxh - maxh / height * y) / 2;
+            unsigned int opacity = (maxw / width * x + maxh - maxh / height * y) / 2;
             pixel->opacity = (opacity <= MaxRGB) ? opacity : MaxRGB;
         }
     }

imagemagickwrapper.c

@@ -5,7 +5,6 @@
 #include "imagescaler.h"
 
 cImageMagickWrapper::cImageMagickWrapper() {
-    InitializeMagick(NULL);
 }
 
 cImageMagickWrapper::~cImageMagickWrapper() {
@@ -77,21 +76,21 @@ bool cImageMagickWrapper::LoadImage(std::string FileName, std::string Path, std:
         std::stringstream sstrImgFile;
         sstrImgFile << Path << FileName << "." << Extension;
         std::string imgFile = sstrImgFile.str();
-        if (tvguideConfig.debugImageLoading)
+        if (config.debugImageLoading)
             esyslog("tvguide: trying to load: %s", imgFile.c_str());
         buffer.read(imgFile.c_str());
-        if (tvguideConfig.debugImageLoading)
+        if (config.debugImageLoading)
             esyslog("tvguide: %s sucessfully loaded", imgFile.c_str());
     } catch( Magick::Warning &warning ) {
-        if (tvguideConfig.debugImageLoading)
+        if (config.debugImageLoading)
             esyslog("tvguide: Magick Warning: %s", warning.what());
         return true;
     } catch( Magick::Error &error ) {
-        if (tvguideConfig.debugImageLoading)
+        if (config.debugImageLoading)
             esyslog("tvguide: Magick Error: %s", error.what());
         return false;
     } catch(...) {
-        if (tvguideConfig.debugImageLoading)
+        if (config.debugImageLoading)
             esyslog("tvguide: an unknown Magick error occured during image loading");
         return false;
     }
@@ -102,21 +101,21 @@ bool cImageMagickWrapper::LoadImage(const char *fullpath) {
     if ((fullpath == NULL) || (strlen(fullpath) < 5))
         return false;
     try {
-        if (tvguideConfig.debugImageLoading)
+        if (config.debugImageLoading)
             esyslog("tvguide: trying to load: %s", fullpath);
         buffer.read(fullpath);
-        if (tvguideConfig.debugImageLoading)
+        if (config.debugImageLoading)
             esyslog("tvguide: %s sucessfully loaded", fullpath);
     } catch( Magick::Warning &warning ) {
-        if (tvguideConfig.debugImageLoading)
+        if (config.debugImageLoading)
             esyslog("tvguide: Magick Warning: %s", warning.what());
         return true;
     } catch( Magick::Error &error ) {
-        if (tvguideConfig.debugImageLoading)
+        if (config.debugImageLoading)
             esyslog("tvguide: Magick Error: %s", error.what());
         return false;
     } catch(...) {
-        if (tvguideConfig.debugImageLoading)
+        if (config.debugImageLoading)
             esyslog("tvguide: an unknown Magick error occured during image loading");
         return false;
     }
@@ -145,7 +144,7 @@ void cImageMagickWrapper::CreateGradient(tColor back, tColor blend, int width, i
     for (int x = 0; x < width; x++) {
         for (int y = 0; y < height; y++) {
             PixelPacket *pixel = pixels + y * width + x;
-            int opacity = (maxw / width * x + maxh - maxh / height * y) / 2;
+            unsigned int opacity = (maxw / width * x + maxh - maxh / height * y) / 2;
             pixel->opacity = (opacity <= MaxRGB) ? opacity : MaxRGB;
         }
     }

osdmanager.c

@@ -17,7 +17,7 @@ bool cOsdManager::setOsd() {
 
 void cOsdManager::setBackground() {
     
-    if (tvguideConfig.displayStatusHeader && tvguideConfig.scaleVideo) {
+    if (config.displayStatusHeader && config.scaleVideo) {
         int widthStatus = cOsd::OsdWidth() - geoManager.statusHeaderHeight * 16 / 9;
         osd->DrawRectangle(0, 0, widthStatus, geoManager.statusHeaderHeight, theme.Color(clrBackgroundOSD));
         osd->DrawRectangle(0, geoManager.statusHeaderHeight, Width(), Height(), theme.Color(clrBackgroundOSD));    

po/ca_ES.po

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-tvguide 0.0.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-05-10 17:24+0200\n"
+"POT-Creation-Date: 2019-04-22 14:34+0200\n"
 "PO-Revision-Date: 2013-09-21 17:49+0200\n"
 "Last-Translator: My friend <Sampep> Thanks David <Gabychan> <gbonich@gmail.com>\n"
 "Language-Team: \n"
@@ -303,79 +303,106 @@ msgstr ""
 msgid "Save Search Timer"
 msgstr ""
 
-msgid "Search String"
+msgid "Search term"
 msgstr ""
 
 msgid "Active"
 msgstr ""
 
-msgid "Search Mode"
-msgstr "Mode de cerca"
+msgid "Search mode"
+msgstr ""
 
-msgid "Use Title"
+msgid "Tolerance"
+msgstr ""
+
+msgid "Match case"
+msgstr ""
+
+msgid "Use title"
 msgstr "Utilitza títol"
 
-msgid "Use Subtitle"
+msgid "Use subtitle"
 msgstr "Utilitza subtítol"
 
-msgid "Use Description"
+msgid "Use description"
 msgstr "Utilitza descripció"
 
-msgid "Limit Channels"
+msgid "Use channel"
 msgstr "Canals restringits"
 
-msgid "Use Time"
-msgstr "Utilitza temps"
-
-msgid "Display advanced Options"
-msgstr ""
-
-msgid "Limit Days of the Week"
-msgstr ""
-
-msgid "Time margin for start in minutes"
-msgstr ""
-
-msgid "Time margin for stop in minutes"
-msgstr ""
-
-msgid "Series Recording"
-msgstr ""
-
-msgid "Folder"
-msgstr ""
-
-msgid "Use VPS"
-msgstr ""
-
-msgid "Avoid Repeats"
-msgstr ""
-
-msgid "Use in Favorites"
-msgstr ""
-
-msgid "Hide advanced Options"
-msgstr ""
-
-msgid "Display Results for Search Timer"
-msgstr "Mostra resultats de la cerca"
-
-msgid "Start Channel"
+msgid "from channel"
 msgstr "Inicia canal"
 
-msgid "Stop Channel"
+msgid "to channel"
 msgstr "Atura canal"
 
+msgid "Channel group"
+msgstr ""
+
+msgid "Use time"
+msgstr "Utilitza temps"
+
 msgid "Start after"
 msgstr "Comença després"
 
 msgid "Start before"
 msgstr "Comença abans"
 
-msgid "Select Days"
+msgid "Use duration"
+msgstr "Utilitza Durada"
+
+msgid "Min. duration"
 msgstr ""
 
-msgid "Number of allowed repeats"
+msgid "Max. duration"
+msgstr ""
+
+msgid "Use day of week"
+msgstr ""
+
+msgid "Day of week"
+msgstr ""
+
+msgid "Use in Favorites"
+msgstr ""
+
+msgid "Use as search timer"
+msgstr ""
+
+msgid "Action"
+msgstr ""
+
+msgid "Switch ... minutes before start"
+msgstr ""
+
+msgid "Unmute sound"
+msgstr ""
+
+msgid "Ask ... minutes before start"
+msgstr ""
+
+msgid "Series Recording"
+msgstr ""
+
+msgid "Directory"
+msgstr ""
+
+msgid "Delete recordings after ... days"
+msgstr ""
+
+msgid "Keep ... recordings"
+msgstr ""
+
+msgid "Pause when ... recordings exist"
+msgstr ""
+
+msgid "Avoid Repeats"
+msgstr ""
+
+msgid "Allowed repeats"
+msgstr ""
+
+msgid "Only repeats within ... days"
 msgstr ""
 
 msgid "Compare Title"
@@ -387,6 +414,33 @@ msgstr ""
 msgid "Compare Description"
 msgstr ""
 
+msgid "Min. match in %"
+msgstr ""
+
+msgid "Compare date"
+msgstr ""
+
+msgid "Time margin for start in minutes"
+msgstr ""
+
+msgid "Time margin for stop in minutes"
+msgstr ""
+
+msgid "Use VPS"
+msgstr ""
+
+msgid "Auto delete"
+msgstr ""
+
+msgid "after ... recordings"
+msgstr ""
+
+msgid "after ... days after first rec."
+msgstr ""
+
+msgid "Display Results for Search Timer"
+msgstr "Mostra resultats de la cerca"
+
 msgid "Really delete Search Timer"
 msgstr ""
 
@@ -462,6 +516,9 @@ msgstr "No s'ha creat el canvi de temporitzador"
 msgid "Switch Timer deleted"
 msgstr "Canvi de temporitzador esborrat"
 
+msgid "Search Mode"
+msgstr "Mode de cerca"
+
 msgid "Channel to Search"
 msgstr "Canal a cercar"
 
@@ -525,6 +582,54 @@ msgstr "coincidència exacta"
 msgid "regular expression"
 msgstr "expressió regular"
 
+msgid "fuzzy"
+msgstr ""
+
+msgid "Interval"
+msgstr ""
+
+msgid "Channel Group"
+msgstr ""
+
+msgid "only FTA"
+msgstr ""
+
+msgid "same day"
+msgstr ""
+
+msgid "same week"
+msgstr ""
+
+msgid "same month"
+msgstr ""
+
+msgid "Record"
+msgstr ""
+
+msgid "Announce by OSD"
+msgstr ""
+
+msgid "Switch only"
+msgstr ""
+
+msgid "Announce and switch"
+msgstr ""
+
+msgid "Announce by mail"
+msgstr ""
+
+msgid "Inactive record"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "count recordings"
+msgstr ""
+
+msgid "count days"
+msgstr ""
+
 msgid "General Settings"
 msgstr "Preferències"
 
@@ -780,16 +885,31 @@ msgstr ""
 msgid "Folder for instant Recordings"
 msgstr ""
 
+msgid "Folder"
+msgstr ""
+
 msgid "Use Remotetimers"
 msgstr "Utilitza temporitzadors remots"
 
+msgid "Limit channels in favorites"
+msgstr ""
+
+msgid "Start Channel"
+msgstr "Inicia canal"
+
+msgid "Stop Channel"
+msgstr "Atura canal"
+
 msgid "Use \"What's on now\" in favorites"
 msgstr ""
 
 msgid "Use \"What's on next\" in favorites"
 msgstr ""
 
-msgid "Use user defined time 1 in favorites"
+msgid "User defined times in favorites:"
+msgstr ""
+
+msgid "Use user defined time 1"
 msgstr ""
 
 msgid "Description"
@@ -798,16 +918,19 @@ msgstr ""
 msgid "Time"
 msgstr ""
 
-msgid "Use user defined time 2 in favorites"
+msgid "Use user defined time 2"
 msgstr ""
 
-msgid "Use user defined time 3 in favorites"
+msgid "Use user defined time 3"
 msgstr ""
 
-msgid "Use user defined time 4 in favorites"
+msgid "Use user defined time 4"
 msgstr ""
 
-msgid "Limit channels in favorites"
+msgid "Switchtimer:"
+msgstr ""
+
+msgid "Switch (x)min before start of the show"
 msgstr ""
 
 msgid "Create Log Messages for image loading"
@@ -840,6 +963,9 @@ msgstr ""
 msgid "Recording Menus Icon Cache"
 msgstr ""
 
+msgid "A fancy 2d EPG Viewer"
+msgstr ""
+
 msgid "No Cast available"
 msgstr ""
 
@@ -909,9 +1035,6 @@ msgstr ""
 msgid "yes"
 msgstr ""
 
-msgid "no"
-msgstr ""
-
 msgid "Adult"
 msgstr ""
 

po/de_DE.po

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-tvguide 0.0.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-05-10 17:24+0200\n"
+"POT-Creation-Date: 2019-04-22 14:34+0200\n"
 "PO-Revision-Date: 2012-08-25 17:49+0200\n"
 "Last-Translator: Horst\n"
 "Language-Team: \n"
@@ -300,68 +300,44 @@ msgstr "Suchtimer konfigurieren"
 msgid "Save Search Timer"
 msgstr "Suchtimer speichern"
 
-msgid "Search String"
+msgid "Search term"
 msgstr "Suchbegriff"
 
 msgid "Active"
 msgstr "Aktiv"
 
-msgid "Search Mode"
+msgid "Search mode"
 msgstr "Suchmodus"
 
-msgid "Use Title"
-msgstr "Titel benutzen"
+msgid "Tolerance"
+msgstr "Toleranz"
 
-msgid "Use Subtitle"
-msgstr "Untertitel benutzen"
+msgid "Match case"
+msgstr "Groß/klein"
 
-msgid "Use Description"
-msgstr "Beschreibung benutzen"
+msgid "Use title"
+msgstr "Verwende Titel"
 
-msgid "Limit Channels"
-msgstr "Kanäle einschränken"
+msgid "Use subtitle"
+msgstr "Verwende Untertitel"
 
-msgid "Use Time"
-msgstr "Zeit benutzen"
+msgid "Use description"
+msgstr "Verwende Beschreibung"
 
-msgid "Display advanced Options"
-msgstr "Erweiterte Optionen anzeigen"
+msgid "Use channel"
+msgstr "Verwende Kanal"
 
-msgid "Limit Days of the Week"
-msgstr "Wochentage beschränken"
+msgid "from channel"
+msgstr "von Kanal"
 
-msgid "Time margin for start in minutes"
-msgstr "Zeit vor Start in Minuten"
+msgid "to channel"
+msgstr "bis Kanal"
 
-msgid "Time margin for stop in minutes"
-msgstr "Zeit nach Ende in Minuten"
+msgid "Channel group"
+msgstr "Kanalgruppe"
 
-msgid "Series Recording"
-msgstr "Serienaufnahme"
-
-msgid "Folder"
-msgstr "Verzeichnis"
-
-msgid "Use VPS"
-msgstr "VPS benutzen"
-
-msgid "Avoid Repeats"
-msgstr "Wiederholungen vermeiden"
-
-msgid "Use in Favorites"
-msgstr "Als Favorit benutzen"
-
-msgid "Hide advanced Options"
-msgstr "Erweiterte Optionen ausblenden"
-
-msgid "Display Results for Search Timer"
-msgstr "Ergebnisse für Suchtimer anzeigen"
-
-msgid "Start Channel"
-msgstr "Startkanal"
-
-msgid "Stop Channel"
-msgstr "Stopkanal"
+msgid "Use time"
+msgstr "Verwende Uhrzeit"
 
 msgid "Start after"
 msgstr "Beginn nach"
@@ -369,20 +345,98 @@ msgstr "Beginn nach"
 msgid "Start before"
 msgstr "Beginn vor"
 
-msgid "Select Days"
-msgstr "Tage bestimmen"
+msgid "Use duration"
+msgstr "Verwende Dauer"
 
-msgid "Number of allowed repeats"
-msgstr "Anzahl erlaubter Wiederholungen"
+msgid "Min. duration"
+msgstr "Min. Dauer"
+
+msgid "Max. duration"
+msgstr "Max. Dauer"
+
+msgid "Use day of week"
+msgstr "Verwende Wochentag"
+
+msgid "Day of week"
+msgstr "Wochentag"
+
+msgid "Use in Favorites"
+msgstr "Als Favorit benutzen"
+
+msgid "Use as search timer"
+msgstr "Als Suchtimer verwenden"
+
+msgid "Action"
+msgstr "Aktion"
+
+msgid "Switch ... minutes before start"
+msgstr "Umschalten ... Minuten vor Start"
+
+msgid "Unmute sound"
+msgstr "Ton anschalten"
+
+msgid "Ask ... minutes before start"
+msgstr "Nachfrage ... Minuten vor Start"
+
+msgid "Series Recording"
+msgstr "Serienaufnahme"
+
+msgid "Directory"
+msgstr "Verzeichnis"
+
+msgid "Delete recordings after ... days"
+msgstr "Aufn. nach ... Tagen löschen"
+
+msgid "Keep ... recordings"
+msgstr "Behalte ... Aufnahmen"
+
+msgid "Pause when ... recordings exist"
+msgstr "Pause, wenn ... Aufnahmen exist."
+
+msgid "Avoid Repeats"
+msgstr "Vermeide Wiederholung"
+
+msgid "Allowed repeats"
+msgstr "Erlaubte Wiederholungen"
+
+msgid "Only repeats within ... days"
+msgstr "Nur Wiederh. innerhalb von ... Tagen"
 
 msgid "Compare Title"
-msgstr "Titel vergleichen"
+msgstr "Vergleiche Titel"
 
 msgid "Compare Subtitle"
-msgstr "Untertitel vergleichen"
+msgstr "Vergleiche Untertitel"
 
 msgid "Compare Description"
-msgstr "Beschreibung vergleichen"
+msgstr "Vergleiche Beschreibung"
+
+msgid "Min. match in %"
+msgstr "Min. Übereinstimmung in %"
+
+msgid "Compare date"
+msgstr "Vergleiche Zeitpunkt"
+
+msgid "Time margin for start in minutes"
+msgstr "Vorlauf zum Timer-Beginn (min)"
+
+msgid "Time margin for stop in minutes"
+msgstr "Nachlauf zum Timer-Ende (min)"
+
+msgid "Use VPS"
+msgstr "Verwende VPS"
+
+msgid "Auto delete"
+msgstr "automatisch löschen"
+
+msgid "after ... recordings"
+msgstr "nach ... Aufnahmen"
+
+msgid "after ... days after first rec."
+msgstr "nach ... Tagen nach erster Aufn."
+
+msgid "Display Results for Search Timer"
+msgstr "Ergebnisse für Suchtimer anzeigen"
 
 msgid "Really delete Search Timer"
 msgstr "Suchtimer wirklich löschen"
@@ -459,6 +513,9 @@ msgstr "Umschalttimer NICHT erfolgreich angelegt"
 msgid "Switch Timer deleted"
 msgstr "Umschalttimer gelöscht"
 
+msgid "Search Mode"
+msgstr "Suchmodus"
+
 msgid "Channel to Search"
 msgstr "Suche auf Kanal"
 
@@ -522,6 +579,54 @@ msgstr "exakt"
 msgid "regular expression"
 msgstr "Regulärer Ausdruck"
 
+msgid "fuzzy"
+msgstr "unscharf"
+
+msgid "Interval"
+msgstr "Bereich"
+
+msgid "Channel Group"
+msgstr "Kanalgruppe"
+
+msgid "only FTA"
+msgstr "ohne PayTV"
+
+msgid "same day"
+msgstr "gleicher Tag"
+
+msgid "same week"
+msgstr "gleiche Woche"
+
+msgid "same month"
+msgstr "gleicher Monat"
+
+msgid "Record"
+msgstr "Aufnehmen"
+
+msgid "Announce by OSD"
+msgstr "per OSD ankündigen"
+
+msgid "Switch only"
+msgstr "Nur umschalten"
+
+msgid "Announce and switch"
+msgstr "Ankündigen und Umschalten"
+
+msgid "Announce by mail"
+msgstr "per Mail ankündigen"
+
+msgid "Inactive record"
+msgstr "inaktive Aufnahme"
+
+msgid "no"
+msgstr "Nein"
+
+msgid "count recordings"
+msgstr "Anzahl Aufnahmen"
+
+msgid "count days"
+msgstr "Anzahl Tage"
+
 msgid "General Settings"
 msgstr "Allgemeine Einstellungen"
 
@@ -777,17 +882,32 @@ msgstr "Festes Verzeichnis benutzen"
 msgid "Folder for instant Recordings"
 msgstr "Verzeichnis für Sofortaufnahmen"
 
+msgid "Folder"
+msgstr "Verzeichnis"
+
 msgid "Use Remotetimers"
 msgstr "RemoteTimers benutzen"
 
+msgid "Limit channels in favorites"
+msgstr "Kanäle in Favoriten beschränken"
+
+msgid "Start Channel"
+msgstr "von Kanal"
+
+msgid "Stop Channel"
+msgstr "bis Kanal"
+
 msgid "Use \"What's on now\" in favorites"
 msgstr "\"Was läuft jetzt\" in Favoriten benutzen"
 
 msgid "Use \"What's on next\" in favorites"
 msgstr "\"Was läuft als nächstes\" in Favoriten benutzen"
 
-msgid "Use user defined time 1 in favorites"
-msgstr "Benutzerdef. Zeit 1 in Favoriten benutzen"
+msgid "User defined times in favorites:"
+msgstr "Nutzer definierte Zeiten in Favoriten:"
+
+msgid "Use user defined time 1"
+msgstr "Verw. benutzerdef. Zeit 1"
 
 msgid "Description"
 msgstr "Beschreibung"
@@ -795,17 +915,20 @@ msgstr "Beschreibung"
 msgid "Time"
 msgstr "Zeit"
 
-msgid "Use user defined time 2 in favorites"
-msgstr "Benutzerdef. Zeit 2 in Favoriten benutzen"
+msgid "Use user defined time 2"
+msgstr "Verw. benutzerdef. Zeit 2"
 
-msgid "Use user defined time 3 in favorites"
-msgstr "Benutzerdef. Zeit 3 in Favoriten benutzen"
+msgid "Use user defined time 3"
+msgstr "Verw. benutzerdef. Zeit 3"
 
-msgid "Use user defined time 4 in favorites"
-msgstr "Benutzerdef. Zeit 4 in Favoriten benutzen"
+msgid "Use user defined time 4"
+msgstr "Verw. benutzerdef. Zeit 4"
 
-msgid "Limit channels in favorites"
-msgstr "Kanäle in Favoriten beschränken"
+msgid "Switchtimer:"
+msgstr "Umschalttimer:"
+
+msgid "Switch (x)min before start of the show"
+msgstr "Umschalten (x)min vor der Sendung"
 
 msgid "Create Log Messages for image loading"
 msgstr "Log Nachrichten für das Laden der Bilder erzeugen"
@@ -837,6 +960,9 @@ msgstr "Kanalgruppen Cache"
 msgid "Recording Menus Icon Cache"
 msgstr "Recording Menüs Icon Cache"
 
+msgid "A fancy 2d EPG Viewer"
+msgstr "Eine schicke Programm Vorschau"
+
 msgid "No Cast available"
 msgstr "Keine Besetzung vorhanden"
 
@@ -906,9 +1032,6 @@ msgstr "Überblick"
 msgid "yes"
 msgstr "Ja"
 
-msgid "no"
-msgstr "Nein"
-
 msgid "Adult"
 msgstr "Nur für Erwachsene"
 
@@ -939,3 +1062,8 @@ msgstr "TheMovieDB Popularität"
 msgid "TheMovieDB Vote Average"
 msgstr "TheMovieDB durchschnittliche Bewertung"
 
+#~ msgid "Display advanced Options"
+#~ msgstr "Erweiterte Optionen anzeigen"
+
+#~ msgid "Hide advanced Options"
+#~ msgstr "Erweiterte Optionen ausblenden"

po/ru_RU.po

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-tvguide 1.0.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-05-10 17:24+0200\n"
+"POT-Creation-Date: 2019-04-22 14:34+0200\n"
 "PO-Revision-Date: 2013-09-25 17:49+0400\n"
 "Last-Translator: AmiD, ilya\n"
 "Language-Team: Russia-Cherepovets(wm.amid@gmail.com)\n"
@@ -300,79 +300,106 @@ msgstr ""
 msgid "Save Search Timer"
 msgstr ""
 
-msgid "Search String"
+msgid "Search term"
 msgstr ""
 
 msgid "Active"
 msgstr ""
 
-msgid "Search Mode"
-msgstr "Режим поиска"
+msgid "Search mode"
+msgstr ""
 
-msgid "Use Title"
+msgid "Tolerance"
+msgstr ""
+
+msgid "Match case"
+msgstr ""
+
+msgid "Use title"
 msgstr "Искать в названиях"
 
-msgid "Use Subtitle"
+msgid "Use subtitle"
 msgstr "Искать в эпизодах"
 
-msgid "Use Description"
+msgid "Use description"
 msgstr "Искать в описаниях"
 
-msgid "Limit Channels"
+msgid "Use channel"
 msgstr "Ограничить список каналов"
 
-msgid "Use Time"
+msgid "from channel"
+msgstr ""
+
+msgid "to channel"
+msgstr ""
+
+msgid "Channel group"
+msgstr ""
+
+msgid "Use time"
 msgstr "Время"
 
-msgid "Display advanced Options"
-msgstr ""
-
-msgid "Limit Days of the Week"
-msgstr ""
-
-msgid "Time margin for start in minutes"
-msgstr ""
-
-msgid "Time margin for stop in minutes"
-msgstr ""
-
-msgid "Series Recording"
-msgstr ""
-
-msgid "Folder"
-msgstr ""
-
-msgid "Use VPS"
-msgstr ""
-
-msgid "Avoid Repeats"
-msgstr ""
-
-msgid "Use in Favorites"
-msgstr ""
-
-msgid "Hide advanced Options"
-msgstr ""
-
-msgid "Display Results for Search Timer"
-msgstr "Тест"
-
-msgid "Start Channel"
-msgstr "С канала"
-
-msgid "Stop Channel"
-msgstr "По канал"
-
 msgid "Start after"
 msgstr "С"
 
 msgid "Start before"
 msgstr "До"
 
-msgid "Select Days"
+msgid "Use duration"
 msgstr ""
 
-msgid "Number of allowed repeats"
+msgid "Min. duration"
+msgstr ""
+
+msgid "Max. duration"
+msgstr ""
+
+msgid "Use day of week"
+msgstr ""
+
+msgid "Day of week"
+msgstr ""
+
+msgid "Use in Favorites"
+msgstr ""
+
+msgid "Use as search timer"
+msgstr ""
+
+msgid "Action"
+msgstr ""
+
+msgid "Switch ... minutes before start"
+msgstr ""
+
+msgid "Unmute sound"
+msgstr ""
+
+msgid "Ask ... minutes before start"
+msgstr ""
+
+msgid "Series Recording"
+msgstr ""
+
+msgid "Directory"
+msgstr ""
+
+msgid "Delete recordings after ... days"
+msgstr ""
+
+msgid "Keep ... recordings"
+msgstr ""
+
+msgid "Pause when ... recordings exist"
+msgstr ""
+
+msgid "Avoid Repeats"
+msgstr ""
+
+msgid "Allowed repeats"
+msgstr ""
+
+msgid "Only repeats within ... days"
 msgstr ""
 
 msgid "Compare Title"
@@ -384,6 +411,33 @@ msgstr ""
 msgid "Compare Description"
 msgstr ""
 
+msgid "Min. match in %"
+msgstr ""
+
+msgid "Compare date"
+msgstr ""
+
+msgid "Time margin for start in minutes"
+msgstr ""
+
+msgid "Time margin for stop in minutes"
+msgstr ""
+
+msgid "Use VPS"
+msgstr ""
+
+msgid "Auto delete"
+msgstr ""
+
+msgid "after ... recordings"
+msgstr ""
+
+msgid "after ... days after first rec."
+msgstr ""
+
+msgid "Display Results for Search Timer"
+msgstr "Тест"
+
 msgid "Really delete Search Timer"
 msgstr ""
 
@@ -459,6 +513,9 @@ msgstr "Таймер переключения НЕ был создан!"
 msgid "Switch Timer deleted"
 msgstr "Таймер переключения удален"
 
+msgid "Search Mode"
+msgstr "Режим поиска"
+
 msgid "Channel to Search"
 msgstr "Канал для поиска"
 
@@ -522,6 +579,54 @@ msgstr "точное совпадение"
 msgid "regular expression"
 msgstr "регулярные выражения"
 
+msgid "fuzzy"
+msgstr ""
+
+msgid "Interval"
+msgstr ""
+
+msgid "Channel Group"
+msgstr ""
+
+msgid "only FTA"
+msgstr ""
+
+msgid "same day"
+msgstr ""
+
+msgid "same week"
+msgstr ""
+
+msgid "same month"
+msgstr ""
+
+msgid "Record"
+msgstr ""
+
+msgid "Announce by OSD"
+msgstr ""
+
+msgid "Switch only"
+msgstr ""
+
+msgid "Announce and switch"
+msgstr ""
+
+msgid "Announce by mail"
+msgstr ""
+
+msgid "Inactive record"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "count recordings"
+msgstr ""
+
+msgid "count days"
+msgstr ""
+
 msgid "General Settings"
 msgstr "Основные настройки"
 
@@ -777,16 +882,31 @@ msgstr ""
 msgid "Folder for instant Recordings"
 msgstr ""
 
+msgid "Folder"
+msgstr ""
+
 msgid "Use Remotetimers"
 msgstr "RemoteTimers benutzen"
 
+msgid "Limit channels in favorites"
+msgstr ""
+
+msgid "Start Channel"
+msgstr "С канала"
+
+msgid "Stop Channel"
+msgstr "По канал"
+
 msgid "Use \"What's on now\" in favorites"
 msgstr ""
 
 msgid "Use \"What's on next\" in favorites"
 msgstr ""
 
-msgid "Use user defined time 1 in favorites"
+msgid "User defined times in favorites:"
+msgstr ""
+
+msgid "Use user defined time 1"
 msgstr ""
 
 msgid "Description"
@@ -795,16 +915,19 @@ msgstr ""
 msgid "Time"
 msgstr ""
 
-msgid "Use user defined time 2 in favorites"
+msgid "Use user defined time 2"
 msgstr ""
 
-msgid "Use user defined time 3 in favorites"
+msgid "Use user defined time 3"
 msgstr ""
 
-msgid "Use user defined time 4 in favorites"
+msgid "Use user defined time 4"
 msgstr ""
 
-msgid "Limit channels in favorites"
+msgid "Switchtimer:"
+msgstr ""
+
+msgid "Switch (x)min before start of the show"
 msgstr ""
 
 msgid "Create Log Messages for image loading"
@@ -837,6 +960,9 @@ msgstr ""
 msgid "Recording Menus Icon Cache"
 msgstr ""
 
+msgid "A fancy 2d EPG Viewer"
+msgstr ""
+
 msgid "No Cast available"
 msgstr ""
 
@@ -906,9 +1032,6 @@ msgstr ""
 msgid "yes"
 msgstr ""
 
-msgid "no"
-msgstr ""
-
 msgid "Adult"
 msgstr ""
 

po/sk_SK.po

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-tvguide 1.1.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-05-10 17:24+0200\n"
+"POT-Creation-Date: 2019-04-22 14:34+0200\n"
 "PO-Revision-Date: 2013-09-15 00:12+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: \n"
@@ -300,79 +300,106 @@ msgstr ""
 msgid "Save Search Timer"
 msgstr ""
 
-msgid "Search String"
+msgid "Search term"
 msgstr ""
 
 msgid "Active"
 msgstr ""
 
-msgid "Search Mode"
-msgstr "Re<EFBFBD>im vyh<79>ad<61>vania"
+msgid "Search mode"
+msgstr ""
 
-msgid "Use Title"
+msgid "Tolerance"
+msgstr ""
+
+msgid "Match case"
+msgstr ""
+
+msgid "Use title"
 msgstr "Pou<6F>i<EFBFBD> n<>zov"
 
-msgid "Use Subtitle"
+msgid "Use subtitle"
 msgstr "Pou<6F>i<EFBFBD> titulky"
 
-msgid "Use Description"
+msgid "Use description"
 msgstr "Pou<6F>i<EFBFBD> popis"
 
-msgid "Limit Channels"
+msgid "Use channel"
 msgstr "Obmedzi<7A> kan<61>ly"
 
-msgid "Use Time"
+msgid "from channel"
+msgstr ""
+
+msgid "to channel"
+msgstr ""
+
+msgid "Channel group"
+msgstr ""
+
+msgid "Use time"
 msgstr "Pou<6F>i<EFBFBD> <20>as"
 
-msgid "Display advanced Options"
-msgstr ""
-
-msgid "Limit Days of the Week"
-msgstr ""
-
-msgid "Time margin for start in minutes"
-msgstr ""
-
-msgid "Time margin for stop in minutes"
-msgstr ""
-
-msgid "Series Recording"
-msgstr ""
-
-msgid "Folder"
-msgstr ""
-
-msgid "Use VPS"
-msgstr ""
-
-msgid "Avoid Repeats"
-msgstr ""
-
-msgid "Use in Favorites"
-msgstr ""
-
-msgid "Hide advanced Options"
-msgstr ""
-
-msgid "Display Results for Search Timer"
-msgstr "Pozrie<69> v<>sledky pre vyh<79>ad<61>vanie pl<70>nov"
-
-msgid "Start Channel"
-msgstr "Od kan<61>lu"
-
-msgid "Stop Channel"
-msgstr "Po kan<61>l"
-
 msgid "Start after"
 msgstr "Za<5A>iatok po"
 
 msgid "Start before"
 msgstr "Za<5A>iatok pred"
 
-msgid "Select Days"
+msgid "Use duration"
 msgstr ""
 
-msgid "Number of allowed repeats"
+msgid "Min. duration"
+msgstr ""
+
+msgid "Max. duration"
+msgstr ""
+
+msgid "Use day of week"
+msgstr ""
+
+msgid "Day of week"
+msgstr ""
+
+msgid "Use in Favorites"
+msgstr ""
+
+msgid "Use as search timer"
+msgstr ""
+
+msgid "Action"
+msgstr ""
+
+msgid "Switch ... minutes before start"
+msgstr ""
+
+msgid "Unmute sound"
+msgstr ""
+
+msgid "Ask ... minutes before start"
+msgstr ""
+
+msgid "Series Recording"
+msgstr ""
+
+msgid "Directory"
+msgstr ""
+
+msgid "Delete recordings after ... days"
+msgstr ""
+
+msgid "Keep ... recordings"
+msgstr ""
+
+msgid "Pause when ... recordings exist"
+msgstr ""
+
+msgid "Avoid Repeats"
+msgstr ""
+
+msgid "Allowed repeats"
+msgstr ""
+
+msgid "Only repeats within ... days"
 msgstr ""
 
 msgid "Compare Title"
@@ -384,6 +411,33 @@ msgstr ""
 msgid "Compare Description"
 msgstr ""
 
+msgid "Min. match in %"
+msgstr ""
+
+msgid "Compare date"
+msgstr ""
+
+msgid "Time margin for start in minutes"
+msgstr ""
+
+msgid "Time margin for stop in minutes"
+msgstr ""
+
+msgid "Use VPS"
+msgstr ""
+
+msgid "Auto delete"
+msgstr ""
+
+msgid "after ... recordings"
+msgstr ""
+
+msgid "after ... days after first rec."
+msgstr ""
+
+msgid "Display Results for Search Timer"
+msgstr "Pozrie<69> v<>sledky pre vyh<79>ad<61>vanie pl<70>nov"
+
 msgid "Really delete Search Timer"
 msgstr ""
 
@@ -459,6 +513,9 @@ msgstr "Pl
 msgid "Switch Timer deleted"
 msgstr "Pl<50>n prepnutia vymazan<61>"
 
+msgid "Search Mode"
+msgstr "Re<52>im vyh<79>ad<61>vania"
+
 msgid "Channel to Search"
 msgstr "H<>ada<64> na kan<61>le"
 
@@ -522,6 +579,54 @@ msgstr "presn
 msgid "regular expression"
 msgstr "regul<75>rny v<>raz"
 
+msgid "fuzzy"
+msgstr ""
+
+msgid "Interval"
+msgstr ""
+
+msgid "Channel Group"
+msgstr ""
+
+msgid "only FTA"
+msgstr ""
+
+msgid "same day"
+msgstr ""
+
+msgid "same week"
+msgstr ""
+
+msgid "same month"
+msgstr ""
+
+msgid "Record"
+msgstr ""
+
+msgid "Announce by OSD"
+msgstr ""
+
+msgid "Switch only"
+msgstr ""
+
+msgid "Announce and switch"
+msgstr ""
+
+msgid "Announce by mail"
+msgstr ""
+
+msgid "Inactive record"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "count recordings"
+msgstr ""
+
+msgid "count days"
+msgstr ""
+
 msgid "General Settings"
 msgstr "V<>eobecn<63> nastavenia"
 
@@ -777,16 +882,31 @@ msgstr ""
 msgid "Folder for instant Recordings"
 msgstr ""
 
+msgid "Folder"
+msgstr ""
+
 msgid "Use Remotetimers"
 msgstr "Pou<6F>i<EFBFBD> vzdialen<65> pl<70>nova<76>"
 
+msgid "Limit channels in favorites"
+msgstr ""
+
+msgid "Start Channel"
+msgstr "Od kan<61>lu"
+
+msgid "Stop Channel"
+msgstr "Po kan<61>l"
+
 msgid "Use \"What's on now\" in favorites"
 msgstr ""
 
 msgid "Use \"What's on next\" in favorites"
 msgstr ""
 
-msgid "Use user defined time 1 in favorites"
+msgid "User defined times in favorites:"
+msgstr ""
+
+msgid "Use user defined time 1"
 msgstr ""
 
 msgid "Description"
@@ -795,16 +915,19 @@ msgstr ""
 msgid "Time"
 msgstr ""
 
-msgid "Use user defined time 2 in favorites"
+msgid "Use user defined time 2"
 msgstr ""
 
-msgid "Use user defined time 3 in favorites"
+msgid "Use user defined time 3"
 msgstr ""
 
-msgid "Use user defined time 4 in favorites"
+msgid "Use user defined time 4"
 msgstr ""
 
-msgid "Limit channels in favorites"
+msgid "Switchtimer:"
+msgstr ""
+
+msgid "Switch (x)min before start of the show"
 msgstr ""
 
 msgid "Create Log Messages for image loading"
@@ -837,6 +960,9 @@ msgstr ""
 msgid "Recording Menus Icon Cache"
 msgstr ""
 
+msgid "A fancy 2d EPG Viewer"
+msgstr ""
+
 msgid "No Cast available"
 msgstr ""
 
@@ -906,9 +1032,6 @@ msgstr ""
 msgid "yes"
 msgstr ""
 
-msgid "no"
-msgstr ""
-
 msgid "Adult"
 msgstr ""
 

recmanager.c

@@ -44,37 +44,40 @@ bool cRecManager::RefreshRemoteTimers(void) {
 bool cRecManager::CheckEventForTimer(const cEvent *event) {
     bool hasTimer = false;
 
-    if (tvguideConfig.useRemoteTimers && pRemoteTimers) {
+    if (config.useRemoteTimers && pRemoteTimers) {
         RemoteTimers_GetMatch_v1_0 rtMatch;
         rtMatch.event = event;
         pRemoteTimers->Service("RemoteTimers::GetMatch-v1.0", &rtMatch);
         if (rtMatch.timerMatch == tmFull)
             hasTimer = true;
-    } else
+    } else {
+#if VDRVERSNUM >= 20301
+        eTimerMatch TimerMatch = tmNone;
+        LOCK_TIMERS_READ;
+        const cTimers *timers = Timers;
+        if (timers->GetMatch(event, &TimerMatch) && (TimerMatch == tmFull))
+            hasTimer = true;
+#else
         hasTimer = event->HasTimer();
-
+#endif
+    }
     return hasTimer;
 }
 
-#if VDRVERSNUM >= 20301
 const cTimer *cRecManager::GetTimerForEvent(const cEvent *event) {
     const cTimer *timer = NULL;
-#else
-cTimer *cRecManager::GetTimerForEvent(const cEvent *event) {
-    cTimer *timer = NULL;
-#endif
-    if (tvguideConfig.useRemoteTimers && pRemoteTimers) {
+    if (config.useRemoteTimers && pRemoteTimers) {
         RemoteTimers_GetMatch_v1_0 rtMatch;
         rtMatch.event = event;
         pRemoteTimers->Service("RemoteTimers::GetMatch-v1.0", &rtMatch);
         timer = rtMatch.timer;
-#if VDRVERSNUM >= 20301
         return timer;
     }
+
+#if VDRVERSNUM >= 20301
     LOCK_TIMERS_READ;
     timer = Timers->GetMatch(event);
 #else
-    } else
     timer = Timers.GetMatch(event);
 #endif
     return timer;
@@ -82,7 +85,7 @@ cTimer *cRecManager::GetTimerForEvent(const cEvent *event) {
 
 cTimer *cRecManager::createTimer(const cEvent *event, std::string path) {
     cTimer *timer = NULL;
-    if (tvguideConfig.useRemoteTimers && pRemoteTimers) {
+    if (config.useRemoteTimers && pRemoteTimers) {
         timer = createRemoteTimer(event, path);
     } else {
         timer = createLocalTimer(event, path);
@@ -93,11 +96,14 @@ cTimer *cRecManager::createTimer(const cEvent *event, std::string path) {
 cTimer *cRecManager::createLocalTimer(const cEvent *event, std::string path) {
     cTimer *timer = new cTimer(event);
 #if VDRVERSNUM >= 20301
+    if (Setup.SVDRPPeering && *Setup.SVDRPDefaultHost)
+        ((cTimer*)timer)->SetRemote(Setup.SVDRPDefaultHost);
     LOCK_TIMERS_WRITE;
-    cTimer *t = Timers->GetTimer(timer);
+    cTimers* timers = Timers;
 #else
-    cTimer *t = Timers.GetTimer(timer);
+    cTimers* timers = &Timers;
 #endif
+    cTimer *t = timers->GetTimer(timer);
     if (t) {
         t->OnOff();
 #if VDRVERSNUM >= 20301
@@ -109,19 +115,11 @@ cTimer *cRecManager::createLocalTimer(const cEvent *event, std::string path) {
         timer = t;
         isyslog("timer %s reactivated", *t->ToDescr());
     } else {
-#if VDRVERSNUM >= 20301
-        Timers->Add(timer);
-#else
-        Timers.Add(timer);
-#endif
+        timers->Add(timer);
         isyslog("timer %s added (active)", *timer->ToDescr());
     }
     SetTimerPath(timer, event, path);
-#if VDRVERSNUM >= 20301
-    Timers->SetModified();
-#else
-    Timers.SetModified();
-#endif
+    timers->SetModified();
     return timer;
 }
 
@@ -145,9 +143,9 @@ cTimer *cRecManager::createRemoteTimer(const cEvent *event, std::string path) {
 }
 
 void cRecManager::SetTimerPath(cTimer *timer, const cEvent *event, std::string path) {
-    if (tvguideConfig.instRecFolderMode == eFolderFixed) {
+    if (config.instRecFolderMode == eFolderFixed) {
         Epgsearch_services_v1_2 *epgSearch = new Epgsearch_services_v1_2;
-        std::string recDir = tvguideConfig.instRecFixedFolder;
+        std::string recDir = config.instRecFixedFolder;
         std::replace(recDir.begin(), recDir.end(), '/', '~');
         if (strchr(recDir.c_str(), '%') != NULL) {
             if (epgSearchPlugin->Service("Epgsearch-services-v1.1", epgSearch)) {
@@ -178,15 +176,14 @@ void cRecManager::SetTimerPath(cTimer *timer, const cEvent *event, std::string p
 }
 
 void cRecManager::DeleteTimer(int timerID) {
-    dsyslog ("%s %s %d\n", __FILE__, __func__,  __LINE__);
+    const cTimer *t;
 #if VDRVERSNUM >= 20301
-    cTimer *t;
     {
-    LOCK_TIMERS_WRITE;
+    LOCK_TIMERS_READ;
     t = Timers->Get(timerID);
     }
 #else
-    cTimer *t = Timers.Get(timerID);
+    t = Timers.Get(timerID);
 #endif
     if (!t)
         return;
@@ -194,10 +191,9 @@ void cRecManager::DeleteTimer(int timerID) {
 }
 
 void cRecManager::DeleteTimer(const cEvent *event) {
-    dsyslog ("%s %s %d\n", __FILE__, __func__,  __LINE__);
     if (!event)
         return;
-    if (tvguideConfig.useRemoteTimers && pRemoteTimers) {
+    if (config.useRemoteTimers && pRemoteTimers) {
         DeleteRemoteTimer(event);
     } else {
         DeleteLocalTimer(event);
@@ -205,42 +201,42 @@ void cRecManager::DeleteTimer(const cEvent *event) {
 }
 
 void cRecManager::DeleteLocalTimer(const cEvent *event) {
-    dsyslog ("%s %s %d\n", __FILE__, __func__,  __LINE__);
+    const cTimer *t;
 #if VDRVERSNUM >= 20301
-    cTimer *t;
     {
-    LOCK_TIMERS_WRITE;
+    LOCK_TIMERS_READ;
     t = Timers->GetMatch(event);
     }
 #else
-    cTimer *t = Timers.GetMatch(event);
+    t = Timers.GetMatch(event);
 #endif
     if (!t)
         return;
     DeleteTimer(t);
 }
 
-void cRecManager::DeleteTimer(cTimer *timer) {
-    dsyslog ("%s %s %d\n", __FILE__, __func__,  __LINE__);
+void cRecManager::DeleteTimer(const cTimer *timer) {
 #if VDRVERSNUM >= 20301
     LOCK_TIMERS_WRITE;
+    cTimers* timers = Timers;
+    cTimer* t = timers->GetTimer(timer);
+#else
+    cTimers* timers = &Timers;
+    cTimer* t = timers->GetTimer((cTimer*)timer);
 #endif
-    if (timer->Recording()) {
-        timer->Skip();
+    if (!t)
+        return;
+    if (t->Recording()) {
+        t->Skip();
 #if VDRVERSNUM >= 20301
-        cRecordControls::Process(Timers, time(NULL));
+        cRecordControls::Process(timers, time(NULL));
 #else
         cRecordControls::Process(time(NULL));
 #endif
     }
-    isyslog("timer %s deleted", *timer->ToDescr());
-#if VDRVERSNUM >= 20301
-    Timers->Del(timer, true);
-    Timers->SetModified();
-#else
-    Timers.Del(timer, true);
-    Timers.SetModified();
-#endif
+    isyslog("timer %s deleted", *t->ToDescr());
+    timers->Del(t, true);
+    timers->SetModified();
 }
 
 void cRecManager::DeleteRemoteTimer(const cEvent *event) {
@@ -257,19 +253,17 @@ void cRecManager::DeleteRemoteTimer(const cEvent *event) {
     }
 }
 
-#if VDRVERSNUM >= 20301
 void cRecManager::SaveTimer(const cTimer *t, cTimer newTimerSettings) {
     if (!t)
-#else
-void cRecManager::SaveTimer(cTimer *timer, cTimer newTimerSettings) {
-    if (!timer)
-#endif
         return;
 
 #if VDRVERSNUM >= 20301
     LOCK_TIMERS_WRITE;
     cTimer *timer = Timers->GetTimer(t);
+#else
+    cTimer *timer = Timers.GetTimer((cTimer*)t);
 #endif
+
     bool active = newTimerSettings.HasFlags(tfActive);
     int prio = newTimerSettings.Priority();
     int lifetime = newTimerSettings.Lifetime();
@@ -293,7 +287,7 @@ void cRecManager::SaveTimer(cTimer *timer, cTimer newTimerSettings) {
 #if VDRVERSNUM < 20300
     timer->SetEventFromSchedule();
 #endif
-    if (tvguideConfig.useRemoteTimers && pRemoteTimers) {
+    if (config.useRemoteTimers && pRemoteTimers) {
         RemoteTimers_Timer_v1_0 rt;
         rt.timer = timer;
         if (!pRemoteTimers->Service("RemoteTimers::ModTimer-v1.0", &rt))
@@ -308,7 +302,6 @@ void cRecManager::SaveTimer(cTimer *timer, cTimer newTimerSettings) {
     }
 }
 
-
 bool cRecManager::IsRecorded(const cEvent *event) {
 #if VDRVERSNUM >= 20301
     LOCK_TIMERS_WRITE;
@@ -341,11 +334,10 @@ cTVGuideTimerConflicts *cRecManager::CheckTimerConflict(void) {
 }
 
 void cRecManager::CreateSeriesTimer(cTimer *seriesTimer) {
-#if VDRVERSNUM >= 20301
-#else
+#if VDRVERSNUM < 20300
     seriesTimer->SetEventFromSchedule();
 #endif
-    if (tvguideConfig.useRemoteTimers && pRemoteTimers) {
+    if (config.useRemoteTimers && pRemoteTimers) {
         RemoteTimers_Timer_v1_0 rt;
         rt.timer = seriesTimer;
         if (!pRemoteTimers->Service("RemoteTimers::NewTimer-v1.0", &rt))
@@ -355,12 +347,11 @@ void cRecManager::CreateSeriesTimer(cTimer *seriesTimer) {
 #if VDRVERSNUM >= 20301
         LOCK_TIMERS_WRITE;
         cTimers* timers = Timers;
+#else
+        cTimers* timers = &Timers;
+#endif
         timers->Add(seriesTimer);
         timers->SetModified();
-#else
-        Timers.Add(seriesTimer);
-        Timers.SetModified();
-#endif
     }
 }
 
@@ -407,12 +398,14 @@ const cEvent **cRecManager::PerformSearchTimerSearch(std::string epgSearchString
         numResults = results.size();
         if (numResults > 0) {
             searchResults = new const cEvent *[numResults];
+            const cSchedules *schedules;
 #if VDRVERSNUM >= 20301
+            {
             LOCK_SCHEDULES_READ;
-            const cSchedules* schedules = Schedules;
+            schedules = Schedules;
+            }
 #else
             cSchedulesLock schedulesLock;
-            const cSchedules *schedules;
             schedules = cSchedules::Schedules(schedulesLock);
 #endif
             const cEvent *event = NULL;
@@ -424,11 +417,14 @@ const cEvent **cRecManager::PerformSearchTimerSearch(std::string epgSearchString
                     int eventID = atoi(flds[1].c_str());
                     std::string channelID = flds[7];
                     tChannelID chanID = tChannelID::FromString(channelID.c_str());
+                    const cChannel *channel;
 #if VDRVERSNUM >= 20301
+                    {
                     LOCK_CHANNELS_READ;
-                    const cChannel *channel = Channels->GetByChannelID(chanID);
+                    channel = Channels->GetByChannelID(chanID);
+                    }
 #else
-                    cChannel *channel = Channels.GetByChannelID(chanID);
+                    channel = Channels.GetByChannelID(chanID);
 #endif
                     if (channel) {
                         const cSchedule *Schedule = NULL;
@@ -490,6 +486,52 @@ void cRecManager::GetSearchTimers(std::vector<cTVGuideSearchTimer> *searchTimer)
     std::sort(searchTimer->begin(), searchTimer->end());
 }
 
+void cRecManager::GetSearchExtCats(std::vector<std::string> *searchExtCats) {
+    if (!epgSearchAvailable) {
+            return;
+    }
+    Epgsearch_services_v1_1 *epgSearch = new Epgsearch_services_v1_1;
+    if (epgSearchPlugin->Service("Epgsearch-services-v1.1", epgSearch)) {
+        std::list<std::string> list;
+        list = epgSearch->handler->ExtEPGInfoList();
+
+        for (std::list<std::string>::iterator it = list.begin(); it != list.end(); it++) {
+            searchExtCats->push_back(*it);
+        }
+    }
+}
+
+void cRecManager::GetChannelGroups(std::vector<std::string> *channelGroups) {
+    if (!epgSearchAvailable) {
+            return;
+    }
+    Epgsearch_services_v1_1 *epgSearch = new Epgsearch_services_v1_1;
+    if (epgSearchPlugin->Service("Epgsearch-services-v1.1", epgSearch)) {
+        std::list<std::string> list;
+        list = epgSearch->handler->ChanGrpList();
+
+        for (std::list<std::string>::iterator it = list.begin(); it != list.end(); it++) {
+            channelGroups->push_back(*it);
+        }
+    }
+    std::sort(channelGroups->begin(), channelGroups->end());
+}
+
+void cRecManager::GetBlacklists(std::vector<std::string> *blacklists) {
+    if (!epgSearchAvailable) {
+            return;
+    }
+    Epgsearch_services_v1_1 *epgSearch = new Epgsearch_services_v1_1;
+    if (epgSearchPlugin->Service("Epgsearch-services-v1.1", epgSearch)) {
+        std::list<std::string> list;
+        list = epgSearch->handler->BlackList();
+
+        for (std::list<std::string>::iterator it = list.begin(); it != list.end(); it++) {
+            blacklists->push_back(*it);
+        }
+    }
+}
+
 int cRecManager::CreateSearchTimer(std::string epgSearchString) {
     int timerID = -1;
     if (!epgSearchAvailable)
@@ -536,45 +578,33 @@ void cRecManager::DeleteSearchTimer(cTVGuideSearchTimer *searchTimer, bool delTi
         return;
     int searchTimerID = searchTimer->GetID();
     if (delTimers) {
+        cTimers* timers;
 #if VDRVERSNUM >= 20301
+        {
         LOCK_TIMERS_WRITE;
-        cTimer *timer = Timers->First();
+        timers = Timers;
+        }
 #else
-        cTimer *timer = Timers.First();
+        timers = &Timers;
 #endif
+        cTimer *timer = timers->First();
         while (timer) {
             if (!timer->Recording()) {
                 char* searchID = GetAuxValue(timer, "s-id");
                 if (searchID) {
                     if (searchTimerID == atoi(searchID)) {
-#if VDRVERSNUM >= 20301
-                        cTimer* timerNext = Timers->Next(timer);
-#else
-                        cTimer* timerNext = Timers.Next(timer);
-#endif
+                        cTimer* timerNext = timers->Next(timer);
                         DeleteTimer(timer);
                         timer = timerNext;
                     } else {
-#if VDRVERSNUM >= 20301
-                        timer = Timers->Next(timer);
-#else
-                        timer = Timers.Next(timer);
-#endif
+                        timer = timers->Next(timer);
                     }
                     free(searchID);
                 } else {
-#if VDRVERSNUM >= 20301
-                    timer = Timers->Next(timer);
-#else
-                    timer = Timers.Next(timer);
-#endif
+                    timer = timers->Next(timer);
                 }
             } else {
-#if VDRVERSNUM >= 20301
-                timer = Timers->Next(timer);
-#else
-                timer = Timers.Next(timer);
-#endif
+                timer = timers->Next(timer);
             }
         }
     }
@@ -582,9 +612,9 @@ void cRecManager::DeleteSearchTimer(cTVGuideSearchTimer *searchTimer, bool delTi
     if (epgSearchPlugin->Service("Epgsearch-services-v1.1", epgSearch)) {
         bool success = epgSearch->handler->DelSearchTimer(searchTimerID);
         if (success) {
-            esyslog("tvguide: search timer \"%s\" sucessfully deleted", searchTimer->SearchString().c_str());
+            esyslog("tvguide: search timer \"%s\" sucessfully deleted", searchTimer->GetSearchString().c_str());
         } else {
-            esyslog("tvguide: error deleting search timer \"%s\"", searchTimer->SearchString().c_str());
+            esyslog("tvguide: error deleting search timer \"%s\"", searchTimer->GetSearchString().c_str());
         }
     }
 }
@@ -597,14 +627,14 @@ void cRecManager::UpdateSearchTimers(void) {
     }
 }
 
-// announceOnly: 0 = switch, 1 = announce only, 2 = ask for switch
+// switchMode: 0 = switch, 1 = announce only, 2 = ask for switch
 bool cRecManager::CreateSwitchTimer(const cEvent *event, cSwitchTimer switchTimer) {
     if (epgSearchAvailable && event) {
         Epgsearch_switchtimer_v1_0 data;
         data.event = event;
         data.mode = 1;
         data.switchMinsBefore = switchTimer.switchMinsBefore;
-        data.announceOnly = switchTimer.announceOnly;
+        data.announceOnly = switchTimer.switchMode;
         data.success = false;
         epgSearchPlugin->Service("Epgsearch-switchtimer-v1.0", &data);
         cSwitchTimer *t = new cSwitchTimer(event);
@@ -627,24 +657,20 @@ void cRecManager::DeleteSwitchTimer(const cEvent *event) {
     }
 }
 
-#if VDRVERSNUM >= 20301
 const cRecording **cRecManager::SearchForRecordings(std::string searchString, int &numResults) {
 
     const cRecording **matchingRecordings = NULL;
-#else
-cRecording **cRecManager::SearchForRecordings(std::string searchString, int &numResults) {
-
-    cRecording **matchingRecordings = NULL;
-#endif
     int num = 0;
     numResults = 0;
 
 #if VDRVERSNUM >= 20301
     LOCK_RECORDINGS_READ;
-    for (const cRecording *recording = Recordings->First(); recording; recording = Recordings->Next(recording)) {
+    const cRecordings* recordings = Recordings;
 #else
-    for (cRecording *recording = Recordings.First(); recording; recording = Recordings.Next(recording)) {
+    const cRecordings* recordings = &Recordings;
 #endif
+
+    for (const cRecording *recording = recordings->First(); recording; recording = recordings->Next(recording)) {
         std::string s1 = recording->Name();
         std::string s2 = searchString;
         if (s1.empty() || s2.empty()) continue;
@@ -675,11 +701,7 @@ cRecording **cRecManager::SearchForRecordings(std::string searchString, int &num
         }
 
         if (match) {
-#if VDRVERSNUM >= 20301
             matchingRecordings = (const cRecording **)realloc(matchingRecordings, (num + 1) * sizeof(cRecording *));
-#else
-            matchingRecordings = (cRecording **)realloc(matchingRecordings, (num + 1) * sizeof(cRecording *));
-#endif
             matchingRecordings[num++] = recording;
         }
     }
@@ -695,8 +717,8 @@ const cEvent **cRecManager::LoadReruns(const cEvent *event, int &numResults) {
     if (epgSearchAvailable && !isempty(event->Title())) {
         Epgsearch_searchresults_v1_0 data;
         std::string strQuery = event->Title();
-        if (tvguideConfig.useSubtitleRerun > 0) {
-            if (tvguideConfig.useSubtitleRerun == 2 || !isempty(event->ShortText()))
+        if (config.useSubtitleRerun > 0) {
+            if (config.useSubtitleRerun == 2 || !isempty(event->ShortText()))
                 strQuery += "~";
             if (!isempty(event->ShortText()))
                 strQuery += event->ShortText();
@@ -757,33 +779,24 @@ void cRecManager::GetFavorites(std::vector<cTVGuideSearchTimer> *favorites) {
 const cEvent **cRecManager::WhatsOnNow(bool nowOrNext, int &numResults) {
     std::vector<const cEvent*> tmpResults;
 #if VDRVERSNUM >= 20301
-    LOCK_SCHEDULES_READ;
     LOCK_CHANNELS_READ;
-//    const cChannels* channels = Channels;
+    const cChannels* channels = Channels;
+    LOCK_SCHEDULES_READ;
     const cSchedules* schedules = Schedules;
 #else
+    cChannels* channels = &Channels;
     cSchedulesLock schedulesLock;
     const cSchedules *schedules = cSchedules::Schedules(schedulesLock);
 #endif
     const cChannel *startChannel = NULL, *stopChannel = NULL;
-    if (tvguideConfig.favLimitChannels) {
-#if VDRVERSNUM >= 20301
-        startChannel = Channels->GetByNumber(tvguideConfig.favStartChannel);
-        stopChannel = Channels->GetByNumber(tvguideConfig.favStopChannel);
+    if (config.favLimitChannels) {
+        startChannel = channels->GetByNumber(config.favStartChannel);
+        stopChannel = channels->GetByNumber(config.favStopChannel);
     }
     if (!startChannel)
-        startChannel = Channels->First();
+        startChannel = channels->First();
 
-    for (const cChannel *channel = startChannel; channel; channel = Channels->Next(channel)) {
-#else
-        startChannel = Channels.GetByNumber(tvguideConfig.favStartChannel);
-        stopChannel = Channels.GetByNumber(tvguideConfig.favStopChannel);
-    }
-    if (!startChannel)
-        startChannel = Channels.First();
-
-    for (const cChannel *channel = startChannel; channel; channel = Channels.Next(channel)) {
-#endif
+    for (const cChannel *channel = startChannel; channel; channel = channels->Next(channel)) {
         if (channel->GroupSep()) continue;
         const cSchedule *Schedule = schedules->GetSchedule(channel);
         if (!Schedule) continue;
@@ -812,13 +825,13 @@ const cEvent **cRecManager::UserDefinedTime(int userTime, int &numResults) {
     std::vector<const cEvent*> tmpResults;
     int favTime = 0;
     if (userTime == 1) {
-        favTime = tvguideConfig.favTime1;
+        favTime = config.favTime1;
     } else if (userTime == 2) {
-        favTime = tvguideConfig.favTime2;
+        favTime = config.favTime2;
     } else if (userTime == 3) {
-        favTime = tvguideConfig.favTime3;
+        favTime = config.favTime3;
     } else if (userTime == 4) {
-        favTime = tvguideConfig.favTime4;
+        favTime = config.favTime4;
     }
 
     time_t now = time(0);
@@ -835,32 +848,23 @@ const cEvent **cRecManager::UserDefinedTime(int userTime, int &numResults) {
 
 #if VDRVERSNUM >= 20301
     LOCK_CHANNELS_READ;
+    const cChannels* channels = Channels;
     LOCK_SCHEDULES_READ;
-//    const cChannels* channels = Channels;
     const cSchedules* schedules = Schedules;
 #else
+    cChannels* channels = &Channels;
     cSchedulesLock schedulesLock;
     const cSchedules *schedules = cSchedules::Schedules(schedulesLock);
 #endif
     const cChannel *startChannel = NULL, *stopChannel = NULL;
-    if (tvguideConfig.favLimitChannels) {
-#if VDRVERSNUM >= 20301
-        startChannel = Channels->GetByNumber(tvguideConfig.favStartChannel);
-        stopChannel = Channels->GetByNumber(tvguideConfig.favStopChannel);
+    if (config.favLimitChannels) {
+        startChannel = channels->GetByNumber(config.favStartChannel);
+        stopChannel = channels->GetByNumber(config.favStopChannel);
     }
     if (!startChannel)
-        startChannel = Channels->First();
+        startChannel = channels->First();
 
-    for (const cChannel *channel = startChannel; channel; channel = Channels->Next(channel)) {
-#else
-        startChannel = Channels.GetByNumber(tvguideConfig.favStartChannel);
-        stopChannel = Channels.GetByNumber(tvguideConfig.favStopChannel);
-    }
-    if (!startChannel)
-        startChannel = Channels.First();
-
-    for (const cChannel *channel = startChannel; channel; channel = Channels.Next(channel)) {
-#endif
+    for (const cChannel *channel = startChannel; channel; channel = channels->Next(channel)) {
         if (channel->GroupSep()) continue;
         const cSchedule *Schedule = schedules->GetSchedule(channel);
         if (!Schedule) continue;

recmanager.h

@@ -28,25 +28,17 @@ public:
     bool EpgSearchAvailable(void) {return epgSearchAvailable;};
     bool RefreshRemoteTimers(void);
     bool CheckEventForTimer(const cEvent *event);
-#if VDRVERSNUM >= 20301
     const cTimer *GetTimerForEvent(const cEvent *event);
-#else
-    cTimer *GetTimerForEvent(const cEvent *event);
-#endif
     cTimer *createTimer(const cEvent *event, std::string path = "");
     cTimer *createLocalTimer(const cEvent *event, std::string path);
     cTimer *createRemoteTimer(const cEvent *event, std::string path);
     void SetTimerPath(cTimer *timer, const cEvent *event, std::string path);
-    void DeleteTimer(cTimer *timer);
+    void DeleteTimer(const cTimer *timer);
     void DeleteTimer(int timerID);
     void DeleteTimer(const cEvent *event);
     void DeleteLocalTimer(const cEvent *event);
     void DeleteRemoteTimer(const cEvent *event);
-#if VDRVERSNUM >= 20301
     void SaveTimer(const cTimer *timer, cTimer newTimerSettings);
-#else
-    void SaveTimer(cTimer *timer, cTimer newTimerSettings);
-#endif
     bool IsRecorded(const cEvent *event);
     cTVGuideTimerConflicts *CheckTimerConflict(void);
     void CreateSeriesTimer(cTimer *seriesTimer);
@@ -54,17 +46,16 @@ public:
     const cEvent **PerformSearch(Epgsearch_searchresults_v1_0 data, int &numResults);
     void ReadEPGSearchTemplates(std::vector<TVGuideEPGSearchTemplate> *epgTemplates);
     void GetSearchTimers(std::vector<cTVGuideSearchTimer> *timers);
+    void GetSearchExtCats(std::vector<std::string> *searchExtCats);
+    void GetChannelGroups(std::vector<std::string> *channelGroups);
+    void GetBlacklists(std::vector<std::string> *blacklists);
     int CreateSearchTimer(std::string epgSearchString);
     bool SaveSearchTimer(cTVGuideSearchTimer *searchTimer);
     void DeleteSearchTimer(cTVGuideSearchTimer *searchTimer, bool delTimers);
     void UpdateSearchTimers(void);
     bool CreateSwitchTimer(const cEvent *event, cSwitchTimer switchTimer);
     void DeleteSwitchTimer(const cEvent *event);
-#if VDRVERSNUM >= 20301
     const cRecording **SearchForRecordings(std::string searchString, int &numResults);
-#else
-    cRecording **SearchForRecordings(std::string searchString, int &numResults);
-#endif
     const cEvent **LoadReruns(const cEvent *event, int &numResults);
     void GetFavorites(std::vector<cTVGuideSearchTimer> *favorites);
     const cEvent **WhatsOnNow(bool nowOrNext, int &numResults);

recmenu.c

@@ -55,24 +55,28 @@ int cRecMenu::CalculateOptimalWidth(void) {
 
 bool cRecMenu::CalculateHeight(bool reDraw) {
     int newHeight = 2 * border;
-    if (header)
+    bool returnvalue = false;
+    if (header) {
         newHeight += headerHeight;
+    }
     for (std::list<cRecMenuItem*>::iterator item = menuItems.begin(); item != menuItems.end(); item++) {
         newHeight += (*item)->GetHeight();
     }
-    if (footer)
+    if (footer) {
         newHeight += footerHeight;
+    }
 
     y = (geoManager.osdHeight - newHeight) / 2;
 
     if (newHeight != height) {
         height = newHeight;
+        returnvalue = true;
+    }
     if (scrollable && !reDraw) {
         width += scrollbarWidth + border;
+        returnvalue = true;
     }
-        return true;
-    }
-    return false;
+    return returnvalue;
 }
 
 void cRecMenu::CreatePixmap(void) {
@@ -141,7 +145,6 @@ void cRecMenu::InitMenu(bool complete) {
 
 }
 
-
 void cRecMenu::AddMenuItem(cRecMenuItem *item, bool inFront) {
     item->Show();
     if (!inFront)
@@ -153,7 +156,7 @@ void cRecMenu::AddMenuItem(cRecMenuItem *item, bool inFront) {
 bool cRecMenu::AddMenuItemInitial(cRecMenuItem *item, bool inFront) {
     currentHeight += item->GetHeight();
     int totalHeight = headerHeight + footerHeight + currentHeight + 2*border;
-    if (totalHeight >= geoManager.osdHeight - 10) {
+    if (totalHeight >= geoManager.osdHeight - 80) {
         scrollable = true;
         currentHeight -= item->GetHeight();
         if (deleteMenuItems) {
@@ -434,14 +437,16 @@ void cRecMenu::JumpBegin(void) {
             if (currentItem >= numItems)
                 break;
         }
-        Arrange(true);
+        if (CalculateHeight(true))
+            CreatePixmap();
+        Arrange(false);
         startIndex = 0;
         stopIndex = numItems - 1;
         cRecMenuItem *first = menuItems.front();
         first->setActive();
         first->setBackground();
         first->Draw();
-        Display(true);    
+        Display(false);    
     }
 }
 
@@ -480,7 +485,9 @@ void cRecMenu::JumpEnd(void) {
             if (itemsAdded >= numItems)
                 break;
         }
-        Arrange(true);
+        if (CalculateHeight(true))
+            CreatePixmap();
+        Arrange(false);
         stopIndex = totalNumItems;
         startIndex = stopIndex - numItems;
         if (footer) {
@@ -493,7 +500,7 @@ void cRecMenu::JumpEnd(void) {
             last->setBackground();
             last->Draw();
         }
-        Display(true);
+        Display(false);
     }
 }
 
@@ -525,7 +532,7 @@ void cRecMenu::Arrange(bool scroll) {
 }
 
 void cRecMenu::Display(bool scroll) {
-    if (tvguideConfig.style == eStyleGraphical) {
+    if (config.style == eStyleGraphical) {
         drawBackgroundGraphical(bgRecMenuBack);
     } else {
         pixmap->Fill(theme.Color(clrBackground));
@@ -667,7 +674,7 @@ eRecMenuState cRecMenu::ProcessKey(eKeys Key) {
 cImage *cRecMenu::createScrollbar(int width, int height, tColor clrBgr, tColor clrBlend) {
     cImage *image = new cImage(cSize(width, height));
     image->Fill(clrBgr);
-    if (tvguideConfig.style != eStyleFlat) {
+    if (config.style != eStyleFlat) {
         int numSteps = 64;
         int alphaStep = 0x03;
         if (height < 30)

recmenuitem.c

@@ -36,7 +36,7 @@ void cRecMenuItem::SetPixmaps(void) {
 }
 
 void cRecMenuItem::setBackground(void) {
-    if (tvguideConfig.style == eStyleGraphical) {
+    if (config.style == eStyleGraphical) {
         if (defaultBackground) {
             drawBackgroundGraphical(bgButton, active);
         }
@@ -52,7 +52,7 @@ void cRecMenuItem::setBackground(void) {
             colorBlending = theme.Color(clrGrid1Blending);
             colorText = theme.Color(clrFont);
         }
-        colorTextBack = (tvguideConfig.style == eStyleFlat)?color:clrTransparent;
+        colorTextBack = (config.style == eStyleFlat)?color:clrTransparent;
         if (defaultBackground) {
             drawBackground();
             drawBorder();
@@ -177,7 +177,7 @@ void cRecMenuItemButtonYesNo::Show(void) {
 }
 
 void cRecMenuItemButtonYesNo::setBackground() {
-    if (tvguideConfig.style == eStyleGraphical) {
+    if (config.style == eStyleGraphical) {
         drawBackgroundGraphical(bgButton, yesActive&&active);
         colorTextBack = clrTransparent;
         colorTextNoBack = clrTransparent;
@@ -213,8 +213,8 @@ void cRecMenuItemButtonYesNo::setBackground() {
                                 theme.Color(clrGrid1Blending));
             colorTextNo = theme.Color(clrFont);
         }
-        colorTextBack = (tvguideConfig.style == eStyleFlat)?color:clrTransparent;
-        colorTextNoBack = (tvguideConfig.style == eStyleFlat)?colorNoBack:clrTransparent;
+        colorTextBack = (config.style == eStyleFlat)?color:clrTransparent;
+        colorTextNoBack = (config.style == eStyleFlat)?colorNoBack:clrTransparent;
         drawBackground();
         drawBorder();
         pixmapNo->drawBackground();
@@ -297,7 +297,6 @@ void cRecMenuItemInfo::Draw(void) {
 
 // --- cRecMenuItemInt  -------------------------------------------------------
 cRecMenuItemInt::cRecMenuItemInt(cString text,
-                                int initialVal,
                                 int minVal,
                                 int maxVal,
                                 bool active, 
@@ -305,7 +304,7 @@ cRecMenuItemInt::cRecMenuItemInt(cString text,
                                 eRecMenuState action) {
     selectable = true;
     this->text = text;
-    this->currentVal = initialVal;
+    this->currentVal = *callback;
     this->minVal = minVal;
     this->maxVal = maxVal;
     this->active = active;
@@ -371,7 +370,7 @@ eRecMenuState cRecMenuItemInt::ProcessKey(eKeys Key) {
                     *callback = currentVal;
                 DrawValue();
             }
-            return rmsConsumed;
+            return (currentVal == 0) ? rmsRefresh : rmsConsumed;
             break;
         case kRight:
             fresh = true;
@@ -381,7 +380,7 @@ eRecMenuState cRecMenuItemInt::ProcessKey(eKeys Key) {
                     *callback = currentVal;
                 DrawValue();
             }
-            return rmsConsumed;
+            return (currentVal == 1) ? rmsRefresh : rmsConsumed;
             break;
         case k0 ... k9:
             if (fresh) {
@@ -406,14 +405,13 @@ eRecMenuState cRecMenuItemInt::ProcessKey(eKeys Key) {
 
 // --- cRecMenuItemBool  -------------------------------------------------------
 cRecMenuItemBool::cRecMenuItemBool(cString text,
-                                   bool initialVal,
-                                   bool refresh,
                                    bool active,
                                    bool *callback,
-                                   eRecMenuState action) {
+                                   eRecMenuState action,
+                                   bool refresh) {
     selectable = true;
     this->text = text;
-    this->yes = initialVal;
+    this->yes = *callback;
     this->refresh = refresh;
     this->active = active;
     this->callback = callback;
@@ -422,6 +420,22 @@ cRecMenuItemBool::cRecMenuItemBool(cString text,
     pixmapVal = NULL;
 }
 
+cRecMenuItemBool::cRecMenuItemBool(cString text,
+                                   bool active,
+                                   int *callback,
+                                   eRecMenuState action,
+                                   bool refresh) {
+    selectable = true;
+    this->text = text;
+    this->yes = *callback;
+    this->refresh = refresh;
+    this->active = active;
+    this->callback = (bool*)callback;
+    this->action = action;
+    height = 3 * font->Height() / 2;
+    pixmapVal = NULL;
+}
+
 cRecMenuItemBool::~cRecMenuItemBool(void) {
     if (pixmapVal)
         osdManager.releasePixmap(pixmapVal);
@@ -490,20 +504,20 @@ eRecMenuState cRecMenuItemBool::ProcessKey(eKeys Key) {
 // --- cRecMenuItemSelect  -------------------------------------------------------
 cRecMenuItemSelect::cRecMenuItemSelect(cString text,
                                        std::vector<std::string> Strings,
-                                       int initialVal,
                                        bool active,
                                        int *callback,
-                                       eRecMenuState action) {
+                                       eRecMenuState action,
+                                       bool refresh) {
     selectable = true;
     this->text = text;
     strings = Strings;
     numValues = Strings.size();
-    if ((initialVal < 0) || (initialVal > numValues-1))
+    this->currentVal = *callback;
+    if ((this->currentVal < 0) || (this->currentVal > numValues - 1))
         this->currentVal = 0;
-    else
-        this->currentVal = initialVal;
     this->active = active;
     this->callback = callback;
+    this->refresh = refresh;
     this->action = action;
     height = 3 * font->Height() / 2;
     pixmapVal = NULL;
@@ -571,6 +585,9 @@ eRecMenuState cRecMenuItemSelect::ProcessKey(eKeys Key) {
             if (callback)
                 *callback = currentVal;
             DrawValue();
+            if (refresh)
+                return rmsRefresh;
+            else
                 return rmsConsumed;
             break;
         case kRight:
@@ -578,6 +595,9 @@ eRecMenuState cRecMenuItemSelect::ProcessKey(eKeys Key) {
             if (callback)
                 *callback = currentVal;
             DrawValue();
+            if (refresh)
+                return rmsRefresh;
+            else
                 return rmsConsumed;
             break;
         case kOk:
@@ -604,8 +624,8 @@ cRecMenuItemSelectDirectory::cRecMenuItemSelectDirectory(cString text,
     height = 3 * font->Height() / 2;
     pixmapVal = NULL;
     folders.push_back(tr("root video folder"));
-    if (isSearchTimer && tvguideConfig.instRecFixedFolder.size() > 0)
-        folders.push_back(tvguideConfig.instRecFixedFolder);
+    if (isSearchTimer && config.instRecFixedFolder.size() > 0)
+        folders.push_back(config.instRecFixedFolder);
     ReadRecordingDirectories(&folders, NULL, "");
     numValues = folders.size();
     this->currentVal = GetInitial();
@@ -645,9 +665,9 @@ void cRecMenuItemSelectDirectory::Draw(void) {
 void cRecMenuItemSelectDirectory::DrawValue(void) {
     pixmapVal->Fill(clrTransparent);
     int iconSize = min(128, height);
-    int textX = width - font->Width(folders[currentVal].c_str()) - iconSize;
+    int textX = std::max(width - font->Width(folders[currentVal].c_str()) - iconSize, 10 + font->Width(*text) + 2 * iconSize);
     int textY = (height - font->Height()) / 2;
-    pixmapVal->DrawText(cPoint(textX, textY), folders[currentVal].c_str(), colorText, clrTransparent, font);
+    pixmapVal->DrawText(cPoint(textX, textY), folders[currentVal].c_str(), colorText, clrTransparent, font, width - textX - iconSize, font->Height(), taTop | taRight);
     int iconLeftX = textX - iconSize;
     int iconRightX = width - iconSize;
     int iconY = (height - iconSize) / 2;
@@ -713,13 +733,12 @@ int cRecMenuItemSelectDirectory::GetInitial(void) {
 
 // --- cRecMenuItemText  -------------------------------------------------------
 cRecMenuItemText::cRecMenuItemText(cString title,
-                                   char *initialVal,
                                    int length,
                                    bool active,
                                    char *callback) {
     selectable = true;
     this->title = title;
-    value = initialVal;
+    value = callback;
     this->active = active;
     this->callback = callback;
     height = 3 * font->Height();
@@ -1286,13 +1305,12 @@ eRecMenuState cRecMenuItemText::ProcessKey(eKeys Key) {
 
 // --- cRecMenuItemTime  -------------------------------------------------------
 cRecMenuItemTime::cRecMenuItemTime(cString text,
-                                   int initialVal,
                                    bool active,
                                    int *callback,
                                    eRecMenuState action) {
     selectable = true;
     this->text = text;
-    this->value = initialVal;
+    this->value = *callback;
     hh = value / 100;
     mm = value % 100;
     pos = 0;
@@ -1430,13 +1448,12 @@ eRecMenuState cRecMenuItemTime::ProcessKey(eKeys Key) {
 
 // --- cRecMenuItemDay  -------------------------------------------------------
 cRecMenuItemDay::cRecMenuItemDay(cString text,
-                                 time_t initialVal,
                                  bool active,
                                  time_t *callback,
                                  eRecMenuState action) {
     selectable = true;
     this->text = text;
-    this->currentVal = cTimer::SetTime(initialVal, 0);
+    this->currentVal = cTimer::SetTime(*callback, 0);
     this->active = active;
     this->callback = callback;
     this->action = action;
@@ -1576,9 +1593,9 @@ void cRecMenuItemTimer::Draw(void) {
         channelName = channel->Name();
     }
     int logoX = DrawIcons();
-    int logoWidth = height * tvguideConfig.logoWidthRatio / tvguideConfig.logoHeightRatio;
+    int logoWidth = height * config.logoWidthRatio / config.logoHeightRatio;
     cImageLoader imgLoader;
-    if (!tvguideConfig.hideChannelLogos) {
+    if (!config.hideChannelLogos) {
         if (imgLoader.LoadLogo(channel, logoWidth, height)) {
             cImage logo = imgLoader.GetImage();
             pixmapIcons->DrawImage(cPoint(logoX, 0), logo);
@@ -1802,13 +1819,13 @@ cRecMenuItemEvent::~cRecMenuItemEvent(void) {
 void cRecMenuItemEvent::SetPixmaps(void) {
     if (!pixmap) {
         pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
-        pixmapText = osdManager.requestPixmap(5, cRect(x, y, width, height));
+        pixmapText = osdManager.requestPixmap(5, cRect(x, y, width - height / 2 - 10, height));
         pixmapText->Fill(clrTransparent);
         pixmapIcons = osdManager.requestPixmap(6, cRect(x, y, width, height));
         pixmapIcons->Fill(clrTransparent);
     } else {
         pixmap->SetViewPort(cRect(x, y, width, height));
-        pixmapText->SetViewPort(cRect(x, y, width, height));
+        pixmapText->SetViewPort(cRect(x, y, width - height / 2 - 10, height));
         pixmapIcons->SetViewPort(cRect(x, y, width, height));
     }
 }
@@ -1826,14 +1843,15 @@ void cRecMenuItemEvent::Draw(void) {
     cString channelName = "";
     if (channel)
         channelName = channel->Name();
-    int logoWidth = height * tvguideConfig.logoWidthRatio / tvguideConfig.logoHeightRatio;
+    int logoWidth = height * config.logoWidthRatio / config.logoHeightRatio;
     cImageLoader imgLoader;
-    if (!tvguideConfig.hideChannelLogos) {
+    if (!config.hideChannelLogos) {
         if (imgLoader.LoadLogo(channel, logoWidth, height)) {
             cImage logo = imgLoader.GetImage();
-            pixmapText->DrawImage(cPoint(logoX, 0), logo);
-            logoX += logoWidth + 5;
+            pixmapText->DrawImage(cPoint(logoX, (height - logo.Height()) / 2), logo);
+//            logoX += logoWidth + 5;
         }
+	logoX += logoWidth + 5;
     }
     
     int textX = logoX;
@@ -1870,7 +1888,6 @@ int cRecMenuItemEvent::DrawIcons(void) {
         iconsX += iconSize + 5;
     }
 
-    iconY = height - iconSize - 10;
     if (event->HasTimer()) {
         cImage *imgHasTimer = imgCache.GetIcon("activetimer", iconSize, iconSize);
         if (imgHasTimer) {
@@ -1918,18 +1935,21 @@ eRecMenuState cRecMenuItemEvent::ProcessKey(eKeys Key) {
 
 // --- cRecMenuItemChannelChooser -------------------------------------------------------
 cRecMenuItemChannelChooser::cRecMenuItemChannelChooser(cString text,
-#if VDRVERSNUM >= 20301
-                                                       const cChannel *initialChannel,
-#else
-                                                       cChannel *initialChannel,
-#endif
                                                        bool active,
                                                        int *callback,
                                                        eRecMenuState action) {
     selectable = true;
     this->text = text;
-    this->channel = initialChannel;
-    if (initialChannel)
+#if VDRVERSNUM >= 20301
+    {
+    LOCK_CHANNELS_READ;
+    channels = Channels;
+    }
+#else
+    channels = &Channels;
+#endif
+    this->channel = channels->GetByNumber(*callback);
+    if (callback)
         initialChannelSet = true;
     else
         initialChannelSet = false;
@@ -1938,7 +1958,7 @@ cRecMenuItemChannelChooser::cRecMenuItemChannelChooser(cString text,
     this->active = active;
     this->callback = callback;
     this->action = action;
-    height = 2 * font->Height();
+    height = 3 * font->Height() / 2;
     pixmapChannel = NULL;
 }
 
@@ -1980,12 +2000,12 @@ void cRecMenuItemChannelChooser::DrawValue(void) {
         cString textVal = cString::sprintf("%d - %s", channel->Number(), channel->Name());
         int textX = width - font->Width(*textVal) - 10;
         pixmapChannel->DrawText(cPoint(textX, textY), *textVal, colorText, clrTransparent, font);
-        int logoWidth = height * tvguideConfig.logoWidthRatio / tvguideConfig.logoHeightRatio;
+        int logoWidth = height * config.logoWidthRatio / config.logoHeightRatio;
         int logoX = textX - logoWidth - 10;
         cImageLoader imgLoader;
-        if (imgLoader.LoadLogo(channel, logoWidth, height)) {
+        if (imgLoader.LoadLogo(channel, logoWidth, height - 10)) {
             cImage logo = imgLoader.GetImage();
-            pixmapChannel->DrawImage(cPoint(logoX, 0), logo);
+            pixmapChannel->DrawImage(cPoint(logoX, 5), logo);
         }
     } else {
         cString textVal = tr("all Channels");
@@ -2007,29 +2027,15 @@ eRecMenuState cRecMenuItemChannelChooser::ProcessKey(eKeys Key) {
             fresh = true;
             if (!channel)
                 return rmsConsumed;
-#if VDRVERSNUM >= 20301
             const cChannel *prev = channel;
-            LOCK_CHANNELS_READ;
-            const cChannel *firstChannel = Channels->First();
-#else
-            cChannel *prev = channel;
-            cChannel *firstChannel = Channels.First();
-#endif
+            const cChannel *firstChannel = channels->First();
             if(firstChannel->GroupSep())
-#if VDRVERSNUM >= 20301
-                firstChannel = Channels->Next(firstChannel);
-#else
-                firstChannel = Channels.Next(firstChannel);
-#endif
+                firstChannel = channels->Next(firstChannel);
             if (prev == firstChannel) {
                 if (!initialChannelSet)
                     channel = NULL;
             } else {
-#if VDRVERSNUM >= 20301
-                while (prev = Channels->Prev(prev)) {
-#else
-                while (prev = Channels.Prev(prev)) {
-#endif
+                while (prev = channels->Prev(prev)) {
                     if(!prev->GroupSep()) {
                         channel = prev;
                         break;
@@ -2046,30 +2052,14 @@ eRecMenuState cRecMenuItemChannelChooser::ProcessKey(eKeys Key) {
             return rmsConsumed;
             break; }
         case kRight: {
-#if VDRVERSNUM >= 20301
-            LOCK_CHANNELS_READ;
-#endif
             fresh = true;
             if (!channel) {
-#if VDRVERSNUM >= 20301
-                channel = Channels->First();
-#else
-                channel = Channels.First();
-#endif
+                channel = channels->First();
                 if(channel->GroupSep())
-#if VDRVERSNUM >= 20301
-                    channel = Channels->Next(channel);
-#else
-                    channel = Channels.Next(channel);
-#endif
+                    channel = channels->Next(channel);
             } else {
-#if VDRVERSNUM >= 20301
                 const cChannel *next = channel;
-                while (next = Channels->Next(next)) {
-#else
-                cChannel *next = channel;
-                while (next = Channels.Next(next)) {
-#endif
+                while (next = channels->Next(next)) {
                     if(!next->GroupSep()) {
                         channel = next;
                         break;
@@ -2091,12 +2081,7 @@ eRecMenuState cRecMenuItemChannelChooser::ProcessKey(eKeys Key) {
                fresh = false;
             }
             channelNumber = channelNumber * 10 + (Key - k0);
-#if VDRVERSNUM >= 20301
-            LOCK_CHANNELS_READ;
-            const cChannel *chanNew = Channels->GetByNumber(channelNumber);
-#else
-            cChannel *chanNew = Channels.GetByNumber(channelNumber);
-#endif
+            chanNew = channels->GetByNumber(channelNumber);
             if (chanNew) {
                 channel = chanNew;
                 DrawValue();
@@ -2115,17 +2100,16 @@ eRecMenuState cRecMenuItemChannelChooser::ProcessKey(eKeys Key) {
 
 // --- cRecMenuItemDayChooser -------------------------------------------------------
 cRecMenuItemDayChooser::cRecMenuItemDayChooser(cString text,
-                                               int weekdays,
                                                bool active,
                                                int *callback) {
     selectable = true;
     this->text = text;
+    this->weekdays = *callback;
     if (weekdays < 1)
         weekdays *= -1;
-    this->weekdays = weekdays;
     this->active = active;
     this->callback = callback;
-    height = 2 * font->Height();
+    height = 3 * font->Height() / 2;
     selectedDay = 0;
     pixmapWeekdays = NULL;
     pixmapWeekdaysSelect = NULL;
@@ -2258,11 +2242,7 @@ eRecMenuState cRecMenuItemDayChooser::ProcessKey(eKeys Key) {
 }
 
 // --- cRecMenuItemRecording  -------------------------------------------------------
-#if VDRVERSNUM >= 20301
 cRecMenuItemRecording::cRecMenuItemRecording(const cRecording *recording, bool active) {
-#else
-cRecMenuItemRecording::cRecMenuItemRecording(cRecording *recording, bool active) {
-#endif
     selectable = true;
     this->recording = recording;
     this->active = active;
@@ -2294,7 +2274,7 @@ void cRecMenuItemRecording::Draw(void) {
     LOCK_CHANNELS_READ;
     const cChannel *channel = Channels->GetByChannelID(recInfo->ChannelID());
 #else
-    cChannel *channel = Channels.GetByChannelID(recInfo->ChannelID());
+    const cChannel *channel = Channels.GetByChannelID(recInfo->ChannelID());
 #endif
     cString channelName = tr("unknown channel");
     if (channel)
@@ -2398,10 +2378,10 @@ void cRecMenuItemTimelineHeader::DrawCurrentTimer(void) {
     const cChannel *channel = timer->Channel();
     int x = 0;
     if (channel) {
-        int logoWidth = infoHeight * tvguideConfig.logoWidthRatio / tvguideConfig.logoHeightRatio;
+        int logoWidth = infoHeight * config.logoWidthRatio / config.logoHeightRatio;
         bool logoDrawn = false;
         cImageLoader imgLoader;
-        if (!tvguideConfig.hideChannelLogos) {
+        if (!config.hideChannelLogos) {
             if (imgLoader.LoadLogo(channel, logoWidth, infoHeight)) {
                 cImage logo = imgLoader.GetImage();
                 pixmapTimerInfo->DrawImage(cPoint(0, 0), logo);
@@ -2409,7 +2389,7 @@ void cRecMenuItemTimelineHeader::DrawCurrentTimer(void) {
                 logoDrawn = true;
             }
         }
-        if (tvguideConfig.hideChannelLogos || !logoDrawn) {
+        if (config.hideChannelLogos || !logoDrawn) {
             int channelNameWidth = fontSmall->Width(channel->Name());
             pixmapTimerInfo->DrawText(cPoint(10, (infoHeight - fontSmall->Height())/2), channel->Name(), colorText, clrTransparent, fontSmall);
             x += channelNameWidth + 20;
@@ -2510,11 +2490,7 @@ void cRecMenuItemTimelineHeader::Show(void) {
 
 
 // --- cRecMenuItemTimelineTimer  -------------------------------------------------------
-#if VDRVERSNUM >= 20301
 cRecMenuItemTimelineTimer::cRecMenuItemTimelineTimer(const cTimer *timer, time_t start, time_t stop,  std::vector<cTVGuideTimerConflict*> conflictsToday, cRecMenuItemTimelineHeader *header, bool active) {
-#else
-cRecMenuItemTimelineTimer::cRecMenuItemTimelineTimer(cTimer *timer, time_t start, time_t stop,  std::vector<cTVGuideTimerConflict*> conflictsToday, cRecMenuItemTimelineHeader *header, bool active) {
-#endif
     conflicts = conflictsToday;
     defaultBackground = false;
     pixmapBack = NULL;
@@ -2661,11 +2637,7 @@ void cRecMenuItemTimelineTimer::Show(void) {
     if (pixmapTimerConflicts) pixmapTimerConflicts->SetLayer(6);
 }
 
-#if VDRVERSNUM >= 20301
 const cTimer *cRecMenuItemTimelineTimer::GetTimerValue(void) {
-#else
-cTimer *cRecMenuItemTimelineTimer::GetTimerValue(void) {
-#endif
     return timer;    
 }
 
@@ -2719,18 +2691,19 @@ void cRecMenuItemSearchTimer::SetPixmaps(void) {
 
 void cRecMenuItemSearchTimer::Draw(void) {
     int textX = DrawIcons();
+    bool timerIsActive = timer.IsActive();
     pixmapText->Fill(clrTransparent);
     textX += 20;
-    cString label;
-    if (timer.Active()) {
-        label = cString::sprintf("\"%s\"", timer.SearchString().c_str());
-    } else {
-        label = cString::sprintf("\"%s\" (%s)", timer.SearchString().c_str(), tr("inactive"));
-    }
+    cString label = cString::sprintf("\"%s\"", timer.GetSearchString().c_str());
+    cString inactive = cString::sprintf("(%s)", tr("inactive"));
     int numTimersActive = timer.GetNumTimers();
     int numRecordings = timer.GetNumRecordings();
+
     cString info = cString::sprintf("%s: %d, %s: %d", tr("active timers"), numTimersActive, tr("recordings done"), numRecordings);
     pixmapText->DrawText(cPoint(textX, 5 + (height/2 - font->Height()) / 2), *label, colorText, clrTransparent, font);
+    if (!timerIsActive) {
+        pixmapText->DrawText(cPoint(textX, 5 + (height - font->Height()) / 2), *inactive, colorText, clrTransparent, font, width - textX - 20, 0, taRight);
+    }
     pixmapText->DrawText(cPoint(textX, height/2 + (height/2 - fontSmall->Height())/2), *info, colorText, clrTransparent, fontSmall);
 }
 
@@ -2847,7 +2820,7 @@ void cRecMenuItemFavorite::Draw(void) {
     int textX = DrawIcons();
     pixmapText->Fill(clrTransparent);
     textX += 20;
-    cString label = cString::sprintf("\"%s\"", favorite.SearchString().c_str());
+    cString label = cString::sprintf("\"%s\"", favorite.GetSearchString().c_str());
     pixmapText->DrawText(cPoint(textX, (height - fontLarge->Height())/2), *label, colorText, clrTransparent, fontLarge);
 }
 

recmenuitem.h

@@ -46,7 +46,6 @@ enum eRecMenuState {
     rmsSearchTimerOptions,
     rmsSearchTimers,
     rmsSearchTimerEdit,
-    rmsSearchTimerEditAdvanced,
     rmsSearchTimerTest,
     rmsSearchTimerSave,
     rmsSearchTimerCreateWithTemplate,
@@ -123,11 +122,7 @@ public:
     virtual bool GetBoolValue(void) { return false; };
     virtual cString GetStringValue(void) { return cString(""); };
     virtual const cEvent *GetEventValue(void) { return NULL; };
-#if VDRVERSNUM >= 20301
     virtual const cTimer *GetTimerValue(void) { return NULL; };
-#else
-    virtual cTimer *GetTimerValue(void) { return NULL; };
-#endif
     virtual eRecMenuState ProcessKey(eKeys Key) { return rmsNotConsumed; };
 };
 
@@ -204,7 +199,6 @@ private:
     void DrawValue(void);
 public:
     cRecMenuItemInt(cString text,
-                    int initialVal,
                     int minVal,
                     int maxVal,
                     bool active = false,
@@ -231,11 +225,15 @@ private:
     void DrawValue(void);
 public:
     cRecMenuItemBool(cString text,
-                     bool initialVal,
-                     bool refresh = false,
                      bool active = false,
                      bool *callback = NULL,
-                     eRecMenuState action = rmsNotConsumed);
+                     eRecMenuState action = rmsNotConsumed,
+                     bool refresh = false);
+    cRecMenuItemBool(cString text,
+                     bool active = false,
+                     int *callback = NULL,
+                     eRecMenuState action = rmsNotConsumed,
+                     bool refresh = false);
     virtual ~cRecMenuItemBool(void);
     void SetPixmaps(void);
     void Hide(void);
@@ -251,6 +249,7 @@ private:
     cString text;
     int currentVal;
     int *callback;
+    bool refresh;
     std::vector<std::string> strings;
     int numValues;
     cPixmap *pixmapVal;
@@ -258,10 +257,10 @@ private:
 public:
     cRecMenuItemSelect(cString text,
                        std::vector<std::string> Strings,
-                       int initialVal,
                        bool active = false,
                        int *callback = NULL,
-                       eRecMenuState action = rmsNotConsumed);
+                       eRecMenuState action = rmsNotConsumed,
+                       bool refresh = false);
     virtual ~cRecMenuItemSelect(void);
     void SetPixmaps(void);
     void Hide(void);
@@ -344,7 +343,6 @@ private:
     void DrawValue(char *newValue);
 public:
     cRecMenuItemText(cString title,
-                     char *initialVal,
                      int length,
                      bool active = false,
                      char *callback = NULL);
@@ -373,7 +371,6 @@ private:
     void DrawValue(void);
 public:
     cRecMenuItemTime(cString text,
-                    int initialVal,
                     bool active = false,
                     int *callback = NULL,
                     eRecMenuState action = rmsNotConsumed);
@@ -396,7 +393,6 @@ private:
     void DrawValue(void);
 public:
     cRecMenuItemDay(cString text,
-                    time_t initialVal,
                     bool active = false,
                     time_t *callback = NULL,
                     eRecMenuState action = rmsNotConsumed);
@@ -494,10 +490,13 @@ class cRecMenuItemChannelChooser : public cRecMenuItem {
 private:
     cString text;
 #if VDRVERSNUM >= 20301
-    const cChannel *channel;
+    const cChannels *channels;
+    const cChannel *chanNew;
 #else
-    cChannel *channel;
+    cChannels *channels;
+    cChannel *chanNew;
 #endif
+    const cChannel *channel;
     int channelNumber;
     int *callback;
     bool initialChannelSet;
@@ -506,11 +505,6 @@ private:
     void DrawValue(void);
 public:
     cRecMenuItemChannelChooser (cString text,
-#if VDRVERSNUM >= 20301
-                                const cChannel *initialChannel,
-#else
-                                cChannel *initialChannel,
-#endif
                                 bool active = false,
                                 int *callback = NULL,
                                 eRecMenuState action = rmsNotConsumed);
@@ -544,7 +538,6 @@ private:
     bool WeekDaySet(unsigned day);
 public:
     cRecMenuItemDayChooser (cString text,
-                            int weekdays,
                             bool active = false,
                             int *callback = NULL);
     virtual ~cRecMenuItemDayChooser(void);
@@ -560,18 +553,10 @@ public:
 // --- cRecMenuItemRecording  -------------------------------------------------------
 class cRecMenuItemRecording : public cRecMenuItem {
 private:
-#if VDRVERSNUM >= 20301
     const cRecording *recording;
-#else
-    cRecording *recording;
-#endif
     cPixmap *pixmapText;
 public:
-#if VDRVERSNUM >= 20301
     cRecMenuItemRecording(const cRecording *recording, bool active);
-#else
-    cRecMenuItemRecording(cRecording *recording, bool active);
-#endif
     virtual ~cRecMenuItemRecording(void);
     void SetPixmaps(void);
     void Hide(void);
@@ -583,11 +568,7 @@ public:
 class cRecMenuItemTimelineHeader : public cRecMenuItem {
 private:
     time_t day;
-#if VDRVERSNUM >= 20301
     const cTimer *timer;
-#else
-    cTimer *timer;
-#endif
     std::vector<cTVGuideTimerConflict*> conflicts;
     cPixmap *pixmapTimeline;
     cPixmap *pixmapTimerInfo;
@@ -603,11 +584,7 @@ public:
     virtual ~cRecMenuItemTimelineHeader(void);
     void SetDay(time_t day) { this->day = day; };
     void SetPixmaps(void);
-#if VDRVERSNUM >= 20301
     void SetCurrentTimer(const cTimer *timer) { this->timer = timer; };
-#else
-    void SetCurrentTimer(cTimer *timer) { this->timer = timer; };
-#endif
     void UnsetCurrentTimer(void) { timer = NULL; };
     void RefreshTimerDisplay(void);
     void Hide(void);
@@ -618,11 +595,7 @@ public:
 // --- cRecMenuItemTimelineTimer  -------------------------------------------------------
 class cRecMenuItemTimelineTimer : public cRecMenuItem {
 private:
-#if VDRVERSNUM >= 20301
     const cTimer *timer;
-#else
-    cTimer *timer;
-#endif
     std::vector<cTVGuideTimerConflict*> conflicts;
     cPixmap *pixmapBack;
     cPixmap *pixmapTimerConflicts;
@@ -637,11 +610,7 @@ private:
     void DrawTimerConflicts(void);
     void DrawNoTimerInfo(void);
 public:
-#if VDRVERSNUM >= 20301
     cRecMenuItemTimelineTimer(const cTimer *timer, time_t start, time_t stop, std::vector<cTVGuideTimerConflict*> conflictsToday, cRecMenuItemTimelineHeader *header, bool active);
-#else
-    cRecMenuItemTimelineTimer(cTimer *timer, time_t start, time_t stop, std::vector<cTVGuideTimerConflict*> conflictsToday, cRecMenuItemTimelineHeader *header, bool active);
-#endif
     virtual ~cRecMenuItemTimelineTimer(void);
     void setActive(void);
     void setInactive(void);
@@ -649,11 +618,7 @@ public:
     void Hide(void);
     void Show(void); 
     void Draw(void);
-#if VDRVERSNUM >= 20301
     const cTimer *GetTimerValue(void);
-#else
-    cTimer *GetTimerValue(void);
-#endif
     eRecMenuState ProcessKey(eKeys Key);
 };
 

recmenus.c

@@ -1,18 +1,16 @@
 #include "services/remotetimers.h"
 #include "tools.h"
-#include "recmenumanager.h"
+#include "recmenuview.h"
 #include "recmenus.h"
 
 // --- cRecMenuMain  ---------------------------------------------------------
 cRecMenuMain::cRecMenuMain(bool epgSearchAvailable, bool timerActive, bool switchTimerActive) {
     eRecMenuState action = rmsInstantRecord;
-    dsyslog ("%s %s %d\n", __FILE__, __func__,  __LINE__);
     if (!timerActive) {
-        if (tvguideConfig.instRecFolderMode == eFolderSelect)
+        if (config.instRecFolderMode == eFolderSelect)
             action = rmsInstantRecordFolder;
         AddMenuItem(new cRecMenuItemButton(tr("Instant Record"), action, true, false, false, true));
     } else {
-        dsyslog ("%s %s %d\n", __FILE__, __func__,  __LINE__);
         AddMenuItem(new cRecMenuItemButton(tr("Delete Timer"), rmsDeleteTimer, true, false, false, true));
         AddMenuItem(new cRecMenuItemButton(tr("Edit Timer"), rmsEditTimer, false, false, false, true));
     }
@@ -24,7 +22,7 @@ cRecMenuMain::cRecMenuMain(bool epgSearchAvailable, bool timerActive, bool switc
         AddMenuItem(new cRecMenuItemButton(tr("Search Timers"), rmsSearchTimers, false, false, false, true));
     }
 
-    if (tvguideConfig.instRecFolderMode == eFolderSelect)
+    if (config.instRecFolderMode == eFolderSelect)
         action = rmsSeriesTimerFolder;
     else
         action = rmsSeriesTimer;
@@ -85,7 +83,7 @@ cRecMenuItem *cRecMenuAskFolder::GetMenuItem(int number) {
     if (number == 0) {
         cRecMenuItem *result = new cRecMenuItemButton(tr("root video folder"), rmsInstantRecord, false, false, true);
         return result;
-    } else if ((number > 0) && (number < folders.size()+1)) {
+    } else if ((number > 0) && (number < (int)folders.size() + 1)) {
         cRecMenuItem *result = new cRecMenuItemButton(folders[number-1].c_str(), rmsInstantRecord, false, false, true);
         return result;
     }
@@ -99,7 +97,7 @@ int cRecMenuAskFolder::GetTotalNumMenuItems(void) {
 std::string cRecMenuAskFolder::GetFolder(void) {
     std::string folder = "";
     int folderActive = GetActive();
-    if (folderActive > 0 && folderActive < folders.size() + 1)
+    if (folderActive > 0 && folderActive < (int)folders.size() + 1)
         folder = folders[folderActive - 1];
     return folder;
 }
@@ -111,11 +109,11 @@ cRecMenuConfirmTimer::cRecMenuConfirmTimer(const cEvent *event) {
     LOCK_CHANNELS_READ;
     const cString channelName = Channels->GetByChannelID(event->ChannelID())->Name();
 #else
-    cString channelName = Channels.GetByChannelID(event->ChannelID())->Name();
+    const cString channelName = Channels.GetByChannelID(event->ChannelID())->Name();
 #endif
     cString message;
     bool eventHasTimer = false;
-    if (tvguideConfig.useRemoteTimers && pRemoteTimers) {
+    if (config.useRemoteTimers && pRemoteTimers) {
         RemoteTimers_GetMatch_v1_0 rtMatch;
         rtMatch.event = event;
         pRemoteTimers->Service("RemoteTimers::GetMatch-v1.0", &rtMatch);
@@ -149,13 +147,12 @@ cRecMenuConfirmTimer::cRecMenuConfirmTimer(const cEvent *event) {
 
 // --- cRecMenuConfirmDeleteTimer  ---------------------------------------------------------
 cRecMenuConfirmDeleteTimer::cRecMenuConfirmDeleteTimer(const cEvent *event) {
-    dsyslog ("%s %s %d\n", __FILE__, __func__,  __LINE__);
     SetWidthPercent(50);
 #if VDRVERSNUM >= 20301
     LOCK_CHANNELS_READ;
     const cString channelName = Channels->GetByChannelID(event->ChannelID())->Name();
 #else
-    cString channelName = Channels.GetByChannelID(event->ChannelID())->Name();
+    const cString channelName = Channels.GetByChannelID(event->ChannelID())->Name();
 #endif
     cString text = cString::sprintf("%s\n%s\n%s %s - %s\n%s", 
                                     tr("Timer deleted"), 
@@ -177,13 +174,12 @@ cRecMenuConfirmDeleteTimer::cRecMenuConfirmDeleteTimer(const cEvent *event) {
 
 // --- cRecMenuAskDeleteTimer ---------------------------------------------------------
 cRecMenuAskDeleteTimer::cRecMenuAskDeleteTimer(const cEvent *event) {
-    dsyslog ("%s %s %d\n", __FILE__, __func__,  __LINE__);
     SetWidthPercent(50);
 #if VDRVERSNUM >= 20301
     LOCK_CHANNELS_READ;
     const cString channelName = Channels->GetByChannelID(event->ChannelID())->Name();
 #else
-    cString channelName = Channels.GetByChannelID(event->ChannelID())->Name();
+    const cString channelName = Channels.GetByChannelID(event->ChannelID())->Name();
 #endif
     cString text = cString::sprintf("%s \"%s, %s\" %s", 
                                     tr("Timer"),
@@ -275,7 +271,7 @@ cRecMenuTimerConflict::cRecMenuTimerConflict(cTVGuideTimerConflict *conflict) {
 }
     
 cRecMenuItem *cRecMenuTimerConflict::GetMenuItem(int number) { 
-    if ((number >= 0) && (number < conflict->timerIDs.size())) {
+    if ((number >= 0) && (number < (int)conflict->timerIDs.size())) {
 #if VDRVERSNUM >= 20301
         LOCK_TIMERS_READ;
         const cTimer *timer = Timers->Get(conflict->timerIDs[number]);
@@ -387,8 +383,8 @@ cRecMenuConfirmRerunUsed::cRecMenuConfirmRerunUsed(const cEvent *original, const
     const cString channelOrig = Channels->GetByChannelID(original->ChannelID())->Name();
     const cString channelReplace = Channels->GetByChannelID(replace->ChannelID())->Name();
 #else
-    cString channelOrig = Channels.GetByChannelID(original->ChannelID())->Name();
-    cString channelReplace = Channels.GetByChannelID(replace->ChannelID())->Name();
+    const cString channelOrig = Channels.GetByChannelID(original->ChannelID())->Name();
+    const cString channelReplace = Channels.GetByChannelID(replace->ChannelID())->Name();
 #endif
     cString message1 = tr("Timer for");
     cString message2 = tr("replaced by rerun");
@@ -413,12 +409,7 @@ cRecMenuConfirmRerunUsed::cRecMenuConfirmRerunUsed(const cEvent *original, const
 }
 
 // --- cRecMenuEditTimer  ---------------------------------------------------------
-#if VDRVERSNUM >= 20301
 cRecMenuEditTimer::cRecMenuEditTimer(const cTimer *timer, eRecMenuState nextState) {
-//    const cTimer *originalTimer;
-#else
-cRecMenuEditTimer::cRecMenuEditTimer(cTimer *timer, eRecMenuState nextState) {
-#endif
     SetWidthPercent(70);
     if (!timer)
         return;
@@ -435,7 +426,7 @@ cRecMenuEditTimer::cRecMenuEditTimer(cTimer *timer, eRecMenuState nextState) {
     AddMenuItemInitial(infoItem);
                 
     timerActive = false;
-    if (tvguideConfig.useRemoteTimers && pRemoteTimers) {
+    if (config.useRemoteTimers && pRemoteTimers) {
         RemoteTimers_GetMatch_v1_0 rtMatch;
         rtMatch.event = timer->Event();
         pRemoteTimers->Service("RemoteTimers::GetMatch-v1.0", &rtMatch);
@@ -453,12 +444,12 @@ cRecMenuEditTimer::cRecMenuEditTimer(cTimer *timer, eRecMenuState nextState) {
     lifetime = timer->Lifetime();
     strncpy(folder, GetDirectoryFromTimer(timer->File()).c_str(), TEXTINPUTLENGTH);
     
-    AddMenuItemInitial(new cRecMenuItemBool(tr("Timer Active"), timerActive, false, true, &timerActive));
-    AddMenuItemInitial(new cRecMenuItemInt(tr("Priority"), prio, 0, MAXPRIORITY, false, &prio));
-    AddMenuItemInitial(new cRecMenuItemInt(tr("Lifetime"), lifetime, 0, MAXLIFETIME, false, &lifetime));
-    AddMenuItemInitial(new cRecMenuItemDay(tr("Day"), day, false, &day));
-    AddMenuItemInitial(new cRecMenuItemTime(tr("Timer start time"), start, false, &start));
-    AddMenuItemInitial(new cRecMenuItemTime(tr("Timer stop time"), stop, false, &stop));
+    AddMenuItemInitial(new cRecMenuItemBool(tr("Timer Active"), true, &timerActive));
+    AddMenuItemInitial(new cRecMenuItemInt(tr("Priority"), 0, MAXPRIORITY, false, &prio));
+    AddMenuItemInitial(new cRecMenuItemInt(tr("Lifetime"), 0, MAXLIFETIME, false, &lifetime));
+    AddMenuItemInitial(new cRecMenuItemDay(tr("Day"), false, &day));
+    AddMenuItemInitial(new cRecMenuItemTime(tr("Timer start time"), false, &start));
+    AddMenuItemInitial(new cRecMenuItemTime(tr("Timer stop time"), false, &stop));
     cString fileInfo = cString::sprintf("%s:\n%s", tr("Timer File"), timer->File());
     cRecMenuItemInfo *fileInfoItem = new cRecMenuItemInfo(*fileInfo, false);
     fileInfoItem->CalculateHeight(width - 2 * border);
@@ -475,11 +466,7 @@ cRecMenuEditTimer::cRecMenuEditTimer(cTimer *timer, eRecMenuState nextState) {
     Arrange();
 }
 
-#if VDRVERSNUM >= 20301
 const cTimer *cRecMenuEditTimer::GetOriginalTimer(void) {
-#else
-cTimer *cRecMenuEditTimer::GetOriginalTimer(void) {
-#endif
     return originalTimer;
 }
 
@@ -517,11 +504,7 @@ cTimer cRecMenuEditTimer::GetTimer(void) {
 ******************************************************************************************/
 
 // --- cRecMenuSeriesTimer ---------------------------------------------------------
-#if VDRVERSNUM >= 20301
 cRecMenuSeriesTimer::cRecMenuSeriesTimer(const cChannel *initialChannel, const cEvent *event, std::string folder) {
-#else
-cRecMenuSeriesTimer::cRecMenuSeriesTimer(cChannel *initialChannel, const cEvent *event, std::string folder) {
-#endif
     if (!initialChannel)
         return;
     timerActive = true;
@@ -539,14 +522,14 @@ cRecMenuSeriesTimer::cRecMenuSeriesTimer(cChannel *initialChannel, const cEvent
     infoItem->CalculateHeight(width - 2 * border);
     SetHeader(infoItem);
 
-    AddMenuItem(new cRecMenuItemBool(tr("Timer Active"), timerActive, false, false, &timerActive));
-    AddMenuItem(new cRecMenuItemChannelChooser(tr("Channel"), initialChannel, false, &channel));
-    AddMenuItem(new cRecMenuItemTime(tr("Series Timer start time"), start, false, &start));
-    AddMenuItem(new cRecMenuItemTime(tr("Series Timer stop time"), stop, false, &stop));
-    AddMenuItem(new cRecMenuItemDayChooser(tr("Days to record"), dayOfWeek, false, &dayOfWeek));
-    AddMenuItem(new cRecMenuItemDay(tr("Day to start"), tstart, false, &tstart));
-    AddMenuItem(new cRecMenuItemInt(tr("Priority"), priority, 0, MAXPRIORITY, false, &priority));
-    AddMenuItem(new cRecMenuItemInt(tr("Lifetime"), lifetime, 0, MAXLIFETIME, false, &lifetime));
+    AddMenuItem(new cRecMenuItemBool(tr("Timer Active"), false, &timerActive));
+    AddMenuItem(new cRecMenuItemChannelChooser(tr("Channel"), false, &channel));
+    AddMenuItem(new cRecMenuItemTime(tr("Series Timer start time"), false, &start));
+    AddMenuItem(new cRecMenuItemTime(tr("Series Timer stop time"), false, &stop));
+    AddMenuItem(new cRecMenuItemDayChooser(tr("Days to record"), false, &dayOfWeek));
+    AddMenuItem(new cRecMenuItemDay(tr("Day to start"), false, &tstart));
+    AddMenuItem(new cRecMenuItemInt(tr("Priority"), 0, MAXPRIORITY, false, &priority));
+    AddMenuItem(new cRecMenuItemInt(tr("Lifetime"), 0, MAXLIFETIME, false, &lifetime));
 
     AddMenuItem(new cRecMenuItemButtonYesNo(tr("Create Timer"), tr("Cancel"), rmsSeriesTimerCreate, rmsClose, true));
 
@@ -628,7 +611,7 @@ cRecMenuSearchTimer::cRecMenuSearchTimer(const cEvent *event) {
     infoItem->CalculateHeight(width - 2 * border);
     SetHeader(infoItem);
     strncpy(searchString, event->Title(), TEXTINPUTLENGTH);
-    AddMenuItemInitial(new cRecMenuItemText(tr("Search Expression:"), searchString, TEXTINPUTLENGTH, false));
+    AddMenuItemInitial(new cRecMenuItemText(tr("Search Expression:"), TEXTINPUTLENGTH, false, searchString));
     AddMenuItemInitial(new cRecMenuItemButtonYesNo(tr("Continue"), tr("Cancel"), rmsSearchTimerOptions, rmsClose, true));
     CalculateHeight();
     CreatePixmap();
@@ -641,7 +624,7 @@ cRecMenuSearchTimerTemplates::cRecMenuSearchTimerTemplates(cTVGuideSearchTimer s
     this->templates = templates;
     SetWidthPercent(70);
     cString message = tr("Configure Search Timer for Search String");
-    cString infoText = cString::sprintf("%s:\n%s", *message, searchTimer.SearchString().c_str());
+    cString infoText = cString::sprintf("%s:\n%s", *message, searchTimer.GetSearchString().c_str());
     cRecMenuItemInfo *infoItem = new cRecMenuItemInfo(*infoText, true);
     infoItem->CalculateHeight(width - 2 * border);
     SetHeader(infoItem);
@@ -677,7 +660,7 @@ int cRecMenuSearchTimerTemplates::GetTotalNumMenuItems(void) {
 TVGuideEPGSearchTemplate cRecMenuSearchTimerTemplates::GetTemplate(void) {
     TVGuideEPGSearchTemplate templ;
     int tmplActive = GetActive() - 1;
-    if (tmplActive >= 0 && tmplActive < templates.size())
+    if (tmplActive >= 0 && tmplActive < (int)templates.size())
         templ = templates[tmplActive];
     return templ;
 }
@@ -731,42 +714,36 @@ int cRecMenuSearchTimers::GetTotalNumMenuItems(void) {
 }
 
 // --- cRecMenuSearchTimerEdit  ---------------------------------------------------------
-cRecMenuSearchTimerEdit::cRecMenuSearchTimerEdit(cTVGuideSearchTimer searchTimer, bool advancedOptions) {
+cRecMenuSearchTimerEdit::cRecMenuSearchTimerEdit(cTVGuideSearchTimer searchTimer, std::vector<std::string> channelGroups) {
+    init = true;
     deleteMenuItems = false;
-    this->advancedOptions = advancedOptions;
-    this->searchTimer = searchTimer;
-    strncpy(searchString, searchTimer.SearchString().c_str(), TEXTINPUTLENGTH);
-    timerActive = searchTimer.Active();
-    mode = searchTimer.SearchMode();
-    useTitle = searchTimer.UseTitle();
-    useSubtitle = searchTimer.UseSubtitle();
-    useDescription = searchTimer.UseDescription();
-    useChannel = searchTimer.UseChannel();
-    startChannel = searchTimer.StartChannel();
-    stopChannel = searchTimer.StopChannel();
-    useTime = searchTimer.UseTime();
-    startTime = searchTimer.StartTime();
-    stopTime = searchTimer.StopTime();
-    useDayOfWeek = searchTimer.UseDayOfWeek();
-    dayOfWeek = searchTimer.DayOfWeek();
-    priority = searchTimer.Priority();
-    lifetime = searchTimer.Lifetime();
-    useEpisode = searchTimer.UseEpisode();
-    std::string dir = searchTimer.Directory();
+    this->sT = searchTimer;
+    this->channelGroups = channelGroups;
+    strncpy(searchString, sT.searchString.c_str(), TEXTINPUTLENGTH);
+    channelgroupIndex = -1;
+    std::string dir = sT.directory;
     strncpy(directory, dir.c_str(), TEXTINPUTLENGTH);
-    marginStart = searchTimer.MarginStart();
-    marginStop = searchTimer.MarginStop();
-    useVPS = searchTimer.UseVPS();
-    avoidRepeats = searchTimer.AvoidRepeats();
-    allowedRepeats = searchTimer.AllowedRepeats();
-    compareTitle = searchTimer.CompareTitle();
-    compareSubtitle = searchTimer.CompareSubtitle();
-    compareSummary = searchTimer.CompareSummary();
-    useInFavorites = searchTimer.UseInFavorites();
+    dayOfWeek = DayOfWeek(sT.dayOfWeek);
+//    dsyslog("Weekday = %i, %i",  sT.dayOfWeek, dayOfWeek);
+    indent = "   ";
+
+    if (sT.useChannel == 1) {
+        startChannel = (sT.channelMin) ? sT.channelMin->Number() : 0;
+        stopChannel = (sT.channelMax) ? sT.channelMax->Number() : 0;
+        if (startChannel == 0) startChannel = 1;
+        if (stopChannel == 0) stopChannel = 1;
+    }
+
+    sT.GetSearchModes(&searchModes);
+    sT.GetUseChannelModes(&useChannelModes);
+    sT.GetCompareDateModes(&compareDateModes);
+    sT.GetSearchTimerModes(&searchTimerModes);
+    sT.GetDelModes(&delModes);
+    channelgroupIndex = SplitChannelGroups(&channelGroups, &channelgroups);
 
     SetWidthPercent(70);
     cString infoText;
-    if (searchTimer.GetID() > -1) {
+    if (sT.GetID() > -1) {
         infoText = tr("Configure Search Timer Options");
     } else {
         infoText = tr("Create Search Timer");
@@ -774,9 +751,8 @@ cRecMenuSearchTimerEdit::cRecMenuSearchTimerEdit(cTVGuideSearchTimer searchTimer
     cRecMenuItemInfo *infoItem = new cRecMenuItemInfo(*infoText, true);
     infoItem->CalculateHeight(width - 2 * border);
     SetHeader(infoItem);
-    cRecMenuItemButtonYesNo *footerButton = new cRecMenuItemButtonYesNo(tr("Save Search Timer"), tr("Cancel"), rmsSearchTimerSave, rmsSearchTimers, (advancedOptions)?false:true);
+    cRecMenuItemButtonYesNo *footerButton = new cRecMenuItemButtonYesNo(tr("Save Search Timer"), tr("Cancel"), rmsSearchTimerSave, rmsSearchTimers, false);
     SetFooter(footerButton);
-    InitMenuItems();
     CreateMenuItems();
 }
 
@@ -785,169 +761,198 @@ cRecMenuSearchTimerEdit::~cRecMenuSearchTimerEdit(void) {
         delete *it;
     }
     mainMenuItems.clear();
-    for (std::vector<cRecMenuItem*>::iterator it = useChannelSubMenu.begin(); it != useChannelSubMenu.end(); it++) {
-        delete *it;
-    }
-    useChannelSubMenu.clear();
-    for (std::vector<cRecMenuItem*>::iterator it = useTimeSubMenu.begin(); it != useTimeSubMenu.end(); it++) {
-        delete *it;
-    }
-    useTimeSubMenu.clear();
-    for (std::vector<cRecMenuItem*>::iterator it = useDayOfWeekSubMenu.begin(); it != useDayOfWeekSubMenu.end(); it++) {
-        delete *it;
-    }
-    useDayOfWeekSubMenu.clear();
-    for (std::vector<cRecMenuItem*>::iterator it = avoidRepeatSubMenu.begin(); it != avoidRepeatSubMenu.end(); it++) {
-        delete *it;
-    }
-    avoidRepeatSubMenu.clear();
-    currentMenuItems.clear();
 }
 
-void cRecMenuSearchTimerEdit::InitMenuItems(void) {
-
-    useChannelPos = 6;
-    useTimePos = 7;
-    useDayOfWeekPos = 8;
-    avoidRepeatsPos = 14;
-
-    mainMenuItems.push_back(new cRecMenuItemText(tr("Search String"), searchString, TEXTINPUTLENGTH, false, searchString));
-    mainMenuItems.push_back(new cRecMenuItemBool(tr("Active"), timerActive, false, false, &timerActive, rmsSearchTimerSave));
-    std::vector<std::string> searchModes;
-    searchTimer.GetSearchModes(&searchModes);
-    mainMenuItems.push_back(new cRecMenuItemSelect(tr("Search Mode"), searchModes, mode, false, &mode, rmsSearchTimerSave));
-    mainMenuItems.push_back(new cRecMenuItemBool(tr("Use Title"), useTitle, false, false, &useTitle, rmsSearchTimerSave));
-    mainMenuItems.push_back(new cRecMenuItemBool(tr("Use Subtitle"), useSubtitle, false, false, &useSubtitle, rmsSearchTimerSave));
-    mainMenuItems.push_back(new cRecMenuItemBool(tr("Use Description"), useDescription, false, false, &useDescription, rmsSearchTimerSave));
-    mainMenuItems.push_back(new cRecMenuItemBool(tr("Limit Channels"), useChannel, true, false, &useChannel, rmsSearchTimerSave));
-    mainMenuItems.push_back(new cRecMenuItemBool(tr("Use Time"), useTime, true, false, &useTime, rmsSearchTimerSave));
-    if (!advancedOptions) {
-        mainMenuItems.push_back(new cRecMenuItemButton(tr("Display advanced Options"), rmsSearchTimerEditAdvanced, false));
-    } else {
-        mainMenuItems.push_back(new cRecMenuItemBool(tr("Limit Days of the Week"), useDayOfWeek, true, false, &useDayOfWeek, rmsSearchTimerSave));
-        mainMenuItems.push_back(new cRecMenuItemInt(tr("Priority"), priority, 0, 99, false, &priority, rmsSearchTimerSave));
-        mainMenuItems.push_back(new cRecMenuItemInt(tr("Lifetime"), lifetime, 0, 99, false, &lifetime, rmsSearchTimerSave));
-        mainMenuItems.push_back(new cRecMenuItemInt(tr("Time margin for start in minutes"), marginStart, 0, 30, false, &marginStart, rmsSearchTimerSave));
-        mainMenuItems.push_back(new cRecMenuItemInt(tr("Time margin for stop in minutes"), marginStop, 0, 30, false, &marginStop, rmsSearchTimerSave));
-        mainMenuItems.push_back(new cRecMenuItemBool(tr("Series Recording"), useEpisode, false, false, &useEpisode, rmsSearchTimerSave));
-        mainMenuItems.push_back(new cRecMenuItemSelectDirectory(tr("Folder"), std::string(directory), false, directory, rmsSearchTimerSave, true));
-        mainMenuItems.push_back(new cRecMenuItemBool(tr("Use VPS"), useVPS, false, false, &useVPS, rmsSearchTimerSave));
-        mainMenuItems.push_back(new cRecMenuItemBool(tr("Avoid Repeats"), avoidRepeats, true, false, &avoidRepeats, rmsSearchTimerSave));
-        mainMenuItems.push_back(new cRecMenuItemBool(tr("Use in Favorites"), useInFavorites, false, false, &useInFavorites, rmsSearchTimerSave));
-        mainMenuItems.push_back(new cRecMenuItemButton(tr("Hide advanced Options"), rmsSearchTimerEdit, false));
-    }
-    mainMenuItems.push_back(new cRecMenuItemButton(tr("Display Results for Search Timer"), rmsSearchTimerTest, false));
-
-    if (startChannel == 0)
-        startChannel = 1;
-    if (stopChannel == 0)
-        stopChannel = 1;
-#if VDRVERSNUM >= 20301
-    LOCK_CHANNELS_READ;
-    useChannelSubMenu.push_back(new cRecMenuItemChannelChooser(tr("Start Channel"), Channels->GetByNumber(startChannel), false, &startChannel, rmsSearchTimerSave));
-    useChannelSubMenu.push_back(new cRecMenuItemChannelChooser(tr("Stop Channel"), Channels->GetByNumber(stopChannel), false, &stopChannel, rmsSearchTimerSave));
-#else
-    useChannelSubMenu.push_back(new cRecMenuItemChannelChooser(tr("Start Channel"), Channels.GetByNumber(startChannel), false, &startChannel, rmsSearchTimerSave));
-    useChannelSubMenu.push_back(new cRecMenuItemChannelChooser(tr("Stop Channel"), Channels.GetByNumber(stopChannel), false, &stopChannel, rmsSearchTimerSave));
-#endif
-
-    useTimeSubMenu.push_back(new cRecMenuItemTime(tr("Start after"), startTime, false, &startTime, rmsSearchTimerSave));
-    useTimeSubMenu.push_back(new cRecMenuItemTime(tr("Start before"), stopTime, false, &stopTime, rmsSearchTimerSave));
-
-    if (advancedOptions) {
-        useDayOfWeekSubMenu.push_back(new cRecMenuItemDayChooser(tr("Select Days"), dayOfWeek, false, &dayOfWeek));
-        avoidRepeatSubMenu.push_back(new cRecMenuItemInt(tr("Number of allowed repeats"), allowedRepeats, 0, 30, false, &allowedRepeats, rmsSearchTimerSave));
-        avoidRepeatSubMenu.push_back(new cRecMenuItemBool(tr("Compare Title"), compareTitle, false, false, &compareTitle, rmsSearchTimerSave));
-        avoidRepeatSubMenu.push_back(new cRecMenuItemBool(tr("Compare Subtitle"), compareSubtitle, false, false, &compareSubtitle, rmsSearchTimerSave));
-        avoidRepeatSubMenu.push_back(new cRecMenuItemBool(tr("Compare Description"), compareSummary, false, false, &compareSummary, rmsSearchTimerSave));
+int cRecMenuSearchTimerEdit::DayOfWeek(int dayofWeek) {
+    int vdrDayOfWeek = 0;
+    if (dayofWeek > 0) {
+        vdrDayOfWeek = pow(2, (dayofWeek + 6) % 7);
+    } else if (dayofWeek < 0) {
+        int absDayOfWeek = abs(dayofWeek);
+        for (int i = 0; i < 7; i++) {
+            if (absDayOfWeek & (1 << i)) {
+                vdrDayOfWeek += pow(2, (i + 6) % 7);
             }
         }
+    }
+    return vdrDayOfWeek;
+}
 
+int cRecMenuSearchTimerEdit::SetDayOfWeek(int VDRDayOfWeek) {
+    int epgSearchDayOfWeek = 0;
+    for (int i=0; i < 7; i++) {
+        if (VDRDayOfWeek & (1 << i)) {
+            epgSearchDayOfWeek += pow(2, (i+1)%7);
+        }
+    }
+    return epgSearchDayOfWeek * (-1);
+}
+
+int cRecMenuSearchTimerEdit::SplitChannelGroups(std::vector<std::string> *channelGroups, std::vector<std::string> *channelgroups) {
+    int i = 0;
+    int j = 0;
+    for (std::vector<std::string>::iterator it = channelGroups->begin(); it != channelGroups->end(); it++) {
+        std::string a = *it;
+        splitstring s(a.c_str());
+        std::vector<std::string> value = s.split('|', 0);
+        std::vector<std::string>::iterator ito = value.begin();
+        channelgroups->push_back(*ito);
+        std::string b = *ito;
+        if (b.compare(sT.channelGroup) == 0)
+            j = i;
+        i++;
+    }
+    return j;
+}
 
 void cRecMenuSearchTimerEdit::CreateMenuItems(void) {
-    bool reDraw = false;
-    if (GetCurrentNumMenuItems() > 0) {
-        InitMenu(false);
-        currentMenuItems.clear();
-        reDraw = true;
-    }
 
-   int numMainMenuItems = mainMenuItems.size();
+    int activeMenuItem = 0;
 
-    for (int i = 0; i < numMainMenuItems; i++) {
-        currentMenuItems.push_back(mainMenuItems[i]);
-        if ((i == useChannelPos) && useChannel)
-            AddSubMenu(&useChannelSubMenu);
-        else if ((i == useTimePos) && useTime)
-            AddSubMenu(&useTimeSubMenu);
-        else if (advancedOptions && (i == useDayOfWeekPos) && useDayOfWeek)
-            AddSubMenu(&useDayOfWeekSubMenu);
-        else if (advancedOptions && (i == avoidRepeatsPos) && avoidRepeats)
-            AddSubMenu(&avoidRepeatSubMenu);
-    }    
-
-    int numMenuItemsAll = currentMenuItems.size();
-    int start = GetStartIndex();
-     for (int i = start; i < numMenuItemsAll; i++) {
-        if ((i == start) && !reDraw && advancedOptions) {
-            currentMenuItems[i]->setActive();
-        }
-        if (!AddMenuItemInitial(currentMenuItems[i])) {
+    if (mainMenuItems.size() > 0) {
+        for (long unsigned int index = 0; index < mainMenuItems.size(); index++) {
+            if (mainMenuItems[index]->isActive()) {
+                activeMenuItem = index;
                 break;
             }
         }
-    numMenuItems = currentMenuItems.size();
-    CalculateHeight();
+        mainMenuItems.clear();
+    }
+
+    mainMenuItems.push_back(new cRecMenuItemText(tr("Search term"), TEXTINPUTLENGTH, init, searchString));
+    mainMenuItems.push_back(new cRecMenuItemBool(tr("Active"), false, &sT.useAsSearchTimer, rmsSearchTimerSave, true));
+    mainMenuItems.push_back(new cRecMenuItemSelect(tr("Search mode"), searchModes, false, &sT.mode, rmsSearchTimerSave, true));
+    if (sT.mode == 5) {
+        mainMenuItems.push_back(new cRecMenuItemInt(cString::sprintf("%s%s", *indent, tr("Tolerance")), 1, 9, false, &sT.fuzzyTolerance, rmsSearchTimerSave));
+    }
+    mainMenuItems.push_back(new cRecMenuItemBool(tr("Match case"), false, &sT.useCase, rmsSearchTimerSave));
+    mainMenuItems.push_back(new cRecMenuItemBool(tr("Use title"), false, &sT.useTitle, rmsSearchTimerSave));
+    mainMenuItems.push_back(new cRecMenuItemBool(tr("Use subtitle"), false, &sT.useSubtitle, rmsSearchTimerSave));
+    mainMenuItems.push_back(new cRecMenuItemBool(tr("Use description"), false, &sT.useDescription, rmsSearchTimerSave));
+//    mainMenuItems.push_back(new cRecMenuItemBool(tr("Use content descriptor"), false, &sT.useContentDescriptors, rmsSearchTimerSave));
+    mainMenuItems.push_back(new cRecMenuItemSelect(tr("Use channel"), useChannelModes, false, &sT.useChannel, rmsSearchTimerSave, true));
+    if (sT.useChannel == 1) {
+        mainMenuItems.push_back(new cRecMenuItemChannelChooser(cString::sprintf("%s%s", *indent, tr("from channel")), false, &startChannel, rmsSearchTimerSave));
+        mainMenuItems.push_back(new cRecMenuItemChannelChooser(cString::sprintf("%s%s", *indent, tr("to channel")), false, &stopChannel, rmsSearchTimerSave));
+    }
+    else if ((sT.useChannel == 2) && (channelgroups.size() > 0)) {
+        mainMenuItems.push_back(new cRecMenuItemSelect(cString::sprintf("%s%s", *indent, tr("Channel group")), channelgroups, false, &channelgroupIndex, rmsSearchTimerSave, false));
+    }
+    mainMenuItems.push_back(new cRecMenuItemBool(tr("Use time"), false, &sT.useTime, rmsSearchTimerSave, true));
+    if (sT.useTime) {
+        mainMenuItems.push_back(new cRecMenuItemTime(cString::sprintf("%s%s", *indent, tr("Start after")), false, &sT.startTime, rmsSearchTimerSave));
+        mainMenuItems.push_back(new cRecMenuItemTime(cString::sprintf("%s%s", *indent, tr("Start before")), false, &sT.stopTime, rmsSearchTimerSave));
+    }
+    mainMenuItems.push_back(new cRecMenuItemBool(tr("Use duration"), false, &sT.useDuration, rmsSearchTimerSave, true));
+    if (sT.useDuration) {
+        mainMenuItems.push_back(new cRecMenuItemTime(cString::sprintf("%s%s", *indent, tr("Min. duration")), false, &sT.minDuration, rmsSearchTimerSave));
+        mainMenuItems.push_back(new cRecMenuItemTime(cString::sprintf("%s%s", *indent, tr("Max. duration")), false, &sT.maxDuration, rmsSearchTimerSave));
+    }
+    mainMenuItems.push_back(new cRecMenuItemBool(tr("Use day of week"), false, &sT.useDayOfWeek, rmsSearchTimerSave, true));
+    if (sT.useDayOfWeek)
+        mainMenuItems.push_back(new cRecMenuItemDayChooser(cString::sprintf("%s%s", *indent, tr("Day of week")), false, &dayOfWeek));
+    mainMenuItems.push_back(new cRecMenuItemBool(tr("Use in Favorites"), false, &sT.useInFavorites, rmsSearchTimerSave));
+    mainMenuItems.push_back(new cRecMenuItemBool(tr("Use as search timer"), false, &sT.useAsSearchTimer, rmsSearchTimerSave, true));
+    if (sT.useAsSearchTimer) {
+        mainMenuItems.push_back(new cRecMenuItemSelect(cString::sprintf("%s%s", *indent, tr("Action")), searchTimerModes, false, &sT.action, rmsSearchTimerSave, true));
+        if (sT.action == searchTimerActionSwitchOnly) {
+            mainMenuItems.push_back(new cRecMenuItemInt(cString::sprintf("%s%s%s", *indent, *indent, tr("Switch ... minutes before start")), 0, 99, false, &sT.switchMinsBefore, rmsSearchTimerSave));
+            mainMenuItems.push_back(new cRecMenuItemBool(cString::sprintf("%s%s%s", *indent, *indent, tr("Unmute sound")), false, &sT.unmuteSoundOnSwitch, rmsSearchTimerSave));
+        }
+        if (sT.action ==  searchTimerActionAnnounceAndSwitch) {
+            mainMenuItems.push_back(new cRecMenuItemInt(cString::sprintf("%s%s%s", *indent, *indent, tr("Ask ... minutes before start")), 0, 99, false, &sT.switchMinsBefore, rmsSearchTimerSave));
+            mainMenuItems.push_back(new cRecMenuItemBool(cString::sprintf("%s%s%s", *indent, *indent, tr("Unmute sound")), false, &sT.unmuteSoundOnSwitch, rmsSearchTimerSave));
+        }
+        if ((sT.action == searchTimerActionRecord) || (sT.action == searchTimerActionInactiveRecord)) {
+            mainMenuItems.push_back(new cRecMenuItemBool(cString::sprintf("%s%s%s", *indent, *indent, tr("Series Recording")), false, &sT.useEpisode, rmsSearchTimerSave));
+            mainMenuItems.push_back(new cRecMenuItemSelectDirectory(cString::sprintf("%s%s%s", *indent, *indent, tr("Directory")), std::string(directory), false, directory, rmsSearchTimerSave, true));
+            mainMenuItems.push_back(new cRecMenuItemInt(cString::sprintf("%s%s%s", *indent, *indent, tr("Delete recordings after ... days")), 0, 999, false, &sT.delAfterDays, rmsSearchTimerSave));
+            if (sT.delAfterDays > 0) {
+                mainMenuItems.push_back(new cRecMenuItemInt(cString::sprintf("%s%s%s%s", *indent, *indent, *indent, tr("Keep ... recordings")), 0, 999, false, &sT.recordingsKeep, rmsSearchTimerSave));
+            }
+            mainMenuItems.push_back(new cRecMenuItemInt(cString::sprintf("%s%s%s", *indent, *indent, tr("Pause when ... recordings exist")), 0, 999, false, &sT.pauseOnNrRecordings, rmsSearchTimerSave));
+            mainMenuItems.push_back(new cRecMenuItemBool(cString::sprintf("%s%s%s", *indent, *indent, tr("Avoid Repeats")), false, &sT.avoidRepeats, rmsSearchTimerSave, true));
+            if (sT.avoidRepeats) {
+                mainMenuItems.push_back(new cRecMenuItemInt(cString::sprintf("%s%s%s%s", *indent, *indent, *indent, tr("Allowed repeats")), 0, 99, false, &sT.allowedRepeats, rmsSearchTimerSave));
+                if (sT.allowedRepeats > 0) {
+                    mainMenuItems.push_back(new cRecMenuItemInt(cString::sprintf("%s%s%s%s%s", *indent, *indent, *indent, *indent, tr("Only repeats within ... days")), 0, 999, false, &sT.repeatsWithinDays, rmsSearchTimerSave));
+                }
+                mainMenuItems.push_back(new cRecMenuItemBool(cString::sprintf("%s%s%s%s", *indent, *indent, *indent, tr("Compare Title")), false, &sT.compareTitle, rmsSearchTimerSave));
+                mainMenuItems.push_back(new cRecMenuItemBool(cString::sprintf("%s%s%s%s", *indent, *indent, *indent, tr("Compare Subtitle")), false, &sT.compareSubtitle, rmsSearchTimerSave));
+                mainMenuItems.push_back(new cRecMenuItemBool(cString::sprintf("%s%s%s%s", *indent, *indent, *indent, tr("Compare Description")), false, &sT.compareSummary, rmsSearchTimerSave, true));
+                if (sT.compareSummary) {
+                    mainMenuItems.push_back(new cRecMenuItemInt(cString::sprintf("%s%s%s%s%s", *indent, *indent, *indent, *indent, tr("Min. match in %")), 1, 100, false, &sT.compareSummaryMatchInPercent, rmsSearchTimerSave));
+                }
+                mainMenuItems.push_back(new cRecMenuItemSelect(cString::sprintf("%s%s%s%s", *indent, *indent, *indent, tr("Compare date")), compareDateModes, false, &sT.compareDate, rmsSearchTimerSave, false));
+            }
+            mainMenuItems.push_back(new cRecMenuItemInt(cString::sprintf("%s%s%s", *indent, *indent, tr("Priority")), 0, 99, false, &sT.priority, rmsSearchTimerSave));
+            mainMenuItems.push_back(new cRecMenuItemInt(cString::sprintf("%s%s%s", *indent, *indent, tr("Lifetime")), 0, 99, false, &sT.lifetime, rmsSearchTimerSave));
+            mainMenuItems.push_back(new cRecMenuItemInt(cString::sprintf("%s%s%s", *indent, *indent, tr("Time margin for start in minutes")), 0, 30, false, &sT.marginStart, rmsSearchTimerSave));
+            mainMenuItems.push_back(new cRecMenuItemInt(cString::sprintf("%s%s%s", *indent, *indent, tr("Time margin for stop in minutes")), 0, 30, false, &sT.marginStop, rmsSearchTimerSave));
+            mainMenuItems.push_back(new cRecMenuItemBool(cString::sprintf("%s%s%s", *indent, *indent, tr("Use VPS")), false, &sT.useVPS, rmsSearchTimerSave));
+            mainMenuItems.push_back(new cRecMenuItemSelect(cString::sprintf("%s%s%s", *indent, *indent, tr("Auto delete")), delModes, false, &sT.delMode, rmsSearchTimerSave, true));
+            if (sT.delMode == 1)
+                mainMenuItems.push_back(new cRecMenuItemInt(cString::sprintf("%s%s%s%s", *indent, *indent, *indent, tr("after ... recordings")), 0, 999, false, &sT.delAfterCountRecs, rmsSearchTimerSave));
+            else if (sT.delMode == 2)
+                mainMenuItems.push_back(new cRecMenuItemInt(cString::sprintf("%s%s%s%s", *indent, *indent, *indent, tr("after ... days after first rec.")), 0, 999, false, &sT.delAfterDaysOfFirstRec, rmsSearchTimerSave));
+        }
+    }
+    mainMenuItems.push_back(new cRecMenuItemButton(tr("Display Results for Search Timer"), rmsSearchTimerTest, false));
+
+    bool reDraw = false;
+    if (GetCurrentNumMenuItems() > 0) {
+        InitMenu(false);
+        reDraw = true;
+    }
+    
+    numMenuItems = mainMenuItems.size();
+
+    int start = GetStartIndex();
+    for (int i = start; i < numMenuItems; i++) {
+        if (!AddMenuItemInitial(mainMenuItems[i])) {
+            break;
+        }
+    }
+    if (reDraw)
+        mainMenuItems[activeMenuItem]->setActive();
+
+    if (init) {
+        init = !init;
+    }
+    CalculateHeight(!reDraw);
     CreatePixmap();
     Arrange();
 }
 
-void cRecMenuSearchTimerEdit::AddSubMenu(std::vector<cRecMenuItem*> *subMenu) {
-    for (std::vector<cRecMenuItem*>::iterator it = subMenu->begin(); it < subMenu->end(); it++) {
-        currentMenuItems.push_back(*it);
-    }
-}
-
-
 cTVGuideSearchTimer cRecMenuSearchTimerEdit::GetSearchTimer(void) {
-    searchTimer.SetSearchString(searchString);
-    searchTimer.SetActive(timerActive);
-    searchTimer.SetSearchMode(mode);
-    searchTimer.SetUseTitle(useTitle);
-    searchTimer.SetUseSubtitle(useSubtitle);
-    searchTimer.SetUseDesription(useDescription);
-    searchTimer.SetUseChannel(useChannel);
-    if (useChannel) {
-        searchTimer.SetStartChannel(startChannel);
-        searchTimer.SetStopChannel(stopChannel);
+    sT.searchString = searchString;
+    if (sT.useChannel == 1) {
+#if VDRVERSNUM >= 20301
+        {
+        LOCK_CHANNELS_READ;
+        sT.channelMin = Channels->GetByNumber(startChannel);
+        sT.channelMax = Channels->GetByNumber(stopChannel);
         }
-    searchTimer.SetUseTime(useTime);
-    if (useTime) {
-        searchTimer.SetStartTime(startTime);
-        searchTimer.SetStopTime(stopTime);
+#else
+        sT.channelMin = Channels.GetByNumber(startChannel);
+        sT.channelMax = Channels.GetByNumber(stopChannel);
+#endif
     }
-    searchTimer.SetUseDayOfWeek(useDayOfWeek);
-    if (useDayOfWeek) {
-        searchTimer.SetDayOfWeek(dayOfWeek);
+    if (sT.useChannel == 2) {
+        if (channelgroups.size() > 0) {
+            std::string & channelGroup = channelgroups[channelgroupIndex];
+            sT.channelGroup = channelGroup;
+        } else {
+            sT.useChannel = 0;
+        }
+    }
+    if (sT.useDayOfWeek) {
+        sT.dayOfWeek = SetDayOfWeek(dayOfWeek);
     }
-    searchTimer.SetPriority(priority);
-    searchTimer.SetLifetime(lifetime);
-    searchTimer.SetUseEpisode(useEpisode);
     std::string dir(directory);
     std::replace(dir.begin(), dir.end(), '/', '~');
-    searchTimer.SetDirectory(dir);
-    searchTimer.SetMarginStart(marginStart);
-    searchTimer.SetMarginStop(marginStop);
-    searchTimer.SetUseVPS(useVPS);
-    searchTimer.SetAvoidRepeats(avoidRepeats);
-    if (avoidRepeats) {
-        searchTimer.SetAllowedRepeats(allowedRepeats);
-        searchTimer.SetCompareTitle(compareTitle);
-        searchTimer.SetCompareSubtitle(compareSubtitle);
-        searchTimer.SetCompareSummary(compareSummary);
-    }
-    searchTimer.SetUseInFavorites(useInFavorites);
-    return searchTimer;
+    sT.directory = dir;
+    return sT;
 }
 
 int cRecMenuSearchTimerEdit::GetTotalNumMenuItems(void) { 
@@ -956,7 +961,7 @@ int cRecMenuSearchTimerEdit::GetTotalNumMenuItems(void) {
 
 cRecMenuItem *cRecMenuSearchTimerEdit::GetMenuItem(int number) {
     if ((number > -1) && (number < numMenuItems)) {
-        return currentMenuItems[number];
+        return mainMenuItems[number];
     }
     return NULL;
 }
@@ -966,7 +971,7 @@ cRecMenuSearchTimerDeleteConfirm::cRecMenuSearchTimerDeleteConfirm(cTVGuideSearc
     this->searchTimer = searchTimer;
     SetWidthPercent(70);
     cString message = tr("Really delete Search Timer");
-    cString infoText = cString::sprintf("%s \"%s\"?", *message, searchTimer.SearchString().c_str());
+    cString infoText = cString::sprintf("%s \"%s\"?", *message, searchTimer.GetSearchString().c_str());
     cRecMenuItemInfo *infoItem = new cRecMenuItemInfo(*infoText, true);
     infoItem->CalculateHeight(width - 2 * border);
     SetHeader(infoItem);
@@ -1016,7 +1021,7 @@ cRecMenuSearchTimerTemplatesCreate::cRecMenuSearchTimerTemplatesCreate(TVGuideEP
     cString message2 = tr("Search Term");
     cString message3 = tr("Using Template");
     
-    cString infoText = cString::sprintf("%s\n%s: \"%s\"\n%s \"%s\"", *message1, *message2, searchTimer.SearchString().c_str(), *message3, templ.name.c_str());
+    cString infoText = cString::sprintf("%s\n%s: \"%s\"\n%s \"%s\"", *message1, *message2, searchTimer.GetSearchString().c_str(), *message3, templ.name.c_str());
     cRecMenuItemInfo *infoItem = new cRecMenuItemInfo(*infoText);
     infoItem->CalculateHeight(width - 2 * border);
     AddMenuItem(infoItem);
@@ -1109,8 +1114,8 @@ cRecMenuSearchTimerNothingFound::cRecMenuSearchTimerNothingFound(std::string sea
 
 // --- cRecMenuSwitchTimer  ---------------------------------------------------------
 cRecMenuSwitchTimer::cRecMenuSwitchTimer(void) {
-    switchMinsBefore = 2;
-    announceOnly = 0;
+    switchMinsBefore = config.switchMinsBefore;
+    switchMode = config.switchMode;
 
     SetWidthPercent(60);
     
@@ -1119,12 +1124,12 @@ cRecMenuSwitchTimer::cRecMenuSwitchTimer(void) {
     infoItem->CalculateHeight(width - 2 * border);
     AddMenuItem(infoItem);
 
-    AddMenuItem(new cRecMenuItemInt(tr("Minutes before switching"), switchMinsBefore, 0, 10, false, &switchMinsBefore));
-    std::vector<std::string> switchModes;
-    switchModes.push_back(tr("switch"));
-    switchModes.push_back(tr("announce only"));
-    switchModes.push_back(tr("ask for switch"));
-    AddMenuItem(new cRecMenuItemSelect(tr("Switch Mode"), switchModes, announceOnly, false, &announceOnly));
+    AddMenuItem(new cRecMenuItemInt(tr("Minutes before switching"), 0, 10, false, &switchMinsBefore));
+    std::vector<std::string> switchModeItems;
+    switchModeItems.push_back(tr("switch"));
+    switchModeItems.push_back(tr("announce only"));
+    switchModeItems.push_back(tr("ask for switch"));
+    AddMenuItem(new cRecMenuItemSelect(tr("Switch Mode"), switchModeItems, false, &switchMode));
     
     AddMenuItem(new cRecMenuItemButtonYesNo(tr("Create"), tr("Cancel"), rmsSwitchTimerCreate, rmsClose, true));
     
@@ -1136,7 +1141,7 @@ cRecMenuSwitchTimer::cRecMenuSwitchTimer(void) {
 cSwitchTimer cRecMenuSwitchTimer::GetSwitchTimer(void) {
     cSwitchTimer st;
     st.switchMinsBefore = switchMinsBefore;
-    st.announceOnly = announceOnly;
+    st.switchMode = switchMode;
     return st;
 }
 
@@ -1192,16 +1197,16 @@ cRecMenuSearch::cRecMenuSearch(std::string searchString, bool withOptions) {
     cRecMenuItemInfo *infoItem = new cRecMenuItemInfo(*infoText, true);
     infoItem->CalculateHeight(width - 2 * border);
     SetHeader(infoItem);
-    AddMenuItem(new cRecMenuItemText(tr("Search Expression:"), this->searchString, TEXTINPUTLENGTH, false, this->searchString));
+    AddMenuItem(new cRecMenuItemText(tr("Search Expression:"), TEXTINPUTLENGTH, false, this->searchString));
     if (withOptions) {
         std::vector<std::string> searchModes;
         cTVGuideSearchTimer searchTimer;
         searchTimer.GetSearchModes(&searchModes);
-        AddMenuItemInitial(new cRecMenuItemSelect(tr("Search Mode"), searchModes, 0, false, &mode));
-        AddMenuItemInitial(new cRecMenuItemChannelChooser(tr("Channel to Search"), NULL, false, &channelNr));
-        AddMenuItemInitial(new cRecMenuItemBool(tr("Search in title"), true, false, false, &useTitle));
-        AddMenuItemInitial(new cRecMenuItemBool(tr("Search in Subtitle"), true, false, false, &useSubTitle));
-        AddMenuItemInitial(new cRecMenuItemBool(tr("Search in Description"), false, false, false, &useDescription));
+        AddMenuItemInitial(new cRecMenuItemSelect(tr("Search Mode"), searchModes, false, &mode));
+        AddMenuItemInitial(new cRecMenuItemChannelChooser(tr("Channel to Search"), false, &channelNr));
+        AddMenuItemInitial(new cRecMenuItemBool(tr("Search in title"), false, &useTitle));
+        AddMenuItemInitial(new cRecMenuItemBool(tr("Search in Subtitle"), false, &useSubTitle));
+        AddMenuItemInitial(new cRecMenuItemBool(tr("Search in Description"), false, &useDescription));
     } else {
         AddMenuItemInitial(new cRecMenuItemButton(tr("Show Search Options"), rmsSearchWithOptions, false));
     }
@@ -1277,7 +1282,7 @@ cRecMenuSearchConfirmTimer::cRecMenuSearchConfirmTimer(const cEvent *event, eRec
     LOCK_CHANNELS_READ;
     const cString channelName = Channels->GetByChannelID(event->ChannelID())->Name();
 #else
-    cString channelName = Channels.GetByChannelID(event->ChannelID())->Name();
+    const cString channelName = Channels.GetByChannelID(event->ChannelID())->Name();
 #endif
     cString message = tr("Timer created");
     cString text = cString::sprintf("%s\n%s\n%s %s - %s\n%s", 
@@ -1335,7 +1340,7 @@ cRecMenuRecordingSearch::cRecMenuRecordingSearch(std::string search) {
     infoItem->CalculateHeight(width - 2 * border);
     SetHeader(infoItem);
     
-    AddMenuItem(new cRecMenuItemText(tr("Search Expression:"), searchString, TEXTINPUTLENGTH, false, searchString));
+    AddMenuItem(new cRecMenuItemText(tr("Search Expression:"), TEXTINPUTLENGTH, false, searchString));
     AddMenuItem(new cRecMenuItemButtonYesNo(tr("Perform Search"), tr("Cancel"), rmsRecordingSearchResult, rmsClose, true));
     CalculateHeight();
     CreatePixmap();
@@ -1343,11 +1348,7 @@ cRecMenuRecordingSearch::cRecMenuRecordingSearch(std::string search) {
 }
 
 // --- cRecMenuRecordingSearchResults  ---------------------------------------------------------
-#if VDRVERSNUM >= 20301
 cRecMenuRecordingSearchResults::cRecMenuRecordingSearchResults(std::string searchString, const cRecording **searchResults, int numResults) {
-#else
-cRecMenuRecordingSearchResults::cRecMenuRecordingSearchResults(std::string searchString, cRecording **searchResults, int numResults) {
-#endif
     this->searchString = searchString;
     this->searchResults = searchResults;
     SetWidthPercent(80);
@@ -1436,7 +1437,7 @@ void cRecMenuTimeline::GetTimersForDay(void) {
 //    const cTimers* timers = Timers;
     for (const cTimer *t = Timers->First(); t; t = Timers->Next(t)) {
 #else
-    for (cTimer *t = Timers.First(); t; t = Timers.Next(t)) {
+    for (const cTimer *t = Timers.First(); t; t = Timers.Next(t)) {
 #endif
         if (((t->StartTime() > timeStart) && (t->StartTime() <= timeStop)) || ((t->StopTime() > timeStart) && (t->StopTime() <= timeStop))) {
             timersToday.push_back(t);
@@ -1511,11 +1512,7 @@ void cRecMenuTimeline::ClearMenu(void) {
     header->UnsetCurrentTimer();
 }
 
-#if VDRVERSNUM >= 20301
 const cTimer *cRecMenuTimeline::GetTimer(void) {
-#else
-cTimer *cRecMenuTimeline::GetTimer(void) {
-#endif
     if (cRecMenuItemTimelineTimer *activeItem = dynamic_cast<cRecMenuItemTimelineTimer*>(GetActiveMenuItem()))
         return activeItem->GetTimerValue();
     return NULL;
@@ -1587,26 +1584,26 @@ cRecMenuFavorites::~cRecMenuFavorites(void) {
 }
 
 void cRecMenuFavorites::CreateFavoritesMenuItems(void) {
-    if (tvguideConfig.favWhatsOnNow) {
+    if (config.favWhatsOnNow) {
         myMenuItems.push_back(new cRecMenuItemFavoriteStatic(tr("What's on now"), rmsFavoritesNow, false));
     }
-    if (tvguideConfig.favWhatsOnNext) {
+    if (config.favWhatsOnNext) {
         myMenuItems.push_back(new cRecMenuItemFavoriteStatic(tr("What's on next"), rmsFavoritesNext, false));
     }
-    if (tvguideConfig.favUseTime1) {
-        std::string desc = *cString::sprintf("%s (%s)", tvguideConfig.descUser1.c_str(), NiceTime(tvguideConfig.favTime1).c_str());
+    if (config.favUseTime1) {
+        std::string desc = *cString::sprintf("%s (%s)", config.descUser1.c_str(), NiceTime(config.favTime1).c_str());
         myMenuItems.push_back(new cRecMenuItemFavoriteStatic(desc, rmsFavoritesUser1, false));
     }
-    if (tvguideConfig.favUseTime2) {
-        std::string desc = *cString::sprintf("%s (%s)", tvguideConfig.descUser2.c_str(), NiceTime(tvguideConfig.favTime2).c_str());
+    if (config.favUseTime2) {
+        std::string desc = *cString::sprintf("%s (%s)", config.descUser2.c_str(), NiceTime(config.favTime2).c_str());
         myMenuItems.push_back(new cRecMenuItemFavoriteStatic(desc, rmsFavoritesUser2, false));
     }
-    if (tvguideConfig.favUseTime3) {
-        std::string desc = *cString::sprintf("%s (%s)", tvguideConfig.descUser3.c_str(), NiceTime(tvguideConfig.favTime3).c_str());
+    if (config.favUseTime3) {
+        std::string desc = *cString::sprintf("%s (%s)", config.descUser3.c_str(), NiceTime(config.favTime3).c_str());
         myMenuItems.push_back(new cRecMenuItemFavoriteStatic(desc, rmsFavoritesUser3, false));
     }
-    if (tvguideConfig.favUseTime4) {
-        std::string desc = *cString::sprintf("%s (%s)", tvguideConfig.descUser4.c_str(), NiceTime(tvguideConfig.favTime4).c_str());
+    if (config.favUseTime4) {
+        std::string desc = *cString::sprintf("%s (%s)", config.descUser4.c_str(), NiceTime(config.favTime4).c_str());
         myMenuItems.push_back(new cRecMenuItemFavoriteStatic(desc, rmsFavoritesUser4, false));
     }
 

recmenus.h

@@ -10,6 +10,15 @@
 #include "switchtimer.h"
 #include "recmanager.h"
 
+typedef enum {
+    searchTimerActionRecord = 0,
+    searchTimerActionAnnounceViaOSD,
+    searchTimerActionSwitchOnly,
+    searchTimerActionAnnounceAndSwitch,
+    searchTimerActionAnnounceViaMail,
+    searchTimerActionInactiveRecord
+} searchTimerAction;
+
 // --- cRecMenuMain  ---------------------------------------------------------
 class cRecMenuMain : public cRecMenu {
 public:
@@ -115,11 +124,7 @@ public:
 // --- cRecMenuEditTimer  ---------------------------------------------------------
 class cRecMenuEditTimer: public cRecMenu {
 private:
-#if VDRVERSNUM >= 20301
     const cTimer *originalTimer;
-#else
-    cTimer *originalTimer;
-#endif
     bool timerActive;
     time_t day;
     int start;
@@ -128,13 +133,8 @@ private:
     int lifetime;
     char folder[TEXTINPUTLENGTH];
 public:
-#if VDRVERSNUM >= 20301
     cRecMenuEditTimer(const cTimer *timer, eRecMenuState nextState);
     const cTimer *GetOriginalTimer(void);
-#else
-    cRecMenuEditTimer(cTimer *timer, eRecMenuState nextState);
-    cTimer *GetOriginalTimer(void);
-#endif
     virtual ~cRecMenuEditTimer(void) {};
     cTimer GetTimer(void);
 };
@@ -157,11 +157,7 @@ class cRecMenuSeriesTimer: public cRecMenu {
     int lifetime;
     void CalculateTimes(const cEvent *event);
 public:
-#if VDRVERSNUM >= 20301
     cRecMenuSeriesTimer(const cChannel *initialChannel, const cEvent *event, std::string folder);
-#else
-    cRecMenuSeriesTimer(cChannel *initialChannel, const cEvent *event, std::string folder);
-#endif
     virtual ~cRecMenuSeriesTimer(void) {};
     cTimer *GetTimer(void);
 };
@@ -220,50 +216,34 @@ public:
 // --- cRecMenuSearchTimerEdit  ---------------------------------------------------------
 class cRecMenuSearchTimerEdit: public cRecMenu {
 private:
-    bool advancedOptions;
-    cTVGuideSearchTimer searchTimer;
+    cTVGuideSearchTimer sT;
+    std::vector<std::string> searchModes;
+    std::vector<std::string> useChannelModes;
+    std::vector<std::string> channelGroups;
+    std::vector<std::string> compareDateModes;
+    std::vector<std::string> searchTimerModes;
+    std::vector<std::string> delModes;
+    std::vector<std::string> channelgroups;
     std::vector<cRecMenuItem*> mainMenuItems;
-    std::vector<cRecMenuItem*> useChannelSubMenu;
-    std::vector<cRecMenuItem*> useTimeSubMenu;
-    std::vector<cRecMenuItem*> useDayOfWeekSubMenu;
-    std::vector<cRecMenuItem*> avoidRepeatSubMenu;
-    std::vector<cRecMenuItem*> currentMenuItems;
+    cString indent;
+    bool init;
     int numMenuItems;
     int useChannelPos;
     int useTimePos;
     int useDayOfWeekPos;
+    int DayOfWeek(int dayofWeek = 0);
+    int SetDayOfWeek(int VDRDayOfWeek);
     int avoidRepeatsPos;
     char searchString[TEXTINPUTLENGTH];
     bool timerActive;
-    int mode;
-    bool useTitle;
-    bool useSubtitle;
-    bool useDescription;
-    bool useChannel;
     int startChannel;
     int stopChannel;
-    bool useTime;
-    int startTime;
-    int stopTime;
-    bool useDayOfWeek;
+    int channelgroupIndex;
     int dayOfWeek;
-    int priority;
-    int lifetime;
-    bool useEpisode;
     char directory[TEXTINPUTLENGTH];
-    int marginStart;
-    int marginStop;
-    bool useVPS;
-    bool avoidRepeats;
-    int allowedRepeats;
-    bool compareTitle;
-    bool compareSubtitle;
-    bool compareSummary;
-    bool useInFavorites;
-    void InitMenuItems(void);
-    void AddSubMenu(std::vector<cRecMenuItem*> *subMenu);
+    int SplitChannelGroups(std::vector<std::string> *channelGroups, std::vector<std::string> *channelgroups);
 public:
-    cRecMenuSearchTimerEdit(cTVGuideSearchTimer searchTimer, bool advancedOptions);
+    cRecMenuSearchTimerEdit(cTVGuideSearchTimer searchTimer, std::vector<std::string> channelGroups);
     void CreateMenuItems(void);
     virtual ~cRecMenuSearchTimerEdit(void);
     cTVGuideSearchTimer GetSearchTimer(void);
@@ -332,7 +312,7 @@ public:
 class cRecMenuSwitchTimer: public cRecMenu {
 private:
     int switchMinsBefore;
-    int announceOnly;
+    int switchMode;
 public:
     cRecMenuSwitchTimer(void);
     virtual ~cRecMenuSwitchTimer(void) {};
@@ -425,18 +405,10 @@ public:
 class cRecMenuRecordingSearchResults: public cRecMenu {
 private:
     std::string searchString;
-#if VDRVERSNUM >= 20301
     const cRecording **searchResults;
-#else
-    cRecording **searchResults;
-#endif
     int numResults;
 public:
-#if VDRVERSNUM >= 20301
     cRecMenuRecordingSearchResults(std::string searchString, const cRecording **searchResults, int numResults);
-#else
-    cRecMenuRecordingSearchResults(std::string searchString, cRecording **searchResults, int numResults);
-#endif
     cRecMenuItem *GetMenuItem(int number);
     int GetTotalNumMenuItems(void);
     virtual ~cRecMenuRecordingSearchResults(void) {
@@ -459,11 +431,7 @@ public:
 // --- cRecMenuTimeline  ---------------------------------------------------------
 class cRecMenuTimeline: public cRecMenu {
 private:
-#if VDRVERSNUM >= 20301
     std::vector<const cTimer*> timersToday;
-#else
-    std::vector<cTimer*> timersToday;
-#endif
     int numTimersToday;
     time_t today;
     time_t timeStart;
@@ -479,16 +447,11 @@ private:
     void ClearMenu(void);
 public:
     cRecMenuTimeline(cTVGuideTimerConflicts *timerConflicts);
+    virtual ~cRecMenuTimeline(void) {};
     cRecMenuItem *GetMenuItem(int number);
     int GetTotalNumMenuItems(void);
-    virtual ~cRecMenuTimeline(void) {
-    };
     eRecMenuState ProcessKey(eKeys Key);
-#if VDRVERSNUM >= 20301
     const cTimer *GetTimer(void);
-#else
-    cTimer *GetTimer(void);
-#endif
 };
 
 /******************************************************************************************

recmenuview.c

@@ -2,9 +2,9 @@
 #include "recmenus.h"
 #include "switchtimer.h"
 #include "timerconflict.h"
-#include "recmenumanager.h"
+#include "recmenuview.h"
 
-cRecMenuManager::cRecMenuManager(void) {
+cRecMenuView::cRecMenuView(void) {
     footer = NULL;
     active = false;
     activeMenu = NULL;
@@ -16,7 +16,7 @@ cRecMenuManager::cRecMenuManager(void) {
     detailViewActive = false;
 }
 
-cRecMenuManager::~cRecMenuManager(void) {
+cRecMenuView::~cRecMenuView(void) {
     if (activeMenu) {
         active = false;
         delete activeMenu;
@@ -29,7 +29,7 @@ cRecMenuManager::~cRecMenuManager(void) {
     delete recManager;
 }
 
-void cRecMenuManager::Start(const cEvent *event) {
+void cRecMenuView::Start(const cEvent *event) {
     active = true;
     activeMenuBuffer = NULL;
     detailViewActive = false;
@@ -40,7 +40,7 @@ void cRecMenuManager::Start(const cEvent *event) {
     osdManager.flush();
 }
 
-void cRecMenuManager::StartFavorites(void) {
+void cRecMenuView::StartFavorites(void) {
     active = true;
     activeMenuBuffer = NULL;
     detailViewActive = false;
@@ -53,7 +53,7 @@ void cRecMenuManager::StartFavorites(void) {
 }
 
 
-void cRecMenuManager::Close(void) {
+void cRecMenuView::Close(void) {
     event = NULL;
     active = false;
     if (activeMenu) {
@@ -67,12 +67,12 @@ void cRecMenuManager::Close(void) {
     DeleteBackground();
 }
 
-void cRecMenuManager::SetBackground(void) {
+void cRecMenuView::SetBackground(void) {
     int backgroundWidth = geoManager.osdWidth;
     int backgroundHeight = geoManager.osdHeight;
     pixmapBackground = osdManager.requestPixmap(3, cRect(0, 0, backgroundWidth, backgroundHeight));
     pixmapBackground->Fill(theme.Color(clrRecMenuBackground));
-    if (tvguideConfig.scaleVideo) {
+    if (config.scaleVideo) {
         int tvHeight = geoManager.statusHeaderHeight;
         int tvWidth = tvHeight * 16 / 9;
         int tvX = geoManager.osdWidth - tvWidth;
@@ -80,11 +80,75 @@ void cRecMenuManager::SetBackground(void) {
     }
 }
 
-void cRecMenuManager::DeleteBackground(void) {
+void cRecMenuView::DeleteBackground(void) {
     osdManager.releasePixmap(pixmapBackground);
 }
 
-eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
+void cRecMenuView::DisplaySearchTimerList(void) {
+    delete activeMenu;
+    std::vector<cTVGuideSearchTimer> searchTimers;
+    recManager->GetSearchTimers(&searchTimers);
+    activeMenu = new cRecMenuSearchTimers(searchTimers);
+    activeMenu->Display();
+}
+
+bool cRecMenuView::DisplayTimerConflict(const cTimer *timer) {
+    int timerID = 0;
+#if VDRVERSNUM >= 20301
+    LOCK_TIMERS_READ;
+    for (const cTimer *t = Timers->First(); t; t = Timers->Next(t)) {
+#else
+    for (const cTimer *t = Timers.First(); t; t = Timers.Next(t)) {
+#endif
+        if (t == timer)
+            return DisplayTimerConflict(timerID);
+        timerID++;
+    }
+    return false;
+}
+
+bool cRecMenuView::DisplayTimerConflict(int timerID) {
+    if (timerConflicts)
+        delete timerConflicts;
+    timerConflicts = recManager->CheckTimerConflict();
+    if (!timerConflicts)
+        return false;
+    int showTimerConflict = timerConflicts->GetCorrespondingConflict(timerID);
+    if (showTimerConflict > -1) {
+        timerConflicts->SetCurrentConflict(showTimerConflict);
+        cTVGuideTimerConflict *conflict = timerConflicts->GetCurrentConflict();
+        if (!conflict)
+            return false;
+        activeMenu = new cRecMenuTimerConflict(conflict);
+        activeMenu->Display();
+        return true;
+    }
+    return false;
+}
+
+void cRecMenuView::DisplayFavoriteResults(std::string header, const cEvent **result, int numResults) {
+    if (numResults) {
+        activeMenuBuffer = activeMenu;
+        activeMenuBuffer->Hide();
+        activeMenu = new cRecMenuSearchTimerResults(header, result, numResults, "", rmsFavoritesRecord);
+        activeMenu->Display();
+    } else {
+        activeMenuBuffer = activeMenu;
+        activeMenuBuffer->Hide();
+        activeMenu = new cRecMenuSearchTimerNothingFound(header);
+        activeMenu->Display();
+    }
+}
+
+void cRecMenuView::DisplayDetailedView(const cEvent *ev) {
+    activeMenu->Hide();
+    detailView = new cDetailView(ev, footer);
+    footer->SetDetailedViewMode(true);
+    detailView->Start();
+    detailViewActive = true;
+}
+
+eOSState cRecMenuView::StateMachine(eRecMenuState nextState) {
     eOSState state = osContinue;
     switch (nextState) {
 /***************************************************************************************
@@ -111,6 +175,47 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
             activeMenu = new cRecMenuAskFolder(event, rmsInstantRecord);
             activeMenu->Display();
             break;
+        case rmsDeleteTimer: {
+            //caller: main menu
+            //delete timer for active event
+            delete activeMenu;
+            if (recManager->IsRecorded(event)) {
+                activeMenu = new cRecMenuAskDeleteTimer(event);
+            } else {
+                recManager->DeleteTimer(event);
+                activeMenu = new cRecMenuConfirmDeleteTimer(event);
+            }
+            activeMenu->Display();
+            break; }
+        case rmsDeleteTimerConfirmation: {
+            //delete running timer for active event
+            recManager->DeleteTimer(event);
+            delete activeMenu;
+            activeMenu = new cRecMenuConfirmDeleteTimer(event);
+            activeMenu->Display();
+            break; }
+        case rmsEditTimer: {
+            //edit timer for active event
+            const cTimer *timer = recManager->GetTimerForEvent(event);
+            if (timer) {
+                delete activeMenu;
+                activeMenu = new cRecMenuEditTimer(timer, rmsSaveTimer);
+                activeMenu->Display();
+            }
+            break; }
+        case rmsSaveTimer: {
+            //caller: cRecMenuEditTimer
+            //save timer for active event
+            cTimer timerModified;
+            const cTimer *originalTimer;
+            if (cRecMenuEditTimer *menu = dynamic_cast<cRecMenuEditTimer*>(activeMenu)) {
+                timerModified = menu->GetTimer();
+                originalTimer = menu->GetOriginalTimer();
+            } else break;
+            recManager->SaveTimer(originalTimer, timerModified);
+            Close();
+            state = osEnd;
+            break; }
         case rmsIgnoreTimerConflict:
         //caller: cRecMenuTimerConflict
         //Confirming created Timer
@@ -141,7 +246,6 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
         case rmsDeleteTimerConflictMenu: {
             //caller: cRecMenuTimerConflict
             //delete timer out of current timer conflict
-            dsyslog ("%s %s %d\n", __FILE__, __func__,  __LINE__);
             int timerIndex;
             if (cRecMenuTimerConflict *menu = dynamic_cast<cRecMenuTimerConflict*>(activeMenu)) {
                 timerIndex = menu->GetTimerConflictIndex();
@@ -166,7 +270,7 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
             LOCK_TIMERS_READ;
             const cTimer *timer = Timers->Get(timerID);
 #else
-            cTimer *timer = Timers.Get(timerID);
+            const cTimer *timer = Timers.Get(timerID);
 #endif
             if (timer) {
                 delete activeMenu;
@@ -178,11 +282,7 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
             //caller: cRecMenuEditTimer
             //save timer from current timer conflict
             cTimer timerModified;
-#if VDRVERSNUM >= 20301
             const cTimer *originalTimer;
-#else
-            cTimer *originalTimer;
-#endif
             if (cRecMenuEditTimer *menu = dynamic_cast<cRecMenuEditTimer*>(activeMenu)) {
                 timerModified = menu->GetTimer();
                 originalTimer = menu->GetOriginalTimer();
@@ -194,60 +294,6 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
                 activeMenu->Display();
             }
             break; }
-        case rmsDeleteTimer:
-            //caller: main menu
-            //delete timer for active event
-            dsyslog ("%s %s %d\n", __FILE__, __func__,  __LINE__);
-            delete activeMenu;
-            if (recManager->IsRecorded(event)) {
-                activeMenu = new cRecMenuAskDeleteTimer(event);
-            } else {
-                recManager->DeleteTimer(event);
-                activeMenu = new cRecMenuConfirmDeleteTimer(event);
-            }
-            activeMenu->Display();
-            break;
-        case rmsDeleteTimerConfirmation:
-            //delete running timer for active event
-            recManager->DeleteTimer(event);
-            delete activeMenu;
-            activeMenu = new cRecMenuConfirmDeleteTimer(event);
-            activeMenu->Display();
-            break;
-        case rmsEditTimer: {
-            //edit timer for active event
-#if VDRVERSNUM >= 20301
-            const cTimer *timer;
-            {
-            LOCK_TIMERS_READ;
-            timer = recManager->GetTimerForEvent(event);
-            }
-#else
-            cTimer *timer = recManager->GetTimerForEvent(event);
-#endif
-            if (timer) {
-                delete activeMenu;
-                activeMenu = new cRecMenuEditTimer(timer, rmsSaveTimer);
-                activeMenu->Display();
-            }
-            break; }
-        case rmsSaveTimer: {
-            //caller: cRecMenuEditTimer
-            //save timer for active event
-            cTimer timerModified;
-#if VDRVERSNUM >= 20301
-            const cTimer *originalTimer;
-#else
-            cTimer *originalTimer;
-#endif
-            if (cRecMenuEditTimer *menu = dynamic_cast<cRecMenuEditTimer*>(activeMenu)) {
-                timerModified = menu->GetTimer();
-                originalTimer = menu->GetOriginalTimer();
-            } else break;
-            recManager->SaveTimer(originalTimer, timerModified);
-            state = osEnd;
-            Close();
-            break; }
 /***************************************************************************************
 *    SERIES TIMER
 ****************************************************************************************/
@@ -319,7 +365,9 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
                 if (epgSearchTemplates.size() > 0) {
                     activeMenu = new cRecMenuSearchTimerTemplates(searchTimer, epgSearchTemplates);
                 } else {
-                    activeMenu = new cRecMenuSearchTimerEdit(searchTimer, false);
+                    std::vector<std::string> channelGroups;
+                    recManager->GetChannelGroups(&channelGroups);
+                    activeMenu = new cRecMenuSearchTimerEdit(searchTimer, channelGroups);
                 }
             }
             activeMenu->Display();
@@ -328,21 +376,20 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
             //caller: main menu
             DisplaySearchTimerList();
             break; }
-        case rmsSearchTimerEdit:
-        case rmsSearchTimerEditAdvanced: {
+        case rmsSearchTimerEdit: {
             //caller: cRecMenuSearchTimers, cRecMenuSearchTimerEdit, cRecMenuSearchTimerTemplates
             cTVGuideSearchTimer searchTimer;
-            bool advancedOptions = false;
             if (cRecMenuSearchTimers *menu = dynamic_cast<cRecMenuSearchTimers*>(activeMenu)) {
                 searchTimer = menu->GetSearchTimer();
             } else if (cRecMenuSearchTimerEdit *menu = dynamic_cast<cRecMenuSearchTimerEdit*>(activeMenu)) {
                 searchTimer = menu->GetSearchTimer();
-                advancedOptions = (nextState == rmsSearchTimerEditAdvanced)?true:false;
             } else if (cRecMenuSearchTimerTemplates *menu = dynamic_cast<cRecMenuSearchTimerTemplates*>(activeMenu)) {
                 searchTimer = menu->GetSearchTimer();
             } else break;
             delete activeMenu;
-            activeMenu = new cRecMenuSearchTimerEdit(searchTimer, advancedOptions);
+            std::vector<std::string> channelGroups;
+            recManager->GetChannelGroups(&channelGroups);
+            activeMenu = new cRecMenuSearchTimerEdit(searchTimer, channelGroups);
             activeMenu->Display();
             break; }
         case rmsSearchTimerTest: {
@@ -371,14 +418,13 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
             if (numSearchResults) {
                 activeMenuBuffer = activeMenu;
                 activeMenuBuffer->Hide();
-                activeMenu = new cRecMenuSearchTimerResults(searchTimer.SearchString(), searchResult, numSearchResults, "", recState);
-                activeMenu->Display();
+                activeMenu = new cRecMenuSearchTimerResults(searchTimer.GetSearchString(), searchResult, numSearchResults, "", recState);
             } else {
                activeMenuBuffer = activeMenu;
                activeMenuBuffer->Hide();
-               activeMenu = new cRecMenuSearchTimerNothingFound(searchTimer.SearchString());
-               activeMenu->Display();
+               activeMenu = new cRecMenuSearchTimerNothingFound(searchTimer.GetSearchString());
             }
+            activeMenu->Display();
             break; }
         case rmsSearchTimerSave: {
             //caller: cRecMenuSearchTimerEdit, cRecMenuSearchTimerTemplatesCreate
@@ -457,67 +503,6 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
             activeMenu = new cRecMenuSearchConfirmTimer(ev, rmsFavoritesRecordConfirm);
             activeMenu->Display();
             break; }
-        /**********************************************************************************************
-         *    SWITCH TIMER
-         ***********************************************************************************************/
-        case rmsSwitchTimer:
-            delete activeMenu;
-            activeMenu = new cRecMenuSwitchTimer();
-            activeMenu->Display();
-            break;
-        case rmsSwitchTimerCreate: {
-            cSwitchTimer switchTimer;
-            if (cRecMenuSwitchTimer *menu = dynamic_cast<cRecMenuSwitchTimer*>(activeMenu)) {
-                switchTimer = menu->GetSwitchTimer();
-            } else break;
-            bool success = recManager->CreateSwitchTimer(event, switchTimer);
-            delete activeMenu;
-            activeMenu = new cRecMenuSwitchTimerConfirm(success);
-            activeMenu->Display();
-            break; }
-        case rmsSwitchTimerDelete:
-            recManager->DeleteSwitchTimer(event);
-            delete activeMenu;
-            activeMenu = new cRecMenuSwitchTimerDelete();
-            activeMenu->Display();
-            break;
-        /**********************************************************************************************
-         *    RECORDINGS SEARCH
-         ***********************************************************************************************/
-        case rmsRecordingSearch: {
-            //caller: main menu or rmsRecordingSearchResult
-            std::string searchString = event->Title();
-            if (cRecMenuRecordingSearchResults *menu = dynamic_cast<cRecMenuRecordingSearchResults*>(activeMenu)) {
-                searchString = menu->GetSearchString();
-            };
-            delete activeMenu;
-            activeMenu = new cRecMenuRecordingSearch(searchString);
-            activeMenu->Display();
-            break; }
-        case rmsRecordingSearchResult:  {
-            //caller: cRecMenuRecordingSearch
-            std::string searchString;
-            if (cRecMenuRecordingSearch *menu = dynamic_cast<cRecMenuRecordingSearch*>(activeMenu)) {
-                searchString = menu->GetSearchString();
-            } else break;
-            delete activeMenu;
-            if (searchString.size() < 4) {
-                activeMenu = new cRecMenuRecordingSearch(searchString);
-            } else {
-                int numSearchResults = 0;
-#if VDRVERSNUM >= 20301
-                const cRecording **searchResult = recManager->SearchForRecordings(searchString, numSearchResults);
-#else
-                cRecording **searchResult = recManager->SearchForRecordings(searchString, numSearchResults);
-#endif
-                if (numSearchResults == 0) {
-                    activeMenu = new cRecMenuRecordingSearchNotFound(searchString);
-                } else {
-                    activeMenu = new cRecMenuRecordingSearchResults(searchString, searchResult, numSearchResults);
-                }
-            }
-            activeMenu->Display();
-            break; }
 /**********************************************************************************************
 *    SEARCH
 ***********************************************************************************************/
@@ -601,6 +586,30 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
             activeMenu->Show();
             break;
 /**********************************************************************************************
+*    SWITCH TIMER
+***********************************************************************************************/
+        case rmsSwitchTimer:
+            delete activeMenu;
+            activeMenu = new cRecMenuSwitchTimer();
+            activeMenu->Display();
+            break;
+        case rmsSwitchTimerCreate: {
+            cSwitchTimer switchTimer;
+            if (cRecMenuSwitchTimer *menu = dynamic_cast<cRecMenuSwitchTimer*>(activeMenu)) {
+                switchTimer = menu->GetSwitchTimer();
+            } else break;
+            bool success = recManager->CreateSwitchTimer(event, switchTimer);
+            delete activeMenu;
+            activeMenu = new cRecMenuSwitchTimerConfirm(success);
+            activeMenu->Display();
+            break; }
+        case rmsSwitchTimerDelete:
+            recManager->DeleteSwitchTimer(event);
+            delete activeMenu;
+            activeMenu = new cRecMenuSwitchTimerDelete();
+            activeMenu->Display();
+            break;
+/**********************************************************************************************
 *    CHECK FOR TIMER CONFLICTS
 ***********************************************************************************************/
         case rmsTimerConflicts: {
@@ -658,13 +667,12 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
                         activeMenuBuffer = activeMenu;
                         activeMenuBuffer->Hide();
                         activeMenu = new cRecMenuRerunResults(event, reruns, numReruns);
-                        activeMenu->Display();
                     } else {
                         activeMenuBuffer = activeMenu;
                         activeMenuBuffer->Hide();
                         activeMenu = new cRecMenuNoRerunsFound((event->Title()) ? event->Title() : "");
-                        activeMenu->Display();
                     }
+                    activeMenu->Display();
                 }
             }
             break; }
@@ -721,11 +729,7 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
             activeMenu->Display();
             break; }
         case rmsTimelineTimerEdit: {
-#if VDRVERSNUM >= 20301
             const cTimer *timer;
-#else
-            cTimer *timer;
-#endif
             if (cRecMenuTimeline *menu = dynamic_cast<cRecMenuTimeline*>(activeMenu)) {
                 timer = menu->GetTimer();
             } else break;
@@ -737,11 +741,7 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
             break;}
         case rmsTimelineTimerSave: {
             cTimer timerModified;
-#if VDRVERSNUM >= 20301
             const cTimer *originalTimer;
-#else
-            cTimer *originalTimer;
-#endif
             if (cRecMenuEditTimer *menu = dynamic_cast<cRecMenuEditTimer*>(activeMenu)) {
                 timerModified = menu->GetTimer();
                 originalTimer = menu->GetOriginalTimer();
@@ -756,18 +756,11 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
             activeMenu->Display();
             break; }
         case rmsTimelineTimerDelete: {
-#if VDRVERSNUM >= 20301
             const cTimer *timer;
-#else
-            cTimer *timer;
-#endif
             if (cRecMenuEditTimer *menu = dynamic_cast<cRecMenuEditTimer*>(activeMenu)) {
                 timer = menu->GetOriginalTimer();
             } else break;
-            {
-            LOCK_TIMERS_WRITE;
-            recManager->DeleteTimer(Timers->GetTimer(timer));
-            }
+            recManager->DeleteTimer(timer);
             delete activeMenu;
             if (timerConflicts) {
                 delete timerConflicts;
@@ -777,6 +770,39 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
             activeMenu->Display();
             break; }
 /**********************************************************************************************
+*    RECORDINGS SEARCH
+***********************************************************************************************/
+        case rmsRecordingSearch: {
+            //caller: main menu or rmsRecordingSearchResult
+            std::string searchString = event->Title();
+            if (cRecMenuRecordingSearchResults *menu = dynamic_cast<cRecMenuRecordingSearchResults*>(activeMenu)) {
+                searchString = menu->GetSearchString();
+            };
+            delete activeMenu;
+            activeMenu = new cRecMenuRecordingSearch(searchString);
+            activeMenu->Display();
+            break; }
+        case rmsRecordingSearchResult:  {
+            //caller: cRecMenuRecordingSearch
+            std::string searchString;
+            if (cRecMenuRecordingSearch *menu = dynamic_cast<cRecMenuRecordingSearch*>(activeMenu)) {
+                searchString = menu->GetSearchString();
+            } else break;
+            delete activeMenu;
+            if (searchString.size() < 4) {
+                activeMenu = new cRecMenuRecordingSearch(searchString);
+            } else {
+                int numSearchResults = 0;
+                const cRecording **searchResult = recManager->SearchForRecordings(searchString, numSearchResults);
+                if (numSearchResults == 0) {
+                    activeMenu = new cRecMenuRecordingSearchNotFound(searchString);
+                } else {
+                    activeMenu = new cRecMenuRecordingSearchResults(searchString, searchResult, numSearchResults);
+                }
+            }
+            activeMenu->Display();
+            break; }
+/**********************************************************************************************
 *    FAVORITES
 *********************************************************************************************/
         case rmsFavoritesRecord: {
@@ -818,22 +844,22 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
         case rmsFavoritesUser1: {
             int numResults = 0;
             const cEvent **result = recManager->UserDefinedTime(1, numResults);
-            DisplayFavoriteResults(tvguideConfig.descUser1, result, numResults);
+            DisplayFavoriteResults(config.descUser1, result, numResults);
             break; }
         case rmsFavoritesUser2: {
             int numResults = 0;
             const cEvent **result = recManager->UserDefinedTime(2, numResults);
-            DisplayFavoriteResults(tvguideConfig.descUser2, result, numResults);
+            DisplayFavoriteResults(config.descUser2, result, numResults);
             break; }
         case rmsFavoritesUser3: {
             int numResults = 0;
             const cEvent **result = recManager->UserDefinedTime(3, numResults);
-            DisplayFavoriteResults(tvguideConfig.descUser3, result, numResults);
+            DisplayFavoriteResults(config.descUser3, result, numResults);
             break; }
         case rmsFavoritesUser4: {
             int numResults = 0;
             const cEvent **result = recManager->UserDefinedTime(4, numResults);
-            DisplayFavoriteResults(tvguideConfig.descUser4, result, numResults);
+            DisplayFavoriteResults(config.descUser4, result, numResults);
             break; }
 
 /**********************************************************************************************
@@ -858,73 +884,7 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
     return state;
 }
 
-void cRecMenuManager::DisplayFavoriteResults(std::string header, const cEvent **result, int numResults) {
-    if (numResults) {
-        activeMenuBuffer = activeMenu;
-        activeMenuBuffer->Hide();
-        activeMenu = new cRecMenuSearchTimerResults(header, result, numResults, "", rmsFavoritesRecord);
-        activeMenu->Display();
-    } else {
-        activeMenuBuffer = activeMenu;
-        activeMenuBuffer->Hide();
-        activeMenu = new cRecMenuSearchTimerNothingFound(header);
-        activeMenu->Display();
-    }
-}
-
-void cRecMenuManager::DisplaySearchTimerList(void) {
-    delete activeMenu;
-    std::vector<cTVGuideSearchTimer> searchTimers;
-    recManager->GetSearchTimers(&searchTimers);
-    activeMenu = new cRecMenuSearchTimers(searchTimers);
-    activeMenu->Display();
-}
-
-#if VDRVERSNUM >= 20301
-bool cRecMenuManager::DisplayTimerConflict(const cTimer *timer) {
-    int timerID = 0;
-    LOCK_TIMERS_READ;
-    for (const cTimer *t = Timers->First(); t; t = Timers->Next(t)) {
-#else
-bool cRecMenuManager::DisplayTimerConflict(cTimer *timer) {
-    int timerID = 0;
-    for (cTimer *t = Timers.First(); t; t = Timers.Next(t)) {
-#endif
-        if (t == timer)
-            return DisplayTimerConflict(timerID);
-        timerID++;
-    }
-    return false;
-}
-
-bool cRecMenuManager::DisplayTimerConflict(int timerID) {
-    if (timerConflicts)
-        delete timerConflicts;
-    timerConflicts = recManager->CheckTimerConflict();
-    if (!timerConflicts)
-        return false;
-    int showTimerConflict = timerConflicts->GetCorrespondingConflict(timerID);
-    if (showTimerConflict > -1) {
-        timerConflicts->SetCurrentConflict(showTimerConflict);
-        cTVGuideTimerConflict *conflict = timerConflicts->GetCurrentConflict();
-        if (!conflict)
-            return false;
-        activeMenu = new cRecMenuTimerConflict(conflict);
-        activeMenu->Display();
-        return true;
-    }
-    return false;
-}
-
-void cRecMenuManager::DisplayDetailedView(const cEvent *ev) {
-    activeMenu->Hide();
-    detailView = new cDetailView(ev, footer);
-    footer->SetDetailedViewMode(true);
-    detailView->Start();
-    detailViewActive = true;
-}
-
-eOSState cRecMenuManager::ProcessKey(eKeys Key) {
+eOSState cRecMenuView::ProcessKey(eKeys Key) {
     eOSState state = osContinue;
     eRecMenuState nextState = rmsContinue;
     if (!activeMenu)

recmenuview.h

@@ -1,13 +1,13 @@
-#ifndef __TVGUIDE_RECMENUMANAGER_H
-#define __TVGUIDE_RECMENUMANAGER_H
+#ifndef __TVGUIDE_RECMENUVIEW_H
+#define __TVGUIDE_RECMENUVIEW_H
 
 #include "recmenu.h"
 #include "recmanager.h"
 #include "services/epgsearch.h"
 #include "footer.h"
 
-// --- cRecMenuManager  -------------------------------------------------------------
-class cRecMenuManager {
+// --- cRecMenuView  -------------------------------------------------------------
+class cRecMenuView {
 private:
     cFooter *footer;
     bool active;
@@ -15,6 +15,7 @@ private:
     cRecMenu *activeMenuBuffer;
     cRecMenu *activeMenuBuffer2;
     const cEvent *event;
+    const cEvent *displayEvent;
     cRecManager *recManager;
     cTVGuideTimerConflicts *timerConflicts;
     cDetailView *detailView;
@@ -23,24 +24,20 @@ private:
     void SetBackground(void);
     void DeleteBackground(void);
     void DisplaySearchTimerList(void);
-#if VDRVERSNUM >= 20301
     bool DisplayTimerConflict(const cTimer *timer);
-#else
-    bool DisplayTimerConflict(cTimer *timer);
-#endif
     bool DisplayTimerConflict(int timerID);
     void DisplayDetailedView(const cEvent *ev);
     void DisplayFavoriteResults(std::string header, const cEvent **result, int numResults);
+    eOSState StateMachine(eRecMenuState nextState);
 public:
-    cRecMenuManager(void);
-    virtual ~cRecMenuManager(void);
+    cRecMenuView(void);
+    virtual ~cRecMenuView(void);
     void SetFooter(cFooter *footer) { this->footer = footer; };
     bool isActive(void) { return active; };
     void Start(const cEvent *event);
     void StartFavorites(void);
     void Close(void);
-    eOSState StateMachine(eRecMenuState nextState);
     eOSState ProcessKey(eKeys Key);
 };
 
-#endif //__TVGUIDE_RECMENUMANAGER_H
+#endif //__TVGUIDE_RECMENUVIEW_H

searchtimer.c

@@ -17,9 +17,11 @@ cTVGuideSearchTimer::cTVGuideSearchTimer(void) {
     stopTime = 2359;
     useChannel = false;
 #if VDRVERSNUM >= 20301
+    {
     LOCK_CHANNELS_READ;
     channelMin = Channels->GetByNumber(cDevice::CurrentChannel());
     channelMax = Channels->GetByNumber(cDevice::CurrentChannel());
+    }
 #else
     channelMin = Channels.GetByNumber(cDevice::CurrentChannel());
     channelMax = Channels.GetByNumber(cDevice::CurrentChannel());
@@ -38,7 +40,7 @@ cTVGuideSearchTimer::cTVGuideSearchTimer(void) {
     dayOfWeek = 0;
     directory = "";
     useEpisode = 0;
-    priority = 99;
+    priority = 50;
     lifetime = 99;
     marginStart = 5;
     marginStop = 5;
@@ -47,19 +49,21 @@ cTVGuideSearchTimer::cTVGuideSearchTimer(void) {
     useExtEPGInfo = 0;
     extEPGInfoValues = "";
     avoidRepeats = 1;
-    allowedRepeats = 1;
     compareTitle = 1;
-    compareSubtitle = 2;
+    compareSubtitle = 1;
     compareSummary = 1;
+    compareSummaryMatchInPercent = 90;
+    compareDate = 0;
+    allowedRepeats = 1;
     catvaluesAvoidRepeat = 0;
     repeatsWithinDays = 0;
     delAfterDays = 0;
     recordingsKeep = 0;
-    switchMinsBefore = 0;
+    switchMinsBefore = 1;
     pauseOnNrRecordings = 0;
     blacklistMode = 0;
     blacklists = "";
-    fuzzyTolerance = 0;
+    fuzzyTolerance = 1;
     useInFavorites = 0;
     menuTemplate = 0;
     delMode = 0;
@@ -69,16 +73,14 @@ cTVGuideSearchTimer::cTVGuideSearchTimer(void) {
     useAsSearchTimerTil = 0;
     ignoreMissingEPGCats = 0;
     unmuteSoundOnSwitch = 0;
-    compareSummaryMatchInPercent = 0;
     contentsFilter = "";
-    compareDate = 0;
 }
 
 cTVGuideSearchTimer::~cTVGuideSearchTimer(void) {
 }
 
 bool cTVGuideSearchTimer::operator < (const cTVGuideSearchTimer& other) const {
-    std::string searchStringOther = other.SearchString();
+    std::string searchStringOther = other.GetSearchString();
     searchStringOther = StrToLowerCase(searchStringOther);
     std::string thisSearchString = StrToLowerCase(searchString);
     int comp = thisSearchString.compare(searchStringOther);
@@ -95,31 +97,6 @@ void cTVGuideSearchTimer::SetTemplate(std::string tmpl) {
     strTimer = searchTimerString.str();
 }
 
-int cTVGuideSearchTimer::DayOfWeek(void) {
-    int vdrDayOfWeek = 0;
-    if (dayOfWeek >= 0) {
-        vdrDayOfWeek = pow(2, (dayOfWeek+6)%7);
-    } else if (dayOfWeek < 0) {
-        int absDayOfWeek = abs(dayOfWeek);
-        for (int i=0; i < 7; i++) {
-            if (absDayOfWeek & (1 << i)) {
-                vdrDayOfWeek += pow(2, (i+6)%7);
-            }
-        }
-    }
-    return vdrDayOfWeek; 
-}
-
-void cTVGuideSearchTimer::SetDayOfWeek(int VDRDayOfWeek) { 
-    int epgSearchDayOfWeek = 0;
-    for (int i=0; i < 7; i++) {
-        if (VDRDayOfWeek & (1 << i)) {
-            epgSearchDayOfWeek += pow(2, (i+1)%7);
-        }
-    }
-    this->dayOfWeek = epgSearchDayOfWeek * (-1);
-}
-
 /*
     0 - unique search timer id
     1 - the search term
@@ -242,9 +219,12 @@ bool cTVGuideSearchTimer::Parse(bool readTemplate) {
                     channelMin = NULL;
                     channelMax = NULL;
                 } else if (useChannel == 1) {
+                    int minNum = 0, maxNum = 0;
+                    int fields = sscanf(values[value].c_str(), "%d-%d", &minNum, &maxNum);
+                    if (fields == 0) { // stored with ID
                         char *channelMinbuffer = NULL;
                         char *channelMaxbuffer = NULL;
-                    int channels = sscanf(values[value].c_str(), "%a[^|]|%a[^|]", &channelMinbuffer, &channelMaxbuffer);
+                        int channels = sscanf(values[value].c_str(), "%m[^|]|%m[^|]", &channelMinbuffer, &channelMaxbuffer);
 #if VDRVERSNUM >= 20301
                         LOCK_CHANNELS_READ;
                         channelMin = Channels->GetByChannelID(tChannelID::FromString(channelMinbuffer), true, true);
@@ -252,6 +232,7 @@ bool cTVGuideSearchTimer::Parse(bool readTemplate) {
                         channelMin = Channels.GetByChannelID(tChannelID::FromString(channelMinbuffer), true, true);
 #endif
                         if (!channelMin) {
+                            esyslog("ERROR: channel '%s' not defined", channelMinbuffer);
                             channelMin = channelMax = NULL;
                             useChannel = 0;
                         }
@@ -264,15 +245,16 @@ bool cTVGuideSearchTimer::Parse(bool readTemplate) {
                             channelMax = Channels.GetByChannelID(tChannelID::FromString(channelMaxbuffer), true, true);
 #endif
                             if (!channelMax) {
+                                esyslog("ERROR: channel '%s' not defined", channelMaxbuffer);
                                 channelMin = channelMax = NULL;
                                 useChannel = 0;
                             }
                         }
                         free(channelMinbuffer);
                         free(channelMaxbuffer);
-                } else if (useChannel == 2) {
-                	channelGroup = values[value];
                     }
+                } else if (useChannel == 2)
+                    channelGroup = values[value];
                 break;
             case 7:
            		useCase = atoi(values[value].c_str());
@@ -515,13 +497,12 @@ std::string cTVGuideSearchTimer::BuildSearchString(void) {
     return strTimer;
 }
 
-bool cTVGuideSearchTimer::Active(void) {
+bool cTVGuideSearchTimer::IsActive(void) {
     if (useAsSearchTimer)
         return true;
     return false;
 }
 
-
 int cTVGuideSearchTimer::GetNumTimers(void) {
     int numTimers = 0;
     if (ID < 0)
@@ -570,8 +551,37 @@ void cTVGuideSearchTimer::GetSearchModes(std::vector<std::string> *searchModes)
     searchModes->push_back(tr("one term must exist"));
     searchModes->push_back(tr("exact match"));
     searchModes->push_back(tr("regular expression"));
+    searchModes->push_back(tr("fuzzy"));
 }
 
+void cTVGuideSearchTimer::GetUseChannelModes(std::vector<std::string> *useChannelModes) {
+    useChannelModes->push_back(tr("No"));
+    useChannelModes->push_back(tr("Interval"));
+    useChannelModes->push_back(tr("Channel Group"));
+    useChannelModes->push_back(tr("only FTA"));
+}
+
+void cTVGuideSearchTimer::GetCompareDateModes(std::vector<std::string> *compareDateModes) {
+    compareDateModes->push_back(tr("No"));
+    compareDateModes->push_back(tr("same day"));
+    compareDateModes->push_back(tr("same week"));
+    compareDateModes->push_back(tr("same month"));
+}
+
+void cTVGuideSearchTimer::GetSearchTimerModes(std::vector<std::string> *searchTimerModes) {
+    searchTimerModes->push_back(tr("Record"));
+    searchTimerModes->push_back(tr("Announce by OSD"));
+    searchTimerModes->push_back(tr("Switch only"));
+    searchTimerModes->push_back(tr("Announce and switch"));
+    searchTimerModes->push_back(tr("Announce by mail"));
+    searchTimerModes->push_back(tr("Inactive record"));
+}
+
+void cTVGuideSearchTimer::GetDelModes(std::vector<std::string> *delModes) {
+    delModes->push_back(tr("no"));
+    delModes->push_back(tr("count recordings"));
+    delModes->push_back(tr("count days"));
+}
 
 void cTVGuideSearchTimer::Dump(void) {
     esyslog("tvguide searchtimer: strTimer: %s", strTimer.c_str());
@@ -592,23 +602,3 @@ void cTVGuideSearchTimer::Dump(void) {
     esyslog("tvguide searchtimer: useSubtitle: %d", useSubtitle);
     esyslog("tvguide searchtimer: useDescription: %d", useDescription);
 }
-
-void cTVGuideSearchTimer::SetStartChannel(int startChannel)
-{
-#if VDRVERSNUM >= 20301
-   LOCK_CHANNELS_READ;
-   channelMin = Channels->GetByNumber(startChannel);
-#else
-   channelMin = Channels.GetByNumber(startChannel);
-#endif
-};
-
-void cTVGuideSearchTimer::SetStopChannel(int stopChannel)
-{
-#if VDRVERSNUM >= 20301
-   LOCK_CHANNELS_READ;
-   channelMax = Channels->GetByNumber(stopChannel);
-#else
-   channelMax = Channels.GetByNumber(stopChannel);
-#endif
-};

searchtimer.h

@@ -3,7 +3,8 @@
 
 
 class cTVGuideSearchTimer {
-private:
+friend class cRecMenuSearchTimerEdit;
+protected:
     std::string strTimer;
     int         ID;
     std::string searchString;
@@ -11,13 +12,8 @@ private:
     int         startTime;
     int      	stopTime;
     int         useChannel;
-#if VDRVERSNUM >= 20301
     const cChannel    *channelMin;
     const cChannel    *channelMax;
-#else
-    cChannel 	*channelMin;
-    cChannel 	*channelMax;
-#endif
     std::string channelGroup;
     int      	useCase;
     int      	mode;
@@ -76,65 +72,19 @@ public:
     std::string BuildSearchString(void);
     int GetID(void) { return ID; };
     //GETTER
-    std::string SearchString(void) const { return searchString; };
-    bool Active(void);
-    bool UseTitle(void) { return useTitle; };
-    bool UseSubtitle(void) { return useSubtitle; };
-    bool UseDescription(void) { return useDescription; };
-    int SearchMode(void) { return mode; };
-    bool UseChannel(void) { return useChannel; };
-    int StartChannel(void) { return (channelMin)?channelMin->Number():0; };
-    int StopChannel(void) { return (channelMax)?channelMax->Number():0; };
-    bool UseTime(void) { return useTime; };
-    int StartTime(void) { return startTime; };
-    int StopTime(void) { return stopTime; };
-    bool UseDayOfWeek(void) { return useDayOfWeek; };
-    int DayOfWeek(void);
-    int UseEpisode(void) { return useEpisode; };
-    std::string Directory(void) { return directory; };
-    int Priority(void) { return priority; };
-    int Lifetime(void) { return lifetime; };
-    int MarginStart(void) { return marginStart; };
-    int MarginStop(void) { return marginStop; };
-    bool UseVPS(void) { return useVPS; };
-    bool AvoidRepeats(void) { return avoidRepeats; };
-    int AllowedRepeats(void) { return allowedRepeats; };
-    bool CompareTitle(void) { return compareTitle; };
-    bool CompareSubtitle(void) { return compareSubtitle; };
-    bool CompareSummary(void) { return compareSummary; };
+    std::string GetSearchString(void) const { return searchString; };
+    bool IsActive(void);
     bool UseInFavorites(void) { return useInFavorites; };
     //SETTER
     void SetSearchString(std::string searchString) { this->searchString = searchString; };
-    void SetActive(bool active) { useAsSearchTimer = active; };
-    void SetSearchMode(int searchMode) { mode = searchMode; };
-    void SetUseTitle(bool useTitle) { this->useTitle = useTitle; };
-    void SetUseSubtitle(bool useSubtitle) { this->useSubtitle = useSubtitle; };
-    void SetUseDesription(bool useDescription) { this->useDescription = useDescription; };
-    void SetUseChannel(bool useChannel) { this->useChannel = useChannel; };
-    void SetStartChannel(int startChannel);
-    void SetStopChannel(int stopChannel);
-    void SetUseTime(bool useTime) { this->useTime = useTime; };
-    void SetStartTime(int startTime) { this->startTime = startTime; };
-    void SetStopTime(int stopTime) { this->stopTime = stopTime; };
-    void SetUseDayOfWeek(bool useDayOfWeek) { this->useDayOfWeek = useDayOfWeek; };
-    void SetDayOfWeek(int VDRDayOfWeek);
-    void SetUseEpisode(int useEpisode) { this->useEpisode = useEpisode; };
-    void SetDirectory(std::string directory) { this-> directory = directory; };
-    void SetPriority(int priority) { this->priority = priority; };
-    void SetLifetime(int lifetime) { this->lifetime = lifetime; };
-    void SetMarginStart(int marginStart) { this->marginStart = marginStart; };
-    void SetMarginStop(int marginStop) { this->marginStop = marginStop; };
-    void SetUseVPS(bool useVPS) { this->useVPS = useVPS; };
-    void SetAvoidRepeats(bool avoidRepeats) { this->avoidRepeats = avoidRepeats; };
-    void SetAllowedRepeats(int allowedRepeats) { this->allowedRepeats = allowedRepeats; };
-    void SetCompareTitle(bool compareTitle) { this->compareTitle = compareTitle; };
-    void SetCompareSubtitle(bool compareSubtitle) { this->compareSubtitle = compareSubtitle; };
-    void SetCompareSummary(bool compareSummary) { this->compareSummary = compareSummary; };
-    void SetUseInFavorites(bool useInFavorites) { this->useInFavorites = useInFavorites; };
     //COMMON
     int GetNumTimers(void);
     int GetNumRecordings(void);
     void GetSearchModes(std::vector<std::string> *searchModes);
+    void GetUseChannelModes(std::vector<std::string> *useChannelModes);
+    void GetSearchTimerModes(std::vector<std::string> *searchTimerModes);
+    void GetCompareDateModes(std::vector<std::string> *compareDateModes);
+    void GetDelModes(std::vector<std::string> *delModes);
     void Dump(void);
 };
 

services/epgsearch.h

@@ -31,8 +31,7 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
 #include <vdr/osdbase.h>
 
 // Data structure for service "Epgsearch-search-v1.0"
-struct Epgsearch_search_v1_0
-{
+struct Epgsearch_search_v1_0 {
 // in
     char* query;               // search term
     int mode;                  // search mode (0=phrase, 1=and, 2=or, 3=regular expression)
@@ -45,8 +44,7 @@ struct Epgsearch_search_v1_0
 };
 
 // Data structure for service "Epgsearch-exttimeredit-v1.0"
-struct Epgsearch_exttimeredit_v1_0
-{
+struct Epgsearch_exttimeredit_v1_0 {
 // in
     cTimer* timer;             // pointer to the timer to edit
     bool bNew;                 // flag that indicates, if this is a new timer or an existing one
@@ -56,38 +54,33 @@ struct Epgsearch_exttimeredit_v1_0
 };
 
 // Data structure for service "Epgsearch-enablesearchtimers-v1.0"
-struct Epgsearch_enablesearchtimers_v1_0
-{
+struct Epgsearch_enablesearchtimers_v1_0 {
 // in
     bool enable;           // enable search timer thread?
 };
 
 // Data structure for service "Epgsearch-updatesearchtimers-v1.0"
-struct Epgsearch_updatesearchtimers_v1_0
-{
+struct Epgsearch_updatesearchtimers_v1_0 {
 // in
     bool showMessage;           // inform via osd when finished?
 };
 
 // Data structure for service "Epgsearch-osdmessage-v1.0"
-struct Epgsearch_osdmessage_v1_0
-{
+struct Epgsearch_osdmessage_v1_0 {
 // in
     char* message;             // the message to display
     eMessageType type;
 };
 
 // Data structure for service "EpgsearchMenu-v1.0"
-struct EpgSearchMenu_v1_0
-{
+struct EpgSearchMenu_v1_0 {
 // in
 // out
     cOsdMenu* Menu;   // pointer to the menu
 };
 
 // Data structure for service "Epgsearch-lastconflictinfo-v1.0"
-struct Epgsearch_lastconflictinfo_v1_0
-{
+struct Epgsearch_lastconflictinfo_v1_0 {
 // in
 // out
     time_t nextConflict;       // next conflict date, 0 if none
@@ -96,8 +89,7 @@ struct Epgsearch_lastconflictinfo_v1_0
 };
 
 // Data structure for service "Epgsearch-searchresults-v1.0"
-struct Epgsearch_searchresults_v1_0
-{
+struct Epgsearch_searchresults_v1_0 {
 // in
     char* query;               // search term
     int mode;                  // search mode (0=phrase, 1=and, 2=or, 3=regular expression)
@@ -118,8 +110,7 @@ struct Epgsearch_searchresults_v1_0
 };
 
 // Data structure for service "Epgsearch-switchtimer-v1.0"
-struct Epgsearch_switchtimer_v1_0
-{
+struct Epgsearch_switchtimer_v1_0 {
 // in
     const cEvent* event;
     int mode;                  // mode (0=query existence, 1=add/modify, 2=delete)
@@ -161,10 +152,13 @@ class cServiceHandler
     virtual bool WriteSetupValue(const std::string& entry, const std::string& value) = 0;
 };
 
-struct Epgsearch_services_v1_0
-{
+struct Epgsearch_services_v1_0 {
 // in/out
+#if __cplusplus < 201103L
     std::auto_ptr<cServiceHandler> handler;
+#else
+    std::unique_ptr<cServiceHandler> handler;
+#endif
 };
 
 // Data structures for service "Epgsearch-services-v1.1"
@@ -177,10 +171,13 @@ class cServiceHandler_v1_1 : public cServiceHandler
     virtual bool IsConflictCheckAdvised() = 0;
 };
 
-struct Epgsearch_services_v1_1
-{
+struct Epgsearch_services_v1_1 {
 // in/out
+#if __cplusplus < 201103L
     std::auto_ptr<cServiceHandler_v1_1> handler;
+#else
+    std::unique_ptr<cServiceHandler_v1_1> handler;
+#endif
 };
 
 // Data structures for service "Epgsearch-services-v1.2"
@@ -193,10 +190,13 @@ class cServiceHandler_v1_2 : public cServiceHandler_v1_1
     virtual std::string Evaluate(const std::string& expr, const cEvent* event) = 0;
 };
 
-struct Epgsearch_services_v1_2
-{
+struct Epgsearch_services_v1_2 {
 // in/out
+#if __cplusplus < 201103L
     std::auto_ptr<cServiceHandler_v1_2> handler;
+#else
+    std::unique_ptr<cServiceHandler_v1_2> handler;
+#endif
 };
 
 #endif

services/remotetimers.h

@@ -1,18 +1,98 @@
-#ifndef REMOTETIMERSERVICES_INC
-#define REMOTETIMERSERVICES_INC
+/*
+ * remotetimers.h: Public interface of the plugin's services
+ *
+ * Copyright (C) 2008-2013 Frank Schmirler <vdr@schmirler.de>
+ *
+ * This file is part of VDR Plugin remotetimers.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ */
+
+#ifndef _SERVICE__H
+#define _SERVICE__H
 
-#include <vdr/epg.h>
 #include <vdr/timers.h>
+#include <vdr/epg.h>
+#include <vdr/osdbase.h>
 
-// RemoteTimers services
-struct RemoteTimers_Event_v1_0 {
+/*
+ * If the Data argument is NULL, all service calls return true.
+ * Otherwise the return value indicates success or failure of the service call.
+ *
+ * The service calls are not thread safe and must be called from the VDR main loop.
+ */
+
+/*
+ * RemoteTimers::InstantRecording-v1.0
+ * Start an instant recording or pause live TV. VDR needs to be patched to support this.
+ * The service returns false if a local timer should be used. An error occured if true is returned but the out parameters name and fileName are NULL.
+ * Data points to the following structure where pause indicates if it is an instant recording or an attempt to pause live TV.
+ */
+
+struct RemoteTimers_InstantRecording_v1_0 {
 //in
+	const cTimer	*timer;
+	bool		pause;
 	const cEvent	*event;
 //out
-    cTimer *timer;
-    cString errorMsg;
+	cString		name;
+	cString		fileName;
 };
 
+/* 
+ * RemoteTimers::RefreshTimers-v1.0
+ * Fetch timer list from remote VDR. You must call this service before you can use one of the service calls below.
+ * Data points to a cString which in case of failure (service call returns false) contains an error message.
+ */
+
+//out
+//	cString errorMsg;
+
+/*
+ * RemoteTimers::ForEachConflict-v1.0
+ * Iterates the list of remote timer conflicts.
+ * The service call always returns true.
+ * Data points to a const char* which must be NULL to return the first conflict. Pass the previously returned conflict to get the next one until const char* is NULL.
+ *
+ */
+//in+out
+//	const char* conflict;
+
+/*
+ * RemoteTimers::ForEach-v1.0
+ * Iterates the list of remote timers.
+ * The service call always returns true.
+ * Data points to a cTimer* which must be NULL to return the first timer. Pass the previously returned timer to get the next one until cTimer* is NULL.
+ *
+ * RemoteTimers::GetTimer-v1.0
+ * Test if the timer exists as either a remote or a local timer. 
+ * The service call always returns true.
+ * Data points to a cTimer* which points to the timer you are looking for. If found, cTimer* will point to the timer, otherwise it will be NULL.
+ */
+
+//in+out
+//	cTimer* timer;
+
+/*
+ * RemoteTimers::GetMatch-v1.0
+ * Find the remote or local timer which matches the event best.
+ * The service call always returns true.
+ * Data points to the following structure:
+ */
+
 struct RemoteTimers_GetMatch_v1_0 {
 //in
 	const cEvent	*event;
@@ -23,6 +103,43 @@ struct RemoteTimers_GetMatch_v1_0 {
 	bool		isRemote;
 };
 
+/*
+ * RemoteTimers::GetTimerByEvent-v1.0
+ * Find the remote or local timer matching the event.
+ * If no timer matches, the service call returns false.
+ * Data points to a RemoteTimers_Event_v1_0 struct.
+ *
+ * RemoteTimers::NewTimerByEvent-v1.0
+ * Add a new timer for an event.
+ * In case of an error, the service call returns false and the structure includes an error message.
+ * Data points to a RemoteTimers_Event_v1_0 struct.
+ */
+
+struct RemoteTimers_Event_v1_0 {
+//in
+        const cEvent    *event;
+//out
+	cTimer		*timer;
+	cString		errorMsg;
+};
+
+/*
+ * RemoteTimers::NewTimer-v1.0
+ * Add a new timer.
+ * In case of an error, the service call returns false and the structure includes an error message.
+ * Data points to a RemoteTimers_Timer_v1_0 struct.
+ *
+ * RemoteTimers::ModTimer-v1.0
+ * Change an existing timer.
+ * In case of an error, the service call returns false and the structure includes an error message.
+ * Data points to a RemoteTimers_Timer_v1_0 struct.
+ *
+ * RemoteTimers::DelTimer-v1.0
+ * Delete an existing timer.
+ * In case of an error, the service call returns false and the structure includes an error message.
+ * Data points to a RemoteTimers_Timer_v1_0 struct.
+ */
+
 struct RemoteTimers_Timer_v1_0 {
 //in+out
 	cTimer		*timer;
@@ -30,4 +147,36 @@ struct RemoteTimers_Timer_v1_0 {
 	cString		errorMsg;
 };
 
-#endif //REMOTETIMERSERVICES_INC
+/*
+ * RemoteTimers::GetTimerById-v1.0
+ * Get a remote timer by its id (i.e. timer->Index()+1 on remote machine).
+ * The service call always returns true.
+ * Data must point to a RemoteTimers_Timer_v1_1 structure. errorMsg is unused.
+ * NULL is returned as timer if no remote timer exists for the given id locally.
+ * Note that a timer with this id may exist remotely. This can happen if the
+ * remote timer's channel doesn't exist on the local machine.
+ */
+
+struct RemoteTimers_Timer_v1_1 {
+//in+out
+	cTimer		*timer;
+	int		id;
+//out
+	cString		errorMsg;
+};
+
+/*
+ * RemoteTimers::Menu-v1.0
+ * Depending on the state parameter, open the Timers or Schedule menu.
+ * In case of an error, menu is NULL.
+ * Data points to a RemoteTimers_Menu_v1_0 struct.
+ */
+struct RemoteTimers_Menu_v1_0 {
+//in
+	const char	*serverIp;
+	unsigned short	serverPort;
+	eOSState	state;
+//out
+	cOsdMenu	*menu;
+};
+#endif //_SERVICE__H

setup.c

@@ -1,7 +1,7 @@
 #include "setup.h"
 
 cTvguideSetup::cTvguideSetup() {
-    tmpTvguideConfig = tvguideConfig;
+    tmpConfig = config;
     Setup();
 }
 
@@ -9,8 +9,8 @@ cTvguideSetup::~cTvguideSetup() {
     geoManager.SetGeometry(cOsd::OsdWidth(), cOsd::OsdHeight(), true);
     fontManager.DeleteFonts();
     fontManager.SetFonts();
-    tvguideConfig.LoadTheme();
-    tvguideConfig.setDynamicValues();
+    config.LoadTheme();
+    config.setDynamicValues();
     imgCache.Clear();
     imgCache.CreateCache();
 }
@@ -40,15 +40,15 @@ eOSState cTvguideSetup::ProcessKey(eKeys Key) {
         if ((Key == kOk && !hadSubMenu)) {
             const char* ItemText = Get(Current())->Text();
             if (strcmp(ItemText, tr("General Settings")) == 0)
-                state = AddSubMenu(new cMenuSetupGeneral(&tmpTvguideConfig));
+                state = AddSubMenu(new cMenuSetupGeneral(&tmpConfig));
             if (strcmp(ItemText, tr("Screen Presentation")) == 0)
-                state = AddSubMenu(new cMenuSetupScreenLayout(&tmpTvguideConfig));
+                state = AddSubMenu(new cMenuSetupScreenLayout(&tmpConfig));
             if (strcmp(ItemText, tr("Fonts and Fontsizes")) == 0)
-                state = AddSubMenu(new cMenuSetupFont(&tmpTvguideConfig));
+                state = AddSubMenu(new cMenuSetupFont(&tmpConfig));
             if (strcmp(ItemText, tr("Recording Menus and Favorites")) == 0)
-                state = AddSubMenu(new cMenuSetupFavorites(&tmpTvguideConfig));
+                state = AddSubMenu(new cMenuSetupFavorites(&tmpConfig));
             if (strcmp(ItemText, tr("Image Loading and Caching")) == 0)
-                state = AddSubMenu(new cMenuSetupImageCache(&tmpTvguideConfig));  
+                state = AddSubMenu(new cMenuSetupImageCache(&tmpConfig));  
         }
     }   
     return state;
@@ -56,105 +56,108 @@ eOSState cTvguideSetup::ProcessKey(eKeys Key) {
 
 void cTvguideSetup::Store(void) {
 
-    tvguideConfig = tmpTvguideConfig;
-    SetupStore("debugImageLoading", tvguideConfig.debugImageLoading);
-    SetupStore("useNopacityTheme", tvguideConfig.useNopacityTheme);
-    SetupStore("themeIndex", tvguideConfig.themeIndex);
-    SetupStore("showMainMenuEntry", tvguideConfig.showMainMenuEntry);
-    SetupStore("replaceOriginalSchedule", tvguideConfig.replaceOriginalSchedule);
-    SetupStore("displayMode", tvguideConfig.displayMode);
-    SetupStore("showTimeInGrid", tvguideConfig.showTimeInGrid);
-    SetupStore("displayStatusHeader", tvguideConfig.displayStatusHeader);
-    SetupStore("displayChannelGroups", tvguideConfig.displayChannelGroups);
-    SetupStore("displayTimeBase", tvguideConfig.displayTimeBase);
-    SetupStore("headerHeightPercent", tvguideConfig.headerHeightPercent);
-    SetupStore("channelGroupsPercent", tvguideConfig.channelGroupsPercent);
-    SetupStore("epgViewBorder", tvguideConfig.epgViewBorder);
-    SetupStore("scaleVideo", tvguideConfig.scaleVideo);
-    SetupStore("decorateVideo", tvguideConfig.decorateVideo);
-    SetupStore("roundedCorners", tvguideConfig.roundedCorners);
-    SetupStore("timeFormat", tvguideConfig.timeFormat);
-    SetupStore("channelCols", tvguideConfig.channelCols);
-    SetupStore("channelRows", tvguideConfig.channelRows);
-    SetupStore("displayTime", tvguideConfig.displayTime);
-    SetupStore("bigStepHours", tvguideConfig.bigStepHours);
-    SetupStore("hugeStepHours", tvguideConfig.hugeStepHours);
-    SetupStore("channelJumpMode", tvguideConfig.channelJumpMode);
-    SetupStore("blueKeyMode", tvguideConfig.blueKeyMode);
-    SetupStore("numkeyMode", tvguideConfig.numkeyMode);
-    SetupStore("useRemoteTimers", tvguideConfig.useRemoteTimers);
-    SetupStore("closeOnSwitch", tvguideConfig.closeOnSwitch);
-    SetupStore("hideLastGroup", tvguideConfig.hideLastGroup);
-    SetupStore("hideChannelLogos", tvguideConfig.hideChannelLogos);
-    SetupStore("logoExtension", tvguideConfig.logoExtension);
-    SetupStore("logoWidthRatio", tvguideConfig.logoWidthRatio);
-    SetupStore("logoHeightRatio", tvguideConfig.logoHeightRatio);
-    SetupStore("hideEpgImages", tvguideConfig.hideEpgImages);
-    SetupStore("epgImageWidth", tvguideConfig.epgImageWidth);
-    SetupStore("epgImageHeight", tvguideConfig.epgImageHeight);
-    SetupStore("numAdditionalEPGPictures", tvguideConfig.numAdditionalEPGPictures);
-    SetupStore("epgImageWidthLarge", tvguideConfig.epgImageWidthLarge);
-    SetupStore("epgImageHeightLarge", tvguideConfig.epgImageHeightLarge);
-    SetupStore("detailedViewScrollStep", tvguideConfig.detailedViewScrollStep);
-    SetupStore("timeLineWidthPercent", tvguideConfig.timeLineWidthPercent);
-    SetupStore("timeLineHeightPercent", tvguideConfig.timeLineHeightPercent);
-    SetupStore("displayChannelName", tvguideConfig.displayChannelName);
-    SetupStore("channelHeaderWidthPercent", tvguideConfig.channelHeaderWidthPercent);
-    SetupStore("channelHeaderHeightPercent", tvguideConfig.channelHeaderHeightPercent);
-    SetupStore("footerHeightPercent", tvguideConfig.footerHeightPercent);
-    SetupStore("instRecFolderMode", tvguideConfig.instRecFolderMode);
-    SetupStore("instRecFixedFolder", tvguideConfig.instRecFixedFolder.c_str());
-    SetupStore("favWhatsOnNow", tvguideConfig.favWhatsOnNow);
-    SetupStore("favWhatsOnNext", tvguideConfig.favWhatsOnNext);
-    SetupStore("favUseTime1", tvguideConfig.favUseTime1);
-    SetupStore("favUseTime2", tvguideConfig.favUseTime2);
-    SetupStore("favUseTime3", tvguideConfig.favUseTime3);
-    SetupStore("favUseTime4", tvguideConfig.favUseTime4);
-    SetupStore("favTime1", tvguideConfig.favTime1);
-    SetupStore("favTime2", tvguideConfig.favTime2);
-    SetupStore("favTime3", tvguideConfig.favTime3);
-    SetupStore("favTime4", tvguideConfig.favTime4);
-    SetupStore("descUser1", tvguideConfig.descUser1.c_str());
-    SetupStore("descUser2", tvguideConfig.descUser2.c_str());
-    SetupStore("descUser3", tvguideConfig.descUser3.c_str());
-    SetupStore("descUser4", tvguideConfig.descUser4.c_str());
-    SetupStore("favLimitChannels", tvguideConfig.favLimitChannels);
-    SetupStore("favStartChannel", tvguideConfig.favStartChannel);
-    SetupStore("favStopChannel", tvguideConfig.favStopChannel);
-    SetupStore("fontIndex", tvguideConfig.fontIndex);
-    SetupStore("FontButtonDelta", tvguideConfig.FontButtonDelta);
-    SetupStore("FontDetailViewDelta", tvguideConfig.FontDetailViewDelta);
-    SetupStore("FontDetailHeaderDelta", tvguideConfig.FontDetailHeaderDelta);
-    SetupStore("FontMessageBoxDelta", tvguideConfig.FontMessageBoxDelta);
-    SetupStore("FontMessageBoxLargeDelta", tvguideConfig.FontMessageBoxLargeDelta);
-    SetupStore("FontStatusHeaderDelta", tvguideConfig.FontStatusHeaderDelta);
-    SetupStore("FontStatusHeaderLargeDelta", tvguideConfig.FontStatusHeaderLargeDelta);
-    SetupStore("FontChannelHeaderDelta", tvguideConfig.FontChannelHeaderDelta);
-    SetupStore("FontChannelGroupsDelta", tvguideConfig.FontChannelGroupsDelta);
-    SetupStore("FontGridDelta", tvguideConfig.FontGridDelta);
-    SetupStore("FontGridSmallDelta", tvguideConfig.FontGridSmallDelta);
-    SetupStore("FontTimeLineWeekdayDelta", tvguideConfig.FontTimeLineWeekdayDelta);
-    SetupStore("FontTimeLineDateDelta", tvguideConfig.FontTimeLineDateDelta);
-    SetupStore("FontTimeLineTimeDelta", tvguideConfig.FontTimeLineTimeDelta);
-    SetupStore("FontChannelHeaderHorizontalDelta", tvguideConfig.FontChannelHeaderHorizontalDelta);
-    SetupStore("FontChannelGroupsHorizontalDelta", tvguideConfig.FontChannelGroupsHorizontalDelta);
-    SetupStore("FontGridHorizontalDelta", tvguideConfig.FontGridHorizontalDelta);
-    SetupStore("FontGridHorizontalSmallDelta", tvguideConfig.FontGridHorizontalSmallDelta);
-    SetupStore("FontTimeLineDateHorizontalDelta", tvguideConfig.FontTimeLineDateHorizontalDelta);
-    SetupStore("FontTimeLineTimeHorizontalDelta", tvguideConfig.FontTimeLineTimeHorizontalDelta);
-    SetupStore("FontRecMenuItemDelta", tvguideConfig.FontRecMenuItemDelta);
-    SetupStore("FontRecMenuItemSmallDelta", tvguideConfig.FontRecMenuItemSmallDelta);
-    SetupStore("FontRecMenuItemLargeDelta", tvguideConfig.FontRecMenuItemLargeDelta);
-    SetupStore("displayRerunsDetailEPGView", tvguideConfig.displayRerunsDetailEPGView);
-    SetupStore("numReruns", tvguideConfig.numReruns);
-    SetupStore("useSubtitleRerun", tvguideConfig.useSubtitleRerun);
-    SetupStore("numLogosInitial", tvguideConfig.numLogosInitial);
-    SetupStore("numLogosMax", tvguideConfig.numLogosMax);
-    SetupStore("limitLogoCache", tvguideConfig.limitLogoCache);
+    config = tmpConfig;
+    SetupStore("debugImageLoading", config.debugImageLoading);
+    SetupStore("useNopacityTheme", config.useNopacityTheme);
+    SetupStore("themeIndex", config.themeIndex);
+    SetupStore("showMainMenuEntry", config.showMainMenuEntry);
+    SetupStore("replaceOriginalSchedule", config.replaceOriginalSchedule);
+    SetupStore("displayMode", config.displayMode);
+    SetupStore("showTimeInGrid", config.showTimeInGrid);
+    SetupStore("displayStatusHeader", config.displayStatusHeader);
+    SetupStore("displayChannelGroups", config.displayChannelGroups);
+    SetupStore("displayTimeBase", config.displayTimeBase);
+    SetupStore("headerHeightPercent", config.headerHeightPercent);
+    SetupStore("channelGroupsPercent", config.channelGroupsPercent);
+    SetupStore("epgViewBorder", config.epgViewBorder);
+    SetupStore("scaleVideo", config.scaleVideo);
+    SetupStore("decorateVideo", config.decorateVideo);
+    SetupStore("roundedCorners", config.roundedCorners);
+    SetupStore("timeFormat", config.timeFormat);
+    SetupStore("channelCols", config.channelCols);
+    SetupStore("channelRows", config.channelRows);
+    SetupStore("displayTime", config.displayTime);
+    SetupStore("displayHorizontalTime", config.displayHorizontalTime);
+    SetupStore("bigStepHours", config.bigStepHours);
+    SetupStore("hugeStepHours", config.hugeStepHours);
+    SetupStore("channelJumpMode", config.channelJumpMode);
+    SetupStore("blueKeyMode", config.blueKeyMode);
+    SetupStore("numkeyMode", config.numkeyMode);
+    SetupStore("useRemoteTimers", config.useRemoteTimers);
+    SetupStore("closeOnSwitch", config.closeOnSwitch);
+    SetupStore("hideLastGroup", config.hideLastGroup);
+    SetupStore("hideChannelLogos", config.hideChannelLogos);
+    SetupStore("logoExtension", config.logoExtension);
+    SetupStore("logoWidthRatio", config.logoWidthRatio);
+    SetupStore("logoHeightRatio", config.logoHeightRatio);
+    SetupStore("hideEpgImages", config.hideEpgImages);
+    SetupStore("epgImageWidth", config.epgImageWidth);
+    SetupStore("epgImageHeight", config.epgImageHeight);
+    SetupStore("numAdditionalEPGPictures", config.numAdditionalEPGPictures);
+    SetupStore("epgImageWidthLarge", config.epgImageWidthLarge);
+    SetupStore("epgImageHeightLarge", config.epgImageHeightLarge);
+    SetupStore("detailedViewScrollStep", config.detailedViewScrollStep);
+    SetupStore("timeLineWidthPercent", config.timeLineWidthPercent);
+    SetupStore("timeLineHeightPercent", config.timeLineHeightPercent);
+    SetupStore("displayChannelName", config.displayChannelName);
+    SetupStore("channelHeaderWidthPercent", config.channelHeaderWidthPercent);
+    SetupStore("channelHeaderHeightPercent", config.channelHeaderHeightPercent);
+    SetupStore("footerHeightPercent", config.footerHeightPercent);
+    SetupStore("instRecFolderMode", config.instRecFolderMode);
+    SetupStore("instRecFixedFolder", config.instRecFixedFolder.c_str());
+    SetupStore("favWhatsOnNow", config.favWhatsOnNow);
+    SetupStore("favWhatsOnNext", config.favWhatsOnNext);
+    SetupStore("favUseTime1", config.favUseTime1);
+    SetupStore("favUseTime2", config.favUseTime2);
+    SetupStore("favUseTime3", config.favUseTime3);
+    SetupStore("favUseTime4", config.favUseTime4);
+    SetupStore("favTime1", config.favTime1);
+    SetupStore("favTime2", config.favTime2);
+    SetupStore("favTime3", config.favTime3);
+    SetupStore("favTime4", config.favTime4);
+    SetupStore("descUser1", config.descUser1.c_str());
+    SetupStore("descUser2", config.descUser2.c_str());
+    SetupStore("descUser3", config.descUser3.c_str());
+    SetupStore("descUser4", config.descUser4.c_str());
+    SetupStore("favLimitChannels", config.favLimitChannels);
+    SetupStore("favStartChannel", config.favStartChannel);
+    SetupStore("favStopChannel", config.favStopChannel);
+    SetupStore("switchMode", config.switchMode);
+    SetupStore("switchMinsBefore", config.switchMinsBefore);
+    SetupStore("fontIndex", config.fontIndex);
+    SetupStore("FontButtonDelta", config.FontButtonDelta);
+    SetupStore("FontDetailViewDelta", config.FontDetailViewDelta);
+    SetupStore("FontDetailHeaderDelta", config.FontDetailHeaderDelta);
+    SetupStore("FontMessageBoxDelta", config.FontMessageBoxDelta);
+    SetupStore("FontMessageBoxLargeDelta", config.FontMessageBoxLargeDelta);
+    SetupStore("FontStatusHeaderDelta", config.FontStatusHeaderDelta);
+    SetupStore("FontStatusHeaderLargeDelta", config.FontStatusHeaderLargeDelta);
+    SetupStore("FontChannelHeaderDelta", config.FontChannelHeaderDelta);
+    SetupStore("FontChannelGroupsDelta", config.FontChannelGroupsDelta);
+    SetupStore("FontGridDelta", config.FontGridDelta);
+    SetupStore("FontGridSmallDelta", config.FontGridSmallDelta);
+    SetupStore("FontTimeLineWeekdayDelta", config.FontTimeLineWeekdayDelta);
+    SetupStore("FontTimeLineDateDelta", config.FontTimeLineDateDelta);
+    SetupStore("FontTimeLineTimeDelta", config.FontTimeLineTimeDelta);
+    SetupStore("FontChannelHeaderHorizontalDelta", config.FontChannelHeaderHorizontalDelta);
+    SetupStore("FontChannelGroupsHorizontalDelta", config.FontChannelGroupsHorizontalDelta);
+    SetupStore("FontGridHorizontalDelta", config.FontGridHorizontalDelta);
+    SetupStore("FontGridHorizontalSmallDelta", config.FontGridHorizontalSmallDelta);
+    SetupStore("FontTimeLineDateHorizontalDelta", config.FontTimeLineDateHorizontalDelta);
+    SetupStore("FontTimeLineTimeHorizontalDelta", config.FontTimeLineTimeHorizontalDelta);
+    SetupStore("FontRecMenuItemDelta", config.FontRecMenuItemDelta);
+    SetupStore("FontRecMenuItemSmallDelta", config.FontRecMenuItemSmallDelta);
+    SetupStore("FontRecMenuItemLargeDelta", config.FontRecMenuItemLargeDelta);
+    SetupStore("displayRerunsDetailEPGView", config.displayRerunsDetailEPGView);
+    SetupStore("numReruns", config.numReruns);
+    SetupStore("useSubtitleRerun", config.useSubtitleRerun);
+    SetupStore("numLogosInitial", config.numLogosInitial);
+    SetupStore("numLogosMax", config.numLogosMax);
+    SetupStore("limitLogoCache", config.limitLogoCache);
 }
 
-cMenuSetupSubMenu::cMenuSetupSubMenu(const char* Title, cTvguideConfig* data) : cOsdMenu(Title, 30) {
-    tmpTvguideConfig = data;
+cMenuSetupSubMenu::cMenuSetupSubMenu(const char* Title, cTVGuideConfig* data) : cOsdMenu(Title, 40) {
+    tmpConfig = data;
     indent = "    ";
 }
 
@@ -180,7 +183,7 @@ eOSState cMenuSetupSubMenu::ProcessKey(eKeys Key) {
 
 //----- General Settings -------------------------------------------------------------------------------------------------------------
 
-cMenuSetupGeneral::cMenuSetupGeneral(cTvguideConfig* data)  : cMenuSetupSubMenu(tr("General Settings"), data) {
+cMenuSetupGeneral::cMenuSetupGeneral(cTVGuideConfig* data)  : cMenuSetupSubMenu(tr("General Settings"), data) {
     themes.Load(*cString("tvguide"));
     timeFormatItems[0] = "12h";
     timeFormatItems[1] = "24h";
@@ -200,47 +203,56 @@ cMenuSetupGeneral::cMenuSetupGeneral(cTvguideConfig* data)  : cMenuSetupSubMenu(
 void cMenuSetupGeneral::Set(void) {
     int currentItem = Current();
     Clear();
-    Add(new cMenuEditBoolItem(tr("Show Main Menu Entry"), &tmpTvguideConfig->showMainMenuEntry));
-    Add(new cMenuEditBoolItem(tr("Replace VDR Schedules Menu"), &tmpTvguideConfig->replaceOriginalSchedule));
-    Add(new cMenuEditBoolItem(tr("Use appropriate nOpacity Theme"), &tmpTvguideConfig->useNopacityTheme));
-    if (!tmpTvguideConfig->useNopacityTheme) {
+    Add(new cMenuEditBoolItem(tr("Show Main Menu Entry"), &tmpConfig->showMainMenuEntry));
+    Add(new cMenuEditBoolItem(tr("Replace VDR Schedules Menu"), &tmpConfig->replaceOriginalSchedule));
+    Add(new cMenuEditBoolItem(tr("Use appropriate nOpacity Theme"), &tmpConfig->useNopacityTheme));
+    if (!tmpConfig->useNopacityTheme) {
         if (themes.NumThemes())
-            Add(new cMenuEditStraItem(cString::sprintf("%s%s", *indent, tr("Theme")), &tmpTvguideConfig->themeIndex, themes.NumThemes(), themes.Descriptions()));
+            Add(new cMenuEditStraItem(cString::sprintf("%s%s", *indent, tr("Theme")), &tmpConfig->themeIndex, themes.NumThemes(), themes.Descriptions()));
     }
-    Add(new cMenuEditIntItem(tr("Time to display in minutes"), &tmpTvguideConfig->displayTime, 60, 320));
-    Add(new cMenuEditBoolItem(tr("Rounded Corners"), &tmpTvguideConfig->roundedCorners));
+    if (tmpConfig->displayMode == eVertical) {
+        Add(new cMenuEditIntItem(tr("Time to display in minutes"), &tmpConfig->displayTime, 60, 320));
+    } else if (tmpConfig->displayMode == eHorizontal) {
+        Add(new cMenuEditIntItem(tr("Time to display in minutes"), &tmpConfig->displayHorizontalTime, 60, 320));
+    }
+    Add(new cMenuEditBoolItem(tr("Rounded Corners"), &tmpConfig->roundedCorners));
     
-    Add(new cMenuEditStraItem(tr("Channel Jump Mode (Keys Green / Yellow)"), &tmpTvguideConfig->channelJumpMode, 2,  jumpMode));
-    Add(new cMenuEditStraItem(tr("Keys Blue and OK"), &tmpTvguideConfig->blueKeyMode, 3,  blueMode));
-    Add(new cMenuEditBoolItem(tr("Close TVGuide after channel switch"), &tmpTvguideConfig->closeOnSwitch));
-    Add(new cMenuEditStraItem(tr("Functionality of numeric Keys"), &tmpTvguideConfig->numkeyMode, 2,  numMode));
-    Add(new cMenuEditBoolItem(tr("Hide last Channel Group"), &tmpTvguideConfig->hideLastGroup));
-    Add(new cMenuEditIntItem(tr("Big Step (Keys 1 / 3) in hours"), &tmpTvguideConfig->bigStepHours, 1, 12));
-    Add(new cMenuEditIntItem(tr("Huge Step (Keys 4 / 6) in hours"), &tmpTvguideConfig->hugeStepHours, 13, 48));
-    Add(new cMenuEditStraItem(tr("Time Format (12h/24h)"), &tmpTvguideConfig->timeFormat, 2,  timeFormatItems));
-    Add(new cMenuEditIntItem(tr("EPG Window Text Scrolling Speed"), &tmpTvguideConfig->detailedViewScrollStep, 1, 30));
-    Add(new cMenuEditBoolItem(tr("Display Reruns in detailed EPG View"), &tmpTvguideConfig->displayRerunsDetailEPGView));
-    if (tmpTvguideConfig->displayRerunsDetailEPGView) {
-        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *indent, tr("Number of reruns to display")), &tmpTvguideConfig->numReruns, 1, 10));
-        Add(new cMenuEditStraItem(cString::sprintf("%s%s", *indent, tr("Use Subtitle for reruns")), &tmpTvguideConfig->useSubtitleRerun, 3, useSubtitleRerunTexts));
+    Add(new cMenuEditStraItem(tr("Channel Jump Mode (Keys Green / Yellow)"), &tmpConfig->channelJumpMode, 2,  jumpMode));
+    Add(new cMenuEditStraItem(tr("Keys Blue and OK"), &tmpConfig->blueKeyMode, 3,  blueMode));
+    Add(new cMenuEditBoolItem(tr("Close TVGuide after channel switch"), &tmpConfig->closeOnSwitch));
+    Add(new cMenuEditStraItem(tr("Functionality of numeric Keys"), &tmpConfig->numkeyMode, 2,  numMode));
+    Add(new cMenuEditBoolItem(tr("Hide last Channel Group"), &tmpConfig->hideLastGroup));
+    Add(new cMenuEditIntItem(tr("Big Step (Keys 1 / 3) in hours"), &tmpConfig->bigStepHours, 1, 12));
+    Add(new cMenuEditIntItem(tr("Huge Step (Keys 4 / 6) in hours"), &tmpConfig->hugeStepHours, 13, 48));
+    Add(new cMenuEditStraItem(tr("Time Format (12h/24h)"), &tmpConfig->timeFormat, 2,  timeFormatItems));
+    Add(new cMenuEditIntItem(tr("EPG Window Text Scrolling Speed"), &tmpConfig->detailedViewScrollStep, 1, 30));
+    Add(new cMenuEditBoolItem(tr("Display Reruns in detailed EPG View"), &tmpConfig->displayRerunsDetailEPGView));
+    if (tmpConfig->displayRerunsDetailEPGView) {
+        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *indent, tr("Number of reruns to display")), &tmpConfig->numReruns, 1, 10));
+        Add(new cMenuEditStraItem(cString::sprintf("%s%s", *indent, tr("Use Subtitle for reruns")), &tmpConfig->useSubtitleRerun, 3, useSubtitleRerunTexts));
     }
     SetCurrent(Get(currentItem));
     Display();
 }
 
 eOSState cMenuSetupGeneral::ProcessKey(eKeys Key) {
+    bool olduseNopacityTheme = tmpConfig->useNopacityTheme;
+    bool olddisplayRerunsDetailEPGView = tmpConfig->displayRerunsDetailEPGView;
     eOSState state = cOsdMenu::ProcessKey(Key);
     if (Key == kOk) {
         state = osBack;
     } else if (Key != kNone) {
+        if (tmpConfig->useNopacityTheme != olduseNopacityTheme ||
+	    tmpConfig->displayRerunsDetailEPGView != olddisplayRerunsDetailEPGView) {
             Set();
         }
+    }
     return state;
 }
 
 //----- Screen Presentation -------------------------------------------------------------------------------------------------------------
 
-cMenuSetupScreenLayout::cMenuSetupScreenLayout(cTvguideConfig* data)  : cMenuSetupSubMenu(tr("Screen Presentation"), data) {
+cMenuSetupScreenLayout::cMenuSetupScreenLayout(cTVGuideConfig* data)  : cMenuSetupSubMenu(tr("Screen Presentation"), data) {
     displayModeItems[0] = "vertical";
     displayModeItems[1] = "horizontal";
     hideChannelLogosItems[0] = trVDR("yes");
@@ -254,55 +266,55 @@ void cMenuSetupScreenLayout::Set(void) {
     int currentItem = Current();
     Clear();
     
-    Add(new cMenuEditStraItem(tr("Display Mode"), &tmpTvguideConfig->displayMode, 2,  displayModeItems));
-    if (tmpTvguideConfig->displayMode == eVertical) {
-        Add(new cMenuEditIntItem(*cString::sprintf("%s%s", *indent, tr("Height of Channel Header (Perc. of osd height)")), &tmpTvguideConfig->channelHeaderHeightPercent, 5, 30));
-        Add(new cMenuEditIntItem(*cString::sprintf("%s%s", *indent, tr("Width of Timeline (Perc. of osd width)")), &tmpTvguideConfig->timeLineWidthPercent, 5, 30));
-        Add(new cMenuEditIntItem(*cString::sprintf("%s%s", *indent, tr("Number of Channels to display")), &tmpTvguideConfig->channelCols, 3, 12));
-    } else if (tmpTvguideConfig->displayMode == eHorizontal) {
-        Add(new cMenuEditIntItem(*cString::sprintf("%s%s", *indent, tr("Width of Channel Header (Perc. of osd width)")), &tmpTvguideConfig->channelHeaderWidthPercent, 5, 30));
-        Add(new cMenuEditIntItem(*cString::sprintf("%s%s", *indent, tr("Height of Timeline (Perc. of osd height)")), &tmpTvguideConfig->timeLineHeightPercent, 5, 30));
-        Add(new cMenuEditIntItem(*cString::sprintf("%s%s", *indent, tr("Number of Channels to display")), &tmpTvguideConfig->channelRows, 3, 12));
-        Add(new cMenuEditBoolItem(*cString::sprintf("%s%s", *indent, tr("Display time in EPG Grids")), &tmpTvguideConfig->showTimeInGrid));
+    Add(new cMenuEditStraItem(tr("Display Mode"), &tmpConfig->displayMode, 2,  displayModeItems));
+    if (tmpConfig->displayMode == eVertical) {
+        Add(new cMenuEditIntItem(*cString::sprintf("%s%s", *indent, tr("Height of Channel Header (Perc. of osd height)")), &tmpConfig->channelHeaderHeightPercent, 5, 30));
+        Add(new cMenuEditIntItem(*cString::sprintf("%s%s", *indent, tr("Width of Timeline (Perc. of osd width)")), &tmpConfig->timeLineWidthPercent, 5, 30));
+        Add(new cMenuEditIntItem(*cString::sprintf("%s%s", *indent, tr("Number of Channels to display")), &tmpConfig->channelCols, 3, 12));
+    } else if (tmpConfig->displayMode == eHorizontal) {
+        Add(new cMenuEditIntItem(*cString::sprintf("%s%s", *indent, tr("Width of Channel Header (Perc. of osd width)")), &tmpConfig->channelHeaderWidthPercent, 5, 30));
+        Add(new cMenuEditIntItem(*cString::sprintf("%s%s", *indent, tr("Height of Timeline (Perc. of osd height)")), &tmpConfig->timeLineHeightPercent, 5, 30));
+        Add(new cMenuEditIntItem(*cString::sprintf("%s%s", *indent, tr("Number of Channels to display")), &tmpConfig->channelRows, 3, 12));
+        Add(new cMenuEditBoolItem(*cString::sprintf("%s%s", *indent, tr("Display time in EPG Grids")), &tmpConfig->showTimeInGrid));
     }
-    Add(new cMenuEditIntItem(tr("Height of Headers (Status Header and EPG View, Perc. of osd height)"), &tmpTvguideConfig->headerHeightPercent, 10, 50));
-    Add(new cMenuEditIntItem(tr("Height of Footer (Perc. of osd height)"), &tmpTvguideConfig->footerHeightPercent, 3, 20));
+    Add(new cMenuEditIntItem(tr("Height of Headers (Status Header and EPG View, Perc. of osd height)"), &tmpConfig->headerHeightPercent, 10, 50));
+    Add(new cMenuEditIntItem(tr("Height of Footer (Perc. of osd height)"), &tmpConfig->footerHeightPercent, 3, 20));
     
-    Add(new cMenuEditBoolItem(tr("Display status header"), &tmpTvguideConfig->displayStatusHeader));
-    if (tmpTvguideConfig->displayStatusHeader) {
-        Add(new cMenuEditBoolItem(*cString::sprintf("%s%s", *indent, tr("Scale video to upper right corner")), &tmpTvguideConfig->scaleVideo));
-        Add(new cMenuEditBoolItem(*cString::sprintf("%s%s", *indent, tr("Rounded corners around video frame")), &tmpTvguideConfig->decorateVideo));
+    Add(new cMenuEditBoolItem(tr("Display status header"), &tmpConfig->displayStatusHeader));
+    if (tmpConfig->displayStatusHeader) {
+        Add(new cMenuEditBoolItem(*cString::sprintf("%s%s", *indent, tr("Scale video to upper right corner")), &tmpConfig->scaleVideo));
+        Add(new cMenuEditBoolItem(*cString::sprintf("%s%s", *indent, tr("Rounded corners around video frame")), &tmpConfig->decorateVideo));
     }
     
-    Add(new cMenuEditBoolItem(tr("Display Channel Names in Header"), &tmpTvguideConfig->displayChannelName));
-    Add(new cMenuEditBoolItem(tr("Display channel groups"), &tmpTvguideConfig->displayChannelGroups));
-    if (tmpTvguideConfig->displayChannelGroups) {
-        if (tmpTvguideConfig->displayMode == eVertical) {
-            Add(new cMenuEditIntItem(*cString::sprintf("%s%s", *indent, tr("Height of channel groups (Perc. of osd height)")), &tmpTvguideConfig->channelGroupsPercent, 3, 30));
-        } else if (tmpTvguideConfig->displayMode == eHorizontal) {
-            Add(new cMenuEditIntItem(*cString::sprintf("%s%s", *indent, tr("Width of channel groups (Perc. of osd width)")), &tmpTvguideConfig->channelGroupsPercent, 3, 30));
+    Add(new cMenuEditBoolItem(tr("Display Channel Names in Header"), &tmpConfig->displayChannelName));
+    Add(new cMenuEditBoolItem(tr("Display channel groups"), &tmpConfig->displayChannelGroups));
+    if (tmpConfig->displayChannelGroups) {
+        if (tmpConfig->displayMode == eVertical) {
+            Add(new cMenuEditIntItem(*cString::sprintf("%s%s", *indent, tr("Height of channel groups (Perc. of osd height)")), &tmpConfig->channelGroupsPercent, 3, 30));
+        } else if (tmpConfig->displayMode == eHorizontal) {
+            Add(new cMenuEditIntItem(*cString::sprintf("%s%s", *indent, tr("Width of channel groups (Perc. of osd width)")), &tmpConfig->channelGroupsPercent, 3, 30));
         }
     }
     
-    Add(new cMenuEditBoolItem(tr("Display current time baseline"), &tmpTvguideConfig->displayTimeBase));
-    Add(new cMenuEditStraItem(tr("Show Channel Logos"), &tmpTvguideConfig->hideChannelLogos, 2,  hideChannelLogosItems));   
-    if (!tmpTvguideConfig->hideChannelLogos) {
-        Add(InfoItem(tr("Logo Path used"), *tvguideConfig.logoPath));
-        Add(new cMenuEditStraItem(*cString::sprintf("%s%s", *indent, tr("Logo Extension")), &tmpTvguideConfig->logoExtension, 2,  logoExtensionItems));
-        Add(new cMenuEditIntItem(*cString::sprintf("%s%s", *indent, tr("Logo width ratio")), &tmpTvguideConfig->logoWidthRatio, 1, 1000));
-        Add(new cMenuEditIntItem(*cString::sprintf("%s%s", *indent, tr("Logo height ratio")), &tmpTvguideConfig->logoHeightRatio, 1, 1000));
+    Add(new cMenuEditBoolItem(tr("Display current time baseline"), &tmpConfig->displayTimeBase));
+    Add(new cMenuEditStraItem(tr("Show Channel Logos"), &tmpConfig->hideChannelLogos, 2,  hideChannelLogosItems));   
+    if (!tmpConfig->hideChannelLogos) {
+        Add(InfoItem(tr("Logo Path used"), *config.logoPath));
+        Add(new cMenuEditStraItem(*cString::sprintf("%s%s", *indent, tr("Logo Extension")), &tmpConfig->logoExtension, 2,  logoExtensionItems));
+        Add(new cMenuEditIntItem(*cString::sprintf("%s%s", *indent, tr("Logo width ratio")), &tmpConfig->logoWidthRatio, 1, 1000));
+        Add(new cMenuEditIntItem(*cString::sprintf("%s%s", *indent, tr("Logo height ratio")), &tmpConfig->logoHeightRatio, 1, 1000));
     }
     
-    Add(new cMenuEditIntItem(tr("Text Border in Detailed View (pixel)"), &tmpTvguideConfig->epgViewBorder, 0, 300));
+    Add(new cMenuEditIntItem(tr("Text Border in Detailed View (pixel)"), &tmpConfig->epgViewBorder, 0, 300));
     
-    Add(new cMenuEditStraItem(tr("Show EPG Images"), &tmpTvguideConfig->hideEpgImages, 2,  hideChannelLogosItems)); 
-    if (!tmpTvguideConfig->hideEpgImages) {
-        Add(InfoItem(tr("EPG Images Path used"), *tvguideConfig.epgImagePath));
-        Add(new cMenuEditIntItem(*cString::sprintf("%s%s", *indent, tr("EPG Image width")), &tmpTvguideConfig->epgImageWidth, 0, 800));
-        Add(new cMenuEditIntItem(*cString::sprintf("%s%s", *indent, tr("EPG Image height")), &tmpTvguideConfig->epgImageHeight, 0, 800));
-        Add(new cMenuEditIntItem(*cString::sprintf("%s%s", *indent, tr("Number of additional EPG Images")), &tmpTvguideConfig->numAdditionalEPGPictures, 0, 20));
-        Add(new cMenuEditIntItem(*cString::sprintf("%s%s", *indent, tr("Additional EPG Image width")), &tmpTvguideConfig->epgImageWidthLarge, 1, 800));
-        Add(new cMenuEditIntItem(*cString::sprintf("%s%s", *indent, tr("Additional EPG Image height")), &tmpTvguideConfig->epgImageHeightLarge, 0, 800));
+    Add(new cMenuEditStraItem(tr("Show EPG Images"), &tmpConfig->hideEpgImages, 2,  hideChannelLogosItems)); 
+    if (!tmpConfig->hideEpgImages) {
+        Add(InfoItem(tr("EPG Images Path used"), *config.epgImagePath));
+        Add(new cMenuEditIntItem(*cString::sprintf("%s%s", *indent, tr("EPG Image width")), &tmpConfig->epgImageWidth, 0, 800));
+        Add(new cMenuEditIntItem(*cString::sprintf("%s%s", *indent, tr("EPG Image height")), &tmpConfig->epgImageHeight, 0, 800));
+        Add(new cMenuEditIntItem(*cString::sprintf("%s%s", *indent, tr("Number of additional EPG Images")), &tmpConfig->numAdditionalEPGPictures, 0, 20));
+        Add(new cMenuEditIntItem(*cString::sprintf("%s%s", *indent, tr("Additional EPG Image width")), &tmpConfig->epgImageWidthLarge, 1, 800));
+        Add(new cMenuEditIntItem(*cString::sprintf("%s%s", *indent, tr("Additional EPG Image height")), &tmpConfig->epgImageHeightLarge, 0, 800));
     }
     
     SetCurrent(Get(currentItem));
@@ -310,20 +322,31 @@ void cMenuSetupScreenLayout::Set(void) {
 }
 
 eOSState cMenuSetupScreenLayout::ProcessKey(eKeys Key) {
+    int olddisplayMode = tmpConfig->displayMode;
+    bool olddisplayStatusHeader = tmpConfig->displayStatusHeader;
+    bool olddisplayChannelGroups = tmpConfig->displayChannelGroups;
+    int oldhideChannelLogos = tmpConfig->hideChannelLogos;
+    int oldhideEpgImages = tmpConfig->hideEpgImages;
     eOSState state = cOsdMenu::ProcessKey(Key);
     if (Key == kOk) {
         state = osBack;
     } else if (Key != kNone) {
+        if (tmpConfig->displayMode != olddisplayMode ||
+            tmpConfig->displayStatusHeader != olddisplayStatusHeader ||
+            tmpConfig->displayChannelGroups != olddisplayChannelGroups ||
+            tmpConfig->hideChannelLogos != oldhideChannelLogos ||
+            tmpConfig->hideEpgImages != oldhideEpgImages) {
             Set();
         }
+    }
     return state;
 }
 
 //-----Fonts and Fontsizes -------------------------------------------------------------------------------------------------------
 
-cMenuSetupFont::cMenuSetupFont(cTvguideConfig* data)  : cMenuSetupSubMenu(tr("Fonts and Fontsizes"), data) {
+cMenuSetupFont::cMenuSetupFont(cTVGuideConfig* data)  : cMenuSetupSubMenu(tr("Fonts and Fontsizes"), data) {
     cFont::GetAvailableFontNames(&fontNames);
-    fontNames.Insert(strdup(tvguideConfig.fontNameDefault));
+    fontNames.Insert(strdup(config.fontNameDefault));
     Set();
 }
 
@@ -331,37 +354,37 @@ void cMenuSetupFont::Set(void) {
     int currentItem = Current();
     Clear();
 
-    Add(new cMenuEditStraItem(tr("Font"), &tmpTvguideConfig->fontIndex, fontNames.Size(), &fontNames[0]));
+    Add(new cMenuEditStraItem(tr("Font"), &tmpConfig->fontIndex, fontNames.Size(), &fontNames[0]));
     
-    Add(new cMenuEditIntItem(tr("Status Header Font Size"), &tmpTvguideConfig->FontStatusHeaderDelta, -30, 30));    
-    Add(new cMenuEditIntItem(tr("Status Header Large Font Size"), &tmpTvguideConfig->FontStatusHeaderLargeDelta, -30, 30));
-    Add(new cMenuEditIntItem(tr("Detail EPG View Font Size"), &tmpTvguideConfig->FontDetailViewDelta, -30, 30));
-    Add(new cMenuEditIntItem(tr("Detail EPG View Header Font Size"), &tmpTvguideConfig->FontDetailHeaderDelta, -30, 30));
-    Add(new cMenuEditIntItem(tr("Message Font Size"), &tmpTvguideConfig->FontMessageBoxDelta, -30, 30));
-    Add(new cMenuEditIntItem(tr("Message Large Font Size"), &tmpTvguideConfig->FontMessageBoxLargeDelta, -30, 30));
-    Add(new cMenuEditIntItem(tr("Button Font Size"), &tmpTvguideConfig->FontButtonDelta, -30, 30));
+    Add(new cMenuEditIntItem(tr("Status Header Font Size"), &tmpConfig->FontStatusHeaderDelta, -30, 30));    
+    Add(new cMenuEditIntItem(tr("Status Header Large Font Size"), &tmpConfig->FontStatusHeaderLargeDelta, -30, 30));
+    Add(new cMenuEditIntItem(tr("Detail EPG View Font Size"), &tmpConfig->FontDetailViewDelta, -30, 30));
+    Add(new cMenuEditIntItem(tr("Detail EPG View Header Font Size"), &tmpConfig->FontDetailHeaderDelta, -30, 30));
+    Add(new cMenuEditIntItem(tr("Message Font Size"), &tmpConfig->FontMessageBoxDelta, -30, 30));
+    Add(new cMenuEditIntItem(tr("Message Large Font Size"), &tmpConfig->FontMessageBoxLargeDelta, -30, 30));
+    Add(new cMenuEditIntItem(tr("Button Font Size"), &tmpConfig->FontButtonDelta, -30, 30));
 
 
-    if (tmpTvguideConfig->displayMode == eVertical) {
-        Add(new cMenuEditIntItem(tr("Channel Header Font Size"), &tmpTvguideConfig->FontChannelHeaderDelta, -30, 30));
-        Add(new cMenuEditIntItem(tr("Channel Groups Font Size"), &tmpTvguideConfig->FontChannelGroupsDelta, -30, 30));
-        Add(new cMenuEditIntItem(tr("Grid Font Size"), &tmpTvguideConfig->FontGridDelta, -30, 30));
-        Add(new cMenuEditIntItem(tr("Grid Font Small Size"), &tmpTvguideConfig->FontGridSmallDelta, -30, 30));
-        Add(new cMenuEditIntItem(tr("Timeline Weekday Font Size"), &tmpTvguideConfig->FontTimeLineWeekdayDelta, -30, 30));
-        Add(new cMenuEditIntItem(tr("Timeline Date Font Size"), &tmpTvguideConfig->FontTimeLineDateDelta, -30, 30));
-        Add(new cMenuEditIntItem(tr("Timeline Time Font Size"), &tmpTvguideConfig->FontTimeLineTimeDelta, -30, 30));
-    } else if (tmpTvguideConfig->displayMode == eHorizontal) {
-        Add(new cMenuEditIntItem(tr("Channel Header Font Size"), &tmpTvguideConfig->FontChannelHeaderHorizontalDelta, -30, 30));
-        Add(new cMenuEditIntItem(tr("Channel Groups Font Size"), &tmpTvguideConfig->FontChannelGroupsHorizontalDelta, -30, 30));
-        Add(new cMenuEditIntItem(tr("Grid Font Size"), &tmpTvguideConfig->FontGridHorizontalDelta, -30, 30));
-        Add(new cMenuEditIntItem(tr("Grid Font Small Size"), &tmpTvguideConfig->FontGridHorizontalSmallDelta, -30, 30));
-        Add(new cMenuEditIntItem(tr("Timeline Date Font Size"), &tmpTvguideConfig->FontTimeLineDateHorizontalDelta, -30, 30));
-        Add(new cMenuEditIntItem(tr("Timeline Time Font Size"), &tmpTvguideConfig->FontTimeLineTimeHorizontalDelta, -30, 30));
+    if (tmpConfig->displayMode == eVertical) {
+        Add(new cMenuEditIntItem(tr("Channel Header Font Size"), &tmpConfig->FontChannelHeaderDelta, -30, 30));
+        Add(new cMenuEditIntItem(tr("Channel Groups Font Size"), &tmpConfig->FontChannelGroupsDelta, -30, 30));
+        Add(new cMenuEditIntItem(tr("Grid Font Size"), &tmpConfig->FontGridDelta, -30, 30));
+        Add(new cMenuEditIntItem(tr("Grid Font Small Size"), &tmpConfig->FontGridSmallDelta, -30, 30));
+        Add(new cMenuEditIntItem(tr("Timeline Weekday Font Size"), &tmpConfig->FontTimeLineWeekdayDelta, -30, 30));
+        Add(new cMenuEditIntItem(tr("Timeline Date Font Size"), &tmpConfig->FontTimeLineDateDelta, -30, 30));
+        Add(new cMenuEditIntItem(tr("Timeline Time Font Size"), &tmpConfig->FontTimeLineTimeDelta, -30, 30));
+    } else if (tmpConfig->displayMode == eHorizontal) {
+        Add(new cMenuEditIntItem(tr("Channel Header Font Size"), &tmpConfig->FontChannelHeaderHorizontalDelta, -30, 30));
+        Add(new cMenuEditIntItem(tr("Channel Groups Font Size"), &tmpConfig->FontChannelGroupsHorizontalDelta, -30, 30));
+        Add(new cMenuEditIntItem(tr("Grid Font Size"), &tmpConfig->FontGridHorizontalDelta, -30, 30));
+        Add(new cMenuEditIntItem(tr("Grid Font Small Size"), &tmpConfig->FontGridHorizontalSmallDelta, -30, 30));
+        Add(new cMenuEditIntItem(tr("Timeline Date Font Size"), &tmpConfig->FontTimeLineDateHorizontalDelta, -30, 30));
+        Add(new cMenuEditIntItem(tr("Timeline Time Font Size"), &tmpConfig->FontTimeLineTimeHorizontalDelta, -30, 30));
     }
     
-    Add(new cMenuEditIntItem(tr("Search & Recording Menu Font Size"), &tmpTvguideConfig->FontRecMenuItemDelta, -30, 30));
-    Add(new cMenuEditIntItem(tr("Search & Recording Menu Small Font Size"), &tmpTvguideConfig->FontRecMenuItemSmallDelta, -30, 30));
-    Add(new cMenuEditIntItem(tr("Search & Recording Menu Header Font Size"), &tmpTvguideConfig->FontRecMenuItemLargeDelta, -30, 30));
+    Add(new cMenuEditIntItem(tr("Search & Recording Menu Font Size"), &tmpConfig->FontRecMenuItemDelta, -30, 30));
+    Add(new cMenuEditIntItem(tr("Search & Recording Menu Small Font Size"), &tmpConfig->FontRecMenuItemSmallDelta, -30, 30));
+    Add(new cMenuEditIntItem(tr("Search & Recording Menu Header Font Size"), &tmpConfig->FontRecMenuItemLargeDelta, -30, 30));
 
     SetCurrent(Get(currentItem));
     Display();
@@ -369,7 +392,7 @@ void cMenuSetupFont::Set(void) {
 
 //----- Recording Menus and Favorites -------------------------------------------------------------------------------------------------------
 
-cMenuSetupFavorites::cMenuSetupFavorites(cTvguideConfig* data)  : cMenuSetupSubMenu(tr("Recording Menus and Favorites"), data) {
+cMenuSetupFavorites::cMenuSetupFavorites(cTVGuideConfig* data)  : cMenuSetupSubMenu(tr("Recording Menus and Favorites"), data) {
     strn0cpy(description1, data->descUser1.c_str(), sizeof(description1));
     strn0cpy(description2, data->descUser2.c_str(), sizeof(description2));
     strn0cpy(description3, data->descUser3.c_str(), sizeof(description3));
@@ -378,6 +401,9 @@ cMenuSetupFavorites::cMenuSetupFavorites(cTvguideConfig* data)  : cMenuSetupSubM
     recFolderMode[1] = tr("Select from folder list");
     recFolderMode[2] = tr("Use fixed folder");
     strn0cpy(fixedFolder, data->instRecFixedFolder.c_str(), sizeof(fixedFolder));
+    switchModeItems[0] = (tr("switch"));
+    switchModeItems[1] = (tr("announce only"));
+    switchModeItems[2] = (tr("ask for switch"));
     Set();
 }
 
@@ -385,40 +411,44 @@ void cMenuSetupFavorites::Set(void) {
     int currentItem = Current();
     Clear();
 
-    Add(new cMenuEditStraItem(tr("Folder for instant Recordings"), &tmpTvguideConfig->instRecFolderMode, 3,  recFolderMode));
-    if (tmpTvguideConfig->instRecFolderMode == eFolderFixed) {
+    Add(new cMenuEditStraItem(tr("Folder for instant Recordings"), &tmpConfig->instRecFolderMode, 3,  recFolderMode));
+    if (tmpConfig->instRecFolderMode == eFolderFixed) {
         Add(new cMenuEditStrItem(cString::sprintf("%s%s", *indent, tr("Folder")), fixedFolder, sizeof(fixedFolder), trVDR(FileNameChars)));
     }
     if (pRemoteTimers)
-        Add(new cMenuEditBoolItem(tr("Use Remotetimers"), &tmpTvguideConfig->useRemoteTimers));
+        Add(new cMenuEditBoolItem(tr("Use Remotetimers"), &tmpConfig->useRemoteTimers));
 
-    Add(new cMenuEditBoolItem(tr("Use \"What's on now\" in favorites"), &tmpTvguideConfig->favWhatsOnNow));
-    Add(new cMenuEditBoolItem(tr("Use \"What's on next\" in favorites"), &tmpTvguideConfig->favWhatsOnNext));
-    Add(new cMenuEditBoolItem(tr("Use user defined time 1 in favorites"), &tmpTvguideConfig->favUseTime1));
-    if (tmpTvguideConfig->favUseTime1) {
+    Add(new cMenuEditBoolItem(tr("Limit channels in favorites"), &tmpConfig->favLimitChannels));
+    if (tmpConfig->favLimitChannels) {
+        Add(new cMenuEditChanItem(tr("Start Channel"), &tmpConfig->favStartChannel));
+        Add(new cMenuEditChanItem(tr("Stop Channel"), &tmpConfig->favStopChannel));
+    }
+    Add(new cMenuEditBoolItem(tr("Use \"What's on now\" in favorites"), &tmpConfig->favWhatsOnNow));
+    Add(new cMenuEditBoolItem(tr("Use \"What's on next\" in favorites"), &tmpConfig->favWhatsOnNext));
+    Add(new cOsdItem(tr("User defined times in favorites:"), osUnknown, false));
+    Add(new cMenuEditBoolItem(tr("Use user defined time 1"), &tmpConfig->favUseTime1));
+    if (tmpConfig->favUseTime1) {
         Add(new cMenuEditStrItem(cString::sprintf("%s%s", *indent, tr("Description")), description1, sizeof(description1), trVDR(FileNameChars)));
-        Add(new cMenuEditTimeItem(cString::sprintf("%s%s", *indent, tr("Time")), &tmpTvguideConfig->favTime1));
+        Add(new cMenuEditTimeItem(cString::sprintf("%s%s", *indent, tr("Time")), &tmpConfig->favTime1));
     }
-    Add(new cMenuEditBoolItem(tr("Use user defined time 2 in favorites"), &tmpTvguideConfig->favUseTime2));
-    if (tmpTvguideConfig->favUseTime2) {
+    Add(new cMenuEditBoolItem(tr("Use user defined time 2"), &tmpConfig->favUseTime2));
+    if (tmpConfig->favUseTime2) {
         Add(new cMenuEditStrItem(cString::sprintf("%s%s", *indent, tr("Description")), description2, sizeof(description2), trVDR(FileNameChars)));
-        Add(new cMenuEditTimeItem(cString::sprintf("%s%s", *indent, tr("Time")), &tmpTvguideConfig->favTime2));
+        Add(new cMenuEditTimeItem(cString::sprintf("%s%s", *indent, tr("Time")), &tmpConfig->favTime2));
     }
-    Add(new cMenuEditBoolItem(tr("Use user defined time 3 in favorites"), &tmpTvguideConfig->favUseTime3));
-    if (tmpTvguideConfig->favUseTime3) {
+    Add(new cMenuEditBoolItem(tr("Use user defined time 3"), &tmpConfig->favUseTime3));
+    if (tmpConfig->favUseTime3) {
         Add(new cMenuEditStrItem(cString::sprintf("%s%s", *indent, tr("Description")), description3, sizeof(description3), trVDR(FileNameChars)));
-        Add(new cMenuEditTimeItem(cString::sprintf("%s%s", *indent, tr("Time")), &tmpTvguideConfig->favTime3));
+        Add(new cMenuEditTimeItem(cString::sprintf("%s%s", *indent, tr("Time")), &tmpConfig->favTime3));
     }
-    Add(new cMenuEditBoolItem(tr("Use user defined time 4 in favorites"), &tmpTvguideConfig->favUseTime4));
-    if (tmpTvguideConfig->favUseTime4) {
+    Add(new cMenuEditBoolItem(tr("Use user defined time 4"), &tmpConfig->favUseTime4));
+    if (tmpConfig->favUseTime4) {
         Add(new cMenuEditStrItem(cString::sprintf("%s%s", *indent, tr("Description")), description4, sizeof(description4), trVDR(FileNameChars)));
-        Add(new cMenuEditTimeItem(cString::sprintf("%s%s", *indent, tr("Time")), &tmpTvguideConfig->favTime4));
-    }
-    Add(new cMenuEditBoolItem(tr("Limit channels in favorites"), &tmpTvguideConfig->favLimitChannels));
-    if (tmpTvguideConfig->favLimitChannels) {
-        Add(new cMenuEditChanItem(tr("Start Channel"), &tmpTvguideConfig->favStartChannel));
-        Add(new cMenuEditChanItem(tr("Stop Channel"), &tmpTvguideConfig->favStopChannel));
+        Add(new cMenuEditTimeItem(cString::sprintf("%s%s", *indent, tr("Time")), &tmpConfig->favTime4));
     }
+    Add(new cOsdItem(tr("Switchtimer:"), osUnknown, false));
+    Add(new cMenuEditStraItem(tr("Switch Mode"), &tmpConfig->switchMode, 3,  switchModeItems));
+    Add(new cMenuEditIntItem(tr("Switch (x)min before start of the show"), &tmpConfig->switchMinsBefore, 0, 10));
 
 
     SetCurrent(Get(currentItem));
@@ -426,53 +456,63 @@ void cMenuSetupFavorites::Set(void) {
 }
 
 eOSState cMenuSetupFavorites::ProcessKey(eKeys Key) {
-    int tmpFavUseTime1 = tmpTvguideConfig->favUseTime1;
-    int tmpFavUseTime2 = tmpTvguideConfig->favUseTime2;
-    int tmpFavUseTime3 = tmpTvguideConfig->favUseTime3;
-    int tmpFavUseTime4 = tmpTvguideConfig->favUseTime4;
-    int tmpFavLimitChannels = tmpTvguideConfig->favLimitChannels;
-    int tmpFolderMode = tmpTvguideConfig->instRecFolderMode;
+
+    int tmpFavUseTime1 = tmpConfig->favUseTime1;
+    int tmpFavUseTime2 = tmpConfig->favUseTime2;
+    int tmpFavUseTime3 = tmpConfig->favUseTime3;
+    int tmpFavUseTime4 = tmpConfig->favUseTime4;
+    int tmpFavLimitChannels = tmpConfig->favLimitChannels;
+    int tmpFolderMode = tmpConfig->instRecFolderMode;
+
     eOSState state = cOsdMenu::ProcessKey(Key);
-    if (Key == kOk) {
-        tmpTvguideConfig->descUser1 = description1;
-        tmpTvguideConfig->descUser2 = description2;
-        tmpTvguideConfig->descUser3 = description3;
-        tmpTvguideConfig->descUser4 = description4;
-        tmpTvguideConfig->instRecFixedFolder = fixedFolder;
-    } else if ((Key == kLeft)||(Key == kRight)) {
-        if ((tmpFavUseTime1 != tmpTvguideConfig->favUseTime1) ||
-            (tmpFavUseTime2 != tmpTvguideConfig->favUseTime2) ||
-            (tmpFavUseTime3 != tmpTvguideConfig->favUseTime3) ||
-            (tmpFavUseTime4 != tmpTvguideConfig->favUseTime4) ||
-            (tmpFavLimitChannels != tmpTvguideConfig->favLimitChannels) ||
-            (tmpFolderMode != tmpTvguideConfig->instRecFolderMode) )
+
+    if ((tmpFavUseTime1 != tmpConfig->favUseTime1) ||
+        (tmpFavUseTime2 != tmpConfig->favUseTime2) ||
+        (tmpFavUseTime3 != tmpConfig->favUseTime3) ||
+        (tmpFavUseTime4 != tmpConfig->favUseTime4) ||
+        (tmpFavLimitChannels != tmpConfig->favLimitChannels) ||
+        (tmpFolderMode != tmpConfig->instRecFolderMode) ) {
         Set();
+        Display();
     }
+
+    if (state == osUnknown) {
+        switch (Key) {
+        case kOk: {
+            tmpConfig->descUser1 = cString::sprintf("%s", description1);
+            tmpConfig->descUser2 = cString::sprintf("%s", description2);
+            tmpConfig->descUser3 = cString::sprintf("%s", description3);
+            tmpConfig->descUser4 = cString::sprintf("%s", description4);
+            return osBack; }
+        default:
+            break;
+        }
+    }
+
     return state;
 }
 
-
 //-----Image Caching-------------------------------------------------------------------------------------------------------------
-cMenuSetupImageCache::cMenuSetupImageCache(cTvguideConfig* data)  : cMenuSetupSubMenu(tr("Image Loading and Caching"), data) {
+cMenuSetupImageCache::cMenuSetupImageCache(cTVGuideConfig* data)  : cMenuSetupSubMenu(tr("Image Loading and Caching"), data) {
     Set();
 }
 
 void cMenuSetupImageCache::Set(void) {
     int currentItem = Current();
     Clear();
-    Add(new cMenuEditBoolItem(tr("Create Log Messages for image loading"), &tmpTvguideConfig->debugImageLoading));
-    Add(new cMenuEditBoolItem(tr("Limit Logo Cache"), &tmpTvguideConfig->limitLogoCache));
-    if (&tmpTvguideConfig->limitLogoCache) {
-        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *indent, tr("Maximal number of logos to cache")), &tmpTvguideConfig->numLogosMax, 1, 9999));
+    Add(new cMenuEditBoolItem(tr("Create Log Messages for image loading"), &tmpConfig->debugImageLoading));
+    Add(new cMenuEditBoolItem(tr("Limit Logo Cache"), &tmpConfig->limitLogoCache));
+    if (&tmpConfig->limitLogoCache) {
+        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *indent, tr("Maximal number of logos to cache")), &tmpConfig->numLogosMax, 1, 9999));
     }
-    Add(new cMenuEditIntItem(tr("Number of  logos to cache at start"), &tmpTvguideConfig->numLogosInitial, 0, 9999));
+    Add(new cMenuEditIntItem(tr("Number of  logos to cache at start"), &tmpConfig->numLogosInitial, 0, 9999));
 
     Add(InfoItem(tr("Cache Sizes"), ""));
-    Add(InfoItem(tr("OSD Element Cache"), (imgCache.GetCacheSize(ctOsdElement)).c_str()));
-    Add(InfoItem(tr("Logo cache"), (imgCache.GetCacheSize(ctLogo)).c_str()));
-    Add(InfoItem(tr("EPG Grid Cache"), (imgCache.GetCacheSize(ctGrid)).c_str()));
-    Add(InfoItem(tr("Channel Groups Cache"), (imgCache.GetCacheSize(ctChannelGroup)).c_str()));
-    Add(InfoItem(tr("Recording Menus Icon Cache"), (imgCache.GetCacheSize(ctIcon)).c_str()));
+    Add(InfoItem(tr("OSD Element Cache"), cString::sprintf("\t%s", (imgCache.GetCacheSize(ctOsdElement)).c_str())));
+    Add(InfoItem(tr("Logo cache"), cString::sprintf("\t%s", (imgCache.GetCacheSize(ctLogo)).c_str())));
+    Add(InfoItem(tr("EPG Grid Cache"), cString::sprintf("\t%s", (imgCache.GetCacheSize(ctGrid)).c_str())));
+    Add(InfoItem(tr("Channel Groups Cache"), cString::sprintf("\t%s", (imgCache.GetCacheSize(ctChannelGroup)).c_str())));
+    Add(InfoItem(tr("Recording Menus Icon Cache"), cString::sprintf("\t%s", (imgCache.GetCacheSize(ctIcon)).c_str())));
 
     SetCurrent(Get(currentItem));
     Display();

setup.h

@@ -4,12 +4,14 @@
 #include <vdr/menuitems.h>
 #include "config.h"
 
+extern cTVGuideConfig config;
+
 class cTvguideSetup : public cMenuSetupPage {
     public:
         cTvguideSetup(void);
         virtual ~cTvguideSetup();       
     private:
-        cTvguideConfig tmpTvguideConfig;
+        cTVGuideConfig tmpConfig;
         void Setup(void);
     protected:
         virtual eOSState ProcessKey(eKeys Key);
@@ -19,13 +21,13 @@ class cTvguideSetup : public cMenuSetupPage {
 
 class cMenuSetupSubMenu : public cOsdMenu {
     protected:
-        cTvguideConfig *tmpTvguideConfig;
+        cTVGuideConfig *tmpConfig;
         virtual eOSState ProcessKey(eKeys Key);
         virtual void Set(void) = 0;
         cOsdItem *InfoItem(const char *label, const char *value);
         cString indent;
     public:
-        cMenuSetupSubMenu(const char *Title, cTvguideConfig *data);
+        cMenuSetupSubMenu(const char *Title, cTVGuideConfig *data);
 };
 
 class cMenuSetupGeneral : public cMenuSetupSubMenu {
@@ -39,7 +41,7 @@ class cMenuSetupGeneral : public cMenuSetupSubMenu {
         const char *useSubtitleRerunTexts[3];
         void Set(void);
     public:
-        cMenuSetupGeneral(cTvguideConfig *data);
+        cMenuSetupGeneral(cTVGuideConfig *data);
 };
 
 class cMenuSetupScreenLayout : public cMenuSetupSubMenu {
@@ -50,7 +52,7 @@ class cMenuSetupScreenLayout : public cMenuSetupSubMenu {
         const char * logoExtensionItems[2];
         void Set(void);
     public:
-        cMenuSetupScreenLayout(cTvguideConfig *data);
+        cMenuSetupScreenLayout(cTVGuideConfig *data);
 };
 
 class cMenuSetupFont : public cMenuSetupSubMenu {
@@ -58,7 +60,7 @@ class cMenuSetupFont : public cMenuSetupSubMenu {
         cStringList fontNames;
         void Set(void);
     public:
-        cMenuSetupFont(cTvguideConfig *data);
+        cMenuSetupFont(cTVGuideConfig *data);
 };
 
 class cMenuSetupFavorites : public cMenuSetupSubMenu {
@@ -68,18 +70,19 @@ class cMenuSetupFavorites : public cMenuSetupSubMenu {
         char description3[256];
         char description4[256];
         const char * recFolderMode[3];
+        const char * switchModeItems[3];
         char fixedFolder[256];
         void Set(void);
         virtual eOSState ProcessKey(eKeys Key);
     public:
-        cMenuSetupFavorites(cTvguideConfig *data);
+        cMenuSetupFavorites(cTVGuideConfig *data);
 };
 
 class cMenuSetupImageCache : public cMenuSetupSubMenu {
     protected:
         void Set(void);
     public:
-        cMenuSetupImageCache(cTvguideConfig *data);
+        cMenuSetupImageCache(cTVGuideConfig *data);
 };
 
 #endif //__TVGUIDE_SETUP_H

statusheader.c

@@ -17,7 +17,7 @@ cStatusHeader::cStatusHeader(void) {
 cStatusHeader::~cStatusHeader(void) {
     osdManager.releasePixmap(pixmapText);
     osdManager.releasePixmap(pixmapTVFrame);
-    if (tvguideConfig.scaleVideo) {
+    if (config.scaleVideo) {
         cRect vidWin = cDevice::PrimaryDevice()->CanScaleVideo(cRect::Null);
         cDevice::PrimaryDevice()->ScaleVideo(vidWin);
     }
@@ -26,8 +26,8 @@ cStatusHeader::~cStatusHeader(void) {
 void cStatusHeader::Draw(void) {
     pixmapText->Fill(clrTransparent);
     pixmapTVFrame->Fill(clrTransparent);
-    if (tvguideConfig.style == eStyleGraphical) {
-        if (tvguideConfig.scaleVideo) {
+    if (config.style == eStyleGraphical) {
+        if (config.scaleVideo) {
             drawBackgroundGraphical(bgStatusHeaderWindowed);
             cImage *tvFrameBack = imgCache.GetOsdElement(oeStatusHeaderTVFrame);
             if (tvFrameBack)
@@ -36,7 +36,7 @@ void cStatusHeader::Draw(void) {
             drawBackgroundGraphical(bgStatusHeaderFull);
         }
     } else {
-        if (tvguideConfig.decorateVideo) {
+        if (config.decorateVideo) {
             DecorateVideoFrame();
         }
         drawBackground();
@@ -45,7 +45,7 @@ void cStatusHeader::Draw(void) {
 }
 
 void cStatusHeader::ScaleVideo(void) {
-    if (tvguideConfig.scaleVideo) {
+    if (config.scaleVideo) {
         int width = height * 16 / 9;
         int x = osdManager.Left() + geoManager.osdWidth - width;
         int y = osdManager.Top();
@@ -55,14 +55,11 @@ void cStatusHeader::ScaleVideo(void) {
     }
 }
 
-void cStatusHeader::DrawInfoText(cGrid *grid) {
+void cStatusHeader::DrawInfoText(cGridElement *grid) {
     int border = 10;
     int textWidth = 0;
-    if (tvguideConfig.displayMode == eVertical)
-       textWidth = width - 2 * border - geoManager.clockWidth - 2;
-    else
     textWidth = width - 2 * border;
-    tColor colorTextBack = (tvguideConfig.style == eStyleFlat)?color:clrTransparent;
+    tColor colorTextBack = (config.style == eStyleFlat)?color:clrTransparent;
     pixmapText->Fill(clrTransparent);
     int x = border;
     int y = border;

statusheader.h

@@ -2,7 +2,7 @@
 #define __TVGUIDE_STATUSHEADER_H
 
 #include "styledpixmap.h"
-#include "grid.h"
+#include "gridelement.h"
 
 // --- cStatusHeader  -------------------------------------------------------------
 
@@ -19,7 +19,7 @@ public:
     virtual ~cStatusHeader(void);
     void Draw(void);
     void ScaleVideo(void);
-    void DrawInfoText(cGrid *grid);
+    void DrawInfoText(cGridElement *grid);
 };
 
 #endif //__TVGUIDE_STATUSHEADER_H

styledpixmap.c

@@ -22,9 +22,9 @@ void cStyledPixmap::setPixmap(cPixmap *pixmap) {
 }
 
 void cStyledPixmap::drawBackground() {
-    if (tvguideConfig.style == eStyleBlendingDefault){
+    if (config.style == eStyleBlendingDefault){
         drawBlendedBackground();
-    } else if (tvguideConfig.style == eStyleBlendingMagick){
+    } else if (config.style == eStyleBlendingMagick){
         drawSparsedBackground();
     } else {
         pixmap->Fill(color);
@@ -129,7 +129,7 @@ void cStyledPixmap::drawBorder() {
     int height = pixmap->ViewPort().Height();
     
     drawDefaultBorder(width, height);
-    if (tvguideConfig.roundedCorners) {
+    if (config.roundedCorners) {
         int borderRadius = 12;
         drawRoundedCorners(width, height, borderRadius);
     }

styledpixmap.h

@@ -3,7 +3,7 @@
 
 #include <vdr/osd.h>
 #include <vdr/epg.h>
-#include "timer.h"
+#include "timemanager.h"
 #include "config.h"
 
 enum eBackgroundType {

switchtimer.c

@@ -6,8 +6,8 @@ cSwitchTimers SwitchTimers;
 cSwitchTimer::cSwitchTimer(void) {
     eventID = 0;
     startTime = 0;
-    switchMinsBefore = 2;
-    announceOnly = 0;
+    switchMinsBefore = config.switchMinsBefore;
+    switchMode = config.switchMode;
 }
 
 cSwitchTimer::cSwitchTimer(const cEvent* Event) {
@@ -20,17 +20,6 @@ cSwitchTimer::cSwitchTimer(const cEvent* Event) {
     }
 }
 
-#if VDRVERSNUM >= 20305
-cSwitchTimer& cSwitchTimer::operator= (const cSwitchTimer &SwitchTimer)
-{
-    this->eventID = SwitchTimer.eventID;
-    this->startTime = SwitchTimer.startTime;
-    this->channelID = SwitchTimer.channelID;
-    this->switchMinsBefore = SwitchTimer.switchMinsBefore;
-    return *this;
-}
-
-#endif
 bool cSwitchTimer::Parse(const char *s) {
     char *line;
     char *pos;

switchtimer.h

@@ -2,6 +2,7 @@
 #define __TVGUIDE_SWITCHTIMER_H
 
 #include <vdr/plugin.h>
+#include "config.h"
 
 class cSwitchTimer : public cListObject {
 public:
@@ -9,10 +10,18 @@ public:
     time_t startTime;
     tChannelID channelID;
     int switchMinsBefore;
-    int announceOnly;
+    int switchMode;
 #if VDRVERSNUM >= 20305
     cSwitchTimer(const cSwitchTimer &SwitchTimer) { *this = SwitchTimer; };
-    cSwitchTimer& operator= (const cSwitchTimer &SwitchTimer);
+    cSwitchTimer& operator= (const cSwitchTimer &SwitchTimer)
+    {
+        this->eventID = SwitchTimer.eventID;
+        this->startTime = SwitchTimer.startTime;
+        this->channelID = SwitchTimer.channelID;
+        this->switchMinsBefore = SwitchTimer.switchMinsBefore;
+        this->switchMode = SwitchTimer.switchMode;
+        return *this;
+    };
 #endif
     cSwitchTimer(void);
     cSwitchTimer(const cEvent* Event);

timeline.c

@@ -1,11 +1,12 @@
 #include "imageloader.h"
 #include "timeline.h"
 
-cTimeLine::cTimeLine(cMyTime *myTime) {
-    this->myTime = myTime;
-    if (tvguideConfig.displayMode == eVertical) {
+cTimeLine::cTimeLine(cTimeManager *timeManager) {
+    this->timeManager = timeManager;
+    lastClock = "";
+    if (config.displayMode == eVertical) {
         dateViewer = new cStyledPixmap(osdManager.requestPixmap(1, cRect(0, 
-                                                                         geoManager.statusHeaderHeight, 
+                                                                         geoManager.statusHeaderHeight + geoManager.clockHeight, 
                                                                          geoManager.dateVieverWidth, 
                                                                          geoManager.dateVieverHeight)));
         timeline = osdManager.requestPixmap(2, cRect(0, 
@@ -16,14 +17,10 @@ cTimeLine::cTimeLine(cMyTime *myTime) {
                                                      0, 
                                                      geoManager.timeLineWidth, 
                                                      1440 * geoManager.minutePixel));
-        timeBase = osdManager.requestPixmap(3, cRect(0, 
-                                                     geoManager.statusHeaderHeight + geoManager.channelGroupsHeight + geoManager.channelHeaderHeight, 
-                                                     geoManager.osdWidth, 
-                                                     geoManager.timeLineGridHeight));
-    } else if (tvguideConfig.displayMode == eHorizontal) {
+    } else if (config.displayMode == eHorizontal) {
         dateViewer = new cStyledPixmap(osdManager.requestPixmap(1, cRect(geoManager.clockWidth, 
                                                                          geoManager.statusHeaderHeight, 
-                                                                         geoManager.dateVieverWidth - geoManager.clockWidth,
+                                                                         geoManager.dateVieverWidth,
                                                                          geoManager.dateVieverHeight)));
         timeline = osdManager.requestPixmap(2, cRect(geoManager.channelHeaderWidth + geoManager.channelGroupsWidth, 
                                                      geoManager.statusHeaderHeight, 
@@ -33,22 +30,12 @@ cTimeLine::cTimeLine(cMyTime *myTime) {
                                                      0, 
                                                      1440 * geoManager.minutePixel, 
                                                      geoManager.timeLineHeight));
-        timeBase = osdManager.requestPixmap(3, cRect(geoManager.channelGroupsWidth + geoManager.channelHeaderWidth, 
-                                                     geoManager.statusHeaderHeight, 
-                                                     geoManager.timeLineGridWidth, 
-                                                     geoManager.timeLineHeight + tvguideConfig.channelRows * geoManager.rowHeight));
     }
-    timeBase->Fill(clrTransparent);
     int clockY;
     int clockX;
-    if (tvguideConfig.displayMode == eVertical) {
-       clockY = 10;
-       if (tvguideConfig.scaleVideo) {
-          clockX = geoManager.osdWidth - geoManager.tvFrameWidth - geoManager.clockWidth - 4;
-          }
-       else {
-          clockX = geoManager.osdWidth - geoManager.clockWidth - 10;
-          }
+    if (config.displayMode == eVertical) {
+       clockY = geoManager.statusHeaderHeight;
+       clockX = 0;
        }
     else {
        clockY = geoManager.statusHeaderHeight;
@@ -68,9 +55,9 @@ cTimeLine::~cTimeLine(void) {
 }
 
 void cTimeLine::drawDateViewer() {
-    cString weekDay = myTime->GetWeekday();
-    cString date = myTime->GetDate();   
-    if (tvguideConfig.style != eStyleGraphical) {
+    cString weekDay = timeManager->GetWeekday();
+    cString date = timeManager->GetDate();   
+    if (config.style != eStyleGraphical) {
         dateViewer->setColor(theme.Color(clrHeader), theme.Color(clrHeaderBlending));
         dateViewer->drawBackground();
         dateViewer->drawBorder();
@@ -83,18 +70,20 @@ void cTimeLine::drawDateViewer() {
             dateViewer->Fill(clrTransparent);
     }
     tColor colorFont = theme.Color(clrButtonYellow);
-    tColor colorFontBack = (tvguideConfig.style == eStyleFlat)?theme.Color(clrHeader):clrTransparent;
+    tColor colorFontBack = (config.style == eStyleFlat) ? theme.Color(clrHeader) : clrTransparent;
 
-    if (tvguideConfig.displayMode == eVertical) {
-        int textHeight = fontManager.FontTimeLineWeekday->Height();
+    if (config.displayMode == eVertical) {
+        int textHeightWeekday = fontManager.FontTimeLineWeekday->Height();
+        int textHeightDate = fontManager.FontTimeLineDate->Height();
         int weekdayWidth = fontManager.FontTimeLineWeekday->Width(*weekDay);
         int dateWidth = fontManager.FontTimeLineDate->Width(*date);
-        dateViewer->DrawText(cPoint((geoManager.timeLineWidth-weekdayWidth)/2, (geoManager.channelHeaderHeight + geoManager.channelGroupsHeight -2*textHeight)/2), *weekDay, colorFont, colorFontBack, fontManager.FontTimeLineWeekday);
-        dateViewer->DrawText(cPoint((geoManager.timeLineWidth-dateWidth)/2, (geoManager.channelHeaderHeight + geoManager.channelGroupsHeight -2*textHeight)/2 + textHeight + 5), *date, colorFont, colorFontBack, fontManager.FontTimeLineDate);
-    } else if (tvguideConfig.displayMode == eHorizontal) {
+        int y = ((geoManager.dateVieverHeight - textHeightWeekday - textHeightDate) / 2);
+        dateViewer->DrawText(cPoint((geoManager.timeLineWidth - weekdayWidth) / 2, y), *weekDay, colorFont, colorFontBack, fontManager.FontTimeLineWeekday);
+        dateViewer->DrawText(cPoint((geoManager.timeLineWidth - dateWidth) / 2, y + textHeightWeekday), *date, colorFont, colorFontBack, fontManager.FontTimeLineDate);
+    } else if (config.displayMode == eHorizontal) {
         cString strDate = cString::sprintf("%s %s", *weekDay, *date);
         int x = ((dateViewer->Width() - fontManager.FontTimeLineDateHorizontal->Width(*strDate)) / 2);
-        int y = (dateViewer->Height() - fontManager.FontTimeLineDateHorizontal->Height())/2;
+        int y = ((dateViewer->Height() - fontManager.FontTimeLineDateHorizontal->Height()) / 2);
         dateViewer->DrawText(cPoint(x, y), *strDate, colorFont, colorFontBack, fontManager.FontTimeLineDateHorizontal);
     }
 }
@@ -108,7 +97,7 @@ void cTimeLine::drawTimeline() {
     int imgHeight = geoManager.timeLineGridHeight;
     const cImage *img1 = NULL;
     const cImage *img2 = NULL;
-    if (tvguideConfig.style == eStyleGraphical) {
+    if (config.style == eStyleGraphical) {
         img1 = imgCache.GetOsdElement(oeTimeline1);
         img2 = imgCache.GetOsdElement(oeTimeline2);
     } else {
@@ -125,8 +114,8 @@ void cTimeLine::drawTimeline() {
         if (i%2==0) {
             img = img1;
             colorFont = theme.Color(clrTimeline2);
-            colorBackground = (tvguideConfig.style == eStyleFlat)?theme.Color(clrTimeline1):clrTransparent;
-            if (tvguideConfig.timeFormat == e12Hours) {
+            colorBackground = (config.style == eStyleFlat)?theme.Color(clrTimeline1):clrTransparent;
+            if (config.timeFormat == e12Hours) {
                 if (i == 0)
                     sprintf(timetext, "12:00 PM");
                 else if (i/2 < 13)
@@ -139,8 +128,8 @@ void cTimeLine::drawTimeline() {
         } else {
             img = img2;
             colorFont = theme.Color(clrTimeline1);
-            colorBackground = (tvguideConfig.style == eStyleFlat)?theme.Color(clrTimeline2):clrTransparent;
-            if (tvguideConfig.timeFormat == e12Hours) {
+            colorBackground = (config.style == eStyleFlat)?theme.Color(clrTimeline2):clrTransparent;
+            if (config.timeFormat == e12Hours) {
                 if (i == 1)
                     sprintf(timetext, "12:30 PM");
                 else if (i/2 < 13)
@@ -151,25 +140,25 @@ void cTimeLine::drawTimeline() {
                 sprintf(timetext, "%d:30", i/2);
             }
         }
-        if (tvguideConfig.displayMode == eVertical) {
+        if (config.displayMode == eVertical) {
             posY = i*geoManager.minutePixel*30;
             timeline->DrawImage(cPoint(0, posY), *img);
-            if (tvguideConfig.style != eStyleGraphical) {
+            if (config.style != eStyleGraphical) {
                 decorateTile(0, posY, imgWidth+2, imgHeight);
             }
             textWidth = fontManager.FontTimeLineTime->Width(timetext);
             timeline->DrawText(cPoint((geoManager.timeLineWidth-textWidth)/2, posY + 5), timetext, colorFont, colorBackground, fontManager.FontTimeLineTime);
-        } else if (tvguideConfig.displayMode == eHorizontal) {
+        } else if (config.displayMode == eHorizontal) {
             posX = i*geoManager.minutePixel*30;
             timeline->DrawImage(cPoint(posX, 0), *img);
-            if (tvguideConfig.style != eStyleGraphical) {
+            if (config.style != eStyleGraphical) {
                 decorateTile(posX, 0, imgWidth, imgHeight+2);
             }
             timeline->DrawText(cPoint(posX + 15, (dateViewer->Height() - fontManager.FontTimeLineTimeHorizontal->Height())/2), timetext, colorFont, colorBackground, fontManager.FontTimeLineTimeHorizontal);
        }
     }
     setTimeline();
-    if (tvguideConfig.style != eStyleGraphical) {
+    if (config.style != eStyleGraphical) {
         delete img1;
         delete img2;
     }
@@ -186,7 +175,7 @@ void cTimeLine::decorateTile(int posX, int posY, int tileWidth, int tileHeight)
     timeline->DrawRectangle(cRect(2+posX,posY+tileHeight-3,tileWidth-4,1), theme.Color(clrBorder));     //bottom
     timeline->DrawRectangle(cRect(posX+tileWidth-3,posY+2,1,tileHeight-4), theme.Color(clrBorder));     //right
     
-    if (tvguideConfig.roundedCorners) {
+    if (config.roundedCorners) {
         int borderRadius = 12;
         drawRoundedCorners(posX, posY, tileWidth, tileHeight, borderRadius);
     }
@@ -209,22 +198,32 @@ void cTimeLine::drawRoundedCorners(int posX, int posY, int width, int height, in
 }
 
 void cTimeLine::drawCurrentTimeBase(void) {
-    timeBase->Fill(clrTransparent);
-    bool nowVisible = myTime->NowVisible();
+    bool nowVisible = timeManager->NowVisible();
+    if (timeBase)
+       osdManager.releasePixmap(timeBase);
     if (!nowVisible)
         return;
-    int deltaTime = (myTime->GetNow() - myTime->GetStart()) / 60 * geoManager.minutePixel;
-    if (tvguideConfig.displayMode == eVertical) {
-        timeBase->DrawRectangle(cRect(0, deltaTime - 2, timeBase->ViewPort().Width(), 4), theme.Color(clrTimeBase));
+    int deltaTime = (timeManager->GetNow() - timeManager->GetStart()) / 60 * geoManager.minutePixel;
+    int x1, x2, y1, y2;
+    if (config.displayMode == eVertical) {
+       x1 = 0;
+       y1 = geoManager.statusHeaderHeight + geoManager.channelGroupsHeight + geoManager.channelHeaderHeight + deltaTime - 2;
+       x2 = geoManager.osdWidth;
+       y2 = 4;
     } else {
-        timeBase->DrawRectangle(cRect(deltaTime-2, 0, 4, timeBase->ViewPort().Height()), theme.Color(clrTimeBase));
+       x1 = geoManager.channelGroupsWidth + geoManager.channelHeaderWidth + deltaTime - 2;
+       y1 = geoManager.statusHeaderHeight;
+       x2 = 4;
+       y2 = geoManager.timeLineHeight + config.channelRows * geoManager.rowHeight;
     }
+    timeBase = osdManager.requestPixmap(3, cRect(x1, y1, x2, y2));
+    timeBase->Fill(clrTransparent);
+    timeBase->DrawRectangle(cRect(0, 0, timeBase->ViewPort().Width(), timeBase->ViewPort().Height()), theme.Color(clrTimeBase));
 }
 
-
 cImage *cTimeLine::createBackgroundImage(int width, int height, tColor clrBgr, tColor clrBlend) {
     cImage *image = NULL;
-    if (tvguideConfig.style == eStyleBlendingDefault) {
+    if (config.style == eStyleBlendingDefault) {
         image = new cImage(cSize(width, height));
         image->Fill(clrBgr);
         int stepY = 0.5*height / 64;
@@ -239,7 +238,7 @@ cImage *cTimeLine::createBackgroundImage(int width, int height, tColor clrBgr, t
             }
             alpha += 0x04;
         }
-    } else  if (tvguideConfig.style == eStyleBlendingMagick) {
+    } else  if (config.style == eStyleBlendingMagick) {
         cImageLoader imgLoader;
         if (imgLoader.DrawBackground(clrBgr, clrBlend, width, height)) {
             image = new cImage(imgLoader.GetImage());
@@ -252,29 +251,30 @@ cImage *cTimeLine::createBackgroundImage(int width, int height, tColor clrBgr, t
 }
 
 void cTimeLine::setTimeline() {
-    int offset = myTime->GetTimelineOffset();
+    int offset = timeManager->GetTimelineOffset();
     int xNew, yNew;
-    if (tvguideConfig.displayMode == eVertical) {
+    if (config.displayMode == eVertical) {
         xNew = 0;
         yNew = -offset*geoManager.minutePixel;
-    } else if (tvguideConfig.displayMode == eHorizontal) {
+    } else if (config.displayMode == eHorizontal) {
         xNew = -offset*geoManager.minutePixel;
         yNew = 0;
     }
     timeline->SetDrawPortPoint(cPoint(xNew, yNew));
-    if (tvguideConfig.displayTimeBase)
+    if (config.displayTimeBase)
         drawCurrentTimeBase();
 }
 
-void cTimeLine::drawClock() {
-    if (tvguideConfig.displayMode == eVertical)
+bool cTimeLine::drawClock() {
+    cString currentTime = timeManager->GetCurrentTime();
+    if (strcmp(currentTime, lastClock)) {
+       if (config.displayMode == eVertical)
           clock->Fill(clrTransparent);
-    cString currentTime = myTime->GetCurrentTime();
-    const cFont *font = (tvguideConfig.displayMode == eVertical)?fontManager.FontTimeLineTime:fontManager.FontTimeLineTimeHorizontal;
+       const cFont *font = (config.displayMode == eVertical) ? fontManager.FontTimeLineTime : fontManager.FontTimeLineTimeHorizontal;
        int textHeight = font->Height();
        int clockTextWidth = font->Width(*currentTime);
-    tColor colorFontBack = (tvguideConfig.style == eStyleFlat)?theme.Color(clrHeader):clrTransparent;
-    if (tvguideConfig.style == eStyleGraphical) {
+       tColor colorFontBack = (config.style == eStyleFlat) ? theme.Color(clrHeader) : clrTransparent;
+       if (config.style == eStyleGraphical) {
           clock->drawBackgroundGraphical(bgClock);
        } else {
           clock->setColor(theme.Color(clrHeader), theme.Color(clrHeaderBlending));
@@ -282,4 +282,8 @@ void cTimeLine::drawClock() {
           clock->drawBorder();
        }
        clock->DrawText(cPoint((geoManager.clockWidth - clockTextWidth) / 2, (geoManager.clockHeight - textHeight) / 2), *currentTime, theme.Color(clrFont), colorFontBack, font);
+       lastClock = currentTime;
+       return true;
+    }
+    return false;
 }

timeline.h

@@ -1,29 +1,30 @@
 #ifndef __TVGUIDE_TIMELINE_H
 #define __TVGUIDE_TIMELINE_H
 
-#include "timer.h"
+#include "timemanager.h"
 #include "styledpixmap.h"
 
 // --- cTimeLine  -------------------------------------------------------------
 
 class cTimeLine  {
 private:
-    cMyTime *myTime;
+    cTimeManager *timeManager;
     cStyledPixmap *dateViewer;
     cPixmap *timeline;
     cStyledPixmap *clock;
     cPixmap *timeBase;
+    cString lastClock;
     void decorateTile(int posX, int posY, int tileWidth, int tileHeight);
     void drawRoundedCorners(int posX, int posY, int width, int height, int radius);
     cImage *createBackgroundImage(int width, int height, tColor clrBgr, tColor clrBlend);
-    void drawCurrentTimeBase(void);
 public:
-    cTimeLine(cMyTime *myTime);
+    cTimeLine(cTimeManager *timeManager);
     virtual ~cTimeLine(void);
-    void setTimeline();
-    void drawDateViewer();
-    void drawTimeline();
-    void drawClock();
+    void setTimeline(void);
+    void drawDateViewer(void);
+    void drawTimeline(void);
+    void drawCurrentTimeBase(void);
+    bool drawClock();
 };
 
 #endif //__TVGUIDE_TIMELINE_H

timemanager.c

@@ -1,12 +1,12 @@
 #include <time.h>
 #include <vdr/tools.h>
 #include "config.h"
-#include "timer.h"
+#include "timemanager.h"
 
-cMyTime::~cMyTime(void) {
+cTimeManager::~cTimeManager(void) {
 }
 
-cString cMyTime::printTime(time_t displayTime) {
+cString cTimeManager::printTime(time_t displayTime) {
     struct tm *ts;
     ts = localtime(&displayTime);
     cString strTime = cString::sprintf("%d.%d-%d:%d.%d", ts->tm_mday, ts->tm_mon + 1, ts->tm_hour, ts->tm_min, ts->tm_sec);
@@ -14,23 +14,23 @@ cString cMyTime::printTime(time_t displayTime) {
 }
 
 
-void cMyTime::Now() {   
+void cTimeManager::Now() {   
     t = time(0);
     tStart = t;
     tStart = GetRounded();
-    if (tvguideConfig.displayMode == eVertical) {
+    if (config.displayMode == eVertical) {
         tEnd = tStart + (geoManager.osdHeight - geoManager.statusHeaderHeight - geoManager.channelHeaderHeight - geoManager.channelGroupsHeight - geoManager.footerHeight) / geoManager.minutePixel * 60;
-    } else if (tvguideConfig.displayMode == eHorizontal) {
+    } else if (config.displayMode == eHorizontal) {
         tEnd = tStart + (geoManager.osdWidth - geoManager.channelHeaderWidth - geoManager.channelGroupsWidth) / geoManager.minutePixel * 60;
     }
 }
 
-void cMyTime::AddStep(int step) {
+void cTimeManager::AddStep(int step) {
     tStart += step * 60;
     tEnd   += step * 60;
 }
 
-bool cMyTime::DelStep(int step) {
+bool cTimeManager::DelStep(int step) {
     if ((tStart - step * 60) + 30 * 60 < t) {
         return true;
     }
@@ -39,16 +39,16 @@ bool cMyTime::DelStep(int step) {
     return false;
 }
 
-void cMyTime::SetTime(time_t newTime) {
+void cTimeManager::SetTime(time_t newTime) {
     tStart = newTime;
-    if (tvguideConfig.displayMode == eVertical) {
+    if (config.displayMode == eVertical) {
         tEnd = tStart + (geoManager.osdHeight - geoManager.statusHeaderHeight - geoManager.channelHeaderHeight - geoManager.channelGroupsHeight - geoManager.footerHeight) / geoManager.minutePixel * 60;
-    } else if (tvguideConfig.displayMode == eHorizontal) {
+    } else if (config.displayMode == eHorizontal) {
         tEnd = tStart + (geoManager.osdWidth - geoManager.channelHeaderWidth - geoManager.channelGroupsWidth) / geoManager.minutePixel * 60;
     }
 }
 
-time_t cMyTime::getPrevPrimetime(time_t current) {
+time_t cTimeManager::getPrevPrimetime(time_t current) {
     tm *st = localtime(&current);
     if (st->tm_hour < 21) {
         current -= 24 * 60 * 60;
@@ -60,7 +60,7 @@ time_t cMyTime::getPrevPrimetime(time_t current) {
     return primeTime;
 }
 
-time_t cMyTime::getNextPrimetime(time_t current){
+time_t cTimeManager::getNextPrimetime(time_t current){
     tm *st = localtime(&current);
     if (st->tm_hour > 19) {
         current += 24 * 60 * 60;
@@ -72,45 +72,45 @@ time_t cMyTime::getNextPrimetime(time_t current){
     return primeTime;
 }
 
-bool cMyTime::tooFarInPast(time_t current) {
+bool cTimeManager::tooFarInPast(time_t current) {
     if (current < t) {
         return true;
     }
     return false;
 }
 
-cString cMyTime::GetCurrentTime() {
+cString cTimeManager::GetCurrentTime() {
     char buf[25];
     t = time(0);
     tm *st = localtime(&t);
     //snprintf(text, sizeof(text), "%d:%02d", st->tm_hour, st->tm_min);
-    if (tvguideConfig.timeFormat == e12Hours) {
+    if (config.timeFormat == e12Hours) {
         strftime(buf, sizeof(buf), "%I:%M %p", st);
-    } else if (tvguideConfig.timeFormat == e24Hours)
+    } else if (config.timeFormat == e24Hours)
         strftime(buf, sizeof(buf), "%H:%M", st);
     return buf;
     
 }
 
-cString cMyTime::GetDate() {
+cString cTimeManager::GetDate() {
     char text[6];
     tm *st = localtime(&tStart);
     snprintf(text, sizeof(text), "%d.%d", st->tm_mday, st->tm_mon+1);
     return text;
 }
 
-cString cMyTime::GetWeekday() {
+cString cTimeManager::GetWeekday() {
     return WeekDayName(tStart);
 }
 
-int cMyTime::GetTimelineOffset() {
+int cTimeManager::GetTimelineOffset() {
     tm *st = localtime(&tStart);
     int offset = st->tm_hour * 60;
     offset += st->tm_min;
     return offset;
 }
 
-time_t cMyTime::GetRounded() {
+time_t cTimeManager::GetRounded() {
     tm *rounded = localtime ( &tStart );
     rounded->tm_sec = 0;
     if (rounded->tm_min > 29)
@@ -120,14 +120,13 @@ time_t cMyTime::GetRounded() {
     return mktime(rounded);
 }
 
-bool cMyTime::NowVisible(void) {
+bool cTimeManager::NowVisible(void) {
     if (t > tStart)
         return true;
     return false;
 }
 
-
-void cMyTime::debug() {
+void cTimeManager::debug() {
     esyslog("t: %s, tStart: %s, tEnd: %s", *TimeString(t), *TimeString(tStart), *TimeString(tEnd));
 }
 

timemanager.h

@@ -1,18 +1,18 @@
-#ifndef __TVGUIDE_TIMER_H
-#define __TVGUIDE_TIMER_H
+#ifndef __TVGUIDE_TIMEMANAGER_H
+#define __TVGUIDE_TIMEMANAGER_H
 
 #include <vdr/tools.h>
 
-// --- cMyTime ------------------------------------------------------------- 
+// --- cTimeManager ------------------------------------------------------------- 
 
-class cMyTime {
+class cTimeManager {
     private:
         time_t t;
         time_t tStart;
         time_t tEnd;
     public:
-        cMyTime(){};
-        virtual ~cMyTime(void);
+        cTimeManager(){};
+        virtual ~cTimeManager(void);
         static cString printTime(time_t displayTime);
         void Now();
         time_t GetNow() { return t; };
@@ -49,4 +49,4 @@ class cTimeInterval {
         cTimeInterval *Union(cTimeInterval *interval);
 };
 
-#endif //__TVGUIDE_TIMER_H
+#endif //__TVGUIDE_TIMEMANAGER_H

timerconflict.c

@@ -2,7 +2,7 @@
 #include <vector>
 #include <vdr/timers.h>
 #include "tools.h"
-#include "timer.h"
+#include "timemanager.h"
 #include "timerconflict.h"
 
 cTVGuideTimerConflict::cTVGuideTimerConflict(void) {
@@ -71,7 +71,7 @@ void cTVGuideTimerConflicts::AddConflict(std::string epgSearchConflictLine) {
     splitstring s3(flds2[2].c_str());
     std::vector<std::string> flds3 = s3.split('#');
     std::vector<int> timerIDs;
-    for (int k = 0; k < flds3.size(); k++) {
+    for (int k = 0; k < (int)flds3.size(); k++) {
         timerIDs.push_back(atoi(flds3[k].c_str()) - 1);
     }
     conflict->timerIDs = timerIDs;
@@ -80,18 +80,17 @@ void cTVGuideTimerConflicts::AddConflict(std::string epgSearchConflictLine) {
 
 void cTVGuideTimerConflicts::CalculateConflicts(void) {
     numConflicts = conflicts.size();
-//    time_t startTime = 0;
-//    time_t endTime = 0;
     for (int i=0; i < numConflicts; i++) {
         cTimeInterval *unionSet = NULL;
         int numTimers = conflicts[i]->timerIDs.size();
-        for (int j=0; j < numTimers; j++) {
 #if VDRVERSNUM >= 20301
         LOCK_TIMERS_READ;
-            const cTimer *timer = Timers->Get(conflicts[i]->timerIDs[j]);
+        const cTimers* timers = Timers;
 #else
-            const cTimer *timer = Timers.Get(conflicts[i]->timerIDs[j]);
+        const cTimers* timers = &Timers;
 #endif
+        for (int j=0; j < numTimers; j++) {
+            const cTimer *timer = timers->Get(conflicts[i]->timerIDs[j]);
             if (timer) {
                 if (!unionSet) {
                     unionSet = new cTimeInterval(timer->StartTime(), timer->StopTime());
@@ -110,12 +109,7 @@ void cTVGuideTimerConflicts::CalculateConflicts(void) {
         
         cTimeInterval *intersect = NULL;
         for (int j=0; j < numTimers; j++) {
-#if VDRVERSNUM >= 20301
-            LOCK_TIMERS_READ;
-            const cTimer *timer = Timers->Get(conflicts[i]->timerIDs[j]);
-#else
-            const cTimer *timer = Timers.Get(conflicts[i]->timerIDs[j]);
-#endif
+            const cTimer *timer = timers->Get(conflicts[i]->timerIDs[j]);
             if (timer) {
                 if (!intersect) {
                     intersect = new cTimeInterval(timer->StartTime(), timer->StopTime());

tools.c

@@ -144,7 +144,7 @@ std::vector<std::string>& splitstring::split(char delim, int rep) {
     std::string work = data();
     std::string buf = "";
     int i = 0;
-    while (i < work.length()) {
+    while (i < (int)work.length()) {
         if (work[i] != delim)
             buf += work[i];
         else if (rep == 1) {

tvguide.c

@@ -12,6 +12,7 @@
 #include <vdr/plugin.h>
 #include <vdr/device.h>
 #include <vdr/menu.h>
+#include <Magick++.h>
 
 #define DEFINE_CONFIG 1
 #include "geometrymanager.h"
@@ -26,8 +27,8 @@
 #error "VDR-2.0.0 API version or greater is required!"
 #endif
 
-static const char *VERSION        = "1.2.3";
-static const char *DESCRIPTION    = "A fancy 2d EPG Viewer";
+static const char *VERSION        = "1.2.12";
+static const char *DESCRIPTION    = tr("A fancy 2d EPG Viewer");
 static const char *MAINMENUENTRY  = "Tvguide";
 
 class cPluginTvguide : public cPlugin {
@@ -35,7 +36,7 @@ public:
   cPluginTvguide(void);
   virtual ~cPluginTvguide();
   virtual const char *Version(void) { return VERSION; }
-  virtual const char *Description(void) { return DESCRIPTION; }
+  virtual const char *Description(void) { return tr(DESCRIPTION); }
   virtual const char *CommandLineHelp(void);
   virtual bool ProcessArgs(int argc, char *argv[]);
   virtual bool Initialize(void);
@@ -45,7 +46,7 @@ public:
   virtual void MainThreadHook(void);
   virtual cString Active(void);
   virtual time_t WakeupTime(void);
-  virtual const char *MainMenuEntry(void) { return (tvguideConfig.showMainMenuEntry)?MAINMENUENTRY:NULL; }
+  virtual const char *MainMenuEntry(void) { return (config.showMainMenuEntry) ? MAINMENUENTRY : NULL; }
   virtual cOsdObject *MainMenuAction(void);
   virtual cMenuSetupPage *SetupMenu(void);
   virtual bool SetupParse(const char *Name, const char *Value);
@@ -63,8 +64,8 @@ cPluginTvguide::~cPluginTvguide() {
 const char *cPluginTvguide::CommandLineHelp(void) {
     return 
          "  -e <IMAGESDIR>, --epgimages=<IMAGESDIR>  Set directory where epgimages are stored.\n"
-	       "  -i <ICONDIR>, --icons=<ICONDIR>         Set directory where icons are stored.\n"
-         "  -l <LOGODIR>, --logodir=<LOGODIR>       Set directory where logos are stored.\n";
+         "  -i <ICONDIR>,   --iconpath=<ICONDIR>     Set directory where icons are stored.\n"
+         "  -l <LOGODIR>,   --logopath=<LOGODIR>     Set directory where logos are stored.\n";
 }
 
 bool cPluginTvguide::ProcessArgs(int argc, char *argv[]) {
@@ -78,13 +79,13 @@ bool cPluginTvguide::ProcessArgs(int argc, char *argv[]) {
   while ((c = getopt_long(argc, argv, "e:i:l:", long_options, NULL)) != -1) {
     switch (c) {
       case 'e':
-        tvguideConfig.SetImagesPath(cString(optarg));
+        config.SetImagesPath(cString(optarg));
         break;
       case 'i':
-      	tvguideConfig.SetIconsPath(cString(optarg));
+      	config.SetIconsPath(cString(optarg));
 	      break;
       case 'l':
-        tvguideConfig.SetLogoPath(cString(optarg));
+        config.SetLogoPath(cString(optarg));
         break;
       default:
         return false;
@@ -93,11 +94,15 @@ bool cPluginTvguide::ProcessArgs(int argc, char *argv[]) {
   return true;
 }
 
+__attribute__((constructor)) static void init(void) {
+   Magick::InitializeMagick(NULL);
+}
+
 bool cPluginTvguide::Initialize(void) {
-    tvguideConfig.SetDefaultPathes();
-    tvguideConfig.LoadTheme();
-    tvguideConfig.SetStyle();
-    tvguideConfig.setDynamicValues();
+    config.SetDefaultPathes();
+    config.LoadTheme();
+    config.SetStyle();
+    config.setDynamicValues();
     geoManager.SetGeometry(cOsd::OsdWidth(), cOsd::OsdHeight());
     fontManager.SetFonts();
     imgCache.CreateCache();
@@ -134,11 +139,11 @@ cMenuSetupPage *cPluginTvguide::SetupMenu(void) {
 }
 
 bool cPluginTvguide::SetupParse(const char *Name, const char *Value) {
-  return tvguideConfig.SetupParse(Name, Value);
+  return config.SetupParse(Name, Value);
 }
 
 bool cPluginTvguide::Service(const char *Id, void *Data) {
-  if (strcmp(Id, "MainMenuHooksPatch-v1.0::osSchedule") == 0 && tvguideConfig.replaceOriginalSchedule != 0) {
+  if (strcmp(Id, "MainMenuHooksPatch-v1.0::osSchedule") == 0 && config.replaceOriginalSchedule != 0) {
       if (Data == NULL)
          return true;
       cOsdObject **guide = (cOsdObject**) Data;

tvguideosd.c

@@ -15,14 +15,14 @@ cTvGuideOsd::cTvGuideOsd(void) {
     detailViewActive = false;
     activeGrid = NULL;
     timeLine = NULL;
-    recMenuManager = NULL;
+    recMenuView = NULL;
     channelJumper = NULL;
 }
 
 cTvGuideOsd::~cTvGuideOsd() {
-    delete myTime;
+    delete timeManager;
     columns.Clear();
-    if (tvguideConfig.displayStatusHeader) {
+    if (config.displayStatusHeader) {
         delete statusHeader;
     }
     if (detailView)
@@ -30,7 +30,7 @@ cTvGuideOsd::~cTvGuideOsd() {
     delete timeLine;
     delete channelGroups;
     delete footer;
-    delete recMenuManager;
+    delete recMenuView;
     if (channelJumper)
         delete channelJumper;
     osdManager.deleteOsd();
@@ -41,9 +41,9 @@ void cTvGuideOsd::Show(void) {
     bool ok = false;
     ok = osdManager.setOsd();
     if (ok) {
-        bool themeChanged = tvguideConfig.LoadTheme();
-        tvguideConfig.SetStyle();
-        tvguideConfig.setDynamicValues();
+        bool themeChanged = config.LoadTheme();
+        config.SetStyle();
+        config.setDynamicValues();
         bool geoChanged = geoManager.SetGeometry(cOsd::OsdWidth(), cOsd::OsdHeight());
         if (themeChanged || geoChanged) {
             fontManager.DeleteFonts();
@@ -52,15 +52,15 @@ void cTvGuideOsd::Show(void) {
             imgCache.CreateCache();
         }
         osdManager.setBackground();
-        myTime = new cMyTime();
-        myTime->Now();
+        timeManager = new cTimeManager();
+        timeManager->Now();
         SwitchTimers.Load(AddDirectory(cPlugin::ConfigDirectory("epgsearch"), "epgsearchswitchtimers.conf"));
-        recMenuManager = new cRecMenuManager();
+        recMenuView = new cRecMenuView();
         pRemoteTimers = cPluginManager::CallFirstService("RemoteTimers::RefreshTimers-v1.0", NULL);
         if (pRemoteTimers) {
             isyslog("tvguide: remotetimers-plugin is available");
         }
-        if (tvguideConfig.useRemoteTimers && pRemoteTimers) {
+        if (config.useRemoteTimers && pRemoteTimers) {
             cString errorMsg;
             if (!pRemoteTimers->Service("RemoteTimers::RefreshTimers-v1.0", &errorMsg)) {
                 esyslog("tvguide: %s", *errorMsg);
@@ -73,7 +73,7 @@ void cTvGuideOsd::Show(void) {
 
 void cTvGuideOsd::drawOsd() {
     cPixmap::Lock();
-    int numBack = tvguideConfig.numGrids / 2;
+    int numBack = config.numGrids / 2;
     int offset = 0;
     const cChannel *newStartChannel;
 #if VDRVERSNUM >= 20301
@@ -106,21 +106,21 @@ void cTvGuideOsd::drawOsd() {
     if (offset < 0)
         offset = 0;
     
-    if (tvguideConfig.displayStatusHeader) {
+    if (config.displayStatusHeader) {
         statusHeader = new cStatusHeader();
         statusHeader->Draw();
         statusHeader->ScaleVideo();
     }
-    timeLine = new cTimeLine(myTime);
+    timeLine = new cTimeLine(timeManager);
     timeLine->drawDateViewer();
     timeLine->drawTimeline();
     timeLine->drawClock();
     channelGroups = new cChannelGroups();
     channelGroups->ReadChannelGroups();
     footer = new cFooter(channelGroups);
-    recMenuManager->SetFooter(footer);
+    recMenuView->SetFooter(footer);
     footer->drawRedButton();
-    if (tvguideConfig.channelJumpMode == eNumJump) {
+    if (config.channelJumpMode == eNumJump) {
         footer->drawGreenButton();
         footer->drawYellowButton();
     }
@@ -139,16 +139,20 @@ void cTvGuideOsd::readChannels(const cChannel *channelStart) {
     if (!channelStart)
         return;
 #if VDRVERSNUM >= 20301
+    const cChannels *channels;
+    {
     LOCK_CHANNELS_READ;
-    for (const cChannel *channel = channelStart; channel; channel = Channels->Next(channel)) {
+    channels = Channels;
+    }
 #else
-    for (const cChannel *channel = channelStart; channel; channel = Channels.Next(channel)) {
+    cChannels *channels = &Channels;
 #endif
+    for (const cChannel *channel = channelStart; channel; channel = channels->Next(channel)) {
         if (!channel->GroupSep()) {
             if (channelGroups->IsInLastGroup(channel)) {
                 break;
             }
-            cChannelColumn *column = new cChannelColumn(i, channel, myTime);
+            cChannelEpg *column = new cChannelEpg(i, channel, timeManager);
             if (column->readGrids()) {
                 columns.Add(column);
                 i++;
@@ -156,20 +160,16 @@ void cTvGuideOsd::readChannels(const cChannel *channelStart) {
                 delete column;
             }
         }
-        if (i == tvguideConfig.numGrids) {
+        if (i == config.numGrids) {
             foundEnough = true;
             break;
         }
     }
     if (!foundEnough) {
         int numCurrent = columns.Count();
-        int numBack = tvguideConfig.numGrids - numCurrent;
+        int numBack = config.numGrids - numCurrent;
         int newChannelNumber = columns.First()->getChannel()->Number() - numBack;
-#if VDRVERSNUM >= 20301
-        const cChannel *newStart = Channels->GetByNumber(newChannelNumber);
-#else
-        const cChannel *newStart = Channels.GetByNumber(newChannelNumber);
-#endif
+        const cChannel *newStart = channels->GetByNumber(newChannelNumber);
         readChannels(newStart);
     }
 }
@@ -180,16 +180,16 @@ void cTvGuideOsd::drawGridsChannelJump(int offset) {
     activeGrid = columns.Get(offset)->getActive();
     if (activeGrid)
         activeGrid->SetActive();
-    if (tvguideConfig.displayStatusHeader) {
+    if (config.displayStatusHeader) {
         statusHeader->DrawInfoText(activeGrid);
     }
-    if (activeGrid && (tvguideConfig.channelJumpMode == eGroupJump)) {
+    if (activeGrid && (config.channelJumpMode == eGroupJump)) {
         footer->UpdateGroupButtons(activeGrid->column->getChannel());
     }
-    if (tvguideConfig.displayChannelGroups) {
+    if (config.displayChannelGroups) {
         channelGroups->DrawChannelGroups(columns.First()->getChannel(), columns.Last()->getChannel());
     }
-    for (cChannelColumn *column = columns.First(); column; column = columns.Next(column)) {
+    for (cChannelEpg *column = columns.First(); column; column = columns.Next(column)) {
         column->createHeader();
         column->drawGrids();
     }
@@ -198,13 +198,13 @@ void cTvGuideOsd::drawGridsChannelJump(int offset) {
 void cTvGuideOsd::drawGridsTimeJump() {
     if (columns.Count() == 0)
         return;
-    cChannelColumn *colActive = NULL;
+    cChannelEpg *colActive = NULL;
     if (activeGrid) {
         colActive = activeGrid->column;
     } else {
         colActive = columns.First();
     }
-    for (cChannelColumn *column = columns.First(); column; column = columns.Next(column)) {
+    for (cChannelEpg *column = columns.First(); column; column = columns.Next(column)) {
         column->clearGrids();
         column->readGrids();
         column->drawGrids();
@@ -213,13 +213,13 @@ void cTvGuideOsd::drawGridsTimeJump() {
     if (activeGrid) {
         activeGrid->SetActive();
         activeGrid->Draw();
-        if (tvguideConfig.displayStatusHeader) {
+        if (config.displayStatusHeader) {
             statusHeader->DrawInfoText(activeGrid);
         }
     }
 }
 
-void cTvGuideOsd::setNextActiveGrid(cGrid *next) {
+void cTvGuideOsd::setNextActiveGrid(cGridElement *next) {
     if (!next || !activeGrid) {
         return;
     }
@@ -228,28 +228,31 @@ void cTvGuideOsd::setNextActiveGrid(cGrid *next) {
     activeGrid = next;
     activeGrid->SetActive();
     activeGrid->Draw();
-    if (tvguideConfig.displayStatusHeader) {
+    if (config.displayStatusHeader) {
         statusHeader->DrawInfoText(activeGrid);
     }
 }
 
 void cTvGuideOsd::channelForward() {
-    cChannelColumn *colRight = columns.Next(activeGrid->column);
+    cChannelEpg *colRight = columns.Next(activeGrid->column);
     bool colAdded = false;
     if (!colRight) {
         const cChannel *channelRight = activeGrid->column->getChannel();
+        const cChannels *channels;
 #if VDRVERSNUM >= 20301
         {
         LOCK_CHANNELS_READ;
-        while (channelRight = Channels->Next(channelRight)) {
+        channels = Channels;
+        }
 #else
-        while (channelRight = Channels.Next(channelRight)) {
+        channels = &Channels;
 #endif
+        while (channelRight = channels->Next(channelRight)) {
             if (!channelRight->GroupSep()) {
                 if (channelGroups->IsInLastGroup(channelRight)) {
                     break;
                 }
-                colRight = new cChannelColumn(tvguideConfig.numGrids - 1, channelRight, myTime);
+                colRight = new cChannelEpg(config.numGrids - 1, channelRight, timeManager);
                 if (colRight->readGrids()) {
                     break;
                 } else {
@@ -258,16 +261,13 @@ void cTvGuideOsd::channelForward() {
                 }
             }
         }
-#if VDRVERSNUM >= 20301
-        } //LOCK_CHANNELS_READ
-#endif
         if (colRight) {
             colAdded = true;
-            if (columns.Count() == tvguideConfig.numGrids) {
-                cChannelColumn *cFirst = columns.First();
+            if (columns.Count() == config.numGrids) {
+                cChannelEpg *cFirst = columns.First();
                 columns.Del(cFirst);
             }
-            for (cChannelColumn *column = columns.First(); column; column = columns.Next(column)) {
+            for (cChannelEpg *column = columns.First(); column; column = columns.Next(column)) {
                 column->SetNum(column->GetNum() - 1);
                 column->drawHeader();
                 column->drawGrids();
@@ -278,34 +278,37 @@ void cTvGuideOsd::channelForward() {
         }
     }
     if (colRight) {
-        cGrid *right = colRight->getNeighbor(activeGrid);
+        cGridElement *right = colRight->getNeighbor(activeGrid);
         if (right) {
             setNextActiveGrid(right);
         }
     }
-    if (tvguideConfig.displayChannelGroups && colAdded) {
+    if (config.displayChannelGroups && colAdded) {
         channelGroups->DrawChannelGroups(columns.First()->getChannel(), columns.Last()->getChannel());
     }
-    if (activeGrid && (tvguideConfig.channelJumpMode == eGroupJump)) {
+    if (activeGrid && (config.channelJumpMode == eGroupJump)) {
         footer->UpdateGroupButtons(activeGrid->column->getChannel());
     }
     osdManager.flush();
 }
 
 void cTvGuideOsd::channelBack() {
-    cChannelColumn *colLeft = columns.Prev(activeGrid->column);
+    cChannelEpg *colLeft = columns.Prev(activeGrid->column);
     bool colAdded = false;
     if (!colLeft) {
         const cChannel *channelLeft = activeGrid->column->getChannel();
+        const cChannels *channels;
 #if VDRVERSNUM >= 20301
 	{
 	LOCK_CHANNELS_READ;
-	while (channelLeft = Channels->Prev(channelLeft)) {
+	channels = Channels;
+        }
 #else
-        while (channelLeft = Channels.Prev(channelLeft)) {
+        channels = &Channels;
 #endif
+        while (channelLeft = channels->Prev(channelLeft)) {
             if (!channelLeft->GroupSep()) {
-                colLeft = new cChannelColumn(0, channelLeft, myTime);
+                colLeft = new cChannelEpg(0, channelLeft, timeManager);
                 if (colLeft->readGrids()) {
                     break;
                 } else {
@@ -314,16 +317,13 @@ void cTvGuideOsd::channelBack() {
                 }
             }
         }
-#if VDRVERSNUM >= 20301
-	} //LOCK_CHANNELS_READ
-#endif
         if (colLeft) {
             colAdded = true;
-            if (columns.Count() == tvguideConfig.numGrids) {
-                cChannelColumn *cLast = columns.Last();
+            if (columns.Count() == config.numGrids) {
+                cChannelEpg *cLast = columns.Last();
                 columns.Del(cLast);
             }
-            for (cChannelColumn *column = columns.First(); column; column = columns.Next(column)) {
+            for (cChannelEpg *column = columns.First(); column; column = columns.Next(column)) {
                 column->SetNum(column->GetNum() + 1);
                 column->drawHeader();
                 column->drawGrids();
@@ -335,16 +335,16 @@ void cTvGuideOsd::channelBack() {
     }
 
     if (colLeft) {
-        cGrid *left = colLeft->getNeighbor(activeGrid);
+        cGridElement *left = colLeft->getNeighbor(activeGrid);
         if (left) {
             setNextActiveGrid(left);
         }
     }
-    if (tvguideConfig.displayChannelGroups && colAdded) {
+    if (config.displayChannelGroups && colAdded) {
         channelGroups->DrawChannelGroups(columns.First()->getChannel(), columns.Last()->getChannel());
     }
 
-    if (activeGrid && (tvguideConfig.channelJumpMode == eGroupJump)) {
+    if (activeGrid && (config.channelJumpMode == eGroupJump)) {
         footer->UpdateGroupButtons(activeGrid->column->getChannel());
     }
     osdManager.flush();
@@ -352,14 +352,14 @@ void cTvGuideOsd::channelBack() {
 
 void cTvGuideOsd::timeForward() {
     bool actionDone = false;
-    if ( (myTime->GetEnd() - activeGrid->EndTime())/60 < 30 ) {
+    if ((timeManager->GetEnd() - activeGrid->EndTime())/60 < 30 ) {
         ScrollForward();
         actionDone = true;
     }
-    cGrid *next = activeGrid->column->getNext(activeGrid);
+    cGridElement *next = activeGrid->column->getNext(activeGrid);
     if (next) {
-        if (   (next->EndTime() < myTime->GetEnd())
-            || ( (myTime->GetEnd() - next->StartTime())/60 > 30 ) ) {
+        if (   (next->EndTime() < timeManager->GetEnd())
+            || ( (timeManager->GetEnd() - next->StartTime())/60 > 30 ) ) {
             setNextActiveGrid(next);
             actionDone = true;
         }
@@ -371,11 +371,10 @@ void cTvGuideOsd::timeForward() {
 }
 
 void cTvGuideOsd::ScrollForward() {
-    myTime->AddStep(tvguideConfig.stepMinutes);
+    timeManager->AddStep(config.stepMinutes);
     timeLine->drawDateViewer();
-    timeLine->drawClock();
     timeLine->setTimeline();
-    for (cChannelColumn *column = columns.First(); column; column = columns.Next(column)) {
+    for (cChannelEpg *column = columns.First(); column; column = columns.Next(column)) {
         column->AddNewGridsAtEnd();
         column->ClearOutdatedStart();
         column->drawGrids();
@@ -384,14 +383,14 @@ void cTvGuideOsd::ScrollForward() {
 
 void cTvGuideOsd::timeBack() {
     bool actionDone = false;
-    if ( (activeGrid->StartTime() - myTime->GetStart())/60 < 30 ) {
+    if ((activeGrid->StartTime() - timeManager->GetStart())/60 < 30 ) {
         ScrollBack();
         actionDone = true;
     }
-    cGrid *prev = activeGrid->column->getPrev(activeGrid);
+    cGridElement *prev = activeGrid->column->getPrev(activeGrid);
     if (prev) {
-        if (   (prev->StartTime() > myTime->GetStart())
-            || ( (prev->EndTime() - myTime->GetStart())/60 > 30 )
+        if (   (prev->StartTime() > timeManager->GetStart())
+            || ( (prev->EndTime() - timeManager->GetStart())/60 > 30 )
             || ( prev->isFirst()) ) {
             setNextActiveGrid(prev);
             actionDone = true;
@@ -404,13 +403,12 @@ void cTvGuideOsd::timeBack() {
 }
 
 void cTvGuideOsd::ScrollBack() {
-    bool tooFarInPast = myTime->DelStep(tvguideConfig.stepMinutes);
+    bool tooFarInPast = timeManager->DelStep(config.stepMinutes);
     if (tooFarInPast)
         return;
     timeLine->drawDateViewer();
-    timeLine->drawClock();
     timeLine->setTimeline();
-    for (cChannelColumn *column = columns.First(); column; column = columns.Next(column)) {
+    for (cChannelEpg *column = columns.First(); column; column = columns.Next(column)) {
         column->AddNewGridsAtStart();
         column->ClearOutdatedEnd();
         column->drawGrids();
@@ -421,9 +419,9 @@ void cTvGuideOsd::processKeyUp() {
     if (!activeGrid) {
         return;
     }
-    if (tvguideConfig.displayMode == eVertical) {
+    if (config.displayMode == eVertical) {
         timeBack();
-    } else if (tvguideConfig.displayMode == eHorizontal) {
+    } else if (config.displayMode == eHorizontal) {
         channelBack();
     }
 }
@@ -432,9 +430,9 @@ void cTvGuideOsd::processKeyDown() {
     if (!activeGrid) {
             return;
     }
-    if (tvguideConfig.displayMode == eVertical) {
+    if (config.displayMode == eVertical) {
         timeForward();
-    } else if (tvguideConfig.displayMode == eHorizontal) {
+    } else if (config.displayMode == eHorizontal) {
         channelForward();
     }
 }
@@ -442,9 +440,9 @@ void cTvGuideOsd::processKeyDown() {
 void cTvGuideOsd::processKeyLeft() {
     if (activeGrid == NULL)
         return;
-    if (tvguideConfig.displayMode == eVertical) {
+    if (config.displayMode == eVertical) {
         channelBack();
-    } else if (tvguideConfig.displayMode == eHorizontal) {
+    } else if (config.displayMode == eHorizontal) {
         timeBack();
     }
 }
@@ -452,9 +450,9 @@ void cTvGuideOsd::processKeyLeft() {
 void cTvGuideOsd::processKeyRight() {
     if (activeGrid == NULL)
         return;
-    if (tvguideConfig.displayMode == eVertical) {
+    if (config.displayMode == eVertical) {
         channelForward();
-    } else if (tvguideConfig.displayMode == eHorizontal) {
+    } else if (config.displayMode == eHorizontal) {
         timeForward();
     }
 }
@@ -462,7 +460,7 @@ void cTvGuideOsd::processKeyRight() {
 void cTvGuideOsd::processKeyRed() {
     if  ((activeGrid == NULL) || activeGrid->isDummy())
         return;
-    recMenuManager->Start(activeGrid->GetEvent());
+    recMenuView->Start(activeGrid->GetEvent());
 }
 
 void cTvGuideOsd::processKeyGreen() {
@@ -474,7 +472,7 @@ void cTvGuideOsd::processKeyGreen() {
     int currentCol = activeGrid->column->GetNum();
     const cChannel *prev = NULL;
     
-    if (tvguideConfig.channelJumpMode == eGroupJump) {
+    if (config.channelJumpMode == eGroupJump) {
         int prevNum = channelGroups->GetPrevGroupChannelNumber(currentChannel);
         if (prevNum) {
 #if VDRVERSNUM >= 20301
@@ -484,8 +482,8 @@ void cTvGuideOsd::processKeyGreen() {
             prev = Channels.GetByNumber(prevNum);
 #endif
         }    
-    } else if (tvguideConfig.channelJumpMode == eNumJump) {
-        int i = tvguideConfig.jumpChannels + 1;
+    } else if (config.channelJumpMode == eNumJump) {
+        int i = config.jumpChannels + 1;
 #if VDRVERSNUM >= 20301
         LOCK_CHANNELS_READ;
         for (const cChannel *channel = firstChannel; channel; channel = Channels->Prev(channel)) {
@@ -503,7 +501,7 @@ void cTvGuideOsd::processKeyGreen() {
     if (prev) {
         readChannels(prev);
         if (columns.Count() > 0) {
-            if (tvguideConfig.channelJumpMode == eGroupJump)
+            if (config.channelJumpMode == eGroupJump)
                 drawGridsChannelJump();
             else
                 drawGridsChannelJump(currentCol);
@@ -520,7 +518,7 @@ void cTvGuideOsd::processKeyYellow() {
     const cChannel *firstChannel = columns.First()->getChannel();
     const cChannel *next = NULL;
     
-    if (tvguideConfig.channelJumpMode == eGroupJump) {
+    if (config.channelJumpMode == eGroupJump) {
         int nextNum = channelGroups->GetNextGroupChannelNumber(currentChannel);
         if (nextNum) {
 #if VDRVERSNUM >= 20301
@@ -530,7 +528,7 @@ void cTvGuideOsd::processKeyYellow() {
             next = Channels.GetByNumber(nextNum);
 #endif
         }    
-    } else if (tvguideConfig.channelJumpMode == eNumJump) {
+    } else if (config.channelJumpMode == eNumJump) {
         int i=0;
 #if VDRVERSNUM >= 20301
         LOCK_CHANNELS_READ;
@@ -545,7 +543,7 @@ void cTvGuideOsd::processKeyYellow() {
                 next = channel;
                 i++;
             }
-            if (i == (tvguideConfig.jumpChannels+1)) {
+            if (i == (config.jumpChannels+1)) {
                 break;
             }
         }
@@ -553,7 +551,7 @@ void cTvGuideOsd::processKeyYellow() {
     if (next) {
         readChannels(next);
         if (columns.Count() > 0) {
-            if (tvguideConfig.channelJumpMode == eGroupJump)
+            if (config.channelJumpMode == eGroupJump)
                 drawGridsChannelJump();
             else
                 drawGridsChannelJump(currentCol);
@@ -563,22 +561,22 @@ void cTvGuideOsd::processKeyYellow() {
 }
 
 eOSState cTvGuideOsd::processKeyBlue(bool *alreadyUnlocked) {
-    if (tvguideConfig.blueKeyMode == eBlueKeySwitch) {
+    if (config.blueKeyMode == eBlueKeySwitch) {
         return ChannelSwitch(alreadyUnlocked);
-    } else if (tvguideConfig.blueKeyMode == eBlueKeyEPG) {
+    } else if (config.blueKeyMode == eBlueKeyEPG) {
         DetailedEPG();
-    } else if (tvguideConfig.blueKeyMode == eBlueKeyFavorites) {
-        recMenuManager->StartFavorites();
+    } else if (config.blueKeyMode == eBlueKeyFavorites) {
+        recMenuView->StartFavorites();
     }
     return osContinue;
 }
 
 eOSState cTvGuideOsd::processKeyOk(bool *alreadyUnlocked) {
-    if (tvguideConfig.blueKeyMode == eBlueKeySwitch) {
+    if (config.blueKeyMode == eBlueKeySwitch) {
         DetailedEPG();
-    } else if (tvguideConfig.blueKeyMode == eBlueKeyEPG) {
+    } else if (config.blueKeyMode == eBlueKeyEPG) {
         return ChannelSwitch(alreadyUnlocked);
-    } else if (tvguideConfig.blueKeyMode == eBlueKeyFavorites) {
+    } else if (config.blueKeyMode == eBlueKeyFavorites) {
         DetailedEPG();
     }
     return osContinue;
@@ -592,7 +590,7 @@ eOSState cTvGuideOsd::ChannelSwitch(bool *alreadyUnlocked) {
         cPixmap::Unlock();
         *alreadyUnlocked = true;
         cDevice::PrimaryDevice()->SwitchChannel(currentChannel, true);
-        if (tvguideConfig.closeOnSwitch) {
+        if (config.closeOnSwitch) {
             if (detailView) {
                 delete detailView;
                 detailView = NULL;
@@ -616,7 +614,7 @@ void cTvGuideOsd::DetailedEPG() {
 }
 
 void cTvGuideOsd::processNumKey(int numKey) {
-    if (tvguideConfig.numkeyMode == 0) {
+    if (config.numkeyMode == 0) {
         //timely jumps with 1,3,4,6,7,9
         TimeJump(numKey);
     } else {
@@ -628,38 +626,38 @@ void cTvGuideOsd::processNumKey(int numKey) {
 void cTvGuideOsd::TimeJump(int mode) {
     switch (mode) {
         case 1: {
-            bool tooFarInPast = myTime->DelStep(tvguideConfig.bigStepHours*60);
+            bool tooFarInPast = timeManager->DelStep(config.bigStepHours*60);
             if (tooFarInPast)
                 return;
         }
             break;
         case 3: {
-            myTime->AddStep(tvguideConfig.bigStepHours*60);
+            timeManager->AddStep(config.bigStepHours*60);
         }
             break;
         case 4: {
-            bool tooFarInPast = myTime->DelStep(tvguideConfig.hugeStepHours*60);
+            bool tooFarInPast = timeManager->DelStep(config.hugeStepHours*60);
             if (tooFarInPast)
                 return;
         }
             break;
         case 6: {
-            myTime->AddStep(tvguideConfig.hugeStepHours*60);
+            timeManager->AddStep(config.hugeStepHours*60);
         }
             break;
         case 7: {
-            cMyTime primeChecker;
+            cTimeManager primeChecker;
             primeChecker.Now();
-            time_t prevPrime = primeChecker.getPrevPrimetime(myTime->GetStart());
+            time_t prevPrime = primeChecker.getPrevPrimetime(timeManager->GetStart());
             if (primeChecker.tooFarInPast(prevPrime))
                 return;
-            myTime->SetTime(prevPrime);
+            timeManager->SetTime(prevPrime);
         }
             break;
         case 9: {
-            cMyTime primeChecker;
-            time_t nextPrime = primeChecker.getNextPrimetime(myTime->GetStart());
-            myTime->SetTime(nextPrime);
+            cTimeManager primeChecker;
+            time_t nextPrime = primeChecker.getNextPrimetime(timeManager->GetStart());
+            timeManager->SetTime(nextPrime);
         }
             break;
         default:
@@ -672,9 +670,14 @@ void cTvGuideOsd::TimeJump(int mode) {
     osdManager.flush();
 }
 
+int cTvGuideOsd::GetLastValidChannel(void) {
+    return channelGroups->GetLastValidChannel();
+}
+
 void cTvGuideOsd::ChannelJump(int num) {
     if (!channelJumper) {
-        channelJumper = new cChannelJump(channelGroups);
+        int lastValidChannel = GetLastValidChannel();
+        channelJumper = new cChannelJump(channelGroups, lastValidChannel);
     }
     channelJumper->Set(num);
     channelJumper->DrawText();
@@ -708,7 +711,7 @@ void cTvGuideOsd::CheckTimeout(void) {
 }
 
 void cTvGuideOsd::SetTimers() {
-    for (cChannelColumn *column = columns.First(); column; column = columns.Next(column)) {
+    for (cChannelEpg *column = columns.First(); column; column = columns.Next(column)) {
         column->SetTimers();
     }
 }
@@ -717,8 +720,8 @@ eOSState cTvGuideOsd::ProcessKey(eKeys Key) {
     eOSState state = osContinue;
     cPixmap::Lock();
     bool alreadyUnlocked = false;
-    if (recMenuManager->isActive()) {
-        state = recMenuManager->ProcessKey(Key);
+    if (recMenuView->isActive()) {
+        state = recMenuView->ProcessKey(Key);
         if (state == osEnd) {
             SetTimers();                
             osdManager.flush();
@@ -734,13 +737,13 @@ eOSState cTvGuideOsd::ProcessKey(eKeys Key) {
             delete detailView;
             detailView = NULL;
             detailViewActive = false;
-            if ((tvguideConfig.blueKeyMode == eBlueKeySwitch) || (tvguideConfig.blueKeyMode == eBlueKeyFavorites)) {
+            if ((config.blueKeyMode == eBlueKeySwitch) || (config.blueKeyMode == eBlueKeyFavorites)) {
                 state = ChannelSwitch(&alreadyUnlocked);
             } else {
                 osdManager.flush();
                 state = osContinue;
             }
-        } else if ((Key & ~k_Repeat) == kOk && (tvguideConfig.blueKeyMode == eBlueKeyEPG)) {
+        } else if ((Key & ~k_Repeat) == kOk && (config.blueKeyMode == eBlueKeyEPG)) {
             delete detailView;
             detailView = NULL;
             detailViewActive = false;
@@ -771,6 +774,10 @@ eOSState cTvGuideOsd::ProcessKey(eKeys Key) {
             case kNone:     if (channelJumper) CheckTimeout(); break;
             default:        break;
         }
+        if (timeLine->drawClock()) {
+            timeLine->drawCurrentTimeBase();
+            osdManager.flush();
+            }
     }
     if (!alreadyUnlocked) {
         cPixmap::Unlock();
@@ -782,7 +789,7 @@ void cTvGuideOsd::dump() {
     esyslog("tvguide: ------Dumping Content---------");
     activeGrid->debug();
 //    int i=1;
-    for (cChannelColumn *col = columns.First(); col; col = columns.Next(col)) {
+    for (cChannelEpg *col = columns.First(); col; col = columns.Next(col)) {
         col->dumpGrids();
     }
 }

tvguideosd.h

@@ -1,31 +1,32 @@
 #ifndef __TVGUIDE_TVGUIDEOSD_H
 #define __TVGUIDE_TVGUIDEOSD_H
 
-#include "timer.h"
-#include "grid.h"
-#include "channelcolumn.h"
+#include "timemanager.h"
+#include "gridelement.h"
+#include "channelepg.h"
 #include "statusheader.h"
 #include "detailview.h"
 #include "timeline.h"
 #include "channelgroups.h"
 #include "footer.h"
-#include "recmenumanager.h"
+#include "recmenuview.h"
 #include "channeljump.h"
 
 // --- cTvGuideOsd -------------------------------------------------------------
 
 class cTvGuideOsd : public cOsdObject {
 private:
-  cMyTime *myTime;
-  cList<cChannelColumn> columns;
-  cGrid *activeGrid;
+  cTimeManager *timeManager;
+  cList<cChannelEpg> columns;
+  cGridElement *activeGrid;
   cStatusHeader *statusHeader;
   cDetailView *detailView;
   cTimeLine *timeLine;
   cChannelGroups *channelGroups;
   cFooter *footer;
-  cRecMenuManager *recMenuManager;
+  cRecMenuView *recMenuView;
   cChannelJump *channelJumper;
+  int GetLastValidChannel(void);
   bool detailViewActive;
   void drawOsd();
   void readChannels(const cChannel *channelStart);
@@ -44,7 +45,7 @@ private:
   void TimeJump(int mode);
   void ChannelJump(int num);
   void CheckTimeout(void);
-  void setNextActiveGrid(cGrid *next);
+  void setNextActiveGrid(cGridElement *next);
   void channelForward();
   void channelBack();
   void timeForward();

view.c

@@ -1,10 +1,11 @@
 #include "detailview.h"
+#include "switchtimer.h"
 
 /********************************************************************************************
 * cView
 ********************************************************************************************/
 
-cView::cView(void) {
+cView::cView(void) : cThread("View") {
     activeView = 0;
     scrollable = false;
     tabbed = false;
@@ -70,7 +71,7 @@ void cView::SetGeometry(void) {
     scrollbarWidth = 40;
     width = geoManager.osdWidth - scrollbarWidth;
     height = geoManager.osdHeight;
-    border = tvguideConfig.epgViewBorder;
+    border = config.epgViewBorder;
     headerWidth = geoManager.headerContentWidth;
     headerHeight = geoManager.epgViewHeaderHeight;
     if (tabbed)
@@ -88,8 +89,8 @@ void cView::DrawHeader(void) {
     }
     pixmapHeader->Fill(clrTransparent);
     pixmapHeaderLogo->Fill(clrTransparent);
-    if (tvguideConfig.style == eStyleGraphical) {
-        if (tvguideConfig.scaleVideo) {
+    if (config.style == eStyleGraphical) {
+        if (config.scaleVideo) {
             pixmapHeader->drawBackgroundGraphical(bgStatusHeaderWindowed);
         } else {
             pixmapHeader->drawBackgroundGraphical(bgStatusHeaderFull);
@@ -100,9 +101,9 @@ void cView::DrawHeader(void) {
     }
     //Channel Logo
     int logoHeight = 2 * headerHeight / 3;
-    int logoWidth = logoHeight * tvguideConfig.logoWidthRatio / tvguideConfig.logoHeightRatio;
+    int logoWidth = logoHeight * config.logoWidthRatio / config.logoHeightRatio;
     int xText = border / 2;
-    if (channel && !tvguideConfig.hideChannelLogos) {
+    if (channel && !config.hideChannelLogos) {
         cImageLoader imgLoader;
         if (imgLoader.LoadLogo(channel, logoWidth, logoHeight)) {
             cImage logo = imgLoader.GetImage();
@@ -121,15 +122,10 @@ void cView::DrawHeader(void) {
     pixmapHeader->DrawText(cPoint(xText, ySubtitle), CutText(subTitle, textWidthMax, fontHeader).c_str(), theme.Color(clrFont), theme.Color(clrStatusHeader), fontHeader);
     //REC Icon
     eTimerMatch timerMatch = tmNone; 
-#if VDRVERSNUM >= 20301
-//    LOCK_TIMERS_READ;
-    const cTimer *ti;
-#else
-    cTimer *ti;
-#endif
     if (!event)
         return;
-    if (tvguideConfig.useRemoteTimers && pRemoteTimers) {
+    const cTimer *ti;
+    if (config.useRemoteTimers && pRemoteTimers) {
         RemoteTimers_GetMatch_v1_0 rtMatch;
         rtMatch.event = event;
         pRemoteTimers->Service("RemoteTimers::GetMatch-v1.0", &rtMatch);
@@ -143,14 +139,23 @@ void cView::DrawHeader(void) {
         ti = Timers.GetMatch(event, &timerMatch);
 #endif
     }
-    if (timerMatch == tmFull) {
-        cString recIconText(" REC ");
-        int widthIcon = fontManager.FontDetailHeader->Width(*recIconText);
+    bool hasSwitchTimer = SwitchTimers.EventInSwitchList(event);
+    if (hasSwitchTimer || (ti && timerMatch == tmFull)) {
+        tColor iconColor;
+        bool switchOnly = false;
+        bool timerActive = ti && ti->HasFlags(tfActive);
+        cString recIconText;
+#ifdef SWITCHONLYPATCH
+        switchOnly = ti && ti->HasFlags(tfSwitchOnly);
+#endif
+        (hasSwitchTimer || switchOnly) ? recIconText = "Switch" : recIconText = " REC ";
+        iconColor = (hasSwitchTimer || switchOnly) ? theme.Color(clrButtonYellow) : timerActive ? theme.Color(clrButtonRed) : theme.Color(clrButtonGreen);
+        int widthIcon = fontManager.FontDetailHeader->Width(*recIconText) + 10;
         int height = fontManager.FontDetailHeader->Height() + 10;
-        int posX = headerWidth - widthIcon - 20;
-        int posY = 20;
-        pixmapHeader->DrawRectangle( cRect(posX, posY, widthIcon, height), theme.Color(clrButtonRed));
-        pixmapHeader->DrawText(cPoint(posX, posY+5), *recIconText, theme.Color(clrFont), theme.Color(clrButtonRed), fontManager.FontDetailHeader);
+        int posX = headerWidth - widthIcon - 25;
+        int posY = ySubtitle - 5;
+        pixmapHeader->DrawRectangle( cRect(posX, posY, widthIcon, height), iconColor);
+        pixmapHeader->DrawText(cPoint(posX + 5, posY + 5), *recIconText, theme.Color(clrFont), iconColor, fontManager.FontDetailHeader);
     }
 }
 
@@ -284,7 +289,7 @@ void cView::CreateFloatingTextWrapper(cTextWrapper *twNarrow, cTextWrapper *twFu
     std::stringstream sstrTextTall;
     std::stringstream sstrTextFull;
       
-    for (int i=0; i<flds.size(); i++) {
+    for (int i = 0; i < (int)flds.size(); i++) {
         if (!flds[i].size()) {
             //empty line
             linesDrawn++;
@@ -445,7 +450,7 @@ void cView::DrawScrollbar(void) {
 cImage *cView::CreateScrollbarImage(int width, int height, tColor clrBgr, tColor clrBlend) {
     cImage *image = new cImage(cSize(width, height));
     image->Fill(clrBgr);
-    if (tvguideConfig.style != eStyleFlat) {
+    if (config.style != eStyleFlat) {
         int numSteps = 64;
         int alphaStep = 0x03;
         if (height < 30)
@@ -480,7 +485,7 @@ bool cView::KeyUp(void) {
     if (aktHeight >= 0) {
         return false;
     }
-    int step = tvguideConfig.detailedViewScrollStep * font->Height();
+    int step = config.detailedViewScrollStep * font->Height();
     int newY = aktHeight + step;
     if (newY > 0)
         newY = 0;
@@ -498,7 +503,7 @@ bool cView::KeyDown(void) {
     if (totalHeight - ((-1)*aktHeight) == screenHeight) {
         return false;
     } 
-    int step = tvguideConfig.detailedViewScrollStep * font->Height();
+    int step = config.detailedViewScrollStep * font->Height();
     int newY = aktHeight - step;
     if ((-1)*newY > totalHeight - screenHeight)
         newY = (-1)*(totalHeight - screenHeight);
@@ -535,9 +540,9 @@ void cEPGView::SetTabs(void) {
 
 void cEPGView::CheckEPGImages(void) {
     if (eventID > 0) {
-        for (int i=1; i <= tvguideConfig.numAdditionalEPGPictures; i++) {
+        for (int i=1; i <= config.numAdditionalEPGPictures; i++) {
             cString epgimage;
-            epgimage = cString::sprintf("%s%d_%d.jpg", *tvguideConfig.epgImagePath, eventID, i);
+            epgimage = cString::sprintf("%s%d_%d.jpg", *config.epgImagePath, eventID, i);
             FILE *fp = fopen(*epgimage, "r");
             if (fp) {
                 std::stringstream ss;
@@ -555,8 +560,8 @@ void cEPGView::CheckEPGImages(void) {
 }
 
 void cEPGView::DrawImages(void) {
-    int imgWidth = tvguideConfig.epgImageWidthLarge;
-    int imgHeight = tvguideConfig.epgImageHeightLarge;
+    int imgWidth = config.epgImageWidthLarge;
+    int imgHeight = config.epgImageHeightLarge;
 
     int totalHeight = numEPGPics * (imgHeight + border);
 
@@ -636,7 +641,7 @@ cSeriesView::cSeriesView(int seriesId, int episodeId) : cView() {
 }
 
 cSeriesView::~cSeriesView(void) {
-    Cancel(-1);
+    Cancel(3);
     while (Active())
         cCondWait::SleepMs(10);
 }
@@ -858,7 +863,7 @@ cMovieView::cMovieView(int movieId) : cView() {
 }
 
 cMovieView::~cMovieView(void) {
-    Cancel(-1);
+    Cancel(3);
     while (Active())
         cCondWait::SleepMs(10);
 }