diff options
| author | scop <scop> | 2005-04-21 21:46:35 +0000 |
|---|---|---|
| committer | scop <scop> | 2005-04-21 21:46:35 +0000 |
| commit | d5b786df7a54e2fd585f3376473c1fdae2152aa3 (patch) | |
| tree | 376ec03bbfba6b0421088bd2b5cf700396d3c032 | |
| parent | 503cdef76383607799731d0d0c4e8dfde02fec1e (diff) | |
| download | vdr-plugin-dxr3-d5b786df7a54e2fd585f3376473c1fdae2152aa3.tar.gz vdr-plugin-dxr3-d5b786df7a54e2fd585f3376473c1fdae2152aa3.tar.bz2 | |
OSD region/section optimization, http://article.gmane.org/gmane.linux.vdr/21658 (Thomas Husterer).
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 3 | ||||
| -rw-r--r-- | dxr3colormanager.c | 2 | ||||
| -rw-r--r-- | dxr3colormanager.h | 7 |
4 files changed, 6 insertions, 7 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 22fb732..b550c18 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -11,6 +11,7 @@ Gavin Hamill Paavo Hartikainen Tobias Haustein Stefan Huelswitt +Thomas Husterer Seppo Ingalsuo Antti Järvinen Atte Manninen @@ -286,7 +286,8 @@ NOTE: I havent found time to include all of the languages, will be done in pre2 - set aspect ratio and audio mode to unknown when releasing devices, fixes the setup eg. after returning from the MPlayer plugin (Luca Olivetti, Kimmo Vuorinen) -- rework OSD color management, fixes color "bleeding" (Luca Olivetti) +- rework OSD color management, fixes eg. color "bleeding" + (Luca Olivetti, Thomas Husterer) - sync SPU decoder with VDR 1.3.23 (Ville Skyttä) - register only needed ffmpeg codec(s) (Marco Schlüßler) - fix crash at exit (Marco Schlüßler) diff --git a/dxr3colormanager.c b/dxr3colormanager.c index 1e40711..56f38ea 100644 --- a/dxr3colormanager.c +++ b/dxr3colormanager.c @@ -231,7 +231,7 @@ unsigned char cColorManager::AddColor(int x, int y, unsigned char color, if (!curSection->HasColor(color, ColorIndex)) { // this color is new for this section - if (curSection->AllColorsUsed()) + if (curSection->AllColorsUsed(curRegion->Y1==y)) { // no more free colors if (y != curRegion->Y1) diff --git a/dxr3colormanager.h b/dxr3colormanager.h index e21888e..2a2553c 100644 --- a/dxr3colormanager.h +++ b/dxr3colormanager.h @@ -54,12 +54,9 @@ public: xSection(int x); bool HasColor(unsigned int color, unsigned char &ColorIndex); unsigned char AddColor(unsigned int color); - bool AllColorsUsed() { + bool AllColorsUsed(bool FirstLine) { //DIAG("AllColorsUsed: %d\n",NrOfColors); - if(NrOfColors >= 4) - return (true); - else - return (false); + return(NrOfColors >= (FirstLine ? 3 : 4)); }; int X1; int X2; |