[vdr] Re: ShowReplayMode bug (was Re: Video Disk Recorder version 0.97)

[Klaus Schmidinger <Klaus.Schmidinger@cadsoft.de>]

Stefan Huelswitt wrote:
> 
> On 23 Oct 2001 Sergei Haller <Sergei.Haller@math.uni-giessen.de> wrote:
> 
> > there must be something wrong with it. e.g. if you are replaying without
> 
> Unfortunaly true. In some cases the small OSD is left open and
> disturbs further display. I think this should cure this (there
> may be better ways to fix this):

I believe this should also do (with less impact):

---
 menu.c      2001/10/21 14:28:14     1.131
+++ menu.c      2001/10/27 10:20:04
@@ -2365,6 +2365,8 @@
 cReplayControl::~cReplayControl()
 {
   Hide();
+  if (Setup.ShowReplayMode)
+     Hide(); // the initial Hide() may have reopened the small mode display window
   dvbApi->StopReplay();
 }


Can somebody please confirm this?

Klaus

> 
> diff -uN VDR/menu.c VDR-0.97-orig/menu.c
> --- VDR/menu.c  Tue Oct 23 18:15:23 2001
> +++ VDR-0.97-orig/menu.c        Sun Oct 21 16:28:14 2001
> @@ -2364,7 +2364,7 @@
> 
>  cReplayControl::~cReplayControl()
>  {
> -  Hide(true);
> +  Hide();
>    dvbApi->StopReplay();
>  }
> 
> @@ -2413,12 +2413,12 @@
>       }
>  }
> 
> -void cReplayControl::Hide(bool noShowMode)
> +void cReplayControl::Hide(void)
>  {
>    if (visible) {
>       Interface->Close();
>       needsFastResponse = visible = false;
> -     if (!noShowMode && !modeOnly)
> +     if (!modeOnly)
>          ShowMode();
>       else
>          modeOnly = false;
> @@ -2664,7 +2664,7 @@
> 
>  void cReplayControl::EditCut(void)
>  {
> -  Hide(true);
> +  Hide();
>    if (!cVideoCutter::Active()) {
>       if (!cVideoCutter::Start(fileName))
>          Interface->Error(tr("Can't start editing process!"));
> @@ -2727,7 +2727,7 @@
>      case kGreen:   dvbApi->SkipSeconds(-60); break;
>      case kYellow|k_Repeat:
>      case kYellow:  dvbApi->SkipSeconds( 60); break;
> -    case kBlue:    Hide(true);
> +    case kBlue:    Hide();
>                     dvbApi->StopReplay();
>                     return osEnd;
>      default: {
> @@ -2748,7 +2748,7 @@
>            displayFrames = DisplayedFrames;
>            switch (Key) {
>              // Menu control:
> -            case kMenu:    Hide(true); return osMenu; // allow direct switching to menu
> +            case kMenu:    Hide(); return osMenu; // allow direct switching to menu
>              case kOk:      if (visible && !modeOnly)
>                                Hide();
>                             else
> diff -uN VDR/menu.h VDR-0.97-orig/menu.h
> --- VDR/menu.h  Tue Oct 23 18:12:53 2001
> +++ VDR-0.97-orig/menu.h        Sun Oct 21 16:26:01 2001
> @@ -110,7 +110,7 @@
>    void TimeSearchProcess(eKeys Key);
>    void TimeSearch(void);
>    void Show(int Seconds = 0);
> -  void Hide(bool noShowMode = false);
> +  void Hide(void);
>    static char *fileName;
>  #ifdef DVDSUPPORT
>    static cDVD *dvd;//XXX member really necessary???
> 
> --
> Stefan Huelswitt
> huels@iname.com  | http://home.pages.de/~nathan

-- 
_______________________________________________________________

Klaus Schmidinger                       Phone: +49-8635-6989-10
CadSoft Computer GmbH                   Fax:   +49-8635-6989-40
Hofmark 2                               Email:   kls@cadsoft.de
D-84568 Pleiskirchen, Germany           URL:     www.cadsoft.de
_______________________________________________________________