Faster OSD by using bitmap

1 files changed, 34 insertions, 17 deletions

diff --git a/dvbapi.c b/dvbapi.c
index 1468de60..e30cad68 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.c 1.27 2000/09/17 12:45:55 kls Exp $
+ * $Id: dvbapi.c 1.28 2000/10/03 10:13:51 kls Exp $
  */
 
 #include "dvbapi.h"
@@ -19,6 +19,7 @@ extern "C" {
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <unistd.h>
+#include "dvbapi.h"
 #include "interface.h"
 #include "tools.h"
 #include "videodir.h"
@@ -1087,6 +1088,8 @@ cDvbApi::cDvbApi(const char *FileName)
   start_color();
   leaveok(stdscr, true);
   window = NULL;
+#else
+  osd = NULL;
 #endif
   lastProgress = lastTotal = -1;
   replayTitle = NULL;
@@ -1488,18 +1491,19 @@ void cDvbApi::Open(int w, int h)
   d *= lineHeight;
   int x = (720 - MenuColumns * charWidth) / 2; //TODO PAL vs. NTSC???
   int y = (576 - MenuLines * lineHeight) / 2 + d;
-  Cmd(OSD_Open, 4, x, y, x + w - 1, y + h - 1);
+  osd = new cDvbOsd(videoDev, x, y, x + w - 1, y + h - 1, 4);
   #define SETCOLOR(n, r, g, b, o) Cmd(OSD_SetColor, n, r, g, b, o)
+  SETCOLOR(clrTransparent, 0x00, 0x00, 0x00,   0);
 #endif
-  SETCOLOR(clrBackground, 0x00, 0x00, 0x00, 127); // background 50% gray
-  SETCOLOR(clrBlack,      0x00, 0x00, 0x00, 255);
-  SETCOLOR(clrRed,        0xFC, 0x14, 0x14, 255);
-  SETCOLOR(clrGreen,      0x24, 0xFC, 0x24, 255);
-  SETCOLOR(clrYellow,     0xFC, 0xC0, 0x24, 255);
-  SETCOLOR(clrBlue,       0x00, 0x00, 0xFC, 255);
-  SETCOLOR(clrCyan,       0x00, 0xFC, 0xFC, 255);
-  SETCOLOR(clrMagenta,    0xB0, 0x00, 0xFC, 255);
-  SETCOLOR(clrWhite,      0xFC, 0xFC, 0xFC, 255);
+  SETCOLOR(clrBackground,  0x00, 0x00, 0x00, 127); // background 50% gray
+  SETCOLOR(clrBlack,       0x00, 0x00, 0x00, 255);
+  SETCOLOR(clrRed,         0xFC, 0x14, 0x14, 255);
+  SETCOLOR(clrGreen,       0x24, 0xFC, 0x24, 255);
+  SETCOLOR(clrYellow,      0xFC, 0xC0, 0x24, 255);
+  SETCOLOR(clrBlue,        0x00, 0x00, 0xFC, 255);
+  SETCOLOR(clrCyan,        0x00, 0xFC, 0xFC, 255);
+  SETCOLOR(clrMagenta,     0xB0, 0x00, 0xFC, 255);
+  SETCOLOR(clrWhite,       0xFC, 0xFC, 0xFC, 255);
 
   lastProgress = lastTotal = -1;
 }
@@ -1512,7 +1516,8 @@ void cDvbApi::Close(void)
      window = 0;
      }
 #else
-  Cmd(OSD_Close);
+  delete osd;
+  osd = NULL;
 #endif
   lastProgress = lastTotal = -1;
 }
@@ -1523,7 +1528,7 @@ void cDvbApi::Clear(void)
   SetColor(clrBackground, clrBackground);
   Fill(0, 0, cols, rows, clrBackground);
 #else
-  Cmd(OSD_Clear);
+  osd->Clear();
 #endif
 }
 
@@ -1539,7 +1544,7 @@ void cDvbApi::Fill(int x, int y, int w, int h, eDvbColor color)
       }
   wsyncup(window); // shouldn't be necessary because of 'syncok()', but w/o it doesn't work
 #else
-  Cmd(OSD_FillBlock, color, x * charWidth, y * lineHeight, (x + w) * charWidth - 1, (y + h) * lineHeight - 1);
+  osd->Fill(x * charWidth, y * lineHeight, (x + w) * charWidth - 1, (y + h) * lineHeight - 1, color);
 #endif
 }
 
@@ -1557,7 +1562,15 @@ void cDvbApi::Text(int x, int y, const char *s, eDvbColor colorFg, eDvbColor col
   wmove(window, y, x); // ncurses wants 'y' before 'x'!
   waddstr(window, s);
 #else
-  Cmd(OSD_Text, (int(colorBg) << 16) | colorFg, x * charWidth, y * lineHeight, 1, 0, s);
+  osd->Text(x * charWidth, y * lineHeight, s, colorFg, colorBg);
+#endif
+}
+
+void cDvbApi::Flush(void)
+{
+#ifndef DEBUG_OSD
+  if (osd)
+     osd->Flush();
 #endif
 }
 
@@ -1567,11 +1580,13 @@ bool cDvbApi::ShowProgress(bool Initial)
 
   if (GetIndex(&Current, &Total)) {
      if (Initial) {
+        Clear();
         if (replayTitle)
            Text(0, 0, replayTitle);
         }
      if (Total != lastTotal)
         Text(-7, 2, cIndexFile::Str(Total));
+     Flush();
 #ifdef DEBUG_OSD
      int p = cols * Current / Total;
      Fill(0, 1, p, 1, clrGreen);
@@ -1597,12 +1612,14 @@ bool cDvbApi::ShowProgress(bool Initial)
            color = clrWhite;
            }
         if (lastProgress < 0)
-           Cmd(OSD_FillBlock, clrWhite, 0, y1, w - 1, y2);
-        Cmd(OSD_FillBlock, color, x1, y1, x2, y2);
+           osd->Fill(0, y1, w - 1, y2, clrWhite);
+        osd->Fill(x1, y1, x2, y2, color);
         lastProgress = p;
         }
+     Flush();
 #endif
      Text(0, 2, cIndexFile::Str(Current));
+     Flush();
      lastTotal = Total;
      return true;
      }