Version 1.3.5

HISTORY

@@ -278,3 +278,16 @@ Version 1.3.2
 - 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

epggrid.c

@@ -20,9 +20,9 @@ cEpgGrid::~cEpgGrid(void) {
 void cEpgGrid::SetViewportHeight() {
     int viewportHeightOld = viewportHeight;
     if ( column->Start() > StartTime() ) {
-        viewportHeight = (min((int)EndTime(), column->Stop()) - column->Start()) /60;
+        viewportHeight = (std::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.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.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 ));
         }

recmanager.c

@@ -1,4 +1,4 @@
-#define __STL_CONFIG_H
+#define DISABLE_TEMPLATES_COLLIDING_WITH_STL
 
 #include <string>
 #include <sstream>

recmenuitem.c

@@ -557,7 +557,7 @@ void cRecMenuItemSelect::Draw(void) {
 void cRecMenuItemSelect::DrawValue(void) {
     pixmapVal->Fill(clrTransparent);
     std::string textVal = strings[currentVal];
-    int iconSize = min(128, height);
+    int iconSize = std::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);
@@ -664,7 +664,7 @@ void cRecMenuItemSelectDirectory::Draw(void) {
 
 void cRecMenuItemSelectDirectory::DrawValue(void) {
     pixmapVal->Fill(clrTransparent);
-    int iconSize = min(128, height);
+    int iconSize = std::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);
@@ -967,7 +967,7 @@ char *cRecMenuItemText::GetSMSKeys(int num) {
     if (specialChar)
         addition = 1;
     Utf8FromArray(startCharUtf8, p, numChars+addition);
-    int maxChars = min(numChars+1+addition, 8);
+    int maxChars = std::min(numChars+1+addition, 8);
     char *smskey = new char[maxChars];
     Utf8Strn0Cpy(smskey, p, maxChars);
     return smskey;
@@ -2163,7 +2163,7 @@ void cRecMenuItemDayChooser::SetSizes(void) {
         if (charWidth > maxWidth)
             maxWidth = charWidth;
     }    
-    daysSize = min(maxWidth + 15, height - 4);
+    daysSize = std::min(maxWidth + 15, height - 4);
     daysX = width - 10 - 7 * daysSize;
     daysY = (height  - daysSize) / 2;
 }

recmenuview.c

@@ -121,7 +121,7 @@ bool cRecMenuView::DisplayTimerConflict(int timerID) {
         cTVGuideTimerConflict *conflict = timerConflicts->GetCurrentConflict();
         if (!conflict)
             return false;
-//        delete activeMenu;
+        delete activeMenu;
         activeMenu = new cRecMenuTimerConflict(conflict, rmsIgnoreTimerConflict);
         activeMenu->Display();
         return true;

themes/tvguide-iceblue.theme

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

tvguide.c

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

view.c

@@ -222,7 +222,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++) {
@@ -252,14 +252,14 @@ 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(max(textHeight, imgHeight + 2*border));
-    for (int i=0; i < textLinesTall; i++) {
+    CreateContent(std::max(textHeight, imgHeight + 2 * border));
+    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;
     }
@@ -274,13 +274,13 @@ void cView::DrawFloatingContent(std::string *infoText, cTvMedia *img, cTvMedia *
     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;