Repeatable vdr 1.3.35 crash at end of recording

Message ID 436B6745.10506@cadsoft.de
State New
Headers

Commit Message

Klaus Schmidinger Nov. 4, 2005, 1:51 p.m. UTC
  Marko Mäkelä wrote:
> ...
> BTW, is there a reason why VDR discards the currently displayed menu
> at the end of a recording?

Not really, it just arose that way.

This should fix it:




Klaus
  

Comments

Marko Mäkelä Nov. 4, 2005, 9:52 p.m. UTC | #1
On Fri, Nov 04, 2005 at 02:51:01PM +0100, Klaus Schmidinger wrote:
> Marko Mäkelä wrote:
> >...
> >BTW, is there a reason why VDR discards the currently displayed menu
> >at the end of a recording?
> 
> Not really, it just arose that way.
> 
> This should fix it:
> 
> 
> --- vdr.c       2005/10/09 10:01:45     1.218
> +++ vdr.c       2005/11/04 13:48:39
> @@ -813,8 +813,14 @@
>          if (Interact) {
>             eOSState state = Interact->ProcessKey(key);
>             if (state == osUnknown && Interact != cControl::Control()) {
> -              if (ISMODELESSKEY(key) && cControl::Control())
> +              if (ISMODELESSKEY(key) && cControl::Control()) {
>                   state = cControl::Control()->ProcessKey(key);
> +                 if (state == osEnd) {
> +                    // let's not close a menu when replay ends:
> +                    cControl::Shutdown();
> +                    continue;
> +                    }
> +                 }
>                else if (time(NULL) - LastActivity > MENUTIMEOUT)
>                   state = osEnd;
>                }

Thanks!  Out of curiosity, I enabled the main menu (the one that shows
"stop playback" as the last entry) during playback.  The item did not
go away when the playback ended.  Of course, I had to select that item
when softdevice was already showing live program.  It went black for
a couple of seconds and then resumed playing the live program.

For me, it's just a cosmetic thing.  It's very nice that I can play with
the menus (such as browse the EPG) while watching a recording that is
about to end.  However, perhaps someone with a hardware MPEG decoder
(FF card or DXR3) should test this patch?

	Marko
  
Klaus Schmidinger Nov. 4, 2005, 10:03 p.m. UTC | #2
Marko Mäkelä wrote:
> ...
> For me, it's just a cosmetic thing.  It's very nice that I can play with
> the menus (such as browse the EPG) while watching a recording that is
> about to end.  However, perhaps someone with a hardware MPEG decoder
> (FF card or DXR3) should test this patch?

I have a FF card myself and it works fine here.

Klaus
  
Marko Mäkelä Nov. 4, 2005, 10:06 p.m. UTC | #3
On Fri, Nov 04, 2005 at 11:03:41PM +0100, Klaus Schmidinger wrote:
> Marko Mäkelä wrote:
> >...
> >For me, it's just a cosmetic thing.  It's very nice that I can play with
> >the menus (such as browse the EPG) while watching a recording that is
> >about to end.  However, perhaps someone with a hardware MPEG decoder
> >(FF card or DXR3) should test this patch?
> 
> I have a FF card myself and it works fine here.

Great! I guess the FF card will just keep playing the live stream when
you select the "stop playback" menu item.

	Marko
  
Klaus Schmidinger Nov. 4, 2005, 10:07 p.m. UTC | #4
Marko Mäkelä wrote:
> On Fri, Nov 04, 2005 at 11:03:41PM +0100, Klaus Schmidinger wrote:
> 
>>Marko Mäkelä wrote:
>>
>>>...
>>>For me, it's just a cosmetic thing.  It's very nice that I can play with
>>>the menus (such as browse the EPG) while watching a recording that is
>>>about to end.  However, perhaps someone with a hardware MPEG decoder
>>>(FF card or DXR3) should test this patch?
>>
>>I have a FF card myself and it works fine here.
> 
> 
> Great! I guess the FF card will just keep playing the live stream when
> you select the "stop playback" menu item.

Actually it didn't occur to me to select that option ;-)

I'll try that tomorrow.

Klaus
  
Klaus Schmidinger Nov. 5, 2005, 12:28 p.m. UTC | #5
Klaus Schmidinger wrote:
> Marko Mäkelä wrote:
> 
>> On Fri, Nov 04, 2005 at 11:03:41PM +0100, Klaus Schmidinger wrote:
>>
>>> Marko Mäkelä wrote:
>>>
>>>> ...
>>>> For me, it's just a cosmetic thing.  It's very nice that I can play 
>>>> with
>>>> the menus (such as browse the EPG) while watching a recording that is
>>>> about to end.  However, perhaps someone with a hardware MPEG decoder
>>>> (FF card or DXR3) should test this patch?
>>>
>>>
>>> I have a FF card myself and it works fine here.
>>
>>
>>
>> Great! I guess the FF card will just keep playing the live stream when
>> you select the "stop playback" menu item.
> 
> 
> Actually it didn't occur to me to select that option ;-)
> 
> I'll try that tomorrow.
> 
> Klaus

Tried it - nothing happens.

I know that this option should be removed when the replay has ended.
I'll attend to this when the more important stuff is done...

Klaus
  

Patch

--- vdr.c       2005/10/09 10:01:45     1.218
+++ vdr.c       2005/11/04 13:48:39
@@ -813,8 +813,14 @@ 
          if (Interact) {
             eOSState state = Interact->ProcessKey(key);
             if (state == osUnknown && Interact != cControl::Control()) {
-              if (ISMODELESSKEY(key) && cControl::Control())
+              if (ISMODELESSKEY(key) && cControl::Control()) {
                   state = cControl::Control()->ProcessKey(key);
+                 if (state == osEnd) {
+                    // let's not close a menu when replay ends:
+                    cControl::Shutdown();
+                    continue;
+                    }
+                 }
                else if (time(NULL) - LastActivity > MENUTIMEOUT)
                   state = osEnd;
                }