HISTORY

@@ -265,39 +265,3 @@ Version 1.3.0
 - Fixed stopIndex in cRecMenu::JumpBegin
 - Fixed horizontal alignment in timeline
 - Fixed messages in DisplayTimerConflict
-
-Version 1.3.1
-
-- Fixes for <VDR-2.3.1 compatibility
-- Fixed a segfault while starting tvguide
-
-Version 1.3.2
-
-- Fixed display groupname in cChannelGroupGrid::DrawHorizontal
-- Center some channel logos
-- Add "Timer On/Off" to recmenu
-- Wrap title in detailview header
-- Optional deactivation of the timer confirmation messages
-
-Version 1.3.3
-
-- Bugfix
-
-Version 1.3.4
-
-- Fix for gcc11
-
-Version 1.3.5
-
-- Fix for VDR-2.5.4
-- Update iceblue theme
-
-Version 1.3.6
-
-- Fix segfault when tvscraper returns "call->type = tNone"
-- In menu "Search Recordins" get ChannelName from 'RecInfo'
-- Display errors in search recordings
-- Fixed possible segfault when showing scrollbar in search result lists
-- Adapt epgsearch "allow empty" for searchtimer
-- some rework
-- optical optimization

channelepg.c

@@ -214,7 +214,7 @@ void cChannelEpg::AddNewGridsAtStart() {
     const cSchedule *Schedule = NULL;
     Schedule = schedules->GetSchedule(channel);
     if (!Schedule) {
-        if (firstGrid->IsDummy()) {
+        if (firstGrid->isDummy()) {
             firstGrid->SetStartTime(timeManager->GetStart());
             firstGrid->SetEndTime(timeManager->GetEnd());
         }
@@ -238,7 +238,7 @@ void cChannelEpg::AddNewGridsAtStart() {
     }
     if (dummyNeeded) {
         firstGrid = grids.First();
-        if (firstGrid->IsDummy()) {
+        if (firstGrid->isDummy()) {
             firstGrid->SetStartTime(timeManager->GetStart());
             if (firstGrid->EndTime() >= timeManager->GetEnd())
                 firstGrid->SetEndTime(timeManager->GetEnd());
@@ -270,7 +270,7 @@ void cChannelEpg::AddNewGridsAtEnd() {
     const cSchedule *Schedule = NULL;
     Schedule = schedules->GetSchedule(channel);
     if (!Schedule) {
-        if (lastGrid->IsDummy()) {
+        if (lastGrid->isDummy()) {
             lastGrid->SetStartTime(timeManager->GetStart());
             lastGrid->SetEndTime(timeManager->GetEnd());
         }
@@ -293,7 +293,7 @@ void cChannelEpg::AddNewGridsAtEnd() {
     }
     if (dummyNeeded) {
         lastGrid = grids.Last();
-        if (lastGrid->IsDummy()) {
+        if (lastGrid->isDummy()) {
             lastGrid->SetEndTime(timeManager->GetEnd());
             if (lastGrid->StartTime() <= timeManager->GetStart())
                 lastGrid->SetStartTime(timeManager->GetStart());
@@ -313,7 +313,7 @@ void cChannelEpg::ClearOutdatedStart() {
             grids.Del(firstGrid);
             firstGrid = NULL;
         } else {
-            if (firstGrid->IsDummy()) {
+            if (firstGrid->isDummy()) {
                 firstGrid->SetStartTime(timeManager->GetStart());
                 cGridElement *next = getNext(firstGrid);
                 if (next) {
@@ -337,7 +337,7 @@ void cChannelEpg::ClearOutdatedEnd() {
             grids.Del(lastGrid);
             lastGrid = NULL;
         } else {
-            if (lastGrid->IsDummy()) {
+            if (lastGrid->isDummy()) {
                 lastGrid->SetEndTime(timeManager->GetEnd());
                 cGridElement *prev = getPrev(lastGrid);
                 if (prev) {

channelgroup.c

@@ -47,7 +47,7 @@ void cChannelGroupGrid::SetGeometry(int start, int end) {
         width = geoManager.channelGroupsWidth;
         height = (end - start + 1) * geoManager.rowHeight;
     }
-    pixmap = osdManager.CreatePixmap(1, cRect(x, y, width, height));
+    pixmap = osdManager.requestPixmap(1, cRect(x, y, width, height));
 }
 
 void cChannelGroupGrid::Draw(void) {
@@ -68,28 +68,29 @@ void cChannelGroupGrid::Draw(void) {
 
 void cChannelGroupGrid::DrawVertical(tColor colorText, tColor colorTextBack) {
     int textY = (Height() - fontManager.FontChannelGroups->Height()) / 2;
-    cString text = cString::sprintf("%s", CutText(name, Width() - 4, fontManager.FontChannelGroups).c_str());
+    cString text = CutText(name, Width() - 4, fontManager.FontChannelGroups).c_str();
     int textWidth = fontManager.FontChannelGroups->Width(*text);
     int x = (Width() - textWidth) / 2;
     pixmap->DrawText(cPoint(x, textY), *text, colorText, colorTextBack, fontManager.FontChannelGroups);
 }
 
 void cChannelGroupGrid::DrawHorizontal(tColor colorText, tColor colorTextBack) {
-    std::string groupName = name;
+    std::string nameUpper = name;
-    int numChars = groupName.length();
+    std::transform(nameUpper.begin(), nameUpper.end(),nameUpper.begin(), ::toupper);
+    int numChars = nameUpper.length();
     int charHeight = fontManager.FontChannelGroupsHorizontal->Height();
     int textHeight = numChars * charHeight;
     int y = 5;
-    if ((textHeight + 5) < Height()) {
+    if ((textHeight +5) < Height()) {
         y = (Height() - textHeight) / 2;
     }
-    for (int i = 0; i < numChars; i++) {
+    for (int i=0; i < numChars; i++) {
-        if (((y + 2 * charHeight) > Height()) && ((i + 1) < numChars)) {
+        if (((y + 2*charHeight) > Height()) && ((i+1)<numChars)) {
             int x = (Width() - fontManager.FontChannelGroupsHorizontal->Width("...")) / 2;
             pixmap->DrawText(cPoint(x, y), "...", colorText, colorTextBack, fontManager.FontChannelGroupsHorizontal);
             break;
         }
-        cString currentChar = cString::sprintf("%s", utf8_substr(groupName.c_str(), i, 1).c_str());
+        cString currentChar = cString::sprintf("%c", nameUpper.at(i));
         int x = (Width() - fontManager.FontChannelGroupsHorizontal->Width(*currentChar)) / 2;
         pixmap->DrawText(cPoint(x, y), *currentChar, colorText, colorTextBack, fontManager.FontChannelGroupsHorizontal);
         y += fontManager.FontChannelGroupsHorizontal->Height();

channeljump.c

@@ -18,17 +18,17 @@ cChannelJump::cChannelJump(cChannelGroups *channelGroups, int lastValidChannel)
 }
 
 cChannelJump::~cChannelJump(void) {
-    osdManager.DestroyPixmap(pixmapBack);
+    osdManager.releasePixmap(pixmapBack);
-    osdManager.DestroyPixmap(pixmapText);
+    osdManager.releasePixmap(pixmapText);
 }
 
 void cChannelJump::SetPixmaps(void) {
 	int x = (geoManager.osdWidth - geoManager.channelJumpWidth)/2;
 	int y = (geoManager.osdHeight - geoManager.channelJumpHeight)/2;
 	
-	pixmapBack = osdManager.CreatePixmap(4, cRect(x, y, geoManager.channelJumpWidth, geoManager.channelJumpHeight));
+	pixmapBack = osdManager.requestPixmap(4, cRect(x, y, geoManager.channelJumpWidth, geoManager.channelJumpHeight));
-	pixmap = osdManager.CreatePixmap(5, cRect(x, y, geoManager.channelJumpWidth, geoManager.channelJumpHeight));
+	pixmap = osdManager.requestPixmap(5, cRect(x, y, geoManager.channelJumpWidth, geoManager.channelJumpHeight));
-	pixmapText = osdManager.CreatePixmap(6, cRect(x, y, geoManager.channelJumpWidth, geoManager.channelJumpHeight));
+	pixmapText = osdManager.requestPixmap(6, cRect(x, y, geoManager.channelJumpWidth, geoManager.channelJumpHeight));
 }
 
 void cChannelJump::Draw(void) {

config.c

@@ -35,7 +35,6 @@ cTVGuideConfig::cTVGuideConfig() {
     jumpChannels = 0;
     blueKeyMode = 2;
     addSubtitleToTimer = 1;
-    timerMessage = 1;
     closeOnSwitch = 1;
     numkeyMode = 0;
     useRemoteTimers = 0;
@@ -298,7 +297,6 @@ bool cTVGuideConfig::SetupParse(const char *Name, const char *Value) {
     else if (strcmp(Name, "instRecFolderMode") == 0)        instRecFolderMode = atoi(Value);
     else if (strcmp(Name, "instRecFixedFolder") == 0)       instRecFixedFolder = Value;
     else if (strcmp(Name, "addSubtitleToTimer") == 0)       addSubtitleToTimer = atoi(Value);
-    else if (strcmp(Name, "timerMessage") == 0)             timerMessage = atoi(Value);
     else if (strcmp(Name, "favWhatsOnNow") == 0)            favWhatsOnNow = atoi(Value);
     else if (strcmp(Name, "favWhatsOnNext") == 0)           favWhatsOnNext = atoi(Value);
     else if (strcmp(Name, "favUseTime1") == 0)              favUseTime1 = atoi(Value);

config.h

@@ -88,7 +88,6 @@ class cTVGuideConfig {
         int channelJumpMode;
         int jumpChannels;
         int blueKeyMode;
-        int timerMessage;
         int addSubtitleToTimer;
         int closeOnSwitch;
         int numkeyMode;

detailview.c

@@ -32,8 +32,6 @@ void cDetailView::InitiateView(void) {
             view = new cMovieView(call.movieId);
         } else if (call.type == tSeries) {
             view = new cSeriesView(call.seriesId, call.episodeId);
-        } else {
-            view = new cEPGView();
         }
     } else {
         view = new cEPGView();                
@@ -149,14 +147,14 @@ eOSState cDetailView::ProcessKey(eKeys Key) {
             bool scrolled = view->KeyUp();
             if (scrolled) {
                 view->DrawScrollbar();
-                osdManager.Flush();
+                osdManager.flush();
             }
             break; }
         case kDown: {
             bool scrolled = view->KeyDown();
             if (scrolled) {
                 view->DrawScrollbar();
-                osdManager.Flush();
+                osdManager.flush();
             }
             break; }
         case kLeft:

dummygrid.c

@@ -34,10 +34,10 @@ void cDummyGrid::PositionPixmap() {
             y0 += (StartTime() - column->Start())/60*geoManager.minutePixel;
         }
         if (!pixmap) {
-            pixmap = osdManager.CreatePixmap(-1, cRect(x0, y0, geoManager.colWidth, viewportHeight));
+            pixmap = osdManager.requestPixmap(-1, cRect(x0, y0, geoManager.colWidth, viewportHeight));
         } else if (dirty) {
-            osdManager.DestroyPixmap(pixmap);
+            osdManager.releasePixmap(pixmap);
-            pixmap = osdManager.CreatePixmap(-1, cRect(x0, y0, geoManager.colWidth, viewportHeight));
+            pixmap = osdManager.requestPixmap(-1, cRect(x0, y0, geoManager.colWidth, viewportHeight));
         } else {
             pixmap->SetViewPort(cRect(x0, y0, geoManager.colWidth, viewportHeight));
         }
@@ -48,10 +48,10 @@ void cDummyGrid::PositionPixmap() {
             x0 += (StartTime() - column->Start())/60*geoManager.minutePixel;
         }
         if (!pixmap) {
-            pixmap = osdManager.CreatePixmap(-1, cRect(x0, y0, viewportHeight, geoManager.rowHeight));
+            pixmap = osdManager.requestPixmap(-1, cRect(x0, y0, viewportHeight, geoManager.rowHeight));
         } else if (dirty) {
-            osdManager.DestroyPixmap(pixmap);
+            osdManager.releasePixmap(pixmap);
-            pixmap = osdManager.CreatePixmap(-1, cRect(x0, y0, viewportHeight, geoManager.rowHeight));
+            pixmap = osdManager.requestPixmap(-1, cRect(x0, y0, viewportHeight, geoManager.rowHeight));
         } else {
             pixmap->SetViewPort(cRect(x0, y0, viewportHeight, geoManager.rowHeight));
         }

epggrid.c

@@ -20,9 +20,9 @@ cEpgGrid::~cEpgGrid(void) {
 void cEpgGrid::SetViewportHeight() {
     int viewportHeightOld = viewportHeight;
     if ( column->Start() > StartTime() ) {
-        viewportHeight = (std::min((int)EndTime(), column->Stop()) - column->Start()) / 60;
+        viewportHeight = (min((int)EndTime(), column->Stop()) - column->Start()) /60;
     } else if ( column->Stop() < EndTime() ) {
-        viewportHeight = (column->Stop() - StartTime()) / 60;
+        viewportHeight = (column->Stop() - StartTime()) /60;
         if (viewportHeight < 0) viewportHeight = 0;
     } else {
         viewportHeight = Duration() / 60;
@@ -37,11 +37,11 @@ void cEpgGrid::PositionPixmap() {
         int x0 = column->getX();
         int y0 = geoManager.statusHeaderHeight + geoManager.channelHeaderHeight + geoManager.channelGroupsHeight;
         if ( column->Start() < StartTime() ) {
-            y0 += (StartTime() - column->Start()) / 60 * geoManager.minutePixel;
+            y0 += (StartTime() - column->Start())/60*geoManager.minutePixel;
         }
         if (!pixmap) {
-            pixmap = osdManager.CreatePixmap(-1, cRect(x0, y0, geoManager.colWidth, viewportHeight),
+            pixmap = osdManager.requestPixmap(-1, cRect(x0, y0, geoManager.colWidth, viewportHeight),
-                                                cRect(0, 0, geoManager.colWidth, Duration() / 60 * geoManager.minutePixel));
+                                                cRect(0, 0, geoManager.colWidth, Duration()/60*geoManager.minutePixel));
         } else {
             pixmap->SetViewPort(cRect(x0, y0, geoManager.colWidth, viewportHeight));
         }
@@ -49,11 +49,11 @@ void cEpgGrid::PositionPixmap() {
         int x0 = geoManager.channelHeaderWidth + geoManager.channelGroupsWidth;
         int y0 = column->getY();
         if ( column->Start() < StartTime() ) {
-            x0 += (StartTime() - column->Start()) / 60 * geoManager.minutePixel;
+            x0 += (StartTime() - column->Start())/60*geoManager.minutePixel;
         }
         if (!pixmap) {
-            pixmap = osdManager.CreatePixmap(-1, cRect(x0, y0, viewportHeight, geoManager.rowHeight),
+            pixmap = osdManager.requestPixmap(-1, cRect(x0, y0, viewportHeight, geoManager.rowHeight),
-                                                cRect(0, 0, Duration() / 60 * geoManager.minutePixel, geoManager.rowHeight));
+                                                cRect(0, 0, Duration()/60*geoManager.minutePixel, geoManager.rowHeight));
         } else {
             pixmap->SetViewPort(cRect(x0, y0, viewportHeight, geoManager.rowHeight ));
         }

footer.c

@@ -8,7 +8,7 @@ cFooter::cFooter(cChannelGroups *channelGroups) {
     currentGroup = -1;
     buttonY = (geoManager.footerHeight - geoManager.buttonHeight)/2;
     SetButtonPositions();
-    footer = osdManager.CreatePixmap(2, cRect( 0, 
+    footer = osdManager.requestPixmap(2, cRect( 0, 
                                                 geoManager.footerY, 
                                                 geoManager.osdWidth, 
                                                 geoManager.footerHeight),
@@ -17,7 +17,7 @@ cFooter::cFooter(cChannelGroups *channelGroups) {
 }
 
 cFooter::~cFooter(void) {
-    osdManager.DestroyPixmap(footer);
+    osdManager.releasePixmap(footer);
 }
 
 void cFooter::drawRedButton() {

geometrymanager.c

@@ -12,19 +12,19 @@ cGeometryManager::~cGeometryManager() {
 }
 
 bool cGeometryManager::SetGeometry(int osdWidth, int osdHeight, bool force) {
-    if (!force && (this->osdWidth == osdWidth) && (this->osdHeight == osdHeight)) {
+	if (!force && (this->osdWidth == osdWidth) && (this->osdHeight == osdHeight)) {
-        esyslog("tvgudie: GeoManager SetGeometry nothing to change");
+		esyslog("tvgudie: GeoManager SetGeometry nothing to change");
-        return false;
+		return false;
-    }
+	}
-    this->osdWidth = osdWidth;
+	this->osdWidth = osdWidth;
-    this->osdHeight = osdHeight;
+	this->osdHeight = osdHeight;
-    esyslog("tvguide: Set OSD to %d x %d px", osdWidth, osdHeight);
+	esyslog("tvguide: Set OSD to %d x %d px", osdWidth, osdHeight);
 
-    statusHeaderHeight = (config.displayStatusHeader) ? (config.headerHeightPercent * osdHeight / 100) : 0;
+	statusHeaderHeight = (config.displayStatusHeader) ? (config.headerHeightPercent * osdHeight / 100):0;
     tvFrameWidth = statusHeaderHeight * 16 / 9;
     headerContentWidth = (config.scaleVideo) ? (osdWidth -  tvFrameWidth):osdWidth;
-    channelGroupsWidth = (config.displayChannelGroups) ? (config.channelGroupsPercent * osdWidth / 100) : 0;
+    channelGroupsWidth = (config.displayChannelGroups) ? (config.channelGroupsPercent * osdWidth / 100):0;
-    channelGroupsHeight = (config.displayChannelGroups) ? (config.channelGroupsPercent * osdHeight / 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;

gridelement.h

@@ -51,7 +51,7 @@ public:
     bool Active(void) { return active; };
     bool HasTimer(void) {return hasTimer;};
     bool HasSwitchTimer(void) {return hasSwitchTimer;};
-    bool IsDummy(void) { return dummy; };
+    bool isDummy(void) { return dummy; };
     virtual void debug() {};
 };
 

headergrid.c

@@ -8,7 +8,7 @@ cHeaderGrid::cHeaderGrid(void) : cGridElement(NULL) {
 }
 
 cHeaderGrid::~cHeaderGrid(void) {
-    osdManager.DestroyPixmap(pixmapLogo);
+    osdManager.releasePixmap(pixmapLogo);
 }
 
 void cHeaderGrid::createBackground(int num) {
@@ -22,8 +22,8 @@ void cHeaderGrid::createBackground(int num) {
         x = geoManager.channelGroupsWidth;
         y = geoManager.statusHeaderHeight + geoManager.timeLineHeight + num*geoManager.rowHeight;
     }
-    pixmap = osdManager.CreatePixmap(1, cRect(x, y, geoManager.channelLogoWidth, geoManager.channelLogoHeight));
+    pixmap = osdManager.requestPixmap(1, cRect(x, y, geoManager.channelLogoWidth, geoManager.channelLogoHeight));
-    pixmapLogo = osdManager.CreatePixmap(2, cRect(x, y, geoManager.channelLogoWidth, geoManager.channelLogoHeight));
+    pixmapLogo = osdManager.requestPixmap(2, cRect(x, y, geoManager.channelLogoWidth, geoManager.channelLogoHeight));
     if ((!pixmap) || (!pixmapLogo)){
         return;
     }
@@ -56,8 +56,7 @@ void cHeaderGrid::drawChannelHorizontal(const cChannel *channel) {
         cImage *logo = imgCache.GetLogo(channel);
         if (logo) {
             const int logoheight = logo->Height();
-            const int logowidth = logo->Width();
+            pixmapLogo->DrawImage(cPoint(logoX, (Height() - logoheight) / 2), *logo);
-            pixmapLogo->DrawImage(cPoint(logoX + ((logoWidth - logowidth) / 2), (Height() - logoheight) / 2), *logo);
             logoFound = true;
         }
     }
@@ -82,6 +81,7 @@ void cHeaderGrid::drawChannelHorizontal(const cChannel *channel) {
 // Draw Channel vertical view
 
 void cHeaderGrid::drawChannelVertical(const cChannel *channel) {
+    int logoWidth = geoManager.logoWidth;
     int logoHeight = geoManager.logoHeight;
     cTextWrapper tw;
     cString headerText = cString::sprintf("%d - %s", channel->Number(), channel->Name());
@@ -93,10 +93,8 @@ void cHeaderGrid::drawChannelVertical(const cChannel *channel) {
     if (!config.hideChannelLogos) {
         cImage *logo = imgCache.GetLogo(channel);
         if (logo) {
-            const int logoheight = logo->Height();
+                pixmapLogo->DrawImage(cPoint((Width() - logoWidth) / 2, 6), *logo);
-            const int logowidth = logo->Width();
+                logoFound = true;
-            pixmapLogo->DrawImage(cPoint((Width() - logowidth) / 2, (logoHeight - logoheight) / 2), *logo);
-            logoFound = true;
         }
     }
     bool drawText = false;

imagecache.c

@@ -34,19 +34,19 @@ void cImageCache::CreateCache(void) {
     int start = cTimeMs::Now();
     int startNext = cTimeMs::Now();
     CreateOsdIconCache();
-    esyslog("tvguide: Osd Icon Cache created in %d ms", int(cTimeMs::Now()-startNext));
+    esyslog("tvguide: Osd Icon Cash created in %d ms", int(cTimeMs::Now()-startNext));
     startNext = cTimeMs::Now();
     PrepareGridIconCache();
     CreateGridIconCache();
-    esyslog("tvguide: Grid Icon Cache created in %d ms", int(cTimeMs::Now()-startNext));
+    esyslog("tvguide: Grid Icon Cash created in %d ms", int(cTimeMs::Now()-startNext));
     startNext = cTimeMs::Now();
     CreateChannelGroupCache();
-    esyslog("tvguide: Channelgroup Cache created in %d ms", int(cTimeMs::Now()-startNext));
+    esyslog("tvguide: Channelgroup Cash created in %d ms", int(cTimeMs::Now()-startNext));
     startNext = cTimeMs::Now();
     CreateLogoCache();
-    esyslog("tvguide: Logo Cache created in %d ms", int(cTimeMs::Now()-startNext));
+    esyslog("tvguide: Logo Cash created in %d ms", int(cTimeMs::Now()-startNext));
     startNext = cTimeMs::Now();
-    esyslog("tvguide: Complete Image Cache created in %d ms", int(cTimeMs::Now()-start));
+    esyslog("tvguide: Complete Image Cash created in %d ms", int(cTimeMs::Now()-start));
 }
 
 void cImageCache::CreateOsdIconCache(void) {
@@ -357,7 +357,7 @@ cImage *cImageCache::GetLogo(const cChannel *channel) {
                     delete tempStaticLogo;
                     tempStaticLogo = NULL;
                 }
-                tempStaticLogo = CreateImage(geoManager.logoWidth * 0.8, geoManager.logoHeight * 0.8);
+                tempStaticLogo = CreateImage(geoManager.logoWidth, geoManager.logoHeight);
                 return tempStaticLogo;
             } else {
             //add requested logo to cache
@@ -609,7 +609,7 @@ bool cImageCache::LoadLogo(const cChannel *channel) {
 }
 
 void cImageCache::InsertIntoLogoCache(std::string channelID) {
-    cImage *image = CreateImage(geoManager.logoWidth * 0.8, geoManager.logoHeight * 0.8);
+    cImage *image = CreateImage(geoManager.logoWidth, geoManager.logoHeight);
     logoCache.insert(std::pair<std::string, cImage*>(channelID, image));
 }
 

osdmanager.c

@@ -2,21 +2,12 @@
 #include "osdmanager.h"
 
 cOsdManager::cOsdManager(void) {
-    osd = NULL;
 }
 
-void cOsdManager::Lock(void) {
+bool cOsdManager::setOsd() {
-    mutex.Lock();
-}
-
-void cOsdManager::Unlock(void) {
-    mutex.Unlock();
-}
-
-bool cOsdManager::CreateOsd(void) {
     osd = cOsdProvider::NewOsd(cOsd::OsdLeft(), cOsd::OsdTop());
     if (osd) {
-        tArea Area = { 0, 0, cOsd::OsdWidth() - 1, cOsd::OsdHeight() - 1,  32 };
+        tArea Area = { 0, 0, cOsd::OsdWidth(), cOsd::OsdHeight(),  32 };
         if (osd->SetAreas(&Area, 1) == oeOk) {  
             return true;
         }
@@ -24,14 +15,7 @@ bool cOsdManager::CreateOsd(void) {
     return false;
 }
 
-void cOsdManager::DeleteOsd(void) {
+void cOsdManager::setBackground() {
-    Lock();
-    delete osd;
-    osd = NULL;
-    Unlock();
-}
-
-void cOsdManager::SetBackground(void) {
     
     if (config.displayStatusHeader && config.scaleVideo) {
         int widthStatus = cOsd::OsdWidth() - geoManager.statusHeaderHeight * 16 / 9;
@@ -43,20 +27,12 @@ void cOsdManager::SetBackground(void) {
     
 }
 
-cPixmap *cOsdManager::CreatePixmap(int Layer, const cRect &ViewPort, const cRect &DrawPort) {
+cPixmap *cOsdManager::requestPixmap(int Layer, const cRect &ViewPort, const cRect &DrawPort) {
-    if (osd)
+    return osd->CreatePixmap(Layer, ViewPort, DrawPort);
-        return osd->CreatePixmap(Layer, ViewPort, DrawPort);
-    return NULL;
 }
 
-void cOsdManager::DestroyPixmap(cPixmap *pixmap) {
+void cOsdManager::releasePixmap(cPixmap *pixmap) {
-    if (!osd || !pixmap)
+    if (!pixmap)
         return;
     osd->DestroyPixmap(pixmap);
 }
-
-void cOsdManager::Flush(void) {
-    if (osd) {
-        osd->Flush();
-    }
-}

osdmanager.h

@@ -4,23 +4,20 @@
 #include <vdr/osd.h>
 
 class cOsdManager {
-private:
+    private:
-    cOsd *osd;
+        cOsd *osd;
-    cMutex mutex;
+    public:
-public:
+        cOsdManager(void);
-    cOsdManager(void);
+        bool setOsd();
-    void Lock(void);
+        void setBackground();
-    void Unlock(void);
+        void flush() {osd->Flush();};
-    bool CreateOsd(void);
+        cPixmap *requestPixmap(int Layer, const cRect &ViewPort, const cRect &DrawPort = cRect::Null);
-    void DeleteOsd(void);
+        void releasePixmap(cPixmap *pixmap);
-    void SetBackground(void);
+        void deleteOsd() {delete osd;};
-    cPixmap *CreatePixmap(int Layer, const cRect &ViewPort, const cRect &DrawPort = cRect::Null);
+        int Width() { return osd->Width(); };
-    void DestroyPixmap(cPixmap *pixmap);
+        int Height() { return osd->Height(); };
-    void Flush(void);
+        int Top() { return osd->Top(); };
-    int Width(void) { return osd->Width(); };
+        int Left() { return osd->Left(); };
-    int Height(void) { return osd->Height(); };
-    int Top(void) { return osd->Top(); };
-    int Left(void) { return osd->Left(); };
 };
 
 #endif //__TVGUIDE_OSDMANAGER_H

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: 2022-04-29 16:05+0200\n"
+"POT-Creation-Date: 2020-02-17 14:30+0100\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"
@@ -25,7 +25,7 @@ msgid "min"
 msgstr "min"
 
 msgid "Reruns of "
-msgstr "Reemissions "
+msgstr ""
 
 msgid "No reruns found"
 msgstr ""
@@ -75,15 +75,6 @@ msgstr "tots els canals"
 msgid "unknown channel"
 msgstr "canal desconegut"
 
-msgid "with"
-msgstr ""
-
-msgid "errors"
-msgstr ""
-
-msgid "error"
-msgstr ""
-
 msgid "Duration"
 msgstr "Durada"
 
@@ -114,15 +105,12 @@ msgstr ""
 msgid "Instant Record"
 msgstr "Enregistra a l'instant"
 
-msgid "Timer On/Off"
+msgid "Delete Timer"
-msgstr "Temporitzador On/Off"
+msgstr "Esborra temporitzador"
 
 msgid "Edit Timer"
 msgstr "Edita temporitzador"
 
-msgid "Delete Timer"
-msgstr "Esborra temporitzador"
-
 msgid "Timer Timeline"
 msgstr ""
 
@@ -180,14 +168,14 @@ msgstr "Sí"
 msgid "No"
 msgstr "No"
 
-msgid "Timer Conflicts"
+msgid "One"
-msgstr "Conflicte al temporitzador"
+msgstr "Un"
 
 msgid "detected"
 msgstr "detectat"
 
-msgid "Ignore Conflicts"
+msgid "Timer Conflicts"
-msgstr "Ignora conflictes"
+msgstr "Conflicte al temporitzador"
 
 msgid "Show conflict"
 msgstr "Mostra conflicte"
@@ -195,6 +183,9 @@ msgstr "Mostra conflicte"
 msgid "timers involved"
 msgstr "temporitzadors involucrats"
 
+msgid "Ignore Conflicts"
+msgstr "Ignora conflictes"
+
 msgid "Ignore Conflict"
 msgstr "Ignora conflicte"
 
@@ -225,12 +216,6 @@ msgstr ""
 msgid "replaced by rerun"
 msgstr ""
 
-msgid "Save"
-msgstr "Desa"
-
-msgid "Cancel"
-msgstr "Cancel·la"
-
 msgid "Timer Active"
 msgstr "Temporitzador actiu"
 
@@ -255,11 +240,14 @@ msgstr ""
 msgid "New Folder"
 msgstr ""
 
-msgid "Create Series Timer based on:"
+msgid "Save"
-msgstr "Programa enregistrament de Sèries segons:"
+msgstr "Desa"
 
-msgid "Create Timer"
+msgid "Cancel"
-msgstr "Crea temporitzador"
+msgstr "Cancel·la"
+
+msgid "Create Series Timer based on"
+msgstr "Programa enregistrament de Sèries segons"
 
 msgid "Series Timer start time"
 msgstr "Inici temporitzador Sèries"
@@ -273,6 +261,9 @@ msgstr "Dies a enregistrar"
 msgid "Day to start"
 msgstr "Dia d'inici"
 
+msgid "Create Timer"
+msgstr "Crea temporitzador"
+
 msgid "Series Timer created"
 msgstr "Sèrie programada"
 
@@ -282,17 +273,17 @@ msgstr "Inici"
 msgid "Stop"
 msgstr "Final"
 
-msgid "Configure Search Timer based on:"
+msgid "Configure Search Timer based on"
-msgstr "Configura cerca de temporitzadors segons:"
+msgstr "Configura cerca de temporitzadors segons"
-
-msgid "Continue"
-msgstr "Continua"
 
 msgid "Search Expression:"
 msgstr "Cerca expressió:"
 
-msgid "Configure Search Timer for Search String:"
+msgid "Continue"
-msgstr "Configura cerca de temporitzadors amb text:"
+msgstr "Continua"
+
+msgid "Configure Search Timer for Search String"
+msgstr "Configura cerca de temporitzadors amb text"
 
 msgid "Manually configure Options"
 msgstr "Opcions de configuració manual"
@@ -459,7 +450,7 @@ msgstr ""
 msgid "Delete Search Timer and created Timers"
 msgstr ""
 
-msgid "Search Timer sucessfully created"
+msgid "Search Timer sucessfully created."
 msgstr "S'ha creat cerca de temporitzador"
 
 msgid "Search Timer update initialised"
@@ -483,12 +474,12 @@ msgstr "Utilitza una altra plantilla"
 msgid "search results for Favorite"
 msgstr ""
 
-msgid "search results for Search Timer"
-msgstr "cerca resultats per temporitzador"
-
 msgid "search result for Favorite"
 msgstr ""
 
+msgid "search results for Search Timer"
+msgstr "cerca resultats per temporitzador"
+
 msgid "search result for Search Timer"
 msgstr "cerca resultat per temporitzador"
 
@@ -498,8 +489,8 @@ msgstr "No s'ha trobat la cadena de text"
 msgid "Configure Options for Switchtimer"
 msgstr "Opcions de configuració de canvi de temporitzador"
 
-msgid "Create"
+msgid "Minutes before switching"
-msgstr "Crea"
+msgstr "Minuts abans del canvi"
 
 msgid "switch"
 msgstr "canvia"
@@ -510,12 +501,12 @@ msgstr "només anunci"
 msgid "ask for switch"
 msgstr "pregunta pel canvi"
 
-msgid "Minutes before switching"
-msgstr "Minuts abans del canvi"
-
 msgid "Switch Mode"
 msgstr "Mode de canvi"
 
+msgid "Create"
+msgstr "Crea"
+
 msgid "Switch Timer sucessfully created"
 msgstr "Canvi de temporitzador creat"
 
@@ -525,9 +516,6 @@ msgstr "No s'ha creat el canvi de temporitzador"
 msgid "Switch Timer deleted"
 msgstr "Canvi de temporitzador esborrat"
 
-msgid "Perform Search"
-msgstr "Realitza la cerca"
-
 msgid "Search Mode"
 msgstr "Mode de cerca"
 
@@ -546,6 +534,9 @@ msgstr "Cerca a la descripció"
 msgid "Show Search Options"
 msgstr "Mostra opcions de cerca"
 
+msgid "Perform Search"
+msgstr "Realitza la cerca"
+
 msgid "search results for"
 msgstr "resultats de cerca per"
 
@@ -561,12 +552,12 @@ msgstr ""
 msgid "Found"
 msgstr "Trobada"
 
-msgid "recordings"
-msgstr "gravacions"
-
 msgid "recording"
 msgstr "gravació"
 
+msgid "recordings"
+msgstr "gravacions"
+
 msgid "for"
 msgstr "per"
 
@@ -600,9 +591,6 @@ msgstr "expressió regular"
 msgid "fuzzy"
 msgstr ""
 
-msgid "allow empty"
-msgstr ""
-
 msgid "Interval"
 msgstr ""
 
@@ -772,7 +760,7 @@ msgid "Display time in EPG Grids"
 msgstr "Mostra el temps a l'EPG"
 
 msgid "Height of Headers (Status Header and EPG View, Perc. of osd height)"
-msgstr "Alçada capçalera d'estat (% alçada OSD)"
+msgstr ""
 
 msgid "Height of Footer (Perc. of osd height)"
 msgstr ""
@@ -910,7 +898,7 @@ msgid "Instant recording:"
 msgstr ""
 
 msgid "Folder for instant Recordings"
-msgstr "Utilitza carpetes per gravacions a l'instant"
+msgstr ""
 
 msgid "Folder"
 msgstr ""
@@ -921,9 +909,6 @@ msgstr ""
 msgid "Use Remotetimers"
 msgstr "Utilitza temporitzadors remots"
 
-msgid "Show timer confirmation messages"
-msgstr ""
-
 msgid "Favorites:"
 msgstr ""
 
@@ -1012,7 +997,7 @@ msgid "EPG Info"
 msgstr ""
 
 msgid "Reruns"
-msgstr "Reemissions"
+msgstr ""
 
 msgid "Recording Information"
 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: 2022-04-29 16:05+0200\n"
+"POT-Creation-Date: 2020-02-17 14:30+0100\n"
 "PO-Revision-Date: 2012-08-25 17:49+0200\n"
 "Last-Translator: Horst\n"
 "Language-Team: \n"
@@ -72,15 +72,6 @@ msgstr "alle Kanäle"
 msgid "unknown channel"
 msgstr "unbekannter Kanal"
 
-msgid "with"
-msgstr "mit"
-
-msgid "errors"
-msgstr "Fehler"
-
-msgid "error"
-msgstr "Fehler"
-
 msgid "Duration"
 msgstr "Dauer"
 
@@ -111,15 +102,12 @@ msgstr "erledigte Aufnahmen"
 msgid "Instant Record"
 msgstr "Aufnahme"
 
-msgid "Timer On/Off"
+msgid "Delete Timer"
-msgstr "Timer Ein/Aus"
+msgstr "Timer löschen"
 
 msgid "Edit Timer"
 msgstr "Timer bearbeiten"
 
-msgid "Delete Timer"
-msgstr "Timer löschen"
-
 msgid "Timer Timeline"
 msgstr "Timer Tagesübersicht"
 
@@ -177,14 +165,14 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nein"
 
-msgid "Timer Conflicts"
+msgid "One"
-msgstr "Timerkonflikte"
+msgstr "Ein"
 
 msgid "detected"
 msgstr "gefunden"
 
-msgid "Ignore Conflicts"
+msgid "Timer Conflicts"
-msgstr "Konflikte ignorieren"
+msgstr "Timerkonflikte"
 
 msgid "Show conflict"
 msgstr "Konflikt zeigen"
@@ -192,6 +180,9 @@ msgstr "Konflikt zeigen"
 msgid "timers involved"
 msgstr "Timer beteiligt"
 
+msgid "Ignore Conflicts"
+msgstr "Konflikte ignorieren"
+
 msgid "Ignore Conflict"
 msgstr "Konflikt ignorieren"
 
@@ -222,12 +213,6 @@ msgstr "Timer für"
 msgid "replaced by rerun"
 msgstr "ersetzt durch Wiederholung"
 
-msgid "Save"
-msgstr "Speichern"
-
-msgid "Cancel"
-msgstr "Abbrechen"
-
 msgid "Timer Active"
 msgstr "Timer aktiv"
 
@@ -252,11 +237,14 @@ msgstr "Timer Datei"
 msgid "New Folder"
 msgstr "Neues Verzeichnis"
 
-msgid "Create Series Timer based on:"
+msgid "Save"
-msgstr "Serientimer anlegen basierend auf:"
+msgstr "Speichern"
 
-msgid "Create Timer"
+msgid "Cancel"
-msgstr "Timer anlegen"
+msgstr "Abbrechen"
+
+msgid "Create Series Timer based on"
+msgstr "Serientimer anlegen basierend auf"
 
 msgid "Series Timer start time"
 msgstr "Serientimer Start Zeit"
@@ -270,6 +258,9 @@ msgstr "Tage"
 msgid "Day to start"
 msgstr "Beginnen am"
 
+msgid "Create Timer"
+msgstr "Timer anlegen"
+
 msgid "Series Timer created"
 msgstr "Serientimer angelegt"
 
@@ -279,17 +270,17 @@ msgstr "Start"
 msgid "Stop"
 msgstr "Stop"
 
-msgid "Configure Search Timer based on:"
+msgid "Configure Search Timer based on"
-msgstr "Suchtimer konfigurieren basierend auf:"
+msgstr "Suchtimer konfigurieren basierend auf"
-
-msgid "Continue"
-msgstr "Weiter"
 
 msgid "Search Expression:"
 msgstr "Suchausdruck:"
 
-msgid "Configure Search Timer for Search String:"
+msgid "Continue"
-msgstr "Suchtimer konfigurieren für Suchbegriff:"
+msgstr "Weiter"
+
+msgid "Configure Search Timer for Search String"
+msgstr "Suchtimer konfigurieren für Suchbegriff"
 
 msgid "Manually configure Options"
 msgstr "Optionen manuell konfigurieren"
@@ -456,7 +447,7 @@ msgstr "Nur Suchtimer löschen"
 msgid "Delete Search Timer and created Timers"
 msgstr "Suchtimer und erzeugte Timer löschen"
 
-msgid "Search Timer sucessfully created"
+msgid "Search Timer sucessfully created."
 msgstr "Suchtimer erfolgreich angelegt"
 
 msgid "Search Timer update initialised"
@@ -480,12 +471,12 @@ msgstr "Anderes Template benutzen"
 msgid "search results for Favorite"
 msgstr "Suchergebnisse für Favorit"
 
-msgid "search results for Search Timer"
-msgstr "Treffer für Suchtimer"
-
 msgid "search result for Favorite"
 msgstr "Suchergebnis für Favorit"
 
+msgid "search results for Search Timer"
+msgstr "Treffer für Suchtimer"
+
 msgid "search result for Search Timer"
 msgstr "Treffer für Suchtimer"
 
@@ -495,8 +486,8 @@ msgstr "Keine Treffer für Suchbegriff"
 msgid "Configure Options for Switchtimer"
 msgstr "Optionen für Umschalttimer konfigurieren"
 
-msgid "Create"
+msgid "Minutes before switching"
-msgstr "Anlegen"
+msgstr "Minuten vor umschalten"
 
 msgid "switch"
 msgstr "umschalten"
@@ -507,12 +498,12 @@ msgstr "nur ankündigen"
 msgid "ask for switch"
 msgstr "vor umschalten fragen"
 
-msgid "Minutes before switching"
-msgstr "Minuten vor umschalten"
-
 msgid "Switch Mode"
 msgstr "Umschaltmodus"
 
+msgid "Create"
+msgstr "Anlegen"
+
 msgid "Switch Timer sucessfully created"
 msgstr "Umschalttimer erfolgreich angelegt"
 
@@ -522,9 +513,6 @@ msgstr "Umschalttimer NICHT erfolgreich angelegt"
 msgid "Switch Timer deleted"
 msgstr "Umschalttimer gelöscht"
 
-msgid "Perform Search"
-msgstr "Suche ausführen"
-
 msgid "Search Mode"
 msgstr "Suchmodus"
 
@@ -543,6 +531,9 @@ msgstr "In Beschreibung suchen"
 msgid "Show Search Options"
 msgstr "Suchoptionen anzeigen"
 
+msgid "Perform Search"
+msgstr "Suche ausführen"
+
 msgid "search results for"
 msgstr "Suchergebnisse für"
 
@@ -558,12 +549,12 @@ msgstr "Suchausdruck muss mindestens drei Zeichen haben"
 msgid "Found"
 msgstr " "
 
-msgid "recordings"
-msgstr "Aufnahmen gefunden"
-
 msgid "recording"
 msgstr "Aufnahme gefunden"
 
+msgid "recordings"
+msgstr "Aufnahmen gefunden"
+
 msgid "for"
 msgstr "für"
 
@@ -597,9 +588,6 @@ msgstr "Regulärer Ausdruck"
 msgid "fuzzy"
 msgstr "unscharf"
 
-msgid "allow empty"
-msgstr "erlaube leere"
-
 msgid "Interval"
 msgstr "Bereich"
 
@@ -918,9 +906,6 @@ msgstr "Untertitel in manuellen Timern"
 msgid "Use Remotetimers"
 msgstr "RemoteTimers benutzen"
 
-msgid "Show timer confirmation messages"
-msgstr "Timer Bestätigungsmeldungen anzeigen"
-
 msgid "Favorites:"
 msgstr "Favoriten:"
 
@@ -970,7 +955,7 @@ msgid "Create Log Messages for image loading"
 msgstr "Log Nachrichten für das Laden der Bilder erzeugen"
 
 msgid "Limit Logo Cache"
-msgstr "Logo Cache beschränken"
+msgstr "Logo Cash beschränken"
 
 msgid "Maximal number of logos to cache"
 msgstr "Maximale Anzahl Logos"
@@ -1012,7 +997,7 @@ msgid "Reruns"
 msgstr "Wiederholungen"
 
 msgid "Recording Information"
-msgstr "Aufnahme Information"
+msgstr ""
 
 msgid "Image Galery"
 msgstr "Bildergalerie"

po/it_IT.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: 2022-04-29 16:05+0200\n"
+"POT-Creation-Date: 2020-02-17 14:30+0100\n"
 "PO-Revision-Date: 2012-08-25 17:49+0200\n"
 "Last-Translator: fiveten_59\n"
 "Language-Team: \n"
@@ -72,15 +72,6 @@ msgstr "Tutti i Canali"
 msgid "unknown channel"
 msgstr "Canale sconosciuto"
 
-msgid "with"
-msgstr ""
-
-msgid "errors"
-msgstr ""
-
-msgid "error"
-msgstr ""
-
 msgid "Duration"
 msgstr "Durata"
 
@@ -111,15 +102,12 @@ msgstr "registrazione eseguita"
 msgid "Instant Record"
 msgstr "Registrazione immediata"
 
-msgid "Timer On/Off"
+msgid "Delete Timer"
-msgstr "Timer On/Off"
+msgstr "Cancella il Timer"
 
 msgid "Edit Timer"
 msgstr "Edita il Timer"
 
-msgid "Delete Timer"
-msgstr "Cancella il Timer"
-
 msgid "Timer Timeline"
 msgstr "Scadenza del Timer"
 
@@ -177,14 +165,14 @@ msgstr "Si"
 msgid "No"
 msgstr "No"
 
-msgid "Timer Conflicts"
+msgid "One"
-msgstr "Conflitti del Timer"
+msgstr "Uno"
 
 msgid "detected"
 msgstr "rilevato"
 
-msgid "Ignore Conflicts"
+msgid "Timer Conflicts"
-msgstr "Ignora conflitti"
+msgstr "Conflitti del Timer"
 
 msgid "Show conflict"
 msgstr "Mostra conflitto"
@@ -192,6 +180,9 @@ msgstr "Mostra conflitto"
 msgid "timers involved"
 msgstr "Timers impegnati"
 
+msgid "Ignore Conflicts"
+msgstr "Ignora conflitti"
+
 msgid "Ignore Conflict"
 msgstr "Ignora conflitto"
 
@@ -222,12 +213,6 @@ msgstr "Timer per"
 msgid "replaced by rerun"
 msgstr "rimosso dal riavvio"
 
-msgid "Save"
-msgstr "Salva"
-
-msgid "Cancel"
-msgstr "Cancella"
-
 msgid "Timer Active"
 msgstr "Timer attivo"
 
@@ -252,11 +237,14 @@ msgstr "File del Timer"
 msgid "New Folder"
 msgstr "Nuova cartella"
 
-msgid "Create Series Timer based on:"
+msgid "Save"
-msgstr "Crea il Series Timer basato su:"
+msgstr "Salva"
 
-msgid "Create Timer"
+msgid "Cancel"
-msgstr "Crea il Timer"
+msgstr "Cancella"
+
+msgid "Create Series Timer based on"
+msgstr "Crea il Series Timer basato su"
 
 msgid "Series Timer start time"
 msgstr "Ora d'avvio del Series Timer"
@@ -270,6 +258,9 @@ msgstr "Giorni da registrare"
 msgid "Day to start"
 msgstr "Giorno d'inizio"
 
+msgid "Create Timer"
+msgstr "Crea il Timer"
+
 msgid "Series Timer created"
 msgstr "Series Timer creato"
 
@@ -279,17 +270,17 @@ msgstr "Avvio"
 msgid "Stop"
 msgstr "Ferma"
 
-msgid "Configure Search Timer based on:"
+msgid "Configure Search Timer based on"
-msgstr "Configura il Search Timer in serie basato su:"
+msgstr "Configura il Search Timer in serie basato su"
-
-msgid "Continue"
-msgstr "Continua"
 
 msgid "Search Expression:"
 msgstr "Cerca espressione:"
 
-msgid "Configure Search Timer for Search String:"
+msgid "Continue"
-msgstr "Configura il Search Timer basato su Search String:"
+msgstr "Continua"
+
+msgid "Configure Search Timer for Search String"
+msgstr "Configura il Search Timer basato su Search String"
 
 msgid "Manually configure Options"
 msgstr "Configura manualmente le Opzioni"
@@ -456,7 +447,7 @@ msgstr "Elimina solo il Search Timer"
 msgid "Delete Search Timer and created Timers"
 msgstr "Elimina il Search Timer e Timers creati"
 
-msgid "Search Timer sucessfully created"
+msgid "Search Timer sucessfully created."
 msgstr "Search Timer creato con successo"
 
 msgid "Search Timer update initialised"
@@ -480,12 +471,12 @@ msgstr "Anderes Template benutzen"
 msgid "search results for Favorite"
 msgstr "Suchergebnisse für Favorit"
 
-msgid "search results for Search Timer"
-msgstr "Treffer für Suchtimer"
-
 msgid "search result for Favorite"
 msgstr "Suchergebnis für Favorit"
 
+msgid "search results for Search Timer"
+msgstr "Treffer für Suchtimer"
+
 msgid "search result for Search Timer"
 msgstr "Treffer für Suchtimer"
 
@@ -495,8 +486,8 @@ msgstr "Keine Treffer für Suchbegriff"
 msgid "Configure Options for Switchtimer"
 msgstr "Optionen für Umschalttimer konfigurieren"
 
-msgid "Create"
+msgid "Minutes before switching"
-msgstr "Creare"
+msgstr "Minuten vor umschalten"
 
 msgid "switch"
 msgstr "cambio"
@@ -507,12 +498,12 @@ msgstr "Segnala solamente"
 msgid "ask for switch"
 msgstr "chiedi per cambiare"
 
-msgid "Minutes before switching"
-msgstr "Minuten vor umschalten"
-
 msgid "Switch Mode"
 msgstr "Modalità Switch"
 
+msgid "Create"
+msgstr "Creare"
+
 msgid "Switch Timer sucessfully created"
 msgstr "Switch Timer creato con successo"
 
@@ -522,9 +513,6 @@ msgstr "Switch Timer NON creato"
 msgid "Switch Timer deleted"
 msgstr "Switch Timer eliminato"
 
-msgid "Perform Search"
-msgstr "Fai una ricerca"
-
 msgid "Search Mode"
 msgstr "Modalità di ricerca"
 
@@ -543,6 +531,9 @@ msgstr "Cerca nella descrizione"
 msgid "Show Search Options"
 msgstr "Mostra opzioni di ricerca"
 
+msgid "Perform Search"
+msgstr "Fai una ricerca"
+
 msgid "search results for"
 msgstr "cerca risultati per"
 
@@ -558,12 +549,12 @@ msgstr "Search String deve avere almeno tre lettere"
 msgid "Found"
 msgstr "Trovato"
 
-msgid "recordings"
-msgstr "registrazioni"
-
 msgid "recording"
 msgstr "registrazione"
 
+msgid "recordings"
+msgstr "registrazioni"
+
 msgid "for"
 msgstr "per"
 
@@ -597,9 +588,6 @@ msgstr "Regulärer Ausdruck"
 msgid "fuzzy"
 msgstr ""
 
-msgid "allow empty"
-msgstr ""
-
 msgid "Interval"
 msgstr ""
 
@@ -918,9 +906,6 @@ msgstr "Aggiungi episodi ai timer manuali"
 msgid "Use Remotetimers"
 msgstr "Usa Remotetimers"
 
-msgid "Show timer confirmation messages"
-msgstr ""
-
 msgid "Favorites:"
 msgstr ""
 

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: 2022-04-29 16:05+0200\n"
+"POT-Creation-Date: 2020-02-17 14:30+0100\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"
@@ -22,7 +22,7 @@ msgid "min"
 msgstr "мин"
 
 msgid "Reruns of "
-msgstr "ПОВТОРЫ ЭТОЙ "
+msgstr ""
 
 msgid "No reruns found"
 msgstr ""
@@ -72,15 +72,6 @@ msgstr "все каналы"
 msgid "unknown channel"
 msgstr "неизвестный канал"
 
-msgid "with"
-msgstr ""
-
-msgid "errors"
-msgstr ""
-
-msgid "error"
-msgstr ""
-
 msgid "Duration"
 msgstr "Продолжительность"
 
@@ -111,15 +102,12 @@ msgstr ""
 msgid "Instant Record"
 msgstr "Записать"
 
-msgid "Timer On/Off"
+msgid "Delete Timer"
-msgstr "таймер Вкл/Выкл"
+msgstr "Удалить таймер"
 
 msgid "Edit Timer"
 msgstr "Редактировать таймер"
 
-msgid "Delete Timer"
-msgstr "Удалить таймер"
-
 msgid "Timer Timeline"
 msgstr ""
 
@@ -177,14 +165,14 @@ msgstr "Да"
 msgid "No"
 msgstr "Нет"
 
-msgid "Timer Conflicts"
+msgid "One"
-msgstr "Таймер-конфликты"
+msgstr "Один"
 
 msgid "detected"
 msgstr "обнаружен"
 
-msgid "Ignore Conflicts"
+msgid "Timer Conflicts"
-msgstr "Игнорировать конфликты"
+msgstr "Таймер-конфликты"
 
 msgid "Show conflict"
 msgstr "Показать конфликты"
@@ -192,6 +180,9 @@ msgstr "Показать конфликты"
 msgid "timers involved"
 msgstr "Таймер"
 
+msgid "Ignore Conflicts"
+msgstr "Игнорировать конфликты"
+
 msgid "Ignore Conflict"
 msgstr "Игнорировать конфликт"
 
@@ -222,12 +213,6 @@ msgstr ""
 msgid "replaced by rerun"
 msgstr ""
 
-msgid "Save"
-msgstr "Сохранить"
-
-msgid "Cancel"
-msgstr "Отменить"
-
 msgid "Timer Active"
 msgstr "Таймер активен"
 
@@ -252,11 +237,14 @@ msgstr ""
 msgid "New Folder"
 msgstr ""
 
-msgid "Create Series Timer based on:"
+msgid "Save"
-msgstr "Настроить циклический таймер:"
+msgstr "Сохранить"
 
-msgid "Create Timer"
+msgid "Cancel"
-msgstr "Создать"
+msgstr "Отменить"
+
+msgid "Create Series Timer based on"
+msgstr "Настроить циклический таймер"
 
 msgid "Series Timer start time"
 msgstr "Время с"
@@ -270,6 +258,9 @@ msgstr "Дни недели"
 msgid "Day to start"
 msgstr "Начиная с"
 
+msgid "Create Timer"
+msgstr "Создать"
+
 msgid "Series Timer created"
 msgstr "Циклический таймер создан"
 
@@ -279,17 +270,17 @@ msgstr "Старт"
 msgid "Stop"
 msgstr "Стоп"
 
-msgid "Configure Search Timer based on:"
+msgid "Configure Search Timer based on"
-msgstr "Настроить поисковый таймер:"
+msgstr "Настроить поисковый таймер"
-
-msgid "Continue"
-msgstr "Продолжить"
 
 msgid "Search Expression:"
 msgstr "Искать выражение:"
 
-msgid "Configure Search Timer for Search String:"
+msgid "Continue"
-msgstr "Настройка таймера поиска по ключевым словам:"
+msgstr "Продолжить"
+
+msgid "Configure Search Timer for Search String"
+msgstr "Настройка таймера поиска по ключевым словам"
 
 msgid "Manually configure Options"
 msgstr "Ручная настройка параметров"
@@ -304,7 +295,7 @@ msgid "No Search Timers Configured"
 msgstr ""
 
 msgid "Configure Search Timer Options"
-msgstr "Настроить параметры таймера"
+msgstr ""
 
 msgid "Save Search Timer"
 msgstr ""
@@ -456,7 +447,7 @@ msgstr ""
 msgid "Delete Search Timer and created Timers"
 msgstr ""
 
-msgid "Search Timer sucessfully created"
+msgid "Search Timer sucessfully created."
 msgstr "Поисковый таймер создан"
 
 msgid "Search Timer update initialised"
@@ -480,12 +471,12 @@ msgstr "Использовать другие шаблоны"
 msgid "search results for Favorite"
 msgstr ""
 
-msgid "search results for Search Timer"
-msgstr "Совпадений найдено"
-
 msgid "search result for Favorite"
 msgstr ""
 
+msgid "search results for Search Timer"
+msgstr "Совпадений найдено"
+
 msgid "search result for Search Timer"
 msgstr "Совпадение найдено"
 
@@ -495,8 +486,8 @@ msgstr "Совпадений НЕ найдено"
 msgid "Configure Options for Switchtimer"
 msgstr "Настройка таймера переключения"
 
-msgid "Create"
+msgid "Minutes before switching"
-msgstr "Создать"
+msgstr "Минут до события"
 
 msgid "switch"
 msgstr "Переключить"
@@ -507,12 +498,12 @@ msgstr "Только предупредить"
 msgid "ask for switch"
 msgstr "Спросить о переключении"
 
-msgid "Minutes before switching"
-msgstr "Минут до события"
-
 msgid "Switch Mode"
 msgstr "Режим переключения"
 
+msgid "Create"
+msgstr "Создать"
+
 msgid "Switch Timer sucessfully created"
 msgstr "Таймер переключения создан"
 
@@ -522,9 +513,6 @@ msgstr "Таймер переключения НЕ был создан!"
 msgid "Switch Timer deleted"
 msgstr "Таймер переключения удален"
 
-msgid "Perform Search"
-msgstr "Найти"
-
 msgid "Search Mode"
 msgstr "Режим поиска"
 
@@ -543,6 +531,9 @@ msgstr "Искать в описаниях"
 msgid "Show Search Options"
 msgstr "Показать параметры поиска"
 
+msgid "Perform Search"
+msgstr "Найти"
+
 msgid "search results for"
 msgstr "Найдено по запросу"
 
@@ -558,12 +549,12 @@ msgstr ""
 msgid "Found"
 msgstr "Найдено"
 
-msgid "recordings"
-msgstr "записей"
-
 msgid "recording"
 msgstr "запись"
 
+msgid "recordings"
+msgstr "записей"
+
 msgid "for"
 msgstr "для"
 
@@ -597,9 +588,6 @@ msgstr "регулярные выражения"
 msgid "fuzzy"
 msgstr ""
 
-msgid "allow empty"
-msgstr ""
-
 msgid "Interval"
 msgstr ""
 
@@ -769,7 +757,7 @@ msgid "Display time in EPG Grids"
 msgstr "Показывать время в сетке EPG"
 
 msgid "Height of Headers (Status Header and EPG View, Perc. of osd height)"
-msgstr "Высота верхней панели (% от высоты OSD)"
+msgstr ""
 
 msgid "Height of Footer (Perc. of osd height)"
 msgstr ""
@@ -907,7 +895,7 @@ msgid "Instant recording:"
 msgstr ""
 
 msgid "Folder for instant Recordings"
-msgstr "Использовать директории для быстрой записи"
+msgstr ""
 
 msgid "Folder"
 msgstr ""
@@ -918,9 +906,6 @@ msgstr ""
 msgid "Use Remotetimers"
 msgstr "RemoteTimers benutzen"
 
-msgid "Show timer confirmation messages"
-msgstr ""
-
 msgid "Favorites:"
 msgstr ""
 
@@ -1009,7 +994,7 @@ msgid "EPG Info"
 msgstr ""
 
 msgid "Reruns"
-msgstr "ПОВТОРЫ"
+msgstr ""
 
 msgid "Recording Information"
 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: 2022-04-29 16:05+0200\n"
+"POT-Creation-Date: 2020-02-17 14:30+0100\n"
 "PO-Revision-Date: 2013-09-15 00:12+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: \n"
@@ -22,7 +22,7 @@ msgid "min"
 msgstr "min"
 
 msgid "Reruns of "
-msgstr "Repríza tohto "
+msgstr ""
 
 msgid "No reruns found"
 msgstr ""
@@ -72,15 +72,6 @@ msgstr "v
 msgid "unknown channel"
 msgstr "neznámy Kanal"
 
-msgid "with"
-msgstr ""
-
-msgid "errors"
-msgstr ""
-
-msgid "error"
-msgstr ""
-
 msgid "Duration"
 msgstr "Då¾ka"
 
@@ -111,15 +102,12 @@ msgstr ""
 msgid "Instant Record"
 msgstr "Okam¾ite nahra»"
 
-msgid "Timer On/Off"
+msgid "Delete Timer"
-msgstr "Zap./Vyp. plán nahrávania"
+msgstr "Vymaza» plán nahrávania"
 
 msgid "Edit Timer"
 msgstr "Upravi» plán nahrávania"
 
-msgid "Delete Timer"
-msgstr "Vymaza» plán nahrávania"
-
 msgid "Timer Timeline"
 msgstr ""
 
@@ -177,14 +165,14 @@ msgstr "
 msgid "No"
 msgstr "Nie"
 
-msgid "Timer Conflicts"
+msgid "One"
-msgstr "Konflikty plánov"
+msgstr "Jeden"
 
 msgid "detected"
 msgstr "nájdených"
 
-msgid "Ignore Conflicts"
+msgid "Timer Conflicts"
-msgstr "Ignorova» konflikty"
+msgstr "Konflikty plánov"
 
 msgid "Show conflict"
 msgstr "Zobrazi» konflikt"
@@ -192,6 +180,9 @@ msgstr "Zobrazi
 msgid "timers involved"
 msgstr "plány komplikované"
 
+msgid "Ignore Conflicts"
+msgstr "Ignorova» konflikty"
+
 msgid "Ignore Conflict"
 msgstr "Ignorova» konflikt"
 
@@ -222,12 +213,6 @@ msgstr ""
 msgid "replaced by rerun"
 msgstr ""
 
-msgid "Save"
-msgstr "Ulo¾i»"
-
-msgid "Cancel"
-msgstr "Zru¹i»"
-
 msgid "Timer Active"
 msgstr "Plán aktívny"
 
@@ -252,11 +237,14 @@ msgstr ""
 msgid "New Folder"
 msgstr ""
 
-msgid "Create Series Timer based on:"
+msgid "Save"
-msgstr "Vytvorenie plánu na základe série:"
+msgstr "Ulo¾i»"
 
-msgid "Create Timer"
+msgid "Cancel"
-msgstr "Vytvori» plán"
+msgstr "Zru¹i»"
+
+msgid "Create Series Timer based on"
+msgstr "Vytvorenie plánu na základe série"
 
 msgid "Series Timer start time"
 msgstr "Sériový plán zaèína"
@@ -270,6 +258,9 @@ msgstr "Dni"
 msgid "Day to start"
 msgstr "Zaèína dòa"
 
+msgid "Create Timer"
+msgstr "Vytvori» plán"
+
 msgid "Series Timer created"
 msgstr "Vytvorený sériový plán"
 
@@ -279,17 +270,17 @@ msgstr "
 msgid "Stop"
 msgstr "Stop"
 
-msgid "Configure Search Timer based on:"
+msgid "Configure Search Timer based on"
-msgstr "Vyhµadávanie plánu nastavi» na základe:"
+msgstr "Vyhµadávanie plánu nastavi» na základe"
-
-msgid "Continue"
-msgstr "Ïal¹ie"
 
 msgid "Search Expression:"
 msgstr "Hµadaný výraz:"
 
-msgid "Configure Search Timer for Search String:"
+msgid "Continue"
-msgstr "Konfigurácia vyhµadávania plánu pre hµadané kµúèové slovo:"
+msgstr "Ïal¹ie"
+
+msgid "Configure Search Timer for Search String"
+msgstr "Konfigurácia vyhµadávania plánu pre hµadané kµúèové slovo "
 
 msgid "Manually configure Options"
 msgstr "Ruène konfigurova» mo¾nosti"
@@ -456,8 +447,8 @@ msgstr ""
 msgid "Delete Search Timer and created Timers"
 msgstr ""
 
-msgid "Search Timer sucessfully created"
+msgid "Search Timer sucessfully created."
-msgstr "Vyhµadávaè plánu vytvorený"
+msgstr "Vyhµadávaè plánu vytvorený."
 
 msgid "Search Timer update initialised"
 msgstr "Vyhladávaè plánu inicializovaný"
@@ -480,12 +471,12 @@ msgstr "Pou
 msgid "search results for Favorite"
 msgstr ""
 
-msgid "search results for Search Timer"
-msgstr "nájdené výsledky vyhµadávania plánu"
-
 msgid "search result for Favorite"
 msgstr ""
 
+msgid "search results for Search Timer"
+msgstr "nájdené výsledky vyhµadávania plánu"
+
 msgid "search result for Search Timer"
 msgstr "nájdený výsledok vyhµadávania plánu"
 
@@ -495,8 +486,8 @@ msgstr "H
 msgid "Configure Options for Switchtimer"
 msgstr "Konfigurova» mo¾nosti pre prepínací plán"
 
-msgid "Create"
+msgid "Minutes before switching"
-msgstr "Vytvori»"
+msgstr "Minúty pred prepnutím"
 
 msgid "switch"
 msgstr "Prepnú»"
@@ -507,12 +498,12 @@ msgstr "iba ozn
 msgid "ask for switch"
 msgstr "opýta» sa na prepnutie"
 
-msgid "Minutes before switching"
-msgstr "Minúty pred prepnutím"
-
 msgid "Switch Mode"
 msgstr "Prepínací re¾im"
 
+msgid "Create"
+msgstr "Vytvori»"
+
 msgid "Switch Timer sucessfully created"
 msgstr "Prepnutie je naplánované"
 
@@ -522,9 +513,6 @@ msgstr "Pl
 msgid "Switch Timer deleted"
 msgstr "Plán prepnutia vymazaný"
 
-msgid "Perform Search"
-msgstr "Vykona» vyhµadávanie"
-
 msgid "Search Mode"
 msgstr "Re¾im vyhµadávania"
 
@@ -543,6 +531,9 @@ msgstr "H
 msgid "Show Search Options"
 msgstr "Zobrazi» mo¾nosti vyhµadávania"
 
+msgid "Perform Search"
+msgstr "Vykona» vyhµadávanie"
+
 msgid "search results for"
 msgstr "vyhµadané výsledky pre"
 
@@ -558,12 +549,12 @@ msgstr ""
 msgid "Found"
 msgstr "Nájdené"
 
-msgid "recordings"
-msgstr "nahrávky"
-
 msgid "recording"
 msgstr "nahrávka"
 
+msgid "recordings"
+msgstr "nahrávky"
+
 msgid "for"
 msgstr "pre"
 
@@ -597,9 +588,6 @@ msgstr "regul
 msgid "fuzzy"
 msgstr ""
 
-msgid "allow empty"
-msgstr ""
-
 msgid "Interval"
 msgstr ""
 
@@ -769,7 +757,7 @@ msgid "Display time in EPG Grids"
 msgstr "Zobrazi» èas v EPG mrie¾ke"
 
 msgid "Height of Headers (Status Header and EPG View, Perc. of osd height)"
-msgstr "Vý¹ka stavovej hlavièky (% z OSD vý¹ky)"
+msgstr ""
 
 msgid "Height of Footer (Perc. of osd height)"
 msgstr ""
@@ -907,7 +895,7 @@ msgid "Instant recording:"
 msgstr ""
 
 msgid "Folder for instant Recordings"
-msgstr "Pou¾i» adresáre pre okam¾ité nahrávky"
+msgstr ""
 
 msgid "Folder"
 msgstr ""
@@ -918,9 +906,6 @@ msgstr "Prida
 msgid "Use Remotetimers"
 msgstr "Pou¾i» vzdialený plánovaè"
 
-msgid "Show timer confirmation messages"
-msgstr ""
-
 msgid "Favorites:"
 msgstr ""
 
@@ -1009,7 +994,7 @@ msgid "EPG Info"
 msgstr ""
 
 msgid "Reruns"
-msgstr "Repríza"
+msgstr ""
 
 msgid "Recording Information"
 msgstr ""

recmanager.c

@@ -1,4 +1,4 @@
-#define DISABLE_TEMPLATES_COLLIDING_WITH_STL
+#define __STL_CONFIG_H
 
 #include <string>
 #include <sstream>
@@ -267,21 +267,6 @@ void cRecManager::DeleteRemoteTimer(const cEvent *event) {
     }
 }
 
-void cRecManager::OnOffTimer(const cEvent *event) {
-    const cTimer *t;
-#if VDRVERSNUM >= 20301
-    {
-    LOCK_TIMERS_READ;
-    t = Timers->GetMatch(event);
-    }
-#else
-    t = Timers.GetMatch(event);
-#endif
-    if (!t)
-        return;
-    SaveTimer(t);
-}
-
 void cRecManager::SaveTimer(const cTimer *t, cTimer *newTimerSettings) {
     if (!t)
         return;
@@ -303,26 +288,20 @@ void cRecManager::SaveTimer(const cTimer *t, cTimer *newTimerSettings) {
     if (!timer) {
        return;
     }
+    bool active = newTimerSettings->HasFlags(tfActive);
+    int prio = newTimerSettings->Priority();
+    int lifetime = newTimerSettings->Lifetime();
+    time_t day = newTimerSettings->Day();
+    int start = newTimerSettings->Start();
+    int stop = newTimerSettings->Stop();
+    std::string fileName = newTimerSettings->File();
 
-    bool active = true;
+    timer->SetDay(day);
-    if (newTimerSettings) {
+    timer->SetStart(start);
-       int prio = newTimerSettings->Priority();
+    timer->SetStop(stop);
-       int lifetime = newTimerSettings->Lifetime();
+    timer->SetPriority(prio);
-       time_t day = newTimerSettings->Day();
+    timer->SetLifetime(lifetime);
-       int start = newTimerSettings->Start();
+    timer->SetFile(fileName.c_str());
-       int stop = newTimerSettings->Stop();
-       std::string fileName = newTimerSettings->File();
-
-       timer->SetDay(day);
-       timer->SetStart(start);
-       timer->SetStop(stop);
-       timer->SetPriority(prio);
-       timer->SetLifetime(lifetime);
-       timer->SetFile(fileName.c_str());
-
-       active = newTimerSettings->HasFlags(tfActive);
-    } else
-       active = !timer->HasFlags(tfActive);
 
     if (active)
        timer->SetFlags(tfActive);

recmanager.h

@@ -33,12 +33,11 @@ public:
     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 OnOffTimer(const cEvent *event);
     void DeleteTimer(const cTimer *timer);
     void DeleteTimer(const cEvent *event);
     void DeleteLocalTimer(const cEvent *event);
     void DeleteRemoteTimer(const cEvent *event);
-    void SaveTimer(const cTimer *timer, cTimer *newTimerSettings = NULL);
+    void SaveTimer(const cTimer *timer, cTimer *newTimerSettings);
     bool IsRecorded(const cEvent *event);
     cTVGuideTimerConflicts *CheckTimerConflict(void);
     void CreateSeriesTimer(cTimer *seriesTimer);

recmenu.c

@@ -28,7 +28,7 @@ cRecMenu::~cRecMenu(void) {
     if (footer)
         delete footer;
     if (pixmapScrollBar)
-        osdManager.DestroyPixmap(pixmapScrollBar);
+        osdManager.releasePixmap(pixmapScrollBar);
     if (imgScrollBar)
         delete imgScrollBar;
 }
@@ -81,26 +81,26 @@ bool cRecMenu::CalculateHeight(bool reDraw) {
 
 void cRecMenu::CreatePixmap(void) {
     if (pixmap)
-        osdManager.DestroyPixmap(pixmap);
+        osdManager.releasePixmap(pixmap);
-    pixmap = osdManager.CreatePixmap(3, cRect(x, y, width, height));
+    pixmap = osdManager.requestPixmap(3, cRect(x, y, width, height));
     if (scrollable) {
         int scrollBarX = x + width - scrollbarWidth - border;
         int scrollBarY = y + border + headerHeight;
         int scrollBarHeight = height - headerHeight - footerHeight - 2 * border;
         if (pixmapScrollBar)
-            osdManager.DestroyPixmap(pixmapScrollBar);
+            osdManager.releasePixmap(pixmapScrollBar);
-        pixmapScrollBar = osdManager.CreatePixmap(4, cRect(scrollBarX, scrollBarY, scrollbarWidth, scrollBarHeight));
+        pixmapScrollBar = osdManager.requestPixmap(4, cRect(scrollBarX, scrollBarY, scrollbarWidth, scrollBarHeight));
     } else 
         pixmapScrollBar = NULL;
 }
 
-void cRecMenu::AddHeader(cRecMenuItem *header) {
+void cRecMenu::SetHeader(cRecMenuItem *header) { 
     this->header = header; 
     headerHeight = header->GetHeight();
     height += headerHeight;
 }
 
-void cRecMenu::AddFooter(cRecMenuItem *footer) {
+void cRecMenu::SetFooter(cRecMenuItem *footer) {
     this->footer = footer;
     footerHeight = footer->GetHeight();
     height += footerHeight;
@@ -121,11 +121,12 @@ void cRecMenu::InitMenu(bool complete) {
     numItems = 0;
     if (scrollable) {
         width -= scrollbarWidth + border;
-        osdManager.DestroyPixmap(pixmapScrollBar);
+        osdManager.releasePixmap(pixmapScrollBar);
         pixmapScrollBar = NULL;
-        DELETENULL(imgScrollBar);
+        delete imgScrollBar;
+        imgScrollBar = NULL;
     }
-    osdManager.DestroyPixmap(pixmap);
+    osdManager.releasePixmap(pixmap);
     pixmap = NULL;
     for (std::list<cRecMenuItem*>::iterator it = menuItems.begin(); it != menuItems.end(); it++) {
         if (deleteMenuItems)
@@ -178,14 +179,14 @@ void cRecMenu::Activate(cRecMenuItem *itemOld, cRecMenuItem *item) {
     itemOld->setInactive();
     itemOld->setBackground();
     itemOld->Draw();
-    item->SetActive();
+    item->setActive();
     item->setBackground();
     item->Draw();
 }
 
 bool cRecMenu::ActivatePrev(void) {
     cRecMenuItem *activeItem = GetActiveMenuItem();
-    if (!scrollable && footer && footer->IsActive()) {
+    if (!scrollable && footer && footer->isActive()) {
         if (menuItems.size() > 0) {
             cRecMenuItem *itemLast = menuItems.back();
             Activate(footer, itemLast);
@@ -216,7 +217,7 @@ bool cRecMenu::ActivatePrev(void) {
 }
 
 bool cRecMenu::ScrollUp(void) {
-    if (footer && footer->IsActive()) {
+    if (footer && footer->isActive()) {
         if (menuItems.size() > 0)
             Activate(footer, menuItems.back());
     } else {
@@ -274,7 +275,7 @@ bool cRecMenu::ActivateNext(void) {
         if (next) {
             Activate(activeItem , next);
             return true;
-        } else if (!scrollable && footer && footer->isSelectable() && !footer->IsActive()) {
+        } else if (!scrollable && footer && footer->isSelectable() && !footer->isActive()) {
             Activate(activeItem , footer);
             return true;
         }
@@ -312,7 +313,7 @@ bool cRecMenu::ScrollDown(void) {
         ActivateNext();
     } else {
         //last item reached, activate footer if not already active
-        if ((footer) && !(footer->IsActive())) {
+        if ((footer) && !(footer->isActive())) {
             cRecMenuItem *activeItem = GetActiveMenuItem();
             Activate(activeItem , footer);
         } else {
@@ -334,7 +335,7 @@ void cRecMenu::PageUp(void) {
         Activate(footer, menuItems.front());
         return;
     }
-    int newActive = GetNumActive() - numItems;
+    int newActive = GetActive() - numItems;
     if (newActive < 0)
         newActive = 0;
     activeItem->setInactive();
@@ -347,7 +348,7 @@ void cRecMenu::PageUp(void) {
     bool spaceLeft = true;
     while (newItem = GetMenuItem(startIndex-1)) {
         if (startIndex-1 == newActive)
-            newItem->SetActive();
+            newItem->setActive();
         spaceLeft = AddMenuItemInitial(newItem, true);
         if (!spaceLeft)
             break;
@@ -359,8 +360,8 @@ void cRecMenu::PageUp(void) {
                 break;
         }
     }
-    if (GetNumActive() == numItems)
+    if (GetActive() == numItems)
-            menuItems.front()->SetActive();
+            menuItems.front()->setActive();
     if (CalculateHeight(true))
         CreatePixmap();
     Arrange(deleteMenuItems);
@@ -378,7 +379,7 @@ void cRecMenu::PageDown(void) {
         JumpEnd();
         return;
     }
-    int newActive = GetNumActive() + numItems;
+    int newActive = GetActive() + numItems;
     activeItem->setInactive();
     activeItem->setBackground();
     ClearMenuItems();
@@ -389,7 +390,7 @@ void cRecMenu::PageDown(void) {
     bool spaceLeft = true;
     while (newItem = GetMenuItem(stopIndex)) {
         if (stopIndex == newActive)
-            newItem->SetActive();
+            newItem->setActive();
         spaceLeft = AddMenuItemInitial(newItem);
         if (!spaceLeft)
             break;
@@ -401,8 +402,8 @@ void cRecMenu::PageDown(void) {
                 break;
         }
     }
-    if (GetNumActive() == GetTotalNumMenuItems())
+    if (GetActive() == GetTotalNumMenuItems())
-            menuItems.back()->SetActive();
+            menuItems.back()->setActive();
     if (CalculateHeight(true))
         CreatePixmap();
     Arrange(deleteMenuItems);
@@ -442,7 +443,7 @@ void cRecMenu::JumpBegin(void) {
         startIndex = 0;
         stopIndex = currentItem;
         cRecMenuItem *first = menuItems.front();
-        first->SetActive();
+        first->setActive();
         first->setBackground();
         first->Draw();
         Display(false);    
@@ -490,12 +491,12 @@ void cRecMenu::JumpEnd(void) {
         stopIndex = totalNumItems;
         startIndex = stopIndex - numItems;
         if (footer) {
-            footer->SetActive();
+            footer->setActive();
             footer->setBackground();
             footer->Draw();
         } else {
             cRecMenuItem *last = menuItems.back();
-            last->SetActive();
+            last->setActive();
             last->setBackground();
             last->Draw();
         }
@@ -591,14 +592,14 @@ void cRecMenu::DrawScrollBar(void) {
     if (!pixmapScrollBar)
        return;
     pixmapScrollBar->Fill(theme.Color(clrBorder));
-    pixmapScrollBar->DrawRectangle(cRect(2, 2, pixmapScrollBar->ViewPort().Width() - 4, pixmapScrollBar->ViewPort().Height() - 4), theme.Color(clrBackground));
+    pixmapScrollBar->DrawRectangle(cRect(2,2,pixmapScrollBar->ViewPort().Width()-4, pixmapScrollBar->ViewPort().Height() - 4), theme.Color(clrBackground));
     
     int totalNumItems = GetTotalNumMenuItems();
     if (!totalNumItems)
        return;
-    if (!imgScrollBar) {
+    if (imgScrollBar == NULL) {
         int scrollBarImgHeight = (pixmapScrollBar->ViewPort().Height() - 8) * numItems / totalNumItems;
-        imgScrollBar = createScrollbar(pixmapScrollBar->ViewPort().Width() - 8, scrollBarImgHeight, theme.Color(clrHighlight), theme.Color(clrHighlightBlending));
+        imgScrollBar = createScrollbar(pixmapScrollBar->ViewPort().Width()-8, scrollBarImgHeight, theme.Color(clrHighlight), theme.Color(clrHighlightBlending));
     }
     int offset = (pixmapScrollBar->ViewPort().Height() - 8) * startIndex / totalNumItems;
     pixmapScrollBar->DrawImage(cPoint(4, 2 + offset), *imgScrollBar);
@@ -606,10 +607,10 @@ void cRecMenu::DrawScrollBar(void) {
 
 cRecMenuItem *cRecMenu::GetActiveMenuItem(void) {
     for (std::list<cRecMenuItem*>::iterator item = menuItems.begin(); item != menuItems.end(); item++) {
-        if ((*item)->IsActive())
+        if ((*item)->isActive())
             return *item;
     }
-    if (footer && footer->IsActive())
+    if (footer && footer->isActive())
         return footer;
     return NULL;
 }
@@ -624,10 +625,10 @@ cRecMenuItem *cRecMenu::GetMenuItemAt(int num) {
     return NULL;
 }
 
-int cRecMenu::GetNumActive(void) {
+int cRecMenu::GetActive(void) {
     int numActive = startIndex;
     for (std::list<cRecMenuItem*>::iterator item = menuItems.begin(); item != menuItems.end(); item++) {
-        if ((*item)->IsActive()) {
+        if ((*item)->isActive()) {
             break;
         }
         numActive++;
@@ -677,21 +678,25 @@ 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 (height >= 32 && config.style != eStyleFlat) {
+    if (config.style != eStyleFlat) {
         int numSteps = 64;
         int alphaStep = 0x03;
-        if (height < 100) {
+        if (height < 30)
+            return image;
+        else if (height < 100) {
             numSteps = 32;
             alphaStep = 0x06;
         }
-        int stepY = std::max(1, (int)(0.5 * height / numSteps));
+        int stepY = 0.5*height / numSteps;
+        if (stepY == 0)
+            stepY = 1;
         int alpha = 0x40;
         tColor clr;
-        for (int i = 0; i < numSteps; i++) {
+        for (int i = 0; i<numSteps; i++) {
             clr = AlphaBlend(clrBgr, clrBlend, alpha);
-            for (int y = i * stepY; y < (i + 1) * stepY; y++) {
+            for (int y = i*stepY; y < (i+1)*stepY; y++) {
-                for (int x = 0; x < width; x++) {
+                for (int x=0; x<width; x++) {
-                    image->SetPixel(cPoint(x, y), clr);
+                    image->SetPixel(cPoint(x,y), clr);
                 }
             }
             alpha += alphaStep;

recmenu.h

@@ -37,8 +37,8 @@ protected:
     int CalculateOptimalWidth(void);
     bool CalculateHeight(bool reDraw = false);
     void CreatePixmap(void);
-    void AddHeader(cRecMenuItem *header);
+    void SetHeader(cRecMenuItem *header);
-    void AddFooter(cRecMenuItem *footer);
+    void SetFooter(cRecMenuItem *footer);
     void ClearMenuItems(bool destructor = false);
     void InitMenu(bool complete);
     bool AddMenuItemInitial(cRecMenuItem *item, bool inFront = false);
@@ -53,7 +53,7 @@ protected:
     virtual int GetTotalNumMenuItems(void) { return 0; };
     virtual void CreateMenuItems(void) {};
     int GetStartIndex(void) { return startIndex; };
-    int GetNumActive(void);
+    int GetActive(void);
 public:
     cRecMenu(void);
     virtual ~cRecMenu(void);

recmenuitem.c

@@ -30,7 +30,7 @@ void cRecMenuItem::SetGeometry(int x, int y, int width) {
 
 void cRecMenuItem::SetPixmaps(void) {
     if (!pixmap)
-        pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+        pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
     else
         pixmap->SetViewPort(cRect(x, y, width, height));
 }
@@ -76,7 +76,7 @@ cRecMenuItemButton::cRecMenuItemButton(const char *text, eRecMenuState action, b
 
 cRecMenuItemButton::~cRecMenuItemButton(void) {
     if (pixmapText)
-        osdManager.DestroyPixmap(pixmapText);
+        osdManager.releasePixmap(pixmapText);
 }
 
 int cRecMenuItemButton::GetWidth(void) {
@@ -89,8 +89,8 @@ void cRecMenuItemButton::SetPixmaps(void) {
         width = width / 2;
     }
     if (!pixmap) {
-        pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+        pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
-        pixmapText = osdManager.CreatePixmap(5, cRect(x, y, width, height));
+        pixmapText = osdManager.requestPixmap(5, cRect(x, y, width, height));
     } else {
         pixmap->SetViewPort(cRect(x, y, width, height));
         pixmapText->SetViewPort(cRect(x, y, width, height));
@@ -158,8 +158,8 @@ void cRecMenuItemButtonYesNo::SetPixmaps(void) {
     int noX = x + 52 * width / 100;
     int yPixmaps = y + geoManager.borderRecMenus / 2;
     if (!pixmap) {
-        pixmap = osdManager.CreatePixmap(4, cRect(yesX, yPixmaps, buttonWidth, height));
+        pixmap = osdManager.requestPixmap(4, cRect(yesX, yPixmaps, buttonWidth, height));
-        pixmapNo = new cStyledPixmap(osdManager.CreatePixmap(4, cRect(noX, yPixmaps, buttonWidth, height)));    
+        pixmapNo = new cStyledPixmap(osdManager.requestPixmap(4, cRect(noX, yPixmaps, buttonWidth, height)));    
     } else {
         pixmap->SetViewPort(cRect(yesX, yPixmaps, buttonWidth, height));
         pixmapNo->SetViewPort(cRect(noX, yPixmaps, buttonWidth, height));
@@ -266,41 +266,15 @@ cRecMenuItemInfo::cRecMenuItemInfo(const char *text, bool largeFont) {
     selectable = false;
     active = false;
     this->text = text;
-    this->line1 = "";
-    this->line2 = "";
-    this->line3 = "";
-    this->line4 = "";
-    this->numLines = 1;
     fontInfo = (largeFont) ? fontLarge : font;
     border = 10;
 }
 
-cRecMenuItemInfo::cRecMenuItemInfo(std::string line1, int numLines, std::string line2, std::string line3, std::string line4, int width, bool largeFont) {
-    selectable = false;
-    fontInfo = (largeFont) ? fontLarge : font;
-    border = 10;
-    this->numLines = numLines;
-    this->line2 = line2;
-    this->line3 = line3;
-    this->line4 = line4;
-    if (numLines == 1) {
-        this->line1 = line1;
-    } else if (numLines == 2) {
-        this->line1 = cString::sprintf("%s\n%s", line1.c_str(), line2.c_str());
-    } else if (numLines == 3) {
-        this->line1 = cString::sprintf("%s\n%s\n%s", line1.c_str(), line2.c_str(), line3.c_str());
-    } else if (numLines == 4) {
-        this->line1 = cString::sprintf("%s\n%s\n%s\n%s", line1.c_str(), line2.c_str(), line3.c_str(), line4.c_str());
-    }
-    this->active = false;
-    CalculateHeight(width);
-}
-
 cRecMenuItemInfo::~cRecMenuItemInfo(void) {
 }
 
 void cRecMenuItemInfo::CalculateHeight(int textWidth) {
-    wrapper.Set((line1 == "") ? *text : line1.c_str(), fontInfo, textWidth);
+    wrapper.Set(*text, fontInfo, textWidth);
     height = fontInfo->Height() * wrapper.Lines() + 2 * border;
 }
 
@@ -343,13 +317,13 @@ cRecMenuItemInt::cRecMenuItemInt(cString text,
 
 cRecMenuItemInt::~cRecMenuItemInt(void) {
     if (pixmapVal)
-        osdManager.DestroyPixmap(pixmapVal);
+        osdManager.releasePixmap(pixmapVal);
 }
 
 void cRecMenuItemInt::SetPixmaps(void) {
     if (!pixmap) {
-        pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+        pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
-        pixmapVal = osdManager.CreatePixmap(5, cRect(x, y, width, height));
+        pixmapVal = osdManager.requestPixmap(5, cRect(x, y, width, height));
     } else {
         pixmap->SetViewPort(cRect(x, y, width, height));
         pixmapVal->SetViewPort(cRect(x, y, width, height));
@@ -464,13 +438,13 @@ cRecMenuItemBool::cRecMenuItemBool(cString text,
 
 cRecMenuItemBool::~cRecMenuItemBool(void) {
     if (pixmapVal)
-        osdManager.DestroyPixmap(pixmapVal);
+        osdManager.releasePixmap(pixmapVal);
 }
 
 void cRecMenuItemBool::SetPixmaps(void) {
     if (!pixmap) {
-        pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+        pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
-        pixmapVal = osdManager.CreatePixmap(5, cRect(x, y, width, height));
+        pixmapVal = osdManager.requestPixmap(5, cRect(x, y, width, height));
     } else {
         pixmap->SetViewPort(cRect(x, y, width, height));
         pixmapVal->SetViewPort(cRect(x, y, width, height));
@@ -551,13 +525,13 @@ cRecMenuItemSelect::cRecMenuItemSelect(cString text,
 
 cRecMenuItemSelect::~cRecMenuItemSelect(void) {
     if (pixmapVal)
-        osdManager.DestroyPixmap(pixmapVal);
+        osdManager.releasePixmap(pixmapVal);
 }
 
 void cRecMenuItemSelect::SetPixmaps(void) {
     if (!pixmap) {
-        pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+        pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
-        pixmapVal = osdManager.CreatePixmap(5, cRect(x, y, width, height));
+        pixmapVal = osdManager.requestPixmap(5, cRect(x, y, width, height));
     } else {
         pixmap->SetViewPort(cRect(x, y, width, height));
         pixmapVal->SetViewPort(cRect(x, y, width, height));
@@ -583,7 +557,7 @@ void cRecMenuItemSelect::Draw(void) {
 void cRecMenuItemSelect::DrawValue(void) {
     pixmapVal->Fill(clrTransparent);
     std::string textVal = strings[currentVal];
-    int iconSize = std::min(128, height);
+    int iconSize = min(128, height);
     int textX = width - font->Width(textVal.c_str()) - iconSize;
     int textY = (height - font->Height()) / 2;
     pixmapVal->DrawText(cPoint(textX, textY), textVal.c_str(), colorText, clrTransparent, font);
@@ -659,13 +633,13 @@ cRecMenuItemSelectDirectory::cRecMenuItemSelectDirectory(cString text,
 
 cRecMenuItemSelectDirectory::~cRecMenuItemSelectDirectory(void) {
     if (pixmapVal)
-        osdManager.DestroyPixmap(pixmapVal);
+        osdManager.releasePixmap(pixmapVal);
 }
 
 void cRecMenuItemSelectDirectory::SetPixmaps(void) {
     if (!pixmap) {
-        pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+        pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
-        pixmapVal = osdManager.CreatePixmap(5, cRect(x, y, width, height));
+        pixmapVal = osdManager.requestPixmap(5, cRect(x, y, width, height));
     } else {
         pixmap->SetViewPort(cRect(x, y, width, height));
         pixmapVal->SetViewPort(cRect(x, y, width, height));
@@ -690,7 +664,7 @@ void cRecMenuItemSelectDirectory::Draw(void) {
 
 void cRecMenuItemSelectDirectory::DrawValue(void) {
     pixmapVal->Fill(clrTransparent);
-    int iconSize = std::min(128, height);
+    int iconSize = min(128, height);
     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, width - textX - iconSize, font->Height(), taTop | taRight);
@@ -793,13 +767,13 @@ cRecMenuItemText::cRecMenuItemText(cString title,
 
 cRecMenuItemText::~cRecMenuItemText(void) {
     if (pixmapVal)
-        osdManager.DestroyPixmap(pixmapVal);
+        osdManager.releasePixmap(pixmapVal);
     if (pixmapKeyboard)
         delete pixmapKeyboard;
     if (pixmapKeyboardHighlight)
-        osdManager.DestroyPixmap(pixmapKeyboardHighlight);
+        osdManager.releasePixmap(pixmapKeyboardHighlight);
     if (pixmapKeyboardIcons)
-        osdManager.DestroyPixmap(pixmapKeyboardIcons);    
+        osdManager.releasePixmap(pixmapKeyboardIcons);    
     delete[] valueUtf8;
     delete[] allowedUtf8;
     delete[] charMapUtf8;
@@ -813,11 +787,11 @@ void cRecMenuItemText::SetPixmaps(void) {
     int keyboardX = x + (100 - keyboardWidth)*width / 100;
     int keyboardY = y + height;
     if (!pixmap) {
-        pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+        pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
-        pixmapVal = osdManager.CreatePixmap(5, cRect(xPixmapVal, yPixmapVal, widthPixmapVal, heightPixmapVal));
+        pixmapVal = osdManager.requestPixmap(5, cRect(xPixmapVal, yPixmapVal, widthPixmapVal, heightPixmapVal));
-        pixmapKeyboard = new cStyledPixmap(osdManager.CreatePixmap(-1, cRect(keyboardX, keyboardY, keyboardWidth*width/100, keyboardHeight)));
+        pixmapKeyboard = new cStyledPixmap(osdManager.requestPixmap(-1, cRect(keyboardX, keyboardY, keyboardWidth*width/100, keyboardHeight)));
-        pixmapKeyboardHighlight = osdManager.CreatePixmap(-1, cRect(keyboardX, keyboardY, keyboardWidth*width/100, keyboardHeight));
+        pixmapKeyboardHighlight = osdManager.requestPixmap(-1, cRect(keyboardX, keyboardY, keyboardWidth*width/100, keyboardHeight));
-        pixmapKeyboardIcons = osdManager.CreatePixmap(-1, cRect(keyboardX, keyboardY, keyboardWidth*width/100, keyboardHeight));
+        pixmapKeyboardIcons = osdManager.requestPixmap(-1, cRect(keyboardX, keyboardY, keyboardWidth*width/100, keyboardHeight));
     } else {
         pixmap->SetViewPort(cRect(x, y, width, height));
         pixmapVal->SetViewPort(cRect(xPixmapVal, yPixmapVal, widthPixmapVal, heightPixmapVal));
@@ -993,7 +967,7 @@ char *cRecMenuItemText::GetSMSKeys(int num) {
     if (specialChar)
         addition = 1;
     Utf8FromArray(startCharUtf8, p, numChars+addition);
-    int maxChars = std::min(numChars+1+addition, 8);
+    int maxChars = min(numChars+1+addition, 8);
     char *smskey = new char[maxChars];
     Utf8Strn0Cpy(smskey, p, maxChars);
     return smskey;
@@ -1350,13 +1324,13 @@ cRecMenuItemTime::cRecMenuItemTime(cString text,
 
 cRecMenuItemTime::~cRecMenuItemTime(void) {
     if (pixmapVal)
-        osdManager.DestroyPixmap(pixmapVal);
+        osdManager.releasePixmap(pixmapVal);
 }
 
 void cRecMenuItemTime::SetPixmaps(void) {
     if (!pixmap) {
-        pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+        pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
-        pixmapVal = osdManager.CreatePixmap(5, cRect(x, y, width, height));
+        pixmapVal = osdManager.requestPixmap(5, cRect(x, y, width, height));
     } else {
         pixmap->SetViewPort(cRect(x, y, width, height));
         pixmapVal->SetViewPort(cRect(x, y, width, height));
@@ -1489,13 +1463,13 @@ cRecMenuItemDay::cRecMenuItemDay(cString text,
 
 cRecMenuItemDay::~cRecMenuItemDay(void) {
     if (pixmapVal)
-        osdManager.DestroyPixmap(pixmapVal);
+        osdManager.releasePixmap(pixmapVal);
 }
 
 void cRecMenuItemDay::SetPixmaps(void) {
     if (!pixmap) {
-        pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+        pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
-        pixmapVal = osdManager.CreatePixmap(5, cRect(x, y, width, height));
+        pixmapVal = osdManager.requestPixmap(5, cRect(x, y, width, height));
     } else {
         pixmap->SetViewPort(cRect(x, y, width, height));
         pixmapVal->SetViewPort(cRect(x, y, width, height));
@@ -1580,16 +1554,16 @@ cRecMenuItemTimer::cRecMenuItemTimer(const cTimer *timer,
 
 cRecMenuItemTimer::~cRecMenuItemTimer(void) {
     if (pixmapIcons)
-        osdManager.DestroyPixmap(pixmapIcons);
+        osdManager.releasePixmap(pixmapIcons);
     if (pixmapStatus)
-        osdManager.DestroyPixmap(pixmapStatus);
+        osdManager.releasePixmap(pixmapStatus);
 }
 
 void cRecMenuItemTimer::SetPixmaps(void) {
     if (!pixmap) {
-        pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+        pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
-        pixmapStatus = osdManager.CreatePixmap(5, cRect(x, y, width, height));
+        pixmapStatus = osdManager.requestPixmap(5, cRect(x, y, width, height));
-        pixmapIcons = osdManager.CreatePixmap(6, cRect(x, y, width, height));
+        pixmapIcons = osdManager.requestPixmap(6, cRect(x, y, width, height));
     } else {
         pixmap->SetViewPort(cRect(x, y, width, height));
         pixmapStatus->SetViewPort(cRect(x, y, width, height));
@@ -1627,7 +1601,7 @@ void cRecMenuItemTimer::Draw(void) {
     if (!config.hideChannelLogos) {
         if (imgLoader.LoadLogo(channel, logoWidth, height)) {
             cImage logo = imgLoader.GetImage();
-            pixmapIcons->DrawImage(cPoint(logoX, (height - logo.Height()) / 2), logo);
+            pixmapIcons->DrawImage(cPoint(logoX, 0), logo);
             logoX += logoWidth + 5;
         }
     }
@@ -1765,13 +1739,13 @@ cRecMenuItemTimerConflictHeader::cRecMenuItemTimerConflictHeader(time_t conflict
 
 cRecMenuItemTimerConflictHeader::~cRecMenuItemTimerConflictHeader(void) {
     if (pixmapStatus)
-        osdManager.DestroyPixmap(pixmapStatus);
+        osdManager.releasePixmap(pixmapStatus);
 }
 
 void cRecMenuItemTimerConflictHeader::SetPixmaps(void) {
     if (!pixmap) {
-       pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+       pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
-       pixmapStatus = osdManager.CreatePixmap(5, cRect(x, y, width, height));
+       pixmapStatus = osdManager.requestPixmap(5, cRect(x, y, width, height));
     } else {
        pixmap->SetViewPort(cRect(x, y, width, height));
        pixmapStatus->SetViewPort(cRect(x, y, width, height));
@@ -1845,17 +1819,17 @@ cRecMenuItemEvent::cRecMenuItemEvent(const cEvent *event,
 
 cRecMenuItemEvent::~cRecMenuItemEvent(void) {
     if (pixmapIcons)
-        osdManager.DestroyPixmap(pixmapIcons);
+        osdManager.releasePixmap(pixmapIcons);
     if (pixmapText)
-        osdManager.DestroyPixmap(pixmapText);
+        osdManager.releasePixmap(pixmapText);
 }
 
 void cRecMenuItemEvent::SetPixmaps(void) {
     if (!pixmap) {
-        pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+        pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
-        pixmapText = osdManager.CreatePixmap(5, cRect(x, y, width - height / 2 - 10, height));
+        pixmapText = osdManager.requestPixmap(5, cRect(x, y, width - height / 2 - 10, height));
         pixmapText->Fill(clrTransparent);
-        pixmapIcons = osdManager.CreatePixmap(6, cRect(x, y, width, height));
+        pixmapIcons = osdManager.requestPixmap(6, cRect(x, y, width, height));
         pixmapIcons->Fill(clrTransparent);
     } else {
         pixmap->SetViewPort(cRect(x, y, width, height));
@@ -1878,11 +1852,12 @@ void cRecMenuItemEvent::Draw(void) {
     if (channel)
         channelName = channel->Name();
     int logoWidth = height * config.logoWidthRatio / config.logoHeightRatio;
+    cImageLoader imgLoader;
     if (!config.hideChannelLogos) {
-        cImageLoader imgLoader;
+        if (imgLoader.LoadLogo(channel, logoWidth, height)) {
-        if (imgLoader.LoadLogo(channel, logoWidth * 0.8, height * 0.8)) {
             cImage logo = imgLoader.GetImage();
-            pixmapText->DrawImage(cPoint(logoX + (logoWidth - logo.Width()) / 2, (height - logo.Height()) / 2), logo);
+            pixmapText->DrawImage(cPoint(logoX, (height - logo.Height()) / 2), logo);
+//            logoX += logoWidth + 5;
         }
 	logoX += logoWidth + 5;
     }
@@ -1997,13 +1972,13 @@ cRecMenuItemChannelChooser::cRecMenuItemChannelChooser(cString text,
 
 cRecMenuItemChannelChooser::~cRecMenuItemChannelChooser(void) {
     if (pixmapChannel)
-        osdManager.DestroyPixmap(pixmapChannel);
+        osdManager.releasePixmap(pixmapChannel);
 }
 
 void cRecMenuItemChannelChooser::SetPixmaps(void) {
     if (!pixmap) {
-        pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+        pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
-        pixmapChannel = osdManager.CreatePixmap(5, cRect(x, y, width, height));
+        pixmapChannel = osdManager.requestPixmap(5, cRect(x, y, width, height));
     } else {
         pixmap->SetViewPort(cRect(x, y, width, height));
         pixmapChannel->SetViewPort(cRect(x, y, width, height));
@@ -2038,7 +2013,7 @@ void cRecMenuItemChannelChooser::DrawValue(void) {
         cImageLoader imgLoader;
         if (imgLoader.LoadLogo(channel, logoWidth, height - 10)) {
             cImage logo = imgLoader.GetImage();
-            pixmapChannel->DrawImage(cPoint(logoX, (height - logo.Height()) / 2), logo);
+            pixmapChannel->DrawImage(cPoint(logoX, 5), logo);
         }
     } else {
         cString textVal = tr("all Channels");
@@ -2150,16 +2125,16 @@ cRecMenuItemDayChooser::cRecMenuItemDayChooser(cString text,
 
 cRecMenuItemDayChooser::~cRecMenuItemDayChooser(void) {
     if (pixmapWeekdays)
-        osdManager.DestroyPixmap(pixmapWeekdays);
+        osdManager.releasePixmap(pixmapWeekdays);
     if (pixmapWeekdaysSelect)
-        osdManager.DestroyPixmap(pixmapWeekdaysSelect);
+        osdManager.releasePixmap(pixmapWeekdaysSelect);
 }
 
 void cRecMenuItemDayChooser::SetPixmaps(void) {
     if (!pixmap) {
-        pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+        pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
-        pixmapWeekdays = osdManager.CreatePixmap(5, cRect(x, y, width, height));
+        pixmapWeekdays = osdManager.requestPixmap(5, cRect(x, y, width, height));
-        pixmapWeekdaysSelect = osdManager.CreatePixmap(6, cRect(x, y, width, height));
+        pixmapWeekdaysSelect = osdManager.requestPixmap(6, cRect(x, y, width, height));
     } else {
         pixmap->SetViewPort(cRect(x, y, width, height));
         pixmapWeekdays->SetViewPort(cRect(x, y, width, height));
@@ -2188,7 +2163,7 @@ void cRecMenuItemDayChooser::SetSizes(void) {
         if (charWidth > maxWidth)
             maxWidth = charWidth;
     }    
-    daysSize = std::min(maxWidth + 15, height - 4);
+    daysSize = min(maxWidth + 15, height - 4);
     daysX = width - 10 - 7 * daysSize;
     daysY = (height  - daysSize) / 2;
 }
@@ -2285,13 +2260,13 @@ cRecMenuItemRecording::cRecMenuItemRecording(const cRecording *recording, bool a
 
 cRecMenuItemRecording::~cRecMenuItemRecording(void) {
     if (pixmapText)
-        osdManager.DestroyPixmap(pixmapText);
+        osdManager.releasePixmap(pixmapText);
 }
 
 void cRecMenuItemRecording::SetPixmaps(void) {
     if (!pixmap) {
-        pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+        pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
-        pixmapText = osdManager.CreatePixmap(5, cRect(x, y, width, height));
+        pixmapText = osdManager.requestPixmap(5, cRect(x, y, width, height));
         pixmapText->Fill(clrTransparent);
     } else {
         pixmap->SetViewPort(cRect(x, y, width, height));
@@ -2303,38 +2278,21 @@ void cRecMenuItemRecording::Draw(void) {
     if (!recording)
         return;
     const cRecordingInfo *recInfo = recording->Info();
-    const cChannel *channel = NULL;
-    cString channelName = tr("unknown channel");
-    if (recInfo) {
-        if (recInfo->ChannelName() && (strlen(recInfo->ChannelName()) > 0)) {
-           channelName = recInfo->ChannelName();
-        } else {
 #if VDRVERSNUM >= 20301
-           {
+    LOCK_CHANNELS_READ;
-           LOCK_CHANNELS_READ;
+    const cChannel *channel = Channels->GetByChannelID(recInfo->ChannelID());
-           channel = Channels->GetByChannelID(recInfo->ChannelID());
-           }
 #else
-           channel = Channels.GetByChannelID(recInfo->ChannelID());
+    const cChannel *channel = Channels.GetByChannelID(recInfo->ChannelID());
 #endif
-           if (channel)
+    cString channelName = tr("unknown channel");
-              channelName = channel->Name();
+    if (channel)
-        }
+        channelName = channel->Name();
-    }
     cString name = recording->Name();
     cString dateTime = cString::sprintf("%s, %s", *DateString(recording->Start()), *TimeString(recording->Start()));
     
     int recDuration = recording->LengthInSeconds() / 60;
     
-    cString recDetails = "";
+    cString recDetails = cString::sprintf("%s: %d %s, %s %s %s \"%s\"", tr("Duration"), recDuration, tr("min"), tr("recorded at"), *dateTime, tr("from"), *channelName);
-#if (APIVERSNUM >= 20505)
-    cString error = "";
-    if (recInfo->Errors() >= 0) {
-       error = cString::sprintf("%s %d %s ", tr("with"), recInfo->Errors(), (recInfo->Errors() >= 2) ? tr("errors") : tr("error"));
-       recDetails = cString::sprintf("%s: %d %s, %s %s %s \"%s\" %s", tr("Duration"), recDuration, tr("min"), tr("recorded at"), *dateTime, tr("from"), *channelName, *error);
-    } else
-#endif
-    recDetails = cString::sprintf("%s: %d %s, %s %s %s \"%s\"", tr("Duration"), recDuration, tr("min"), tr("recorded at"), *dateTime, tr("from"), *channelName);
     recDetails = CutText(*recDetails, width - 40, fontSmall).c_str();
     int text1Y = (height/2 - font->Height()) / 2 + 5;
     int text2Y = height/2 + (height/2 - fontSmall->Height())/2 - 5;
@@ -2370,20 +2328,20 @@ cRecMenuItemTimelineHeader::cRecMenuItemTimelineHeader(time_t day, int numTimers
 
 cRecMenuItemTimelineHeader::~cRecMenuItemTimelineHeader(void) {
     if (pixmapTimeline)
-        osdManager.DestroyPixmap(pixmapTimeline);
+        osdManager.releasePixmap(pixmapTimeline);
     if (pixmapTimerInfo)
-        osdManager.DestroyPixmap(pixmapTimerInfo);
+        osdManager.releasePixmap(pixmapTimerInfo);
     if (pixmapTimerConflicts)
-        osdManager.DestroyPixmap(pixmapTimerConflicts);
+        osdManager.releasePixmap(pixmapTimerConflicts);
 }
 
 void cRecMenuItemTimelineHeader::SetPixmaps(void) {
     if (!pixmap) {
-        pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+        pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
-        pixmapTimeline = osdManager.CreatePixmap(5, cRect(x, y, width, height));
+        pixmapTimeline = osdManager.requestPixmap(5, cRect(x, y, width, height));
-        pixmapTimerInfo = osdManager.CreatePixmap(6, cRect(x, y + 3 * font->Height() / 2, width, 2 * font->Height()));
+        pixmapTimerInfo = osdManager.requestPixmap(6, cRect(x, y + 3 * font->Height() / 2, width, 2 * font->Height()));
         if (conflicts.size() > 0) {
-            pixmapTimerConflicts = osdManager.CreatePixmap(6, cRect(x, y, width, height));
+            pixmapTimerConflicts = osdManager.requestPixmap(6, cRect(x, y, width, height));
         }
     } else {
         pixmap->SetViewPort(cRect(x, y, width, height));
@@ -2435,7 +2393,7 @@ void cRecMenuItemTimelineHeader::DrawCurrentTimer(void) {
         if (!config.hideChannelLogos) {
             if (imgLoader.LoadLogo(channel, logoWidth, infoHeight)) {
                 cImage logo = imgLoader.GetImage();
-                pixmapTimerInfo->DrawImage(cPoint(0, (infoHeight - logo.Height()) / 2), logo);
+                pixmapTimerInfo->DrawImage(cPoint(0, 0), logo);
                 x += logoWidth + 10;
                 logoDrawn = true;
             }
@@ -2553,23 +2511,21 @@ cRecMenuItemTimelineTimer::cRecMenuItemTimelineTimer(const cTimer *timer, time_t
     selectable = true;
     this->active = active;
     height = geoManager.osdHeight / 16;
-    if (active)
-       SetActive();
 }
 
 cRecMenuItemTimelineTimer::~cRecMenuItemTimelineTimer(void) {
     if (pixmapBack)
-        osdManager.DestroyPixmap(pixmapBack);
+        osdManager.releasePixmap(pixmapBack);
     if (pixmapTimerConflicts)
-        osdManager.DestroyPixmap(pixmapTimerConflicts);
+        osdManager.releasePixmap(pixmapTimerConflicts);
 }
 
 void cRecMenuItemTimelineTimer::SetPixmaps(void) {
     if (!pixmap) {
-        pixmapBack = osdManager.CreatePixmap(4, cRect(x, y, width, height)); 
+        pixmapBack = osdManager.requestPixmap(4, cRect(x, y, width, height)); 
-        pixmap = osdManager.CreatePixmap(5, cRect(x, y, width, height));
+        pixmap = osdManager.requestPixmap(5, cRect(x, y, width, height));
         if (conflicts.size() > 0) {
-            pixmapTimerConflicts = osdManager.CreatePixmap(6, cRect(x, y, width, height));
+            pixmapTimerConflicts = osdManager.requestPixmap(6, cRect(x, y, width, height));
         }        
     } else {
         pixmapBack->SetViewPort(cRect(x, y, width, height));
@@ -2667,7 +2623,7 @@ void cRecMenuItemTimelineTimer::DrawNoTimerInfo(void) {
     pixmap->DrawText(cPoint(x, y), *noTimersText, colorText, clrTransparent, font);
 }
 
-void cRecMenuItemTimelineTimer::SetActive(void) {
+void cRecMenuItemTimelineTimer::setActive(void) {
     active = true;
     header->SetCurrentTimer(timer);
     header->RefreshTimerDisplay();
@@ -2691,7 +2647,7 @@ void cRecMenuItemTimelineTimer::Show(void) {
     if (pixmapTimerConflicts) pixmapTimerConflicts->SetLayer(6);
 }
 
-const cTimer *cRecMenuItemTimelineTimer::GetTimer(void) {
+const cTimer *cRecMenuItemTimelineTimer::GetTimerValue(void) {
     return timer;    
 }
 
@@ -2726,16 +2682,16 @@ cRecMenuItemSearchTimer::cRecMenuItemSearchTimer(cTVGuideSearchTimer timer,
 
 cRecMenuItemSearchTimer::~cRecMenuItemSearchTimer(void) {
     if (pixmapText)
-        osdManager.DestroyPixmap(pixmapText);
+        osdManager.releasePixmap(pixmapText);
     if (pixmapIcons)
-        osdManager.DestroyPixmap(pixmapIcons);
+        osdManager.releasePixmap(pixmapIcons);
 }
 
 void cRecMenuItemSearchTimer::SetPixmaps(void) {
     if (!pixmap) {
-        pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+        pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
-        pixmapText = osdManager.CreatePixmap(5, cRect(x, y, width, height));
+        pixmapText = osdManager.requestPixmap(5, cRect(x, y, width, height));
-        pixmapIcons = osdManager.CreatePixmap(6, cRect(x, y, width, height));
+        pixmapIcons = osdManager.requestPixmap(6, cRect(x, y, width, height));
     } else {
         pixmap->SetViewPort(cRect(x, y, width, height));
         pixmapText->SetViewPort(cRect(x, y, width, height));
@@ -2853,16 +2809,16 @@ cRecMenuItemFavorite::cRecMenuItemFavorite(cTVGuideSearchTimer favorite,
 
 cRecMenuItemFavorite::~cRecMenuItemFavorite(void) {
     if (pixmapText)
-        osdManager.DestroyPixmap(pixmapText);
+        osdManager.releasePixmap(pixmapText);
     if (pixmapIcons)
-        osdManager.DestroyPixmap(pixmapIcons);
+        osdManager.releasePixmap(pixmapIcons);
 }
 
 void cRecMenuItemFavorite::SetPixmaps(void) {
     if (!pixmap) {
-        pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+        pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
-        pixmapText = osdManager.CreatePixmap(5, cRect(x, y, width, height));
+        pixmapText = osdManager.requestPixmap(5, cRect(x, y, width, height));
-        pixmapIcons = osdManager.CreatePixmap(6, cRect(x, y, width, height));
+        pixmapIcons = osdManager.requestPixmap(6, cRect(x, y, width, height));
     } else {
         pixmap->SetViewPort(cRect(x, y, width, height));
         pixmapText->SetViewPort(cRect(x, y, width, height));
@@ -2928,16 +2884,16 @@ cRecMenuItemFavoriteStatic::cRecMenuItemFavoriteStatic(std::string text, eRecMen
 
 cRecMenuItemFavoriteStatic::~cRecMenuItemFavoriteStatic(void) {
     if (pixmapText)
-        osdManager.DestroyPixmap(pixmapText);
+        osdManager.releasePixmap(pixmapText);
     if (pixmapIcons)
-        osdManager.DestroyPixmap(pixmapIcons);
+        osdManager.releasePixmap(pixmapIcons);
 }
 
 void cRecMenuItemFavoriteStatic::SetPixmaps(void) {
     if (!pixmap) {
-        pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+        pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
-        pixmapText = osdManager.CreatePixmap(5, cRect(x, y, width, height));
+        pixmapText = osdManager.requestPixmap(5, cRect(x, y, width, height));
-        pixmapIcons = osdManager.CreatePixmap(6, cRect(x, y, width, height));
+        pixmapIcons = osdManager.requestPixmap(6, cRect(x, y, width, height));
     } else {
         pixmap->SetViewPort(cRect(x, y, width, height));
         pixmapText->SetViewPort(cRect(x, y, width, height));

recmenuitem.h

@@ -25,7 +25,6 @@ enum eRecMenuState {
     rmsSearchRerunsTimerConflictMenu,
     rmsSaveTimerConflictMenu,
     rmsTimerConflictShowInfo,
-    rmsOnOffTimer,
     rmsDeleteTimer,
     rmsDeleteTimerConfirmation,
     rmsEditTimer,
@@ -110,10 +109,10 @@ public:
     virtual int GetHeight(void) { return height; };
     virtual int GetWidth(void) { return 0; };
     virtual void CalculateHeight(int textWidth) {};
-    virtual void SetActive(void) { this->active = true; }
+    virtual void setActive(void) { this->active = true; }
     virtual void setInactive(void) { this->active = false; }
     bool isSelectable(void) { return selectable; }
-    bool IsActive(void) { return active; }
+    bool isActive(void) { return active; }
     virtual void setBackground(void);
     virtual void Draw(void) {};
     virtual void Hide(void) { if (pixmap) pixmap->SetLayer(-1);};
@@ -122,7 +121,8 @@ public:
     virtual time_t GetTimeValue(void) { return 0; };
     virtual bool GetBoolValue(void) { return false; };
     virtual cString GetStringValue(void) { return cString(""); };
-    virtual const cEvent *GetEvent(void) { return NULL; };
+    virtual const cEvent *GetEventValue(void) { return NULL; };
+    virtual const cTimer *GetTimerValue(void) { return NULL; };
     virtual eRecMenuState ProcessKey(eKeys Key) { return rmsNotConsumed; };
 };
 
@@ -174,18 +174,12 @@ public:
 // --- cRecMenuItemInfo  -------------------------------------------------------
 class cRecMenuItemInfo : public cRecMenuItem {
 private:
-    int numLines;
     cString text;
-    std::string line1;
-    std::string line2;
-    std::string line3;
-    std::string line4;
     cTextWrapper wrapper;
     int border;
     const cFont *fontInfo;
 public:
     cRecMenuItemInfo(const char *text, bool largeFont = false);
-    cRecMenuItemInfo(std::string line1, int numLines = 1, std::string line2 = "", std::string line3 = "", std::string line4 = "", int width = 80, bool largeFont = false);
     virtual ~cRecMenuItemInfo(void);
     void setBackground(void);
     void CalculateHeight(int textWidth);
@@ -486,7 +480,7 @@ public:
     void SetPixmaps(void);
     void Hide(void);
     void Show(void); 
-    const cEvent *GetEvent(void) { return event; };
+    const cEvent *GetEventValue(void) { return event; };
     eRecMenuState ProcessKey(eKeys Key);
     void Draw(void);
 };
@@ -620,13 +614,13 @@ private:
 public:
     cRecMenuItemTimelineTimer(const cTimer *timer, time_t start, time_t stop, std::vector<cTVGuideTimerConflict*> conflictsToday, cRecMenuItemTimelineHeader *header, bool active);
     virtual ~cRecMenuItemTimelineTimer(void);
-    void SetActive(void);
+    void setActive(void);
     void setInactive(void);
     void SetPixmaps(void);
     void Hide(void);
     void Show(void); 
     void Draw(void);
-    const cTimer *GetTimer(void);
+    const cTimer *GetTimerValue(void);
     eRecMenuState ProcessKey(eKeys Key);
 };
 

recmenus.h

@@ -205,12 +205,13 @@ class cRecMenuSearchTimers: public cRecMenu {
 private:
     int numSearchTimers;
     std::vector<cTVGuideSearchTimer> searchTimers;
+    void SetMenuItems(void);
 public:
     cRecMenuSearchTimers(std::vector<cTVGuideSearchTimer> searchTimers);
-    virtual ~cRecMenuSearchTimers(void) {};
     cRecMenuItem *GetMenuItem(int number);
     int GetTotalNumMenuItems(void);
     cTVGuideSearchTimer GetSearchTimer(void);
+    virtual ~cRecMenuSearchTimers(void);
 };
 
 // --- cRecMenuSearchTimerEdit  ---------------------------------------------------------
@@ -218,7 +219,6 @@ class cRecMenuSearchTimerEdit: public cRecMenu {
 private:
     cTVGuideSearchTimer sT;
     std::vector<std::string> searchModes;
-    std::vector<std::string> subTitleModes;
     std::vector<std::string> useChannelModes;
     std::vector<std::string> channelGroups;
     std::vector<std::string> compareDateModes;
@@ -258,7 +258,7 @@ private:
     cTVGuideSearchTimer searchTimer;
 public:
     cRecMenuSearchTimerDeleteConfirm(cTVGuideSearchTimer searchTimer);
-    virtual ~cRecMenuSearchTimerDeleteConfirm(void) {};
+    virtual ~cRecMenuSearchTimerDeleteConfirm(void);
     cTVGuideSearchTimer GetSearchTimer(void);
 };
 

recmenuview.c

@@ -37,7 +37,7 @@ void cRecMenuView::Start(const cEvent *event) {
     this->event = event;
     activeMenu = new cRecMenuMain(recManager->EpgSearchAvailable(), recManager->CheckEventForTimer(event), SwitchTimers.EventInSwitchList(event));
     activeMenu->Display();
-    osdManager.Flush();
+    osdManager.flush();
 }
 
 void cRecMenuView::StartFavorites(void) {
@@ -49,7 +49,7 @@ void cRecMenuView::StartFavorites(void) {
     recManager->GetFavorites(&favorites);
     activeMenu = new cRecMenuFavorites(favorites);
     activeMenu->Display();
-    osdManager.Flush();
+    osdManager.flush();
 }
 
 
@@ -70,7 +70,7 @@ void cRecMenuView::Close(void) {
 void cRecMenuView::SetBackground(void) {
     int backgroundWidth = geoManager.osdWidth;
     int backgroundHeight = geoManager.osdHeight;
-    pixmapBackground = osdManager.CreatePixmap(3, cRect(0, 0, backgroundWidth, backgroundHeight));
+    pixmapBackground = osdManager.requestPixmap(3, cRect(0, 0, backgroundWidth, backgroundHeight));
     pixmapBackground->Fill(theme.Color(clrRecMenuBackground));
     if (config.scaleVideo) {
         int tvHeight = geoManager.statusHeaderHeight;
@@ -81,7 +81,7 @@ void cRecMenuView::SetBackground(void) {
 }
 
 void cRecMenuView::DeleteBackground(void) {
-    osdManager.DestroyPixmap(pixmapBackground);
+    osdManager.releasePixmap(pixmapBackground);
 }
 
 void cRecMenuView::DisplaySearchTimerList(void) {
@@ -121,7 +121,6 @@ bool cRecMenuView::DisplayTimerConflict(int timerID) {
         cTVGuideTimerConflict *conflict = timerConflicts->GetCurrentConflict();
         if (!conflict)
             return false;
-        delete activeMenu;
         activeMenu = new cRecMenuTimerConflict(conflict, rmsIgnoreTimerConflict);
         activeMenu->Display();
         return true;
@@ -164,16 +163,11 @@ eOSState cRecMenuView::StateMachine(eRecMenuState nextState) {
             if (cRecMenuAskFolder *menu = dynamic_cast<cRecMenuAskFolder*>(activeMenu)) {
                 recFolder = menu->GetFolder();
             }
+            delete activeMenu;
             cTimer *timer = recManager->createTimer(event, recFolder);
             if (!DisplayTimerConflict(timer)) {
-                if (config.timerMessage) {
+                activeMenu = new cRecMenuConfirmTimer(event);
-                    delete activeMenu;
+                activeMenu->Display();
-                    activeMenu = new cRecMenuConfirmTimer(event);
-                    activeMenu->Display();
-                } else {
-                    Close();
-                    state = osEnd;
-                }
             }
             break; }
         case rmsInstantRecordFolder:
@@ -183,49 +177,24 @@ eOSState cRecMenuView::StateMachine(eRecMenuState nextState) {
             activeMenu = new cRecMenuAskFolder(event, rmsInstantRecord);
             activeMenu->Display();
             break;
-        case rmsOnOffTimer: {
-            //caller: main menu
-            //De/Activate timer for active event
-            recManager->OnOffTimer(event);
-            if (config.timerMessage) {
-                delete activeMenu;
-                activeMenu = new cRecMenuConfirmTimer(event, true);
-                activeMenu->Display();
-            } else {
-                Close();
-                state = osEnd;
-            }
-            break; }
         case rmsDeleteTimer: {
             //caller: main menu
             //delete timer for active event
+            delete activeMenu;
             if (recManager->IsRecorded(event)) {
-                delete activeMenu;
                 activeMenu = new cRecMenuAskDeleteTimer(event);
-                activeMenu->Display();
             } else {
                 recManager->DeleteTimer(event);
-                if (config.timerMessage) {
+                activeMenu = new cRecMenuConfirmDeleteTimer(event);
-                    delete activeMenu;
-                    activeMenu = new cRecMenuConfirmDeleteTimer(event);
-                    activeMenu->Display();
-                } else {
-                    Close();
-                    state = osEnd;
-                }
             }
+            activeMenu->Display();
             break; }
         case rmsDeleteTimerConfirmation: {
             //delete running timer for active event
             recManager->DeleteTimer(event);
-            if (config.timerMessage) {
+            delete activeMenu;
-                delete activeMenu;
+            activeMenu = new cRecMenuConfirmDeleteTimer(event);
-                activeMenu = new cRecMenuConfirmDeleteTimer(event);
+            activeMenu->Display();
-                activeMenu->Display();
-            } else {
-                Close();
-                state = osEnd;
-            }
             break; }
         case rmsEditTimer: {
             //edit timer for active event
@@ -252,14 +221,9 @@ eOSState cRecMenuView::StateMachine(eRecMenuState nextState) {
         case rmsIgnoreTimerConflict:
         //caller: cRecMenuTimerConflict
         //Confirming created Timer
-            if (config.timerMessage) {
+            delete activeMenu;
-                delete activeMenu;
+            activeMenu = new cRecMenuConfirmTimer(event);
-                activeMenu = new cRecMenuConfirmTimer(event);
+            activeMenu->Display();
-                activeMenu->Display();
-            } else {
-                Close();
-                state = osEnd;
-            }
             break;
         case rmsTimerConflictShowInfo: {
             //caller: cRecMenuTimerConflict
@@ -267,18 +231,12 @@ eOSState cRecMenuView::StateMachine(eRecMenuState nextState) {
             if (cRecMenuTimerConflict *menu = dynamic_cast<cRecMenuTimerConflict*>(activeMenu)) {
                 timerIndex = menu->GetTimerConflictIndex();
             } else break;
-            const cTimers* timers;
-#if VDRVERSNUM >= 20301
             int timerID = timerConflicts->GetCurrentConflictTimerID(timerIndex) + 1;
-            {
+#if VDRVERSNUM >= 20301
             LOCK_TIMERS_READ;
-            timers = Timers;
+            const cTimer *t = Timers->GetById(timerID);
-            }
-            const cTimer *t = timers->GetById(timerID);
 #else
-            int timerID = timerConflicts->GetCurrentConflictTimerID(timerIndex);
+            const cTimer *t = Timers.Get(timerID);
-            timers = &Timers;
-            const cTimer *t = timers->Get(timerID);
 #endif
             if (t) {
                 const cEvent *ev = t->Event();
@@ -308,16 +266,11 @@ eOSState cRecMenuView::StateMachine(eRecMenuState nextState) {
             timers = &Timers;
             event = timers->Get(timerID)->Event();
 #endif
-            recManager->DeleteTimer(event);
+            recManager->DeleteTimer(event); // (timerID);
+            delete activeMenu;
             if (!DisplayTimerConflict(timerID)) {
-                if (config.timerMessage) {
+                activeMenu = new cRecMenuConfirmDeleteTimer(event);
-                    delete activeMenu;
+                activeMenu->Display();
-                    activeMenu = new cRecMenuConfirmDeleteTimer(event);
-                    activeMenu->Display();
-                } else {
-                    Close();
-                    state = osEnd;
-                }
             }
             break; }
         case rmsEditTimerConflictMenu: {
@@ -327,18 +280,12 @@ eOSState cRecMenuView::StateMachine(eRecMenuState nextState) {
             if (cRecMenuTimerConflict *menu = dynamic_cast<cRecMenuTimerConflict*>(activeMenu)) {
                 timerIndex = menu->GetTimerConflictIndex();
             } else break;
-            const cTimers* timers;
-#if VDRVERSNUM >= 20301
             int timerID = timerConflicts->GetCurrentConflictTimerID(timerIndex) + 1;
-            {
+#if VDRVERSNUM >= 20301
             LOCK_TIMERS_READ;
-            timers = Timers;
+            const cTimer *timer = Timers->GetById(timerID);
-            }
-            const cTimer *timer = timers->GetById(timerID);
 #else
-            int timerID = timerConflicts->GetCurrentConflictTimerID(timerIndex);
+            const cTimer *timer = Timers.Get(timerID);
-            timers = &Timers;
-            const cTimer *timer = timers->Get(timerID);
 #endif
             if (timer) {
                 delete activeMenu;
@@ -356,15 +303,10 @@ eOSState cRecMenuView::StateMachine(eRecMenuState nextState) {
                 originalTimer = menu->GetOriginalTimer();
             } else break;
             recManager->SaveTimer(originalTimer, timerModified);
+            delete activeMenu;
             if (!DisplayTimerConflict(originalTimer)) {
-                if (config.timerMessage) {
+                activeMenu = new cRecMenuConfirmTimer(originalTimer->Event(), true);
-                    delete activeMenu;
+                activeMenu->Display();
-                    activeMenu = new cRecMenuConfirmTimer(originalTimer->Event(), true);
-                    activeMenu->Display();
-                } else {
-                    Close();
-                    state = osEnd;
-                }
             }
             break; }
 /***************************************************************************************
@@ -724,18 +666,12 @@ eOSState cRecMenuView::StateMachine(eRecMenuState nextState) {
             if (cRecMenuTimerConflict *menu = dynamic_cast<cRecMenuTimerConflict*>(activeMenu)) {
                 timerConflict = menu->GetTimerConflictIndex();
             } else break;
-            const cTimers* timers;
-#if VDRVERSNUM >= 20301
             int timerID = timerConflicts->GetCurrentConflictTimerID(timerConflict) + 1;
-            {
+#if VDRVERSNUM >= 20301
             LOCK_TIMERS_READ;
-            timers = Timers;
+            const cTimer *timer = Timers->GetById(timerID);
-            }
-            const cTimer *timer = timers->GetById(timerID);
 #else
-            int timerID = timerConflicts->GetCurrentConflictTimerID(timerConflict);
+            cTimer *timer = Timers.Get(timerID);
-            timers = &Timers;
-            const cTimer *timer = timers->Get(timerID);
 #endif
             if (timer) {
                 const cEvent *event = timer->Event();
@@ -777,16 +713,12 @@ eOSState cRecMenuView::StateMachine(eRecMenuState nextState) {
                 originalConflictIndex = menu->GetTimerConflictIndex();
             } else break;
             int originalTimerID = timerConflicts->GetCurrentConflictTimerID(originalConflictIndex);
-            const cTimers* timers;
 #if VDRVERSNUM >= 20301
-            {
             LOCK_TIMERS_READ;
-            timers = Timers;
+            const cTimer *timerOriginal = Timers->Get(originalTimerID);
-            }
 #else
-            timers = &Timers;
+            cTimer *timerOriginal = Timers.Get(originalTimerID);
 #endif
-            const cTimer *timerOriginal = timers->Get(originalTimerID);
             if (replace && timerOriginal) {
                 recManager->DeleteTimer(timerOriginal->Event());
                 recManager->createTimer(replace);
@@ -994,12 +926,12 @@ eOSState cRecMenuView::ProcessKey(eKeys Key) {
                 activeMenu->UpdateActiveMenuItem();
                 activeMenu->Show();
                 state = osContinue;
-                osdManager.Flush();
+                osdManager.flush();
             }
             return state;
         }
         state = StateMachine(nextState);
     }
-    osdManager.Flush();
+    osdManager.flush();
     return state;
 }

recmenuview.h

@@ -32,8 +32,8 @@ private:
 public:
     cRecMenuView(void);
     virtual ~cRecMenuView(void);
-    void AddFooter(cFooter *footer) { this->footer = footer; };
+    void SetFooter(cFooter *footer) { this->footer = footer; };
-    bool IsActive(void) { return active; };
+    bool isActive(void) { return active; };
     void Start(const cEvent *event);
     void StartFavorites(void);
     void Close(void);

searchtimer.c

@@ -554,12 +554,6 @@ void cTVGuideSearchTimer::GetSearchModes(std::vector<std::string> *searchModes)
     searchModes->push_back(tr("fuzzy"));
 }
 
-void cTVGuideSearchTimer::GetSubTitleModes(std::vector<std::string> *subTitleModes) {
-    subTitleModes->push_back(trVDR("no"));
-    subTitleModes->push_back(trVDR("yes"));
-    subTitleModes->push_back(tr("allow empty"));
-}
-
 void cTVGuideSearchTimer::GetUseChannelModes(std::vector<std::string> *useChannelModes) {
     useChannelModes->push_back(tr("No"));
     useChannelModes->push_back(tr("Interval"));

searchtimer.h

@@ -81,7 +81,6 @@ public:
     int GetNumTimers(void);
     int GetNumRecordings(void);
     void GetSearchModes(std::vector<std::string> *searchModes);
-    void GetSubTitleModes(std::vector<std::string> *subTitleModes);
     void GetUseChannelModes(std::vector<std::string> *useChannelModes);
     void GetSearchTimerModes(std::vector<std::string> *searchTimerModes);
     void GetCompareDateModes(std::vector<std::string> *compareDateModes);

setup.c

@@ -108,8 +108,7 @@ void cTvguideSetup::Store(void) {
     SetupStore("footerHeightPercent", config.footerHeightPercent);
     SetupStore("instRecFolderMode", config.instRecFolderMode);
     SetupStore("instRecFixedFolder", config.instRecFixedFolder.c_str());
-    SetupStore("addSubtitleToTimer", config.addSubtitleToTimer);
+    SetupStore("AddSubtitleToTimerMode", config.addSubtitleToTimer);
-    SetupStore("timerMessage", config.timerMessage);
     SetupStore("favWhatsOnNow", config.favWhatsOnNow);
     SetupStore("favWhatsOnNext", config.favWhatsOnNext);
     SetupStore("favUseTime1", config.favUseTime1);
@@ -433,7 +432,6 @@ void cMenuSetupFavorites::Set(void) {
     Add(new cMenuEditStraItem(tr("Add episode to manual timers"), &tmpConfig->addSubtitleToTimer, 3, addSubtitleMode));
     if (pRemoteTimers)
         Add(new cMenuEditBoolItem(tr("Use Remotetimers"), &tmpConfig->useRemoteTimers));
-    Add(new cMenuEditBoolItem(tr("Show timer confirmation messages"), &tmpConfig->timerMessage));
     Add(new cOsdItem(tr("Favorites:"), osUnknown, false));
     Add(new cMenuEditBoolItem(tr("Limit channels in favorites"), &tmpConfig->favLimitChannels));
     if (tmpConfig->favLimitChannels) {

statusheader.c

@@ -9,14 +9,14 @@ cStatusHeader::cStatusHeader(void) {
     height = geoManager.statusHeaderHeight;
     width = geoManager.headerContentWidth;
     tvFrameWidth = geoManager.tvFrameWidth;
-    pixmap = osdManager.CreatePixmap(1, cRect(0, 0, width, height));
+    pixmap = osdManager.requestPixmap(1, cRect(0, 0, width, height));
-    pixmapText = osdManager.CreatePixmap(2, cRect(0, 0, width, height));
+    pixmapText = osdManager.requestPixmap(2, cRect(0, 0, width, height));
-    pixmapTVFrame = osdManager.CreatePixmap(1, cRect(width, 0, tvFrameWidth, height));
+    pixmapTVFrame = osdManager.requestPixmap(1, cRect(width, 0, tvFrameWidth, height));
 }
 
 cStatusHeader::~cStatusHeader(void) {
-    osdManager.DestroyPixmap(pixmapText);
+    osdManager.releasePixmap(pixmapText);
-    osdManager.DestroyPixmap(pixmapTVFrame);
+    osdManager.releasePixmap(pixmapTVFrame);
     if (config.scaleVideo) {
         cRect vidWin = cDevice::PrimaryDevice()->CanScaleVideo(cRect::Null);
         cDevice::PrimaryDevice()->ScaleVideo(vidWin);
@@ -63,7 +63,7 @@ void cStatusHeader::DrawInfoText(cGridElement *grid) {
     pixmapText->Fill(clrTransparent);
     int x = border;
     int y = border;
-    if (!grid->IsDummy()) {
+    if (!grid->isDummy()) {
         const cEvent *event = grid->GetEvent();
         int newX = DrawPoster(event, x, y, height-2*border, border);
         if (newX > 0) {

styledpixmap.c

@@ -12,7 +12,7 @@ cStyledPixmap::cStyledPixmap(cPixmap *pixmap) {
 
 cStyledPixmap::~cStyledPixmap(void) {
     if (pixmap)
-        osdManager.DestroyPixmap(pixmap);
+        osdManager.releasePixmap(pixmap);
 }
 
 void cStyledPixmap::setPixmap(cPixmap *pixmap) {

themes/tvguide-iceblue.theme

@@ -1,14 +1,14 @@
 Description = IceBlue
 clrStyle = 00000000
-clrBackground = EEFFFFFF
+clrBackground = DDFFFFFF
-clrBackgroundOSD = F0FFFFFF
+clrBackgroundOSD = FFFFFFFF
-clrGrid1 = FFB2B2C
+clrGrid1 = BB555555
-clrGrid2 = 55B2B2C7
+clrGrid2 = BB888888
 clrGridFontBack = 00000000
-clrGridActiveFontBack = FFFFFFFF
+clrGridActiveFontBack = 00000000
 clrHighlight = FF000044
 clrFont = FF000000
-clrFontActive = FFFFFFFF
+clrFontActive  = FFFFFFFF
 clrFontButtons = FFFFFFFF
 clrFontHeader = FF000000
 clrHeader = FFFFFFFF
@@ -20,14 +20,14 @@ clrTimeline1Blending = 00000000
 clrTimeline2 = FF000000
 clrTimeline2Blending = 00000000
 clrTimeBase = A0FF0000
-clrTabInactive = 55B2B2C7
+clrTabInactive = 88B8B8E6
-clrButtonRed = FFCC00000
+clrButtonRed = FFBB0000
 clrButtonRedBorder = FF000000
 clrButtonGreen = FF00BB00
 clrButtonGreenBorder = FF000000
-clrButtonYellow = FFF5B800
+clrButtonYellow = FFBBBB00
 clrButtonYellowBorder = FF000000
-clrButtonBlue = FF003DF5
+clrButtonBlue = FF0000BB
 clrButtonBlueBorder = FF000000
 clrRecMenuBackground = AA000000
 clrRecMenuTimerConflictBackground = FFCCCCCC
@@ -36,16 +36,16 @@ clrRecMenuTimerConflictOverlap = AAFF0000
 clrRecMenuDayActive = FF00FF00
 clrRecMenuDayInactive = FFFF0000
 clrRecMenuDayHighlight = 77000000
-clrRecMenuTextBack = 00000000
+clrRecMenuTextBack = FF3C3C3C
 clrRecMenuTextActiveBack = FF404749
 clrRecMenuKeyboardBack = FF000044
-clrRecMenuKeyboardBorder = FF6C6C6C
+clrRecMenuKeyboardBorder = FF3C3C3C
 clrRecMenuKeyboardHigh = 55FFFFFF
 clrButtonRedKeyboard = FFBB0000
 clrButtonGreenKeyboard = FF00BB00
 clrButtonYellowKeyboard = FFBBBB00
 clrRecMenuTimelineTimer = B012273f
-clrRecMenuTimelineBack = 55B2B2C7
+clrRecMenuTimelineBack = FF828282
-clrRecMenuTimelineActive = 773F3F3F
+clrRecMenuTimelineActive = FF3F3F3F
 clrRecMenuTimelineConflict = 30FF0000
 clrRecMenuTimelineConflictOverlap = 90FF0000

timeline.c

@@ -25,9 +25,9 @@ cTimeLine::cTimeLine(cTimeManager *timeManager) {
         y12 = geoManager.statusHeaderHeight;
         y22 = geoManager.timeLineHeight;
     }
-    dateViewer = new cStyledPixmap(osdManager.CreatePixmap(1, cRect(x11, y11, x21, y21)));
+    dateViewer = new cStyledPixmap(osdManager.requestPixmap(1, cRect(x11, y11, x21, y21)));
-    timeline = osdManager.CreatePixmap(2, cRect(x12, y12, x22, y22));
+    timeline = osdManager.requestPixmap(2, cRect(x12, y12, x22, y22));
-    clock = new cStyledPixmap(osdManager.CreatePixmap(3, cRect(0, 
+    clock = new cStyledPixmap(osdManager.requestPixmap(3, cRect(0, 
                                                                 geoManager.statusHeaderHeight, 
                                                                 geoManager.clockWidth, 
                                                                 geoManager.clockHeight)));
@@ -36,8 +36,8 @@ cTimeLine::cTimeLine(cTimeManager *timeManager) {
 cTimeLine::~cTimeLine(void) {
     if (clock)
        delete clock;
-    osdManager.DestroyPixmap(timeBase);
+    osdManager.releasePixmap(timeBase);
-    osdManager.DestroyPixmap(timeline);
+    osdManager.releasePixmap(timeline);
     if (dateViewer)
         delete dateViewer;
 }
@@ -205,7 +205,7 @@ void cTimeLine::DrawTimeIndicator(void) {
        return;
     }
     int deltaTime = (time(0) - timeManager->GetStart()) / 60 * geoManager.minutePixel;
-    osdManager.DestroyPixmap(timeBase);
+    osdManager.releasePixmap(timeBase);
     int x1, x2, y1, y2;
     if (config.displayMode == eVertical) {
        x1 = 0;
@@ -218,7 +218,7 @@ void cTimeLine::DrawTimeIndicator(void) {
        x2 = 4;
        y2 = geoManager.timeLineHeight + config.channelRows * geoManager.rowHeight;
     }
-    timeBase = osdManager.CreatePixmap(3, cRect(x1, y1, x2, y2));
+    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));
 }

tools.c

@@ -10,6 +10,7 @@
 #include <vdr/plugin.h>
 #include <vdr/skins.h>
 #include "services/epgsearch.h"
+
 #include "tools.h"
 
 cPlugin *GetScraperPlugin(void) {
@@ -41,7 +42,7 @@ std::string utf8_substr(const std::string& str, unsigned int start, long unsigne
     }
     if (q<=start+leng || leng==std::string::npos){ max=i; }
     if (min==std::string::npos || max==std::string::npos) { return ""; }
-    return str.substr(min,max-min);
+    return str.substr(min,max);
 }
 
 std::string CutText(std::string text, int width, const cFont *font) {
@@ -434,8 +435,8 @@ ALGORITHM
 ******************************************************************************/
 int afuzzy_checkSUB(const char *t, AFUZZY *fuzzy)
 {
-    char c;
+    register char c;
-    int j, d;
+    register int j, d;
 
     /* For eficciency this case should be little bit optimized */
     if (!fuzzy->k)
@@ -449,7 +450,7 @@ int afuzzy_checkSUB(const char *t, AFUZZY *fuzzy)
 
             if (R1 & fuzzy->mask_ok)
                 return 1;
-        } /* end for (int j = 0 ... */
+        } /* end for (register int j = 0 ... */
         return 0;
     }
 
@@ -473,16 +474,16 @@ int afuzzy_checkSUB(const char *t, AFUZZY *fuzzy)
 
         memcpy(fuzzy->R, fuzzy->R1, fuzzy->r_size);
 
-    } /* end for (int j = 0 ... */
+    } /* end for (register int j = 0 ... */
 
     return 0;
 }
 
 int afuzzy_checkFLT(const char *t, AFUZZY *fuzzy)
 {
-    Uint FilterR = 0;
+    register Uint FilterR = 0;
-    Uint FilterR1;
+    register Uint FilterR1;
-    int j;
+    register int j;
 
     for (j = 0; t[j] != '\0'; j++)
     {
@@ -491,7 +492,7 @@ int afuzzy_checkFLT(const char *t, AFUZZY *fuzzy)
         if (FilterR1 & fuzzy->filter_ok)
             return 1;
         FilterR = FilterR1;
-    } /* end for (int j = 0 ... */
+    } /* end for (register int j = 0 ... */
 
     return 0;
 }

tvguide.c

@@ -27,7 +27,7 @@
 #error "VDR-2.0.0 API version or greater is required!"
 #endif
 
-static const char *VERSION        = "1.3.6";
+static const char *VERSION        = "1.3.0";
 static const char *DESCRIPTION    = tr("A fancy 2d EPG Viewer");
 static const char *MAINMENUENTRY  = "Tvguide";
 

tvguideosd.c

@@ -33,12 +33,14 @@ cTvGuideOsd::~cTvGuideOsd() {
     delete recMenuView;
     if (channelJumper)
         delete channelJumper;
-    osdManager.DeleteOsd();
+    osdManager.deleteOsd();
 }
 
 void cTvGuideOsd::Show(void) {
     int start = cTimeMs::Now();
-    if (osdManager.CreateOsd()) {
+    bool ok = false;
+    ok = osdManager.setOsd();
+    if (ok) {
         bool themeChanged = config.LoadTheme();
         config.SetStyle();
         config.setDynamicValues();
@@ -49,7 +51,7 @@ void cTvGuideOsd::Show(void) {
             imgCache.Clear();
             imgCache.CreateCache();
         }
-        osdManager.SetBackground();
+        osdManager.setBackground();
         timeManager = new cTimeManager();
         timeManager->Now();
         SwitchTimers.Load(AddDirectory(cPlugin::ConfigDirectory("epgsearch"), "epgsearchswitchtimers.conf"));
@@ -116,17 +118,17 @@ void cTvGuideOsd::drawOsd() {
     channelGroups = new cChannelGroups();
     channelGroups->ReadChannelGroups();
     footer = new cFooter(channelGroups);
-    recMenuView->AddFooter(footer);
+    recMenuView->SetFooter(footer);
     footer->drawRedButton();
     if (config.channelJumpMode == eNumJump) {
         footer->drawGreenButton();
         footer->drawYellowButton();
     }
     footer->drawBlueButton(false);
-    osdManager.Flush();
+    osdManager.flush();
     readChannels(newStartChannel);
     drawGridsChannelJump(offset);
-    osdManager.Flush();
+    osdManager.flush();
     cPixmap::Unlock();
 }
 
@@ -287,7 +289,7 @@ void cTvGuideOsd::channelForward() {
     if (activeGrid && (config.channelJumpMode == eGroupJump)) {
         footer->UpdateGroupButtons(activeGrid->column->getChannel());
     }
-    osdManager.Flush();
+    osdManager.flush();
 }
 
 void cTvGuideOsd::channelBack() {
@@ -345,7 +347,7 @@ void cTvGuideOsd::channelBack() {
     if (activeGrid && (config.channelJumpMode == eGroupJump)) {
         footer->UpdateGroupButtons(activeGrid->column->getChannel());
     }
-    osdManager.Flush();
+    osdManager.flush();
 }
 
 void cTvGuideOsd::timeForward() {
@@ -365,7 +367,7 @@ void cTvGuideOsd::timeForward() {
     if (!actionDone) {
         ScrollForward();
     }
-    osdManager.Flush();
+    osdManager.flush();
 }
 
 void cTvGuideOsd::ScrollForward() {
@@ -404,7 +406,7 @@ void cTvGuideOsd::timeBack() {
     if (!actionDone) {
         ScrollBack();
     }
-    osdManager.Flush();
+    osdManager.flush();
 }
 
 void cTvGuideOsd::ScrollBack() {
@@ -468,7 +470,7 @@ void cTvGuideOsd::processKeyRight() {
 }
 
 void cTvGuideOsd::processKeyRed() {
-    if  ((activeGrid == NULL) || activeGrid->IsDummy())
+    if  ((activeGrid == NULL) || activeGrid->isDummy())
         return;
     recMenuView->Start(activeGrid->GetEvent());
 }
@@ -516,7 +518,7 @@ void cTvGuideOsd::processKeyGreen() {
             else
                 drawGridsChannelJump(currentCol);
         }
-        osdManager.Flush();
+        osdManager.flush();
     }
 }
 
@@ -566,7 +568,7 @@ void cTvGuideOsd::processKeyYellow() {
             else
                 drawGridsChannelJump(currentCol);
         }
-        osdManager.Flush();
+        osdManager.flush();
     }
 }
 
@@ -613,13 +615,13 @@ eOSState cTvGuideOsd::ChannelSwitch(bool *alreadyUnlocked) {
 }
 
 void cTvGuideOsd::DetailedEPG() {
-    if (!activeGrid->IsDummy()) {
+    if (!activeGrid->isDummy()) {
         detailViewActive = true;
         detailView = new cDetailView(activeGrid->GetEvent(), footer);
         footer->SetDetailedViewMode();
-        osdManager.Flush();
+        osdManager.flush();
         detailView->Start();
-        osdManager.Flush();
+        osdManager.flush();
     }
 }
 
@@ -673,7 +675,7 @@ void cTvGuideOsd::TimeJump(int mode) {
     timeLine->DrawDateViewer();
     timeLine->DrawClock();
     timeLine->DrawTimeline();
-    osdManager.Flush();
+    osdManager.flush();
 }
 
 int cTvGuideOsd::GetLastValidChannel(void) {
@@ -687,7 +689,7 @@ void cTvGuideOsd::ChannelJump(int num) {
     }
     channelJumper->Set(num);
     channelJumper->DrawText();
-    osdManager.Flush();
+    osdManager.flush();
 }
 
 void cTvGuideOsd::CheckTimeout(void) {
@@ -712,7 +714,7 @@ void cTvGuideOsd::CheckTimeout(void) {
                 drawGridsChannelJump();
             }
         }
-        osdManager.Flush();
+        osdManager.flush();
     }
 }
 
@@ -726,11 +728,11 @@ eOSState cTvGuideOsd::ProcessKey(eKeys Key) {
     eOSState state = osContinue;
     cPixmap::Lock();
     bool alreadyUnlocked = false;
-    if (recMenuView->IsActive()) {
+    if (recMenuView->isActive()) {
         state = recMenuView->ProcessKey(Key);
         if (state == osEnd) {
             SetTimers();                
-            osdManager.Flush();
+            osdManager.flush();
         }
         state = osContinue;
     } else if (detailViewActive) {
@@ -746,7 +748,7 @@ eOSState cTvGuideOsd::ProcessKey(eKeys Key) {
             if ((config.blueKeyMode == eBlueKeySwitch) || (config.blueKeyMode == eBlueKeyFavorites)) {
                 state = ChannelSwitch(&alreadyUnlocked);
             } else {
-                osdManager.Flush();
+                osdManager.flush();
                 state = osContinue;
             }
         } else if ((Key & ~k_Repeat) == kOk && (config.blueKeyMode == eBlueKeyEPG)) {
@@ -760,7 +762,7 @@ eOSState cTvGuideOsd::ProcessKey(eKeys Key) {
                 delete detailView;
                 detailView = NULL;
                 detailViewActive = false;
-                osdManager.Flush();
+                osdManager.flush();
                 state = osContinue;
             }
         }
@@ -785,7 +787,7 @@ eOSState cTvGuideOsd::ProcessKey(eKeys Key) {
             default:        break;
         }
         if (timeLine->DrawClock()) {
-            osdManager.Flush();
+            osdManager.flush();
         }
     }
     if (!alreadyUnlocked) {

view.c

@@ -41,19 +41,19 @@ cView::cView(void) : cThread("View") {
 
 cView::~cView(void) {
     if (pixmapBackground)
-        osdManager.DestroyPixmap(pixmapBackground);
+        osdManager.releasePixmap(pixmapBackground);
     if (pixmapHeader)
         delete pixmapHeader;
     if (pixmapHeaderLogo)
-        osdManager.DestroyPixmap(pixmapHeaderLogo);   
+        osdManager.releasePixmap(pixmapHeaderLogo);   
     if (pixmapContent)
-        osdManager.DestroyPixmap(pixmapContent);
+        osdManager.releasePixmap(pixmapContent);
     if (pixmapTabs)
-        osdManager.DestroyPixmap(pixmapTabs);
+        osdManager.releasePixmap(pixmapTabs);
     if (pixmapScrollbar)
-        osdManager.DestroyPixmap(pixmapScrollbar);
+        osdManager.releasePixmap(pixmapScrollbar);
     if (pixmapScrollbarBack)
-        osdManager.DestroyPixmap(pixmapScrollbarBack);
+        osdManager.releasePixmap(pixmapScrollbarBack);
     if (imgScrollBar)
         delete imgScrollBar;
 }
@@ -81,11 +81,11 @@ void cView::SetGeometry(void) {
 
 void cView::DrawHeader(void) {
     if (!pixmapHeader) {
-        pixmapHeader = new cStyledPixmap(osdManager.CreatePixmap(5, cRect(0, 0, headerWidth, headerHeight)));
+        pixmapHeader = new cStyledPixmap(osdManager.requestPixmap(5, cRect(0, 0, headerWidth, headerHeight)));
         pixmapHeader->setColor(theme.Color(clrHeader), theme.Color(clrHeaderBlending));
     }
     if (!pixmapHeaderLogo) {
-        pixmapHeaderLogo = osdManager.CreatePixmap(6, cRect(0, 0, width, headerHeight));
+        pixmapHeaderLogo = osdManager.requestPixmap(6, cRect(0, 0, width, headerHeight));
     }
     pixmapHeader->Fill(clrTransparent);
     pixmapHeaderLogo->Fill(clrTransparent);
@@ -108,24 +108,17 @@ void cView::DrawHeader(void) {
         if (imgLoader.LoadLogo(channel, logoWidth, logoHeight)) {
             cImage logo = imgLoader.GetImage();
             const int logoheight = logo.Height();
-            const int logowidth = logo.Width();
+            pixmapHeaderLogo->DrawImage(cPoint(border / 2, ((headerHeight - logoHeight) / 2 + (logoHeight - logoheight) / 2)), logo);
-            pixmapHeaderLogo->DrawImage(cPoint(xText + ((logoWidth - logowidth) / 2), ((headerHeight - logoheight) / 2)), logo);
             xText += logoWidth + border / 2;
         }
     }
     //Date and Time, Title, Subtitle
-    int textWidthMax = headerWidth - xText - border / 2;
-    wrapper.Set(title.c_str(), fontHeaderLarge, textWidthMax);
-    int lineHeight = fontHeaderLarge->Height();
-    int textLines = wrapper.Lines();
     int yDateTime = border / 2;
-    int yTitle = (headerHeight - textLines * lineHeight) / 2;
+    int yTitle = (headerHeight - fontHeaderLarge->Height()) / 2;
     int ySubtitle = headerHeight - fontHeader->Height() - border / 3;
-
+    int textWidthMax = headerWidth - xText - border / 2;
     pixmapHeader->DrawText(cPoint(xText, yDateTime), CutText(dateTime, textWidthMax, fontHeader).c_str(), theme.Color(clrFont), theme.Color(clrStatusHeader), fontHeader);
-    for (int i = 0; i < textLines; i++) {
+    pixmapHeader->DrawText(cPoint(xText, yTitle), CutText(title, textWidthMax, fontHeaderLarge).c_str(), theme.Color(clrFont), theme.Color(clrStatusHeader), fontHeaderLarge);
-        pixmapHeader->DrawText(cPoint(xText, yTitle + i * lineHeight), wrapper.GetLine(i), theme.Color(clrFont), theme.Color(clrStatusHeader), fontHeaderLarge);
-    }
     pixmapHeader->DrawText(cPoint(xText, ySubtitle), CutText(subTitle, textWidthMax, fontHeader).c_str(), theme.Color(clrFont), theme.Color(clrStatusHeader), fontHeader);
     //REC Icon
     eTimerMatch timerMatch = tmNone; 
@@ -168,7 +161,7 @@ void cView::DrawHeader(void) {
 
 void cView::DrawTabs(void) {
     if (!pixmapTabs) {
-        pixmapTabs = osdManager.CreatePixmap(4, cRect(0, y + headerHeight + contentHeight, width + scrollbarWidth, tabHeight));
+        pixmapTabs = osdManager.requestPixmap(4, cRect(0, y + headerHeight + contentHeight, width + scrollbarWidth, tabHeight));
     }
     tColor bgColor = theme.Color(clrTabInactive);
     pixmapTabs->Fill(clrTransparent);
@@ -195,18 +188,18 @@ void cView::DrawTabs(void) {
 
 void cView::ClearContent(void) {
     if (pixmapContent && Running()) {
-        osdManager.DestroyPixmap(pixmapContent);
+        osdManager.releasePixmap(pixmapContent);
         pixmapContent = NULL;
     }
     if (pixmapBackground && Running()) {
-        osdManager.DestroyPixmap(pixmapBackground);
+        osdManager.releasePixmap(pixmapBackground);
         pixmapBackground = NULL;
     }
 }
 
 void cView::CreateContent(int fullHeight) {
     scrollable = false;
-    pixmapBackground = osdManager.CreatePixmap(3, cRect(x, y + headerHeight, width + scrollbarWidth, contentHeight + tabHeight));
+    pixmapBackground = osdManager.requestPixmap(3, cRect(x, y + headerHeight, width + scrollbarWidth, contentHeight + tabHeight));
     pixmapBackground->Fill(theme.Color(clrBackground));
 
     int drawPortHeight = contentHeight; 
@@ -214,7 +207,7 @@ void cView::CreateContent(int fullHeight) {
         drawPortHeight = fullHeight;
         scrollable = true;
     }
-    pixmapContent = osdManager.CreatePixmap(4, cRect(x, y + headerHeight, width, contentHeight), cRect(0, 0, width, drawPortHeight));
+    pixmapContent = osdManager.requestPixmap(4, cRect(x, y + headerHeight, width, contentHeight), cRect(0, 0, width, drawPortHeight));
     pixmapContent->Fill(clrTransparent);
 }
 
@@ -223,7 +216,7 @@ void cView::DrawContent(std::string *text) {
     wText.Set(text->c_str(), font, width - 2 * border);
     int lineHeight = font->Height();
     int textLines = wText.Lines();
-    int textHeight = lineHeight * textLines + 2 * border;
+    int textHeight = lineHeight * textLines + 2*border;
     int yText = border;
     CreateContent(textHeight);
     for (int i=0; i < textLines; i++) {
@@ -253,18 +246,18 @@ void cView::DrawFloatingContent(std::string *infoText, cTvMedia *img, cTvMedia *
     int lineHeight = font->Height();
     int textLinesTall = wTextTall.Lines();
     int textLinesFull = wTextFull.Lines();
-    int textHeight = lineHeight * (textLinesTall + textLinesFull) + 2 * border;
+    int textHeight = lineHeight * (textLinesTall + textLinesFull) + 2*border;
     int yText = border;
-    CreateContent(std::max(textHeight, imgHeight + 2 * border));
+    CreateContent(max(textHeight, imgHeight + 2*border));
-    for (int i = 0; i < textLinesTall; i++) {
+    for (int i=0; i < textLinesTall; i++) {
         pixmapContent->DrawText(cPoint(border, yText), wTextTall.GetLine(i), theme.Color(clrFont), clrTransparent, font);
         yText += lineHeight;
     }
-    for (int i = 0; i < textLinesFull; i++) {
+    for (int i=0; i < textLinesFull; i++) {
         pixmapContent->DrawText(cPoint(border, yText), wTextFull.GetLine(i), theme.Color(clrFont), clrTransparent, font);
         yText += lineHeight;
     }
-    osdManager.Flush();
+    osdManager.flush();
     cImageLoader imgLoader;
     if (imgLoader.LoadPoster(img->path.c_str(), imgWidth, imgHeight)) {
         if (Running() && pixmapContent)
@@ -272,16 +265,16 @@ void cView::DrawFloatingContent(std::string *infoText, cTvMedia *img, cTvMedia *
     }
     if (!img2)
         return;
-    osdManager.Flush();
+    osdManager.flush();
     if (imgLoader.LoadPoster(img2->path.c_str(), imgWidth2, imgHeight2)) {
         if (Running() && pixmapContent)
-            pixmapContent->DrawImage(cPoint(width - imgWidth2 - border, imgHeight + 2 * border), imgLoader.GetImage());
+            pixmapContent->DrawImage(cPoint(width - imgWidth2 - border, imgHeight + 2*border), imgLoader.GetImage());
     }
 }
 
 void cView::CreateFloatingTextWrapper(cTextWrapper *twNarrow, cTextWrapper *twFull, std::string *text, int widthImg, int heightImg) {
     int lineHeight = font->Height();
-    int linesNarrow = (heightImg + 2 * border)/ lineHeight;
+    int linesNarrow = (heightImg + 2*border)/ lineHeight;
     int linesDrawn = 0;
     int y = 0;
     int widthNarrow = width - 3 * border - widthImg;
@@ -401,7 +394,7 @@ void cView::DrawActors(std::vector<cActor> *actors) {
             }
             actor++;
         }
-        osdManager.Flush();
+        osdManager.flush();
         x = 0;
         y += thumbHeight + 2 * fontSmall->Height() + border + border/2;
     }
@@ -427,11 +420,11 @@ void cView::DrawScrollbar(void) {
         return;
 
     if (!pixmapScrollbar) {
-        pixmapScrollbar = osdManager.CreatePixmap(6, cRect(width, y + headerHeight, scrollbarWidth, contentHeight));
+        pixmapScrollbar = osdManager.requestPixmap(6, cRect(width, y + headerHeight, scrollbarWidth, contentHeight));
         pixmapScrollbar->Fill(clrTransparent);
     }
     if (!pixmapScrollbarBack) {
-        pixmapScrollbarBack = osdManager.CreatePixmap(5, cRect(width, y + headerHeight, scrollbarWidth, contentHeight));
+        pixmapScrollbarBack = osdManager.requestPixmap(5, cRect(width, y + headerHeight, scrollbarWidth, contentHeight));
         pixmapScrollbarBack->Fill(clrTransparent);
     }
 
@@ -488,6 +481,7 @@ bool cView::KeyUp(void) {
     if (!scrollable)
         return false;
     int aktHeight = pixmapContent->DrawPort().Point().Y();
+//    int lineHeight = font->Height();
     if (aktHeight >= 0) {
         return false;
     }
@@ -587,7 +581,7 @@ void cEPGView::DrawImages(void) {
         if (drawPic) {
             pixmapContent->DrawImage(cPoint((width - imgWidth) / 2, yPic), imgLoader.GetImage());
             yPic += imgHeight + border;
-            osdManager.Flush();
+            osdManager.flush();
         }
     } 
 }
@@ -612,7 +606,7 @@ void cEPGView::Action(void) {
     ClearContent();
     if (!headerDrawn) {
         DrawHeader();
-        osdManager.Flush();
+        osdManager.flush();
         headerDrawn = true;
     }
     if (tabs.size() == 0) {
@@ -632,7 +626,7 @@ void cEPGView::Action(void) {
             break;
     }
     DrawScrollbar();
-    osdManager.Flush();
+    osdManager.flush();
 }
 
 /********************************************************************************************
@@ -755,32 +749,32 @@ void cSeriesView::DrawImages(void) {
             if (imgLoader.LoadPoster(series.banners[i].path.c_str(), series.banners[i].width, series.banners[i].height) && Running()) {
                 pixmapContent->DrawImage(cPoint((width - series.banners[i].width) / 2, yPic), imgLoader.GetImage());
                 yPic += series.banners[i].height + border;
-                osdManager.Flush();
+                osdManager.flush();
             }
         }
         if (imgLoader.LoadPoster(series.fanarts[i].path.c_str(), fanartWidth, fanartHeight) && Running()) {
             pixmapContent->DrawImage(cPoint((width - fanartWidth)/2, yPic), imgLoader.GetImage());
             yPic += fanartHeight + border;
-            osdManager.Flush();
+            osdManager.flush();
         }
     }
     if (numPosters >= 1) {
         if (imgLoader.LoadPoster(series.posters[0].path.c_str(), posterWidth, posterHeight) && Running()) {
             pixmapContent->DrawImage(cPoint(border, yPic), imgLoader.GetImage());
-            osdManager.Flush();
+            osdManager.flush();
             yPic += posterHeight + border;
         }
     }
     if (numPosters >= 2) {
         if (imgLoader.LoadPoster(series.posters[1].path.c_str(), posterWidth, posterHeight) && Running()) {
             pixmapContent->DrawImage(cPoint(2 * border + posterWidth, yPic - posterHeight - border), imgLoader.GetImage());
-            osdManager.Flush();
+            osdManager.flush();
         }
     }
     if (numPosters == 3) {
         if (imgLoader.LoadPoster(series.posters[2].path.c_str(), posterWidth, posterHeight) && Running()) {
             pixmapContent->DrawImage(cPoint((width - posterWidth) / 2, yPic), imgLoader.GetImage());
-            osdManager.Flush();
+            osdManager.flush();
         }
     }
 }
@@ -814,7 +808,7 @@ void cSeriesView::Action(void) {
     ClearContent();
     if (!headerDrawn) {
         DrawHeader();
-        osdManager.Flush();
+        osdManager.flush();
         headerDrawn = true;
     }
     if (tabs.size() == 0) {
@@ -856,7 +850,7 @@ void cSeriesView::Action(void) {
             break;
     }
     DrawScrollbar();
-    osdManager.Flush();
+    osdManager.flush();
 }
 
 /********************************************************************************************
@@ -982,28 +976,28 @@ void cMovieView::DrawImages(void) {
         if (imgLoader.LoadPoster(movie.fanart.path.c_str(), fanartWidth, fanartHeight) && Running()) {
             pixmapContent->DrawImage(cPoint((width - fanartWidth)/2, yPic), imgLoader.GetImage());
             yPic += fanartHeight + border;
-            osdManager.Flush();
+            osdManager.flush();
         }
     }
     if (movie.collectionFanart.width > 0 && movie.collectionFanart.height > 0 && movie.collectionFanart.path.size() > 0) {
         if (imgLoader.LoadPoster(movie.collectionFanart.path.c_str(), collectionFanartWidth, collectionFanartHeight) && Running()) {
             pixmapContent->DrawImage(cPoint((width - collectionFanartWidth)/2, yPic), imgLoader.GetImage());
             yPic += collectionFanartHeight + border;
-            osdManager.Flush();
+            osdManager.flush();
         }
     }
     if (movie.poster.width > 0 && movie.poster.height > 0 && movie.poster.path.size() > 0) {
         if (imgLoader.LoadPoster(movie.poster.path.c_str(), movie.poster.width, movie.poster.height) && Running()) {
             pixmapContent->DrawImage(cPoint((width - movie.poster.width) / 2, yPic), imgLoader.GetImage());
             yPic += movie.poster.height + border;
-            osdManager.Flush();
+            osdManager.flush();
         }
     }
     if (movie.collectionPoster.width > 0 && movie.collectionPoster.height > 0 && movie.collectionPoster.path.size() > 0) {
         if (imgLoader.LoadPoster(movie.collectionPoster.path.c_str(), movie.collectionPoster.width, movie.collectionPoster.height) && Running()) {
             pixmapContent->DrawImage(cPoint((width - movie.collectionPoster.width) / 2, yPic), imgLoader.GetImage());
             yPic += movie.collectionPoster.height + border;
-            osdManager.Flush();
+            osdManager.flush();
         }
     }
 }
@@ -1028,7 +1022,7 @@ void cMovieView::Action(void) {
     ClearContent();
     if (!headerDrawn) {
         DrawHeader();
-        osdManager.Flush();
+        osdManager.flush();
         headerDrawn = true;
     }
     if (tabs.size() == 0) {
@@ -1064,5 +1058,5 @@ void cMovieView::Action(void) {
             break;
     }
     DrawScrollbar();
-    osdManager.Flush();
+    osdManager.flush();
 }

view.h

@@ -51,7 +51,6 @@ protected:
     int contentHeight;
     int tabHeight;
     int scrollbarWidth;
-    cTextWrapper wrapper;
     std::vector<std::string> tabs;
     std::string title;
     std::string subTitle;