[MPlayer-dev-eng] [PATCH] -menu & pause bug fix?

[Vladimir Mosgalin]

On Mon, 24 Mar 2003, Alban Bedel wrote:

AB>> This is regarding menu & pause bug (well, at least I think it is bug):
AB>> --- cut ---
AB>> 1) Bug with menu. Run mplayer -menu <some-file>, and pause key will
AB>>    start working strangely - every first press will be lost, but when
AB>>    you press menu key, pause activates. After it everything repeats.
AB>>    This makes -menu really unusable..
AB>> --- cut ---
AB>> 
AB>> I tried to discover what causes that, and that was too easy... When I
AB>> remove 4 lines from vf_menu.c (see patch), pause starts working as
AB>> expected. The problem is, this seems to be dumb - these lines were
AB>> responsible for something... I can't even imagine such behavior was made
AB>> on purpose. I tested patch, it breaks nothing for me, but now I can run
AB>> mplayer with menu=on without problems.
AB>
AB>At the begining pause in the menu was somewhat special to allow
AB>browsing the menu while in pause. iirc some user complained of
AB>something and that was removed. It seems only partialy, imho we
AB>should rather find the original problem (was that that pause needed
AB>to be pressed 2 time while not in the menu ?) and fix it.  Dunno what
AB>you guys think, but if one can't browse in the menu while in pause
AB>that suck imho (Ok that suck even more if it's buggy ;)

AB>PS: I don't have that much time atm and my top priority for mplayer
AB>    is removing the old config code atm. Pls don't apply that, it's
AB>    ok to comment, #if 0 it or whatever but keep the code there pls,
AB>    as i want to do a real fix someday.

OK, as current mplayer works incorrect with -menu and this needs
to be fixed, maybe someone with cvs will apply following patch.

-- 

Vladimir
-------------- next part --------------
diff -uNr main.orig/libmenu/vf_menu.c main/libmenu/vf_menu.c
--- main.orig/libmenu/vf_menu.c	Sat Mar 29 20:31:06 2003
+++ main/libmenu/vf_menu.c	Sat Mar 29 20:34:12 2003
@@ -85,10 +85,12 @@
 
   switch(cmd->id) {
   case MP_CMD_PAUSE :
+#if 0 // http://mplayerhq.hu/pipermail/mplayer-dev-eng/2003-March/017331.html
     if(!paused && !go2pause) { // Initial pause cmd -> wait the next put_image
       go2pause = 1;
       return 1;
     }
+#endif
     if(go2pause == 2) // Msg resent by put_image after saving the image
       go2pause = 0;
     break;