Move bluray keypress/action handling into BDRingBuffer

Author: Mark Kendall

mythtv/libs/libmythtv/bdringbuffer.cpp

@@ -16,6 +16,7 @@
 #include "mythlocale.h"
 #include "mythdirs.h"
 #include "bluray.h"
+#include "tv.h" // for actions
 
 #define LOC      QString("BDRingBuf(%1): ").arg(filename)
 #define LOC_WARN QString("BDRingBuf(%1) Warning: ").arg(filename)
@@ -148,6 +149,88 @@ void BDRingBuffer::GetDescForPos(QString &desc) const
                        .arg(m_currentTitleInfo->chapters->idx);
 }
 
+bool BDRingBuffer::HandleAction(const QStringList &actions, int64_t pts)
+{
+    if (actions.contains(ACTION_MENUTEXT))
+    {
+        PressButton(BD_VK_POPUP, pts);
+        return true;
+    }
+
+    if (!IsInMenu())
+        return false;
+
+    bool handled = true;
+    if (actions.contains(ACTION_UP) ||
+        actions.contains(ACTION_CHANNELUP))
+    {
+        PressButton(BD_VK_UP, pts);
+    }
+    else if (actions.contains(ACTION_DOWN) ||
+             actions.contains(ACTION_CHANNELDOWN))
+    {
+        PressButton(BD_VK_DOWN, pts);
+    }
+    else if (actions.contains(ACTION_LEFT) ||
+             actions.contains(ACTION_SEEKRWND))
+    {
+        PressButton(BD_VK_LEFT, pts);
+    }
+    else if (actions.contains(ACTION_RIGHT) ||
+             actions.contains(ACTION_SEEKFFWD))
+    {
+        PressButton(BD_VK_RIGHT, pts);
+    }
+    else if (actions.contains(ACTION_0))
+    {
+        PressButton(BD_VK_0, pts);
+    }
+    else if (actions.contains(ACTION_1))
+    {
+        PressButton(BD_VK_1, pts);
+    }
+    else if (actions.contains(ACTION_2))
+    {
+        PressButton(BD_VK_2, pts);
+    }
+    else if (actions.contains(ACTION_3))
+    {
+        PressButton(BD_VK_3, pts);
+    }
+    else if (actions.contains(ACTION_4))
+    {
+        PressButton(BD_VK_4, pts);
+    }
+    else if (actions.contains(ACTION_5))
+    {
+        PressButton(BD_VK_5, pts);
+    }
+    else if (actions.contains(ACTION_6))
+    {
+        PressButton(BD_VK_6, pts);
+    }
+    else if (actions.contains(ACTION_7))
+    {
+        PressButton(BD_VK_7, pts);
+    }
+    else if (actions.contains(ACTION_8))
+    {
+        PressButton(BD_VK_8, pts);
+    }
+    else if (actions.contains(ACTION_9))
+    {
+        PressButton(BD_VK_9, pts);
+    }
+    else if (actions.contains(ACTION_SELECT))
+    {
+        PressButton(BD_VK_ENTER, pts);
+    }
+    else
+        handled = false;
+
+    return handled;
+}
+
 bool BDRingBuffer::OpenFile(const QString &lfilename, uint retry_ms)
 {
     VERBOSE(VB_IMPORTANT, LOC + QString("Opened BDRingBuffer device at %1")

mythtv/libs/libmythtv/bdringbuffer.h

@@ -92,6 +92,7 @@ class MPUBLIC BDRingBuffer : public RingBuffer
     int GetSubtitleLanguage(uint streamID);
 
     // commands
+    bool         HandleAction(const QStringList &actions, int64_t pts);
     virtual bool OpenFile(const QString &filename,
                           uint retry_ms = kDefaultOpenTimeout);
     void close(void);

mythtv/libs/libmythtv/tv_play.cpp

@@ -3902,82 +3902,7 @@ bool TV::DiscMenuHandleAction(PlayerContext *ctx, const QStringList &actions)
             }
         }
 
-        if (has_action(ACTION_MENUTEXT, actions))
-        {
-            bdrb->PressButton(BD_VK_POPUP, pts);
-            return true;
-        }
-
-        if (!bdrb->IsInMenu())
-            return false;
-
-        handled = true;
-        if (has_action(ACTION_UP, actions) ||
-            has_action(ACTION_CHANNELUP, actions))
-        {
-            bdrb->PressButton(BD_VK_UP, pts);
-        }
-        else if (has_action(ACTION_DOWN, actions) ||
-                 has_action(ACTION_CHANNELDOWN, actions))
-        {
-            bdrb->PressButton(BD_VK_DOWN, pts);
-        }
-        else if (has_action(ACTION_LEFT, actions) ||
-                 has_action(ACTION_SEEKRWND, actions))
-        {
-            bdrb->PressButton(BD_VK_LEFT, pts);
-        }
-        else if (has_action(ACTION_RIGHT, actions) ||
-                 has_action(ACTION_SEEKFFWD, actions))
-        {
-            bdrb->PressButton(BD_VK_RIGHT, pts);
-        }
-        else if (has_action(ACTION_0, actions))
-        {
-            bdrb->PressButton(BD_VK_0, pts);
-        }
-        else if (has_action(ACTION_1, actions))
-        {
-            bdrb->PressButton(BD_VK_1, pts);
-        }
-        else if (has_action(ACTION_2, actions))
-        {
-            bdrb->PressButton(BD_VK_2, pts);
-        }
-        else if (has_action(ACTION_3, actions))
-        {
-            bdrb->PressButton(BD_VK_3, pts);
-        }
-        else if (has_action(ACTION_4, actions))
-        {
-            bdrb->PressButton(BD_VK_4, pts);
-        }
-        else if (has_action(ACTION_5, actions))
-        {
-            bdrb->PressButton(BD_VK_5, pts);
-        }
-        else if (has_action(ACTION_6, actions))
-        {
-            bdrb->PressButton(BD_VK_6, pts);
-        }
-        else if (has_action(ACTION_7, actions))
-        {
-            bdrb->PressButton(BD_VK_7, pts);
-        }
-        else if (has_action(ACTION_8, actions))
-        {
-            bdrb->PressButton(BD_VK_8, pts);
-        }
-        else if (has_action(ACTION_9, actions))
-        {
-            bdrb->PressButton(BD_VK_9, pts);
-        }
-        else if (has_action(ACTION_SELECT, actions))
-        {
-            bdrb->PressButton(BD_VK_ENTER, pts);
-        }
-        else
-            handled = false;
+        handled = bdrb->HandleAction(actions, pts);
     }
 
     return handled;