Ticket #1492: DVD_menu_control.patch

tv_play.cpp

@@ -2133 +2133 @@
                 handled = false;
         }
     }
-    
+
     if (recAdjustment)
     {
         for (unsigned int i = 0; i < actions.size(); i++)
@@ -2198 +2198 @@
         }
     }
 
+    if (prbuffer->isDVD() && prbuffer->DVD()->IsInMenu())
+    {
+        for (unsigned int i = 0; i < actions.size(); i++)
+        {
+            QString action = actions[i];
+
+            int nb_buttons = prbuffer->DVD()->NumMenuButtons();
+            if (nb_buttons > 0)
+            {
+                handled = true;
+
+                if (action == "UP" || action == "CHANNELUP")
+                    prbuffer->DVD()->MoveButtonUp();
+                else if (action == "DOWN" || action == "CHANNELDOWN")
+                    prbuffer->DVD()->MoveButtonDown();
+                else if (action == "LEFT" || action == "SEEKRWND")
+                    prbuffer->DVD()->MoveButtonLeft();
+                else if (action == "RIGHT" || action == "SEEKFFWD")
+                    prbuffer->DVD()->MoveButtonRight();
+                else if (action == "SELECT")
+                    nvp->ActivateDVDButton();
+                else
+                    handled = false;
+            }
+        }
+    }
+
 #if DEBUG_ACTIONS
     for (uint i = 0; i < actions.size(); ++i)
         VERBOSE(VB_IMPORTANT, LOC + QString("handled(%1) actions[%2](%3)")
@@ -2675 +2702 @@
             QString action = actions[i];
             handled = true;
 
-            if (prbuffer->isDVD() && prbuffer->DVD()->IsInMenu())
+            if (action == "DELETE")
             {
-                int nb_buttons = prbuffer->DVD()->NumMenuButtons();
-                if (nb_buttons > 0)
-                {
-                    if (action == "UP" || action == "CHANNELUP")
-                        prbuffer->DVD()->MoveButtonUp();
-                    else if (action == "DOWN" || action == "CHANNELDOWN")
-                        prbuffer->DVD()->MoveButtonDown();
-                    else if (action == "LEFT" || action == "SEEKRWND")
-                        prbuffer->DVD()->MoveButtonLeft();
-                    else if (action == "RIGHT" || action == "SEEKFFWD")
-                        prbuffer->DVD()->MoveButtonRight();
-                    else if (action == "SELECT")
-                        nvp->ActivateDVDButton();
-                }
-            }
-            else if (action == "DELETE")
-            {
                 NormalSpeed();
                 StopFFRew();
                 nvp->SetBookmark();