Refactor DrawDisk()

3 files changed, 13 insertions, 11 deletions

diff --git a/displaymenu.c b/displaymenu.c
index bfdfb78..8102d86 100644
--- a/displaymenu.c
+++ b/displaymenu.c
@@ -29,6 +29,7 @@ cLCARSNGDisplayMenu::cLCARSNGDisplayMenu(void)
   lastLiveIndicatorY = -1;
   lastLiveIndicatorTransferring = false;
   currentTitle = NULL;
+  lastcurrentTitle = NULL;
   lastDiskUsageState = -1;
   lastDiskAlert = false;
   lastSystemLoad = -1;
@@ -558,25 +559,20 @@ void cLCARSNGDisplayMenu::DrawDate(void)
 void cLCARSNGDisplayMenu::DrawDisk(void)
 {
   if (yb02) {
-     if (cVideoDiskUsage::HasChanged(lastDiskUsageState) || initial) { // must call HasChanged() first, or it shows an outdated value in the 'initial' case!
+     if (cVideoDiskUsage::HasChanged(lastDiskUsageState) || initial || currentTitle != lastcurrentTitle) { // must call HasChanged() first, or it shows an outdated value in the 'initial' case!
         const cFont *font = cFont::GetFont(fontOsd);
         int DiskUsage = cVideoDiskUsage::UsedPercent();
         bool DiskAlert = DiskUsage > DISKUSAGEALERTLIMIT;
         tColor ColorFg = DiskAlert ? Theme.Color(clrAlertFg) : frameColorFg;
         tColor ColorBg = DiskAlert ? Theme.Color(clrAlertBg) : frameColorBg;
-        int freemb = FreeMB(currentTitle, initial);
-        int minutes = 0;
+        int minutes = FreeMB(currentTitle, (currentTitle != lastcurrentTitle) ? true : false);
+        lastcurrentTitle = currentTitle;
         if (initial || DiskAlert != lastDiskAlert) {
            DrawRectangleOutline(osd, xa00, yb02, xa02 - 1, yb03 - 1, frameColorBr, frameColorBg, 15);
            osd->DrawText(xa00 + Margin, yb02 + Margin, tr("DISK"), ColorFg, ColorBg, tinyFont, xa02 - xa00 - 2 * Margin, yb03 - yb02 - 2 * Margin, taTop | taLeft | taBorder);
            }
-        {
-        LOCK_RECORDINGS_READ;
-        double MBperMinute = Recordings->MBperMinute();
-        minutes = int(double(freemb) / (MBperMinute > 0 ? MBperMinute : MB_PER_MINUTE));
-        }
         osd->DrawText(xa01, yb02 + Margin, cString::sprintf("%02d%s", DiskUsage, "%"), ColorFg, ColorBg, font, xa02 - xa01 - Margin, lineHeight, taBottom | taRight | taBorder);
-        osd->DrawText(xa00 + Margin, yb03 - lineHeight - Margin, freemb ? cString::sprintf("%02d:%02d", minutes / 60, minutes % 60) : cString::sprintf("%02d:%02d", cVideoDiskUsage::FreeMinutes() / 60, cVideoDiskUsage::FreeMinutes() % 60), ColorFg, ColorBg, font, xa02 - xa00 - 2 * Margin, lineHeight, taBottom | taRight | taBorder);
+        osd->DrawText(xa00 + Margin, yb03 - lineHeight - Margin, cString::sprintf("%02d:%02d", minutes / 60, minutes % 60), ColorFg, ColorBg, font, xa02 - xa00 - 2 * Margin, lineHeight, taBottom | taRight | taBorder);
         lastDiskAlert = DiskAlert;
         }
      }
@@ -1260,7 +1256,6 @@ void cLCARSNGDisplayMenu::Clear(void)
 void cLCARSNGDisplayMenu::SetTitle(const char *Title)
 {
   const cFont *font = cFont::GetFont(fontOsd);
-  initial = true;
   currentTitle = NULL;
   switch (MenuCategory()) {
      case mcMain:
diff --git a/displaymenu.h b/displaymenu.h
index bdf4093..e95a374 100644
--- a/displaymenu.h
+++ b/displaymenu.h
@@ -41,6 +41,7 @@ private:
   eCurrentMode lastMode;
   cString lastDate;
   const char *currentTitle;
+  const char *lastcurrentTitle;
   int lastDiskUsageState;
   bool lastDiskAlert;
   double lastSystemLoad;
diff --git a/lcarsng.c b/lcarsng.c
index 124592a..5e97403 100644
--- a/lcarsng.c
+++ b/lcarsng.c
@@ -206,6 +206,8 @@ int FreeMB(const char *Base, bool Initial)
      Directory = (strcmp(currentBase, cString::sprintf("%s", trVDR("Recordings"))) && strcmp(currentBase, cString::sprintf("%s", trVDR("Deleted Recordings")))) ? true : false;
 //     free(p);
      }
+  if (!Directory)
+     return cVideoDiskUsage::FreeMinutes();
   if (Initial || lastFreeMB <= 0 || (time(NULL) - lastDiskSpaceCheck) > DISKSPACECHEK) {
      dev_t fsid = 0;
      int freediskspace = 0;
@@ -254,7 +256,11 @@ int FreeMB(const char *Base, bool Initial)
      lastDiskSpaceCheck = time(NULL);
      }
   free(currentBase);
-  return lastFreeMB;
+  if (lastFreeMB == 0)
+     return cVideoDiskUsage::FreeMinutes();
+  LOCK_RECORDINGS_READ;
+  double MBperMinute = Recordings->MBperMinute();
+  return int(double(lastFreeMB) / (MBperMinute > 0 ? MBperMinute : MB_PER_MINUTE));
 }
 
 // --- cLCARSNG ------------------------------------------------------------