Packman Build Service PMBS

kodi-next.spec Changed

_service:download_files:master.tar.gz/system/keymaps/keyboard.xml Changed

_service:download_files:master.tar.gz/system/keymaps/remote.xml Changed

_service:download_files:master.tar.gz/xbmc/guilib/WindowIDs.h Changed

_service:download_files:master.tar.gz/xbmc/input/ButtonTranslator.cpp Changed

@@ -203,27 +203,17 @@
   // try to get the action from the current window
   unsigned int actionID = GetActionCode(window, key, strAction);
 
-  // if it's invalid, try to get it from the global map
-  if (actionID == ACTION_NONE && fallback)
+  if (fallback)
   {
-    //! @todo Refactor fallback logic
-    int fallbackWindow = CWindowTranslator::GetFallbackWindow(window);
-    if (fallbackWindow > -1)
-      actionID = GetActionCode(fallbackWindow, key, strAction);
-
-    // still no valid action? use global map
-    if (actionID == ACTION_NONE)
-      actionID = GetActionCode(-1, key, strAction);
+    // if it's invalid, try to get it from fallback windows or the global map (window == -1)
+    while (actionID == ACTION_NONE && window > -1)
+    {
+      window = CWindowTranslator::GetFallbackWindow(window);
+      actionID = GetActionCode(window, key, strAction);
+    }
   }
 
-  // Now fill our action structure
-  CAction action(actionID, strAction, key);
-  return action;
-}
-
-CAction CButtonTranslator::GetGlobalAction(const CKey &key)
-{
-  return GetAction(-1, key, true);
+  return CAction(actionID, strAction, key);
 }
 
 bool CButtonTranslator::HasLongpressMapping(int window, const CKey &key)

_service:download_files:master.tar.gz/xbmc/input/ButtonTranslator.h Changed

_service:download_files:master.tar.gz/xbmc/input/CustomControllerTranslator.cpp Changed

@@ -84,23 +84,16 @@
   // Try to get the action from the current window
   if (!TranslateString(windowId, controllerName, buttonId, actionId, strAction))
   {
-    // If it's invalid, try to get it from a fallback window or the global map
-    int fallbackWindow = CWindowTranslator::GetFallbackWindow(windowId);
-    if (fallbackWindow > -1)
-      TranslateString(fallbackWindow, controllerName, buttonId, actionId, strAction);
-
-    // Still no valid action? Use global map
-    if (actionId == ACTION_NONE)
-      TranslateString(-1, controllerName, buttonId, actionId, strAction);
-  }
-
-  if (actionId != ACTION_NONE)
-  {
-    action = actionId;
-    return true;
+    // if it's invalid, try to get it from fallback windows or the global map (windowId == -1)
+    while (actionId == ACTION_NONE && windowId > -1)
+    {
+      windowId = CWindowTranslator::GetFallbackWindow(windowId);
+      TranslateString(windowId, controllerName, buttonId, actionId, strAction);
+    }
   }
 
-  return false;
+  action = actionId;
+  return actionId != ACTION_NONE;
 }
 
 bool CCustomControllerTranslator::TranslateString(int windowId, const std::string& controllerName, int buttonId, unsigned int& actionId, std::string& strAction)

_service:download_files:master.tar.gz/xbmc/input/InputManager.cpp Changed

_service:download_files:master.tar.gz/xbmc/input/InputManager.h Changed

_service:download_files:master.tar.gz/xbmc/input/TouchTranslator.cpp Changed

_service:download_files:master.tar.gz/xbmc/input/WindowTranslator.cpp Changed

@@ -21,6 +21,7 @@
 #include "WindowTranslator.h"
 #include "Application.h"
 #include "guilib/WindowIDs.h"
+#include "pvr/PVRGUIActions.h"
 #include "pvr/PVRManager.h"
 #include "ServiceBroker.h"
 #include "utils/log.h"
@@ -131,8 +132,12 @@
     { "movieinformation"         , WINDOW_DIALOG_VIDEO_INFO },
     { "textviewer"               , WINDOW_DIALOG_TEXT_VIEWER },
     { "fullscreenvideo"          , WINDOW_FULLSCREEN_VIDEO },
-    { "fullscreenlivetv"         , WINDOW_FULLSCREEN_LIVETV },         // virtual window/keymap section for PVR specific bindings in fullscreen playback (which internally uses WINDOW_FULLSCREEN_VIDEO)
-    { "fullscreenradio"          , WINDOW_FULLSCREEN_RADIO },          // virtual window for fullscreen radio, uses WINDOW_VISUALISATION as fallback
+    { "fullscreenlivetv"         , WINDOW_FULLSCREEN_LIVETV }, // virtual window for fullscreen radio, uses WINDOW_FULLSCREEN_VIDEO as fallback
+    { "fullscreenlivetvpreview"  , WINDOW_FULLSCREEN_LIVETV_PREVIEW }, // Live TV channel preview
+    { "fullscreenlivetvinput"    , WINDOW_FULLSCREEN_LIVETV_INPUT }, // Livr TV direct channel number input
+    { "fullscreenradio"          , WINDOW_FULLSCREEN_RADIO }, // virtual window for fullscreen radio, uses WINDOW_VISUALISATION as fallback
+    { "fullscreenradiopreview"   , WINDOW_FULLSCREEN_RADIO_PREVIEW }, // PVR Radio channel preview
+    { "fullscreenradioinput"     , WINDOW_FULLSCREEN_RADIO_INPUT }, // PVR radio direct channel number input
     { "fullscreengame"           , WINDOW_FULLSCREEN_GAME },
     { "visualisation"            , WINDOW_VISUALISATION },
     { "slideshow"                , WINDOW_SLIDESHOW },
@@ -167,8 +172,12 @@
 
 static const std::vector<FallbackWindowMapping> FallbackWindows =
 {
-    { WINDOW_FULLSCREEN_LIVETV   , WINDOW_FULLSCREEN_VIDEO },
-    { WINDOW_FULLSCREEN_RADIO    , WINDOW_VISUALISATION },
+    { WINDOW_FULLSCREEN_LIVETV,         WINDOW_FULLSCREEN_VIDEO },
+    { WINDOW_FULLSCREEN_LIVETV_INPUT,   WINDOW_FULLSCREEN_LIVETV },
+    { WINDOW_FULLSCREEN_LIVETV_PREVIEW, WINDOW_FULLSCREEN_LIVETV },
+    { WINDOW_FULLSCREEN_RADIO,          WINDOW_VISUALISATION },
+    { WINDOW_FULLSCREEN_RADIO_INPUT,    WINDOW_FULLSCREEN_RADIO },
+    { WINDOW_FULLSCREEN_RADIO_PREVIEW,  WINDOW_FULLSCREEN_RADIO },
 };
 } // anonymous namespace
 
@@ -278,9 +287,16 @@
     // check if we're in a DVD menu
     if (g_application.GetAppPlayer().IsInMenu())
       return WINDOW_VIDEO_MENU;
-    // check for LiveTV and switch to it's virtual window
-    else if (CServiceBroker::GetPVRManager().IsStarted() && g_application.CurrentFileItem().HasPVRChannelInfoTag())
-      return WINDOW_FULLSCREEN_LIVETV;
+    // special casing for Live TV
+    else if (g_application.CurrentFileItem().HasPVRChannelInfoTag())
+    {
+      if (CServiceBroker::GetPVRManager().GUIActions()->GetChannelNumberInputHandler().HasChannelNumber())
+        return WINDOW_FULLSCREEN_LIVETV_INPUT;
+      else if (CServiceBroker::GetPVRManager().GUIActions()->GetChannelNavigator().IsPreview())
+        return WINDOW_FULLSCREEN_LIVETV_PREVIEW;
+      else
+        return WINDOW_FULLSCREEN_LIVETV;
+    }
     // special casing for numeric seek
     else if (g_application.GetAppPlayer().GetSeekHandler().HasTimeCode())
       return WINDOW_VIDEO_TIME_SEEK;
@@ -288,8 +304,15 @@
   else if (windowId == WINDOW_VISUALISATION)
   {
     // special casing for PVR radio
-    if (CServiceBroker::GetPVRManager().IsStarted() && g_application.CurrentFileItem().HasPVRChannelInfoTag())
-      return WINDOW_FULLSCREEN_RADIO;
+    if (g_application.CurrentFileItem().HasPVRChannelInfoTag())
+    {
+      if (CServiceBroker::GetPVRManager().GUIActions()->GetChannelNumberInputHandler().HasChannelNumber())
+        return WINDOW_FULLSCREEN_RADIO_INPUT;
+      else if (CServiceBroker::GetPVRManager().GUIActions()->GetChannelNavigator().IsPreview())
+        return WINDOW_FULLSCREEN_RADIO_PREVIEW;
+      else
+        return WINDOW_FULLSCREEN_RADIO;
+    }
     // special casing for numeric seek
     else if (g_application.GetAppPlayer().GetSeekHandler().HasTimeCode())
       return WINDOW_VIDEO_TIME_SEEK;

_service:download_files:master.tar.gz/xbmc/music/windows/GUIWindowVisualisation.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/PVRActionListener.cpp Changed

@@ -157,6 +157,28 @@
       return true;
     }
 
+    case ACTION_SELECT_ITEM:
+    {
+      if (!bIsPlayingPVR)
+        return false;
+
+      // If the button that caused this action matches action "Select" ...
+      if (CServiceBroker::GetSettings().GetBool(CSettings::SETTING_PVRPLAYBACK_CONFIRMCHANNELSWITCH) &&
+          CServiceBroker::GetPVRManager().GUIActions()->GetChannelNavigator().IsPreview())
+      {
+        // ... and if "confirm channel switch" setting is active and a channel
+        // preview is currently shown, switch to the currently previewed channel.
+        CServiceBroker::GetPVRManager().GUIActions()->GetChannelNavigator().SwitchToCurrentChannel();
+        return true;
+      }
+      else if (CServiceBroker::GetPVRManager().GUIActions()->GetChannelNumberInputHandler().CheckInputAndExecuteAction())
+      {
+        // ... or if the action was processed by direct channel number input, we're done.
+        return true;
+      }
+      return false;
+    }
+
     case ACTION_MOVE_UP:
     case ACTION_NEXT_ITEM:
     case ACTION_CHANNEL_UP:

_service:download_files:master.tar.gz/xbmc/pvr/PVRChannelNumberInputHandler.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/PVRChannelNumberInputHandler.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/PVRGUIActions.cpp Changed

@@ -1831,29 +1831,6 @@
     return m_channelNavigator;
   }
 
-  bool CPVRGUIActions::OnAction(const CAction &action)
-  {
-    // If the button that caused this action matches (global) action "Select" (OK)...
-    if (action.GetID() == ACTION_SELECT_ITEM ||
-        CServiceBroker::GetInputManager().GetGlobalAction(action.GetButtonCode()).GetID() == ACTION_SELECT_ITEM)
-    {
-      if (m_settings.GetBoolValue(CSettings::SETTING_PVRPLAYBACK_CONFIRMCHANNELSWITCH) &&
-          GetChannelNavigator().IsPreview())
-      {
-        // ... and if "confirm channel switch" setting is active and a channel
-        // preview is currently shown, switch to the currently previewed channel.
-        GetChannelNavigator().SwitchToCurrentChannel();
-        return true;
-      }
-      else if (GetChannelNumberInputHandler().CheckInputAndExecuteAction())
-      {
-        // ... and action was processed by direct channel number input, we're done.
-          return true;
-      }
-    }
-    return false;
-  }
-
   void CPVRGUIActions::OnPlaybackStarted(const CFileItemPtr &item)
   {
     if (item->HasPVRChannelInfoTag())

_service:download_files:master.tar.gz/xbmc/pvr/PVRGUIActions.h Changed

_service:download_files:master.tar.gz/xbmc/video/windows/GUIWindowFullScreen.cpp Changed

Changes of Revision 65