Version 1.2.7

HISTORY

@@ -181,3 +181,9 @@ Version 1.2.6
 - Channelgroup in cRecMenuSearchTimerEdit
   (Create and modify of channelgroups isn't yet possible, should be done in epgsearch)
 - Change channel icon size in cRecMenuSearchTimerEdit
+
+Version 1.2.7
+
+- Eliminate a "invalid lock sequence report" in tvguideosd.c
+- Optical changes in favorites and searchtimer menu
+- Changes in README

README

@@ -1,10 +1,14 @@
 This is a "plugin" for the Video Disk Recorder (VDR).
 
-Written by:                  Louis Braun <louis DOT braun AT gmx DOT de>
+TVGuide on GitLab: https://gitlab.com/kamel5/tvguide
 
-Project's homepage:          http://projects.vdr-developer.org/projects/plg-tvguide 
+Original Written by:           Louis Braun <louis DOT braun AT gmx DOT de>
 
-Latest version available at: http://projects.vdr-developer.org/projects/plg-tvguide/files
+Original Project's homepage:   http://projects.vdr-developer.org/projects/plg-tvguide 
+
+Latest version available at:   https://gitlab.com/kamel5/tvguide
+
+Original version available at: http://projects.vdr-developer.org/projects/plg-tvguide/files
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -274,4 +278,4 @@ Setup Options
   - Maximal number of logos to cache
 - Number of  logos to cache at start: number of logos to pre cache at plugin startup
   (a too large number causes a slower VDR start)
-- Information about image cache sizes
+- Information about image cache sizes

recmenuitem.c

@@ -1810,13 +1810,13 @@ cRecMenuItemEvent::~cRecMenuItemEvent(void) {
 void cRecMenuItemEvent::SetPixmaps(void) {
     if (!pixmap) {
         pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
-        pixmapText = osdManager.requestPixmap(5, cRect(x, y, width, height));
+        pixmapText = osdManager.requestPixmap(5, cRect(x, y, width - height / 2 - 10, height));
         pixmapText->Fill(clrTransparent);
         pixmapIcons = osdManager.requestPixmap(6, cRect(x, y, width, height));
         pixmapIcons->Fill(clrTransparent);
     } else {
         pixmap->SetViewPort(cRect(x, y, width, height));
-        pixmapText->SetViewPort(cRect(x, y, width, height));
+        pixmapText->SetViewPort(cRect(x, y, width - height / 2 - 10, height));
         pixmapIcons->SetViewPort(cRect(x, y, width, height));
     }
 }
@@ -1869,7 +1869,7 @@ int cRecMenuItemEvent::DrawIcons(void) {
     int iconY = (height - iconSize) / 2;
     std::string iconInfo;
     if (active) {
-        iconInfo = (iconActive==0)?"info_active":"info_inactive";
+        iconInfo = (iconActive == 0) ? "info_active" : "info_inactive";
     } else {
         iconInfo = "info_inactive";
     }
@@ -1879,7 +1879,6 @@ int cRecMenuItemEvent::DrawIcons(void) {
         iconsX += iconSize + 5;
     }
 
-    iconY = height - iconSize - 10;
     if (event->HasTimer()) {
         cImage *imgHasTimer = imgCache.GetIcon("activetimer", iconSize, iconSize);
         if (imgHasTimer) {
@@ -2694,18 +2693,19 @@ void cRecMenuItemSearchTimer::SetPixmaps(void) {
 
 void cRecMenuItemSearchTimer::Draw(void) {
     int textX = DrawIcons();
+    bool timerIsActive = timer.Active();
     pixmapText->Fill(clrTransparent);
     textX += 20;
-    cString label;
-    if (timer.Active()) {
-        label = cString::sprintf("\"%s\"", timer.SearchString().c_str());
-    } else {
-        label = cString::sprintf("\"%s\" (%s)", timer.SearchString().c_str(), tr("inactive"));
-    }
+    cString label = cString::sprintf("\"%s\"", timer.SearchString().c_str());
+    cString inactive = cString::sprintf("(%s)", tr("inactive"));
     int numTimersActive = timer.GetNumTimers();
     int numRecordings = timer.GetNumRecordings();
+
     cString info = cString::sprintf("%s: %d, %s: %d", tr("active timers"), numTimersActive, tr("recordings done"), numRecordings);
-    pixmapText->DrawText(cPoint(textX, 5 + (height/2 - font->Height())/2), *label, colorText, clrTransparent, font);
+    pixmapText->DrawText(cPoint(textX, 5 + (height/2 - font->Height()) / 2), *label, colorText, clrTransparent, font);
+    if (!timerIsActive) {
+        pixmapText->DrawText(cPoint(textX, 5 + (height - font->Height()) / 2), *inactive, colorText, clrTransparent, font, width - textX - 20, 0, taRight);
+    }
     pixmapText->DrawText(cPoint(textX, height/2 + (height/2 - fontSmall->Height())/2), *info, colorText, clrTransparent, fontSmall);
 }
 

tvguide.c

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

tvguideosd.c

@@ -238,13 +238,16 @@ void cTvGuideOsd::channelForward() {
     bool colAdded = false;
     if (!colRight) {
         const cChannel *channelRight = activeGrid->column->getChannel();
+        const cChannels *channels;
 #if VDRVERSNUM >= 20301
-	{
+        {
         LOCK_CHANNELS_READ;
-        while (channelRight = Channels->Next(channelRight)) {
+        channels = Channels;
+        }
 #else
-        while (channelRight = Channels.Next(channelRight)) {
+        channels = &Channels;
 #endif
+        while (channelRight = channels->Next(channelRight)) {
             if (!channelRight->GroupSep()) {
                 if (channelGroups->IsInLastGroup(channelRight)) {
                     break;
@@ -258,9 +261,6 @@ void cTvGuideOsd::channelForward() {
                 }
             }
         }
-#if VDRVERSNUM >= 20301
-        } //LOCK_CHANNELS_READ
-#endif
         if (colRight) {
             colAdded = true;
             if (columns.Count() == tvguideConfig.numGrids) {
@@ -297,13 +297,16 @@ void cTvGuideOsd::channelBack() {
     bool colAdded = false;
     if (!colLeft) {
         const cChannel *channelLeft = activeGrid->column->getChannel();
+        const cChannels *channels;
 #if VDRVERSNUM >= 20301
 	{
 	LOCK_CHANNELS_READ;
-	while (channelLeft = Channels->Prev(channelLeft)) {
+	channels = Channels;
+        }
 #else
-        while (channelLeft = Channels.Prev(channelLeft)) {
+        channels = &Channels;
 #endif
+        while (channelLeft = channels->Prev(channelLeft)) {
             if (!channelLeft->GroupSep()) {
                 colLeft = new cChannelColumn(0, channelLeft, myTime);
                 if (colLeft->readGrids()) {
@@ -314,9 +317,6 @@ void cTvGuideOsd::channelBack() {
                 }
             }
         }
-#if VDRVERSNUM >= 20301
-	} //LOCK_CHANNELS_READ
-#endif
         if (colLeft) {
             colAdded = true;
             if (columns.Count() == tvguideConfig.numGrids) {