Move DVD menu keypress handling into DVDRingBuffer

Author: Mark Kendall

mythtv/libs/libmythtv/dvdringbuffer.cpp

@@ -957,6 +957,44 @@ void DVDRingBuffer::GoToPreviousProgram(void)
         dvdnav_prev_pg_search(m_dvdnav);
 }
 
+bool DVDRingBuffer::HandleAction(const QStringList &actions, int64_t pts)
+{
+    (void)pts;
+
+    if (!NumMenuButtons())
+        return false;
+
+    bool handled = true;
+    if (actions.contains(ACTION_UP) ||
+        actions.contains(ACTION_CHANNELUP))
+    {
+        MoveButtonUp();
+    }
+    else if (actions.contains(ACTION_DOWN) ||
+             actions.contains(ACTION_CHANNELDOWN))
+    {
+        MoveButtonDown();
+    }
+    else if (actions.contains(ACTION_LEFT) ||
+             actions.contains(ACTION_SEEKRWND))
+    {
+        MoveButtonLeft();
+    }
+    else if (actions.contains(ACTION_RIGHT) ||
+             actions.contains(ACTION_SEEKFFWD))
+    {
+        MoveButtonRight();
+    }
+    else if (actions.contains(ACTION_SELECT))
+    {
+        ActivateButton();
+    }
+    else
+        handled = false;
+
+    return handled;
+}
+
 void DVDRingBuffer::MoveButtonLeft(void)
 {
     if (NumMenuButtons() > 1)

mythtv/libs/libmythtv/dvdringbuffer.h

@@ -67,11 +67,7 @@ class MPUBLIC DVDRingBuffer : public RingBuffer
     QRect       GetButtonCoords(void);
     void        ReleaseMenuButton(void);
     bool        IsInMenu(void) const { return m_inMenu; }
-    void        ActivateButton(void);
-    void        MoveButtonLeft(void);
-    void        MoveButtonRight(void);
-    void        MoveButtonUp(void);
-    void        MoveButtonDown(void);
+    bool        HandleAction(const QStringList &actions, int64_t pts);
 
     // Subtitles
     uint GetSubtitleLanguage(int key);
@@ -175,6 +171,11 @@ class MPUBLIC DVDRingBuffer : public RingBuffer
     MythDVDPlayer *m_parent;
 
     // Private menu/button stuff
+    void ActivateButton(void);
+    void MoveButtonLeft(void);
+    void MoveButtonRight(void);
+    void MoveButtonUp(void);
+    void MoveButtonDown(void);
     bool DVDButtonUpdate(bool b_mode);
     void ClearMenuSPUParameters(void);
     void ClearMenuButton(void);

mythtv/libs/libmythtv/tv_play.cpp

@@ -3854,39 +3854,7 @@ bool TV::DiscMenuHandleAction(PlayerContext *ctx, const QStringList &actions)
 
     if (dvdrb)
     {
-        int nb_buttons = dvdrb->NumMenuButtons();
-        if (nb_buttons == 0)
-            return false;
-
-        handled = true;
-        if (has_action(ACTION_UP, actions) ||
-            has_action(ACTION_CHANNELUP, actions))
-        {
-            dvdrb->MoveButtonUp();
-        }
-        else if (has_action(ACTION_DOWN, actions) ||
-                 has_action(ACTION_CHANNELDOWN, actions))
-        {
-            dvdrb->MoveButtonDown();
-        }
-        else if (has_action(ACTION_LEFT, actions) ||
-                 has_action(ACTION_SEEKRWND, actions))
-        {
-            dvdrb->MoveButtonLeft();
-        }
-        else if (has_action(ACTION_RIGHT, actions) ||
-                 has_action(ACTION_SEEKFFWD, actions))
-        {
-            dvdrb->MoveButtonRight();
-        }
-        else if (has_action(ACTION_SELECT, actions))
-        {
-            ctx->LockDeletePlayer(__FILE__, __LINE__);
-            dvdrb->ActivateButton();
-            ctx->UnlockDeletePlayer(__FILE__, __LINE__);
-        }
-        else
-            handled = false;
+        handled = dvdrb->HandleAction(actions, 0);
     }
     else if (bdrb)
     {