Packman Build Service PMBS

kodi-next.spec Changed

_service:download_files:master.tar.gz/addons/skin.estuary/xml/Includes.xml Changed

_service:download_files:master.tar.gz/cmake/modules/FindAML.cmake Changed

_service:download_files:master.tar.gz/cmake/modules/FindFFMPEG.cmake Changed

_service:download_files:master.tar.gz/cmake/modules/FindWaylandpp.cmake Changed

_service:download_files:master.tar.gz/cmake/platform/linux/wayland.cmake Changed

_service:download_files:master.tar.gz/cmake/scripts/linux/ExtraTargets.cmake Changed

_service:download_files:master.tar.gz/media/splash.jpg Changed

_service:download_files:master.tar.gz/tools/depends/configure.ac Changed

_service:download_files:master.tar.gz/tools/depends/native/waylandpp-scanner-native/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/target/Toolchain_binaddons.cmake.in Changed

@@ -12,30 +12,30 @@
   if(PLATFORM STREQUAL raspberry-pi)
     set(CORE_PLATFORM_NAME rbpi)
     set(ENABLE_LDGOLD OFF CACHE BOOL "Disabling Gnu Gold Linker" FORCE)
-    if(NOT APP_RENDERSYSTEM)
-      set(APP_RENDERSYSTEM gles)
+    if(NOT APP_RENDER_SYSTEM)
+      set(APP_RENDER_SYSTEM gles)
     endif()
   endif()
-  if(NOT APP_RENDERSYSTEM)
-    set(APP_RENDERSYSTEM gl)
+  if(NOT APP_RENDER_SYSTEM)
+    set(APP_RENDER_SYSTEM gl)
   endif()
 elseif(OS STREQUAL android)
   set(CMAKE_SYSTEM_NAME Android)
   set(CORE_SYSTEM_NAME android)
-  if(NOT APP_RENDERSYSTEM)
-    set(APP_RENDERSYSTEM gles)
+  if(NOT APP_RENDER_SYSTEM)
+    set(APP_RENDER_SYSTEM gles)
   endif()
 elseif(OS STREQUAL osx)
   set(CMAKE_SYSTEM_NAME Darwin)
   set(CORE_SYSTEM_NAME osx)
-  if(NOT APP_RENDERSYSTEM)
-    set(APP_RENDERSYSTEM gl)
+  if(NOT APP_RENDER_SYSTEM)
+    set(APP_RENDER_SYSTEM gl)
   endif()
 elseif(OS STREQUAL ios)
   set(CMAKE_SYSTEM_NAME Darwin)
   set(CORE_SYSTEM_NAME ios)
-  if(NOT APP_RENDERSYSTEM)
-    set(APP_RENDERSYSTEM gles)
+  if(NOT APP_RENDER_SYSTEM)
+    set(APP_RENDER_SYSTEM gles)
   endif()
 endif()

_service:download_files:master.tar.gz/tools/depends/target/wayland-protocols/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/target/waylandpp/Makefile Changed

_service:download_files:master.tar.gz/xbmc/Application.cpp Changed

_service:download_files:master.tar.gz/xbmc/SectionLoader.h Changed

_service:download_files:master.tar.gz/xbmc/ServiceManager.cpp Changed

_service:download_files:master.tar.gz/xbmc/SystemGlobals.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/PVRClient.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/DllLoader/Win32DllLoader.cpp Changed

@@ -37,11 +37,7 @@
 //dllLoadLibraryA, dllFreeLibrary, dllGetProcAddress are from dllLoader,
 //they are wrapper functions of COFF/PE32 loader.
 extern "C" HMODULE WINAPI dllLoadLibraryA(LPCSTR libname);
-extern "C" HMODULE WINAPI dllLoadLibraryExA(LPCSTR lpLibFileName, HANDLE hFile, DWORD dwFlags);
 extern "C" BOOL WINAPI dllFreeLibrary(HINSTANCE hLibModule);
-extern "C" FARPROC WINAPI dllGetProcAddress(HMODULE hModule, LPCSTR function);
-extern "C" HMODULE WINAPI dllGetModuleHandleA(LPCSTR lpModuleName);
-extern "C" DWORD WINAPI dllGetModuleFileNameA(HMODULE hModule, LPSTR lpFilename, DWORD nSize);
 
 // our exports
 Export win32_exports[] =
@@ -241,10 +237,9 @@
 
 void Win32DllLoader::OverrideImports(const std::string &dll)
 {
-#ifdef TARGET_WINDOWS_DESKTOP
   using KODI::PLATFORM::WINDOWS::ToW;
   auto strdllW = ToW(CSpecialProtocol::TranslatePath(dll));
-  auto image_base = reinterpret_cast<BYTE*>(GetModuleHandleW(strdllW.c_str()));
+  auto image_base = reinterpret_cast<BYTE*>(m_dllHandle);
 
   if (!image_base)
   {
@@ -323,7 +318,6 @@
       }
     }
   }
-#endif
 }
 
 bool Win32DllLoader::NeedsHooking(const char *dllName)

_service:download_files:master.tar.gz/xbmc/cores/DllLoader/dll_util.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoPlayer.cpp Changed

@@ -62,12 +62,12 @@
 #include "settings/Settings.h"
 #include "settings/MediaSettings.h"
 #include "utils/log.h"
-#include "utils/JobManager.h"
 #include "utils/StreamDetails.h"
 #include "utils/StreamUtils.h"
 #include "utils/Variant.h"
 #include "storage/MediaManager.h"
 #include "dialogs/GUIDialogKaiToast.h"
+#include "utils/JobManager.h"
 #include "utils/StringUtils.h"
 #include "video/Bookmark.h"
 #include "Util.h"
@@ -628,11 +628,12 @@
       m_messenger("player"),
       m_renderManager(m_clock, this)
 {
+  m_outboundEvents.reset(new CJobQueue(false, 1, CJob::PRIORITY_NORMAL));
   m_players_created = false;
-  m_pDemuxer = NULL;
-  m_pSubtitleDemuxer = NULL;
-  m_pCCDemuxer = NULL;
-  m_pInputStream = NULL;
+  m_pDemuxer = nullptr;
+  m_pSubtitleDemuxer = nullptr;
+  m_pCCDemuxer = nullptr;
+  m_pInputStream = nullptr;
 
   m_dvd.Clear();
   m_State.Clear();
@@ -684,6 +685,11 @@
 
   CloseFile();
   DestroyPlayers();
+
+  while (m_outboundEvents->IsProcessing())
+  {
+    Sleep(10);
+  }
 }
 
 bool CVideoPlayer::OpenFile(const CFileItem& file, const CPlayerOptions &options)
@@ -1240,9 +1246,9 @@
 
   IPlayerCallback *cb = &m_callback;
   CFileItem fileItem = m_item;
-  CJobManager::GetInstance().Submit([=]() {
+  m_outboundEvents->Submit([=]() {
     cb->RequestVideoSettings(fileItem);
-  }, CJob::PRIORITY_NORMAL);
+  });
 
   if (!OpenInputStream())
   {
@@ -2449,18 +2455,18 @@
   IPlayerCallback *cb = &m_callback;
   CFileItem fileItem(m_item);
   CVideoSettings vs = m_processInfo->GetVideoSettings();
-  CJobManager::GetInstance().Submit([=]() {
+  m_outboundEvents->Submit([=]() {
     cb->StoreVideoSettings(fileItem, vs);
-  }, CJob::PRIORITY_NORMAL);
+  });
 
   CBookmark bookmark;
   bookmark.totalTimeInSeconds = m_processInfo->GetMaxTime() / 1000;
   bookmark.timeInSeconds = GetTime() / 1000;
   bookmark.player = m_name;
   bookmark.playerState = GetPlayerState();
-  CJobManager::GetInstance().Submit([=]() {
+  m_outboundEvents->Submit([=]() {
     cb->OnPlayerCloseFile(fileItem, bookmark);
-  }, CJob::PRIORITY_NORMAL);
+  });
     
   // destroy objects
   SAFE_DELETE(m_pDemuxer);
@@ -2487,14 +2493,14 @@
 
   bool error = m_error;
   bool abort = m_bAbortRequest;
-  CJobManager::GetInstance().Submit([=]() {
+  m_outboundEvents->Submit([=]() {
     if (error)
       cb->OnPlayBackError();
     else if (abort)
       cb->OnPlayBackStopped();
     else
       cb->OnPlayBackEnded();
-  }, CJob::PRIORITY_NORMAL);
+  });
 }
 
 void CVideoPlayer::HandleMessages()
@@ -2511,25 +2517,25 @@
       IPlayerCallback *cb = &m_callback;
       CFileItem fileItem(m_item);
       CVideoSettings vs = m_processInfo->GetVideoSettings();
-      CJobManager::GetInstance().Submit([=]() {
+      m_outboundEvents->Submit([=]() {
         cb->StoreVideoSettings(fileItem, vs);
-      }, CJob::PRIORITY_NORMAL);
+      });
 
       CBookmark bookmark;
       bookmark.totalTimeInSeconds = m_processInfo->GetMaxTime() / 1000;
       bookmark.timeInSeconds = GetTime() / 1000;
       bookmark.player = m_name;
       bookmark.playerState = GetPlayerState();
-      CJobManager::GetInstance().Submit([=]() {
+      m_outboundEvents->Submit([=]() {
         cb->OnPlayerCloseFile(fileItem, bookmark);
-      }, CJob::PRIORITY_NORMAL);
+      });
 
       m_item = msg.GetItem();
       m_playerOptions = msg.GetOptions();
 
-      CJobManager::GetInstance().Submit([this]() {
+      m_outboundEvents->Submit([this]() {
         m_callback.OnPlayBackStarted(m_item);
-      }, CJob::PRIORITY_NORMAL);
+      });
 
       FlushBuffers(DVD_NOPTS_VALUE, true, true);
       m_renderManager.Flush(false);
@@ -2961,9 +2967,9 @@
       CServiceBroker::GetDataCacheCore().SignalAudioInfoChange();
       CServiceBroker::GetDataCacheCore().SignalVideoInfoChange();
       IPlayerCallback *cb = &m_callback;
-      CJobManager::GetInstance().Submit([=]() {
+      m_outboundEvents->Submit([=]() {
         cb->OnAVChange();
-      }, CJob::PRIORITY_NORMAL);
+      });
     }
     else if (pMsg->IsType(CDVDMsg::PLAYER_ABORT))
     {
@@ -3900,6 +3906,9 @@
 // since we call ffmpeg functions to decode, this is being called in the same thread as ::Process() is
 int CVideoPlayer::OnDiscNavResult(void* pData, int iMessage)
 {
+  if (!m_pInputStream)
+    return 0;
+
 #if defined(HAVE_LIBBLURAY)
   if (m_pInputStream->IsStreamType(DVDSTREAM_TYPE_BLURAY))
   {

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoPlayer.h Changed

@@ -283,6 +283,7 @@
 //------------------------------------------------------------------------------
 
 class CProcessInfo;
+class CJobQueue;
 
 class CVideoPlayer : public IPlayer, public CThread, public IVideoPlayer,
                      public IDispResource, public IRenderLoop, public IRenderMsg
@@ -532,19 +533,20 @@
   int m_errorCount;
   double m_offset_pts;
 
-  CDVDMessageQueue m_messenger;     // thread messenger
+  CDVDMessageQueue m_messenger;
+  std::unique_ptr<CJobQueue> m_outboundEvents;
 
-  IDVDStreamPlayerVideo *m_VideoPlayerVideo; // video part
-  IDVDStreamPlayerAudio *m_VideoPlayerAudio; // audio part
-  CVideoPlayerSubtitle *m_VideoPlayerSubtitle; // subtitle part
-  CDVDTeletextData *m_VideoPlayerTeletext; // teletext part
-  CDVDRadioRDSData *m_VideoPlayerRadioRDS; // rds part
+  IDVDStreamPlayerVideo *m_VideoPlayerVideo;
+  IDVDStreamPlayerAudio *m_VideoPlayerAudio;
+  CVideoPlayerSubtitle *m_VideoPlayerSubtitle;
+  CDVDTeletextData *m_VideoPlayerTeletext;
+  CDVDRadioRDSData *m_VideoPlayerRadioRDS;
 
-  CDVDClock m_clock;                // master clock
+  CDVDClock m_clock;
   CDVDOverlayContainer m_overlayContainer;
 
-  std::shared_ptr<CDVDInputStream> m_pInputStream;  // input stream for current playing file
-  CDVDDemux* m_pDemuxer;            // demuxer for current playing file
+  std::shared_ptr<CDVDInputStream> m_pInputStream;
+  CDVDDemux* m_pDemuxer;
   CDVDDemux* m_pSubtitleDemuxer;
   CDVDDemuxCC* m_pCCDemuxer;

_service:download_files:master.tar.gz/xbmc/cores/paplayer/PAPlayer.cpp Changed

@@ -53,10 +53,8 @@
   m_isFinished(false),
   m_defaultCrossfadeMS (0),
   m_upcomingCrossfadeMS(0),
-  m_currentStream(NULL ),
   m_audioCallback(NULL ),
   m_jobCounter(0),
-  m_continueStream(false),
   m_newForcedPlayerTime(-1),
   m_newForcedTotalTime (-1)
 {
@@ -318,22 +316,20 @@
   {
     // check if we advance a track of a CUE sheet
     // if this is the case we don't need to open a new stream
-    std::string newURL = file.GetMusicInfoTag() ? file.GetMusicInfoTag()->GetURL() : file.GetPath();
-    std::string oldURL = m_currentStream->m_fileItem.GetMusicInfoTag() ?
-                           m_currentStream->m_fileItem.GetMusicInfoTag()->GetURL() : m_currentStream->m_fileItem.GetPath();
+    std::string newURL = file.GetDynURL().GetFileName();
+    std::string oldURL = m_currentStream->m_fileItem.GetDynURL().GetFileName();
     if (newURL.compare(oldURL) == 0 &&
         file.m_lStartOffset &&
         file.m_lStartOffset == m_currentStream->m_fileItem.m_lEndOffset &&
         m_currentStream && m_currentStream->m_prepareTriggered)
     {
-      m_continueStream = true;
+      m_currentStream->m_nextFileItem.reset(new CFileItem(file));
       m_upcomingCrossfadeMS = 0;
       return true;
     }
+    m_currentStream->m_nextFileItem.reset();
   }
 
-  m_continueStream = false;
-
   StreamInfo *si = new StreamInfo();
   si->m_fileItem = file;
   if (!si->m_decoder.Create(file, si->m_fileItem.m_lStartOffset))
@@ -471,7 +467,7 @@
     return false;
   }
 
-  si->m_stream->SetVolume    (si->m_volume);
+  si->m_stream->SetVolume(si->m_volume);
   float peak = 1.0;
   float gain = si->m_decoder.GetReplayGain(peak);
   if (peak * gain <= 1.0)
@@ -676,15 +672,15 @@
     if (!si->m_started)
       continue;
 
-    /* is it time to prepare the next stream? */
+    // is it time to prepare the next stream?
     if (si->m_prepareNextAtFrame > 0 && !si->m_prepareTriggered && si->m_framesSent >= si->m_prepareNextAtFrame)
     {
       si->m_prepareTriggered = true;
       m_callback.OnQueueNextItem();
     }
 
-    /* it is time to start playing the next stream? */
-    if (si->m_playNextAtFrame > 0 && !si->m_playNextTriggered && !m_continueStream && si->m_framesSent >= si->m_playNextAtFrame)
+    // it is time to start playing the next stream?
+    if (si->m_playNextAtFrame > 0 && !si->m_playNextTriggered && !si->m_nextFileItem && si->m_framesSent >= si->m_playNextAtFrame)
     {
       if (!si->m_prepareTriggered)
       {
@@ -768,16 +764,19 @@
       si->m_decoder.ReadSamples(PACKET_SIZE) == RET_ERROR ||
       ((si->m_endOffset) && (si->m_framesSent / si->m_audioFormat.m_sampleRate >= (si->m_endOffset - si->m_startOffset) / 1000)))
   {
-    if (si == m_currentStream && m_continueStream)
+    if (si == m_currentStream && si->m_nextFileItem)
     {
       // update current stream with info of next track
-      si->m_startOffset = si->m_fileItem.m_lStartOffset;
-      if (si->m_fileItem.m_lEndOffset)
-        si->m_endOffset = si->m_fileItem.m_lEndOffset;
+      si->m_startOffset = si->m_nextFileItem->m_lStartOffset;
+      if (si->m_nextFileItem->m_lEndOffset)
+        si->m_endOffset = si->m_nextFileItem->m_lEndOffset;
       else
         si->m_endOffset = 0;
       si->m_framesSent = 0;
 
+      si->m_fileItem = *si->m_nextFileItem;
+      si->m_nextFileItem.reset();
+
       int64_t streamTotalTime = si->m_decoder.TotalTime() - si->m_startOffset;
       if (si->m_endOffset)
         streamTotalTime = si->m_endOffset - si->m_startOffset;
@@ -797,7 +796,6 @@
 
       UpdateGUIData(si);
       m_callback.OnPlayBackStarted(si->m_fileItem);
-      m_continueStream = false;
     }
     else
     {

_service:download_files:master.tar.gz/xbmc/cores/paplayer/PAPlayer.h Changed

@@ -92,9 +92,10 @@
   float GetPercentage();
 
 private:
-  typedef struct
+  struct StreamInfo
   {
     CFileItem m_fileItem;
+    std::unique_ptr<CFileItem> m_nextFileItem;
     CAudioDecoder m_decoder;             /* the stream decoder */
     int64_t m_startOffset;               /* the stream start offset */
     int64_t m_endOffset;                 /* the stream end offset */
@@ -118,7 +119,7 @@
 
     bool m_isSlaved;                     /* true if the stream has been slaved to another */
     bool m_waitOnDrain;                  /* wait for stream being drained in AE */
-  } StreamInfo;
+  };
 
   typedef std::list<StreamInfo*> StreamList;
 
@@ -130,7 +131,7 @@
   unsigned int        m_defaultCrossfadeMS;  /* how long the default crossfade is in ms */
   unsigned int        m_upcomingCrossfadeMS; /* how long the upcoming crossfade is in ms */
   CEvent              m_startEvent;          /* event for playback start */
-  StreamInfo*         m_currentStream;       /* the current playing stream */
+  StreamInfo* m_currentStream = nullptr;
   IAudioCallback*     m_audioCallback;       /* the viz audio callback */
 
   CCriticalSection    m_streamsLock;         /* lock for the stream list */
@@ -138,7 +139,6 @@
   StreamList          m_finishing;           /* finishing streams */
   int                 m_jobCounter;
   CEvent              m_jobEvent;
-  bool                m_continueStream;
   int64_t             m_newForcedPlayerTime;
   int64_t             m_newForcedTotalTime;
   std::unique_ptr<CProcessInfo> m_processInfo;

_service:download_files:master.tar.gz/xbmc/games/GameServices.cpp Changed

_service:download_files:master.tar.gz/xbmc/games/GameServices.h Changed

@@ -24,6 +24,8 @@
 #include <memory>
 #include <string>
 
+class CSettings;
+
 namespace PERIPHERALS
 {
   class CPeripherals;
@@ -39,6 +41,7 @@
 namespace GAME
 {
   class CControllerManager;
+  class CGameSettings;
   class CPortManager;
 
   class CGameServices
@@ -46,6 +49,7 @@
   public:
     CGameServices(CControllerManager &controllerManager,
                   RETRO::CGUIGameRenderManager &renderManager,
+                  CSettings &settings,
                   PERIPHERALS::CPeripherals &peripheralManager);
     ~CGameServices();
 
@@ -53,6 +57,7 @@
     ControllerPtr GetDefaultController();
     ControllerVector GetControllers();
 
+    CGameSettings& GameSettings() { return *m_gameSettings; }
     CPortManager& PortManager();
 
     RETRO::CGUIGameRenderManager &GameRenderManager() { return m_gameRenderManager; }
@@ -63,6 +68,7 @@
     RETRO::CGUIGameRenderManager &m_gameRenderManager;
 
     // Game services
+    std::unique_ptr<CGameSettings> m_gameSettings;
     std::unique_ptr<CPortManager> m_portManager;
   };
 }

_service:download_files:master.tar.gz/xbmc/games/GameSettings.cpp Changed

@@ -34,10 +34,27 @@
 
 #define SETTING_GAMES_KEYBOARD_PLAYERCONFIG_PREFIX  "gameskeyboard.keyboardplayerconfig" //! @todo
 
-CGameSettings& CGameSettings::GetInstance()
+CGameSettings::CGameSettings(CSettings &settings) :
+  m_settings(settings)
 {
-  static CGameSettings gameSettingsInstance;
-  return gameSettingsInstance;
+  m_settings.RegisterCallback(this, {
+    CSettings::SETTING_GAMES_KEYBOARD_PLAYERS,
+    CSettings::SETTING_GAMES_KEYBOARD_PLAYERCONFIG_1,
+    CSettings::SETTING_GAMES_KEYBOARD_PLAYERCONFIG_2,
+    CSettings::SETTING_GAMES_KEYBOARD_PLAYERCONFIG_3,
+    CSettings::SETTING_GAMES_KEYBOARD_PLAYERCONFIG_4,
+    CSettings::SETTING_GAMES_KEYBOARD_PLAYERCONFIG_5,
+    CSettings::SETTING_GAMES_KEYBOARD_PLAYERCONFIG_6,
+    CSettings::SETTING_GAMES_KEYBOARD_PLAYERCONFIG_7,
+    CSettings::SETTING_GAMES_KEYBOARD_PLAYERCONFIG_8,
+    CSettings::SETTING_GAMES_ENABLEREWIND,
+    CSettings::SETTING_GAMES_REWINDTIME,
+  });
+}
+
+CGameSettings::~CGameSettings()
+{
+  m_settings.UnregisterCallback(this);
 }
 
 void CGameSettings::OnSettingChanged(std::shared_ptr<const CSetting> setting)

_service:download_files:master.tar.gz/xbmc/games/GameSettings.h Changed

_service:download_files:master.tar.gz/xbmc/games/addons/GameClient.cpp Changed

_service:download_files:master.tar.gz/xbmc/games/addons/GameClient.h Changed

_service:download_files:master.tar.gz/xbmc/games/addons/input/GameClientJoystick.cpp Changed

_service:download_files:master.tar.gz/xbmc/games/addons/input/GameClientJoystick.h Changed

_service:download_files:master.tar.gz/xbmc/games/addons/input/GameClientKeyboard.cpp Changed

_service:download_files:master.tar.gz/xbmc/games/addons/input/GameClientKeyboard.h Changed

_service:download_files:master.tar.gz/xbmc/games/addons/input/GameClientMouse.cpp Changed

_service:download_files:master.tar.gz/xbmc/games/addons/input/GameClientMouse.h Changed

_service:download_files:master.tar.gz/xbmc/games/addons/playback/GameClientReversiblePlayback.cpp Changed

_service:download_files:master.tar.gz/xbmc/games/controllers/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/games/controllers/ControllerDefinitions.h Changed

_service:download_files:master.tar.gz/xbmc/games/controllers/ControllerFeature.cpp Changed

_service:download_files:master.tar.gz/xbmc/games/controllers/ControllerFeature.h Changed

@@ -34,7 +34,7 @@
 class CControllerFeature
 {
 public:
-  CControllerFeature(void) { Reset(); }
+  CControllerFeature() = default;
   CControllerFeature(const CControllerFeature& other) { *this = other; }
 
   void Reset(void);
@@ -43,10 +43,14 @@
 
   JOYSTICK::FEATURE_TYPE Type(void) const { return m_type; }
   JOYSTICK::FEATURE_CATEGORY Category(void) const { return m_category; }
-  std::string            CategoryLabel(void) const;
-  const std::string&     Name(void) const       { return m_strName; }
-  std::string            Label(void) const;
-  int                    LabelID(void) const    { return m_labelId; }
+  const std::string &Name(void) const { return m_strName; }
+
+  // GUI properties
+  std::string Label(void) const;
+  int LabelID(void) const { return m_labelId; }
+  std::string CategoryLabel(void) const;
+
+  // Input properties
   JOYSTICK::INPUT_TYPE InputType(void) const { return m_inputType; }
 
   bool Deserialize(const TiXmlElement* pElement,
@@ -55,13 +59,13 @@
                    int categoryLabelId);
 
 private:
-  const CController *m_controller; // To get the controller ID for translating labels
-  JOYSTICK::FEATURE_TYPE m_type;
-  JOYSTICK::FEATURE_CATEGORY m_category;
-  int m_categoryLabelId;
-  std::string            m_strName;
-  int                    m_labelId;
-  JOYSTICK::INPUT_TYPE m_inputType;
+  const CController *m_controller = nullptr; // Used for translating addon-specific labels
+  JOYSTICK::FEATURE_TYPE m_type = JOYSTICK::FEATURE_TYPE::UNKNOWN;
+  JOYSTICK::FEATURE_CATEGORY m_category = JOYSTICK::FEATURE_CATEGORY::UNKNOWN;
+  int m_categoryLabelId = -1;
+  std::string m_strName;
+  int m_labelId = -1;
+  JOYSTICK::INPUT_TYPE m_inputType = JOYSTICK::INPUT_TYPE::UNKNOWN;
 };
 
 }

_service:download_files:master.tar.gz/xbmc/games/controllers/ControllerIDs.h Added

_service:download_files:master.tar.gz/xbmc/games/controllers/ControllerManager.cpp Changed

_service:download_files:master.tar.gz/xbmc/games/controllers/ControllerTranslator.cpp Changed

_service:download_files:master.tar.gz/xbmc/games/controllers/dialogs/GUIDialogAxisDetection.cpp Changed

_service:download_files:master.tar.gz/xbmc/games/controllers/dialogs/GUIDialogButtonCapture.cpp Changed

_service:download_files:master.tar.gz/xbmc/games/controllers/dialogs/GUIDialogButtonCapture.h Changed

_service:download_files:master.tar.gz/xbmc/games/controllers/dialogs/GUIDialogIgnoreInput.cpp Changed

_service:download_files:master.tar.gz/xbmc/games/controllers/guicontrols/GUIFeatureControls.cpp Changed

@@ -24,21 +24,21 @@
 using namespace KODI;
 using namespace GAME;
 
-CGUIFeatureGroupTitle::CGUIFeatureGroupTitle(const CGUILabelControl& groupTitleTemplate, const std::string& groupName, unsigned int featureIndex) :
+CGUIFeatureGroupTitle::CGUIFeatureGroupTitle(const CGUILabelControl& groupTitleTemplate, const std::string& groupName, unsigned int buttonIndex) :
   CGUILabelControl(groupTitleTemplate)
 {
   // Initialize CGUILabelControl
   SetLabel(groupName);
-  SetID(CONTROL_FEATURE_GROUPS_START + featureIndex);
+  SetID(CONTROL_FEATURE_GROUPS_START + buttonIndex);
   SetVisible(true);
   AllocResources();
 }
 
-CGUIFeatureSeparator::CGUIFeatureSeparator(const CGUIImage& separatorTemplate, unsigned int featureIndex) :
+CGUIFeatureSeparator::CGUIFeatureSeparator(const CGUIImage& separatorTemplate, unsigned int buttonIndex) :
   CGUIImage(separatorTemplate)
 {
   // Initialize CGUIImage
-  SetID(CONTROL_FEATURE_SEPARATORS_START + featureIndex);
+  SetID(CONTROL_FEATURE_SEPARATORS_START + buttonIndex);
   SetVisible(true);
   AllocResources();
 }

_service:download_files:master.tar.gz/xbmc/games/controllers/guicontrols/GUIFeatureControls.h Changed

_service:download_files:master.tar.gz/xbmc/games/controllers/windows/GUIConfigurationWizard.cpp Changed

@@ -23,8 +23,8 @@
 #include "games/controllers/guicontrols/GUIFeatureButton.h"
 #include "games/controllers/Controller.h"
 #include "games/controllers/ControllerFeature.h"
-#include "input/joysticks/IButtonMap.h"
-#include "input/joysticks/IButtonMapCallback.h"
+#include "input/joysticks/interfaces/IButtonMap.h"
+#include "input/joysticks/interfaces/IButtonMapCallback.h"
 #include "input/joysticks/JoystickUtils.h"
 #include "input/keyboard/KeymapActionMap.h"
 #include "input/InputManager.h"
@@ -198,8 +198,8 @@
 
   bool bHandled = false;
 
-  // Handle esc key separately
-  if (!m_deviceName.empty() && m_deviceName != buttonMap->DeviceName())
+  // Abort if another controller cancels the prompt
+  if (IsMapping() && !IsMapping(buttonMap->DeviceName()))
   {
     bool bIsCancelAction = false;
 
@@ -272,52 +272,62 @@
     {
       const CControllerFeature& feature = currentButton->Feature();
 
-      CLog::Log(LOGDEBUG, "%s: mapping feature \"%s\" for device %s",
-        m_strControllerId.c_str(), feature.Name().c_str(), buttonMap->DeviceName().c_str());
-
-      switch (feature.Type())
+      if (feature.Type() == JOYSTICK::FEATURE_TYPE::UNKNOWN)
       {
-        case FEATURE_TYPE::SCALAR:
-        {
-          buttonMap->AddScalar(feature.Name(), primitive);
-          bHandled = true;
-          break;
-        }
-        case FEATURE_TYPE::ANALOG_STICK:
-        {
-          buttonMap->AddAnalogStick(feature.Name(), analogStickDirection, primitive);
-          bHandled = true;
-          break;
-        }
-        case FEATURE_TYPE::RELPOINTER:
-        {
-          buttonMap->AddRelativePointer(feature.Name(), analogStickDirection, primitive);
-          bHandled = true;
-          break;
-        }
-        case FEATURE_TYPE::WHEEL:
+        // Unknown feature, absorb input
+        bHandled = true;
+      }
+      else
+      {
+        CLog::Log(LOGDEBUG, "%s: mapping feature \"%s\" for device %s",
+          m_strControllerId.c_str(), feature.Name().c_str(), buttonMap->DeviceName().c_str());
+
+        switch (feature.Type())
         {
-          buttonMap->AddWheel(feature.Name(), wheelDirection, primitive);
-          bHandled = true;
-          break;
+          case FEATURE_TYPE::SCALAR:
+          {
+            buttonMap->AddScalar(feature.Name(), primitive);
+            bHandled = true;
+            break;
+          }
+          case FEATURE_TYPE::ANALOG_STICK:
+          {
+            buttonMap->AddAnalogStick(feature.Name(), analogStickDirection, primitive);
+            bHandled = true;
+            break;
+          }
+          case FEATURE_TYPE::RELPOINTER:
+          {
+            buttonMap->AddRelativePointer(feature.Name(), analogStickDirection, primitive);
+            bHandled = true;
+            break;
+          }
+          case FEATURE_TYPE::WHEEL:
+          {
+            buttonMap->AddWheel(feature.Name(), wheelDirection, primitive);
+            bHandled = true;
+            break;
+          }
+          case FEATURE_TYPE::THROTTLE:
+          {
+            buttonMap->AddThrottle(feature.Name(), throttleDirection, primitive);
+            bHandled = true;
+            break;
+          }
+          default:
+            break;
         }
-        case FEATURE_TYPE::THROTTLE:
+
+        if (bHandled)
         {
-          buttonMap->AddThrottle(feature.Name(), throttleDirection, primitive);
-          bHandled = true;
-          break;
-        }
-        default:
-          break;
-      }
+          m_history.insert(primitive);
 
-      if (bHandled)
-      {
-        m_history.insert(primitive);
+          OnMotion(buttonMap);
+          m_inputEvent.Set();
 
-        OnMotion(buttonMap);
-        m_inputEvent.Set();
-        m_deviceName = buttonMap->DeviceName();
+          if (m_deviceName.empty())
+            m_deviceName = buttonMap->DeviceName();
+        }
       }
     }
   }
@@ -358,14 +368,20 @@
 
 bool CGUIConfigurationWizard::OnKeyPress(const CKey& key)
 {
-  using namespace KEYBOARD;
-
   bool bHandled = false;
 
   if (!m_bStop)
+    bHandled = OnKeyAction(m_actionMap->GetActionID(key));
+
+  return bHandled;
+}
+
+bool CGUIConfigurationWizard::OnKeyAction(unsigned int actionId)
+{
+  bool bHandled = false;
+
+  switch (actionId)
   {
-    switch (m_actionMap->GetActionID(key))
-    {
     case ACTION_MOVE_LEFT:
     case ACTION_MOVE_RIGHT:
     case ACTION_MOVE_UP:
@@ -389,7 +405,6 @@
       // Absorb keypress
       bHandled = true;
       break;
-    }
   }
 
   return bHandled;
@@ -400,6 +415,16 @@
   return Abort(false);
 }
 
+bool CGUIConfigurationWizard::IsMapping() const
+{
+  return !m_deviceName.empty();
+}
+
+bool CGUIConfigurationWizard::IsMapping(const std::string &deviceName) const
+{
+  return m_deviceName == deviceName;
+}
+
 void CGUIConfigurationWizard::InstallHooks(void)
 {
   CServiceBroker::GetPeripherals().RegisterJoystickButtonMapper(this);

_service:download_files:master.tar.gz/xbmc/games/controllers/windows/GUIConfigurationWizard.h Changed

@@ -21,9 +21,9 @@
 
 #include "IConfigurationWindow.h"
 #include "input/joysticks/DriverPrimitive.h"
-#include "input/joysticks/IButtonMapper.h"
-#include "input/keyboard/IKeyboardHandler.h"
-#include "input/mouse/IMouseInputHandler.h"
+#include "input/joysticks/interfaces/IButtonMapper.h"
+#include "input/keyboard/interfaces/IKeyboardHandler.h"
+#include "input/mouse/interfaces/IMouseInputHandler.h"
 #include "threads/CriticalSection.h"
 #include "threads/Event.h"
 #include "threads/Thread.h"
@@ -90,12 +90,17 @@
   private:
     void InitializeState(void);
 
+    bool IsMapping() const;
+    bool IsMapping(const std::string &deviceName) const;
+
     void InstallHooks(void);
     void RemoveHooks(void);
 
     void OnMotion(const JOYSTICK::IButtonMap* buttonMap);
     void OnMotionless(const JOYSTICK::IButtonMap* buttonMap);
 
+    bool OnKeyAction(unsigned int actionId);
+
     // Construction parameters
     const bool                           m_bEmulation;
     const unsigned int                   m_controllerNumber;

_service:download_files:master.tar.gz/xbmc/games/controllers/windows/GUIControllerList.cpp Changed

_service:download_files:master.tar.gz/xbmc/games/controllers/windows/GUIControllerWindow.cpp Changed

_service:download_files:master.tar.gz/xbmc/games/controllers/windows/GUIFeatureList.cpp Changed

@@ -113,26 +113,30 @@
   auto featureGroups = GetFeatureGroups(features);
 
   // Create controls
-  unsigned int featureIndex = 0;
+  m_buttonCount = 0;
   for (auto itGroup = featureGroups.begin(); itGroup != featureGroups.end(); ++itGroup)
   {
     const std::string& groupName = itGroup->groupName;
 
     // Create buttons
-    std::vector<CGUIButtonControl*> buttons = GetButtons(itGroup->features, featureIndex);
+    std::vector<CGUIButtonControl*> buttons = GetButtons(itGroup->features, m_buttonCount);
     if (!buttons.empty())
     {
+      // Just in case
+      if (m_buttonCount + buttons.size() >= MAX_FEATURE_COUNT)
+        break;
+
       // Add a separator if the group list isn't empty
       if (m_guiFeatureSeparator && m_guiList->GetTotalSize() > 0)
       {
-        CGUIFeatureSeparator* pSeparator = new CGUIFeatureSeparator(*m_guiFeatureSeparator, featureIndex);
+        CGUIFeatureSeparator* pSeparator = new CGUIFeatureSeparator(*m_guiFeatureSeparator, m_buttonCount);
         m_guiList->AddControl(pSeparator);
       }
 
       // Add the group title
       if (m_guiGroupTitle && !groupName.empty())
       {
-        CGUIFeatureGroupTitle* pGroupTitle = new CGUIFeatureGroupTitle(*m_guiGroupTitle, groupName, featureIndex);
+        CGUIFeatureGroupTitle* pGroupTitle = new CGUIFeatureGroupTitle(*m_guiGroupTitle, groupName, m_buttonCount);
         m_guiList->AddControl(pGroupTitle);
       }
 
@@ -140,24 +144,18 @@
       for (CGUIButtonControl* pButton : buttons)
         m_guiList->AddControl(pButton);
 
-      featureIndex += itGroup->features.size();
+      m_buttonCount += buttons.size();
     }
-
-    // Just in case
-    if (featureIndex >= MAX_FEATURE_COUNT)
-      break;
   }
 }
 
-void CGUIFeatureList::OnSelect(unsigned int index)
+void CGUIFeatureList::OnSelect(unsigned int buttonIndex)
 {
-  const unsigned int featureCount = m_controller->FeatureCount();
-
   // Generate list of buttons for the wizard
   std::vector<IFeatureButton*> buttons;
-  for ( ; index < featureCount; index++)
+  for ( ; buttonIndex < m_buttonCount; buttonIndex++)
   {
-    IFeatureButton* control = GetButtonControl(index);
+    IFeatureButton* control = GetButtonControl(buttonIndex);
     if (control)
       buttons.push_back(control);
   }
@@ -165,15 +163,17 @@
   m_wizard->Run(m_controller->ID(), buttons);
 }
 
-IFeatureButton* CGUIFeatureList::GetButtonControl(unsigned int featureIndex)
+IFeatureButton* CGUIFeatureList::GetButtonControl(unsigned int buttonIndex)
 {
-  CGUIControl* control = m_guiList->GetControl(CONTROL_FEATURE_BUTTONS_START + featureIndex);
+  CGUIControl* control = m_guiList->GetControl(CONTROL_FEATURE_BUTTONS_START + buttonIndex);
 
   return static_cast<IFeatureButton*>(dynamic_cast<CGUIFeatureButton*>(control));
 }
 
 void CGUIFeatureList::CleanupButtons(void)
 {
+  m_buttonCount = 0;
+
   m_wizard->Abort(true);
 
   if (m_guiList)
@@ -225,18 +225,19 @@
   std::vector<CGUIButtonControl*> buttons;
 
   // Create buttons
-  unsigned int featureIndex = startIndex;
+  unsigned int buttonIndex = startIndex;
   for (const CControllerFeature& feature : features)
   {
     BUTTON_TYPE buttonType = CGUIFeatureTranslator::GetButtonType(feature.Type());
 
-    CGUIButtonControl* pButton = CGUIFeatureFactory::CreateButton(buttonType, *m_guiButtonTemplate, m_wizard, feature, featureIndex);
+    CGUIButtonControl* pButton = CGUIFeatureFactory::CreateButton(buttonType, *m_guiButtonTemplate, m_wizard, feature, buttonIndex);
 
     // If successful, add button to result
     if (pButton != nullptr)
+    {
       buttons.push_back(pButton);
-
-    featureIndex++;
+      buttonIndex++;
+    }
   }
 
   return buttons;

_service:download_files:master.tar.gz/xbmc/games/controllers/windows/GUIFeatureList.h Changed

_service:download_files:master.tar.gz/xbmc/games/controllers/windows/IConfigurationWindow.h Changed

@@ -139,20 +139,20 @@
     virtual void Load(const ControllerPtr& controller) = 0;
 
     /*!
-     * \brief  Focus has been set to the specified feature
-     * \param  featureIndex The index of the feature being focused
+     * \brief  Focus has been set to the specified GUI button
+     * \param  buttonIndex The index of the button being focused
      */
-    virtual void OnFocus(unsigned int index) = 0;
+    virtual void OnFocus(unsigned int buttonIndex) = 0;
 
     /*!
-     * \brief  The specified feature has been selected
-     * \param  featureIndex The index of the feature being selected
+     * \brief  The specified GUI button has been selected
+     * \param  buttonIndex The index of the button being selected
      */
-    virtual void OnSelect(unsigned int index) = 0;
+    virtual void OnSelect(unsigned int buttonIndex) = 0;
   };
 
   /*!
-   * \brief A button in a feature list
+   * \brief A GUI button in a feature list
    */
   class IFeatureButton
   {
@@ -216,8 +216,9 @@
     virtual ~IConfigurationWizard() = default;
 
     /*!
-     * \brief Start the wizard at the specified feature
-     * \param featureIndex The index of the feature to start at
+     * \brief Start the wizard for the specified buttons
+     * \param controllerId The controller ID being mapped
+     * \param buttons The buttons to map
      */
     virtual void Run(const std::string& strControllerId, const std::vector<IFeatureButton*>& buttons) = 0;

_service:download_files:master.tar.gz/xbmc/games/ports/InputSink.cpp Changed

_service:download_files:master.tar.gz/xbmc/games/ports/InputSink.h Changed

_service:download_files:master.tar.gz/xbmc/games/ports/Port.h Changed

_service:download_files:master.tar.gz/xbmc/games/ports/PortManager.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIIncludes.cpp Changed

@@ -435,7 +435,8 @@
 
     Params params;
     std::string tagName;
-    // normal or old-style include
+
+    // determine which form of include call we have
     const char *name = include->Attribute("content");
     if (name)
     {
@@ -464,22 +465,31 @@
     auto it = m_includes.find(tagName);
     if (it != m_includes.end())
     {
-      const TiXmlElement *includeBody = &it->second.first;
-      const Params& defaultParams = it->second.second;
-      const TiXmlElement *tag = includeBody->FirstChildElement();
+      const TiXmlElement *includeDefinition = &it->second.first;
+
       // combine passed include parameters with their default values into a single list (no overwrites)
+      const Params& defaultParams = it->second.second;
       params.insert(defaultParams.begin(), defaultParams.end());
-      while (tag)
+
+      // process include definition
+      const TiXmlElement *includeDefinitionChild = includeDefinition->FirstChildElement();
+      while (includeDefinitionChild)
       {
-        // we insert before the <include> element to keep the correct
-        // order (we render in the order given in the xml file)
-        TiXmlElement *insertedTag = static_cast<TiXmlElement*>(node->InsertBeforeChild(include, *tag));
-        // after insertion we resolve parameters even if parameter list is empty (to remove param references)
-        ResolveParametersForNode(insertedTag, params);
-        tag = tag->NextSiblingElement();
+        // insert before <include> element to keep order of occurrence in xml file
+        TiXmlElement *insertedNode = static_cast<TiXmlElement*>(node->InsertBeforeChild(include, *includeDefinitionChild));
+
+        // process nested
+        InsertNested(node, include, insertedNode);
+
+        // resolve parameters even if parameter list is empty (to remove param references)
+        ResolveParametersForNode(insertedNode, params);
+
+        includeDefinitionChild = includeDefinitionChild->NextSiblingElement();
       }
+
       // remove the include element itself
       node->RemoveChild(include);
+
       include = node->FirstChildElement("include");
     }
     else
@@ -490,6 +500,40 @@
   }
 }
 
+void CGUIIncludes::InsertNested(TiXmlElement *controls, TiXmlElement *include, TiXmlElement *node)
+{
+  TiXmlElement *target;
+  TiXmlElement *nested;
+
+  if (node->ValueStr() == "nested")
+  {
+    nested = node;
+    target = controls;
+  }
+  else
+  {
+    nested = node->FirstChildElement("nested");
+    target = node;
+  }
+
+  if (nested)
+  {
+    // copy all child elements except param elements
+    const TiXmlElement *child = include->FirstChildElement();
+    while (child)
+    {
+      if (child->ValueStr() != "param")
+      {
+        // insert before <nested> element to keep order of occurrence in xml file
+        target->InsertBeforeChild(nested, *child);
+      }
+      child = child->NextSiblingElement();
+    }
+    target->RemoveChild(nested);
+  }
+
+}
+
 bool CGUIIncludes::GetParameters(const TiXmlElement *include, const char *valueAttribute, Params& params)
 {
   bool foundAny = false;

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

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

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

@@ -28,9 +28,9 @@
 #include "JoystickMapper.h"
 #include "KeymapEnvironment.h"
 #include "TouchTranslator.h"
-#include "input/keyboard/IKeyboardHandler.h"
+#include "input/keyboard/interfaces/IKeyboardHandler.h"
 #include "input/mouse/generic/MouseInputHandling.h"
-#include "input/mouse/IMouseDriverHandler.h"
+#include "input/mouse/interfaces/IMouseDriverHandler.h"
 #include "input/mouse/MouseWindowingButtonMap.h"
 #include "input/keyboard/KeyboardEasterEgg.h"
 #include "input/Key.h"
@@ -589,7 +589,7 @@
 
         // If the key pressed is shift-A to shift-Z set usekeyboard to true.
         // This causes the keypress to be used for list navigation.
-        if (control->IsContainer() && key.GetModifiers() == CKey::MODIFIER_SHIFT && key.GetVKey() >= XBMCVK_A && key.GetVKey() <= XBMCVK_Z)
+        if (control->IsContainer() && (key.GetModifiers() & CKey::MODIFIER_SHIFT) && key.GetVKey() >= XBMCVK_A && key.GetVKey() <= XBMCVK_Z)
           useKeyboard = true;
       }
     }
@@ -628,13 +628,13 @@
           // Check for paste keypress
 #ifdef TARGET_WINDOWS
           // In Windows paste is ctrl-V
-          if (key.GetVKey() == XBMCVK_V && key.GetModifiers() == CKey::MODIFIER_CTRL)
+          if (key.GetVKey() == XBMCVK_V && (key.GetModifiers() & CKey::MODIFIER_CTRL))
 #elif defined(TARGET_LINUX)
           // In Linux paste is ctrl-V
-          if (key.GetVKey() == XBMCVK_V && key.GetModifiers() == CKey::MODIFIER_CTRL)
+          if (key.GetVKey() == XBMCVK_V && (key.GetModifiers() & CKey::MODIFIER_CTRL))
 #elif defined(TARGET_DARWIN_OSX)
           // In OSX paste is cmd-V
-          if (key.GetVKey() == XBMCVK_V && key.GetModifiers() == CKey::MODIFIER_META)
+          if (key.GetVKey() == XBMCVK_V && (key.GetModifiers() & CKey::MODIFIER_META))
 #else
           // Placeholder for other operating systems
           if (false)

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

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

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

@@ -149,7 +149,7 @@
   CKey(void);
   CKey(uint32_t buttonCode, uint8_t leftTrigger = 0, uint8_t rightTrigger = 0, float leftThumbX = 0.0f, float leftThumbY = 0.0f, float rightThumbX = 0.0f, float rightThumbY = 0.0f, float repeat = 0.0f);
   CKey(uint32_t buttonCode, unsigned int held);
-  CKey(uint8_t vkey, wchar_t unicode, char ascii, uint32_t modifiers, unsigned int held);
+  CKey(uint32_t keycode, uint8_t vkey, wchar_t unicode, char ascii, uint32_t modifiers, unsigned int held);
   CKey(const CKey& key);
   void Reset();
 
@@ -169,6 +169,7 @@
   bool GetFromService() const { return m_fromService; }
 
   inline uint32_t GetButtonCode() const { return m_buttonCode; }
+  inline uint32_t GetKeycode() const    { return m_keycode; } // XBMCKey enum in XBMC_keysym.h
   inline uint8_t  GetVKey() const       { return m_vkey; }
   inline wchar_t  GetUnicode() const    { return m_unicode; }
   inline char     GetAscii() const      { return m_ascii; }
@@ -182,11 +183,15 @@
     MODIFIER_RALT  = 0x00080000,
     MODIFIER_SUPER = 0x00100000,
     MODIFIER_META  = 0X00200000,
-    MODIFIER_LONG  = 0X01000000
+    MODIFIER_LONG  = 0X01000000,
+    MODIFIER_NUMLOCK = 0X02000000,
+    MODIFIER_CAPSLOCK = 0X04000000,
+    MODIFIER_SCROLLLOCK = 0X08000000,
   };
 
 private:
   uint32_t m_buttonCode;
+  uint32_t m_keycode;
   uint8_t  m_vkey;
   wchar_t  m_unicode;
   char     m_ascii;

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

@@ -74,6 +74,7 @@
 
 CKey CKeyboardStat::TranslateKey(XBMC_keysym& keysym) const
 {
+  uint32_t keycode;
   uint8_t vkey;
   wchar_t unicode;
   char ascii;
@@ -92,12 +93,19 @@
     modifiers |= CKey::MODIFIER_SUPER;
   if (keysym.mod & XBMCKMOD_META)
     modifiers |= CKey::MODIFIER_META;
+  if (keysym.mod & XBMCKMOD_NUM)
+    modifiers |= CKey::MODIFIER_NUMLOCK;
+  if (keysym.mod & XBMCKMOD_CAPS)
+    modifiers |= CKey::MODIFIER_CAPSLOCK;
+  if (keysym.mod & XBMCKMOD_MODE)
+    modifiers |= CKey::MODIFIER_SCROLLLOCK;
 
   CLog::Log(LOGDEBUG, "Keyboard: scancode: 0x%02x, sym: 0x%04x, unicode: 0x%04x, modifier: 0x%x", keysym.scancode, keysym.sym, keysym.unicode, keysym.mod);
 
   // The keysym.unicode is usually valid, even if it is zero. A zero
   // unicode just means this is a non-printing keypress. The ascii and
   // vkey will be set below.
+  keycode = keysym.sym;
   unicode = keysym.unicode;
   ascii = 0;
   vkey = 0;
@@ -121,6 +129,8 @@
   // will match keys like \ that are on different keys on regional keyboards.
   else if (KeyTableLookupUnicode(keysym.unicode, &keytable))
   {
+    if (keycode == 0)
+      keycode = keytable.sym;
     vkey = keytable.vkey;
     ascii = keytable.ascii;
   }
@@ -169,13 +179,13 @@
   // The A-Z keys are exempted because shift-A-Z is used for navigation in lists.
   // The function keys are exempted because function keys have no shifted value and
   // the Nyxboard remote uses keys like Shift-F3 for some buttons.
-  if (modifiers == CKey::MODIFIER_SHIFT)
+  if (modifiers & CKey::MODIFIER_SHIFT)
     if ((unicode < 'A' || unicode > 'Z') && (unicode < 'a' || unicode > 'z') && (vkey < XBMCVK_F1 || vkey > XBMCVK_F24))
       modifiers = 0;
 
   // Create and return a CKey
 
-  CKey key(vkey, unicode, ascii, modifiers, held);
+  CKey key(keycode, vkey, unicode, ascii, modifiers, held);
 
   return key;
 }

_service:download_files:master.tar.gz/xbmc/input/joysticks/CMakeLists.txt Changed

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

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

@@ -23,40 +23,24 @@
 using namespace KODI;
 using namespace JOYSTICK;
 
-CDriverPrimitive::CDriverPrimitive(void)
-  : m_type(),
-    m_driverIndex(0),
-    m_hatDirection(),
-    m_center(0),
-    m_semiAxisDirection(),
-    m_range(1)
-{
-}
+CDriverPrimitive::CDriverPrimitive(void) = default;
 
 CDriverPrimitive::CDriverPrimitive(PRIMITIVE_TYPE type, unsigned int index)
   : m_type(type),
-    m_driverIndex(index),
-    m_hatDirection(),
-    m_center(0),
-    m_semiAxisDirection(),
-    m_range(1)
+    m_driverIndex(index)
 {
 }
 
 CDriverPrimitive::CDriverPrimitive(unsigned int hatIndex, HAT_DIRECTION direction)
-  : m_type(HAT),
+  : m_type(PRIMITIVE_TYPE::HAT),
     m_driverIndex(hatIndex),
-    m_hatDirection(direction),
-    m_center(0),
-    m_semiAxisDirection(),
-    m_range(1)
+    m_hatDirection(direction)
 {
 }
 
 CDriverPrimitive::CDriverPrimitive(unsigned int axisIndex, int center, SEMIAXIS_DIRECTION direction, unsigned int range)
-  : m_type(SEMIAXIS),
+  : m_type(PRIMITIVE_TYPE::SEMIAXIS),
     m_driverIndex(axisIndex),
-    m_hatDirection(),
     m_center(center),
     m_semiAxisDirection(direction),
     m_range(range)
@@ -69,12 +53,12 @@
   {
     switch (m_type)
     {
-    case BUTTON:
-    case MOTOR:
+    case PRIMITIVE_TYPE::BUTTON:
+    case PRIMITIVE_TYPE::MOTOR:
       return m_driverIndex == rhs.m_driverIndex;
-    case HAT:
+    case PRIMITIVE_TYPE::HAT:
       return m_driverIndex == rhs.m_driverIndex && m_hatDirection == rhs.m_hatDirection;
-    case SEMIAXIS:
+    case PRIMITIVE_TYPE::SEMIAXIS:
       return m_driverIndex       == rhs.m_driverIndex &&
              m_center            == rhs.m_center &&
              m_semiAxisDirection == rhs.m_semiAxisDirection &&
@@ -91,20 +75,22 @@
   if (m_type < rhs.m_type) return true;
   if (m_type > rhs.m_type) return false;
 
-  // Driver index is common to all valid primitives
-  if (m_type != UNKNOWN)
+  if (m_type == PRIMITIVE_TYPE::BUTTON ||
+      m_type == PRIMITIVE_TYPE::HAT ||
+      m_type == PRIMITIVE_TYPE::SEMIAXIS ||
+      m_type == PRIMITIVE_TYPE::MOTOR)
   {
     if (m_driverIndex < rhs.m_driverIndex) return true;
     if (m_driverIndex > rhs.m_driverIndex) return false;
   }
 
-  if (m_type == HAT)
+  if (m_type == PRIMITIVE_TYPE::HAT)
   {
     if (m_hatDirection < rhs.m_hatDirection) return true;
     if (m_hatDirection > rhs.m_hatDirection) return false;
   }
 
-  if (m_type == SEMIAXIS)
+  if (m_type == PRIMITIVE_TYPE::SEMIAXIS)
   {
     if (m_center < rhs.m_center) return true;
     if (m_center > rhs.m_center) return false;
@@ -121,10 +107,11 @@
 
 bool CDriverPrimitive::IsValid(void) const
 {
-  if (m_type == BUTTON || m_type == MOTOR)
+  if (m_type == PRIMITIVE_TYPE::BUTTON ||
+      m_type == PRIMITIVE_TYPE::MOTOR)
     return true;
 
-  if (m_type == HAT)
+  if (m_type == PRIMITIVE_TYPE::HAT)
   {
     return m_hatDirection == HAT_DIRECTION::UP    ||
            m_hatDirection == HAT_DIRECTION::DOWN  ||
@@ -132,7 +119,7 @@
            m_hatDirection == HAT_DIRECTION::LEFT;
   }
 
-  if (m_type == SEMIAXIS)
+  if (m_type == PRIMITIVE_TYPE::SEMIAXIS)
   {
     unsigned int maxRange = 1;

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

_service:download_files:master.tar.gz/xbmc/input/joysticks/IButtonMap.h Deleted

@@ -1,343 +0,0 @@
-/*
- *      Copyright (C) 2014-2017 Team Kodi
- *      http://kodi.tv
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this Program; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-#include "DriverPrimitive.h"
-#include "JoystickTypes.h"
-
-#include <string>
-#include <vector>
-
-namespace KODI
-{
-namespace JOYSTICK
-{
-  /*!
-   * \ingroup joystick
-   * \brief Button map interface to translate between the driver's raw
-   *        button/hat/axis elements and physical joystick features.
-   *
-   * \sa IButtonMapper
-   */
-  class IButtonMap
-  {
-  public:
-    virtual ~IButtonMap() = default;
-
-    /*!
-     * \brief The add-on ID of the game controller associated with this button map
-     *
-     * The controller ID provided by the implementation serves as the context
-     * for the feature names below.
-     *
-     * \return The ID of this button map's game controller add-on
-     */
-    virtual std::string ControllerID(void) const = 0;
-
-    /*!
-     * \brief The name of the peripheral associated with this button map
-     *
-     * \return The peripheral's name
-     */
-    virtual std::string DeviceName(void) const = 0;
-
-    /*!
-     * \brief Load the button map into memory
-     *
-     * \return True if button map is ready to start translating buttons, false otherwise
-     */
-    virtual bool Load(void) = 0;
-
-    /*!
-     * \brief Reset the button map to its defaults, or clear button map if no defaults
-     */
-    virtual void Reset(void) = 0;
-
-    /*!
-     * \brief Check if the button map is empty
-     *
-     * \return True if the button map is empty, false if it has features
-     */
-    virtual bool IsEmpty(void) const = 0;
-
-    /*!
-     * \brief Get the feature associated with a driver primitive
-     *
-     * Multiple primitives can be mapped to the same feature. For example,
-     * analog sticks use one primitive for each direction.
-     *
-     * \param primitive    The driver primitive (a button, hat direction or semi-axis)
-     * \param feature      The name of the resolved joystick feature, or
-     *                     invalid if false is returned
-     *
-     * \return True if the driver primitive is associated with a feature, false otherwise
-     */
-    virtual bool GetFeature(
-      const CDriverPrimitive& primitive,
-      FeatureName& feature
-    ) = 0;
-
-    /*!
-     * \brief Get the type of the feature for the given name
-     *
-     * \param feature      The feature to look up
-     *
-     * \return The feature's type
-     */
-    virtual FEATURE_TYPE GetFeatureType(const FeatureName& feature) = 0;
-
-    /*!
-     * \brief Get the driver primitive for a scalar feature
-     *
-     * When a feature can be represented by a single driver primitive, it is
-     * called a scalar feature.
-     *
-     *   - This includes buttons and triggers, because they can be mapped to a
-     *     single button/hat/semiaxis
-     *
-     *   - This does not include analog sticks, because they require two axes
-     *     and four driver primitives (one for each semiaxis)
-     *
-     * \param feature        Must be a scalar feature (a feature that only
-     *                       requires a single driver primitive)
-     * \param primitive      The resolved driver primitive
-     *
-     * \return True if the feature resolved to a driver primitive, false if the
-     *         feature didn't resolve or isn't a scalar feature
-     */
-    virtual bool GetScalar(
-      const FeatureName& feature,
-      CDriverPrimitive& primitive
-    ) = 0;
-
-    /*!
-     * \brief Add or update a scalar feature
-     *
-     * \param feature        Must be a scalar feature
-     * \param primitive      The feature's driver primitive
-     *
-     * \return True if the feature was updated, false if the feature is
-     *         unchanged or failure occurs
-     */
-    virtual void AddScalar(
-      const FeatureName& feature,
-      const CDriverPrimitive& primitive
-    ) = 0;
-
-    /*!
-     * \brief Get an analog stick direction from the button map
-     *
-     * \param      feature   Must be an analog stick or this will return false
-     * \param      direction The direction whose primitive is to be retrieved
-     * \param[out] primitive The primitive mapped to the specified direction
-     *
-     * \return True if the feature and direction resolved to a driver primitive
-     */
-    virtual bool GetAnalogStick(
-      const FeatureName& feature,
-      ANALOG_STICK_DIRECTION direction,
-      CDriverPrimitive& primitive
-    ) = 0;
-
-    /*!
-     * \brief Add or update an analog stick direction
-     *
-     * \param feature   Must be an analog stick or this will return false
-     * \param direction The direction being mapped
-     * \param primitive The driver primitive for the specified analog stick and direction
-     *
-     * \return True if the analog stick was updated, false otherwise
-     */
-    virtual void AddAnalogStick(
-      const FeatureName& feature,
-      ANALOG_STICK_DIRECTION direction,
-      const CDriverPrimitive& primitive
-    ) = 0;
-
-    /*!
-     * \brief Get a relative pointer direction from the button map
-     *
-     * \param      feature   Must be a relative pointer stick or this will return false
-     * \param      direction The direction whose primitive is to be retrieved
-     * \param[out] primitive The primitive mapped to the specified direction
-     *
-     * \return True if the feature and direction resolved to a driver primitive
-     */
-    virtual bool GetRelativePointer(
-      const FeatureName& feature,
-      ANALOG_STICK_DIRECTION direction,
-      CDriverPrimitive& primitive
-    ) = 0;
-
-    /*!
-     * \brief Add or update a relative pointer direction
-     *
-     * \param feature   Must be a relative pointer or this will return false
-     * \param direction The direction being mapped
-     * \param primitive The driver primitive for the specified analog stick and direction
-     *
-     * \return True if the analog stick was updated, false otherwise
-     */
-    virtual void AddRelativePointer(
-      const FeatureName& feature,
-      ANALOG_STICK_DIRECTION direction,
-      const CDriverPrimitive& primitive
-    ) = 0;
-
-    /*!
-     * \brief Get an accelerometer from the button map
-     *
-     * \param feature       Must be an accelerometer or this will return false
-     * \param positiveX     The semiaxis mapped to the positive X direction (possibly unknown)
-     * \param positiveY     The semiaxis mapped to the positive Y direction (possibly unknown)
-     * \param positiveZ     The semiaxis mapped to the positive Z direction (possibly unknown)
-     *
-     * \return True if the feature resolved to an accelerometer with at least 1 known axis
-     */
-    virtual bool GetAccelerometer(
-      const FeatureName& feature,
-      CDriverPrimitive& positiveX,
-      CDriverPrimitive& positiveY,
-      CDriverPrimitive& positiveZ
-    ) = 0;
-
-    /*!
-     * \brief Get or update an accelerometer
-     *
-     * \param feature       Must be an accelerometer or this will return false
-     * \param positiveX     The semiaxis corresponding to the positive X direction
-     * \param positiveY     The semiaxis corresponding to the positive Y direction
-     * \param positiveZ     The semiaxis corresponding to the positive Z direction
-     *
-     * The driver primitives must be mapped to a semiaxis or this function will fail.
-     *
-     * \return True if the accelerometer was updated, false if unchanged or failure occurred
-     */
-    virtual void AddAccelerometer(
-      const FeatureName& feature,
-      const CDriverPrimitive& positiveX,
-      const CDriverPrimitive& positiveY,
-      const CDriverPrimitive& positiveZ
-    ) = 0;
-
-    /*!
-     * \brief Get a wheel direction from the button map
-     *
-     * \param      feature   Must be a wheel or this will return false
-     * \param      direction The direction whose primitive is to be retrieved
-     * \param[out] primitive The primitive mapped to the specified direction
-     *
-     * \return True if the feature and direction resolved to a driver primitive
-     */
-    virtual bool GetWheel(
-      const FeatureName& feature,
-      WHEEL_DIRECTION direction,
-      CDriverPrimitive& primitive
-    ) = 0;
-
-    /*!
-     * \brief Add or update a wheel direction
-     *
-     * \param      feature   Must be a wheel or this will return false
-     * \param direction The direction being mapped
-     * \param primitive The driver primitive for the specified analog stick and direction
-     *
-     * \return True if the analog stick was updated, false otherwise
-     */
-    virtual void AddWheel(
-      const FeatureName& feature,
-      WHEEL_DIRECTION direction,
-      const CDriverPrimitive& primitive
-    ) = 0;
-
-    /*!
-     * \brief Get a throttle direction from the button map
-     *
-     * \param      feature   Must be a throttle or this will return false
-     * \param      direction The direction whose primitive is to be retrieved
-     * \param[out] primitive The primitive mapped to the specified direction
-     *
-     * \return True if the feature and direction resolved to a driver primitive
-     */
-    virtual bool GetThrottle(
-      const FeatureName& feature,
-      THROTTLE_DIRECTION direction,
-      CDriverPrimitive& primitive
-    ) = 0;
-
-    /*!
-     * \brief Add or update a throttle direction
-     *
-     * \param      feature   Must be a throttle or this will return false
-     * \param direction The direction being mapped
-     * \param primitive The driver primitive for the specified analog stick and direction
-     *
-     * \return True if the analog stick was updated, false otherwise
-     */
-    virtual void AddThrottle(
-      const FeatureName& feature,
-      THROTTLE_DIRECTION direction,
-      const CDriverPrimitive& primitive
-    ) = 0;
-
-    /*!
-     * \brief Set a list of driver primitives to be ignored
-     *
-     * This is necessary to prevent features from interfering with the button
-     * mapping process. This includes accelerometers, as well as PS4 triggers
-     * which send both a button press and an analog value.
-     *
-     * \param primitives      The driver primitives to be ignored
-     */
-    virtual void SetIgnoredPrimitives(const std::vector<CDriverPrimitive>& primitives) = 0;
-
-    /*!
-     * \brief Check if a primitive is in the list of primitives to be ignored
-     *
-     * \param primitive      The primitive to check
-     *
-     * \return True if the primitive should be ignored in the mapping process
-     */
-    virtual bool IsIgnored(const CDriverPrimitive& primitive) = 0;
-
-    /*!
-     * \brief Get the properties of an axis
-     *
-     * \param axisIndex The index of the axis to check
-     * \param center[out] The center, if known
-     * \param range[out] The range, if known
-     *
-     * \return True if the properties are known, false otherwise
-     */
-    virtual bool GetAxisProperties(unsigned int axisIndex, int& center, unsigned int& range) = 0;
-
-    /*!
-     * \brief Save the button map
-     */
-    virtual void SaveButtonMap() = 0;
-
-    /*!
-    * \brief Revert changes to the button map since the last time it was loaded
-    *        or commited to disk
-    */
-    virtual void RevertButtonMap() = 0;
-  };
-}
-}

_service:download_files:master.tar.gz/xbmc/input/joysticks/IButtonSequence.h Deleted

@@ -1,36 +0,0 @@
-/*
- *      Copyright (C) 2016-2017 Team Kodi
- *      http://kodi.tv
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this Program; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-#include "JoystickTypes.h"
-
-namespace KODI
-{
-namespace JOYSTICK
-{
-  class IButtonSequence
-  {
-  public:
-    virtual ~IButtonSequence() = default;
-
-    virtual bool OnButtonPress(const FeatureName& feature) = 0;
-  };
-}
-}

_service:download_files:master.tar.gz/xbmc/input/joysticks/IDriverHandler.h Deleted

@@ -1,85 +0,0 @@
-/*
- *      Copyright (C) 2014-2017 Team Kodi
- *      http://kodi.tv
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this Program; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-#include "JoystickTypes.h"
-
-namespace KODI
-{
-namespace JOYSTICK
-{
-  /*!
-   * \brief Interface defining methods to handle joystick events for raw driver
-   *        elements (buttons, hats, axes)
-   */
-  class IDriverHandler
-  {
-  public:
-    virtual ~IDriverHandler() = default;
-
-    /*!
-     * \brief Handle button motion
-     *
-     * \param buttonIndex The index of the button as reported by the driver
-     * \param bPressed    true for press motion, false for release motion
-     *
-     * \return True if a press was handled, false otherwise
-     */
-    virtual bool OnButtonMotion(unsigned int buttonIndex, bool bPressed) = 0;
-
-    /*!
-     * \brief Handle hat motion
-     *
-     * \param hatIndex     The index of the hat as reported by the driver
-     * \param state        The direction the hat is now being pressed
-     *
-     * \return True if the new direction was handled, false otherwise
-     */
-    virtual bool OnHatMotion(unsigned int hatIndex, HAT_STATE state) = 0;
-
-    /*!
-     * \brief Handle axis motion
-     *
-     * If a joystick feature requires multiple axes (analog sticks, accelerometers),
-     * they can be buffered for later processing.
-     *
-     * \param axisIndex   The index of the axis as reported by the driver
-     * \param position    The position of the axis in the closed interval [-1.0, 1.0]
-     * \param center      The center point of the axis (either -1, 0 or 1)
-     * \param range       The maximum distance the axis can move (either 1 or 2)
-     *
-     * \return True if the motion was handled, false otherwise
-     */
-    virtual bool OnAxisMotion(unsigned int axisIndex, float position, int center, unsigned int range) = 0;
-
-    /*!
-     * \brief Handle buffered axis positions for features that require multiple axes
-     *
-     * ProcessAxisMotions() is called at the end of the frame when all axis motions
-     * have been reported. This has several uses, including:
-     *
-     *  - Combining multiple axes into a single analog stick or accelerometer event
-     *  - Imitating an analog feature with a digital button so that events can be
-     *    dispatched every frame.
-     */
-    virtual void ProcessAxisMotions(void) = 0;
-  };
-}
-}

_service:download_files:master.tar.gz/xbmc/input/joysticks/IInputHandler.h Deleted

@@ -1,165 +0,0 @@
-/*
- *      Copyright (C) 2014-2017 Team Kodi
- *      http://kodi.tv
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this Program; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-#include "JoystickTypes.h"
-
-#include <string>
-
-namespace KODI
-{
-namespace JOYSTICK
-{
-  class IInputReceiver;
-
-  /*!
-   * \ingroup joystick
-   * \brief Interface for handling input events for game controllers
-   */
-  class IInputHandler
-  {
-  public:
-    IInputHandler(void) : m_receiver(nullptr) { }
-
-    virtual ~IInputHandler() = default;
-
-    /*!
-     * \brief The add-on ID of the game controller associated with this input handler
-     *
-     * \return The ID of the add-on extending kodi.game.controller
-     */
-    virtual std::string ControllerID(void) const = 0;
-
-    /*!
-     * \brief Return true if the input handler accepts the given feature
-     *
-     * \param feature A feature belonging to the controller specified by ControllerID()
-     *
-     * \return True if the feature is used for input, false otherwise
-     */
-    virtual bool HasFeature(const FeatureName& feature) const = 0;
-
-    /*!
-     * \brief Return true if the input handler is currently accepting input for the
-     *        given feature
-     *
-     * \param feature A feature belonging to the controller specified by ControllerID()
-     *
-     * \return True if the feature is currently accepting input, false otherwise
-     *
-     * This does not prevent the input events from being called, but can return
-     * false to indicate that input wasn't handled for the specified feature.
-     */
-    virtual bool AcceptsInput(const FeatureName &feature) const = 0;
-
-    /*!
-     * \brief A digital button has been pressed or released
-     *
-     * \param feature      The feature being pressed
-     * \param bPressed     True if pressed, false if released
-     *
-     * \return True if the event was handled otherwise false
-     */
-    virtual bool OnButtonPress(const FeatureName& feature, bool bPressed) = 0;
-
-    /*!
-     * \brief A digital button has been pressed for more than one event frame
-     *
-     * \param feature      The feature being held
-     * \param holdTimeMs   The time elapsed since the initial press (ms)
-     *
-     * If OnButtonPress() returns true for the initial press, then this callback
-     * is invoked on subsequent frames until the button is released.
-     */
-    virtual void OnButtonHold(const FeatureName& feature, unsigned int holdTimeMs) = 0;
-
-    /*!
-     * \brief An analog button (trigger or a pressure-sensitive button) has changed state
-     *
-     * \param feature      The feature changing state
-     * \param magnitude    The button pressure or trigger travel distance in the
-     *                     closed interval [0, 1]
-     * \param motionTimeMs The time elapsed since the magnitude was 0
-     *
-     * \return True if the event was handled otherwise false
-     */
-    virtual bool OnButtonMotion(const FeatureName& feature, float magnitude, unsigned int motionTimeMs) = 0;
-
-    /*!
-     * \brief An analog stick has moved
-     *
-     * \param feature      The analog stick being moved
-     * \param x            The x coordinate in the closed interval [-1, 1]
-     * \param y            The y coordinate in the closed interval [-1, 1]
-     * \param motionTimeMs The time elapsed since this analog stick was centered,
-     *                     or 0 if the analog stick is centered
-     *
-     * \return True if the event was handled otherwise false
-     */
-    virtual bool OnAnalogStickMotion(const FeatureName& feature, float x, float y, unsigned int motionTimeMs) = 0;
-
-    /*!
-     * \brief An accelerometer's state has changed
-     *
-     * \param feature      The accelerometer being accelerated
-     * \param x            The x coordinate in the closed interval [-1, 1]
-     * \param y            The y coordinate in the closed interval [-1, 1]
-     * \param z            The z coordinate in the closed interval [-1, 1]
-     *
-     * \return True if the event was handled otherwise false
-     */
-    virtual bool OnAccelerometerMotion(const FeatureName& feature, float x, float y, float z) { return false; }
-
-    /*!
-     * \brief A wheel has changed state
-     *
-     * Left is negative position, right is positive position
-     *
-     * \param feature      The wheel changing state
-     * \param position     The position in the closed interval [-1, 1]
-     * \param motionTimeMs The time elapsed since the position was 0
-     *
-     * \return True if the event was handled otherwise false
-     */
-    virtual bool OnWheelMotion(const FeatureName& feature, float position, unsigned int motionTimeMs) = 0;
-
-    /*!
-     * \brief A throttle has changed state
-     *
-     * Up is positive position, down is negative position.
-     *
-     * \param feature      The wheel changing state
-     * \param position     The position in the closed interval [-1, 1]
-     * \param motionTimeMs The time elapsed since the position was 0
-     *
-     * \return True if the event was handled otherwise false
-     */
-    virtual bool OnThrottleMotion(const FeatureName& feature, float position, unsigned int motionTimeMs) = 0;
-
-    // Input receiver interface
-    void SetInputReceiver(IInputReceiver* receiver) { m_receiver = receiver; }
-    void ResetInputReceiver(void) { m_receiver = nullptr; }
-    IInputReceiver* InputReceiver(void) { return m_receiver; }
-
-  private:
-    IInputReceiver* m_receiver;
-  };
-}
-}

_service:download_files:master.tar.gz/xbmc/input/joysticks/IInputReceiver.h Deleted

@@ -1,48 +0,0 @@
-/*
- *      Copyright (C) 2014-2017 Team Kodi
- *      http://kodi.tv
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this Program; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-#include "JoystickTypes.h"
-
-namespace KODI
-{
-namespace JOYSTICK
-{
-  /*!
-   * \ingroup joystick
-   * \brief Interface for sending input events to game controllers
-   */
-  class IInputReceiver
-  {
-  public:
-    virtual ~IInputReceiver() = default;
-
-    /*!
-     * \brief Set the value of a rumble motor
-     *
-     * \param feature      The name of the motor to rumble
-     * \param magnitude    The motor's new magnitude of vibration in the closed interval [0, 1]
-     *
-     * \return True if the event was handled otherwise false
-     */
-    virtual bool SetRumbleState(const FeatureName& feature, float magnitude) = 0;
-  };
-}
-}

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

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

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

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

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

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

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

_service:download_files:master.tar.gz/xbmc/input/joysticks/generic/ButtonMapping.cpp Changed

@@ -22,9 +22,9 @@
 #include "games/controllers/Controller.h"
 #include "games/controllers/ControllerFeature.h"
 #include "games/controllers/ControllerManager.h"
+#include "input/joysticks/interfaces/IButtonMap.h"
+#include "input/joysticks/interfaces/IButtonMapper.h"
 #include "input/joysticks/DriverPrimitive.h"
-#include "input/joysticks/IButtonMap.h"
-#include "input/joysticks/IButtonMapper.h"
 #include "input/joysticks/JoystickTranslator.h"
 #include "input/joysticks/JoystickUtils.h"
 #include "input/IKeymap.h"
@@ -45,10 +45,25 @@
 #define AXIS_THRESHOLD       0.75f // Axis must exceed this value to be mapped
 #define TRIGGER_DELAY_MS     200   // Delay trigger detection to handle anomalous triggers with non-zero center
 
+// --- CPrimitiveDetector ------------------------------------------------------
+
+CPrimitiveDetector::CPrimitiveDetector(CButtonMapping* buttonMapping) :
+  m_buttonMapping(buttonMapping)
+{
+}
+
+bool CPrimitiveDetector::MapPrimitive(const CDriverPrimitive &primitive)
+{
+  if (primitive.IsValid())
+    return m_buttonMapping->MapPrimitive(primitive);
+
+  return false;
+}
+
 // --- CButtonDetector ---------------------------------------------------------
 
 CButtonDetector::CButtonDetector(CButtonMapping* buttonMapping, unsigned int buttonIndex) :
-  m_buttonMapping(buttonMapping),
+  CPrimitiveDetector(buttonMapping),
   m_buttonIndex(buttonIndex)
 {
 }
@@ -56,13 +71,7 @@
 bool CButtonDetector::OnMotion(bool bPressed)
 {
   if (bPressed)
-  {
-    CDriverPrimitive buttonPrimitive(PRIMITIVE_TYPE::BUTTON, m_buttonIndex);
-    if (buttonPrimitive.IsValid())
-    {
-      return m_buttonMapping->MapPrimitive(buttonPrimitive);
-    }
-  }
+    return MapPrimitive(CDriverPrimitive(PRIMITIVE_TYPE::BUTTON, m_buttonIndex));
 
   return false;
 }
@@ -70,27 +79,20 @@
 // --- CHatDetector ------------------------------------------------------------
 
 CHatDetector::CHatDetector(CButtonMapping* buttonMapping, unsigned int hatIndex) :
-  m_buttonMapping(buttonMapping),
+  CPrimitiveDetector(buttonMapping),
   m_hatIndex(hatIndex)
 {
 }
 
 bool CHatDetector::OnMotion(HAT_STATE state)
 {
-  CDriverPrimitive hatPrimitive(m_hatIndex, static_cast<HAT_DIRECTION>(state));
-  if (hatPrimitive.IsValid())
-  {
-    m_buttonMapping->MapPrimitive(hatPrimitive);
-    return true;
-  }
-
-  return false;
+  return MapPrimitive(CDriverPrimitive(m_hatIndex, static_cast<HAT_DIRECTION>(state)));
 }
 
 // --- CAxisDetector -----------------------------------------------------------
 
 CAxisDetector::CAxisDetector(CButtonMapping* buttonMapping, unsigned int axisIndex, const AxisConfiguration& config) :
-  m_buttonMapping(buttonMapping),
+  CPrimitiveDetector(buttonMapping),
   m_axisIndex(axisIndex),
   m_config(config),
   m_state(AXIS_STATE::INACTIVE),
@@ -166,7 +168,7 @@
       }
 
       // Map primitive
-      if (!m_buttonMapping->MapPrimitive(m_activatedPrimitive))
+      if (!MapPrimitive(m_activatedPrimitive))
       {
         if (m_type == AXIS_TYPE::OFFSET)
           CLog::Log(LOGDEBUG, "Mapping offset axis %u failed", m_axisIndex);

_service:download_files:master.tar.gz/xbmc/input/joysticks/generic/ButtonMapping.h Changed

@@ -19,9 +19,9 @@
  */
 #pragma once
 
+#include "input/joysticks/interfaces/IButtonMapCallback.h"
+#include "input/joysticks/interfaces/IDriverHandler.h"
 #include "input/joysticks/DriverPrimitive.h"
-#include "input/joysticks/IButtonMapCallback.h"
-#include "input/joysticks/IDriverHandler.h"
 
 #include <map>
 #include <stdint.h>
@@ -36,7 +36,35 @@
   class IButtonMap;
   class IButtonMapper;
 
-  class CButtonDetector
+  /*!
+   * \brief Detects and dispatches mapping events
+   *
+   * A mapping event usually occurs when a driver primitive is pressed or
+   * exceeds a certain threshold.
+   *
+   * Detection can be quite complicated due to driver bugs, so each type of
+   * driver primitive is given its own detector class inheriting from this one.
+   */
+  class CPrimitiveDetector
+  {
+  protected:
+    CPrimitiveDetector(CButtonMapping* buttonMapping);
+
+    /*!
+     * \brief Dispatch a mapping event
+     *
+     * \return True if the primitive was mapped, false otherwise
+     */
+    bool MapPrimitive(const CDriverPrimitive &primitive);
+
+  private:
+    CButtonMapping* const m_buttonMapping;
+  };
+
+  /*!
+   * \brief Detects when a button should be mapped
+   */
+  class CButtonDetector : public CPrimitiveDetector
   {
   public:
     CButtonDetector(CButtonMapping* buttonMapping, unsigned int buttonIndex);
@@ -46,18 +74,20 @@
      *
      * \param bPressed The new state
      *
-     * \return True if this press was absorbed, false if it should fall through
+     * \return True if this press was handled, false if it should fall through
      *         to the next driver handler
      */
     bool OnMotion(bool bPressed);
 
   private:
     // Construction parameters
-    CButtonMapping* const m_buttonMapping;
     const unsigned int m_buttonIndex;
   };
 
-  class CHatDetector
+  /*!
+   * \brief Detects when a D-pad direction should be mapped
+   */
+  class CHatDetector : public CPrimitiveDetector
   {
   public:
     CHatDetector(CButtonMapping* buttonMapping, unsigned int hatIndex);
@@ -73,7 +103,6 @@
 
   private:
     // Construction parameters
-    CButtonMapping* const m_buttonMapping;
     const unsigned int m_hatIndex;
   };
 
@@ -85,7 +114,10 @@
     bool bLateDiscovery = false;
   };
 
-  class CAxisDetector
+  /*!
+   * \brief Detects when an axis should be mapped
+   */
+  class CAxisDetector : public CPrimitiveDetector
   {
   public:
     CAxisDetector(CButtonMapping* buttonMapping, unsigned int axisIndex, const AxisConfiguration& config);
@@ -178,7 +210,6 @@
     void DetectType(float position);
 
     // Construction parameters
-    CButtonMapping* const m_buttonMapping;
     const unsigned int m_axisIndex;
     AxisConfiguration m_config; // mutable

_service:download_files:master.tar.gz/xbmc/input/joysticks/generic/DriverReceiving.cpp Changed

_service:download_files:master.tar.gz/xbmc/input/joysticks/generic/DriverReceiving.h Changed

_service:download_files:master.tar.gz/xbmc/input/joysticks/generic/FeatureHandling.cpp Changed

_service:download_files:master.tar.gz/xbmc/input/joysticks/generic/InputHandling.cpp Changed

_service:download_files:master.tar.gz/xbmc/input/joysticks/generic/InputHandling.h Changed

_service:download_files:master.tar.gz/xbmc/input/joysticks/interfaces/IButtonMap.h Added

@@ -0,0 +1,343 @@
+/*
+ *      Copyright (C) 2014-2017 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "input/joysticks/DriverPrimitive.h"
+#include "input/joysticks/JoystickTypes.h"
+
+#include <string>
+#include <vector>
+
+namespace KODI
+{
+namespace JOYSTICK
+{
+  /*!
+   * \ingroup joystick
+   * \brief Button map interface to translate between the driver's raw
+   *        button/hat/axis elements and physical joystick features.
+   *
+   * \sa IButtonMapper
+   */
+  class IButtonMap
+  {
+  public:
+    virtual ~IButtonMap() = default;
+
+    /*!
+     * \brief The add-on ID of the game controller associated with this button map
+     *
+     * The controller ID provided by the implementation serves as the context
+     * for the feature names below.
+     *
+     * \return The ID of this button map's game controller add-on
+     */
+    virtual std::string ControllerID(void) const = 0;
+
+    /*!
+     * \brief The name of the peripheral associated with this button map
+     *
+     * \return The peripheral's name
+     */
+    virtual std::string DeviceName(void) const = 0;
+
+    /*!
+     * \brief Load the button map into memory
+     *
+     * \return True if button map is ready to start translating buttons, false otherwise
+     */
+    virtual bool Load(void) = 0;
+
+    /*!
+     * \brief Reset the button map to its defaults, or clear button map if no defaults
+     */
+    virtual void Reset(void) = 0;
+
+    /*!
+     * \brief Check if the button map is empty
+     *
+     * \return True if the button map is empty, false if it has features
+     */
+    virtual bool IsEmpty(void) const = 0;
+
+    /*!
+     * \brief Get the feature associated with a driver primitive
+     *
+     * Multiple primitives can be mapped to the same feature. For example,
+     * analog sticks use one primitive for each direction.
+     *
+     * \param primitive    The driver primitive (a button, hat direction or semi-axis)
+     * \param feature      The name of the resolved joystick feature, or
+     *                     invalid if false is returned
+     *
+     * \return True if the driver primitive is associated with a feature, false otherwise
+     */
+    virtual bool GetFeature(
+      const CDriverPrimitive& primitive,
+      FeatureName& feature
+    ) = 0;
+
+    /*!
+     * \brief Get the type of the feature for the given name
+     *
+     * \param feature      The feature to look up
+     *
+     * \return The feature's type
+     */
+    virtual FEATURE_TYPE GetFeatureType(const FeatureName& feature) = 0;
+
+    /*!
+     * \brief Get the driver primitive for a scalar feature
+     *
+     * When a feature can be represented by a single driver primitive, it is
+     * called a scalar feature.
+     *
+     *   - This includes buttons and triggers, because they can be mapped to a
+     *     single button/hat/semiaxis
+     *
+     *   - This does not include analog sticks, because they require two axes
+     *     and four driver primitives (one for each semiaxis)
+     *
+     * \param feature        Must be a scalar feature (a feature that only
+     *                       requires a single driver primitive)
+     * \param primitive      The resolved driver primitive
+     *
+     * \return True if the feature resolved to a driver primitive, false if the
+     *         feature didn't resolve or isn't a scalar feature
+     */
+    virtual bool GetScalar(
+      const FeatureName& feature,
+      CDriverPrimitive& primitive
+    ) = 0;
+
+    /*!
+     * \brief Add or update a scalar feature
+     *
+     * \param feature        Must be a scalar feature
+     * \param primitive      The feature's driver primitive
+     *
+     * \return True if the feature was updated, false if the feature is
+     *         unchanged or failure occurs
+     */
+    virtual void AddScalar(
+      const FeatureName& feature,
+      const CDriverPrimitive& primitive
+    ) = 0;
+
+    /*!
+     * \brief Get an analog stick direction from the button map
+     *
+     * \param      feature   Must be an analog stick or this will return false
+     * \param      direction The direction whose primitive is to be retrieved
+     * \param[out] primitive The primitive mapped to the specified direction
+     *
+     * \return True if the feature and direction resolved to a driver primitive
+     */
+    virtual bool GetAnalogStick(
+      const FeatureName& feature,
+      ANALOG_STICK_DIRECTION direction,
+      CDriverPrimitive& primitive
+    ) = 0;
+
+    /*!
+     * \brief Add or update an analog stick direction
+     *
+     * \param feature   Must be an analog stick or this will return false
+     * \param direction The direction being mapped
+     * \param primitive The driver primitive for the specified analog stick and direction
+     *
+     * \return True if the analog stick was updated, false otherwise
+     */
+    virtual void AddAnalogStick(
+      const FeatureName& feature,
+      ANALOG_STICK_DIRECTION direction,
+      const CDriverPrimitive& primitive
+    ) = 0;
+
+    /*!
+     * \brief Get a relative pointer direction from the button map
+     *
+     * \param      feature   Must be a relative pointer stick or this will return false
+     * \param      direction The direction whose primitive is to be retrieved
+     * \param[out] primitive The primitive mapped to the specified direction
+     *
+     * \return True if the feature and direction resolved to a driver primitive
+     */
+    virtual bool GetRelativePointer(
+      const FeatureName& feature,
+      ANALOG_STICK_DIRECTION direction,
+      CDriverPrimitive& primitive
+    ) = 0;
+
+    /*!
+     * \brief Add or update a relative pointer direction
+     *
+     * \param feature   Must be a relative pointer or this will return false
+     * \param direction The direction being mapped
+     * \param primitive The driver primitive for the specified analog stick and direction
+     *
+     * \return True if the analog stick was updated, false otherwise
+     */
+    virtual void AddRelativePointer(
+      const FeatureName& feature,
+      ANALOG_STICK_DIRECTION direction,
+      const CDriverPrimitive& primitive
+    ) = 0;
+
+    /*!
+     * \brief Get an accelerometer from the button map
+     *
+     * \param feature       Must be an accelerometer or this will return false
+     * \param positiveX     The semiaxis mapped to the positive X direction (possibly unknown)
+     * \param positiveY     The semiaxis mapped to the positive Y direction (possibly unknown)
+     * \param positiveZ     The semiaxis mapped to the positive Z direction (possibly unknown)
+     *
+     * \return True if the feature resolved to an accelerometer with at least 1 known axis
+     */
+    virtual bool GetAccelerometer(
+      const FeatureName& feature,
+      CDriverPrimitive& positiveX,
+      CDriverPrimitive& positiveY,
+      CDriverPrimitive& positiveZ
+    ) = 0;
+
+    /*!
+     * \brief Get or update an accelerometer
+     *
+     * \param feature       Must be an accelerometer or this will return false
+     * \param positiveX     The semiaxis corresponding to the positive X direction
+     * \param positiveY     The semiaxis corresponding to the positive Y direction
+     * \param positiveZ     The semiaxis corresponding to the positive Z direction
+     *
+     * The driver primitives must be mapped to a semiaxis or this function will fail.
+     *
+     * \return True if the accelerometer was updated, false if unchanged or failure occurred
+     */
+    virtual void AddAccelerometer(
+      const FeatureName& feature,
+      const CDriverPrimitive& positiveX,
+      const CDriverPrimitive& positiveY,
+      const CDriverPrimitive& positiveZ
+    ) = 0;
+
+    /*!
+     * \brief Get a wheel direction from the button map
+     *
+     * \param      feature   Must be a wheel or this will return false
+     * \param      direction The direction whose primitive is to be retrieved
+     * \param[out] primitive The primitive mapped to the specified direction
+     *
+     * \return True if the feature and direction resolved to a driver primitive
+     */
+    virtual bool GetWheel(
+      const FeatureName& feature,
+      WHEEL_DIRECTION direction,
+      CDriverPrimitive& primitive
+    ) = 0;
+
+    /*!
+     * \brief Add or update a wheel direction
+     *
+     * \param      feature   Must be a wheel or this will return false
+     * \param direction The direction being mapped
+     * \param primitive The driver primitive for the specified analog stick and direction
+     *
+     * \return True if the analog stick was updated, false otherwise
+     */
+    virtual void AddWheel(
+      const FeatureName& feature,
+      WHEEL_DIRECTION direction,
+      const CDriverPrimitive& primitive
+    ) = 0;
+
+    /*!
+     * \brief Get a throttle direction from the button map
+     *
+     * \param      feature   Must be a throttle or this will return false
+     * \param      direction The direction whose primitive is to be retrieved
+     * \param[out] primitive The primitive mapped to the specified direction
+     *
+     * \return True if the feature and direction resolved to a driver primitive
+     */
+    virtual bool GetThrottle(
+      const FeatureName& feature,
+      THROTTLE_DIRECTION direction,
+      CDriverPrimitive& primitive
+    ) = 0;
+
+    /*!
+     * \brief Add or update a throttle direction
+     *
+     * \param      feature   Must be a throttle or this will return false
+     * \param direction The direction being mapped
+     * \param primitive The driver primitive for the specified analog stick and direction
+     *
+     * \return True if the analog stick was updated, false otherwise
+     */
+    virtual void AddThrottle(
+      const FeatureName& feature,
+      THROTTLE_DIRECTION direction,
+      const CDriverPrimitive& primitive
+    ) = 0;
+
+    /*!
+     * \brief Set a list of driver primitives to be ignored
+     *
+     * This is necessary to prevent features from interfering with the button
+     * mapping process. This includes accelerometers, as well as PS4 triggers
+     * which send both a button press and an analog value.
+     *
+     * \param primitives      The driver primitives to be ignored
+     */
+    virtual void SetIgnoredPrimitives(const std::vector<CDriverPrimitive>& primitives) = 0;
+
+    /*!
+     * \brief Check if a primitive is in the list of primitives to be ignored
+     *
+     * \param primitive      The primitive to check
+     *
+     * \return True if the primitive should be ignored in the mapping process
+     */
+    virtual bool IsIgnored(const CDriverPrimitive& primitive) = 0;
+
+    /*!
+     * \brief Get the properties of an axis
+     *
+     * \param axisIndex The index of the axis to check
+     * \param center[out] The center, if known
+     * \param range[out] The range, if known
+     *
+     * \return True if the properties are known, false otherwise
+     */
+    virtual bool GetAxisProperties(unsigned int axisIndex, int& center, unsigned int& range) = 0;
+
+    /*!
+     * \brief Save the button map
+     */
+    virtual void SaveButtonMap() = 0;
+
+    /*!
+    * \brief Revert changes to the button map since the last time it was loaded
+    *        or commited to disk
+    */
+    virtual void RevertButtonMap() = 0;
+  };
+}
+}

_service:download_files:master.tar.gz/xbmc/input/joysticks/interfaces/IButtonMapCallback.h Changed

_service:download_files:master.tar.gz/xbmc/input/joysticks/interfaces/IButtonMapper.h Changed

_service:download_files:master.tar.gz/xbmc/input/joysticks/interfaces/IButtonSequence.h Added

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (C) 2016-2017 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "input/joysticks/JoystickTypes.h"
+
+namespace KODI
+{
+namespace JOYSTICK
+{
+  class IButtonSequence
+  {
+  public:
+    virtual ~IButtonSequence() = default;
+
+    virtual bool OnButtonPress(const FeatureName& feature) = 0;
+  };
+}
+}

_service:download_files:master.tar.gz/xbmc/input/joysticks/interfaces/IDriverHandler.h Added

@@ -0,0 +1,85 @@
+/*
+ *      Copyright (C) 2014-2017 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "input/joysticks/JoystickTypes.h"
+
+namespace KODI
+{
+namespace JOYSTICK
+{
+  /*!
+   * \brief Interface defining methods to handle joystick events for raw driver
+   *        elements (buttons, hats, axes)
+   */
+  class IDriverHandler
+  {
+  public:
+    virtual ~IDriverHandler() = default;
+
+    /*!
+     * \brief Handle button motion
+     *
+     * \param buttonIndex The index of the button as reported by the driver
+     * \param bPressed    true for press motion, false for release motion
+     *
+     * \return True if a press was handled, false otherwise
+     */
+    virtual bool OnButtonMotion(unsigned int buttonIndex, bool bPressed) = 0;
+
+    /*!
+     * \brief Handle hat motion
+     *
+     * \param hatIndex     The index of the hat as reported by the driver
+     * \param state        The direction the hat is now being pressed
+     *
+     * \return True if the new direction was handled, false otherwise
+     */
+    virtual bool OnHatMotion(unsigned int hatIndex, HAT_STATE state) = 0;
+
+    /*!
+     * \brief Handle axis motion
+     *
+     * If a joystick feature requires multiple axes (analog sticks, accelerometers),
+     * they can be buffered for later processing.
+     *
+     * \param axisIndex   The index of the axis as reported by the driver
+     * \param position    The position of the axis in the closed interval [-1.0, 1.0]
+     * \param center      The center point of the axis (either -1, 0 or 1)
+     * \param range       The maximum distance the axis can move (either 1 or 2)
+     *
+     * \return True if the motion was handled, false otherwise
+     */
+    virtual bool OnAxisMotion(unsigned int axisIndex, float position, int center, unsigned int range) = 0;
+
+    /*!
+     * \brief Handle buffered axis positions for features that require multiple axes
+     *
+     * ProcessAxisMotions() is called at the end of the frame when all axis motions
+     * have been reported. This has several uses, including:
+     *
+     *  - Combining multiple axes into a single analog stick or accelerometer event
+     *  - Imitating an analog feature with a digital button so that events can be
+     *    dispatched every frame.
+     */
+    virtual void ProcessAxisMotions(void) = 0;
+  };
+}
+}

_service:download_files:master.tar.gz/xbmc/input/joysticks/interfaces/IDriverReceiver.h Changed

_service:download_files:master.tar.gz/xbmc/input/joysticks/interfaces/IInputHandler.h Added

@@ -0,0 +1,165 @@
+/*
+ *      Copyright (C) 2014-2017 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "input/joysticks/JoystickTypes.h"
+
+#include <string>
+
+namespace KODI
+{
+namespace JOYSTICK
+{
+  class IInputReceiver;
+
+  /*!
+   * \ingroup joystick
+   * \brief Interface for handling input events for game controllers
+   */
+  class IInputHandler
+  {
+  public:
+    IInputHandler(void) : m_receiver(nullptr) { }
+
+    virtual ~IInputHandler() = default;
+
+    /*!
+     * \brief The add-on ID of the game controller associated with this input handler
+     *
+     * \return The ID of the add-on extending kodi.game.controller
+     */
+    virtual std::string ControllerID(void) const = 0;
+
+    /*!
+     * \brief Return true if the input handler accepts the given feature
+     *
+     * \param feature A feature belonging to the controller specified by ControllerID()
+     *
+     * \return True if the feature is used for input, false otherwise
+     */
+    virtual bool HasFeature(const FeatureName& feature) const = 0;
+
+    /*!
+     * \brief Return true if the input handler is currently accepting input for the
+     *        given feature
+     *
+     * \param feature A feature belonging to the controller specified by ControllerID()
+     *
+     * \return True if the feature is currently accepting input, false otherwise
+     *
+     * This does not prevent the input events from being called, but can return
+     * false to indicate that input wasn't handled for the specified feature.
+     */
+    virtual bool AcceptsInput(const FeatureName &feature) const = 0;
+
+    /*!
+     * \brief A digital button has been pressed or released
+     *
+     * \param feature      The feature being pressed
+     * \param bPressed     True if pressed, false if released
+     *
+     * \return True if the event was handled otherwise false
+     */
+    virtual bool OnButtonPress(const FeatureName& feature, bool bPressed) = 0;
+
+    /*!
+     * \brief A digital button has been pressed for more than one event frame
+     *
+     * \param feature      The feature being held
+     * \param holdTimeMs   The time elapsed since the initial press (ms)
+     *
+     * If OnButtonPress() returns true for the initial press, then this callback
+     * is invoked on subsequent frames until the button is released.
+     */
+    virtual void OnButtonHold(const FeatureName& feature, unsigned int holdTimeMs) = 0;
+
+    /*!
+     * \brief An analog button (trigger or a pressure-sensitive button) has changed state
+     *
+     * \param feature      The feature changing state
+     * \param magnitude    The button pressure or trigger travel distance in the
+     *                     closed interval [0, 1]
+     * \param motionTimeMs The time elapsed since the magnitude was 0
+     *
+     * \return True if the event was handled otherwise false
+     */
+    virtual bool OnButtonMotion(const FeatureName& feature, float magnitude, unsigned int motionTimeMs) = 0;
+
+    /*!
+     * \brief An analog stick has moved
+     *
+     * \param feature      The analog stick being moved
+     * \param x            The x coordinate in the closed interval [-1, 1]
+     * \param y            The y coordinate in the closed interval [-1, 1]
+     * \param motionTimeMs The time elapsed since this analog stick was centered,
+     *                     or 0 if the analog stick is centered
+     *
+     * \return True if the event was handled otherwise false
+     */
+    virtual bool OnAnalogStickMotion(const FeatureName& feature, float x, float y, unsigned int motionTimeMs) = 0;
+
+    /*!
+     * \brief An accelerometer's state has changed
+     *
+     * \param feature      The accelerometer being accelerated
+     * \param x            The x coordinate in the closed interval [-1, 1]
+     * \param y            The y coordinate in the closed interval [-1, 1]
+     * \param z            The z coordinate in the closed interval [-1, 1]
+     *
+     * \return True if the event was handled otherwise false
+     */
+    virtual bool OnAccelerometerMotion(const FeatureName& feature, float x, float y, float z) { return false; }
+
+    /*!
+     * \brief A wheel has changed state
+     *
+     * Left is negative position, right is positive position
+     *
+     * \param feature      The wheel changing state
+     * \param position     The position in the closed interval [-1, 1]
+     * \param motionTimeMs The time elapsed since the position was 0
+     *
+     * \return True if the event was handled otherwise false
+     */
+    virtual bool OnWheelMotion(const FeatureName& feature, float position, unsigned int motionTimeMs) = 0;
+
+    /*!
+     * \brief A throttle has changed state
+     *
+     * Up is positive position, down is negative position.
+     *
+     * \param feature      The wheel changing state
+     * \param position     The position in the closed interval [-1, 1]
+     * \param motionTimeMs The time elapsed since the position was 0
+     *
+     * \return True if the event was handled otherwise false
+     */
+    virtual bool OnThrottleMotion(const FeatureName& feature, float position, unsigned int motionTimeMs) = 0;
+
+    // Input receiver interface
+    void SetInputReceiver(IInputReceiver* receiver) { m_receiver = receiver; }
+    void ResetInputReceiver(void) { m_receiver = nullptr; }
+    IInputReceiver* InputReceiver(void) { return m_receiver; }
+
+  private:
+    IInputReceiver* m_receiver;
+  };
+}
+}

_service:download_files:master.tar.gz/xbmc/input/joysticks/interfaces/IInputProvider.h Changed

_service:download_files:master.tar.gz/xbmc/input/joysticks/interfaces/IInputReceiver.h Added

@@ -0,0 +1,48 @@
+/*
+ *      Copyright (C) 2014-2017 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "input/joysticks/JoystickTypes.h"
+
+namespace KODI
+{
+namespace JOYSTICK
+{
+  /*!
+   * \ingroup joystick
+   * \brief Interface for sending input events to game controllers
+   */
+  class IInputReceiver
+  {
+  public:
+    virtual ~IInputReceiver() = default;
+
+    /*!
+     * \brief Set the value of a rumble motor
+     *
+     * \param feature      The name of the motor to rumble
+     * \param magnitude    The motor's new magnitude of vibration in the closed interval [0, 1]
+     *
+     * \return True if the event was handled otherwise false
+     */
+    virtual bool SetRumbleState(const FeatureName& feature, float magnitude) = 0;
+  };
+}
+}

_service:download_files:master.tar.gz/xbmc/input/joysticks/keymaps/KeymapHandler.h Changed

_service:download_files:master.tar.gz/xbmc/input/joysticks/keymaps/KeymapHandling.cpp Changed

_service:download_files:master.tar.gz/xbmc/input/keyboard/CMakeLists.txt Changed

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

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

_service:download_files:master.tar.gz/xbmc/input/keyboard/generic/JoystickEmulation.cpp Changed

_service:download_files:master.tar.gz/xbmc/input/keyboard/generic/JoystickEmulation.h Changed

_service:download_files:master.tar.gz/xbmc/input/keyboard/interfaces Added

_service:download_files:master.tar.gz/xbmc/input/keyboard/interfaces/IActionMap.h Changed

_service:download_files:master.tar.gz/xbmc/input/keyboard/interfaces/IKeyboardHandler.h Changed

_service:download_files:master.tar.gz/xbmc/input/keyboard/interfaces/IKeyboardInputProvider.h Changed

_service:download_files:master.tar.gz/xbmc/input/mouse/CMakeLists.txt Changed

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

_service:download_files:master.tar.gz/xbmc/input/mouse/generic/MouseInputHandling.cpp Changed

_service:download_files:master.tar.gz/xbmc/input/mouse/generic/MouseInputHandling.h Changed

_service:download_files:master.tar.gz/xbmc/input/mouse/interfaces Added

_service:download_files:master.tar.gz/xbmc/input/mouse/interfaces/IMouseButtonMap.h Changed

_service:download_files:master.tar.gz/xbmc/input/mouse/interfaces/IMouseDriverHandler.h Changed

_service:download_files:master.tar.gz/xbmc/input/mouse/interfaces/IMouseInputHandler.h Changed

_service:download_files:master.tar.gz/xbmc/input/mouse/interfaces/IMouseInputProvider.h Changed

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

_service:download_files:master.tar.gz/xbmc/network/httprequesthandler/python/HTTPPythonWsgiInvoker.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/win10/NetworkWin10.cpp Changed

_service:download_files:master.tar.gz/xbmc/peripherals/Peripherals.cpp Changed

_service:download_files:master.tar.gz/xbmc/peripherals/Peripherals.h Changed

@@ -33,6 +33,7 @@
 #include "utils/Observer.h"
 
 class CFileItemList;
+class CInputManager;
 class CSetting;
 class CSettingsCategory;
 class TiXmlElement;
@@ -41,6 +42,11 @@
 
 namespace KODI
 {
+namespace GAME
+{
+  class CControllerManager;
+}
+
 namespace JOYSTICK
 {
   class IButtonMapper;
@@ -61,7 +67,9 @@
                         public ANNOUNCEMENT::IAnnouncer
   {
   public:
-    explicit CPeripherals(ANNOUNCEMENT::CAnnouncementManager &announcements);
+    explicit CPeripherals(ANNOUNCEMENT::CAnnouncementManager &announcements,
+                          CInputManager &inputManager,
+                          KODI::GAME::CControllerManager &controllerProfiles);
 
     ~CPeripherals() override;
 
@@ -313,6 +321,16 @@
     // implementation of IAnnouncer
     void Announce(ANNOUNCEMENT::AnnouncementFlag flag, const char *sender, const char *message, const CVariant &data) override;
 
+    /*!
+     * \brief Access the input manager passed to the constructor
+     */
+    CInputManager &GetInputManager() { return m_inputManager; }
+
+    /*!
+     * \brief Access controller profiles through the construction parameter
+     */
+    KODI::GAME::CControllerManager &GetControllerProfiles() { return m_controllerProfiles; }
+
   private:
     bool LoadMappings();
     bool GetMappingForDevice(const CPeripheralBus &bus, PeripheralScanResult& result) const;
@@ -322,6 +340,8 @@
 
     // Construction parameters
     ANNOUNCEMENT::CAnnouncementManager &m_announcements;
+    CInputManager &m_inputManager;
+    KODI::GAME::CControllerManager &m_controllerProfiles;
 
 #if !defined(HAVE_LIBCEC)
     bool                                 m_bMissingLibCecWarningDisplayed = false;

_service:download_files:master.tar.gz/xbmc/peripherals/addons/AddonButtonMap.cpp Changed

_service:download_files:master.tar.gz/xbmc/peripherals/addons/AddonButtonMap.h Changed

_service:download_files:master.tar.gz/xbmc/peripherals/addons/AddonButtonMapping.cpp Changed

_service:download_files:master.tar.gz/xbmc/peripherals/addons/AddonButtonMapping.h Changed

_service:download_files:master.tar.gz/xbmc/peripherals/addons/AddonInputHandling.cpp Changed

_service:download_files:master.tar.gz/xbmc/peripherals/addons/AddonInputHandling.h Changed

_service:download_files:master.tar.gz/xbmc/peripherals/addons/PeripheralAddon.cpp Changed

@@ -20,7 +20,6 @@
 
 #include "PeripheralAddon.h"
 #include "PeripheralAddonTranslator.h"
-#include "ServiceBroker.h"
 #include "AddonButtonMap.h"
 #include "PeripheralAddonTranslator.h"
 #include "addons/AddonManager.h"
@@ -28,9 +27,9 @@
 #include "filesystem/SpecialProtocol.h"
 #include "games/controllers/Controller.h"
 #include "games/controllers/ControllerManager.h"
+#include "input/joysticks/interfaces/IButtonMap.h"
+#include "input/joysticks/interfaces/IDriverHandler.h"
 #include "input/joysticks/DriverPrimitive.h"
-#include "input/joysticks/IButtonMap.h"
-#include "input/joysticks/IDriverHandler.h"
 #include "input/joysticks/JoystickTranslator.h"
 #include "input/joysticks/JoystickUtils.h"
 #include "peripherals/Peripherals.h"
@@ -58,8 +57,9 @@
   #define SAFE_DELETE(p)  do { delete (p); (p) = NULL; } while (0)
 #endif
 
-CPeripheralAddon::CPeripheralAddon(const ADDON::BinaryAddonBasePtr& addonInfo)
+CPeripheralAddon::CPeripheralAddon(const ADDON::BinaryAddonBasePtr& addonInfo, CPeripherals &manager)
   : IAddonInstanceHandler(ADDON_INSTANCE_PERIPHERAL, addonInfo),
+    m_manager(manager),
     m_bSupportsJoystickRumble(false),
     m_bSupportsJoystickPowerOff(false)
 {
@@ -774,6 +774,39 @@
   }
 }
 
+void CPeripheralAddon::TriggerDeviceScan()
+{
+  m_manager.TriggerDeviceScan(PERIPHERAL_BUS_ADDON);
+}
+
+unsigned int CPeripheralAddon::FeatureCount(const std::string &controllerId, JOYSTICK_FEATURE_TYPE type) const
+{
+  using namespace GAME;
+
+  unsigned int count = 0;
+
+  CControllerManager& controllerProfiles = m_manager.GetControllerProfiles();
+  ControllerPtr controller = controllerProfiles.GetController(controllerId);
+  if (controller)
+    count = controller->FeatureCount(CPeripheralAddonTranslator::TranslateFeatureType(type));
+
+  return count;
+}
+
+JOYSTICK_FEATURE_TYPE CPeripheralAddon::FeatureType(const std::string &controllerId, const std::string &featureName) const
+{
+  using namespace GAME;
+
+  JOYSTICK_FEATURE_TYPE type = JOYSTICK_FEATURE_TYPE_UNKNOWN;
+
+  CControllerManager& controllerProfiles = m_manager.GetControllerProfiles();
+  ControllerPtr controller = controllerProfiles.GetController(controllerId);
+  if (controller)
+    type = CPeripheralAddonTranslator::TranslateFeatureType(controller->FeatureType(featureName));
+
+  return type;
+}
+
 void CPeripheralAddon::GetPeripheralInfo(const CPeripheral* device, kodi::addon::Peripheral& peripheralInfo)
 {
   peripheralInfo.SetType(CPeripheralAddonTranslator::TranslateType(device->Type()));
@@ -855,7 +888,10 @@
 
 void CPeripheralAddon::cb_trigger_scan(void* kodiInstance)
 {
-  CServiceBroker::GetPeripherals().TriggerDeviceScan(PERIPHERAL_BUS_ADDON);
+  if (kodiInstance == nullptr)
+    return;
+
+  static_cast<CPeripheralAddon*>(kodiInstance)->TriggerDeviceScan();
 }
 
 void CPeripheralAddon::cb_refresh_button_maps(void* kodiInstance, const char* deviceName, const char* controllerId)
@@ -868,28 +904,16 @@
 
 unsigned int CPeripheralAddon::cb_feature_count(void* kodiInstance, const char* controllerId, JOYSTICK_FEATURE_TYPE type)
 {
-  using namespace GAME;
+  if (kodiInstance == nullptr || controllerId == nullptr)
+    return 0;
 
-  unsigned int count = 0;
-
-  CControllerManager& controllerManager = CServiceBroker::GetGameControllerManager();
-  ControllerPtr controller = controllerManager.GetController(controllerId);
-  if (controller)
-    count = controller->FeatureCount(CPeripheralAddonTranslator::TranslateFeatureType(type));
-
-  return count;
+  return static_cast<CPeripheralAddon*>(kodiInstance)->FeatureCount(controllerId, type);
 }
 
 JOYSTICK_FEATURE_TYPE CPeripheralAddon::cb_feature_type(void* kodiInstance, const char* controllerId, const char* featureName)
 {
-  using namespace GAME;
-
-  JOYSTICK_FEATURE_TYPE type = JOYSTICK_FEATURE_TYPE::JOYSTICK_FEATURE_TYPE_UNKNOWN;
+  if (kodiInstance == nullptr || controllerId == nullptr || featureName == nullptr)
+    return JOYSTICK_FEATURE_TYPE_UNKNOWN;
 
-  CControllerManager& controllerManager = CServiceBroker::GetGameControllerManager();
-  ControllerPtr controller = controllerManager.GetController(controllerId);
-  if (controller)
-    type = CPeripheralAddonTranslator::TranslateFeatureType(controller->FeatureType(featureName));
-
-  return type;
+  return static_cast<CPeripheralAddon*>(kodiInstance)->FeatureType(controllerId, featureName);
 }

_service:download_files:master.tar.gz/xbmc/peripherals/addons/PeripheralAddon.h Changed

@@ -45,6 +45,7 @@
 {
   class CPeripheral;
   class CPeripheralJoystick;
+  class CPeripherals;
 
   typedef std::vector<kodi::addon::DriverPrimitive> PrimitiveVector;
   typedef std::map<KODI::JOYSTICK::FeatureName, kodi::addon::JoystickFeature> FeatureMap;
@@ -52,7 +53,7 @@
   class CPeripheralAddon : public ADDON::IAddonInstanceHandler
   {
   public:
-    explicit CPeripheralAddon(const ADDON::BinaryAddonBasePtr& addonInfo);
+    explicit CPeripheralAddon(const ADDON::BinaryAddonBasePtr& addonInfo, CPeripherals &manager);
     ~CPeripheralAddon(void) override;
 
     /*!
@@ -100,7 +101,6 @@
 
     void RegisterButtonMap(CPeripheral* device, KODI::JOYSTICK::IButtonMap* buttonMap);
     void UnregisterButtonMap(KODI::JOYSTICK::IButtonMap* buttonMap);
-    void RefreshButtonMaps(const std::string& strDeviceName = "");
 
     static inline bool ProvidesJoysticks(const ADDON::BinaryAddonBasePtr& addonInfo)
     {
@@ -115,6 +115,12 @@
   private:
     void UnregisterButtonMap(CPeripheral* device);
 
+    // Binary add-on callbacks
+    void TriggerDeviceScan();
+    void RefreshButtonMaps(const std::string& strDeviceName = "");
+    unsigned int FeatureCount(const std::string &controllerId, JOYSTICK_FEATURE_TYPE type) const;
+    JOYSTICK_FEATURE_TYPE FeatureType(const std::string &controllerId, const std::string &featureName) const;
+
     /*!
      * @brief Helper functions
      */
@@ -138,6 +144,9 @@
     static std::string GetDeviceName(PeripheralType type);
     static std::string GetProvider(PeripheralType type);
 
+    // Construction parameters
+    CPeripherals &m_manager;
+
     /* @brief Cache for const char* members in PERIPHERAL_PROPERTIES */
     std::string         m_strUserPath;    /*!< @brief translated path to the user profile */
     std::string         m_strClientPath;  /*!< @brief translated path to this add-on */

_service:download_files:master.tar.gz/xbmc/peripherals/addons/PeripheralAddonTranslator.cpp Changed

_service:download_files:master.tar.gz/xbmc/peripherals/bus/virtual/PeripheralBusAddon.cpp Changed

_service:download_files:master.tar.gz/xbmc/peripherals/devices/Peripheral.cpp Changed

@@ -23,7 +23,7 @@
 #include <utility>
 
 #include "guilib/LocalizeStrings.h"
-#include "input/joysticks/IInputHandler.h"
+#include "input/joysticks/interfaces/IInputHandler.h"
 #include "peripherals/addons/PeripheralAddon.h"
 #include "peripherals/bus/virtual/PeripheralBusAddon.h"
 #include "peripherals/Peripherals.h"
@@ -586,22 +586,24 @@
 
 void CPeripheral::RegisterJoystickButtonMapper(IButtonMapper* mapper)
 {
-  std::map<IButtonMapper*, IDriverHandler*>::iterator it = m_buttonMappers.find(mapper);
+  auto it = m_buttonMappers.find(mapper);
   if (it == m_buttonMappers.end())
   {
-    IDriverHandler* addonMapping = new CAddonButtonMapping(m_manager, this, mapper);
-    RegisterJoystickDriverHandler(addonMapping, false);
-    m_buttonMappers[mapper] = addonMapping;
+    std::unique_ptr<CAddonButtonMapping> addonMapping(new CAddonButtonMapping(m_manager, this, mapper));
+
+    RegisterJoystickDriverHandler(addonMapping.get(), false);
+
+    m_buttonMappers[mapper] = std::move(addonMapping);
   }
 }
 
 void CPeripheral::UnregisterJoystickButtonMapper(IButtonMapper* mapper)
 {
-  std::map<IButtonMapper*, IDriverHandler*>::iterator it = m_buttonMappers.find(mapper);
+  auto it = m_buttonMappers.find(mapper);
   if (it != m_buttonMappers.end())
   {
-    UnregisterJoystickDriverHandler(it->second);
-    delete it->second;
+    UnregisterJoystickDriverHandler(it->second.get());
+
     m_buttonMappers.erase(it);
   }
 }

_service:download_files:master.tar.gz/xbmc/peripherals/devices/Peripheral.h Changed

_service:download_files:master.tar.gz/xbmc/peripherals/devices/PeripheralHID.cpp Changed

@@ -22,7 +22,7 @@
 #include "utils/log.h"
 #include "guilib/LocalizeStrings.h"
 #include "input/InputManager.h"
-#include "ServiceBroker.h"
+#include "peripherals/Peripherals.h"
 
 using namespace PERIPHERALS;
 
@@ -38,7 +38,7 @@
   if (!m_strKeymap.empty() && !GetSettingBool("do_not_use_custom_keymap"))
   {
     CLog::Log(LOGDEBUG, "%s - switching active keymapping to: default", __FUNCTION__);
-    CServiceBroker::GetInputManager().RemoveKeymap(m_strKeymap);
+    m_manager.GetInputManager().RemoveKeymap(m_strKeymap);
   }
 }
 
@@ -66,12 +66,12 @@
       if (bKeymapEnabled)
       {
         CLog::Log(LOGDEBUG, "%s - adding keymapping for: %s", __FUNCTION__, m_strKeymap.c_str());
-        CServiceBroker::GetInputManager().AddKeymap(m_strKeymap);
+        m_manager.GetInputManager().AddKeymap(m_strKeymap);
       }
       else if (!bKeymapEnabled)
       {
         CLog::Log(LOGDEBUG, "%s - removing keymapping for: %s", __FUNCTION__, m_strKeymap.c_str());
-        CServiceBroker::GetInputManager().RemoveKeymap(m_strKeymap);
+        m_manager.GetInputManager().RemoveKeymap(m_strKeymap);
       }
     }

_service:download_files:master.tar.gz/xbmc/peripherals/devices/PeripheralJoystick.cpp Changed

@@ -19,10 +19,10 @@
  */
 
 #include "PeripheralJoystick.h"
+#include "games/controllers/ControllerIDs.h"
+#include "input/joysticks/interfaces/IDriverHandler.h"
 #include "input/joysticks/keymaps/KeymapHandling.h"
 #include "input/joysticks/DeadzoneFilter.h"
-#include "input/joysticks/IDriverHandler.h"
-#include "input/joysticks/JoystickIDs.h"
 #include "input/joysticks/JoystickMonitor.h"
 #include "input/joysticks/JoystickTranslator.h"
 #include "input/joysticks/RumbleGenerator.h"
@@ -34,7 +34,6 @@
 #include "threads/SingleLock.h"
 #include "utils/log.h"
 #include "Application.h"
-#include "ServiceBroker.h"
 
 #include <algorithm>
 
@@ -93,7 +92,7 @@
         InitializeDeadzoneFiltering();
 
         // Give joystick monitor priority over default controller
-        m_appInput.reset(new CKeymapHandling(this, false, CServiceBroker::GetInputManager().KeymapEnvironment()));
+        m_appInput.reset(new CKeymapHandling(this, false, m_manager.GetInputManager().KeymapEnvironment()));
         m_joystickMonitor.reset(new CJoystickMonitor);
         RegisterInputHandler(m_joystickMonitor.get(), false);
       }

_service:download_files:master.tar.gz/xbmc/peripherals/devices/PeripheralJoystick.h Changed

_service:download_files:master.tar.gz/xbmc/peripherals/devices/PeripheralJoystickEmulation.cpp Changed

_service:download_files:master.tar.gz/xbmc/peripherals/devices/PeripheralJoystickEmulation.h Changed

_service:download_files:master.tar.gz/xbmc/platform/posix/Filesystem.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/win32/WinMain.cpp Changed

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

@@ -397,7 +397,7 @@
         tag.DeTokenize(tag.Writers()).c_str(), tag.Year(), tag.IMDBNumber().c_str(),
         tag.Icon().c_str(), tag.GenreType(), tag.GenreSubType(), strGenre.c_str(),
         static_cast<unsigned int>(iFirstAired), tag.ParentalRating(), tag.StarRating(), tag.Notify(),
-        tag.SeriesNumber(), tag.EpisodeNumber(), tag.EpisodePart(), tag.EpisodeName().c_str(), tag.Flags(),
+        tag.SeriesNumber(), tag.EpisodeNumber(), tag.EpisodePart(), tag.EpisodeName(true).c_str(), tag.Flags(),
         tag.UniqueBroadcastID());
   }
   else
@@ -413,7 +413,7 @@
         tag.DeTokenize(tag.Writers()).c_str(), tag.Year(), tag.IMDBNumber().c_str(),
         tag.Icon().c_str(), tag.GenreType(), tag.GenreSubType(), strGenre.c_str(),
         static_cast<unsigned int>(iFirstAired), tag.ParentalRating(), tag.StarRating(), tag.Notify(),
-        tag.SeriesNumber(), tag.EpisodeNumber(), tag.EpisodePart(), tag.EpisodeName().c_str(), tag.Flags(),
+        tag.SeriesNumber(), tag.EpisodeNumber(), tag.EpisodePart(), tag.EpisodeName(true).c_str(), tag.Flags(),
         tag.UniqueBroadcastID(), iBroadcastId);
   }

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

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

@@ -189,27 +189,28 @@
 
     /*!
      * @brief Get the title of this event.
-     * @param bOverrideParental True to override parental control, false check it.
+     * @param bOverrideParental True to override parental control, false to check it.
      * @return The title.
      */
     std::string Title(bool bOverrideParental = false) const;
 
     /*!
      * @brief Get the plot outline of this event.
-     * @param bOverrideParental True to override parental control, false check it.
+     * @param bOverrideParental True to override parental control, false to check it.
      * @return The plot outline.
      */
     std::string PlotOutline(bool bOverrideParental = false) const;
 
     /*!
      * @brief Get the plot of this event.
-     * @param bOverrideParental True to override parental control, false check it.
+     * @param bOverrideParental True to override parental control, false to check it.
      * @return The plot.
      */
     std::string Plot(bool bOverrideParental = false) const;
 
     /*!
      * @brief Get the original title of this event.
+     * @param bOverrideParental True to override parental control, false check it.
      * @return The original title.
      */
     std::string OriginalTitle(bool bOverrideParental = false) const;
@@ -337,9 +338,10 @@
 
     /*!
      * @brief The episode name of this event.
+     * @param bOverrideParental True to override parental control, false to check it.
      * @return The episode name.
      */
-    std::string EpisodeName(void) const;
+    std::string EpisodeName(bool bOverrideParental = false) const;
 
     /*!
      * @brief Get the path to the icon for this event.

_service:download_files:master.tar.gz/xbmc/settings/Settings.cpp Changed

@@ -31,7 +31,6 @@
 #include "cores/playercorefactory/PlayerCoreFactory.h"
 #include "cores/VideoPlayer/VideoRenderers/BaseRenderer.h"
 #include "filesystem/File.h"
-#include "games/GameSettings.h"
 #include "guilib/GUIAudioManager.h"
 #include "guilib/GUIFontManager.h"
 #include "guilib/StereoscopicsManager.h"
@@ -1003,20 +1002,6 @@
   settingSet.insert(CSettings::SETTING_POWERMANAGEMENT_WAKEONACCESS);
   GetSettingsManager()->RegisterCallback(&CWakeOnAccess::GetInstance(), settingSet);
 
-  settingSet.clear();
-  settingSet.insert(CSettings::SETTING_GAMES_KEYBOARD_PLAYERS);
-  settingSet.insert(CSettings::SETTING_GAMES_KEYBOARD_PLAYERCONFIG_1);
-  settingSet.insert(CSettings::SETTING_GAMES_KEYBOARD_PLAYERCONFIG_2);
-  settingSet.insert(CSettings::SETTING_GAMES_KEYBOARD_PLAYERCONFIG_3);
-  settingSet.insert(CSettings::SETTING_GAMES_KEYBOARD_PLAYERCONFIG_4);
-  settingSet.insert(CSettings::SETTING_GAMES_KEYBOARD_PLAYERCONFIG_5);
-  settingSet.insert(CSettings::SETTING_GAMES_KEYBOARD_PLAYERCONFIG_6);
-  settingSet.insert(CSettings::SETTING_GAMES_KEYBOARD_PLAYERCONFIG_7);
-  settingSet.insert(CSettings::SETTING_GAMES_KEYBOARD_PLAYERCONFIG_8);
-  settingSet.insert(CSettings::SETTING_GAMES_ENABLEREWIND);
-  settingSet.insert(CSettings::SETTING_GAMES_REWINDTIME);
-  GetSettingsManager()->RegisterCallback(&GAME::CGameSettings::GetInstance(), settingSet);
-
 #ifdef HAVE_LIBBLURAY
   settingSet.clear();
   settingSet.insert(CSettings::SETTING_DISC_PLAYBACK);
@@ -1039,7 +1024,6 @@
   GetSettingsManager()->UnregisterCallback(&CNetworkServices::GetInstance());
   GetSettingsManager()->UnregisterCallback(&g_passwordManager);
   GetSettingsManager()->UnregisterCallback(&CRssManager::GetInstance());
-  GetSettingsManager()->UnregisterCallback(&GAME::CGameSettings::GetInstance());
 #if defined(TARGET_LINUX)
   GetSettingsManager()->UnregisterCallback(&g_timezone);
 #endif // defined(TARGET_LINUX)

_service:download_files:master.tar.gz/xbmc/settings/lib/Setting.cpp Changed

@@ -763,8 +763,6 @@
         if (!m_optionsFillerName.empty())
         {
           m_optionsFiller = reinterpret_cast<IntegerSettingOptionsFiller>(m_settingsManager->GetSettingOptionsFiller(shared_from_base<CSettingInt>()));
-          if (m_optionsFiller == nullptr)
-            CLog::Log(LOGWARNING, "CSettingInt: unknown options filler \"%s\" of \"%s\"", m_optionsFillerName.c_str(), m_id.c_str());
         }
       }
       else
@@ -911,7 +909,10 @@
   {
     m_optionsFiller = reinterpret_cast<IntegerSettingOptionsFiller>(m_settingsManager->GetSettingOptionsFiller(shared_from_base<CSettingInt>()));
     if (m_optionsFiller == nullptr)
+    {
+      CLog::Log(LOGERROR, "CSettingInt: unknown options filler \"%s\" of \"%s\"", m_optionsFillerName.c_str(), m_id.c_str());
       return options;
+    }
   }
 
   int bestMatchingValue = m_value;
@@ -1193,8 +1194,6 @@
         if (!m_optionsFillerName.empty())
         {
           m_optionsFiller = reinterpret_cast<StringSettingOptionsFiller>(m_settingsManager->GetSettingOptionsFiller(shared_from_base<CSettingString>()));
-          if (m_optionsFiller == nullptr)
-            CLog::Log(LOGWARNING, "CSettingString: unknown options filler \"%s\" of \"%s\"", m_optionsFillerName.c_str(), m_id.c_str());
         }
       }
       else
@@ -1314,7 +1313,10 @@
   {
     m_optionsFiller = reinterpret_cast<StringSettingOptionsFiller>(m_settingsManager->GetSettingOptionsFiller(shared_from_base<CSettingString>()));
     if (m_optionsFiller == nullptr)
+    {
+      CLog::Log(LOGERROR, "CSettingString: unknown options filler \"%s\" of \"%s\"", m_optionsFillerName.c_str(), m_id.c_str());
       return options;
+    }
   }
 
   std::string bestMatchingValue = m_value;

_service:download_files:master.tar.gz/xbmc/utils/AMLUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/JobManager.h Changed

@@ -39,6 +39,24 @@
   CJobManager  *m_jobManager;
 };
 
+template<typename F>
+class CLambdaJob : public CJob
+{
+public:
+  CLambdaJob(F&& f) : m_f(std::forward<F>(f)) {};
+  bool DoWork() override
+  {
+    m_f();
+    return true;
+  }
+  bool operator==(const CJob *job) const override
+  {
+    return this == job;
+  };
+private:
+  F m_f;
+};
+
 /*!
  \ingroup jobs
  \brief Job Queue class to handle a queue of unique jobs to be processed sequentially
@@ -103,6 +121,15 @@
   bool AddJob(CJob *job);
 
   /*!
+   \brief Add a function f to this job queue
+   */
+  template<typename F>
+  void Submit(F&& f)
+  {
+    AddJob(new CLambdaJob<F>(std::forward<F>(f)));
+  }
+
+  /*!
    \brief Cancel a job in the queue
    Cancels a job in the queue. Any job currently being processed may complete after this
    call has completed, but OnJobComplete will not be performed. If the job is only queued
@@ -207,20 +234,6 @@
     CJob::PRIORITY m_priority;
   };
 
-  template<typename F>
-  class CLambdaJob : public CJob
-  {
-  public:
-    CLambdaJob(F&& f) : m_f(std::forward<F>(f)) {};
-    bool DoWork() override
-    {
-      m_f();
-      return true;
-    }
-  private:
-    F m_f;
-  };
-
 public:
   /*!
    \brief The only way through which the global instance of the CJobManager should be accessed.

_service:download_files:master.tar.gz/xbmc/windowing/X11/WinSystemX11GLContext.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/ShellSurfaceXdgShell.cpp Added

@@ -0,0 +1,163 @@
+/*
+ *      Copyright (C) 2017 Team XBMC
+ *      http://xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "ShellSurfaceXdgShell.h"
+
+#include "messaging/ApplicationMessenger.h"
+#include "Registry.h"
+
+using namespace KODI::WINDOWING::WAYLAND;
+
+namespace
+{
+
+IShellSurface::State ConvertStateFlag(wayland::xdg_toplevel_state flag)
+{
+  switch(flag)
+  {
+    case wayland::xdg_toplevel_state::activated:
+      return IShellSurface::STATE_ACTIVATED;
+    case wayland::xdg_toplevel_state::fullscreen:
+      return IShellSurface::STATE_FULLSCREEN;
+    case wayland::xdg_toplevel_state::maximized:
+      return IShellSurface::STATE_MAXIMIZED;
+    case wayland::xdg_toplevel_state::resizing:
+      return IShellSurface::STATE_RESIZING;
+    default:
+      throw std::runtime_error(std::string("Unknown xdg_toplevel state flag ") + std::to_string(static_cast<std::underlying_type<decltype(flag)>::type> (flag)));
+  }
+}
+
+}
+
+CShellSurfaceXdgShell* CShellSurfaceXdgShell::TryCreate(IShellSurfaceHandler& handler, CConnection& connection, const wayland::surface_t& surface, std::string const& title, std::string const& class_)
+{
+  wayland::xdg_wm_base_t shell;
+  CRegistry registry{connection};
+  registry.RequestSingleton(shell, 1, 1, false);
+  registry.Bind();
+
+  if (shell)
+  {
+    return new CShellSurfaceXdgShell(handler, connection.GetDisplay(), shell, surface, title, class_);
+  }
+  else
+  {
+    return nullptr;
+  }
+}
+
+CShellSurfaceXdgShell::CShellSurfaceXdgShell(IShellSurfaceHandler& handler, wayland::display_t& display, const wayland::xdg_wm_base_t& shell, const wayland::surface_t& surface, std::string const& title, std::string const& app_id)
+: m_handler{handler}, m_display{display}, m_shell{shell}, m_surface{surface}, m_xdgSurface{m_shell.get_xdg_surface(m_surface)}, m_xdgToplevel{m_xdgSurface.get_toplevel()}
+{
+  m_shell.on_ping() = [this](std::uint32_t serial)
+  {
+    m_shell.pong(serial);
+  };
+  m_xdgSurface.on_configure() = [this](std::uint32_t serial)
+  {
+    m_handler.OnConfigure(serial, m_configuredSize, m_configuredState);
+  };
+  m_xdgToplevel.on_close() = [this]()
+  {
+    m_handler.OnClose();
+  };
+  m_xdgToplevel.on_configure() = [this](std::int32_t width, std::int32_t height, std::vector<wayland::xdg_toplevel_state> states)
+  {
+    m_configuredSize.Set(width, height);
+    m_configuredState.reset();
+    for (auto state : states)
+    {
+      m_configuredState.set(ConvertStateFlag(state));
+    }
+  };
+  m_xdgToplevel.set_app_id(app_id);
+  m_xdgToplevel.set_title(title);
+  // Set sensible minimum size
+  m_xdgToplevel.set_min_size(300, 200);
+}
+
+void CShellSurfaceXdgShell::Initialize()
+{
+  // Commit surface to confirm role
+  // Don't do it in constructor since SetFullScreen might be called before
+  m_surface.commit();
+  // Make sure we get the initial configure before continuing
+  m_display.roundtrip();
+}
+
+void CShellSurfaceXdgShell::AckConfigure(std::uint32_t serial)
+{
+  m_xdgSurface.ack_configure(serial);
+}
+
+CShellSurfaceXdgShell::~CShellSurfaceXdgShell() noexcept
+{
+  // xdg_shell is picky: must destroy toplevel role before surface
+  m_xdgToplevel.proxy_release();
+  m_xdgSurface.proxy_release();
+}
+
+void CShellSurfaceXdgShell::SetFullScreen(const wayland::output_t& output, float)
+{
+  // xdg_shell does not support refresh rate setting at the moment
+  m_xdgToplevel.set_fullscreen(output);
+}
+
+void CShellSurfaceXdgShell::SetWindowed()
+{
+  m_xdgToplevel.unset_fullscreen();
+}
+
+void CShellSurfaceXdgShell::SetMaximized()
+{
+  m_xdgToplevel.set_maximized();
+}
+
+void CShellSurfaceXdgShell::UnsetMaximized()
+{
+  m_xdgToplevel.unset_maximized();
+}
+
+void CShellSurfaceXdgShell::SetMinimized()
+{
+  m_xdgToplevel.set_minimized();
+}
+
+void CShellSurfaceXdgShell::SetWindowGeometry(CRectInt geometry)
+{
+  m_xdgSurface.set_window_geometry(geometry.x1, geometry.y1, geometry.Width(), geometry.Height());
+}
+
+void CShellSurfaceXdgShell::StartMove(const wayland::seat_t& seat, std::uint32_t serial)
+{
+  m_xdgToplevel.move(seat, serial);
+}
+
+void CShellSurfaceXdgShell::StartResize(const wayland::seat_t& seat, std::uint32_t serial, wayland::shell_surface_resize edge)
+{
+  // wl_shell shell_surface_resize is identical to xdg_shell resize_edge
+  m_xdgToplevel.resize(seat, serial, static_cast<std::uint32_t> (edge));
+}
+
+void CShellSurfaceXdgShell::ShowShellContextMenu(const wayland::seat_t& seat, std::uint32_t serial, CPointInt position)
+{
+  m_xdgToplevel.show_window_menu(seat, serial, position.x, position.y);
+}

_service:download_files:master.tar.gz/xbmc/windowing/wayland/ShellSurfaceXdgShell.h Added

@@ -0,0 +1,84 @@
+/*
+ *      Copyright (C) 2017 Team XBMC
+ *      http://xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "Connection.h"
+#include "ShellSurface.h"
+
+#include <wayland-extra-protocols.hpp>
+
+namespace KODI
+{
+namespace WINDOWING
+{
+namespace WAYLAND
+{
+
+/**
+ * Shell surface implementation for stable xdg_shell
+ */
+class CShellSurfaceXdgShell : public IShellSurface
+{
+public:
+  /**
+   * Construct xdg_shell toplevel object for given surface
+   *
+   * \param handler the shell surface handler
+   * \param display the wl_display global (for initial roundtrip)
+   * \param shell the xdg_wm_base global
+   * \param surface surface to make shell surface for
+   * \param title title of the surfae
+   * \param class_ class of the surface, which should match the name of the
+   *               .desktop file of the application
+   */
+  CShellSurfaceXdgShell(IShellSurfaceHandler& handler, wayland::display_t& display, wayland::xdg_wm_base_t const& shell, wayland::surface_t const& surface, std::string const& title, std::string const& class_);
+  virtual ~CShellSurfaceXdgShell() noexcept;
+
+  static CShellSurfaceXdgShell* TryCreate(IShellSurfaceHandler& handler, CConnection& connection, wayland::surface_t const& surface, std::string const& title, std::string const& class_);
+
+  void Initialize() override;
+
+  void SetFullScreen(wayland::output_t const& output, float refreshRate) override;
+  void SetWindowed() override;
+  void SetMaximized() override;
+  void UnsetMaximized() override;
+  void SetMinimized() override;
+  void SetWindowGeometry(CRectInt geometry) override;
+  void AckConfigure(std::uint32_t serial) override;
+
+  void StartMove(const wayland::seat_t& seat, std::uint32_t serial) override;
+  void StartResize(const wayland::seat_t& seat, std::uint32_t serial, wayland::shell_surface_resize edge) override;
+  void ShowShellContextMenu(const wayland::seat_t& seat, std::uint32_t serial, CPointInt position) override;
+
+private:
+  IShellSurfaceHandler& m_handler;
+  wayland::display_t& m_display;
+  wayland::xdg_wm_base_t m_shell;
+  wayland::surface_t m_surface;
+  wayland::xdg_surface_t m_xdgSurface;
+  wayland::xdg_toplevel_t m_xdgToplevel;
+
+  CSizeInt m_configuredSize;
+  StateBitset m_configuredState;
+};
+
+}
+}
+}

_service:download_files:master.tar.gz/xbmc/windowing/wayland/ShellSurfaceXdgShellUnstableV6.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/WinSystemWayland.cpp Changed

@@ -44,6 +44,7 @@
 #include "settings/DisplaySettings.h"
 #include "settings/Settings.h"
 #include "ShellSurfaceWlShell.h"
+#include "ShellSurfaceXdgShell.h"
 #include "ShellSurfaceXdgShellUnstableV6.h"
 #include "threads/SingleLock.h"
 #include "Util.h"
@@ -303,10 +304,14 @@
   // Try with this resolution if compositor does not say otherwise
   UpdateSizeVariables({res.iWidth, res.iHeight}, m_scale, m_shellSurfaceState, false);
 
-  m_shellSurface.reset(CShellSurfaceXdgShellUnstableV6::TryCreate(*this, *m_connection, m_surface, name, KODI::LINUX::DESKTOP_FILE_NAME));
+  m_shellSurface.reset(CShellSurfaceXdgShell::TryCreate(*this, *m_connection, m_surface, name, KODI::LINUX::DESKTOP_FILE_NAME));
   if (!m_shellSurface)
   {
-    CLog::LogF(LOGWARNING, "Compositor does not support xdg_shell unstable v6 protocol - falling back to wl_shell, not all features might work");
+    m_shellSurface.reset(CShellSurfaceXdgShellUnstableV6::TryCreate(*this, *m_connection, m_surface, name, KODI::LINUX::DESKTOP_FILE_NAME));
+  }
+  if (!m_shellSurface)
+  {
+    CLog::LogF(LOGWARNING, "Compositor does not support xdg_shell protocol (stable or unstable v6) - falling back to wl_shell, not all features might work");
     m_shellSurface.reset(new CShellSurfaceWlShell(*this, *m_connection, m_surface, name, KODI::LINUX::DESKTOP_FILE_NAME));
   }
 
@@ -506,7 +511,7 @@
 {
   CSingleLock lock(m_outputsMutex);
   auto outputIt = std::find_if(m_outputs.begin(), m_outputs.end(),
-                               [this, &output](decltype(m_outputs)::value_type const& entry)
+                               [&output](decltype(m_outputs)::value_type const& entry)
                                {
                                  return (output == entry.second->GetWaylandOutput());
                                });

_service:download_files:master.tar.gz/xbmc/windowing/wayland/WinSystemWayland.h Changed

Changes of Revision 51