[xbmc] nuke whitespace

802 files changed, 3939 insertions, 3940 deletions

diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index c5d82fd2b7..fa1dd10398 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -583,7 +583,7 @@ bool CApplication::Create(const CAppParamParser &params)
   // application inbound service
   m_pAppPort = std::make_shared<CAppInboundProtocol>(*this);
   CServiceBroker::RegisterAppPort(m_pAppPort);
-  
+
   m_pWinSystem = CWinSystemBase::CreateWinSystem();
   CServiceBroker::RegisterWinSystem(m_pWinSystem.get());
 
@@ -1966,14 +1966,14 @@ bool CApplication::OnAction(const CAction &action)
       m_itemCurrentFile->GetMusicInfoTag()->SetUserrating(userrating);
       // Mirror changes to GUI item
       CServiceBroker::GetGUI()->GetInfoManager().SetCurrentItem(*m_itemCurrentFile);
-      
+
       // Asynchronously update song userrating in music library
       MUSIC_UTILS::UpdateSongRatingJob(m_itemCurrentFile, userrating);
 
-      // Tell all windows (e.g. playlistplayer, media windows) to update the fileitem 
+      // Tell all windows (e.g. playlistplayer, media windows) to update the fileitem
       CGUIMessage msg(GUI_MSG_NOTIFY_ALL, 0, 0, GUI_MSG_UPDATE_ITEM, 0, m_itemCurrentFile);
       CServiceBroker::GetGUI()->GetWindowManager().SendMessage(msg);
-    }      
+    }
     return true;
   }
 
@@ -2003,7 +2003,7 @@ bool CApplication::OnAction(const CAction &action)
       CGUIMessage msg(GUI_MSG_NOTIFY_ALL, 0, 0, GUI_MSG_UPDATE_ITEM, 0, m_itemCurrentFile);
       CServiceBroker::GetGUI()->GetWindowManager().SendMessage(msg);
     }
-    
+
     return true;
   }
   else if ((action.GetID() == ACTION_INCREASE_RATING || action.GetID() == ACTION_DECREASE_RATING) && m_appPlayer.IsPlayingVideo())
@@ -2028,8 +2028,8 @@ bool CApplication::OnAction(const CAction &action)
       CVideoDatabase db;
       if (db.Open())
       {
-        db.SetVideoUserRating(m_itemCurrentFile->GetVideoInfoTag()->m_iDbId, 
-                              m_itemCurrentFile->GetVideoInfoTag()->m_iUserRating, 
+        db.SetVideoUserRating(m_itemCurrentFile->GetVideoInfoTag()->m_iDbId,
+                              m_itemCurrentFile->GetVideoInfoTag()->m_iUserRating,
                               m_itemCurrentFile->GetVideoInfoTag()->m_type);
         db.Close();
       }
@@ -4916,7 +4916,7 @@ void CApplication::StartMusicCleanup(bool userInitiated /* = true */)
   if (userInitiated)
     /*
      CMusicLibraryQueue::GetInstance().CleanLibraryModal();
-     As cleaning is non-granular and does not offer many opportunities to update progress 
+     As cleaning is non-granular and does not offer many opportunities to update progress
      dialog rendering, do asynchronously with model dialog
     */
     CMusicLibraryQueue::GetInstance().CleanLibrary(true);
diff --git a/xbmc/Application.h b/xbmc/Application.h
index 3db0f8963c..57603ca0c9 100644
--- a/xbmc/Application.h
+++ b/xbmc/Application.h
@@ -354,7 +354,7 @@ public:
   ReplayGainSettings& GetReplayGainSettings() { return m_replayGainSettings; }
 
   void SetLoggingIn(bool switchingProfiles);
-  
+
   /*!
    \brief Register an action listener.
    \param listener The listener to register
diff --git a/xbmc/Autorun.cpp b/xbmc/Autorun.cpp
index 1b29a2b20c..69e799a2c3 100644
--- a/xbmc/Autorun.cpp
+++ b/xbmc/Autorun.cpp
@@ -92,7 +92,7 @@ void CAutorun::ExecuteAutorun(const std::string& path, bool bypassSettings, bool
 #ifdef HAS_CDDA_RIPPER
   const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
 
-  if (CServiceBroker::GetSettings().GetInt(CSettings::SETTING_AUDIOCDS_AUTOACTION) == AUTOCD_RIP && 
+  if (CServiceBroker::GetSettings().GetInt(CSettings::SETTING_AUDIOCDS_AUTOACTION) == AUTOCD_RIP &&
       pInfo->IsAudio(1) && !profileManager.GetCurrentProfile().musicLocked())
   {
     CCDDARipper::GetInstance().RipCD();
@@ -239,7 +239,7 @@ bool CAutorun::RunDisc(IDirectory* pDir, const std::string& strDrive, int& nAdde
         // Most HD DVD will also include an "ADV_OBJ" folder for advanced content. This folder should be handled first.
         //! @todo for the time being, the DVD autorun settings are used to determine if the HD DVD should be started automatically.
         CFileItemList items, sitems;
-        
+
         // Advanced Content HD DVD (most discs?)
         if (StringUtils::EqualsNoCase(name, "ADV_OBJ"))
         {
@@ -251,7 +251,7 @@ bool CAutorun::RunDisc(IDirectory* pDir, const std::string& strDrive, int& nAdde
             // HD DVD Standard says the highest numbered playlist has to be handled first.
             CLog::Log(LOGINFO,"HD DVD: Playlist found. Set filetypes to *.xpl for external player.");
             items.Sort(SortByLabel, SortOrderDescending);
-            phddvdItem = pItem; 
+            phddvdItem = pItem;
             hddvdname = URIUtils::GetFileName(items[0]->GetPath());
             CLog::Log(LOGINFO,"HD DVD: %s", items[0]->GetPath().c_str());
           }
@@ -271,7 +271,7 @@ bool CAutorun::RunDisc(IDirectory* pDir, const std::string& strDrive, int& nAdde
               // HD DVD Standard says the lowest numbered ifo has to be handled first.
               CLog::Log(LOGINFO,"HD DVD: IFO found. Set filename to HV* and filetypes to *.ifo for external player.");
               items.Sort(SortByLabel, SortOrderAscending);
-              phddvdItem = pItem; 
+              phddvdItem = pItem;
               hddvdname = URIUtils::GetFileName(items[0]->GetPath());
               CLog::Log(LOGINFO,"HD DVD: %s",items[0]->GetPath().c_str());
             }
@@ -321,7 +321,7 @@ bool CAutorun::RunDisc(IDirectory* pDir, const std::string& strDrive, int& nAdde
 
             // get playername
             std::string hdVideoPlayer = CServiceBroker::GetPlayerCoreFactory().GetDefaultPlayer(item);
-            
+
             // Single *.xpl or *.ifo files require an external player to handle playback.
             // If no matching rule was found, VideoPlayer will be default player.
             if (hdVideoPlayer != "VideoPlayer")
@@ -342,7 +342,7 @@ bool CAutorun::RunDisc(IDirectory* pDir, const std::string& strDrive, int& nAdde
           CServiceBroker::GetPlaylistPlayer().Play(0, "");
           return true;
         }
-				
+
         // Video CDs can have multiple file formats. First we need to determine which one is used on the CD
         std::string strExt;
         if (StringUtils::EqualsNoCase(name, "MPEGAV"))
@@ -513,7 +513,7 @@ bool CAutorun::IsEnabled() const
 bool CAutorun::PlayDiscAskResume(const std::string& path)
 {
   return PlayDisc(path, true, !CanResumePlayDVD(path) ||
-    HELPERS::ShowYesNoDialogText(CVariant{341}, CVariant{""}, CVariant{13404}, CVariant{12021}) == 
+    HELPERS::ShowYesNoDialogText(CVariant{341}, CVariant{""}, CVariant{13404}, CVariant{12021}) ==
     DialogResponse::YES);
 }
 
diff --git a/xbmc/CompileInfo.cpp.in b/xbmc/CompileInfo.cpp.in
index 5cdf41f6a2..bf198f750b 100644
--- a/xbmc/CompileInfo.cpp.in
+++ b/xbmc/CompileInfo.cpp.in
@@ -43,7 +43,7 @@ const char* CCompileInfo::GetPackage()
 const char* CCompileInfo::GetClass()
 {
   static std::string s_classname;
-  
+
   if (s_classname.empty())
   {
     s_classname = CCompileInfo::GetPackage();
diff --git a/xbmc/CueDocument.cpp b/xbmc/CueDocument.cpp
index 295c4b088c..c54b264008 100644
--- a/xbmc/CueDocument.cpp
+++ b/xbmc/CueDocument.cpp
@@ -202,7 +202,7 @@ void CCueDocument::GetSongs(VECSONGS &songs)
       aSong.strArtistDesc = m_strArtist;
     else
       aSong.strArtistDesc = track.strArtist;
-    //Pass album artist to MusicInfoTag object by setting album artist vector. 
+    //Pass album artist to MusicInfoTag object by setting album artist vector.
     aSong.SetAlbumArtist(StringUtils::Split(m_strArtist, g_advancedSettings.m_musicItemSeparator));
     aSong.strAlbum = m_strAlbum;
     aSong.genre = StringUtils::Split(m_strGenre, g_advancedSettings.m_musicItemSeparator);
@@ -218,7 +218,7 @@ void CCueDocument::GetSongs(VECSONGS &songs)
     aSong.iStartOffset = track.iStartTime;
     aSong.iEndOffset = track.iEndTime;
     if (aSong.iEndOffset)
-      // Convert offset in frames (75 per second) to duration in whole seconds with rounding 
+      // Convert offset in frames (75 per second) to duration in whole seconds with rounding
       aSong.iDuration = CUtil::ConvertMilliSecsToSecsIntRounded(aSong.iEndOffset - aSong.iStartOffset);
     else
       aSong.iDuration = 0;
diff --git a/xbmc/DatabaseManager.h b/xbmc/DatabaseManager.h
index 3fdfd41daa..ac9b43a410 100644
--- a/xbmc/DatabaseManager.h
+++ b/xbmc/DatabaseManager.h
@@ -57,7 +57,7 @@ public:
 
    \param name the name of the database to check.
    \return true if the database can be opened, false otherwise.
-   */ 
+   */
   bool CanOpen(const std::string &name);
 
   bool IsUpgrading() const { return m_bIsUpgrading; }
diff --git a/xbmc/DbUrl.cpp b/xbmc/DbUrl.cpp
index de7dde7198..e3497fd3ad 100644
--- a/xbmc/DbUrl.cpp
+++ b/xbmc/DbUrl.cpp
@@ -69,7 +69,7 @@ void CDbUrl::AddOption(const std::string &key, const char *value)
 {
   if (!validateOption(key, value))
     return;
-  
+
   CUrlOptions::AddOption(key, value);
   updateOptions();
 }
@@ -78,7 +78,7 @@ void CDbUrl::AddOption(const std::string &key, const std::string &value)
 {
   if (!validateOption(key, value))
     return;
-  
+
   CUrlOptions::AddOption(key, value);
   updateOptions();
 }
@@ -87,7 +87,7 @@ void CDbUrl::AddOption(const std::string &key, int value)
 {
   if (!validateOption(key, value))
     return;
-  
+
   CUrlOptions::AddOption(key, value);
   updateOptions();
 }
@@ -96,7 +96,7 @@ void CDbUrl::AddOption(const std::string &key, float value)
 {
   if (!validateOption(key, value))
     return;
-  
+
   CUrlOptions::AddOption(key, value);
   updateOptions();
 }
@@ -105,7 +105,7 @@ void CDbUrl::AddOption(const std::string &key, double value)
 {
   if (!validateOption(key, value))
     return;
-  
+
   CUrlOptions::AddOption(key, value);
   updateOptions();
 }
@@ -114,7 +114,7 @@ void CDbUrl::AddOption(const std::string &key, bool value)
 {
   if (!validateOption(key, value))
     return;
-  
+
   CUrlOptions::AddOption(key, value);
   updateOptions();
 }
@@ -122,13 +122,13 @@ void CDbUrl::AddOption(const std::string &key, bool value)
 void CDbUrl::AddOptions(const std::string &options)
 {
   CUrlOptions::AddOptions(options);
-  updateOptions();  
+  updateOptions();
 }
 
 void CDbUrl::RemoveOption(const std::string &key)
 {
   CUrlOptions::RemoveOption(key);
-  updateOptions(); 
+  updateOptions();
 }
 
 bool CDbUrl::validateOption(const std::string &key, const CVariant &value)
diff --git a/xbmc/DbUrl.h b/xbmc/DbUrl.h
index d8806eeaee..154266cf75 100644
--- a/xbmc/DbUrl.h
+++ b/xbmc/DbUrl.h
@@ -58,7 +58,7 @@ public:
 protected:
   virtual bool parse() = 0;
   virtual bool validateOption(const std::string &key, const CVariant &value);
-  
+
   CURL m_url;
   std::string m_type;
 
diff --git a/xbmc/FileItem.cpp b/xbmc/FileItem.cpp
index 4fc5bb08ef..9d5f44dcbd 100644
--- a/xbmc/FileItem.cpp
+++ b/xbmc/FileItem.cpp
@@ -1699,7 +1699,7 @@ std::string CFileItem::GetOpticalMediaPath() const
   path = URIUtils::AddFileToFolder(GetPath(), "VIDEO_TS.IFO");
   if (CFile::Exists(path))
     return path;
-  
+
   path = URIUtils::AddFileToFolder(GetPath(), "VIDEO_TS", "VIDEO_TS.IFO");
   if (CFile::Exists(path))
     return path;
@@ -1800,7 +1800,7 @@ void CFileItem::LoadEmbeddedCue()
       SetCueDocument(cuesheet);
     }
     // Clear cuesheet tag having added it to item
-    tag.SetCueSheet(""); 
+    tag.SetCueSheet("");
   }
 }
 
diff --git a/xbmc/GUIPassword.cpp b/xbmc/GUIPassword.cpp
index 8b7c56c3a5..e2e1e30c8f 100644
--- a/xbmc/GUIPassword.cpp
+++ b/xbmc/GUIPassword.cpp
@@ -360,18 +360,18 @@ bool CGUIPassword::CheckSettingLevelLock(const SettingLevel& level, bool enforce
   const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
 
   LOCK_LEVEL::SETTINGS_LOCK lockLevel = profileManager.GetCurrentProfile().settingsLockLevel();
-  
+
   if (lockLevel == LOCK_LEVEL::NONE)
     return true;
-  
+
     //check if we are already in settings and in an level that needs unlocking
   int windowID = CServiceBroker::GetGUI()->GetWindowManager().GetActiveWindow();
-  if ((int)lockLevel-1 <= (short)CViewStateSettings::GetInstance().GetSettingLevel() && 
-     (windowID == WINDOW_SETTINGS_MENU || 
+  if ((int)lockLevel-1 <= (short)CViewStateSettings::GetInstance().GetSettingLevel() &&
+     (windowID == WINDOW_SETTINGS_MENU ||
          (windowID >= WINDOW_SCREEN_CALIBRATION &&
           windowID <= WINDOW_SETTINGS_MYPVR)))
     return true; //Already unlocked
-  
+
   else if (lockLevel == LOCK_LEVEL::ALL)
     return IsMasterLockUnlocked(true);
   else if ((int)lockLevel-1 <= (short)level)
diff --git a/xbmc/LangInfo.h b/xbmc/LangInfo.h
index c83bc0a297..0bd94892ad 100644
--- a/xbmc/LangInfo.h
+++ b/xbmc/LangInfo.h
@@ -105,7 +105,7 @@ public:
   // or a three char language code
   // or a language name in english (as used by XBMC)
   void SetAudioLanguage(const std::string& language);
-  
+
   // three char language code (not win32 specific)
   const std::string& GetSubtitleLanguage() const;
   // language can either be a two char language code as defined in ISO639
diff --git a/xbmc/PartyModeManager.cpp b/xbmc/PartyModeManager.cpp
index bc917a21ab..326bfde2e8 100644
--- a/xbmc/PartyModeManager.cpp
+++ b/xbmc/PartyModeManager.cpp
@@ -719,7 +719,7 @@ void CPartyModeManager::Announce()
   if (g_application.GetAppPlayer().IsPlaying())
   {
     CVariant data;
-    
+
     data["player"]["playerid"] = CServiceBroker::GetPlaylistPlayer().GetCurrentPlaylist();
     data["property"]["partymode"] = m_bEnabled;
     ANNOUNCEMENT::CAnnouncementManager::GetInstance().Announce(ANNOUNCEMENT::Player, "xbmc", "OnPropertyChanged", data);
diff --git a/xbmc/PasswordManager.cpp b/xbmc/PasswordManager.cpp
index 0f5cac20af..33f052a1e7 100644
--- a/xbmc/PasswordManager.cpp
+++ b/xbmc/PasswordManager.cpp
@@ -153,7 +153,7 @@ void CPasswordManager::Load()
     CXBMCTinyXML doc;
     if (!doc.LoadFile(passwordsFile))
     {
-      CLog::Log(LOGERROR, "%s - Unable to load: %s, Line %d\n%s", 
+      CLog::Log(LOGERROR, "%s - Unable to load: %s, Line %d\n%s",
         __FUNCTION__, passwordsFile.c_str(), doc.ErrorRow(), doc.ErrorDesc());
       return;
     }
diff --git a/xbmc/PasswordManager.h b/xbmc/PasswordManager.h
index fe09fee8e2..391005c45f 100644
--- a/xbmc/PasswordManager.h
+++ b/xbmc/PasswordManager.h
@@ -30,7 +30,7 @@ class CURL;
 /*!
  \ingroup filesystem
  \brief Password Manager class for saving authentication details
- 
+
  Handles access to previously saved passwords for paths, translating normal URLs
  into authenticated URLs if the user has details about the username and password
  for a path previously saved. Should be accessed via CPasswordManager::GetInstance()
@@ -56,12 +56,12 @@ public:
 
   /*!
    \brief Prompt for a username and password for the particular URL.
-   
+
    This routine pops up a dialog, requesting the user enter a username and password
    to access the given URL.  The user may optionally save these details.  If saved
    we write the details into the users profile.  If not saved, the details are temporarily
    stored so that further access no longer requires prompting for authentication.
-   
+
    \param url the URL to authenticate.
    \return true if the user entered details, false if the user cancelled the dialog.
    \sa CURL, SaveAuthenticatedURL
diff --git a/xbmc/PlayListPlayer.cpp b/xbmc/PlayListPlayer.cpp
index 7ee351ceb7..8bbda50390 100644
--- a/xbmc/PlayListPlayer.cpp
+++ b/xbmc/PlayListPlayer.cpp
@@ -240,7 +240,7 @@ bool CPlayListPlayer::Play()
     return false;
 
   CPlayList& playlist = GetPlaylist(m_iCurrentPlayList);
-  if (playlist.size() <= 0) 
+  if (playlist.size() <= 0)
     return false;
 
   return Play(0, "");
@@ -252,7 +252,7 @@ bool CPlayListPlayer::PlaySongId(int songId)
     return false;
 
   CPlayList& playlist = GetPlaylist(m_iCurrentPlayList);
-  if (playlist.size() <= 0) 
+  if (playlist.size() <= 0)
     return Play();
 
   for (int i = 0; i < playlist.size(); i++)
@@ -290,11 +290,11 @@ bool CPlayListPlayer::Play(int iSong, std::string player, bool bAutoPlay /* = fa
     return false;
 
   CPlayList& playlist = GetPlaylist(m_iCurrentPlayList);
-  if (playlist.size() <= 0) 
+  if (playlist.size() <= 0)
     return false;
-  if (iSong < 0) 
+  if (iSong < 0)
     iSong = 0;
-  if (iSong >= playlist.size()) 
+  if (iSong >= playlist.size())
     iSong = playlist.size() - 1;
 
   // check if the item itself is a playlist, and can be expanded
@@ -531,7 +531,7 @@ void CPlayListPlayer::SetShuffle(int iPlaylist, bool bYesNo, bool bNotify /* = f
       // so dont do anything
     }
   }
-  
+
   AnnouncePropertyChanged(iPlaylist, "shuffled", IsShuffled(iPlaylist));
 }
 
diff --git a/xbmc/PlayListPlayer.h b/xbmc/PlayListPlayer.h
index 5bbab72d40..7b85e49095 100644
--- a/xbmc/PlayListPlayer.h
+++ b/xbmc/PlayListPlayer.h
@@ -96,7 +96,7 @@ public:
   void SetCurrentSong(int index);
 
   int GetNextSong();
-  
+
   /*! \brief Get the index in the playlist that is offset away from the current index in the current playlist.
    Obeys any repeat settings (eg repeat one will return the current index regardless of offset)
    \return the index of the entry, or -1 if there is no current playlist. There is no guarantee that the returned index is valid.
@@ -145,7 +145,7 @@ public:
    \sa IsShuffled
    */
   void SetShuffle(int playlist, bool shuffle, bool notify = false);
-  
+
   /*! \brief Return whether a playlist is shuffled.
    If partymode is enabled, this always returns false.
    \param playlist the playlist to query for shuffle state, PLAYLIST_MUSIC or PLAYLIST_VIDEO.
diff --git a/xbmc/SeekHandler.h b/xbmc/SeekHandler.h
index 7d0963079c..329920291c 100644
--- a/xbmc/SeekHandler.h
+++ b/xbmc/SeekHandler.h
@@ -43,7 +43,7 @@ public:
   ~CSeekHandler() override;
 
   static void SettingOptionsSeekStepsFiller(std::shared_ptr<const CSetting> setting, std::vector< std::pair<std::string, int> > &list, int &current, void *data);
-  
+
   void OnSettingChanged(std::shared_ptr<const CSetting> setting) override;
   bool OnAction(const CAction &action) override;
 
diff --git a/xbmc/SettingsLock.h b/xbmc/SettingsLock.h
index b004bdcccc..a8d8a1e76b 100644
--- a/xbmc/SettingsLock.h
+++ b/xbmc/SettingsLock.h
@@ -29,7 +29,7 @@ namespace LOCK_LEVEL {
     NONE,     //settings are unlocked => user can access all settings levels
     ALL,      //all settings are locked => user always has to enter password, when entering the settings screen
     STANDARD, //settings level standard and up are locked => user can still access the beginner levels
-    ADVANCED, 
+    ADVANCED,
     EXPERT
   };
 }
diff --git a/xbmc/TextureCache.h b/xbmc/TextureCache.h
index ed9415769a..5c2d13f158 100644
--- a/xbmc/TextureCache.h
+++ b/xbmc/TextureCache.h
@@ -66,7 +66,7 @@ public:
    \param needsRecaching [out] whether the image needs recaching.
    \return cached url of this image
    \sa GetCachedImage
-   */ 
+   */
   std::string CheckCachedImage(const std::string &image, bool &needsRecaching);
 
   /*! \brief Cache image (if required) using a background job
diff --git a/xbmc/TextureCacheJob.h b/xbmc/TextureCacheJob.h
index 1cd246d650..7b87ea8906 100644
--- a/xbmc/TextureCacheJob.h
+++ b/xbmc/TextureCacheJob.h
@@ -59,7 +59,7 @@ public:
 /*!
  \ingroup textures
  \brief Job class for caching textures
- 
+
  Handles loading and caching of textures.
  */
 class CTextureCacheJob : public CJob
diff --git a/xbmc/URL.cpp b/xbmc/URL.cpp
index d17c744632..caa21737d6 100644
--- a/xbmc/URL.cpp
+++ b/xbmc/URL.cpp
@@ -689,7 +689,7 @@ std::string CURL::Decode(const std::string& strURLData)
     }
     else strResult += kar;
   }
-  
+
   return strResult;
 }
 
@@ -703,7 +703,7 @@ std::string CURL::Encode(const std::string& strURLData)
   for (size_t i = 0; i < strURLData.size(); ++i)
   {
     const char kar = strURLData[i];
-    
+
     // Don't URL encode "-_.!()" according to RFC1738
     //! @todo Update it to "-_.~" after Gotham according to RFC3986
     if (StringUtils::isasciialphanum(kar) || kar == '-' || kar == '.' || kar == '_' || kar == '!' || kar == '(' || kar == ')')
@@ -788,7 +788,7 @@ bool CURL::GetProtocolOption(const std::string &key, std::string &value) const
   CVariant valueObj;
   if (!m_protocolOptions.GetOption(key, valueObj))
     return false;
-  
+
   value = valueObj.asString();
   return true;
 }
@@ -798,7 +798,7 @@ std::string CURL::GetProtocolOption(const std::string &key) const
   std::string value;
   if (!GetProtocolOption(key, value))
     return "";
-  
+
   return value;
 }
 
diff --git a/xbmc/Util.cpp b/xbmc/Util.cpp
index 38d36d864d..6c7238dbea 100644
--- a/xbmc/Util.cpp
+++ b/xbmc/Util.cpp
@@ -188,7 +188,7 @@ std::string GetHomePath(const std::string& strTarget, std::string strPath)
       std::string currentDirectory;
       std::wstring currentDirectoryW(buf.get());
       CWIN32Util::RemoveExtraLongPathPrefix(currentDirectoryW);
-      
+
       if (IsDirectoryValidRoot(currentDirectoryW))
       {
         g_charsetConverter.wToUTF8(currentDirectoryW, currentDirectory);
@@ -234,7 +234,7 @@ std::string GetHomePath(const std::string& strTarget, std::string strPath)
       strcat(given_path, "../Resources/");
       strcat(given_path, CCompileInfo::GetAppName());
       strcat(given_path, "/");
-      
+
       // if this path doesn't exist we
       // might not be started from the app bundle
       // but from the debugger/xcode. Lets
@@ -253,7 +253,7 @@ std::string GetHomePath(const std::string& strTarget, std::string strPath)
         while(given_path_stdstr.length() > 0 && !validRoot);
         strncpy(given_path, given_path_stdstr.c_str(), sizeof(given_path)-1);
       }
-      
+
 #endif
 
       // Convert to real path.
@@ -383,7 +383,7 @@ std::string CUtil::GetTitleFromPath(const CURL& url, bool bIsFolder /* = false *
     URIUtils::RemoveExtension(strFilename);
     return strFilename;
   }
-  
+
   // URLDecode since the original path may be an URL
   strFilename = CURL::Decode(strFilename);
   return strFilename;
@@ -756,7 +756,7 @@ std::string CUtil::GetNextPathname(const std::string &path_template, int max)
 {
   if (path_template.find("%04d") == std::string::npos)
     return "";
-  
+
   for (int i = 0; i <= max; i++)
   {
     std::string name = StringUtils::Format(path_template.c_str(), i);
@@ -975,7 +975,7 @@ std::string CUtil::MakeLegalPath(const std::string &strPathAndFile, int LegalTyp
   std::vector<std::string> dirs = URIUtils::SplitPath(strPathAndFile);
   if (dirs.empty())
     return strPathAndFile;
-  // we just add first token to path and don't legalize it - possible values: 
+  // we just add first token to path and don't legalize it - possible values:
   // "X:" (local win32), "" (local unix - empty string before '/') or
   // "protocol://domain"
   std::string dir(dirs.front());
@@ -993,7 +993,7 @@ std::string CUtil::ValidatePath(const std::string &path, bool bFixDoubleSlashes
   // Don't do any stuff on URLs containing %-characters or protocols that embed
   // filenames. NOTE: Don't use IsInZip or IsInRar here since it will infinitely
   // recurse and crash XBMC
-  if (URIUtils::IsURL(path) && 
+  if (URIUtils::IsURL(path) &&
       (path.find('%') != std::string::npos ||
       StringUtils::StartsWithNoCase(path, "apk:") ||
       StringUtils::StartsWithNoCase(path, "zip:") ||
@@ -1700,7 +1700,7 @@ int CUtil::LookupRomanDigit(char roman_digit)
 
 int CUtil::TranslateRomanNumeral(const char* roman_numeral)
 {
-  
+
   int decimal = -1;
 
   if (roman_numeral && roman_numeral[0])
@@ -1714,22 +1714,22 @@ int CUtil::TranslateRomanNumeral(const char* roman_numeral)
     {
       int digit = CUtil::LookupRomanDigit(*roman_numeral);
       int test  = last;
-      
+
       // General sanity checks
 
       // numeral not in LUT
       if (!digit)
         return -1;
-      
+
       while (test > 5)
         test /= 10;
-      
+
       // N = 10^n may not precede (N+1) > 10^(N+1)
       if (test == 1 && digit > last * 10)
         return -1;
-      
+
       // N = 5*10^n may not precede (N+1) >= N
-      if (test == 5 && digit >= last) 
+      if (test == 5 && digit >= last)
         return -1;
 
       // End general sanity checks
@@ -1737,11 +1737,11 @@ int CUtil::TranslateRomanNumeral(const char* roman_numeral)
       if (last < digit)
       {
         // smaller numerals may not repeat before a larger one
-        if (repeat) 
+        if (repeat)
           return -1;
 
         temp_sum += digit;
-        
+
         repeat  = 0;
         trend   = 0;
       }
@@ -1757,7 +1757,7 @@ int CUtil::TranslateRomanNumeral(const char* roman_numeral)
           decimal += 2 * last - temp_sum;
         else
           decimal += temp_sum;
-        
+
         temp_sum = digit;
 
         trend   = 1;
@@ -1798,7 +1798,7 @@ std::string CUtil::ResolveExecutablePath()
 
   CDarwinUtils::GetExecutablePath(given_path, &path_size);
   strExecutablePath = given_path;
-#elif defined(TARGET_FREEBSD)                                                                                                                                                                   
+#elif defined(TARGET_FREEBSD)
   char buf[PATH_MAX];
   size_t buflen;
   int mib[4];
@@ -2310,14 +2310,14 @@ void CUtil::ScanForExternalAudio(const std::string& videoPath, std::vector<std::
    ||  item.IsPlayList()
    ||  item.IsLiveTV()
    ||  item.IsPVR()
-   || !item.IsVideo()) 
+   || !item.IsVideo())
     return;
 
   std::string strBasePath;
-  std::string strAudio;  
+  std::string strAudio;
 
   GetVideoBasePathAndFileName(videoPath, strBasePath, strAudio);
-  
+
   CFileItemList items;
   const std::vector<std::string> common_sub_dirs = { "audio", "tracks"};
   GetItemsToScan(strBasePath, CServiceBroker::GetFileExtensionProvider().GetMusicExtensions(), common_sub_dirs, items);
diff --git a/xbmc/Util.h b/xbmc/Util.h
index c279a1645f..d5ab07292b 100644
--- a/xbmc/Util.h
+++ b/xbmc/Util.h
@@ -97,7 +97,7 @@ public:
   static bool IsVobSub(const std::vector<std::string>& vecSubtitles, const std::string& strSubPath);
   static std::string GetVobSubSubFromIdx(const std::string& vobSubIdx);
   static std::string GetVobSubIdxFromSub(const std::string& vobSub);
-  
+
   /** \brief Retrieves paths of external audio files for a given video.
   *   \param[in] videoPath The full path of the video file.
   *   \param[out] vecAudio A vector containing the full paths of all found external audio files.
@@ -125,7 +125,7 @@ public:
   static std::string MakeLegalPath(const std::string &strPath, int LegalType=LEGAL_NONE);
 #endif
   static std::string ValidatePath(const std::string &path, bool bFixDoubleSlashes = false); ///< return a validated path, with correct directory separators.
-  
+
   static bool IsUsingTTFSubtitles();
 
   /*! \brief Split a comma separated parameter list into separate parameters.
diff --git a/xbmc/XBDateTime.cpp b/xbmc/XBDateTime.cpp
index 709154401b..7f1dcc621e 100644
--- a/xbmc/XBDateTime.cpp
+++ b/xbmc/XBDateTime.cpp
@@ -228,7 +228,7 @@ int CDateTimeSpan::GetSecondsTotal() const
 {
   ULARGE_INTEGER time;
   ToULargeInt(time);
-  
+
   return (int)(time.QuadPart/SECONDS_TO_FILETIME);
 }
 
diff --git a/xbmc/addons/Addon.cpp b/xbmc/addons/Addon.cpp
index b31cc9a94c..0af365f3eb 100644
--- a/xbmc/addons/Addon.cpp
+++ b/xbmc/addons/Addon.cpp
@@ -194,7 +194,7 @@ void CAddon::SaveSettings(void)
     doc.SaveFile(m_userSettingsPath);
 
   m_hasUserSettings = true;
-  
+
   //push the settings changes to the running addon instance
   CServiceBroker::GetAddonMgr().ReloadSettings(ID());
 #ifdef HAS_PYTHON
diff --git a/xbmc/addons/AddonManager.h b/xbmc/addons/AddonManager.h
index 000afbb7e6..310abf8eea 100644
--- a/xbmc/addons/AddonManager.h
+++ b/xbmc/addons/AddonManager.h
@@ -150,7 +150,7 @@ namespace ADDON
     bool FindInstallableById(const std::string& addonId, AddonPtr& addon);
 
     void AddToUpdateableAddons(AddonPtr &pAddon);
-    void RemoveFromUpdateableAddons(AddonPtr &pAddon);    
+    void RemoveFromUpdateableAddons(AddonPtr &pAddon);
     bool ReloadSettings(const std::string &id);
 
     /*! Get addons with available updates */
diff --git a/xbmc/addons/BinaryAddonCache.h b/xbmc/addons/BinaryAddonCache.h
index 8178722f86..f63775a293 100644
--- a/xbmc/addons/BinaryAddonCache.h
+++ b/xbmc/addons/BinaryAddonCache.h
@@ -43,7 +43,7 @@ public:
 protected:
   void Update();
   void OnEvent(const AddonEvent& event);
-  
+
   CCriticalSection m_critSection;
   std::multimap<TYPE, VECADDONS> m_addons;
 };
diff --git a/xbmc/addons/GUIDialogAddonInfo.cpp b/xbmc/addons/GUIDialogAddonInfo.cpp
index 833cefd57d..00d3ddee23 100644
--- a/xbmc/addons/GUIDialogAddonInfo.cpp
+++ b/xbmc/addons/GUIDialogAddonInfo.cpp
@@ -563,7 +563,7 @@ bool CGUIDialogAddonInfo::ShowForItem(const CFileItemPtr& item)
   if (!dialog->SetItem(item))
     return false;
 
-  dialog->Open(); 
+  dialog->Open();
   return true;
 }
 
diff --git a/xbmc/addons/GUIDialogAddonInfo.h b/xbmc/addons/GUIDialogAddonInfo.h
index ba3e002e78..36c88370b4 100644
--- a/xbmc/addons/GUIDialogAddonInfo.h
+++ b/xbmc/addons/GUIDialogAddonInfo.h
@@ -34,7 +34,7 @@ public:
   ~CGUIDialogAddonInfo(void) override;
   bool OnMessage(CGUIMessage& message) override;
   bool OnAction(const CAction &action) override;
-  
+
   CFileItemPtr GetCurrentListItem(int offset = 0) override { return m_item; }
   bool HasListItems() const override { return true; }
 
diff --git a/xbmc/addons/GUIWindowAddonBrowser.cpp b/xbmc/addons/GUIWindowAddonBrowser.cpp
index 67b21ef9ab..4346a61230 100644
--- a/xbmc/addons/GUIWindowAddonBrowser.cpp
+++ b/xbmc/addons/GUIWindowAddonBrowser.cpp
@@ -421,7 +421,7 @@ int CGUIWindowAddonBrowser::SelectAddonID(const std::vector<ADDON::TYPE> &types,
       for (ADDON::IVECADDONS addon = installableAddons.begin(); addon != installableAddons.end();)
       {
         AddonPtr pAddon = *addon;
-        
+
         // check if the addon matches one of the provided addon types
         bool matchesType = false;
         for (std::vector<ADDON::TYPE>::const_iterator type = validTypes.begin(); type != validTypes.end(); ++type)
diff --git a/xbmc/addons/GUIWindowAddonBrowser.h b/xbmc/addons/GUIWindowAddonBrowser.h
index 291811dd91..b23a73ec78 100644
--- a/xbmc/addons/GUIWindowAddonBrowser.h
+++ b/xbmc/addons/GUIWindowAddonBrowser.h
@@ -47,7 +47,7 @@ public:
    \param showInstalled whether installed addons should be in the list
    \param showInstallable whether installable addons should be in the list
    \param showMore whether to show the "Get More" button (only makes sense if showInstalled is true and showInstallable is false)
-   \return 1 if an addon was selected or multiple selection was specified, 2 if "Get More" was chosen, 0 if the selection process was cancelled or -1 if an error occurred or 
+   \return 1 if an addon was selected or multiple selection was specified, 2 if "Get More" was chosen, 0 if the selection process was cancelled or -1 if an error occurred or
    */
   static int SelectAddonID(ADDON::TYPE type, std::string &addonID, bool showNone = false, bool showDetails = true, bool showInstalled = true, bool showInstallable = false, bool showMore = true);
   static int SelectAddonID(const std::vector<ADDON::TYPE> &types, std::string &addonID, bool showNone = false, bool showDetails = true, bool showInstalled = true, bool showInstallable = false, bool showMore = true);
@@ -60,13 +60,13 @@ public:
    \param showInstalled whether installed addons should be in the list
    \param showInstallable whether installable addons should be in the list
    \param showMore whether to show the "Get More" button (only makes sense if showInstalled is true and showInstallable is false)
-   \return 1 if an addon was selected or multiple selection was specified, 2 if "Get More" was chosen, 0 if the selection process was cancelled or -1 if an error occurred or 
+   \return 1 if an addon was selected or multiple selection was specified, 2 if "Get More" was chosen, 0 if the selection process was cancelled or -1 if an error occurred or
    */
   static int SelectAddonID(ADDON::TYPE type, std::vector<std::string> &addonIDs, bool showNone = false, bool showDetails = true, bool multipleSelection = true, bool showInstalled = true, bool showInstallable = false, bool showMore = true);
   static int SelectAddonID(const std::vector<ADDON::TYPE> &types, std::vector<std::string> &addonIDs, bool showNone = false, bool showDetails = true, bool multipleSelection = true, bool showInstalled = true, bool showInstallable = false, bool showMore = true);
 
   bool UseFileDirectories() override { return false; }
-  
+
 protected:
   bool OnClick(int iItem, const std::string &player = "") override;
   void UpdateButtons() override;
diff --git a/xbmc/addons/LanguageResource.cpp b/xbmc/addons/LanguageResource.cpp
index 09a7ee492b..081516a959 100644
--- a/xbmc/addons/LanguageResource.cpp
+++ b/xbmc/addons/LanguageResource.cpp
@@ -139,7 +139,7 @@ void CLanguageResource::OnPostInstall(bool update, bool modal)
     return;
 
   if (IsInUse() ||
-     (!update && !modal && 
+     (!update && !modal &&
        (HELPERS::ShowYesNoDialogText(CVariant{Name()}, CVariant{24132}) == DialogResponse::YES)))
   {
     if (IsInUse())
diff --git a/xbmc/addons/PVRClient.h b/xbmc/addons/PVRClient.h
index 20c39ec73c..93ca9db6b1 100644
--- a/xbmc/addons/PVRClient.h
+++ b/xbmc/addons/PVRClient.h
@@ -572,7 +572,7 @@ namespace PVR
     * @return PVR_ERROR_NO_ERROR on success, respective error code otherwise.
     */
     PVR_ERROR GetRecordingEdl(const CPVRRecording &recording, std::vector<PVR_EDL_ENTRY> &edls);
-    
+
     /*!
     * @brief Retrieve the edit decision list (EDL) from the backend.
     * @param epgTag The EPG tag.
diff --git a/xbmc/addons/Scraper.cpp b/xbmc/addons/Scraper.cpp
index 1cab696c2f..98e913403c 100644
--- a/xbmc/addons/Scraper.cpp
+++ b/xbmc/addons/Scraper.cpp
@@ -460,7 +460,7 @@ CScraperUrl CScraper::NfoUrl(const std::string &sNfoContent)
     scurlRet.m_url.emplace_back(surl);
     return scurlRet;
   }
-    
+
   // scraper function takes contents of .nfo file, returns XML (see below)
   std::vector<std::string> vcsIn;
   vcsIn.push_back(sNfoContent);
diff --git a/xbmc/addons/Scraper.h b/xbmc/addons/Scraper.h
index add758b59d..8777912bac 100644
--- a/xbmc/addons/Scraper.h
+++ b/xbmc/addons/Scraper.h
@@ -130,7 +130,7 @@ public:
 
   /*! \brief Resolve an external ID (e.g. MusicBrainz IDs) to a URL using scrapers
    If we have an ID in hand, e.g. MusicBrainz IDs or TheTVDB Season IDs
-   we can get directly to a URL instead of searching by name and choosing from 
+   we can get directly to a URL instead of searching by name and choosing from
    the search results. The correct scraper type should be used to get the right
    URL for a given ID, so we can differentiate albums, artists, TV Seasons, etc.
    \param externalID the external ID - e.g. MusicBrainzArtist/AlbumID
diff --git a/xbmc/addons/Skin.cpp b/xbmc/addons/Skin.cpp
index c9839f4a2a..9e94bc83ee 100644
--- a/xbmc/addons/Skin.cpp
+++ b/xbmc/addons/Skin.cpp
@@ -410,7 +410,7 @@ void CSkinInfo::OnPostInstall(bool update, bool modal)
   if (!g_SkinInfo)
     return;
 
-  if (IsInUse() || (!update && !modal && 
+  if (IsInUse() || (!update && !modal &&
     HELPERS::ShowYesNoDialogText(CVariant{Name()}, CVariant{24099}) == DialogResponse::YES))
   {
     CGUIDialogKaiToast *toast = CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIDialogKaiToast>(WINDOW_DIALOG_KAI_TOAST);
@@ -439,7 +439,7 @@ void CSkinInfo::SettingOptionsSkinColorsFiller(SettingConstPtr setting, std::vec
 
   // There is a default theme (just defaults.xml)
   // any other *.xml files are additional color themes on top of this one.
-  
+
   // add the default label
   list.push_back(std::make_pair(g_localizeStrings.Get(15109), "SKINDEFAULT")); // the standard defaults.xml will be used!
 
diff --git a/xbmc/addons/Visualization.h b/xbmc/addons/Visualization.h
index d4c2558818..e34a895a53 100644
--- a/xbmc/addons/Visualization.h
+++ b/xbmc/addons/Visualization.h
@@ -44,7 +44,7 @@ public:
   int GetActivePreset();
   std::string GetActivePresetName();
   bool IsLocked();
- 
+
 private:
   std::string m_name; /*!< To add-on sended name */
   std::string m_presetsPath; /*!< To add-on sended preset path */
diff --git a/xbmc/addons/binary-addons/AddonDll.cpp b/xbmc/addons/binary-addons/AddonDll.cpp
index 7a4aa9efb8..1f718e4b02 100644
--- a/xbmc/addons/binary-addons/AddonDll.cpp
+++ b/xbmc/addons/binary-addons/AddonDll.cpp
@@ -33,7 +33,7 @@
 #include "filesystem/File.h"
 #include "filesystem/SpecialProtocol.h"
 #include "filesystem/Directory.h"
-#include "messaging/helpers/DialogOKHelper.h" 
+#include "messaging/helpers/DialogOKHelper.h"
 #include "settings/lib/SettingSection.h"
 #include "utils/log.h"
 #include "utils/StringUtils.h"
@@ -479,7 +479,7 @@ bool CAddonDll::CheckAPIVersion(int type)
   /* If a instance (not global) version becomes checked must be the version
    * present.
    */
-  if (kodiMinVersion > addonVersion || 
+  if (kodiMinVersion > addonVersion ||
       addonVersion > AddonVersion(kodi::addon::GetTypeVersion(type)))
   {
     CLog::Log(LOGERROR, "Add-on '%s' is using an incompatible API version for type '%s'. Kodi API min version = '%s', add-on API version '%s'",
@@ -586,7 +586,7 @@ void CAddonDll::DeInitInterface()
 }
 
 char* CAddonDll::get_addon_path(void* kodiBase)
-{ 
+{
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr)
   {
@@ -598,7 +598,7 @@ char* CAddonDll::get_addon_path(void* kodiBase)
 }
 
 char* CAddonDll::get_base_user_path(void* kodiBase)
-{ 
+{
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr)
   {
diff --git a/xbmc/addons/interfaces/Filesystem.cpp b/xbmc/addons/interfaces/Filesystem.cpp
index 246a65eeec..667e0d7506 100644
--- a/xbmc/addons/interfaces/Filesystem.cpp
+++ b/xbmc/addons/interfaces/Filesystem.cpp
@@ -470,7 +470,7 @@ int64_t Interface_Filesystem::get_file_length(void* kodiBase, void* file)
     CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p')", __FUNCTION__, kodiBase, file);
     return -1;
   }
-  
+
   return static_cast<CFile*>(file)->GetLength();
 }
 
diff --git a/xbmc/addons/interfaces/GUI/ListItem.cpp b/xbmc/addons/interfaces/GUI/ListItem.cpp
index 5aff746b1e..2f93b15be1 100644
--- a/xbmc/addons/interfaces/GUI/ListItem.cpp
+++ b/xbmc/addons/interfaces/GUI/ListItem.cpp
@@ -93,7 +93,7 @@ void Interface_GUIListItem::destroy(void* kodiBase, void* handle)
     CLog::Log(LOGERROR, "ADDON::Interface_GUIListItem::%s - invalid data", __FUNCTION__);
     return;
   }
-  
+
   CFileItemPtr* item = static_cast<CFileItemPtr*>(handle);
   if (item)
     delete item;
diff --git a/xbmc/addons/interfaces/GUI/Window.cpp b/xbmc/addons/interfaces/GUI/Window.cpp
index 40576e590f..922907f37f 100644
--- a/xbmc/addons/interfaces/GUI/Window.cpp
+++ b/xbmc/addons/interfaces/GUI/Window.cpp
@@ -276,7 +276,7 @@ bool Interface_GUIWindow::show(void* kodiBase, void* handle)
     return false;
   }
 
-  if (pAddonWindow->m_oldWindowId != pAddonWindow->m_windowId && 
+  if (pAddonWindow->m_oldWindowId != pAddonWindow->m_windowId &&
       pAddonWindow->m_windowId != CServiceBroker::GetGUI()->GetWindowManager().GetActiveWindow())
     pAddonWindow->m_oldWindowId = CServiceBroker::GetGUI()->GetWindowManager().GetActiveWindow();
 
@@ -677,7 +677,7 @@ void Interface_GUIWindow::add_list_item(void* kodiBase, void* handle, void* item
               __FUNCTION__, kodiBase, handle, item, addon ? addon->ID().c_str() : "unknown");
     return;
   }
-  
+
   CFileItemPtr* pItem(static_cast<CFileItemPtr*>(item));
   if (pItem->get() == nullptr)
   {
@@ -1071,7 +1071,7 @@ bool CGUIAddonWindow::OnMessage(CGUIMessage& message)
     case GUI_MSG_WINDOW_INIT:
     {
       CGUIMediaWindow::OnMessage(message);
-      
+
       if (CBOnInit)
         CBOnInit(m_clientHandle);
       return true;
@@ -1080,7 +1080,7 @@ bool CGUIAddonWindow::OnMessage(CGUIMessage& message)
 
     case GUI_MSG_FOCUSED:
     {
-      if (m_viewControl.HasControl(message.GetControlId()) && 
+      if (m_viewControl.HasControl(message.GetControlId()) &&
           m_viewControl.GetCurrentControl() != (int)message.GetControlId())
       {
         m_viewControl.SetFocused();
diff --git a/xbmc/addons/interfaces/GUI/controls/Edit.cpp b/xbmc/addons/interfaces/GUI/controls/Edit.cpp
index dde65d5ea1..323eeea335 100644
--- a/xbmc/addons/interfaces/GUI/controls/Edit.cpp
+++ b/xbmc/addons/interfaces/GUI/controls/Edit.cpp
@@ -127,7 +127,7 @@ void Interface_GUIControlEdit::set_input_type(void* kodiBase, void* handle, int
     default:
       kodiType = CGUIEditControl::INPUT_TYPE_PASSWORD_NUMBER_VERIFY_NEW;
   }
- 
+
   control->SetInputType(kodiType, heading);
 }
 
diff --git a/xbmc/addons/interfaces/GUI/dialogs/FileBrowser.h b/xbmc/addons/interfaces/GUI/dialogs/FileBrowser.h
index 5e93f8f52d..fb1ebae6b7 100644
--- a/xbmc/addons/interfaces/GUI/dialogs/FileBrowser.h
+++ b/xbmc/addons/interfaces/GUI/dialogs/FileBrowser.h
@@ -31,7 +31,7 @@ extern "C"
 {
 
 struct AddonGlobalInterface;
-  
+
 namespace ADDON
 {
 
@@ -59,7 +59,7 @@ namespace ADDON
      * class.
      */
     //@{
-    static bool show_and_get_directory(void* kodiBase, const char* shares, 
+    static bool show_and_get_directory(void* kodiBase, const char* shares,
                                        const char* heading, const char* path_in,
                                        char** path_out, bool write_only);
 
@@ -74,13 +74,13 @@ namespace ADDON
                                            bool use_thumbs, bool use_file_directories,
                                            bool singleList);
 
-    static bool show_and_get_file_list(void* kodiBase, const char* shares, 
-                                       const char* mask, const char* heading, 
-                                       char*** file_list, unsigned int* entries, 
+    static bool show_and_get_file_list(void* kodiBase, const char* shares,
+                                       const char* mask, const char* heading,
+                                       char*** file_list, unsigned int* entries,
                                        bool use_thumbs, bool use_file_directories);
 
     static bool show_and_get_source(void* kodiBase, const char* path_in, char** path_out,
-                                    bool allow_network_shares, const char* additional_share, 
+                                    bool allow_network_shares, const char* additional_share,
                                     const char* type);
 
     static bool show_and_get_image(void* kodiBase, const char* shares, const char* heading,
diff --git a/xbmc/addons/interfaces/GUI/dialogs/OK.cpp b/xbmc/addons/interfaces/GUI/dialogs/OK.cpp
index 295ee1f509..f46f85b1b2 100644
--- a/xbmc/addons/interfaces/GUI/dialogs/OK.cpp
+++ b/xbmc/addons/interfaces/GUI/dialogs/OK.cpp
@@ -22,7 +22,7 @@
 #include "addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/OK.h"
 
 #include "addons/binary-addons/AddonDll.h"
-#include "messaging/helpers/DialogOKHelper.h" 
+#include "messaging/helpers/DialogOKHelper.h"
 #include "utils/log.h"
 #include "utils/Variant.h"
 using namespace KODI::MESSAGING;
diff --git a/xbmc/addons/interfaces/GUI/dialogs/YesNo.h b/xbmc/addons/interfaces/GUI/dialogs/YesNo.h
index a6e37af95a..26a9f013ce 100644
--- a/xbmc/addons/interfaces/GUI/dialogs/YesNo.h
+++ b/xbmc/addons/interfaces/GUI/dialogs/YesNo.h
@@ -22,7 +22,7 @@
 
 extern "C"
 {
-  
+
 struct AddonGlobalInterface;
 
 namespace ADDON
diff --git a/xbmc/addons/interfaces/General.cpp b/xbmc/addons/interfaces/General.cpp
index f0d3500e80..72d720fb83 100644
--- a/xbmc/addons/interfaces/General.cpp
+++ b/xbmc/addons/interfaces/General.cpp
@@ -176,7 +176,7 @@ char* Interface_General::unknown_to_utf8(void* kodiBase, const char* source, boo
               __FUNCTION__, kodiBase, static_cast<const void*>(source), static_cast<void*>(ret));
     return nullptr;
   }
-   
+
   std::string string;
   *ret = g_charsetConverter.unknownToUTF8(source, string, failOnBadChar);
   char* buffer = strdup(string.c_str());
diff --git a/xbmc/addons/kodi-addon-dev-kit/doxygen/Doxyfile b/xbmc/addons/kodi-addon-dev-kit/doxygen/Doxyfile
index 729f159039..0e74d2471f 100644
--- a/xbmc/addons/kodi-addon-dev-kit/doxygen/Doxyfile
+++ b/xbmc/addons/kodi-addon-dev-kit/doxygen/Doxyfile
@@ -162,7 +162,7 @@ FULL_PATH_NAMES        = YES
 # will be relative from the directory where doxygen is started.
 # This tag requires that the tag FULL_PATH_NAMES is set to YES.
 
-STRIP_FROM_PATH        = 
+STRIP_FROM_PATH        =
 
 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
 # path mentioned in the documentation of a class, which tells the reader which
@@ -263,7 +263,7 @@ ALIASES                = "table_start=<table width= 100% style= border bgcolor=
 # A mapping has the form "name=value". For example adding "class=itcl::class"
 # will allow you to use the command class in the itcl::class meaning.
 
-TCL_SUBST              = 
+TCL_SUBST              =
 
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
@@ -310,7 +310,7 @@ OPTIMIZE_OUTPUT_VHDL   = NO
 # Note that for custom extensions you also need to set FILE_PATTERNS otherwise
 # the files are not read by doxygen.
 
-EXTENSION_MAPPING      = 
+EXTENSION_MAPPING      =
 
 # If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
 # according to the Markdown format, which allows for more readable
@@ -667,7 +667,7 @@ GENERATE_DEPRECATEDLIST= YES
 # sections, marked by \if <section_label> ... \endif and \cond <section_label>
 # ... \endcond blocks.
 
-ENABLED_SECTIONS       = 
+ENABLED_SECTIONS       =
 
 # The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
 # initial value of a variable or macro / define can have for it to appear in the
@@ -709,7 +709,7 @@ SHOW_NAMESPACES        = NO
 # by doxygen. Whatever the program writes to standard output is used as the file
 # version. For an example see the documentation.
 
-FILE_VERSION_FILTER    = 
+FILE_VERSION_FILTER    =
 
 # The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
 # by doxygen. The layout file controls the global structure of the generated
@@ -732,7 +732,7 @@ LAYOUT_FILE            = DoxygenLayout.xml
 # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
 # search path. See also \cite for info how to create references.
 
-CITE_BIB_FILES         = 
+CITE_BIB_FILES         =
 
 #---------------------------------------------------------------------------
 # Configuration options related to warning and progress messages
@@ -797,7 +797,7 @@ WARN_FORMAT            = "$file:$line: $text"
 # messages should be written. If left blank the output is written to standard
 # error (stderr).
 
-WARN_LOGFILE           = 
+WARN_LOGFILE           =
 
 #---------------------------------------------------------------------------
 # Configuration options related to the input files
@@ -971,7 +971,7 @@ RECURSIVE              = YES
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE                = 
+EXCLUDE                =
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
@@ -987,7 +987,7 @@ EXCLUDE_SYMLINKS       = NO
 # Note that the wildcards are matched against the file with absolute path, so to
 # exclude all test directories for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       = 
+EXCLUDE_PATTERNS       =
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the
@@ -998,7 +998,7 @@ EXCLUDE_PATTERNS       =
 # Note that the wildcards are matched against the file with absolute path, so to
 # exclude all test directories use the pattern */test/*
 
-EXCLUDE_SYMBOLS        = 
+EXCLUDE_SYMBOLS        =
 
 # The EXAMPLE_PATH tag can be used to specify one or more files or directories
 # that contain example code fragments that are included (see the \include
@@ -1011,7 +1011,7 @@ EXAMPLE_PATH           = .
 # *.h) to filter out the source-files in the directories. If left blank all
 # files are included.
 
-EXAMPLE_PATTERNS       = 
+EXAMPLE_PATTERNS       =
 
 # If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
 # searched for input files to be used with the \include or \dontinclude commands
@@ -1045,7 +1045,7 @@ IMAGE_PATH             = .
 # need to set EXTENSION_MAPPING for the extension otherwise the files are not
 # properly processed by doxygen.
 
-INPUT_FILTER           = 
+INPUT_FILTER           =
 
 # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
 # basis. Doxygen will compare the file name with each pattern and apply the
@@ -1058,7 +1058,7 @@ INPUT_FILTER           =
 # need to set EXTENSION_MAPPING for the extension otherwise the files are not
 # properly processed by doxygen.
 
-FILTER_PATTERNS        = 
+FILTER_PATTERNS        =
 
 # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
 # INPUT_FILTER) will also be used to filter the input files that are used for
@@ -1073,14 +1073,14 @@ FILTER_SOURCE_FILES    = NO
 # *.ext= (so without naming a filter).
 # This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
 
-FILTER_SOURCE_PATTERNS = 
+FILTER_SOURCE_PATTERNS =
 
 # If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
 # is part of the input, its contents will be placed on the main page
 # (index.html). This can be useful if you have a project on for instance GitHub
 # and want to reuse the introduction page also for the doxygen output.
 
-USE_MDFILE_AS_MAINPAGE = 
+USE_MDFILE_AS_MAINPAGE =
 
 #---------------------------------------------------------------------------
 # Configuration options related to source browsing
@@ -1185,7 +1185,7 @@ CLANG_ASSISTED_PARSING = NO
 # specified with INPUT and INCLUDE_PATH.
 # This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
 
-CLANG_OPTIONS          = 
+CLANG_OPTIONS          =
 
 #---------------------------------------------------------------------------
 # Configuration options related to the alphabetical class index
@@ -1211,7 +1211,7 @@ COLS_IN_ALPHA_INDEX    = 5
 # while generating the index headers.
 # This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
 
-IGNORE_PREFIX          = 
+IGNORE_PREFIX          =
 
 #---------------------------------------------------------------------------
 # Configuration options related to the HTML output
@@ -1255,7 +1255,7 @@ HTML_FILE_EXTENSION    = .html
 # of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_HEADER            = 
+HTML_HEADER            =
 
 # The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
 # generated HTML page. If the tag is left blank doxygen will generate a standard
@@ -1265,7 +1265,7 @@ HTML_HEADER            =
 # that doxygen normally uses.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_FOOTER            = 
+HTML_FOOTER            =
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
 # sheet that is used by each HTML page. It can be used to fine-tune the look of
@@ -1277,7 +1277,7 @@ HTML_FOOTER            =
 # obsolete.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_STYLESHEET        = 
+HTML_STYLESHEET        =
 
 # The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
 # cascading style sheets that are included after the standard style sheets
@@ -1290,7 +1290,7 @@ HTML_STYLESHEET        =
 # list). For an example see the documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_EXTRA_STYLESHEET  = 
+HTML_EXTRA_STYLESHEET  =
 
 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the HTML output directory. Note
@@ -1429,7 +1429,7 @@ GENERATE_HTMLHELP      = NO
 # written to the html output directory.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
-CHM_FILE               = 
+CHM_FILE               =
 
 # The HHC_LOCATION tag can be used to specify the location (absolute path
 # including file name) of the HTML help compiler (hhc.exe). If non-empty,
@@ -1437,7 +1437,7 @@ CHM_FILE               =
 # The file has to be specified with full path.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
-HHC_LOCATION           = 
+HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
 # (YES) or that it should be included in the master .chm file (NO).
@@ -1450,7 +1450,7 @@ GENERATE_CHI           = NO
 # and project file content.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
-CHM_INDEX_ENCODING     = 
+CHM_INDEX_ENCODING     =
 
 # The BINARY_TOC flag controls whether a binary table of contents is generated
 # (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
@@ -1481,7 +1481,7 @@ GENERATE_QHP           = NO
 # the HTML output folder.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
-QCH_FILE               = 
+QCH_FILE               =
 
 # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
 # Project output. For more information please see Qt Help Project / Namespace
@@ -1506,7 +1506,7 @@ QHP_VIRTUAL_FOLDER     = doc
 # filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
-QHP_CUST_FILTER_NAME   = 
+QHP_CUST_FILTER_NAME   =
 
 # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
 # custom filter to add. For more information please see Qt Help Project / Custom
@@ -1514,21 +1514,21 @@ QHP_CUST_FILTER_NAME   =
 # filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
-QHP_CUST_FILTER_ATTRS  = 
+QHP_CUST_FILTER_ATTRS  =
 
 # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
 # project's filter section matches. Qt Help Project / Filter Attributes (see:
 # http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
-QHP_SECT_FILTER_ATTRS  = 
+QHP_SECT_FILTER_ATTRS  =
 
 # The QHG_LOCATION tag can be used to specify the location of Qt's
 # qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
 # generated .qhp file.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
-QHG_LOCATION           = 
+QHG_LOCATION           =
 
 # If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
 # generated, together with the HTML files, they form an Eclipse help plugin. To
@@ -1661,7 +1661,7 @@ MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
-MATHJAX_EXTENSIONS     = 
+MATHJAX_EXTENSIONS     =
 
 # The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
 # of code that will be used on startup of the MathJax code. See the MathJax site
@@ -1669,7 +1669,7 @@ MATHJAX_EXTENSIONS     =
 # example see the documentation.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
-MATHJAX_CODEFILE       = 
+MATHJAX_CODEFILE       =
 
 # When the SEARCHENGINE tag is enabled doxygen will generate a search box for
 # the HTML output. The underlying search engine uses javascript and DHTML and
@@ -1729,7 +1729,7 @@ EXTERNAL_SEARCH        = NO
 # Searching" for details.
 # This tag requires that the tag SEARCHENGINE is set to YES.
 
-SEARCHENGINE_URL       = 
+SEARCHENGINE_URL       =
 
 # When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
 # search data is written to a file for indexing by an external tool. With the
@@ -1745,7 +1745,7 @@ SEARCHDATA_FILE        = searchdata.xml
 # projects and redirect the results back to the right project.
 # This tag requires that the tag SEARCHENGINE is set to YES.
 
-EXTERNAL_SEARCH_ID     = 
+EXTERNAL_SEARCH_ID     =
 
 # The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
 # projects other than the one defined by this configuration file, but that are
@@ -1755,7 +1755,7 @@ EXTERNAL_SEARCH_ID     =
 # EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
 # This tag requires that the tag SEARCHENGINE is set to YES.
 
-EXTRA_SEARCH_MAPPINGS  = 
+EXTRA_SEARCH_MAPPINGS  =
 
 #---------------------------------------------------------------------------
 # Configuration options related to the LaTeX output
@@ -1819,7 +1819,7 @@ PAPER_TYPE             = a4
 # If left blank no extra packages will be included.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-EXTRA_PACKAGES         = 
+EXTRA_PACKAGES         =
 
 # The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
 # generated LaTeX document. The header should contain everything until the first
@@ -1835,7 +1835,7 @@ EXTRA_PACKAGES         =
 # to HTML_HEADER.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-LATEX_HEADER           = 
+LATEX_HEADER           =
 
 # The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
 # generated LaTeX document. The footer should contain everything after the last
@@ -1846,7 +1846,7 @@ LATEX_HEADER           =
 # Note: Only use a user-defined footer if you know what you are doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-LATEX_FOOTER           = 
+LATEX_FOOTER           =
 
 # The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
 # LaTeX style sheets that are included after the standard style sheets created
@@ -1857,7 +1857,7 @@ LATEX_FOOTER           =
 # list).
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-LATEX_EXTRA_STYLESHEET = 
+LATEX_EXTRA_STYLESHEET =
 
 # The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the LATEX_OUTPUT output
@@ -1865,7 +1865,7 @@ LATEX_EXTRA_STYLESHEET =
 # markers available.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-LATEX_EXTRA_FILES      = 
+LATEX_EXTRA_FILES      =
 
 # If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
 # prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
@@ -1973,14 +1973,14 @@ RTF_HYPERLINKS         = NO
 # default style sheet that doxygen normally uses.
 # This tag requires that the tag GENERATE_RTF is set to YES.
 
-RTF_STYLESHEET_FILE    = 
+RTF_STYLESHEET_FILE    =
 
 # Set optional variables used in the generation of an RTF document. Syntax is
 # similar to doxygen's config file. A template extensions file can be generated
 # using doxygen -e rtf extensionFile.
 # This tag requires that the tag GENERATE_RTF is set to YES.
 
-RTF_EXTENSIONS_FILE    = 
+RTF_EXTENSIONS_FILE    =
 
 # If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
 # with syntax highlighting in the RTF output.
@@ -2025,7 +2025,7 @@ MAN_EXTENSION          = .3
 # MAN_EXTENSION with the initial . removed.
 # This tag requires that the tag GENERATE_MAN is set to YES.
 
-MAN_SUBDIR             = 
+MAN_SUBDIR             =
 
 # If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
 # will generate one additional man file for each entity documented in the real
@@ -2138,7 +2138,7 @@ PERLMOD_PRETTY         = YES
 # overwrite each other's variables.
 # This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
-PERLMOD_MAKEVAR_PREFIX = 
+PERLMOD_MAKEVAR_PREFIX =
 
 #---------------------------------------------------------------------------
 # Configuration options related to the preprocessor
@@ -2179,7 +2179,7 @@ SEARCH_INCLUDES        = YES
 # preprocessor.
 # This tag requires that the tag SEARCH_INCLUDES is set to YES.
 
-INCLUDE_PATH           = 
+INCLUDE_PATH           =
 
 # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
 # patterns (like *.h and *.hpp) to filter out the header-files in the
@@ -2187,7 +2187,7 @@ INCLUDE_PATH           =
 # used.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-INCLUDE_FILE_PATTERNS  = 
+INCLUDE_FILE_PATTERNS  =
 
 # The PREDEFINED tag can be used to specify one or more macro names that are
 # defined before the preprocessor is started (similar to the -D option of e.g.
@@ -2207,7 +2207,7 @@ PREDEFINED             = DOXYGEN_SHOULD_SKIP_THIS \
 # definition found in the source code.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-EXPAND_AS_DEFINED      = 
+EXPAND_AS_DEFINED      =
 
 # If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
 # remove all references to function-like macros that are alone on a line, have
@@ -2236,13 +2236,13 @@ SKIP_FUNCTION_MACROS   = YES
 # the path). If a tag file is not located in the directory in which doxygen is
 # run, you must also specify the path to the tagfile here.
 
-TAGFILES               = 
+TAGFILES               =
 
 # When a file name is specified after GENERATE_TAGFILE, doxygen will create a
 # tag file that is based on the input files it reads. See section "Linking to
 # external documentation" for more information about the usage of tag files.
 
-GENERATE_TAGFILE       = 
+GENERATE_TAGFILE       =
 
 # If the ALLEXTERNALS tag is set to YES, all external class will be listed in
 # the class index. If set to NO, only the inherited external classes will be
@@ -2291,14 +2291,14 @@ CLASS_DIAGRAMS         = NO
 # the mscgen tool resides. If left empty the tool is assumed to be found in the
 # default search path.
 
-MSCGEN_PATH            = 
+MSCGEN_PATH            =
 
 # You can include diagrams made with dia in doxygen documentation. Doxygen will
 # then run dia to produce the diagram and insert it in the documentation. The
 # DIA_PATH tag allows you to specify the directory where the dia binary resides.
 # If left empty dia is assumed to be found in the default search path.
 
-DIA_PATH               = 
+DIA_PATH               =
 
 # If set to YES the inheritance and collaboration graphs will hide inheritance
 # and usage relations if the target is undocumented or is not a class.
@@ -2347,7 +2347,7 @@ DOT_FONTSIZE           = 10
 # the path where dot can find it using this tag.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_FONTPATH           = 
+DOT_FONTPATH           =
 
 # If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
 # each documented class showing the direct and indirect inheritance relations.
@@ -2493,26 +2493,26 @@ INTERACTIVE_SVG        = NO
 # found. If left blank, it is assumed the dot tool can be found in the path.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_PATH               = 
+DOT_PATH               =
 
 # The DOTFILE_DIRS tag can be used to specify one or more directories that
 # contain dot files that are included in the documentation (see the \dotfile
 # command).
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOTFILE_DIRS           = 
+DOTFILE_DIRS           =
 
 # The MSCFILE_DIRS tag can be used to specify one or more directories that
 # contain msc files that are included in the documentation (see the \mscfile
 # command).
 
-MSCFILE_DIRS           = 
+MSCFILE_DIRS           =
 
 # The DIAFILE_DIRS tag can be used to specify one or more directories that
 # contain dia files that are included in the documentation (see the \diafile
 # command).
 
-DIAFILE_DIRS           = 
+DIAFILE_DIRS           =
 
 # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
 # path where java can find the plantuml.jar file. If left blank, it is assumed
@@ -2520,17 +2520,17 @@ DIAFILE_DIRS           =
 # generate a warning when it encounters a \startuml command in this case and
 # will not generate output for the diagram.
 
-PLANTUML_JAR_PATH      = 
+PLANTUML_JAR_PATH      =
 
 # When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
 # configuration file for plantuml.
 
-PLANTUML_CFG_FILE      = 
+PLANTUML_CFG_FILE      =
 
 # When using plantuml, the specified paths are searched for files specified by
 # the !include statement in a plantuml block.
 
-PLANTUML_INCLUDE_PATH  = 
+PLANTUML_INCLUDE_PATH  =
 
 # The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
 # that will be shown in the graph. If the number of nodes in a graph becomes
diff --git a/xbmc/addons/kodi-addon-dev-kit/doxygen/DoxygenLayout.xml b/xbmc/addons/kodi-addon-dev-kit/doxygen/DoxygenLayout.xml
index f0d9268d96..b6a6b2c7a7 100644
--- a/xbmc/addons/kodi-addon-dev-kit/doxygen/DoxygenLayout.xml
+++ b/xbmc/addons/kodi-addon-dev-kit/doxygen/DoxygenLayout.xml
@@ -11,7 +11,7 @@
     </tab>
     <tab type="classes" visible="yes" title="">
       <tab type="classlist" visible="yes" title="" intro=""/>
-      <tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/> 
+      <tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/>
       <tab type="hierarchy" visible="yes" title="" intro=""/>
       <tab type="classmembers" visible="yes" title="" intro=""/>
     </tab>-->
diff --git a/xbmc/addons/kodi-addon-dev-kit/doxygen/Modules/modules_python.dox b/xbmc/addons/kodi-addon-dev-kit/doxygen/Modules/modules_python.dox
index 2812c8aede..c280968f23 100644
--- a/xbmc/addons/kodi-addon-dev-kit/doxygen/Modules/modules_python.dox
+++ b/xbmc/addons/kodi-addon-dev-kit/doxygen/Modules/modules_python.dox
@@ -176,4 +176,3 @@ web applications or frameworks for the Python programming language.
 - @subpage python_v17
 - @subpage python_v18
 +*/
-  
\ No newline at end of file
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/Filesystem.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/Filesystem.h
index 30c72cd667..d36ed4e519 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/Filesystem.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/Filesystem.h
@@ -41,7 +41,7 @@
   #define _SSIZE_T_DEFINED
 #endif // !_SSIZE_T_DEFINED
 #endif
-  
+
 #ifndef S_ISDIR
   #define S_ISDIR(mode)  ((((mode)) & 0170000) == (0040000))
 #endif
@@ -896,7 +896,7 @@ namespace vfs
     return strReturn;
   }
   //----------------------------------------------------------------------------
-  
+
   //============================================================================
   ///
   /// @ingroup cpp_kodi_vfs
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/General.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/General.h
index 54f6af3a41..40323b8361 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/General.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/General.h
@@ -189,8 +189,8 @@ namespace kodi {
 /// @return               The localized message, or default if the add-on
 ///                       helper fails to return a message
 ///
-/// @note Label id's \b 30000 to \b 30999 and \b 32000 to \b 32999 are related 
-/// to the add-on's own included strings from 
+/// @note Label id's \b 30000 to \b 30999 and \b 32000 to \b 32999 are related
+/// to the add-on's own included strings from
 /// <b>./resources/language/resource.language.??_??/strings.po</b>
 /// All other strings are from Kodi core language files.
 ///
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/AudioEncoder.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/AudioEncoder.h
index 2271c16f3c..76c19bf028 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/AudioEncoder.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/AudioEncoder.h
@@ -137,10 +137,10 @@ namespace addon
     //==========================================================================
     /// \brief Write block of data
     ///
-    /// \param[in] data                 Pointer to the array of elements to be 
+    /// \param[in] data                 Pointer to the array of elements to be
     ///                                 written
     /// \param[in] length               Size in bytes to be written.
-    /// \return                         The total number of bytes 
+    /// \return                         The total number of bytes
     ///                                 successfully written is returned.
     int Write(const uint8_t* data, int length)
     {
@@ -155,7 +155,7 @@ namespace addon
     ///
     /// \param[in] position             the position that you want to seek to
     /// \param[in] whence               [optional] offset relative to
-    ///                                 You can set the value of whence to one 
+    ///                                 You can set the value of whence to one
     ///                                 of three things:
     ///  |   Value  | int | Description                                        |
     ///  |:--------:|:---:|:---------------------------------------------------|
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Peripheral.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Peripheral.h
index 1adc6f71ea..2c4bf4f323 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Peripheral.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Peripheral.h
@@ -781,7 +781,7 @@ namespace addon
       return addonInstance->toAddon.addonInstance->SendEvent(event);
     }
 
-    
+
     inline static PERIPHERAL_ERROR ADDON_GetJoystickInfo(const AddonInstance_Peripheral* addonInstance, unsigned int index, JOYSTICK_INFO* info)
     {
       return addonInstance->toAddon.addonInstance->GetJoystickInfo(index, info);
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VFS.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VFS.h
index 433462e825..c406e05630 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VFS.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VFS.h
@@ -579,7 +579,7 @@ namespace addon
                                            int* num_entries,
                                            char* rootpath)
     {
-      std::string cppRootPath; 
+      std::string cppRootPath;
       std::vector<kodi::vfs::CDirEntry> addonEntries;
       bool ret = instance->toAddon.addonInstance->ContainsFiles(*url, addonEntries, cppRootPath);
       if (ret)
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VideoCodec.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VideoCodec.h
index 8a8779ab6c..f264d11e74 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VideoCodec.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VideoCodec.h
@@ -53,12 +53,12 @@ extern "C"
     } codec;
 
     STREAMCODEC_PROFILE codecProfile;
-    
+
     //UnknownVideoFormat is terminator
     VIDEOCODEC_FORMAT *videoFormats;
 
     uint32_t width, height;
-    
+
     const uint8_t *extraData;
     unsigned int extraDataSize;
 
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Visualization.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Visualization.h
index 141d4cfd95..a758edf297 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Visualization.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Visualization.h
@@ -35,7 +35,7 @@ extern "C"
 struct AddonInstance_Visualization;
 
 typedef enum VIS_ACTION : unsigned int /* internal */
-{ 
+{
   VIS_ACTION_NONE = 0,
   VIS_ACTION_NEXT_PRESET,
   VIS_ACTION_PREV_PRESET,
@@ -691,7 +691,7 @@ namespace addon
     {
       addon->toAddon.addonInstance->AudioData(audioData, audioDataLength, freqData, freqDataLength);
     }
-    
+
     inline static bool ADDON_IsDirty(const AddonInstance_Visualization* addon)
     {
       return addon->toAddon.addonInstance->IsDirty();
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/Window.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/Window.h
index 4919a5e507..cd93366024 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/Window.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/Window.h
@@ -99,7 +99,7 @@ namespace gui
       if (!m_controlHandle)
         kodi::Log(ADDON_LOG_FATAL, "kodi::gui::CWindow can't create window class from Kodi !!!");
       m_interface->kodi_gui->window->set_callbacks(m_interface->kodiBase, m_controlHandle, this,
-                                                   CBOnInit, CBOnFocus, CBOnClick, CBOnAction, 
+                                                   CBOnInit, CBOnFocus, CBOnClick, CBOnAction,
                                                    CBGetContextButtons, CBOnContextButton);
     }
     //--------------------------------------------------------------------------
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/definitions.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/definitions.h
index 78ca136754..aefabfe3ce 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/definitions.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/definitions.h
@@ -224,7 +224,7 @@ typedef struct AddonToKodiFuncTable_kodi_gui_dialogKeyboard
   bool (*send_text_to_active_keyboard)(void* kodiBase, const char* text, bool close_keyboard);
   bool (*is_keyboard_activated)(void* kodiBase);
 } AddonToKodiFuncTable_kodi_gui_dialogKeyboard;
-  
+
 typedef struct AddonToKodiFuncTable_kodi_gui_dialogNumeric
 {
   bool (*show_and_verify_new_password)(void* kodiBase, char** password);
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/FileBrowser.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/FileBrowser.h
index 0dfeb990d5..4100063a54 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/FileBrowser.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/FileBrowser.h
@@ -160,7 +160,7 @@ namespace dialogs
       char* retString = nullptr;
       bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogFileBrowser->show_and_get_file_from_dir(CAddonBase::m_interface->toKodi->kodiBase,
                                                                                                           directory.c_str(), mask.c_str(), heading.c_str(),
-                                                                                                          path.c_str(), &retString, useThumbs, 
+                                                                                                          path.c_str(), &retString, useThumbs,
                                                                                                           useFileDirectories, singleList);
       if (retString != nullptr)
       {
@@ -224,7 +224,7 @@ namespace dialogs
     {
       using namespace ::kodi::addon;
       char* retString = nullptr;
-      bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogFileBrowser->show_and_get_source(CAddonBase::m_interface->toKodi->kodiBase, path.c_str(), &retString, 
+      bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogFileBrowser->show_and_get_source(CAddonBase::m_interface->toKodi->kodiBase, path.c_str(), &retString,
                                                                                                    allowNetworkShares, additionalShare.c_str(), type.c_str());
       if (retString != nullptr)
       {
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h
index d82591429c..7ba303866d 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h
@@ -540,7 +540,7 @@ public:
 
     return m_cb->Control_Spin_GetValue(m_Handle->addonData, m_controlHandle);
   }
-  
+
   void SetValue(int iValue)
   {
     if (m_controlHandle)
@@ -731,7 +731,7 @@ public:
   {
     m_controlHandle = m_cb->Window_GetControl_SettingsSlider(m_Handle->addonData, m_Window->GetControlHandle(), controlId);
   }
-  
+
   ~CAddonGUISettingsSliderControl(void) override = default;
 
   void SetVisible(bool yesNo)
@@ -907,7 +907,7 @@ inline bool CAddonGUIRenderingControl::OnDirtyCB(GUIHANDLE cbhdl)
 {
   return static_cast<CAddonGUIRenderingControl*>(cbhdl)->Dirty();
 }
-  
+
 class CHelper_libKODI_guilib
 {
 public:
@@ -932,7 +932,7 @@ public:
       m_Callbacks = (KodiAPI::GUI::CB_GUILib*)m_Handle->GUILib_RegisterMe(m_Handle->addonData);
     if (!m_Callbacks)
       fprintf(stderr, "libKODI_guilib-ERROR: GUILib_RegisterMe can't get callback table from Kodi !!!\n");
-  
+
     return m_Callbacks != nullptr;
   }
 
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_addon.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_addon.h
index c32cb1fd68..3073ccf0de 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_addon.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_addon.h
@@ -196,7 +196,7 @@ namespace ADDON
         m_Callbacks = (KodiAPI::AddOn::CB_AddOnLib*)m_Handle->AddOnLib_RegisterMe(m_Handle->addonData);
       if (!m_Callbacks)
         fprintf(stderr, "libXBMC_addon-ERROR: AddOnLib_RegisterMe can't get callback table from Kodi !!!\n");
-    
+
       return m_Callbacks != nullptr;
     }
 
@@ -302,7 +302,7 @@ namespace ADDON
     {
       m_Callbacks->FreeString(m_Handle->addonData, str);
     }
-    
+
     /*!
      * @brief Free the memory used by arr including its elements
      * @param arr The string array to free
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_pvr.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_pvr.h
index e7d9f500a2..62f4a86df6 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_pvr.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_pvr.h
@@ -62,7 +62,7 @@ public:
       m_Callbacks = (AddonInstance_PVR*)m_Handle->PVRLib_RegisterMe(m_Handle->addonData);
     if (!m_Callbacks)
       fprintf(stderr, "libXBMC_pvr-ERROR: PVRLib_register_me can't get callback table from Kodi !!!\n");
-  
+
     return m_Callbacks != NULL;
   }
 
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h
index 837d1858e6..4c639d20a7 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h
@@ -117,7 +117,7 @@ extern "C"
    *          Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function.
    */
   PVR_ERROR IsEPGTagPlayable(const EPG_TAG* tag, bool* bIsPlayable);
-  
+
   /*!
    * Retrieve the edit decision list (EDL) of an EPG tag on the backend.
    * @param epgTag The EPG tag.
diff --git a/xbmc/addons/settings/AddonSettings.cpp b/xbmc/addons/settings/AddonSettings.cpp
index cb41ba60b3..dd98963f6b 100644
--- a/xbmc/addons/settings/AddonSettings.cpp
+++ b/xbmc/addons/settings/AddonSettings.cpp
@@ -713,7 +713,7 @@ bool CAddonSettings::InitializeFromOldSettingDefinitions(const CXBMCTinyXML& doc
 
   // register the callback for action settings
   GetSettingsManager()->RegisterCallback(this, actionSettings);
-  
+
   return true;
 }
 
@@ -819,7 +819,7 @@ SettingPtr CAddonSettings::InitializeFromOldSettingTextIpAddress(const std::stri
       control->SetHidden(StringUtils::EqualsNoCase(option, "hidden"));
     }
   }
-  
+
   setting->SetDefault(defaultValue);
   setting->SetAllowEmpty(true);
   setting->SetControl(control);
@@ -1519,7 +1519,7 @@ void CAddonSettings::FileEnumSettingOptionsFiller(std::shared_ptr<const CSetting
   // fetch the matching files/directories
   CFileItemList items;
   XFILE::CDirectory::GetDirectory(settingPath->GetSources().front(), items, masking, XFILE::DIR_FLAG_NO_FILE_DIRS);
-  
+
   // process the matching files/directories
   for (auto item : items)
   {
diff --git a/xbmc/addons/settings/GUIDialogAddonSettings.cpp b/xbmc/addons/settings/GUIDialogAddonSettings.cpp
index 3fb28f7cb2..f93b5b57a7 100644
--- a/xbmc/addons/settings/GUIDialogAddonSettings.cpp
+++ b/xbmc/addons/settings/GUIDialogAddonSettings.cpp
@@ -27,7 +27,7 @@
 #include "guilib/GUIWindowManager.h"
 #include "guilib/WindowIDs.h"
 #include "guilib/LocalizeStrings.h"
-#include "messaging/helpers/DialogOKHelper.h" 
+#include "messaging/helpers/DialogOKHelper.h"
 #include "settings/lib/SettingsManager.h"
 #include "utils/StringUtils.h"
 #include "utils/Variant.h"
diff --git a/xbmc/cdrip/CDDARipJob.cpp b/xbmc/cdrip/CDDARipJob.cpp
index d0d8884c8f..09df8aa1f2 100644
--- a/xbmc/cdrip/CDDARipJob.cpp
+++ b/xbmc/cdrip/CDDARipJob.cpp
@@ -49,11 +49,11 @@ using namespace XFILE;
 
 CCDDARipJob::CCDDARipJob(const std::string& input,
                          const std::string& output,
-                         const CMusicInfoTag& tag, 
+                         const CMusicInfoTag& tag,
                          int encoder,
                          bool eject,
                          unsigned int rate,
-                         unsigned int channels, unsigned int bps) : 
+                         unsigned int channels, unsigned int bps) :
   m_rate(rate), m_channels(channels), m_bps(bps), m_tag(tag),
   m_input(input), m_output(CUtil::MakeLegalPath(output)), m_eject(eject),
   m_encoder(encoder)
@@ -71,7 +71,7 @@ bool CCDDARipJob::DoWork()
   CFileItem file(m_output, false);
   if (file.IsRemote())
     m_output = SetupTempFile();
-  
+
   if (m_output.empty())
   {
     CLog::Log(LOGERROR, "CCDDARipper: Error opening file");
@@ -88,7 +88,7 @@ bool CCDDARipJob::DoWork()
   }
 
   // setup the progress dialog
-  CGUIDialogExtendedProgressBar* pDlgProgress = 
+  CGUIDialogExtendedProgressBar* pDlgProgress =
       CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIDialogExtendedProgressBar>(WINDOW_DIALOG_EXT_PROGRESS);
   CGUIDialogProgressBarHandle* handle = pDlgProgress->GetHandle(g_localizeStrings.Get(605));
 
@@ -123,7 +123,7 @@ bool CCDDARipJob::DoWork()
     // copy the ripped track to the share
     if (!CFile::Copy(m_output, file.GetPath()))
     {
-      CLog::Log(LOGERROR, "CDDARipper: Error copying file from %s to %s", 
+      CLog::Log(LOGERROR, "CDDARipper: Error copying file from %s to %s",
                 m_output.c_str(), file.GetPath().c_str());
       CFile::Delete(m_output);
       return false;
@@ -238,7 +238,7 @@ std::string CCDDARipJob::SetupTempFile()
   int fd;
   strncpy(tmp, CSpecialProtocol::TranslatePath("special://temp/riptrackXXXXXX").c_str(), MAX_PATH);
   if ((fd = mkstemp(tmp)) == -1)
-   tmp[0] = '\0'; 
+   tmp[0] = '\0';
   if (fd != -1)
     close(fd);
 #endif
diff --git a/xbmc/cdrip/CDDARipJob.h b/xbmc/cdrip/CDDARipJob.h
index 21a7f655cc..1d5f503406 100644
--- a/xbmc/cdrip/CDDARipJob.h
+++ b/xbmc/cdrip/CDDARipJob.h
@@ -70,7 +70,7 @@ protected:
   //! \sa CCDDARipper::GetData, CEncoder::Encode
   int RipChunk(XFILE::CFile& reader, CEncoder* encoder, int& percent);
 
-  unsigned int m_rate; //< The sample rate of the input file 
+  unsigned int m_rate; //< The sample rate of the input file
   unsigned int m_channels; //< The number of channels in input file
   unsigned int m_bps; //< The bits per sample of input
   MUSIC_INFO::CMusicInfoTag m_tag; //< Music tag to attach to output file
diff --git a/xbmc/cdrip/CDDARipper.cpp b/xbmc/cdrip/CDDARipper.cpp
index 1c7f76c265..ae30b9ccbf 100644
--- a/xbmc/cdrip/CDDARipper.cpp
+++ b/xbmc/cdrip/CDDARipper.cpp
@@ -79,7 +79,7 @@ bool CCDDARipper::RipTrack(CFileItem* pItem)
   if (!CreateAlbumDir(*pItem->GetMusicInfoTag(), strDirectory, legalType))
     return false;
 
-  std::string strFile = URIUtils::AddFileToFolder(strDirectory, 
+  std::string strFile = URIUtils::AddFileToFolder(strDirectory,
                       CUtil::MakeLegalFileName(GetTrackName(pItem), legalType));
 
   AddJob(new CCDDARipJob(pItem->GetPath(),strFile,
@@ -136,7 +136,7 @@ bool CCDDARipper::RipCD()
     if (item->GetPath().find(".cdda") == std::string::npos)
       continue;
 
-    bool eject = CServiceBroker::GetSettings().GetBool(CSettings::SETTING_AUDIOCDS_EJECTONRIP) && 
+    bool eject = CServiceBroker::GetSettings().GetBool(CSettings::SETTING_AUDIOCDS_EJECTONRIP) &&
                  i == vecItems.Size()-1;
     AddJob(new CCDDARipJob(item->GetPath(),strFile,
                            *item->GetMusicInfoTag(),
@@ -208,7 +208,7 @@ std::string CCDDARipper::GetAlbumDirName(const MUSIC_INFO::CMusicInfoTag& infoTa
   size_t pos = strAlbumDir.find_last_of("/\\");
   if (pos == std::string::npos)
     return ""; // no directory
-  
+
   strAlbumDir = strAlbumDir.substr(0, pos);
 
   // replace %A with album artist name
diff --git a/xbmc/cdrip/CDDARipper.h b/xbmc/cdrip/CDDARipper.h
index 91032957cd..3bba3401e2 100644
--- a/xbmc/cdrip/CDDARipper.h
+++ b/xbmc/cdrip/CDDARipper.h
@@ -33,11 +33,11 @@ namespace MUSIC_INFO
 /*! \brief Rip an entire CD or a single track
 
  The CCDDARipper class is used to rip an entire CD or just a single track.
- Tracks are stored in a folder constructed from two user settings: audiocds.recordingpath and 
- audiocds.trackpathformat. The former is the absolute file system path for the root folder 
- where ripped music is stored, and the latter specifies the format for the album subfolder and 
+ Tracks are stored in a folder constructed from two user settings: audiocds.recordingpath and
+ audiocds.trackpathformat. The former is the absolute file system path for the root folder
+ where ripped music is stored, and the latter specifies the format for the album subfolder and
  for the track file name.
- Format used to encode ripped tracks is defined by the audiocds.encoder user setting, and 
+ Format used to encode ripped tracks is defined by the audiocds.encoder user setting, and
  there are several choices: wav, ogg vorbis and mp3.
  */
 class CCDDARipper : public CJobQueue
@@ -68,7 +68,7 @@ private:
   CCDDARipper(const CCDDARipper&) = delete;
   ~CCDDARipper() override;
   CCDDARipper const& operator=(CCDDARipper const&) = delete;
-  
+
   /*! \brief Return track file name extension for the given encoder type
    \param[in] iEncoder encoder type (see CDDARIP_ENCODER_... constants)
    \return file extension string (i.e. ".wav", ".mp3", ...)
diff --git a/xbmc/commons/Buffer.h b/xbmc/commons/Buffer.h
index 3cf658aa9f..9882b23cad 100644
--- a/xbmc/commons/Buffer.h
+++ b/xbmc/commons/Buffer.h
@@ -35,33 +35,33 @@ namespace XbmcCommons
   };
 
   /**
-   * This class is based on the java java.nio.Buffer class however, it 
-   *  does not implement the 'mark' functionality. 
+   * This class is based on the java java.nio.Buffer class however, it
+   *  does not implement the 'mark' functionality.
    *
-   * [ the following is borrowed from the javadocs for java.nio.Buffer 
+   * [ the following is borrowed from the javadocs for java.nio.Buffer
    * where it applies to this class]:
    *
    * A buffer is a linear, finite sequence of elements of a unspecified types.
-   * Aside from its content, the essential properties of a buffer are its capacity, 
+   * Aside from its content, the essential properties of a buffer are its capacity,
    *   limit, and position:
-   *    A buffer's capacity is the number of elements it contains. The capacity 
+   *    A buffer's capacity is the number of elements it contains. The capacity
    *      of a buffer is never negative and never changes.
    *
-   *    A buffer's limit is the index of the first element that should not be 
-   *      read or written. A buffer's limit is never negative and is never greater 
+   *    A buffer's limit is the index of the first element that should not be
+   *      read or written. A buffer's limit is never negative and is never greater
    *      than its capacity.
    *
-   *     A buffer's position is the index of the next element to be read or written. 
+   *     A buffer's position is the index of the next element to be read or written.
    *       A buffer's position is never negative and is never greater than its limit.
    *
    * Invariants:
    *
    * The following invariant holds for the mark, position, limit, and capacity values:
    *
-   *     0 <= mark <= position <= limit <= capacity 
+   *     0 <= mark <= position <= limit <= capacity
    *
-   * A newly-created buffer always has a position of zero and a limit set to the 
-   * capacity. The initial content of a buffer is, in general, undefined. 
+   * A newly-created buffer always has a position of zero and a limit set to the
+   * capacity. The initial content of a buffer is, in general, undefined.
    *
    * Example:
    *  Buffer buffer(1024);
@@ -75,14 +75,14 @@ namespace XbmcCommons
    *  the above is correct, it would be wrong to chain the output as follows:
    *
    *  std::cout << "buffer contents:" << buffer.getInt() << ", " << std::cout
-   *      << buffer.getCharPointerDirect() << ", " << buffer.getLongLong() 
+   *      << buffer.getCharPointerDirect() << ", " << buffer.getLongLong()
    *      << std::endl;
    *
    * This would result in the get's executing from right to left and therefore would
    *  produce totally erroneous results. This is also a problem when the values are
    *  passed to a method as in:
    *
-   * printf("buffer contents: %d, \"%s\", %ll\n", buffer.getInt(), 
+   * printf("buffer contents: %d, \"%s\", %ll\n", buffer.getInt(),
    *         buffer.getCharPointerDirect(), buffer.getLongLong());
    *
    * This would also produce erroneous results as they get's will be evaluated
@@ -97,8 +97,8 @@ namespace XbmcCommons
     size_t mlimit;
 
     inline void check(size_t count) const
-    { 
-      if ((mposition + count) > mlimit) 
+    {
+      if ((mposition + count) > mlimit)
         throw BufferException("Buffer buffer overflow: Cannot add more data to the Buffer's buffer.");
     }
 
@@ -120,20 +120,20 @@ namespace XbmcCommons
      *
      * Buffer b = Buffer(buf,bufSize).forward(bufSize).flip();
      */
-    inline Buffer(void* buffer_, size_t bufferSize) : buffer((unsigned char*)buffer_), mcapacity(bufferSize) 
+    inline Buffer(void* buffer_, size_t bufferSize) : buffer((unsigned char*)buffer_), mcapacity(bufferSize)
     {
       clear();
     }
 
     /**
      * Construct a buffer buffer using the size buffer provided. The
-     * buffer will be internally managed and potentially shared with 
+     * buffer will be internally managed and potentially shared with
      * other Buffer instances. It will be freed upon destruction of
      * the last Buffer that references it.
      */
     inline explicit Buffer(size_t bufferSize) : buffer(bufferSize ? new unsigned char[bufferSize] : NULL), mcapacity(bufferSize)
-    { 
-      clear(); 
+    {
+      clear();
       bufferRef.reset(buffer, std::default_delete<unsigned char[]>());
     }
 
@@ -144,7 +144,7 @@ namespace XbmcCommons
      * in the source buffer and vice/vrs. However, each buffer maintains
      * its own indexing.
      */
-    inline Buffer(const Buffer& buf) : bufferRef(buf.bufferRef), buffer(buf.buffer), 
+    inline Buffer(const Buffer& buf) : bufferRef(buf.bufferRef), buffer(buf.buffer),
       mposition(buf.mposition), mcapacity(buf.mcapacity), mlimit(buf.mlimit) { }
 
     inline ~Buffer() { }
@@ -175,11 +175,11 @@ namespace XbmcCommons
     }
 
     /**
-     * Flips this buffer. The limit is set to the current position 
-     *   and then the position is set to zero. 
+     * Flips this buffer. The limit is set to the current position
+     *   and then the position is set to zero.
      *
-     * After a sequence of channel-read or put operations, invoke this 
-     *   method to prepare for a sequence of channel-write or relative 
+     * After a sequence of channel-read or put operations, invoke this
+     *   method to prepare for a sequence of channel-write or relative
      *   get operations. For example:
      *
      * buf.put(magic);    // Prepend header
@@ -193,18 +193,18 @@ namespace XbmcCommons
     inline Buffer& flip() { mlimit = mposition; mposition = 0; return *this; }
 
     /**
-     *Clears this buffer. The position is set to zero, the limit 
+     *Clears this buffer. The position is set to zero, the limit
      *  is set to the capacity.
      *
-     * Invoke this method before using a sequence of channel-read 
+     * Invoke this method before using a sequence of channel-read
      *  or put operations to fill this buffer. For example:
      *
      *     buf.clear();     // Prepare buffer for reading
      *     in.read(buf);    // Read data
      *
-     * This method does not actually erase the data in the buffer, 
-     *  but it is named as if it did because it will most often be used 
-     *  in situations in which that might as well be the case. 
+     * This method does not actually erase the data in the buffer,
+     *  but it is named as if it did because it will most often be used
+     *  in situations in which that might as well be the case.
      */
     inline Buffer& clear() { mlimit = mcapacity; mposition = 0; return *this; }
 
@@ -255,8 +255,8 @@ namespace XbmcCommons
 
     inline std::string getString() { std::string ret((const char*)(buffer + mposition)); size_t len = ret.length() + 1; check(len); mposition += len; return ret; }
     inline std::string getString(size_t length)
-    { 
-      check(length); 
+    {
+      check(length);
       std::string ret((const char*)(buffer + mposition),length);
       mposition += length;
       return ret;
diff --git a/xbmc/commons/Exception.h b/xbmc/commons/Exception.h
index 4e6ef7ac85..a629ae49dc 100644
--- a/xbmc/commons/Exception.h
+++ b/xbmc/commons/Exception.h
@@ -99,14 +99,14 @@ namespace XbmcCommons
    * This class forms the base class for unchecked exceptions. Unchecked exceptions
    * are those that really shouldn't be handled explicitly. For example, on windows
    * when a access violation is converted to a win32_exception, there's nothing
-   * that can be done in most code. The outer most stack frame might try to 
+   * that can be done in most code. The outer most stack frame might try to
    * do some error logging prior to shutting down, but that's really it.
    */
   XBMCCOMMONS_STANDARD_EXCEPTION(UncheckedException);
 
 /**
- * In cases where you catch(...){} you will (may) inadvertently be 
- * catching UncheckedException's. Therefore this macro will allow 
+ * In cases where you catch(...){} you will (may) inadvertently be
+ * catching UncheckedException's. Therefore this macro will allow
  * you to do something equivalent to:
  *    catch (anything except UncheckedException) {}
  *
diff --git a/xbmc/contrib/kissfft/_kiss_fft_guts.h b/xbmc/contrib/kissfft/_kiss_fft_guts.h
index ba66144403..f008a7b500 100644
--- a/xbmc/contrib/kissfft/_kiss_fft_guts.h
+++ b/xbmc/contrib/kissfft/_kiss_fft_guts.h
@@ -20,7 +20,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 #include <limits.h>
 
 #define MAXFACTORS 32
-/* e.g. an fft of length 128 has 4 factors 
+/* e.g. an fft of length 128 has 4 factors
  as far as kissfft is concerned
  4*4*4*2
  */
@@ -48,7 +48,7 @@ struct kiss_fft_state{
 #define SAMP_MAX 2147483647
 #else
 # define FRACBITS 15
-# define SAMPPROD int32_t 
+# define SAMPPROD int32_t
 #define SAMP_MAX 32767
 #endif
 
@@ -152,12 +152,12 @@ struct kiss_fft_state{
 
 #ifdef KISS_FFT_USE_ALLOCA
 // define this to allow use of alloca instead of malloc for temporary buffers
-// Temporary buffers are used in two case: 
+// Temporary buffers are used in two case:
 // 1. FFT sizes that have "bad" factors. i.e. not 2,3 and 5
 // 2. "in-place" FFTs.  Notice the quotes, since kissfft does not really do an in-place transform.
 #include <alloca.h>
 #define  KISS_FFT_TMP_ALLOC(nbytes) alloca(nbytes)
-#define  KISS_FFT_TMP_FREE(ptr) 
+#define  KISS_FFT_TMP_FREE(ptr)
 #else
 #define  KISS_FFT_TMP_ALLOC(nbytes) KISS_FFT_MALLOC(nbytes)
 #define  KISS_FFT_TMP_FREE(ptr) KISS_FFT_FREE(ptr)
diff --git a/xbmc/contrib/kissfft/kiss_fft.c b/xbmc/contrib/kissfft/kiss_fft.c
index 846549b1cd..d3b50f8702 100644
--- a/xbmc/contrib/kissfft/kiss_fft.c
+++ b/xbmc/contrib/kissfft/kiss_fft.c
@@ -250,7 +250,7 @@ void kf_work(
     const kiss_fft_cpx * Fout_end = Fout + p*m;
 
 #ifdef _OPENMP
-    // use openmp extensions at the 
+    // use openmp extensions at the
     // top-level (not recursive)
     if (fstride==1 && p<=5)
     {
@@ -258,15 +258,15 @@ void kf_work(
 
         // execute the p different work units in different threads
 #       pragma omp parallel for
-        for (k=0;k<p;++k) 
+        for (k=0;k<p;++k)
             kf_work( Fout +k*m, f+ fstride*in_stride*k,fstride*p,in_stride,factors,st);
         // all threads have joined by this point
 
         switch (p) {
             case 2: kf_bfly2(Fout,fstride,st,m); break;
-            case 3: kf_bfly3(Fout,fstride,st,m); break; 
+            case 3: kf_bfly3(Fout,fstride,st,m); break;
             case 4: kf_bfly4(Fout,fstride,st,m); break;
-            case 5: kf_bfly5(Fout,fstride,st,m); break; 
+            case 5: kf_bfly5(Fout,fstride,st,m); break;
             default: kf_bfly_generic(Fout,fstride,st,m,p); break;
         }
         return;
@@ -282,7 +282,7 @@ void kf_work(
         do{
             // recursive call:
             // DFT of size m*p performed by doing
-            // p instances of smaller DFTs of size m, 
+            // p instances of smaller DFTs of size m,
             // each one takes a decimated version of the input
             kf_work( Fout , f, fstride*p, in_stride, factors,st);
             f += fstride*in_stride;
@@ -291,21 +291,21 @@ void kf_work(
 
     Fout=Fout_beg;
 
-    // recombine the p smaller DFTs 
+    // recombine the p smaller DFTs
     switch (p) {
         case 2: kf_bfly2(Fout,fstride,st,m); break;
-        case 3: kf_bfly3(Fout,fstride,st,m); break; 
+        case 3: kf_bfly3(Fout,fstride,st,m); break;
         case 4: kf_bfly4(Fout,fstride,st,m); break;
-        case 5: kf_bfly5(Fout,fstride,st,m); break; 
+        case 5: kf_bfly5(Fout,fstride,st,m); break;
         default: kf_bfly_generic(Fout,fstride,st,m,p); break;
     }
 }
 
 /*  facbuf is populated by p1,m1,p2,m2, ...
-    where 
+    where
     p[i] * m[i] = m[i-1]
     m0 = n                  */
-static 
+static
 void kf_factor(int n,int * facbuf)
 {
     int p=4;
diff --git a/xbmc/contrib/kissfft/kiss_fft.h b/xbmc/contrib/kissfft/kiss_fft.h
index 64c50f4aae..c01722cad7 100644
--- a/xbmc/contrib/kissfft/kiss_fft.h
+++ b/xbmc/contrib/kissfft/kiss_fft.h
@@ -28,17 +28,17 @@ extern "C" {
 # define kiss_fft_scalar __m128
 #define KISS_FFT_MALLOC(nbytes) _mm_malloc(nbytes,16)
 #define KISS_FFT_FREE _mm_free
-#else	
+#else
 #define KISS_FFT_MALLOC malloc
 #define KISS_FFT_FREE free
-#endif	
+#endif
 
 
 #ifdef FIXED_POINT
-#include <sys/types.h>	
+#include <sys/types.h>
 # if (FIXED_POINT == 32)
 #  define kiss_fft_scalar int32_t
-# else	
+# else
 #  define kiss_fft_scalar int16_t
 # endif
 #else
@@ -55,9 +55,9 @@ typedef struct {
 
 typedef struct kiss_fft_state* kiss_fft_cfg;
 
-/* 
+/*
  *  kiss_fft_alloc
- *  
+ *
  *  Initialize a FFT (or IFFT) algorithm's cfg/state buffer.
  *
  *  typical usage:      kiss_fft_cfg mycfg=kiss_fft_alloc(1024,0,NULL,NULL);
@@ -67,18 +67,18 @@ typedef struct kiss_fft_state* kiss_fft_cfg;
  *
  *  If lenmem is NULL, then kiss_fft_alloc will allocate a cfg buffer using malloc.
  *  The returned value should be free()d when done to avoid memory leaks.
- *  
+ *
  *  The state can be placed in a user supplied buffer 'mem':
  *  If lenmem is not NULL and mem is not NULL and *lenmem is large enough,
  *      then the function places the cfg in mem and the size used in *lenmem
  *      and returns mem.
- *  
+ *
  *  If lenmem is not NULL and ( mem is NULL or *lenmem is not large enough),
- *      then the function returns NULL and places the minimum cfg 
+ *      then the function returns NULL and places the minimum cfg
  *      buffer size in *lenmem.
  * */
 
-kiss_fft_cfg kiss_fft_alloc(int nfft,int inverse_fft,void * mem,size_t * lenmem); 
+kiss_fft_cfg kiss_fft_alloc(int nfft,int inverse_fft,void * mem,size_t * lenmem);
 
 /*
  * kiss_fft(cfg,in_out_buf)
@@ -97,16 +97,16 @@ void kiss_fft(kiss_fft_cfg cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout);
  * */
 void kiss_fft_stride(kiss_fft_cfg cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout,int fin_stride);
 
-/* If kiss_fft_alloc allocated a buffer, it is one contiguous 
+/* If kiss_fft_alloc allocated a buffer, it is one contiguous
    buffer and can be simply free()d when no longer needed*/
 #define kiss_fft_free free
 
 /*
- Cleans up some memory that gets managed internally. Not necessary to call, but it might clean up 
+ Cleans up some memory that gets managed internally. Not necessary to call, but it might clean up
  your compiler output to call this before you exit.
 */
 void kiss_fft_cleanup(void);
-	
+
 
 /*
  * Returns the smallest integer k, such that k>=n and k has only "fast" factors (2,3,5)
@@ -118,7 +118,7 @@ int kiss_fft_next_fast_size(int n);
         (kiss_fft_next_fast_size( ((n)+1)>>1)<<1)
 
 #ifdef __cplusplus
-} 
+}
 #endif
 
 #endif
diff --git a/xbmc/contrib/kissfft/kiss_fftr.c b/xbmc/contrib/kissfft/kiss_fftr.c
index b8e238b1e2..302f1cd3e9 100644
--- a/xbmc/contrib/kissfft/kiss_fftr.c
+++ b/xbmc/contrib/kissfft/kiss_fftr.c
@@ -83,12 +83,12 @@ void kiss_fftr(kiss_fftr_cfg st,const kiss_fft_scalar *timedata,kiss_fft_cpx *fr
      * contains the sum of the even-numbered elements of the input time sequence
      * The imag part is the sum of the odd-numbered elements
      *
-     * The sum of tdc.r and tdc.i is the sum of the input time sequence. 
+     * The sum of tdc.r and tdc.i is the sum of the input time sequence.
      *      yielding DC of input time sequence
-     * The difference of tdc.r - tdc.i is the sum of the input (dot product) [1,-1,1,-1... 
+     * The difference of tdc.r - tdc.i is the sum of the input (dot product) [1,-1,1,-1...
      *      yielding Nyquist bin of input time sequence
      */
- 
+
     tdc.r = st->tmpbuf[0].r;
     tdc.i = st->tmpbuf[0].i;
     C_FIXDIV(tdc,2);
@@ -96,14 +96,14 @@ void kiss_fftr(kiss_fftr_cfg st,const kiss_fft_scalar *timedata,kiss_fft_cpx *fr
     CHECK_OVERFLOW_OP(tdc.r ,-, tdc.i);
     freqdata[0].r = tdc.r + tdc.i;
     freqdata[ncfft].r = tdc.r - tdc.i;
-#ifdef USE_SIMD    
+#ifdef USE_SIMD
     freqdata[ncfft].i = freqdata[0].i = _mm_set1_ps(0);
 #else
     freqdata[ncfft].i = freqdata[0].i = 0;
 #endif
 
     for ( k=1;k <= ncfft/2 ; ++k ) {
-        fpk    = st->tmpbuf[k]; 
+        fpk    = st->tmpbuf[k];
         fpnk.r =   st->tmpbuf[ncfft-k].r;
         fpnk.i = - st->tmpbuf[ncfft-k].i;
         C_FIXDIV(fpk,2);
@@ -149,7 +149,7 @@ void kiss_fftri(kiss_fftr_cfg st,const kiss_fft_cpx *freqdata,kiss_fft_scalar *t
         C_MUL (fok, tmp, st->super_twiddles[k-1]);
         C_ADD (st->tmpbuf[k],     fek, fok);
         C_SUB (st->tmpbuf[ncfft - k], fek, fok);
-#ifdef USE_SIMD        
+#ifdef USE_SIMD
         st->tmpbuf[ncfft - k].i *= _mm_set1_ps(-1.0);
 #else
         st->tmpbuf[ncfft - k].i *= -1;
diff --git a/xbmc/contrib/kissfft/kiss_fftr.h b/xbmc/contrib/kissfft/kiss_fftr.h
index 72e5a57714..222bf95f2d 100644
--- a/xbmc/contrib/kissfft/kiss_fftr.h
+++ b/xbmc/contrib/kissfft/kiss_fftr.h
@@ -6,13 +6,13 @@
 extern "C" {
 #endif
 
-    
-/* 
- 
+
+/*
+
  Real optimized version can save about 45% cpu time vs. complex fft of a real seq.
 
- 
- 
+
+
  */
 
 typedef struct kiss_fftr_state *kiss_fftr_cfg;
@@ -22,7 +22,7 @@ kiss_fftr_cfg kiss_fftr_alloc(int nfft,int inverse_fft,void * mem, size_t * lenm
 /*
  nfft must be even
 
- If you don't care to allocate space, use mem = lenmem = NULL 
+ If you don't care to allocate space, use mem = lenmem = NULL
 */
 
 
diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
index 7070f9756f..227ce06398 100644
--- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
@@ -1375,7 +1375,7 @@ void CActiveAE::Configure(AEAudioFormat *desiredFmt)
   }
 
   // resample buffers for sink
-  if (m_sinkBuffers && 
+  if (m_sinkBuffers &&
      (!CompareFormat(m_sinkBuffers->m_format,m_sinkFormat) ||
       !CompareFormat(m_sinkBuffers->m_inputFormat, sinkInputFormat) ||
       m_sinkBuffers->m_format.m_frames != m_sinkFormat.m_frames))
@@ -2038,7 +2038,7 @@ bool CActiveAE::RunStages()
               fadingStep = delta / samples;
             }
 
-            // for stream amplification, 
+            // for stream amplification,
             // turned off downmix normalization,
             // or if sink format is float (in order to prevent from clipping)
             // we need to run on a per sample basis
diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.h
index 9bfa67c59d..415d4cc077 100644
--- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.h
+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.h
@@ -162,5 +162,5 @@ protected:
   int64_t m_lastSamplePts;
   bool m_fillPackets;
 };
-  
+
 }
diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEFilter.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEFilter.h
index dfae0a3fbe..fae0569fcf 100644
--- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEFilter.h
+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEFilter.h
@@ -42,7 +42,7 @@ public:
   bool IsEof();
   bool IsActive();
   int GetBufferedSamples();
-  
+
 protected:
   bool CreateFilterGraph();
   bool CreateAtempoFilter();
diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.h
index 389814dba6..a416557bd1 100644
--- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.h
+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.h
@@ -120,7 +120,7 @@ public:
   bool HasWork();
   CActiveAEBufferPool *GetResampleBuffers();
   CActiveAEBufferPool *GetAtempoBuffers();
-  
+
   AEAudioFormat m_inputFormat;
   std::deque<CSampleBuffer*> m_outputSamples;
   std::deque<CSampleBuffer*> m_inputSamples;
@@ -177,10 +177,10 @@ public:
 
   unsigned int GetFrameSize() const override;
   unsigned int GetChannelCount() const override;
-  
+
   unsigned int GetSampleRate() const override ;
   enum AEDataFormat GetDataFormat() const override;
-  
+
   double GetResampleRatio() override;
   void SetResampleRatio(double ratio) override;
   void SetResampleMode(int mode) override;
diff --git a/xbmc/cores/AudioEngine/Interfaces/AEStream.h b/xbmc/cores/AudioEngine/Interfaces/AEStream.h
index 3b4760f7fe..ee478b1d1b 100644
--- a/xbmc/cores/AudioEngine/Interfaces/AEStream.h
+++ b/xbmc/cores/AudioEngine/Interfaces/AEStream.h
@@ -148,7 +148,7 @@ public:
    * Returns true if the is stream has finished draining
    */
   virtual bool IsDrained() = 0;
-  
+
   /**
    * Flush all buffers dropping the audio data
    */
@@ -258,7 +258,7 @@ public:
     * @param from The volume level to fade from (0.0f-1.0f) - See notes
     * @param target The volume level to fade to (0.0f-1.0f)
     * @param time The amount of time in milliseconds for the fade to occur
-    * @note The from parameter does not set the streams volume, it is only used to calculate the fade time properly 
+    * @note The from parameter does not set the streams volume, it is only used to calculate the fade time properly
     */
   virtual void FadeVolume(float from, float target, unsigned int time) {} /* FIXME: once all the engines have these new methods */
 
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
index 75eb2bfa19..d541f960a7 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
@@ -738,16 +738,16 @@ bool CAESinkALSA::InitializeHW(const ALSAConfig &inconfig, ALSAConfig &outconfig
   snd_pcm_hw_params_get_buffer_size_max(hw_params, &bufferSize);
   snd_pcm_hw_params_get_period_size_max(hw_params, &periodSize, NULL);
 
-  /* 
-   We want to make sure, that we have max 200 ms Buffer with 
+  /*
+   We want to make sure, that we have max 200 ms Buffer with
    a periodSize of approx 50 ms. Choosing a higher bufferSize
    will cause problems with menu sounds. Buffer will be increased
    after those are fixed.
   */
   periodSize  = std::min(periodSize, (snd_pcm_uframes_t) sampleRate / 20);
   bufferSize  = std::min(bufferSize, (snd_pcm_uframes_t) sampleRate / 5);
-  
-  /* 
+
+  /*
    According to upstream we should set buffer size first - so make sure it is always at least
    4x period size to not get underruns (some systems seem to have issues with only 2 periods)
   */
@@ -764,7 +764,7 @@ bool CAESinkALSA::InitializeHW(const ALSAConfig &inconfig, ALSAConfig &outconfig
     snd_pcm_hw_params_copy(hw_params_copy, hw_params); // restore working copy
     CLog::Log(LOGDEBUG, "CAESinkALSA::InitializeHW - Request: Failed to limit periodSize to %lu", periodSizeMax);
   }
-  
+
   // first trying bufferSize, PeriodSize
   // for more info see here:
   // http://mailman.alsa-project.org/pipermail/alsa-devel/2009-September/021069.html
@@ -789,7 +789,7 @@ bool CAESinkALSA::InitializeHW(const ALSAConfig &inconfig, ALSAConfig &outconfig
       // try only periodSize
       periodSize = periodSizeTemp;
       snd_pcm_hw_params_copy(hw_params_copy, hw_params); // restore working copy
-      if(snd_pcm_hw_params_set_period_size_near(m_pcm, hw_params_copy, &periodSize, NULL) != 0 
+      if(snd_pcm_hw_params_set_period_size_near(m_pcm, hw_params_copy, &periodSize, NULL) != 0
         || snd_pcm_hw_params(m_pcm, hw_params_copy) != 0)
       {
         // try only BufferSize
@@ -811,7 +811,7 @@ bool CAESinkALSA::InitializeHW(const ALSAConfig &inconfig, ALSAConfig &outconfig
       snd_pcm_get_params(m_pcm, &bufferSize, &periodSize);
     }
   }
-  
+
   CLog::Log(LOGDEBUG, "CAESinkALSA::InitializeHW - Got: periodSize %lu, bufferSize %lu", periodSize, bufferSize);
 
   /* set the format parameters */
@@ -1395,9 +1395,9 @@ void CAESinkALSA::EnumerateDevice(AEDeviceInfoList &list, const std::string &dev
 
             if (badHDMI)
             {
-              /* 
-               * Warn about disconnected devices, but keep them enabled 
-               * Detection can go wrong on Intel, Nvidia and on all 
+              /*
+               * Warn about disconnected devices, but keep them enabled
+               * Detection can go wrong on Intel, Nvidia and on all
                * AMD (fglrx) hardware, so it is not safe to close those
                * handles
                */
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp
index 0c08f90bd0..2fc92e54fe 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp
@@ -232,7 +232,7 @@ int CAESinkAUDIOTRACK::AudioTrackWrite(char* audioData, int offsetInBytes, int s
     else
       written = m_at_jni->write(m_charbuf, 0, sizeInBytes - offsetInBytes);
   }
-  
+
   return written;
 }
 
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.h b/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.h
index 85fe3bf6ba..2f28d1e269 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.h
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.h
@@ -60,14 +60,14 @@ protected:
   static bool HasAmlHD();
   static void UpdateAvailablePCMCapabilities();
   static void UpdateAvailablePassthroughCapabilities();
-  
+
   int AudioTrackWrite(char* audioData, int offsetInBytes, int sizeInBytes);
   int AudioTrackWrite(char* audioData, int sizeInBytes, int64_t timestamp);
 
 private:
   jni::CJNIAudioTrack  *m_at_jni;
   int     m_jniAudioFormat;
-  
+
   double                m_duration_written;
   unsigned int          m_min_buffer_size;
   int64_t               m_offset;
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp
index 781f2d46dd..3097c53753 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp
@@ -283,9 +283,9 @@ bool CAESinkDARWINOSX::Initialize(AEAudioFormat &format, std::string &device)
 
   /* Update our AE format */
   format.m_sampleRate    = outputFormat.mSampleRate;
-  
+
   m_outputBufferIndex = requestedStreamIndex;
-  
+
   // if we are in passthrough but didn't have a matching
   // virtual format - enable bitstream which deals with
   // backconverting from float to 16bit
@@ -326,7 +326,7 @@ bool CAESinkDARWINOSX::Initialize(AEAudioFormat &format, std::string &device)
 
   // update the channel map based on the new stream format
   devEnum.GetAEChannelMap(format.m_channelLayout, numOutputChannels);
-   
+
   //! @todo Should we use the virtual format to determine our data format?
   format.m_frameSize     = format.m_channelLayout.Count() * (CAEUtil::DataFormatToBits(format.m_dataFormat) >> 3);
   format.m_frames        = m_device.GetBufferSize();
@@ -438,7 +438,7 @@ unsigned int CAESinkDARWINOSX::AddPackets(uint8_t **data, unsigned int frames, u
     if (!m_started && timer.IsTimePast())
     {
       CLog::Log(LOGERROR, "%s engine didn't start in %d ms!", __FUNCTION__, timeout);
-      return INT_MAX;    
+      return INT_MAX;
     }
   }
 
@@ -489,7 +489,7 @@ inline void LogLevel(unsigned int got, unsigned int wanted)
     {
       CLog::Log(LOGWARNING, "DARWINOSX: %sflow (%u vs %u bytes)", got > wanted ? "over" : "under", got, wanted);
       lastReported = got;
-    }    
+    }
   }
   else
     lastReported = INT_MAX; // indicate we were good at least once
@@ -506,7 +506,7 @@ OSStatus CAESinkDARWINOSX::renderCallback(AudioDeviceID inDevice, const AudioTim
     //planar always starts at outputbuffer/streamidx 0
     unsigned int startIdx = sink->m_buffer->NumPlanes() == 1 ? sink->m_outputBufferIndex : 0;
     unsigned int endIdx = startIdx + sink->m_buffer->NumPlanes();
-    
+
     /* NOTE: We assume that the buffers are all the same size... */
     if (sink->m_outputBitstream)
     {
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp
index 1d5a68cbfa..591e4a2d23 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp
@@ -636,7 +636,7 @@ bool CAESinkDirectSound::UpdateCacheStatus()
       return false;
     }
   }
-  else 
+  else
     m_BufferTimeouts = 0;
 
   // Calculate available space in the ring buffer
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp
index 40d412db92..342f92e20b 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp
@@ -412,7 +412,7 @@ void CAESinkOSS::GetDelay(AEDelayStatus& status)
     status.SetDelay(0);
     return;
   }
-  
+
   int delay;
   if (ioctl(m_fd, SNDCTL_DSP_GETODELAY, &delay) == -1)
   {
@@ -464,7 +464,7 @@ void CAESinkOSS::EnumerateDevicesEx(AEDeviceInfoList &list, bool force)
     CLog::Log(LOGNOTICE,
 	  "CAESinkOSS::EnumerateDevicesEx - No OSS mixer device present: %s", mixerdev);
     return;
-  }	
+  }
 
 #if defined(SNDCTL_SYSINFO) && defined(SNDCTL_CARDINFO)
   oss_sysinfo sysinfo;
@@ -523,7 +523,7 @@ void CAESinkOSS::EnumerateDevicesEx(AEDeviceInfoList &list, bool force)
     {
       info.m_deviceType = AE_DEVTYPE_PCM;
     }
- 
+
     oss_audioinfo ainfo;
     memset(&ainfo, 0, sizeof(ainfo));
     ainfo.dev = i;
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkPULSE.h b/xbmc/cores/AudioEngine/Sinks/AESinkPULSE.h
index d141484304..afa6a279c3 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkPULSE.h
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkPULSE.h
@@ -69,7 +69,7 @@ private:
   unsigned int m_BufferSize;
   unsigned int m_Channels;
 
-  pa_stream *m_Stream; 
+  pa_stream *m_Stream;
   pa_cvolume m_Volume;
   bool m_volume_needs_update;
   uint32_t m_periodSize;
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkPi.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkPi.cpp
index 9e39433ded..33fd0df190 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkPi.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkPi.cpp
@@ -591,7 +591,7 @@ void CAESinkPi::EnumerateDevicesEx(AEDeviceInfoList &list, bool force)
   m_info.m_dataFormats.push_back(AE_FMT_FLOATP);
   m_info.m_dataFormats.push_back(AE_FMT_S32NEP);
   m_info.m_dataFormats.push_back(AE_FMT_S16NEP);
-  
+
   m_info.m_wantsIECPassthrough = true;
   list.push_back(m_info);
 }
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkSNDIO.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkSNDIO.cpp
index 185dca9e6a..9eef595c9f 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkSNDIO.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkSNDIO.cpp
@@ -56,7 +56,7 @@ static struct sndio_formats formats[] =
   { AE_FMT_S32NE, 32, 4, 1, SIO_LE_NATIVE, 1 },
   { AE_FMT_S32LE, 32, 4, 1, 1, 1 },
   { AE_FMT_S32BE, 32, 4, 1, 0, 1 },
-  
+
   { AE_FMT_S24NE4, 24, 4, 1, SIO_LE_NATIVE, 0 },
   { AE_FMT_S24NE4, 24, 4, 1, SIO_LE_NATIVE, 1 },
   { AE_FMT_S24NE3, 24, 3, 1, SIO_LE_NATIVE, 0 },
@@ -68,7 +68,7 @@ static struct sndio_formats formats[] =
   { AE_FMT_S16LE, 16, 2, 1, 1, 0 },
   { AE_FMT_S16BE, 16, 2, 1, 0, 1 },
   { AE_FMT_S16BE, 16, 2, 1, 0, 0 },
-  
+
   { AE_FMT_U8, 8, 1, 0, 0, 0 },
   { AE_FMT_U8, 8, 1, 0, 0, 1 },
   { AE_FMT_U8, 8, 1, 0, 1, 0 },
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp
index e270b58ad7..40fdfd502c 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp
@@ -451,7 +451,7 @@ void CAESinkWASAPI::EnumerateDevicesEx(AEDeviceInfoList &deviceInfoList, bool fo
                    "Exclusive mode is not allowed on device \"%s\", check device settings.",
                    details.strDescription);
         SafeRelease(&pDevice);
-        continue; 
+        continue;
       }
       if (SUCCEEDED(hr) || details.eDeviceType == AE_DEVTYPE_HDMI)
       {
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkXAudio.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkXAudio.cpp
index f0a22b5150..e4e4224cd2 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkXAudio.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkXAudio.cpp
@@ -202,7 +202,7 @@ void CAESinkXAudio::GetDelay(AEDelayStatus& status)
 
   XAUDIO2_VOICE_STATE state;
   m_sourceVoice->GetState(&state, 0);
-  
+
   double delay = (double)(m_sinkFrames - state.SamplesPlayed) / m_format.m_sampleRate;
   status.SetDelay(delay);
   return;
@@ -395,7 +395,7 @@ void CAESinkXAudio::EnumerateDevicesEx(AEDeviceInfoList &deviceInfoList, bool fo
     {
       CLog::Log(LOGNOTICE, __FUNCTION__": stream type \"%s\" on device \"%s\" seems to be not supported.", CAEUtil::StreamTypeToStr(CAEStreamInfo::STREAM_TYPE_TRUEHD), details.strDescription.c_str());
     }
-    else 
+    else
     {
       deviceInfo.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_TRUEHD);
       add192 = true;
@@ -417,7 +417,7 @@ void CAESinkXAudio::EnumerateDevicesEx(AEDeviceInfoList &deviceInfoList, bool fo
     {
       CLog::Log(LOGNOTICE, __FUNCTION__": stream type \"%s\" on device \"%s\" seems to be not supported.", CAEUtil::StreamTypeToStr(CAEStreamInfo::STREAM_TYPE_EAC3), details.strDescription.c_str());
     }
-    else 
+    else
     {
       deviceInfo.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_EAC3);
       add192 = true;
@@ -777,7 +777,7 @@ initialize:
   m_uiBufferLen = (int)(format.m_sampleRate * 0.02);
   m_dwFrameSize = wfxex.Format.nBlockAlign;
   m_dwChunkSize = m_dwFrameSize * m_uiBufferLen;
-  m_dwBufferLen = m_dwChunkSize * 4; 
+  m_dwBufferLen = m_dwChunkSize * 4;
   m_AvgBytesPerSec = wfxex.Format.nAvgBytesPerSec;
 
   CLog::Log(LOGINFO, __FUNCTION__": XAudio Sink Initialized using: %s, %d, %d",
@@ -819,7 +819,7 @@ void CAESinkXAudio::Drain()
 
 bool CAESinkXAudio::IsUSBDevice()
 {
-#if 0 // TODO 
+#if 0 // TODO
   IPropertyStore *pProperty = nullptr;
   PROPVARIANT varName;
   PropVariantInit(&varName);
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkXAudio.h b/xbmc/cores/AudioEngine/Sinks/AESinkXAudio.h
index 4b74005a93..a3955f42e8 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkXAudio.h
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkXAudio.h
@@ -49,7 +49,7 @@ public:
 
     void GetDelay(AEDelayStatus& status) override;
     double GetCacheTotal() override;
-    double GetLatency() override; 
+    double GetLatency() override;
     unsigned int AddPackets(uint8_t **data, unsigned int frames, unsigned int offset) override;
     void Drain() override;
 
@@ -86,7 +86,7 @@ private:
       STDMETHOD_(void, OnVoiceProcessingPassEnd)() override {}
       STDMETHOD_(void, OnStreamEnd)() override {}
       STDMETHOD_(void, OnBufferStart)(void*) override {}
-      STDMETHOD_(void, OnBufferEnd)(void* context) override 
+      STDMETHOD_(void, OnBufferEnd)(void* context) override
       {
         SetEvent(mBufferEnd.get());
         struct buffer_ctx *ctx = static_cast<struct buffer_ctx*>(context);
@@ -96,14 +96,14 @@ private:
       STDMETHOD_(void, OnLoopEnd)(void*) override {}
       STDMETHOD_(void, OnVoiceError)(void*, HRESULT) override {}
 
-      struct handle_closer 
-      { 
-        void operator()(HANDLE h) 
-        { 
-          assert(h != INVALID_HANDLE_VALUE); 
-          if (h) 
-            CloseHandle(h); 
-        } 
+      struct handle_closer
+      {
+        void operator()(HANDLE h)
+        {
+          assert(h != INVALID_HANDLE_VALUE);
+          if (h)
+            CloseHandle(h);
+        }
       };
       std::unique_ptr<void, handle_closer> mBufferEnd;
     };
diff --git a/xbmc/cores/AudioEngine/Sinks/osx/AEDeviceEnumerationOSX.cpp b/xbmc/cores/AudioEngine/Sinks/osx/AEDeviceEnumerationOSX.cpp
index 0023cb1ff4..85b92a7b65 100644
--- a/xbmc/cores/AudioEngine/Sinks/osx/AEDeviceEnumerationOSX.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/osx/AEDeviceEnumerationOSX.cpp
@@ -31,7 +31,7 @@
 // default channel map - in case it can't be fetched from the device
 static enum AEChannel CAChannelMap[CA_MAX_CHANNELS + 1] = {
   AE_CH_FL , AE_CH_FR , AE_CH_BL , AE_CH_BR , AE_CH_FC , AE_CH_LFE , AE_CH_SL , AE_CH_SR ,
-  AE_CH_UNKNOWN1  , AE_CH_UNKNOWN2  , AE_CH_UNKNOWN3  , AE_CH_UNKNOWN4  , 
+  AE_CH_UNKNOWN1  , AE_CH_UNKNOWN2  , AE_CH_UNKNOWN3  , AE_CH_UNKNOWN4  ,
   AE_CH_UNKNOWN5  , AE_CH_UNKNOWN6  , AE_CH_UNKNOWN7  , AE_CH_UNKNOWN8  ,
   AE_CH_UNKNOWN9  , AE_CH_UNKNOWN10 , AE_CH_UNKNOWN11 , AE_CH_UNKNOWN12 ,
   AE_CH_UNKNOWN13 , AE_CH_UNKNOWN14 , AE_CH_UNKNOWN15 , AE_CH_UNKNOWN16 ,
@@ -83,7 +83,7 @@ bool AEDeviceEnumerationOSX::Enumerate()
       CCoreAudioStream::GetAvailablePhysicalFormats(streamList[streamIdx], &info.formatList);
 
       CCoreAudioStream::GetAvailableVirtualFormats(streamList[streamIdx], &info.formatListVirt);
-      
+
       hasPassthroughOrDigitalFormats(info.formatList, info.hasPassthroughFormats, info.isDigital);
 
       info.isDigital |= isDigital;
@@ -109,7 +109,7 @@ bool AEDeviceEnumerationOSX::isDigitalDevice() const
   if (!isDigital)
   {
     std::string devNameLower = m_caDevice.GetName();
-    StringUtils::ToLower(devNameLower);                       
+    StringUtils::ToLower(devNameLower);
     isDigital = devNameLower.find("digital") != std::string::npos;
   }
   return isDigital;
@@ -132,9 +132,9 @@ void AEDeviceEnumerationOSX::hasPassthroughOrDigitalFormats(const StreamFormatLi
     else
     {
       // PassthroughFormat 2ch 16bit LE 48000Hz / 192000Hz */
-      if (desc.mBitsPerChannel == 16 && 
+      if (desc.mBitsPerChannel == 16 &&
           !(desc.mFormatFlags & kAudioFormatFlagIsBigEndian) &&
-          desc.mChannelsPerFrame == 2 && 
+          desc.mChannelsPerFrame == 2 &&
           (desc.mSampleRate == 48000 || desc.mSampleRate == 192000))
       {
         hasPassthroughFormats = true;
@@ -143,17 +143,17 @@ void AEDeviceEnumerationOSX::hasPassthroughOrDigitalFormats(const StreamFormatLi
   }
 }
 
-enum AEDeviceType AEDeviceEnumerationOSX::getDeviceType(bool hasPassthroughFormats, 
-                                                        bool isDigital, 
-                                                        UInt32 numChannels,  
+enum AEDeviceType AEDeviceEnumerationOSX::getDeviceType(bool hasPassthroughFormats,
+                                                        bool isDigital,
+                                                        UInt32 numChannels,
                                                         UInt32 transportType) const
 {
   // flag indicating that the device name "sounds" like HDMI
   bool hasHdmiName = m_deviceName.find("HDMI") != std::string::npos;
   // flag indicating that the device name "sounds" like DisplayPort
   bool hasDisplayPortName = m_deviceName.find("DisplayPort") != std::string::npos;
-  enum AEDeviceType deviceType = AE_DEVTYPE_PCM;//default    
-  
+  enum AEDeviceType deviceType = AE_DEVTYPE_PCM;//default
+
   // decide the type of the device based on the discovered information
   // in the streams
   // device defaults to PCM (see start of the while loop)
@@ -170,11 +170,11 @@ enum AEDeviceType AEDeviceEnumerationOSX::getDeviceType(bool hasPassthroughForma
       // or CA reported the transportType as HDMI
       if (hasHdmiName || transportType == kIOAudioDeviceTransportTypeHdmi)
         deviceType = AE_DEVTYPE_HDMI;
-      
+
       // either the devicename suggests its DisplayPort
       // or CA reported the transportType as DisplayPort or Thunderbolt
-      if (hasDisplayPortName || 
-          transportType == kIOAudioDeviceTransportTypeDisplayPort || 
+      if (hasDisplayPortName ||
+          transportType == kIOAudioDeviceTransportTypeDisplayPort ||
           transportType == kIOAudioDeviceTransportTypeThunderbolt)
         deviceType = AE_DEVTYPE_DP;
     }
@@ -202,7 +202,7 @@ CADeviceList AEDeviceEnumerationOSX::GetDeviceInfoList() const
   UInt32 numDevices = m_caStreamInfos.size();
   if (m_isPlanar)
     numDevices = 1;
-  
+
   for (UInt32 streamIdx = 0; streamIdx < numDevices; streamIdx++)
   {
     CAEDeviceInfo deviceInfo;
@@ -210,7 +210,7 @@ CADeviceList AEDeviceEnumerationOSX::GetDeviceInfoList() const
     devInstance.audioDeviceId = m_deviceID;
     devInstance.streamIndex = streamIdx;
     devInstance.sourceId = INT_MAX;//don't set audio source by default
-    
+
     deviceInfo.m_deviceName = getDeviceNameForStream(streamIdx);
     deviceInfo.m_displayName = m_deviceName;
     deviceInfo.m_displayNameExtra = getExtraDisplayNameForStream(streamIdx);
@@ -220,7 +220,7 @@ CADeviceList AEDeviceEnumerationOSX::GetDeviceInfoList() const
     deviceInfo.m_streamTypes = getTypeListForStream(streamIdx);
     deviceInfo.m_deviceType = m_caStreamInfos[streamIdx].deviceType;
     deviceInfo.m_wantsIECPassthrough = true;
-    
+
     CoreAudioDataSourceList sourceList;
     // if this enumerator contains multiple devices with more then 1 source we add :source suffixes to the
     // device names and overwrite the extraname with the source name
@@ -285,7 +285,7 @@ AEDataFormatList AEDeviceEnumerationOSX::getFormatListForStream(UInt32 streamIdx
   AEDataFormatList returnDataFormatList;
   if (streamIdx >= m_caStreamInfos.size())
     return returnDataFormatList;
-  
+
   // check the streams
   const StreamFormatList &formatList = m_caStreamInfos[streamIdx].formatList;
   for(UInt32 formatIdx = 0; formatIdx < formatList.size(); formatIdx++)
@@ -327,7 +327,7 @@ CAEChannelInfo AEDeviceEnumerationOSX::getChannelInfoForStream(UInt32 streamIdx)
   CAEChannelInfo channelInfo;
   if (streamIdx >= m_caStreamInfos.size())
     return channelInfo;
-  
+
   if (m_isPlanar)
   {
     //get channel map to match the devices channel layout as set in audio-midi-setup
@@ -450,7 +450,7 @@ AESampleRateList AEDeviceEnumerationOSX::getSampleRateListForStream(UInt32 strea
   AESampleRateList returnSampleRateList;
   if (streamIdx >= m_caStreamInfos.size())
     return returnSampleRateList;
-  
+
   // check the streams
   const StreamFormatList &formatList = m_caStreamInfos[streamIdx].formatList;
   for(UInt32 formatIdx = 0; formatIdx < formatList.size(); formatIdx++)
@@ -468,11 +468,11 @@ AESampleRateList AEDeviceEnumerationOSX::getSampleRateListForStream(UInt32 strea
         returnSampleRateList.push_back(formatDesc.mSampleRate);
       formatDesc.mSampleRate = 48000;
     }
-    
+
     if (!hasSampleRate(returnSampleRateList, formatDesc.mSampleRate))
       returnSampleRateList.push_back(formatDesc.mSampleRate);
   }
-  
+
   return returnSampleRateList;
 }
 
@@ -491,7 +491,7 @@ std::string AEDeviceEnumerationOSX::getDeviceNameForStream(UInt32 streamIdx) con
 }
 
 std::string AEDeviceEnumerationOSX::getExtraDisplayNameForStream(UInt32 streamIdx) const
-{ 
+{
   // for distinguishing the streams inside one device we add
   // the corresponding channels to the extraDisplayName
   // planar devices are ignored here as their streams are
@@ -578,27 +578,27 @@ float AEDeviceEnumerationOSX::ScoreFormat(const AudioStreamBasicDescription &for
 bool AEDeviceEnumerationOSX::FindSuitableFormatForStream(UInt32 &streamIdx, const AEAudioFormat &format, bool virt, AudioStreamBasicDescription &outputFormat, AudioStreamID &outputStream) const
 {
   CLog::Log(LOGDEBUG, "%s: Finding stream for format %s", __FUNCTION__, CAEUtil::DataFormatToStr(format.m_dataFormat));
-  
+
   bool                        formatFound  = false;
   float                       outputScore  = 0;
   UInt32                      streamIdxStart = streamIdx;
   UInt32                      streamIdxEnd   = streamIdx + 1;
   UInt32                      streamIdxCurrent = streamIdx;
-  
+
   if (streamIdx == INT_MAX)
   {
     streamIdxStart = 0;
     streamIdxEnd = m_caStreamInfos.size();
     streamIdxCurrent = 0;
   }
-  
+
   if (streamIdxCurrent >= m_caStreamInfos.size())
     return false;
-  
+
   // loop over all streams or over given streams (depends on initial value of param streamIdx
   for(streamIdxCurrent = streamIdxStart; streamIdxCurrent < streamIdxEnd; streamIdxCurrent++)
   {
-    
+
     // Probe physical or virtual  formats
     const StreamFormatList *formats = &m_caStreamInfos[streamIdxCurrent].formatList;
     if (virt)
@@ -633,10 +633,10 @@ bool AEDeviceEnumerationOSX::FindSuitableFormatForStream(UInt32 &streamIdx, cons
       }
     }
   }
-  
+
   if (m_isPlanar)
     outputFormat.mChannelsPerFrame = std::min((size_t)format.m_channelLayout.Count(), m_caStreamInfos.size());
-  
+
   return formatFound;
 }
 
@@ -745,7 +745,7 @@ enum AEChannel AEDeviceEnumerationOSX::caChannelToAEChannel(const AudioChannelLa
   }
   if (unknownChannel == AE_CH_MAX)
     unknownChannel = AE_CH_UNKNOWN1;
-  
+
   return ret;
 }
 
@@ -763,13 +763,13 @@ void AEDeviceEnumerationOSX::GetAEChannelMap(CAEChannelInfo &channelMap, unsigne
   bool mapAvailable = false;
   unsigned int numberChannelsInDeviceLayout = CA_MAX_CHANNELS; // default number of channels from CAChannelMap
   AudioChannelLayout *layout = NULL;
-  
+
   // try to fetch either the multichannel or the stereo channel layout from the device
   if (channelsPerFrame == 2 || channelMap.Count() == 2)
     mapAvailable = m_caDevice.GetPreferredChannelLayoutForStereo(calayout);
   else
     mapAvailable = m_caDevice.GetPreferredChannelLayout(calayout);
-  
+
   // if a map was fetched - check if it is usable
   if (mapAvailable)
   {
@@ -779,32 +779,32 @@ void AEDeviceEnumerationOSX::GetAEChannelMap(CAEChannelInfo &channelMap, unsigne
     else
       numberChannelsInDeviceLayout = layout->mNumberChannelDescriptions;
   }
-  
+
   // start the mapping action
   // the number of channels to be added to the outgoing channelmap
   // this is CA_MAX_CHANNELS at max and might be lower for some output devices (channelsPerFrame)
   unsigned int numChannelsToMap = std::min((unsigned int)CA_MAX_CHANNELS, (unsigned int)channelsPerFrame);
-  
+
   // if there was a map fetched we force the number of
   // channels to map to channelsPerFrame (this allows mapping
   // of more then CA_MAX_CHANNELS if needed)
   if (mapAvailable)
     numChannelsToMap = channelsPerFrame;
-  
+
   std::string layoutStr;
-  
+
   if (logMapping)
   {
     CLog::Log(LOGDEBUG, "%s Engine requests layout %s", __FUNCTION__, ((std::string)channelMap).c_str());
-    
+
     if (mapAvailable)
       CLog::Log(LOGDEBUG, "%s trying to map to %s layout: %s", __FUNCTION__, channelsPerFrame == 2 ? "stereo" : "multichannel", calayout.ChannelLayoutToString(*layout, layoutStr));
     else
       CLog::Log(LOGDEBUG, "%s no map available - using static multichannel map layout", __FUNCTION__);
   }
-  
+
   channelMap.Reset();// start with an empty map
-  
+
   for (unsigned int channel = 0; channel < numChannelsToMap; channel++)
   {
     // we only try to map channels which are defined in the device layout
@@ -816,15 +816,15 @@ void AEDeviceEnumerationOSX::GetAEChannelMap(CAEChannelInfo &channelMap, unsigne
         currentChannel = caChannelToAEChannel(layout->mChannelDescriptions[channel].mChannelLabel);
       else// get the channel from the default map
         currentChannel = CAChannelMap[channel];
-      
+
     }
     else// fill with unknown channels
       currentChannel = caChannelToAEChannel(kAudioChannelLabel_Unknown);
-    
+
     if(!channelMap.HasChannel(currentChannel))// only add if not already added
       channelMap += currentChannel;
   }
-  
+
   if (logMapping)
     CLog::Log(LOGDEBUG, "%s mapped channels to layout %s", __FUNCTION__, ((std::string)channelMap).c_str());
 }
diff --git a/xbmc/cores/AudioEngine/Sinks/osx/AEDeviceEnumerationOSX.h b/xbmc/cores/AudioEngine/Sinks/osx/AEDeviceEnumerationOSX.h
index 86e9ff8487..50b32159c2 100644
--- a/xbmc/cores/AudioEngine/Sinks/osx/AEDeviceEnumerationOSX.h
+++ b/xbmc/cores/AudioEngine/Sinks/osx/AEDeviceEnumerationOSX.h
@@ -41,7 +41,7 @@ typedef std::vector< std::pair<struct CADeviceInstance, CAEDeviceInfo> > CADevic
 //            1..n formats
 //       - 0..n sources
 //on non planar devices we have numstreams * numsources devices for our list
-//on planar devices we have 1 * numsources devices for our list 
+//on planar devices we have 1 * numsources devices for our list
 class AEDeviceEnumerationOSX
 {
 public:
@@ -52,15 +52,15 @@ public:
   AEDeviceEnumerationOSX(AudioDeviceID deviceID);
   // d'tor
   ~AEDeviceEnumerationOSX(){};
-  
+
   /*!
-  * @brief Gets the device list which was enumerated by the last call to Enumerate 
+  * @brief Gets the device list which was enumerated by the last call to Enumerate
   *        (which is also called in c'tor).
   *
   * @return Returns the device list.
   */
   CADeviceList  GetDeviceInfoList() const;
-  
+
   /*!
   * @brief Fetches all metadata from the CoreAudio device which is needed to generate a proper DeviceList for AE
   *        This method is always called from C'tor but can be called multiple times if the streams of a device
@@ -93,7 +93,7 @@ public:
   * @param outputStream [out] - the coreaudio streamid which contains the coreaudio format returned in outputFormat
   * @return true if a matching corea audio format was found - else false
   */
-  bool          FindSuitableFormatForStream(UInt32 &streamIdx, const AEAudioFormat &format, bool virt, 
+  bool          FindSuitableFormatForStream(UInt32 &streamIdx, const AEAudioFormat &format, bool virt,
                                             AudioStreamBasicDescription &outputFormat,
                                             AudioStreamID &outputStream) const;
 
@@ -129,13 +129,13 @@ public:
   float             ScoreFormat(const AudioStreamBasicDescription &formatDesc, const AEAudioFormat &format) const;
 
 private:
-  
+
   /*!
   * @brief Checks if this is a digital device based on CA transportType or name
   * @return - true if this is a digital device - else false.
   */
   bool              isDigitalDevice() const;
-  
+
   /*!
   * @brief Checks if there are passthrough formats or digital formats
   *       (the latter are passthrough formats with dedicated format config like AC3/DTS)
@@ -143,8 +143,8 @@ private:
   * @param hasPassthroughFormats [out] - true if there were passthrough formats in the list
   * @param hasDigitalFormat [out] - true if there were dedicated passthrough formats in the list
   */
-  void              hasPassthroughOrDigitalFormats(const StreamFormatList &formatList, 
-                                                   bool &hasPassthroughFormats, 
+  void              hasPassthroughOrDigitalFormats(const StreamFormatList &formatList,
+                                                   bool &hasPassthroughFormats,
                                                    bool &hasDigitalFormat) const;
 
   /*!
@@ -155,7 +155,7 @@ private:
   * @param transportType [in] - the transportType of the device
   * @return the AE devicetype
   */
-  enum AEDeviceType getDeviceType(bool hasPassthroughFormats, bool isDigital, 
+  enum AEDeviceType getDeviceType(bool hasPassthroughFormats, bool isDigital,
                                   UInt32 numChannels, UInt32 transportType) const;
 
   /*!
@@ -167,7 +167,7 @@ private:
   * @brief Scores a samplerate based on:
   * 1. Prefer exact match
   * 2. Prefer exact multiple of source samplerate and prefer the lowest
-  * 
+  *
   * @param destinationRate [in] - the destination samplerate to score
   * @param sourceRate [in] - the sourceRate of the audio format - this is the samplerate the score is based on
   * @return the score
diff --git a/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioChannelLayout.cpp b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioChannelLayout.cpp
index aa70efb032..8539925cb4 100644
--- a/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioChannelLayout.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioChannelLayout.cpp
@@ -133,13 +133,13 @@ bool CCoreAudioChannelLayout::CopyLayoutForStereo(UInt32 layout[2])
   enum {
     kVariableLengthArray_deprecated = 1
   };
-  
+
   free(m_pLayout);
   m_pLayout = NULL;
-  
+
   UInt32 channels = 2;
   UInt32 size = sizeof(AudioChannelLayout) + (channels - kVariableLengthArray_deprecated) * sizeof(AudioChannelDescription);
-  
+
   m_pLayout = (AudioChannelLayout*)malloc(size);
   m_pLayout->mChannelLayoutTag = kAudioChannelLayoutTag_UseChannelDescriptions;
   m_pLayout->mNumberChannelDescriptions = 2;//stereo
diff --git a/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioDevice.cpp b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioDevice.cpp
index fbe95ea65c..9f35efee0e 100644
--- a/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioDevice.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioDevice.cpp
@@ -222,7 +222,7 @@ std::string CCoreAudioDevice::GetName() const
   UInt32 propertySize = sizeof(deviceName);
 
   OSStatus ret = AudioObjectGetPropertyData(m_DeviceId, &propertyAddress, 0, NULL, &propertySize, &deviceName);
-  
+
   if (ret != noErr)
   {
     CLog::Log(LOGERROR, "CCoreAudioDevice::GetName: "
@@ -243,7 +243,7 @@ bool CCoreAudioDevice::IsDigital() const
   UInt32 transportType = 0;
   if (!m_DeviceId)
     return false;
-    
+
   transportType = GetTransportType();
   if (transportType == INT_MAX)
     return false;
@@ -260,7 +260,7 @@ bool CCoreAudioDevice::IsDigital() const
     isDigital = true;
   if (transportType == kAudioStreamTerminalTypeDigitalAudioInterface)
     isDigital = true;
-    
+
   return isDigital;
 }
 
@@ -321,20 +321,20 @@ UInt32 CCoreAudioDevice::GetTotalOutputChannels() const
 UInt32 CCoreAudioDevice::GetNumChannelsOfStream(UInt32 streamIdx) const
 {
   UInt32 channels = 0;
-  
+
   if (!m_DeviceId)
     return channels;
-  
+
   AudioObjectPropertyAddress  propertyAddress;
   propertyAddress.mScope    = kAudioDevicePropertyScopeOutput;
   propertyAddress.mElement  = 0;
   propertyAddress.mSelector = kAudioDevicePropertyStreamConfiguration;
-  
+
   UInt32 size = 0;
   OSStatus ret = AudioObjectGetPropertyDataSize(m_DeviceId, &propertyAddress, 0, NULL, &size);
   if (ret != noErr)
     return channels;
-  
+
   AudioBufferList* pList = (AudioBufferList*)malloc(size);
   ret = AudioObjectGetPropertyData(m_DeviceId, &propertyAddress, 0, NULL, &size, pList);
   if (ret == noErr)
@@ -348,9 +348,9 @@ UInt32 CCoreAudioDevice::GetNumChannelsOfStream(UInt32 streamIdx) const
               "Unable to get number of stream output channels - id: 0x%04x. Error = %s",
               (uint)m_DeviceId, GetError(ret).c_str());
   }
-  
+
   free(pList);
-  
+
   return channels;
 }
 
@@ -598,7 +598,7 @@ bool CCoreAudioDevice::GetPreferredChannelLayoutForStereo(CCoreAudioChannelLayou
 {
   if (!m_DeviceId)
     return false;
-  
+
   AudioObjectPropertyAddress  propertyAddress;
   propertyAddress.mScope    = kAudioDevicePropertyScopeOutput;
   propertyAddress.mElement  = 0;
@@ -636,10 +636,10 @@ std::string CCoreAudioDevice::GetDataSourceName(UInt32 dataSourceId) const
   CFStringRef dataSourceNameCF;
   std::string dataSourceName;
   std::string ret = "";
-  
+
   if (!m_DeviceId)
     return ret;
-  
+
   AudioObjectPropertyAddress  propertyAddress;
   propertyAddress.mScope    = kAudioDevicePropertyScopeOutput;
   propertyAddress.mElement  = 0;
@@ -668,40 +668,40 @@ std::string CCoreAudioDevice::GetDataSourceName(UInt32 dataSourceId) const
 bool CCoreAudioDevice::GetDataSource(UInt32 &dataSourceId) const
 {
   bool ret = false;
-  
+
   if (!m_DeviceId)
     return false;
-  
+
   AudioObjectPropertyAddress  propertyAddress;
   propertyAddress.mScope    = kAudioDevicePropertyScopeOutput;
   propertyAddress.mElement  = 0;
   propertyAddress.mSelector = kAudioDevicePropertyDataSource;
-  
+
   UInt32 size = sizeof(dataSourceId);
   OSStatus status = AudioObjectGetPropertyData(m_DeviceId, &propertyAddress, 0, NULL, &size, &dataSourceId);
   if(status == noErr)
     ret = true;
-  
+
   return ret;
 }
 
 bool CCoreAudioDevice::SetDataSource(UInt32 &dataSourceId)
 {
   bool ret = false;
-  
+
   if (!m_DeviceId)
     return false;
-  
+
   AudioObjectPropertyAddress  propertyAddress;
   propertyAddress.mScope    = kAudioDevicePropertyScopeOutput;
   propertyAddress.mElement  = 0;
   propertyAddress.mSelector = kAudioDevicePropertyDataSource;
-  
+
   UInt32 size = sizeof(dataSourceId);
   OSStatus status = AudioObjectSetPropertyData(m_DeviceId, &propertyAddress, 0, NULL, size, &dataSourceId);
   if(status == noErr)
     ret = true;
-  
+
   return ret;
 }
 
@@ -881,12 +881,12 @@ void CCoreAudioDevice::RegisterDeviceChangedCB(bool bRegister, AudioObjectProper
         kAudioObjectPropertyScopeGlobal,
         kAudioObjectPropertyElementMaster
     };
-    
+
     if (bRegister)
         ret = AudioObjectAddPropertyListener(kAudioObjectSystemObject, &inAdr, callback, ref);
     else
         ret = AudioObjectRemovePropertyListener(kAudioObjectSystemObject, &inAdr, callback, ref);
-    
+
     if (ret != noErr)
         CLog::Log(LOGERROR, "CCoreAudioAE::Deinitialize - error %s a listener callback for device changes!", bRegister?"attaching":"removing");
 }
@@ -895,18 +895,18 @@ void CCoreAudioDevice::RegisterDefaultOutputDeviceChangedCB(bool bRegister, Audi
 {
     OSStatus ret = noErr;
     static int registered = -1;
-    
+
     //only allow registration once
     if (bRegister == (registered == 1))
         return;
-    
+
     AudioObjectPropertyAddress inAdr =
     {
         kAudioHardwarePropertyDefaultOutputDevice,
         kAudioObjectPropertyScopeGlobal,
         kAudioObjectPropertyElementMaster
     };
-    
+
     if (bRegister)
     {
         ret = AudioObjectAddPropertyListener(kAudioObjectSystemObject, &inAdr, defaultOutputDeviceChanged, ref);
@@ -917,7 +917,7 @@ void CCoreAudioDevice::RegisterDefaultOutputDeviceChangedCB(bool bRegister, Audi
         ret = AudioObjectRemovePropertyListener(kAudioObjectSystemObject, &inAdr, defaultOutputDeviceChanged, ref);
         m_defaultOutputDeviceChangedCB = NULL;
     }
-    
+
     if (ret != noErr)
         CLog::Log(LOGERROR, "CCoreAudioAE::Deinitialize - error %s a listener callback for default output device changes!", bRegister?"attaching":"removing");
     else
diff --git a/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioDevice.h b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioDevice.h
index b3674ba6a4..def5c2f31b 100644
--- a/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioDevice.h
+++ b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioDevice.h
@@ -41,15 +41,15 @@ public:
   CCoreAudioDevice();
   explicit CCoreAudioDevice(AudioDeviceID deviceId);
   virtual ~CCoreAudioDevice();
-  
+
   bool          Open(AudioDeviceID deviceId);
   void          Close();
-  
+
   void          Start();
   void          Stop();
   void          RemoveObjectListenerProc(AudioObjectPropertyListenerProc callback, void *pClientData);
   bool          SetObjectListenerProc(AudioObjectPropertyListenerProc callback, void *pClientData);
-  
+
   AudioDeviceID GetId() {return m_DeviceId;}
   std::string   GetName() const;
   bool          IsDigital() const;
@@ -75,7 +75,7 @@ public:
   UInt32        GetNumLatencyFrames();
   UInt32        GetBufferSize();
   bool          SetBufferSize(UInt32 size);
-    
+
   static void   RegisterDeviceChangedCB(bool bRegister, AudioObjectPropertyListenerProc callback,  void *ref);
   static void   RegisterDefaultOutputDeviceChangedCB(bool bRegister, AudioObjectPropertyListenerProc callback, void *ref);
   // suppresses the default output device changed callback for given time in ms
@@ -90,7 +90,7 @@ protected:
   int               m_MixerRestore;
   AudioDeviceIOProc m_IoProc;
   AudioObjectPropertyListenerProc m_ObjectListenerProc;
-  
+
   Float64           m_SampleRateRestore;
   pid_t             m_HogPid;
   unsigned int      m_frameSize;
diff --git a/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioHardware.cpp b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioHardware.cpp
index 4e344adebb..31cdde993b 100644
--- a/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioHardware.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioHardware.cpp
@@ -26,14 +26,14 @@
 
 bool CCoreAudioHardware::GetAutoHogMode()
 {
-  AudioObjectPropertyAddress propertyAddress; 
-  propertyAddress.mScope    = kAudioObjectPropertyScopeGlobal; 
+  AudioObjectPropertyAddress propertyAddress;
+  propertyAddress.mScope    = kAudioObjectPropertyScopeGlobal;
   propertyAddress.mElement  = kAudioObjectPropertyElementMaster;
-  propertyAddress.mSelector = kAudioHardwarePropertyHogModeIsAllowed; 
+  propertyAddress.mSelector = kAudioHardwarePropertyHogModeIsAllowed;
 
   UInt32 val = 0;
   UInt32 size = sizeof(val);
-  OSStatus ret = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &size, &val); 
+  OSStatus ret = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &size, &val);
   if (ret != noErr)
   {
     CLog::Log(LOGERROR, "CCoreAudioHardware::GetAutoHogMode: "
@@ -45,14 +45,14 @@ bool CCoreAudioHardware::GetAutoHogMode()
 
 void CCoreAudioHardware::SetAutoHogMode(bool enable)
 {
-  AudioObjectPropertyAddress propertyAddress; 
-  propertyAddress.mScope    = kAudioObjectPropertyScopeGlobal; 
+  AudioObjectPropertyAddress propertyAddress;
+  propertyAddress.mScope    = kAudioObjectPropertyScopeGlobal;
   propertyAddress.mElement  = kAudioObjectPropertyElementMaster;
-  propertyAddress.mSelector = kAudioHardwarePropertyHogModeIsAllowed; 
+  propertyAddress.mSelector = kAudioHardwarePropertyHogModeIsAllowed;
 
   UInt32 val = enable ? 1 : 0;
   UInt32 size = sizeof(val);
-  OSStatus ret = AudioObjectSetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, size, &val); 
+  OSStatus ret = AudioObjectSetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, size, &val);
   if (ret != noErr)
     CLog::Log(LOGERROR, "CCoreAudioHardware::SetAutoHogMode: "
       "Unable to set auto 'hog' mode. Error = %s", GetError(ret).c_str());
@@ -83,7 +83,7 @@ void CCoreAudioHardware::ResetStream(AudioStreamID streamId)
 {
   CCoreAudioStream stream;
   stream.Open(streamId);
-  
+
   AudioStreamBasicDescription desc;
   if (stream.GetPhysicalFormat(&desc))
   {
@@ -132,13 +132,13 @@ AudioDeviceID CCoreAudioHardware::FindAudioDevice(const std::string &searchName)
     "Searching for device - %s.", searchName.c_str());
 
   // Obtain a list of all available audio devices
-  AudioObjectPropertyAddress propertyAddress; 
-  propertyAddress.mScope    = kAudioObjectPropertyScopeGlobal; 
+  AudioObjectPropertyAddress propertyAddress;
+  propertyAddress.mScope    = kAudioObjectPropertyScopeGlobal;
   propertyAddress.mElement  = kAudioObjectPropertyElementMaster;
-  propertyAddress.mSelector = kAudioHardwarePropertyDevices; 
+  propertyAddress.mSelector = kAudioHardwarePropertyDevices;
 
   UInt32 size = 0;
-  OSStatus ret = AudioObjectGetPropertyDataSize(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &size); 
+  OSStatus ret = AudioObjectGetPropertyDataSize(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &size);
   if (ret != noErr)
   {
     CLog::Log(LOGERROR, "CCoreAudioHardware::FindAudioDevice: "
@@ -184,13 +184,13 @@ AudioDeviceID CCoreAudioHardware::GetDefaultOutputDevice()
   propertyAddress.mScope    = kAudioObjectPropertyScopeGlobal;
   propertyAddress.mElement  = kAudioObjectPropertyElementMaster;
   propertyAddress.mSelector = kAudioHardwarePropertyDefaultOutputDevice;
-  
+
   UInt32 size = sizeof(AudioDeviceID);
   OSStatus ret = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &size, &deviceId);
 
   // outputDevice is set to 0 if there is no audio device available
   // or if the default device is set to an encoded format
-  if (ret != noErr || !deviceId) 
+  if (ret != noErr || !deviceId)
   {
     CLog::Log(LOGERROR, "CCoreAudioHardware::GetDefaultOutputDevice:"
       " Unable to identify default output device. Error = %s", GetError(ret).c_str());
@@ -201,7 +201,7 @@ AudioDeviceID CCoreAudioHardware::GetDefaultOutputDevice()
     else
       return 0;
   }
-  
+
   lastDeviceId = deviceId;
 
   return deviceId;
@@ -221,7 +221,7 @@ void CCoreAudioHardware::GetOutputDeviceName(std::string& name)
 
     CFStringRef theDeviceName = NULL;
     UInt32 propertySize = sizeof(CFStringRef);
-    OSStatus ret = AudioObjectGetPropertyData(deviceId, &propertyAddress, 0, NULL, &propertySize, &theDeviceName); 
+    OSStatus ret = AudioObjectGetPropertyData(deviceId, &propertyAddress, 0, NULL, &propertySize, &theDeviceName);
     if (ret != noErr)
       return;
 
@@ -238,13 +238,13 @@ UInt32 CCoreAudioHardware::GetOutputDevices(CoreAudioDeviceList *pList)
     return found;
 
   // Obtain a list of all available audio devices
-  AudioObjectPropertyAddress propertyAddress; 
-  propertyAddress.mScope    = kAudioObjectPropertyScopeGlobal; 
+  AudioObjectPropertyAddress propertyAddress;
+  propertyAddress.mScope    = kAudioObjectPropertyScopeGlobal;
   propertyAddress.mElement  = kAudioObjectPropertyElementMaster;
-  propertyAddress.mSelector = kAudioHardwarePropertyDevices; 
+  propertyAddress.mSelector = kAudioHardwarePropertyDevices;
 
   UInt32 size = 0;
-  OSStatus ret = AudioObjectGetPropertyDataSize(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &size); 
+  OSStatus ret = AudioObjectGetPropertyDataSize(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &size);
   if (ret != noErr)
   {
     CLog::Log(LOGERROR, "CCoreAudioHardware::GetOutputDevices:"
diff --git a/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioHelpers.cpp b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioHelpers.cpp
index 7de4f415cc..e7106cfdab 100644
--- a/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioHelpers.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioHelpers.cpp
@@ -26,7 +26,7 @@
 std::string GetError(OSStatus error)
 {
   char buffer[128];
- 
+
   *(UInt32 *)(buffer + 1) = CFSwapInt32HostToBig(error);
   if (isprint(buffer[1]) && isprint(buffer[2]) &&
       isprint(buffer[3]) && isprint(buffer[4]))
@@ -39,7 +39,7 @@ std::string GetError(OSStatus error)
     // no, format it as an integer
     sprintf(buffer, "%d", (int)error);
   }
- 
+
   return std::string(buffer);
 }
 
@@ -53,7 +53,7 @@ const char* StreamDescriptionToString(AudioStreamBasicDescription desc, std::str
     0
   };
 
-  std::stringstream sstr; 
+  std::stringstream sstr;
   switch (desc.mFormatID)
   {
     case kAudioFormatLinearPCM:
@@ -82,7 +82,7 @@ const char* StreamDescriptionToString(AudioStreamBasicDescription desc, std::str
             << " AC-3/DTS ("
             << (UInt32)desc.mSampleRate
             << "Hz)";
-      str = sstr.str();                
+      str = sstr.str();
       break;
     case kAudioFormat60958AC3:
       sstr  << "["
diff --git a/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioStream.cpp b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioStream.cpp
index b206b3f615..95d79d71e0 100644
--- a/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioStream.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioStream.cpp
@@ -44,14 +44,14 @@ bool CCoreAudioStream::Open(AudioStreamID streamId)
   // watch for physical property changes.
   AudioObjectPropertyAddress propertyAOPA;
   propertyAOPA.mScope    = kAudioObjectPropertyScopeGlobal;
-  propertyAOPA.mElement  = kAudioObjectPropertyElementMaster;  
+  propertyAOPA.mElement  = kAudioObjectPropertyElementMaster;
   propertyAOPA.mSelector = kAudioStreamPropertyPhysicalFormat;
   if (AudioObjectAddPropertyListener(m_StreamId, &propertyAOPA, HardwareStreamListener, this) != noErr)
     CLog::Log(LOGERROR, "CCoreAudioStream::Open: couldn't set up a physical property listener.");
 
   // watch for virtual property changes.
   propertyAOPA.mScope    = kAudioObjectPropertyScopeGlobal;
-  propertyAOPA.mElement  = kAudioObjectPropertyElementMaster;  
+  propertyAOPA.mElement  = kAudioObjectPropertyElementMaster;
   propertyAOPA.mSelector = kAudioStreamPropertyVirtualFormat;
   if (AudioObjectAddPropertyListener(m_StreamId, &propertyAOPA, HardwareStreamListener, this) != noErr)
     CLog::Log(LOGERROR, "CCoreAudioStream::Open: couldn't set up a virtual property listener.");
@@ -59,7 +59,7 @@ bool CCoreAudioStream::Open(AudioStreamID streamId)
   return true;
 }
 
-//! @todo Should it even be possible to change both the 
+//! @todo Should it even be possible to change both the
 //! physical and virtual formats, since the devices do it themselves?
 void CCoreAudioStream::Close(bool restore)
 {
@@ -72,13 +72,13 @@ void CCoreAudioStream::Close(bool restore)
   // that will trigger callbacks that we do not care about.
   AudioObjectPropertyAddress propertyAOPA;
   propertyAOPA.mScope    = kAudioObjectPropertyScopeGlobal;
-  propertyAOPA.mElement  = kAudioObjectPropertyElementMaster;  
+  propertyAOPA.mElement  = kAudioObjectPropertyElementMaster;
   propertyAOPA.mSelector = kAudioStreamPropertyPhysicalFormat;
   if (AudioObjectRemovePropertyListener(m_StreamId, &propertyAOPA, HardwareStreamListener, this) != noErr)
     CLog::Log(LOGDEBUG, "CCoreAudioStream::Close: Couldn't remove property listener.");
 
   propertyAOPA.mScope    = kAudioObjectPropertyScopeGlobal;
-  propertyAOPA.mElement  = kAudioObjectPropertyElementMaster;  
+  propertyAOPA.mElement  = kAudioObjectPropertyElementMaster;
   propertyAOPA.mSelector = kAudioStreamPropertyVirtualFormat;
   if (AudioObjectRemovePropertyListener(m_StreamId, &propertyAOPA, HardwareStreamListener, this) != noErr)
     CLog::Log(LOGDEBUG, "CCoreAudioStream::Close: Couldn't remove property listener.");
@@ -115,12 +115,12 @@ UInt32 CCoreAudioStream::GetDirection()
   UInt32 val = 0;
   UInt32 size = sizeof(UInt32);
 
-  AudioObjectPropertyAddress propertyAddress; 
-  propertyAddress.mScope    = kAudioObjectPropertyScopeGlobal; 
+  AudioObjectPropertyAddress propertyAddress;
+  propertyAddress.mScope    = kAudioObjectPropertyScopeGlobal;
   propertyAddress.mElement  = kAudioObjectPropertyElementMaster;
-  propertyAddress.mSelector = kAudioStreamPropertyDirection; 
+  propertyAddress.mSelector = kAudioStreamPropertyDirection;
 
-  OSStatus ret = AudioObjectGetPropertyData(m_StreamId, &propertyAddress, 0, NULL, &size, &val); 
+  OSStatus ret = AudioObjectGetPropertyData(m_StreamId, &propertyAddress, 0, NULL, &size, &val);
   if (ret)
     return 0;
 
@@ -146,25 +146,25 @@ bool CCoreAudioStream::GetStartingChannelInDevice(AudioStreamID id, UInt32 &star
 {
   if (!id)
     return 0;
-  
+
   UInt32 i_param_size = sizeof(UInt32);
   UInt32 i_param;
   startingChannel = 0;
   bool ret = false;
-  
-  AudioObjectPropertyAddress propertyAddress; 
-  propertyAddress.mScope    = kAudioObjectPropertyScopeGlobal; 
+
+  AudioObjectPropertyAddress propertyAddress;
+  propertyAddress.mScope    = kAudioObjectPropertyScopeGlobal;
   propertyAddress.mElement  = kAudioObjectPropertyElementMaster;
-  propertyAddress.mSelector = kAudioStreamPropertyStartingChannel; 
-  
+  propertyAddress.mSelector = kAudioStreamPropertyStartingChannel;
+
   // number of frames of latency in the AudioStream
-  OSStatus status = AudioObjectGetPropertyData(id, &propertyAddress, 0, NULL, &i_param_size, &i_param); 
+  OSStatus status = AudioObjectGetPropertyData(id, &propertyAddress, 0, NULL, &i_param_size, &i_param);
   if (status == noErr)
   {
     startingChannel = i_param;
     ret = true;
   }
-  
+
   return ret;
 }
 
@@ -176,10 +176,10 @@ UInt32 CCoreAudioStream::GetTerminalType(AudioStreamID id)
   UInt32 val = 0;
   UInt32 size = sizeof(UInt32);
 
-  AudioObjectPropertyAddress propertyAddress; 
-  propertyAddress.mScope    = kAudioObjectPropertyScopeGlobal; 
+  AudioObjectPropertyAddress propertyAddress;
+  propertyAddress.mScope    = kAudioObjectPropertyScopeGlobal;
   propertyAddress.mElement  = kAudioObjectPropertyElementMaster;
-  propertyAddress.mSelector = kAudioStreamPropertyTerminalType; 
+  propertyAddress.mSelector = kAudioStreamPropertyTerminalType;
 
   OSStatus ret = AudioObjectGetPropertyData(id, &propertyAddress, 0, NULL, &size, &val);
   if (ret)
@@ -195,13 +195,13 @@ UInt32 CCoreAudioStream::GetNumLatencyFrames()
   UInt32 i_param_size = sizeof(uint32_t);
   UInt32 i_param, num_latency_frames = 0;
 
-  AudioObjectPropertyAddress propertyAddress; 
-  propertyAddress.mScope    = kAudioObjectPropertyScopeGlobal; 
+  AudioObjectPropertyAddress propertyAddress;
+  propertyAddress.mScope    = kAudioObjectPropertyScopeGlobal;
   propertyAddress.mElement  = kAudioObjectPropertyElementMaster;
-  propertyAddress.mSelector = kAudioStreamPropertyLatency; 
+  propertyAddress.mSelector = kAudioStreamPropertyLatency;
 
   // number of frames of latency in the AudioStream
-  OSStatus ret = AudioObjectGetPropertyData(m_StreamId, &propertyAddress, 0, NULL, &i_param_size, &i_param); 
+  OSStatus ret = AudioObjectGetPropertyData(m_StreamId, &propertyAddress, 0, NULL, &i_param_size, &i_param);
   if (ret == noErr)
   {
     num_latency_frames += i_param;
@@ -217,15 +217,15 @@ bool CCoreAudioStream::GetVirtualFormat(AudioStreamBasicDescription* pDesc)
 
   UInt32 size = sizeof(AudioStreamBasicDescription);
 
-  AudioObjectPropertyAddress propertyAddress; 
-  propertyAddress.mScope    = kAudioObjectPropertyScopeGlobal; 
+  AudioObjectPropertyAddress propertyAddress;
+  propertyAddress.mScope    = kAudioObjectPropertyScopeGlobal;
   propertyAddress.mElement  = kAudioObjectPropertyElementMaster;
-  propertyAddress.mSelector = kAudioStreamPropertyVirtualFormat; 
-  OSStatus ret = AudioObjectGetPropertyDataSize(m_StreamId, &propertyAddress, 0, NULL, &size); 
+  propertyAddress.mSelector = kAudioStreamPropertyVirtualFormat;
+  OSStatus ret = AudioObjectGetPropertyDataSize(m_StreamId, &propertyAddress, 0, NULL, &size);
   if (ret)
     return false;
 
-  ret = AudioObjectGetPropertyData(m_StreamId, &propertyAddress, 0, NULL, &size, pDesc); 
+  ret = AudioObjectGetPropertyData(m_StreamId, &propertyAddress, 0, NULL, &size, pDesc);
   if (ret)
     return false;
   return true;
@@ -257,13 +257,13 @@ bool CCoreAudioStream::SetVirtualFormat(AudioStreamBasicDescription* pDesc)
   }
   m_virtual_format_event.Reset();
 
-  AudioObjectPropertyAddress propertyAddress; 
-  propertyAddress.mScope    = kAudioObjectPropertyScopeGlobal; 
+  AudioObjectPropertyAddress propertyAddress;
+  propertyAddress.mScope    = kAudioObjectPropertyScopeGlobal;
   propertyAddress.mElement  = kAudioObjectPropertyElementMaster;
-  propertyAddress.mSelector = kAudioStreamPropertyVirtualFormat; 
+  propertyAddress.mSelector = kAudioStreamPropertyVirtualFormat;
 
   UInt32 propertySize = sizeof(AudioStreamBasicDescription);
-  OSStatus ret = AudioObjectSetPropertyData(m_StreamId, &propertyAddress, 0, NULL, propertySize, pDesc); 
+  OSStatus ret = AudioObjectSetPropertyData(m_StreamId, &propertyAddress, 0, NULL, propertySize, pDesc);
   if (ret)
   {
     CLog::Log(LOGERROR, "CCoreAudioStream::SetVirtualFormat: "
@@ -307,12 +307,12 @@ bool CCoreAudioStream::GetPhysicalFormat(AudioStreamBasicDescription* pDesc)
 
   UInt32 size = sizeof(AudioStreamBasicDescription);
 
-  AudioObjectPropertyAddress propertyAddress; 
-  propertyAddress.mScope    = kAudioObjectPropertyScopeGlobal; 
+  AudioObjectPropertyAddress propertyAddress;
+  propertyAddress.mScope    = kAudioObjectPropertyScopeGlobal;
   propertyAddress.mElement  = kAudioObjectPropertyElementMaster;
-  propertyAddress.mSelector = kAudioStreamPropertyPhysicalFormat; 
+  propertyAddress.mSelector = kAudioStreamPropertyPhysicalFormat;
 
-  OSStatus ret = AudioObjectGetPropertyData(m_StreamId, &propertyAddress, 0, NULL, &size, pDesc); 
+  OSStatus ret = AudioObjectGetPropertyData(m_StreamId, &propertyAddress, 0, NULL, &size, pDesc);
   if (ret)
     return false;
   return true;
@@ -343,13 +343,13 @@ bool CCoreAudioStream::SetPhysicalFormat(AudioStreamBasicDescription* pDesc)
   }
   m_physical_format_event.Reset();
 
-  AudioObjectPropertyAddress propertyAddress; 
-  propertyAddress.mScope    = kAudioObjectPropertyScopeGlobal; 
+  AudioObjectPropertyAddress propertyAddress;
+  propertyAddress.mScope    = kAudioObjectPropertyScopeGlobal;
   propertyAddress.mElement  = kAudioObjectPropertyElementMaster;
-  propertyAddress.mSelector = kAudioStreamPropertyPhysicalFormat; 
+  propertyAddress.mSelector = kAudioStreamPropertyPhysicalFormat;
 
   UInt32 propertySize = sizeof(AudioStreamBasicDescription);
-  OSStatus ret = AudioObjectSetPropertyData(m_StreamId, &propertyAddress, 0, NULL, propertySize, pDesc); 
+  OSStatus ret = AudioObjectSetPropertyData(m_StreamId, &propertyAddress, 0, NULL, propertySize, pDesc);
   if (ret)
   {
     CLog::Log(LOGERROR, "CCoreAudioStream::SetPhysicalFormat: "
@@ -398,10 +398,10 @@ bool CCoreAudioStream::GetAvailableVirtualFormats(AudioStreamID id, StreamFormat
   if (!pList || !id)
     return false;
 
-  AudioObjectPropertyAddress propertyAddress; 
-  propertyAddress.mScope    = kAudioObjectPropertyScopeGlobal; 
+  AudioObjectPropertyAddress propertyAddress;
+  propertyAddress.mScope    = kAudioObjectPropertyScopeGlobal;
   propertyAddress.mElement  = kAudioObjectPropertyElementMaster;
-  propertyAddress.mSelector = kAudioStreamPropertyAvailableVirtualFormats; 
+  propertyAddress.mSelector = kAudioStreamPropertyAvailableVirtualFormats;
 
   UInt32 propertySize = 0;
   OSStatus ret = AudioObjectGetPropertyDataSize(id, &propertyAddress, 0, NULL, &propertySize);
@@ -430,10 +430,10 @@ bool CCoreAudioStream::GetAvailablePhysicalFormats(AudioStreamID id, StreamForma
   if (!pList || !id)
     return false;
 
-  AudioObjectPropertyAddress propertyAddress; 
-  propertyAddress.mScope    = kAudioObjectPropertyScopeGlobal; 
+  AudioObjectPropertyAddress propertyAddress;
+  propertyAddress.mScope    = kAudioObjectPropertyScopeGlobal;
   propertyAddress.mElement  = kAudioObjectPropertyElementMaster;
-  propertyAddress.mSelector = kAudioStreamPropertyAvailablePhysicalFormats; 
+  propertyAddress.mSelector = kAudioStreamPropertyAvailablePhysicalFormats;
 
   UInt32 propertySize = 0;
   OSStatus ret = AudioObjectGetPropertyDataSize(id, &propertyAddress, 0, NULL, &propertySize);
diff --git a/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioStream.h b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioStream.h
index af83aa023e..a5c1110c66 100644
--- a/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioStream.h
+++ b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioStream.h
@@ -38,7 +38,7 @@ class CCoreAudioStream
 public:
   CCoreAudioStream();
   virtual ~CCoreAudioStream();
-  
+
   bool    Open(AudioStreamID streamId);
   void    Close(bool restore = true);
 
@@ -65,7 +65,7 @@ protected:
   CEvent m_physical_format_event;
 
   AudioStreamID m_StreamId;
-  AudioStreamBasicDescription m_OriginalVirtualFormat;  
+  AudioStreamBasicDescription m_OriginalVirtualFormat;
   AudioStreamBasicDescription m_OriginalPhysicalFormat;
 };
 
diff --git a/xbmc/cores/AudioEngine/Sinks/windows/AESinkFactoryWin.cpp b/xbmc/cores/AudioEngine/Sinks/windows/AESinkFactoryWin.cpp
index 91a8647eb4..40355f0545 100644
--- a/xbmc/cores/AudioEngine/Sinks/windows/AESinkFactoryWin.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/windows/AESinkFactoryWin.cpp
@@ -142,7 +142,7 @@ const char *WASAPIErrToStr(HRESULT err)
         ((format.m_streamInfo.m_type == CAEStreamInfo::STREAM_TYPE_DTSHD) ||
         (format.m_streamInfo.m_type == CAEStreamInfo::STREAM_TYPE_TRUEHD)))
       {
-        // IEC 61937 transmissions over HDMI       
+        // IEC 61937 transmissions over HDMI
         wfxex.Format.nSamplesPerSec = 192000L;
         wfxex.Format.wBitsPerSample = 16;
         wfxex.Samples.wValidBitsPerSample = 16;
diff --git a/xbmc/cores/AudioEngine/Sinks/windows/AESinkFactoryWin.h b/xbmc/cores/AudioEngine/Sinks/windows/AESinkFactoryWin.h
index 9b50ef7baa..563737dffa 100644
--- a/xbmc/cores/AudioEngine/Sinks/windows/AESinkFactoryWin.h
+++ b/xbmc/cores/AudioEngine/Sinks/windows/AESinkFactoryWin.h
@@ -79,7 +79,7 @@ DEFINE_GUIDSTRUCT("00000008-0000-0010-8000-00aa00389b71", KSDATAFORMAT_SUBTYPE_I
 static const unsigned int WASAPISampleRateCount = 10;
 static const unsigned int WASAPISampleRates[] = { 384000, 192000, 176400, 96000, 88200, 48000, 44100, 32000, 22050, 11025 };
 
-static const enum AEChannel layoutsList[][16] = 
+static const enum AEChannel layoutsList[][16] =
 {
   /* Most common configurations */
   {AE_CH_FC,  AE_CH_NULL}, // Mono
@@ -207,7 +207,7 @@ struct IAEWASAPIDevice
 class CAESinkFactoryWin
 {
 public:
-  /* 
+  /*
     Gets list of audio renderers available on platform
   */
   static std::vector<RendererDetail> GetRendererDetails();
diff --git a/xbmc/cores/AudioEngine/Sinks/windows/AESinkFactoryWin10.cpp b/xbmc/cores/AudioEngine/Sinks/windows/AESinkFactoryWin10.cpp
index 7b5aa8d12b..80987ac560 100644
--- a/xbmc/cores/AudioEngine/Sinks/windows/AESinkFactoryWin10.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/windows/AESinkFactoryWin10.cpp
@@ -58,10 +58,10 @@ std::vector<RendererDetail> CAESinkFactoryWin::GetRendererDetails()
 
     // Add custom properties to the query
     DeviceInformationCollection devInfocollection = Wait(DeviceInformation::FindAllAsync(audioSelector,
-      { 
-          PKEY_AudioEndpoint_FormFactor, 
-          PKEY_AudioEndpoint_GUID, 
-          PKEY_AudioEndpoint_PhysicalSpeakers, 
+      {
+          PKEY_AudioEndpoint_FormFactor,
+          PKEY_AudioEndpoint_GUID,
+          PKEY_AudioEndpoint_PhysicalSpeakers,
           PKEY_AudioEngine_DeviceFormat,
           PKEY_Device_EnumeratorName
       }));
@@ -171,7 +171,7 @@ class CAudioInterfaceActivator : public winrt::implements<CAudioInterfaceActivat
 
   }
 public:
-  static Concurrency::task<IAudioClient*> ActivateAsync(LPCWCHAR pszDeviceId) 
+  static Concurrency::task<IAudioClient*> ActivateAsync(LPCWCHAR pszDeviceId)
   {
     winrt::com_ptr<CAudioInterfaceActivator> activator = winrt::make_self<CAudioInterfaceActivator>();
     ComPtr<IActivateAudioInterfaceAsyncOperation> asyncOp;
diff --git a/xbmc/cores/AudioEngine/Sinks/windows/AESinkFactoryWin32.cpp b/xbmc/cores/AudioEngine/Sinks/windows/AESinkFactoryWin32.cpp
index 4ef882dbf1..15098926ad 100644
--- a/xbmc/cores/AudioEngine/Sinks/windows/AESinkFactoryWin32.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/windows/AESinkFactoryWin32.cpp
@@ -50,7 +50,7 @@ std::vector<RendererDetail> CAESinkFactoryWin::GetRendererDetails()
 
   hr = CoCreateInstance(CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL, IID_IMMDeviceEnumerator, reinterpret_cast<void**>(pEnumerator.GetAddressOf()));
   EXIT_ON_FAILURE(hr, "Could not allocate WASAPI device enumerator.")
-  
+
   UINT uiCount = 0;
 
   // get the default audio endpoint
@@ -204,7 +204,7 @@ struct AEWASAPIDeviceWin32 : public IAEWASAPIDevice
   }
 
 protected:
-  AEWASAPIDeviceWin32(IMMDevice* pDevice) 
+  AEWASAPIDeviceWin32(IMMDevice* pDevice)
     : m_pDevice(pDevice)
   {
   }
diff --git a/xbmc/cores/AudioEngine/Utils/AEAudioFormat.h b/xbmc/cores/AudioEngine/Utils/AEAudioFormat.h
index 6e572b626e..1f4ff260b3 100644
--- a/xbmc/cores/AudioEngine/Utils/AEAudioFormat.h
+++ b/xbmc/cores/AudioEngine/Utils/AEAudioFormat.h
@@ -77,7 +77,7 @@ struct AEAudioFormat
             m_frameSize     ==  fmt.m_frameSize     &&
             m_streamInfo    ==  fmt.m_streamInfo;
   }
- 
+
   AEAudioFormat& operator=(const AEAudioFormat& fmt)
   {
     m_dataFormat = fmt.m_dataFormat;
diff --git a/xbmc/cores/AudioEngine/Utils/AEChannelInfo.cpp b/xbmc/cores/AudioEngine/Utils/AEChannelInfo.cpp
index c0360b84bc..4b4b22e6c2 100644
--- a/xbmc/cores/AudioEngine/Utils/AEChannelInfo.cpp
+++ b/xbmc/cores/AudioEngine/Utils/AEChannelInfo.cpp
@@ -293,7 +293,7 @@ const char* CAEChannelInfo::GetChName(const enum AEChannel ch)
     "TC"  , "TBL", "TBR", "TBC", "BLOC", "BROC",
 
     /* p16v devices */
-    "UNKNOWN1" , "UNKNOWN2" , "UNKNOWN3" , "UNKNOWN4" , 
+    "UNKNOWN1" , "UNKNOWN2" , "UNKNOWN3" , "UNKNOWN4" ,
     "UNKNOWN5" , "UNKNOWN6" , "UNKNOWN7" , "UNKNOWN8" ,
     "UNKNOWN9" , "UNKNOWN10", "UNKNOWN11", "UNKNOWN12",
     "UNKNOWN13", "UNKNOWN14", "UNKNOWN15", "UNKNOWN16",
@@ -301,7 +301,7 @@ const char* CAEChannelInfo::GetChName(const enum AEChannel ch)
     "UNKNOWN21", "UNKNOWN22", "UNKNOWN23", "UNKNOWN24",
     "UNKNOWN25", "UNKNOWN26", "UNKNOWN27", "UNKNOWN28",
     "UNKNOWN29", "UNKNOWN30", "UNKNOWN31", "UNKNOWN32",
-    "UNKNOWN33", "UNKNOWN34", "UNKNOWN35", "UNKNOWN36", 
+    "UNKNOWN33", "UNKNOWN34", "UNKNOWN35", "UNKNOWN36",
     "UNKNOWN37", "UNKNOWN38", "UNKNOWN39", "UNKNOWN40",
     "UNKNOWN41", "UNKNOWN42", "UNKNOWN43", "UNKNOWN44",
     "UNKNOWN45", "UNKNOWN46", "UNKNOWN47", "UNKNOWN48",
diff --git a/xbmc/cores/AudioEngine/Utils/AEPackIEC61937.cpp b/xbmc/cores/AudioEngine/Utils/AEPackIEC61937.cpp
index 9d9a8d9aa0..ead8afbb76 100644
--- a/xbmc/cores/AudioEngine/Utils/AEPackIEC61937.cpp
+++ b/xbmc/cores/AudioEngine/Utils/AEPackIEC61937.cpp
@@ -211,7 +211,7 @@ int CAEPackIEC61937::PackDTS(uint8_t *data, unsigned int size, uint8_t *dest, bo
     size += size & 0x1;
     SwapEndian((uint16_t*)dataTo, (uint16_t*)data, size >> 1);
   }
-  
+
   if (size != frameSize)
     memset(packet->m_data + size, 0, frameSize - IEC61937_DATA_OFFSET - size);
 
diff --git a/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp b/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp
index 8dc78420a6..2c3254b391 100644
--- a/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp
+++ b/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp
@@ -404,7 +404,7 @@ unsigned int CAEStreamParser::SyncAC3(uint8_t *data, unsigned int size)
       /* if we have enough data, validate the entire packet, else try to validate crc2 (5/8 of the packet) */
       if (framesize <= size - skip)
         crc_size = framesize - 1;
-      else 
+      else
         crc_size = (framesize >> 1) + (framesize >> 3) - 1;
 
       if (crc_size <= size - skip)
diff --git a/xbmc/cores/AudioEngine/Utils/AEUtil.cpp b/xbmc/cores/AudioEngine/Utils/AEUtil.cpp
index 468b4f1244..fea407565d 100644
--- a/xbmc/cores/AudioEngine/Utils/AEUtil.cpp
+++ b/xbmc/cores/AudioEngine/Utils/AEUtil.cpp
@@ -107,20 +107,20 @@ unsigned int CAEUtil::DataFormatToBits(const enum AEDataFormat dataFormat)
     16,                  /* S16BE  */
     16,                  /* S16LE  */
     16,                  /* S16NE  */
-    
+
     32,                  /* S32BE  */
     32,                  /* S32LE  */
     32,                  /* S32NE  */
-    
+
     32,                  /* S24BE  */
     32,                  /* S24LE  */
     32,                  /* S24NE  */
     32,                  /* S24NER */
-    
+
     24,                  /* S24BE3 */
     24,                  /* S24LE3 */
     24,                  /* S24NE3 */
-    
+
     sizeof(double) << 3, /* DOUBLE */
     sizeof(float ) << 3, /* FLOAT  */
 
@@ -198,23 +198,23 @@ const char* CAEUtil::DataFormatToStr(const enum AEDataFormat dataFormat)
     "AE_FMT_S16BE",
     "AE_FMT_S16LE",
     "AE_FMT_S16NE",
-    
+
     "AE_FMT_S32BE",
     "AE_FMT_S32LE",
     "AE_FMT_S32NE",
-    
+
     "AE_FMT_S24BE4",
     "AE_FMT_S24LE4",
     "AE_FMT_S24NE4",  /* S24 in 4 bytes */
     "AE_FMT_S24NE4MSB",
-    
+
     "AE_FMT_S24BE3",
     "AE_FMT_S24LE3",
     "AE_FMT_S24NE3", /* S24 in 3 bytes */
-    
+
     "AE_FMT_DOUBLE",
     "AE_FMT_FLOAT",
-    
+
     "AE_FMT_RAW",
 
     /* planar formats */
diff --git a/xbmc/cores/AudioEngine/Utils/AEUtil.h b/xbmc/cores/AudioEngine/Utils/AEUtil.h
index 82378f7f49..7795f9602b 100644
--- a/xbmc/cores/AudioEngine/Utils/AEUtil.h
+++ b/xbmc/cores/AudioEngine/Utils/AEUtil.h
@@ -179,10 +179,10 @@ public:
    */
   static inline float GainToScale(const float dB)
   {
-    float val = 0.0f; 
+    float val = 0.0f;
     // we need to make sure that our lowest db returns plain zero
-    if (dB > -60.0f) 
-      val = pow(10.0f, dB/20); 
+    if (dB > -60.0f)
+      val = pow(10.0f, dB/20);
 
     // in order to not introduce computing overhead for nearly zero
     // values of dB e.g. -0.01 or -0.001 we clamp to top
diff --git a/xbmc/cores/DllLoader/CMakeLists.txt b/xbmc/cores/DllLoader/CMakeLists.txt
index 71e7894c39..313b8fe132 100644
--- a/xbmc/cores/DllLoader/CMakeLists.txt
+++ b/xbmc/cores/DllLoader/CMakeLists.txt
@@ -25,7 +25,7 @@ if(NOT CORE_SYSTEM_NAME STREQUAL windows AND NOT CORE_SYSTEM_NAME STREQUAL windo
   list(APPEND HEADERS mmap_anon.h
                       SoLoader.h)
   if(NOT CORE_SYSTEM_NAME STREQUAL freebsd)
-    list(APPEND SOURCES ldt_keeper.c) 
+    list(APPEND SOURCES ldt_keeper.c)
     list(APPEND HEADERS ldt_keeper.h)
   endif()
 else()
diff --git a/xbmc/cores/DllLoader/Win32DllLoader.cpp b/xbmc/cores/DllLoader/Win32DllLoader.cpp
index 48bdea20d8..2199955f13 100644
--- a/xbmc/cores/DllLoader/Win32DllLoader.cpp
+++ b/xbmc/cores/DllLoader/Win32DllLoader.cpp
@@ -139,7 +139,7 @@ bool Win32DllLoader::Load()
   auto strDllW = ToW(CSpecialProtocol::TranslatePath(strFileName));
 
 #ifdef TARGET_WINDOWS_STORE
-  // The path cannot be an absolute path or a relative path that contains ".." in the path. 
+  // The path cannot be an absolute path or a relative path that contains ".." in the path.
   auto appPath = winrt::Windows::ApplicationModel::Package::Current().InstalledLocation().Path();
   size_t len = appPath.size();
 
diff --git a/xbmc/cores/DllLoader/coff.cpp b/xbmc/cores/DllLoader/coff.cpp
index ef70c60414..01fa877152 100644
--- a/xbmc/cores/DllLoader/coff.cpp
+++ b/xbmc/cores/DllLoader/coff.cpp
@@ -184,7 +184,7 @@ int CoffLoader::LoadCoffHModule(FILE *fp)
 
   if (fseek(fp, 0x3c, SEEK_SET) != 0)
     return 0;
-  
+
   int Offset = 0;
   if (!fread(&Offset, sizeof(int), 1, fp) || (Offset <= 0))
     return 0;
@@ -315,7 +315,7 @@ int CoffLoader::LoadStringTable(FILE *fp)
 {
   int StringTableSize;
   char *tmp = NULL;
-  
+
   int Offset = ftell(fp);
   if (Offset < 0)
     return 0;
diff --git a/xbmc/cores/DllLoader/dll_tracker.cpp b/xbmc/cores/DllLoader/dll_tracker.cpp
index 8f551e041c..af680314da 100644
--- a/xbmc/cores/DllLoader/dll_tracker.cpp
+++ b/xbmc/cores/DllLoader/dll_tracker.cpp
@@ -68,7 +68,7 @@ void tracker_dll_free(DllLoader* pDll)
 	    DummyListIter dit = (*it)->dummyList.begin();
 	    while (dit != (*it)->dummyList.end()) { free((void*)*dit); ++dit;	}
 	    (*it)->dummyList.clear();
-	
+
       delete (*it);
       it = g_trackedDlls.erase(it);
     }
diff --git a/xbmc/cores/DllLoader/exports/kernel32.def b/xbmc/cores/DllLoader/exports/kernel32.def
index 1079b148fc..b23a9be326 100755
--- a/xbmc/cores/DllLoader/exports/kernel32.def
+++ b/xbmc/cores/DllLoader/exports/kernel32.def
@@ -5,7 +5,7 @@ VERSION 1.0
 EXPORTS
     AddAtomA
     FindAtomA
-		GetAtomNameA		
+		GetAtomNameA
 		CreateThread
 		FindClose
 		FindFirstFileA
@@ -18,7 +18,7 @@ EXPORTS
 		ReadConsoleInputA
 		SetUnhandledExceptionFilter
 		Sleep
-		TerminateThread		
+		TerminateThread
 		GetCurrentThread
 		QueryPerformanceCounter
 		QueryPerformanceFrequency
diff --git a/xbmc/cores/DllLoader/exports/wrapper.c b/xbmc/cores/DllLoader/exports/wrapper.c
index 7c7d4ac613..c63bad9391 100644
--- a/xbmc/cores/DllLoader/exports/wrapper.c
+++ b/xbmc/cores/DllLoader/exports/wrapper.c
@@ -391,7 +391,7 @@ int __wrap_ioctl(int d, unsigned long int request, ...)
     res = dll_ioctl(d, request, va);
     va_end(va);
     return res;
-} 
+}
 
 int __wrap__stat(const char *path, struct _stat *buffer)
 {
@@ -461,10 +461,10 @@ struct mntent *__wrap_getmntent(FILE *fp)
   return NULL;
 }
 
-// GCC 4.3 in Ubuntu 8.10 defines _FORTIFY_SOURCE=2 which means, that fread, read etc 
+// GCC 4.3 in Ubuntu 8.10 defines _FORTIFY_SOURCE=2 which means, that fread, read etc
 // are actually #defines which are inlined when compiled with -O. Those defines
 // actually call __*chk (for example, __fread_chk). We need to bypass this whole
-// thing to actually call our wrapped functions. 
+// thing to actually call our wrapped functions.
 #if _FORTIFY_SOURCE > 1
 
 size_t __wrap___fread_chk(void * ptr, size_t ptrlen, size_t size, size_t n, FILE * stream)
diff --git a/xbmc/cores/DllLoader/ldt_keeper.c b/xbmc/cores/DllLoader/ldt_keeper.c
index dbbb3c1408..558b86ac13 100644
--- a/xbmc/cores/DllLoader/ldt_keeper.c
+++ b/xbmc/cores/DllLoader/ldt_keeper.c
@@ -178,7 +178,7 @@ ldt_fs_t* Setup_LDT_Keeper(void)
   if (getenv("DYLD_BIND_AT_LAUNCH") == NULL)
     printf("DYLD_BIND_AT_LAUNCH");
 #endif // TARGET_DARWIN
-    
+
   sret = sysconf(_SC_PAGE_SIZE);
   if (sret == -1)
   {
@@ -270,7 +270,7 @@ void Restore_LDT_Keeper(ldt_fs_t* ldt_fs)
 	  return;
   if (ldt_fs->prev_struct)
 	  free(ldt_fs->prev_struct);
-  
+
   int sret = sysconf(_SC_PAGE_SIZE);
   if (sret != -1)
     munmap((char*)ldt_fs->fs_seg, sret);
diff --git a/xbmc/cores/IPlayer.h b/xbmc/cores/IPlayer.h
index 7fae53ba68..80e80a0d0d 100644
--- a/xbmc/cores/IPlayer.h
+++ b/xbmc/cores/IPlayer.h
@@ -173,8 +173,8 @@ public:
   virtual bool SeekTimeRelative(int64_t iTime) { return false; }
 
   /*!
-   \brief Sets the current time. This 
-   can be used for injecting the current time. 
+   \brief Sets the current time. This
+   can be used for injecting the current time.
    This is not to be confused with a seek. It just
    can be used if endless streams contain multiple
    tracks in reality (like with airtunes)
@@ -206,7 +206,7 @@ public:
   //returns a state that is needed for resuming from a specific time
   virtual std::string GetPlayerState() { return ""; };
   virtual bool SetPlayerState(const std::string& state) { return false;};
-  
+
   virtual void GetAudioCapabilities(std::vector<int> &audioCaps) { audioCaps.assign(1,IPC_AUD_ALL); };
   /*!
    \brief define the subtitle capabilities of the player
diff --git a/xbmc/cores/RetroPlayer/guibridge/GUIRenderHandle.cpp b/xbmc/cores/RetroPlayer/guibridge/GUIRenderHandle.cpp
index bb2c877fa8..7bf629c9d1 100644
--- a/xbmc/cores/RetroPlayer/guibridge/GUIRenderHandle.cpp
+++ b/xbmc/cores/RetroPlayer/guibridge/GUIRenderHandle.cpp
@@ -38,7 +38,7 @@ CGUIRenderHandle::~CGUIRenderHandle()
 }
 
 void CGUIRenderHandle::Render()
-{ 
+{
   m_renderManager.Render(this);
 }
 
diff --git a/xbmc/cores/VideoPlayer/DVDClock.cpp b/xbmc/cores/VideoPlayer/DVDClock.cpp
index 3bf2d5a36f..c0fdf8cb05 100644
--- a/xbmc/cores/VideoPlayer/DVDClock.cpp
+++ b/xbmc/cores/VideoPlayer/DVDClock.cpp
@@ -302,7 +302,7 @@ double CDVDClock::SystemToPlaying(int64_t system)
     m_vSyncAdjust = 0;
     m_bReset = false;
   }
-  
+
   if (m_pauseClock)
     current = m_pauseClock;
   else
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodec.h b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodec.h
index 71bc78e94d..f231463bfb 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodec.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodec.h
@@ -81,7 +81,7 @@ public:
    * return codecs name
    */
   virtual const char* GetName() { return m_codecName.c_str(); }
-  
+
 protected:
   /*
    * Adapts startTime, stopTIme from the subtitle stream (which is relative to stream pts)
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp
index 05ce9ba2ea..b91e2c3268 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp
@@ -82,7 +82,7 @@ bool CDVDOverlayCodecFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &optio
     memcpy(parse_extra, hints.extradata, parse_extrasize);
     parse_extra[parse_extrasize] = '\0';
 
-    // assume that the extra data is formatted as a concatenation of lines ('\n' terminated) 
+    // assume that the extra data is formatted as a concatenation of lines ('\n' terminated)
     char *ptr = parse_extra;
     do // read line by line
     {
@@ -97,18 +97,18 @@ bool CDVDOverlayCodecFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &optio
           CLog::Log(LOGDEBUG,"%s - parsed extradata: size: %d x %d", __FUNCTION__,  width, height);
         }
       }
-      /*        
+      /*
       // leaving commented code: these items don't work yet... but they may be meaningful
       if (!strncmp(ptr, "palette:", 8))
         if (sscanf(ptr, "palette: %x, %x, %x, %x, %x, %x, %x, %x,"
-                                " %x, %x, %x, %x, %x, %x, %x, %x", ...        
+                                " %x, %x, %x, %x, %x, %x, %x, %x", ...
       if (!strncasecmp(ptr, "forced subs: on", 15))
         forced_subs_only = 1;
       */
       // if tried all possibilities, then read newline char and move to next line
       ptr = strchr(ptr, '\n');
       if (ptr != NULL) ptr++;
-    } 
+    }
     while (ptr != NULL && ptr <= parse_extra + parse_extrasize);
 
     delete[] parse_extra;
@@ -162,7 +162,7 @@ int CDVDOverlayCodecFFmpeg::Decode(DemuxPacket *pPacket)
     return OC_BUFFER;
 
   double pts_offset = 0.0;
- 
+
   if (m_pCodecContext->codec_id == AV_CODEC_ID_HDMV_PGS_SUBTITLE && m_Subtitle.format == 0)
   {
     // for pgs subtitles the packet pts of the end_segments are wrong
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.cpp
index 59d4d2d7eb..2221ebe2cc 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.cpp
@@ -69,7 +69,7 @@ int CDVDOverlayCodecSSA::Decode(DemuxPacket *pPacket)
 {
   if(!pPacket)
     return OC_ERROR;
-  
+
   double pts = pPacket->dts != DVD_NOPTS_VALUE ? pPacket->dts : pPacket->pts;
   if (pts == DVD_NOPTS_VALUE)
     pts = 0;
@@ -129,7 +129,7 @@ int CDVDOverlayCodecSSA::Decode(DemuxPacket *pPacket)
 
   if(m_pOverlay)
   {
-    /* there will only ever be one active, so we 
+    /* there will only ever be one active, so we
      * must always make sure any new one overlap
      * include the full duration of the old one */
     if(m_pOverlay->iPTSStopTime > pts + duration)
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.cpp
index 4f7c071c8a..89b13347ea 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.cpp
@@ -50,7 +50,7 @@
                       (((uint32_t) str[1]) << 16) | \
                       (((uint32_t) str[2]) << 8) | \
                       (((uint32_t) str[3]) << 0))
-                      
+
 typedef enum {
  BOLD       = 0x1,
  ITALIC     = 0x2,
@@ -107,7 +107,7 @@ int CDVDOverlayCodecTX3G::Decode(DemuxPacket *pPacket)
   uint8_t  *end = pPacket->pData + pPacket->iSize;
 
   // Parse the packet as a TX3G TextSample.
-  // Look for a single StyleBox ('styl') and 
+  // Look for a single StyleBox ('styl') and
   // read all contained StyleRecords.
   // Ignore all other box types.
   // NOTE: Buffer overflows on read are not checked.
@@ -244,7 +244,7 @@ int CDVDOverlayCodecTX3G::Decode(DemuxPacket *pPacket)
     // this is a char index, not a byte index.
     charIndex++;
   }
-  
+
   if (strUTF8.empty())
     return OC_BUFFER;
 
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp
index 5879e0bd59..017f0a4472 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp
@@ -62,10 +62,10 @@ int CDVDOverlayCodecText::Decode(DemuxPacket *pPacket)
 
   if(!pPacket)
     return OC_ERROR;
-  
+
   uint8_t *data = pPacket->pData;
   int      size = pPacket->iSize;
-  
+
   m_pOverlay = new CDVDOverlayText();
   CDVDOverlayCodec::GetAbsoluteTimes(m_pOverlay->iPTSStartTime, m_pOverlay->iPTSStopTime, pPacket, m_pOverlay->replace);
 
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/contrib/cc_decoder.c b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/contrib/cc_decoder.c
index c207204364..50bd2e271f 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/contrib/cc_decoder.c
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/contrib/cc_decoder.c
@@ -44,13 +44,13 @@ enum { WHITE, GREEN, BLUE, CYAN, RED, YELLOW, MAGENTA, BLACK };
 
 /* --------------------- misc. EIA 608 definitions -------------------*/
 
-#define TRANSP_SPACE 0x19   /* code for transparent space, essentially 
+#define TRANSP_SPACE 0x19   /* code for transparent space, essentially
 			                       arbitrary */
 
 /* mapping from PAC row code to actual CC row */
 static int  rowdata[] = {10, -1, 0, 1, 2, 3, 11, 12, 13, 14, 4, 5, 6, 7, 8, 9};
 /* FIXME: do real TM */
-/* must be mapped as a music note in the captioning font */ 
+/* must be mapped as a music note in the captioning font */
 
 static unsigned char specialchar[] = {0xAE,0xB0,0xBD,0xBF,0x54,0xA2,0xA3,0xB6,0xA0,
                                       TRANSP_SPACE,0xA8,0xA2,0xAA,0xAE,0xB4,0xBB};
@@ -149,7 +149,7 @@ static void ccbuf_add_char(cc_buffer_t *buf, uint8_t c)
 }
 
 
-static void ccbuf_set_cursor(cc_buffer_t *buf, int row, int column, 
+static void ccbuf_set_cursor(cc_buffer_t *buf, int row, int column,
 			     int underline, int italics, int color)
 {
   cc_row_t *rowbuf = &buf->rows[row];
@@ -163,7 +163,7 @@ static void ccbuf_set_cursor(cc_buffer_t *buf, int row, int column,
   rowbuf->pac_attr = attr;
   rowbuf->pac_attr_chg = 1;
 
-  buf->rowpos = row; 
+  buf->rowpos = row;
   rowbuf->pos = column;
   rowbuf->attr_chg = 0;
 }
@@ -173,7 +173,7 @@ static void ccbuf_apply_attribute(cc_buffer_t *buf, cc_attribute_t *attr)
 {
   cc_row_t *rowbuf = &buf->rows[buf->rowpos];
   int pos = rowbuf->pos;
-  
+
   rowbuf->attr_chg = 1;
   rowbuf->cells[pos].attributes = *attr;
   /* A midrow attribute always counts as a space */
@@ -185,7 +185,7 @@ static void ccbuf_tab(cc_buffer_t *buf, int tabsize)
 {
   cc_row_t *rowbuf = &buf->rows[buf->rowpos];
   rowbuf->pos += tabsize;
-  if (rowbuf->pos > CC_COLUMNS) 
+  if (rowbuf->pos > CC_COLUMNS)
   {
     rowbuf->pos = CC_COLUMNS;
     return;
@@ -410,7 +410,7 @@ static void cc_decode_misc_control_code(cc_decoder_t *dec, int channel,
   cc_set_channel(dec, channel);
   cc_buffer_t *buf;
 
-  switch (c2) 
+  switch (c2)
   {          /* 0x20 <= c2 <= 0x2f */
   case 0x20:             /* RCL */
     dec->style = CC_POPON;
@@ -565,7 +565,7 @@ static void cc_decode_EIA608(cc_decoder_t *dec, uint16_t data)
       }
     }
   }
-  
+
   dec->lastcode = data;
 }
 
@@ -579,7 +579,7 @@ void decode_cc(cc_decoder_t *dec, uint8_t *buffer, uint32_t buf_len)
 
     uint8_t data1 = buffer[i + 1];
     uint8_t data2 = buffer[i + 2];
-    
+
     switch (cc_type)
     {
     case 0:
@@ -588,10 +588,10 @@ void decode_cc(cc_decoder_t *dec, uint8_t *buffer, uint32_t buf_len)
         cc_decode_EIA608(dec, data1 | (data2 << 8));
       }
       break;
-      
+
     case 1:
       break;
-      
+
     default:
       break;
     }
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/contrib/cc_decoder.h b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/contrib/cc_decoder.h
index 182f958d46..cf137beddd 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/contrib/cc_decoder.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/contrib/cc_decoder.h
@@ -43,7 +43,7 @@ typedef struct cc_attribute_s {
 } cc_attribute_t;
 
 /* CC character cell */
-typedef struct cc_char_cell_s 
+typedef struct cc_char_cell_s
 {
   uint8_t c;                   /* character code, not the same as ASCII */
   cc_attribute_t attributes;   /* attributes of this character, if changed */
@@ -63,7 +63,7 @@ typedef struct cc_row_s
 } cc_row_t;
 
 /* closed captioning memory for a single channel */
-typedef struct cc_buffer_s 
+typedef struct cc_buffer_s
 {
   cc_row_t rows[CC_ROWS];
   int rowpos;              /* row cursor position */
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
index 69af154f52..35d35f2ed4 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
@@ -525,7 +525,7 @@ void CDVDVideoCodecFFmpeg::SetFilters()
       case 180:
         m_filters_next += "vflip,hflip";
         break;
-      case 270:  
+      case 270:
         m_filters_next += "transpose=2";
         break;
       default:
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DXVA.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DXVA.cpp
index cc41a94573..455e5319c4 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DXVA.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DXVA.cpp
@@ -53,29 +53,29 @@ DEFINE_GUID(DXVA_ModeH264_VLD_NoFGT_Flash, 0x4245F676,0x2BBC,0x4166,0xa0,0xBB,0x
 DEFINE_GUID(DXVA_Intel_VC1_ClearVideo_2,   0xE07EC519,0xE651,0x4CD6,0xAC,0x84,0x13,0x70,0xCC,0xEE,0xC8,0x51);
 
 // redefine DXVA_NoEncrypt with other macro, solves unresolved external symbol linker error
-#ifdef DXVA_NoEncrypt 
+#ifdef DXVA_NoEncrypt
 #undef DXVA_NoEncrypt
 #endif
 DEFINE_GUID(DXVA_NoEncrypt, 0x1b81beD0, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
 
-static const int PROFILES_MPEG2_SIMPLE[] = { FF_PROFILE_MPEG2_SIMPLE, 
+static const int PROFILES_MPEG2_SIMPLE[] = { FF_PROFILE_MPEG2_SIMPLE,
                                              FF_PROFILE_UNKNOWN };
 static const int PROFILES_MPEG2_MAIN[]   = { FF_PROFILE_MPEG2_SIMPLE,
-                                             FF_PROFILE_MPEG2_MAIN, 
+                                             FF_PROFILE_MPEG2_MAIN,
                                              FF_PROFILE_UNKNOWN };
 static const int PROFILES_H264_HIGH[]    = { FF_PROFILE_H264_BASELINE,
                                              FF_PROFILE_H264_CONSTRAINED_BASELINE,
                                              FF_PROFILE_H264_MAIN,
-                                             FF_PROFILE_H264_HIGH, 
+                                             FF_PROFILE_H264_HIGH,
                                              FF_PROFILE_UNKNOWN };
-static const int PROFILES_HEVC_MAIN[]    = { FF_PROFILE_HEVC_MAIN, 
+static const int PROFILES_HEVC_MAIN[]    = { FF_PROFILE_HEVC_MAIN,
                                              FF_PROFILE_UNKNOWN };
 static const int PROFILES_HEVC_MAIN10[]  = { FF_PROFILE_HEVC_MAIN,
-                                             FF_PROFILE_HEVC_MAIN_10, 
+                                             FF_PROFILE_HEVC_MAIN_10,
                                              FF_PROFILE_UNKNOWN };
-static const int PROFILES_VP9_0[]        = { FF_PROFILE_VP9_0, 
+static const int PROFILES_VP9_0[]        = { FF_PROFILE_VP9_0,
                                              FF_PROFILE_UNKNOWN };
-static const int PROFILES_VP9_10_2[]     = { FF_PROFILE_VP9_2, 
+static const int PROFILES_VP9_10_2[]     = { FF_PROFILE_VP9_2,
                                              FF_PROFILE_UNKNOWN };
 
 typedef struct {
@@ -380,7 +380,7 @@ void CDXVAContext::DestroyContext()
 void CDXVAContext::QueryCaps()
 {
   m_input_count = m_service->GetVideoDecoderProfileCount();
-  
+
   m_input_list = new GUID[m_input_count];
   for (unsigned i = 0; i < m_input_count; i++)
   {
@@ -535,9 +535,9 @@ bool CDXVAContext::CreateSurfaces(const D3D11_VIDEO_DECODER_DESC &format, const
   pD3DDevice->GetImmediateContext(&pD3DDeviceContext);
   pD3DDeviceContext.As(&pD3DDeviceContext1);
 
-  CD3D11_TEXTURE2D_DESC texDesc(format.OutputFormat, 
-                                FFALIGN(format.SampleWidth, alignment), 
-                                FFALIGN(format.SampleHeight, alignment), 
+  CD3D11_TEXTURE2D_DESC texDesc(format.OutputFormat,
+                                FFALIGN(format.SampleWidth, alignment),
+                                FFALIGN(format.SampleHeight, alignment),
                                 count, 1, D3D11_BIND_DECODER);
   UINT supported;
   if (SUCCEEDED(pD3DDevice->CheckFormatSupport(format.OutputFormat, &supported))
@@ -952,7 +952,7 @@ static bool HasATIMP2Bug(AVCodecContext *avctx)
   // here are params of these videos
   return avctx->height <= 576
       && avctx->colorspace == AVCOL_SPC_BT470BG
-      && avctx->color_primaries == AVCOL_PRI_BT470BG 
+      && avctx->color_primaries == AVCOL_PRI_BT470BG
       && avctx->color_trc == AVCOL_TRC_GAMMA28;
 }
 
@@ -1241,7 +1241,7 @@ CDVDVideoCodec::VCReturn CDecoder::Check(AVCodecContext* avctx)
   && avctx->codec_id != AV_CODEC_ID_VC1
   && avctx->codec_id != AV_CODEC_ID_WMV3)
     return CDVDVideoCodec::VC_NONE;
-  
+
 #ifdef TARGET_WINDOWS_DESKTOP
   D3D11_VIDEO_DECODER_EXTENSION data = {0};
   union {
diff --git a/xbmc/cores/VideoPlayer/DVDDemuxSPU.cpp b/xbmc/cores/VideoPlayer/DVDDemuxSPU.cpp
index 27cb76547f..23801ccc9e 100644
--- a/xbmc/cores/VideoPlayer/DVDDemuxSPU.cpp
+++ b/xbmc/cores/VideoPlayer/DVDDemuxSPU.cpp
@@ -376,7 +376,7 @@ CDVDOverlaySpu* CDVDDemuxSPU::ParseRLE(CDVDOverlaySpu* pSPU, uint8_t* pUnparsedD
   /* The subtitles are interlaced, we need two offsets */
   unsigned int i_id = 0;                   /* Start on the even SPU layer */
   unsigned int pi_table[2];
-  
+
   /* Colormap statistics */
   int i_border = -1;
   int stats[4]; stats[0] = stats[1] = stats[2] = stats[3] = 0;
diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.h
index a3eb6d33d5..c7346dd819 100644
--- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.h
+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.h
@@ -348,7 +348,7 @@ public:
    * adaptive demuxers like DASH can use this to choose best fitting video stream
    */
   virtual void SetVideoResolution(int width, int height) {};
-  
+
   /*
   * return the id of the demuxer
   */
diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.h
index 47cb1f6740..819ed381a9 100644
--- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.h
+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.h
@@ -59,7 +59,7 @@ protected:
   bool ParsePacket(DemuxPacket* pPacket);
   void DisposeStreams();
   std::shared_ptr<CDemuxStream> GetStreamInternal(int iStreamId);
-  
+
   std::shared_ptr<CDVDInputStream> m_pInput;
   std::shared_ptr<CDVDInputStream::IDemux> m_IDemux;
   std::map<int, std::shared_ptr<CDemuxStream>> m_streams;
diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
index a5aa86ae07..b7c3c62117 100644
--- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
@@ -264,7 +264,7 @@ bool CDVDDemuxFFmpeg::Open(std::shared_ptr<CDVDInputStream> pInput, bool streami
       {
         url.SetProtocol("mmst");
         strFile = url.Get();
-      } 
+      }
     }
     if (result < 0 && avformat_open_input(&m_pFormatContext, strFile.c_str(), iformat, &options) < 0 )
     {
@@ -428,9 +428,9 @@ bool CDVDDemuxFFmpeg::Open(std::shared_ptr<CDVDInputStream> pInput, bool streami
   }
 
   // Avoid detecting framerate if advancedsettings.xml says so
-  if (g_advancedSettings.m_videoFpsDetect == 0) 
+  if (g_advancedSettings.m_videoFpsDetect == 0)
       m_pFormatContext->fps_probe_size = 0;
-  
+
   // analyse very short to speed up mjpeg playback start
   if (iformat && (strcmp(iformat->name, "mjpeg") == 0) && m_ioContext->seekable == 0)
     av_opt_set_int(m_pFormatContext, "analyzeduration", 500000, 0);
@@ -575,7 +575,7 @@ bool CDVDDemuxFFmpeg::Open(std::shared_ptr<CDVDInputStream> pInput, bool streami
   {
     SeekTime(0);
   }
-  
+
   return true;
 }
 
@@ -723,7 +723,7 @@ AVDictionary *CDVDDemuxFFmpeg::GetFFMpegOptionsFromInput()
         hasCookies = true;
       }
       // other standard headers (see https://en.wikipedia.org/wiki/List_of_HTTP_header_fields) are appended as actual headers
-      else if (name == "accept" || name == "accept-language" || name == "accept-datetime" || 
+      else if (name == "accept" || name == "accept-language" || name == "accept-datetime" ||
                name == "authorization" || name == "cache-control" || name == "connection" || name == "content-md5" ||
                name == "date" || name == "expect" || name == "forwarded" || name == "from" || name == "if-match" ||
                name == "if-modified-since" || name == "if-none-match" || name == "if-range" || name == "if-unmodified-since" ||
@@ -747,7 +747,7 @@ AVDictionary *CDVDDemuxFFmpeg::GetFFMpegOptionsFromInput()
       // we don't add blindly all options to headers anymore
       // if anybody wants to pass options to ffmpeg, explicitly prefix those
       // to be identified here
-      else 
+      else
       {
         CLog::Log(LOGDEBUG, "CDVDDemuxFFmpeg::GetFFMpegOptionsFromInput() ignoring header option '%s: %s'", it->first.c_str(), value.c_str());
       }
@@ -1225,7 +1225,7 @@ bool CDVDDemuxFFmpeg::SeekByte(int64_t pos)
 void CDVDDemuxFFmpeg::UpdateCurrentPTS()
 {
   m_currentPts = DVD_NOPTS_VALUE;
-  
+
   int idx = av_find_default_stream_index(m_pFormatContext);
   if (idx >= 0)
   {
@@ -1281,7 +1281,7 @@ int CDVDDemuxFFmpeg::GetPrograms(std::vector<ProgramInfo>& programs)
   programs.clear();
   if (!m_pFormatContext || m_pFormatContext->nb_programs <= 1)
     return 0;
-  
+
   for (unsigned int i = 0; i < m_pFormatContext->nb_programs; i++)
   {
     std::ostringstream os;
@@ -1448,7 +1448,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx)
         st->m_channelLayoutName = buf;
         if (st->iBitsPerSample == 0)
           st->iBitsPerSample = pStream->codecpar->bits_per_coded_sample;
-  
+
         if(av_dict_get(pStream->metadata, "title", NULL, 0))
           st->m_description = av_dict_get(pStream->metadata, "title", NULL, 0)->value;
 
@@ -1505,7 +1505,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx)
         st->iBitRate = static_cast<int>(pStream->codecpar->bit_rate);
 
         AVDictionaryEntry *rtag = av_dict_get(pStream->metadata, "rotate", NULL, 0);
-        if (rtag) 
+        if (rtag)
           st->iOrientation = atoi(rtag->value);
 
         // detect stereoscopic mode
@@ -1516,7 +1516,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx)
         if (!stereoMode.empty())
           st->stereo_mode = stereoMode;
 
-        
+
         if ( m_pInput->IsStreamType(DVDSTREAM_TYPE_DVD) )
         {
           if (pStream->codecpar->codec_id == AV_CODEC_ID_PROBE)
@@ -1555,10 +1555,10 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx)
         {
           CDemuxStreamSubtitleFFmpeg* st = new CDemuxStreamSubtitleFFmpeg(pStream);
           stream = st;
-      
+
           if(av_dict_get(pStream->metadata, "title", NULL, 0))
             st->m_description = av_dict_get(pStream->metadata, "title", NULL, 0)->value;
-  
+
           break;
         }
       }
@@ -1765,7 +1765,7 @@ void CDVDDemuxFFmpeg::GetChapterName(std::string& strChapterName, int chapterIdx
   if (chapterIdx <= 0 || chapterIdx > GetChapterCount())
     chapterIdx = GetChapter();
   std::shared_ptr<CDVDInputStream::IChapter> ich = std::dynamic_pointer_cast<CDVDInputStream::IChapter>(m_pInput);
-  if(ich)  
+  if(ich)
     ich->GetChapterName(strChapterName, chapterIdx);
   else
   {
@@ -1787,7 +1787,7 @@ int64_t CDVDDemuxFFmpeg::GetChapterPos(int chapterIdx)
     return 0;
 
   std::shared_ptr<CDVDInputStream::IChapter> ich = std::dynamic_pointer_cast<CDVDInputStream::IChapter>(m_pInput);
-  if(ich)  
+  if(ich)
     return ich->GetChapterPos(chapterIdx);
 
   return static_cast<int64_t>(m_pFormatContext->chapters[chapterIdx-1]->start*av_q2d(m_pFormatContext->chapters[chapterIdx-1]->time_base));
@@ -1864,7 +1864,7 @@ bool CDVDDemuxFFmpeg::IsProgramChange()
     m_program = m_newProgram;
     return true;
   }
-  
+
   if (m_pFormatContext->programs[m_program]->nb_stream_indexes != m_streamsInProgram)
     return true;
 
diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDFactoryDemuxer.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDFactoryDemuxer.cpp
index 50e29a096b..0e0527cc94 100644
--- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDFactoryDemuxer.cpp
+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDFactoryDemuxer.cpp
@@ -46,7 +46,7 @@ CDVDDemux* CDVDFactoryDemuxer::CreateDemuxer(std::shared_ptr<CDVDInputStream> pI
     else
       return NULL;
   }
-  
+
   // Try to open CDDA demuxer
   if (pInputStream->IsStreamType(DVDSTREAM_TYPE_FILE) && pInputStream->GetContent().compare("application/octet-stream") == 0)
   {
diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp
index 406ad0c4be..a352d4bb64 100644
--- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp
@@ -537,7 +537,7 @@ void CDVDInputStreamBluray::ProcessEvent() {
 
   int pid = -1;
   switch (m_event.event) {
-  
+
    /* errors */
 
   case BD_EVENT_ERROR:
diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h
index 85111d8106..bb4d38a8f3 100644
--- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h
@@ -43,7 +43,7 @@ class CDVDOverlayImage;
 class DllLibbluray;
 class IVideoPlayer;
 
-class CDVDInputStreamBluray 
+class CDVDInputStreamBluray
   : public CDVDInputStream
   , public CDVDInputStream::IDisplayTime
   , public CDVDInputStream::IChapter
diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFile.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFile.cpp
index cbc41f5b8f..25fddfc1b6 100644
--- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFile.cpp
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFile.cpp
@@ -53,7 +53,7 @@ bool CDVDInputStreamFile::Open()
     return false;
 
   unsigned int flags = READ_TRUNCATED | READ_BITRATE | READ_CHUNKED;
-  
+
   // If this file is audio and/or video (= not a subtitle) flag to caller
   if (!m_item.IsSubtitle())
     flags |= READ_AUDIO_VIDEO;
@@ -128,7 +128,7 @@ int CDVDInputStreamFile::Read(uint8_t* buf, int buf_size)
     return -1; // player will retry read in case of error until playback is stopped
 
   /* we currently don't support non completing reads */
-  if (ret == 0) 
+  if (ret == 0)
     m_eof = true;
 
   return (int)ret;
diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.cpp
index 214b23dffd..ec7e70751f 100644
--- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.cpp
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.cpp
@@ -292,7 +292,7 @@ int CDVDInputStreamNavigator::Read(uint8_t* buf, int buf_size)
     else if (navresult == NAVRESULT_NOP)
     {
       NOPcount++;
-      if (NOPcount == 1000) 
+      if (NOPcount == 1000)
       {
         m_bEOF = true;
         CLog::Log(LOGERROR,"CDVDInputStreamNavigator: Stopping playback due to infinite loop, caused by badly authored DVD navigation structure. Try enabling 'Attempt to skip introduction before DVD menu'.");
@@ -1068,10 +1068,10 @@ void CDVDInputStreamNavigator::SetAudioStreamName(AudioStreamInfo &info, const a
   case 1:
     info.name += " Mono";
     break;
-  case 2: 
+  case 2:
     info.name += " Stereo";
     break;
-  case 6: 
+  case 6:
     info.name += " 5.1";
     break;
   case 7:
@@ -1555,7 +1555,7 @@ std::string CDVDInputStreamNavigator::GetDVDSerialString()
 
 int64_t CDVDInputStreamNavigator::GetChapterPos(int ch)
 {
-  if (ch == -1 || ch > GetChapterCount()) 
+  if (ch == -1 || ch > GetChapterCount())
     ch = GetChapter();
 
   std::map<int, std::map<int, int64_t>>::iterator title = m_mapTitleChapters.find(m_iTitle);
@@ -1638,7 +1638,7 @@ int dvd_inputstreamnavigator_cb_read(void * p_stream, void * buffer, int i_read)
 int dvd_inputstreamnavigator_cb_readv(void * p_stream, void * p_iovec, int i_blocks)
 {
   // NOTE/TODO: this vectored read callback somehow doesn't seem to be called by libdvdnav.
-  // Therefore, the code below isn't really tested, but inspired from the libc_readv code for Win32 in libdvdcss (device.c:713). 
+  // Therefore, the code below isn't really tested, but inspired from the libc_readv code for Win32 in libdvdcss (device.c:713).
   CDVDInputStreamFile *lpstream = reinterpret_cast<CDVDInputStreamFile*>(p_stream);
   const struct iovec* lpiovec = reinterpret_cast<const struct iovec*>(p_iovec);
 
diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDStateSerializer.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDStateSerializer.cpp
index f7373930fa..257db66aa7 100644
--- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDStateSerializer.cpp
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDStateSerializer.cpp
@@ -46,7 +46,7 @@ bool CDVDStateSerializer::DVDToXMLState( std::string &xmlstate, const dvd_state_
   TiXmlElement eRoot("navstate");
   eRoot.SetAttribute("version", 1);
 
-	
+
   { TiXmlElement eRegisters("registers");
 
     for( int i = 0; i < 24; i++ )
diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/decoder.h b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/decoder.h
index b76c4054d6..af4dea53e7 100644
--- a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/decoder.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/decoder.h
@@ -1,19 +1,19 @@
 /*
  * Copyright (C) 2000, 2001 Martin Norbäck, Håkan Hjort
- * 
+ *
  * This file is part of libdvdnav, a DVD navigation library. It is modified
  * from a file originally part of the Ogle DVD player.
- * 
+ *
  * libdvdnav 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 of the License, or
  * (at your option) any later version.
- * 
+ *
  * libdvdnav 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 libdvdnav; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -94,7 +94,7 @@ typedef struct {
 /* the big VM function, executing the given commands and writing
  * the link where to continue, the return value indicates if a jump
  * has been performed */
-int32_t vmEval_CMD(vm_cmd_t commands[], int32_t num_commands, 
+int32_t vmEval_CMD(vm_cmd_t commands[], int32_t num_commands,
 	       registers_t *registers, link_t *return_values);
 
 /* extracts some bits from the command */
diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvd_reader.h b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvd_reader.h
index f7295d30a1..04436759d7 100644
--- a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvd_reader.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvd_reader.h
@@ -70,12 +70,12 @@ struct iovec
 #ifdef __cplusplus
 extern "C" {
 #endif
-  
+
 /**
  * Opaque type that is used as a handle for one instance of an opened DVD.
  */
 typedef struct dvd_reader_s dvd_reader_t;
-  
+
 /**
  * Opaque type for a file read handle, much like a normal fd or FILE *.
  */
@@ -104,7 +104,7 @@ typedef struct {
  *
  * If the given file is a block device, or is the mountpoint for a block
  * device, then that device is used for CSS authentication using libdvdcss.
- * If no device is available, then no CSS authentication is performed, 
+ * If no device is available, then no CSS authentication is performed,
  * and we hope that the image is decrypted.
  *
  * If the path given is a directory, then the files in that directory may be
@@ -115,7 +115,7 @@ typedef struct {
  *   path/VTS_01_1.VOB
  *   path/vts_01_1.vob
  *
- * @param path Specifies the the device, file or directory to be used. 
+ * @param path Specifies the the device, file or directory to be used.
  * @return If successful a a read handle is returned. Otherwise 0 is returned.
  *
  * dvd = DVDOpen(path);
@@ -134,13 +134,13 @@ dvd_reader_t *DVDOpen( const char * );
 void DVDClose( dvd_reader_t * );
 
 /**
- * 
+ *
  */
 typedef enum {
   DVD_READ_INFO_FILE,        /**< VIDEO_TS.IFO  or VTS_XX_0.IFO (title) */
   DVD_READ_INFO_BACKUP_FILE, /**< VIDEO_TS.BUP  or VTS_XX_0.BUP (title) */
   DVD_READ_MENU_VOBS,        /**< VIDEO_TS.VOB  or VTS_XX_0.VOB (title) */
-  DVD_READ_TITLE_VOBS        /**< VTS_XX_[1-9].VOB (title).  All files in 
+  DVD_READ_TITLE_VOBS        /**< VTS_XX_[1-9].VOB (title).  All files in
 				  the title set are opened and read as a
 				  single file. */
 } dvd_read_domain_t;
@@ -181,7 +181,7 @@ int DVDFileStat(dvd_reader_t *, int, dvd_read_domain_t, dvd_stat_t *);
  *
  * @param dvd  A dvd read handle.
  * @param titlenum Which Video Title Set should be used, VIDEO_TS is 0.
- * @param domain Which domain. 
+ * @param domain Which domain.
  * @return If successful a a file read handle is returned, otherwise 0.
  *
  * dvd_file = DVDOpenFile(dvd, titlenum, domain); */
@@ -199,8 +199,8 @@ void DVDCloseFile( dvd_file_t * );
 /**
  * Reads block_count number of blocks from the file at the given block offset.
  * Returns number of blocks read on success, -1 on error.  This call is only
- * for reading VOB data, and should not be used when reading the IFO files.  
- * When reading from an encrypted drive, blocks are decrypted using libdvdcss 
+ * for reading VOB data, and should not be used when reading the IFO files.
+ * When reading from an encrypted drive, blocks are decrypted using libdvdcss
  * where required.
  *
  * @param dvd_file  A file read handle.
@@ -256,7 +256,7 @@ ssize_t DVDFileSize( dvd_file_t * );
  * This is the MD5 sum of VIDEO_TS.IFO and the VTS_0?_0.IFO files
  * in title order (those that exist).
  * If you need a 'text' representation of the id, print it as a
- * hexadecimal number, using lowercase letters, discid[0] first. 
+ * hexadecimal number, using lowercase letters, discid[0] first.
  * I.e. the same format as the command-line 'md5sum' program uses.
  *
  * @param dvd A read handle to get the disc ID from
@@ -321,7 +321,7 @@ int DVDISOVolumeInfo( dvd_reader_t *, char *, unsigned int,
  *             -1 - returns the current setting.
  *              0 - UDF Cache turned off.
  *              1 - (default level) Pointers to IFO files and some data from
- *                  PrimaryVolumeDescriptor are cached. 
+ *                  PrimaryVolumeDescriptor are cached.
  *
  * @return The level of caching.
  */
diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvd_types.h b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvd_types.h
index 4fc1475de3..deb97db34c 100644
--- a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvd_types.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvd_types.h
@@ -3,17 +3,17 @@
  *
  * This file is part of libdvdnav, a DVD navigation library. It is a modified
  * file originally part of the Ogle DVD player project.
- * 
+ *
  * libdvdnav 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 of the License, or
  * (at your option) any later version.
- * 
+ *
  * libdvdnav 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 libdvdnav; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -47,7 +47,7 @@ typedef enum {
  * (see dvdnav_get_highlight_area())
  */
 typedef struct {
-  uint32_t palette;     /* The CLUT entries for the highlight palette 
+  uint32_t palette;     /* The CLUT entries for the highlight palette
 			   (4-bits per entry -> 4 entries) */
   uint16_t sx,sy,ex,ey; /* The start/end x,y positions */
   uint32_t pts;         /* Highlight PTS to match with SPU */
@@ -73,15 +73,15 @@ typedef enum {
 
 /* User operation permissions */
 typedef enum {
-  UOP_FLAG_TitleOrTimePlay            = 0x00000001, 
-  UOP_FLAG_ChapterSearchOrPlay        = 0x00000002, 
-  UOP_FLAG_TitlePlay                  = 0x00000004, 
-  UOP_FLAG_Stop                       = 0x00000008,  
+  UOP_FLAG_TitleOrTimePlay            = 0x00000001,
+  UOP_FLAG_ChapterSearchOrPlay        = 0x00000002,
+  UOP_FLAG_TitlePlay                  = 0x00000004,
+  UOP_FLAG_Stop                       = 0x00000008,
   UOP_FLAG_GoUp                       = 0x00000010,
-  UOP_FLAG_TimeOrChapterSearch        = 0x00000020, 
-  UOP_FLAG_PrevOrTopPGSearch          = 0x00000040,  
-  UOP_FLAG_NextPGSearch               = 0x00000080,   
-  UOP_FLAG_ForwardScan                = 0x00000100,  
+  UOP_FLAG_TimeOrChapterSearch        = 0x00000020,
+  UOP_FLAG_PrevOrTopPGSearch          = 0x00000040,
+  UOP_FLAG_NextPGSearch               = 0x00000080,
+  UOP_FLAG_ForwardScan                = 0x00000100,
   UOP_FLAG_BackwardScan               = 0x00000200,
   UOP_FLAG_TitleMenuCall              = 0x00000400,
   UOP_FLAG_RootMenuCall               = 0x00000800,
@@ -97,7 +97,7 @@ typedef enum {
   UOP_FLAG_SubPicStreamChange         = 0x00200000,
   UOP_FLAG_AngleChange                = 0x00400000,
   UOP_FLAG_KaraokeAudioPresModeChange = 0x00800000,
-  UOP_FLAG_VideoPresModeChange        = 0x01000000 
+  UOP_FLAG_VideoPresModeChange        = 0x01000000
 } DVDUOP_t;
 
 /* Parental Level */
@@ -124,7 +124,7 @@ typedef uint16_t DVDRegister_t;
 typedef enum {
   DVDFalse = 0,
   DVDTrue = 1
-} DVDBool_t; 
+} DVDBool_t;
 typedef DVDRegister_t DVDGPRMArray_t[16];
 typedef DVDRegister_t DVDSPRMArray_t[24];
 
@@ -145,10 +145,10 @@ typedef struct {
 } DVDTimecode_t;
 
 /* Subpicture stream number (0-31,62,63) */
-typedef int DVDSubpictureStream_t;  
+typedef int DVDSubpictureStream_t;
 
 /* Audio stream number (0-7, 15(none)) */
-typedef int DVDAudioStream_t;  
+typedef int DVDAudioStream_t;
 
 /* The audio application mode */
 typedef enum {
@@ -192,7 +192,7 @@ typedef enum {
   DVD_SUBPICTURE_LANG_EXT_NormalDirectorsComments  = 13,
   DVD_SUBPICTURE_LANG_EXT_BigDirectorsComments  = 14,
   DVD_SUBPICTURE_LANG_EXT_ChildrensDirectorsComments  = 15,
-} DVDSubpictureLangExt_t;  
+} DVDSubpictureLangExt_t;
 
 /* Karaoke Downmix mode */
 typedef enum {
@@ -218,7 +218,7 @@ typedef enum {
   DVD_DISPLAY_MODE_ContentDefault = 0,
   DVD_DISPLAY_MODE_16x9 = 1,
   DVD_DISPLAY_MODE_4x3PanScan = 2,
-  DVD_DISPLAY_MODE_4x3Letterboxed = 3  
+  DVD_DISPLAY_MODE_4x3Letterboxed = 3
 } DVDDisplayMode_t;
 
 typedef int DVDAudioSampleFreq_t;
diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav.h b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav.h
index 9537308433..8c40b3f478 100644
--- a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav.h
@@ -1,18 +1,18 @@
-/* 
+/*
  * Copyright (C) 2001 Rich Wareham <richwareham@users.sourceforge.net>
- * 
+ *
  * This file is part of libdvdnav, a DVD navigation library.
- * 
+ *
  * libdvdnav 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 of the License, or
  * (at your option) any later version.
- * 
+ *
  * libdvdnav 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 libdvdnav; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -91,7 +91,7 @@ dvdnav_status_t dvdnav_open(dvdnav_t **dest, const char *path);
 dvdnav_status_t dvdnav_open_stream(dvdnav_t **dest, void *stream, dvdnav_stream_cb *stream_cb);
 
 /*
- * Closes a dvdnav_t previously opened with dvdnav_open(), freeing any 
+ * Closes a dvdnav_t previously opened with dvdnav_open(), freeing any
  * memory associated with it.
  */
 dvdnav_status_t dvdnav_close(dvdnav_t *self);
@@ -127,7 +127,7 @@ const char* dvdnav_err_to_string(dvdnav_t *self);
  * Sets the region mask (bit 0 set implies region 1, bit 1 set implies
  * region 2, etc) of the virtual machine. Generally you will only need to set
  * this if you are playing RCE discs which query the virtual machine as to its
- * region setting. 
+ * region setting.
  *
  * This has _nothing_ to do with the region setting of the DVD drive.
  */
@@ -186,7 +186,7 @@ dvdnav_status_t dvdnav_get_PGC_positioning_flag(dvdnav_t *self, int32_t *pgc_bas
  */
 
 /*
- * Attempts to get the next block off the DVD and copies it into the buffer 'buf'. 
+ * Attempts to get the next block off the DVD and copies it into the buffer 'buf'.
  * If there is any special actions that may need to be performed, the value
  * pointed to by 'event' gets set accordingly.
  *
@@ -335,7 +335,7 @@ dvdnav_status_t dvdnav_current_title_program(dvdnav_t *self, int32_t *title,
 /*
  * Return the current position (in blocks) within the current
  * title and the length (in blocks) of said title.
- * 
+ *
  * Current implementation is wrong and likely to behave unpredictably!
  * Use is discouraged!
  */
@@ -370,7 +370,7 @@ dvdnav_status_t dvdnav_part_search(dvdnav_t *self, int32_t part);
  * 'origin' can be one of SEEK_SET, SEEK_CUR, SEEK_END as defined in
  * fcntl.h.
  */
-dvdnav_status_t dvdnav_sector_search(dvdnav_t *self, 
+dvdnav_status_t dvdnav_sector_search(dvdnav_t *self,
 				     uint64_t offset, int32_t origin);
 
 /*
@@ -385,7 +385,7 @@ int64_t dvdnav_get_current_time(dvdnav_t *self);
  *
  * Currently implemented using interpolation, which is slightly inaccurate.
  */
-dvdnav_status_t dvdnav_time_search(dvdnav_t *self, 
+dvdnav_status_t dvdnav_time_search(dvdnav_t *self,
 				   uint64_t time);
 
 /*
@@ -439,7 +439,7 @@ dvdnav_status_t dvdnav_get_position(dvdnav_t *self, uint32_t *pos,
  */
 
 /*
- * Get the currently highlighted button 
+ * Get the currently highlighted button
  * number (1..36) or 0 if no button is highlighted.
  */
 dvdnav_status_t dvdnav_get_current_highlight(dvdnav_t *self, int32_t *button);
@@ -511,7 +511,7 @@ dvdnav_status_t dvdnav_mouse_activate(dvdnav_t *self, pci_t *pci, int32_t x, int
  * languages                                                         *
  *********************************************************************/
 
-/* 
+/*
  * The language codes expected by these functions are two character
  * codes as defined in ISO639.
  */
@@ -560,7 +560,7 @@ dvdnav_status_t dvdnav_get_serial_string(dvdnav_t *self, const char **serial_str
  * Get video aspect code.
  * The aspect code does only change on VTS boundaries.
  * See the DVDNAV_VTS_CHANGE event.
- * 
+ *
  * 0 -- 4:3, 2 -- 16:9
  */
 uint8_t dvdnav_get_video_aspect(dvdnav_t *self);
@@ -598,7 +598,7 @@ uint16_t dvdnav_audio_stream_format(dvdnav_t *self, uint8_t stream);
 uint16_t dvdnav_audio_stream_channels(dvdnav_t *self, uint8_t stream);
 
 /*
- * Converts a *logical* subpicture stream id into country code 
+ * Converts a *logical* subpicture stream id into country code
  * (returns 0xffff if no such stream).
  */
 uint16_t dvdnav_spu_stream_to_lang(dvdnav_t *self, uint8_t stream);
diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav_events.h b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav_events.h
index dd2f90c3b0..bde7cd42bf 100644
--- a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav_events.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav_events.h
@@ -1,25 +1,25 @@
-/* 
+/*
  * Copyright (C) 2001 Rich Wareham <richwareham@users.sourceforge.net>
- * 
+ *
  * This file is part of libdvdnav, a DVD navigation library.
- * 
+ *
  * libdvdnav 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 of the License, or
  * (at your option) any later version.
- * 
+ *
  * libdvdnav 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 libdvdnav; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /*
- * This header defines events and event types 
+ * This header defines events and event types
  */
 
 #pragma once
@@ -87,7 +87,7 @@ typedef struct {
    * Use this, if you blend the SPU on an anamorphic image after
    * unsqueezing it the pan&scan way. */
   int physical_pan_scan;
-  
+
   /* The logical (DVD) stream number. */
   int logical;
 } dvdnav_spu_stream_change_event_t;
@@ -194,7 +194,7 @@ typedef struct {
   int display;
 
   /* FIXME: these fields are currently not set */
-  uint32_t palette;     /* The CLUT entries for the highlight palette 
+  uint32_t palette;     /* The CLUT entries for the highlight palette
 			   (4-bits per entry -> 4 entries) */
   uint16_t sx,sy,ex,ey; /* The start/end x,y positions */
   uint32_t pts;         /* Highlight PTS to match with SPU */
diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav_internal.h b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav_internal.h
index 110fd03e96..52eb1e3b3c 100644
--- a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav_internal.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav_internal.h
@@ -1,18 +1,18 @@
-/* 
+/*
  * Copyright (C) 2001-2004 Rich Wareham <richwareham@users.sourceforge.net>
- * 
+ *
  * This file is part of libdvdnav, a DVD navigation library.
- * 
+ *
  * libdvdnav 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 of the License, or
  * (at your option) any later version.
- * 
+ *
  * libdvdnav 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 libdvdnav; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -104,7 +104,7 @@ typedef struct read_cache_s read_cache_t;
 
 /*
  * These are defined here because they are
- * not in ifo_types.h, they maybe one day 
+ * not in ifo_types.h, they maybe one day
  */
 
 #ifndef audio_status_t
@@ -117,7 +117,7 @@ typedef struct {
 #else
   uint8_t zero2;
   unsigned int stream_number : 3;
-  unsigned int zero1         : 4;  
+  unsigned int zero1         : 4;
   unsigned int available     : 1;
 #endif
 } ATTRIBUTE_PACKED audio_status_t;
@@ -154,35 +154,35 @@ typedef struct dvdnav_vobu_s {
   int32_t vobu_length;
   int32_t blockN;      /* Relative offset */
   int32_t vobu_next;   /* Relative offset */
-} dvdnav_vobu_t;  
-   
+} dvdnav_vobu_t;
+
 /** The main DVDNAV type **/
 
 struct dvdnav_s {
   /* General data */
   char        path[MAX_PATH_LEN]; /* Path to DVD device/dir */
   dvd_file_t *file;               /* Currently opened file */
- 
+
   /* Position data */
   vm_position_t position_next;
   vm_position_t position_current;
-  dvdnav_vobu_t vobu;  
+  dvdnav_vobu_t vobu;
 
   /* NAV data */
   pci_t pci;
   dsi_t dsi;
   uint32_t last_cmd_nav_lbn;      /* detects when a command is issued on an already left NAV */
-  
+
   /* Flags */
   int skip_still;                 /* Set when skipping a still */
   int sync_wait;                  /* applications should wait till they are in sync with us */
   int sync_wait_skip;             /* Set when skipping wait state */
-  int spu_clut_changed;           /* The SPU CLUT changed */ 
+  int spu_clut_changed;           /* The SPU CLUT changed */
   int started;                    /* vm_start has been called? */
   int use_read_ahead;             /* 1 - use read-ahead cache, 0 - don't */
   int pgc_based;                  /* positioning works PGC based instead of PG based */
   int cur_cell_time;              /* time expired since the beginning of the current cell, read from the dsi */
-  
+
   /* VM */
   vm_t *vm;
   pthread_mutex_t vm_lock;
diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/ifo_types.h b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/ifo_types.h
index 5bf22f9352..307c0fa56a 100644
--- a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/ifo_types.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/ifo_types.h
@@ -26,7 +26,7 @@
 
 
 #undef ATTRIBUTE_PACKED
-#undef PRAGMA_PACK_BEGIN 
+#undef PRAGMA_PACK_BEGIN
 #undef PRAGMA_PACK_END
 
 #if defined(__GNUC__)
@@ -80,12 +80,12 @@ typedef struct {
   unsigned char video_format         : 2;
   unsigned char display_aspect_ratio : 2;
   unsigned char permitted_df         : 2;
-  
+
   unsigned char line21_cc_1          : 1;
   unsigned char line21_cc_2          : 1;
   unsigned char unknown1             : 1;
   unsigned char bit_rate             : 1;
-  
+
   unsigned char picture_size         : 2;
   unsigned char letterboxed          : 1;
   unsigned char film_mode            : 1;
@@ -99,7 +99,7 @@ typedef struct {
   unsigned char multichannel_extension : 1;
   unsigned char lang_type              : 2;
   unsigned char application_mode       : 2;
-  
+
   unsigned char quantization           : 2;
   unsigned char sample_frequency       : 2;
   unsigned char unknown1               : 1;
@@ -183,7 +183,7 @@ typedef struct {
 
 /**
  * PGC Command Table.
- */ 
+ */
 typedef struct {
   uint16_t nr_of_pre;
   uint16_t nr_of_post;
@@ -198,7 +198,7 @@ typedef struct {
 /**
  * PGC Program Map
  */
-typedef uint8_t pgc_program_map_t; 
+typedef uint8_t pgc_program_map_t;
 
 /**
  * Cell Playback Information.
@@ -210,7 +210,7 @@ typedef struct {
   unsigned int interleaved      : 1;
   unsigned int stc_discontinuity: 1;
   unsigned int seamless_angle   : 1;
-  
+
   unsigned int playback_mode    : 1;  /**< When set, enter StillMode after each VOBU */
   unsigned int restricted       : 1;  /**< ?? drop out of fastforward? */
   unsigned int unknown2         : 6;
@@ -246,7 +246,7 @@ typedef struct {
 typedef struct {
   unsigned int zero                           : 7; /* 25-31 */
   unsigned int video_pres_mode_change         : 1; /* 24 */
-  
+
   unsigned int karaoke_audio_pres_mode_change : 1; /* 23 */
   unsigned int angle_change                   : 1;
   unsigned int subpic_stream_change           : 1;
@@ -255,7 +255,7 @@ typedef struct {
   unsigned int still_off                      : 1;
   unsigned int button_select_or_activate      : 1;
   unsigned int resume                         : 1; /* 16 */
-  
+
   unsigned int chapter_menu_call              : 1; /* 15 */
   unsigned int angle_menu_call                : 1;
   unsigned int audio_menu_call                : 1;
@@ -264,7 +264,7 @@ typedef struct {
   unsigned int title_menu_call                : 1;
   unsigned int backward_scan                  : 1;
   unsigned int forward_scan                   : 1; /* 8 */
-  
+
   unsigned int next_pg_search                 : 1; /* 7 */
   unsigned int prev_or_top_pg_search          : 1;
   unsigned int time_or_chapter_search         : 1;
@@ -424,7 +424,7 @@ typedef struct {
   uint32_t vmgm_c_adt;            /* sector */
   uint32_t vmgm_vobu_admap;       /* sector */
   uint8_t  zero_6[32];
-  
+
   video_attr_t vmgm_video_attr;
   uint8_t  zero_7;
   uint8_t  nr_of_vmgm_audio_streams; /* should be 0 or 1 */
@@ -508,20 +508,20 @@ typedef struct {
 typedef struct {
   uint32_t last_byte;
   uint32_t vts_cat;
-  
+
   video_attr_t vtsm_vobs_attr;
   uint8_t  zero_1;
   uint8_t  nr_of_vtsm_audio_streams; /* should be 0 or 1 */
   audio_attr_t vtsm_audio_attr;
-  audio_attr_t zero_2[7];  
+  audio_attr_t zero_2[7];
   uint8_t  zero_3[16];
   uint8_t  zero_4;
   uint8_t  nr_of_vtsm_subp_streams; /* should be 0 or 1 */
   subp_attr_t vtsm_subp_attr;
   subp_attr_t zero_5[27];
-  
+
   uint8_t  zero_6[2];
-  
+
   video_attr_t vtstt_vobs_video_attr;
   uint8_t  zero_7;
   uint8_t  nr_of_vtstt_audio_streams;
@@ -552,10 +552,10 @@ typedef struct {
 typedef struct {
   uint32_t last_byte;    /* offsets are relative here */
   uint16_t offsets[100]; /* == nr_of_srpts + 1 (first is disc title) */
-#if 0  
+#if 0
   uint16_t unknown; /* 0x48 ?? 0x48 words (16bit) info following */
   uint16_t zero_1;
-  
+
   uint8_t type_of_info; /* ?? 01 == disc, 02 == Title, 04 == Title part */
   uint8_t unknown1;
   uint8_t unknown2;
@@ -563,14 +563,14 @@ typedef struct {
   uint8_t unknown4; /* ?? always 0x30 language?, text format? */
   uint8_t unknown5;
   uint16_t offset; /* from first */
-  
+
   char text[12]; /* ended by 0x09 */
 #endif
 } ATTRIBUTE_PACKED txtdt_t;
 
 /**
  * Text Data Language Unit. (Incomplete)
- */ 
+ */
 typedef struct {
   uint16_t lang_code;
   uint16_t unknown;      /* 0x0001, title 1? disc 1? side 1? */
@@ -630,7 +630,7 @@ typedef struct {
   uint32_t vts_c_adt;       /* sector */
   uint32_t vts_vobu_admap;  /* sector */
   uint8_t  zero_13[24];
-  
+
   video_attr_t vtsm_video_attr;
   uint8_t  zero_14;
   uint8_t  nr_of_vtsm_audio_streams; /* should be 0 or 1 */
@@ -641,7 +641,7 @@ typedef struct {
   subp_attr_t vtsm_subp_attr;
   subp_attr_t zero_17[27];
   uint8_t  zero_18[2];
-  
+
   video_attr_t vts_video_attr;
   uint8_t  zero_19;
   uint8_t  nr_of_vts_audio_streams;
@@ -726,20 +726,20 @@ typedef struct {
  */
 typedef struct {
   dvd_file_t *file;
-  
+
   /* VMGI */
   vmgi_mat_t     *vmgi_mat;
   tt_srpt_t      *tt_srpt;
-  pgc_t          *first_play_pgc;    
+  pgc_t          *first_play_pgc;
   ptl_mait_t     *ptl_mait;
   vts_atrt_t     *vts_atrt;
   txtdt_mgi_t    *txtdt_mgi;
-  
+
   /* Common */
   pgci_ut_t      *pgci_ut;
   c_adt_t        *menu_c_adt;
   vobu_admap_t   *menu_vobu_admap;
-  
+
   /* VTSI */
   vtsi_mat_t     *vtsi_mat;
   vts_ptt_srpt_t *vts_ptt_srpt;
diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/nav_types.h b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/nav_types.h
index d007c68d87..9151ec9b17 100644
--- a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/nav_types.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/nav_types.h
@@ -32,7 +32,7 @@
 
 
 #undef ATTRIBUTE_PACKED
-#undef PRAGMA_PACK_BEGIN 
+#undef PRAGMA_PACK_BEGIN
 #undef PRAGMA_PACK_END
 
 #if defined(__GNUC__)
@@ -65,7 +65,7 @@
 
 
 /**
- * PCI General Information 
+ * PCI General Information
  */
 typedef struct {
   uint32_t nv_pck_lbn;      /**< sector address of this nav pack */
@@ -86,8 +86,8 @@ typedef struct {
   uint32_t nsml_agl_dsta[9];  /**< address of destination vobu in AGL_C#n */
 } ATTRIBUTE_PACKED nsml_agli_t;
 
-/** 
- * Highlight General Information 
+/**
+ * Highlight General Information
  *
  * For btngrX_dsp_ty the bits have the following meaning:
  * 000b: normal 4/3 only buttons
@@ -109,7 +109,7 @@ typedef struct {
   unsigned int zero4 : 1;          /**< reserved */
   unsigned int btngr3_dsp_ty : 3;  /**< display type of subpic stream for button group 3 */
   uint8_t btn_ofn;     /**< button offset number range 0-255 */
-  uint8_t btn_ns;      /**< number of valid buttons  <= 36/18/12 (low 6 bits) */  
+  uint8_t btn_ns;      /**< number of valid buttons  <= 36/18/12 (low 6 bits) */
   uint8_t nsl_btn_ns;  /**< number of buttons selectable by U_BTNNi (low 6 bits)   nsl_btn_ns <= btn_ns */
   uint8_t zero5;       /**< reserved */
   uint8_t fosl_btnn;   /**< forcedly selected button  (low 6 bits) */
@@ -117,8 +117,8 @@ typedef struct {
 } ATTRIBUTE_PACKED hl_gi_t;
 
 
-/** 
- * Button Color Information Table 
+/**
+ * Button Color Information Table
  * Each entry being a 32bit word that contains the color indexs and alpha
  * values to use.  They are all represented by 4 bit number and stored
  * like this [Ci3, Ci2, Ci1, Ci0, A3, A2, A1, A0].   The actual palette
@@ -129,7 +129,7 @@ typedef struct {
   uint32_t btn_coli[3][2];  /**< [button color number-1][select:0/action:1] */
 } ATTRIBUTE_PACKED btn_colit_t;
 
-/** 
+/**
  * Button Information
  *
  * NOTE: I've had to change the structure from the disk layout to get
@@ -159,7 +159,7 @@ typedef struct {
 } ATTRIBUTE_PACKED btni_t;
 
 /**
- * Highlight Information 
+ * Highlight Information
  */
 typedef struct {
   hl_gi_t     hl_gi;
@@ -181,7 +181,7 @@ typedef struct {
 
 
 /**
- * DSI General Information 
+ * DSI General Information
  */
 typedef struct {
   uint32_t nv_pck_scr;
@@ -210,7 +210,7 @@ typedef struct {
     uint32_t stp_ptm1;
     uint32_t stp_ptm2;
     uint32_t gap_len1;
-    uint32_t gap_len2;      
+    uint32_t gap_len2;
   } vob_a[8];
 } ATTRIBUTE_PACKED sml_pbi_t;
 
@@ -230,7 +230,7 @@ typedef struct {
 } ATTRIBUTE_PACKED sml_agli_t;
 
 /**
- * VOBU Search Information 
+ * VOBU Search Information
  */
 typedef struct {
   uint32_t next_video; /**< Next vobu that contains video */
@@ -245,7 +245,7 @@ typedef struct {
 
 /**
  * Synchronous Information
- */ 
+ */
 typedef struct {
   uint16_t a_synca[8];   /**< offset to first audio packet for this VOBU */
   uint32_t sp_synca[32]; /**< offset to first subpicture packet */
diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/remap.h b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/remap.h
index f169d0d2ee..1e8a33b205 100644
--- a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/remap.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/remap.h
@@ -1,16 +1,16 @@
-/* 
+/*
  * This file is part of libdvdnav, a DVD navigation library.
- * 
+ *
  * libdvdnav 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 of the License, or
  * (at your option) any later version.
- * 
+ *
  * libdvdnav 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 libdvdnav; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -24,7 +24,7 @@ typedef struct remap_s remap_t;
 
 remap_t* remap_loadmap( char *title);
 
-unsigned long remap_block( 
-	remap_t *map, int domain, int title, int program, 
+unsigned long remap_block(
+	remap_t *map, int domain, int title, int program,
 	unsigned long cblock, unsigned long offset);
 
diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/vm.h b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/vm.h
index f1f914c598..7c3f6ed32b 100644
--- a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/vm.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/vm.h
@@ -1,20 +1,20 @@
 /*
  * Copyright (C) 2000, 2001 Håkan Hjort
  * Copyright (C) 2001 Rich Wareham <richwareham@users.sourceforge.net>
- * 
+ *
  * This file is part of libdvdnav, a DVD navigation library. It is modified
  * from a file originally part of the Ogle DVD player.
- * 
+ *
  * libdvdnav 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 of the License, or
  * (at your option) any later version.
- * 
+ *
  * libdvdnav 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 libdvdnav; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -32,14 +32,14 @@ typedef enum {
   VTS_DOMAIN  = 2,
   VMGM_DOMAIN = 4,
   VTSM_DOMAIN = 8
-} domain_t;  
+} domain_t;
 
 /**
  * State: SPRM, GPRM, Domain, pgc, pgN, cellN, ?
  */
 typedef struct {
   registers_t registers;
-  
+
   domain_t  domain;
   int       vtsN;         /* 0 is vmgm? */
   pgc_t    *pgc;          /* either this or 'int pgcN' is enough? */
@@ -48,7 +48,7 @@ typedef struct {
   int       cellN;
   int32_t   cell_restart; /* get cell to restart */
   int       blockN;
-  
+
   /* Resume info */
   int      rsm_vtsN;
   int      rsm_blockN;    /* of nav_packet */
diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/vmcmd.h b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/vmcmd.h
index d4885c4d24..6717287124 100644
--- a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/vmcmd.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/vmcmd.h
@@ -1,19 +1,19 @@
 /*
  * Copyright (C) 2000, 2001 Martin Norbäck, Håkan Hjort
- * 
+ *
  * This file is part of libdvdnav, a DVD navigation library. It is modified
  * from a file originally part of the Ogle DVD player.
- * 
+ *
  * libdvdnav 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 of the License, or
  * (at your option) any later version.
- * 
+ *
  * libdvdnav 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 libdvdnav; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/xbmc/cores/VideoPlayer/DVDStreamInfo.h b/xbmc/cores/VideoPlayer/DVDStreamInfo.h
index 445d43067b..2a5773eb59 100644
--- a/xbmc/cores/VideoPlayer/DVDStreamInfo.h
+++ b/xbmc/cores/VideoPlayer/DVDStreamInfo.h
@@ -101,14 +101,14 @@ public:
     if (this != &right)
       Assign(right, true);
 
-    return *this; 
+    return *this;
   }
 
   bool operator==(const CDemuxStream& right)      { return Equal( CDVDStreamInfo(right, true), true);}
   bool operator!=(const CDemuxStream& right)      { return !Equal( CDVDStreamInfo(right, true), true);}
 
   CDVDStreamInfo& operator=(const CDemuxStream& right)
-  { 
+  {
     Assign(right, true);
     return *this;
   }
diff --git a/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleLineCollection.cpp b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleLineCollection.cpp
index 9c0b2152e5..f455870c63 100644
--- a/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleLineCollection.cpp
+++ b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleLineCollection.cpp
@@ -60,7 +60,7 @@ void CDVDSubtitleLineCollection::Sort()
 {
   if (!m_pHead || !m_pHead->pNext)
     return;
-  
+
   for (ListElement* p1 = m_pHead; p1->pNext != NULL; p1 = p1->pNext)
   {
     for (ListElement* p2 = p1->pNext; p2 != NULL; p2 = p2->pNext)
diff --git a/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParser.h b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParser.h
index 10c179c972..40df0cb48a 100644
--- a/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParser.h
+++ b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParser.h
@@ -67,7 +67,7 @@ class CDVDSubtitleParserText
 public:
   CDVDSubtitleParserText(std::unique_ptr<CDVDSubtitleStream> && stream, const std::string& filename)
     : CDVDSubtitleParserCollection(filename)
-		, m_pStream(std::move(stream)) 
+		, m_pStream(std::move(stream))
   {
   }
 
diff --git a/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleStream.cpp b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleStream.cpp
index e3bbf07ce9..3e0480a5f4 100644
--- a/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleStream.cpp
+++ b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleStream.cpp
@@ -119,7 +119,7 @@ bool CDVDSubtitleStream::IsIncompatible(CDVDInputStream* pInputStream, XUTILS::a
   {
     *bytesRead = (size_t)read;
   }
-  
+
   if (read >= 4)
   {
     if (!std::memcmp(buf.get(), vobsub, 4))
diff --git a/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleTagMicroDVD.cpp b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleTagMicroDVD.cpp
index 27ffd1cb83..85deaa1e0e 100644
--- a/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleTagMicroDVD.cpp
+++ b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleTagMicroDVD.cpp
@@ -149,7 +149,7 @@ void CDVDSubtitleTagMicroDVD::ConvertLine(CDVDOverlayText* pOverlay, const char*
       }
     }
   }
-    
+
   if (strUTF8.empty())
     return;
 
diff --git a/xbmc/cores/VideoPlayer/Edl.cpp b/xbmc/cores/VideoPlayer/Edl.cpp
index b165cf2fcd..6505f8c14b 100644
--- a/xbmc/cores/VideoPlayer/Edl.cpp
+++ b/xbmc/cores/VideoPlayer/Edl.cpp
@@ -577,9 +577,9 @@ bool CEdl::ReadPvr(const CFileItem &fileItem)
     CLog::Log(LOGERROR, "%s - PVR Manager not started, cannot read Edl for %s", __FUNCTION__, strMovie.c_str());
     return false;
   }
-  
+
   std::vector<PVR_EDL_ENTRY> edl;
-  
+
   if (fileItem.HasPVRRecordingInfoTag())
   {
     CLog::Log(LOGDEBUG, "%s - Reading Edl for recording: %s", __FUNCTION__, fileItem.GetPVRRecordingInfoTag()->m_strTitle.c_str());
@@ -867,7 +867,7 @@ void CEdl::SetLastCutTime(const int iCutTime)
 
 bool CEdl::GetNearestCut(bool bPlus, const int iSeek, Cut *pCut) const
 {
-  if (bPlus) 
+  if (bPlus)
   {
     // Searching forwards
     for (auto &cut : m_vecCuts)
@@ -886,13 +886,13 @@ bool CEdl::GetNearestCut(bool bPlus, const int iSeek, Cut *pCut) const
       }
     }
     return false;
-  } 
+  }
   else
   {
     // Searching backwards
     for (int i = (int)m_vecCuts.size() - 1; i >= 0; i--)
     {
-      if (iSeek - 20000 >= m_vecCuts[i].start && iSeek <= m_vecCuts[i].end) 
+      if (iSeek - 20000 >= m_vecCuts[i].start && iSeek <= m_vecCuts[i].end)
         // Inside cut. We ignore if we're closer to 20 seconds inside
       {
         if (pCut)
diff --git a/xbmc/cores/VideoPlayer/Process/ProcessInfo.cpp b/xbmc/cores/VideoPlayer/Process/ProcessInfo.cpp
index 7f3ea54749..a641405ed8 100644
--- a/xbmc/cores/VideoPlayer/Process/ProcessInfo.cpp
+++ b/xbmc/cores/VideoPlayer/Process/ProcessInfo.cpp
@@ -37,7 +37,7 @@ void CProcessInfo::RegisterProcessControl(std::string id, CreateProcessControl c
 CProcessInfo* CProcessInfo::CreateInstance()
 {
   CSingleLock lock(createSection);
-  
+
   CProcessInfo *ret = nullptr;
   for (auto &info : m_processControls)
   {
diff --git a/xbmc/cores/VideoPlayer/Process/ProcessInfo.h b/xbmc/cores/VideoPlayer/Process/ProcessInfo.h
index a0f8260985..466685e676 100644
--- a/xbmc/cores/VideoPlayer/Process/ProcessInfo.h
+++ b/xbmc/cores/VideoPlayer/Process/ProcessInfo.h
@@ -17,7 +17,7 @@
  *  <http://www.gnu.org/licenses/>.
  *
  */
- 
+
 #pragma once
 
 #include "VideoBuffer.h"
diff --git a/xbmc/cores/VideoPlayer/VideoPlayer.cpp b/xbmc/cores/VideoPlayer/VideoPlayer.cpp
index 07b9147515..892f62917e 100644
--- a/xbmc/cores/VideoPlayer/VideoPlayer.cpp
+++ b/xbmc/cores/VideoPlayer/VideoPlayer.cpp
@@ -2510,7 +2510,7 @@ void CVideoPlayer::OnExit()
   m_outboundEvents->Submit([=]() {
     cb->OnPlayerCloseFile(fileItem, bookmark);
   });
-    
+
   // destroy objects
   SAFE_DELETE(m_pDemuxer);
   SAFE_DELETE(m_pSubtitleDemuxer);
@@ -3536,7 +3536,7 @@ bool CVideoPlayer::OpenStream(CCurrentStream& current, int64_t demuxerId, int iS
     stream = m_pSubtitleDemuxer->GetStream(demuxerId, iStream);
     if(!stream || stream->disabled)
       return false;
-    
+
     m_pSubtitleDemuxer->EnableStream(demuxerId, iStream, true);
 
     hint.Assign(*stream, true);
@@ -4759,7 +4759,7 @@ void CVideoPlayer::UpdatePlayState(double timeout)
   state.timestamp = m_clock.GetAbsoluteClock();
 
   m_processInfo->SetPlayTimes(state.startTime, state.time, state.timeMin, state.timeMax);
-  
+
   CSingleLock lock(m_StateSection);
   m_State = state;
 }
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/BaseRenderer.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/BaseRenderer.cpp
index 3ebff54c6a..3c987e38d7 100644
--- a/xbmc/cores/VideoPlayer/VideoRenderers/BaseRenderer.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/BaseRenderer.cpp
@@ -51,7 +51,7 @@ CBaseRenderer::CBaseRenderer()
     m_rotatedDestCoords[i].x = 0;
     m_rotatedDestCoords[i].y = 0;
     m_savedRotatedDestCoords[i].x = 0;
-    m_savedRotatedDestCoords[i].y = 0;    
+    m_savedRotatedDestCoords[i].y = 0;
   }
 }
 
@@ -110,7 +110,7 @@ inline void CBaseRenderer::ReorderDrawPoints()
   float diffY = 0.0f;
   float centerX = 0.0f;
   float centerY = 0.0f;
-  
+
   if (changeAspect)// we are either rotating by 90 or 270 degrees which inverts aspect ratio
   {
     float newWidth = m_destRect.Height(); // new width is old height
@@ -137,7 +137,7 @@ inline void CBaseRenderer::ReorderDrawPoints()
         newWidth /= aspectRatio;
       }
     }
-    
+
     // calculate the center point of the view
     centerX = m_viewRect.x1 + m_viewRect.Width() / 2.0f;
     centerY = m_viewRect.y1 + m_viewRect.Height() / 2.0f;
@@ -148,7 +148,7 @@ inline void CBaseRenderer::ReorderDrawPoints()
     // calculate the number of pixels we need to go in each
     // y direction from the center point
     diffY = newHeight / 2;
-    
+
   }
 
   for (int destIdx=0, srcIdx=pointOffset; destIdx < 4; destIdx++)
@@ -192,13 +192,13 @@ void CBaseRenderer::saveRotatedCoords()
 void CBaseRenderer::syncDestRectToRotatedPoints()
 {
   m_rotatedDestCoords[0].x = m_destRect.x1;
-  m_rotatedDestCoords[0].y = m_destRect.y1;  
+  m_rotatedDestCoords[0].y = m_destRect.y1;
   m_rotatedDestCoords[1].x = m_destRect.x2;
   m_rotatedDestCoords[1].y = m_destRect.y1;
   m_rotatedDestCoords[2].x = m_destRect.x2;
-  m_rotatedDestCoords[2].y = m_destRect.y2;  
+  m_rotatedDestCoords[2].y = m_destRect.y2;
   m_rotatedDestCoords[3].x = m_destRect.x1;
-  m_rotatedDestCoords[3].y = m_destRect.y2; 
+  m_rotatedDestCoords[3].y = m_destRect.y2;
 }
 
 void CBaseRenderer::restoreRotatedCoords()
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.cpp
index cf65e7fc71..ebf193ac75 100644
--- a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.cpp
@@ -202,7 +202,7 @@ bool CColorManager::GetVideo3dLut(int videoFlags, int *cmsToken, CMS_DATA_FORMAT
       m_curIccWhitePoint = (CMS_WHITEPOINT)CServiceBroker::GetSettings().GetInt("videoscreen.cmswhitepoint");
       m_curIccPrimaries = (CMS_PRIMARIES)CServiceBroker::GetSettings().GetInt("videoscreen.cmsprimaries");
       CLog::Log(LOGDEBUG, "ColorManager: primaries setting: %d\n", (int)m_curIccPrimaries);
-      if (m_curIccPrimaries == CMS_PRIMARIES_AUTO) 
+      if (m_curIccPrimaries == CMS_PRIMARIES_AUTO)
         m_curIccPrimaries = videoPrimaries;
       CLog::Log(LOGDEBUG, "ColorManager: source profile primaries: %d\n", (int)m_curIccPrimaries);
       cmsHPROFILE sourceProfile = CreateSourceProfile(m_curIccPrimaries, gammaCurve, m_curIccWhitePoint);
@@ -388,12 +388,12 @@ bool CColorManager::Load3dLut(const std::string filename, CMS_DATA_FORMAT format
   int components = format == CMS_DATA_FMT_RGBA ? 4 : 3;
   for (int rIndex = 0; rIndex < rSize; rIndex++)
   {
-    for (int gIndex = 0; gIndex < gSize; gIndex++) 
+    for (int gIndex = 0; gIndex < gSize; gIndex++)
     {
       std::vector<uint16_t> input(bSize * 3); // always 3 components
       lutFile.Read(input.data(), input.size() * sizeof(input[0]));
       int index = (rIndex + gIndex * rSize) * components;
-      for (int bIndex = 0; bIndex < bSize; bIndex++) 
+      for (int bIndex = 0; bIndex < bSize; bIndex++)
       {
         int offset = index + bIndex * rSize * gSize * components;
         clutData[offset + 0] = input[bIndex * 3 + 2];
@@ -576,11 +576,11 @@ void CColorManager::Create3dLut(cmsHTRANSFORM transform, CMS_DATA_FORMAT format,
 #define videoToPC(x) ( clamp((((x)*255)-16)/219,0,1) )
 #define PCToVideo(x) ( (((x)*219)+16)/255 )
 
-  for (int bIndex=0; bIndex<lutResolution; bIndex++) 
+  for (int bIndex=0; bIndex<lutResolution; bIndex++)
   {
-    for (int gIndex=0; gIndex<lutResolution; gIndex++) 
+    for (int gIndex=0; gIndex<lutResolution; gIndex++)
     {
-      for (int rIndex=0; rIndex<lutResolution; rIndex++) 
+      for (int rIndex=0; rIndex<lutResolution; rIndex++)
       {
         int offset = rIndex * components;
         input[offset + 0] = videoToPC(rIndex / (lutResolution-1.0));
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/DXVAHD.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/DXVAHD.cpp
index 7411c0a099..585108088b 100644
--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/DXVAHD.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/DXVAHD.cpp
@@ -352,56 +352,56 @@ static void ReleaseStream(D3D11_VIDEO_PROCESSOR_STREAM &stream_data)
   delete[] stream_data.ppFutureSurfaces;
 }
 
-static DXGI_COLOR_SPACE_TYPE GetDXGIColorSpace(CRenderBuffer* view) 
+static DXGI_COLOR_SPACE_TYPE GetDXGIColorSpace(CRenderBuffer* view)
 {
   if (view->color_space == AVCOL_SPC_RGB)
   {
-    if (!view->full_range) 
+    if (!view->full_range)
     {
-      if (view->primaries == AVCOL_PRI_BT2020) 
+      if (view->primaries == AVCOL_PRI_BT2020)
       {
-        if (view->color_transfer == AVCOL_TRC_SMPTEST2084) 
+        if (view->color_transfer == AVCOL_TRC_SMPTEST2084)
         {
           return DXGI_COLOR_SPACE_RGB_STUDIO_G2084_NONE_P2020;
         }
-        else 
+        else
         {
           return DXGI_COLOR_SPACE_RGB_STUDIO_G22_NONE_P2020;
         }
       }
-      else 
+      else
       {
         return DXGI_COLOR_SPACE_RGB_STUDIO_G22_NONE_P709;
       }
     }
-    else 
+    else
     {
-      if (view->primaries == AVCOL_PRI_BT2020) 
+      if (view->primaries == AVCOL_PRI_BT2020)
       {
-        if (view->color_transfer == AVCOL_TRC_SMPTEST2084) 
+        if (view->color_transfer == AVCOL_TRC_SMPTEST2084)
         {
           return DXGI_COLOR_SPACE_RGB_FULL_G2084_NONE_P2020;
         }
-        else 
+        else
         {
           return DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P2020;
         }
       }
-      else 
+      else
       {
         if (view->color_transfer == AVCOL_TRC_LINEAR ||
-            view->color_transfer == AVCOL_TRC_LOG) 
+            view->color_transfer == AVCOL_TRC_LOG)
         {
           return DXGI_COLOR_SPACE_RGB_FULL_G10_NONE_P709;
         }
-        else 
+        else
         {
           return DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709;
         }
       }
     }
   }
-  else 
+  else
   {
     if (view->primaries == AVCOL_PRI_BT2020) // UHDTV
     {
@@ -466,7 +466,7 @@ bool CProcessorHD::Render(CRect src, CRect dst, ID3D11Resource* target, CRenderB
   // restore processor if it was lost
   if (!m_pVideoProcessor && !OpenProcessor())
     return false;
-  
+
   if (!views[2])
     return false;
 
@@ -569,7 +569,7 @@ bool CProcessorHD::Render(CRect src, CRect dst, ID3D11Resource* target, CRenderB
   {
     videoCtx1->VideoProcessorSetStreamColorSpace1(m_pVideoProcessor.Get(), DEFAULT_STREAM_INDEX, GetDXGIColorSpace(views[2]));
     // TODO select color space depend on real output format
-    DXGI_COLOR_SPACE_TYPE colorSpace = DX::Windowing()->UseLimitedColor() ? DXGI_COLOR_SPACE_RGB_STUDIO_G22_NONE_P709 : DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709; 
+    DXGI_COLOR_SPACE_TYPE colorSpace = DX::Windowing()->UseLimitedColor() ? DXGI_COLOR_SPACE_RGB_STUDIO_G22_NONE_P709 : DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709;
     videoCtx1->VideoProcessorSetOutputColorSpace1(m_pVideoProcessor.Get(), colorSpace);
     // makes target available for processing in shaders
     videoCtx1->VideoProcessorSetOutputShaderUsage(m_pVideoProcessor.Get(), 1);
@@ -598,10 +598,10 @@ bool CProcessorHD::Render(CRect src, CRect dst, ID3D11Resource* target, CRenderB
   }
 
   // brightness
-  ApplyFilter(D3D11_VIDEO_PROCESSOR_FILTER_BRIGHTNESS, 
+  ApplyFilter(D3D11_VIDEO_PROCESSOR_FILTER_BRIGHTNESS,
               brightness, 0, 100, 50);
   // contrast
-  ApplyFilter(D3D11_VIDEO_PROCESSOR_FILTER_CONTRAST, 
+  ApplyFilter(D3D11_VIDEO_PROCESSOR_FILTER_CONTRAST,
               contrast, 0, 100, 50);
   // unused filters
   ApplyFilter(D3D11_VIDEO_PROCESSOR_FILTER_HUE, 50, 0, 100, 50);
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVTBGL.h b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVTBGL.h
index 18ac8c1c01..2ce02d4206 100644
--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVTBGL.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVTBGL.h
@@ -31,7 +31,7 @@ public:
 
   static CBaseRenderer* Create(CVideoBuffer *buffer);
   static bool Register();
-  
+
   // Player functions
   virtual void ReleaseBuffer(int idx) override;
   virtual bool NeedBuffer(int idx) override;
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVTBGLES.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVTBGLES.cpp
index 4fda7acc01..15edfadb4c 100644
--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVTBGLES.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVTBGLES.cpp
@@ -138,15 +138,15 @@ bool CRendererVTB::CreateTexture(int index)
   YUVBUFFER &buf = m_buffers[index];
   YuvImage &im = buf.image;
   YUVPLANE (&planes)[YuvImage::MAX_PLANES] = buf.fields[0];
-  
+
   DeleteTexture(index);
-  
+
   memset(&im    , 0, sizeof(im));
   memset(&planes, 0, sizeof(YUVPLANE[YuvImage::MAX_PLANES]));
-  
+
   im.height = m_sourceHeight;
   im.width = m_sourceWidth;
-  
+
   planes[0].texwidth  = im.width;
   planes[0].texheight = im.height;
   planes[1].texwidth  = planes[0].texwidth >> im.cshift_x;
@@ -276,7 +276,7 @@ bool CRendererVTB::NeedBuffer(int idx)
     if (syncState != GL_SIGNALED_APPLE)
       return true;
   }
-  
+
   return false;
 }
 
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.cpp
index 3187f0095b..700aca20ef 100644
--- a/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.cpp
@@ -969,7 +969,7 @@ void CLinuxRendererGL::LoadShaders(int field)
   else
     CLog::Log(LOGNOTICE, "GL: NPOT texture support detected");
 
-  
+
   if (m_pboSupported)
   {
     CLog::Log(LOGNOTICE, "GL: Using GL_ARB_pixel_buffer_object");
@@ -1526,7 +1526,7 @@ void CLinuxRendererGL::RenderFromFBO()
   glGenBuffers(1, &vertexVBO);
   glBindBuffer(GL_ARRAY_BUFFER, vertexVBO);
   glBufferData(GL_ARRAY_BUFFER, sizeof(PackedVertex)*4, &vertex[0], GL_STATIC_DRAW);
-  
+
   glVertexAttribPointer(vertLoc, 3, GL_FLOAT, 0, sizeof(PackedVertex), BUFFER_OFFSET(offsetof(PackedVertex, x)));
   glVertexAttribPointer(loc, 2, GL_FLOAT, 0, sizeof(PackedVertex), BUFFER_OFFSET(offsetof(PackedVertex, u1)));
 
@@ -1695,9 +1695,9 @@ bool CLinuxRendererGL::RenderCapture(CRenderCapture* capture)
 
   // save current video rect
   CRect saveSize = m_destRect;
-  
+
   saveRotatedCoords();//backup current m_rotatedDestCoords
-      
+
   // new video rect is capture size
   m_destRect.SetRect(0, 0, (float)capture->GetWidth(), (float)capture->GetHeight());
   MarkDirty();
@@ -2623,7 +2623,7 @@ bool CLinuxRendererGL::Supports(ESCALINGMETHOD method)
         return g_advancedSettings.m_videoEnableHighQualityHwScalers;
     }
   }
- 
+
   return false;
 }
 
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h
index b2e3959a7c..e0f51db7ca 100644
--- a/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h
@@ -161,7 +161,7 @@ protected:
   int m_renderMethod;
   RenderQuality m_renderQuality;
   CRenderSystemGL *m_renderSystem;
-  
+
   // Raw data used by renderer
   int m_currentField;
   int m_reloadShaders;
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRenderer.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRenderer.cpp
index c69291ee6c..5ca5e1af44 100644
--- a/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRenderer.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRenderer.cpp
@@ -164,7 +164,7 @@ void CRenderer::Render(int idx)
 
     if(!o)
       continue;
- 
+
     render.push_back(o);
   }
 
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererDX.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererDX.cpp
index 4fd3d5044e..d514045db8 100644
--- a/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererDX.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererDX.cpp
@@ -83,7 +83,7 @@ COverlayQuadsDX::COverlayQuadsDX(ASS_Image* images, int width, int height)
   SQuads quads;
   if(!convert_quad(images, quads, width))
     return;
-  
+
   float u, v;
   if(!LoadTexture(quads.size_x
                 , quads.size_y
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererGL.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererGL.cpp
index 87c5e59c7c..d1e401d009 100644
--- a/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererGL.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererGL.cpp
@@ -152,7 +152,7 @@ static void LoadTexture(GLenum target
 #endif
 
   free(pixelVector);
-  
+
   *u = (GLfloat)width  / width2;
   *v = (GLfloat)height / height2;
 }
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/ConversionMatrix.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/ConversionMatrix.cpp
index 60071452e1..0ca6b180ae 100644
--- a/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/ConversionMatrix.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/ConversionMatrix.cpp
@@ -357,7 +357,7 @@ void CConvertMatrix::SetColParams(AVColorSpace colSpace, int bits, bool limited,
       m_srcTextureBits == textuteBits &&
       m_pMat)
     return;
-  
+
   m_colSpace = colSpace;
   m_srcBits = bits;
   m_limitedSrc = limited;
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/ConversionMatrix.h b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/ConversionMatrix.h
index e15487873c..e6a842349d 100644
--- a/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/ConversionMatrix.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/ConversionMatrix.h
@@ -125,7 +125,7 @@ public:
   float GetGammaDst();
 
   static bool GetRGBYuvCoefs(AVColorSpace colspace, float (&coefs)[3]);
-  
+
 protected:
   void GenMat();
 
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/VideoFilterShaderGL.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/VideoFilterShaderGL.cpp
index bbe07e934a..d4069f1148 100644
--- a/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/VideoFilterShaderGL.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/VideoFilterShaderGL.cpp
@@ -84,7 +84,7 @@ ConvolutionFilterShader::ConvolutionFilterShader(ESCALINGMETHOD method, bool str
     else
       m_internalformat = GL_RGBA;
   }
-  else if (m_method == VS_SCALINGMETHOD_SPLINE36 || 
+  else if (m_method == VS_SCALINGMETHOD_SPLINE36 ||
            m_method == VS_SCALINGMETHOD_LANCZOS3)
   {
     shadername = "gl_convolution-6x6.glsl";
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/WinVideoFilter.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/WinVideoFilter.cpp
index 9bcb521a3e..e5a21c1d9b 100644
--- a/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/WinVideoFilter.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/WinVideoFilter.cpp
@@ -199,9 +199,9 @@ void COutputShader::ApplyEffectParameters(CD3DEffect &effect, unsigned sourceWid
   }
   if (m_useDithering)
   {
-    float ditherParams[3] = 
-    { 
-      static_cast<float>(sourceWidth) / dither_size, 
+    float ditherParams[3] =
+    {
+      static_cast<float>(sourceWidth) / dither_size,
       static_cast<float>(sourceHeight) / dither_size,
       static_cast<float>(1 << m_ditherDepth) - 1.0f
     };
@@ -574,7 +574,7 @@ CYUV2RGBShader::~CYUV2RGBShader()
 void CYUV2RGBShader::PrepareParameters(CRenderBuffer* videoBuffer, CRect sourceRect, CPoint dest[])
 {
   if (m_sourceRect != sourceRect
-    || m_dest[0] != dest[0] || m_dest[1] != dest[1] 
+    || m_dest[0] != dest[0] || m_dest[1] != dest[1]
     || m_dest[2] != dest[2] || m_dest[3] != dest[3]
     || videoBuffer->GetWidth() != m_sourceWidth
     || videoBuffer->GetHeight() != m_sourceHeight)
@@ -641,7 +641,7 @@ void CYUV2RGBShader::SetShaderParameters(CRenderBuffer* videoBuffer)
   m_effect.SetResources("g_Texture", ppSRView, videoBuffer->GetActivePlanes());
   m_effect.SetFloatArray("g_StepXY", m_texSteps, ARRAY_SIZE(m_texSteps));
 
-  float yuvMat[4][4]; 
+  float yuvMat[4][4];
   m_pConvMatrix->GetYuvMat(yuvMat);
   m_effect.SetMatrix("g_ColorMatrix", reinterpret_cast<float*>(yuvMat));
 
@@ -802,7 +802,7 @@ bool CConvolutionShader1Pass::Create(ESCALINGMETHOD method, COutputShader *pCLUT
 void CConvolutionShader1Pass::Render(CD3DTexture &sourceTexture,
                                      unsigned int sourceWidth, unsigned int sourceHeight,
                                      unsigned int destWidth, unsigned int destHeight,
-                                     CRect sourceRect, CRect destRect, bool useLimitRange, 
+                                     CRect sourceRect, CRect destRect, bool useLimitRange,
                                      CD3DTexture *target)
 {
   PrepareParameters(sourceWidth, sourceHeight, sourceRect, destRect);
@@ -957,11 +957,11 @@ void CConvolutionShaderSeparable::Render(CD3DTexture &sourceTexture,
     CreateIntermediateRenderTarget(destWidth, sourceHeight);
 
   PrepareParameters(sourceWidth, sourceHeight, destWidth, destHeight, sourceRect, destRect);
-  float texSteps[] = 
-  { 
-    1.0f / static_cast<float>(sourceWidth), 
-    1.0f / static_cast<float>(sourceHeight), 
-    1.0f / static_cast<float>(destWidth), 
+  float texSteps[] =
+  {
+    1.0f / static_cast<float>(sourceWidth),
+    1.0f / static_cast<float>(sourceHeight),
+    1.0f / static_cast<float>(destWidth),
     1.0f / static_cast<float>(sourceHeight)
   };
   SetShaderParameters(sourceTexture, texSteps, 4, useLimitRange);
@@ -1049,7 +1049,7 @@ void CConvolutionShaderSeparable::PrepareParameters(unsigned int sourceWidth, un
     // Horizontal dimension: crop/zoom, so that it is completely done with the convolution shader. Scaling to display width in pass1 and
     // cropping/zooming in pass 2 would use bilinear in pass2, which we don't want.
     // Vertical dimension: crop using sourceRect to save memory bandwidth for high zoom values, but don't stretch/shrink in any way in this pass.
-    
+
     v[0].x = 0;
     v[0].y = 0;
     v[0].z = 0;
@@ -1110,8 +1110,8 @@ void CConvolutionShaderSeparable::SetShaderParameters(CD3DTexture &sourceTexture
   m_effect.SetTexture( "g_Texture",  sourceTexture );
   m_effect.SetTexture( "g_KernelTexture", m_HQKernelTexture );
   m_effect.SetFloatArray("g_StepXY", texSteps, texStepsCount);
-  float colorRange[2] = 
-  { 
+  float colorRange[2] =
+  {
     (useLimitRange ?  16.f / 255.f : 0.f),
     (useLimitRange ? 219.f / 255.f : 1.f)
   };
@@ -1125,7 +1125,7 @@ void CConvolutionShaderSeparable::SetStepParams(UINT iPass)
   ID3D11DeviceContext* pContext = DX::DeviceResources::Get()->GetD3DContext();
 
   CD3D11_VIEWPORT viewPort = CD3D11_VIEWPORT(
-    0.0f, 
+    0.0f,
     0.0f,
     static_cast<float>(m_target->GetWidth()),
     static_cast<float>(m_target->GetHeight()));
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/WinVideoFilter.h b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/WinVideoFilter.h
index 67016674e1..10c3b87b45 100644
--- a/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/WinVideoFilter.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/WinVideoFilter.h
@@ -96,7 +96,7 @@ private:
   unsigned m_sourceWidth{ 0 };
   unsigned m_sourceHeight{ 0 };
   CRect m_sourceRect{ 0.f, 0.f, 0.f, 0.f };
-  CPoint m_destPoints[4] = 
+  CPoint m_destPoints[4] =
   {
     { 0.f, 0.f },
     { 0.f, 0.f },
@@ -161,11 +161,11 @@ public:
   virtual void Render(CD3DTexture &sourceTexture,
                       unsigned int sourceWidth, unsigned int sourceHeight,
                       unsigned int destWidth, unsigned int destHeight,
-                      CRect sourceRect, CRect destRect, bool useLimitRange, 
+                      CRect sourceRect, CRect destRect, bool useLimitRange,
                       CD3DTexture *target) = 0;
   CConvolutionShader();
   virtual ~CConvolutionShader();
-  
+
 protected:
   virtual bool ChooseKernelD3DFormat();
   virtual bool CreateHQKernel(ESCALINGMETHOD method);
@@ -190,14 +190,14 @@ public:
   void Render(CD3DTexture &sourceTexture,
               unsigned int sourceWidth, unsigned int sourceHeight,
               unsigned int destWidth, unsigned int destHeight,
-              CRect sourceRect, CRect destRect, bool useLimitRange, 
+              CRect sourceRect, CRect destRect, bool useLimitRange,
               CD3DTexture *target) override;
   CConvolutionShader1Pass() : CConvolutionShader(), m_sourceWidth(0), m_sourceHeight(0) {}
 
 protected:
   void PrepareParameters(unsigned int sourceWidth, unsigned int sourceHeight,
                          CRect sourceRect, CRect destRect);
-  void SetShaderParameters(CD3DTexture &sourceTexture, float* texSteps, 
+  void SetShaderParameters(CD3DTexture &sourceTexture, float* texSteps,
                            int texStepsCount, bool useLimitRange) override;
 
 
@@ -225,7 +225,7 @@ protected:
   void PrepareParameters(unsigned int sourceWidth, unsigned int sourceHeight,
                          unsigned int destWidth, unsigned int destHeight,
                          CRect sourceRect, CRect destRect);
-  void SetShaderParameters(CD3DTexture &sourceTexture, float* texSteps, 
+  void SetShaderParameters(CD3DTexture &sourceTexture, float* texSteps,
                            int texStepsCount, bool useLimitRange) override;
   void SetStepParams(UINT stepIndex) override;
 
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/dither.h b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/dither.h
index c7b722020f..dc2cf1d935 100644
--- a/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/dither.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/dither.h
@@ -7,68 +7,68 @@
 static const int dither_size = 64;
 static const int dither_size2 = 4096;
 static const uint16_t dither_matrix[] = {
-	   3, 2603,  743, 2361,  199, 2711,  806, 3181, 2113, 3820,  988, 3485, 1560, 2650,  327, 3063, 1660, 3340,  356, 1055, 2218, 2796, 3278,  528, 2104, 2909, 1465, 4076,  911, 3358, 1586, 3039,   41, 4038,  690, 3493,  155, 3754,  636, 3403,  271, 1355, 2973, 1816, 1287, 3908, 1095, 2549, 4086,  984, 3452,  357, 3560, 1662,   39, 1362, 2954, 1538,  552, 2823, 1871,  319, 2964,  792, 
-	3590, 1799, 4095, 1197, 3302, 2009, 3974, 1602,  475, 1433, 2801, 2059,  551, 4067, 1916,  914, 3887, 1308, 2969, 1817, 3780,  790, 1262, 1828, 3421,  802, 2454,  126, 3006, 2212,  536, 2513, 1029, 2142, 2920, 1641, 3178, 1902, 2848,  966, 2579, 3567, 2252,  142, 2798,  388, 3014, 2005,  216, 2285, 1583, 2994, 1091, 2813, 2002, 3712,  856, 4069, 2292, 1256, 3682, 2405, 1359, 3225, 
-	1046, 2855,  404, 2646, 1698,  545, 1138, 2982, 1985, 3610,  133, 3256, 1794,  971, 3167, 2251,  483, 2613,  668, 3468,   75, 3156, 2398, 3838,  201, 2690, 1060, 3599, 1820, 1168, 3890, 1743, 3564, 1487,  372, 2617, 1078,  462, 2193, 3915, 1659,  567, 1123, 3806, 1897, 3623,  849, 1483, 3513, 2857,  777, 2164, 3993,  584, 3338,  461, 2748, 1806,  206, 3264,  729, 1993, 3925,  492, 
-	2269, 1508, 3497,  927, 3743, 2109, 3469,  248, 2697, 1041, 2404, 1260, 3741, 2162,   52, 3526, 1214, 3722, 2085, 1449, 2557, 1938,  442, 1418, 2987, 1612, 3232, 2139,  654, 2884,  245, 2754,  621, 3060, 3858, 1341, 3698, 2948, 1436,   64, 3194, 2025, 3092, 1506,  595, 2216, 3252, 2632,  484, 1239, 3625,  122, 1864, 2589, 1475, 2360, 1195, 3588, 2536, 1010, 2890,  110, 2628, 1735, 
-	3110,  217, 1939, 2913,  101, 2483, 1274, 3124, 1636, 3791,  810, 3049,  417, 2828, 1416, 2515, 1992,  219, 3088,  844, 3343, 1171, 3632, 2201,  637, 3939,  354, 1330, 3800, 1943, 3284, 1390, 2347,  947, 2047,  200, 2128,  739, 3511, 2707, 1177, 4051,  336, 2501, 3472, 1316,   17, 2087, 3801, 1892, 2466, 1409, 3241, 1031, 3844,  152, 3123,  631, 1485, 3835, 1664, 3396, 1181, 3569, 
-	 890, 3790, 2353, 1098, 3229,  820, 3910,  448, 2319,  579, 2618, 1903, 3502,  873, 3988,  585, 3015, 1639, 2261, 4055,  292, 2809,  894, 3168, 1959,  995, 2627, 3128, 2282,  506, 1050, 3986,  125, 3537, 2804, 1533, 3291, 2523, 1860,  539, 2328,  829, 2866, 1965,  941, 2718, 4021, 1444,  877, 3210,  695, 3755,  391, 2980,  839, 3378, 1739, 2217, 3031,  351, 2334,  760, 2468,  413, 
-	2833, 1382,  553, 4013, 1886, 2660, 1512, 2092, 3541, 1391, 3950,  202, 1543, 2705, 1734, 3312,  990, 3765,  607, 1317, 2458, 1813, 3906,  134, 2390, 3415, 1671,   38, 1218, 3668, 2535, 1552, 2657, 1883,  518, 4094, 1028,  304, 3884, 1303, 3557, 1680, 3406,  203, 3717, 1854,  422, 2304, 2944,  249, 2651, 1757, 2297, 1576, 2706, 2014,  524, 3970, 1139, 2063, 3639, 1417, 4053, 1763, 
-	2150, 3450, 2616, 1247,  334, 3355,  650, 2955,   20, 3187,  885, 2178, 3352,  507, 2351,  162, 2735, 1492, 3254, 2030, 3544,  565, 1575, 2921, 1376,  547, 4037, 2017, 3337, 1730,  287, 3247,  660, 3048, 1201, 2383, 1935, 3138, 1594, 2902,  132, 2758, 1358, 2279,  763, 3203, 1574, 3527, 1157, 3938,  958, 3383, 1130, 4012,  234, 3545, 1335, 2558,   27, 3206,  651, 2949,  209, 3170, 
-	 977,   50, 1647, 3087, 2189, 1733, 3768, 1331, 2012, 2470, 1484, 2999,  979, 3863, 1288, 3603, 2147,  447, 2876,    6, 1122, 2673, 3368,  837, 3769, 2529,  965, 2699,  575, 2914, 2149,  954, 3693, 1635, 3441,   11, 3725,  780, 2425,  953, 3797, 2171,  677, 3957, 2587, 1108, 2849,  656, 2129, 1650, 2881,   63, 2612,  735, 2348,  951, 3106, 1614, 3490, 1834, 1223, 2597, 1523, 2306, 
-	3851, 1983, 3714,  599, 3524,  179, 2408,  904, 4050,  688, 3427,  369, 2671, 1994, 2931,  645, 1686, 3931, 1221, 2553, 3842, 2071,  305, 2276, 1829,  221, 3227, 1452, 3552, 1096, 3956, 1472, 2438,  335, 2187, 2889, 1428, 2746,  415, 3224, 1851, 1086, 2957,  350, 1764, 3393,  116, 2516, 3662,  398, 2209, 3716, 1310, 3464, 1480, 3762,  381, 2853,  772, 2374, 3943,  487, 3542,  616, 
-	1302, 2963,  925, 2731, 1148, 2869, 1414, 3026,  310, 2740, 1744, 3699, 1573,   76, 1126, 3300, 2493,  878, 3438, 1849,  785, 1478, 3653, 2765, 1085, 3605, 2246,  383, 1878, 2479,  106, 2841,  801, 3901, 1842,  610, 3518, 1104, 3996, 2270,  549, 3492, 2105, 3640,  931, 2224, 3916, 1866,  816, 3193, 1024, 1845, 3161,  502, 2990, 1942, 2475, 1035, 3673,  243, 1977, 3097, 1679, 2121, 
-	3318,  363, 2287, 1590, 3989,  500, 3453, 1796, 3659, 1240, 2331,  834, 3115, 2537, 4070, 2050,  212, 3079, 2267,  371, 2834, 3223, 1270,  527, 3130, 2052,  938, 2757, 3775,  740, 3471, 1656, 3281, 1062, 3102, 1349, 2512, 2090,  173, 1577, 3100, 1412,   40, 1931, 3152,  520, 1253, 2906, 1467, 2366, 4081,  254, 2089, 2522, 1174,  123, 4040, 2205, 1557, 3196, 1076, 2686,  103, 3920, 
-	 850, 2585, 3651,  147, 1909, 2562,  989, 2275,  761, 3235,  186, 3852, 1212, 1888,  603, 1399, 3749, 1561,  711, 3969, 2138,  158, 1997, 4079, 1615,   65, 3913, 1778, 1301, 3072, 2083,  394, 2599, 1990,  154, 3818,  480, 3351, 1827, 3665,  853, 2734, 4066, 1128, 2538, 1619, 3257,  192, 3606,  557, 1625, 2793,  867, 3894, 1791, 3366, 1384,  472, 2779,  843, 3802, 1332, 2434, 1453, 
-	2867, 1807, 1198, 2181, 3244, 1311, 3823,   81, 2649, 1381, 2776, 2046,  449, 3574, 2161, 3237, 1067, 2118, 2996, 1700, 1044, 3696, 2654,  759, 2455, 2966,  707, 3157,  256, 2362,  920, 4058,  671, 3601, 2263, 1528, 2976,  922, 2630,  373, 2432, 1971,  580, 3385,  289, 3770, 1960, 2598,  992, 2160, 3069, 1131, 3240,  370, 2745,  899, 3036, 1863, 3575, 2268,  399, 2953,  724, 3270, 
-	 314, 3516,  658, 3795,  412, 2997,  809, 3349, 1771, 3999,  702, 3449, 1657, 2621,  280, 2795,  512, 3615,   66, 2531, 3420,  477, 1568, 3357, 1250, 2100, 3508, 1001, 2006, 3727, 1397, 2988, 1812, 1135, 2800,  812, 1922, 3587, 1395, 3935, 1167, 3055, 1554, 2231, 2858, 1203,  773, 3964, 1703, 3433,    5, 3812, 1918, 2393, 1457, 3778,  664, 2569,   53, 1468, 3387, 1727, 4077, 2222, 
-	1037, 1966, 3089, 1367, 2762, 1694, 2355, 1087, 2837,  328, 2373, 1286, 3126,  961, 3928, 1746, 2430, 1230, 3177,  857, 1435, 2888, 2198,  264, 3777,  456, 1539, 2578, 3371,  592, 2655,   36, 2173, 3345,  297, 4010, 2397,   73, 2832,  661, 3310,  168, 3830,  691, 1420, 3547, 2305,  387, 2912,  742, 2643, 1544,  614, 3619,  164, 2172, 3316, 1259, 3978, 2042,  613, 2743,  210, 1413, 
-	3680, 2637,   13, 2316,  709, 4059,  220, 3670, 1569, 3285,  903, 3786,   31, 2293, 1354, 3342,  738, 4033, 2221, 1877, 3879,  728, 3246, 1926, 1141, 2821, 4006,  156, 1193, 1907, 3231, 1507, 3753,  948, 3083, 1667,  718, 3142, 1780, 2278, 1338, 2747, 1716, 3139, 2136,   94, 3085, 1978, 1356, 3723, 1065, 2101, 3008, 1300, 2831, 1899,  455, 3113,  939, 2898, 3608, 1097, 2126, 3147, 
-	 532, 1527, 3911, 1769, 3322, 1296, 2656, 2078,  563, 2000, 2586, 1714, 2926,  782, 2677,  181, 2938, 1535,  396, 2840,  197, 2435, 1032, 3626, 2542,  653, 2235, 1800, 2875, 3872,  353, 2456,  644, 2606, 1351, 2132, 3514, 1100, 3857,  324, 3451,  796, 2526,  419, 3747, 1766,  981, 3362, 2400,  187, 2728, 4023,  416, 3499,  881, 3849, 1521, 2431, 1841,  333, 2299, 1567, 3831,  964, 
-	2402, 3411, 1068, 2543,  340, 3109,  907, 3460, 1372, 3942,  259, 3408, 1103, 3631, 1632, 3813, 1049, 2043, 3581, 1344, 3332, 1604, 2983,   21, 1663, 3305, 1272, 3664,  519, 2208, 1048, 3555, 2029, 3949,  465, 2896,  228, 2623, 1579, 2478, 1450, 4045, 1147, 3326,  909, 2573, 4003,  513, 1249, 3532, 1775,  910, 2340, 1717, 2610,  624, 3391,  194, 3912, 2704,  765, 3243,  108, 2919, 
-	1689,  291, 2959,  826, 3779, 1626, 2250,   74, 2694,  847, 3013, 1460, 2401,  382, 2864,  627, 2463, 3140,  797, 2666,  515, 3990,  824, 2156, 3846,  341, 2911,  932, 2723, 1638, 3080, 1387,  149, 1748, 3266, 1202, 3711,  942, 3248,  744, 2970,   24, 2344, 1910, 2977,  232, 2107, 2892, 1850, 3047,  343, 2037, 3402,   85, 3220, 1278, 2200, 2854,  905, 1430, 3746, 1975, 2506,  686, 
-	3997, 2247, 1255, 3484, 2152,  544, 3034, 3870, 1520, 3528, 2180,  606, 4090, 1781, 2123, 3354, 1591,   80, 3767, 1955, 1245, 2363, 1750, 3165, 1089, 2472, 1566, 3455,   83, 4085,  692, 2685, 3475, 2356,  741, 2769, 1693, 2314,  395, 3637, 2070, 1658, 3467,  481, 1407, 3660, 1531,  753, 3819, 1047, 2532, 3902, 1161, 2491, 1621, 4065,  433, 1676, 3573, 2226,  490, 1189, 3091, 1790, 
-	 944, 3309, 1920,  135, 1440, 2799, 1859, 1115, 2427,  443, 1847, 2816,  993, 3041,  238, 1199, 3981, 2254,  949, 2900, 3456,  237, 3658,  548, 1961, 3024,  708, 2313, 1976, 1178, 3301, 2084,  556, 1321, 3880, 2015,   90, 4016, 1914, 2680,  970, 3118, 1194, 3930, 2508,  937, 3282, 2439,   57, 2777, 1578,  510, 3127,  769, 2939,  957, 2041, 3238,   28, 3019, 1890, 3389,  263, 3676, 
-	2076,  474, 3067, 2450, 4043,  800, 3556,  250, 3365, 1306, 3841,  107, 3419, 1410, 3570, 2197,  499, 3093, 1831,  425, 1550, 2652,  924, 2414, 4030,  190, 3546, 1007, 3708, 2645,  290, 1607, 3728, 2591,  358, 3205, 1162, 2863, 1346,  633, 3874,  279, 2766,  766, 2082, 3025,  438, 1946, 3629,  808, 3473, 2307, 1343, 3796,  265, 2415, 3729, 1323, 2473,  793, 3836, 1350, 2782, 1070, 
-	2624, 3860,  864, 1741,  437, 3098,  985, 2607, 1934, 2933,  828, 2703, 1889,  466, 2572, 1493, 2794, 1136, 3643, 2056, 3914, 1172, 3412, 1826, 1327, 3146, 1651, 2530,  440, 1486, 3073, 2242, 1033, 1815, 2972, 1515, 3463,  489, 2469, 3347, 1454, 2311, 1726, 3197,  124, 1622, 4091, 1156, 2170, 2946, 1835,  167, 2700, 1968, 3320, 1227,  469, 3121, 1018, 2727, 1761,  428, 1969, 3265, 
-	  60, 1524, 2301, 3593, 2683, 1269, 2207, 3891,  593, 1564, 3633, 1176, 2375, 3745,  967, 3904,  752, 3313,  180, 2452,  701, 2820,   59, 2923,  467, 2163,  866, 3941, 1898, 3392,  657, 3991,    2, 3592,  831, 2378,  982, 3798, 2099,  140, 3062,  876, 3737, 1279, 3548, 2376,  725, 3344,  301, 1318, 3961, 1107, 3562,  578, 1517, 2861, 2184, 1643, 3922,  193, 3479, 2309, 4088,  840, 
-	2487, 3498, 1235,  272, 2031, 3707,   33, 1394, 3148, 2120,  225, 3290,  731, 2044, 3208,    8, 2349, 1691, 2715, 1371, 3162, 1631, 2233, 3821, 1079, 3481, 2806,  112, 2929, 1054, 2420, 1446, 2847, 1933, 3180,  223, 2736, 1879, 1211, 3582, 1773, 2441,  424, 2648,  588, 1927, 2788, 1500, 3117, 2447,  602, 2880, 2190, 1856, 4015,   96, 3628,  604, 1913, 2882, 1319,  628, 1466, 3027, 
-	1688,  564, 2732, 3236,  715, 1613, 3306, 2273,  430, 3980, 2548, 1627, 2865,  348, 1722, 2958, 1309, 3690,  860, 4072,  397, 3561,  634, 1438, 2674, 1870,  663, 2377, 1295, 3825,  274, 3487, 1173,  550, 2169, 4060,  756, 3263,  367, 2611,  623, 4032, 2067, 3356, 1064, 3885,  178, 3645,  818, 1809, 3377, 1456,  375, 3137,  859, 2682, 1073, 3400, 2437,  913, 3242, 2604, 3638,  325, 
-	2206, 3898, 1982, 1084, 4018, 2521, 1020, 2856, 1832, 1234,  886, 3480, 1277, 4046, 2215, 1045, 3428,  283, 3021, 2027, 1284, 2642, 1912, 3262,  257, 3917, 1601, 3595, 2065,  716, 3212, 1633, 2687, 3703, 1021, 1674, 3029, 1378, 3896, 1609, 3018, 1365,   43, 1708, 2829, 1553, 2514, 1266, 2300, 3829,   14, 2525, 3720, 1292, 2380, 1718, 3050, 1464,  303, 3994, 2055,  114, 1923, 1142, 
-	3184, 1353,  145, 3001, 2102,  313, 3517,  679, 3685, 2016, 2915,   95, 2459,  641, 3163,  454, 2600, 1767, 2277,  586, 3444,  163, 3764,  962, 2429, 1140, 3191,  320, 2981, 1753, 2564,  845, 2054,  307, 3304, 2232,   79, 2659,  827, 2294, 1026, 3489, 2560, 3804,  361, 3287,  687, 3053,  408, 1375, 2985, 1774,  778, 3272,  262, 3900,  517, 2103, 3151,  726, 1565, 3759, 2502, 3520, 
-	 784, 2324, 3740, 1758,  955, 3131, 1546, 2413,  195, 3211,  786, 3757, 1785, 3535, 1434, 2049, 3882, 1124, 3735, 1459, 2554, 2079, 1505, 3040,  751, 2752, 1419, 2329,  972, 3736,  131, 3104, 3973, 1290, 2770,  672, 3448, 1762, 3694,  231, 3222,  521, 1963,  855, 2326, 1160, 3979, 1697, 3509, 2066,  617, 4052, 2290, 1600, 2810, 1158, 2570, 3549,  998, 2288, 2993, 1237,  503, 1777, 
-	2860,  414, 2726,  570, 3649, 2256,  841, 3862, 1322, 2561, 1652, 2280, 1069, 2583,  170, 2886,  673, 2443,   68, 3334,  734, 3953,  364, 2214, 3677,   32, 4063,  573, 3279, 1469, 2407, 1911,  511, 2343, 1504, 3807, 1053, 2381, 1297, 2785, 1653, 2417, 3646, 1445, 3169, 1996,  113, 2771,  999, 2546, 3253, 1188,  153, 3641,  591, 3414, 1900,   46, 1782, 3814,  240, 2196, 3417,  969, 
-	4047, 2114, 1481, 3381, 1952,   87, 2952, 2053, 3360,  589, 4022,  337, 3380,  833, 3960, 1603, 3293,  963, 3046, 1981, 2802,  991, 3174, 1824, 1164, 3132, 1620, 2676, 2081,  378, 3883, 1094, 2960, 3580,  174, 2034, 2878,  379, 3315,  612, 3983, 1238,  160, 2842,  562, 3404, 2399,  798, 3731,  269, 1562, 2907, 1973, 2631, 1403, 2320,  926, 3683, 2764, 1133, 3195, 1443, 2667, 1872, 
-	   0, 3099, 1027, 2462, 1191, 3982, 1617,  365, 1118, 3077, 1389, 2713, 1811, 2995, 2127,  482, 2011, 3598, 1655,  470, 1369, 3565, 2332,  649, 2850, 1930,  794, 3572, 1120, 3394,  887, 2609, 1587,  733, 1846, 3228,  836, 3888, 2010, 2688,  945, 2956, 2143, 1677, 3704, 1282, 1855, 2968, 1431, 2308, 3919,  453, 3386,  720, 3972,  345, 3221, 2001,  431, 2426,  667, 3893,  377, 3617, 
-	2039,  746, 3832,  296, 3286,  615, 2357, 3613, 1940, 2262,   37, 3578,  568, 1326, 3721, 1153, 2789,  270, 2541, 4035, 2203,  146, 1534, 3375,  306, 3871, 2186,  214, 2556, 1893, 3071,   56, 3350, 2074, 4089, 1186, 2626, 1491,   19, 1713, 3470,  390, 3803,  722, 2566,  299, 4075,  497, 3437, 1102, 1802, 2580, 1144, 1862, 2852, 1580, 2485, 1271, 4073, 1729, 2870, 1222, 2339,  872, 
-	3297, 2551, 1294, 2897, 1737, 2719, 1313, 3042,  771, 3810, 1490, 2411, 1949, 2664,  130, 3116, 1494, 3787, 1246,  598, 3260, 1848, 3773, 1112, 2480,  946, 2941, 1532, 4009,  611, 1682, 3824, 1226, 2729,  285, 3028,  534, 3531, 2509, 3150, 1265, 2385, 1405, 3329, 1768, 3108, 1190, 1987, 2724,   54, 3577,  842, 3808, 2219,  119, 3751,  700, 2986,  884, 3482,  100, 3215, 1408, 2759, 
-	1593,  478, 3558, 2062,  817, 3734,  207, 1797, 2581,  468, 3158,  815, 3945,  980, 3486, 2259,  770, 1788, 3185, 2370, 1030, 2903,  748, 2708, 1805, 3602,  530, 3218, 1248, 2238, 2894,  486, 2396,  851, 3622, 1666, 2354, 1137, 1947,  712, 4031,  902, 3009,   78, 2317,  803, 3533, 2486,  879, 3143, 2115, 3017,  317, 3209, 1244, 2058, 3407,  253, 2266, 1526, 2517,  767, 3657,  196, 
-	4011, 1861, 2346,  109, 3086, 1011, 2112, 4061, 1229, 3447, 1683, 2767,  282, 2891, 1843,  494, 3372, 2639,   16, 1951, 3705,  312, 2068, 4002,   70, 1455, 2756, 2003,  157, 3454, 1117, 3687, 1366, 3207, 2144,  674, 3869,  182, 3671, 2188,  277, 2684, 1598, 3881, 1061, 2822,  198, 1616, 3760, 1393,  569, 1673, 2712, 1522, 3591,  861, 2575, 1752, 3288, 1025, 3948, 1814, 2134, 3038, 
-	 933, 3239, 1213, 3897, 1582, 2423, 3182,  626, 2681,  136, 2327, 1127, 3612, 2179, 1182, 4093, 2095,  935, 3895,  697, 2528, 1597, 3033, 1152, 2359, 3325, 1016, 3799, 1756, 2593,  342, 2008, 2817,  121, 1497, 3280, 1760, 2786, 1285, 3084, 1732, 3597,  576, 1917, 3426, 1357, 3940, 2091,  376, 3335, 2013, 3877,  819, 2440,  401, 3070, 1345, 3866,  541, 2797,  288, 3333,  574, 1529, 
-	2457,  405, 2846,  659, 3395,  346, 1184, 3483, 1595, 3853,  901, 3275, 1755,  680, 3056,  229, 1581, 2975, 1348, 3330, 1233, 3609,  485, 3435,  705, 2048,  322, 2461,  736, 3944, 1545, 3341,  936, 4017, 2614,  402, 2428,  776, 3348,  488, 2584, 1228, 2158, 3061,  318, 2391,  632, 3022, 2453, 1043, 2778,  141, 2961, 1175, 4044, 1919,   25, 2159, 3145, 1624, 2336, 1225, 2629, 3840, 
-	1106, 3501, 2148, 1479, 2641, 1830, 2922, 1998,  504, 2096, 3005,  432, 2488, 3826, 1402, 2448, 3692,  366, 2225, 2772,  175, 2140, 2826, 1334, 2608, 3739, 1571, 3495, 2108, 1232, 2678,  559, 2325, 1905, 1145, 3503, 1360, 3955, 2124,  994, 3855,  151, 3370, 1013, 2737, 1709, 3630, 1462,  783, 4020, 1801, 1307, 3689, 2274,  629, 2670, 3538,  787, 1289, 3585,  917, 3742, 1684,   51, 
-	3002, 1712,  218, 3642,  749, 3954,   26, 3600, 1000, 2721, 1361, 3656, 1210,   58, 3153,  640, 1974, 3213,  898, 1819, 4026,  928, 1779, 3839,  139, 1056, 2989,  525, 3234,   10, 3553, 1648, 3792,  258, 3101,  699, 2838,   49, 1474, 2945, 1772, 2412, 1547, 4062,  822, 3245,    7, 2035, 3135,  298, 3384, 2192,  498, 1838, 3364, 1038, 1556, 3023, 2444,  177, 2716,  501, 2905, 2061, 
-	 883, 4084, 2602, 1200, 2386, 1392, 2812, 2248, 1728, 4027,  242, 1875, 2873, 2166, 1644, 3554, 1080, 2524, 3772,  505, 2369, 3160,  434, 2286, 3192, 1882, 2392, 1363, 2720, 1970, 1003, 2918,  895, 2763, 2106, 3730, 1585, 2379, 3589,  418, 3259,  669, 2773,  352, 2291, 1092, 2691, 3724, 1170, 2661,  952, 2862, 1518, 3043,  222, 2518, 3905,  360, 1692, 4019, 1936, 3432,  973, 3258, 
-	2245,  555, 1925, 3074,  444, 3319, 1066,  392, 3204,  813, 2358, 3461,  865, 3976,  458, 2644, 1839,  127, 1514, 2917, 1163, 2028, 3519, 1220,  642, 4068,  278, 3604,  605, 3975, 2503,  406, 3359, 1793, 1264,  471, 3328, 1059, 1921, 2672, 1254, 3794, 1364, 3621, 1789, 3488, 1563,  652, 2337, 1695, 3822,   82, 3465, 1231, 3672, 2045,  940, 2223, 3120,  685, 1320, 2367, 1784,  326, 
-	3766, 1519, 3424,  923, 3706, 1867, 2155, 3783, 1451, 2937, 1608,  543, 2596, 1477, 3336,  960, 3899, 2032, 3425,  863, 3661,   44, 1589, 2893, 2135, 1511, 3064, 1759, 2310, 1293, 1833, 3761, 2227,  102, 4078, 2033, 2702,  239, 3984,  732, 2228,   98, 2992,  713, 2590,  233, 2433, 3992,  384, 2965,  755, 2477, 1881,  681, 2775,  529, 1804, 3373, 1155, 2550, 3793,  148, 3507, 2693, 
-	1057, 2924,   93, 2714, 1588,  204, 2971,  694, 2544,  104, 3892, 1958, 3250,  189, 2130, 3003,  355, 3122,  648, 2582, 1740, 2213, 3932,  331, 3331,  891, 2533,  781, 3176,  185, 3004,  721, 1180, 3125, 2333,  908, 1654, 3096, 1421, 3431, 2825, 1736, 2125, 3339, 1423, 3058,  805, 1932, 3226, 1386, 3571, 1105, 4092, 2167, 1548, 3771, 2899,   69, 3607,  464, 1724, 3045, 1204, 1964, 
-	2389,  706, 3971, 1132, 2449, 3859, 1166, 3369, 1280, 3476,  930, 2422, 1268, 3718,  745, 1705, 2717, 1379, 2271, 3847,  450, 2814, 1022, 2692, 1315, 3647,   89, 3845, 1052, 3536, 1584, 2157, 3652, 1510,  682, 2868, 3624,  538, 2489, 1006,  362, 3876, 1051,  435, 3774, 1146, 3543, 1005, 2237,  191, 2023, 2636,  410, 3200,  183, 2321,  889, 2133, 1488, 2874, 2234,  643, 4041,  389, 
-	3594, 1642, 2094, 3295,  523, 2040, 2675,  359, 2295, 1853, 3051,  316, 2824, 1002, 2500, 4071, 1114, 3529,  211, 1304, 3075, 1441, 3382,  693, 2387, 1665, 2901, 1263, 2445, 1915,  581, 3308,  329, 2481, 3834,  188, 2165, 1217, 3750, 1876, 3283, 1470, 2725, 2281, 1702, 2815,   77, 2594, 3929, 1629, 3324,  906, 2940, 1267, 3523, 1388, 4008, 2662,  762, 3702, 1063, 2749, 1525, 3159, 
-	 852, 2998,  261, 2739, 1822,  976, 3550, 1672, 4057,  554, 1374, 3828, 1894, 3202,    4, 2220,  572, 1884, 3198, 2119,  723, 3618,  176, 2036, 3968,  427, 2183, 3401,  368, 4036, 2871, 1324, 2709, 1880, 1072, 3149, 1723, 2811,   23, 2394,  757, 2984,  159, 3966,  582, 2093, 3268, 1463,  618, 2859,  463, 3715, 1725, 2283,  655, 3068,  386, 1675, 3011,  266, 1986, 3410,   12, 2073, 
-	2474, 1216, 3732,  900, 3924, 2364,   47, 2830,  871, 2605, 3255, 2191,  597, 1610, 3443, 1406, 3655, 2555,  875, 3995, 1570, 2471, 1731, 3000,  804, 3230,  975, 1798, 2620,  897, 2211,   48, 3923,  835, 3446, 2257,  583, 3311, 1549, 4054, 2098, 1273, 3405, 1967, 1340, 3663,  862, 2007, 3748, 1219, 1924, 2416,   30, 3861, 1165, 2467, 1929, 3379, 1121, 3952, 2567,  915, 1787, 3909, 
-	 509, 3442, 1501, 2563,  457, 1559, 3353, 1352, 3654, 2060,  150, 1125, 3579, 2574, 1039, 2962,  323, 1628, 3010,   88, 2753,  535, 3713, 1040, 2663, 1891, 3811,  213, 3616, 1429, 3439, 1715, 2117, 2932,  380, 1385, 3889, 1110, 2592,  608, 3094,  411, 2547,  807, 3119,  338, 2315, 3037,  224, 3398, 2710, 1017, 3103, 1516, 3292,  236, 3744,  719, 2382, 1555,  537, 3522, 2647, 1305, 
-	2774, 2024,  128, 3190, 1945, 2947,  646, 2510,  421, 1236, 3936, 2698, 1792,  284, 3756,  832, 2322, 3867, 1090, 2241, 3323, 1333, 2137, 3141,   22, 1299, 2803, 2080,  768, 2835,  452, 3066,  639, 1243, 3679, 2635, 2019,  321, 3627, 1312, 1989, 3726, 1489, 3551, 2122, 1605, 4064, 1081, 1770, 2204,  666, 3998, 1858,  540, 2111, 2668, 1427, 2936,   97, 3129, 1895, 2210,  241, 3719, 
-	1009, 3307, 1810,  934, 3634, 1119, 3959, 1719, 3445, 2916, 1599,  533, 3179, 2365, 1447, 2844, 1953,  526, 3430, 1887,  789, 3815,  347, 1513, 4082, 2460,  542, 3172, 1670, 2260, 3987, 1368, 3510, 2240, 1808,  115, 3035, 1618, 2146, 3361,  184, 2335,  662, 2783,   42, 2925,  596, 2571, 3596,  956, 2877,  295, 2552, 3494,  987, 3926,  893, 1840, 3667, 1241, 3856, 1083, 3216,  727, 
-	2342,  409, 4080, 2436,  300, 2741, 2185,  171, 2026,  683, 2230, 3738, 1339,  747, 4005,  138, 3219, 1502, 2565,  255, 3076, 1699, 2368, 3418,  638, 1747, 3500, 1113, 3763,  120, 1023, 2689,  252, 2792,  774, 4025, 1008, 3217,  791, 2665, 1150, 4004, 1837,  997, 3850, 1437, 3413, 1984,  129, 3171, 1606, 3688, 1206, 2244, 1803,  429, 3112, 2418,  811, 2696,  344, 2496, 1749, 2967, 
-	1377, 2839, 1099, 2077, 3271,  838, 1442, 3583, 2679, 1034, 3054,   62, 2069, 3267, 1852, 2519, 1205, 3695,  869, 4024, 2176, 1101, 2974,  918, 2151, 2843,  267, 2406, 1496, 2951, 2174, 1690, 3817, 1143, 3299, 1979, 2495,  476, 3868, 1498, 2979,  493, 3134, 2490, 1937,  445, 2350,  854, 3946, 1169, 2341,  775, 3007,   84, 2805, 3563, 2097,  215, 3294, 1640, 3477,  870, 4014,   71, 
-	3678, 1711, 3504,  670, 1623, 3864, 2883,  546, 1645, 4034, 1396, 3457, 2634,  473, 1015, 3559,  423, 2202, 2887, 1611,  558, 3374,  137, 1896, 3644, 1075, 3937,  825, 3458,  460, 3691,  590, 2075, 3081,  439, 1337, 3440, 1742, 2318,   67, 1954, 3491, 1401,  230, 3648, 2751, 1328, 3012, 1687, 2658,  374, 3314, 1704, 4074, 1448,  620, 1329, 3958, 1999,  560, 2088, 2791, 1257, 2284, 
-	 821, 2492,  227, 3057, 2540,   29, 1258, 2239, 3016,  273, 2424,  635, 1251, 3684, 2255, 1681, 3105, 1432,   45, 3506, 2619, 1261, 3886, 2484,  436, 3107, 1701, 2625, 1380, 2352, 1551, 3199,  929, 2410, 1865, 3781,  246, 2942, 1185, 3681, 2588,  912, 2264, 3269, 1208,  714, 3752,  268, 3466,  730, 3837, 1242, 2722,  919, 2372, 3416, 2615,  880, 2851, 1476, 3788,  286, 3289, 1668, 
-	3399, 1314, 3921, 1795, 1036, 3478, 1948, 3697,  921, 3397, 1707, 3878, 2004, 2943,  166, 2733,  814, 3918, 2086,  978, 1957, 3155,  622, 1461, 2750, 2064,   61, 3346,  676, 3032,  205, 1821, 3977,    1, 2819,  892, 2442,  754, 3233,  566, 1537, 3963,  678, 1696, 2895, 1904, 2465, 1458, 2131, 2904, 1776, 2298,  226, 3710, 1988,  308, 1630, 3636,   34, 3095, 1116, 2464,  703, 2638, 
-	 385, 2781,  600, 2323, 3175,  764, 2808,  403, 1825, 2695, 1082, 2845,  339, 1499, 4087, 1179, 3376,  459, 2827, 3758,  294, 2345, 1818, 3409,  959, 3784, 1276, 1857, 4042, 1149, 3534, 2520, 1209, 3363, 1422, 3525, 1634, 4083, 2194, 1823, 3082,  293, 2633, 3530,   99, 3927,  531, 3114, 1058,    9, 3620,  874, 3277,  684, 3052, 1215, 3188, 1908, 2265,  758, 3434, 1885, 3967,  968, 
-	3701, 2022, 3459, 1503,  332, 4001, 1473, 2168, 3833,  117, 2338,  779, 3173, 2153,  609, 2576, 1637, 2409,  846, 1542, 3321, 1077, 4056,  169, 2978,  561, 3214, 2253,  400, 2807, 1928,  495, 2991,  689, 2177,  420, 2885, 1088,  172, 2761, 1281, 3422, 1991, 1109, 2388,  943, 3317, 1669, 4029, 2653, 1398, 2497, 1540, 2818, 1836, 3865,  522,  983, 4049, 2601, 1536,  165, 2182, 3164, 
-	1572,   92, 1183, 2927, 1873, 2451, 1093, 3201,  888, 3044, 1439, 3789, 1151, 3512, 1783, 3650,  251, 3274, 1868, 2669,  710, 2872, 1370, 2446, 2038, 1646, 2577, 1012, 3635, 2145,  974, 3805, 2272, 1738, 3933, 2527, 1342, 3303, 1944, 3843,  514, 2296,  788, 3709, 1592, 2780, 2020,  281, 2249,  665, 3462,  315, 3985, 1074,  111, 2534, 2018, 2930, 1411,  441, 3576, 2836, 1347,  508, 
-	2744, 2243, 3951,  696, 3666,  161, 3521,  516, 2494, 1962, 3436,  491, 2476,   15, 2760,  868, 2258, 1291, 3875,   91, 3700, 2141,  393, 3611,  750, 3903,  275, 3296, 1596,  105, 3144, 1541,  260, 3183, 1042,  118, 3686,  594, 2384,  996, 3539, 1710, 3133,  235, 3030,  587, 3785, 1154, 3020, 1941, 1196, 3154, 1720, 2236, 3474, 1325, 3614,  247, 3249, 1844, 2229, 1014, 3776, 1869, 
-	3515,  986, 1956, 2545, 1336, 3078, 2051, 1649, 4048,  309, 1192, 2787, 1721, 3388, 1426, 3965, 2928,  496, 2175, 3111, 1019, 1745, 3065, 1482, 3186, 1252, 2879,  698, 2507, 3947,  896, 2742, 3586, 1400, 2110, 2934, 1706, 2738, 1383, 2950,   35, 2482, 1425, 4039, 1187, 2505, 1509, 3390,  479, 3873, 2395,  848, 2768,  407, 2910,  619, 1754, 2755, 1207, 3816,  717, 3059,  276, 2498, 
-	 647, 2908,  311, 3166,  571, 2303,  916, 2935, 1283, 3276, 1874, 3907,  823, 2302,  577, 1995, 1129, 3566, 1415,  601, 2539, 3540,  858, 2595,   18, 2330, 1751, 3505, 1111, 1906, 2403,  625, 2199,  446, 3782,  799, 3367,  349, 4007,  830, 3251, 1071, 2730,  426, 1972, 3568,   72, 2154, 2790, 1404,  144, 3674, 1471, 3854, 1004, 2072, 3934,  882, 2419,   86, 2640, 1685, 3298, 1530, 
-	3848, 1373, 3429, 1661, 3809, 1424, 3584,   55, 2622,  675, 2421,  208, 3090, 1224, 3675, 2504,  143, 2057, 2701, 4028, 1558,  244, 1980, 3962, 1159, 3669,  451, 2021, 2784,  302, 3733, 1298, 3261, 1786, 2568, 1275, 2289, 1495, 2499, 1765, 2116, 3827,  704, 3423, 2371,  795, 3189, 1678,  630, 3136, 1901, 2559,  737, 2195, 3273, 2511,  330, 3327, 1950, 3496,  950, 4000, 1134, 2312, 
+	   3, 2603,  743, 2361,  199, 2711,  806, 3181, 2113, 3820,  988, 3485, 1560, 2650,  327, 3063, 1660, 3340,  356, 1055, 2218, 2796, 3278,  528, 2104, 2909, 1465, 4076,  911, 3358, 1586, 3039,   41, 4038,  690, 3493,  155, 3754,  636, 3403,  271, 1355, 2973, 1816, 1287, 3908, 1095, 2549, 4086,  984, 3452,  357, 3560, 1662,   39, 1362, 2954, 1538,  552, 2823, 1871,  319, 2964,  792,
+	3590, 1799, 4095, 1197, 3302, 2009, 3974, 1602,  475, 1433, 2801, 2059,  551, 4067, 1916,  914, 3887, 1308, 2969, 1817, 3780,  790, 1262, 1828, 3421,  802, 2454,  126, 3006, 2212,  536, 2513, 1029, 2142, 2920, 1641, 3178, 1902, 2848,  966, 2579, 3567, 2252,  142, 2798,  388, 3014, 2005,  216, 2285, 1583, 2994, 1091, 2813, 2002, 3712,  856, 4069, 2292, 1256, 3682, 2405, 1359, 3225,
+	1046, 2855,  404, 2646, 1698,  545, 1138, 2982, 1985, 3610,  133, 3256, 1794,  971, 3167, 2251,  483, 2613,  668, 3468,   75, 3156, 2398, 3838,  201, 2690, 1060, 3599, 1820, 1168, 3890, 1743, 3564, 1487,  372, 2617, 1078,  462, 2193, 3915, 1659,  567, 1123, 3806, 1897, 3623,  849, 1483, 3513, 2857,  777, 2164, 3993,  584, 3338,  461, 2748, 1806,  206, 3264,  729, 1993, 3925,  492,
+	2269, 1508, 3497,  927, 3743, 2109, 3469,  248, 2697, 1041, 2404, 1260, 3741, 2162,   52, 3526, 1214, 3722, 2085, 1449, 2557, 1938,  442, 1418, 2987, 1612, 3232, 2139,  654, 2884,  245, 2754,  621, 3060, 3858, 1341, 3698, 2948, 1436,   64, 3194, 2025, 3092, 1506,  595, 2216, 3252, 2632,  484, 1239, 3625,  122, 1864, 2589, 1475, 2360, 1195, 3588, 2536, 1010, 2890,  110, 2628, 1735,
+	3110,  217, 1939, 2913,  101, 2483, 1274, 3124, 1636, 3791,  810, 3049,  417, 2828, 1416, 2515, 1992,  219, 3088,  844, 3343, 1171, 3632, 2201,  637, 3939,  354, 1330, 3800, 1943, 3284, 1390, 2347,  947, 2047,  200, 2128,  739, 3511, 2707, 1177, 4051,  336, 2501, 3472, 1316,   17, 2087, 3801, 1892, 2466, 1409, 3241, 1031, 3844,  152, 3123,  631, 1485, 3835, 1664, 3396, 1181, 3569,
+	 890, 3790, 2353, 1098, 3229,  820, 3910,  448, 2319,  579, 2618, 1903, 3502,  873, 3988,  585, 3015, 1639, 2261, 4055,  292, 2809,  894, 3168, 1959,  995, 2627, 3128, 2282,  506, 1050, 3986,  125, 3537, 2804, 1533, 3291, 2523, 1860,  539, 2328,  829, 2866, 1965,  941, 2718, 4021, 1444,  877, 3210,  695, 3755,  391, 2980,  839, 3378, 1739, 2217, 3031,  351, 2334,  760, 2468,  413,
+	2833, 1382,  553, 4013, 1886, 2660, 1512, 2092, 3541, 1391, 3950,  202, 1543, 2705, 1734, 3312,  990, 3765,  607, 1317, 2458, 1813, 3906,  134, 2390, 3415, 1671,   38, 1218, 3668, 2535, 1552, 2657, 1883,  518, 4094, 1028,  304, 3884, 1303, 3557, 1680, 3406,  203, 3717, 1854,  422, 2304, 2944,  249, 2651, 1757, 2297, 1576, 2706, 2014,  524, 3970, 1139, 2063, 3639, 1417, 4053, 1763,
+	2150, 3450, 2616, 1247,  334, 3355,  650, 2955,   20, 3187,  885, 2178, 3352,  507, 2351,  162, 2735, 1492, 3254, 2030, 3544,  565, 1575, 2921, 1376,  547, 4037, 2017, 3337, 1730,  287, 3247,  660, 3048, 1201, 2383, 1935, 3138, 1594, 2902,  132, 2758, 1358, 2279,  763, 3203, 1574, 3527, 1157, 3938,  958, 3383, 1130, 4012,  234, 3545, 1335, 2558,   27, 3206,  651, 2949,  209, 3170,
+	 977,   50, 1647, 3087, 2189, 1733, 3768, 1331, 2012, 2470, 1484, 2999,  979, 3863, 1288, 3603, 2147,  447, 2876,    6, 1122, 2673, 3368,  837, 3769, 2529,  965, 2699,  575, 2914, 2149,  954, 3693, 1635, 3441,   11, 3725,  780, 2425,  953, 3797, 2171,  677, 3957, 2587, 1108, 2849,  656, 2129, 1650, 2881,   63, 2612,  735, 2348,  951, 3106, 1614, 3490, 1834, 1223, 2597, 1523, 2306,
+	3851, 1983, 3714,  599, 3524,  179, 2408,  904, 4050,  688, 3427,  369, 2671, 1994, 2931,  645, 1686, 3931, 1221, 2553, 3842, 2071,  305, 2276, 1829,  221, 3227, 1452, 3552, 1096, 3956, 1472, 2438,  335, 2187, 2889, 1428, 2746,  415, 3224, 1851, 1086, 2957,  350, 1764, 3393,  116, 2516, 3662,  398, 2209, 3716, 1310, 3464, 1480, 3762,  381, 2853,  772, 2374, 3943,  487, 3542,  616,
+	1302, 2963,  925, 2731, 1148, 2869, 1414, 3026,  310, 2740, 1744, 3699, 1573,   76, 1126, 3300, 2493,  878, 3438, 1849,  785, 1478, 3653, 2765, 1085, 3605, 2246,  383, 1878, 2479,  106, 2841,  801, 3901, 1842,  610, 3518, 1104, 3996, 2270,  549, 3492, 2105, 3640,  931, 2224, 3916, 1866,  816, 3193, 1024, 1845, 3161,  502, 2990, 1942, 2475, 1035, 3673,  243, 1977, 3097, 1679, 2121,
+	3318,  363, 2287, 1590, 3989,  500, 3453, 1796, 3659, 1240, 2331,  834, 3115, 2537, 4070, 2050,  212, 3079, 2267,  371, 2834, 3223, 1270,  527, 3130, 2052,  938, 2757, 3775,  740, 3471, 1656, 3281, 1062, 3102, 1349, 2512, 2090,  173, 1577, 3100, 1412,   40, 1931, 3152,  520, 1253, 2906, 1467, 2366, 4081,  254, 2089, 2522, 1174,  123, 4040, 2205, 1557, 3196, 1076, 2686,  103, 3920,
+	 850, 2585, 3651,  147, 1909, 2562,  989, 2275,  761, 3235,  186, 3852, 1212, 1888,  603, 1399, 3749, 1561,  711, 3969, 2138,  158, 1997, 4079, 1615,   65, 3913, 1778, 1301, 3072, 2083,  394, 2599, 1990,  154, 3818,  480, 3351, 1827, 3665,  853, 2734, 4066, 1128, 2538, 1619, 3257,  192, 3606,  557, 1625, 2793,  867, 3894, 1791, 3366, 1384,  472, 2779,  843, 3802, 1332, 2434, 1453,
+	2867, 1807, 1198, 2181, 3244, 1311, 3823,   81, 2649, 1381, 2776, 2046,  449, 3574, 2161, 3237, 1067, 2118, 2996, 1700, 1044, 3696, 2654,  759, 2455, 2966,  707, 3157,  256, 2362,  920, 4058,  671, 3601, 2263, 1528, 2976,  922, 2630,  373, 2432, 1971,  580, 3385,  289, 3770, 1960, 2598,  992, 2160, 3069, 1131, 3240,  370, 2745,  899, 3036, 1863, 3575, 2268,  399, 2953,  724, 3270,
+	 314, 3516,  658, 3795,  412, 2997,  809, 3349, 1771, 3999,  702, 3449, 1657, 2621,  280, 2795,  512, 3615,   66, 2531, 3420,  477, 1568, 3357, 1250, 2100, 3508, 1001, 2006, 3727, 1397, 2988, 1812, 1135, 2800,  812, 1922, 3587, 1395, 3935, 1167, 3055, 1554, 2231, 2858, 1203,  773, 3964, 1703, 3433,    5, 3812, 1918, 2393, 1457, 3778,  664, 2569,   53, 1468, 3387, 1727, 4077, 2222,
+	1037, 1966, 3089, 1367, 2762, 1694, 2355, 1087, 2837,  328, 2373, 1286, 3126,  961, 3928, 1746, 2430, 1230, 3177,  857, 1435, 2888, 2198,  264, 3777,  456, 1539, 2578, 3371,  592, 2655,   36, 2173, 3345,  297, 4010, 2397,   73, 2832,  661, 3310,  168, 3830,  691, 1420, 3547, 2305,  387, 2912,  742, 2643, 1544,  614, 3619,  164, 2172, 3316, 1259, 3978, 2042,  613, 2743,  210, 1413,
+	3680, 2637,   13, 2316,  709, 4059,  220, 3670, 1569, 3285,  903, 3786,   31, 2293, 1354, 3342,  738, 4033, 2221, 1877, 3879,  728, 3246, 1926, 1141, 2821, 4006,  156, 1193, 1907, 3231, 1507, 3753,  948, 3083, 1667,  718, 3142, 1780, 2278, 1338, 2747, 1716, 3139, 2136,   94, 3085, 1978, 1356, 3723, 1065, 2101, 3008, 1300, 2831, 1899,  455, 3113,  939, 2898, 3608, 1097, 2126, 3147,
+	 532, 1527, 3911, 1769, 3322, 1296, 2656, 2078,  563, 2000, 2586, 1714, 2926,  782, 2677,  181, 2938, 1535,  396, 2840,  197, 2435, 1032, 3626, 2542,  653, 2235, 1800, 2875, 3872,  353, 2456,  644, 2606, 1351, 2132, 3514, 1100, 3857,  324, 3451,  796, 2526,  419, 3747, 1766,  981, 3362, 2400,  187, 2728, 4023,  416, 3499,  881, 3849, 1521, 2431, 1841,  333, 2299, 1567, 3831,  964,
+	2402, 3411, 1068, 2543,  340, 3109,  907, 3460, 1372, 3942,  259, 3408, 1103, 3631, 1632, 3813, 1049, 2043, 3581, 1344, 3332, 1604, 2983,   21, 1663, 3305, 1272, 3664,  519, 2208, 1048, 3555, 2029, 3949,  465, 2896,  228, 2623, 1579, 2478, 1450, 4045, 1147, 3326,  909, 2573, 4003,  513, 1249, 3532, 1775,  910, 2340, 1717, 2610,  624, 3391,  194, 3912, 2704,  765, 3243,  108, 2919,
+	1689,  291, 2959,  826, 3779, 1626, 2250,   74, 2694,  847, 3013, 1460, 2401,  382, 2864,  627, 2463, 3140,  797, 2666,  515, 3990,  824, 2156, 3846,  341, 2911,  932, 2723, 1638, 3080, 1387,  149, 1748, 3266, 1202, 3711,  942, 3248,  744, 2970,   24, 2344, 1910, 2977,  232, 2107, 2892, 1850, 3047,  343, 2037, 3402,   85, 3220, 1278, 2200, 2854,  905, 1430, 3746, 1975, 2506,  686,
+	3997, 2247, 1255, 3484, 2152,  544, 3034, 3870, 1520, 3528, 2180,  606, 4090, 1781, 2123, 3354, 1591,   80, 3767, 1955, 1245, 2363, 1750, 3165, 1089, 2472, 1566, 3455,   83, 4085,  692, 2685, 3475, 2356,  741, 2769, 1693, 2314,  395, 3637, 2070, 1658, 3467,  481, 1407, 3660, 1531,  753, 3819, 1047, 2532, 3902, 1161, 2491, 1621, 4065,  433, 1676, 3573, 2226,  490, 1189, 3091, 1790,
+	 944, 3309, 1920,  135, 1440, 2799, 1859, 1115, 2427,  443, 1847, 2816,  993, 3041,  238, 1199, 3981, 2254,  949, 2900, 3456,  237, 3658,  548, 1961, 3024,  708, 2313, 1976, 1178, 3301, 2084,  556, 1321, 3880, 2015,   90, 4016, 1914, 2680,  970, 3118, 1194, 3930, 2508,  937, 3282, 2439,   57, 2777, 1578,  510, 3127,  769, 2939,  957, 2041, 3238,   28, 3019, 1890, 3389,  263, 3676,
+	2076,  474, 3067, 2450, 4043,  800, 3556,  250, 3365, 1306, 3841,  107, 3419, 1410, 3570, 2197,  499, 3093, 1831,  425, 1550, 2652,  924, 2414, 4030,  190, 3546, 1007, 3708, 2645,  290, 1607, 3728, 2591,  358, 3205, 1162, 2863, 1346,  633, 3874,  279, 2766,  766, 2082, 3025,  438, 1946, 3629,  808, 3473, 2307, 1343, 3796,  265, 2415, 3729, 1323, 2473,  793, 3836, 1350, 2782, 1070,
+	2624, 3860,  864, 1741,  437, 3098,  985, 2607, 1934, 2933,  828, 2703, 1889,  466, 2572, 1493, 2794, 1136, 3643, 2056, 3914, 1172, 3412, 1826, 1327, 3146, 1651, 2530,  440, 1486, 3073, 2242, 1033, 1815, 2972, 1515, 3463,  489, 2469, 3347, 1454, 2311, 1726, 3197,  124, 1622, 4091, 1156, 2170, 2946, 1835,  167, 2700, 1968, 3320, 1227,  469, 3121, 1018, 2727, 1761,  428, 1969, 3265,
+	  60, 1524, 2301, 3593, 2683, 1269, 2207, 3891,  593, 1564, 3633, 1176, 2375, 3745,  967, 3904,  752, 3313,  180, 2452,  701, 2820,   59, 2923,  467, 2163,  866, 3941, 1898, 3392,  657, 3991,    2, 3592,  831, 2378,  982, 3798, 2099,  140, 3062,  876, 3737, 1279, 3548, 2376,  725, 3344,  301, 1318, 3961, 1107, 3562,  578, 1517, 2861, 2184, 1643, 3922,  193, 3479, 2309, 4088,  840,
+	2487, 3498, 1235,  272, 2031, 3707,   33, 1394, 3148, 2120,  225, 3290,  731, 2044, 3208,    8, 2349, 1691, 2715, 1371, 3162, 1631, 2233, 3821, 1079, 3481, 2806,  112, 2929, 1054, 2420, 1446, 2847, 1933, 3180,  223, 2736, 1879, 1211, 3582, 1773, 2441,  424, 2648,  588, 1927, 2788, 1500, 3117, 2447,  602, 2880, 2190, 1856, 4015,   96, 3628,  604, 1913, 2882, 1319,  628, 1466, 3027,
+	1688,  564, 2732, 3236,  715, 1613, 3306, 2273,  430, 3980, 2548, 1627, 2865,  348, 1722, 2958, 1309, 3690,  860, 4072,  397, 3561,  634, 1438, 2674, 1870,  663, 2377, 1295, 3825,  274, 3487, 1173,  550, 2169, 4060,  756, 3263,  367, 2611,  623, 4032, 2067, 3356, 1064, 3885,  178, 3645,  818, 1809, 3377, 1456,  375, 3137,  859, 2682, 1073, 3400, 2437,  913, 3242, 2604, 3638,  325,
+	2206, 3898, 1982, 1084, 4018, 2521, 1020, 2856, 1832, 1234,  886, 3480, 1277, 4046, 2215, 1045, 3428,  283, 3021, 2027, 1284, 2642, 1912, 3262,  257, 3917, 1601, 3595, 2065,  716, 3212, 1633, 2687, 3703, 1021, 1674, 3029, 1378, 3896, 1609, 3018, 1365,   43, 1708, 2829, 1553, 2514, 1266, 2300, 3829,   14, 2525, 3720, 1292, 2380, 1718, 3050, 1464,  303, 3994, 2055,  114, 1923, 1142,
+	3184, 1353,  145, 3001, 2102,  313, 3517,  679, 3685, 2016, 2915,   95, 2459,  641, 3163,  454, 2600, 1767, 2277,  586, 3444,  163, 3764,  962, 2429, 1140, 3191,  320, 2981, 1753, 2564,  845, 2054,  307, 3304, 2232,   79, 2659,  827, 2294, 1026, 3489, 2560, 3804,  361, 3287,  687, 3053,  408, 1375, 2985, 1774,  778, 3272,  262, 3900,  517, 2103, 3151,  726, 1565, 3759, 2502, 3520,
+	 784, 2324, 3740, 1758,  955, 3131, 1546, 2413,  195, 3211,  786, 3757, 1785, 3535, 1434, 2049, 3882, 1124, 3735, 1459, 2554, 2079, 1505, 3040,  751, 2752, 1419, 2329,  972, 3736,  131, 3104, 3973, 1290, 2770,  672, 3448, 1762, 3694,  231, 3222,  521, 1963,  855, 2326, 1160, 3979, 1697, 3509, 2066,  617, 4052, 2290, 1600, 2810, 1158, 2570, 3549,  998, 2288, 2993, 1237,  503, 1777,
+	2860,  414, 2726,  570, 3649, 2256,  841, 3862, 1322, 2561, 1652, 2280, 1069, 2583,  170, 2886,  673, 2443,   68, 3334,  734, 3953,  364, 2214, 3677,   32, 4063,  573, 3279, 1469, 2407, 1911,  511, 2343, 1504, 3807, 1053, 2381, 1297, 2785, 1653, 2417, 3646, 1445, 3169, 1996,  113, 2771,  999, 2546, 3253, 1188,  153, 3641,  591, 3414, 1900,   46, 1782, 3814,  240, 2196, 3417,  969,
+	4047, 2114, 1481, 3381, 1952,   87, 2952, 2053, 3360,  589, 4022,  337, 3380,  833, 3960, 1603, 3293,  963, 3046, 1981, 2802,  991, 3174, 1824, 1164, 3132, 1620, 2676, 2081,  378, 3883, 1094, 2960, 3580,  174, 2034, 2878,  379, 3315,  612, 3983, 1238,  160, 2842,  562, 3404, 2399,  798, 3731,  269, 1562, 2907, 1973, 2631, 1403, 2320,  926, 3683, 2764, 1133, 3195, 1443, 2667, 1872,
+	   0, 3099, 1027, 2462, 1191, 3982, 1617,  365, 1118, 3077, 1389, 2713, 1811, 2995, 2127,  482, 2011, 3598, 1655,  470, 1369, 3565, 2332,  649, 2850, 1930,  794, 3572, 1120, 3394,  887, 2609, 1587,  733, 1846, 3228,  836, 3888, 2010, 2688,  945, 2956, 2143, 1677, 3704, 1282, 1855, 2968, 1431, 2308, 3919,  453, 3386,  720, 3972,  345, 3221, 2001,  431, 2426,  667, 3893,  377, 3617,
+	2039,  746, 3832,  296, 3286,  615, 2357, 3613, 1940, 2262,   37, 3578,  568, 1326, 3721, 1153, 2789,  270, 2541, 4035, 2203,  146, 1534, 3375,  306, 3871, 2186,  214, 2556, 1893, 3071,   56, 3350, 2074, 4089, 1186, 2626, 1491,   19, 1713, 3470,  390, 3803,  722, 2566,  299, 4075,  497, 3437, 1102, 1802, 2580, 1144, 1862, 2852, 1580, 2485, 1271, 4073, 1729, 2870, 1222, 2339,  872,
+	3297, 2551, 1294, 2897, 1737, 2719, 1313, 3042,  771, 3810, 1490, 2411, 1949, 2664,  130, 3116, 1494, 3787, 1246,  598, 3260, 1848, 3773, 1112, 2480,  946, 2941, 1532, 4009,  611, 1682, 3824, 1226, 2729,  285, 3028,  534, 3531, 2509, 3150, 1265, 2385, 1405, 3329, 1768, 3108, 1190, 1987, 2724,   54, 3577,  842, 3808, 2219,  119, 3751,  700, 2986,  884, 3482,  100, 3215, 1408, 2759,
+	1593,  478, 3558, 2062,  817, 3734,  207, 1797, 2581,  468, 3158,  815, 3945,  980, 3486, 2259,  770, 1788, 3185, 2370, 1030, 2903,  748, 2708, 1805, 3602,  530, 3218, 1248, 2238, 2894,  486, 2396,  851, 3622, 1666, 2354, 1137, 1947,  712, 4031,  902, 3009,   78, 2317,  803, 3533, 2486,  879, 3143, 2115, 3017,  317, 3209, 1244, 2058, 3407,  253, 2266, 1526, 2517,  767, 3657,  196,
+	4011, 1861, 2346,  109, 3086, 1011, 2112, 4061, 1229, 3447, 1683, 2767,  282, 2891, 1843,  494, 3372, 2639,   16, 1951, 3705,  312, 2068, 4002,   70, 1455, 2756, 2003,  157, 3454, 1117, 3687, 1366, 3207, 2144,  674, 3869,  182, 3671, 2188,  277, 2684, 1598, 3881, 1061, 2822,  198, 1616, 3760, 1393,  569, 1673, 2712, 1522, 3591,  861, 2575, 1752, 3288, 1025, 3948, 1814, 2134, 3038,
+	 933, 3239, 1213, 3897, 1582, 2423, 3182,  626, 2681,  136, 2327, 1127, 3612, 2179, 1182, 4093, 2095,  935, 3895,  697, 2528, 1597, 3033, 1152, 2359, 3325, 1016, 3799, 1756, 2593,  342, 2008, 2817,  121, 1497, 3280, 1760, 2786, 1285, 3084, 1732, 3597,  576, 1917, 3426, 1357, 3940, 2091,  376, 3335, 2013, 3877,  819, 2440,  401, 3070, 1345, 3866,  541, 2797,  288, 3333,  574, 1529,
+	2457,  405, 2846,  659, 3395,  346, 1184, 3483, 1595, 3853,  901, 3275, 1755,  680, 3056,  229, 1581, 2975, 1348, 3330, 1233, 3609,  485, 3435,  705, 2048,  322, 2461,  736, 3944, 1545, 3341,  936, 4017, 2614,  402, 2428,  776, 3348,  488, 2584, 1228, 2158, 3061,  318, 2391,  632, 3022, 2453, 1043, 2778,  141, 2961, 1175, 4044, 1919,   25, 2159, 3145, 1624, 2336, 1225, 2629, 3840,
+	1106, 3501, 2148, 1479, 2641, 1830, 2922, 1998,  504, 2096, 3005,  432, 2488, 3826, 1402, 2448, 3692,  366, 2225, 2772,  175, 2140, 2826, 1334, 2608, 3739, 1571, 3495, 2108, 1232, 2678,  559, 2325, 1905, 1145, 3503, 1360, 3955, 2124,  994, 3855,  151, 3370, 1013, 2737, 1709, 3630, 1462,  783, 4020, 1801, 1307, 3689, 2274,  629, 2670, 3538,  787, 1289, 3585,  917, 3742, 1684,   51,
+	3002, 1712,  218, 3642,  749, 3954,   26, 3600, 1000, 2721, 1361, 3656, 1210,   58, 3153,  640, 1974, 3213,  898, 1819, 4026,  928, 1779, 3839,  139, 1056, 2989,  525, 3234,   10, 3553, 1648, 3792,  258, 3101,  699, 2838,   49, 1474, 2945, 1772, 2412, 1547, 4062,  822, 3245,    7, 2035, 3135,  298, 3384, 2192,  498, 1838, 3364, 1038, 1556, 3023, 2444,  177, 2716,  501, 2905, 2061,
+	 883, 4084, 2602, 1200, 2386, 1392, 2812, 2248, 1728, 4027,  242, 1875, 2873, 2166, 1644, 3554, 1080, 2524, 3772,  505, 2369, 3160,  434, 2286, 3192, 1882, 2392, 1363, 2720, 1970, 1003, 2918,  895, 2763, 2106, 3730, 1585, 2379, 3589,  418, 3259,  669, 2773,  352, 2291, 1092, 2691, 3724, 1170, 2661,  952, 2862, 1518, 3043,  222, 2518, 3905,  360, 1692, 4019, 1936, 3432,  973, 3258,
+	2245,  555, 1925, 3074,  444, 3319, 1066,  392, 3204,  813, 2358, 3461,  865, 3976,  458, 2644, 1839,  127, 1514, 2917, 1163, 2028, 3519, 1220,  642, 4068,  278, 3604,  605, 3975, 2503,  406, 3359, 1793, 1264,  471, 3328, 1059, 1921, 2672, 1254, 3794, 1364, 3621, 1789, 3488, 1563,  652, 2337, 1695, 3822,   82, 3465, 1231, 3672, 2045,  940, 2223, 3120,  685, 1320, 2367, 1784,  326,
+	3766, 1519, 3424,  923, 3706, 1867, 2155, 3783, 1451, 2937, 1608,  543, 2596, 1477, 3336,  960, 3899, 2032, 3425,  863, 3661,   44, 1589, 2893, 2135, 1511, 3064, 1759, 2310, 1293, 1833, 3761, 2227,  102, 4078, 2033, 2702,  239, 3984,  732, 2228,   98, 2992,  713, 2590,  233, 2433, 3992,  384, 2965,  755, 2477, 1881,  681, 2775,  529, 1804, 3373, 1155, 2550, 3793,  148, 3507, 2693,
+	1057, 2924,   93, 2714, 1588,  204, 2971,  694, 2544,  104, 3892, 1958, 3250,  189, 2130, 3003,  355, 3122,  648, 2582, 1740, 2213, 3932,  331, 3331,  891, 2533,  781, 3176,  185, 3004,  721, 1180, 3125, 2333,  908, 1654, 3096, 1421, 3431, 2825, 1736, 2125, 3339, 1423, 3058,  805, 1932, 3226, 1386, 3571, 1105, 4092, 2167, 1548, 3771, 2899,   69, 3607,  464, 1724, 3045, 1204, 1964,
+	2389,  706, 3971, 1132, 2449, 3859, 1166, 3369, 1280, 3476,  930, 2422, 1268, 3718,  745, 1705, 2717, 1379, 2271, 3847,  450, 2814, 1022, 2692, 1315, 3647,   89, 3845, 1052, 3536, 1584, 2157, 3652, 1510,  682, 2868, 3624,  538, 2489, 1006,  362, 3876, 1051,  435, 3774, 1146, 3543, 1005, 2237,  191, 2023, 2636,  410, 3200,  183, 2321,  889, 2133, 1488, 2874, 2234,  643, 4041,  389,
+	3594, 1642, 2094, 3295,  523, 2040, 2675,  359, 2295, 1853, 3051,  316, 2824, 1002, 2500, 4071, 1114, 3529,  211, 1304, 3075, 1441, 3382,  693, 2387, 1665, 2901, 1263, 2445, 1915,  581, 3308,  329, 2481, 3834,  188, 2165, 1217, 3750, 1876, 3283, 1470, 2725, 2281, 1702, 2815,   77, 2594, 3929, 1629, 3324,  906, 2940, 1267, 3523, 1388, 4008, 2662,  762, 3702, 1063, 2749, 1525, 3159,
+	 852, 2998,  261, 2739, 1822,  976, 3550, 1672, 4057,  554, 1374, 3828, 1894, 3202,    4, 2220,  572, 1884, 3198, 2119,  723, 3618,  176, 2036, 3968,  427, 2183, 3401,  368, 4036, 2871, 1324, 2709, 1880, 1072, 3149, 1723, 2811,   23, 2394,  757, 2984,  159, 3966,  582, 2093, 3268, 1463,  618, 2859,  463, 3715, 1725, 2283,  655, 3068,  386, 1675, 3011,  266, 1986, 3410,   12, 2073,
+	2474, 1216, 3732,  900, 3924, 2364,   47, 2830,  871, 2605, 3255, 2191,  597, 1610, 3443, 1406, 3655, 2555,  875, 3995, 1570, 2471, 1731, 3000,  804, 3230,  975, 1798, 2620,  897, 2211,   48, 3923,  835, 3446, 2257,  583, 3311, 1549, 4054, 2098, 1273, 3405, 1967, 1340, 3663,  862, 2007, 3748, 1219, 1924, 2416,   30, 3861, 1165, 2467, 1929, 3379, 1121, 3952, 2567,  915, 1787, 3909,
+	 509, 3442, 1501, 2563,  457, 1559, 3353, 1352, 3654, 2060,  150, 1125, 3579, 2574, 1039, 2962,  323, 1628, 3010,   88, 2753,  535, 3713, 1040, 2663, 1891, 3811,  213, 3616, 1429, 3439, 1715, 2117, 2932,  380, 1385, 3889, 1110, 2592,  608, 3094,  411, 2547,  807, 3119,  338, 2315, 3037,  224, 3398, 2710, 1017, 3103, 1516, 3292,  236, 3744,  719, 2382, 1555,  537, 3522, 2647, 1305,
+	2774, 2024,  128, 3190, 1945, 2947,  646, 2510,  421, 1236, 3936, 2698, 1792,  284, 3756,  832, 2322, 3867, 1090, 2241, 3323, 1333, 2137, 3141,   22, 1299, 2803, 2080,  768, 2835,  452, 3066,  639, 1243, 3679, 2635, 2019,  321, 3627, 1312, 1989, 3726, 1489, 3551, 2122, 1605, 4064, 1081, 1770, 2204,  666, 3998, 1858,  540, 2111, 2668, 1427, 2936,   97, 3129, 1895, 2210,  241, 3719,
+	1009, 3307, 1810,  934, 3634, 1119, 3959, 1719, 3445, 2916, 1599,  533, 3179, 2365, 1447, 2844, 1953,  526, 3430, 1887,  789, 3815,  347, 1513, 4082, 2460,  542, 3172, 1670, 2260, 3987, 1368, 3510, 2240, 1808,  115, 3035, 1618, 2146, 3361,  184, 2335,  662, 2783,   42, 2925,  596, 2571, 3596,  956, 2877,  295, 2552, 3494,  987, 3926,  893, 1840, 3667, 1241, 3856, 1083, 3216,  727,
+	2342,  409, 4080, 2436,  300, 2741, 2185,  171, 2026,  683, 2230, 3738, 1339,  747, 4005,  138, 3219, 1502, 2565,  255, 3076, 1699, 2368, 3418,  638, 1747, 3500, 1113, 3763,  120, 1023, 2689,  252, 2792,  774, 4025, 1008, 3217,  791, 2665, 1150, 4004, 1837,  997, 3850, 1437, 3413, 1984,  129, 3171, 1606, 3688, 1206, 2244, 1803,  429, 3112, 2418,  811, 2696,  344, 2496, 1749, 2967,
+	1377, 2839, 1099, 2077, 3271,  838, 1442, 3583, 2679, 1034, 3054,   62, 2069, 3267, 1852, 2519, 1205, 3695,  869, 4024, 2176, 1101, 2974,  918, 2151, 2843,  267, 2406, 1496, 2951, 2174, 1690, 3817, 1143, 3299, 1979, 2495,  476, 3868, 1498, 2979,  493, 3134, 2490, 1937,  445, 2350,  854, 3946, 1169, 2341,  775, 3007,   84, 2805, 3563, 2097,  215, 3294, 1640, 3477,  870, 4014,   71,
+	3678, 1711, 3504,  670, 1623, 3864, 2883,  546, 1645, 4034, 1396, 3457, 2634,  473, 1015, 3559,  423, 2202, 2887, 1611,  558, 3374,  137, 1896, 3644, 1075, 3937,  825, 3458,  460, 3691,  590, 2075, 3081,  439, 1337, 3440, 1742, 2318,   67, 1954, 3491, 1401,  230, 3648, 2751, 1328, 3012, 1687, 2658,  374, 3314, 1704, 4074, 1448,  620, 1329, 3958, 1999,  560, 2088, 2791, 1257, 2284,
+	 821, 2492,  227, 3057, 2540,   29, 1258, 2239, 3016,  273, 2424,  635, 1251, 3684, 2255, 1681, 3105, 1432,   45, 3506, 2619, 1261, 3886, 2484,  436, 3107, 1701, 2625, 1380, 2352, 1551, 3199,  929, 2410, 1865, 3781,  246, 2942, 1185, 3681, 2588,  912, 2264, 3269, 1208,  714, 3752,  268, 3466,  730, 3837, 1242, 2722,  919, 2372, 3416, 2615,  880, 2851, 1476, 3788,  286, 3289, 1668,
+	3399, 1314, 3921, 1795, 1036, 3478, 1948, 3697,  921, 3397, 1707, 3878, 2004, 2943,  166, 2733,  814, 3918, 2086,  978, 1957, 3155,  622, 1461, 2750, 2064,   61, 3346,  676, 3032,  205, 1821, 3977,    1, 2819,  892, 2442,  754, 3233,  566, 1537, 3963,  678, 1696, 2895, 1904, 2465, 1458, 2131, 2904, 1776, 2298,  226, 3710, 1988,  308, 1630, 3636,   34, 3095, 1116, 2464,  703, 2638,
+	 385, 2781,  600, 2323, 3175,  764, 2808,  403, 1825, 2695, 1082, 2845,  339, 1499, 4087, 1179, 3376,  459, 2827, 3758,  294, 2345, 1818, 3409,  959, 3784, 1276, 1857, 4042, 1149, 3534, 2520, 1209, 3363, 1422, 3525, 1634, 4083, 2194, 1823, 3082,  293, 2633, 3530,   99, 3927,  531, 3114, 1058,    9, 3620,  874, 3277,  684, 3052, 1215, 3188, 1908, 2265,  758, 3434, 1885, 3967,  968,
+	3701, 2022, 3459, 1503,  332, 4001, 1473, 2168, 3833,  117, 2338,  779, 3173, 2153,  609, 2576, 1637, 2409,  846, 1542, 3321, 1077, 4056,  169, 2978,  561, 3214, 2253,  400, 2807, 1928,  495, 2991,  689, 2177,  420, 2885, 1088,  172, 2761, 1281, 3422, 1991, 1109, 2388,  943, 3317, 1669, 4029, 2653, 1398, 2497, 1540, 2818, 1836, 3865,  522,  983, 4049, 2601, 1536,  165, 2182, 3164,
+	1572,   92, 1183, 2927, 1873, 2451, 1093, 3201,  888, 3044, 1439, 3789, 1151, 3512, 1783, 3650,  251, 3274, 1868, 2669,  710, 2872, 1370, 2446, 2038, 1646, 2577, 1012, 3635, 2145,  974, 3805, 2272, 1738, 3933, 2527, 1342, 3303, 1944, 3843,  514, 2296,  788, 3709, 1592, 2780, 2020,  281, 2249,  665, 3462,  315, 3985, 1074,  111, 2534, 2018, 2930, 1411,  441, 3576, 2836, 1347,  508,
+	2744, 2243, 3951,  696, 3666,  161, 3521,  516, 2494, 1962, 3436,  491, 2476,   15, 2760,  868, 2258, 1291, 3875,   91, 3700, 2141,  393, 3611,  750, 3903,  275, 3296, 1596,  105, 3144, 1541,  260, 3183, 1042,  118, 3686,  594, 2384,  996, 3539, 1710, 3133,  235, 3030,  587, 3785, 1154, 3020, 1941, 1196, 3154, 1720, 2236, 3474, 1325, 3614,  247, 3249, 1844, 2229, 1014, 3776, 1869,
+	3515,  986, 1956, 2545, 1336, 3078, 2051, 1649, 4048,  309, 1192, 2787, 1721, 3388, 1426, 3965, 2928,  496, 2175, 3111, 1019, 1745, 3065, 1482, 3186, 1252, 2879,  698, 2507, 3947,  896, 2742, 3586, 1400, 2110, 2934, 1706, 2738, 1383, 2950,   35, 2482, 1425, 4039, 1187, 2505, 1509, 3390,  479, 3873, 2395,  848, 2768,  407, 2910,  619, 1754, 2755, 1207, 3816,  717, 3059,  276, 2498,
+	 647, 2908,  311, 3166,  571, 2303,  916, 2935, 1283, 3276, 1874, 3907,  823, 2302,  577, 1995, 1129, 3566, 1415,  601, 2539, 3540,  858, 2595,   18, 2330, 1751, 3505, 1111, 1906, 2403,  625, 2199,  446, 3782,  799, 3367,  349, 4007,  830, 3251, 1071, 2730,  426, 1972, 3568,   72, 2154, 2790, 1404,  144, 3674, 1471, 3854, 1004, 2072, 3934,  882, 2419,   86, 2640, 1685, 3298, 1530,
+	3848, 1373, 3429, 1661, 3809, 1424, 3584,   55, 2622,  675, 2421,  208, 3090, 1224, 3675, 2504,  143, 2057, 2701, 4028, 1558,  244, 1980, 3962, 1159, 3669,  451, 2021, 2784,  302, 3733, 1298, 3261, 1786, 2568, 1275, 2289, 1495, 2499, 1765, 2116, 3827,  704, 3423, 2371,  795, 3189, 1678,  630, 3136, 1901, 2559,  737, 2195, 3273, 2511,  330, 3327, 1950, 3496,  950, 4000, 1134, 2312,
 };
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/WinRenderBuffer.h b/xbmc/cores/VideoPlayer/VideoRenderers/WinRenderBuffer.h
index d8e1049687..efc71f0239 100644
--- a/xbmc/cores/VideoPlayer/VideoRenderers/WinRenderBuffer.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/WinRenderBuffer.h
@@ -17,7 +17,7 @@
  *  <http://www.gnu.org/licenses/>.
  *
  */
- 
+
 #pragma once
 
 #include "DVDCodecs/Video/DXVA.h"
@@ -26,7 +26,7 @@
 class CVideoBuffer;
 struct VideoPicture;
 
-enum EBufferFormat 
+enum EBufferFormat
 {
   BUFFER_FMT_NONE = 0,
   BUFFER_FMT_YUV420P,
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/yuv2rgb.neon.S b/xbmc/cores/VideoPlayer/VideoRenderers/yuv2rgb.neon.S
index df7218b4fa..e6603241b3 100644
--- a/xbmc/cores/VideoPlayer/VideoRenderers/yuv2rgb.neon.S
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/yuv2rgb.neon.S
@@ -10,7 +10,7 @@
 #if defined(HAS_NEON) && !defined(__LP64__)
 
  /* Initial ARM Neon implementation of core YUV2RGB functions. */
-        
+
     .text
     .align 4
 #ifndef __APPLE__
@@ -32,7 +32,7 @@
 #define coef_u_g       d2
 #define coef_v_g       d3
 #define coef_u_b       d4
-/* D5 is spare */        
+/* D5 is spare */
 #define bias_r         q3
 #define bias_r_lo      d6
 #define bias_r_hi      d7
@@ -67,7 +67,7 @@
 #define red8_o         d27
 #define grn8_e         d28
 #define alp8_e         d29
-#define grn8_o         d30 /* overlaps with q15 - y_scale, but safe */ 
+#define grn8_o         d30 /* overlaps with q15 - y_scale, but safe */
 #define alp8_o         d31 /* overlaps with q15 - y_scale, but safe */
 
 /* ARM registers */
@@ -84,7 +84,7 @@
 #define aligned_count  sl
 #define rgb_b_ptr      fp
 #define y_b_ptr        ip
-        
+
 /* Constants */
 /* 8-bit constants can be loaded into vectors using VMOV */
 #define C_Y_SCALE      74   /* Y scale , 74 */
@@ -139,7 +139,7 @@ _yuv420_2_rgb8888_neon:
         cmp             width, #16
         vpoplt          {q4-q7}
         poplt           {r4-r12, pc}
-        
+
         /* Load up vectors containing the bias values. */
         vld1.s16        {bias_r_lo[], bias_r_hi[]}, [lr]!
         vld1.s16        {bias_g_lo[], bias_g_hi[]}, [lr]!
@@ -190,15 +190,15 @@ loop_h_420:
            better performance. */
         pld             [v_ptr]
         pld             [u_ptr]
-        
+
         /***********/
         /* TOP ROW */
-        /***********/        
+        /***********/
         /* Top row: Load 16 pixels of y, even and odd. */
         vld2.u8         {y_even, y_odd}, [y_t_ptr], count
 
         /* Top row, even: combine luminance and chrominance. */
-        vmull.u8        y_scale, y_even, coef_y        
+        vmull.u8        y_scale, y_even, coef_y
         vqadd.s16       red, y_scale, r_delta
         vqadd.s16       grn, y_scale, g_delta
         vqadd.s16       blu, y_scale, b_delta
@@ -221,7 +221,7 @@ loop_h_420:
         vzip.u8         blu8_e, grn8_e
 
         /* Top row, odd: combine luminance and chrominance. */
-        vmull.u8        y_scale, y_odd, coef_y        
+        vmull.u8        y_scale, y_odd, coef_y
         vqadd.s16       red, y_scale, r_delta
         vqadd.s16       grn, y_scale, g_delta
         vqadd.s16       blu, y_scale, b_delta
@@ -248,12 +248,12 @@ loop_h_420:
 
         /**************/
         /* BOTTOM ROW */
-        /**************/        
+        /**************/
         /* Bottom row: Load 16 pixels of y, even and odd. */
         vld2.u8         {y_even, y_odd}, [y_b_ptr], count
 
         /* Bottom row, even: combine luminance and chrominance. */
-        vmull.u8        y_scale, y_even, coef_y        
+        vmull.u8        y_scale, y_even, coef_y
         vqadd.s16       red, y_scale, r_delta
         vqadd.s16       grn, y_scale, g_delta
         vqadd.s16       blu, y_scale, b_delta
@@ -276,7 +276,7 @@ loop_h_420:
         vzip.u8         blu8_e, grn8_e
 
         /* Bottom row, odd: combine luminance and chrominance. */
-        vmull.u8        y_scale, y_odd, coef_y        
+        vmull.u8        y_scale, y_odd, coef_y
         vqadd.s16       red, y_scale, r_delta
         vqadd.s16       grn, y_scale, g_delta
         vqadd.s16       blu, y_scale, b_delta
@@ -293,7 +293,7 @@ loop_h_420:
            ready for storage. */
         vzip.u8         red8_o, alp8_o
         vzip.u8         blu8_o, grn8_o
-        
+
         /* Have we reached the end of the row yet? */
         subs            aligned_count, aligned_count, count
 
@@ -318,7 +318,7 @@ loop_h_420:
         add             y_t_ptr, y_pitch, LSL #1
         add             u_ptr, uv_pitch
         add             v_ptr, uv_pitch
-        
+
         /* Have we reached the bottom row yet? */
         subs            height, height, #2
         bgt             loop_v_420
@@ -334,7 +334,7 @@ loop_h_420:
    one row, not a 2x2 matrix */
 #define rgb_ptr     rgb_t_ptr
 #define y_ptr       y_t_ptr
-        
+
 #ifndef __APPLE__
 yuv422_2_rgb8888_neon:
 #else
@@ -366,12 +366,12 @@ _yuv422_2_rgb8888_neon:
         cmp             width, #16
         vpoplt          {q4-q7}
         poplt           {r4-r12, pc}
-        
+
         /* Load up vectors containing the bias values. */
         vld1.s16        {bias_r_lo[], bias_r_hi[]}, [lr]!
         vld1.s16        {bias_g_lo[], bias_g_hi[]}, [lr]!
         vld1.s16        {bias_b_lo[], bias_b_hi[]}, [lr]!
-        
+
         /* Build coefficient vectors containing the same value in each element. */
         vmov.u8         coef_y, #C_Y_SCALE
         vmov.u8         coef_v_r, #C_V_RED
@@ -416,7 +416,7 @@ loop_h_422:
         vadd.s16        b_delta, b_delta, bias_b
 
         /* Even: combine luminance and chrominance. */
-        vmull.u8        y_scale, y_even, coef_y        
+        vmull.u8        y_scale, y_even, coef_y
         vqadd.s16       red, y_scale, r_delta
         vqadd.s16       grn, y_scale, g_delta
         vqadd.s16       blu, y_scale, b_delta
@@ -439,7 +439,7 @@ loop_h_422:
         vzip.u8         blu8_e, grn8_e
 
         /* Odd: combine luminance and chrominance. */
-        vmull.u8        y_scale, y_odd, coef_y        
+        vmull.u8        y_scale, y_odd, coef_y
         vqadd.s16       red, y_scale, r_delta
         vqadd.s16       grn, y_scale, g_delta
         vqadd.s16       blu, y_scale, b_delta
@@ -456,7 +456,7 @@ loop_h_422:
            ready for storage. */
         vzip.u8         red8_o, alp8_o
         vzip.u8         blu8_o, grn8_o
-        
+
         /* Have we reached the end of the row yet? */
         subs            aligned_count, aligned_count, count
 
@@ -480,7 +480,7 @@ loop_h_422:
         add             y_ptr, y_pitch
         add             u_ptr, uv_pitch
         add             v_ptr, uv_pitch
-        
+
         /* Have we reached the bottom yet? */
         subs            height, height, #1
         bgt             loop_v_422
diff --git a/xbmc/cores/VideoSettings.h b/xbmc/cores/VideoSettings.h
index cde3101a53..b2d985df9c 100644
--- a/xbmc/cores/VideoSettings.h
+++ b/xbmc/cores/VideoSettings.h
@@ -19,7 +19,7 @@
  */
 
 #pragma once
- 
+
 // VideoSettings.h: interface for the CVideoSettings class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/xbmc/cores/omxplayer/OMXAudioCodecOMX.cpp b/xbmc/cores/omxplayer/OMXAudioCodecOMX.cpp
index 1180038f16..4991d8da66 100644
--- a/xbmc/cores/omxplayer/OMXAudioCodecOMX.cpp
+++ b/xbmc/cores/omxplayer/OMXAudioCodecOMX.cpp
@@ -240,9 +240,9 @@ int COMXAudioCodecOMX::GetData(unsigned char** dst, double &dts, double &pts)
     {
       m_iSampleFormat = m_pCodecContext->sample_fmt;
       m_pConvert = swr_alloc_set_opts(NULL,
-                      av_get_default_channel_layout(m_pCodecContext->channels), 
+                      av_get_default_channel_layout(m_pCodecContext->channels),
                       m_desiredSampleFormat, m_pCodecContext->sample_rate,
-                      av_get_default_channel_layout(m_pCodecContext->channels), 
+                      av_get_default_channel_layout(m_pCodecContext->channels),
                       m_pCodecContext->sample_fmt, m_pCodecContext->sample_rate,
                       0, NULL);
 
diff --git a/xbmc/cores/omxplayer/OMXImage.cpp b/xbmc/cores/omxplayer/OMXImage.cpp
index d6fd3b6e4c..b3c3c003f8 100644
--- a/xbmc/cores/omxplayer/OMXImage.cpp
+++ b/xbmc/cores/omxplayer/OMXImage.cpp
@@ -725,7 +725,7 @@ OMX_IMAGE_CODINGTYPE COMXImageFile::GetCodingType(unsigned int &width, unsigned
           bool bError = false;
           SKIPN(p, 1 * 2);
           readBits += 2;
-        
+
           char o1 = READ8(p);
           char o2 = READ8(p);
           readBits += 2;
@@ -737,14 +737,14 @@ OMX_IMAGE_CODINGTYPE COMXImageFile::GetCodingType(unsigned int &width, unsigned
             bMotorola = false;
           else
             bError = true;
-        
+
           SKIPN(p, 1 * 2);
           readBits += 2;
 
           if(!bError)
           {
             unsigned int offset, a, b, numberOfTags, tagNumber;
-  
+
             // Get first IFD offset (offset to IFD0)
             if(bMotorola)
             {
@@ -772,7 +772,7 @@ OMX_IMAGE_CODINGTYPE COMXImageFile::GetCodingType(unsigned int &width, unsigned
             {
               SKIPN(p, 1 * offset);
               readBits += offset;
-            } 
+            }
 
             // Get the number of directory entries contained in this IFD
             if(bMotorola)
@@ -903,7 +903,7 @@ bool COMXImageFile::ReadFile(const std::string& inputFile, int orientation)
     CLog::Log(LOGERROR, "%s::%s %s m_image_buffer null (%lu)\n", CLASSNAME, __func__, m_filename, m_image_size);
     return false;
   }
-  
+
   m_pFile.Read(m_image_buffer, m_image_size);
   m_pFile.Close();
 
@@ -1263,7 +1263,7 @@ bool COMXImageEnc::Encode(unsigned char *buffer, int size, unsigned width, unsig
   if (pitch == 0)
      pitch = 4 * width;
 
-  if (!buffer || !size) 
+  if (!buffer || !size)
   {
     CLog::Log(LOGERROR, "%s::%s error no buffer\n", CLASSNAME, __func__);
     return false;
diff --git a/xbmc/cores/paplayer/AudioDecoder.cpp b/xbmc/cores/paplayer/AudioDecoder.cpp
index 424234e4a1..0146cad7e9 100644
--- a/xbmc/cores/paplayer/AudioDecoder.cpp
+++ b/xbmc/cores/paplayer/AudioDecoder.cpp
@@ -205,7 +205,7 @@ void *CAudioDecoder::GetData(unsigned int samples)
     CLog::Log(LOGERROR, "CAudioDecoder::GetData - More data was requested then we have space to buffer!");
     return NULL;
   }
-  
+
   if (size > m_pcmBuffer.getMaxReadSize())
   {
     CLog::Log(LOGWARNING, "CAudioDecoder::GetData() more bytes/samples (%i) requested than we have to give (%i)!", size, m_pcmBuffer.getMaxReadSize());
@@ -216,10 +216,10 @@ void *CAudioDecoder::GetData(unsigned int samples)
   {
     if (m_status == STATUS_ENDING && m_pcmBuffer.getMaxReadSize() == 0)
       m_status = STATUS_ENDED;
-    
+
     return m_outputBuffer;
   }
-  
+
   CLog::Log(LOGERROR, "CAudioDecoder::GetData() ReadBinary failed with %i samples", samples);
   return NULL;
 }
diff --git a/xbmc/cores/paplayer/CodecFactory.cpp b/xbmc/cores/paplayer/CodecFactory.cpp
index b7d9c2d8c1..bb2c7268b3 100644
--- a/xbmc/cores/paplayer/CodecFactory.cpp
+++ b/xbmc/cores/paplayer/CodecFactory.cpp
@@ -88,8 +88,8 @@ ICodec* CodecFactory::CreateCodecDemux(const CFileItem& file, unsigned int filec
       content == "application/ogg"  ||
       content == "audio/ogg"        ||
       content == "audio/x-xbmc-pcm" ||
-      content == "audio/flac"       || 
-      content == "audio/x-flac"     || 
+      content == "audio/flac"       ||
+      content == "audio/x-flac"     ||
       content == "application/x-flac"
       )
   {
diff --git a/xbmc/cores/paplayer/PAPlayer.cpp b/xbmc/cores/paplayer/PAPlayer.cpp
index 264181850a..acc4833686 100644
--- a/xbmc/cores/paplayer/PAPlayer.cpp
+++ b/xbmc/cores/paplayer/PAPlayer.cpp
@@ -92,7 +92,7 @@ void PAPlayer::SoftStart(bool wait/* = false */)
     si->m_stream->Resume();
     si->m_stream->FadeVolume(0.0f, 1.0f, FAST_XFADE_TIME);
   }
-  
+
   if (wait)
   {
     /* wait for them to fade in */
@@ -181,14 +181,14 @@ void PAPlayer::SoftStop(bool wait/* = false */, bool close/* = true */)
 
 void PAPlayer::CloseAllStreams(bool fade/* = true */)
 {
-  if (!fade) 
+  if (!fade)
   {
     CSingleLock lock(m_streamsLock);
     while (!m_streams.empty())
     {
       StreamInfo* si = m_streams.front();
       m_streams.pop_front();
-      
+
       if (si->m_stream)
       {
         CloseFileCB(*si);
@@ -222,7 +222,7 @@ void PAPlayer::CloseAllStreams(bool fade/* = true */)
     SoftStop(false, true);
     CSingleLock lock(m_streamsLock);
     m_currentStream = NULL;
-  }  
+  }
 }
 
 bool PAPlayer::OpenFile(const CFileItem& file, const CPlayerOptions &options)
@@ -392,7 +392,7 @@ bool PAPlayer::QueueNextFileEx(const CFileItem &file, bool fadeIn)
   int64_t streamTotalTime = si->m_decoderTotal;
   if (si->m_endOffset)
     streamTotalTime = si->m_endOffset - si->m_startOffset;
-  
+
   si->m_prepareNextAtFrame = 0;
   // cd drives don't really like it to be crossfaded or prepared
   if(!file.IsCDDA())
@@ -419,7 +419,7 @@ bool PAPlayer::QueueNextFileEx(const CFileItem &file, bool fadeIn)
   if (!PrepareStream(si))
   {
     CLog::Log(LOGINFO, "PAPlayer::QueueNextFileEx - Error preparing stream");
-    
+
     si->m_decoder.Destroy();
     // advance playlist
     AdvancePlaylistOnError(si->m_fileItem);
@@ -550,7 +550,7 @@ void PAPlayer::Process()
     return;
   }
 
-  CLog::Log(LOGDEBUG, "PAPlayer::Process - Playback started");  
+  CLog::Log(LOGDEBUG, "PAPlayer::Process - Playback started");
   while(m_isPlaying && !m_bStop)
   {
     /* this needs to happen outside of any locks to prevent deadlocks */
@@ -574,7 +574,7 @@ void PAPlayer::Process()
       SetTimeInternal(m_newForcedPlayerTime);
       m_newForcedPlayerTime = -1;
     }
-    
+
     if (m_newForcedTotalTime != -1)
     {
       SetTotalTimeInternal(m_newForcedTotalTime);
@@ -601,7 +601,7 @@ inline void PAPlayer::ProcessStreams(double &freeBufferTime)
   {
     StreamInfo* si = *itt;
     if (si->m_stream->IsDrained())
-    {      
+    {
       itt = m_finishing.erase(itt);
       CloseFileCB(*si);
       CServiceBroker::GetActiveAE()->FreeStream(si->m_stream);
@@ -667,7 +667,7 @@ inline void PAPlayer::ProcessStreams(double &freeBufferTime)
 
       /* unregister the audio callback */
       si->m_stream->UnRegisterAudioCallback();
-      si->m_decoder.Destroy();      
+      si->m_decoder.Destroy();
       si->m_stream->Drain(false);
       m_finishing.push_back(si);
       return;
@@ -970,7 +970,7 @@ void PAPlayer::SetTotalTimeInternal(int64_t time)
   CSingleLock lock(m_streamsLock);
   if (!m_currentStream)
     return;
-  
+
   m_currentStream->m_decoder.SetTotalTime(time);
   UpdateGUIData(m_currentStream);
 }
@@ -980,9 +980,9 @@ void PAPlayer::SetTimeInternal(int64_t time)
   CSingleLock lock(m_streamsLock);
   if (!m_currentStream)
     return;
-  
+
   m_currentStream->m_framesSent = time / 1000 * m_currentStream->m_audioFormat.m_sampleRate;
-  
+
   if (m_currentStream->m_stream)
     m_currentStream->m_framesSent += m_currentStream->m_stream->GetDelay() * m_currentStream->m_audioFormat.m_sampleRate;
 }
@@ -1004,7 +1004,7 @@ int64_t PAPlayer::GetTotalTime64()
   total -= m_currentStream->m_startOffset;
   return total;
 }
-                       
+
 void PAPlayer::SetTotalTime(int64_t time)
 {
   m_newForcedTotalTime = time;
diff --git a/xbmc/cores/paplayer/PAPlayer.h b/xbmc/cores/paplayer/PAPlayer.h
index d67d1c2590..6ac4a2fff0 100644
--- a/xbmc/cores/paplayer/PAPlayer.h
+++ b/xbmc/cores/paplayer/PAPlayer.h
@@ -137,7 +137,7 @@ private:
   IAudioCallback*     m_audioCallback;       /* the viz audio callback */
 
   CCriticalSection    m_streamsLock;         /* lock for the stream list */
-  StreamList          m_streams;             /* playing streams */  
+  StreamList          m_streams;             /* playing streams */
   StreamList          m_finishing;           /* finishing streams */
   int                 m_jobCounter;
   CEvent              m_jobEvent;
diff --git a/xbmc/cores/playercorefactory/PlayerCoreFactory.cpp b/xbmc/cores/playercorefactory/PlayerCoreFactory.cpp
index 6e1b862a01..b7b4e98913 100644
--- a/xbmc/cores/playercorefactory/PlayerCoreFactory.cpp
+++ b/xbmc/cores/playercorefactory/PlayerCoreFactory.cpp
@@ -70,7 +70,7 @@ IPlayer* CPlayerCoreFactory::CreatePlayer(const std::string& nameId, IPlayerCall
 {
   CSingleLock lock(m_section);
   size_t idx = GetPlayerIndex(nameId);
-  
+
   if (m_vecPlayerConfigs.empty() || idx > m_vecPlayerConfigs.size())
     return nullptr;
 
@@ -99,7 +99,7 @@ void CPlayerCoreFactory::GetPlayers(std::vector<std::string>&players, const bool
     {
       if (std::find(players.begin(), players.end(), conf->m_name) != players.end())
         continue;
-      
+
       CLog::Log(LOGDEBUG, "CPlayerCoreFactory::GetPlayers: adding player: %s", conf->m_name.c_str());
       players.push_back(conf->m_name);
     }
diff --git a/xbmc/cores/playercorefactory/PlayerSelectionRule.cpp b/xbmc/cores/playercorefactory/PlayerSelectionRule.cpp
index 5f38e04043..987bcbd402 100644
--- a/xbmc/cores/playercorefactory/PlayerSelectionRule.cpp
+++ b/xbmc/cores/playercorefactory/PlayerSelectionRule.cpp
@@ -149,7 +149,7 @@ void CPlayerSelectionRule::GetPlayers(const CFileItem& item, std::vector<std::st
 
     if (CompileRegExp(m_audioCodec, regExp) && !MatchesRegExp(streamDetails.GetAudioCodec(), regExp))
       return;
-    
+
     std::stringstream itoa;
     itoa << streamDetails.GetAudioChannels();
     std::string audioChannelsstr = itoa.str();
diff --git a/xbmc/dbwrappers/Database.cpp b/xbmc/dbwrappers/Database.cpp
index 76838dfff1..bfd10f63d2 100644
--- a/xbmc/dbwrappers/Database.cpp
+++ b/xbmc/dbwrappers/Database.cpp
@@ -31,7 +31,7 @@
 #include "DbUrl.h"
 #include "ServiceBroker.h"
 
-#if defined(HAS_MYSQL) || defined(HAS_MARIADB) 
+#if defined(HAS_MYSQL) || defined(HAS_MARIADB)
 #include "mysqldataset.h"
 #endif
 
@@ -143,7 +143,7 @@ bool CDatabase::ExistsSubQuery::BuildSQL(std::string & strSQL)
       strWhere += " AND ";
     strWhere += where;
   }
-  if (!strWhere.empty())      
+  if (!strWhere.empty())
     strSQL += " WHERE " + strWhere;
 
   strSQL += ")";
diff --git a/xbmc/dbwrappers/Database.h b/xbmc/dbwrappers/Database.h
index 4e31a0fd5f..287cd63b4f 100644
--- a/xbmc/dbwrappers/Database.h
+++ b/xbmc/dbwrappers/Database.h
@@ -43,7 +43,7 @@ public:
     Filter() : fields("*") {};
     explicit Filter(const char *w) : fields("*"), where(w) {};
     explicit Filter(const std::string &w) : fields("*"), where(w) {};
-    
+
     void AppendField(const std::string &strField);
     void AppendJoin(const std::string &strJoin);
     void AppendWhere(const std::string &strWhere, bool combineWithAnd = true);
@@ -66,7 +66,7 @@ public:
     void AppendJoin(const std::string &strJoin);
     void AppendWhere(const std::string &strWhere, bool combineWithAnd = true);
     bool BuildSQL(std::string &strSQL);
-    
+
     std::string tablename;
     std::string param;
     std::string join;
diff --git a/xbmc/dbwrappers/DatabaseQuery.cpp b/xbmc/dbwrappers/DatabaseQuery.cpp
index 63c6377a86..3f70647824 100644
--- a/xbmc/dbwrappers/DatabaseQuery.cpp
+++ b/xbmc/dbwrappers/DatabaseQuery.cpp
@@ -456,7 +456,7 @@ bool CDatabaseQueryRuleCombination::Load(const CVariant &obj, const IDatabaseQue
 {
   if (!obj.isObject() && !obj.isArray())
     return false;
-  
+
   CVariant child;
   if (obj.isObject())
   {
diff --git a/xbmc/dbwrappers/dataset.cpp b/xbmc/dbwrappers/dataset.cpp
index 68fa28b170..0480e6adc9 100644
--- a/xbmc/dbwrappers/dataset.cpp
+++ b/xbmc/dbwrappers/dataset.cpp
@@ -182,7 +182,7 @@ void Dataset::parse_sql(std::string &sql) {
 			       if(isalnum(sql[next_idx])  || sql[next_idx]=='_') {
 			       	   continue;
 			       	}
-			      sql.replace(idx,fpattern.size(),by_what); 	
+			      sql.replace(idx,fpattern.size(),by_what);
 		}//while
     }//for
 
@@ -196,8 +196,8 @@ void Dataset::parse_sql(std::string &sql) {
 			       if(isalnum(sql[next_idx]) || sql[next_idx]=='_') {
 			       	   continue;
 			       	}
-			      sql.replace(idx,fpattern.size(),by_what); 	
-			}//while  
+			      sql.replace(idx,fpattern.size(),by_what);
+			}//while
   } //for
 }
 
@@ -229,7 +229,7 @@ void Dataset::refresh() {
     open();
     seek(row);
   }
-  else open();		
+  else open();
 }
 
 
@@ -295,7 +295,7 @@ void Dataset::edit() {
   edit_object->resize(field_count());
   for (unsigned int i=0; i<fields_object->size(); i++) {
        (*edit_object)[i].props = (*fields_object)[i].props;
-       (*edit_object)[i].val = (*fields_object)[i].val; 
+       (*edit_object)[i].val = (*fields_object)[i].val;
   }
   ds_state = dsEdit;
 }
@@ -315,7 +315,7 @@ void Dataset::deletion() {
 bool Dataset::set_field_value(const char *f_name, const field_value &value) {
   bool found = false;
   if ((ds_state == dsInsert) || (ds_state == dsEdit)) {
-      for (unsigned int i=0; i < fields_object->size(); i++) 
+      for (unsigned int i=0; i < fields_object->size(); i++)
 	if (str_compare((*edit_object)[i].props.name.c_str(), f_name)==0) {
 			     (*edit_object)[i].val = value;
 			     found = true;
@@ -377,7 +377,7 @@ const field_value Dataset::get_field_value(const char *f_name) {
       if (name)
         name++;
 
-      for (unsigned int i=0; i < fields_object->size(); i++) 
+      for (unsigned int i=0; i < fields_object->size(); i++)
         if (str_compare((*fields_object)[i].props.name.c_str(), f_name) == 0 || (name && str_compare((*fields_object)[i].props.name.c_str(), name) == 0)) {
           fieldIndexMap_Entries[fieldIndexMapID].fieldIndex = i;
           return (*fields_object)[i].val;
@@ -419,7 +419,7 @@ const sql_record* Dataset::get_sql_record()
 
 const field_value Dataset::f_old(const char *f_name) {
   if (ds_state != dsInactive)
-    for (int unsigned i=0; i < fields_object->size(); i++) 
+    for (int unsigned i=0; i < fields_object->size(); i++)
       if ((*fields_object)[i].props.name == f_name)
 	return (*fields_object)[i].val;
   field_value fv;
@@ -427,7 +427,7 @@ const field_value Dataset::f_old(const char *f_name) {
 }
 
 int Dataset::str_compare(const char * s1, const char * s2) {
- 	std::string ts1 = s1; 
+ 	std::string ts1 = s1;
  	std::string ts2 = s2;
  	std::string::const_iterator p = ts1.begin();
  	std::string::const_iterator p2 = ts2.begin();
@@ -435,8 +435,8 @@ int Dataset::str_compare(const char * s1, const char * s2) {
  		if (toupper(*p)!=toupper(*p2))
  			return (toupper(*p)<toupper(*p2)) ? -1 : 1;
  		++p;
- 		++p2;		
- 	}	
+ 		++p2;
+ 	}
  	return (ts2.size() == ts1.size())? 0:
  		(ts1.size()<ts2.size())? -1 : 1;
  }
@@ -584,7 +584,7 @@ DbErrors::DbErrors(const char *msg, ...) {
 
 const char * DbErrors::getMsg() {
 	return msg_.c_str();
-	
+
 }
 
 }// namespace
diff --git a/xbmc/dbwrappers/dataset.h b/xbmc/dbwrappers/dataset.h
index 4ab64b6200..3c3e96aac3 100644
--- a/xbmc/dbwrappers/dataset.h
+++ b/xbmc/dbwrappers/dataset.h
@@ -121,11 +121,11 @@ public:
   virtual int status(void) { return DB_CONNECTION_NONE; }
   virtual int setErr(int err_code, const char *qry)=0;
   virtual const char *getErrorMsg(void) { return error.c_str(); }
-	
+
   virtual int connect(bool create) { return DB_COMMAND_OK; }
   virtual int connectFull( const char *newDb, const char *newHost=NULL,
                       const char *newLogin=NULL, const char *newPasswd=NULL,const char *newPort=NULL,
-                      const char *newKey=NULL, const char *newCert=NULL, const char *newCA=NULL, 
+                      const char *newKey=NULL, const char *newCert=NULL, const char *newCA=NULL,
                       const char *newCApath=NULL, const char *newCiphers=NULL, bool newCompression = false);
   virtual void disconnect(void) { active = false; }
   virtual int reset(void) { return DB_COMMAND_OK; }
@@ -196,7 +196,7 @@ protected:
   Database *db;		// info about db connection
   dsStates ds_state;	        // current state
   Fields *fields_object, *edit_object;
-      
+
   /* query results*/
   result_set result;
   result_set exec_res;
@@ -365,7 +365,7 @@ public:
 
 /* func. retrieves a number of fields */
 /* Number of fields in a record */
-  virtual int field_count();       					
+  virtual int field_count();
   virtual int fieldCount();
 /* func. retrieves a field name with 'n' index */
   virtual const char *fieldName(int n);
@@ -459,7 +459,7 @@ public:
 /* Get the column index from a string field_value request */
   bool get_index_map_entry(const char *f_name);
 
-  void set_ds_state(dsStates new_state) {ds_state = new_state;};	
+  void set_ds_state(dsStates new_state) {ds_state = new_state;};
  public:
 /* return ds_state value */
   dsStates get_state() {return ds_state;};
diff --git a/xbmc/dbwrappers/mysqldataset.h b/xbmc/dbwrappers/mysqldataset.h
index cc9323e2ec..feb0c4d442 100644
--- a/xbmc/dbwrappers/mysqldataset.h
+++ b/xbmc/dbwrappers/mysqldataset.h
@@ -140,7 +140,7 @@ public:
 /* destructor */
   ~MysqlDataset() override;
 
-/* set autorefresh boolean value (if true - refresh the data after edit() 
+/* set autorefresh boolean value (if true - refresh the data after edit()
 or insert() operations default = false) */
   void set_autorefresh(bool val);
 
diff --git a/xbmc/dbwrappers/qry_dat.cpp b/xbmc/dbwrappers/qry_dat.cpp
index c0a2af1714..b278673ffa 100644
--- a/xbmc/dbwrappers/qry_dat.cpp
+++ b/xbmc/dbwrappers/qry_dat.cpp
@@ -43,7 +43,7 @@
 
 namespace dbiplus {
 
-//Constructors 
+//Constructors
 field_value::field_value()
 {
   field_type = ft_String;
@@ -56,57 +56,57 @@ field_value::field_value(const char *s):
   field_type = ft_String;
   is_null = false;
 }
-  
+
 field_value::field_value(const bool b) {
-  bool_value = b; 
+  bool_value = b;
   field_type = ft_Boolean;
   is_null = false;
 }
 
 field_value::field_value(const char c) {
-  char_value = c; 
+  char_value = c;
   field_type = ft_Char;
   is_null = false;
 }
-  
+
 field_value::field_value(const short s) {
-  short_value = s; 
+  short_value = s;
   field_type = ft_Short;
   is_null = false;
 }
-  
+
 field_value::field_value(const unsigned short us) {
-  ushort_value = us; 
+  ushort_value = us;
   field_type = ft_UShort;
   is_null = false;
 }
-  
+
 field_value::field_value(const int i) {
-  int_value = i; 
+  int_value = i;
   field_type = ft_Int;
   is_null = false;
 }
-  
+
 field_value::field_value(const unsigned int ui) {
-  uint_value = ui; 
+  uint_value = ui;
   field_type = ft_UInt;
   is_null = false;
 }
-  
+
 field_value::field_value(const float f) {
-  float_value = f; 
+  float_value = f;
   field_type = ft_Float;
   is_null = false;
 }
-  
+
 field_value::field_value(const double d) {
-  double_value = d; 
+  double_value = d;
   field_type = ft_Double;
   is_null = false;
 }
-  
+
 field_value::field_value(const int64_t i) {
-  int64_value = i; 
+  int64_value = i;
   field_type = ft_Int64;
   is_null = false;
 }
@@ -119,7 +119,7 @@ field_value::field_value (const field_value & fv) {
     }
     case ft_Boolean:{
       set_asBool(fv.get_asBool());
-      break;     
+      break;
     }
     case ft_Char: {
       set_asChar(fv.get_asChar());
@@ -163,7 +163,7 @@ field_value::field_value (const field_value & fv) {
 //empty destructor
 field_value::~field_value() = default;
 
-  
+
 //Conversations functions
 std::string field_value::get_asString() const {
     std::string tmp;
@@ -173,7 +173,7 @@ std::string field_value::get_asString() const {
       return tmp;
     }
     case ft_Boolean:{
-      if (bool_value) 
+      if (bool_value)
 	return tmp = "True";
       else
 	return tmp = "False";
@@ -265,7 +265,7 @@ bool field_value::get_asBool() const {
       return false;
     }
   }
-  
+
 
 char field_value::get_asChar() const {
   switch (field_type) {
@@ -273,7 +273,7 @@ char field_value::get_asChar() const {
       return str_value[0];
     }
     case ft_Boolean:{
-      if (bool_value) 
+      if (bool_value)
 	return 'T';
       else
 	return 'F';
@@ -585,7 +585,7 @@ int64_t field_value::get_asInt64() const {
 
 field_value& field_value::operator= (const field_value & fv) {
   if ( this == &fv ) return *this;
-  
+
   is_null = fv.get_isNull();
 
   switch (fv.get_fType()) {
@@ -597,7 +597,7 @@ field_value& field_value::operator= (const field_value & fv) {
     case ft_Boolean:{
       set_asBool(fv.get_asBool());
       return *this;
-      break;     
+      break;
     }
     case ft_Char: {
       set_asChar(fv.get_asChar());
@@ -654,50 +654,50 @@ void field_value::set_asString(const char *s) {
 void field_value::set_asString(const std::string & s) {
   str_value = s;
   field_type = ft_String;}
-  
+
 void field_value::set_asBool(const bool b) {
-  bool_value = b; 
+  bool_value = b;
   field_type = ft_Boolean;}
-  
+
 void field_value::set_asChar(const char c) {
-  char_value = c; 
+  char_value = c;
   field_type = ft_Char;}
-  
+
 void field_value::set_asShort(const short s) {
-  short_value = s; 
+  short_value = s;
   field_type = ft_Short;}
-  
+
 void field_value::set_asUShort(const unsigned short us) {
-  ushort_value = us; 
+  ushort_value = us;
   field_type = ft_UShort;
 }
 
 void field_value::set_asInt(const int i) {
-  int_value = i; 
+  int_value = i;
   field_type = ft_Int;
 }
-  
+
 void field_value::set_asUInt(const unsigned int ui) {
-  int_value = ui; 
+  int_value = ui;
   field_type = ft_UInt;
 }
-  
+
 void field_value::set_asFloat(const float f) {
-  float_value = f; 
+  float_value = f;
   field_type = ft_Float;}
-  
+
 void field_value::set_asDouble(const double d) {
-  double_value = d; 
+  double_value = d;
   field_type = ft_Double;}
 
 void field_value::set_asInt64(const int64_t i) {
-  int64_value = i; 
+  int64_value = i;
   field_type = ft_Int64;}
-  
+
 fType field_value::get_field_type() {
   return field_type;}
 
-  
+
 std::string field_value::gft() {
     std::string tmp;
     switch (field_type) {
@@ -740,4 +740,4 @@ std::string field_value::gft() {
   return tmp;
   }
 
-} //namespace 
+} //namespace
diff --git a/xbmc/dbwrappers/qry_dat.h b/xbmc/dbwrappers/qry_dat.h
index ec8feed84a..da18d03d9a 100644
--- a/xbmc/dbwrappers/qry_dat.h
+++ b/xbmc/dbwrappers/qry_dat.h
@@ -36,7 +36,7 @@
 
 namespace dbiplus {
 
-enum fType { 
+enum fType {
 	ft_String,
 	ft_Boolean,
 	ft_Char,
@@ -127,7 +127,7 @@ public:
   field_value& operator= (const int64_t i)
     {set_asInt64(i); return *this;}
   field_value& operator= (const field_value & fv);
-  
+
   //class ostream;
   friend std::ostream& operator<< (std::ostream& os, const field_value &fv)
   {switch (fv.get_fType()) {
@@ -137,7 +137,7 @@ public:
     }
     case ft_Boolean:{
       return os << fv.get_asBool();
-      break;     
+      break;
     }
     case ft_Char: {
       return os << fv.get_asChar();
@@ -208,7 +208,7 @@ struct field_prop {
 struct field {
   field_prop props;
   field_value val;
-}; 
+};
 
 
 typedef std::vector<field> Fields;
diff --git a/xbmc/dbwrappers/sqlitedataset.cpp b/xbmc/dbwrappers/sqlitedataset.cpp
index 137ff033b2..fe7dcfe236 100644
--- a/xbmc/dbwrappers/sqlitedataset.cpp
+++ b/xbmc/dbwrappers/sqlitedataset.cpp
@@ -3,7 +3,7 @@
  *
  * Project:SQLiteDataset C++ Dynamic Library
  * Module: SQLiteDataset class realisation file
- * Author: Leo Seib      E-Mail: leoseib@web.de 
+ * Author: Leo Seib      E-Mail: leoseib@web.de
  * Begin: 5/04/2002
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -59,7 +59,7 @@ int callback(void* res_ptr,int ncol, char** result,char** cols)
     sql_record *rec = new sql_record;
     rec->resize(ncol);
     for (int i=0; i<ncol; i++)
-    { 
+    {
       field_value &v = rec->at(i);
       if (result[i] == NULL)
       {
@@ -73,7 +73,7 @@ int callback(void* res_ptr,int ncol, char** result,char** cols)
     }
     r->records.push_back(rec);
   }
-  return 0;  
+  return 0;
 }
 
 static int busy_callback(void*, int busyCount)
@@ -86,7 +86,7 @@ static int busy_callback(void*, int busyCount)
 
 SqliteDatabase::SqliteDatabase() {
 
-  active = false;  
+  active = false;
   _in_transaction = false;    // for transaction
 
   error = "Unknown database error";//S_NO_CONNECTION;
@@ -418,7 +418,7 @@ void SqliteDatabase::rollback_transaction() {
   if (active) {
     sqlite3_exec(conn,"rollback",NULL,NULL,NULL);
     _in_transaction = false;
-  }  
+  }
 }
 
 
@@ -502,7 +502,7 @@ void SqliteDataset::make_query(StringList &_sql) {
 
   for (std::list<std::string>::iterator i =_sql.begin(); i!=_sql.end(); ++i) {
   query = *i;
-  char* err=NULL; 
+  char* err=NULL;
   Dataset::parse_sql(query);
   if (db->setErr(sqlite3_exec(this->handle(),query.c_str(),NULL,NULL,&err),query.c_str())!=SQLITE_OK) {
     throw DbErrors(db->getErrorMsg());
@@ -513,7 +513,7 @@ void SqliteDataset::make_query(StringList &_sql) {
   if (db->in_transaction() && autocommit) db->commit_transaction();
 
   active = true;
-  ds_state = dsSelect;    
+  ds_state = dsSelect;
   if (autorefresh)
     refresh();
 
@@ -651,8 +651,8 @@ bool SqliteDataset::query(const std::string &query) {
     std::string qry = query;
     int fs = qry.find("select");
     int fS = qry.find("SELECT");
-    if (!( fs >= 0 || fS >=0))                                 
-         throw DbErrors("MUST be select SQL!"); 
+    if (!( fs >= 0 || fS >=0))
+         throw DbErrors("MUST be select SQL!");
 
   close();
 
@@ -707,7 +707,7 @@ bool SqliteDataset::query(const std::string &query) {
   else
   {
     throw DbErrors(db->getErrorMsg());
-  }  
+  }
 }
 
 void SqliteDataset::open(const std::string &sql) {
@@ -717,7 +717,7 @@ void SqliteDataset::open(const std::string &sql) {
 
 void SqliteDataset::open() {
   if (select_sql.size()) {
-    query(select_sql); 
+    query(select_sql);
   }
   else {
     ds_state = dsInactive;
@@ -777,7 +777,7 @@ void SqliteDataset::prev(void) {
 
 void SqliteDataset::next(void) {
   Dataset::next();
-  if (!eof()) 
+  if (!eof())
       fill_fields();
 }
 
@@ -798,7 +798,7 @@ bool SqliteDataset::seek(int pos) {
   if (ds_state == dsSelect) {
     Dataset::seek(pos);
     fill_fields();
-    return true;  
+    return true;
     }
   return false;
 }
diff --git a/xbmc/dbwrappers/sqlitedataset.h b/xbmc/dbwrappers/sqlitedataset.h
index d0ebccc9a7..fcc725af11 100644
--- a/xbmc/dbwrappers/sqlitedataset.h
+++ b/xbmc/dbwrappers/sqlitedataset.h
@@ -51,7 +51,7 @@ public:
 /* destructor */
   ~SqliteDatabase() override;
 
-  Dataset *CreateDataset() const override; 
+  Dataset *CreateDataset() const override;
 
 /* func. returns connection handle with SQLite-server */
   sqlite3 *getHandle() {  return conn; }
@@ -94,7 +94,7 @@ public:
 /* virtual methods for formatting */
   std::string vprepare(const char *format, va_list args) override;
 
-  bool in_transaction() override {return _in_transaction;}; 	
+  bool in_transaction() override {return _in_transaction;};
 
 };
 
@@ -135,7 +135,7 @@ public:
 /* destructor */
   ~SqliteDataset() override;
 
-/* set autorefresh boolean value (if true - refresh the data after edit() 
+/* set autorefresh boolean value (if true - refresh the data after edit()
 or insert() operations default = false) */
   void set_autorefresh(bool val);
 
diff --git a/xbmc/dialogs/GUIDialogBusy.cpp b/xbmc/dialogs/GUIDialogBusy.cpp
index 6ba1c82793..1b6113b1da 100644
--- a/xbmc/dialogs/GUIDialogBusy.cpp
+++ b/xbmc/dialogs/GUIDialogBusy.cpp
@@ -35,7 +35,7 @@ class CBusyWaiter : public CThread
 public:
   explicit CBusyWaiter(IRunnable *runnable) :
   CThread(runnable, "waiting"), m_done(new CEvent()),  m_runnable(runnable) { }
-  
+
   ~CBusyWaiter()
   {
     StopThread();
@@ -106,7 +106,7 @@ bool CGUIDialogBusy::WaitOnEvent(CEvent &event, unsigned int displaytime /* = 10
           break;
         }
       }
-      
+
       dialog->Close(true);
     }
   }
diff --git a/xbmc/dialogs/GUIDialogCache.cpp b/xbmc/dialogs/GUIDialogCache.cpp
index bd1b3014c9..6ea7632f0d 100644
--- a/xbmc/dialogs/GUIDialogCache.cpp
+++ b/xbmc/dialogs/GUIDialogCache.cpp
@@ -17,7 +17,7 @@
  *  <http://www.gnu.org/licenses/>.
  *
  */
- 
+
 #include "threads/SystemClock.h"
 #include "GUIDialogCache.h"
 #include "ServiceBroker.h"
@@ -49,7 +49,7 @@ CGUIDialogCache::CGUIDialogCache(DWORD dwDelay, const std::string& strHeader, co
     dwDelay = 0;
 
   if(dwDelay == 0)
-    OpenDialog();    
+    OpenDialog();
   else
     m_endtime.Set((unsigned int)dwDelay);
 
@@ -65,7 +65,7 @@ void CGUIDialogCache::Close(bool bForceClose)
   if (m_pDlg && m_pDlg->IsDialogRunning())
     CApplicationMessenger::GetInstance().PostMsg(TMSG_GUI_WINDOW_CLOSE, -1, bForceClose ? 1 : 0, static_cast<void*>(m_pDlg));
 
-  //Set stop, this will kill this object, when thread stops  
+  //Set stop, this will kill this object, when thread stops
   CThread::m_bStop = true;
 }
 
@@ -109,7 +109,7 @@ void CGUIDialogCache::SetMessage(const std::string& strMessage)
     m_pDlg->SetLine(2, CVariant{strMessage});
   }
   m_strLinePrev2 = m_strLinePrev;
-  m_strLinePrev = strMessage; 
+  m_strLinePrev = strMessage;
 }
 
 bool CGUIDialogCache::OnFileCallback(void* pContext, int ipercent, float avgSpeed)
@@ -120,7 +120,7 @@ bool CGUIDialogCache::OnFileCallback(void* pContext, int ipercent, float avgSpee
     m_pDlg->SetPercentage(ipercent);
   }
 
-  if( IsCanceled() ) 
+  if( IsCanceled() )
     return false;
   else
     return true;
@@ -133,12 +133,12 @@ void CGUIDialogCache::Process()
 
   while( true )
   {
-    
+
     { //Section to make the lock go out of scope before sleep
-      
+
       if( CThread::m_bStop ) break;
 
-      try 
+      try
       {
         CSingleLock lock(CServiceBroker::GetWinSystem()->GetGfxContext());
         m_pDlg->Progress();
@@ -152,7 +152,7 @@ void CGUIDialogCache::Process()
         {
           bSentCancel = true;
         }
-        else if( !m_pDlg->IsDialogRunning() && m_endtime.IsTimePast() 
+        else if( !m_pDlg->IsDialogRunning() && m_endtime.IsTimePast()
               && !CServiceBroker::GetGUI()->GetWindowManager().IsWindowActive(WINDOW_DIALOG_YES_NO) )
           OpenDialog();
       }
@@ -166,14 +166,14 @@ void CGUIDialogCache::Process()
   }
 }
 
-void CGUIDialogCache::ShowProgressBar(bool bOnOff) 
+void CGUIDialogCache::ShowProgressBar(bool bOnOff)
 {
   if (m_pDlg)
     m_pDlg->ShowProgressBar(bOnOff);
 }
 
-void CGUIDialogCache::SetPercentage(int iPercentage) 
-{ 
+void CGUIDialogCache::SetPercentage(int iPercentage)
+{
   if (m_pDlg)
     m_pDlg->SetPercentage(iPercentage);
 }
diff --git a/xbmc/dialogs/GUIDialogContextMenu.cpp b/xbmc/dialogs/GUIDialogContextMenu.cpp
index 3d7c79e9aa..0069436bfd 100644
--- a/xbmc/dialogs/GUIDialogContextMenu.cpp
+++ b/xbmc/dialogs/GUIDialogContextMenu.cpp
@@ -272,7 +272,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
 {
   // buttons that are available on both sources and autosourced items
   if (!item) return false;
-  
+
   // the rest of the operations require a valid share
   CMediaSource *share = GetShare(type, item.get());
   if (!share) return false;
@@ -500,7 +500,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
 CMediaSource *CGUIDialogContextMenu::GetShare(const std::string &type, const CFileItem *item)
 {
   VECSOURCES *shares = CMediaSourceSettings::GetInstance().GetSources(type);
-  if (!shares || !item) 
+  if (!shares || !item)
     return nullptr;
   for (unsigned int i = 0; i < shares->size(); i++)
   {
@@ -529,7 +529,7 @@ void CGUIDialogContextMenu::OnWindowLoaded()
 {
   m_coordX = m_posX;
   m_coordY = m_posY;
-  
+
   const CGUIControlGroupList* pGroupList = dynamic_cast<const CGUIControlGroupList *>(GetControl(GROUP_LIST));
   m_backgroundImage = GetControl(BACKGROUND_IMAGE);
   if (m_backgroundImage && pGroupList)
diff --git a/xbmc/dialogs/GUIDialogKaiToast.cpp b/xbmc/dialogs/GUIDialogKaiToast.cpp
index bbc2a48426..118e30a801 100644
--- a/xbmc/dialogs/GUIDialogKaiToast.cpp
+++ b/xbmc/dialogs/GUIDialogKaiToast.cpp
@@ -160,6 +160,6 @@ void CGUIDialogKaiToast::FrameMove()
   // now check if we should exit
   if (CTimeUtils::GetFrameTime() - m_timer > m_toastDisplayTime)
     Close();
-  
+
   CGUIDialog::FrameMove();
 }
diff --git a/xbmc/dialogs/GUIDialogKaiToast.h b/xbmc/dialogs/GUIDialogKaiToast.h
index a516159995..3724200eb9 100644
--- a/xbmc/dialogs/GUIDialogKaiToast.h
+++ b/xbmc/dialogs/GUIDialogKaiToast.h
@@ -64,7 +64,7 @@ protected:
 
   unsigned int m_toastDisplayTime;
   unsigned int m_toastMessageTime;
-  
+
   static TOASTQUEUE m_notifications;
   static CCriticalSection m_critical;
 };
diff --git a/xbmc/dialogs/GUIDialogKeyboardGeneric.cpp b/xbmc/dialogs/GUIDialogKeyboardGeneric.cpp
index a4b3d5f012..4779849f4f 100644
--- a/xbmc/dialogs/GUIDialogKeyboardGeneric.cpp
+++ b/xbmc/dialogs/GUIDialogKeyboardGeneric.cpp
@@ -396,7 +396,7 @@ void CGUIDialogKeyboardGeneric::Backspace()
     g_charsetConverter.utf8ToW(m_hzcode, tmp);
     tmp.erase(tmp.length() - 1, 1);
     g_charsetConverter.wToUTF8(tmp, m_hzcode);
-    
+
     switch (m_codingtable->GetType())
     {
     case IInputCodingTable::TYPE_WORD_LIST:
diff --git a/xbmc/dialogs/GUIDialogMediaFilter.cpp b/xbmc/dialogs/GUIDialogMediaFilter.cpp
index 0689fbf616..3e4ef1fa3b 100644
--- a/xbmc/dialogs/GUIDialogMediaFilter.cpp
+++ b/xbmc/dialogs/GUIDialogMediaFilter.cpp
@@ -229,10 +229,10 @@ void CGUIDialogMediaFilter::OnSettingChanged(std::shared_ptr<const CSetting> set
   std::map<std::string, Filter>::iterator it = m_filters.find(setting->GetId());
   if (it == m_filters.end())
     return;
-  
+
   bool remove = false;
   Filter& filter = it->second;
- 
+
   if (filter.controlType == "edit")
   {
     std::string value = setting->ToString();
@@ -354,7 +354,7 @@ void CGUIDialogMediaFilter::SetupView()
   CGUIDialogSettingsManualBase::SetupView();
 
   // set the heading label based on the media type
-  uint32_t localizedMediaId = 0; 
+  uint32_t localizedMediaId = 0;
   if (m_mediaType == "movies")
     localizedMediaId = 20342;
   else if (m_mediaType == "tvshows")
@@ -420,7 +420,7 @@ void CGUIDialogMediaFilter::InitializeSettings()
       }
     }
 
-    std::string settingId = StringUtils::Format("filter.%s.%d", filter.mediaType.c_str(), filter.field); 
+    std::string settingId = StringUtils::Format("filter.%s.%d", filter.mediaType.c_str(), filter.field);
     if (filter.controlType == "edit")
     {
       CVariant data;
@@ -657,7 +657,7 @@ int CGUIDialogMediaFilter::GetItems(const Filter &filter, std::vector<std::strin
     CDatabase::Filter dbfilter;
     dbfilter.where = tmpFilter.GetWhereClause(videodb, playlists);
 
-    VIDEODB_CONTENT_TYPE type = VIDEODB_CONTENT_MOVIES;    
+    VIDEODB_CONTENT_TYPE type = VIDEODB_CONTENT_MOVIES;
     if (m_mediaType == "tvshows")
       type = VIDEODB_CONTENT_TVSHOWS;
     else if (m_mediaType == "episodes")
@@ -687,7 +687,7 @@ int CGUIDialogMediaFilter::GetItems(const Filter &filter, std::vector<std::strin
     std::set<std::string> playlists;
     CDatabase::Filter dbfilter;
     dbfilter.where = tmpFilter.GetWhereClause(musicdb, playlists);
-    
+
     if (filter.field == FieldGenre)
       musicdb.GetGenresNav(m_dbUrl->ToString(), selectItems, dbfilter, countOnly);
     else if (filter.field == FieldArtist || filter.field == FieldAlbumArtist)
@@ -824,7 +824,7 @@ void CGUIDialogMediaFilter::GetRange(const Filter &filter, int &min, int &interv
     if (m_mediaType == "episodes")
     {
       std::string field = StringUtils::Format("CAST(strftime(\"%%s\", c%02d) AS INTEGER)", VIDEODB_ID_EPISODE_AIRED);
-      
+
       GetMinMax("episode_view", field, min, max);
       interval = 60 * 60 * 24 * 7; // 1 week
     }
diff --git a/xbmc/dialogs/GUIDialogMediaSource.cpp b/xbmc/dialogs/GUIDialogMediaSource.cpp
index 671695eccd..cc7447ff4c 100644
--- a/xbmc/dialogs/GUIDialogMediaSource.cpp
+++ b/xbmc/dialogs/GUIDialogMediaSource.cpp
@@ -144,14 +144,14 @@ bool CGUIDialogMediaSource::ShowAndAddMediaSource(const std::string &type)
   dialog->Open();
   bool confirmed(dialog->IsConfirmed());
   if (confirmed)
-  { 
+  {
     // Add this media source
     // Get unique source name
     std::string strName = dialog->GetUniqueMediaSourceName();
 
-    CMediaSource share;      
+    CMediaSource share;
     share.FromNameAndPaths(type, strName, dialog->GetPaths());
-    if (dialog->m_paths->Size() > 0) 
+    if (dialog->m_paths->Size() > 0)
       share.m_strThumbnailImage = dialog->m_paths->Get(0)->GetArt("thumb");
     CMediaSourceSettings::GetInstance().AddShare(type, share);
     OnMediaSourceChanged(type, "", share);
@@ -185,7 +185,7 @@ bool CGUIDialogMediaSource::ShowAndEditMediaSource(const std::string &type, cons
   dialog->Open();
   bool confirmed(dialog->IsConfirmed());
   if (confirmed)
-  { 
+  {
     // Update media source
     // Get unique new source name when changed
     std::string strName(dialog->m_name);
@@ -216,7 +216,7 @@ std::string CGUIDialogMediaSource::GetUniqueMediaSourceName()
       if (StringUtils::EqualsNoCase((*pShares)[i].strName, strName))
         break;
     }
-    if (i < pShares->size())      
+    if (i < pShares->size())
       // found a match -  try next
       strName = StringUtils::Format("%s (%i)", m_name.c_str(), j++);
     else
@@ -227,7 +227,7 @@ std::string CGUIDialogMediaSource::GetUniqueMediaSourceName()
 
 void CGUIDialogMediaSource::OnMediaSourceChanged(const std::string& type, const std::string& oldName, const CMediaSource& share)
 {
-  // Processing once media source added/edited - library scraping and scanning 
+  // Processing once media source added/edited - library scraping and scanning
   if (!StringUtils::StartsWithNoCase(share.strPath, "rss://") &&
     !StringUtils::StartsWithNoCase(share.strPath, "rsss://") &&
     !StringUtils::StartsWithNoCase(share.strPath, "upnp://"))
@@ -459,8 +459,8 @@ void CGUIDialogMediaSource::OnOK()
   CMediaSource share;
   share.FromNameAndPaths(m_type, m_name, GetPaths());
 
-  if (StringUtils::StartsWithNoCase(share.strPath, "plugin://") || 
-    CDirectory::GetDirectory(share.strPath, items, "", DIR_FLAG_NO_FILE_DIRS | DIR_FLAG_ALLOW_PROMPT) || 
+  if (StringUtils::StartsWithNoCase(share.strPath, "plugin://") ||
+    CDirectory::GetDirectory(share.strPath, items, "", DIR_FLAG_NO_FILE_DIRS | DIR_FLAG_ALLOW_PROMPT) ||
     CGUIDialogYesNo::ShowAndGetInput(CVariant{ 1001 }, CVariant{ 1025 }))
   {
     m_confirmed = true;
diff --git a/xbmc/dialogs/GUIDialogNumeric.cpp b/xbmc/dialogs/GUIDialogNumeric.cpp
index 4c9592b12c..433e28c466 100644
--- a/xbmc/dialogs/GUIDialogNumeric.cpp
+++ b/xbmc/dialogs/GUIDialogNumeric.cpp
@@ -121,7 +121,7 @@ bool CGUIDialogNumeric::OnAction(const CAction &action)
   else if (action.GetID() >= REMOTE_0 && action.GetID() <= REMOTE_9)
     OnNumber(action.GetID() - REMOTE_0);
   else if (action.GetID() >= KEY_VKEY && action.GetID() < KEY_ASCII)
-  { 
+  {
     // input from the keyboard (vkey, not ascii)
     uint8_t b = action.GetID() & 0xFF;
     if (b == XBMCVK_LEFT)
@@ -477,7 +477,7 @@ std::string CGUIDialogNumeric::GetOutputString() const
   case INPUT_PASSWORD:
     return m_number;
   }
-  
+
   //should never get here
   return std::string();
 }
@@ -732,7 +732,7 @@ void CGUIDialogNumeric::HandleInputIP(uint32_t num)
   if (m_ip[m_block] > 25 || (m_ip[m_block] == 0 && num == 0))
   {
     ++m_block;
-    if (m_block > 3) 
+    if (m_block > 3)
       m_block = 0;
     m_dirty = false;
   }
@@ -741,7 +741,7 @@ void CGUIDialogNumeric::HandleInputIP(uint32_t num)
 }
 
 void CGUIDialogNumeric::HandleInputDate(uint32_t num)
-{ 
+{
   if (m_block == 0) // day of month
   {
     if (m_dirty && (m_datetime.wDay < 3 || num < 2))
@@ -801,7 +801,7 @@ void CGUIDialogNumeric::HandleInputDate(uint32_t num)
 }
 
 void CGUIDialogNumeric::HandleInputSeconds(uint32_t num)
-{ 
+{
   if (m_block == 0) // hour
   {
     if (m_dirty) // have input the first digit
@@ -862,7 +862,7 @@ void CGUIDialogNumeric::HandleInputSeconds(uint32_t num)
 }
 
 void CGUIDialogNumeric::HandleInputTime(uint32_t num)
-{ 
+{
   if (m_block == 0) // hour
   {
     if (m_dirty) // have input the first digit
diff --git a/xbmc/dialogs/GUIDialogOK.cpp b/xbmc/dialogs/GUIDialogOK.cpp
index 6992b138c3..ec20c84060 100644
--- a/xbmc/dialogs/GUIDialogOK.cpp
+++ b/xbmc/dialogs/GUIDialogOK.cpp
@@ -63,7 +63,7 @@ bool CGUIDialogOK::ShowAndGetInput(CVariant heading, CVariant text)
 bool CGUIDialogOK::ShowAndGetInput(CVariant heading, CVariant line0, CVariant line1, CVariant line2)
 {
   CGUIDialogOK *dialog = CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIDialogOK>(WINDOW_DIALOG_OK);
-  if (!dialog) 
+  if (!dialog)
     return false;
   dialog->SetHeading(heading);
   dialog->SetLine(0, line0);
diff --git a/xbmc/dialogs/GUIDialogProgress.cpp b/xbmc/dialogs/GUIDialogProgress.cpp
index 96a891738d..6c44dfbf15 100644
--- a/xbmc/dialogs/GUIDialogProgress.cpp
+++ b/xbmc/dialogs/GUIDialogProgress.cpp
@@ -63,7 +63,7 @@ void CGUIDialogProgress::Open(const std::string &param /* = "" */)
     CSingleLock lock(CServiceBroker::GetWinSystem()->GetGfxContext());
     ShowProgressBar(true);
   }
-  
+
   CGUIDialog::Open_Internal(false, param);
 
   while (m_active && IsAnimating(ANIM_TYPE_WINDOW_OPEN))
diff --git a/xbmc/dialogs/GUIDialogProgress.h b/xbmc/dialogs/GUIDialogProgress.h
index 4fd47a1241..c7f6fac283 100644
--- a/xbmc/dialogs/GUIDialogProgress.h
+++ b/xbmc/dialogs/GUIDialogProgress.h
@@ -39,10 +39,10 @@ public:
   void SetPercentage(int iPercentage);
   int GetPercentage() const { return m_percentage; };
   void ShowProgressBar(bool bOnOff);
-  
+
   /*! \brief Wait for the progress dialog to be closed or canceled, while regularly
    rendering to allow for pointer movement or progress to be shown. Used when showing
-   the progress of a process that is taking place on a separate thread and may be 
+   the progress of a process that is taking place on a separate thread and may be
    reporting progress infrequently.
    \param progresstime the time in ms to wait between rendering the dialog (defaults to 10ms)
    \return true if the dialog is closed, false if the user cancels early.
diff --git a/xbmc/dialogs/GUIDialogSelect.cpp b/xbmc/dialogs/GUIDialogSelect.cpp
index 54ed00862b..56ffc92019 100644
--- a/xbmc/dialogs/GUIDialogSelect.cpp
+++ b/xbmc/dialogs/GUIDialogSelect.cpp
@@ -242,7 +242,7 @@ void CGUIDialogSelect::Sort(bool bSortOrder /*=true*/)
 void CGUIDialogSelect::SetSelected(int iSelected)
 {
   if (iSelected < 0 || iSelected >= (int)m_vecList->Size() ||
-      m_vecList->Get(iSelected).get() == NULL) 
+      m_vecList->Get(iSelected).get() == NULL)
     return;
 
   // only set m_iSelected if there is no multi-select
@@ -324,7 +324,7 @@ void CGUIDialogSelect::OnInitWindow()
 
   SET_CONTROL_LABEL(CONTROL_NUMBER_OF_ITEMS, StringUtils::Format("%i %s",
       m_vecList->Size(), g_localizeStrings.Get(127).c_str()));
-  
+
   if (m_multiSelection)
     EnableButton(true, 186);
 
diff --git a/xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp b/xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp
index c3b980dd1e..1156b99c88 100644
--- a/xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp
+++ b/xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp
@@ -214,7 +214,7 @@ void CGUIDialogSmartPlaylistEditor::OnPopupMenu(int item)
 }
 
 void CGUIDialogSmartPlaylistEditor::OnRuleList(int item)
-{ 
+{
   if (item < 0 || item > static_cast<int>(m_playlist.m_ruleCombination.m_rules.size()))
     return;
   if (item == static_cast<int>(m_playlist.m_ruleCombination.m_rules.size()))
@@ -335,7 +335,7 @@ void CGUIDialogSmartPlaylistEditor::OnType()
   int newSelected = dialog->GetSelectedItem();
   if (!dialog->IsConfirmed() || newSelected < 0 || allowedTypes[newSelected] == ConvertType(m_playlist.GetType()))
     return;
- 
+
   m_playlist.SetType(ConvertType(allowedTypes[newSelected]));
   UpdateButtons();
 }
@@ -398,7 +398,7 @@ void CGUIDialogSmartPlaylistEditor::OnGroupMixed()
 void CGUIDialogSmartPlaylistEditor::UpdateButtons()
 {
   CONTROL_ENABLE(CONTROL_OK); // always enabled since we can have no rules -> match everything (as we do with default partymode playlists)
-  
+
   if (m_mode == "partyvideo" || m_mode == "partymusic")
   {
     SET_CONTROL_LABEL2(CONTROL_NAME, g_localizeStrings.Get(16035));
@@ -406,7 +406,7 @@ void CGUIDialogSmartPlaylistEditor::UpdateButtons()
   }
   else
     SET_CONTROL_LABEL2(CONTROL_NAME, m_playlist.m_playlistName);
-  
+
   UpdateRuleControlButtons();
 
   if (m_playlist.m_ruleCombination.GetType() == CSmartPlaylistRuleCombination::CombinationOr)
diff --git a/xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp b/xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp
index 4ff8e88142..3b47371416 100644
--- a/xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp
+++ b/xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp
@@ -311,7 +311,7 @@ void CGUIDialogSmartPlaylistRule::OnBrowse()
       sources.insert(sources.end(),sources2.begin(),sources2.end());
     }
     g_mediaManager.GetLocalDrives(sources);
-    
+
     std::string path = m_rule.GetParameter();
     CGUIDialogFileBrowser::ShowAndGetDirectory(sources, g_localizeStrings.Get(657), path, false);
     if (!m_rule.m_parameter.empty())
@@ -484,7 +484,7 @@ void CGUIDialogSmartPlaylistRule::OnOperator()
   // check if selection has changed
   if (!dialog->IsConfirmed() || newSelected < 0)
     return;
- 
+
   m_rule.m_operator = (CDatabaseQueryRule::SEARCH_OPERATOR)std::get<1>(labels[newSelected]);
   UpdateButtons();
 }
diff --git a/xbmc/dialogs/GUIDialogYesNo.cpp b/xbmc/dialogs/GUIDialogYesNo.cpp
index 0260c8d826..7112b054d0 100644
--- a/xbmc/dialogs/GUIDialogYesNo.cpp
+++ b/xbmc/dialogs/GUIDialogYesNo.cpp
@@ -187,7 +187,7 @@ int CGUIDialogYesNo::ShowAndGetInput(const KODI::MESSAGING::HELPERS::DialogYesNo
     SetAutoClose(options.autoclose);
   m_bCanceled = false;
   m_bCustom = false;
-  
+
   for (size_t i = 0; i < 3; ++i)
   {
     if (!options.lines[i].isNull())
diff --git a/xbmc/filesystem/AddonsDirectory.h b/xbmc/filesystem/AddonsDirectory.h
index 5244172ad2..c5cf72fd25 100644
--- a/xbmc/filesystem/AddonsDirectory.h
+++ b/xbmc/filesystem/AddonsDirectory.h
@@ -26,7 +26,7 @@
 class CURL;
 typedef std::shared_ptr<CFileItem> CFileItemPtr;
 
-namespace XFILE 
+namespace XFILE
 {
 
   /*!
@@ -59,7 +59,7 @@ namespace XFILE
 
     static void GenerateAddonListing(const CURL &path, const ADDON::VECADDONS& addons, CFileItemList &items, const std::string label);
     static CFileItemPtr FileItemFromAddon(const ADDON::AddonPtr &addon, const std::string& path, bool folder = false);
-  
+
     /*! \brief Returns true if `path` is a path or subpath of the repository directory, otherwise false */
     static bool IsRepoDirectory(const CURL& path);
 
diff --git a/xbmc/filesystem/BlurayDirectory.cpp b/xbmc/filesystem/BlurayDirectory.cpp
index 4291c500b4..f658bb62ca 100644
--- a/xbmc/filesystem/BlurayDirectory.cpp
+++ b/xbmc/filesystem/BlurayDirectory.cpp
@@ -152,7 +152,7 @@ void CBlurayDirectory::GetTitles(bool main, CFileItemList &items)
   std::vector<BLURAY_TITLE_INFO*> titleList;
   uint64_t minDuration = 0;
 
-  // Searching for a user provided list of playlists. 
+  // Searching for a user provided list of playlists.
   if (main)
     titleList = GetUserPlaylists();
 
@@ -275,7 +275,7 @@ bool CBlurayDirectory::InitializeBluray(const std::string &root)
   std::string langCode;
   g_LangCodeExpander.ConvertToISO6392T(g_langInfo.GetDVDMenuLanguage(), langCode);
   m_dll->bd_set_player_setting_str(m_bd, BLURAY_PLAYER_SETTING_MENU_LANG, langCode.c_str());
-  
+
   if (!m_dll->bd_open_files(m_bd, const_cast<std::string*>(&root), DllLibbluray::dir_open, DllLibbluray::file_open))
   {
     CLog::Log(LOGERROR, "CBlurayDirectory::InitializeBluray - failed to open %s", CURL::GetRedacted(root).c_str());
diff --git a/xbmc/filesystem/CircularCache.h b/xbmc/filesystem/CircularCache.h
index f0ede62777..178238c104 100644
--- a/xbmc/filesystem/CircularCache.h
+++ b/xbmc/filesystem/CircularCache.h
@@ -44,7 +44,7 @@ public:
     bool Reset(int64_t pos, bool clearAnyway=true) override;
 
     int64_t CachedDataEndPosIfSeekTo(int64_t iFilePosition) override;
-    int64_t CachedDataEndPos() override; 
+    int64_t CachedDataEndPos() override;
     bool IsCachedPosition(int64_t iFilePosition) override;
 
     CCacheStrategy *CreateNew() override;
diff --git a/xbmc/filesystem/CurlFile.cpp b/xbmc/filesystem/CurlFile.cpp
index 3fe96440f9..f11350d63e 100644
--- a/xbmc/filesystem/CurlFile.cpp
+++ b/xbmc/filesystem/CurlFile.cpp
@@ -360,7 +360,7 @@ long CCurlFile::CReadState::Connect(unsigned int size)
     long response;
     if (CURLE_OK == g_curlInterface.easy_getinfo(m_easyHandle, CURLINFO_RESPONSE_CODE, &response))
       return response;
-    else 
+    else
       return -1;
   }
 
@@ -1128,7 +1128,7 @@ bool CCurlFile::OpenForWrite(const CURL& url, bool bOverWrite)
 
   assert(m_state->m_multiHandle);
 
-  SetCommonOptions(m_state); 
+  SetCommonOptions(m_state);
   g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_UPLOAD, 1);
 
   g_curlInterface.multi_add_handle(m_state->m_multiHandle, m_state->m_easyHandle);
@@ -1354,7 +1354,7 @@ int64_t CCurlFile::Seek(int64_t iFilePosition, int iWhence)
     {
       m_seekable = false;
       return -1;
-    } 
+    }
   }
 
   SetCorrectHeaders(m_state);
@@ -1401,7 +1401,7 @@ int CCurlFile::Stat(const CURL& url, struct __stat64* buffer)
   SetRequestHeaders(m_state);
   g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_TIMEOUT, g_advancedSettings.m_curlconnecttimeout);
   g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_NOBODY, 1);
-  g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_FILETIME , 1); 
+  g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_FILETIME , 1);
 
   if(url2.IsProtocol("ftp"))
   {
@@ -1421,8 +1421,8 @@ int CCurlFile::Stat(const CURL& url, struct __stat64* buffer)
       return -1;
   }
 
-  if(result == CURLE_GOT_NOTHING 
-  || result == CURLE_HTTP_RETURNED_ERROR 
+  if(result == CURLE_GOT_NOTHING
+  || result == CURLE_HTTP_RETURNED_ERROR
   || result == CURLE_RECV_ERROR /* some silly shoutcast servers */ )
   {
     /* some http servers and shoutcast servers don't give us any data on a head request */
diff --git a/xbmc/filesystem/CurlFile.h b/xbmc/filesystem/CurlFile.h
index e7b53bcda3..52bd6b0b91 100644
--- a/xbmc/filesystem/CurlFile.h
+++ b/xbmc/filesystem/CurlFile.h
@@ -46,7 +46,7 @@ namespace XFILE
         PROXY_SOCKS5,
         PROXY_SOCKS5_REMOTE,
       } ProxyType;
-    
+
     public:
       CCurlFile();
       ~CCurlFile() override;
diff --git a/xbmc/filesystem/DAVCommon.cpp b/xbmc/filesystem/DAVCommon.cpp
index b2153a3a85..a574c51555 100644
--- a/xbmc/filesystem/DAVCommon.cpp
+++ b/xbmc/filesystem/DAVCommon.cpp
@@ -20,7 +20,7 @@
 
 #include "DAVCommon.h"
 #include "utils/StringUtils.h"
-#include "utils/log.h"   
+#include "utils/log.h"
 
 using namespace XFILE;
 
diff --git a/xbmc/filesystem/DAVDirectory.cpp b/xbmc/filesystem/DAVDirectory.cpp
index 85f7a3be09..ea984930a6 100644
--- a/xbmc/filesystem/DAVDirectory.cpp
+++ b/xbmc/filesystem/DAVDirectory.cpp
@@ -92,7 +92,7 @@ void CDAVDirectory::ParseResponse(const TiXmlElement *pElement, CFileItem &item)
                 strptime(pPropChild->FirstChild()->Value(), "%Y-%m-%dT%T", &timeDate);
                 item.m_dateTime = mktime(&timeDate);
               }
-              else 
+              else
               if (CDAVCommon::ValueWithoutNamespace(pPropChild, "resourcetype"))
               {
                 if (CDAVCommon::ValueWithoutNamespace(pPropChild->FirstChild(), "collection"))
@@ -195,7 +195,7 @@ bool CDAVDirectory::Create(const CURL& url)
   std::string strRequest = "MKCOL";
 
   dav.SetCustomRequest(strRequest);
- 
+
   if (!dav.Execute(url))
   {
     CLog::Log(LOGERROR, "%s - Unable to create dav directory (%s) - %d", __FUNCTION__, url.GetRedacted().c_str(), dav.GetLastResponseCode());
@@ -226,7 +226,7 @@ bool CDAVDirectory::Remove(const CURL& url)
   std::string strRequest = "DELETE";
 
   dav.SetCustomRequest(strRequest);
- 
+
   if (!dav.Execute(url))
   {
     CLog::Log(LOGERROR, "%s - Unable to delete dav directory (%s) - %d", __FUNCTION__, url.GetRedacted().c_str(), dav.GetLastResponseCode());
diff --git a/xbmc/filesystem/DAVFile.cpp b/xbmc/filesystem/DAVFile.cpp
index ad6fbc6583..eaf088b95a 100644
--- a/xbmc/filesystem/DAVFile.cpp
+++ b/xbmc/filesystem/DAVFile.cpp
@@ -87,7 +87,7 @@ bool CDAVFile::Execute(const CURL& url)
       {
         std::string sRetCode = CDAVCommon::GetStatusTag(pChild->ToElement());
         CRegExp rxCode;
-        rxCode.RegComp("HTTP/1\\.1\\s(\\d+)\\s.*"); 
+        rxCode.RegComp("HTTP/1\\.1\\s(\\d+)\\s.*");
         if (rxCode.RegFind(sRetCode) >= 0)
         {
           if (rxCode.GetSubCount())
@@ -114,7 +114,7 @@ bool CDAVFile::Delete(const CURL& url)
   std::string strRequest = "DELETE";
 
   dav.SetCustomRequest(strRequest);
- 
+
   CLog::Log(LOGDEBUG, "CDAVFile::Delete - Execute DELETE (%s)", url.GetRedacted().c_str());
   if (!dav.Execute(url))
   {
diff --git a/xbmc/filesystem/Directory.cpp b/xbmc/filesystem/Directory.cpp
index 6858c96013..eccdc0f7b1 100644
--- a/xbmc/filesystem/Directory.cpp
+++ b/xbmc/filesystem/Directory.cpp
@@ -224,7 +224,7 @@ bool CDirectory::GetDirectory(const CURL& url, std::shared_ptr<IDirectory> pDire
       if (CPasswordManager::GetInstance().IsURLSupported(realURL))
       {
         bool hide = false;
-        // for explicitly credentials 
+        // for explicitly credentials
         if (!realURL.GetUserName().empty())
         {
           // credentials was changed i.e. were stored in the password
diff --git a/xbmc/filesystem/DirectoryHistory.cpp b/xbmc/filesystem/DirectoryHistory.cpp
index 2a29883bd7..ab3b180250 100644
--- a/xbmc/filesystem/DirectoryHistory.cpp
+++ b/xbmc/filesystem/DirectoryHistory.cpp
@@ -50,10 +50,10 @@ void CDirectoryHistory::SetSelectedItem(const std::string& strSelectedItem, cons
 {
   if (strSelectedItem.empty())
     return;
-  
+
   std::string strDir = preparePath(strDirectory);
   std::string strItem = preparePath(strSelectedItem, false);
-  
+
   HistoryMap::iterator iter = m_vecHistory.find(strDir);
   if (iter != m_vecHistory.end())
   {
diff --git a/xbmc/filesystem/DirectoryHistory.h b/xbmc/filesystem/DirectoryHistory.h
index 67183fcbbb..c3a8b36da0 100644
--- a/xbmc/filesystem/DirectoryHistory.h
+++ b/xbmc/filesystem/DirectoryHistory.h
@@ -47,7 +47,7 @@ public:
     std::string m_strPath;
     std::string m_strFilterPath;
   };
-  
+
   CDirectoryHistory() = default;
   virtual ~CDirectoryHistory();
 
@@ -71,7 +71,7 @@ public:
 
 private:
   static std::string preparePath(const std::string &strDirectory, bool tolower = true);
-  
+
   typedef std::map<std::string, CHistoryItem> HistoryMap;
   HistoryMap m_vecHistory;
   std::vector<CPathHistoryItem> m_vecPathHistory; ///< History of traversed directories
diff --git a/xbmc/filesystem/DllLibNfs.h b/xbmc/filesystem/DllLibNfs.h
index f2495e3cff..bbce0c4d27 100644
--- a/xbmc/filesystem/DllLibNfs.h
+++ b/xbmc/filesystem/DllLibNfs.h
@@ -28,7 +28,7 @@
 #endif
 #ifdef __cplusplus
 extern "C" {
-#endif  
+#endif
 #include <nfsc/libnfs.h>
 #ifdef __cplusplus
 }
@@ -53,17 +53,17 @@ public:
   virtual struct nfs_server_list *nfs_find_local_servers(void)=0;
   virtual void   free_nfs_srvr_list(struct nfs_server_list *srv)=0;
   virtual struct nfs_context *nfs_init_context(void)=0;
-  virtual void nfs_destroy_context(struct nfs_context *nfs)=0;  
-  virtual uint64_t nfs_get_readmax(struct nfs_context *nfs)=0;  
+  virtual void nfs_destroy_context(struct nfs_context *nfs)=0;
+  virtual uint64_t nfs_get_readmax(struct nfs_context *nfs)=0;
   virtual uint64_t nfs_get_writemax(struct nfs_context *nfs)=0;
-  virtual char *nfs_get_error(struct nfs_context *nfs)=0;  
+  virtual char *nfs_get_error(struct nfs_context *nfs)=0;
   virtual int nfs_close(struct nfs_context *nfs,     struct nfsfh *nfsfh)=0;
-  virtual int nfs_fsync(struct nfs_context *nfs,     struct nfsfh *nfsfh)=0;  
+  virtual int nfs_fsync(struct nfs_context *nfs,     struct nfsfh *nfsfh)=0;
   virtual int nfs_mkdir(struct nfs_context *nfs,     const char *path)=0;
   virtual int nfs_rmdir(struct nfs_context *nfs,     const char *path)=0;
   virtual int nfs_unlink(struct nfs_context *nfs,    const char *path)=0;
-  virtual void nfs_closedir(struct nfs_context *nfs,      struct nfsdir *nfsdir)=0;      
-  virtual struct nfsdirent *nfs_readdir(struct nfs_context *nfs, struct nfsdir *nfsdir)=0;  
+  virtual void nfs_closedir(struct nfs_context *nfs,      struct nfsdir *nfsdir)=0;
+  virtual struct nfsdirent *nfs_readdir(struct nfs_context *nfs, struct nfsdir *nfsdir)=0;
   virtual int nfs_mount(struct nfs_context *nfs,     const char *server,   const char *exportname)=0;
   virtual int nfs_stat(struct nfs_context *nfs,      const char *path,     NFSSTAT *st)=0;
   virtual int nfs_fstat(struct nfs_context *nfs,     struct nfsfh *nfsfh,  NFSSTAT *st)=0;
@@ -78,14 +78,14 @@ public:
   virtual int nfs_utime(struct nfs_context *nfs,     const char *path,     struct utimbuf *times)=0;
   virtual int nfs_symlink(struct nfs_context *nfs,   const char *oldpath,  const char *newpath)=0;
   virtual int nfs_rename(struct nfs_context *nfs,    const char *oldpath,  const char *newpath)=0;
-  virtual int nfs_link(struct nfs_context *nfs,      const char *oldpath,  const char *newpath)=0;  
+  virtual int nfs_link(struct nfs_context *nfs,      const char *oldpath,  const char *newpath)=0;
   virtual int nfs_readlink(struct nfs_context *nfs,  const char *path,     char *buf,    int bufsize)=0;
   virtual int nfs_chown(struct nfs_context *nfs,     const char *path,     int uid,      int gid)=0;
   virtual int nfs_fchown(struct nfs_context *nfs,    struct nfsfh *nfsfh,  int uid,      int gid)=0;
-  virtual int nfs_open(struct nfs_context *nfs,      const char *path,     int mode,     struct nfsfh **nfsfh)=0;  
-  virtual int nfs_read(struct nfs_context *nfs,      struct nfsfh *nfsfh,  uint64_t count, char *buf)=0;  
+  virtual int nfs_open(struct nfs_context *nfs,      const char *path,     int mode,     struct nfsfh **nfsfh)=0;
+  virtual int nfs_read(struct nfs_context *nfs,      struct nfsfh *nfsfh,  uint64_t count, char *buf)=0;
   virtual int nfs_write(struct nfs_context *nfs,     struct nfsfh *nfsfh,  uint64_t count, char *buf)=0;
-  virtual int nfs_creat(struct nfs_context *nfs,     const char *path,     int mode,     struct nfsfh **nfsfh)=0;  
+  virtual int nfs_creat(struct nfs_context *nfs,     const char *path,     int mode,     struct nfsfh **nfsfh)=0;
   virtual int nfs_pread(struct nfs_context *nfs,     struct nfsfh *nfsfh,  uint64_t offset, uint64_t count, char *buf)=0;
   virtual int nfs_pwrite(struct nfs_context *nfs,    struct nfsfh *nfsfh,  uint64_t offset, uint64_t count, char *buf)=0;
   virtual int nfs_lseek(struct nfs_context *nfs,     struct nfsfh *nfsfh,  uint64_t offset, int whence,   uint64_t *current_offset)=0;
@@ -101,15 +101,15 @@ class DllLibNfs : public DllDynamic, DllLibNfsInterface
   DEFINE_METHOD1(void,    mount_free_export_list,           (struct exportnode *p1))
   DEFINE_METHOD1(void,    nfs_destroy_context,              (struct nfs_context *p1))
   DEFINE_METHOD1(uint64_t,  nfs_get_readmax,                  (struct nfs_context *p1))
-  DEFINE_METHOD1(uint64_t,  nfs_get_writemax,                 (struct nfs_context *p1)) 
-  DEFINE_METHOD1(char *,  nfs_get_error,                    (struct nfs_context *p1))    
+  DEFINE_METHOD1(uint64_t,  nfs_get_writemax,                 (struct nfs_context *p1))
+  DEFINE_METHOD1(char *,  nfs_get_error,                    (struct nfs_context *p1))
   DEFINE_METHOD2(struct nfsdirent *, nfs_readdir,           (struct nfs_context *p1, struct nfsdir *p2))
   DEFINE_METHOD2(int, nfs_fsync,     (struct nfs_context *p1, struct nfsfh *p2))
   DEFINE_METHOD2(int, nfs_mkdir,     (struct nfs_context *p1, const char *p2))
   DEFINE_METHOD2(int, nfs_rmdir,     (struct nfs_context *p1, const char *p2))
   DEFINE_METHOD2(int, nfs_unlink,    (struct nfs_context *p1, const char *p2))
-  DEFINE_METHOD2(void,nfs_closedir,  (struct nfs_context *p1, struct nfsdir *p2))        
-  DEFINE_METHOD2(int, nfs_close,     (struct nfs_context *p1, struct nfsfh *p2)) 
+  DEFINE_METHOD2(void,nfs_closedir,  (struct nfs_context *p1, struct nfsdir *p2))
+  DEFINE_METHOD2(int, nfs_close,     (struct nfs_context *p1, struct nfsfh *p2))
   DEFINE_METHOD3(int, nfs_mount,     (struct nfs_context *p1, const char *p2,    const char *p3))
   DEFINE_METHOD3(int, nfs_stat,      (struct nfs_context *p1, const char *p2,    NFSSTAT *p3))
   DEFINE_METHOD3(int, nfs_fstat,     (struct nfs_context *p1, struct nfsfh *p2,  NFSSTAT *p3))
@@ -124,7 +124,7 @@ class DllLibNfs : public DllDynamic, DllLibNfsInterface
   DEFINE_METHOD3(int, nfs_access,    (struct nfs_context *p1, const char *p2,    int p3))
   DEFINE_METHOD3(int, nfs_symlink,   (struct nfs_context *p1, const char *p2,    const char *p3))
   DEFINE_METHOD3(int, nfs_rename,    (struct nfs_context *p1, const char *p2,    const char *p3))
-  DEFINE_METHOD3(int, nfs_link,      (struct nfs_context *p1, const char *p2,    const char *p3))  
+  DEFINE_METHOD3(int, nfs_link,      (struct nfs_context *p1, const char *p2,    const char *p3))
   DEFINE_METHOD4(int, nfs_open,      (struct nfs_context *p1, const char *p2,    int p3,     struct nfsfh **p4))
   DEFINE_METHOD4(int, nfs_read,      (struct nfs_context *p1, struct nfsfh *p2,  uint64_t p3,  char *p4))
   DEFINE_METHOD4(int, nfs_write,     (struct nfs_context *p1, struct nfsfh *p2,  uint64_t p3,  char *p4))
@@ -142,14 +142,14 @@ class DllLibNfs : public DllDynamic, DllLibNfsInterface
     RESOLVE_METHOD_RENAME(mount_free_export_list, mount_free_export_list)
     RESOLVE_METHOD_RENAME(mount_getexports, mount_getexports)
     RESOLVE_METHOD_RENAME(nfs_find_local_servers, nfs_find_local_servers)
-    RESOLVE_METHOD_RENAME(free_nfs_srvr_list, free_nfs_srvr_list)        
+    RESOLVE_METHOD_RENAME(free_nfs_srvr_list, free_nfs_srvr_list)
     RESOLVE_METHOD_RENAME(nfs_init_context,   nfs_init_context)
     RESOLVE_METHOD_RENAME(nfs_destroy_context,nfs_destroy_context)
     RESOLVE_METHOD_RENAME(nfs_get_readmax,    nfs_get_readmax)
-    RESOLVE_METHOD_RENAME(nfs_get_writemax,   nfs_get_writemax)   
+    RESOLVE_METHOD_RENAME(nfs_get_writemax,   nfs_get_writemax)
     RESOLVE_METHOD_RENAME(nfs_get_error,      nfs_get_error)
-    RESOLVE_METHOD_RENAME(nfs_readdir,        nfs_readdir)    
-    RESOLVE_METHOD_RENAME(nfs_closedir,       nfs_closedir)  
+    RESOLVE_METHOD_RENAME(nfs_readdir,        nfs_readdir)
+    RESOLVE_METHOD_RENAME(nfs_closedir,       nfs_closedir)
     RESOLVE_METHOD_RENAME(nfs_mount,     nfs_mount)
     RESOLVE_METHOD_RENAME(nfs_stat,      nfs_stat)
     RESOLVE_METHOD_RENAME(nfs_fstat,     nfs_fstat)
@@ -179,7 +179,7 @@ class DllLibNfs : public DllDynamic, DllLibNfsInterface
     RESOLVE_METHOD_RENAME(nfs_access,    nfs_access)
     RESOLVE_METHOD_RENAME(nfs_symlink,   nfs_symlink)
     RESOLVE_METHOD_RENAME(nfs_rename,    nfs_rename)
-    RESOLVE_METHOD_RENAME(nfs_link,      nfs_link)      
+    RESOLVE_METHOD_RENAME(nfs_link,      nfs_link)
   END_METHOD_RESOLVE()
 };
 
diff --git a/xbmc/filesystem/FavouritesDirectory.h b/xbmc/filesystem/FavouritesDirectory.h
index 6682d69e08..29649a6326 100644
--- a/xbmc/filesystem/FavouritesDirectory.h
+++ b/xbmc/filesystem/FavouritesDirectory.h
@@ -36,5 +36,5 @@ namespace XFILE
     bool GetDirectory(const CURL& url, CFileItemList &items) override;
     bool Exists(const CURL& url) override;
   };
-  
+
 }
diff --git a/xbmc/filesystem/File.cpp b/xbmc/filesystem/File.cpp
index 3b02c6e9b0..238a8a11f6 100644
--- a/xbmc/filesystem/File.cpp
+++ b/xbmc/filesystem/File.cpp
@@ -269,7 +269,7 @@ bool CFile::Open(const CURL& file, const unsigned int flags)
     if ((flags & READ_REOPEN) == 0)
     {
       CLog::Log(LOGERROR, "File::Open - already open: %s", file.GetRedacted().c_str());
-      return false;      
+      return false;
     }
     else
     {
@@ -338,7 +338,7 @@ bool CFile::Open(const CURL& file, const unsigned int flags)
         std::unique_ptr<CURL> pNewUrl(pRedirectEx->m_pNewUrl);
         m_pFile = pRedirectEx->m_pNewFileImp;
         delete pRedirectEx;
-        
+
         if (pNewUrl.get())
         {
           CURL newAuthUrl(*pNewUrl);
@@ -352,7 +352,7 @@ bool CFile::Open(const CURL& file, const unsigned int flags)
           }
         }
         else
-        {        
+        {
           if (!m_pFile->Open(authUrl))
           {
             SAFE_DELETE(m_pFile);
@@ -549,7 +549,7 @@ int CFile::Stat(const CURL& file, struct __stat64* buffer)
       std::unique_ptr<IFile> pImp(pRedirectEx->m_pNewFileImp);
       std::unique_ptr<CURL> pNewUrl(pRedirectEx->m_pNewUrl);
       delete pRedirectEx;
-        
+
       if (pNewUrl.get())
       {
         if (pImp.get())
@@ -564,7 +564,7 @@ int CFile::Stat(const CURL& file, struct __stat64* buffer)
           }
         }
       }
-      else     
+      else
       {
         if (pImp.get() && !pImp->Stat(authUrl, buffer))
         {
@@ -725,7 +725,7 @@ int CFile::Truncate(int64_t iSize)
 {
   if (!m_pFile)
     return -1;
-  
+
   try
   {
     return m_pFile->Truncate(iSize);
diff --git a/xbmc/filesystem/File.h b/xbmc/filesystem/File.h
index f5995b7563..f9a0fe1f0b 100644
--- a/xbmc/filesystem/File.h
+++ b/xbmc/filesystem/File.h
@@ -152,11 +152,11 @@ public:
   static bool Exists(const std::string& strFileName, bool bUseCache = true);
   /**
   * Fills struct __stat64 with information about file specified by filename
-  * For st_mode function will set correctly _S_IFDIR (directory) flag and may set 
+  * For st_mode function will set correctly _S_IFDIR (directory) flag and may set
   * _S_IREAD (read permission), _S_IWRITE (write permission) flags if such
   * information is available. Function may set st_size (file size), st_atime,
   * st_mtime, st_ctime (access, modification, creation times).
-  * Any other flags and members of __stat64 that didn't updated with actual file 
+  * Any other flags and members of __stat64 that didn't updated with actual file
   * information will be set to zero (st_nlink can be set ether to 1 or zero).
   * @param strFileName specifies requested file
   * @param buffer      pointer to __stat64 buffer to receive information about file
diff --git a/xbmc/filesystem/FileCache.cpp b/xbmc/filesystem/FileCache.cpp
index 9516b91558..bc7544b6f8 100644
--- a/xbmc/filesystem/FileCache.cpp
+++ b/xbmc/filesystem/FileCache.cpp
@@ -200,7 +200,7 @@ bool CFileCache::Open(const CURL& url)
 
       size_t back = cacheSize / 4;
       size_t front = cacheSize - back;
-      
+
       if (m_flags & READ_MULTI_STREAM)
       {
         // READ_MULTI_STREAM requires double buffering, so use half the amount of memory for each buffer
@@ -225,7 +225,7 @@ bool CFileCache::Open(const CURL& url)
     Close();
     return false;
   }
-  
+
   m_readPos = 0;
   m_writePos = 0;
   m_writeRate = 1024 * 1024;
diff --git a/xbmc/filesystem/FileFactory.cpp b/xbmc/filesystem/FileFactory.cpp
index 35bc2c3d55..b76c41baea 100644
--- a/xbmc/filesystem/FileFactory.cpp
+++ b/xbmc/filesystem/FileFactory.cpp
@@ -126,7 +126,7 @@ IFile* CFileFactory::CreateLoader(const CURL& url)
 #endif
     return new CWin32File();
   }
-#endif // TARGET_WINDOWS 
+#endif // TARGET_WINDOWS
 #if defined(HAS_DVD_DRIVE)
   else if (url.IsProtocol("cdda")) return new CFileCDDA();
 #endif
@@ -151,7 +151,7 @@ IFile* CFileFactory::CreateLoader(const CURL& url)
     ||  url.IsProtocol("ftps")
     ||  url.IsProtocol("rss")
     ||  url.IsProtocol("rsss")
-    ||  url.IsProtocol("http") 
+    ||  url.IsProtocol("http")
     ||  url.IsProtocol("https")) return new CCurlFile();
     else if (url.IsProtocol("dav") || url.IsProtocol("davs")) return new CDAVFile();
 #ifdef HAS_FILESYSTEM_SFTP
diff --git a/xbmc/filesystem/HTTPDirectory.cpp b/xbmc/filesystem/HTTPDirectory.cpp
index 7fcaa1da4a..e87bcb114f 100644
--- a/xbmc/filesystem/HTTPDirectory.cpp
+++ b/xbmc/filesystem/HTTPDirectory.cpp
@@ -54,7 +54,7 @@ bool CHTTPDirectory::GetDirectory(const CURL& url, CFileItemList &items)
 
   CRegExp reDateTime(true);
   reDateTime.RegComp("<td align=\"right\">([0-9]{2})-([A-Z]{3})-([0-9]{4}) ([0-9]{2}):([0-9]{2}) +</td>");
-  
+
   CRegExp reDateTimeLighttp(true);
   reDateTimeLighttp.RegComp("<td class=\"m\">([0-9]{4})-([A-Z]{3})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})</td>");
 
diff --git a/xbmc/filesystem/IDirectory.cpp b/xbmc/filesystem/IDirectory.cpp
index 64dcbb25d3..8b0aa98002 100644
--- a/xbmc/filesystem/IDirectory.cpp
+++ b/xbmc/filesystem/IDirectory.cpp
@@ -61,13 +61,13 @@ bool IDirectory::IsAllowed(const CURL& url) const
     std::string fileName = URIUtils::GetFileName(url);
 
     // Allow filenames of the form video_ts.ifo or vts_##_0.ifo
-    
+
     return StringUtils::EqualsNoCase(fileName, "video_ts.ifo") ||
           (fileName.length() == 12 &&
            StringUtils::StartsWithNoCase(fileName, "vts_") &&
            StringUtils::EndsWithNoCase(fileName, "_0.ifo"));
   }
-  
+
   if (URIUtils::HasExtension(url, ".dat"))
   {
     std::string fileName = URIUtils::GetFileName(url);
diff --git a/xbmc/filesystem/IDirectory.h b/xbmc/filesystem/IDirectory.h
index 91adbed892..62923e6dd8 100644
--- a/xbmc/filesystem/IDirectory.h
+++ b/xbmc/filesystem/IDirectory.h
@@ -134,7 +134,7 @@ public:
 
   /*! \brief Process additional requirements before the directory fetch is performed.
    Some directory fetches may require authentication, keyboard input etc.  The IDirectory subclass
-   should call GetKeyboardInput, SetErrorDialog or RequireAuthentication and then return false 
+   should call GetKeyboardInput, SetErrorDialog or RequireAuthentication and then return false
    from the GetDirectory method. CDirectory will then prompt for input from the user, before
    re-calling the GetDirectory method.
    \sa GetKeyboardInput, SetErrorDialog, RequireAuthentication
diff --git a/xbmc/filesystem/IFile.cpp b/xbmc/filesystem/IFile.cpp
index 0fb26ee476..e9b15547e8 100644
--- a/xbmc/filesystem/IFile.cpp
+++ b/xbmc/filesystem/IFile.cpp
@@ -88,12 +88,12 @@ bool IFile::ReadString(char *szLine, int iLineLength)
   return true;
 }
 
-CRedirectException::CRedirectException() : 
+CRedirectException::CRedirectException() :
   m_pNewFileImp(NULL), m_pNewUrl(NULL)
 {
 }
 
 CRedirectException::CRedirectException(IFile *pNewFileImp, CURL *pNewUrl) :
-  m_pNewFileImp(pNewFileImp), m_pNewUrl(pNewUrl) 
+  m_pNewFileImp(pNewFileImp), m_pNewUrl(pNewUrl)
 {
 }
diff --git a/xbmc/filesystem/IFile.h b/xbmc/filesystem/IFile.h
index f2ec27e086..e298d8f21a 100644
--- a/xbmc/filesystem/IFile.h
+++ b/xbmc/filesystem/IFile.h
@@ -154,7 +154,7 @@ public:
   CURL  *m_pNewUrl;
 
   CRedirectException();
-  
+
   CRedirectException(IFile *pNewFileImp, CURL *pNewUrl=NULL);
 };
 
diff --git a/xbmc/filesystem/ImageFile.cpp b/xbmc/filesystem/ImageFile.cpp
index d289b63023..55a1ebfa66 100644
--- a/xbmc/filesystem/ImageFile.cpp
+++ b/xbmc/filesystem/ImageFile.cpp
@@ -55,7 +55,7 @@ bool CImageFile::Exists(const CURL& url)
   if (!cachedFile.empty())
     return CFile::Exists(cachedFile, false);
 
-  // need to check if the original can be cached on demand and that the file exists 
+  // need to check if the original can be cached on demand and that the file exists
   if (!CTextureCache::CanCacheImageURL(url))
     return false;
 
@@ -69,7 +69,7 @@ int CImageFile::Stat(const CURL& url, struct __stat64* buffer)
   if (!cachedFile.empty())
     return CFile::Stat(cachedFile, buffer);
 
-  /* 
+  /*
    Doesn't exist in the cache yet. We have 3 options here:
    1. Cache the file and do the Stat() on the cached file.
    2. Do the Stat() on the original file.
diff --git a/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeGrouped.cpp b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeGrouped.cpp
index 588bbfd1fe..442e44cf4f 100644
--- a/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeGrouped.cpp
+++ b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeGrouped.cpp
@@ -31,7 +31,7 @@ NODE_TYPE CDirectoryNodeGrouped::GetChildType() const
 {
   if (GetType() == NODE_TYPE_YEAR)
     return NODE_TYPE_YEAR_ALBUM;
-  
+
   return NODE_TYPE_ARTIST;
 }
 
diff --git a/xbmc/filesystem/NFSDirectory.cpp b/xbmc/filesystem/NFSDirectory.cpp
index a50864c980..c2120ade2d 100644
--- a/xbmc/filesystem/NFSDirectory.cpp
+++ b/xbmc/filesystem/NFSDirectory.cpp
@@ -54,12 +54,12 @@ bool CNFSDirectory::GetDirectoryFromExportList(const std::string& strPath, CFile
   std::string nonConstStrPath(strPath);
   std::list<std::string> exportList=gNfsConnection.GetExportList(url);
   std::list<std::string>::iterator it;
-  
+
   for(it=exportList.begin();it!=exportList.end();++it)
   {
-      std::string currentExport(*it);     
+      std::string currentExport(*it);
       URIUtils::RemoveSlashAtEnd(nonConstStrPath);
-           
+
       CFileItemPtr pItem(new CFileItem(currentExport));
       std::string path(nonConstStrPath + currentExport);
       URIUtils::AddSlashAtEnd(path);
@@ -69,7 +69,7 @@ bool CNFSDirectory::GetDirectoryFromExportList(const std::string& strPath, CFile
       pItem->m_bIsFolder = true;
       items.Add(pItem);
   }
-  
+
   return exportList.empty()? false : true;
 }
 
@@ -84,9 +84,9 @@ bool CNFSDirectory::GetServerList(CFileItemList &items)
     return false;
   }
 
-  srvrs = gNfsConnection.GetImpl()->nfs_find_local_servers();	
+  srvrs = gNfsConnection.GetImpl()->nfs_find_local_servers();
 
-  for (srv=srvrs; srv; srv = srv->next) 
+  for (srv=srvrs; srv; srv = srv->next)
   {
       std::string currentExport(srv->addr);
 
@@ -107,69 +107,69 @@ bool CNFSDirectory::GetServerList(CFileItemList &items)
 
 bool CNFSDirectory::ResolveSymlink( const std::string &dirName, struct nfsdirent *dirent, CURL &resolvedUrl)
 {
-  CSingleLock lock(gNfsConnection); 
-  int ret = 0;  
+  CSingleLock lock(gNfsConnection);
+  int ret = 0;
   bool retVal = true;
   std::string fullpath = dirName;
   char resolvedLink[MAX_PATH];
-  
+
   URIUtils::AddSlashAtEnd(fullpath);
   fullpath.append(dirent->name);
-  
+
   resolvedUrl.Reset();
   resolvedUrl.SetPort(2049);
   resolvedUrl.SetProtocol("nfs");
-  resolvedUrl.SetHostName(gNfsConnection.GetConnectedIp()); 
-  
-  ret = gNfsConnection.GetImpl()->nfs_readlink(gNfsConnection.GetNfsContext(), fullpath.c_str(), resolvedLink, MAX_PATH);    
-  
+  resolvedUrl.SetHostName(gNfsConnection.GetConnectedIp());
+
+  ret = gNfsConnection.GetImpl()->nfs_readlink(gNfsConnection.GetNfsContext(), fullpath.c_str(), resolvedLink, MAX_PATH);
+
   if(ret == 0)
   {
     NFSSTAT tmpBuffer = {0};
     fullpath = dirName;
     URIUtils::AddSlashAtEnd(fullpath);
     fullpath.append(resolvedLink);
-  
+
     //special case - if link target is absolute it could be even another export
     //intervolume symlinks baby ...
     if(resolvedLink[0] == '/')
-    {    
+    {
       //use the special stat function for using an extra context
       //because we are inside of a dir traversal
       //and just can't change the global nfs context here
       //without destroying something...
       fullpath = resolvedLink;
-      resolvedUrl.SetFileName(fullpath);            
+      resolvedUrl.SetFileName(fullpath);
       ret = gNfsConnection.stat(resolvedUrl, &tmpBuffer);
     }
     else
     {
       ret = gNfsConnection.GetImpl()->nfs_stat(gNfsConnection.GetNfsContext(), fullpath.c_str(), &tmpBuffer);
-      resolvedUrl.SetFileName(gNfsConnection.GetConnectedExport() + fullpath);      
+      resolvedUrl.SetFileName(gNfsConnection.GetConnectedExport() + fullpath);
     }
 
-    if (ret != 0) 
+    if (ret != 0)
     {
       CLog::Log(LOGERROR, "NFS: Failed to stat(%s) on link resolve %s\n", fullpath.c_str(), gNfsConnection.GetImpl()->nfs_get_error(gNfsConnection.GetNfsContext()));
       retVal = false;
     }
     else
-    {  
+    {
       dirent->inode = tmpBuffer.st_ino;
       dirent->mode = tmpBuffer.st_mode;
       dirent->size = tmpBuffer.st_size;
       dirent->atime.tv_sec = static_cast<long>(tmpBuffer.st_atime);
       dirent->mtime.tv_sec = static_cast<long>(tmpBuffer.st_mtime);
       dirent->ctime.tv_sec = static_cast<long>(tmpBuffer.st_ctime);
-      
+
       //map stat mode to nf3type
       if(S_ISBLK(tmpBuffer.st_mode)){ dirent->type = NF3BLK; }
       else if(S_ISCHR(tmpBuffer.st_mode)){ dirent->type = NF3CHR; }
       else if(S_ISDIR(tmpBuffer.st_mode)){ dirent->type = NF3DIR; }
       else if(S_ISFIFO(tmpBuffer.st_mode)){ dirent->type = NF3FIFO; }
-      else if(S_ISREG(tmpBuffer.st_mode)){ dirent->type = NF3REG; }      
-      else if(S_ISLNK(tmpBuffer.st_mode)){ dirent->type = NF3LNK; }      
-      else if(S_ISSOCK(tmpBuffer.st_mode)){ dirent->type = NF3SOCK; }            
+      else if(S_ISREG(tmpBuffer.st_mode)){ dirent->type = NF3REG; }
+      else if(S_ISLNK(tmpBuffer.st_mode)){ dirent->type = NF3LNK; }
+      else if(S_ISSOCK(tmpBuffer.st_mode)){ dirent->type = NF3SOCK; }
     }
   }
   else
@@ -184,12 +184,12 @@ bool CNFSDirectory::GetDirectory(const CURL& url, CFileItemList &items)
 {
   // We accept nfs://server/path[/file]]]]
   int ret = 0;
-  FILETIME fileTime, localTime;    
-  CSingleLock lock(gNfsConnection); 
+  FILETIME fileTime, localTime;
+  CSingleLock lock(gNfsConnection);
   std::string strDirName="";
   std::string myStrPath(url.Get());
   URIUtils::AddSlashAtEnd(myStrPath); //be sure the dir ends with a slash
-   
+
   if(!gNfsConnection.Connect(url,strDirName))
   {
     //connect has failed - so try to get the exported filesystems if no path is given to the url
@@ -199,17 +199,17 @@ bool CNFSDirectory::GetDirectory(const CURL& url, CFileItemList &items)
       {
         return GetServerList(items);
       }
-      else 
+      else
       {
-        return GetDirectoryFromExportList(myStrPath, items); 
+        return GetDirectoryFromExportList(myStrPath, items);
       }
     }
     else
     {
       return false;
-    }    
+    }
   }
-      
+
   struct nfsdir *nfsdir = NULL;
   struct nfsdirent *nfsdirent = NULL;
 
@@ -221,8 +221,8 @@ bool CNFSDirectory::GetDirectory(const CURL& url, CFileItemList &items)
     return false;
   }
   lock.Leave();
-  
-  while((nfsdirent = gNfsConnection.GetImpl()->nfs_readdir(gNfsConnection.GetNfsContext(), nfsdir)) != NULL) 
+
+  while((nfsdirent = gNfsConnection.GetImpl()->nfs_readdir(gNfsConnection.GetNfsContext(), nfsdir)) != NULL)
   {
     struct nfsdirent tmpDirent = *nfsdirent;
     std::string strName = tmpDirent.name;
@@ -237,13 +237,13 @@ bool CNFSDirectory::GetDirectory(const CURL& url, CFileItemList &items)
       CURL linkUrl;
       //resolve symlink changes tmpDirent and strName
       if(!ResolveSymlink(strDirName,&tmpDirent,linkUrl))
-      { 
+      {
         continue;
       }
-      
+
       path = linkUrl.Get();
     }
-    
+
     iSize = tmpDirent.size;
     bIsDir = tmpDirent.type == NF3DIR;
     lTimeDate = tmpDirent.mtime.tv_sec;
@@ -264,9 +264,9 @@ bool CNFSDirectory::GetDirectory(const CURL& url, CFileItemList &items)
       FileTimeToLocalFileTime(&fileTime, &localTime);
 
       CFileItemPtr pItem(new CFileItem(tmpDirent.name));
-      pItem->m_dateTime=localTime;   
-      pItem->m_dwSize = iSize;        
-      
+      pItem->m_dateTime=localTime;
+      pItem->m_dwSize = iSize;
+
       if (bIsDir)
       {
         URIUtils::AddSlashAtEnd(path);
@@ -296,16 +296,16 @@ bool CNFSDirectory::Create(const CURL& url2)
 {
   int ret = 0;
   bool success=true;
-  
+
   CSingleLock lock(gNfsConnection);
   std::string folderName(url2.Get());
-  URIUtils::RemoveSlashAtEnd(folderName);//mkdir fails if a slash is at the end!!! 
-  CURL url(folderName); 
+  URIUtils::RemoveSlashAtEnd(folderName);//mkdir fails if a slash is at the end!!!
+  CURL url(folderName);
   folderName = "";
-  
+
   if(!gNfsConnection.Connect(url,folderName))
     return false;
-  
+
   ret = gNfsConnection.GetImpl()->nfs_mkdir(gNfsConnection.GetNfsContext(), folderName.c_str());
 
   success = (ret == 0 || -EEXIST == ret);
@@ -320,13 +320,13 @@ bool CNFSDirectory::Remove(const CURL& url2)
 
   CSingleLock lock(gNfsConnection);
   std::string folderName(url2.Get());
-  URIUtils::RemoveSlashAtEnd(folderName);//rmdir fails if a slash is at the end!!!   
+  URIUtils::RemoveSlashAtEnd(folderName);//rmdir fails if a slash is at the end!!!
   CURL url(folderName);
   folderName = "";
-  
+
   if(!gNfsConnection.Connect(url,folderName))
     return false;
-  
+
   ret = gNfsConnection.GetImpl()->nfs_rmdir(gNfsConnection.GetNfsContext(), folderName.c_str());
 
   if(ret != 0 && errno != ENOENT)
@@ -341,18 +341,18 @@ bool CNFSDirectory::Exists(const CURL& url2)
 {
   int ret = 0;
 
-  CSingleLock lock(gNfsConnection); 
+  CSingleLock lock(gNfsConnection);
   std::string folderName(url2.Get());
   URIUtils::RemoveSlashAtEnd(folderName);//remove slash at end or URIUtils::GetFileName won't return what we want...
   CURL url(folderName);
   folderName = "";
-  
+
   if(!gNfsConnection.Connect(url,folderName))
     return false;
-  
+
   NFSSTAT info;
   ret = gNfsConnection.GetImpl()->nfs_stat(gNfsConnection.GetNfsContext(), folderName.c_str(), &info);
-  
+
   if (ret != 0)
   {
     return false;
diff --git a/xbmc/filesystem/NFSFile.cpp b/xbmc/filesystem/NFSFile.cpp
index 0930c24813..d8c633705c 100644
--- a/xbmc/filesystem/NFSFile.cpp
+++ b/xbmc/filesystem/NFSFile.cpp
@@ -74,7 +74,7 @@ CNfsConnection::~CNfsConnection()
 }
 
 void CNfsConnection::resolveHost(const CURL &url)
-{ 
+{
   //resolve if hostname has changed
   CDNSNameCache::Lookup(url.GetHostName(), m_resolvedHostName);
 }
@@ -92,29 +92,29 @@ std::list<std::string> CNfsConnection::GetExportList(const CURL &url)
       for(tmp = exportlist; tmp!=NULL; tmp=tmp->ex_next)
       {
         std::string exportStr = std::string(tmp->ex_dir);
-        
+
         retList.push_back(exportStr);
-      }      
+      }
 
       gNfsConnection.GetImpl()->mount_free_export_list(exportlist);
       retList.sort();
       retList.reverse();
     }
-    
+
     return retList;
 }
 
 bool CNfsConnection::HandleDyLoad()
 {
   bool ret = true;
-  
+
   if(!m_pLibNfs->IsLoaded())
   {
     if(!m_pLibNfs->Load())
     {
-      CLog::Log(LOGERROR,"NFS: Error loading libnfs (%s).",__FUNCTION__);    
+      CLog::Log(LOGERROR,"NFS: Error loading libnfs (%s).",__FUNCTION__);
       ret = false; //fatal
-    }    
+    }
   }
   return ret;
 }
@@ -129,7 +129,7 @@ void CNfsConnection::clearMembers()
     m_exportPath.clear();
     m_hostName.clear();
     m_writeChunkSize = 0;
-    m_readChunkSize = 0;  
+    m_readChunkSize = 0;
     m_pNfsContext = NULL;
 }
 
@@ -147,7 +147,7 @@ void CNfsConnection::destroyContext(const std::string &exportName)
 {
   CSingleLock lock(openContextLock);
   tOpenContextMap::iterator it = m_openContextMap.find(exportName.c_str());
-  if (it != m_openContextMap.end()) 
+  if (it != m_openContextMap.end())
   {
       m_pLibNfs->nfs_destroy_context(it->second.pContext);
       m_openContextMap.erase(it);
@@ -174,7 +174,7 @@ struct nfs_context *CNfsConnection::getContextFromMap(const std::string &exportn
       it->second.lastAccessedTime = now;
       pRet = it->second.pContext;
     }
-    else 
+    else
     {
       //context is timed out
       //destroy it and return NULL
@@ -188,30 +188,30 @@ struct nfs_context *CNfsConnection::getContextFromMap(const std::string &exportn
 
 int CNfsConnection::getContextForExport(const std::string &exportname)
 {
-  int ret = CONTEXT_INVALID; 
-    
+  int ret = CONTEXT_INVALID;
+
   if(HandleDyLoad())
   {
-    clearMembers();  
-    
+    clearMembers();
+
     m_pNfsContext = getContextFromMap(exportname);
 
     if(!m_pNfsContext)
     {
       CLog::Log(LOGDEBUG,"NFS: Context for %s not open - get a new context.", exportname.c_str());
       m_pNfsContext = m_pLibNfs->nfs_init_context();
-    
-      if(!m_pNfsContext) 
+
+      if(!m_pNfsContext)
       {
         CLog::Log(LOGERROR,"NFS: Error initcontext in getContextForExport.");
       }
-      else 
+      else
       {
         struct contextTimeout tmp;
-        CSingleLock lock(openContextLock);        
+        CSingleLock lock(openContextLock);
         tmp.pContext = m_pNfsContext;
         tmp.lastAccessedTime = XbmcThreads::SystemClockMillis();
-        m_openContextMap[exportname] = tmp; //add context to list of all contexts      
+        m_openContextMap[exportname] = tmp; //add context to list of all contexts
         ret = CONTEXT_NEW;
       }
     }
@@ -239,14 +239,14 @@ bool CNfsConnection::splitUrlIntoExportAndPath(const CURL& url, std::string &exp
 bool CNfsConnection::splitUrlIntoExportAndPath(const CURL& url,std::string &exportPath, std::string &relativePath, std::list<std::string> &exportList)
 {
     bool ret = false;
-  
+
     if(!exportList.empty())
     {
       relativePath = "";
       exportPath = "";
-      
+
       std::string path = url.GetFileName();
-      
+
       //GetFileName returns path without leading "/"
       //but we need it because the export paths start with "/"
       //and path.Find(*it) wouldn't work else
@@ -254,9 +254,9 @@ bool CNfsConnection::splitUrlIntoExportAndPath(const CURL& url,std::string &expo
       {
         path = "/" + path;
       }
-      
+
       std::list<std::string>::iterator it;
-      
+
       for(it=exportList.begin();it!=exportList.end();++it)
       {
         //if path starts with the current export path
@@ -281,7 +281,7 @@ bool CNfsConnection::splitUrlIntoExportAndPath(const CURL& url,std::string &expo
           else
             relativePath = "//" + path.substr(exportPath.length()+1);
           ret = true;
-          break;          
+          break;
         }
       }
     }
@@ -296,25 +296,25 @@ bool CNfsConnection::Connect(const CURL& url, std::string &relativePath)
 
   resolveHost(url);
   bool ret = splitUrlIntoExportAndPath(url, exportPath, relativePath);
-  
+
   if( (ret && (exportPath != m_exportPath  ||
        url.GetHostName() != m_hostName))    ||
       (XbmcThreads::SystemClockMillis() - m_lastAccessedTime) > CONTEXT_TIMEOUT )
   {
     int contextRet = getContextForExport(url.GetHostName() + exportPath);
-    
+
     if(contextRet == CONTEXT_INVALID)//we need a new context because sharename or hostname has changed
     {
       return false;
     }
-    
+
     if(contextRet == CONTEXT_NEW) //new context was created - we need to mount it
     {
       //we connect to the directory of the path. This will be the "root" path of this connection then.
       //So all fileoperations are relative to this mountpoint...
       nfsRet = m_pLibNfs->nfs_mount(m_pNfsContext, m_resolvedHostName.c_str(), exportPath.c_str());
 
-      if(nfsRet != 0) 
+      if(nfsRet != 0)
       {
         CLog::Log(LOGERROR,"NFS: Failed to mount nfs share: %s (%s)\n", exportPath.c_str(), m_pLibNfs->nfs_get_error(m_pNfsContext));
         destroyContext(url.GetHostName() + exportPath);
@@ -330,10 +330,10 @@ bool CNfsConnection::Connect(const CURL& url, std::string &relativePath)
 
     if(contextRet == CONTEXT_NEW)
     {
-      CLog::Log(LOGDEBUG,"NFS: chunks: r/w %i/%i\n", (int)m_readChunkSize,(int)m_writeChunkSize);          
+      CLog::Log(LOGDEBUG,"NFS: chunks: r/w %i/%i\n", (int)m_readChunkSize,(int)m_writeChunkSize);
     }
   }
-  return ret; 
+  return ret;
 }
 
 void CNfsConnection::Deinit()
@@ -342,8 +342,8 @@ void CNfsConnection::Deinit()
   {
     destroyOpenContexts();
     m_pNfsContext = NULL;
-    m_pLibNfs->Unload();    
-  }        
+    m_pLibNfs->Unload();
+  }
   clearMembers();
   // clear any keep alive timouts on deinit
   m_KeepAliveTimeouts.clear();
@@ -370,7 +370,7 @@ void CNfsConnection::CheckIfIdle()
       }
     }
   }
-  
+
   if( m_pNfsContext != NULL )
   {
     CSingleLock lock(keepAliveLock);
@@ -404,14 +404,14 @@ void CNfsConnection::resetKeepAlive(std::string _exportPath, struct nfsfh  *_pFi
   CSingleLock lock(keepAliveLock);
   //refresh last access time of the context aswell
   struct nfs_context *pContext = getContextFromMap(_exportPath, true);
-  
+
   // if we keep alive using m_pNfsContext we need to mark
   // its last access time too here
   if (m_pNfsContext == pContext)
   {
     m_lastAccessedTime = XbmcThreads::SystemClockMillis();
   }
-  
+
   //adds new keys - refreshs existing ones
   m_KeepAliveTimeouts[_pFileHandle].exportPath = _exportPath;
   m_KeepAliveTimeouts[_pFileHandle].refreshCounter = KEEP_ALIVE_TIMEOUT;
@@ -429,10 +429,10 @@ void CNfsConnection::keepAlive(std::string _exportPath, struct nfsfh  *_pFileHan
   // on this call we are sure its not timedout even if the last accessed
   // time suggests it.
   struct nfs_context *pContext = getContextFromMap(_exportPath, true);
-  
+
   if (!pContext)// this should normally never happen - paranoia
     pContext = m_pNfsContext;
-  
+
   CLog::Log(LOGNOTICE, "NFS: sending keep alive after %i s.",KEEP_ALIVE_TIMEOUT/2);
   CSingleLock lock(*this);
   m_pLibNfs->nfs_lseek(pContext, _pFileHandle, 0, SEEK_CUR, &offset);
@@ -447,33 +447,33 @@ int CNfsConnection::stat(const CURL &url, NFSSTAT *statbuff)
   std::string exportPath;
   std::string relativePath;
   struct nfs_context *pTmpContext = NULL;
-  
+
   if(!HandleDyLoad())
   {
     return -1;
   }
-  
+
   resolveHost(url);
-  
+
   if(splitUrlIntoExportAndPath(url, exportPath, relativePath))
-  {    
+  {
     pTmpContext = m_pLibNfs->nfs_init_context();
-    
+
     if(pTmpContext)
-    {  
+    {
       //we connect to the directory of the path. This will be the "root" path of this connection then.
       //So all fileoperations are relative to this mountpoint...
       nfsRet = m_pLibNfs->nfs_mount(pTmpContext, m_resolvedHostName.c_str(), exportPath.c_str());
-      
-      if(nfsRet == 0) 
+
+      if(nfsRet == 0)
       {
-        nfsRet = m_pLibNfs->nfs_stat(pTmpContext, relativePath.c_str(), statbuff);      
+        nfsRet = m_pLibNfs->nfs_stat(pTmpContext, relativePath.c_str(), statbuff);
       }
       else
       {
         CLog::Log(LOGERROR,"NFS: Failed to mount nfs share: %s (%s)\n", exportPath.c_str(), m_pLibNfs->nfs_get_error(m_pNfsContext));
       }
-      
+
       m_pLibNfs->nfs_destroy_context(pTmpContext);
       CLog::Log(LOGDEBUG,"NFS: Connected to server %s and export %s in tmpContext\n", url.GetHostName().c_str(), exportPath.c_str());
     }
@@ -519,12 +519,12 @@ int64_t CNFSFile::GetPosition()
   int ret = 0;
   uint64_t offset = 0;
   CSingleLock lock(gNfsConnection);
-  
+
   if (gNfsConnection.GetNfsContext() == NULL || m_pFileHandle == NULL) return 0;
-  
+
   ret = (int)gNfsConnection.GetImpl()->nfs_lseek(gNfsConnection.GetNfsContext(), m_pFileHandle, 0, SEEK_CUR, &offset);
-  
-  if (ret < 0) 
+
+  if (ret < 0)
   {
     CLog::Log(LOGERROR, "NFS: Failed to lseek(%s)",gNfsConnection.GetImpl()->nfs_get_error(gNfsConnection.GetNfsContext()));
   }
@@ -548,30 +548,30 @@ bool CNFSFile::Open(const CURL& url)
     CLog::Log(LOGNOTICE,"NFS: Bad URL : '%s'",url.GetFileName().c_str());
     return false;
   }
-  
+
   std::string filename;
-   
+
   CSingleLock lock(gNfsConnection);
-  
+
   if(!gNfsConnection.Connect(url, filename))
     return false;
-  
-  m_pNfsContext = gNfsConnection.GetNfsContext(); 
+
+  m_pNfsContext = gNfsConnection.GetNfsContext();
   m_exportPath = gNfsConnection.GetContextMapId();
-  
+
   ret = gNfsConnection.GetImpl()->nfs_open(m_pNfsContext, filename.c_str(), O_RDONLY, &m_pFileHandle);
-  
-  if (ret != 0) 
+
+  if (ret != 0)
   {
     CLog::Log(LOGINFO, "CNFSFile::Open: Unable to open file : '%s'  error : '%s'", url.GetFileName().c_str(), gNfsConnection.GetImpl()->nfs_get_error(m_pNfsContext));
     m_pNfsContext = NULL;
     m_exportPath.clear();
     return false;
-  } 
-  
+  }
+
   CLog::Log(LOGDEBUG,"CNFSFile::Open - opened %s",url.GetFileName().c_str());
   m_url=url;
-  
+
   struct __stat64 tmpBuffer;
 
   if( Stat(&tmpBuffer) )
@@ -580,7 +580,7 @@ bool CNFSFile::Open(const CURL& url)
     Close();
     return false;
   }
-  
+
   m_fileSize = tmpBuffer.st_size;//cache the size of this file
   // We've successfully opened the file!
   return true;
@@ -603,23 +603,23 @@ int CNFSFile::Stat(const CURL& url, struct __stat64* buffer)
   int ret = 0;
   CSingleLock lock(gNfsConnection);
   std::string filename;
-  
+
   if(!gNfsConnection.Connect(url,filename))
     return -1;
-   
+
 
   NFSSTAT tmpBuffer = {0};
 
   ret = gNfsConnection.GetImpl()->nfs_stat(gNfsConnection.GetNfsContext(), filename.c_str(), &tmpBuffer);
-  
+
   //if buffer == NULL we where called from Exists - in that case don't spam the log with errors
-  if (ret != 0 && buffer != NULL) 
+  if (ret != 0 && buffer != NULL)
   {
     CLog::Log(LOGERROR, "NFS: Failed to stat(%s) %s\n", url.GetFileName().c_str(), gNfsConnection.GetImpl()->nfs_get_error(gNfsConnection.GetNfsContext()));
     ret = -1;
   }
   else
-  {  
+  {
     if(buffer)
     {
 #if defined(TARGET_WINDOWS)//! @todo get rid of this define after gotham v13
@@ -650,18 +650,18 @@ ssize_t CNFSFile::Read(void *lpBuf, size_t uiBufSize)
 
   ssize_t numberOfBytesRead = 0;
   CSingleLock lock(gNfsConnection);
-  
+
   if (m_pFileHandle == NULL || m_pNfsContext == NULL )
     return -1;
 
-  numberOfBytesRead = gNfsConnection.GetImpl()->nfs_read(m_pNfsContext, m_pFileHandle, uiBufSize, (char *)lpBuf);  
+  numberOfBytesRead = gNfsConnection.GetImpl()->nfs_read(m_pNfsContext, m_pFileHandle, uiBufSize, (char *)lpBuf);
 
   lock.Leave();//no need to keep the connection lock after that
-  
+
   gNfsConnection.resetKeepAlive(m_exportPath, m_pFileHandle);//triggers keep alive timer reset for this filehandle
-  
+
   //something went wrong ...
-  if (numberOfBytesRead < 0) 
+  if (numberOfBytesRead < 0)
     CLog::Log(LOGERROR, "%s - Error( %" PRId64", %s )", __FUNCTION__, (int64_t)numberOfBytesRead, gNfsConnection.GetImpl()->nfs_get_error(m_pNfsContext));
 
   return numberOfBytesRead;
@@ -672,12 +672,12 @@ int64_t CNFSFile::Seek(int64_t iFilePosition, int iWhence)
   int ret = 0;
   uint64_t offset = 0;
 
-  CSingleLock lock(gNfsConnection);  
+  CSingleLock lock(gNfsConnection);
   if (m_pFileHandle == NULL || m_pNfsContext == NULL) return -1;
-  
- 
+
+
   ret = (int)gNfsConnection.GetImpl()->nfs_lseek(m_pNfsContext, m_pFileHandle, iFilePosition, iWhence, &offset);
-  if (ret < 0) 
+  if (ret < 0)
   {
     CLog::Log(LOGERROR, "%s - Error( seekpos: %" PRId64", whence: %i, fsize: %" PRId64", %s)", __FUNCTION__, iFilePosition, iWhence, m_fileSize, gNfsConnection.GetImpl()->nfs_get_error(m_pNfsContext));
     return -1;
@@ -688,13 +688,13 @@ int64_t CNFSFile::Seek(int64_t iFilePosition, int iWhence)
 int CNFSFile::Truncate(int64_t iSize)
 {
   int ret = 0;
-  
-  CSingleLock lock(gNfsConnection);  
+
+  CSingleLock lock(gNfsConnection);
   if (m_pFileHandle == NULL || m_pNfsContext == NULL) return -1;
-  
-  
+
+
   ret = (int)gNfsConnection.GetImpl()->nfs_ftruncate(m_pNfsContext, m_pFileHandle, iSize);
-  if (ret < 0) 
+  if (ret < 0)
   {
     CLog::Log(LOGERROR, "%s - Error( ftruncate: %" PRId64", fsize: %" PRId64", %s)", __FUNCTION__, iSize, m_fileSize, gNfsConnection.GetImpl()->nfs_get_error(m_pNfsContext));
     return -1;
@@ -705,7 +705,7 @@ int CNFSFile::Truncate(int64_t iSize)
 void CNFSFile::Close()
 {
   CSingleLock lock(gNfsConnection);
-  
+
   if (m_pFileHandle != NULL && m_pNfsContext != NULL)
   {
     int ret = 0;
@@ -714,13 +714,13 @@ void CNFSFile::Close()
     // so keep alive code doesn't process it anymore
     gNfsConnection.removeFromKeepAliveList(m_pFileHandle);
     ret = gNfsConnection.GetImpl()->nfs_close(m_pNfsContext, m_pFileHandle);
-        
-	  if (ret < 0) 
+
+	  if (ret < 0)
     {
       CLog::Log(LOGERROR, "Failed to close(%s) - %s\n", m_url.GetFileName().c_str(), gNfsConnection.GetImpl()->nfs_get_error(m_pNfsContext));
     }
     m_pFileHandle = NULL;
-    m_pNfsContext = NULL;    
+    m_pNfsContext = NULL;
     m_fileSize = 0;
     m_exportPath.clear();
   }
@@ -736,11 +736,11 @@ ssize_t CNFSFile::Write(const void* lpBuf, size_t uiBufSize)
   size_t leftBytes = uiBufSize;
   //clamp max write chunksize to 32kb - fixme - this might be superfluous with future libnfs versions
   size_t chunkSize = gNfsConnection.GetMaxWriteChunkSize() > 32768 ? 32768 : (size_t)gNfsConnection.GetMaxWriteChunkSize();
-  
+
   CSingleLock lock(gNfsConnection);
-  
+
   if (m_pFileHandle == NULL || m_pNfsContext == NULL) return -1;
-  
+
   //write as long as some bytes are left to be written
   while( leftBytes )
   {
@@ -751,23 +751,23 @@ ssize_t CNFSFile::Write(const void* lpBuf, size_t uiBufSize)
     }
     //write chunk
     writtenBytes = gNfsConnection.GetImpl()->nfs_write(m_pNfsContext,
-                                  m_pFileHandle, 
-                                  chunkSize, 
+                                  m_pFileHandle,
+                                  chunkSize,
                                   (char *)lpBuf + numberOfBytesWritten);
     //decrease left bytes
     leftBytes-= writtenBytes;
     //increase overall written bytes
     numberOfBytesWritten += writtenBytes;
-        
+
     //danger - something went wrong
-    if (writtenBytes < 0) 
+    if (writtenBytes < 0)
     {
       CLog::Log(LOGERROR, "Failed to pwrite(%s) %s\n", m_url.GetFileName().c_str(), gNfsConnection.GetImpl()->nfs_get_error(m_pNfsContext));
       if (numberOfBytesWritten == 0)
         return -1;
 
       break;
-    }     
+    }
   }
   //return total number of written bytes
   return numberOfBytesWritten;
@@ -778,13 +778,13 @@ bool CNFSFile::Delete(const CURL& url)
   int ret = 0;
   CSingleLock lock(gNfsConnection);
   std::string filename;
-  
+
   if(!gNfsConnection.Connect(url, filename))
     return false;
-  
-  
+
+
   ret = gNfsConnection.GetImpl()->nfs_unlink(gNfsConnection.GetNfsContext(), filename.c_str());
-  
+
   if(ret != 0)
   {
     CLog::Log(LOGERROR, "%s - Error( %s )", __FUNCTION__, gNfsConnection.GetImpl()->nfs_get_error(gNfsConnection.GetNfsContext()));
@@ -797,55 +797,55 @@ bool CNFSFile::Rename(const CURL& url, const CURL& urlnew)
   int ret = 0;
   CSingleLock lock(gNfsConnection);
   std::string strFile;
-  
+
   if(!gNfsConnection.Connect(url,strFile))
     return false;
-  
+
   std::string strFileNew;
   std::string strDummy;
   gNfsConnection.splitUrlIntoExportAndPath(urlnew, strDummy, strFileNew);
-  
+
   ret = gNfsConnection.GetImpl()->nfs_rename(gNfsConnection.GetNfsContext() , strFile.c_str(), strFileNew.c_str());
-  
+
   if(ret != 0)
   {
     CLog::Log(LOGERROR, "%s - Error( %s )", __FUNCTION__, gNfsConnection.GetImpl()->nfs_get_error(gNfsConnection.GetNfsContext()));
-  } 
+  }
   return (ret == 0);
 }
 
 bool CNFSFile::OpenForWrite(const CURL& url, bool bOverWrite)
-{ 
+{
   int ret = 0;
   // we can't open files like nfs://file.f or nfs://server/file.f
   // if a file matches the if below return false, it can't exist on a nfs share.
   if (!IsValidFile(url.GetFileName())) return false;
-  
+
   Close();
   CSingleLock lock(gNfsConnection);
   std::string filename;
-  
+
   if(!gNfsConnection.Connect(url,filename))
     return false;
-  
+
   m_pNfsContext = gNfsConnection.GetNfsContext();
   m_exportPath = gNfsConnection.GetContextMapId();
-  
+
   if (bOverWrite)
   {
     CLog::Log(LOGWARNING, "FileNFS::OpenForWrite() called with overwriting enabled! - %s", filename.c_str());
     //create file with proper permissions
-    ret = gNfsConnection.GetImpl()->nfs_creat(m_pNfsContext, filename.c_str(), S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH, &m_pFileHandle);    
+    ret = gNfsConnection.GetImpl()->nfs_creat(m_pNfsContext, filename.c_str(), S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH, &m_pFileHandle);
     //if file was created the file handle isn't valid ... so close it and open later
     if(ret == 0)
     {
       gNfsConnection.GetImpl()->nfs_close(m_pNfsContext,m_pFileHandle);
-      m_pFileHandle = NULL;          
+      m_pFileHandle = NULL;
     }
   }
 
   ret = gNfsConnection.GetImpl()->nfs_open(m_pNfsContext, filename.c_str(), O_RDWR, &m_pFileHandle);
-  
+
   if (ret || m_pFileHandle == NULL)
   {
     // write error to logfile
@@ -855,11 +855,11 @@ bool CNFSFile::OpenForWrite(const CURL& url, bool bOverWrite)
     return false;
   }
   m_url=url;
-  
+
   struct __stat64 tmpBuffer = {0};
 
   //only stat if file was not created
-  if(!bOverWrite) 
+  if(!bOverWrite)
   {
     if(Stat(&tmpBuffer))
     {
@@ -867,13 +867,13 @@ bool CNFSFile::OpenForWrite(const CURL& url, bool bOverWrite)
       Close();
       return false;
     }
-    m_fileSize = tmpBuffer.st_size;//cache filesize of this file    
+    m_fileSize = tmpBuffer.st_size;//cache filesize of this file
   }
   else//file was created - filesize is zero
   {
-    m_fileSize = 0;    
+    m_fileSize = 0;
   }
-  
+
   // We've successfully opened the file!
   return true;
 }
diff --git a/xbmc/filesystem/NFSFile.h b/xbmc/filesystem/NFSFile.h
index 350934700c..25f1ff5732 100644
--- a/xbmc/filesystem/NFSFile.h
+++ b/xbmc/filesystem/NFSFile.h
@@ -48,14 +48,14 @@
 class DllLibNfs;
 
 class CNfsConnection : public CCriticalSection
-{     
+{
 public:
   struct keepAliveStruct
   {
     std::string exportPath;
     uint64_t refreshCounter;
   };
-  typedef std::map<struct nfsfh  *, struct keepAliveStruct> tFileKeepAliveMap;  
+  typedef std::map<struct nfsfh  *, struct keepAliveStruct> tFileKeepAliveMap;
 
   struct contextTimeout
   {
@@ -63,21 +63,21 @@ public:
     uint64_t lastAccessedTime;
   };
 
-  typedef std::map<std::string, struct contextTimeout> tOpenContextMap;    
-  
+  typedef std::map<std::string, struct contextTimeout> tOpenContextMap;
+
   CNfsConnection();
   ~CNfsConnection();
   bool Connect(const CURL &url, std::string &relativePath);
   struct nfs_context *GetNfsContext() {return m_pNfsContext;}
   uint64_t GetMaxReadChunkSize() {return m_readChunkSize;}
-  uint64_t GetMaxWriteChunkSize() {return m_writeChunkSize;} 
+  uint64_t GetMaxWriteChunkSize() {return m_writeChunkSize;}
   DllLibNfs *GetImpl() {return m_pLibNfs;}
   std::list<std::string> GetExportList(const CURL &url);
   //this functions splits the url into the exportpath (feed to mount) and the rest of the path
   //relative to the mounted export
   bool splitUrlIntoExportAndPath(const CURL& url, std::string &exportPath, std::string &relativePath, std::list<std::string> &exportList);
   bool splitUrlIntoExportAndPath(const CURL& url, std::string &exportPath, std::string &relativePath);
-  
+
   //special stat which uses its own context
   //needed for getting intervolume symlinks to work
   int stat(const CURL &url, NFSSTAT *statbuff);
@@ -91,8 +91,8 @@ public:
   //the timeout for this filehandle if already in list
   void resetKeepAlive(std::string _exportPath, struct nfsfh  *_pFileHandle);
   //removes file handle from keep alive list
-  void removeFromKeepAliveList(struct nfsfh  *_pFileHandle);  
-  
+  void removeFromKeepAliveList(struct nfsfh  *_pFileHandle);
+
   const std::string& GetConnectedIp() const {return m_resolvedHostName;}
   const std::string& GetConnectedExport() const {return m_exportPath;}
   const std::string GetContextMapId() const {return m_hostName + m_exportPath;}
@@ -113,7 +113,7 @@ private:
   std::list<std::string> m_exportList;//list of exported paths of current connected servers
   CCriticalSection keepAliveLock;
   CCriticalSection openContextLock;
- 
+
   void clearMembers();
   struct nfs_context *getContextFromMap(const std::string &exportname, bool forceCacheHit = false);
   int getContextForExport(const std::string &exportname);//get context for given export and add to open contexts map - sets m_pNfsContext (my return a already mounted cached context)
@@ -146,12 +146,12 @@ namespace XFILE
 
     //implement iocontrol for seek_possible for preventing the stat in File class for
     //getting this info ...
-    int IoControl(EIoControl request, void* param) override{ return request == IOCTRL_SEEK_POSSIBLE ? 1 : -1; };    
+    int IoControl(EIoControl request, void* param) override{ return request == IOCTRL_SEEK_POSSIBLE ? 1 : -1; };
     int GetChunkSize() override {return static_cast<int>(gNfsConnection.GetMaxReadChunkSize());}
-    
+
     bool OpenForWrite(const CURL& url, bool bOverWrite = false) override;
     bool Delete(const CURL& url) override;
-    bool Rename(const CURL& url, const CURL& urlnew) override;    
+    bool Rename(const CURL& url, const CURL& urlnew) override;
   protected:
     CURL m_url;
     bool IsValidFile(const std::string& strFileName);
diff --git a/xbmc/filesystem/NptXbmcFile.cpp b/xbmc/filesystem/NptXbmcFile.cpp
index 63bf20a91b..3c7eeb9904 100644
--- a/xbmc/filesystem/NptXbmcFile.cpp
+++ b/xbmc/filesystem/NptXbmcFile.cpp
@@ -122,7 +122,7 @@ NPT_XbmcFileStream::Flush()
 +---------------------------------------------------------------------*/
 class NPT_XbmcFileInputStream : public NPT_InputStream,
                                 private NPT_XbmcFileStream
-                                
+
 {
 public:
     // constructors and destructor
@@ -130,8 +130,8 @@ public:
         NPT_XbmcFileStream(file) {}
 
     // NPT_InputStream methods
-    NPT_Result Read(void*     buffer, 
-                    NPT_Size  bytes_to_read, 
+    NPT_Result Read(void*     buffer,
+                    NPT_Size  bytes_to_read,
                     NPT_Size* bytes_read) override;
     NPT_Result Seek(NPT_Position offset) override {
         return NPT_XbmcFileStream::Seek(offset);
@@ -147,8 +147,8 @@ public:
 |   NPT_XbmcFileInputStream::Read
 +---------------------------------------------------------------------*/
 NPT_Result
-NPT_XbmcFileInputStream::Read(void*     buffer, 
-                              NPT_Size  bytes_to_read, 
+NPT_XbmcFileInputStream::Read(void*     buffer,
+                              NPT_Size  bytes_to_read,
                               NPT_Size* bytes_read)
 {
     unsigned int nb_read;
@@ -159,7 +159,7 @@ NPT_XbmcFileInputStream::Read(void*     buffer,
     }
 
     // read from the file
-    nb_read = m_FileReference->Read(buffer, bytes_to_read);    
+    nb_read = m_FileReference->Read(buffer, bytes_to_read);
     if (nb_read > 0) {
         if (bytes_read) *bytes_read = (NPT_Size)nb_read;
         return NPT_SUCCESS;
@@ -212,8 +212,8 @@ public:
         NPT_XbmcFileStream(file) {}
 
     // NPT_OutputStream methods
-    NPT_Result Write(const void* buffer, 
-                     NPT_Size    bytes_to_write, 
+    NPT_Result Write(const void* buffer,
+                     NPT_Size    bytes_to_write,
                      NPT_Size*   bytes_written) override;
     NPT_Result Seek(NPT_Position offset) override {
         return NPT_XbmcFileStream::Seek(offset);
@@ -230,12 +230,12 @@ public:
 |   NPT_XbmcFileOutputStream::Write
 +---------------------------------------------------------------------*/
 NPT_Result
-NPT_XbmcFileOutputStream::Write(const void* buffer, 
-                                NPT_Size    bytes_to_write, 
+NPT_XbmcFileOutputStream::Write(const void* buffer,
+                                NPT_Size    bytes_to_write,
                                 NPT_Size*   bytes_written)
 {
     int nb_written;
-    nb_written = m_FileReference->Write(buffer, bytes_to_write);    
+    nb_written = m_FileReference->Write(buffer, bytes_to_write);
 
     if (nb_written > 0) {
         if (bytes_written) *bytes_written = (NPT_Size)nb_written;
@@ -355,7 +355,7 @@ NPT_XbmcFile::Close()
 /*----------------------------------------------------------------------
 |   NPT_XbmcFile::GetInputStream
 +---------------------------------------------------------------------*/
-NPT_Result 
+NPT_Result
 NPT_XbmcFile::GetInputStream(NPT_InputStreamReference& stream)
 {
     // default value
@@ -378,7 +378,7 @@ NPT_XbmcFile::GetInputStream(NPT_InputStreamReference& stream)
 /*----------------------------------------------------------------------
 |   NPT_XbmcFile::GetOutputStream
 +---------------------------------------------------------------------*/
-NPT_Result 
+NPT_Result
 NPT_XbmcFile::GetOutputStream(NPT_OutputStreamReference& stream)
 {
     // default value
@@ -391,7 +391,7 @@ NPT_XbmcFile::GetOutputStream(NPT_OutputStreamReference& stream)
     if (!(m_Mode & NPT_FILE_OPEN_MODE_WRITE)) {
         return NPT_ERROR_FILE_NOT_WRITABLE;
     }
-    
+
     // create a stream
     stream = new NPT_XbmcFileOutputStream(m_FileReference);
 
@@ -430,7 +430,7 @@ NPT_File::NPT_File(const char* path) : m_Path(path)
 /*----------------------------------------------------------------------
 |   NPT_File::operator=
 +---------------------------------------------------------------------*/
-NPT_File& 
+NPT_File&
 NPT_File::operator=(const NPT_File& file)
 {
     if (this != &file) {
diff --git a/xbmc/filesystem/PipeFile.cpp b/xbmc/filesystem/PipeFile.cpp
index a09b76fc90..cfb9e9c00f 100644
--- a/xbmc/filesystem/PipeFile.cpp
+++ b/xbmc/filesystem/PipeFile.cpp
@@ -80,7 +80,7 @@ ssize_t CPipeFile::Read(void* lpBuf, size_t uiBufSize)
 {
   if (!m_pipe)
     return -1;
-  
+
   if (uiBufSize > SSIZE_MAX)
     uiBufSize = SSIZE_MAX;
 
@@ -91,7 +91,7 @@ ssize_t CPipeFile::Write(const void* lpBuf, size_t uiBufSize)
 {
   if (!m_pipe)
     return -1;
-  
+
   // m_pipe->Write return bool. either all was written or not.
   return m_pipe->Write((const char *)lpBuf,uiBufSize) ? uiBufSize : -1;
 }
@@ -127,7 +127,7 @@ void CPipeFile::Close()
   if (m_pipe)
   {
     m_pipe->RemoveListener(this);
-    PipesManager::GetInstance().ClosePipe(m_pipe);    
+    PipesManager::GetInstance().ClosePipe(m_pipe);
   }
   m_pipe = NULL;
 }
diff --git a/xbmc/filesystem/PipeFile.h b/xbmc/filesystem/PipeFile.h
index 60a80a8e5e..099b1a471d 100644
--- a/xbmc/filesystem/PipeFile.h
+++ b/xbmc/filesystem/PipeFile.h
@@ -38,7 +38,7 @@
 
 namespace XFILE
 {
-  
+
 class CPipeFile : public IFile, public IPipeListener
 {
 public:
@@ -63,9 +63,9 @@ public:
   bool Delete(const CURL& url) override;
   bool Rename(const CURL& url, const CURL& urlnew) override;
   int IoControl(EIoControl request, void* param) override;
-  
+
   std::string GetName() const;
-  
+
   void OnPipeOverFlow() override;
   void OnPipeUnderFlow() override;
 
@@ -76,15 +76,15 @@ public:
   bool IsEof();
   bool IsEmpty();
   bool IsClosed();
-  
+
   void SetOpenThreshold(int threshold);
 
 protected:
   int64_t m_pos;
   int64_t m_length;
-  
+
   XFILE::Pipe *m_pipe;
-  
+
   CCriticalSection m_lock;
   std::vector<XFILE::IPipeListener *> m_listeners;
 };
diff --git a/xbmc/filesystem/PipesManager.cpp b/xbmc/filesystem/PipesManager.cpp
index 079377b027..2fbe409533 100644
--- a/xbmc/filesystem/PipesManager.cpp
+++ b/xbmc/filesystem/PipesManager.cpp
@@ -102,7 +102,7 @@ void Pipe::Flush()
 int  Pipe::Read(char *buf, int nMaxSize, int nWaitMillis)
 {
   CSingleLock lock(m_lock);
-  
+
   if (!m_bOpen)
   {
     return -1;
@@ -146,10 +146,10 @@ int  Pipe::Read(char *buf, int nMaxSize, int nWaitMillis)
 
     lock.Enter();
     DecRef();
-    
+
     if (!m_bOpen)
       return -1;
-    
+
     if (bHasData)
     {
       int nToRead = min((int)m_buffer.getMaxReadSize(), nMaxSize);
@@ -157,9 +157,9 @@ int  Pipe::Read(char *buf, int nMaxSize, int nWaitMillis)
       nResult = nToRead;
     }
   }
-  
+
   CheckStatus();
-  
+
   return nResult;
 }
 
@@ -199,7 +199,7 @@ bool Pipe::Write(const char *buf, int nSize, int nWaitMillis)
   }
 
   CheckStatus();
-  
+
   return bOk && m_bOpen;
 }
 
@@ -208,22 +208,22 @@ void Pipe::CheckStatus()
   if (m_bEof)
   {
     m_writeEvent.Set();
-    m_readEvent.Set();  
+    m_readEvent.Set();
     return;
   }
-  
+
   if (m_buffer.getMaxWriteSize() == 0)
     m_writeEvent.Reset();
   else
     m_writeEvent.Set();
-  
+
   if (m_buffer.getMaxReadSize() == 0)
     m_readEvent.Reset();
   else
   {
     if (!m_bReadyForRead  && (int)m_buffer.getMaxReadSize() >= m_nOpenThreshold)
       m_bReadyForRead = true;
-    m_readEvent.Set();  
+    m_readEvent.Set();
   }
 }
 
@@ -288,11 +288,11 @@ XFILE::Pipe *PipesManager::CreatePipe(const std::string &name, int nMaxPipeSize)
   std::string pName = name;
   if (pName.empty())
     pName = GetUniquePipeName();
-  
+
   CSingleLock lock(m_lock);
   if (m_pipes.find(pName) != m_pipes.end())
     return NULL;
-  
+
   XFILE::Pipe *p = new XFILE::Pipe(pName, nMaxPipeSize);
   m_pipes[pName] = p;
   return p;
@@ -312,7 +312,7 @@ void         PipesManager::ClosePipe(XFILE::Pipe *pipe)
   CSingleLock lock(m_lock);
   if (!pipe)
     return ;
-  
+
   pipe->DecRef();
   if (pipe->RefCount() == 0)
   {
diff --git a/xbmc/filesystem/PipesManager.h b/xbmc/filesystem/PipesManager.h
index b2f0b2d3e5..b48e4d6159 100644
--- a/xbmc/filesystem/PipesManager.h
+++ b/xbmc/filesystem/PipesManager.h
@@ -1,7 +1,7 @@
 /*
  * Many concepts and protocol are taken from
  * the Boxee project. http://www.boxee.tv
- * 
+ *
  *      Copyright (C) 2011-2015 Team Kodi
  *      http://kodi.tv
  *
@@ -35,7 +35,7 @@
 
 namespace XFILE
 {
- 
+
 class IPipeListener
 {
 public:
@@ -43,18 +43,18 @@ public:
   virtual void OnPipeOverFlow() = 0;
   virtual void OnPipeUnderFlow() = 0;
 };
-  
+
 class Pipe
   {
   public:
     Pipe(const std::string &name, int nMaxSize = PIPE_DEFAULT_MAX_SIZE );
     virtual ~Pipe();
     const std::string &GetName();
-    
+
     void AddRef();
-    void DecRef();   // a pipe does NOT delete itself with ref-count 0. 
-    int  RefCount(); 
-    
+    void DecRef();   // a pipe does NOT delete itself with ref-count 0.
+    int  RefCount();
+
     bool IsEmpty();
 
     /**
@@ -76,21 +76,21 @@ class Pipe
     bool Write(const char *buf, int nSize, int nWaitMillis = -1);
 
     void Flush();
-    
+
     void CheckStatus();
     void Close();
-    
+
     void AddListener(IPipeListener *l);
     void RemoveListener(IPipeListener *l);
-    
+
     void SetEof();
     bool IsEof();
-    
+
     int	GetAvailableRead();
     void SetOpenThreshold(int threshold);
 
   protected:
-    
+
     bool        m_bOpen;
     bool        m_bReadyForRead;
 
@@ -102,13 +102,13 @@ class Pipe
 
     CEvent     m_readEvent;
     CEvent     m_writeEvent;
-    
+
     std::vector<XFILE::IPipeListener *> m_listeners;
-    
+
     CCriticalSection m_lock;
   };
 
-  
+
 class PipesManager
 {
 public:
@@ -120,12 +120,12 @@ public:
   XFILE::Pipe *OpenPipe(const std::string &name);
   void         ClosePipe(XFILE::Pipe *pipe);
   bool         Exists(const std::string &name);
-  
+
 protected:
   PipesManager();
   int    m_nGenIdHelper;
   std::map<std::string, XFILE::Pipe *> m_pipes;
-  
+
   CCriticalSection m_lock;
 };
 
diff --git a/xbmc/filesystem/PluginDirectory.cpp b/xbmc/filesystem/PluginDirectory.cpp
index 6375a35b62..337dc38d61 100644
--- a/xbmc/filesystem/PluginDirectory.cpp
+++ b/xbmc/filesystem/PluginDirectory.cpp
@@ -303,7 +303,7 @@ void CPluginDirectory::AddSortMethod(int handle, SORT_METHOD sortMethod, const s
       {
         dir->m_listItems->AddSortMethod(SortByBitrate, 623, LABEL_MASKS("%T", "%X"));
         break;
-      }             
+      }
     case SORT_METHOD_SIZE:
       {
         dir->m_listItems->AddSortMethod(SortBySize, 553, LABEL_MASKS("%T", "%I"));
@@ -440,7 +440,7 @@ void CPluginDirectory::AddSortMethod(int handle, SORT_METHOD sortMethod, const s
         dir->m_listItems->AddSortMethod(SortByChannel, 19029, LABEL_MASKS("%T", label2Mask));
         break;
       }
-   
+
     default:
       break;
   }
diff --git a/xbmc/filesystem/RSSDirectory.cpp b/xbmc/filesystem/RSSDirectory.cpp
index 9487910da5..d630fde0fc 100644
--- a/xbmc/filesystem/RSSDirectory.cpp
+++ b/xbmc/filesystem/RSSDirectory.cpp
@@ -516,7 +516,7 @@ static void ParseItem(CFileItem* item, TiXmlElement* root, const std::string& pa
     item->m_dwSize  = best->size;
 
     if(best->duration)
-      item->SetProperty("duration", StringUtils::SecondsToTimeString(best->duration));    
+      item->SetProperty("duration", StringUtils::SecondsToTimeString(best->duration));
 
     /* handling of mimetypes fo directories are sub optimal at best */
     if(best->mime == "application/rss+xml" && StringUtils::StartsWithNoCase(item->GetPath(), "http://"))
@@ -569,7 +569,7 @@ bool CRSSDirectory::GetDirectory(const CURL& url, CFileItemList &items)
   CSingleLock lock(m_section);
   if ((it=m_cache.find(strPath)) != m_cache.end())
   {
-    if (it->second > CDateTime::GetCurrentDateTime() && 
+    if (it->second > CDateTime::GetCurrentDateTime() &&
         items.Load())
       return true;
     m_cache.erase(it);
diff --git a/xbmc/filesystem/SFTPFile.cpp b/xbmc/filesystem/SFTPFile.cpp
index 2c22d82c08..fb1e017630 100644
--- a/xbmc/filesystem/SFTPFile.cpp
+++ b/xbmc/filesystem/SFTPFile.cpp
@@ -177,7 +177,7 @@ bool CSFTPSession::GetDirectory(const std::string &base, const std::string &fold
           sftp_attributes_free(attributes);
           continue;
         }
-        
+
         if (attributes)
         {
           std::string itemName = attributes->name;
@@ -387,7 +387,7 @@ bool CSFTPSession::Connect(const std::string &host, unsigned int port, const std
   }
 #endif
   ssh_options_set(m_session, SSH_OPTIONS_LOG_VERBOSITY, 0);
-  ssh_options_set(m_session, SSH_OPTIONS_TIMEOUT, &timeout);  
+  ssh_options_set(m_session, SSH_OPTIONS_TIMEOUT, &timeout);
 
   if(ssh_connect(m_session))
   {
diff --git a/xbmc/filesystem/ShoutcastFile.cpp b/xbmc/filesystem/ShoutcastFile.cpp
index 165606b204..65ed3cbe76 100644
--- a/xbmc/filesystem/ShoutcastFile.cpp
+++ b/xbmc/filesystem/ShoutcastFile.cpp
@@ -152,7 +152,7 @@ bool CShoutcastFile::ExtractTagInfo(const char* buf)
   }
   else
     g_charsetConverter.unknownToUTF8(strBuffer);
-  
+
   bool result=false;
 
   std::wstring wBuffer, wConverted;
diff --git a/xbmc/filesystem/SmartPlaylistDirectory.cpp b/xbmc/filesystem/SmartPlaylistDirectory.cpp
index 5afe7e2fb5..0110898569 100644
--- a/xbmc/filesystem/SmartPlaylistDirectory.cpp
+++ b/xbmc/filesystem/SmartPlaylistDirectory.cpp
@@ -55,10 +55,10 @@ namespace XFILE
     bool result = GetDirectory(playlist, items);
     if (result)
       items.SetProperty("library.smartplaylist", true);
-    
+
     return result;
   }
-  
+
   bool CSmartPlaylistDirectory::GetDirectory(const CSmartPlaylist &playlist, CFileItemList& items, const std::string &strBaseDir /* = "" */, bool filter /* = false */)
   {
     bool success = false, success2 = false;
@@ -137,7 +137,7 @@ namespace XFILE
           videoUrl.AddOption(option, xsp);
         else
           videoUrl.RemoveOption(option);
-        
+
         CDatabase::Filter dbfilter;
         success = db.GetItems(videoUrl.ToString(), items, dbfilter, sorting);
         db.Close();
@@ -252,7 +252,7 @@ namespace XFILE
           videoUrl.AddOption(option, xsp);
         else
           videoUrl.RemoveOption(option);
-        
+
         CFileItemList items2;
         CDatabase::Filter dbfilter;
         success2 = db.GetItems(videoUrl.ToString(), items2, dbfilter, sorting);
diff --git a/xbmc/filesystem/SourcesDirectory.cpp b/xbmc/filesystem/SourcesDirectory.cpp
index c819fdaa49..e52190b955 100644
--- a/xbmc/filesystem/SourcesDirectory.cpp
+++ b/xbmc/filesystem/SourcesDirectory.cpp
@@ -61,7 +61,7 @@ bool CSourcesDirectory::GetDirectory(const VECSOURCES &sources, CFileItemList &i
     CFileItemPtr pItem(new CFileItem(share));
     if (URIUtils::IsProtocol(pItem->GetPath(), "musicsearch"))
       pItem->SetCanQueue(false);
-    
+
     std::string strIcon;
     // We have the real DVD-ROM, set icon on disktype
     if (share.m_iDriveType == CMediaSource::SOURCE_TYPE_DVD && share.m_strThumbnailImage.empty())
@@ -94,13 +94,13 @@ bool CSourcesDirectory::GetDirectory(const VECSOURCES &sources, CFileItemList &i
       strIcon = "DefaultRemovableDisk.png";
     else
       strIcon = "DefaultHardDisk.png";
-    
+
     pItem->SetIconImage(strIcon);
     if (share.m_iHasLock == 2 && m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE)
       pItem->SetOverlayImage(CGUIListItem::ICON_OVERLAY_LOCKED);
     else
       pItem->SetOverlayImage(CGUIListItem::ICON_OVERLAY_NONE);
-    
+
     items.Add(pItem);
   }
   return true;
diff --git a/xbmc/filesystem/UDFDirectory.cpp b/xbmc/filesystem/UDFDirectory.cpp
index 6697ae1756..57dfe496e4 100644
--- a/xbmc/filesystem/UDFDirectory.cpp
+++ b/xbmc/filesystem/UDFDirectory.cpp
@@ -84,7 +84,7 @@ bool CUDFDirectory::GetDirectory(const CURL& url,
       pItem->m_dwSize = dp->d_filesize;
 
       items.Add(pItem);
-    }	
+    }
   }
 
   udfIsoReader.CloseDir(dirp);
diff --git a/xbmc/filesystem/UPnPDirectory.cpp b/xbmc/filesystem/UPnPDirectory.cpp
index 19d8508417..44cc33b2a0 100644
--- a/xbmc/filesystem/UPnPDirectory.cpp
+++ b/xbmc/filesystem/UPnPDirectory.cpp
@@ -146,7 +146,7 @@ bool CUPnPDirectory::GetResource(const CURL& path, CFileItem &item)
 {
     if (!CServiceBroker::GetSettings().GetBool(CSettings::SETTING_SERVICES_UPNP))
       return false;
-  
+
     if(!path.IsProtocol("upnp"))
       return false;
 
@@ -192,7 +192,7 @@ CUPnPDirectory::GetDirectory(const CURL& url, CFileItemList &items)
 {
     if (!CServiceBroker::GetSettings().GetBool(CSettings::SETTING_SERVICES_UPNP))
       return false;
-  
+
     CUPnP* upnp = CUPnP::GetInstance();
 
     /* upnp should never be cached, it has internal cache */
diff --git a/xbmc/filesystem/UPnPFile.cpp b/xbmc/filesystem/UPnPFile.cpp
index b60064c54c..c5881a0411 100644
--- a/xbmc/filesystem/UPnPFile.cpp
+++ b/xbmc/filesystem/UPnPFile.cpp
@@ -36,13 +36,13 @@ bool CUPnPFile::Open(const CURL& url)
   if (CUPnPDirectory::GetResource(url, item_new))
   {
     //CLog::Log(LOGDEBUG,"FileUPnP - file redirect to %s.", item_new.GetPath().c_str());
-    IFile *pNewImp = CFileFactory::CreateLoader(item_new.GetPath());    
-    CURL *pNewUrl = new CURL(item_new.GetPath());    
+    IFile *pNewImp = CFileFactory::CreateLoader(item_new.GetPath());
+    CURL *pNewUrl = new CURL(item_new.GetPath());
     if (pNewImp)
     {
       throw new CRedirectException(pNewImp, pNewUrl);
     }
-    delete pNewUrl;    
+    delete pNewUrl;
   }
   return false;
 }
diff --git a/xbmc/filesystem/UPnPFile.h b/xbmc/filesystem/UPnPFile.h
index b63fdf7011..98f7070ed5 100644
--- a/xbmc/filesystem/UPnPFile.h
+++ b/xbmc/filesystem/UPnPFile.h
@@ -29,10 +29,10 @@ namespace XFILE
     public:
       CUPnPFile();
       ~CUPnPFile() override;
-      bool Open(const CURL& url) override;      
+      bool Open(const CURL& url) override;
       bool Exists(const CURL& url) override;
       int Stat(const CURL& url, struct __stat64* buffer) override;
-      
+
       ssize_t Read(void* lpBuf, size_t uiBufSize) override {return -1;}
       int64_t Seek(int64_t iFilePosition, int iWhence = SEEK_SET) override {return -1;}
       void Close() override{}
diff --git a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNode.h b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNode.h
index 41caee9d04..23ea72f3c0 100644
--- a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNode.h
+++ b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNode.h
@@ -64,7 +64,7 @@ namespace XFILE
       std::string id;
       int         label;
     } Node;
-    
+
     class CDirectoryNode
     {
     public:
diff --git a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeInProgressTvShows.cpp b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeInProgressTvShows.cpp
index 2fe58ef2ed..83420fad5e 100644
--- a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeInProgressTvShows.cpp
+++ b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeInProgressTvShows.cpp
@@ -47,7 +47,7 @@ bool CDirectoryNodeInProgressTvShows::GetContent(CFileItemList& items) const
   CVideoDatabase videodatabase;
   if (!videodatabase.Open())
     return false;
-  
+
   bool bSuccess=videodatabase.GetInProgressTvShowsNav(BuildPath(), items);
 
   videodatabase.Close();
diff --git a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp
index 721d3156b1..e1f71de696 100644
--- a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp
+++ b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp
@@ -50,7 +50,7 @@ NODE_TYPE CDirectoryNodeMoviesOverview::GetChildType() const
   for (unsigned int i = 0; i < sizeof(MovieChildren) / sizeof(Node); ++i)
     if (GetName() == MovieChildren[i].id)
       return MovieChildren[i].node;
-  
+
   return NODE_TYPE_NONE;
 }
 
@@ -67,7 +67,7 @@ bool CDirectoryNodeMoviesOverview::GetContent(CFileItemList& items) const
   CVideoDbUrl videoUrl;
   if (!videoUrl.FromString(BuildPath()))
     return false;
-  
+
   for (unsigned int i = 0; i < sizeof(MovieChildren) / sizeof(Node); ++i)
   {
     if (i == 6)
diff --git a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp
index f27c412cde..4552155fac 100644
--- a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp
+++ b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp
@@ -65,7 +65,7 @@ bool CDirectoryNodeMusicVideosOverview::GetContent(CFileItemList& items) const
   CVideoDbUrl videoUrl;
   if (!videoUrl.FromString(BuildPath()))
     return false;
-  
+
   for (unsigned int i = 0; i < sizeof(MusicVideoChildren) / sizeof(Node); ++i)
   {
     CFileItemPtr pItem(new CFileItem(g_localizeStrings.Get(MusicVideoChildren[i].label)));
diff --git a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedEpisodes.cpp b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedEpisodes.cpp
index 120eabf510..bd3adb31f0 100644
--- a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedEpisodes.cpp
+++ b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedEpisodes.cpp
@@ -34,7 +34,7 @@ bool CDirectoryNodeRecentlyAddedEpisodes::GetContent(CFileItemList& items) const
   CVideoDatabase videodatabase;
   if (!videodatabase.Open())
     return false;
-  
+
   bool bSuccess=videodatabase.GetRecentlyAddedEpisodesNav(BuildPath(), items);
 
   videodatabase.Close();
diff --git a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMovies.cpp b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMovies.cpp
index 0569898fe4..19aab2fc11 100644
--- a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMovies.cpp
+++ b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMovies.cpp
@@ -34,7 +34,7 @@ bool CDirectoryNodeRecentlyAddedMovies::GetContent(CFileItemList& items) const
   CVideoDatabase videodatabase;
   if (!videodatabase.Open())
     return false;
-  
+
   bool bSuccess=videodatabase.GetRecentlyAddedMoviesNav(BuildPath(), items);
 
   videodatabase.Close();
diff --git a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMusicVideos.cpp b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMusicVideos.cpp
index 0d3516ca51..a87ec93e65 100644
--- a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMusicVideos.cpp
+++ b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMusicVideos.cpp
@@ -34,7 +34,7 @@ bool CDirectoryNodeRecentlyAddedMusicVideos::GetContent(CFileItemList& items) co
   CVideoDatabase videodatabase;
   if (!videodatabase.Open())
     return false;
-  
+
   bool bSuccess=videodatabase.GetRecentlyAddedMusicVideosNav(BuildPath(), items);
 
   videodatabase.Close();
diff --git a/xbmc/filesystem/VideoDatabaseFile.cpp b/xbmc/filesystem/VideoDatabaseFile.cpp
index 6e0d5dad24..4d08edf574 100644
--- a/xbmc/filesystem/VideoDatabaseFile.cpp
+++ b/xbmc/filesystem/VideoDatabaseFile.cpp
@@ -34,26 +34,26 @@ CVideoDatabaseFile::~CVideoDatabaseFile(void) = default;
 CVideoInfoTag CVideoDatabaseFile::GetVideoTag(const CURL& url)
 {
   CVideoInfoTag tag;
-  
+
   std::string strFileName = URIUtils::GetFileName(url.Get());
   if (strFileName.empty())
     return tag;
-  
+
   URIUtils::RemoveExtension(strFileName);
   if (!StringUtils::IsNaturalNumber(strFileName))
     return tag;
   long idDb = atol(strFileName.c_str());
-  
+
   VIDEODB_CONTENT_TYPE type = GetType(url);
   if (type == VIDEODB_CONTENT_UNKNOWN)
     return tag;
-  
+
   CVideoDatabase videoDatabase;
   if (!videoDatabase.Open())
     return tag;
-  
+
   tag = videoDatabase.GetDetailsByTypeAndId(type, idDb);
-  
+
   return tag;
 }
 
diff --git a/xbmc/filesystem/VideoDatabaseFile.h b/xbmc/filesystem/VideoDatabaseFile.h
index 4389f40c9e..840322eec9 100644
--- a/xbmc/filesystem/VideoDatabaseFile.h
+++ b/xbmc/filesystem/VideoDatabaseFile.h
@@ -32,7 +32,7 @@ public:
   ~CVideoDatabaseFile(void) override;
 
   static CVideoInfoTag GetVideoTag(const CURL& url);
-  
+
 protected:
   std::string TranslatePath(const CURL& url) override;
   static VIDEODB_CONTENT_TYPE GetType(const CURL& url);
diff --git a/xbmc/filesystem/VirtualDirectory.h b/xbmc/filesystem/VirtualDirectory.h
index 8862a75452..5b0ada2164 100644
--- a/xbmc/filesystem/VirtualDirectory.h
+++ b/xbmc/filesystem/VirtualDirectory.h
@@ -42,7 +42,7 @@ namespace XFILE
     void CancelDirectory() override;
     bool GetDirectory(const CURL& url, CFileItemList &items, bool bUseFileDirectories, bool keepImpl);
     void SetSources(const VECSOURCES& vecSources);
-    inline unsigned int GetNumberOfSources() 
+    inline unsigned int GetNumberOfSources()
     {
       return static_cast<uint32_t>(m_vecSources.size());
     }
diff --git a/xbmc/filesystem/ZeroconfDirectory.cpp b/xbmc/filesystem/ZeroconfDirectory.cpp
index 25198926d0..56c3642ea4 100644
--- a/xbmc/filesystem/ZeroconfDirectory.cpp
+++ b/xbmc/filesystem/ZeroconfDirectory.cpp
@@ -47,9 +47,9 @@ namespace
     else if(fcr_service_type == "_ftp._tcp.")
       return "FTP";
     else if(fcr_service_type == "_webdav._tcp.")
-      return "WebDAV";   
+      return "WebDAV";
     else if(fcr_service_type == "_nfs._tcp.")
-      return "NFS";   
+      return "NFS";
     else if(fcr_service_type == "_sftp-ssh._tcp.")
       return "SFTP";
     //fallback, just return the received type
@@ -64,7 +64,7 @@ namespace
     else if(fcr_service_type == "_webdav._tcp.")
       fr_protocol = "dav";
     else if(fcr_service_type == "_nfs._tcp.")
-      fr_protocol = "nfs";      
+      fr_protocol = "nfs";
     else if(fcr_service_type == "_sftp-ssh._tcp.")
       fr_protocol = "sftp";
     else
@@ -86,7 +86,7 @@ bool GetDirectoryFromTxtRecords(const CZeroconfBrowser::ZeroconfService& zerocon
     std::string path;
     std::string username;
     std::string password;
-  
+
     //search for a path key entry
     CZeroconfBrowser::ZeroconfService::tTxtRecordMap::iterator it = txtRecords.find(TXT_RECORD_PATH_KEY);
 
@@ -97,7 +97,7 @@ bool GetDirectoryFromTxtRecords(const CZeroconfBrowser::ZeroconfService& zerocon
       //a misconfigured zeroconf server.
       path=it->second;
     }
-    
+
     //search for a username key entry
     it = txtRecords.find(TXT_RECORD_USERNAME_KEY);
 
@@ -107,7 +107,7 @@ bool GetDirectoryFromTxtRecords(const CZeroconfBrowser::ZeroconfService& zerocon
       username=it->second;
       url.SetUserName(username);
     }
-    
+
     //search for a password key entry
     it = txtRecords.find(TXT_RECORD_PASSWORD_KEY);
 
@@ -117,7 +117,7 @@ bool GetDirectoryFromTxtRecords(const CZeroconfBrowser::ZeroconfService& zerocon
       password=it->second;
       url.SetPassword(password);
     }
-    
+
     //if we got a path - add a item - else at least we maybe have set username and password to theurl
     if( !path.empty())
     {
@@ -128,11 +128,11 @@ bool GetDirectoryFromTxtRecords(const CZeroconfBrowser::ZeroconfService& zerocon
       {
         URIUtils::RemoveSlashAtEnd(urlStr);//we don't need the slash at and of url then
       }
-      else//path doesn't start with slash - 
+      else//path doesn't start with slash -
       {//this is some kind of misconfiguration - we fix it by adding a slash to the url
         URIUtils::AddSlashAtEnd(urlStr);
       }
-      
+
       //add slash at end of path since it has to be a folder
       URIUtils::AddSlashAtEnd(path);
       //this is the full path includeing remote stuff (e.x. nfs://ip/path
@@ -188,7 +188,7 @@ bool CZeroconfDirectory::GetDirectory(const CURL& url, CFileItemList &items)
       }
     }
     return true;
-  } 
+  }
   else
   {
     //decode the path first
@@ -216,17 +216,17 @@ bool CZeroconfDirectory::GetDirectory(const CURL& url, CFileItemList &items)
           CLog::Log(LOGERROR, "CZeroconfDirectory::GetDirectory Unknown service type (%s), skipping; ", zeroconf_service.GetType().c_str());
           return false;
         }
-        
+
         service.SetProtocol(protocol);
-        
+
         //first try to show the txt-record defined path if any
         if(GetDirectoryFromTxtRecords(zeroconf_service, service, items))
         {
           return true;
         }
         else//no txt record path - so let the CDirectory handler show the folders
-        {          
-          return CDirectory::GetDirectory(service.Get(), items, "", DIR_FLAG_ALLOW_PROMPT); 
+        {
+          return CDirectory::GetDirectory(service.Get(), items, "", DIR_FLAG_ALLOW_PROMPT);
         }
       }
     } catch (std::runtime_error& e) {
diff --git a/xbmc/filesystem/test/CMakeLists.txt b/xbmc/filesystem/test/CMakeLists.txt
index 0ca960d9c3..c50d534a65 100644
--- a/xbmc/filesystem/test/CMakeLists.txt
+++ b/xbmc/filesystem/test/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(SOURCES TestDirectory.cpp 
+set(SOURCES TestDirectory.cpp
             TestFile.cpp
             TestFileFactory.cpp
             TestZipFile.cpp
diff --git a/xbmc/filesystem/test/TestNfsFile.cpp b/xbmc/filesystem/test/TestNfsFile.cpp
index ca3ad979d3..73d236498f 100644
--- a/xbmc/filesystem/test/TestNfsFile.cpp
+++ b/xbmc/filesystem/test/TestNfsFile.cpp
@@ -38,7 +38,7 @@ struct SplitPath
   std::string relativePath;
   bool expectedResultExport;
   bool expectedResultPath;
-} g_TestData[] = { 
+} g_TestData[] = {
                    {"nfs://192.168.0.1:2049/srv/test/tvmedia/foo.txt", "/srv/test", "//tvmedia/foo.txt", true, true},
                    {"nfs://192.168.0.1/srv/test/tv/media/foo.txt", "/srv/test/tv", "//media/foo.txt", true, true},
                    {"nfs://192.168.0.1:2049/srv/test/tvmedia", "/srv/test", "//tvmedia", true, true},
@@ -60,7 +60,7 @@ class TestNfs : public Test,
 
 class ExportList
 {
-  public: 
+  public:
     std::list<std::string> data;
 
     ExportList()
diff --git a/xbmc/filesystem/test/TestZipManager.cpp b/xbmc/filesystem/test/TestZipManager.cpp
index b143c37499..847b8aa797 100644
--- a/xbmc/filesystem/test/TestZipManager.cpp
+++ b/xbmc/filesystem/test/TestZipManager.cpp
@@ -34,7 +34,7 @@ TEST(TestZipManager, PathTraversal)
   ASSERT_TRUE(pathTraversal.RegFind("test/../test.txt") >= 0);
   ASSERT_TRUE(pathTraversal.RegFind("test\\../test.txt") >= 0);
   ASSERT_TRUE(pathTraversal.RegFind("test\\..\\test.txt") >= 0);
-  
+
   ASSERT_FALSE(pathTraversal.RegFind("...") >= 0);
   ASSERT_FALSE(pathTraversal.RegFind("..test.txt") >= 0);
   ASSERT_FALSE(pathTraversal.RegFind("test.txt..") >= 0);
diff --git a/xbmc/games/controllers/dialogs/GUIDialogButtonCapture.cpp b/xbmc/games/controllers/dialogs/GUIDialogButtonCapture.cpp
index 15e5e038cf..b827a8aa1b 100644
--- a/xbmc/games/controllers/dialogs/GUIDialogButtonCapture.cpp
+++ b/xbmc/games/controllers/dialogs/GUIDialogButtonCapture.cpp
@@ -27,7 +27,7 @@
 #include "input/joysticks/JoystickUtils.h"
 #include "input/IKeymap.h"
 #include "input/ActionIDs.h"
-#include "messaging/helpers/DialogOKHelper.h" 
+#include "messaging/helpers/DialogOKHelper.h"
 #include "peripherals/Peripherals.h"
 #include "utils/Variant.h"
 #include "ServiceBroker.h"
diff --git a/xbmc/games/controllers/dialogs/GUIDialogIgnoreInput.cpp b/xbmc/games/controllers/dialogs/GUIDialogIgnoreInput.cpp
index 14c0a547b9..dd1bda2b6d 100644
--- a/xbmc/games/controllers/dialogs/GUIDialogIgnoreInput.cpp
+++ b/xbmc/games/controllers/dialogs/GUIDialogIgnoreInput.cpp
@@ -51,7 +51,7 @@ std::string CGUIDialogIgnoreInput::GetDialogText()
 
 std::string CGUIDialogIgnoreInput::GetDialogHeader()
 {
-  
+
   return g_localizeStrings.Get(35019); // "Ignore input"
 }
 
diff --git a/xbmc/games/controllers/windows/GUIConfigurationWizard.cpp b/xbmc/games/controllers/windows/GUIConfigurationWizard.cpp
index d09941e14a..8a1d654ef9 100644
--- a/xbmc/games/controllers/windows/GUIConfigurationWizard.cpp
+++ b/xbmc/games/controllers/windows/GUIConfigurationWizard.cpp
@@ -357,7 +357,7 @@ bool CGUIConfigurationWizard::MapPrimitive(JOYSTICK::IButtonMap* buttonMap,
       }
     }
   }
-  
+
   return bHandled;
 }
 
diff --git a/xbmc/games/controllers/windows/GUIFeatureList.h b/xbmc/games/controllers/windows/GUIFeatureList.h
index 284384f539..7a372c925a 100644
--- a/xbmc/games/controllers/windows/GUIFeatureList.h
+++ b/xbmc/games/controllers/windows/GUIFeatureList.h
@@ -77,7 +77,7 @@ namespace GAME
     CGUILabelControl*       m_guiGroupTitle;
     CGUIImage*              m_guiFeatureSeparator;
 
-    // Game window stuff 
+    // Game window stuff
     ControllerPtr           m_controller;
     IConfigurationWizard*   m_wizard;
   };
diff --git a/xbmc/games/dialogs/GUIDialogSelectGameClient.cpp b/xbmc/games/dialogs/GUIDialogSelectGameClient.cpp
index a86f1f0900..5eafab207a 100644
--- a/xbmc/games/dialogs/GUIDialogSelectGameClient.cpp
+++ b/xbmc/games/dialogs/GUIDialogSelectGameClient.cpp
@@ -31,7 +31,7 @@
 #include "guilib/GUIWindowManager.h"
 #include "guilib/LocalizeStrings.h"
 #include "guilib/WindowIDs.h"
-#include "messaging/helpers/DialogOKHelper.h" 
+#include "messaging/helpers/DialogOKHelper.h"
 #include "utils/log.h"
 #include "utils/StringUtils.h"
 #include "utils/URIUtils.h"
diff --git a/xbmc/guilib/D3DResource.cpp b/xbmc/guilib/D3DResource.cpp
index 90f236499e..0d5a561bf5 100644
--- a/xbmc/guilib/D3DResource.cpp
+++ b/xbmc/guilib/D3DResource.cpp
@@ -394,7 +394,7 @@ void CD3DTexture::SaveTexture()
       // copy contents to new texture
       pContext->CopyResource(texture.Get(), m_texture.Get());
     }
-    else 
+    else
       texture = m_texture;
 
     // read data from texture
diff --git a/xbmc/guilib/FFmpegImage.cpp b/xbmc/guilib/FFmpegImage.cpp
index 4c44533e5f..882b728ab6 100644
--- a/xbmc/guilib/FFmpegImage.cpp
+++ b/xbmc/guilib/FFmpegImage.cpp
@@ -103,7 +103,7 @@ static int mem_file_read(void *h, uint8_t* buf, int size)
   int64_t unread = mbuf->size - mbuf->pos;
   if (unread <= 0)
     return 0;
-  
+
   size_t tocopy = std::min((size_t)size, (size_t)unread);
   memcpy(buf, mbuf->data + mbuf->pos, tocopy);
   mbuf->pos += tocopy;
@@ -161,7 +161,7 @@ CFFmpegImage::~CFFmpegImage()
 bool CFFmpegImage::LoadImageFromMemory(unsigned char* buffer, unsigned int bufSize,
                                       unsigned int width, unsigned int height)
 {
-    
+
   if (!Initialize(buffer, bufSize))
   {
     //log
diff --git a/xbmc/guilib/FFmpegImage.h b/xbmc/guilib/FFmpegImage.h
index d2cfa5b2b2..eebf6bbc4c 100644
--- a/xbmc/guilib/FFmpegImage.h
+++ b/xbmc/guilib/FFmpegImage.h
@@ -77,7 +77,7 @@ public:
               unsigned int pitch, unsigned int format) override;
   bool CreateThumbnailFromSurface(unsigned char* bufferin, unsigned int width,
                                   unsigned int height, unsigned int format,
-                                  unsigned int pitch, const std::string& destFile, 
+                                  unsigned int pitch, const std::string& destFile,
                                   unsigned char* &bufferout,
                                   unsigned int &bufferoutSize) override;
   void ReleaseThumbnailBuffer() override;
diff --git a/xbmc/guilib/GUIAudioManager.h b/xbmc/guilib/GUIAudioManager.h
index d31dc0bb5c..80c687791c 100644
--- a/xbmc/guilib/GUIAudioManager.h
+++ b/xbmc/guilib/GUIAudioManager.h
@@ -47,7 +47,7 @@ class CGUIAudioManager : public ISettingCallback
   {
   public:
     int usage;
-    IAESound *sound;      
+    IAESound *sound;
   };
 
 public:
diff --git a/xbmc/guilib/GUIBaseContainer.cpp b/xbmc/guilib/GUIBaseContainer.cpp
index b49844e76f..1c9487dc0f 100644
--- a/xbmc/guilib/GUIBaseContainer.cpp
+++ b/xbmc/guilib/GUIBaseContainer.cpp
@@ -666,7 +666,7 @@ CGUIListItemPtr CGUIBaseContainer::GetListItem(int offset, unsigned int flag) co
   int item = GetSelectedItem() + offset;
   if (flag & INFOFLAG_LISTITEM_POSITION) // use offset from the first item displayed, taking into account scrolling
     item = CorrectOffset((int)(m_scroller.GetValue() / m_layout->Size(m_orientation)), offset);
-  
+
   if (flag & INFOFLAG_LISTITEM_ABSOLUTE) // use offset from the first item
     item = CorrectOffset(0, offset);
 
diff --git a/xbmc/guilib/GUIBaseContainer.h b/xbmc/guilib/GUIBaseContainer.h
index a8882887a3..ef28368aae 100644
--- a/xbmc/guilib/GUIBaseContainer.h
+++ b/xbmc/guilib/GUIBaseContainer.h
@@ -143,7 +143,7 @@ protected:
   CGUIListItemLayout *GetFocusedLayout() const;
 
   CPoint m_renderOffset; ///< \brief render offset of the first item in the list \sa SetRenderOffset
-    
+
   float m_analogScrollCount;
   unsigned int m_lastHoldTime;
 
diff --git a/xbmc/guilib/GUIBorderedImage.h b/xbmc/guilib/GUIBorderedImage.h
index 01a5befe10..0521f06ec7 100644
--- a/xbmc/guilib/GUIBorderedImage.h
+++ b/xbmc/guilib/GUIBorderedImage.h
@@ -37,7 +37,7 @@ public:
   void AllocResources() override;
   void FreeResources(bool immediately = false) override;
   void DynamicResourceAlloc(bool bOnOff) override;
-  
+
   CRect CalcRenderRegion() const override;
 
 protected:
diff --git a/xbmc/guilib/GUIControlLookup.cpp b/xbmc/guilib/GUIControlLookup.cpp
index 848e2bc27e..ed29dc78eb 100644
--- a/xbmc/guilib/GUIControlLookup.cpp
+++ b/xbmc/guilib/GUIControlLookup.cpp
@@ -61,7 +61,7 @@ bool CGUIControlLookup::IsValidControl(const CGUIControl *control) const
 void CGUIControlLookup::AddLookup(CGUIControl *control)
 {
   CGUIControlLookup *lookupControl(dynamic_cast<CGUIControlLookup*>(control));
-  
+
   if (lookupControl)
   { // first add all the subitems of this group (if they exist)
     const LookupMap &map(lookupControl->GetLookup());
diff --git a/xbmc/guilib/GUIDialog.cpp b/xbmc/guilib/GUIDialog.cpp
index 7e143b160e..7120659d9d 100644
--- a/xbmc/guilib/GUIDialog.cpp
+++ b/xbmc/guilib/GUIDialog.cpp
@@ -154,7 +154,7 @@ void CGUIDialog::UpdateVisibility()
     else
       Close();
   }
-  
+
   if (m_autoClosing)
   { // check if our timer is running
     if (!m_showStartTime)
diff --git a/xbmc/guilib/GUIDialog.h b/xbmc/guilib/GUIDialog.h
index 5773092f7c..72f72ec6b3 100644
--- a/xbmc/guilib/GUIDialog.h
+++ b/xbmc/guilib/GUIDialog.h
@@ -57,7 +57,7 @@ public:
   void Render() override;
 
   void Open(const std::string &param = "");
-  
+
   bool OnBack(int actionID) override;
 
   bool IsDialogRunning() const override { return m_active; };
diff --git a/xbmc/guilib/GUIEditControl.cpp b/xbmc/guilib/GUIEditControl.cpp
index 5c77cbe74d..14a0bc4185 100644
--- a/xbmc/guilib/GUIEditControl.cpp
+++ b/xbmc/guilib/GUIEditControl.cpp
@@ -626,7 +626,7 @@ bool CGUIEditControl::ClearMD5()
 {
   if (!(m_inputType == INPUT_TYPE_PASSWORD_MD5 || m_inputType == INPUT_TYPE_PASSWORD_NUMBER_VERIFY_NEW) || !m_isMD5)
     return false;
-  
+
   m_text2.clear();
   m_cursorPos = 0;
   if (m_inputType != INPUT_TYPE_PASSWORD_NUMBER_VERIFY_NEW)
@@ -702,7 +702,7 @@ void CGUIEditControl::SetInputValidation(StringValidation::Validator inputValida
 {
   if (m_inputValidator == inputValidator)
     return;
-  
+
   m_inputValidator = inputValidator;
   m_inputValidatorData = data;
   // the input validator has changed, so re-validate the current data
@@ -748,6 +748,6 @@ std::string CGUIEditControl::GetDescriptionByIndex(int index) const
     return GetDescription();
   else if(index == 1)
     return GetLabel2();
-  
+
   return "";
 }
diff --git a/xbmc/guilib/GUIEditControl.h b/xbmc/guilib/GUIEditControl.h
index 3487f4d4cb..eec1a3f39b 100644
--- a/xbmc/guilib/GUIEditControl.h
+++ b/xbmc/guilib/GUIEditControl.h
@@ -95,7 +95,7 @@ protected:
   void UpdateText(bool sendUpdate = true);
   void OnPasteClipboard();
   void OnSMSCharacter(unsigned int key);
-  void DefaultConstructor();  
+  void DefaultConstructor();
 
   virtual bool ValidateInput(const std::wstring &data) const;
   void ValidateInput();
@@ -104,7 +104,7 @@ protected:
    \return true if the password is cleared, false otherwise.
    */
   bool ClearMD5();
-  
+
   std::wstring m_text2;
   std::string  m_text;
   KODI::GUILIB::GUIINFO::CGUIInfoLabel m_hintInfo;
diff --git a/xbmc/guilib/GUIFadeLabelControl.cpp b/xbmc/guilib/GUIFadeLabelControl.cpp
index c9ae3e0219..fde2d8fcbd 100644
--- a/xbmc/guilib/GUIFadeLabelControl.cpp
+++ b/xbmc/guilib/GUIFadeLabelControl.cpp
@@ -42,7 +42,7 @@ CGUIFadeLabelControl::CGUIFadeLabelControl(int parentID, int controlID, float po
 }
 
 CGUIFadeLabelControl::CGUIFadeLabelControl(const CGUIFadeLabelControl &from)
-: CGUIControl(from), m_infoLabels(from.m_infoLabels), m_label(from.m_label), m_scrollInfo(from.m_scrollInfo), m_textLayout(from.m_textLayout), 
+: CGUIControl(from), m_infoLabels(from.m_infoLabels), m_label(from.m_label), m_scrollInfo(from.m_scrollInfo), m_textLayout(from.m_textLayout),
   m_fadeAnim(from.m_fadeAnim)
 {
   m_scrollOut = from.m_scrollOut;
@@ -133,7 +133,7 @@ void CGUIFadeLabelControl::Process(unsigned int currentTime, CDirtyRegionList &d
 
     if (m_fadeAnim.GetState() == ANIM_STATE_APPLIED)
       m_fadeAnim.ResetAnimation();
-    
+
     m_scrollInfo.SetSpeed((m_fadeAnim.GetProcess() == ANIM_PROCESS_NONE) ? m_scrollSpeed : 0);
 
     if (moveToNextLabel)
diff --git a/xbmc/guilib/GUIFontCache.cpp b/xbmc/guilib/GUIFontCache.cpp
index 7e4c08b8fd..4fe5ac434a 100644
--- a/xbmc/guilib/GUIFontCache.cpp
+++ b/xbmc/guilib/GUIFontCache.cpp
@@ -85,7 +85,7 @@ class CGUIFontCacheImpl
 
   EntryList m_list;
   CGUIFontCache<Position, Value> *m_parent;
-  
+
 public:
 
   explicit CGUIFontCacheImpl(CGUIFontCache<Position, Value>* parent) : m_parent(parent) {}
diff --git a/xbmc/guilib/GUIFontCache.h b/xbmc/guilib/GUIFontCache.h
index 0149dccd0e..8bd54ac14b 100644
--- a/xbmc/guilib/GUIFontCache.h
+++ b/xbmc/guilib/GUIFontCache.h
@@ -147,7 +147,7 @@ public:
   explicit CGUIFontCache(CGUIFontTTFBase &font);
 
   ~CGUIFontCache();
- 
+
   Value &Lookup(Position &pos,
                 const std::vector<UTILS::Color> &colors, const vecText &text,
                 uint32_t alignment, float maxPixelWidth,
diff --git a/xbmc/guilib/GUIFontTTF.cpp b/xbmc/guilib/GUIFontTTF.cpp
index 2c4da4b812..3ea1fa591c 100644
--- a/xbmc/guilib/GUIFontTTF.cpp
+++ b/xbmc/guilib/GUIFontTTF.cpp
@@ -129,7 +129,7 @@ public:
 
     return face;
   };
-  
+
   FT_Stroker GetStroker()
   {
     if (!m_library)
@@ -147,7 +147,7 @@ public:
     assert(face);
     FT_Done_Face(face);
   };
-  
+
   static void ReleaseStroker(FT_Stroker stroker)
   {
     assert(stroker);
@@ -799,7 +799,7 @@ bool CGUIFontTTFBase::CacheCharacter(wchar_t letter, uint32_t style, Character *
     unsigned int x2 = std::min(x1 + bitmap.width, m_textureWidth);
     unsigned int y2 = std::min(y1 + bitmap.rows, m_textureHeight);
     CopyCharToTexture(bitGlyph, x1, y1, x2, y2);
-  
+
     m_posX += spacing_between_characters_in_texture + (unsigned short)std::max(ch->right - ch->left + ch->offsetX, ch->advance);
   }
   m_numChars++;
@@ -816,7 +816,7 @@ void CGUIFontTTFBase::RenderCharacter(float posX, float posY, const Character *c
   // just baseline width and height should include the descent
   const float width = ch->right - ch->left;
   const float height = ch->bottom - ch->top;
-  
+
   // return early if nothing to render
   if (width == 0 || height == 0)
     return;
diff --git a/xbmc/guilib/GUIFontTTFDX.cpp b/xbmc/guilib/GUIFontTTFDX.cpp
index 69af2c574b..48c6909b51 100644
--- a/xbmc/guilib/GUIFontTTFDX.cpp
+++ b/xbmc/guilib/GUIFontTTFDX.cpp
@@ -126,7 +126,7 @@ void CGUIFontTTFDX::LastEnd()
       size_t count = size - character;
       count = std::min<size_t>(count, ELEMENT_ARRAY_MAX_CHAR_INDEX);
 
-      // 6 indices and 4 vertices per character 
+      // 6 indices and 4 vertices per character
       pGUIShader->DrawIndexed(count * 6, 0, character * 4);
     }
   }
@@ -173,7 +173,7 @@ void CGUIFontTTFDX::LastEnd()
         size_t count = m_vertexTrans[i].vertexBuffer->size - character;
         count = std::min<size_t>(count, ELEMENT_ARRAY_MAX_CHAR_INDEX);
 
-        // 6 indices and 4 vertices per character 
+        // 6 indices and 4 vertices per character
         pGUIShader->DrawIndexed(count * 6, 0, character * 4);
       }
     }
diff --git a/xbmc/guilib/GUIFontTTFGL.cpp b/xbmc/guilib/GUIFontTTFGL.cpp
index 298c056952..cf6a5ab49e 100644
--- a/xbmc/guilib/GUIFontTTFGL.cpp
+++ b/xbmc/guilib/GUIFontTTFGL.cpp
@@ -364,7 +364,7 @@ bool CGUIFontTTFGL::CopyCharToTexture(FT_BitmapGlyph bitGlyph, unsigned int x1,
     source += bitmap.width;
     target += m_texture->GetPitch();
   }
-  
+
   switch (m_textureStatus)
   {
   case TEXTURE_UPDATED:
@@ -373,7 +373,7 @@ bool CGUIFontTTFGL::CopyCharToTexture(FT_BitmapGlyph bitGlyph, unsigned int x1,
       m_updateY2 = std::max(m_updateY2, y2);
     }
     break;
-      
+
   case TEXTURE_READY:
     {
       m_updateY1 = y1;
@@ -381,7 +381,7 @@ bool CGUIFontTTFGL::CopyCharToTexture(FT_BitmapGlyph bitGlyph, unsigned int x1,
       m_textureStatus = TEXTURE_UPDATED;
     }
     break;
-      
+
   case TEXTURE_REALLOCATED:
     {
       m_updateY2 = std::max(m_updateY2, y2);
@@ -392,7 +392,7 @@ bool CGUIFontTTFGL::CopyCharToTexture(FT_BitmapGlyph bitGlyph, unsigned int x1,
   default:
     break;
   }
-  
+
   return true;
 }
 
diff --git a/xbmc/guilib/GUIFontTTFGL.h b/xbmc/guilib/GUIFontTTFGL.h
index bdba5b2850..d9854c2bb3 100644
--- a/xbmc/guilib/GUIFontTTFGL.h
+++ b/xbmc/guilib/GUIFontTTFGL.h
@@ -50,7 +50,7 @@ protected:
 private:
   unsigned int m_updateY1;
   unsigned int m_updateY2;
-  
+
   enum TextureStatus
   {
     TEXTURE_VOID = 0,
@@ -58,7 +58,7 @@ private:
     TEXTURE_REALLOCATED,
     TEXTURE_UPDATED,
   };
-  
+
   TextureStatus m_textureStatus;
 
   static bool m_staticVertexBufferCreated;
diff --git a/xbmc/guilib/GUIImage.cpp b/xbmc/guilib/GUIImage.cpp
index 097453baf9..787494b9d8 100644
--- a/xbmc/guilib/GUIImage.cpp
+++ b/xbmc/guilib/GUIImage.cpp
@@ -38,7 +38,7 @@ CGUIImage::CGUIImage(int parentID, int controlID, float posX, float posY, float
 }
 
 CGUIImage::CGUIImage(const CGUIImage &left)
-  : CGUIControl(left), 
+  : CGUIControl(left),
   m_image(left.m_image),
   m_info(left.m_info),
   m_texture(left.m_texture),
diff --git a/xbmc/guilib/GUIIncludes.cpp b/xbmc/guilib/GUIIncludes.cpp
index ad6f3ed497..95b7fca519 100644
--- a/xbmc/guilib/GUIIncludes.cpp
+++ b/xbmc/guilib/GUIIncludes.cpp
@@ -151,7 +151,7 @@ void CGUIIncludes::LoadDefaults(const TiXmlElement *node)
 {
   if (!node)
     return;
-  
+
   const TiXmlElement* child = node->FirstChildElement("default");
   while (child)
   {
diff --git a/xbmc/guilib/GUIKeyboard.h b/xbmc/guilib/GUIKeyboard.h
index 5e1ceb207d..0ec6b60dcd 100644
--- a/xbmc/guilib/GUIKeyboard.h
+++ b/xbmc/guilib/GUIKeyboard.h
@@ -51,14 +51,14 @@ class CGUIKeyboard : public ITimerCallback
      * \return - true if typedstring is valid and user has confirmed input - false if typedstring is undefined and user canceled the input
      *
      */
-    virtual bool ShowAndGetInput(char_callback_t pCallback, 
-                                 const std::string &initialString, 
-                                 std::string &typedString, 
-                                 const std::string &heading, 
+    virtual bool ShowAndGetInput(char_callback_t pCallback,
+                                 const std::string &initialString,
+                                 std::string &typedString,
+                                 const std::string &heading,
                                  bool bHiddenInput = false) = 0;
-    
+
     /*!
-    *\brief This call should cancel a currently shown keyboard dialog. The implementation should 
+    *\brief This call should cancel a currently shown keyboard dialog. The implementation should
     * return false from the modal ShowAndGetInput once anyone calls this method.
     */
     virtual void Cancel() = 0;
@@ -74,18 +74,18 @@ class CGUIKeyboard : public ITimerCallback
     // helpers for autoclose function
     void startAutoCloseTimer(unsigned int autoCloseMs)
     {
-      if ( autoCloseMs > 0 ) 
+      if ( autoCloseMs > 0 )
         m_idleTimer.Start(autoCloseMs, false);
     }
 
     void resetAutoCloseTimer()
     {
-      if (m_idleTimer.IsRunning()) 
+      if (m_idleTimer.IsRunning())
         m_idleTimer.Restart();
     }
 
     virtual bool SetTextToKeyboard(const std::string &text, bool closeKeyboard = false) { return false; }
-    
+
   private:
     CTimer m_idleTimer;
 };
diff --git a/xbmc/guilib/GUILabel.cpp b/xbmc/guilib/GUILabel.cpp
index 2158fabc93..7e93a39f97 100644
--- a/xbmc/guilib/GUILabel.cpp
+++ b/xbmc/guilib/GUILabel.cpp
@@ -226,7 +226,7 @@ bool CGUILabel::CheckAndCorrectOverlap(CGUILabel &label1, CGUILabel &label2)
   CRect rect(label1.m_renderRect);
   if (rect.Intersect(label2.m_renderRect).IsEmpty())
     return false; // nothing to do (though it could potentially encroach on the min_space requirement)
-  
+
   // overlap vertically and horizontally - check alignment
   CGUILabel &left = label1.m_renderRect.x1 <= label2.m_renderRect.x1 ? label1 : label2;
   CGUILabel &right = label1.m_renderRect.x1 <= label2.m_renderRect.x1 ? label2 : label1;
diff --git a/xbmc/guilib/GUILabel.h b/xbmc/guilib/GUILabel.h
index 31ab822277..c24cdfb4b8 100644
--- a/xbmc/guilib/GUILabel.h
+++ b/xbmc/guilib/GUILabel.h
@@ -57,7 +57,7 @@ public:
 
     return changed;
   };
-  
+
   KODI::GUILIB::GUIINFO::CGUIInfoColor textColor;
   KODI::GUILIB::GUIINFO::CGUIInfoColor shadowColor;
   KODI::GUILIB::GUIINFO::CGUIInfoColor selectedColor;
@@ -70,7 +70,7 @@ public:
   float width;
   float angle;
   CGUIFont *font;
-  int scrollSpeed; 
+  int scrollSpeed;
   std::string scrollSuffix;
 };
 
@@ -88,7 +88,7 @@ public:
                COLOR_FOCUSED,
                COLOR_DISABLED,
                COLOR_INVALID };
-  
+
   /*! \brief allowed overflow handling techniques for labels, as defined by the skin
    */
   enum OVER_FLOW { OVER_FLOW_TRUNCATE = 0,
@@ -107,7 +107,7 @@ public:
   /*! \brief Render the label on screen
    */
   void Render();
-  
+
   /*! \brief Set the maximal extent of the label
    Sets the maximal size and positioning that the label may render in.  Note that `textwidth>` can override
    this, and `<textoffsetx>` and `<textoffsety>` may also allow the label to be moved outside this rectangle.
@@ -115,7 +115,7 @@ public:
   bool SetMaxRect(float x, float y, float w, float h);
 
   bool SetAlign(uint32_t align);
-  
+
   /*! \brief Set the text to be displayed in the label
    Updates the label control and recomputes final position and size
    \param text std::string to set as this labels text
@@ -150,7 +150,7 @@ public:
    \sa GetRenderRect, UpdateRenderRect
    */
   void SetRenderRect(const CRect &rect) { m_renderRect = rect; };
-  
+
   /*! \brief Set whether or not this label control should scroll
    \param scrolling true if this label should scroll.
    */
@@ -169,30 +169,30 @@ public:
   /*! \brief Set this label invalid.  Forces an update of the control
    */
   void SetInvalid();
-  
+
   /*! \brief Update this labels colors
    */
   bool UpdateColors();
-  
+
   /*! \brief Returns the precalculated final layout of the current text
    \return CRect containing the extents of the current text
    \sa SetRenderRect, UpdateRenderRect
    */
   const CRect &GetRenderRect() const { return m_renderRect; };
-  
+
   /*! \brief Returns the precalculated full width of the current text, regardless of layout
    \return full width of the current text
    \sa CalcTextWidth
    */
   float GetTextWidth() const { return m_textLayout.GetTextWidth(); };
-  
+
   /*! \brief Returns the maximal width that this label can render into
    \return Maximal width that this label can render into. Note that this may differ from the
            amount given in SetMaxRect as offsets and text width overrides have been taken into account.
    \sa SetMaxRect
    */
   float GetMaxWidth() const;
-  
+
   /*! \brief Calculates the width of some text
    \param text std::wstring of text whose width we want
    \return width of the given text
@@ -204,7 +204,7 @@ public:
   CLabelInfo &GetLabelInfo() { return m_label; };
 
   /*! \brief Check a left aligned and right aligned label for overlap and cut the labels off so that no overlap occurs
-   
+
    If a left-aligned label occupies some of the same space on screen as a right-aligned label, then we may be able to
    correct for this by restricting the width of one or both of them. This routine checks two labels to see whether they
    satisfy this assumption and, if so, adjusts the render rect of both labels so that they no longer do so.  The order
@@ -214,20 +214,20 @@ public:
    actual space occupied by the right label.  Similarly, [L   L]...L] refers to the maximal and actual space occupied
    by the left label.  | refers to the central cutting point, i.e. the point that would divide the maximal allowed
    overlap perfectly in two.  There are 3 scenarios to consider:
-   
+
    cut
    [L       [R...[R  L].|..........L]         R]     left label ends to the left of the cut -> just crop the left label.
    [L       [R.....[R   |      L]..L]         R]     both left and right labels occupy more than the cut allows, so crop both.
    [L       [R..........|.[R   L]..L]         R]     right label ends to the right of the cut -> just crop the right label.
-   
+
    \param label1 First label to check
    \param label2 Second label to check
    */
   static bool CheckAndCorrectOverlap(CGUILabel &label1, CGUILabel &label2);
-  
+
 protected:
   UTILS::Color GetColor() const;
-  
+
   /*! \brief Computes the final layout of the text
    Uses the maximal position and width of the text, as well as the text length
    and alignment to compute the final render rect of the text.
diff --git a/xbmc/guilib/GUILabelControl.h b/xbmc/guilib/GUILabelControl.h
index 84206e296c..2f30957e02 100644
--- a/xbmc/guilib/GUILabelControl.h
+++ b/xbmc/guilib/GUILabelControl.h
@@ -50,7 +50,7 @@ public:
   float GetWidth() const override;
   void SetWidth(float width) override;
   CRect CalcRenderRegion() const override;
- 
+
   const CLabelInfo& GetLabelInfo() const { return m_label.GetLabelInfo(); };
   void SetLabel(const std::string &strLabel);
   void ShowCursor(bool bShow = true);
diff --git a/xbmc/guilib/GUIListItem.cpp b/xbmc/guilib/GUIListItem.cpp
index 25606239ec..30c684eeca 100644
--- a/xbmc/guilib/GUIListItem.cpp
+++ b/xbmc/guilib/GUIListItem.cpp
@@ -400,7 +400,7 @@ const CVariant &CGUIListItem::GetProperty(const std::string &strKey) const
 {
   PropertyMap::const_iterator iter = m_mapProperties.find(strKey);
   static CVariant nullVariant = CVariant(CVariant::VariantTypeNull);
-  
+
   if (iter == m_mapProperties.end())
     return nullVariant;
 
diff --git a/xbmc/guilib/GUIMoverControl.cpp b/xbmc/guilib/GUIMoverControl.cpp
index 351c140049..3196bb8a0b 100644
--- a/xbmc/guilib/GUIMoverControl.cpp
+++ b/xbmc/guilib/GUIMoverControl.cpp
@@ -244,7 +244,7 @@ void CGUIMoverControl::SetPosition(float posX, float posY)
 
 bool CGUIMoverControl::SetAlpha(unsigned char alpha)
 {
-  return m_imgFocus.SetAlpha(alpha) | 
+  return m_imgFocus.SetAlpha(alpha) |
          m_imgNoFocus.SetAlpha(alpha);
 }
 
diff --git a/xbmc/guilib/GUIRadioButtonControl.cpp b/xbmc/guilib/GUIRadioButtonControl.cpp
index 1dca38060a..31479370a0 100644
--- a/xbmc/guilib/GUIRadioButtonControl.cpp
+++ b/xbmc/guilib/GUIRadioButtonControl.cpp
@@ -27,7 +27,7 @@ CGUIRadioButtonControl::CGUIRadioButtonControl(int parentID, int controlID, floa
     const CTextureInfo& textureFocus, const CTextureInfo& textureNoFocus,
     const CLabelInfo& labelInfo,
     const CTextureInfo& radioOnFocus, const CTextureInfo& radioOnNoFocus,
-    const CTextureInfo& radioOffFocus, const CTextureInfo& radioOffNoFocus, 
+    const CTextureInfo& radioOffFocus, const CTextureInfo& radioOffNoFocus,
     const CTextureInfo& radioOnDisabled, const CTextureInfo& radioOffDisabled)
     : CGUIButtonControl(parentID, controlID, posX, posY, width, height, textureFocus, textureNoFocus, labelInfo)
     , m_imgRadioOnFocus(posX, posY, 16, 16, radioOnFocus)
diff --git a/xbmc/guilib/GUIResizeControl.cpp b/xbmc/guilib/GUIResizeControl.cpp
index 3e3b059b5b..9f48ff801d 100644
--- a/xbmc/guilib/GUIResizeControl.cpp
+++ b/xbmc/guilib/GUIResizeControl.cpp
@@ -224,7 +224,7 @@ void CGUIResizeControl::SetPosition(float posX, float posY)
 
 bool CGUIResizeControl::SetAlpha(unsigned char alpha)
 {
-  return m_imgFocus.SetAlpha(alpha) | 
+  return m_imgFocus.SetAlpha(alpha) |
          m_imgNoFocus.SetAlpha(alpha);
 }
 
diff --git a/xbmc/guilib/GUIScrollBarControl.cpp b/xbmc/guilib/GUIScrollBarControl.cpp
index a46c45f8f2..9554e16614 100644
--- a/xbmc/guilib/GUIScrollBarControl.cpp
+++ b/xbmc/guilib/GUIScrollBarControl.cpp
@@ -326,11 +326,11 @@ EVENT_RESULT GUIScrollBarControl::OnMouseEvent(const CPoint &point, const CMouse
   {
     Move(1);
     return EVENT_RESULT_HANDLED;
-  }  
+  }
   else if (event.m_id == ACTION_GESTURE_NOTIFY)
   {
     return (m_orientation == HORIZONTAL) ? EVENT_RESULT_PAN_HORIZONTAL_WITHOUT_INERTIA : EVENT_RESULT_PAN_VERTICAL_WITHOUT_INERTIA;
-  }  
+  }
   else if (event.m_id == ACTION_GESTURE_BEGIN)
   { // grab exclusive access
     CGUIMessage msg(GUI_MSG_EXCLUSIVE_MOUSE, GetID(), GetParentID());
@@ -338,7 +338,7 @@ EVENT_RESULT GUIScrollBarControl::OnMouseEvent(const CPoint &point, const CMouse
     return EVENT_RESULT_HANDLED;
   }
   else if (event.m_id == ACTION_GESTURE_PAN)
-  { // do the drag 
+  { // do the drag
     SetFromPosition(point);
     return EVENT_RESULT_HANDLED;
   }
@@ -348,7 +348,7 @@ EVENT_RESULT GUIScrollBarControl::OnMouseEvent(const CPoint &point, const CMouse
     SendWindowMessage(msg);
     return EVENT_RESULT_HANDLED;
   }
-  
+
   return EVENT_RESULT_UNHANDLED;
 }
 
diff --git a/xbmc/guilib/GUIScrollBarControl.h b/xbmc/guilib/GUIScrollBarControl.h
index aedaf5abc7..db5e64c822 100644
--- a/xbmc/guilib/GUIScrollBarControl.h
+++ b/xbmc/guilib/GUIScrollBarControl.h
@@ -21,7 +21,7 @@
 #pragma once
 
 /*!
-\file 
+\file
 \brief
 */
 
diff --git a/xbmc/guilib/GUISettingsSliderControl.cpp b/xbmc/guilib/GUISettingsSliderControl.cpp
index 5bcb26fe20..16cc2a3b89 100644
--- a/xbmc/guilib/GUISettingsSliderControl.cpp
+++ b/xbmc/guilib/GUISettingsSliderControl.cpp
@@ -26,7 +26,7 @@ CGUISettingsSliderControl::CGUISettingsSliderControl(int parentID, int controlID
     , m_buttonControl(parentID, controlID, posX, posY, width, height, textureFocus, textureNoFocus, labelInfo)
     , m_label(posX, posY, width, height, labelInfo)
 {
-  m_label.SetAlign((labelInfo.align & XBFONT_CENTER_Y) | XBFONT_RIGHT);  
+  m_label.SetAlign((labelInfo.align & XBFONT_CENTER_Y) | XBFONT_RIGHT);
   ControlType = GUICONTROL_SETTINGS_SLIDER;
   m_active = false;
 }
@@ -77,7 +77,7 @@ bool CGUISettingsSliderControl::OnAction(const CAction &action)
 {
   // intercept ACTION_SELECT_ITEM because onclick functionality is different from base class
   if (action.GetID() == ACTION_SELECT_ITEM)
-  { 
+  {
     if (!IsActive())
       m_active = true;
      // switch between the two sliders
diff --git a/xbmc/guilib/GUIShaderDX.cpp b/xbmc/guilib/GUIShaderDX.cpp
index 7dc1789160..c61df117c3 100644
--- a/xbmc/guilib/GUIShaderDX.cpp
+++ b/xbmc/guilib/GUIShaderDX.cpp
@@ -299,8 +299,8 @@ void CGUIShaderDX::Project(float &x, float &y, float &z)
 #elif defined(_XM_ARM_NEON_INTRINSICS_) && !defined(_XM_NO_INTRINSICS_)
   XMVECTOR vLocation = { x, y };
 #endif
-  XMVECTOR vScreenCoord = XMVector3Project(vLocation, m_cbViewPort.TopLeftX, m_cbViewPort.TopLeftY, 
-                                           m_cbViewPort.Width, m_cbViewPort.Height, 0, 1, 
+  XMVECTOR vScreenCoord = XMVector3Project(vLocation, m_cbViewPort.TopLeftX, m_cbViewPort.TopLeftY,
+                                           m_cbViewPort.Width, m_cbViewPort.Height, 0, 1,
                                            m_cbWorldViewProj.projection, m_cbWorldViewProj.view, m_cbWorldViewProj.world);
   x = XMVectorGetX(vScreenCoord);
   y = XMVectorGetY(vScreenCoord);
diff --git a/xbmc/guilib/GUIShaderDX.h b/xbmc/guilib/GUIShaderDX.h
index 01b02a43b3..507cfac3b3 100644
--- a/xbmc/guilib/GUIShaderDX.h
+++ b/xbmc/guilib/GUIShaderDX.h
@@ -60,10 +60,10 @@ public:
   void SetViewPort(D3D11_VIEWPORT viewPort);
 
   void XM_CALLCONV GetWVP(DirectX::XMMATRIX &w, DirectX::XMMATRIX &v, DirectX::XMMATRIX &p)
-  { 
-    w = m_cbWorldViewProj.world; 
-    v = m_cbWorldViewProj.view; 
-    p = m_cbWorldViewProj.projection; 
+  {
+    w = m_cbWorldViewProj.world;
+    v = m_cbWorldViewProj.view;
+    p = m_cbWorldViewProj.projection;
   }
   DirectX::XMMATRIX XM_CALLCONV GetWorld() const { return m_cbWorldViewProj.world; }
   DirectX::XMMATRIX XM_CALLCONV GetView() const { return m_cbWorldViewProj.view; }
@@ -77,7 +77,7 @@ public:
   void DrawQuad(Vertex& v1, Vertex& v2, Vertex& v3, Vertex& v4);
   void DrawIndexed(unsigned int indexCount, unsigned int startIndex, unsigned int startVertex);
   void Draw(unsigned int vertexCount, unsigned int startVertex);
-  
+
   bool  HardwareClipIsPossible(void) const { return m_clipPossible; }
   float GetClipXFactor(void) const { return m_clipXFactor;  }
   float GetClipXOffset(void) const { return m_clipXOffset;  }
diff --git a/xbmc/guilib/GUISliderControl.cpp b/xbmc/guilib/GUISliderControl.cpp
index e78da7503c..a3ffd5377c 100644
--- a/xbmc/guilib/GUISliderControl.cpp
+++ b/xbmc/guilib/GUISliderControl.cpp
@@ -308,7 +308,7 @@ void CGUISliderControl::SendClick()
     std::string action = StringUtils::Format(m_action->formatString, percent);
     CGUIMessage message(GUI_MSG_EXECUTE, m_controlID, m_parentID);
     message.SetStringParam(action);
-    CServiceBroker::GetGUI()->GetWindowManager().SendMessage(message);    
+    CServiceBroker::GetGUI()->GetWindowManager().SendMessage(message);
   }
 }
 
@@ -633,7 +633,7 @@ EVENT_RESULT CGUISliderControl::OnMouseEvent(const CPoint &point, const CMouseEv
   else if (event.m_id == ACTION_GESTURE_NOTIFY)
   {
     return EVENT_RESULT_PAN_HORIZONTAL_WITHOUT_INERTIA;
-  }  
+  }
   else if (event.m_id == ACTION_GESTURE_BEGIN)
   { // grab exclusive access
     CGUIMessage msg(GUI_MSG_EXCLUSIVE_MOUSE, GetID(), GetParentID());
@@ -641,7 +641,7 @@ EVENT_RESULT CGUISliderControl::OnMouseEvent(const CPoint &point, const CMouseEv
     return EVENT_RESULT_HANDLED;
   }
   else if (event.m_id == ACTION_GESTURE_PAN)
-  { // do the drag 
+  { // do the drag
     SetFromPosition(point);
     return EVENT_RESULT_HANDLED;
   }
diff --git a/xbmc/guilib/GUISliderControl.h b/xbmc/guilib/GUISliderControl.h
index fef5de10ef..d42b662d9a 100644
--- a/xbmc/guilib/GUISliderControl.h
+++ b/xbmc/guilib/GUISliderControl.h
@@ -97,7 +97,7 @@ protected:
    \return slider position in the range [0,1]
    */
   float GetProportion(RangeSelector selector = RangeSelectorLower) const;
-  
+
   /*! \brief Send a click message (and/or action) to the app in response to a slider move
    */
   void SendClick();
diff --git a/xbmc/guilib/GUIStaticItem.h b/xbmc/guilib/GUIStaticItem.h
index adbff58bbf..64f915d143 100644
--- a/xbmc/guilib/GUIStaticItem.h
+++ b/xbmc/guilib/GUIStaticItem.h
@@ -39,11 +39,11 @@ class TiXmlElement;
 /*!
  \ingroup lists,items
  \brief wrapper class for a static item in a list container
- 
+
  A wrapper class for the items in a container specified via the <content>
  flag.  Handles constructing items from XML and updating item labels, icons
  and properties.
- 
+
  \sa CFileItem, CGUIBaseContainer
  */
 class CGUIStaticItem : public CFileItem
@@ -58,7 +58,7 @@ public:
        <icon>foo.jpg</icon>
        <onclick>ActivateWindow(Home)</onclick>
      </item>
-   
+
    \param element XML element to construct from
    \param contextWindow window context to use for any info labels
    */
@@ -66,7 +66,7 @@ public:
   explicit CGUIStaticItem(const CFileItem &item); // for python
   ~CGUIStaticItem() override = default;
   CGUIListItem *Clone() const override { return new CGUIStaticItem(*this); };
-  
+
   /*! \brief update any infolabels in the items properties
    Runs through all the items properties, updating any that should be
    periodically recomputed
diff --git a/xbmc/guilib/GUITextBox.cpp b/xbmc/guilib/GUITextBox.cpp
index 7b80065fce..e8b2a31364 100644
--- a/xbmc/guilib/GUITextBox.cpp
+++ b/xbmc/guilib/GUITextBox.cpp
@@ -320,7 +320,7 @@ void CGUITextBox::SetMinHeight(float minHeight)
 {
   if (m_minHeight != minHeight)
     SetInvalid();
-  
+
   m_minHeight = minHeight;
 }
 
diff --git a/xbmc/guilib/GUITextLayout.h b/xbmc/guilib/GUITextLayout.h
index 02d90872d6..1abc4c0dfd 100644
--- a/xbmc/guilib/GUITextLayout.h
+++ b/xbmc/guilib/GUITextLayout.h
@@ -79,13 +79,13 @@ public:
    \sa GetTextWidth, CalcTextExtent
    */
   void GetTextExtent(float &width, float &height) const;
-  
+
   /*! \brief Returns the precalculated width of the text to be rendered (in constant time).
    \return width of text
    \sa GetTextExtent, CalcTextExtent
    */
   float GetTextWidth() const { return m_textWidth; };
-  
+
   float GetTextWidth(const std::wstring &text) const;
   bool Update(const std::string &text, float maxWidth = 0, bool forceUpdate = false, bool forceLTRReadingOrder = false);
   bool UpdateW(const std::wstring &text, float maxWidth = 0, bool forceUpdate = false, bool forceLTRReadingOrder = false);
@@ -117,7 +117,7 @@ protected:
   static std::wstring BidiFlip(const std::wstring &text, bool forceLTRReadingOrder);
   void CalcTextExtent();
   void UpdateCommon(const std::wstring &text, float maxWidth, bool forceLTRReadingOrder);
-  
+
   /*! \brief Returns the text, utf8 encoded
    \return utf8 text
    */
@@ -128,7 +128,7 @@ protected:
 
   //! \brief Set whether or not to use the monospace font
   void UseMonoFont(bool use) { m_font = use && m_monoFont ? m_monoFont : m_varFont; }
-  
+
   // our text to render
   std::vector<UTILS::Color> m_colors;
   std::vector<CGUIString> m_lines;
diff --git a/xbmc/guilib/GUITexture.cpp b/xbmc/guilib/GUITexture.cpp
index 413735cee7..f314bcfcda 100644
--- a/xbmc/guilib/GUITexture.cpp
+++ b/xbmc/guilib/GUITexture.cpp
@@ -412,7 +412,7 @@ bool CGUITextureBase::CalculateSize()
     else
       newPosY = m_posY + (m_height - newHeight) * 0.5f;
   }
-  
+
   m_vertex.SetRect(newPosX, newPosY, newPosX + newWidth, newPosY + newHeight);
 
   // scale the diffuse coords as well
diff --git a/xbmc/guilib/GUITextureD3D.cpp b/xbmc/guilib/GUITextureD3D.cpp
index db2903f03f..fb7894ac1f 100644
--- a/xbmc/guilib/GUITextureD3D.cpp
+++ b/xbmc/guilib/GUITextureD3D.cpp
@@ -43,7 +43,7 @@ void CGUITextureD3D::Begin(UTILS::Color color)
   CBaseTexture* texture = m_texture.m_textures[m_currentFrame];
   texture->LoadToGPU();
 
-  if (m_diffuse.size()) 
+  if (m_diffuse.size())
 	  m_diffuse.m_textures[0]->LoadToGPU();
 
   m_col = color;
diff --git a/xbmc/guilib/GUITextureGL.cpp b/xbmc/guilib/GUITextureGL.cpp
index e354ea7640..5b605264f3 100644
--- a/xbmc/guilib/GUITextureGL.cpp
+++ b/xbmc/guilib/GUITextureGL.cpp
@@ -329,7 +329,7 @@ void CGUITextureGL::DrawQuad(const CRect &rect, UTILS::Color color, CBaseTexture
   glGenBuffers(1, &indexVBO);
   glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indexVBO);
   glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(GLubyte)*4, idx, GL_STATIC_DRAW);
-  
+
   glDrawElements(GL_TRIANGLE_STRIP, 4, GL_UNSIGNED_BYTE, 0);
 
   glDisableVertexAttribArray(posLoc);
diff --git a/xbmc/guilib/GUIVisualisationControl.cpp b/xbmc/guilib/GUIVisualisationControl.cpp
index 2be79d0e0c..696f453ce8 100644
--- a/xbmc/guilib/GUIVisualisationControl.cpp
+++ b/xbmc/guilib/GUIVisualisationControl.cpp
@@ -222,7 +222,7 @@ void CGUIVisualisationControl::Render()
     CServiceBroker::GetWinSystem()->GetGfxContext().ApplyStateBlock();
     CServiceBroker::GetWinSystem()->GetGfxContext().RestoreViewPort();
   }
-  
+
   CGUIControl::Render();
 }
 
@@ -243,7 +243,7 @@ bool CGUIVisualisationControl::CanFocusFromPoint(const CPoint &point) const
 void CGUIVisualisationControl::FreeResources(bool immediately)
 {
   DeInitVisualization();
-  
+
   CGUIControl::FreeResources(immediately);
 
   CLog::Log(LOGDEBUG, "FreeVisualisation() done");
@@ -418,7 +418,7 @@ void CGUIVisualisationControl::DeInitVisualization()
   IAE * ae = CServiceBroker::GetActiveAE();
   if (ae)
     ae->UnregisterAudioCallback(this);
-  
+
   m_attemptedLoad = false;
 
   CGUIMessage msg(GUI_MSG_VISUALISATION_UNLOADING, m_controlID, 0);
diff --git a/xbmc/guilib/GUIWindow.cpp b/xbmc/guilib/GUIWindow.cpp
index a526486337..24bf55f3d3 100644
--- a/xbmc/guilib/GUIWindow.cpp
+++ b/xbmc/guilib/GUIWindow.cpp
@@ -102,7 +102,7 @@ bool CGUIWindow::Load(const std::string& strFileName, bool bContainsPath)
     break;
   }
   CLog::Log(LOGINFO, "Loading skin file: %s, load type: %s", strFileName.c_str(), strLoadType);
-  
+
   // Find appropriate skin folder + resolution to load from
   std::string strPath;
   std::string strLowerPath;
@@ -260,7 +260,7 @@ bool CGUIWindow::Load(TiXmlElement *pRootElement)
       m_hasCamera = true;
     }
     else if (strValue == "depth" && pChild->FirstChild())
-    { 
+    {
       float stereo = static_cast<float>(atof(pChild->FirstChild()->Value()));
       m_stereo = std::max(-1.f, std::min(1.f, stereo));
     }
@@ -590,7 +590,7 @@ bool CGUIWindow::OnMessage(CGUIMessage& message)
       return true;
     }
     break;
-      
+
   case GUI_MSG_WINDOW_INIT:
     {
       CLog::Log(LOGDEBUG, "------ Window Init (%s) ------", GetProperty("xmlfile").c_str());
@@ -609,7 +609,7 @@ bool CGUIWindow::OnMessage(CGUIMessage& message)
       return true;
     }
     break;
-  
+
   case GUI_MSG_UNFOCUS_ALL:
     {
       //unfocus the current focused control in this window
diff --git a/xbmc/guilib/GUIWindow.h b/xbmc/guilib/GUIWindow.h
index ddeab5d3d9..06cba6b8fe 100644
--- a/xbmc/guilib/GUIWindow.h
+++ b/xbmc/guilib/GUIWindow.h
@@ -81,7 +81,7 @@ public:
   void CenterWindow();
 
   void DoProcess(unsigned int currentTime, CDirtyRegionList &dirtyregions) override;
-  
+
   /*! \brief Main render function, called every frame.
    Window classes should override this only if they need to alter how something is rendered.
    General updating on a per-frame basis should be handled in FrameMove instead, as DoRender
@@ -94,7 +94,7 @@ public:
     Check if window closing animation is finished and finalize window closing.
    */
   void AfterRender();
-  
+
   /*! \brief Main update function, called every frame prior to rendering
    Any window that requires updating on a frame by frame basis (such as to maintain
    timers and the like) should override this function.
@@ -109,7 +109,7 @@ public:
   // on to the currently focused control.  Returns true if the action has been handled
   // and does not need to be passed further down the line (to our global action handlers)
   bool OnAction(const CAction &action) override;
-  
+
   using CGUIControlGroup::OnBack;
   virtual bool OnBack(int actionID);
   using CGUIControlGroup::OnInfo;
diff --git a/xbmc/guilib/GUIWindowManager.cpp b/xbmc/guilib/GUIWindowManager.cpp
index b502712670..6dedfa4464 100644
--- a/xbmc/guilib/GUIWindowManager.cpp
+++ b/xbmc/guilib/GUIWindowManager.cpp
@@ -257,7 +257,7 @@ void CGUIWindowManager::CreateWindows()
   Add(new CGUIDialogLockSettings);
 
   Add(new CGUIDialogContentSettings);
-  
+
   Add(new CGUIDialogLibExportSettings);
 
   Add(new CGUIDialogInfoProviderSettings);
diff --git a/xbmc/guilib/GUIWindowManager.h b/xbmc/guilib/GUIWindowManager.h
index b8a35ef652..fccd39b467 100644
--- a/xbmc/guilib/GUIWindowManager.h
+++ b/xbmc/guilib/GUIWindowManager.h
@@ -247,7 +247,7 @@ private:
   int GetTopmostDialog(bool modal, bool ignoreClosing) const;
 
   friend class KODI::MESSAGING::CApplicationMessenger;
-  
+
   /*! \brief Activate the given window.
    *
    * \param windowID The window ID to activate.
diff --git a/xbmc/guilib/ISliderCallback.h b/xbmc/guilib/ISliderCallback.h
index fc1fffb622..e51b8806fa 100644
--- a/xbmc/guilib/ISliderCallback.h
+++ b/xbmc/guilib/ISliderCallback.h
@@ -37,7 +37,7 @@ class ISliderCallback
 {
 public:
   virtual ~ISliderCallback() = default;
-  
+
   /*!
    \brief Callback function called whenever the user moves the slider
 
diff --git a/xbmc/guilib/StereoscopicsManager.cpp b/xbmc/guilib/StereoscopicsManager.cpp
index b9b66ba3db..7a1712bc33 100644
--- a/xbmc/guilib/StereoscopicsManager.cpp
+++ b/xbmc/guilib/StereoscopicsManager.cpp
@@ -64,7 +64,7 @@ static const struct StereoModeMap VideoModeToGuiModeMap[] =
   { "right_left",               RENDER_STEREO_MODE_SPLIT_VERTICAL },
   { "top_bottom",               RENDER_STEREO_MODE_SPLIT_HORIZONTAL },
   { "bottom_top",               RENDER_STEREO_MODE_SPLIT_HORIZONTAL },
-  { "checkerboard_rl",          RENDER_STEREO_MODE_CHECKERBOARD }, 
+  { "checkerboard_rl",          RENDER_STEREO_MODE_CHECKERBOARD },
   { "checkerboard_lr",          RENDER_STEREO_MODE_CHECKERBOARD },
   { "row_interleaved_rl",       RENDER_STEREO_MODE_INTERLACED },
   { "row_interleaved_lr",       RENDER_STEREO_MODE_INTERLACED },
diff --git a/xbmc/guilib/Texture.cpp b/xbmc/guilib/Texture.cpp
index 2c70e5b0e9..89bf7f2f69 100644
--- a/xbmc/guilib/Texture.cpp
+++ b/xbmc/guilib/Texture.cpp
@@ -131,7 +131,7 @@ void CBaseTexture::Update(unsigned int width, unsigned int height, unsigned int
     return;
 
   Allocate(width, height, format);
-  
+
   if (m_pixels == nullptr)
     return;
 
diff --git a/xbmc/guilib/TextureBundleXBT.cpp b/xbmc/guilib/TextureBundleXBT.cpp
index 6e661ca9ba..6897989578 100644
--- a/xbmc/guilib/TextureBundleXBT.cpp
+++ b/xbmc/guilib/TextureBundleXBT.cpp
@@ -271,7 +271,7 @@ void CTextureBundleXBT::SetThemeBundle(bool themeBundle)
 std::string CTextureBundleXBT::Normalize(const std::string &name)
 {
   std::string newName(name);
-  
+
   StringUtils::Trim(newName);
   StringUtils::ToLower(newName);
   StringUtils::Replace(newName, '\\','/');
diff --git a/xbmc/guilib/TextureManager.cpp b/xbmc/guilib/TextureManager.cpp
index 04c1cd47ef..b7437820ff 100644
--- a/xbmc/guilib/TextureManager.cpp
+++ b/xbmc/guilib/TextureManager.cpp
@@ -415,7 +415,7 @@ const CTextureArray& CGUITextureManager::Load(const std::string& strTextureName,
       if (pMap->GetMemoryUsage() <= maxMemoryUsage)
       {
         frame = anim.ReadFrame();
-      } 
+      }
       else
       {
         CLog::Log(LOGDEBUG, "Memory limit (%" PRIu64 " bytes) exceeded, %i frames extracted from file : %s", (maxMemoryUsage/11)*12,pMap->GetTexture().size(), CURL::GetRedacted(strPath).c_str());
diff --git a/xbmc/guilib/VisibleEffect.cpp b/xbmc/guilib/VisibleEffect.cpp
index 257b7e63a2..56057c8e72 100644
--- a/xbmc/guilib/VisibleEffect.cpp
+++ b/xbmc/guilib/VisibleEffect.cpp
@@ -762,7 +762,7 @@ float CScroller::Tween(float progress)
       // a = 2 , b = -1
       return (2 * m_pTweener->Tween(progress, 0, 1, 1) - 1);
     }
-    else 
+    else
       return m_pTweener->Tween(progress, 0, 1, 1);
   }
   else
diff --git a/xbmc/guilib/VisibleEffect.h b/xbmc/guilib/VisibleEffect.h
index 9149a0ac21..7d70d7da4b 100644
--- a/xbmc/guilib/VisibleEffect.h
+++ b/xbmc/guilib/VisibleEffect.h
@@ -223,10 +223,10 @@ public:
 
   /**
    * Set target value scroller will be scrolling to
-   * @param endPos target 
+   * @param endPos target
    */
   void ScrollTo(float endPos);
-  
+
   /**
    * Immediately stop scrolling
    */
diff --git a/xbmc/guilib/_Controls.dox b/xbmc/guilib/_Controls.dox
index 206a870ee0..a1e91a7c40 100644
--- a/xbmc/guilib/_Controls.dox
+++ b/xbmc/guilib/_Controls.dox
@@ -3,7 +3,7 @@
 \page skin_controls Controls
 \brief Controls are the substance of your skin. They define everything from
 buttons, to text labels, to visualization placement. This portion of the
-manual will explain each and every control in detail. 
+manual will explain each and every control in detail.
 
 - \subpage Addon_Rendering_control - Control where rendering becomes performed from add-on
 - \subpage skin_Button_control - a standard push button control.
diff --git a/xbmc/guilib/iimage.h b/xbmc/guilib/iimage.h
index 5bf092d439..e7e20e87c2 100644
--- a/xbmc/guilib/iimage.h
+++ b/xbmc/guilib/iimage.h
@@ -61,7 +61,7 @@ public:
    \param bufferoutSize The output buffer size
    \return true if the thumbnail was successfully created
    */
-  virtual bool CreateThumbnailFromSurface(unsigned char* bufferin, unsigned int width, unsigned int height, unsigned int format, unsigned int pitch, const std::string& destFile, 
+  virtual bool CreateThumbnailFromSurface(unsigned char* bufferin, unsigned int width, unsigned int height, unsigned int format, unsigned int pitch, const std::string& destFile,
                                           unsigned char* &bufferout, unsigned int &bufferoutSize)=0;
   /*!
    \brief Frees the output buffer allocated by CreateThumbnailFromSurface
@@ -83,5 +83,5 @@ protected:
   unsigned int m_originalHeight;  ///< original image height before scaling or cropping
   unsigned int m_orientation;
   bool m_hasAlpha;
- 
+
 };
diff --git a/xbmc/input/ButtonTranslator.cpp b/xbmc/input/ButtonTranslator.cpp
index b396ddfe0a..ad7f67d631 100644
--- a/xbmc/input/ButtonTranslator.cpp
+++ b/xbmc/input/ButtonTranslator.cpp
@@ -326,7 +326,7 @@ void CButtonTranslator::MapAction(uint32_t buttonCode, const std::string &szActi
 
 void CButtonTranslator::MapWindowActions(const TiXmlNode *pWindow, int windowID)
 {
-  if (pWindow == nullptr || windowID == WINDOW_INVALID) 
+  if (pWindow == nullptr || windowID == WINDOW_INVALID)
     return;
 
   const TiXmlNode *pDevice;
diff --git a/xbmc/input/IKeymap.h b/xbmc/input/IKeymap.h
index 4e094390fd..1c66bc21c9 100644
--- a/xbmc/input/IKeymap.h
+++ b/xbmc/input/IKeymap.h
@@ -67,7 +67,7 @@ class IWindowKeymap
 {
 public:
   virtual ~IWindowKeymap() = default;
-  
+
   /*!
    * \brief The controller ID
    *
diff --git a/xbmc/input/IRTranslator.cpp b/xbmc/input/IRTranslator.cpp
index 98f40ef599..0fb8e57988 100644
--- a/xbmc/input/IRTranslator.cpp
+++ b/xbmc/input/IRTranslator.cpp
@@ -165,7 +165,7 @@ unsigned int CIRTranslator::TranslateButton(const std::string &szDevice, const s
 
 uint32_t CIRTranslator::TranslateString(std::string strButton)
 {
-  if (strButton.empty()) 
+  if (strButton.empty())
     return 0;
 
   uint32_t buttonCode = 0;
@@ -244,14 +244,14 @@ uint32_t CIRTranslator::TranslateString(std::string strButton)
 
 uint32_t CIRTranslator::TranslateUniversalRemoteString(const std::string &szButton)
 {
-  if (szButton.empty() || szButton.length() < 4 || strnicmp(szButton.c_str(), "obc", 3)) 
+  if (szButton.empty() || szButton.length() < 4 || strnicmp(szButton.c_str(), "obc", 3))
     return 0;
 
   const char *szCode = szButton.c_str() + 3;
 
   // Button Code is 255 - OBC (Original Button Code) of the button
   uint32_t buttonCode = 255 - atol(szCode);
-  if (buttonCode > 255) 
+  if (buttonCode > 255)
     buttonCode = 0;
 
   return buttonCode;
diff --git a/xbmc/input/InertialScrollingHandler.cpp b/xbmc/input/InertialScrollingHandler.cpp
index 6320bd2a18..3a17c8b53e 100644
--- a/xbmc/input/InertialScrollingHandler.cpp
+++ b/xbmc/input/InertialScrollingHandler.cpp
@@ -94,7 +94,7 @@ bool CInertialScrollingHandler::CheckForInertialScrolling(const CAction* action)
     CServiceBroker::GetGUI()->GetWindowManager().SendMessage(message);
     m_bScrolling = false;
     //wakeup screensaver on pan begin
-    g_application.ResetScreenSaver();    
+    g_application.ResetScreenSaver();
     g_application.WakeUpScreenSaverAndDPMS();
   }
   else if(action->GetID() == ACTION_GESTURE_END && !m_panPoints.empty()) //do we need to animate inertial scrolling?
@@ -135,8 +135,8 @@ bool CInertialScrollingHandler::CheckForInertialScrolling(const CAction* action)
         }
       }
 
-      if( inertialRequested )                                                                                                             
-      {        
+      if( inertialRequested )
+      {
         m_iFlickVelocity.x = velocityX;//in pixels per sec
         m_iFlickVelocity.y = velocityY;//in pixels per sec
         m_iLastGesturePoint.x = action->GetAmount(2);//last gesture point x
@@ -145,7 +145,7 @@ bool CInertialScrollingHandler::CheckForInertialScrolling(const CAction* action)
         //calc deacceleration for fullstop in TIME_TO_ZERO_SPEED secs
         //v = a*t + v0 -> set v = 0 because we want to stop scrolling
         //a = -v0 / t
-        m_inertialDeacceleration.x = -1*m_iFlickVelocity.x/TIME_TO_ZERO_SPEED;    
+        m_inertialDeacceleration.x = -1*m_iFlickVelocity.x/TIME_TO_ZERO_SPEED;
         m_inertialDeacceleration.y = -1*m_iFlickVelocity.y/TIME_TO_ZERO_SPEED;
 
         //CLog::Log(LOGDEBUG, "initial pos: %f,%f velocity: %f,%f dec: %f,%f", m_iLastGesturePoint.x, m_iLastGesturePoint.y, m_iFlickVelocity.x, m_iFlickVelocity.y, m_inertialDeacceleration.x, m_inertialDeacceleration.y);
@@ -165,7 +165,7 @@ bool CInertialScrollingHandler::CheckForInertialScrolling(const CAction* action)
 }
 
 bool CInertialScrollingHandler::ProcessInertialScroll(float frameTime)
-{  
+{
   //do inertial scroll animation by sending gesture_pan
   if( m_bScrolling)
   {
@@ -205,7 +205,7 @@ bool CInertialScrollingHandler::ProcessInertialScroll(float frameTime)
       {
         m_iFlickVelocity.y = 0;
       }
-    }   
+    }
     else//no movement -> done
     {
       m_bAborting = true;//we are done
diff --git a/xbmc/input/InertialScrollingHandler.h b/xbmc/input/InertialScrollingHandler.h
index 9478751463..8555b255da 100644
--- a/xbmc/input/InertialScrollingHandler.h
+++ b/xbmc/input/InertialScrollingHandler.h
@@ -33,13 +33,13 @@ class CInertialScrollingHandler
   friend class CApplication;
   public:
     CInertialScrollingHandler();
-    
-    bool IsScrolling(){return m_bScrolling;}    
-    
+
+    bool IsScrolling(){return m_bScrolling;}
+
   private:
     bool CheckForInertialScrolling(const CAction* action);
     bool ProcessInertialScroll(float frameTime);
-  
+
     //-------------------------------------------vars for inertial scrolling animation with gestures
     bool          m_bScrolling;        //flag indicating that we currently do the inertial scrolling emulation
     bool          m_bAborting;         //flag indicating an abort of scrolling
@@ -56,5 +56,5 @@ class CInertialScrollingHandler
     std::deque<PanPoint> m_panPoints;
     CPoint        m_iLastGesturePoint;
     CVector       m_inertialDeacceleration;
-    unsigned int  m_inertialStartTime;  
+    unsigned int  m_inertialStartTime;
 };
diff --git a/xbmc/input/InputCodingTableKorean.cpp b/xbmc/input/InputCodingTableKorean.cpp
index 59a793d887..71a68d92b0 100644
--- a/xbmc/input/InputCodingTableKorean.cpp
+++ b/xbmc/input/InputCodingTableKorean.cpp
@@ -62,7 +62,7 @@ std::wstring CInputCodingTableKorean::InputToKorean(const std::wstring& input)
   { 0x3131, 0x3132, 0x3133, 0x3134, 0x3135, 0x3136, 0x3137, 0x3139, 0x313a, 0x313b, 0x313c, 0x313d, 0x313e, 0x313f, 0x3140, 0x3141, 0x3142, 0x3144, 0x3145, 0x3146, 0x3147, 0x3148, 0x314a, 0x314b, 0x314c, 0x314d, 0x314e };
 
   std::wstring korean;
-  
+
   if (input.empty())
     return korean;
 
@@ -73,9 +73,9 @@ std::wstring CInputCodingTableKorean::InputToKorean(const std::wstring& input)
     wchar_t ch = input.at(i);
     int key = dicKorean.find(ch);
 
-    // H/W Keyboard input with English will be changed to Korean 
+    // H/W Keyboard input with English will be changed to Korean
 	// because H/W input in Korean is not supported.
-    if (key == -1)    
+    if (key == -1)
       key = dicEnglish.find(ch);
 
     if (key == -1) // If not Korean and English
@@ -92,7 +92,7 @@ std::wstring CInputCodingTableKorean::InputToKorean(const std::wstring& input)
       {
         if (jungseong != -1) // Jungseong
           korean += dicJungseong.at(jungseong);
-        
+
         if (jongseong != -1) // Jongseong
           korean += dicJongseong.at(jongseong);
       }
@@ -105,8 +105,8 @@ std::wstring CInputCodingTableKorean::InputToKorean(const std::wstring& input)
     {
       if (jungseong != -1)
       {
-        if (choseong == -1) // Jungseong without choseong cannot have jongseong. 
-		                    // So inputted key is jungseong character, new character is begun. 
+        if (choseong == -1) // Jungseong without choseong cannot have jongseong.
+		                    // So inputted key is jungseong character, new character is begun.
         {
           korean += dicJungseong.at(jungseong);
           jungseong = -1;
@@ -147,7 +147,7 @@ std::wstring CInputCodingTableKorean::InputToKorean(const std::wstring& input)
           else if (jongseong == 16 && key == 9) // "ㅄ"
             jongseong = 17;
           else // Jongseong is completed. So new consonant is choseong.
-          {						
+          {
             korean += MergeCode(choseong, jungseong, jongseong);
             choseong = dicChoseong.find(dicKorean.at(key));
             jungseong = -1;
@@ -157,9 +157,9 @@ std::wstring CInputCodingTableKorean::InputToKorean(const std::wstring& input)
       }
       else // If there is no jungseong, new consonant can be choseong or second part of double consonant.
       {
-        if (choseong == -1) // New consonant is choseong. Also it could be first part of double consonant. 
+        if (choseong == -1) // New consonant is choseong. Also it could be first part of double consonant.
         {
-          if (jongseong != -1) // If choseong is already completed, new consonant is another choseong. 
+          if (jongseong != -1) // If choseong is already completed, new consonant is another choseong.
                                // So previous character has only jongseong.
           {
             korean += dicJongseong.at(jongseong);
@@ -169,7 +169,7 @@ std::wstring CInputCodingTableKorean::InputToKorean(const std::wstring& input)
         }
         // Find double consonant of chongseong
         else if (choseong == 0 && key == 9)   // "ㄳ"
-        {			
+        {
           choseong = -1;
           jongseong = 2;
         }
@@ -232,11 +232,11 @@ std::wstring CInputCodingTableKorean::InputToKorean(const std::wstring& input)
     }
     else // If key is vowel, key is jungseong.
     {
-      if (jongseong != -1) // If previous character has jongseong and this key is jungseong, 
+      if (jongseong != -1) // If previous character has jongseong and this key is jungseong,
                            // actually latest vowel is not jongseong. It's choseong of new character.
       {
-        // If jongseong of previous character is double consonant, we will separate it to two vowel again. 
-        // First part of double consonant is jongseong of previous character. 
+        // If jongseong of previous character is double consonant, we will separate it to two vowel again.
+        // First part of double consonant is jongseong of previous character.
         // Second part of double consonant is choseong of current character.
         int newCho;
         if (jongseong == 2)       // "ㄱ, ㅅ"
@@ -294,7 +294,7 @@ std::wstring CInputCodingTableKorean::InputToKorean(const std::wstring& input)
           jongseong = 16;
           newCho = 9;
         }
-        else // If jongseong is single consonant, previous character has no chongseong. 
+        else // If jongseong is single consonant, previous character has no chongseong.
              // It's choseong of current character.
         {
           newCho = dicChoseong.find(dicJongseong.at(jongseong));
@@ -330,7 +330,7 @@ std::wstring CInputCodingTableKorean::InputToKorean(const std::wstring& input)
         jungseong = 19;
       else // If two vowel cannot be double vowel.
       {
-        if (choseong != -1) // Previous character is completed. 
+        if (choseong != -1) // Previous character is completed.
                             // Current character is begin with jungseong.
         {
           korean += MergeCode(choseong, jungseong, jongseong);
diff --git a/xbmc/input/InputManager.cpp b/xbmc/input/InputManager.cpp
index fa6709e3e3..163a0d0adf 100644
--- a/xbmc/input/InputManager.cpp
+++ b/xbmc/input/InputManager.cpp
@@ -217,20 +217,20 @@ bool CInputManager::ProcessEventServer(int windowId, float frameTime)
       {
         int actionID;
         std::string actionName;
-        
+
         // Translate using custom controller translator.
         if (m_customControllerTranslator->TranslateCustomControllerString(windowId, strMapName, wKeyID, actionID, actionName))
         {
           // break screensaver
           g_application.ResetSystemIdleTimer();
           g_application.ResetScreenSaver();
-          
+
           // in case we wokeup the screensaver or screen - eat that action...
           if (g_application.WakeUpScreenSaverAndDPMS())
             return true;
-          
+
           m_Mouse.SetActive(false);
-          
+
           return ExecuteInputAction(CAction(actionID, fAmount, 0.0f, actionName));
         }
         else
diff --git a/xbmc/input/InputManager.h b/xbmc/input/InputManager.h
index 3273cbc3c0..bcdb5100f6 100644
--- a/xbmc/input/InputManager.h
+++ b/xbmc/input/InputManager.h
@@ -123,7 +123,7 @@ public:
   void Deinitialize();
 
   /*! \brief Handle an input event
-   * 
+   *
    * \param newEvent event details
    * \return true on successfully handled event
    * \sa XBMC_Event
@@ -151,7 +151,7 @@ public:
 
   /*! \brief Check if the mouse is currently active
    *
-   * \return true if active, false otherwise 
+   * \return true if active, false otherwise
    */
   bool IsMouseActive();
 
@@ -175,7 +175,7 @@ public:
    * \param[in] maxY    screen height
    * \param[in] speedX  mouse speed in x dimension
    * \param[in] speedY  mouse speed in y dimension
-   * \return 
+   * \return
    */
   void SetMouseResolution(int maxX, int maxY, float speedX, float speedY);
 
diff --git a/xbmc/input/Key.cpp b/xbmc/input/Key.cpp
index 8a65e0a3a9..33cc5cd50c 100644
--- a/xbmc/input/Key.cpp
+++ b/xbmc/input/Key.cpp
@@ -171,6 +171,6 @@ void CKey::SetFromService(bool fromService)
 {
   if (fromService && (m_buttonCode & KEY_ASCII))
     m_unicode = m_buttonCode - KEY_ASCII;
-    
+
   m_fromService = fromService;
 }
diff --git a/xbmc/input/KeyboardStat.cpp b/xbmc/input/KeyboardStat.cpp
index 3d7ebf3bb1..c150dab6a0 100644
--- a/xbmc/input/KeyboardStat.cpp
+++ b/xbmc/input/KeyboardStat.cpp
@@ -242,7 +242,7 @@ std::string CKeyboardStat::GetKeyName(int KeyID)
     keyname.append(keytable.keyname);
   else
     keyname += StringUtils::Format("%i", keyid);
-  
+
   // in case this might be an universalremote keyid
   // we also print the possible corresponding obc code
   // so users can easily find it in their universalremote
diff --git a/xbmc/input/hardware/IHardwareInput.h b/xbmc/input/hardware/IHardwareInput.h
index 6a76ec9dbd..b4deef32f8 100644
--- a/xbmc/input/hardware/IHardwareInput.h
+++ b/xbmc/input/hardware/IHardwareInput.h
@@ -34,7 +34,7 @@ namespace HARDWARE
   {
   public:
     virtual ~IHardwareInput() = default;
-    
+
     /*!
      * \brief A hardware reset button has been pressed
      */
diff --git a/xbmc/input/joysticks/RumbleGenerator.cpp b/xbmc/input/joysticks/RumbleGenerator.cpp
index 93410b5f30..3176a941f9 100644
--- a/xbmc/input/joysticks/RumbleGenerator.cpp
+++ b/xbmc/input/joysticks/RumbleGenerator.cpp
@@ -134,6 +134,6 @@ std::vector<std::string> CRumbleGenerator::GetMotors(const std::string& controll
   ControllerPtr controller = controllerManager.GetController(controllerId);
   if (controller)
     controller->GetFeatures(motors, FEATURE_TYPE::MOTOR);
- 
+
   return motors;
 }
diff --git a/xbmc/input/joysticks/generic/InputHandling.cpp b/xbmc/input/joysticks/generic/InputHandling.cpp
index 1e4d9ff01c..dc870ced4c 100644
--- a/xbmc/input/joysticks/generic/InputHandling.cpp
+++ b/xbmc/input/joysticks/generic/InputHandling.cpp
@@ -167,6 +167,6 @@ CJoystickFeature* CInputHandling::CreateFeature(const FeatureName& featureName)
     default:
       break;
   }
-  
+
   return feature;
 }
diff --git a/xbmc/input/joysticks/interfaces/IKeymapHandler.h b/xbmc/input/joysticks/interfaces/IKeymapHandler.h
index 06b3e93a87..c14eb84a25 100644
--- a/xbmc/input/joysticks/interfaces/IKeymapHandler.h
+++ b/xbmc/input/joysticks/interfaces/IKeymapHandler.h
@@ -35,7 +35,7 @@ namespace JOYSTICK
   {
   public:
     virtual ~IKeymapHandler() = default;
-    
+
     /*!
      * \brief Get the pressed state of the given keys
      *
diff --git a/xbmc/input/joysticks/keymaps/KeymapHandler.cpp b/xbmc/input/joysticks/keymaps/KeymapHandler.cpp
index c0fcee5e73..4903543366 100644
--- a/xbmc/input/joysticks/keymaps/KeymapHandler.cpp
+++ b/xbmc/input/joysticks/keymaps/KeymapHandler.cpp
@@ -75,7 +75,7 @@ bool CKeymapHandler::AcceptsInput(const FeatureName& feature) const
 {
   if (HasAction(CJoystickUtils::MakeKeyName(feature)))
     return true;
-  
+
   for (auto dir : CJoystickUtils::GetAnalogStickDirections())
   {
     if (HasAction(CJoystickUtils::MakeKeyName(feature, dir)))
diff --git a/xbmc/input/joysticks/keymaps/KeymapHandling.h b/xbmc/input/joysticks/keymaps/KeymapHandling.h
index 8057d6892f..bc257446e0 100644
--- a/xbmc/input/joysticks/keymaps/KeymapHandling.h
+++ b/xbmc/input/joysticks/keymaps/KeymapHandling.h
@@ -52,7 +52,7 @@ namespace JOYSTICK
      * \brief
      */
     IInputReceiver *GetInputReceiver(const std::string &controllerId) const;
-    
+
     /*!
      * \brief
      */
diff --git a/xbmc/input/mouse/MouseStat.cpp b/xbmc/input/mouse/MouseStat.cpp
index 02c4e3406c..07d082c5d5 100644
--- a/xbmc/input/mouse/MouseStat.cpp
+++ b/xbmc/input/mouse/MouseStat.cpp
@@ -97,7 +97,7 @@ void CMouseStat::HandleEvent(XBMC_Event& newEvent)
   // this is a click, doubleclick, drag etc
   uint32_t now = CTimeUtils::GetFrameTime();
   bool bNothingDown = true;
-  
+
   for (int i = 0; i < MOUSE_MAX_BUTTON; i++)
   {
     bClick[i] = false;
diff --git a/xbmc/input/mouse/MouseStat.h b/xbmc/input/mouse/MouseStat.h
index 7e9e97872f..7725d97c6b 100644
--- a/xbmc/input/mouse/MouseStat.h
+++ b/xbmc/input/mouse/MouseStat.h
@@ -46,8 +46,8 @@
 
 #define MOUSE_MAX_BUTTON 7
 
-enum MOUSE_STATE 
-{ 
+enum MOUSE_STATE
+{
   MOUSE_STATE_NORMAL = 1, /*! < Normal state */
   MOUSE_STATE_FOCUS,      /*! < Control below the mouse is currently in focus */
   MOUSE_STATE_DRAG,       /*! < A drag operation is being performed */
diff --git a/xbmc/input/touch/ITouchInputHandler.h b/xbmc/input/touch/ITouchInputHandler.h
index 204ccdbb0d..7b391d5231 100644
--- a/xbmc/input/touch/ITouchInputHandler.h
+++ b/xbmc/input/touch/ITouchInputHandler.h
@@ -68,9 +68,9 @@ public:
    * \param time     The time (in nanoseconds) when this touch occured
    * \param pointer  The number of the touch pointer which caused this event (default 0)
    * \param size     The size of the touch pointer (with sub-pixel) (default 0.0)
-   * 
+   *
    * \return True if the event was handled otherwise false.
-   * 
+   *
    * \sa Update
    */
   virtual bool HandleTouchInput(TouchInput event, float x, float y, int64_t time, int32_t pointer = 0, float size = 0.0f) = 0;
@@ -90,9 +90,9 @@ public:
    * \param y        The y coordinate (with sub-pixel) of the touch
    * \param time     The time (in nanoseconds) when this touch occured
    * \param size     The size of the touch pointer (with sub-pixel) (default 0.0)
-   * 
+   *
    * \return True if the pointer was updated otherwise false.
-   * 
+   *
    * \sa Handle
    */
   virtual bool UpdateTouchPointer(int32_t pointer, float x, float y, int64_t time, float size = 0.0f) { return false; }
diff --git a/xbmc/input/touch/generic/GenericTouchInputHandler.cpp b/xbmc/input/touch/generic/GenericTouchInputHandler.cpp
index cc60923f0d..ff0d854734 100644
--- a/xbmc/input/touch/generic/GenericTouchInputHandler.cpp
+++ b/xbmc/input/touch/generic/GenericTouchInputHandler.cpp
@@ -364,21 +364,21 @@ void CGenericTouchInputHandler::triggerDetectors(TouchInput event, int32_t point
       m_detectors.clear();
       break;
     }
-    
+
     case TouchInputDown:
     {
       for (auto const& detector : m_detectors)
         detector->OnTouchDown(pointer, m_pointers[pointer]);
       break;
     }
-    
+
     case TouchInputUp:
     {
       for (auto const& detector : m_detectors)
         detector->OnTouchUp(pointer, m_pointers[pointer]);
       break;
     }
-    
+
     case TouchInputMove:
     {
       for (auto const& detector : m_detectors)
diff --git a/xbmc/input/touch/generic/GenericTouchPinchDetector.cpp b/xbmc/input/touch/generic/GenericTouchPinchDetector.cpp
index 486304b958..64633c37bb 100644
--- a/xbmc/input/touch/generic/GenericTouchPinchDetector.cpp
+++ b/xbmc/input/touch/generic/GenericTouchPinchDetector.cpp
@@ -94,6 +94,6 @@ bool CGenericTouchPinchDetector::OnTouchMove(unsigned int index, const Pointer &
 
     OnZoomPinch(centerX, centerY, zoom);
   }
-  
+
   return true;
 }
diff --git a/xbmc/input/touch/generic/GenericTouchRotateDetector.cpp b/xbmc/input/touch/generic/GenericTouchRotateDetector.cpp
index e6ee371516..5edee0c6e1 100644
--- a/xbmc/input/touch/generic/GenericTouchRotateDetector.cpp
+++ b/xbmc/input/touch/generic/GenericTouchRotateDetector.cpp
@@ -111,7 +111,7 @@ bool CGenericTouchRotateDetector::OnTouchMove(unsigned int index, const Pointer
       OnRotate(centerX, centerY, m_angle);
     }
   }
-  
+
   return true;
 }
 
@@ -119,10 +119,10 @@ bool CGenericTouchRotateDetector::OnTouchUpdate(unsigned int index, const Pointe
 {
   if (index >= MAX_POINTERS)
     return false;
-  
+
   if (m_done)
     return true;
-  
+
   // update the internal pointers
   m_pointers[index] = pointer;
   return true;
diff --git a/xbmc/input/touch/generic/GenericTouchSwipeDetector.cpp b/xbmc/input/touch/generic/GenericTouchSwipeDetector.cpp
index c4fa353d3e..c2fa6e235f 100644
--- a/xbmc/input/touch/generic/GenericTouchSwipeDetector.cpp
+++ b/xbmc/input/touch/generic/GenericTouchSwipeDetector.cpp
@@ -141,7 +141,7 @@ bool CGenericTouchSwipeDetector::OnTouchMove(unsigned int index, const Pointer &
     else if (deltaXabs > m_dpi * SWIPE_MIN_DISTANCE)
       m_swipeDetected = true;
   }
-  
+
   if (m_directions & TouchMoveDirectionUp)
   {
     // check if the movement went too much in X direction
@@ -167,7 +167,7 @@ bool CGenericTouchSwipeDetector::OnTouchMove(unsigned int index, const Pointer &
     m_done = true;
     return false;
   }
-  
+
   return true;
 }
 
diff --git a/xbmc/interfaces/AnnouncementManager.cpp b/xbmc/interfaces/AnnouncementManager.cpp
index 066fe6e858..91714440e9 100644
--- a/xbmc/interfaces/AnnouncementManager.cpp
+++ b/xbmc/interfaces/AnnouncementManager.cpp
@@ -148,7 +148,7 @@ void CAnnouncementManager::DoAnnounce(AnnouncementFlag flag, const char *sender,
   CVariant object = data.isNull() || data.isObject() ? data : CVariant::VariantTypeObject;
   std::string type;
   int id = 0;
-  
+
   if(item->HasPVRChannelInfoTag())
   {
     const PVR::CPVRChannelPtr channel(item->GetPVRChannelInfoTag());
diff --git a/xbmc/interfaces/IActionListener.h b/xbmc/interfaces/IActionListener.h
index 79762262f4..42b553a319 100644
--- a/xbmc/interfaces/IActionListener.h
+++ b/xbmc/interfaces/IActionListener.h
@@ -26,6 +26,6 @@ class IActionListener
 {
 public:
   virtual ~IActionListener() = default;
-  
+
   virtual bool OnAction(const CAction &action) = 0;
 };
diff --git a/xbmc/interfaces/IAnnouncer.h b/xbmc/interfaces/IAnnouncer.h
index 9a9d737b6f..5bc4c10ade 100644
--- a/xbmc/interfaces/IAnnouncer.h
+++ b/xbmc/interfaces/IAnnouncer.h
@@ -41,7 +41,7 @@ namespace ANNOUNCEMENT
   #define ANNOUNCE_ALL (Player | Playlist | GUI | System | VideoLibrary | AudioLibrary | Application | Input | ANNOUNCEMENT::PVR | Other)
 
   /*!
-    \brief Returns a string representation for the 
+    \brief Returns a string representation for the
     given AnnouncementFlag
     \param notification Specific AnnouncementFlag
     \return String representation of the given AnnouncementFlag
diff --git a/xbmc/interfaces/builtins/AddonBuiltins.cpp b/xbmc/interfaces/builtins/AddonBuiltins.cpp
index 0c4fde992f..ad3d1c95b2 100644
--- a/xbmc/interfaces/builtins/AddonBuiltins.cpp
+++ b/xbmc/interfaces/builtins/AddonBuiltins.cpp
@@ -269,7 +269,7 @@ static int SetDefaultAddon(const std::vector<std::string>& params)
   if (type == ADDON_VIZ)
     allowNone = true;
 
-  if (type != ADDON_UNKNOWN && 
+  if (type != ADDON_UNKNOWN &&
       CGUIWindowAddonBrowser::SelectAddonID(type,addonID,allowNone))
   {
     CAddonSystemSettings::GetInstance().SetActive(type, addonID);
diff --git a/xbmc/interfaces/builtins/Builtins.cpp b/xbmc/interfaces/builtins/Builtins.cpp
index 13487c5514..53d64a3fad 100644
--- a/xbmc/interfaces/builtins/Builtins.cpp
+++ b/xbmc/interfaces/builtins/Builtins.cpp
@@ -170,7 +170,7 @@ int CBuiltins::Execute(const std::string& execString)
                           execute.c_str(), it->second.parameters, params.size());
       return -1;
     }
-  } 
+  }
   else
     return CServiceBroker::GetInputManager().ExecuteBuiltin(execute, params);
 }
diff --git a/xbmc/interfaces/builtins/GUIBuiltins.cpp b/xbmc/interfaces/builtins/GUIBuiltins.cpp
index 7ec189f048..8735e1bc88 100644
--- a/xbmc/interfaces/builtins/GUIBuiltins.cpp
+++ b/xbmc/interfaces/builtins/GUIBuiltins.cpp
@@ -557,7 +557,7 @@ static int ToggleDirty(const std::vector<std::string>&)
 ///   \table_row2_l{
 ///     <b>`SetProperty(key\,value[\,id])`</b>
 ///     ,
-///     Sets a window property for the current window (key\,value)\, or the 
+///     Sets a window property for the current window (key\,value)\, or the
 ///     specified window (key\,value\,id).
 ///     @param[in] key                   The property to set.
 ///     @param[in] value                 The property value.
diff --git a/xbmc/interfaces/builtins/LibraryBuiltins.cpp b/xbmc/interfaces/builtins/LibraryBuiltins.cpp
index 6c265118c3..95c3e06708 100644
--- a/xbmc/interfaces/builtins/LibraryBuiltins.cpp
+++ b/xbmc/interfaces/builtins/LibraryBuiltins.cpp
@@ -118,7 +118,7 @@ static int ExportLibrary(const std::vector<std::string>& params)
       thumbs = StringUtils::EqualsNoCase(params[2], "true");
     else
     {
-      HELPERS::DialogResponse result = HELPERS::ShowYesNoDialogText(CVariant{iHeading}, CVariant{20430}); 
+      HELPERS::DialogResponse result = HELPERS::ShowYesNoDialogText(CVariant{iHeading}, CVariant{20430});
       cancelled = result == HELPERS::DialogResponse::CANCELLED;
       thumbs = result == HELPERS::DialogResponse::YES;
     }
diff --git a/xbmc/interfaces/builtins/PictureBuiltins.cpp b/xbmc/interfaces/builtins/PictureBuiltins.cpp
index 53f58d764f..5266f060a1 100644
--- a/xbmc/interfaces/builtins/PictureBuiltins.cpp
+++ b/xbmc/interfaces/builtins/PictureBuiltins.cpp
@@ -92,7 +92,7 @@ static int Slideshow(const std::vector<std::string>& params)
   return 0;
 }
 
-// Note: For new Texts with comma add a "\" before!!! Is used for table text 
+// Note: For new Texts with comma add a "\" before!!! Is used for table text
 //
 /// \page page_List_of_built_in_functions
 /// \section built_in_functions_11 Picture built-in's
diff --git a/xbmc/interfaces/builtins/PlayerBuiltins.cpp b/xbmc/interfaces/builtins/PlayerBuiltins.cpp
index 444fb22f96..0a974a1811 100644
--- a/xbmc/interfaces/builtins/PlayerBuiltins.cpp
+++ b/xbmc/interfaces/builtins/PlayerBuiltins.cpp
@@ -555,7 +555,7 @@ static int Seek(const std::vector<std::string>& params)
 ///   \table_row2_l{
 ///     <b>`Playlist.PlayOffset(positionType[\,position])`</b>
 ///     ,
-///     Start playing from a particular offset in the playlist 
+///     Start playing from a particular offset in the playlist
 ///     @param[in] positionType          Position in playlist or playlist type.
 ///     @param[in] position              Position in playlist if params[0] is playlist type (optional).
 ///   }
diff --git a/xbmc/interfaces/builtins/SkinBuiltins.cpp b/xbmc/interfaces/builtins/SkinBuiltins.cpp
index c5c48611f2..aef8115e92 100644
--- a/xbmc/interfaces/builtins/SkinBuiltins.cpp
+++ b/xbmc/interfaces/builtins/SkinBuiltins.cpp
@@ -222,7 +222,7 @@ static int SetPath(const std::vector<std::string>& params)
  *  \param params The parameters.
  *  \details params[0] = Name of skin setting.
  *           params[1] = File mask or add-on type (optional).
- *           params[2] = Extra URL to allow selection from or 
+ *           params[2] = Extra URL to allow selection from or
  *                       content type if mask is an addon-on type (optional).
  */
 static int SetFile(const std::vector<std::string>& params)
@@ -260,7 +260,7 @@ static int SetFile(const std::vector<std::string>& params)
         CSkinSettings::GetInstance().SetString(string, replace);
     }
   }
-  else 
+  else
   {
     if (params.size() > 2)
     {
diff --git a/xbmc/interfaces/json-rpc/AddonsOperations.cpp b/xbmc/interfaces/json-rpc/AddonsOperations.cpp
index 0f0bced719..4d5f9b8549 100644
--- a/xbmc/interfaces/json-rpc/AddonsOperations.cpp
+++ b/xbmc/interfaces/json-rpc/AddonsOperations.cpp
@@ -130,11 +130,11 @@ JSONRPC_STATUS CAddonsOperations::GetAddons(const std::string &method, ITranspor
 
   int start, end;
   HandleLimits(parameterObject, result, addons.size(), start, end);
-  
+
   CAddonDatabase addondb;
   for (int index = start; index < end; index++)
     FillDetails(addons.at(index), parameterObject["properties"], result["addons"], addondb, true);
-  
+
   return OK;
 }
 
@@ -145,7 +145,7 @@ JSONRPC_STATUS CAddonsOperations::GetAddonDetails(const std::string &method, ITr
   if (!CServiceBroker::GetAddonMgr().GetAddon(id, addon, ADDON::ADDON_UNKNOWN, false) || addon.get() == NULL ||
       addon->Type() <= ADDON_UNKNOWN || addon->Type() >= ADDON_MAX)
     return InvalidParams;
-    
+
   CAddonDatabase addondb;
   FillDetails(addon, parameterObject["properties"], result["addon"], addondb);
 
@@ -180,7 +180,7 @@ JSONRPC_STATUS CAddonsOperations::ExecuteAddon(const std::string &method, ITrans
   if (!CServiceBroker::GetAddonMgr().GetAddon(id, addon) || addon.get() == NULL ||
       addon->Type() < ADDON_VIZ || addon->Type() >= ADDON_MAX)
     return InvalidParams;
-    
+
   std::string argv;
   CVariant params = parameterObject["params"];
   if (params.isObject())
@@ -206,7 +206,7 @@ JSONRPC_STATUS CAddonsOperations::ExecuteAddon(const std::string &method, ITrans
     if (!params.empty())
       argv = StringUtils::Paramify(params.asString());
   }
-  
+
   std::string cmd;
   if (params.empty())
     cmd = StringUtils::Format("RunAddon(%s)", id.c_str());
@@ -217,7 +217,7 @@ JSONRPC_STATUS CAddonsOperations::ExecuteAddon(const std::string &method, ITrans
     CApplicationMessenger::GetInstance().SendMsg(TMSG_EXECUTE_BUILT_IN, -1, -1, nullptr, cmd);
   else
     CApplicationMessenger::GetInstance().PostMsg(TMSG_EXECUTE_BUILT_IN, -1, -1, nullptr, cmd);
-  
+
   return ACK;
 }
 
@@ -265,17 +265,17 @@ void CAddonsOperations::FillDetails(AddonPtr addon, const CVariant& fields, CVar
 {
   if (addon.get() == NULL)
     return;
-  
+
   CVariant addonInfo = Serialize(addon);
 
   CVariant object;
   object["addonid"] = addonInfo["addonid"];
   object["type"] = addonInfo["type"];
-  
+
   for (unsigned int index = 0; index < fields.size(); index++)
   {
     std::string field = fields[index].asString();
-    
+
     // we need to manually retrieve the enabled / installed state of every addon
     // from the addon database because it can't be read from addon.xml
     if (field == "enabled")
@@ -301,7 +301,7 @@ void CAddonsOperations::FillDetails(AddonPtr addon, const CVariant& fields, CVar
     else if (addonInfo.isMember(field))
       object[field] = addonInfo[field];
   }
-  
+
   if (append)
     result.append(object);
   else
diff --git a/xbmc/interfaces/json-rpc/AddonsOperations.h b/xbmc/interfaces/json-rpc/AddonsOperations.h
index b0a2f1398e..1bc015eb0d 100644
--- a/xbmc/interfaces/json-rpc/AddonsOperations.h
+++ b/xbmc/interfaces/json-rpc/AddonsOperations.h
@@ -33,10 +33,10 @@ namespace JSONRPC
   public:
     static JSONRPC_STATUS GetAddons(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSONRPC_STATUS GetAddonDetails(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
-    
+
     static JSONRPC_STATUS SetAddonEnabled(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSONRPC_STATUS ExecuteAddon(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
-    
+
   private:
     static void FillDetails(ADDON::AddonPtr addon, const CVariant& fields, CVariant &result, CAddonDatabase &addondb, bool append = false);
   };
diff --git a/xbmc/interfaces/json-rpc/ApplicationOperations.cpp b/xbmc/interfaces/json-rpc/ApplicationOperations.cpp
index 73a7f7e66b..0c893d96cf 100644
--- a/xbmc/interfaces/json-rpc/ApplicationOperations.cpp
+++ b/xbmc/interfaces/json-rpc/ApplicationOperations.cpp
@@ -61,7 +61,7 @@ JSONRPC_STATUS CApplicationOperations::SetVolume(const std::string &method, ITra
   {
     int oldVolume = (int)g_application.GetVolume();
     int volume = (int)parameterObject["volume"].asInteger();
-  
+
     g_application.SetVolume((float)volume, true);
 
     up = oldVolume < volume;
diff --git a/xbmc/interfaces/json-rpc/AudioLibrary.cpp b/xbmc/interfaces/json-rpc/AudioLibrary.cpp
index a63cb2c6ac..4eb9d2f232 100644
--- a/xbmc/interfaces/json-rpc/AudioLibrary.cpp
+++ b/xbmc/interfaces/json-rpc/AudioLibrary.cpp
@@ -81,10 +81,10 @@ JSONRPC_STATUS CAudioLibrary::GetArtists(const std::string &method, ITransportLa
   bool allroles = false;
   if (parameterObject["allroles"].isBoolean())
     allroles = parameterObject["allroles"].asBoolean();
-  
+
   int genreID = -1, albumID = -1, songID = -1;
   const CVariant &filter = parameterObject["filter"];
-  
+
   if (allroles)
     musicUrl.AddOption("roleid", -1000); //All roles, any negative parameter overrides implicit roleid=1 filter required for backward compatibility
   else if (filter.isMember("roleid"))
@@ -125,7 +125,7 @@ JSONRPC_STATUS CAudioLibrary::GetArtists(const std::string &method, ITransportLa
     return InvalidParams;
 
   CFileItemList items;
-  musicdatabase.SetTranslateBlankArtist(false);  
+  musicdatabase.SetTranslateBlankArtist(false);
   if (!musicdatabase.GetArtistsNav(musicUrl.ToString(), items, albumArtistsOnly, genreID, albumID, songID, CDatabase::Filter(), sorting))
     return InternalError;
 
@@ -284,7 +284,7 @@ JSONRPC_STATUS CAudioLibrary::GetAlbumDetails(const std::string &method, ITransp
   JSONRPC_STATUS ret = GetAdditionalAlbumDetails(parameterObject, items, musicdatabase);
   if (ret != OK)
     return ret;
-  
+
   HandleFileItem("albumid", false, "albumdetails", items[0], parameterObject, parameterObject["properties"], result, false);
 
   return OK;
@@ -357,10 +357,10 @@ JSONRPC_STATUS CAudioLibrary::GetSongs(const std::string &method, ITransportLaye
   checkProperties.insert("displaylyricist");
   std::set<std::string> additionalProperties;
   bool artistData = CheckForAdditionalProperties(parameterObject["properties"], checkProperties, additionalProperties);
- 
+
   CFileItemList items;
   if (!musicdatabase.GetSongsFullByWhere(musicUrl.ToString(), CDatabase::Filter(), items, sorting, artistData))
-    return InternalError; 
+    return InternalError;
 
   JSONRPC_STATUS ret = GetAdditionalSongDetails(parameterObject, items, musicdatabase);
   if (ret != OK)
@@ -576,11 +576,11 @@ JSONRPC_STATUS CAudioLibrary::SetArtistDetails(const std::string &method, ITrans
   if (ParameterNotNull(parameterObject, "disambiguation"))
     artist.strDisambiguation = parameterObject["disambiguation"].asString();
 
-  // Update existing art. Any existing artwork that isn't specified in this request stays as is. 
+  // Update existing art. Any existing artwork that isn't specified in this request stays as is.
   // If the value is null then the existing art with that type is removed.
   if (ParameterNotNull(parameterObject, "art"))
   {
-    // Get current artwork    
+    // Get current artwork
     musicdatabase.GetArtForItem(artist.idArtist, MediaTypeArtist, artist.art);
 
     std::set<std::string> removedArtwork;
@@ -597,7 +597,7 @@ JSONRPC_STATUS CAudioLibrary::SetArtistDetails(const std::string &method, ITrans
     }
     // Remove null art now, as not done by update
     if (!musicdatabase.RemoveArtForItem(artist.idArtist, MediaTypeArtist, removedArtwork))
-      return InternalError;   
+      return InternalError;
   }
 
   // Update artist including adding or replacing (but not removing) art
@@ -623,7 +623,7 @@ JSONRPC_STATUS CAudioLibrary::SetAlbumDetails(const std::string &method, ITransp
 
   if (ParameterNotNull(parameterObject, "title"))
     album.strAlbum = parameterObject["title"].asString();
-  if (ParameterNotNull(parameterObject, "displayartist")) 
+  if (ParameterNotNull(parameterObject, "displayartist"))
     album.strArtistDesc = parameterObject["displayartist"].asString();
   // Set album sort string before processing artist credits
   if (ParameterNotNull(parameterObject, "sortartist"))
@@ -673,12 +673,12 @@ JSONRPC_STATUS CAudioLibrary::SetAlbumDetails(const std::string &method, ITransp
     album.strMusicBrainzAlbumID = parameterObject["musicbrainzalbumid"].asString();
   if (ParameterNotNull(parameterObject, "musicbrainzreleasegroupid"))
     album.strReleaseGroupMBID = parameterObject["musicbrainzreleasegroupid"].asString();
-  
-  // Update existing art. Any existing artwork that isn't specified in this request stays as is. 
+
+  // Update existing art. Any existing artwork that isn't specified in this request stays as is.
   // If the value is null then the existing art with that type is removed.
   if (ParameterNotNull(parameterObject, "art"))
   {
-    // Get current artwork    
+    // Get current artwork
     musicdatabase.GetArtForItem(album.idAlbum, MediaTypeAlbum, album.art);
 
     std::set<std::string> removedArtwork;
@@ -768,12 +768,12 @@ JSONRPC_STATUS CAudioLibrary::SetSongDetails(const std::string &method, ITranspo
     song.lastPlayed.SetFromDBDateTime(parameterObject["lastplayed"].asString());
   if (ParameterNotNull(parameterObject, "mood"))
     song.strAlbum = parameterObject["mood"].asString();
-  
-  // Update existing art. Any existing artwork that isn't specified in this request stays as is. 
+
+  // Update existing art. Any existing artwork that isn't specified in this request stays as is.
   // If the value is null then the existing art with that type is removed.
   if (ParameterNotNull(parameterObject, "art"))
   {
-    // Get current artwork    
+    // Get current artwork
     std::map<std::string, std::string> artwork;
     musicdatabase.GetArtForItem(song.idSong, MediaTypeSong, artwork);
 
@@ -1044,9 +1044,9 @@ JSONRPC_STATUS CAudioLibrary::GetAdditionalSongDetails(const CVariant &parameter
   std::set<std::string> checkProperties;
   checkProperties.insert("genreid");
   // Query (songview join songartistview) returns song.strAlbumArtists = CMusicInfoTag.m_strAlbumArtistDesc only
-  // Actual album artist data, if required,  comes from album_artist and artist tables. 
+  // Actual album artist data, if required,  comes from album_artist and artist tables.
   // It may differ from just splitting album artist description string
-  checkProperties.insert("albumartist"); 
+  checkProperties.insert("albumartist");
   checkProperties.insert("albumartistid");
   checkProperties.insert("musicbrainzalbumartistid");
   std::set<std::string> additionalProperties;
diff --git a/xbmc/interfaces/json-rpc/AudioLibrary.h b/xbmc/interfaces/json-rpc/AudioLibrary.h
index f93f381b33..c174dc326f 100644
--- a/xbmc/interfaces/json-rpc/AudioLibrary.h
+++ b/xbmc/interfaces/json-rpc/AudioLibrary.h
@@ -69,7 +69,7 @@ namespace JSONRPC
   private:
     static void FillAlbumItem(const CAlbum &album, const std::string &path, CFileItemPtr &item);
     static void FillItemArtistIDs(const std::vector<int> artistids, CFileItemPtr &item);
-    
+
     static bool CheckForAdditionalProperties(const CVariant &properties, const std::set<std::string> &checkProperties, std::set<std::string> &foundProperties);
   };
 }
diff --git a/xbmc/interfaces/json-rpc/FavouritesOperations.cpp b/xbmc/interfaces/json-rpc/FavouritesOperations.cpp
index b860d19bb7..0734a3eaaa 100644
--- a/xbmc/interfaces/json-rpc/FavouritesOperations.cpp
+++ b/xbmc/interfaces/json-rpc/FavouritesOperations.cpp
@@ -37,7 +37,7 @@ JSONRPC_STATUS CFavouritesOperations::GetFavourites(const std::string &method, I
 {
   CFileItemList favourites;
   CServiceBroker::GetFavouritesService().GetAll(favourites);
-  
+
   std::string type = !parameterObject["type"].isNull() ? parameterObject["type"].asString() : "";
 
   std::set<std::string> fields;
@@ -81,7 +81,7 @@ JSONRPC_STATUS CFavouritesOperations::GetFavourites(const std::string &method, I
       {
         if (parameters.size() > 1)
           object["windowparameter"] = parameters[1];
-        else 
+        else
           object["windowparameter"] = "";
       }
     }
@@ -99,11 +99,11 @@ JSONRPC_STATUS CFavouritesOperations::GetFavourites(const std::string &method, I
     }
     else
       object["type"] = "unknown";
-    
+
     if (type.empty() || type.compare(object["type"].asString()) == 0)
       result["favourites"].append(object);
   }
-  
+
   int start, end;
   HandleLimits(parameterObject, result, result["favourites"].size(), start, end);
 
@@ -146,14 +146,14 @@ JSONRPC_STATUS CFavouritesOperations::AddFavourite(const std::string &method, IT
     contextWindow = CWindowTranslator::TranslateWindow(parameterObject["window"].asString());
     if (contextWindow == WINDOW_INVALID)
       return InvalidParams;
-  } 
-  else if (type.compare("script") == 0) 
+  }
+  else if (type.compare("script") == 0)
   {
     if (!URIUtils::IsScript(path))
       path = "script://" + path;
     item = CFileItem(path, false);
   }
-  else if (type.compare("media") == 0) 
+  else if (type.compare("media") == 0)
   {
     item = CFileItem(path, false);
   }
diff --git a/xbmc/interfaces/json-rpc/FileItemHandler.cpp b/xbmc/interfaces/json-rpc/FileItemHandler.cpp
index 3976c2382f..8598c75965 100644
--- a/xbmc/interfaces/json-rpc/FileItemHandler.cpp
+++ b/xbmc/interfaces/json-rpc/FileItemHandler.cpp
@@ -92,7 +92,7 @@ bool CFileItemHandler::GetField(const std::string &field, const CVariant &info,
         return true;
       }
     }
-    
+
     if (item->HasProperty("artist_" + field + "_array"))
     {
       result[field] = item->GetProperty("artist_" + field + "_array");
@@ -124,7 +124,7 @@ bool CFileItemHandler::GetField(const std::string &field, const CVariant &info,
       result["art"] = artObj;
       return true;
     }
-    
+
     if (field == "thumbnail")
     {
       if (thumbLoader != NULL && !item->HasArt("thumb") && !fetchedArt &&
@@ -135,15 +135,15 @@ bool CFileItemHandler::GetField(const std::string &field, const CVariant &info,
       }
       else if (item->HasPictureInfoTag() && !item->HasArt("thumb"))
         item->SetArt("thumb", CTextureUtils::GetWrappedThumbURL(item->GetPath()));
-      
+
       if (item->HasArt("thumb"))
         result["thumbnail"] = CTextureUtils::GetWrappedImageURL(item->GetArt("thumb"));
       else
         result["thumbnail"] = "";
-      
+
       return true;
     }
-    
+
     if (field == "fanart")
     {
       if (thumbLoader != NULL && !item->HasArt("fanart") && !fetchedArt &&
@@ -152,15 +152,15 @@ bool CFileItemHandler::GetField(const std::string &field, const CVariant &info,
         thumbLoader->FillLibraryArt(*item);
         fetchedArt = true;
       }
-      
+
       if (item->HasArt("fanart"))
         result["fanart"] = CTextureUtils::GetWrappedImageURL(item->GetArt("fanart"));
       else
         result["fanart"] = "";
-      
+
       return true;
     }
-    
+
     if (item->HasVideoInfoTag() && item->GetVideoContentType() == VIDEODB_CONTENT_TVSHOWS)
     {
       if (item->GetVideoInfoTag()->m_iSeason < 0 && field == "season")
@@ -330,7 +330,7 @@ void CFileItemHandler::HandleFileItem(const char *ID, bool allowFile, const char
         {
           if (item->m_bIsFolder)
             object["filetype"] = "directory";
-          else 
+          else
             object["filetype"] = "file";
         }
       }
@@ -365,7 +365,7 @@ void CFileItemHandler::HandleFileItem(const char *ID, bool allowFile, const char
       FillDetails(item->GetMusicInfoTag(), item, fields, object, thumbLoader);
     if (item->HasPictureInfoTag())
       FillDetails(item->GetPictureInfoTag(), item, fields, object, thumbLoader);
-    
+
     FillDetails(item.get(), item, fields, object, thumbLoader);
 
     if (deleteThumbloader)
diff --git a/xbmc/interfaces/json-rpc/FileOperations.cpp b/xbmc/interfaces/json-rpc/FileOperations.cpp
index 115f8a64f0..d1086898ae 100644
--- a/xbmc/interfaces/json-rpc/FileOperations.cpp
+++ b/xbmc/interfaces/json-rpc/FileOperations.cpp
@@ -275,7 +275,7 @@ JSONRPC_STATUS CFileOperations::PrepareDownload(const std::string &method, ITran
 
     return OK;
   }
-  
+
   return InvalidParams;
 }
 
diff --git a/xbmc/interfaces/json-rpc/FileOperations.h b/xbmc/interfaces/json-rpc/FileOperations.h
index 7e71912438..ff5836662a 100644
--- a/xbmc/interfaces/json-rpc/FileOperations.h
+++ b/xbmc/interfaces/json-rpc/FileOperations.h
@@ -34,7 +34,7 @@ namespace JSONRPC
     static JSONRPC_STATUS GetDirectory(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSONRPC_STATUS GetFileDetails(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSONRPC_STATUS SetFileDetails(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
-    
+
     static JSONRPC_STATUS PrepareDownload(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSONRPC_STATUS Download(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
 
diff --git a/xbmc/interfaces/json-rpc/JSONRPC.cpp b/xbmc/interfaces/json-rpc/JSONRPC.cpp
index e144eec46f..e82f2d1f7c 100644
--- a/xbmc/interfaces/json-rpc/JSONRPC.cpp
+++ b/xbmc/interfaces/json-rpc/JSONRPC.cpp
@@ -110,7 +110,7 @@ void CJSONRPC::Initialize()
 
   for (unsigned int index = 0; index < size; index++)
     CJSONServiceDescription::AddNotification(JSONRPC_SERVICE_NOTIFICATIONS[index]);
-  
+
   m_initialized = true;
   CLog::Log(LOGINFO, "JSONRPC v%s: Successfully initialized", CJSONServiceDescription::GetVersion());
 }
@@ -222,12 +222,12 @@ JSONRPC_STATUS CJSONRPC::SetConfiguration(const std::string &method, ITransportL
 JSONRPC_STATUS CJSONRPC::NotifyAll(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant& parameterObject, CVariant &result)
 {
   if (parameterObject["data"].isNull())
-    CAnnouncementManager::GetInstance().Announce(Other, parameterObject["sender"].asString().c_str(),  
+    CAnnouncementManager::GetInstance().Announce(Other, parameterObject["sender"].asString().c_str(),
       parameterObject["message"].asString().c_str());
   else
   {
     CVariant data = parameterObject["data"];
-    CAnnouncementManager::GetInstance().Announce(Other, parameterObject["sender"].asString().c_str(),  
+    CAnnouncementManager::GetInstance().Announce(Other, parameterObject["sender"].asString().c_str(),
       parameterObject["message"].asString().c_str(), data);
   }
 
diff --git a/xbmc/interfaces/json-rpc/JSONRPC.h b/xbmc/interfaces/json-rpc/JSONRPC.h
index eb8640e7ea..41b9a35b25 100644
--- a/xbmc/interfaces/json-rpc/JSONRPC.h
+++ b/xbmc/interfaces/json-rpc/JSONRPC.h
@@ -72,7 +72,7 @@ namespace JSONRPC
     static JSONRPC_STATUS GetConfiguration(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant& parameterObject, CVariant &result);
     static JSONRPC_STATUS SetConfiguration(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant& parameterObject, CVariant &result);
     static JSONRPC_STATUS NotifyAll(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant& parameterObject, CVariant &result);
-  
+
   private:
     static bool HandleMethodCall(const CVariant& request, CVariant& response, ITransportLayer *transport, IClient *client);
     static inline bool IsProperJSONRPC(const CVariant& inputroot);
diff --git a/xbmc/interfaces/json-rpc/JSONRPCUtils.h b/xbmc/interfaces/json-rpc/JSONRPCUtils.h
index dd52744d5c..00aaa7afce 100644
--- a/xbmc/interfaces/json-rpc/JSONRPCUtils.h
+++ b/xbmc/interfaces/json-rpc/JSONRPCUtils.h
@@ -59,8 +59,8 @@ namespace JSONRPC
   /*!
    \ingroup jsonrpc
    \brief Permission categories for json rpc methods
-   
-   A JSON-RPC method will only be called if the caller 
+
+   A JSON-RPC method will only be called if the caller
    has the correct permissions to execute the method.
    The method call needs to be perfectly threadsafe.
   */
@@ -90,7 +90,7 @@ namespace JSONRPC
                                                  ControlGUI | ManageAddon | ExecuteAddon | ControlPVR);
 
   /*!
-    \brief Returns a string representation for the 
+    \brief Returns a string representation for the
     given OperationPermission
     \param permission Specific OperationPermission
     \return String representation of the given OperationPermission
diff --git a/xbmc/interfaces/json-rpc/JSONServiceDescription.cpp b/xbmc/interfaces/json-rpc/JSONServiceDescription.cpp
index b655e050b9..c04d150594 100644
--- a/xbmc/interfaces/json-rpc/JSONServiceDescription.cpp
+++ b/xbmc/interfaces/json-rpc/JSONServiceDescription.cpp
@@ -71,13 +71,13 @@ JsonRpcMethodMap CJSONServiceDescription::m_methodMaps[] = {
   { "Player.Move",                                  CPlayerOperations::Move },
   { "Player.Zoom",                                  CPlayerOperations::Zoom },
   { "Player.Rotate",                                CPlayerOperations::Rotate },
-  
+
   { "Player.Open",                                  CPlayerOperations::Open },
   { "Player.GoTo",                                  CPlayerOperations::GoTo },
   { "Player.SetShuffle",                            CPlayerOperations::SetShuffle },
   { "Player.SetRepeat",                             CPlayerOperations::SetRepeat },
   { "Player.SetPartymode",                          CPlayerOperations::SetPartymode },
-  
+
   { "Player.SetAudioStream",                        CPlayerOperations::SetAudioStream },
   { "Player.SetSubtitle",                           CPlayerOperations::SetSubtitle },
   { "Player.SetVideoStream",                        CPlayerOperations::SetVideoStream },
@@ -157,7 +157,7 @@ JsonRpcMethodMap CJSONServiceDescription::m_methodMaps[] = {
   { "VideoLibrary.Scan",                            CVideoLibrary::Scan },
   { "VideoLibrary.Export",                          CVideoLibrary::Export },
   { "VideoLibrary.Clean",                           CVideoLibrary::Clean },
-  
+
 // Addon operations
   { "Addons.GetAddons",                             CAddonsOperations::GetAddons },
   { "Addons.GetAddonDetails",                       CAddonsOperations::GetAddonDetails },
@@ -294,7 +294,7 @@ bool JSONSchemaTypeDefinition::Parse(const CVariant &value, bool isParameter /*
       missingReference = refType;
       return false;
     }
-    
+
     std::string typeName = name;
     *this = *referencedTypeDef;
     if (!typeName.empty())
@@ -450,7 +450,7 @@ bool JSONSchemaTypeDefinition::Parse(const CVariant &value, bool isParameter /*
           missingReference = additionalProperties->missingReference;
           hasAdditionalProperties = false;
           additionalProperties.reset();
-          
+
           CLog::Log(LOGDEBUG, "JSONRPC: Invalid additionalProperties schema definition in type %s", name.c_str());
           return false;
         }
@@ -570,7 +570,7 @@ bool JSONSchemaTypeDefinition::Parse(const CVariant &value, bool isParameter /*
     exclusiveMaximum = value["exclusiveMaximum"].asBoolean(false);
     divisibleBy = (unsigned int)value["divisibleBy"].asUnsignedInteger(0);
   }
-      
+
   if (HasType(type, StringValue))
   {
     minLength = (int)value["minLength"].asInteger(-1);
@@ -596,7 +596,7 @@ bool JSONSchemaTypeDefinition::Parse(const CVariant &value, bool isParameter /*
         }
       }
 
-      // Only add the current item to the enum value 
+      // Only add the current item to the enum value
       // list if it is not duplicate
       if (approved)
         enums.push_back(*enumItr);
@@ -635,7 +635,7 @@ bool JSONSchemaTypeDefinition::Parse(const CVariant &value, bool isParameter /*
       // match the type of the parameter we have to log this
       if (value.isMember("default") && !IsType(value["default"], type))
         CLog::Log(LOGDEBUG, "JSONRPC: Parameter %s has an invalid default value", name.c_str());
-      
+
       // If the type contains an "enum" we need to get the
       // default value from the first enum value
       if (enums.size() > 0)
@@ -949,14 +949,14 @@ JSONRPC_STATUS JSONSchemaTypeDefinition::Check(const CVariant &value, CVariant &
     // Check minimum
     if ((exclusiveMinimum && numberValue <= minimum) || (!exclusiveMinimum && numberValue < minimum) ||
     // Check maximum
-        (exclusiveMaximum && numberValue >= maximum) || (!exclusiveMaximum && numberValue > maximum))        
+        (exclusiveMaximum && numberValue >= maximum) || (!exclusiveMaximum && numberValue > maximum))
     {
       CLog::Log(LOGDEBUG, "JSONRPC: Value does not lay between minimum and maximum in type %s", name.c_str());
       if (value.isDouble())
-        errorMessage = StringUtils::Format("Value between %f (%s) and %f (%s) expected but %f received", 
+        errorMessage = StringUtils::Format("Value between %f (%s) and %f (%s) expected but %f received",
           minimum, exclusiveMinimum ? "exclusive" : "inclusive", maximum, exclusiveMaximum ? "exclusive" : "inclusive", numberValue);
       else
-        errorMessage = StringUtils::Format("Value between %d (%s) and %d (%s) expected but %d received", 
+        errorMessage = StringUtils::Format("Value between %d (%s) and %d (%s) expected but %d received",
           (int)minimum, exclusiveMinimum ? "exclusive" : "inclusive", (int)maximum, exclusiveMaximum ? "exclusive" : "inclusive", (int)numberValue);
       errorData["message"] = errorMessage.c_str();
       return InvalidParams;
@@ -1269,7 +1269,7 @@ bool JsonRpcMethod::Parse(const CVariant &value)
       // "type" element we will ignore it
       if (!parameter.isMember("name") || !parameter["name"].isString() ||
          (!parameter.isMember("type") && !parameter.isMember("$ref") && !parameter.isMember("extends")) ||
-         (parameter.isMember("type") && !parameter["type"].isString() && !parameter["type"].isArray()) || 
+         (parameter.isMember("type") && !parameter["type"].isString() && !parameter["type"].isArray()) ||
          (parameter.isMember("$ref") && !parameter["$ref"].isString()) ||
          (parameter.isMember("extends") && !parameter["extends"].isString() && !parameter["extends"].isArray()))
       {
@@ -1288,7 +1288,7 @@ bool JsonRpcMethod::Parse(const CVariant &value)
       parameters.push_back(param);
     }
   }
-    
+
   // Parse the return value of the method
   if (!parseReturn(value))
   {
@@ -1339,7 +1339,7 @@ JSONRPC_STATUS JsonRpcMethod::Check(const CVariant &requestParameters, ITranspor
     else
       return BadPermission;
   }
-  
+
   return MethodNotFound;
 }
 
@@ -1359,18 +1359,18 @@ bool JsonRpcMethod::parseReturn(const CVariant &value)
     returns->type = NullValue;
     return true;
   }
-  
+
   // If the type of the return value is defined as a simple string we can parse it directly
   if (value["returns"].isString())
     return CJSONServiceDescription::parseJSONSchemaType(value["returns"], returns->unionTypes, returns->type, missingReference);
-  
+
   // otherwise we have to parse the whole type definition
   if (!returns->Parse(value["returns"]))
   {
     missingReference = returns->missingReference;
     return false;
   }
-  
+
   return true;
 }
 
@@ -1496,7 +1496,7 @@ bool CJSONServiceDescription::addMethod(const std::string &jsonMethod, MethodCal
   JsonRpcMethod newMethod;
   newMethod.name = methodName;
   newMethod.method = method;
-  
+
   if (!newMethod.Parse(descriptionObject[newMethod.name]))
   {
     CLog::Log(LOGERROR, "JSONRPC: Could not parse method \"%s\"", methodName.c_str());
@@ -1506,15 +1506,15 @@ bool CJSONServiceDescription::addMethod(const std::string &jsonMethod, MethodCal
       incomplete.Schema = modJsonMethod;
       incomplete.Type = SchemaDefinitionMethod;
       incomplete.Method = method;
-      
+
       IncompleteSchemaDefinitionMap::iterator iter = m_incompleteDefinitions.find(newMethod.missingReference);
       if (iter == m_incompleteDefinitions.end())
         m_incompleteDefinitions[newMethod.missingReference] = std::vector<IncompleteSchemaDefinition>();
-      
+
       CLog::Log(LOGINFO, "JSONRPC: Adding method \"%s\" to list of incomplete definitions (waiting for \"%s\")", methodName.c_str(), newMethod.missingReference.c_str());
       m_incompleteDefinitions[newMethod.missingReference].push_back(incomplete);
     }
-    
+
     return false;
   }
 
@@ -1558,17 +1558,17 @@ bool CJSONServiceDescription::AddType(const std::string &jsonType)
       IncompleteSchemaDefinition incomplete;
       incomplete.Schema = modJsonType;
       incomplete.Type = SchemaDefinitionType;
-      
+
       IncompleteSchemaDefinitionMap::iterator iter = m_incompleteDefinitions.find(globalType->missingReference);
       if (iter == m_incompleteDefinitions.end())
         m_incompleteDefinitions[globalType->missingReference] = std::vector<IncompleteSchemaDefinition>();
-      
+
       CLog::Log(LOGINFO, "JSONRPC: Adding type \"%s\" to list of incomplete definitions (waiting for \"%s\")", typeName.c_str(), globalType->missingReference.c_str());
       m_incompleteDefinitions[globalType->missingReference].push_back(incomplete);
     }
 
     globalType.reset();
-    
+
     return false;
   }
 
@@ -1686,7 +1686,7 @@ bool CJSONServiceDescription::AddEnum(const std::string &name, const std::vector
       schemaType |= (int)currentType;
   }
   definition->type = (JSONSchemaType)schemaType;
-  
+
   if (defaultValue.type() == CVariant::VariantTypeConstNull)
     definition->defaultValue = definition->enums.at(0);
   else
@@ -1900,7 +1900,7 @@ JSONSchemaTypeDefinitionPtr CJSONServiceDescription::GetType(const std::string &
   std::map<std::string, JSONSchemaTypeDefinitionPtr>::iterator iter = m_types.find(identification);
   if (iter == m_types.end())
     return JSONSchemaTypeDefinitionPtr();
-  
+
   return iter->second;
 }
 
@@ -1946,13 +1946,13 @@ bool CJSONServiceDescription::parseJSONSchemaType(const CVariant &value, std::ve
 
     return true;
   }
-  
+
   if (value.isString())
   {
     schemaType = StringToSchemaValueType(value.asString());
     return true;
   }
-  
+
   return false;
 }
 
@@ -1969,11 +1969,11 @@ void CJSONServiceDescription::addReferenceTypeDefinition(JSONSchemaTypeDefinitio
 
   // Add the type to the list of type definitions
   m_types[typeDefinition->ID] = typeDefinition;
-  
+
   IncompleteSchemaDefinitionMap::iterator iter = m_incompleteDefinitions.find(typeDefinition->ID);
   if (iter == m_incompleteDefinitions.end())
     return;
-    
+
   CLog::Log(LOGINFO, "JSONRPC: Resolving incomplete types/methods referencing %s", typeDefinition->ID.c_str());
   for (unsigned int index = 0; index < iter->second.size(); index++)
   {
@@ -1982,7 +1982,7 @@ void CJSONServiceDescription::addReferenceTypeDefinition(JSONSchemaTypeDefinitio
     else
       AddMethod(iter->second[index].Schema, iter->second[index].Method);
   }
-  
+
   m_incompleteDefinitions.erase(typeDefinition->ID);
 }
 
diff --git a/xbmc/interfaces/json-rpc/JSONServiceDescription.h b/xbmc/interfaces/json-rpc/JSONServiceDescription.h
index a95fa03982..cf5639d7f5 100644
--- a/xbmc/interfaces/json-rpc/JSONServiceDescription.h
+++ b/xbmc/interfaces/json-rpc/JSONServiceDescription.h
@@ -33,11 +33,11 @@ namespace JSONRPC
   class JSONSchemaTypeDefinition;
   typedef std::shared_ptr<JSONSchemaTypeDefinition> JSONSchemaTypeDefinitionPtr;
 
-  /*! 
+  /*!
    \ingroup jsonrpc
    \brief Class for a parameter of a
    json rpc method.
-   
+
    Represents a parameter of a defined
    json rpc method and is used to verify
    and extract the value of the parameter
@@ -47,16 +47,16 @@ namespace JSONRPC
   {
   public:
     JSONSchemaTypeDefinition();
-    
+
     bool Parse(const CVariant &value, bool isParameter = false);
     JSONRPC_STATUS Check(const CVariant &value, CVariant &outputValue, CVariant &errorData);
     void Print(bool isParameter, bool isGlobal, bool printDefault, bool printDescriptions, CVariant &output) const;
     void Set(const JSONSchemaTypeDefinitionPtr typeDefinition);
-    
+
     std::string missingReference;
 
     /*!
-     \brief Name of the parameter (for 
+     \brief Name of the parameter (for
      by-name calls)
      */
     std::string name;
@@ -225,11 +225,11 @@ namespace JSONRPC
     JSONSchemaTypeDefinitionPtr additionalProperties;
   };
 
-  /*! 
+  /*!
    \ingroup jsonrpc
    \brief Structure for a published json
    rpc method.
-   
+
    Represents a published json rpc method
    and is used to verify an incoming json
    rpc request against a defined method.
@@ -238,12 +238,12 @@ namespace JSONRPC
   {
   public:
     JsonRpcMethod();
-  
+
     bool Parse(const CVariant &value);
     JSONRPC_STATUS Check(const CVariant &requestParameters, ITransportLayer *transport, IClient *client, bool notification, MethodCall &methodCall, CVariant &outputParameters) const;
-    
-    std::string missingReference;    
-    
+
+    std::string missingReference;
+
     /*!
      \brief Name of the represented method
      */
@@ -275,14 +275,14 @@ namespace JSONRPC
      \brief Definition of the return value
      */
     JSONSchemaTypeDefinitionPtr returns;
-  
+
   private:
     bool parseParameter(const CVariant &value, JSONSchemaTypeDefinitionPtr parameter);
     bool parseReturn(const CVariant &value);
     static JSONRPC_STATUS checkParameter(const CVariant &requestParameters, JSONSchemaTypeDefinitionPtr type, unsigned int position, CVariant &outputParameters, unsigned int &handled, CVariant &errorData);
   };
 
-  /*! 
+  /*!
    \ingroup jsonrpc
    \brief Structure mapping a json rpc method
    definition to an actual method implementation.
@@ -307,10 +307,10 @@ namespace JSONRPC
    service descriptions for the json rpc API
 
    Provides static functions to parse a complete json schema
-   service descriptor of a published service containing json rpc 
-   methods, print the json schema service descriptor representation 
-   into a string (mainly for output purposes) and evaluate and verify 
-   parameters provided in a call to one of the publish json rpc methods 
+   service descriptor of a published service containing json rpc
+   methods, print the json schema service descriptor representation
+   into a string (mainly for output purposes) and evaluate and verify
+   parameters provided in a call to one of the publish json rpc methods
    against a parameter definition parsed from a json schema service
    descriptor.
    */
@@ -391,7 +391,7 @@ namespace JSONRPC
      given parameters from the request against the json schema description for the given method.
      */
     static JSONRPC_STATUS CheckCall(const char* method, const CVariant &requestParameters, ITransportLayer *transport, IClient *client, bool notification, MethodCall &methodCall, CVariant &outputParameters);
-    
+
     static JSONSchemaTypeDefinitionPtr GetType(const std::string &identification);
 
     static void Cleanup();
diff --git a/xbmc/interfaces/json-rpc/JSONUtils.h b/xbmc/interfaces/json-rpc/JSONUtils.h
index f17068e33d..7ec9a5f861 100644
--- a/xbmc/interfaces/json-rpc/JSONUtils.h
+++ b/xbmc/interfaces/json-rpc/JSONUtils.h
@@ -79,7 +79,7 @@ namespace JSONRPC
     {
       if (size < 0)
         size = 0;
-    
+
       start = (int)parameterObject["limits"]["start"].asInteger();
       end   = (int)parameterObject["limits"]["end"].asInteger();
       end = (end <= 0 || end > size) ? size : end;
@@ -120,7 +120,7 @@ namespace JSONRPC
       limitStart = (int)parameterObject["limits"]["start"].asInteger();
       limitEnd = (int)parameterObject["limits"]["end"].asInteger();
     }
-  
+
     /*!
      \brief Checks if the given object contains a parameter
      \param parameterObject Object to check for a parameter
@@ -129,7 +129,7 @@ namespace JSONRPC
      \return True if the parameter is available otherwise false
 
      Checks the given object for a parameter with the given key (if
-     the given object is not an array) or for a parameter at the 
+     the given object is not an array) or for a parameter at the
      given position (if the given object is an array).
      */
     static inline bool ParameterExists(const CVariant &parameterObject, std::string key, unsigned int position) { return IsValueMember(parameterObject, key) || (parameterObject.isArray() && parameterObject.size() > position); }
@@ -139,11 +139,11 @@ namespace JSONRPC
      with the given key
      \param value Value to check for the member
      \param key Key of the member to check for
-     \return True if the given object contains a member with 
+     \return True if the given object contains a member with
      the given key otherwise false
      */
     static inline bool IsValueMember(const CVariant &value, std::string key) { return value.isMember(key); }
-    
+
     /*!
      \brief Returns the json value of a parameter
      \param parameterObject Object containing all provided parameters
@@ -153,11 +153,11 @@ namespace JSONRPC
      given position
 
      Returns the value of the parameter with the given key (if
-     the given object is not an array) or of the parameter at the 
+     the given object is not an array) or of the parameter at the
      given position (if the given object is an array).
      */
     static inline CVariant GetParameter(const CVariant &parameterObject, std::string key, unsigned int position) { return IsValueMember(parameterObject, key) ? parameterObject[key] : parameterObject[position]; }
-    
+
     /*!
      \brief Returns the json value of a parameter or the given
      default value
@@ -169,12 +169,12 @@ namespace JSONRPC
      given position or the default value if the parameter does not exist
 
      Returns the value of the parameter with the given key (if
-     the given object is not an array) or of the parameter at the 
+     the given object is not an array) or of the parameter at the
      given position (if the given object is an array). If the
      parameter does not exist the given default value is returned.
      */
     static inline CVariant GetParameter(const CVariant &parameterObject, std::string key, unsigned int position, CVariant fallback) { return IsValueMember(parameterObject, key) ? parameterObject[key] : ((parameterObject.isArray() && parameterObject.size() > position) ? parameterObject[position] : fallback); }
-    
+
     /*!
      \brief Returns the given json value as a string
      \param value Json value to convert to a string
@@ -236,9 +236,9 @@ namespace JSONRPC
 
       return AnyValue;
     }
-    
+
     /*!
-     \brief Returns a string representation for the 
+     \brief Returns a string representation for the
      given JSONSchemaType
      \param valueType Specific JSONSchemaType
      \return String representation of the given JSONSchemaType
diff --git a/xbmc/interfaces/json-rpc/PVROperations.cpp b/xbmc/interfaces/json-rpc/PVROperations.cpp
index b7227da61b..2de312e9d8 100644
--- a/xbmc/interfaces/json-rpc/PVROperations.cpp
+++ b/xbmc/interfaces/json-rpc/PVROperations.cpp
@@ -41,7 +41,7 @@ JSONRPC_STATUS CPVROperations::GetProperties(const std::string &method, ITranspo
 {
   if (!CServiceBroker::GetPVRManager().IsStarted())
     return FailedToExecute;
-  
+
   CVariant properties = CVariant(CVariant::VariantTypeObject);
   for (unsigned int index = 0; index < parameterObject["properties"].size(); index++)
   {
@@ -63,7 +63,7 @@ JSONRPC_STATUS CPVROperations::GetChannelGroups(const std::string &method, ITran
 {
   if (!CServiceBroker::GetPVRManager().IsStarted())
     return FailedToExecute;
-  
+
   CPVRChannelGroupsContainerPtr channelGroupContainer = CServiceBroker::GetPVRManager().ChannelGroups();
   if (!channelGroupContainer)
     return FailedToExecute;
@@ -90,7 +90,7 @@ JSONRPC_STATUS CPVROperations::GetChannelGroupDetails(const std::string &method,
   CPVRChannelGroupsContainerPtr channelGroupContainer = CServiceBroker::GetPVRManager().ChannelGroups();
   if (!channelGroupContainer)
     return FailedToExecute;
-  
+
   CPVRChannelGroupPtr channelGroup;
   CVariant id = parameterObject["channelgroupid"];
   if (id.isInteger())
@@ -100,9 +100,9 @@ JSONRPC_STATUS CPVROperations::GetChannelGroupDetails(const std::string &method,
 
   if (channelGroup == NULL)
     return InvalidParams;
-  
+
   FillChannelGroupDetails(channelGroup, parameterObject, result["channelgroupdetails"], false);
-  
+
   return OK;
 }
 
@@ -110,27 +110,27 @@ JSONRPC_STATUS CPVROperations::GetChannels(const std::string &method, ITransport
 {
   if (!CServiceBroker::GetPVRManager().IsStarted())
     return FailedToExecute;
-  
+
   CPVRChannelGroupsContainerPtr channelGroupContainer = CServiceBroker::GetPVRManager().ChannelGroups();
   if (!channelGroupContainer)
     return FailedToExecute;
-  
+
   CPVRChannelGroupPtr channelGroup;
   CVariant id = parameterObject["channelgroupid"];
   if (id.isInteger())
     channelGroup = channelGroupContainer->GetByIdFromAll((int)id.asInteger());
   else if (id.isString())
     channelGroup = channelGroupContainer->GetGroupAll(id.asString() == "allradio");
-  
+
   if (channelGroup == NULL)
     return InvalidParams;
-  
+
   CFileItemList channels;
   if (channelGroup->GetMembers(channels) < 0)
     return InvalidParams;
-  
+
   HandleFileItemList("channelid", false, "channels", channels, parameterObject, result, true);
-    
+
   return OK;
 }
 
@@ -138,17 +138,17 @@ JSONRPC_STATUS CPVROperations::GetChannelDetails(const std::string &method, ITra
 {
   if (!CServiceBroker::GetPVRManager().IsStarted())
     return FailedToExecute;
-  
+
   CPVRChannelGroupsContainerPtr channelGroupContainer = CServiceBroker::GetPVRManager().ChannelGroups();
   if (!channelGroupContainer)
     return FailedToExecute;
-  
+
   CPVRChannelPtr channel = channelGroupContainer->GetChannelById((int)parameterObject["channelid"].asInteger());
   if (channel == NULL)
     return InvalidParams;
 
   HandleFileItem("channelid", false, "channeldetails", CFileItemPtr(new CFileItem(channel)), parameterObject, parameterObject["properties"], result, false);
-    
+
   return OK;
 }
 
diff --git a/xbmc/interfaces/json-rpc/PlayerOperations.cpp b/xbmc/interfaces/json-rpc/PlayerOperations.cpp
index 834853528a..3d0b6586e0 100644
--- a/xbmc/interfaces/json-rpc/PlayerOperations.cpp
+++ b/xbmc/interfaces/json-rpc/PlayerOperations.cpp
@@ -271,7 +271,7 @@ JSONRPC_STATUS CPlayerOperations::PlayPause(const std::string &method, ITranspor
     case Audio:
       if (!g_application.GetAppPlayer().CanPause())
         return FailedToExecute;
-      
+
       if (parameterObject["play"].isString())
         CBuiltins::GetInstance().Execute("playercontrol(play)");
       else
@@ -948,7 +948,7 @@ JSONRPC_STATUS CPlayerOperations::SetAudioStream(const std::string &method, ITra
       else
         return FailedToExecute;
       break;
-      
+
     case Audio:
     case Picture:
     default:
@@ -1009,7 +1009,7 @@ JSONRPC_STATUS CPlayerOperations::SetSubtitle(const std::string &method, ITransp
       else
         return FailedToExecute;
       break;
-      
+
     case Audio:
     case Picture:
     default:
@@ -1320,7 +1320,7 @@ JSONRPC_STATUS CPlayerOperations::GetPropertyValue(PlayerType player, const std:
           if (epg)
             ms = epg->GetDuration() * 1000;
         }
-        
+
         MillisecondsToTimeObject(ms, result);
         break;
       }
@@ -1555,7 +1555,7 @@ JSONRPC_STATUS CPlayerOperations::GetPropertyValue(PlayerType player, const std:
         else
           result = CVariant(CVariant::VariantTypeNull);
         break;
-        
+
       case Picture:
       default:
         result = CVariant(CVariant::VariantTypeNull);
@@ -1587,7 +1587,7 @@ JSONRPC_STATUS CPlayerOperations::GetPropertyValue(PlayerType player, const std:
           }
         }
         break;
-        
+
       case Audio:
       case Picture:
       default:
@@ -1666,7 +1666,7 @@ JSONRPC_STATUS CPlayerOperations::GetPropertyValue(PlayerType player, const std:
       case Video:
         result = g_application.GetAppPlayer().GetSubtitleVisible();
         break;
-        
+
       case Audio:
       case Picture:
       default:
@@ -1696,7 +1696,7 @@ JSONRPC_STATUS CPlayerOperations::GetPropertyValue(PlayerType player, const std:
         else
           result = CVariant(CVariant::VariantTypeNull);
         break;
-        
+
       case Audio:
       case Picture:
       default:
@@ -1726,7 +1726,7 @@ JSONRPC_STATUS CPlayerOperations::GetPropertyValue(PlayerType player, const std:
           }
         }
         break;
-        
+
       case Audio:
       case Picture:
       default:
diff --git a/xbmc/interfaces/json-rpc/PlayerOperations.h b/xbmc/interfaces/json-rpc/PlayerOperations.h
index ba7b5b75f7..83cc65ea1f 100644
--- a/xbmc/interfaces/json-rpc/PlayerOperations.h
+++ b/xbmc/interfaces/json-rpc/PlayerOperations.h
@@ -56,13 +56,13 @@ namespace JSONRPC
     static JSONRPC_STATUS Move(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSONRPC_STATUS Zoom(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSONRPC_STATUS Rotate(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
-    
+
     static JSONRPC_STATUS Open(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSONRPC_STATUS GoTo(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSONRPC_STATUS SetShuffle(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSONRPC_STATUS SetRepeat(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSONRPC_STATUS SetPartymode(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
-    
+
     static JSONRPC_STATUS SetAudioStream(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSONRPC_STATUS SetSubtitle(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSONRPC_STATUS SetVideoStream(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
diff --git a/xbmc/interfaces/json-rpc/PlaylistOperations.cpp b/xbmc/interfaces/json-rpc/PlaylistOperations.cpp
index 7c6c548f75..c865e4c3b7 100644
--- a/xbmc/interfaces/json-rpc/PlaylistOperations.cpp
+++ b/xbmc/interfaces/json-rpc/PlaylistOperations.cpp
@@ -36,15 +36,15 @@ JSONRPC_STATUS CPlaylistOperations::GetPlaylists(const std::string &method, ITra
 {
   result = CVariant(CVariant::VariantTypeArray);
   CVariant playlist = CVariant(CVariant::VariantTypeObject);
-  
+
   playlist["playlistid"] = PLAYLIST_MUSIC;
   playlist["type"] = "audio";
   result.append(playlist);
-  
+
   playlist["playlistid"] = PLAYLIST_VIDEO;
   playlist["type"] = "video";
   result.append(playlist);
-  
+
   playlist["playlistid"] = PLAYLIST_PICTURE;
   playlist["type"] = "picture";
   result.append(playlist);
@@ -149,7 +149,7 @@ JSONRPC_STATUS CPlaylistOperations::Add(const std::string &method, ITransportLay
     default:
       return InvalidParams;
   }
-  
+
   NotifyAll();
   return ACK;
 }
@@ -178,7 +178,7 @@ JSONRPC_STATUS CPlaylistOperations::Remove(const std::string &method, ITransport
   int playlist = GetPlaylist(parameterObject["playlistid"]);
   if (playlist == PLAYLIST_PICTURE)
     return FailedToExecute;
-  
+
   int position = (int)parameterObject["position"].asInteger();
   if (CServiceBroker::GetPlaylistPlayer().GetCurrentPlaylist() == playlist && CServiceBroker::GetPlaylistPlayer().GetCurrentSong() == position)
     return InvalidParams;
@@ -252,11 +252,11 @@ JSONRPC_STATUS CPlaylistOperations::GetPropertyValue(int playlist, const std::st
       case PLAYLIST_MUSIC:
         result = "audio";
         break;
-        
+
       case PLAYLIST_VIDEO:
         result = "video";
         break;
-        
+
       case PLAYLIST_PICTURE:
         result = "pictures";
         break;
diff --git a/xbmc/interfaces/json-rpc/PlaylistOperations.h b/xbmc/interfaces/json-rpc/PlaylistOperations.h
index 8d89d29959..4001d30ef5 100644
--- a/xbmc/interfaces/json-rpc/PlaylistOperations.h
+++ b/xbmc/interfaces/json-rpc/PlaylistOperations.h
@@ -36,7 +36,7 @@ namespace JSONRPC
 
     static JSONRPC_STATUS GetItems(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSONRPC_STATUS Add(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
-    static JSONRPC_STATUS Remove(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result); 
+    static JSONRPC_STATUS Remove(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSONRPC_STATUS Insert(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSONRPC_STATUS Clear(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSONRPC_STATUS Swap(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
diff --git a/xbmc/interfaces/json-rpc/ProfilesOperations.cpp b/xbmc/interfaces/json-rpc/ProfilesOperations.cpp
index 1e1fef7b2e..668c4b1223 100644
--- a/xbmc/interfaces/json-rpc/ProfilesOperations.cpp
+++ b/xbmc/interfaces/json-rpc/ProfilesOperations.cpp
@@ -99,7 +99,7 @@ JSONRPC_STATUS CProfilesOperations::LoadProfile(const std::string &method, ITran
 
   std::string profilename = parameterObject["profile"].asString();
   int index = profileManager.GetProfileIndex(profilename);
-  
+
   if (index < 0)
     return InvalidParams;
 
@@ -123,7 +123,7 @@ JSONRPC_STATUS CProfilesOperations::LoadProfile(const std::string &method, ITran
     const CVariant &passwordObject = parameterObject["password"];
     std::string strToVerify = profile->getLockCode();
     std::string password = passwordObject["value"].asString();
-		
+
     // Create password hash from the provided password if md5 is not used
     std::string md5pword2;
     std::string encryption = passwordObject["encryption"].asString();
diff --git a/xbmc/interfaces/json-rpc/SettingsOperations.cpp b/xbmc/interfaces/json-rpc/SettingsOperations.cpp
index d8ee5e6b47..77c17bf703 100644
--- a/xbmc/interfaces/json-rpc/SettingsOperations.cpp
+++ b/xbmc/interfaces/json-rpc/SettingsOperations.cpp
@@ -130,7 +130,7 @@ JSONRPC_STATUS CSettingsOperations::GetCategories(const std::string &method, ITr
           varCategory["groups"].push_back(varGroup);
         }
       }
-      
+
       result["categories"].push_back(varCategory);
     }
   }
@@ -149,7 +149,7 @@ JSONRPC_STATUS CSettingsOperations::GetSettings(const std::string &method, ITran
     strSection = filter["section"].asString();
     strCategory = filter["category"].asString();
   }
- 
+
   std::vector<SettingSectionPtr> sections;
 
   if (doFilter)
@@ -719,7 +719,7 @@ bool CSettingsOperations::SerializeSettingControl(std::shared_ptr<const ISetting
 {
   if (control == NULL)
     return false;
-  
+
   const std::string& type = control->GetType();
   obj["type"] = type;
   obj["format"] = control->GetFormat();
diff --git a/xbmc/interfaces/json-rpc/SettingsOperations.h b/xbmc/interfaces/json-rpc/SettingsOperations.h
index ff144813b4..c58a153242 100644
--- a/xbmc/interfaces/json-rpc/SettingsOperations.h
+++ b/xbmc/interfaces/json-rpc/SettingsOperations.h
@@ -51,7 +51,7 @@ namespace JSONRPC
     static JSONRPC_STATUS GetSections(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSONRPC_STATUS GetCategories(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSONRPC_STATUS GetSettings(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
-    
+
     static JSONRPC_STATUS GetSettingValue(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSONRPC_STATUS SetSettingValue(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSONRPC_STATUS ResetSettingValue(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
diff --git a/xbmc/interfaces/json-rpc/VideoLibrary.cpp b/xbmc/interfaces/json-rpc/VideoLibrary.cpp
index b58b62e7dd..477201ea81 100644
--- a/xbmc/interfaces/json-rpc/VideoLibrary.cpp
+++ b/xbmc/interfaces/json-rpc/VideoLibrary.cpp
@@ -234,7 +234,7 @@ JSONRPC_STATUS CVideoLibrary::GetSeasonDetails(const std::string &method, ITrans
   if (!videodatabase.GetSeasonInfo(id, infos) ||
       infos.m_iDbId <= 0 || infos.m_iIdShow <= 0)
     return InvalidParams;
-  
+
   CFileItemPtr pItem = CFileItemPtr(new CFileItem(infos));
   HandleFileItem("seasonid", false, "seasondetails", pItem, parameterObject, parameterObject["properties"], result, false);
   return OK;
@@ -253,7 +253,7 @@ JSONRPC_STATUS CVideoLibrary::GetEpisodes(const std::string &method, ITransportL
 
   int tvshowID = (int)parameterObject["tvshowid"].asInteger();
   int season   = (int)parameterObject["season"].asInteger();
-  
+
   std::string strPath = StringUtils::Format("videodb://tvshows/titles/%i/%i/", tvshowID, season);
 
   CVideoDbUrl videoUrl;
@@ -461,7 +461,7 @@ JSONRPC_STATUS CVideoLibrary::GetGenres(const std::string &method, ITransportLay
     strPath += "musicvideos";
   }
   strPath += "/genres/";
- 
+
   CVideoDatabase videodatabase;
   if (!videodatabase.Open())
     return InternalError;
@@ -925,7 +925,7 @@ bool CVideoLibrary::FillFileItem(const std::string &strFilename, CFileItemPtr &i
   CVideoDatabase videodatabase;
   if (strFilename.empty())
     return false;
-  
+
   bool filled = false;
   if (videodatabase.Open())
   {
diff --git a/xbmc/interfaces/json-rpc/VideoLibrary.h b/xbmc/interfaces/json-rpc/VideoLibrary.h
index 1385234699..ace1db03e4 100644
--- a/xbmc/interfaces/json-rpc/VideoLibrary.h
+++ b/xbmc/interfaces/json-rpc/VideoLibrary.h
@@ -54,7 +54,7 @@ namespace JSONRPC
     static JSONRPC_STATUS GetRecentlyAddedEpisodes(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSONRPC_STATUS GetRecentlyAddedMusicVideos(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSONRPC_STATUS GetInProgressTVShows(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
-    
+
     static JSONRPC_STATUS GetGenres(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSONRPC_STATUS GetTags(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
 
diff --git a/xbmc/interfaces/json-rpc/schema/methods.json b/xbmc/interfaces/json-rpc/schema/methods.json
index 543eb7ccb9..40a70d1760 100644
--- a/xbmc/interfaces/json-rpc/schema/methods.json
+++ b/xbmc/interfaces/json-rpc/schema/methods.json
@@ -658,7 +658,7 @@
     "description": "Retrieves the values of the music library properties",
     "transport": "Response",
     "permission": "ReadData",
-    "params": [      
+    "params": [
       { "name": "properties", "type": "array", "uniqueItems": true, "required": true, "items": { "$ref": "Audio.Property.Name" } }
     ],
     "returns":  { "$ref": "Audio.Property.Value", "required": true }
@@ -677,22 +677,22 @@
         "type": [
           { "type": "object", "properties": { "genreid": { "$ref": "Library.Id", "required": true, "description": "Deprecated, use songgenreid. Filter for existence of songs with this genre" } }, "additionalProperties": false },
           { "type": "object", "properties": { "songgenreid": { "$ref": "Library.Id", "required": true, "description": "Song genreid. Filter for existence of songs with this genre" } }, "additionalProperties": false },
-          { "type": "object", "properties": { "songgenreid": { "$ref": "Library.Id", "required": true }, 
+          { "type": "object", "properties": { "songgenreid": { "$ref": "Library.Id", "required": true },
                                               "roleid": { "$ref": "Library.Id", "required": true }}, "additionalProperties": false },
-          { "type": "object", "properties": { "songgenreid": { "$ref": "Library.Id", "required": true }, 
+          { "type": "object", "properties": { "songgenreid": { "$ref": "Library.Id", "required": true },
                                               "role": { "type": "string", "minLength": 1, "required": true }}, "additionalProperties": false },
           { "type": "object", "properties": { "genre": { "type": "string", "minLength": 1, "required": true, "description": "Deprecated, use songgenre. Filter for existence of songs with this genre" } }, "additionalProperties": false },
           { "type": "object", "properties": { "songgenre": { "type": "string", "minLength": 1, "required": true, "description": "Song genre. Filter for existence of songs with this genre" } }, "additionalProperties": false },
-          { "type": "object", "properties": { "songgenre": { "type": "string", "minLength": 1, "required": true }, 
+          { "type": "object", "properties": { "songgenre": { "type": "string", "minLength": 1, "required": true },
                                               "roleid": { "$ref": "Library.Id", "required": true }}, "additionalProperties": false },
-          { "type": "object", "properties": { "songgenre": { "type": "string", "minLength": 1, "required": true }, 
+          { "type": "object", "properties": { "songgenre": { "type": "string", "minLength": 1, "required": true },
                                               "role": { "type": "string", "minLength": 1, "required": true }}, "additionalProperties": false },
           { "type": "object", "properties": { "albumid": { "$ref": "Library.Id", "required": true } }, "additionalProperties": false },
           { "type": "object", "properties": { "album": { "type": "string", "minLength": 1, "required": true } }, "additionalProperties": false },
           { "type": "object", "properties": { "songid": { "$ref": "Library.Id", "required": true } }, "additionalProperties": false },
-          { "type": "object", "properties": { "songid": { "$ref": "Library.Id", "required": true }, 
+          { "type": "object", "properties": { "songid": { "$ref": "Library.Id", "required": true },
                                               "roleid": { "$ref": "Library.Id", "required": true }}, "additionalProperties": false },
-          { "type": "object", "properties": { "songid": { "$ref": "Library.Id", "required": true }, 
+          { "type": "object", "properties": { "songid": { "$ref": "Library.Id", "required": true },
                                               "role": { "type": "string", "minLength": 1, "required": true }}, "additionalProperties": false },
           { "type": "object", "properties": { "roleid": { "$ref": "Library.Id", "required": true, "description": "Role contributed by artist. Overridden by allroles parameter" } }, "additionalProperties": false },
           { "type": "object", "properties": { "role": { "type": "string", "minLength": 1, "required": true, "description": "Role contributed by artist. Overridden by allroles parameter" } }, "additionalProperties": false },
@@ -740,14 +740,14 @@
           { "type": "object", "properties": { "genreid": { "$ref": "Library.Id", "required": true, "description": "Song genre. Filter for existence of songs with this genre" } }, "additionalProperties": false },
           { "type": "object", "properties": { "genre": { "type": "string", "minLength": 1, "required": true, "description": "Song genre. Filter for existence of songs with this genre" } }, "additionalProperties": false },
           { "type": "object", "properties": { "artistid": { "$ref": "Library.Id", "required": true } }, "additionalProperties": false },
-          { "type": "object", "properties": { "artistid": { "$ref": "Library.Id", "required": true }, 
+          { "type": "object", "properties": { "artistid": { "$ref": "Library.Id", "required": true },
                                               "roleid": { "$ref": "Library.Id", "required": true }}, "additionalProperties": false },
-          { "type": "object", "properties": { "artistid": { "$ref": "Library.Id", "required": true }, 
+          { "type": "object", "properties": { "artistid": { "$ref": "Library.Id", "required": true },
                                               "role": { "type": "string", "minLength": 1, "required": true }}, "additionalProperties": false },
           { "type": "object", "properties": { "artist": { "type": "string", "minLength": 1, "required": true } }, "additionalProperties": false },
-          { "type": "object", "properties": { "artist": { "type": "string", "minLength": 1, "required": true }, 
+          { "type": "object", "properties": { "artist": { "type": "string", "minLength": 1, "required": true },
                                               "roleid": { "$ref": "Library.Id", "required": true }}, "additionalProperties": false },
-          { "type": "object", "properties": { "artist": { "type": "string", "minLength": 1, "required": true }, 
+          { "type": "object", "properties": { "artist": { "type": "string", "minLength": 1, "required": true },
                                               "role": { "type": "string", "minLength": 1, "required": true }}, "additionalProperties": false },
           { "$ref": "List.Filter.Albums" }
         ]
@@ -794,14 +794,14 @@
           { "type": "object", "properties": { "genreid": { "$ref": "Library.Id", "required": true, "description": "Song genre. Filter for existence of songs with this genre" } }, "additionalProperties": false },
           { "type": "object", "properties": { "genre": { "type": "string", "minLength": 1, "required": true, "description": "Song genre. Filter for existence of songs with this genre" } }, "additionalProperties": false },
           { "type": "object", "properties": { "artistid": { "$ref": "Library.Id", "required": true } }, "additionalProperties": false },
-          { "type": "object", "properties": { "artistid": { "$ref": "Library.Id", "required": true }, 
+          { "type": "object", "properties": { "artistid": { "$ref": "Library.Id", "required": true },
                                               "roleid": { "$ref": "Library.Id", "required": true }}, "additionalProperties": false },
-          { "type": "object", "properties": { "artistid": { "$ref": "Library.Id", "required": true }, 
+          { "type": "object", "properties": { "artistid": { "$ref": "Library.Id", "required": true },
                                               "role": { "type": "string", "minLength": 1, "required": true }}, "additionalProperties": false },
           { "type": "object", "properties": { "artist": { "type": "string", "minLength": 1, "required": true } }, "additionalProperties": false },
-          { "type": "object", "properties": { "artist": { "type": "string", "minLength": 1, "required": true }, 
+          { "type": "object", "properties": { "artist": { "type": "string", "minLength": 1, "required": true },
                                               "roleid": { "$ref": "Library.Id", "required": true }}, "additionalProperties": false },
-          { "type": "object", "properties": { "artist": { "type": "string", "minLength": 1, "required": true }, 
+          { "type": "object", "properties": { "artist": { "type": "string", "minLength": 1, "required": true },
                                               "role": { "type": "string", "minLength": 1, "required": true }}, "additionalProperties": false },
           { "type": "object", "properties": { "albumid": { "$ref": "Library.Id", "required": true } }, "additionalProperties": false },
           { "type": "object", "properties": { "album": { "type": "string", "minLength": 1, "required": true } }, "additionalProperties": false },
diff --git a/xbmc/interfaces/json-rpc/schema/types.json b/xbmc/interfaces/json-rpc/schema/types.json
index 094da58855..c8c445a9a4 100644
--- a/xbmc/interfaces/json-rpc/schema/types.json
+++ b/xbmc/interfaces/json-rpc/schema/types.json
@@ -458,7 +458,7 @@
                 "description", "genre", "died", "disbanded",
                 "yearsactive", "musicbrainzartistid", "fanart",
                 "thumbnail", "compilationartist", "dateadded",
-                "roles", "songgenres", "isalbumartist", 
+                "roles", "songgenres", "isalbumartist",
                 "sortname", "type", "gender", "disambiguation", "art"]
     }
   },
@@ -472,7 +472,7 @@
                 "musicbrainzalbumartistid", "fanart", "thumbnail",
                 "playcount", "artistid", "displayartist",
                 "compilation", "releasetype", "dateadded",
-                "sortartist", "musicbrainzreleasegroupid", "songgenres", "art", 
+                "sortartist", "musicbrainzreleasegroupid", "songgenres", "art",
                 "lastplayed"]
     }
   },
@@ -481,12 +481,12 @@
     "items": { "type": "string",
       "description": "Requesting the genreid, artistid and/or albumartistid field will result in increased response times",
       "enum": [ "title", "artist", "albumartist", "genre", "year",
-                "rating", "album", "track", "duration", "comment", 
+                "rating", "album", "track", "duration", "comment",
                 "lyrics", "musicbrainztrackid", "musicbrainzartistid",
                 "musicbrainzalbumid", "musicbrainzalbumartistid",
                 "playcount", "fanart", "thumbnail", "file", "albumid",
                 "lastplayed", "disc", "genreid", "artistid", "displayartist",
-                "albumartistid", "albumreleasetype", "dateadded", 
+                "albumartistid", "albumreleasetype", "dateadded",
                 "votes", "userrating", "mood", "contributors",
                 "displaycomposer", "displayconductor", "displayorchestra", "displaylyricist",
                 "sortartist", "art"]
@@ -645,7 +645,7 @@
                 "playcount", "writer", "studio", "mpaa", "cast", "country",
                 "imdbnumber", "runtime", "set", "showlink", "streamdetails",
                 "top250", "votes", "fanart", "thumbnail", "file", "sorttitle",
-                "resume", "setid", "dateadded", "tag", "art", "userrating",  
+                "resume", "setid", "dateadded", "tag", "art", "userrating",
                 "ratings", "premiered", "uniqueid" ]
     }
   },
@@ -664,7 +664,7 @@
                 "imdbnumber", "premiered", "votes", "lastplayed",
                 "fanart", "thumbnail", "file", "originaltitle",
                 "sorttitle", "episodeguide", "season", "watchedepisodes",
-                "dateadded", "tag", "art", "userrating", "ratings", 
+                "dateadded", "tag", "art", "userrating", "ratings",
                 "runtime", "uniqueid" ]
     }
   },
diff --git a/xbmc/interfaces/legacy/Addon.h b/xbmc/interfaces/legacy/Addon.h
index 7e32630e3f..1f9f6227b5 100644
--- a/xbmc/interfaces/legacy/Addon.h
+++ b/xbmc/interfaces/legacy/Addon.h
@@ -125,7 +125,7 @@ namespace XBMCAddon
       ///-----------------------------------------------------------------------
       /// @python_v13
       /// **id** is optional as it will be auto detected for this add-on instance.
-      ///            
+      ///
       ///
       /// **Example:**
       /// ~~~~~~~~~~~~~{.py}
diff --git a/xbmc/interfaces/legacy/AddonCallback.h b/xbmc/interfaces/legacy/AddonCallback.h
index 173de4599a..5aea10f7c0 100644
--- a/xbmc/interfaces/legacy/AddonCallback.h
+++ b/xbmc/interfaces/legacy/AddonCallback.h
@@ -30,7 +30,7 @@ namespace XBMCAddon
 
   /**
    * This class is the superclass for all API classes that are expected
-   * to be able to handle cross-language polymorphism. 
+   * to be able to handle cross-language polymorphism.
    */
   class AddonCallback : public AddonClass
   {
diff --git a/xbmc/interfaces/legacy/AddonClass.cpp b/xbmc/interfaces/legacy/AddonClass.cpp
index ef74587a83..3dfaf77a04 100644
--- a/xbmc/interfaces/legacy/AddonClass.cpp
+++ b/xbmc/interfaces/legacy/AddonClass.cpp
@@ -42,7 +42,7 @@ namespace XBMCAddon
 #endif
   }
 
-  AddonClass::AddonClass() : refs(0L), m_isDeallocating(false), 
+  AddonClass::AddonClass() : refs(0L), m_isDeallocating(false),
                              languageHook(NULL)
   {
 #ifdef XBMC_ADDON_DEBUG_MEMORY
@@ -67,7 +67,7 @@ namespace XBMCAddon
   void AddonClass::Release() const
   {
     if (isDeleted)
-      CLog::Log(LOGERROR,"NEWADDON REFCNT Releasing dead class %s 0x%lx", 
+      CLog::Log(LOGERROR,"NEWADDON REFCNT Releasing dead class %s 0x%lx",
                 GetClassname(), (long)(((void*)this)));
 
     long ct = --refs;
@@ -85,11 +85,11 @@ namespace XBMCAddon
   void AddonClass::Acquire() const
   {
     if (isDeleted)
-      CLog::Log(LOGERROR,"NEWADDON REFCNT Acquiring dead class %s 0x%lx", 
+      CLog::Log(LOGERROR,"NEWADDON REFCNT Acquiring dead class %s 0x%lx",
                 GetClassname(), (long)(((void*)this)));
 
 #ifdef LOG_LIFECYCLE_EVENTS
-    CLog::Log(LOGDEBUG,"NEWADDON REFCNT incrementing to %ld on %s 0x%lx", 
+    CLog::Log(LOGDEBUG,"NEWADDON REFCNT incrementing to %ld on %s 0x%lx",
               ++refs, GetClassname(), (long)(((void*)this)));
 #else
     ++refs;
@@ -98,4 +98,4 @@ namespace XBMCAddon
 #endif
 }
 
-              
+
diff --git a/xbmc/interfaces/legacy/AddonClass.h b/xbmc/interfaces/legacy/AddonClass.h
index fabcbbb1ed..9ef9205cd5 100644
--- a/xbmc/interfaces/legacy/AddonClass.h
+++ b/xbmc/interfaces/legacy/AddonClass.h
@@ -29,10 +29,10 @@
  */
 //#define LOG_LIFECYCLE_EVENTS
 
-/** 
+/**
  * Defining XBMC_ADDON_DEBUG_MEMORY will make the Acquire and Release
  *  methods virtual allow the developer to overload them in a sub-class
- *  and set breakpoints to aid in debugging. It will also cause the 
+ *  and set breakpoints to aid in debugging. It will also cause the
  *  reference counting mechanism to never actually delete any AddonClass
  *  instance allowing for the tracking of more references to (supposedly)
  *  deallocated classes.
@@ -62,7 +62,7 @@ namespace XBMCAddon
    * It also provides some means for debugging "lifecycle" events (see the above
    *  description of LOG_LIFECYCLE_EVENTS).
    *
-   * If a scripting language bindings require specific handling there is a 
+   * If a scripting language bindings require specific handling there is a
    *  hook to add in these language specifics that can be set here.
    */
   class AddonClass : public CCriticalSection
@@ -119,7 +119,7 @@ namespace XBMCAddon
     static short getNumAddonClasses();
 
 #ifdef XBMC_ADDON_DEBUG_MEMORY
-    virtual 
+    virtual
 #else
     inline
 #endif
@@ -139,7 +139,7 @@ namespace XBMCAddon
 
 
 #ifdef XBMC_ADDON_DEBUG_MEMORY
-    virtual 
+    virtual
 #else
     inline
 #endif
@@ -147,7 +147,7 @@ namespace XBMCAddon
 #ifndef XBMC_ADDON_DEBUG_MEMORY
     {
 #ifdef LOG_LIFECYCLE_EVENTS
-      CLog::Log(LOGDEBUG,"NEWADDON REFCNT incrementing to %ld on %s 0x%lx", 
+      CLog::Log(LOGDEBUG,"NEWADDON REFCNT incrementing to %ld on %s 0x%lx",
                 ++refs, GetClassname(), (long)(((void*)this)));
 #else
       ++refs;
diff --git a/xbmc/interfaces/legacy/AddonUtils.cpp b/xbmc/interfaces/legacy/AddonUtils.cpp
index 7611d1b641..b7522d324c 100644
--- a/xbmc/interfaces/legacy/AddonUtils.cpp
+++ b/xbmc/interfaces/legacy/AddonUtils.cpp
@@ -102,17 +102,17 @@ namespace XBMCAddonUtils
 
   const char* TraceGuard::getSpaces() { return spaces[depth]; }
 
-  TraceGuard::TraceGuard(const char* _function) :function(_function) 
+  TraceGuard::TraceGuard(const char* _function) :function(_function)
   {
     parent = tlParent;
     depth = parent == NULL ? 0 : parent->depth + 1;
 
     tlParent = this;
 
-    CLog::Log(LOGDEBUG, "%sNEWADDON Entering %s", spaces[depth], function); 
+    CLog::Log(LOGDEBUG, "%sNEWADDON Entering %s", spaces[depth], function);
   }
 
-  TraceGuard::TraceGuard() :function(NULL) 
+  TraceGuard::TraceGuard() :function(NULL)
   {
     parent = tlParent;
     depth = parent == NULL ? 0 : parent->depth + 1;
@@ -120,7 +120,7 @@ namespace XBMCAddonUtils
     // silent
   }
 
-  TraceGuard::~TraceGuard() 
+  TraceGuard::~TraceGuard()
   {
     if (function)
       CLog::Log(LOGDEBUG, "%sNEWADDON Leaving %s", spaces[depth], function);
diff --git a/xbmc/interfaces/legacy/CallbackFunction.h b/xbmc/interfaces/legacy/CallbackFunction.h
index 1d2d17acf2..d23ced31d8 100644
--- a/xbmc/interfaces/legacy/CallbackFunction.h
+++ b/xbmc/interfaces/legacy/CallbackFunction.h
@@ -30,12 +30,12 @@ namespace XBMCAddon
    *   functor (functoid?) for a call to a member function.</p>
    *
    * <p>This class combined with the attending CallbackHandlers should make
-   *  sure that the AddonClass isn't in the midst of deallocating when 
+   *  sure that the AddonClass isn't in the midst of deallocating when
    *  the callback executes. In this way the Callback class acts as
    *  a weak reference.</p>
    */
-  class Callback : public AddonClass 
-  { 
+  class Callback : public AddonClass
+  {
   protected:
     AddonClass* addonClassObject;
     explicit Callback(AddonClass* _object) : addonClassObject(_object) { XBMC_TRACE; }
@@ -50,17 +50,17 @@ namespace XBMCAddon
   struct cb_null_type {};
 
   // stub type template to be partial specialized
-  template<typename M = cb_null_type, typename T1 = cb_null_type, 
-           typename T2 = cb_null_type, typename T3 = cb_null_type, 
-           typename T4 = cb_null_type, typename Extraneous = cb_null_type> 
+  template<typename M = cb_null_type, typename T1 = cb_null_type,
+           typename T2 = cb_null_type, typename T3 = cb_null_type,
+           typename T4 = cb_null_type, typename Extraneous = cb_null_type>
   class CallbackFunction {};
-  
+
   /**
    * This is the template to carry a callback to a member function
    *  that returns 'void' (has no return) and takes no parameters.
    */
   template<class M> class CallbackFunction<M, cb_null_type, cb_null_type, cb_null_type, cb_null_type, cb_null_type> : public Callback
-  { 
+  {
   public:
     typedef void (M::*MemberFunction)();
 
@@ -69,7 +69,7 @@ namespace XBMCAddon
     M* obj;
 
   public:
-    CallbackFunction(M* object, MemberFunction method) : 
+    CallbackFunction(M* object, MemberFunction method) :
       Callback(object), meth(method), obj(object) { XBMC_TRACE; }
 
     ~CallbackFunction() override { XBMC_TRACE; deallocating(); }
@@ -82,7 +82,7 @@ namespace XBMCAddon
    *  that returns 'void' (has no return) and takes one parameter.
    */
   template<class M, typename P1> class CallbackFunction<M,P1, cb_null_type, cb_null_type, cb_null_type, cb_null_type> : public Callback
-  { 
+  {
   public:
     typedef void (M::*MemberFunction)(P1);
 
@@ -92,7 +92,7 @@ namespace XBMCAddon
     P1 param;
 
   public:
-    CallbackFunction(M* object, MemberFunction method, P1 parameter) : 
+    CallbackFunction(M* object, MemberFunction method, P1 parameter) :
       Callback(object), meth(method), obj(object),
       param(parameter) { XBMC_TRACE; }
 
@@ -107,7 +107,7 @@ namespace XBMCAddon
    *  that can be held in an AddonClass::Ref
    */
   template<class M, typename P1> class CallbackFunction<M,AddonClass::Ref<P1>, cb_null_type, cb_null_type, cb_null_type, cb_null_type> : public Callback
-  { 
+  {
   public:
     typedef void (M::*MemberFunction)(P1*);
 
@@ -117,7 +117,7 @@ namespace XBMCAddon
     AddonClass::Ref<P1> param;
 
   public:
-    CallbackFunction(M* object, MemberFunction method, P1* parameter) : 
+    CallbackFunction(M* object, MemberFunction method, P1* parameter) :
       Callback(object), meth(method), obj(object),
       param(parameter) { XBMC_TRACE; }
 
@@ -132,7 +132,7 @@ namespace XBMCAddon
    *  that returns 'void' (has no return) and takes two parameters.
    */
   template<class M, typename P1, typename P2> class CallbackFunction<M,P1,P2, cb_null_type, cb_null_type, cb_null_type> : public Callback
-  { 
+  {
   public:
     typedef void (M::*MemberFunction)(P1,P2);
 
@@ -143,7 +143,7 @@ namespace XBMCAddon
     P2 param2;
 
   public:
-    CallbackFunction(M* object, MemberFunction method, P1 parameter, P2 parameter2) : 
+    CallbackFunction(M* object, MemberFunction method, P1 parameter, P2 parameter2) :
       Callback(object), meth(method), obj(object),
       param1(parameter), param2(parameter2) { XBMC_TRACE; }
 
@@ -170,7 +170,7 @@ namespace XBMCAddon
     P3 param3;
 
   public:
-    CallbackFunction(M* object, MemberFunction method, P1 parameter, P2 parameter2, P3 parameter3) : 
+    CallbackFunction(M* object, MemberFunction method, P1 parameter, P2 parameter2, P3 parameter3) :
       Callback(object), meth(method), obj(object),
       param1(parameter), param2(parameter2), param3(parameter3) { XBMC_TRACE; }
 
diff --git a/xbmc/interfaces/legacy/CallbackHandler.cpp b/xbmc/interfaces/legacy/CallbackHandler.cpp
index 72743f19a6..5912547205 100644
--- a/xbmc/interfaces/legacy/CallbackHandler.cpp
+++ b/xbmc/interfaces/legacy/CallbackHandler.cpp
@@ -98,8 +98,8 @@ namespace XBMCAddon
 
           // make sure the object is not deallocating
 
-          // we need to grab the object lock to see if the object of the call 
-          //  is deallocating. holding this lock should prevent it from 
+          // we need to grab the object lock to see if the object of the call
+          //  is deallocating. holding this lock should prevent it from
           //  deallocating during the execution of this call.
 #ifdef ENABLE_XBMC_TRACE_API
           CLog::Log(LOGDEBUG,"%sNEWADDON executing callback 0x%lx",_tg.getSpaces(),(long)(p->cb.get()));
@@ -124,13 +124,13 @@ namespace XBMCAddon
 
         // since the state of the iterator may have been corrupted by
         //  the changing state of the list from another thread during
-        //  the releasing fo the lock in the immediately preceeding 
+        //  the releasing fo the lock in the immediately preceeding
         //  codeblock, we need to reset it before continuing the loop
         iter = g_callQueue.begin();
       }
       else // if we're not in the right thread for this callback...
         ++iter;
-    }  
+    }
   }
 
   void RetardedAsyncCallbackHandler::clearPendingCalls(void* userData)
diff --git a/xbmc/interfaces/legacy/CallbackHandler.h b/xbmc/interfaces/legacy/CallbackHandler.h
index 03f425b0e2..d30d8ee47e 100644
--- a/xbmc/interfaces/legacy/CallbackHandler.h
+++ b/xbmc/interfaces/legacy/CallbackHandler.h
@@ -41,7 +41,7 @@ namespace XBMCAddon
 
   /**
    * This class is primarily for Python support (hence the "Retarded"
-   *  prefix). Python (et. al. Retarded languages) require that 
+   *  prefix). Python (et. al. Retarded languages) require that
    *  the context within which a callback executes is under the control
    *  of the language. Therefore, this handler is used to queue
    *  messages over to a language controlled thread for eventual
diff --git a/xbmc/interfaces/legacy/Control.cpp b/xbmc/interfaces/legacy/Control.cpp
index ad6c90eb09..80e4eabb07 100644
--- a/xbmc/interfaces/legacy/Control.cpp
+++ b/xbmc/interfaces/legacy/Control.cpp
@@ -533,7 +533,7 @@ namespace XBMCAddon
                                            const char* _disabledColor, long angle,
                                            const char* _shadowColor, const char* _focusedColor,
                                            const char* disabledOnTexture, const char* disabledOffTexture) :
-      strFont("font13"), textColor(0xffffffff), disabledColor(0x60ffffff), 
+      strFont("font13"), textColor(0xffffffff), disabledColor(0x60ffffff),
       textOffsetX(_textOffsetX), textOffsetY(_textOffsetY), align(alignment), iAngle(angle),
       shadowColor(0), focusedColor(0xffffffff)
     {
@@ -662,7 +662,7 @@ namespace XBMCAddon
         CTextureInfo(strTextureRadioOnNoFocus),
         CTextureInfo(strTextureRadioOffFocus),
         CTextureInfo(strTextureRadioOffNoFocus),
-        CTextureInfo(strTextureRadioOnDisabled), 
+        CTextureInfo(strTextureRadioOnDisabled),
         CTextureInfo(strTextureRadioOffDisabled));
 
       CGUIRadioButtonControl* pGuiButtonControl =
@@ -893,10 +893,10 @@ namespace XBMCAddon
       strTextureDownDisabled = XBMCAddonUtils::getDefaultImage((char*)"listcontrol", (char*)"texturedowndisabled");
     }
 
-    void ControlSpin::setTextures(const char* up, const char* down, 
-                                  const char* upFocus, 
+    void ControlSpin::setTextures(const char* up, const char* down,
+                                  const char* upFocus,
                                   const char* downFocus,
-                                  const char* upDisabled, 
+                                  const char* upDisabled,
                                   const char* downDisabled)
     {
       strTextureUp = up;
diff --git a/xbmc/interfaces/legacy/Control.h b/xbmc/interfaces/legacy/Control.h
index 9cd193b744..0ea5568403 100644
--- a/xbmc/interfaces/legacy/Control.h
+++ b/xbmc/interfaces/legacy/Control.h
@@ -712,8 +712,8 @@ namespace XBMCAddon
       ///
       setTextures(...);
 #else
-      virtual void setTextures(const char* up, const char* down, 
-                               const char* upFocus, 
+      virtual void setTextures(const char* up, const char* down,
+                               const char* upFocus,
                                const char* downFocus,
                                const char* upDisabled, const char* downDisabled);
 #endif
@@ -741,7 +741,7 @@ namespace XBMCAddon
     /// \ingroup python_xbmcgui_control
     /// @{
     /// @brief **Used to show some lines of text.**
-    /// 
+    ///
     /// \python_class{ ControlLabel(x, y, width, height, label[, font, textColor,
     ///                             disabledColor, alignment, hasPath, angle]) }
     ///
@@ -793,9 +793,9 @@ namespace XBMCAddon
     {
     public:
       ControlLabel(long x, long y, long width, long height, const String& label,
-                  const char* font = NULL, const char* textColor = NULL, 
+                  const char* font = NULL, const char* textColor = NULL,
                   const char* disabledColor = NULL,
-                  long alignment = XBFONT_LEFT, 
+                  long alignment = XBFONT_LEFT,
                   bool hasPath = false, long angle = 0);
 
       ~ControlLabel() override;
@@ -854,7 +854,7 @@ namespace XBMCAddon
       ///
       setLabel(...);
 #else
-      virtual void setLabel(const String& label = emptyString, 
+      virtual void setLabel(const String& label = emptyString,
                             const char* font = NULL,
                             const char* textColor = NULL,
                             const char* disabledColor = NULL,
@@ -864,7 +864,7 @@ namespace XBMCAddon
 #endif
 
 #ifndef SWIG
-      ControlLabel() : 
+      ControlLabel() :
         bHasPath(false),
         iAngle  (0)
       {}
@@ -944,7 +944,7 @@ namespace XBMCAddon
     {
     public:
       ControlEdit(long x, long y, long width, long height, const String& label,
-                  const char* font = NULL, const char* textColor = NULL, 
+                  const char* font = NULL, const char* textColor = NULL,
                   const char* disabledColor = NULL,
                   long _alignment = XBFONT_LEFT, const char* focusTexture = NULL,
                   const char* noFocusTexture = NULL, bool isPassword = false);
@@ -982,7 +982,7 @@ namespace XBMCAddon
       ///
       setLabel(...);
 #else
-      virtual void setLabel(const String& label = emptyString, 
+      virtual void setLabel(const String& label = emptyString,
                             const char* font = NULL,
                             const char* textColor = NULL,
                             const char* disabledColor = NULL,
@@ -1193,7 +1193,7 @@ namespace XBMCAddon
                   const char* buttonFocusTexture = NULL,
                   const char* selectedColor = NULL,
                   long _imageWidth=10, long _imageHeight=10, long _itemTextXOffset = CONTROL_TEXT_OFFSET_X,
-                  long _itemTextYOffset = CONTROL_TEXT_OFFSET_Y, long _itemHeight = 27, long _space = 2, 
+                  long _itemTextYOffset = CONTROL_TEXT_OFFSET_Y, long _itemHeight = 27, long _space = 2,
                   long _alignmentY = XBFONT_CENTER_Y);
 
       ~ControlList() override;
@@ -1622,7 +1622,7 @@ namespace XBMCAddon
 #ifndef SWIG
       void sendLabelBind(int tail);
 
-      SWIGHIDDENVIRTUAL bool canAcceptMessages(int actionId) override 
+      SWIGHIDDENVIRTUAL bool canAcceptMessages(int actionId) override
       { return ((actionId == ACTION_SELECT_ITEM) | (actionId == ACTION_MOUSE_LEFT_CLICK)); }
 
       // This is called from AddonWindow.cpp but shouldn't be available
@@ -1716,9 +1716,9 @@ namespace XBMCAddon
     class ControlFadeLabel : public Control
     {
     public:
-      ControlFadeLabel(long x, long y, long width, long height, 
-                       const char* font = NULL, 
-                       const char* textColor = NULL, 
+      ControlFadeLabel(long x, long y, long width, long height,
+                       const char* font = NULL,
+                       const char* textColor = NULL,
                        long _alignment = XBFONT_LEFT);
 
       // addLabel() Method
@@ -1845,8 +1845,8 @@ namespace XBMCAddon
     class ControlTextBox : public Control
     {
     public:
-      ControlTextBox(long x, long y, long width, long height, 
-                     const char* font = NULL, 
+      ControlTextBox(long x, long y, long width, long height,
+                     const char* font = NULL,
                      const char* textColor = NULL);
 
       // SetText() Method
@@ -2036,7 +2036,7 @@ namespace XBMCAddon
     class ControlImage : public Control
     {
     public:
-      ControlImage(long x, long y, long width, long height, 
+      ControlImage(long x, long y, long width, long height,
                    const char* filename, long aspectRatio = 0,
                    const char* colorDiffuse = NULL);
 
@@ -2178,7 +2178,7 @@ namespace XBMCAddon
     class ControlProgress : public Control
     {
     public:
-      ControlProgress(long x, long y, long width, long height, 
+      ControlProgress(long x, long y, long width, long height,
                       const char* texturebg = NULL,
                       const char* textureleft = NULL,
                       const char* texturemid = NULL,
@@ -2328,10 +2328,10 @@ namespace XBMCAddon
     {
     public:
       ControlButton(long x, long y, long width, long height, const String& label,
-                    const char* focusTexture = NULL, const char* noFocusTexture = NULL, 
-                    long textOffsetX = CONTROL_TEXT_OFFSET_X, 
-                    long textOffsetY = CONTROL_TEXT_OFFSET_Y, 
-                    long alignment = (XBFONT_LEFT | XBFONT_CENTER_Y), 
+                    const char* focusTexture = NULL, const char* noFocusTexture = NULL,
+                    long textOffsetX = CONTROL_TEXT_OFFSET_X,
+                    long textOffsetY = CONTROL_TEXT_OFFSET_Y,
+                    long alignment = (XBFONT_LEFT | XBFONT_CENTER_Y),
                     const char* font = NULL, const char* textColor = NULL,
                     const char* disabledColor = NULL, long angle = 0,
                     const char* shadowColor = NULL, const char* focusedColor = NULL);
@@ -2369,7 +2369,7 @@ namespace XBMCAddon
       ///
       setLabel(...);
 #else
-      virtual void setLabel(const String& label = emptyString, 
+      virtual void setLabel(const String& label = emptyString,
                             const char* font = NULL,
                             const char* textColor = NULL,
                             const char* disabledColor = NULL,
@@ -2620,9 +2620,9 @@ namespace XBMCAddon
                          const char* focusOnTexture = NULL, const char* noFocusOnTexture = NULL,
                          const char* focusOffTexture = NULL, const char* noFocusOffTexture = NULL,
                          const char* focusTexture = NULL, const char* noFocusTexture = NULL,
-                         long textOffsetX = CONTROL_TEXT_OFFSET_X, 
-                         long textOffsetY = CONTROL_TEXT_OFFSET_Y, 
-                         long _alignment = (XBFONT_LEFT | XBFONT_CENTER_Y), 
+                         long textOffsetX = CONTROL_TEXT_OFFSET_X,
+                         long textOffsetY = CONTROL_TEXT_OFFSET_Y,
+                         long _alignment = (XBFONT_LEFT | XBFONT_CENTER_Y),
                          const char* font = NULL, const char* textColor = NULL,
                          const char* disabledColor = NULL, long angle = 0,
                          const char* shadowColor = NULL, const char* focusedColor = NULL,
@@ -2723,7 +2723,7 @@ namespace XBMCAddon
       ///
       setLabel(...);
 #else
-      virtual void setLabel(const String& label = emptyString, 
+      virtual void setLabel(const String& label = emptyString,
                             const char* font = NULL,
                             const char* textColor = NULL,
                             const char* disabledColor = NULL,
@@ -2781,7 +2781,7 @@ namespace XBMCAddon
       UTILS::Color textColor;
       UTILS::Color disabledColor;
       int textOffsetX;
-      int textOffsetY; 
+      int textOffsetY;
      uint32_t align;
       int iAngle;
       UTILS::Color shadowColor;
@@ -2841,8 +2841,8 @@ namespace XBMCAddon
     class ControlSlider : public Control
     {
     public:
-      ControlSlider(long x, long y, long width, long height, 
-                    const char* textureback = NULL, 
+      ControlSlider(long x, long y, long width, long height,
+                    const char* textureback = NULL,
                     const char* texture = NULL,
                     const char* texturefocus = NULL, int orientation = 1);
 
diff --git a/xbmc/interfaces/legacy/Dialog.cpp b/xbmc/interfaces/legacy/Dialog.cpp
index 84724351f4..788a65266c 100644
--- a/xbmc/interfaces/legacy/Dialog.cpp
+++ b/xbmc/interfaces/legacy/Dialog.cpp
@@ -56,7 +56,7 @@ namespace XBMCAddon
   {
     Dialog::~Dialog() = default;
 
-    bool Dialog::yesno(const String& heading, const String& line1, 
+    bool Dialog::yesno(const String& heading, const String& line1,
                        const String& line2,
                        const String& line3,
                        const String& nolabel,
@@ -180,7 +180,7 @@ namespace XBMCAddon
         return std::unique_ptr<std::vector<int>>();
     }
 
-    bool Dialog::ok(const String& heading, const String& line1, 
+    bool Dialog::ok(const String& heading, const String& line1,
                     const String& line2,
                     const String& line3)
     {
@@ -204,8 +204,8 @@ namespace XBMCAddon
     }
 
 
-    Alternative<String, std::vector<String> > Dialog::browse(int type, const String& heading, 
-                                const String& s_shares, const String& maskparam, bool useThumbs, 
+    Alternative<String, std::vector<String> > Dialog::browse(int type, const String& heading,
+                                const String& s_shares, const String& maskparam, bool useThumbs,
                                 bool useFileDirectories, const String& defaultt,
                                 bool enableMultiple)
     {
@@ -218,15 +218,15 @@ namespace XBMCAddon
     }
 
     String Dialog::browseSingle(int type, const String& heading, const String& s_shares,
-                                const String& maskparam, bool useThumbs, 
-                                bool useFileDirectories, 
+                                const String& maskparam, bool useThumbs,
+                                bool useFileDirectories,
                                 const String& defaultt )
     {
       DelayedCallGuard dcguard(languageHook);
       std::string value;
       std::string mask = maskparam;
       VECSOURCES *shares = CMediaSourceSettings::GetInstance().GetSources(s_shares);
-      if (!shares) 
+      if (!shares)
         throw WindowException("Error: GetSources given %s is NULL.",s_shares.c_str());
 
       if (useFileDirectories && !maskparam.empty())
@@ -243,14 +243,14 @@ namespace XBMCAddon
     }
 
     std::vector<String> Dialog::browseMultiple(int type, const String& heading, const String& s_shares,
-                          const String& mask, bool useThumbs, 
+                          const String& mask, bool useThumbs,
                           bool useFileDirectories, const String& defaultt )
     {
       DelayedCallGuard dcguard(languageHook);
       VECSOURCES *shares = CMediaSourceSettings::GetInstance().GetSources(s_shares);
       std::vector<String> valuelist;
       String lmask = mask;
-      if (!shares) 
+      if (!shares)
         throw WindowException("Error: GetSources given %s is NULL.",s_shares.c_str());
 
       if (useFileDirectories && !lmask.empty())
@@ -329,7 +329,7 @@ namespace XBMCAddon
         iTime = time;
       if (!icon.empty())
         strIcon = icon;
-      
+
       if (strIcon == getNOTIFICATION_INFO())
         CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Info, heading, message, iTime, sound);
       else if (strIcon == getNOTIFICATION_WARNING())
@@ -339,7 +339,7 @@ namespace XBMCAddon
       else
         CGUIDialogKaiToast::QueueNotification(strIcon, heading, message, iTime, sound);
     }
-    
+
     String Dialog::input(const String& heading, const String& defaultt, int type, int option, int autoclose)
     {
       DelayedCallGuard dcguard(languageHook);
@@ -431,7 +431,7 @@ namespace XBMCAddon
       }
     }
 
-    void DialogProgress::create(const String& heading, const String& line1, 
+    void DialogProgress::create(const String& heading, const String& line1,
                                 const String& line2,
                                 const String& line3)
     {
@@ -456,7 +456,7 @@ namespace XBMCAddon
       pDialog->Open();
     }
 
-    void DialogProgress::update(int percent, const String& line1, 
+    void DialogProgress::update(int percent, const String& line1,
                                 const String& line2,
                                 const String& line3)
     {
@@ -538,7 +538,7 @@ namespace XBMCAddon
     void DialogProgressBG::create(const String& heading, const String& message)
     {
       DelayedCallGuard dcguard(languageHook);
-      CGUIDialogExtendedProgressBar* pDialog = 
+      CGUIDialogExtendedProgressBar* pDialog =
           CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIDialogExtendedProgressBar>(WINDOW_DIALOG_EXT_PROGRESS);
 
       if (pDialog == NULL)
diff --git a/xbmc/interfaces/legacy/Dialog.h b/xbmc/interfaces/legacy/Dialog.h
index 74915430bc..205e5867c2 100644
--- a/xbmc/interfaces/legacy/Dialog.h
+++ b/xbmc/interfaces/legacy/Dialog.h
@@ -98,7 +98,7 @@ namespace XBMCAddon
       ///
       yesno(...);
 #else
-      bool yesno(const String& heading, const String& line1, 
+      bool yesno(const String& heading, const String& line1,
                  const String& line2 = emptyString,
                  const String& line3 = emptyString,
                  const String& nolabel = emptyString,
@@ -410,8 +410,8 @@ namespace XBMCAddon
       browseSingle(...);
 #else
       String browseSingle(int type, const String& heading, const String& shares,
-                          const String& mask = emptyString, bool useThumbs = false, 
-                          bool treatAsFolder = false, 
+                          const String& mask = emptyString, bool useThumbs = false,
+                          bool treatAsFolder = false,
                           const String& defaultt = emptyString );
 #endif
 
@@ -457,8 +457,8 @@ namespace XBMCAddon
       browseMultiple(...);
 #else
       std::vector<String> browseMultiple(int type, const String& heading, const String& shares,
-                                         const String& mask = emptyString, bool useThumbs = false, 
-                                         bool treatAsFolder = false, 
+                                         const String& mask = emptyString, bool useThumbs = false,
+                                         bool treatAsFolder = false,
                                          const String& defaultt = emptyString );
 #endif
 
@@ -638,7 +638,7 @@ namespace XBMCAddon
       ///
       create(...);
 #else
-      void create(const String& heading, const String& line1 = emptyString, 
+      void create(const String& heading, const String& line1 = emptyString,
                   const String& line2 = emptyString,
                   const String& line3 = emptyString);
 #endif
@@ -670,7 +670,7 @@ namespace XBMCAddon
       ///
       update(...);
 #else
-      void update(int percent, const String& line1 = emptyString, 
+      void update(int percent, const String& line1 = emptyString,
                   const String& line2 = emptyString,
                   const String& line3 = emptyString);
 #endif
diff --git a/xbmc/interfaces/legacy/Dictionary.h b/xbmc/interfaces/legacy/Dictionary.h
index 024f6be505..ef2d88fade 100644
--- a/xbmc/interfaces/legacy/Dictionary.h
+++ b/xbmc/interfaces/legacy/Dictionary.h
@@ -35,7 +35,7 @@ namespace XBMCAddon
    * cases python addon api calls handle dictionaries with variable
    * value types. In this case we coerce all of these types into
    * strings and then convert them back in the api. Yes, this is messy
-   * and maybe we should use the CVariant here. But for now the 
+   * and maybe we should use the CVariant here. But for now the
    * native api handles these calls by converting the string to the
    * appropriate types.
    */
diff --git a/xbmc/interfaces/legacy/DrmCryptoSession.h b/xbmc/interfaces/legacy/DrmCryptoSession.h
index 1a2e98baca..6e2270f91c 100644
--- a/xbmc/interfaces/legacy/DrmCryptoSession.h
+++ b/xbmc/interfaces/legacy/DrmCryptoSession.h
@@ -51,7 +51,7 @@ namespace XBMCAddon
     /// @param cipherAlgorithm  String algorithm used for en- / decryption
     /// @param macAlgorithm     String algorithm used for sign / verify
     ///
-    /// @throws RuntimeException if the session can not be established 
+    /// @throws RuntimeException if the session can not be established
     ///
     //
     class CryptoSession : public AddonClass
diff --git a/xbmc/interfaces/legacy/Exception.h b/xbmc/interfaces/legacy/Exception.h
index a758e2076a..47b1aa5679 100644
--- a/xbmc/interfaces/legacy/Exception.h
+++ b/xbmc/interfaces/legacy/Exception.h
@@ -29,18 +29,18 @@ namespace XBMCAddon
   XBMCCOMMONS_STANDARD_EXCEPTION(WrongTypeException);
 
   /**
-   * UnimplementedException Can be used in places like the 
+   * UnimplementedException Can be used in places like the
    *  Control hierarchy where the
-   *  requirements of dynamic language usage force us to add 
-   *  unimplemented methods to a class hierarchy. See the 
+   *  requirements of dynamic language usage force us to add
+   *  unimplemented methods to a class hierarchy. See the
    *  detailed explanation on the class Control for more.
    */
   class UnimplementedException : public XbmcCommons::Exception
   {
   public:
     inline UnimplementedException(const UnimplementedException& other) : Exception(other) { }
-    inline UnimplementedException(const char* classname, const char* methodname) : 
-      Exception("UnimplementedException") 
+    inline UnimplementedException(const char* classname, const char* methodname) :
+      Exception("UnimplementedException")
     { SetMessage("Unimplemented method: %s::%s(...)", classname, methodname); }
   };
 
@@ -52,15 +52,15 @@ namespace XBMCAddon
   {
   public:
     inline UnhandledException(const UnhandledException& other) : Exception(other) { }
-    inline UnhandledException(const char* _message,...) : Exception("UnhandledException") { XBMCCOMMONS_COPYVARARGS(_message); } 
+    inline UnhandledException(const char* _message,...) : Exception("UnhandledException") { XBMCCOMMONS_COPYVARARGS(_message); }
   };
 }
 #endif
 
 /**
- * These macros allow the easy declaration (and definition) of parent 
+ * These macros allow the easy declaration (and definition) of parent
  *  class virtual methods that are not implemented until the child class.
- *  This is to support the idosyncracies of dynamically typed scripting 
+ *  This is to support the idosyncracies of dynamically typed scripting
  *  languages. See the comment in AddonControl.h for more details.
  */
 #define THROW_UNIMP(classname) throw UnimplementedException(classname, __FUNCTION__)
diff --git a/xbmc/interfaces/legacy/File.cpp b/xbmc/interfaces/legacy/File.cpp
index 361479aa23..8bc27b2847 100644
--- a/xbmc/interfaces/legacy/File.cpp
+++ b/xbmc/interfaces/legacy/File.cpp
@@ -31,7 +31,7 @@ namespace XBMCAddon
       if ((!numBytes || (((int64_t)numBytes) > size)) && (size >= 0))
         numBytes = (unsigned long) size;
 
-      
+
       XbmcCommons::Buffer ret(numBytes);
 
       if (numBytes == 0)
diff --git a/xbmc/interfaces/legacy/Keyboard.cpp b/xbmc/interfaces/legacy/Keyboard.cpp
index 37fbdc46e6..3075c747d3 100644
--- a/xbmc/interfaces/legacy/Keyboard.cpp
+++ b/xbmc/interfaces/legacy/Keyboard.cpp
@@ -32,7 +32,7 @@ namespace XBMCAddon
   namespace xbmc
   {
 
-    Keyboard::Keyboard(const String& line /* = nullString*/, const String& heading/* = nullString*/, bool hidden/* = false*/) 
+    Keyboard::Keyboard(const String& line /* = nullString*/, const String& heading/* = nullString*/, bool hidden/* = false*/)
       : strDefault(line), strHeading(heading), bHidden(hidden), bConfirmed(false)
     {
     }
diff --git a/xbmc/interfaces/legacy/LanguageHook.h b/xbmc/interfaces/legacy/LanguageHook.h
index 7814536cab..e7be3ac072 100644
--- a/xbmc/interfaces/legacy/LanguageHook.h
+++ b/xbmc/interfaces/legacy/LanguageHook.h
@@ -48,24 +48,24 @@ namespace XBMCAddon
     ~LanguageHook() override;
 
     /**
-     * If the scripting language needs special handling for calls 
+     * If the scripting language needs special handling for calls
      *  that block or are delayed in any other means, this should
      *  be overloaded.
      *
      * In Python when control is passed to a native
-     *  method that blocks, you need to allow other threads in 
+     *  method that blocks, you need to allow other threads in
      *  Python to run by using Py_BEGIN_ALLOW_THREADS. This is
      *  the place to put that functionality
      */
     virtual void DelayedCallOpen() { }
 
     /**
-     * If the scripting language needs special handling for calls 
+     * If the scripting language needs special handling for calls
      *  that block or are delayed in any other means, this should
      *  be overloaded.
      *
      * In Python when control is passed to a native
-     *  method that blocks, you need to allow other threads in 
+     *  method that blocks, you need to allow other threads in
      *  Python to run by using Py_BEGIN_ALLOW_THREADS. When that
      *  delayed method ends you need to restore the Python thread
      *  state using Py_END_ALLOW_THREADS. This is the place to put
@@ -106,7 +106,7 @@ namespace XBMCAddon
      *
      * Currently (for python) the scripting language has the Addon id injected
      *  into it as a global variable. Therefore the only way to retrieve it is
-     *  to use scripting language specific calls. So until I figure out a 
+     *  to use scripting language specific calls. So until I figure out a
      *  better way to do this, this is how I need to retrieve it.
      */
     virtual String GetAddonId() { return emptyString; }
@@ -126,10 +126,10 @@ namespace XBMCAddon
 
   /**
    * This class can be used to access the language hook's DelayedCallOpen
-   *  and DelayedCallClose. It should be used whenever an API method 
+   *  and DelayedCallClose. It should be used whenever an API method
    *  is written such that it can block for an indefinite amount of time
-   *  since certain scripting languages (like Python) need to do extra 
-   *  work for delayed calls (like free the python locks and handle 
+   *  since certain scripting languages (like Python) need to do extra
+   *  work for delayed calls (like free the python locks and handle
    *  callbacks).
    */
   class DelayedCallGuard
@@ -141,7 +141,7 @@ namespace XBMCAddon
     inline explicit DelayedCallGuard(LanguageHook* languageHook_) : languageHook(languageHook_), clearOnExit(false)
     { if (languageHook) languageHook->DelayedCallOpen(); }
 
-    inline DelayedCallGuard() : languageHook(LanguageHook::GetLanguageHook()), clearOnExit(false) 
+    inline DelayedCallGuard() : languageHook(LanguageHook::GetLanguageHook()), clearOnExit(false)
     { if (languageHook) languageHook->DelayedCallOpen(); }
 
     inline ~DelayedCallGuard()
@@ -159,6 +159,6 @@ namespace XBMCAddon
     inline explicit SetLanguageHookGuard(LanguageHook* languageHook) { LanguageHook::SetLanguageHook(languageHook); }
     inline ~SetLanguageHookGuard() { LanguageHook::ClearLanguageHook(); }
   };
-  
+
 }
 
diff --git a/xbmc/interfaces/legacy/ListItem.cpp b/xbmc/interfaces/legacy/ListItem.cpp
index e71aa58a9e..f0093d5693 100644
--- a/xbmc/interfaces/legacy/ListItem.cpp
+++ b/xbmc/interfaces/legacy/ListItem.cpp
@@ -39,7 +39,7 @@ namespace XBMCAddon
 {
   namespace xbmcgui
   {
-    ListItem::ListItem(const String& label, 
+    ListItem::ListItem(const String& label,
                        const String& label2,
                        const String& iconImage,
                        const String& thumbnailImage,
@@ -412,7 +412,7 @@ namespace XBMCAddon
             videotag.m_cast.clear();
             for (const auto& castEntry: alt.later())
             {
-              // castEntry can be a string meaning it's the actor or it can be a tuple meaning it's the 
+              // castEntry can be a string meaning it's the actor or it can be a tuple meaning it's the
               //  actor and the role.
               const String& actor = castEntry.which() == first ? castEntry.former() : castEntry.later().first();
               SActorInfo info;
@@ -426,7 +426,7 @@ namespace XBMCAddon
           {
             if (alt.which() != second)
               throw WrongTypeException("When using \"artist\" you need to supply a list of strings for the value in the dictionary");
-            
+
             videotag.m_artist.clear();
 
             for (const auto& castEntry: alt.later())
@@ -864,7 +864,7 @@ namespace XBMCAddon
           value = alt.former();
         return StringUtils::Split(value, g_advancedSettings.m_videoItemSeparator);
       }
-      
+
       std::vector<std::string> els;
       for (const auto& el : alt.later())
       {
diff --git a/xbmc/interfaces/legacy/ModuleXbmc.cpp b/xbmc/interfaces/legacy/ModuleXbmc.cpp
index e4e65955d6..eb233e1907 100644
--- a/xbmc/interfaces/legacy/ModuleXbmc.cpp
+++ b/xbmc/interfaces/legacy/ModuleXbmc.cpp
@@ -354,7 +354,7 @@ namespace XBMCAddon
       DelayedCallGuard dg;
       g_audioManager.Stop();
     }
-    
+
     void enableNavSounds(bool yesNo)
     {
       XBMC_TRACE;
@@ -576,7 +576,7 @@ namespace XBMCAddon
     int getLOGNONE() { return LOGNONE; }
 
     // language string formats
-    int getISO_639_1() { return CLangCodeExpander::ISO_639_1; } 
+    int getISO_639_1() { return CLangCodeExpander::ISO_639_1; }
     int getISO_639_2(){ return CLangCodeExpander::ISO_639_2; }
     int getENGLISH_NAME() { return CLangCodeExpander::ENGLISH_NAME; }
 
diff --git a/xbmc/interfaces/legacy/ModuleXbmcplugin.cpp b/xbmc/interfaces/legacy/ModuleXbmcplugin.cpp
index 874e9995d4..55fbe477a6 100644
--- a/xbmc/interfaces/legacy/ModuleXbmcplugin.cpp
+++ b/xbmc/interfaces/legacy/ModuleXbmcplugin.cpp
@@ -41,8 +41,8 @@ namespace XBMCAddon
       return XFILE::CPluginDirectory::AddItem(handle, pListItem->item.get(), totalItems);
     }
 
-    bool addDirectoryItems(int handle, 
-                           const std::vector<Tuple<String,const XBMCAddon::xbmcgui::ListItem*,bool> >& items, 
+    bool addDirectoryItems(int handle,
+                           const std::vector<Tuple<String,const XBMCAddon::xbmcgui::ListItem*,bool> >& items,
                            int totalItems)
     {
       CFileItemList fitems;
@@ -62,7 +62,7 @@ namespace XBMCAddon
       return XFILE::CPluginDirectory::AddItems(handle, &fitems, totalItems);
     }
 
-    void endOfDirectory(int handle, bool succeeded, bool updateListing, 
+    void endOfDirectory(int handle, bool succeeded, bool updateListing,
                         bool cacheToDisc)
     {
       // tell the directory class that we're done
@@ -107,7 +107,7 @@ namespace XBMCAddon
       XFILE::CPluginDirectory::SetProperty(handle, "plugincategory", category);
     }
 
-    void setPluginFanart(int handle, const char* image, 
+    void setPluginFanart(int handle, const char* image,
                          const char* color1,
                          const char* color2,
                          const char* color3)
@@ -126,6 +126,6 @@ namespace XBMCAddon
     {
       XFILE::CPluginDirectory::SetProperty(handle, key, value);
     }
-    
+
   }
 }
diff --git a/xbmc/interfaces/legacy/ModuleXbmcplugin.h b/xbmc/interfaces/legacy/ModuleXbmcplugin.h
index 8bf53a2422..16b2fbaded 100644
--- a/xbmc/interfaces/legacy/ModuleXbmcplugin.h
+++ b/xbmc/interfaces/legacy/ModuleXbmcplugin.h
@@ -343,7 +343,7 @@ namespace XBMCAddon
     /// | movies   | tvshows  | episodes | musicvideos
     /// | videos   | images   |  games   |
     ///
-    /// @remark Use **videos** for all videos which do not apply to the 
+    /// @remark Use **videos** for all videos which do not apply to the
     /// more specific mentioned ones like "movies", "episodes" etc.
     /// A good example is youtube.
     ///
diff --git a/xbmc/interfaces/legacy/ModuleXbmcvfs.cpp b/xbmc/interfaces/legacy/ModuleXbmcvfs.cpp
index cc3d972fef..c046f3874b 100644
--- a/xbmc/interfaces/legacy/ModuleXbmcvfs.cpp
+++ b/xbmc/interfaces/legacy/ModuleXbmcvfs.cpp
@@ -50,7 +50,7 @@ namespace XBMCAddon
     {
       DelayedCallGuard dg;
       return XFILE::CFile::Rename(file,newFile);
-    }  
+    }
 
     // check for a file or folder existence, mimics Pythons os.path.exists()
     bool exists(const String& path)
@@ -59,14 +59,14 @@ namespace XBMCAddon
       if (URIUtils::HasSlashAtEnd(path, true))
         return XFILE::CDirectory::Exists(path, false);
       return XFILE::CFile::Exists(path, false);
-    }      
+    }
 
     // make a directory
     bool mkdir(const String& path)
     {
       DelayedCallGuard dg;
       return XFILE::CDirectory::Create(path);
-    }      
+    }
 
     // make all directories along the path
     bool mkdirs(const String& path)
@@ -83,7 +83,7 @@ namespace XBMCAddon
         return CFileUtils::DeleteItem(path);
       else
         return XFILE::CDirectory::Remove(path);
-    }      
+    }
 
     Tuple<std::vector<String>, std::vector<String> > listdir(const String& path)
     {
@@ -100,7 +100,7 @@ namespace XBMCAddon
       for (int i=0; i < items.Size(); i++)
       {
         std::string itemPath = items[i]->GetPath();
-        
+
         if (URIUtils::HasSlashAtEnd(itemPath)) // folder
         {
           URIUtils::RemoveSlashAtEnd(itemPath);
diff --git a/xbmc/interfaces/legacy/PlayList.cpp b/xbmc/interfaces/legacy/PlayList.cpp
index e8961b35c5..5bc76c828f 100644
--- a/xbmc/interfaces/legacy/PlayList.cpp
+++ b/xbmc/interfaces/legacy/PlayList.cpp
@@ -32,7 +32,7 @@ namespace XBMCAddon
   {
     //! @todo need a means to check for a valid construction
     //!  either by throwing an exception or by an "isValid" check
-    PlayList::PlayList(int playList) : 
+    PlayList::PlayList(int playList) :
       iPlayList(playList), pPlayList(NULL)
     {
       // we do not create our own playlist, just using the ones from playlistplayer
diff --git a/xbmc/interfaces/legacy/Player.cpp b/xbmc/interfaces/legacy/Player.cpp
index f83fa1dbdb..999e52157c 100644
--- a/xbmc/interfaces/legacy/Player.cpp
+++ b/xbmc/interfaces/legacy/Player.cpp
@@ -189,8 +189,8 @@ namespace XBMCAddon
     }
 
     void Player::OnPlayBackStarted(const CFileItem &file)
-    { 
-      // We only have fileItem due to us having to 
+    {
+      // We only have fileItem due to us having to
       // implement the interface, we can't send it to python
       // as we're not able to serialize it.
       XBMC_TRACE;
@@ -199,7 +199,7 @@ namespace XBMCAddon
 
     void Player::OnAVStarted(const CFileItem &file)
     {
-      // We only have fileItem due to us having to 
+      // We only have fileItem due to us having to
       // implement the interface, we can't send it to python
       // as we're not able to serialize it.
       XBMC_TRACE;
@@ -213,13 +213,13 @@ namespace XBMCAddon
     }
 
     void Player::OnPlayBackEnded()
-    { 
+    {
       XBMC_TRACE;
       invokeCallback(new CallbackFunction<Player>(this,&Player::onPlayBackEnded));
     }
 
     void Player::OnPlayBackStopped()
-    { 
+    {
       XBMC_TRACE;
       invokeCallback(new CallbackFunction<Player>(this,&Player::onPlayBackStopped));
     }
@@ -231,37 +231,37 @@ namespace XBMCAddon
     }
 
     void Player::OnPlayBackPaused()
-    { 
+    {
       XBMC_TRACE;
       invokeCallback(new CallbackFunction<Player>(this,&Player::onPlayBackPaused));
     }
 
     void Player::OnPlayBackResumed()
-    { 
+    {
       XBMC_TRACE;
       invokeCallback(new CallbackFunction<Player>(this,&Player::onPlayBackResumed));
     }
 
     void Player::OnQueueNextItem()
-    { 
+    {
       XBMC_TRACE;
       invokeCallback(new CallbackFunction<Player>(this,&Player::onQueueNextItem));
     }
 
     void Player::OnPlayBackSpeedChanged(int speed)
-    { 
+    {
       XBMC_TRACE;
       invokeCallback(new CallbackFunction<Player,int>(this,&Player::onPlayBackSpeedChanged,speed));
     }
 
     void Player::OnPlayBackSeek(int64_t time, int64_t seekOffset)
-    { 
+    {
       XBMC_TRACE;
       invokeCallback(new CallbackFunction<Player,int,int>(this,&Player::onPlayBackSeek,static_cast<int>(time),static_cast<int>(seekOffset)));
     }
 
     void Player::OnPlayBackSeekChapter(int chapter)
-    { 
+    {
       XBMC_TRACE;
       invokeCallback(new CallbackFunction<Player,int>(this,&Player::onPlayBackSeekChapter,chapter));
     }
@@ -312,17 +312,17 @@ namespace XBMCAddon
     }
 
     void Player::onPlayBackSpeedChanged(int speed)
-    { 
+    {
       XBMC_TRACE;
     }
 
     void Player::onPlayBackSeek(int time, int seekOffset)
-    { 
+    {
       XBMC_TRACE;
     }
 
     void Player::onPlayBackSeekChapter(int chapter)
-    { 
+    {
       XBMC_TRACE;
     }
 
@@ -529,9 +529,9 @@ namespace XBMCAddon
         }
         return ret;
       }
-    
+
       return std::vector<String>();
-    } 
+    }
 
     void Player::setAudioStream(int iStream)
     {
diff --git a/xbmc/interfaces/legacy/Player.h b/xbmc/interfaces/legacy/Player.h
index 2e78429e5a..40387661e7 100644
--- a/xbmc/interfaces/legacy/Player.h
+++ b/xbmc/interfaces/legacy/Player.h
@@ -86,8 +86,8 @@ namespace XBMCAddon
 #endif
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-      // Construct a Player proxying the given generated binding. The 
-      //  construction of a Player needs to identify whether or not any 
+      // Construct a Player proxying the given generated binding. The
+      //  construction of a Player needs to identify whether or not any
       //  callbacks will be executed asynchronously or not.
       explicit Player(int playerCore = 0);
       ~Player(void) override;
diff --git a/xbmc/interfaces/legacy/RenderCapture.h b/xbmc/interfaces/legacy/RenderCapture.h
index 87ab3b1404..c6ad083d5d 100644
--- a/xbmc/interfaces/legacy/RenderCapture.h
+++ b/xbmc/interfaces/legacy/RenderCapture.h
@@ -122,7 +122,7 @@ namespace XBMCAddon
       ///
       /// @return                        Format of captured image: 'BGRA'
       ///-----------------------------------------------------------------------
-      /// @python_v17 Image will now always be returned in BGRA 
+      /// @python_v17 Image will now always be returned in BGRA
       ///
       getImageFormat()
 #else
diff --git a/xbmc/interfaces/legacy/Tuple.h b/xbmc/interfaces/legacy/Tuple.h
index 3667460746..c1d3dd54d7 100644
--- a/xbmc/interfaces/legacy/Tuple.h
+++ b/xbmc/interfaces/legacy/Tuple.h
@@ -22,7 +22,7 @@
 
 /**
  * This file contains a few templates to define various length
- * Tuples. 
+ * Tuples.
  */
 namespace XBMCAddon
 {
diff --git a/xbmc/interfaces/legacy/Window.cpp b/xbmc/interfaces/legacy/Window.cpp
index 641e887405..efa769a22c 100644
--- a/xbmc/interfaces/legacy/Window.cpp
+++ b/xbmc/interfaces/legacy/Window.cpp
@@ -43,9 +43,9 @@ namespace XBMCAddon
     thread_local ref* InterceptorBase::upcallTls;
 
     /**
-     * Used in add/remove control. It only locks if it's given a 
+     * Used in add/remove control. It only locks if it's given a
      * non-NULL CCriticalSection. It's given a NULL CCriticalSection
-     * when a function higher in the call stack already has a 
+     * when a function higher in the call stack already has a
      */
     class MaybeLock
     {
@@ -88,7 +88,7 @@ namespace XBMCAddon
 
     CGUIWindow* ProxyExistingWindowInterceptor::get() { XBMC_TRACE; return cguiwindow; }
 
-    Window::Window(bool discrim): 
+    Window::Window(bool discrim):
       isDisposed(false), window(NULL), iWindowId(-1),
       iOldWindowId(0), iCurrentControlId(3000), bModal(false), m_actionEvent(true),
       canPulse(true), existingWindow(false), destroyAfterDeInit(false)
@@ -99,7 +99,7 @@ namespace XBMCAddon
     /**
      * This just creates a default window.
      */
-    Window::Window(int existingWindowId) : 
+    Window::Window(int existingWindowId) :
       isDisposed(false), window(NULL), iWindowId(-1),
       iOldWindowId(0), iCurrentControlId(3000), bModal(false), m_actionEvent(true),
       canPulse(false), existingWindow(true), destroyAfterDeInit(false)
@@ -215,11 +215,11 @@ namespace XBMCAddon
       }
     }
 
-    void Window::setWindow(InterceptorBase* _window) 
-    { 
+    void Window::setWindow(InterceptorBase* _window)
+    {
       XBMC_TRACE;
-      window = _window; 
-      iWindowId = _window->get()->GetID(); 
+      window = _window;
+      iWindowId = _window->get()->GetID();
 
       if (!existingWindow)
         CServiceBroker::GetGUI()->GetWindowManager().Add(window->get());
@@ -272,7 +272,7 @@ namespace XBMCAddon
       MaybeLock lock(gc);
 
       // check if control exists
-      CGUIControl* pGUIControl = (CGUIControl*)ref(window)->GetControl(iControlId); 
+      CGUIControl* pGUIControl = (CGUIControl*)ref(window)->GetControl(iControlId);
       if (!pGUIControl)
       {
         // control does not exist.
@@ -686,13 +686,13 @@ namespace XBMCAddon
       {
         bModal = true;
 
-        if(iWindowId != ACTIVE_WINDOW) 
+        if(iWindowId != ACTIVE_WINDOW)
           show();
 
         while (bModal && !g_application.m_bStop)
         {
 //! @todo garbear added this code to the python window.cpp class and
-//!  commented in XBPyThread.cpp. I'm not sure how to handle this 
+//!  commented in XBPyThread.cpp. I'm not sure how to handle this
 //! in this native implementation.
 //          // Check if XBPyThread::stop() raised a SystemExit exception
 //          if (PyThreadState_Get()->async_exc == PyExc_SystemExit)
@@ -707,7 +707,7 @@ namespace XBMCAddon
           do
           {
             {
-              DelayedCallGuard dcguard(languageHook);            
+              DelayedCallGuard dcguard(languageHook);
               stillWaiting = WaitForActionEvent(100) ? false : true;
             }
             languageHook->MakePendingCalls();
diff --git a/xbmc/interfaces/legacy/WindowDialogMixin.cpp b/xbmc/interfaces/legacy/WindowDialogMixin.cpp
index 4fea2946fa..4b9b43434d 100644
--- a/xbmc/interfaces/legacy/WindowDialogMixin.cpp
+++ b/xbmc/interfaces/legacy/WindowDialogMixin.cpp
@@ -68,7 +68,7 @@ namespace XBMCAddon
           return true;
         }
         break;
-        
+
       case HACK_CUSTOM_ACTION_CLOSING:
         {
           // This is from the CGUIPythonWindowXMLDialog::Show_Internal
diff --git a/xbmc/interfaces/legacy/WindowInterceptor.h b/xbmc/interfaces/legacy/WindowInterceptor.h
index 46091e7651..6eaec8aba2 100644
--- a/xbmc/interfaces/legacy/WindowInterceptor.h
+++ b/xbmc/interfaces/legacy/WindowInterceptor.h
@@ -48,7 +48,7 @@ namespace XBMCAddon
       /**
        * Calling up ONCE resets the upcall to to false. The reason is that when
        *   a call is recursive we cannot assume the ref has cleared the flag.
-       *   so ... 
+       *   so ...
        *
        * ref(window)->UpCall()
        *
@@ -57,7 +57,7 @@ namespace XBMCAddon
        *  sometimes in OnMessage). In that case, if upcall is still 'true', than
        *  the call will wrongly proceed back to the xbmc core side rather than
        *  to the Addon API side.
-       */  
+       */
       static bool up() { bool ret = ((upcallTls) != NULL); upcallTls = NULL; return ret; }
     public:
 
@@ -69,21 +69,21 @@ namespace XBMCAddon
 
       virtual void setActive(bool active) { }
       virtual bool isActive() { return false; }
-      
+
       friend class ref;
     };
 
     /**
      * Guard class. But instead of managing memory or thread resources,
-     * any call made using the operator-> results in an 'upcall.' That is, 
+     * any call made using the operator-> results in an 'upcall.' That is,
      * it expects the call about to be made to have come from the XBMCAddon
-     * xbmcgui Window API and not from either the scripting language or the 
+     * xbmcgui Window API and not from either the scripting language or the
      * XBMC core Windowing system.
      *
      * This class is meant to hold references to instances of Interceptor<P>.
      *   see that template definition below.
      */
-    class ref 
+    class ref
     {
       InterceptorBase* w;
     public:
@@ -96,7 +96,7 @@ namespace XBMCAddon
     /**
      * The intention of this class is to intercept calls from
      *  multiple points in the CGUIWindow class hierarchy and pass
-     *  those calls over to the XBMCAddon API Window hierarchy. It 
+     *  those calls over to the XBMCAddon API Window hierarchy. It
      *  is a class template that uses the type template parameter
      *  to determine the parent class.
      *
@@ -112,7 +112,7 @@ namespace XBMCAddon
 #define checkedb(methcall) ( window.isNotNull() ? window-> methcall : false )
 #define checkedv(methcall) { if (window.isNotNull()) window-> methcall ; }
 
-    template <class P /* extends CGUIWindow*/> class Interceptor : 
+    template <class P /* extends CGUIWindow*/> class Interceptor :
       public P, public InterceptorBase
     {
       std::string classname;
@@ -131,7 +131,7 @@ namespace XBMCAddon
         window.reset(_window);
         P::SetLoadType(CGUIWindow::LOAD_ON_GUI_INIT);
       }
-                    
+
       Interceptor(const char* specializedName,
                   Window* _window, int windowid,
                   const char* xmlfile) : P(windowid, xmlfile),
@@ -146,20 +146,20 @@ namespace XBMCAddon
       }
 
       ~Interceptor() override
-      { 
+      {
 #ifdef ENABLE_XBMC_TRACE_API
         XBMCAddonUtils::TraceGuard tg;
         CLog::Log(LOGDEBUG, "%sNEWADDON LIFECYCLE destroying %s 0x%lx", tg.getSpaces(),classname.c_str(), (long)(((void*)this)));
 #endif
       }
 
-      bool OnMessage(CGUIMessage& message) override 
+      bool OnMessage(CGUIMessage& message) override
       { XBMC_TRACE; return up() ? P::OnMessage(message) : checkedb(OnMessage(message)); }
-      bool OnAction(const CAction &action) override 
+      bool OnAction(const CAction &action) override
       { XBMC_TRACE; return up() ? P::OnAction(action) : checkedb(OnAction(action)); }
 
       // NOTE!!: This ALWAYS skips up to the CGUIWindow instance.
-      bool OnBack(int actionId) override 
+      bool OnBack(int actionId) override
       { XBMC_TRACE; return up() ? CGUIWindow::OnBack(actionId) : checkedb(OnBack(actionId)); }
 
       void OnDeinitWindow(int nextWindowID) override
@@ -177,18 +177,18 @@ namespace XBMCAddon
       bool isActive() override { XBMC_TRACE; return P::m_active; }
     };
 
-    template <class P /* extends CGUIWindow*/> class InterceptorDialog : 
+    template <class P /* extends CGUIWindow*/> class InterceptorDialog :
       public Interceptor<P>
     {
     public:
       InterceptorDialog(const char* specializedName,
-                        Window* _window, int windowid) : 
+                        Window* _window, int windowid) :
         Interceptor<P>(specializedName, _window, windowid)
       { }
-                    
+
       InterceptorDialog(const char* specializedName,
                   Window* _window, int windowid,
-                  const char* xmlfile) : 
+                  const char* xmlfile) :
         Interceptor<P>(specializedName, _window, windowid,xmlfile)
       { }
     };
diff --git a/xbmc/interfaces/legacy/WindowXML.cpp b/xbmc/interfaces/legacy/WindowXML.cpp
index e8b7e14f5d..4381fd716a 100644
--- a/xbmc/interfaces/legacy/WindowXML.cpp
+++ b/xbmc/interfaces/legacy/WindowXML.cpp
@@ -47,7 +47,7 @@ namespace XBMCAddon
     template class Interceptor<CGUIMediaWindow>;
 
     /**
-     * This class extends the Interceptor<CGUIMediaWindow> in order to 
+     * This class extends the Interceptor<CGUIMediaWindow> in order to
      *  add behavior for a few more virtual functions that were unnecessary
      *  in the Window or WindowDialog.
      */
@@ -61,7 +61,7 @@ namespace XBMCAddon
       WindowXML* xwin;
     public:
       WindowXMLInterceptor(WindowXML* _window, int windowid,const char* xmlfile) :
-        InterceptorDialog<CGUIMediaWindow>("CGUIMediaWindow",_window,windowid,xmlfile), xwin(_window) 
+        InterceptorDialog<CGUIMediaWindow>("CGUIMediaWindow",_window,windowid,xmlfile), xwin(_window)
       { }
 
       void AllocResources(bool forceLoad = false) override
@@ -237,7 +237,7 @@ namespace XBMCAddon
       //CFileItemPtr fi = pwx->GetListItem(listPos);
       CFileItemPtr fi;
       {
-        if (position < 0 || position >= A(m_vecItems)->Size()) 
+        if (position < 0 || position >= A(m_vecItems)->Size())
           return new ListItem();
         fi = A(m_vecItems)->Get(position);
       }
@@ -332,7 +332,7 @@ namespace XBMCAddon
 
       case GUI_MSG_FOCUSED:
         {
-          if (A(m_viewControl).HasControl(message.GetControlId()) && 
+          if (A(m_viewControl).HasControl(message.GetControlId()) &&
               A(m_viewControl).GetCurrentControl() != (int)message.GetControlId())
           {
             A(m_viewControl).SetFocused();
@@ -377,11 +377,11 @@ namespace XBMCAddon
           {
             CGUIControl* controlClicked = (CGUIControl*)interceptor->GetControl(iControl);
 
-            // The old python way used to check list AND SELECITEM method 
+            // The old python way used to check list AND SELECITEM method
             //   or if its a button, radiobutton.
-            // Its done this way for now to allow other controls without a 
+            // Its done this way for now to allow other controls without a
             //  python version like togglebutton to still raise a onAction event
-            if (controlClicked) // Will get problems if we the id is not on the window 
+            if (controlClicked) // Will get problems if we the id is not on the window
                                 //   and we try to do GetControlType on it. So check to make sure it exists
             {
               if ((controlClicked->IsContainer() && (message.GetParam1() == ACTION_SELECT_ITEM || message.GetParam1() == ACTION_MOUSE_LEFT_CLICK)) || !controlClicked->IsContainer())
@@ -445,7 +445,7 @@ namespace XBMCAddon
       CServiceBroker::GetGUI()->GetTextureManager().RemoveTexturePath(m_mediaDir);
     }
 
-    bool WindowXML::OnClick(int iItem) 
+    bool WindowXML::OnClick(int iItem)
     {
       XBMC_TRACE;
       // Hook Over calling  CGUIMediaWindow::OnClick(iItem) results in it trying to PLAY the file item
@@ -506,7 +506,7 @@ namespace XBMCAddon
       XBMC_TRACE;
       return WindowDialogMixin::OnAction(action) ? true : WindowXML::OnAction(action);
     }
-    
+
     void WindowXMLDialog::OnDeinitWindow(int nextWindowID)
     {
       XBMC_TRACE;
@@ -528,7 +528,7 @@ namespace XBMCAddon
       }
       return false;
     }
-  
+
   }
 
 }
diff --git a/xbmc/interfaces/legacy/swighelper.h b/xbmc/interfaces/legacy/swighelper.h
index 1848136600..e88de26bcc 100644
--- a/xbmc/interfaces/legacy/swighelper.h
+++ b/xbmc/interfaces/legacy/swighelper.h
@@ -22,9 +22,9 @@
 
 /**
  * SWIGHIDDENVIRTUAL allows the keyword 'virtual' to be there when the main
- *  Addon api is compiled, but be hidden from the SWIG code generator. 
+ *  Addon api is compiled, but be hidden from the SWIG code generator.
  *
- * This is to provide finer grain control over which methods are callbackable 
+ * This is to provide finer grain control over which methods are callbackable
  *  (is that a word? ...)
  *  into the scripting language, and which ones are not. True polymorphic
  *  behavior across the scripting language boundary will ONLY occur where
@@ -35,14 +35,14 @@
  * Note: You should not hide virtual destructors from the scripting language.
  */
 #ifdef SWIG
-#define SWIGHIDDENVIRTUAL 
+#define SWIGHIDDENVIRTUAL
 #else
 #define SWIGHIDDENVIRTUAL virtual
 #endif
 
 /**
  * SWIG_CONSTANT_FROM_GETTER will define a constant in the scripting
- *  language from a getter in the Addon api and also provide the 
+ *  language from a getter in the Addon api and also provide the
  *  Addon api declaration. E.g. If you use:
  *
  *  SWIG_CONSTANT_FROM_GETTER(int, MY_CONSTANT);
@@ -51,7 +51,7 @@
  *
  *  int getMy_CONSTANT();
  *
- *  ... in a .cpp file. That call will be made to determine the value 
+ *  ... in a .cpp file. That call will be made to determine the value
  *  of the constant in the scripting language.
  */
 #ifdef SWIG
diff --git a/xbmc/interfaces/legacy/wsgi/WsgiInputStream.h b/xbmc/interfaces/legacy/wsgi/WsgiInputStream.h
index 6e019cf3c3..16ba79ad61 100644
--- a/xbmc/interfaces/legacy/wsgi/WsgiInputStream.h
+++ b/xbmc/interfaces/legacy/wsgi/WsgiInputStream.h
@@ -93,7 +93,7 @@ namespace XBMCAddon
       bool operator!=(const WsgiInputStreamIterator& rhs);
       String& operator*();
       inline bool end() const { return m_remaining <= 0; }
-      
+
     protected:
       String m_data;
       mutable unsigned long m_offset;
diff --git a/xbmc/interfaces/python/CallbackHandler.cpp b/xbmc/interfaces/python/CallbackHandler.cpp
index 31126932df..98e7ec9b68 100644
--- a/xbmc/interfaces/python/CallbackHandler.cpp
+++ b/xbmc/interfaces/python/CallbackHandler.cpp
@@ -57,7 +57,7 @@ namespace XBMCAddon
 
     /**
      * For this method we expect the PyThreadState to be passed as the user
-     *  data for the check. 
+     *  data for the check.
      *
      * @todo This is a stupid way to get this information back to the handler.
      *  there should be a more language neutral means.
diff --git a/xbmc/interfaces/python/LanguageHook.cpp b/xbmc/interfaces/python/LanguageHook.cpp
index a6c1d2e896..7b2e6f6695 100644
--- a/xbmc/interfaces/python/LanguageHook.cpp
+++ b/xbmc/interfaces/python/LanguageHook.cpp
@@ -80,7 +80,7 @@ namespace XBMCAddon
     // we're going to assume we're not in control of the interpreter. This (apparently)
     // can be the case. E.g. Libspotify manages to call into a script using a ctypes
     // extension but under the control of an Interpreter we know nothing about. In
-    // cases like this we're going to use a global interpreter 
+    // cases like this we're going to use a global interpreter
     AddonClass::Ref<PythonLanguageHook> PythonLanguageHook::GetIfExists(PyInterpreterState* interp)
     {
       XBMC_TRACE;
@@ -120,7 +120,7 @@ namespace XBMCAddon
      * See PythonCallbackHandler::PythonCallbackHandler for more details
      */
     XBMCAddon::CallbackHandler* PythonLanguageHook::GetCallbackHandler()
-    { 
+    {
       XBMC_TRACE;
       return new PythonCallbackHandler();
     }
@@ -179,7 +179,7 @@ namespace XBMCAddon
     void PythonLanguageHook::UnregisterMonitorCallback(XBMCAddon::xbmc::Monitor* monitor) { XBMC_TRACE; g_pythonParser.UnregisterPythonMonitorCallBack(monitor); }
 
     bool PythonLanguageHook::WaitForEvent(CEvent& hEvent, unsigned int milliseconds)
-    { 
+    {
       XBMC_TRACE;
       return g_pythonParser.WaitForEvent(hEvent,milliseconds);
     }
diff --git a/xbmc/interfaces/python/LanguageHook.h b/xbmc/interfaces/python/LanguageHook.h
index 1968bcb520..9a8470a782 100644
--- a/xbmc/interfaces/python/LanguageHook.h
+++ b/xbmc/interfaces/python/LanguageHook.h
@@ -56,7 +56,7 @@ namespace XBMCAddon
       void DelayedCallOpen() override;
       void DelayedCallClose() override;
       void MakePendingCalls() override;
-      
+
       /**
        * PythonCallbackHandler expects to be instantiated PER AddonClass instance
        *  that is to be used as a callback. This is why this cannot be instantiated
diff --git a/xbmc/interfaces/python/PyContext.cpp b/xbmc/interfaces/python/PyContext.cpp
index cbaca5d6b4..5c7bf3cd8f 100644
--- a/xbmc/interfaces/python/PyContext.cpp
+++ b/xbmc/interfaces/python/PyContext.cpp
@@ -104,7 +104,7 @@ namespace XBMCAddon
 
     void PyGILLock::acquireGil()
     {
-      PyContextState* cur = tlsPyContextState; 
+      PyContextState* cur = tlsPyContextState;
 
       // it's not possible for cur to be NULL (and if it is, we want to fail anyway).
 
diff --git a/xbmc/interfaces/python/PyContext.h b/xbmc/interfaces/python/PyContext.h
index 755ab4266b..04f0a25bef 100644
--- a/xbmc/interfaces/python/PyContext.h
+++ b/xbmc/interfaces/python/PyContext.h
@@ -27,7 +27,7 @@ namespace XBMCAddon
     class PyGILLock;
 
     /**
-     * These classes should NOT be used with 'new'. They are expected to reside 
+     * These classes should NOT be used with 'new'. They are expected to reside
      *  as stack instances and they act as "Guard" classes that track the
      *  current context.
      */
@@ -45,7 +45,7 @@ namespace XBMCAddon
 
     /**
      * This class supports recursive locking of the GIL. It assumes that
-     * all Python GIL manipulation is done through this class so that it 
+     * all Python GIL manipulation is done through this class so that it
      * can monitor the current owner.
      */
     class PyGILLock
diff --git a/xbmc/interfaces/python/PythonInvoker.cpp b/xbmc/interfaces/python/PythonInvoker.cpp
index 7399ba9bfd..44874b41ee 100644
--- a/xbmc/interfaces/python/PythonInvoker.cpp
+++ b/xbmc/interfaces/python/PythonInvoker.cpp
@@ -111,7 +111,7 @@ static std::vector<std::vector<char>> storeArgumentsCCompatible(std::vector<std:
 static std::vector<char *> getCPointersToArguments(std::vector<std::vector<char>> & input)
 {
   std::vector<char *> output;
-  std::transform(input.begin(), input.end(), std::back_inserter(output), 
+  std::transform(input.begin(), input.end(), std::back_inserter(output),
                 [](std::vector<char> & i) { return &i[0]; });
   return output;
 }
diff --git a/xbmc/interfaces/python/PythonInvoker.h b/xbmc/interfaces/python/PythonInvoker.h
index 09c0d98cee..f039a5ba53 100644
--- a/xbmc/interfaces/python/PythonInvoker.h
+++ b/xbmc/interfaces/python/PythonInvoker.h
@@ -43,7 +43,7 @@ public:
   bool IsStopping() const override { return m_stop || ILanguageInvoker::IsStopping(); }
 
   typedef void (*PythonModuleInitialization)();
-  
+
 protected:
   // implementation of ILanguageInvoker
   bool execute(const std::string &script, const std::vector<std::string> &arguments) override;
diff --git a/xbmc/interfaces/python/PythonSwig.cpp.template b/xbmc/interfaces/python/PythonSwig.cpp.template
index e9772b96ae..da20f8b0be 100644
--- a/xbmc/interfaces/python/PythonSwig.cpp.template
+++ b/xbmc/interfaces/python/PythonSwig.cpp.template
@@ -39,7 +39,7 @@ module.findAll( { it.name() == 'typetab' } ).each {  SwigTypeParser.appendTypeTa
 // ---------------------------------------------------------
 
 // ---------------------------------------------------------
-// Flatten out all of the method/function nodes, whether inside 
+// Flatten out all of the method/function nodes, whether inside
 //  classes or not, into 'methods'
 List methods = module.depthFirst().findAll { it.name() == 'function' || it.name() == 'constructor' || it.name() == 'destructor' }
 // ---------------------------------------------------------
@@ -82,7 +82,7 @@ Helper.setup(this,classes,
      * appear here as it gets converted directly within the PyArg_ParseTupleAndKeywords
      * call.
      */
-    [ 
+    [
       'std::string' : 'if (${slarg}) PyXBMCGetUnicodeString(${api},${slarg},false,"${api}","${method.@name}");',
       (Pattern.compile('''(p.){0,1}std::vector<\\(.*\\)>''')) : new File('typemaps/python.vector.intm'),
       (Pattern.compile('''(p.){0,1}Tuple(3){0,1}<\\(.*\\)>''')) : new File('typemaps/python.Tuple.intm'),
@@ -137,7 +137,7 @@ void doMethod(Node method, MethodType methodType)
   String returns = constructor ? 'p.' + clazz : (destructor ? 'void' : Helper.getReturnSwigType(method))
   Node classnode = Helper.findClassNode(method)
   String classNameAsVariable = clazz == null ? null : PythonTools.getClassNameAsVariable(classnode)
-  boolean useKeywordParsing = !('true' == classnode?.@feature_python_nokwds || 'true' == method?.@feature_python_nokwds) 
+  boolean useKeywordParsing = !('true' == classnode?.@feature_python_nokwds || 'true' == method?.@feature_python_nokwds)
 
   // do the docs
   if (!constructor && !destructor)
@@ -150,14 +150,14 @@ void doMethod(Node method, MethodType methodType)
 <%  }
   }
 %>
-  static <% if(methodType == MethodType.destructor) { %>void<% } else { %>PyObject*<% } %> ${module.@name}_${PythonTools.getPyMethodName(method,methodType)} (<%= ((clazz == null) ? "PyObject" : 
-                   (constructor ? "PyTypeObject" : 'PyHolder')) %>* ${constructor ? 'pytype' : 'self'} <% 
+  static <% if(methodType == MethodType.destructor) { %>void<% } else { %>PyObject*<% } %> ${module.@name}_${PythonTools.getPyMethodName(method,methodType)} (<%= ((clazz == null) ? "PyObject" :
+                   (constructor ? "PyTypeObject" : 'PyHolder')) %>* ${constructor ? 'pytype' : 'self'} <%
                    if (doAsMappingIndex) { %>, PyObject* py${params[0].@name}<% }
                    else if (methodType != MethodType.destructor) { %> , PyObject *args, PyObject *kwds <%} %> )
   {
     XBMC_TRACE;
 <%  if (numParams > 0)
-    { 
+    {
       if (useKeywordParsing && !doAsMappingIndex)
       { %>
     static const char *keywords[] = {<%
@@ -165,8 +165,8 @@ void doMethod(Node method, MethodType methodType)
           "${it.@name}",<% } %>
           NULL};
 <%    }
-      params.each { 
-%>         
+      params.each {
+%>
     ${SwigTypeParser.SwigType_str(SwigTypeParser.convertTypeToLTypeForParam(it.@type))} ${it.@name} ${it.@value != null ? ' = ' + it.@value : SwigTypeParser.SwigType_ispointer(it.@type) ? ' = nullptr' :  ''};<%
         if (!PythonTools.parameterCanBeUsedDirectly(it) && !doAsMappingIndex)
         { %>
@@ -213,7 +213,7 @@ void doMethod(Node method, MethodType methodType)
     if (clazz && !constructor) {
       %>((${clazz}*)retrieveApiInstance((PyObject*)self,&Ty${classNameAsVariable}_Type,"${Helper.callingName(method)}","${clazz}"))-> <%
     }
-    if (constructor && classnode.@feature_director) { 
+    if (constructor && classnode.@feature_director) {
     %>(&(Ty${classNameAsVariable}_Type.pythonType) != pytype) ? new ${classNameAsVariable}_Director(<% params.eachWithIndex { param, i -> %> ${param.@name}${i < params.size() - 1 ? "," : ""} <% } %>) : <% }
 
     // Here is the actual call ... if this is a Director we need to do an upCall (from Python)
@@ -231,7 +231,7 @@ void doMethod(Node method, MethodType methodType)
 %>
     }
     catch (const XBMCAddon::WrongTypeException& e)
-    { 
+    {
       CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage());
       PyErr_SetString(PyExc_TypeError, e.GetMessage()); <%
       if (!destructor) {  %>
@@ -239,7 +239,7 @@ void doMethod(Node method, MethodType methodType)
       } %>
     }
     catch (const XbmcCommons::Exception& e)
-    { 
+    {
       CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage());
       PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); <%
       if (!destructor) {  %>
@@ -263,18 +263,18 @@ void doMethod(Node method, MethodType methodType)
     if (constructor) {
       %>    result = makePythonInstance(apiResult,pytype,false);<%
     }
-    else { 
+    else {
 %>    ${Helper.getOutConversion(returns,'result',method)}<%
     }
     if (constructor && method.@feature_director) { %>
-    if (&(Ty${classNameAsVariable}_Type.pythonType) != pytype) 
+    if (&(Ty${classNameAsVariable}_Type.pythonType) != pytype)
       ((${classNameAsVariable}_Director*)apiResult)->setPyObjectForDirector(result);<%
     }
  %>
 
-    return result; <% } 
+    return result; <% }
     else { %>
-    self->ob_type->tp_free((PyObject*)self); 
+    self->ob_type->tp_free((PyObject*)self);
     <%
     }
     %>
@@ -286,11 +286,11 @@ void doMethod(Node method, MethodType methodType)
  * This method writes out the instance of a TypeInfo (which includes
  * The PyTypeObject as a member) for the class node provided.
  *
- * If classNameAsVariable is not null then the class name as a 
+ * If classNameAsVariable is not null then the class name as a
  * variable will be appended to it.
  */
 void doClassTypeInfo(Node clazz, List classNameAsVariables = null)
-{ 
+{
   String classNameAsVariable = PythonTools.getClassNameAsVariable(clazz)
   String fullClassName = Helper.findFullClassName(clazz)
   classNameAsVariables?.add(classNameAsVariable)
@@ -300,7 +300,7 @@ void doClassTypeInfo(Node clazz, List classNameAsVariables = null)
   TypeInfo Ty${classNameAsVariable}_Type(typeid(${fullClassName}));<%
 %>
   //=========================================================================
-<%    
+<%
 }
 
 /**
@@ -308,14 +308,14 @@ void doClassTypeInfo(Node clazz, List classNameAsVariables = null)
  *  create an external reference to its TypeInfo instance.
  */
 void doExternClassTypeInfo(String knownType)
-{ 
+{
   String classNameAsVariable = knownType.replaceAll('::','_')
 %>
   //=========================================================================
-  // These variables define the type ${knownType} from another module 
+  // These variables define the type ${knownType} from another module
   extern TypeInfo Ty${classNameAsVariable}_Type;
   //=========================================================================
-<%    
+<%
 }
 
 /*******************************************************************************/
@@ -324,10 +324,10 @@ void doExternClassTypeInfo(String knownType)
  *  and class oddities (like comparators, as_mapping, etc.). These include:
  *
  * 1) comparator *_cmp python method as long as there's an operator==, an
- *    operator>, AND an operator<. 
+ *    operator>, AND an operator<.
  * 2) it will create a python "as_mapping" method as long as there's both
  *    an operator[], AND a .size() method on the class.
- * 3) it will handle the explicitly defined rich compare (_rcmp) if the 
+ * 3) it will handle the explicitly defined rich compare (_rcmp) if the
  *    feature is included in the .i file using %feature("python:rcmp")
  * 4) The array of PyMethodDefs for the class definition
  * 5) It will handle public fields as if the were python properties by:
@@ -340,7 +340,7 @@ void doExternClassTypeInfo(String knownType)
  *  method (see #6 above) will be appended to it.
  */
 void doClassMethodInfo(Node clazz, List initTypeCalls)
-{ 
+{
   String classNameAsVariable = PythonTools.getClassNameAsVariable(clazz)
   String fullClassName = Helper.findFullClassName(clazz)
   String initTypeCall = "initPy${classNameAsVariable}_Type"
@@ -386,7 +386,7 @@ void doClassMethodInfo(Node clazz, List initTypeCalls)
   }
 
   if (indexOp)
-  { 
+  {
     sizeNode =  clazz.function.find { it.@name == "size" }
     if (sizeNode)
       doAsMapping = true
@@ -394,7 +394,7 @@ void doClassMethodInfo(Node clazz, List initTypeCalls)
       System.err.println ("Warning: class ${fullClassName} has an inconsistent operator set. To get a as_mapping you must implement 'size' as well as operator[]")
   }
 
-  if (doComparator){ 
+  if (doComparator){
 %>
   static int ${module.@name}_${classNameAsVariable}_cmp(PyObject* obj1, PyObject* obj2)
   {
@@ -442,7 +442,7 @@ void doClassMethodInfo(Node clazz, List initTypeCalls)
     List tmpl = []
     tmpl.addAll(clazz.attributes().keySet())
     List newMethodKeys = tmpl.findAll { it.startsWith('feature_python_method_') }
-    newMethodKeys.each { key -> 
+    newMethodKeys.each { key ->
       String featureEntry = clazz.attribute(key)
       String methodName = key.substring('feature_python_method_'.length()) %>
     {(char*)"${methodName}", (PyCFunction)${module.@name}_${PythonTools.getClassNameAsVariable(clazz)}_${methodName}, METH_VARARGS|METH_KEYWORDS, NULL},
@@ -545,7 +545,7 @@ void doClassMethodInfo(Node clazz, List initTypeCalls)
         ${Helper.getInConversion(returns, 'tmp', 'value', it)}
         if (PyErr_Occurred())
           throw PythonBindings::PythonToCppException();
-        
+
         theObj->${it.@sym_name} = tmp;
       }
       else<%
@@ -579,17 +579,17 @@ void doClassMethodInfo(Node clazz, List initTypeCalls)
     try
     {
       ${clazz.@feature_iterable}* apiResult = ((${fullClassName}*)retrieveApiInstance(self,&Ty${classNameAsVariable}_Type,"${module.@name}_${classNameAsVariable}_iternext","${fullClassName}"))->begin();
-      
+
       ${Helper.getOutConversion('p.' + clazz.@feature_iterable,'result',clazz)}
     }
     catch (const XBMCAddon::WrongTypeException& e)
-    { 
+    {
       CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage());
       PyErr_SetString(PyExc_TypeError, e.GetMessage());
       return NULL;
     }
     catch (const XbmcCommons::Exception& e)
-    { 
+    {
       CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage());
       PyErr_SetString(PyExc_RuntimeError, e.GetMessage());
       return NULL;
@@ -624,13 +624,13 @@ void doClassMethodInfo(Node clazz, List initTypeCalls)
       }
     }
     catch (const XBMCAddon::WrongTypeException& e)
-    { 
+    {
       CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage());
       PyErr_SetString(PyExc_TypeError, e.GetMessage());
       return NULL;
     }
     catch (const XbmcCommons::Exception& e)
-    { 
+    {
       CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage());
       PyErr_SetString(PyExc_RuntimeError, e.GetMessage());
       return NULL;
@@ -731,7 +731,7 @@ List getAllVirtualMethods(Node clazz)
 {
   List ret = []
   ret.addAll(clazz.findAll({ it.name() == 'function' && it.@storage && it.@storage == 'virtual' }))
-  if (clazz.baselist) { 
+  if (clazz.baselist) {
     if (clazz.baselist[0].base) clazz.baselist[0].base.each {
         Node baseclassnode = Helper.findClassNodeByName(module,it.@name,clazz)
         if (baseclassnode && baseclassnode.@feature_director) ret.addAll(getAllVirtualMethods(baseclassnode))
@@ -785,7 +785,7 @@ Helper.getInsertNodes(module, 'header').each { %>${Helper.unescape(it)}<% }
 namespace PythonBindings
 {
 <%
-  // initTypeCalls is the 
+  // initTypeCalls is the
   List initTypeCalls = []
   List classNameAsVariables = []
 
@@ -795,11 +795,11 @@ namespace PythonBindings
 
   // first, find all of the declared known api types
   Set<String> knownApiTypes = new HashSet<String>()
-  module.depthFirst().each 
-  { 
+  module.depthFirst().each
+  {
     String attr = it.attribute('feature_knownapitypes')
     if (attr != null)
-    { 
+    {
       attr.trim().split(',').each { knownApiTypes.add(it) }
     }
   }
@@ -811,7 +811,7 @@ namespace PythonBindings
 
 <%
 //=========================================================================
-// Do the directors. For every class that can be extended in python, we 
+// Do the directors. For every class that can be extended in python, we
 // need to create a Director instance with bridging calls. This chunk of
 // code will generate those classes.
   classes.findAll({ it.@feature_director != null }).each { clazz ->
@@ -819,8 +819,8 @@ namespace PythonBindings
     constructor = clazz.constructor[0]
 %>
   //=========================================================================
-  // This class is the Director for ${Helper.findFullClassName(clazz)}. 
-  // It provides the "reverse bridge" from C++ to Python to support 
+  // This class is the Director for ${Helper.findFullClassName(clazz)}.
+  // It provides the "reverse bridge" from C++ to Python to support
   // cross-language polymorphism.
   //=========================================================================
   class ${PythonTools.getClassNameAsVariable(clazz)}_Director : public Director, public ${clazz.@name}
@@ -832,7 +832,7 @@ namespace PythonBindings
       inline ${PythonTools.getClassNameAsVariable(clazz)}_Director(<%
         List params = constructor?.parm
         params.eachWithIndex { param, i -> %>${SwigTypeParser.SwigType_str(param.@type)} ${param.@name}${i < params.size() - 1 ? "," : ""} <% }
-        %>) : ${Helper.findFullClassName(constructor)}(<% 
+        %>) : ${Helper.findFullClassName(constructor)}(<%
         params.eachWithIndex { param, i -> %> ${param.@name}${i < params.size() - 1 ? "," : ""} <% } %>) { } <%
       }
 %>
@@ -863,7 +863,7 @@ namespace PythonBindings
           throw PythonBindings::PythonToCppException();
       }
 <%    }
-      
+
 %>
   };
 <%
@@ -880,7 +880,7 @@ namespace PythonBindings
     List tmpl = []
     tmpl.addAll(node.attributes().keySet())
     List newMethodKeys = tmpl.findAll { it.startsWith('feature_python_method_') }
-    newMethodKeys.each { key -> 
+    newMethodKeys.each { key ->
       String featureEntry = node.attribute(key)
       String methodName = key.substring('feature_python_method_'.length()) %>
   static PyObject* ${module.@name}_${PythonTools.getClassNameAsVariable(node)}_${methodName}(PyObject* self, PyObject *args, PyObject *kwds)
@@ -900,7 +900,7 @@ namespace PythonBindings
     {NULL, NULL, 0, NULL}
   };
 
-  // This is the call that will call all of the other initializes 
+  // This is the call that will call all of the other initializes
   //  for all of the classes in this module
   static void initTypes()
   {
@@ -946,9 +946,9 @@ namespace PythonBindings
    PyModule_AddStringConstant(module, (char*)"__platform__", (char*)"ALL");
 
    // need to handle constants
-<% module.depthFirst().findAll( { it.name() == 'constant'} ).each { 
-     String pyCall = 
-        (it.@type == 'int' || it.@type == 'long' || it.@type == 'unsigned int' || it.@type == 'unsigned long' || it.@type == 'bool') ? 
+<% module.depthFirst().findAll( { it.name() == 'constant'} ).each {
+     String pyCall =
+        (it.@type == 'int' || it.@type == 'long' || it.@type == 'unsigned int' || it.@type == 'unsigned long' || it.@type == 'bool') ?
         'PyModule_AddIntConstant' : 'PyModule_AddStringConstant' %>
    ${pyCall}(module,"${it.@sym_name}",${it.@value}); <%
   } %>
diff --git a/xbmc/interfaces/python/PythonTools.groovy b/xbmc/interfaces/python/PythonTools.groovy
index 0d1bd70654..f70137d62d 100644
--- a/xbmc/interfaces/python/PythonTools.groovy
+++ b/xbmc/interfaces/python/PythonTools.groovy
@@ -70,8 +70,8 @@ public class PythonTools
    }
 
    /**
-    * This method gets the FULL class name as a variable including the 
-    * namespace. If converts all of the '::' references to '_' so 
+    * This method gets the FULL class name as a variable including the
+    * namespace. If converts all of the '::' references to '_' so
     * that the result can be used in part, or in whole, as a variable name
     */
    public static String getClassNameAsVariable(Node clazz) { return Helper.findFullClassName(clazz).replaceAll('::','_') }
@@ -114,14 +114,14 @@ public class PythonTools
    }
 
   public static String makeDocString(Node docnode)
-  { 
+  {
     if (docnode?.name() != 'doc')
       throw new RuntimeException("Invalid doc Node passed to PythonTools.makeDocString (" + docnode + ")")
 
     String[] lines = (docnode.@value).split(Helper.newline)
     def ret = ''
-    lines.eachWithIndex { val, index -> 
-      val = ((val =~ /\\n/).replaceAll('')) // remove extraneous \n's 
+    lines.eachWithIndex { val, index ->
+      val = ((val =~ /\\n/).replaceAll('')) // remove extraneous \n's
       val = val.replaceAll("\\\\","\\\\\\\\") // escape backslash
       val = ((val =~ /\"/).replaceAll("\\\\\"")) // escape quotes
       ret += ('"' + val + '\\n"' + (index != lines.length - 1 ? Helper.newline : ''))
@@ -137,7 +137,7 @@ public class PythonTools
     String baseclass = 'NULL'
     List knownbases = []
     if (clazz.baselist)
-    { 
+    {
       if (clazz.baselist[0].base) clazz.baselist[0].base.each {
           Node baseclassnode = Helper.findClassNodeByName(module,it.@name,clazz)
           if (baseclassnode) knownbases.add(baseclassnode)
@@ -145,7 +145,7 @@ public class PythonTools
             System.out.println("WARNING: the base class ${it.@name} for ${Helper.findFullClassName(clazz)} is unrecognized within ${module.@name}.")
         }
     }
-    assert knownbases.size() < 2, 
+    assert knownbases.size() < 2,
       "The class ${Helper.findFullClassName(clazz)} has too many known base classes. Multiple inheritance isn't supported in the code generator. Please \"#ifdef SWIG\" out all but one."
     return knownbases.size() > 0 ? knownbases[0] : null
   }
diff --git a/xbmc/interfaces/python/swig.cpp b/xbmc/interfaces/python/swig.cpp
index 74a41aa1de..7440e43481 100644
--- a/xbmc/interfaces/python/swig.cpp
+++ b/xbmc/interfaces/python/swig.cpp
@@ -260,8 +260,8 @@ namespace PythonBindings
 
     UncheckedException::SetMessage("%s", msg.c_str());
   }
-  
-  XBMCAddon::AddonClass* doretrieveApiInstance(const PyHolder* pythonObj, const TypeInfo* typeInfo, const char* expectedType, 
+
+  XBMCAddon::AddonClass* doretrieveApiInstance(const PyHolder* pythonObj, const TypeInfo* typeInfo, const char* expectedType,
                               const char* methodNamespacePrefix, const char* methodNameForErrorString)
   {
     if (pythonObj->magicNumber != XBMC_PYTHON_TYPE_MAGIC_NUMBER)
@@ -271,7 +271,7 @@ namespace PythonBindings
     {
       // maybe it's a child class
       if (typeInfo->parentType)
-        return doretrieveApiInstance(pythonObj, typeInfo->parentType,expectedType, 
+        return doretrieveApiInstance(pythonObj, typeInfo->parentType,expectedType,
                                      methodNamespacePrefix, methodNameForErrorString);
       else
         throw XBMCAddon::WrongTypeException("Incorrect type passed to \"%s\", was expecting a \"%s\" but received a \"%s\"",
@@ -287,8 +287,8 @@ namespace PythonBindings
   void prepareForReturn(XBMCAddon::AddonClass* c)
   {
     XBMC_TRACE;
-    if(c) { 
-      c->Acquire(); 
+    if(c) {
+      c->Acquire();
       PyThreadState* state = PyThreadState_Get();
       XBMCAddon::Python::PythonLanguageHook::GetIfExists(state->interp)->RegisterAddonClassInstance(c);
     }
@@ -298,7 +298,7 @@ namespace PythonBindings
   {
     XBMC_TRACE;
     if(c){
-      XBMCAddon::AddonClass::Ref<XBMCAddon::Python::PythonLanguageHook> lh = 
+      XBMCAddon::AddonClass::Ref<XBMCAddon::Python::PythonLanguageHook> lh =
         XBMCAddon::AddonClass::Ref<XBMCAddon::AddonClass>(c->GetLanguageHook());
 
       if (lh.isNotNull())
@@ -321,8 +321,8 @@ namespace PythonBindings
    * This method is a helper for the generated API. It's called prior to any API
    * class destructor being dealloc-ed from the generated code from Python
    */
-  void cleanForDealloc(XBMCAddon::AddonClass* c) 
-  { 
+  void cleanForDealloc(XBMCAddon::AddonClass* c)
+  {
     XBMC_TRACE;
     if (handleInterpRegistrationForClean(c))
       c->Release();
@@ -336,14 +336,14 @@ namespace PythonBindings
    * called on destruction but cannot be called from the destructor.
    * This overrides the default cleanForDealloc to resolve that.
    */
-  void cleanForDealloc(XBMCAddon::xbmcgui::Window* c) 
+  void cleanForDealloc(XBMCAddon::xbmcgui::Window* c)
   {
     XBMC_TRACE;
     if (handleInterpRegistrationForClean(c))
-    { 
+    {
       c->dispose();
-      c->Release(); 
-    } 
+      c->Release();
+    }
   }
 
   /**
@@ -352,10 +352,10 @@ namespace PythonBindings
    * When this form of the call is used (and pytype isn't NULL) then the
    * passed type is used in the instance. This is for classes that extend API
    * classes in python. The type passed may not be the same type that's stored
-   * in the class metadata of the AddonClass of which 'api' is an instance, 
+   * in the class metadata of the AddonClass of which 'api' is an instance,
    * it can be a subclass in python.
    *
-   * if pytype is NULL then the type is inferred using the class metadata 
+   * if pytype is NULL then the type is inferred using the class metadata
    * stored in the AddonClass instance 'api'.
    */
   PyObject* makePythonInstance(XBMCAddon::AddonClass* api, PyTypeObject* pytype, bool incrementRefCount)
diff --git a/xbmc/interfaces/python/swig.h b/xbmc/interfaces/python/swig.h
index 2b54dd6947..fb986554d0 100644
--- a/xbmc/interfaces/python/swig.h
+++ b/xbmc/interfaces/python/swig.h
@@ -38,11 +38,11 @@ namespace PythonBindings
    * using the python call str(pObject).
    *
    * This method will handle a 'None' that's passed in. If 'None' is passed then
-   * the resulting buf will contain the value of XBMCAddon::emptyString (which 
+   * the resulting buf will contain the value of XBMCAddon::emptyString (which
    * is simply a std::string instantiated with the default constructor.
    */
   void PyXBMCGetUnicodeString(std::string& buf, PyObject* pObject, bool coerceToString = false,
-                              const char* pos = "unknown", 
+                              const char* pos = "unknown",
                               const char* methodname = "unknown");
 
   struct TypeInfo
@@ -57,7 +57,7 @@ namespace PythonBindings
 
   // This will hold the pointer to the api type, whether known or unknown
   struct PyHolder
-  { 
+  {
     PyObject_HEAD
     int32_t magicNumber;
     const TypeInfo* typeInfo;
@@ -72,8 +72,8 @@ namespace PythonBindings
    *
    * Since the calls to this are generated there's no NULL pointer checks
    */
-  inline XBMCAddon::AddonClass* retrieveApiInstance(PyObject* pythonObj, const TypeInfo* typeToCheck, 
-                                   const char* methodNameForErrorString, 
+  inline XBMCAddon::AddonClass* retrieveApiInstance(PyObject* pythonObj, const TypeInfo* typeToCheck,
+                                   const char* methodNameForErrorString,
                                    const char* typenameForErrorString)
   {
     if (pythonObj == NULL || pythonObj == Py_None)
@@ -85,7 +85,7 @@ namespace PythonBindings
 
   bool isParameterRightType(const char* passedType, const char* expectedType, const char* methodNamespacePrefix, bool tryReverse = true);
 
-  XBMCAddon::AddonClass* doretrieveApiInstance(const PyHolder* pythonObj, const TypeInfo* typeInfo, const char* expectedType, 
+  XBMCAddon::AddonClass* doretrieveApiInstance(const PyHolder* pythonObj, const TypeInfo* typeInfo, const char* expectedType,
                               const char* methodNamespacePrefix, const char* methodNameForErrorString);
 
   /**
@@ -94,7 +94,7 @@ namespace PythonBindings
    *
    * Since the calls to this are generated there's no NULL pointer checks
    *
-   * This method will return NULL if either the pythonObj is NULL or the 
+   * This method will return NULL if either the pythonObj is NULL or the
    * pythonObj is Py_None.
    */
   inline XBMCAddon::AddonClass* retrieveApiInstance(const PyObject* pythonObj, const char* expectedType, const char* methodNamespacePrefix,
@@ -132,18 +132,18 @@ namespace PythonBindings
    * When this form of the call is used (and pythonType isn't NULL) then the
    * passed type is used in the instance. This is for classes that extend API
    * classes in python. The type passed may not be the same type that's stored
-   * in the class metadata of the AddonClass of which 'api' is an instance, 
+   * in the class metadata of the AddonClass of which 'api' is an instance,
    * it can be a subclass in python.
    *
-   * if pythonType is NULL then the type is inferred using the class metadata 
+   * if pythonType is NULL then the type is inferred using the class metadata
    * stored in the AddonClass instance 'api'.
    */
   PyObject* makePythonInstance(XBMCAddon::AddonClass* api, PyTypeObject* pythonType, bool incrementRefCount);
 
   /**
    * This method allows for conversion of the native api Type to the Python type.
-   * 
-   * When this form of the call is used then the python type constructed will be the 
+   *
+   * When this form of the call is used then the python type constructed will be the
    * type given by the class metadata in the AddonClass instance 'api'.
    *
    * This is just a helper inline to call the other makePythonInstance with NULL as
@@ -167,8 +167,8 @@ namespace PythonBindings
   };
 
   /**
-   * This exception is thrown from Director calls that call into python when the 
-   * Python error is 
+   * This exception is thrown from Director calls that call into python when the
+   * Python error is
    */
   class PythonToCppException : public XbmcCommons::UncheckedException
   {
@@ -197,7 +197,7 @@ namespace PythonBindings
         T* o1 = (T*)retrieveApiInstance(obj1, swigType, methodNamespacePrefix, methodNameForErrorString);
         T* o2 = (T*)retrieveApiInstance(obj2, swigType, methodNamespacePrefix, methodNameForErrorString);
 
-        return ((*o1) < (*o2) ? -1 : 
+        return ((*o1) < (*o2) ? -1 :
                 ((*o1) > (*o2) ? 1 : 0));
       }
       catch (const XBMCAddon::WrongTypeException& e)
diff --git a/xbmc/interfaces/python/typemaps/python.Alternative.intm b/xbmc/interfaces/python/typemaps/python.Alternative.intm
index eaee4f085e..a0089a7524 100644
--- a/xbmc/interfaces/python/typemaps/python.Alternative.intm
+++ b/xbmc/interfaces/python/typemaps/python.Alternative.intm
@@ -47,7 +47,7 @@
         }
         catch (const XBMCAddon::WrongTypeException&)
         {
-          throw XBMCAddon::WrongTypeException("Failed to convert to input type to either a " 
+          throw XBMCAddon::WrongTypeException("Failed to convert to input type to either a "
                                               "${swigTypeParser.SwigType_ltype(types[0])} or a "
                                               "${swigTypeParser.SwigType_ltype(types[1])}" );
         }
diff --git a/xbmc/interfaces/python/typemaps/python.Alternative.outtm b/xbmc/interfaces/python/typemaps/python.Alternative.outtm
index 5288f756eb..de3ba32579 100644
--- a/xbmc/interfaces/python/typemaps/python.Alternative.outtm
+++ b/xbmc/interfaces/python/typemaps/python.Alternative.outtm
@@ -29,7 +29,7 @@
 
     if (<%if (ispointer) { %>${api} != NULL && <%}%>pos != XBMCAddon::none)
     { <%
-      types.eachWithIndex { curType, entryIndex -> 
+      types.eachWithIndex { curType, entryIndex ->
 %>
       if (pos == XBMCAddon::${altSwitch[entryIndex]})
       {
diff --git a/xbmc/interfaces/python/typemaps/python.Tuple.outtm b/xbmc/interfaces/python/typemaps/python.Tuple.outtm
index 02a6cd5e4e..83d5644532 100644
--- a/xbmc/interfaces/python/typemaps/python.Tuple.outtm
+++ b/xbmc/interfaces/python/typemaps/python.Tuple.outtm
@@ -34,7 +34,7 @@
 <%  }  // this ends the if (ispointer)
 %>    {
       PyObject* pyentry${seq}; <%
-      types.eachWithIndex { curType, entryIndex -> 
+      types.eachWithIndex { curType, entryIndex ->
 %>
 
       if (vecSize > ${entryIndex})
diff --git a/xbmc/interfaces/python/typemaps/python.string.outtm b/xbmc/interfaces/python/typemaps/python.string.outtm
index 6b92a53054..db2740e918 100644
--- a/xbmc/interfaces/python/typemaps/python.string.outtm
+++ b/xbmc/interfaces/python/typemaps/python.string.outtm
@@ -18,6 +18,6 @@
  *  <http://www.gnu.org/licenses/>.
  *
  */
-%>${result} = <% 
+%>${result} = <%
   if(method.@feature_python_coerceToUnicode) { %>PyUnicode_DecodeUTF8(${api}.c_str(),${api}.size(),"replace");<% }
   else { %>PyString_FromStringAndSize(${api}.c_str(), ${api}.length());<% } %>
\ No newline at end of file
diff --git a/xbmc/interfaces/python/typemaps/python.vector.outtm b/xbmc/interfaces/python/typemaps/python.vector.outtm
index 941204ea79..b1b2048342 100644
--- a/xbmc/interfaces/python/typemaps/python.vector.outtm
+++ b/xbmc/interfaces/python/typemaps/python.vector.outtm
@@ -28,7 +28,7 @@
     {
 %>
     if (${api} != NULL)
-    { 
+    {
 <%  }  %>
       ${result} = PyList_New(0);
 
diff --git a/xbmc/interfaces/swig/AddonModuleXbmc.i b/xbmc/interfaces/swig/AddonModuleXbmc.i
index a924f3faf7..1922406e7c 100644
--- a/xbmc/interfaces/swig/AddonModuleXbmc.i
+++ b/xbmc/interfaces/swig/AddonModuleXbmc.i
@@ -39,7 +39,7 @@ using namespace xbmc;
 #endif
 %}
 
-// This is all about warning suppression. It's OK that these base classes are 
+// This is all about warning suppression. It's OK that these base classes are
 // not part of what swig parses.
 %feature("knownbasetypes") XBMCAddon::xbmc "AddonClass,IPlayerCallback,AddonCallback"
 %feature("knownapitypes") XBMCAddon::xbmc "XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem"
diff --git a/xbmc/interfaces/swig/AddonModuleXbmcaddon.i b/xbmc/interfaces/swig/AddonModuleXbmcaddon.i
index 4587596ae1..8caddca56b 100644
--- a/xbmc/interfaces/swig/AddonModuleXbmcaddon.i
+++ b/xbmc/interfaces/swig/AddonModuleXbmcaddon.i
@@ -36,7 +36,7 @@ using namespace xbmcaddon;
 
 %}
 
-// This is all about warning suppression. It's OK that these base classes are 
+// This is all about warning suppression. It's OK that these base classes are
 // not part of what swig parses.
 %feature("knownbasetypes") XBMCAddon::xbmcaddon "AddonClass"
 
diff --git a/xbmc/interfaces/swig/AddonModuleXbmcgui.i b/xbmc/interfaces/swig/AddonModuleXbmcgui.i
index ea5953966b..5054081704 100644
--- a/xbmc/interfaces/swig/AddonModuleXbmcgui.i
+++ b/xbmc/interfaces/swig/AddonModuleXbmcgui.i
@@ -44,7 +44,7 @@ using namespace xbmcgui;
 
 %}
 
-// This is all about warning suppression. It's OK that these base classes are 
+// This is all about warning suppression. It's OK that these base classes are
 // not part of what swig parses.
 %feature("knownbasetypes") XBMCAddon::xbmcgui "AddonClass,AddonCallback"
 
diff --git a/xbmc/interfaces/swig/AddonModuleXbmcwsgi.i b/xbmc/interfaces/swig/AddonModuleXbmcwsgi.i
index ca6e9c206e..3312460910 100644
--- a/xbmc/interfaces/swig/AddonModuleXbmcwsgi.i
+++ b/xbmc/interfaces/swig/AddonModuleXbmcwsgi.i
@@ -43,7 +43,7 @@ using namespace xbmcwsgi;
 
 %}
 
-// This is all about warning suppression. It's OK that these base classes are 
+// This is all about warning suppression. It's OK that these base classes are
 // not part of what swig parses.
 %feature("knownbasetypes") XBMCAddon::xbmcaddon "AddonClass"
 
diff --git a/xbmc/listproviders/DirectoryProvider.cpp b/xbmc/listproviders/DirectoryProvider.cpp
index 76aa24d3bb..30e172171e 100644
--- a/xbmc/listproviders/DirectoryProvider.cpp
+++ b/xbmc/listproviders/DirectoryProvider.cpp
@@ -103,7 +103,7 @@ public:
       }
       m_target = items.GetProperty("node.target").asString();
     }
-    return true;    
+    return true;
   }
 
   std::shared_ptr<CThumbLoader> getThumbLoader(CGUIStaticItemPtr &item)
diff --git a/xbmc/listproviders/MultiProvider.h b/xbmc/listproviders/MultiProvider.h
index 2981596668..ccb84f37c7 100644
--- a/xbmc/listproviders/MultiProvider.h
+++ b/xbmc/listproviders/MultiProvider.h
@@ -35,7 +35,7 @@ class CMultiProvider : public IListProvider
 {
 public:
   CMultiProvider(const TiXmlNode *first, int parentID);
-  
+
   bool Update(bool forceRefresh) override;
   void Fetch(std::vector<CGUIListItemPtr> &items) override;
   bool IsUpdating() const override;
@@ -43,7 +43,7 @@ public:
   bool OnClick(const CGUIListItemPtr &item) override;
   bool OnInfo(const CGUIListItemPtr &item) override;
   bool OnContextMenu(const CGUIListItemPtr &item) override;
-  
+
 protected:
   typedef size_t item_key_type;
   static item_key_type GetItemKey(CGUIListItemPtr const &item);
diff --git a/xbmc/media/MediaType.h b/xbmc/media/MediaType.h
index 459554e034..50ac1d83a4 100644
--- a/xbmc/media/MediaType.h
+++ b/xbmc/media/MediaType.h
@@ -53,7 +53,7 @@ public:
   static std::string GetPluralLocalization(const MediaType &mediaType);
   static std::string GetCapitalLocalization(const MediaType &mediaType);
   static std::string GetCapitalPluralLocalization(const MediaType &mediaType);
-  
+
   typedef struct MediaTypeInfo {
     MediaTypeInfo(const MediaType &mediaType, const std::string &plural, bool container,
                   int localizationSingular, int localizationPlural,
diff --git a/xbmc/messaging/ApplicationMessenger.cpp b/xbmc/messaging/ApplicationMessenger.cpp
index 940556b79f..bc3db68d39 100644
--- a/xbmc/messaging/ApplicationMessenger.cpp
+++ b/xbmc/messaging/ApplicationMessenger.cpp
@@ -106,7 +106,7 @@ int CApplicationMessenger::SendMsg(ThreadMessage&& message, bool wait)
   std::shared_ptr<int> result;
 
   if (wait)
-  { 
+  {
     //Initialize result here as it's not needed for posted messages
     message.result = std::make_shared<int>(-1);
     // check that we're not being called from our application thread, else we'll be waiting
@@ -131,7 +131,7 @@ int CApplicationMessenger::SendMsg(ThreadMessage&& message, bool wait)
     return -1;
 
   ThreadMessage* msg = new ThreadMessage(std::move(message));
-  
+
   CSingleLock lock (m_critSection);
 
   if (msg->dwMessage == TMSG_GUI_MESSAGE)
@@ -146,7 +146,7 @@ int CApplicationMessenger::SendMsg(ThreadMessage&& message, bool wait)
                  //
   if (waitEvent) // ... it just so happens we have a spare reference to the
                  //  waitEvent ... just for such contingencies :)
-  { 
+  {
     // ensure the thread doesn't hold the graphics lock
     CSingleExit exit(CServiceBroker::GetWinSystem()->GetGfxContext());
     waitEvent->Wait();
@@ -213,7 +213,7 @@ void CApplicationMessenger::ProcessMessages()
     lock.Leave(); // <- see the large comment in SendMessage ^
 
     ProcessMessage(pMsg);
-    
+
     if (waitEvent)
       waitEvent->Set();
     delete pMsg;
diff --git a/xbmc/messaging/IMessageTarget.h b/xbmc/messaging/IMessageTarget.h
index de9bce0f46..84d26f60cd 100644
--- a/xbmc/messaging/IMessageTarget.h
+++ b/xbmc/messaging/IMessageTarget.h
@@ -39,7 +39,7 @@ public:
   /*!
    * \brief Should return the message mask that it wishes to receive
    *        messages for
-   *        
+   *
    * The message mask is defined in "messaging/ApplicationMessenger.h"
    * pick the next one available when creating a new
    */
@@ -48,10 +48,10 @@ public:
   /*!
    * \brief This gets called whenever a message matching the registered
    *        message mask is processed.
-   *        
+   *
    * There are no ordering guarantees here so implementations should never
    * rely on a certain ordering of messages.
-   * 
+   *
    * Cleaning up any pointers stored in the message payload is not specified
    * and is decided by the implementer of the message.
    * In general prefer to delete any data in this method to keep the callsites cleaner
diff --git a/xbmc/messaging/helpers/DialogHelper.h b/xbmc/messaging/helpers/DialogHelper.h
index abc0aefe14..1fe0835eff 100644
--- a/xbmc/messaging/helpers/DialogHelper.h
+++ b/xbmc/messaging/helpers/DialogHelper.h
@@ -99,7 +99,7 @@ DialogResponse ShowYesNoCustomDialog(CVariant heading, CVariant text, CVariant n
 
 /*!
   \brief This is a helper method to send a threadmessage to open a Yes/No dialog box
-  
+
   \param[in]  heading           The text to display as the dialog box header
   \param[in]  line0             The text to display on the first line
   \param[in]  line1             The text to display on the second line
diff --git a/xbmc/messaging/helpers/DialogOKHelper.cpp b/xbmc/messaging/helpers/DialogOKHelper.cpp
index 2928c25f35..e17a11d343 100644
--- a/xbmc/messaging/helpers/DialogOKHelper.cpp
+++ b/xbmc/messaging/helpers/DialogOKHelper.cpp
@@ -32,7 +32,7 @@ bool ShowOKDialogText(CVariant heading, CVariant text)
   DialogOKMessage options;
   options.heading = std::move(heading);
   options.text = std::move(text);
-  
+
   if (CApplicationMessenger::GetInstance().SendMsg(TMSG_GUI_DIALOG_OK, -1, -1, static_cast<void*>(&options)) > 0)
     return true;
   return false;
diff --git a/xbmc/messaging/helpers/DialogOKHelper.h b/xbmc/messaging/helpers/DialogOKHelper.h
index ee8272773c..9393957eda 100644
--- a/xbmc/messaging/helpers/DialogOKHelper.h
+++ b/xbmc/messaging/helpers/DialogOKHelper.h
@@ -43,7 +43,7 @@ struct DialogOKMessage
   CVariant heading; //!< Heading to be displayed in the dialog box
   CVariant text;  //!< Body text to be displayed, this is mutually exclusive with lines below
   std::array<CVariant, 3> lines;  //!< Body text to be displayed, specified as three lines. This is mutually exclusive with the text above
-  bool show = true; //!< bool to see if the dialog needs to be shown 
+  bool show = true; //!< bool to see if the dialog needs to be shown
 };
 
 /*!
@@ -70,7 +70,7 @@ bool ShowOKDialogText(CVariant heading, CVariant text);
 
 /*!
   \brief This is a helper method to send a threadmessage to open a OK dialog box
-  
+
   \param[in]  heading           The text to display as the dialog box header
   \param[in]  line0             The text to display on the first line
   \param[in]  line1             The text to display on the second line
diff --git a/xbmc/music/Album.cpp b/xbmc/music/Album.cpp
index 5d3f177d73..cc21e2d7c4 100644
--- a/xbmc/music/Album.cpp
+++ b/xbmc/music/Album.cpp
@@ -158,7 +158,7 @@ void CAlbum::SetArtistCredits(const std::vector<std::string>& names, const std::
         albumartistHints = names;
     }
 
-    // Try to get number of artist sort names and musicbrainz ids to match. Split sort names 
+    // Try to get number of artist sort names and musicbrainz ids to match. Split sort names
     // further using multiple possible delimiters, over single separator applied in Tag loader
     if (artistSort.size() != mbids.size())
       artistSort = StringUtils::SplitMulti(artistSort, { ";", ":", "|", "#" });
@@ -178,7 +178,7 @@ void CAlbum::SetArtistCredits(const std::vector<std::string>& names, const std::
       if (artistName.empty())
         artistName = artistId;
 
-      // Use artist sort name providing we have as many as we have mbid, 
+      // Use artist sort name providing we have as many as we have mbid,
       // otherwise something is wrong with them so ignore and leave blank
       if (artistSort.size() == mbids.size())
         artistCredits.emplace_back(StringUtils::Trim(artistName), StringUtils::Trim(artistSort[i]), artistId);
@@ -187,11 +187,11 @@ void CAlbum::SetArtistCredits(const std::vector<std::string>& names, const std::
     }
   }
   else
-  { 
-    /* 
+  {
+    /*
       No musicbrainz album artist ids so fill artist names directly.
-      This method only called during scanning when there is a musicbrainz album id, so 
-      means mbid tags are incomplete. But could also be called by JSON to SetAlbumDetails 
+      This method only called during scanning when there is a musicbrainz album id, so
+      means mbid tags are incomplete. But could also be called by JSON to SetAlbumDetails
       Try to separate album artist names further, and trim blank space.
     */
     std::vector<std::string> albumArtists = names;
@@ -209,7 +209,7 @@ void CAlbum::SetArtistCredits(const std::vector<std::string>& names, const std::
     for (size_t i = 0; i < albumArtists.size(); i++)
     {
       artistCredits.emplace_back(StringUtils::Trim(albumArtists[i]));
-      // Set artist sort name providing we have as many as we have artists, 
+      // Set artist sort name providing we have as many as we have artists,
       // otherwise something is wrong with them so ignore rather than guess.
       if (artistSort.size() == albumArtists.size())
         artistCredits.back().SetSortName(StringUtils::Trim(artistSort[i]));
@@ -220,16 +220,16 @@ void CAlbum::SetArtistCredits(const std::vector<std::string>& names, const std::
 void CAlbum::MergeScrapedAlbum(const CAlbum& source, bool override /* = true */)
 {
   /*
-   Initial scraping of album information when there is a Musicbrainz album ID derived from 
+   Initial scraping of album information when there is a Musicbrainz album ID derived from
    tags is done directly using that ID, otherwise the lookup is based on album and artist names
    but this can sometimes mis-identify the album (i.e. classical music has many "Symphony No. 5").
-   It is useful to store the scraped mbid, but we need to be able to correct any mistakes. Hence 
-   a manual refresh of album information uses either the mbid as derived from tags or the album 
+   It is useful to store the scraped mbid, but we need to be able to correct any mistakes. Hence
+   a manual refresh of album information uses either the mbid as derived from tags or the album
    and artist names, not any previously scraped mbid.
 
    When overwritting the data derived from tags, AND the original and scraped album have the same
-   Musicbrainz album ID, then merging is used to keep Kodi up to date with changes in the Musicbrainz 
-   database including album artist credits, song artist credits and song titles. However it is ony 
+   Musicbrainz album ID, then merging is used to keep Kodi up to date with changes in the Musicbrainz
+   database including album artist credits, song artist credits and song titles. However it is ony
    appropriate when the music files are tagged with mbids, these are taken as definative, scraped
    mbids can not be depended on in this way.
 
@@ -238,13 +238,13 @@ void CAlbum::MergeScrapedAlbum(const CAlbum& source, bool override /* = true */)
   */
 
   bArtistSongMerge = override && !bScrapedMBID
-    && !source.strMusicBrainzAlbumID.empty() && !strMusicBrainzAlbumID.empty() 
+    && !source.strMusicBrainzAlbumID.empty() && !strMusicBrainzAlbumID.empty()
     && (strMusicBrainzAlbumID.compare(source.strMusicBrainzAlbumID) == 0);
 
   /*
    Musicbrainz album (release) ID and release group ID values derived from music file tags are
-   always taken as accurate and so can not be overwritten by a scraped value. When the album does 
-   not already have an mbid or has a previously scraped mbid, merge the new scraped value, 
+   always taken as accurate and so can not be overwritten by a scraped value. When the album does
+   not already have an mbid or has a previously scraped mbid, merge the new scraped value,
    flagging it as being from the scraper rather than derived from music file tags.
   */
   if (!source.strMusicBrainzAlbumID.empty() && (strMusicBrainzAlbumID.empty() || bScrapedMBID))
@@ -259,19 +259,19 @@ void CAlbum::MergeScrapedAlbum(const CAlbum& source, bool override /* = true */)
 
   /*
    Scraping can return different album artists from the originals derived from tags, even when doing
-   a lookup on name. 
+   a lookup on name.
 
    When overwritting the data derived from tags, AND the original and scraped album have the same
    Musicbrainz album ID, then merging an album replaces both the album artsts and the song artists
-   with those scraped. 
-   
+   with those scraped.
+
    When not doing that kind of merge, for any matching artist names the Musicbrainz artist id
    returned by the scraper can be used to populate any previously missing Musicbrainz artist id values.
   */
   if (bArtistSongMerge)
   {
-    artistCredits = source.artistCredits; // Replace artists and store mbid returned by scraper    
-    strArtistDesc.clear();  // @todo: set artist display string e.g. "artist1 & artist2" when scraped 
+    artistCredits = source.artistCredits; // Replace artists and store mbid returned by scraper
+    strArtistDesc.clear();  // @todo: set artist display string e.g. "artist1 & artist2" when scraped
   }
   else
   {
@@ -325,10 +325,10 @@ void CAlbum::MergeScrapedAlbum(const CAlbum& source, bool override /* = true */)
   fRating = source.fRating;
   iUserrating = source.iUserrating;
   iVotes = source.iVotes;
-  
+
   /*
    When overwritting the data derived from tags, AND the original and scraped album have the same
-   Musicbrainz album ID, update the local songs with scaped Musicbrainz information including the 
+   Musicbrainz album ID, update the local songs with scaped Musicbrainz information including the
    artist credits.
   */
   if (bArtistSongMerge)
@@ -505,7 +505,7 @@ bool CAlbum::Load(const TiXmlElement *album, bool append, bool prioritise)
     float max_rating = 10;
     XMLUtils::GetFloat(album, "rating", rating);
     if (rElement->QueryFloatAttribute("max", &max_rating) == TIXML_SUCCESS && max_rating>=1)
-      rating *= (10.f / max_rating); // Normalise the Rating to between 0 and 10 
+      rating *= (10.f / max_rating); // Normalise the Rating to between 0 and 10
     if (rating > 10.f)
       rating = 10.f;
     fRating = rating;
@@ -542,7 +542,7 @@ bool CAlbum::Load(const TiXmlElement *album, bool append, bool prioritise)
   if (prioritise && iThumbCount && iThumbCount != thumbURL.m_url.size())
   {
     rotate(thumbURL.m_url.begin(),
-           thumbURL.m_url.begin()+iThumbCount, 
+           thumbURL.m_url.begin()+iThumbCount,
            thumbURL.m_url.end());
     thumbURL.m_xml = xmlAdd;
   }
@@ -642,7 +642,7 @@ bool CAlbum::Save(TiXmlNode *node, const std::string &tag, const std::string& st
     XMLUtils::SetString(albumArtistCreditsNode,               "artist", artistCredit->m_strArtist);
     XMLUtils::SetString(albumArtistCreditsNode,  "musicBrainzArtistID", artistCredit->m_strMusicBrainzArtistID);
   }
-  
+
   XMLUtils::SetString(album, "releasetype", GetReleaseType());
 
   return true;
diff --git a/xbmc/music/Album.h b/xbmc/music/Album.h
index eb231f2656..b7fd221ca3 100644
--- a/xbmc/music/Album.h
+++ b/xbmc/music/Album.h
@@ -92,7 +92,7 @@ public:
   \return album artist names as a vector of strings
   */
   const std::vector<std::string> GetAlbumArtist() const;
-  
+
   /*! \brief Get album artist MusicBrainz IDs from the vector of artistcredits objects
   \return album artist MusicBrainz IDs as a vector of strings
   */
@@ -104,7 +104,7 @@ public:
   \return album artist names as a single string
   */
   const std::string GetAlbumArtistString() const;
-  
+
   /*! \brief Get album artist sort name from the artist sort string (if it exists)
   or concatenated from the vector of artistcredits objects
   \return album artist sort names as a single string
@@ -132,16 +132,16 @@ public:
   /*! \brief Set album artist credits using the arrays of tag values.
    If strArtistSort (as from ALBUMARTISTSORT tag) is already set then individual
    artist sort names are also processed.
-   \param names       String vector of albumartist names (as from ALBUMARTIST tag) 
+   \param names       String vector of albumartist names (as from ALBUMARTIST tag)
    \param hints       String vector of albumartist name hints (as from ALBUMARTISTS tag)
    \param mbids       String vector of albumartist Musicbrainz IDs (as from MUSICBRAINZABUMARTISTID tag)
    \param artistnames String vector of artist names (as from ARTIST tag)
    \param artisthints String vector of artist name hints (as from ARTISTS tag)
    \param artistmbids String vector of artist Musicbrainz IDs (as from MUSICBRAINZARTISTID tag)
   */
-  void SetArtistCredits(const std::vector<std::string>& names, const std::vector<std::string>& hints, 
+  void SetArtistCredits(const std::vector<std::string>& names, const std::vector<std::string>& hints,
                         const std::vector<std::string>& mbids,
-                        const std::vector<std::string>& artistnames = std::vector<std::string>(), 
+                        const std::vector<std::string>& artistnames = std::vector<std::string>(),
                         const std::vector<std::string>& artisthints = std::vector<std::string>(),
                         const std::vector<std::string>& artistmbids = std::vector<std::string>());
 
diff --git a/xbmc/music/Artist.cpp b/xbmc/music/Artist.cpp
index f59229a504..3bdc140fda 100644
--- a/xbmc/music/Artist.cpp
+++ b/xbmc/music/Artist.cpp
@@ -26,16 +26,16 @@
 
 void CArtist::MergeScrapedArtist(const CArtist& source, bool override /* = true */)
 {
-  /*   
+  /*
   Initial scraping of artist information when the mbid is derived from tags is done directly
   using that ID, otherwise the lookup is based on name and can mis-identify the artist
   (many have same name). It is useful to store the scraped mbid, but we need to be
-  able to correct any mistakes. Hence a manual refresh of artist information uses either 
+  able to correct any mistakes. Hence a manual refresh of artist information uses either
   the mbid is derived from tags or the artist name, not any previously scraped mbid.
 
    A Musicbrainz artist ID derived from music file tags is always taken as accurate and so can
    not be overwritten by a scraped value. When the artist does not already have an mbid or has
-   a previously scraped mbid, merge the new scraped value, flagging it as being from the 
+   a previously scraped mbid, merge the new scraped value, flagging it as being from the
    scraper rather than derived from music file tags.
    */
   if (!source.strMusicBrainzArtistID.empty() && (strMusicBrainzArtistID.empty() || bScrapedMBID))
@@ -118,7 +118,7 @@ bool CArtist::Load(const TiXmlElement *artist, bool append, bool prioritise)
   if (prioritise && iThumbCount && iThumbCount != thumbURL.m_url.size())
   {
     rotate(thumbURL.m_url.begin(),
-           thumbURL.m_url.begin()+iThumbCount, 
+           thumbURL.m_url.begin()+iThumbCount,
            thumbURL.m_url.end());
     thumbURL.m_xml = xmlAdd;
   }
@@ -165,7 +165,7 @@ bool CArtist::Load(const TiXmlElement *artist, bool append, bool prioritise)
     {
       art.insert(make_pair(artdetailNode->ValueStr(), artdetailNode->FirstChild()->ValueStr()));
       artdetailNode = artdetailNode->NextSibling();
-    }    
+    }
   }
 
   return true;
diff --git a/xbmc/music/Artist.h b/xbmc/music/Artist.h
index f2ff4af470..4b6b096889 100644
--- a/xbmc/music/Artist.h
+++ b/xbmc/music/Artist.h
@@ -51,7 +51,7 @@ public:
     if (strMusicBrainzArtistID > a.strMusicBrainzArtistID) return false;
     return false;
   }
-  
+
   void MergeScrapedArtist(const CArtist& source, bool override = true);
 
   void Reset()
diff --git a/xbmc/music/GUIViewStateMusic.cpp b/xbmc/music/GUIViewStateMusic.cpp
index 624061f82b..00e64e1501 100644
--- a/xbmc/music/GUIViewStateMusic.cpp
+++ b/xbmc/music/GUIViewStateMusic.cpp
@@ -340,7 +340,7 @@ CGUIViewStateMusicSmartPlaylist::CGUIViewStateMusicSmartPlaylist(const CFileItem
     sortAttribute = static_cast<SortAttribute>(sortAttribute | SortAttributeUseArtistSortName);
   const CViewState *viewState = CViewStateSettings::GetInstance().Get("musicnavsongs");
 
-  if (items.GetContent() == "songs" || items.GetContent() == "mixed") 
+  if (items.GetContent() == "songs" || items.GetContent() == "mixed")
   {
     std::string strTrack=CServiceBroker::GetSettings().GetString(CSettings::SETTING_MUSICFILES_TRACKFORMAT);
     AddSortMethod(SortByTrackNumber, 554, LABEL_MASKS(strTrack, "%D"));  // Userdefined, Duration| empty, empty
@@ -365,8 +365,8 @@ CGUIViewStateMusicSmartPlaylist::CGUIViewStateMusicSmartPlaylist(const CFileItem
     }
 
     SetViewAsControl(CViewStateSettings::GetInstance().Get("musicnavsongs")->m_viewMode);
-  } 
-  else if (items.GetContent() == "albums") 
+  }
+  else if (items.GetContent() == "albums")
   {
     std::string strAlbum = g_advancedSettings.m_strMusicLibraryAlbumFormat;
     if (strAlbum.empty())
@@ -399,12 +399,12 @@ CGUIViewStateMusicSmartPlaylist::CGUIViewStateMusicSmartPlaylist(const CFileItem
     }
 
     SetViewAsControl(CViewStateSettings::GetInstance().Get("musicnavalbums")->m_viewMode);
-  } 
-  else 
+  }
+  else
   {
     CLog::Log(LOGERROR,"Music Smart Playlist must be one of songs, mixed or albums");
   }
-  
+
   LoadViewState(items.GetPath(), WINDOW_MUSIC_NAV);
 }
 
@@ -476,7 +476,7 @@ CGUIViewStateWindowMusicNav::CGUIViewStateWindowMusicNav(const CFileItemList& it
         AddSortMethod(SortByArtist, sortAttribute, 557, LABEL_MASKS("%A - %T", "%Y"));
         AddSortMethod(SortByArtistThenYear, sortAttribute, 578, LABEL_MASKS("%A - %T", "%Y"));
         AddSortMethod(SortByAlbum, sortAttribute, 558, LABEL_MASKS("%B - %T", "%Y"));
-        
+
         std::string strTrack=CServiceBroker::GetSettings().GetString(CSettings::SETTING_MUSICFILES_TRACKFORMAT);
         AddSortMethod(SortByTrackNumber, 554, LABEL_MASKS(strTrack, "%D"));  // Userdefined, Duration| empty, empty
       }
diff --git a/xbmc/music/MusicDatabase.cpp b/xbmc/music/MusicDatabase.cpp
index 2a1f95d2cf..bb40430a78 100644
--- a/xbmc/music/MusicDatabase.cpp
+++ b/xbmc/music/MusicDatabase.cpp
@@ -263,7 +263,7 @@ void CMusicDatabase::CreateAnalytics()
               "  DELETE FROM song_genre WHERE song_genre.idSong = old.idSong;"
               "  DELETE FROM art WHERE media_id=old.idSong AND media_type='song';"
               " END");
-  
+
   // we create views last to ensure all indexes are rolled in
   CreateViews();
 }
@@ -413,7 +413,7 @@ bool CMusicDatabase::AddAlbum(CAlbum& album)
                            song->strTitle, song->strMusicBrainzTrackID,
                            song->strFileName, song->strComment,
                            song->strMood, song->strThumb,
-                           song->GetArtistString(), 
+                           song->GetArtistString(),
                            song->GetArtistSort(),
                            song->genre,
                            song->iTrack, song->iDuration, song->iYear,
@@ -425,9 +425,9 @@ bool CMusicDatabase::AddAlbum(CAlbum& album)
                            song->votes,
                            song->replayGain);
 
-    if (song->artistCredits.empty())    
+    if (song->artistCredits.empty())
       AddSongArtist(BLANKARTIST_ID, song->idSong, ROLE_ARTIST, BLANKARTIST_NAME, 0); // Song must have at least one artist so set artist to [Missing]
-    
+
     for (auto artistCredit = song->artistCredits.begin(); artistCredit != song->artistCredits.end(); ++artistCredit)
     {
       artistCredit->idArtist = AddArtist(artistCredit->GetArtist(),
@@ -534,7 +534,7 @@ int CMusicDatabase::AddSong(const int idAlbum,
 
     if (!strMusicBrainzTrackID.empty())
       strSQL = PrepareSQL("SELECT idSong FROM song WHERE idAlbum = %i AND iTrack=%i AND strMusicBrainzTrackID = '%s'",
-                          idAlbum, 
+                          idAlbum,
                           iTrack,
                           strMusicBrainzTrackID.c_str());
     else
@@ -575,7 +575,7 @@ int CMusicDatabase::AddSong(const int idAlbum,
 
       if (dtLastPlayed.IsValid())
         strSQL += PrepareSQL(",%i,%i,%i,'%s', %.1f, %i, %i, '%s','%s', '%s')",
-                      iTimesPlayed, iStartOffset, iEndOffset, dtLastPlayed.GetAsDBDateTime().c_str(), rating, userrating, votes, 
+                      iTimesPlayed, iStartOffset, iEndOffset, dtLastPlayed.GetAsDBDateTime().c_str(), rating, userrating, votes,
                       strComment.c_str(), strMood.c_str(), replayGain.Get().c_str());
       else
         strSQL += PrepareSQL(",%i,%i,%i,NULL, %.1f, %i, %i,'%s', '%s', '%s')",
@@ -587,8 +587,8 @@ int CMusicDatabase::AddSong(const int idAlbum,
     {
       idSong = m_pDS->fv("idSong").get_asInt();
       m_pDS->close();
-      UpdateSong( idSong, strTitle, strMusicBrainzTrackID, strPathAndFileName, strComment, strMood, strThumb, 
-                  artistDisp, artistSort, genres, iTrack, iDuration, iYear, iTimesPlayed, iStartOffset, iEndOffset, 
+      UpdateSong( idSong, strTitle, strMusicBrainzTrackID, strPathAndFileName, strComment, strMood, strThumb,
+                  artistDisp, artistSort, genres, iTrack, iDuration, iYear, iTimesPlayed, iStartOffset, iEndOffset,
                   dtLastPlayed, rating, userrating, votes, replayGain);
     }
 
@@ -641,7 +641,7 @@ bool CMusicDatabase::GetSong(int idSong, CSong& song)
       int idSongArtistRole = record->at(songArtistOffset + artistCredit_idRole).get_asInt();
       if (idSongArtistRole == ROLE_ARTIST)
         song.artistCredits.emplace_back(GetArtistCreditFromDataset(record, songArtistOffset));
-      else 
+      else
         song.AppendArtistRole(GetArtistRoleFromDataset(record, songArtistOffset));
 
       m_pDS->next();
@@ -682,7 +682,7 @@ bool CMusicDatabase::UpdateSong(CSong& song, bool bArtists /*= true*/)
                     song.replayGain);
   if (result < 0)
     return false;
-  
+
   // Replace Song genres and update genre string using the standardised genre names
   AddSongGenres(song.idSong, song.genre);
   if (bArtists)
@@ -717,7 +717,7 @@ int CMusicDatabase::UpdateSong(int idSong,
                                const std::vector<std::string>& genres,
                                int iTrack, int iDuration, int iYear,
                                int iTimesPlayed, int iStartOffset, int iEndOffset,
-                               const CDateTime& dtLastPlayed, float rating, int userrating, int votes, 
+                               const CDateTime& dtLastPlayed, float rating, int userrating, int votes,
                                const ReplayGain& replayGain)
 {
   if (idSong < 0)
@@ -744,7 +744,7 @@ int CMusicDatabase::UpdateSong(int idSong,
     strSQL += PrepareSQL(", strArtistSort = NULL");
   else
     strSQL += PrepareSQL(", strArtistSort = '%s'", artistSort.c_str());
-  
+
 
   if (dtLastPlayed.IsValid())
     strSQL += PrepareSQL(", iTimesPlayed = %i, iStartOffset = %i, iEndOffset = %i, lastplayed = '%s', rating = %.1f, userrating = %i, votes = %i, comment = '%s', mood = '%s', strReplayGain = '%s'",
@@ -765,7 +765,7 @@ int CMusicDatabase::UpdateSong(int idSong,
 
 int CMusicDatabase::AddAlbum(const std::string& strAlbum, const std::string& strMusicBrainzAlbumID,
                              const std::string& strReleaseGroupMBID,
-                             const std::string& strArtist, const std::string& strArtistSort, 
+                             const std::string& strArtist, const std::string& strArtistSort,
                              const std::string& strGenre, int year,
                              const std::string& strRecordLabel, const std::string& strType,
                              bool bCompilation, CAlbum::ReleaseType releaseType)
@@ -833,7 +833,7 @@ int CMusicDatabase::AddAlbum(const std::string& strAlbum, const std::string& str
       m_pDS->close();
 
       strSQL = "UPDATE album SET ";
-      if (!strMusicBrainzAlbumID.empty())   
+      if (!strMusicBrainzAlbumID.empty())
         strSQL += PrepareSQL("strAlbum = '%s', strArtistDisp = '%s', ", strAlbum.c_str(), strArtist.c_str());
       if (strReleaseGroupMBID.empty())
         strSQL += PrepareSQL(" strReleaseGroupMBID = NULL,");
@@ -843,7 +843,7 @@ int CMusicDatabase::AddAlbum(const std::string& strAlbum, const std::string& str
         strSQL += PrepareSQL(" strArtistSort = NULL");
       else
         strSQL += PrepareSQL(" strArtistSort = '%s'", strArtistSort.c_str());
-      
+
       strSQL += PrepareSQL(", strGenres = '%s', iYear=%i, strLabel = '%s', strType = '%s', "
         "bCompilation=%i, strReleaseType = '%s', lastScraped = NULL WHERE idAlbum=%i",
         strGenre.c_str(),
@@ -929,7 +929,7 @@ bool CMusicDatabase::GetAlbum(int idAlbum, CAlbum& album, bool getSongs /* = tru
     if (idAlbum == -1)
       return false; // not in the database
 
-    //Get album, song and album song info data using separate queries/datasets because we can have 
+    //Get album, song and album song info data using separate queries/datasets because we can have
     //multiple roles per artist for songs and that makes a single combined join impractical
     //Get album data
     std::string sql;
@@ -955,9 +955,9 @@ bool CMusicDatabase::GetAlbum(int idAlbum, CAlbum& album, bool getSongs /* = tru
       const dbiplus::sql_record* const record = m_pDS->get_sql_record();
 
       // Album artists always have role = 0 (idRole and strRole columns are in albumartistview to match columns of songartistview)
-      // so there is only one row in the result set for each artist credit.      
+      // so there is only one row in the result set for each artist credit.
       album.artistCredits.push_back(GetArtistCreditFromDataset(record, albumArtistOffset));
-     
+
       m_pDS->next();
     }
     m_pDS->close(); // cleanup recordset data
@@ -993,10 +993,10 @@ bool CMusicDatabase::GetAlbum(int idAlbum, CAlbum& album, bool getSongs /* = tru
         }
 
         int idSongArtistRole = record->at(songArtistOffset + artistCredit_idRole).get_asInt();
-        //By query order song is the last one appended to the album song vector.                
+        //By query order song is the last one appended to the album song vector.
         if (idSongArtistRole == ROLE_ARTIST)
           album.songs.back().artistCredits.emplace_back(GetArtistCreditFromDataset(record, songArtistOffset));
-        else 
+        else
           album.songs.back().AppendArtistRole(GetArtistRoleFromDataset(record, songArtistOffset));
 
         m_pDS->next();
@@ -1112,11 +1112,11 @@ int CMusicDatabase::AddArtist(const std::string& strArtist, const std::string& s
   int idArtist = AddArtist(strArtist, strMusicBrainzArtistID, bScrapedMBID);
   if (idArtist < 0 || strSortName.empty())
     return idArtist;
-  
-  /* Artist sort name always taken as the first value provided that is different from name, so only  
+
+  /* Artist sort name always taken as the first value provided that is different from name, so only
      update when current sort name is blank. If a new sortname the same as name is provided then
      clear any sortname currently held.
-  */ 
+  */
 
   try
   {
@@ -1135,7 +1135,7 @@ int CMusicDatabase::AddArtist(const std::string& strArtist, const std::string& s
     strArtistSort = m_pDS->fv("strSortName").get_asString();
     m_pDS->close();
 
-    if (!strArtistSort.empty())    
+    if (!strArtistSort.empty())
     {
       if (strSortName.compare(strArtistName) == 0)
         m_pDS->exec(PrepareSQL("UPDATE artist SET strSortName = NULL WHERE idArtist = %i", idArtist));
@@ -1247,7 +1247,7 @@ int CMusicDatabase::AddArtist(const std::string& strArtist, const std::string& s
 int  CMusicDatabase::UpdateArtist(int idArtist,
                                   const std::string& strArtist, const std::string& strSortName,
                                   const std::string& strMusicBrainzArtistID, const bool bScrapedMBID,
-                                  const std::string& strType, const std::string& strGender, 
+                                  const std::string& strType, const std::string& strGender,
                                   const std::string& strDisambiguation,
                                   const std::string& strBorn, const std::string& strFormed,
                                   const std::string& strGenres, const std::string& strMoods,
@@ -1270,10 +1270,10 @@ int  CMusicDatabase::UpdateArtist(int idArtist,
                       " strBiography = '%s', strDied = '%s', strDisbanded = '%s', "
                       " strYearsActive = '%s', strImage = '%s', strFanart = '%s', "
                       " lastScraped = '%s', bScrapedMBID = %i",
-                      strArtist.c_str(), 
+                      strArtist.c_str(),
                       /* strSortName.c_str(),*/
                       /* strMusicBrainzArtistID.c_str(), */
-                      strType.c_str(), strGender.c_str(), strDisambiguation.c_str(), 
+                      strType.c_str(), strGender.c_str(), strDisambiguation.c_str(),
                       strBorn.c_str(), strFormed.c_str(), strGenres.c_str(),
                       strMoods.c_str(), strStyles.c_str(), strInstruments.c_str(),
                       strBiography.c_str(), strDied.c_str(), strDisbanded.c_str(),
@@ -1305,7 +1305,7 @@ bool CMusicDatabase::UpdateArtistScrapedMBID(int idArtist, const std::string& st
   // Set scraped artist Musicbrainz ID for a previously added artist with no MusicBrainz ID
   std::string strSQL;
   strSQL = PrepareSQL("UPDATE artist SET strMusicBrainzArtistID = '%s', bScrapedMBID = 1 "
-    "WHERE idArtist = %i AND strMusicBrainzArtistID IS NULL", 
+    "WHERE idArtist = %i AND strMusicBrainzArtistID IS NULL",
     strMusicBrainzArtistID.c_str(), idArtist);
 
   bool status = ExecuteQuery(strSQL);
@@ -1379,7 +1379,7 @@ bool CMusicDatabase::GetArtistExists(int idArtist)
     {
       m_pDS->close();
       return false;
-    }    
+    }
     m_pDS->close(); // cleanup recordset data
     return true;
   }
@@ -1446,7 +1446,7 @@ bool CMusicDatabase::GetArtistDiscography(int idArtist, CFileItemList& items)
       "SELECT strAlbum, iYear, album.idAlbum "
       "FROM album JOIN album_artist ON album_artist.idAlbum = album.idAlbum "
       "WHERE album_artist.idArtist = %i "
-      "ORDER BY iYear, strAlbum, idAlbum DESC",       
+      "ORDER BY iYear, strAlbum, idAlbum DESC",
       idArtist, idArtist);
 
     if (!m_pDS->query(strSQL))
@@ -1553,7 +1553,7 @@ int CMusicDatabase::AddSongContributor(int idSong, const std::string& strRole, c
     if (NULL == m_pDS.get()) return -1;
 
     int idArtist = -1;
-    // Add artist. As we only have name (no MBID) first try to identify artist from song 
+    // Add artist. As we only have name (no MBID) first try to identify artist from song
     // as they may have already been added with a different role (including MBID).
     strSQL = PrepareSQL("SELECT idArtist FROM song_artist WHERE idSong = %i AND strArtist LIKE '%s' ", idSong, strArtist.c_str());
     m_pDS->query(strSQL);
@@ -1585,7 +1585,7 @@ void CMusicDatabase::AddSongContributors(int idSong, const VECMUSICROLES& contri
   {
     composerSort = StringUtils::Split(strSort, g_advancedSettings.m_musicItemSeparator);
   }
-  
+
   for (const auto &credit : contributors)
   {
     std::string strSortName;
@@ -1642,9 +1642,9 @@ bool CMusicDatabase::GetRolesByArtist(int idArtist, CFileItem* item)
       m_pDS->close();
       return true;
     }
-    
+
     CVariant artistRoles(CVariant::VariantTypeArray);
-    
+
     while (!m_pDS->eof())
     {
       CVariant roleObj;
@@ -1722,18 +1722,18 @@ bool CMusicDatabase::AddSongGenres(int idSong, const std::vector<std::string>& g
 
 bool CMusicDatabase::GetAlbumsByArtist(int idArtist, std::vector<int> &albums)
 {
-  try 
+  try
   {
     std::string strSQL;
     strSQL = PrepareSQL("SELECT idAlbum  FROM album_artist WHERE idArtist = %i", idArtist);
-    if (!m_pDS->query(strSQL)) 
+    if (!m_pDS->query(strSQL))
       return false;
     if (m_pDS->num_rows() == 0)
     {
       m_pDS->close();
       return false;
     }
-    
+
     while (!m_pDS->eof())
     {
       albums.push_back(m_pDS->fv("idAlbum").get_asInt());
@@ -1751,13 +1751,13 @@ bool CMusicDatabase::GetAlbumsByArtist(int idArtist, std::vector<int> &albums)
 
 bool CMusicDatabase::GetArtistsByAlbum(int idAlbum, CFileItem* item)
 {
-  try 
+  try
   {
     std::string strSQL;
-    
+
     strSQL = PrepareSQL("SELECT * FROM albumartistview WHERE idAlbum = %i", idAlbum);
-    
-    if (!m_pDS->query(strSQL)) 
+
+    if (!m_pDS->query(strSQL))
       return false;
     if (m_pDS->num_rows() == 0)
     {
@@ -1773,7 +1773,7 @@ bool CMusicDatabase::GetArtistsByAlbum(int idAlbum, CFileItem* item)
       m_pDS->next();
     }
     m_pDS->close();
-   
+
     // Populate item with song albumartist credits
     std::vector<std::string> musicBrainzID;
     std::vector<std::string> albumartists;
@@ -1801,19 +1801,19 @@ bool CMusicDatabase::GetArtistsByAlbum(int idAlbum, CFileItem* item)
 
 bool CMusicDatabase::GetSongsByArtist(int idArtist, std::vector<int> &songs)
 {
-  try 
+  try
   {
     std::string strSQL;
     //Restrict to Artists only, no other roles
     strSQL = PrepareSQL("SELECT idSong FROM song_artist WHERE idArtist = %i AND idRole = 1", idArtist);
-    if (!m_pDS->query(strSQL)) 
+    if (!m_pDS->query(strSQL))
       return false;
     if (m_pDS->num_rows() == 0)
     {
       m_pDS->close();
       return false;
     }
-    
+
     while (!m_pDS->eof())
     {
       songs.push_back(m_pDS->fv("idSong").get_asInt());
@@ -1831,12 +1831,12 @@ bool CMusicDatabase::GetSongsByArtist(int idArtist, std::vector<int> &songs)
 
 bool CMusicDatabase::GetArtistsBySong(int idSong, std::vector<int> &artists)
 {
-  try 
+  try
   {
     std::string strSQL;
     //Restrict to Artists only, no other roles
     strSQL = PrepareSQL("SELECT idArtist FROM song_artist WHERE idSong = %i AND idRole = 1", idSong);
-    if (!m_pDS->query(strSQL)) 
+    if (!m_pDS->query(strSQL))
       return false;
     if (m_pDS->num_rows() == 0)
     {
@@ -1987,7 +1987,7 @@ bool CMusicDatabase::GetGenresBySong(int idSong, std::vector<int>& genres)
 bool CMusicDatabase::GetIsAlbumArtist(int idArtist, CFileItem* item)
 {
   try
-  {    
+  {
     int countalbum = strtol(GetSingleValue("album_artist", "count(idArtist)", PrepareSQL("idArtist=%i", idArtist)).c_str(), NULL, 10);
     CVariant IsAlbumArtistObj(CVariant::VariantTypeBoolean);
     IsAlbumArtistObj = (countalbum > 0);
@@ -2082,7 +2082,7 @@ CSong CMusicDatabase::GetSongFromDataset(const dbiplus::sql_record* const record
   song.strMood = record->at(offset + song_mood).get_asString();
   song.bCompilation = record->at(offset + song_bCompilation).get_asInt() == 1;
   // Replay gain data (needed for songs from cuesheets, both separate .cue files and embedded metadata)
-  song.replayGain.Set(record->at(offset + song_strReplayGain).get_asString());  
+  song.replayGain.Set(record->at(offset + song_strReplayGain).get_asString());
   // Get filename with full path
   song.strFileName = URIUtils::AddFileToFolder(record->at(offset + song_strPath).get_asString(), record->at(offset + song_strFileName).get_asString());
   return song;
@@ -2236,7 +2236,7 @@ CArtistCredit CMusicDatabase::GetArtistCreditFromDataset(const dbiplus::sql_reco
 
 CMusicRole CMusicDatabase::GetArtistRoleFromDataset(const dbiplus::sql_record* const record, int offset /* = 0 */)
 {
-  CMusicRole ArtistRole(record->at(offset + artistCredit_idRole).get_asInt(), 
+  CMusicRole ArtistRole(record->at(offset + artistCredit_idRole).get_asInt(),
                         record->at(offset + artistCredit_strRole).get_asString(),
                         record->at(offset + artistCredit_strArtist).get_asString(),
                         record->at(offset + artistCredit_idArtist).get_asInt());
@@ -2332,7 +2332,7 @@ int CMusicDatabase::GetAlbumIdByPath(const std::string& strPath)
     int idAlbum = -1; // If no album is found, or more than one album is found then -1 is returned
     if (iRowsFound == 1)
       idAlbum = m_pDS->fv(0).get_asInt();
-    
+
     m_pDS->close();
 
     return idAlbum;
@@ -2505,7 +2505,7 @@ bool CMusicDatabase::GetTop100Albums(VECALBUMS& albums)
       }
       // Get album artists
       albums.back().artistCredits.push_back(GetArtistCreditFromDataset(record, albumArtistOffset));
-   
+
       m_pDS->next();
     }
 
@@ -2578,7 +2578,7 @@ bool CMusicDatabase::GetRecentlyPlayedAlbums(VECALBUMS& albums)
       "ORDER BY albumview.lastplayed DESC LIMIT %u) as playedalbums "
       "JOIN albumview ON albumview.idAlbum = playedalbums.idAlbum "
       "JOIN albumartistview ON albumview.idAlbum = albumartistview.idAlbum "
-      "ORDER BY albumview.lastplayed DESC, albumartistview.iorder ", 
+      "ORDER BY albumview.lastplayed DESC, albumartistview.iorder ",
       CAlbum::ReleaseTypeToString(CAlbum::Album).c_str(), RECENTLY_PLAYED_LIMIT);
 
     CLog::Log(LOGDEBUG, "%s query: %s", __FUNCTION__, strSQL.c_str());
@@ -2704,7 +2704,7 @@ bool CMusicDatabase::GetRecentlyAddedAlbums(VECALBUMS& albums, unsigned int limi
     if (NULL == m_pDS.get()) return false;
 
     // Get data from album and album_artist tables to fully populate albums
-    // Use idAlbum to determine the recently added albums 
+    // Use idAlbum to determine the recently added albums
     // (not "dateAdded" as this is file time stamp and nothing to do with when albums added to library)
     std::string strSQL = PrepareSQL("SELECT albumview.*, albumartistview.* FROM "
       "(SELECT idAlbum FROM album WHERE strAlbum != '' ORDER BY idAlbum DESC LIMIT %u) AS recentalbums "
@@ -2761,11 +2761,11 @@ bool CMusicDatabase::GetRecentlyAddedAlbumSongs(const std::string& strBaseDir, C
       return false;
 
     // Get data from song and song_artist tables to fully populate songs
-    // Use idAlbum to determine the recently added albums 
+    // Use idAlbum to determine the recently added albums
     // (not "dateAdded" as this is file time stamp and nothing to do with when albums added to library)
     std::string strSQL;
     strSQL = PrepareSQL("SELECT songview.*, songartistview.* FROM "
-        "(SELECT idAlbum FROM album ORDER BY idAlbum DESC LIMIT %u) AS recentalbums " 
+        "(SELECT idAlbum FROM album ORDER BY idAlbum DESC LIMIT %u) AS recentalbums "
         "JOIN songview ON songview.idAlbum = recentalbums.idAlbum "
         "JOIN songartistview ON songview.idSong = songartistview.idSong "
         "ORDER BY songview.idAlbum DESC, songview.idSong, songartistview.idRole, songartistview.iOrder ",
@@ -2861,7 +2861,7 @@ bool CMusicDatabase::GetSongsByPath(const std::string& strPath1, MAPSONGS& songs
     if (NULL == m_pDB.get()) return false;
     if (NULL == m_pDS.get()) return false;
 
-    std::string strSQL=PrepareSQL("SELECT * FROM songview WHERE strPath='%s'", strPath.c_str()); 
+    std::string strSQL=PrepareSQL("SELECT * FROM songview WHERE strPath='%s'", strPath.c_str());
     if (!m_pDS->query(strSQL)) return false;
     CLog::Log(LOGDEBUG, "%s query: %s", __FUNCTION__, strSQL.c_str());
     int iRowsFound = m_pDS->num_rows();
@@ -3252,7 +3252,7 @@ bool CMusicDatabase::CleanupInfoSettings()
   {
     // Cleanup orphaned info settings (ie those that don't belong to an album or artist entry)
     // Must be executed AFTER the album and artist tables have been cleaned.
-    std::string strSQL = "DELETE FROM infosetting WHERE idSetting NOT IN (SELECT idInfoSetting FROM artist) " 
+    std::string strSQL = "DELETE FROM infosetting WHERE idSetting NOT IN (SELECT idInfoSetting FROM artist) "
       "AND idSetting NOT IN (SELECT idInfoSetting FROM album)";
     m_pDS->exec(strSQL);
     return true;
@@ -3628,7 +3628,7 @@ void CMusicDatabase::Clean()
     HELPERS::ShowOKDialogText(CVariant{189}, CVariant{14057});
     return;
   }
-  
+
   if (HELPERS::ShowYesNoDialogText(CVariant{313}, CVariant{333}) == DialogResponse::YES)
   {
     CMusicDatabase musicdatabase;
@@ -3872,7 +3872,7 @@ bool CMusicDatabase::GetAlbumsByYear(const std::string& strBaseDir, CFileItemLis
 
   musicUrl.AddOption("year", year);
   musicUrl.AddOption("show_singles", true); // allow singles to be listed
-  
+
   Filter filter;
   return GetAlbumsByWhere(musicUrl.ToString(), filter, items);
 }
@@ -3884,21 +3884,21 @@ bool CMusicDatabase::GetCommonNav(const std::string &strBaseDir, const std::stri
 
   if (table.empty() || labelField.empty())
     return false;
-  
+
   try
   {
     Filter extFilter = filter;
     std::string strSQL = "SELECT %s FROM " + table + " ";
     extFilter.AppendGroup(labelField);
     extFilter.AppendWhere(labelField + " != ''");
-    
+
     if (countOnly)
     {
       extFilter.fields = "COUNT(DISTINCT " + labelField + ")";
       extFilter.group.clear();
       extFilter.order.clear();
     }
-    
+
     // Do prepare before add where as it could contain a LIKE statement with wild card that upsets format
     // e.g. LIKE '%symphony%' would be taken as a %s format argument
     strSQL = PrepareSQL(strSQL, !extFilter.fields.empty() ? extFilter.fields.c_str() : labelField.c_str());
@@ -3906,49 +3906,49 @@ bool CMusicDatabase::GetCommonNav(const std::string &strBaseDir, const std::stri
     CMusicDbUrl musicUrl;
     if (!BuildSQL(strBaseDir, strSQL, extFilter, strSQL, musicUrl))
       return false;
-    
+
     // run query
     CLog::Log(LOGDEBUG, "%s query: %s", __FUNCTION__, strSQL.c_str());
     if (!m_pDS->query(strSQL))
       return false;
-    
+
     int iRowsFound = m_pDS->num_rows();
     if (iRowsFound <= 0)
     {
       m_pDS->close();
       return false;
     }
-    
+
     if (countOnly)
     {
       CFileItemPtr pItem(new CFileItem());
       pItem->SetProperty("total", iRowsFound == 1 ? m_pDS->fv(0).get_asInt() : iRowsFound);
       items.Add(pItem);
-      
+
       m_pDS->close();
       return true;
     }
-    
+
     // get data from returned rows
     while (!m_pDS->eof())
     {
       std::string labelValue = m_pDS->fv(labelField.c_str()).get_asString();
       CFileItemPtr pItem(new CFileItem(labelValue));
-      
+
       CMusicDbUrl itemUrl = musicUrl;
       std::string strDir = StringUtils::Format("%s/", labelValue.c_str());
       itemUrl.AppendPath(strDir);
       pItem->SetPath(itemUrl.ToString());
-      
+
       pItem->m_bIsFolder = true;
       items.Add(pItem);
-      
+
       m_pDS->next();
     }
-    
+
     // cleanup
     m_pDS->close();
-    
+
     return true;
   }
   catch (...)
@@ -3956,7 +3956,7 @@ bool CMusicDatabase::GetCommonNav(const std::string &strBaseDir, const std::stri
     m_pDS->close();
     CLog::Log(LOGERROR, "%s failed", __FUNCTION__);
   }
-  
+
   return false;
 }
 
@@ -4043,7 +4043,7 @@ bool CMusicDatabase::GetArtistsByWhere(const std::string& strBaseDir, const Filt
       if (extended)
         extFilter.AppendGroup("artistview.idArtist");
     }
-    
+
     if (countOnly)
     {
       extFilter.fields = "COUNT(DISTINCT artistview.idArtist)";
@@ -4090,7 +4090,7 @@ bool CMusicDatabase::GetArtistsByWhere(const std::string& strBaseDir, const Filt
     if (total < iRowsFound)
       total = iRowsFound;
     items.SetProperty("total", total);
-    
+
     DatabaseResults results;
     results.reserve(iRowsFound);
     if (!SortUtils::SortFromDataset(sortDescription, MediaTypeArtist, m_pDS, results))
@@ -4103,7 +4103,7 @@ bool CMusicDatabase::GetArtistsByWhere(const std::string& strBaseDir, const Filt
     {
       unsigned int targetRow = (unsigned int)i.at(FieldRow).asInteger();
       const dbiplus::sql_record* const record = data.at(targetRow);
-      
+
       try
       {
         CArtist artist = GetArtistFromDataset(record, false);
@@ -4254,7 +4254,7 @@ bool CMusicDatabase::GetAlbumsByWhere(const std::string &baseDir, const Filter &
       m_pDS->close();
       return true;
     }
-    
+
     DatabaseResults results;
     results.reserve(iRowsFound);
     if (!SortUtils::SortFromDataset(sortDescription, MediaTypeAlbum, m_pDS, results))
@@ -4267,7 +4267,7 @@ bool CMusicDatabase::GetAlbumsByWhere(const std::string &baseDir, const Filter &
     {
       unsigned int targetRow = (unsigned int)i.at(FieldRow).asInteger();
       const dbiplus::sql_record* const record = data.at(targetRow);
-      
+
       try
       {
         CMusicDbUrl itemUrl = musicUrl;
@@ -4342,7 +4342,7 @@ bool CMusicDatabase::GetAlbumsByWhere(const std::string &baseDir, const Filter &
       albums.reserve(total);
 
     std::string strSQL;
-    
+
     // Get data from album, album_artist and artist tables to fully populate albums with album artists
     // All albums have at least one artist so inner join sufficient
     if (limited)
@@ -4353,7 +4353,7 @@ bool CMusicDatabase::GetAlbumsByWhere(const std::string &baseDir, const Filter &
     else
       strSQL = "SELECT albumview.*, albumartistview.* "
                "FROM albumview JOIN albumartistview ON albumartistview.idalbum = albumview.idalbum " + strSQLExtra;
-    
+
     CLog::Log(LOGDEBUG, "%s query: %s", __FUNCTION__, strSQL.c_str());
     // run query
     unsigned int time = XbmcThreads::SystemClockMillis();
@@ -4371,8 +4371,8 @@ bool CMusicDatabase::GetAlbumsByWhere(const std::string &baseDir, const Filter &
 
     DatabaseResults results;
     results.reserve(iRowsFound);
-    // Do not apply any limit when sorting as have join with albumartistview so limit would 
-    // apply incorrectly (although when SortByNone limit already applied in SQL). 
+    // Do not apply any limit when sorting as have join with albumartistview so limit would
+    // apply incorrectly (although when SortByNone limit already applied in SQL).
     // Apply limits later to album list rather than dataset
     // But Artist order may be disturbed by sort???
     sorting = sortDescription;
@@ -4451,13 +4451,13 @@ bool CMusicDatabase::GetSongsFullByWhere(const std::string &baseDir, const Filte
     std::string strSQLExtra;
     if (!BuildSQL(strSQLExtra, extFilter, strSQLExtra))
       return false;
-    
+
     // Count number of songs that satisfy selection criteria
     total = (int)strtol(GetSingleValue("SELECT COUNT(1) FROM songview " + strSQLExtra, m_pDS).c_str(), NULL, 10);
 
     // Apply any limiting directly in SQL if there is either no special sorting or random sort
     // When limited, random sort is also applied in SQL
-    bool limitedInSQL = extFilter.limit.empty() && 
+    bool limitedInSQL = extFilter.limit.empty() &&
       (sortDescription.sortBy == SortByNone || sortDescription.sortBy == SortByRandom) &&
       (sortDescription.limitStart > 0 || sortDescription.limitEnd > 0);
     if (limitedInSQL)
@@ -4502,8 +4502,8 @@ bool CMusicDatabase::GetSongsFullByWhere(const std::string &baseDir, const Filte
 
     DatabaseResults results;
     results.reserve(iRowsFound);
-    // Avoid sorting with limits when have join with songartistview 
-    // Limit when SortByNone already applied in SQL, 
+    // Avoid sorting with limits when have join with songartistview
+    // Limit when SortByNone already applied in SQL,
     // apply sort later to fileitems list rather than dataset
     sorting = sortDescription;
     if (artistData && sortDescription.sortBy != SortByNone)
@@ -4522,7 +4522,7 @@ bool CMusicDatabase::GetSongsFullByWhere(const std::string &baseDir, const Filte
     {
       unsigned int targetRow = (unsigned int)i.at(FieldRow).asInteger();
       const dbiplus::sql_record* const record = data.at(targetRow);
-      
+
       try
       {
         if (songId != record->at(song_idSong).get_asInt())
@@ -4570,7 +4570,7 @@ bool CMusicDatabase::GetSongsFullByWhere(const std::string &baseDir, const Filte
     // that is when have join with songartistview and sorting other than random with limit
     if (artistData && sortDescription.sortBy != SortByNone && !(limitedInSQL && sortDescription.sortBy == SortByRandom))
       items.Sort(sortDescription);
-     
+
     CLog::Log(LOGDEBUG, "%s(%s) - took %d ms", __FUNCTION__, filter.where.c_str(), XbmcThreads::SystemClockMillis() - time);
     return true;
   }
@@ -4639,7 +4639,7 @@ bool CMusicDatabase::GetSongsByWhere(const std::string &baseDir, const Filter &f
     if (total < iRowsFound)
       total = iRowsFound;
     items.SetProperty("total", total);
-    
+
     DatabaseResults results;
     results.reserve(iRowsFound);
     if (!SortUtils::SortFromDataset(sortDescription, MediaTypeSong, m_pDS, results))
@@ -4653,7 +4653,7 @@ bool CMusicDatabase::GetSongsByWhere(const std::string &baseDir, const Filter &f
     {
       unsigned int targetRow = (unsigned int)i.at(FieldRow).asInteger();
       const dbiplus::sql_record* const record = data.at(targetRow);
-      
+
       try
       {
         CFileItemPtr item(new CFileItem);
@@ -4690,7 +4690,7 @@ bool CMusicDatabase::GetSongsByYear(const std::string& baseDir, CFileItemList& i
     return false;
 
   musicUrl.AddOption("year", year);
-  
+
   Filter filter;
   return GetSongsFullByWhere(baseDir, filter, items, SortDescription(), true);
 }
@@ -4723,10 +4723,10 @@ void CMusicDatabase::UpdateTables(int version)
     m_pDS->exec("ALTER TABLE album ADD strMusicBrainzAlbumID text\n");
     m_pDS->exec("CREATE TABLE song_new ( idSong integer primary key, idAlbum integer, idPath integer, strArtists text, strGenres text, strTitle varchar(512), iTrack integer, iDuration integer, iYear integer, dwFileNameCRC text, strFileName text, strMusicBrainzTrackID text, iTimesPlayed integer, iStartOffset integer, iEndOffset integer, idThumb integer, lastplayed varchar(20) default NULL, rating char default '0', comment text)\n");
     m_pDS->exec("INSERT INTO song_new ( idSong, idAlbum, idPath, strArtists, strTitle, iTrack, iDuration, iYear, dwFileNameCRC, strFileName, strMusicBrainzTrackID, iTimesPlayed, iStartOffset, iEndOffset, idThumb, lastplayed, rating, comment) SELECT idSong, idAlbum, idPath, strArtists, strTitle, iTrack, iDuration, iYear, dwFileNameCRC, strFileName, strMusicBrainzTrackID, iTimesPlayed, iStartOffset, iEndOffset, idThumb, lastplayed, rating, comment FROM song");
-    
+
     m_pDS->exec("DROP TABLE song");
     m_pDS->exec("ALTER TABLE song_new RENAME TO song");
- 
+
     m_pDS->exec("UPDATE song SET strMusicBrainzTrackID = NULL");
   }
 
@@ -5046,12 +5046,12 @@ void CMusicDatabase::UpdateTables(int version)
     m_pDS->exec("ALTER TABLE album_artist_new RENAME TO album_artist");
   }
   if (version < 60)
-  { 
+  {
     // From now on artist ID = 1 will be an artificial artist [Missing] use for songs that
     // do not have an artist tag to ensure all songs in the library have at least one artist.
     std::string strSQL;
     if (GetArtistExists(BLANKARTIST_ID))
-    { 
+    {
       // When BLANKARTIST_ID (=1) is already in use, move the record
       try
       { //No mbid index yet, so can have record for artist twice even with mbid
@@ -5069,7 +5069,7 @@ void CMusicDatabase::UpdateTables(int version)
         m_pDS->exec(strSQL);
 
         // Update related tables with the new artist ID
-        // Indices have been dropped making transactions very slow, so create appropriate temp indices     
+        // Indices have been dropped making transactions very slow, so create appropriate temp indices
         m_pDS->exec("CREATE INDEX idxSongArtist2 ON song_artist ( idArtist )");
         m_pDS->exec("CREATE INDEX idxAlbumArtist2 ON album_artist ( idArtist )");
         m_pDS->exec("CREATE INDEX idxDiscography ON discography ( idArtist )");
@@ -5104,13 +5104,13 @@ void CMusicDatabase::UpdateTables(int version)
     m_pDS->exec("CREATE INDEX idxSongArtist1 ON song_artist ( idSong, idRole )");
     m_pDS->exec("CREATE INDEX idxAlbumArtist1 ON album_artist ( idAlbum )");
 
-    // Ensure all songs have at least one artist, set those without to [Missing] 
+    // Ensure all songs have at least one artist, set those without to [Missing]
     strSQL = "SELECT count(idSong) FROM song "
              "WHERE NOT EXISTS(SELECT idSong FROM song_artist "
              "WHERE song_artist.idsong = song.idsong AND song_artist.idRole = 1)";
     int numsongs = strtol(GetSingleValue(strSQL).c_str(), NULL, 10);
     if (numsongs > 0)
-    { 
+    {
       CLog::Log(LOGDEBUG, "%i songs have no artist, setting artist to [Missing]", numsongs);
       // Insert song_artist records for songs that don't have any
       try
@@ -5118,7 +5118,7 @@ void CMusicDatabase::UpdateTables(int version)
         strSQL = PrepareSQL("INSERT INTO song_artist(idArtist, idSong, idRole, strArtist, iOrder) "
           "SELECT %i, idSong, %i, '%s', 0 FROM song "
           "WHERE NOT EXISTS(SELECT idSong FROM song_artist "
-          "WHERE song_artist.idsong = song.idsong AND song_artist.idRole = %i)", 
+          "WHERE song_artist.idsong = song.idsong AND song_artist.idRole = %i)",
           BLANKARTIST_ID, ROLE_ARTIST, BLANKARTIST_NAME.c_str(), ROLE_ARTIST);
         ExecuteQuery(strSQL);
       }
@@ -5127,7 +5127,7 @@ void CMusicDatabase::UpdateTables(int version)
         CLog::Log(LOGERROR, "Setting missing artist for songs without an artist has failed");
       }
     }
-    
+
     // Ensure all albums have at least one artist, set those without to [Missing]
     strSQL = "SELECT count(idAlbum) FROM album "
       "WHERE NOT EXISTS(SELECT idAlbum FROM album_artist "
@@ -5142,7 +5142,7 @@ void CMusicDatabase::UpdateTables(int version)
         strSQL = PrepareSQL("INSERT INTO album_artist(idArtist, idAlbum, strArtist, iOrder) "
           "SELECT %i, idAlbum, '%s', 0 FROM album "
           "WHERE NOT EXISTS(SELECT idAlbum FROM album_artist "
-          "WHERE album_artist.idAlbum = album.idAlbum)", 
+          "WHERE album_artist.idAlbum = album.idAlbum)",
           BLANKARTIST_ID, BLANKARTIST_NAME.c_str());
         ExecuteQuery(strSQL);
       }
@@ -5300,7 +5300,7 @@ void CMusicDatabase::UpdateTables(int version)
     {
       m_pDS->exec("INSERT INTO infosetting(idSetting, strScraperPath, strSettings) "
         "SELECT id, strScraperPath, strSettings FROM content_temp");
-      m_pDS->exec("UPDATE artist SET idInfoSetting = " 
+      m_pDS->exec("UPDATE artist SET idInfoSetting = "
         "(SELECT id FROM content_temp WHERE strContent = 'artists' AND idItem = idArtist) "
         "WHERE EXISTS(SELECT 1 FROM content_temp WHERE strContent = 'artists' AND idItem = idArtist) ");
       m_pDS->exec("UPDATE album SET idInfoSetting = "
@@ -5319,7 +5319,7 @@ void CMusicDatabase::UpdateTables(int version)
     m_pDS->exec("DROP TABLE albuminfosong");
   }
   if (version < 68)
-  {    
+  {
     // Add a new columns strType, strGender, strDisambiguation for artists
     m_pDS->exec("ALTER TABLE artist ADD strType TEXT \n");
     m_pDS->exec("ALTER TABLE artist ADD strGender TEXT \n");
@@ -5329,7 +5329,7 @@ void CMusicDatabase::UpdateTables(int version)
   {
     // Remove album_genre table
     m_pDS->exec("DROP TABLE album_genre");
-  } 
+  }
   if (version < 70)
   {
     // Update all songs iStartOffset and iEndOffset to milliseconds instead of frames (* 1000 / 75)
@@ -5343,19 +5343,19 @@ void CMusicDatabase::UpdateTables(int version)
     m_pDS->exec(PrepareSQL("UPDATE versiontagscan SET lastscanned = '%s'", dateAdded.GetAsDBDateTime().c_str()));
   }
 
-  // Set the verion of tag scanning required. 
-  // Not every schema change requires the tags to be rescanned, set to the highest schema version 
-  // that needs this. Forced rescanning (of music files that have not changed since they were 
-  // previously scanned) also accommodates any changes to the way tags are processed 
+  // Set the verion of tag scanning required.
+  // Not every schema change requires the tags to be rescanned, set to the highest schema version
+  // that needs this. Forced rescanning (of music files that have not changed since they were
+  // previously scanned) also accommodates any changes to the way tags are processed
   // e.g. read tags that were not processed by previous versions.
-  // The original db version when the tags were scanned, and the minimal db version needed are 
+  // The original db version when the tags were scanned, and the minimal db version needed are
   // later used to determine if a forced rescan should be prompted
-  
+
   // The last schema change needing forced rescanning was 60.
   // Mostly because of the new tags processed by v17 rather than a schema change.
   SetMusicNeedsTagScan(60);
 
-  // After all updates, store the original db version. 
+  // After all updates, store the original db version.
   // This indicates the version of tag processing that was used to populate db
   SetMusicTagScanVersion(version);
 }
@@ -5511,11 +5511,11 @@ bool CMusicDatabase::GetAlbumPaths(int idAlbum, std::vector<std::pair<std::strin
     if (NULL == m_pDB.get()) return false;
     if (NULL == m_pDS2.get()) return false;
 
-    // Get the unique paths of songs on the album, providing there are no songs from 
-    // other albums with the same path. This returns 
+    // Get the unique paths of songs on the album, providing there are no songs from
+    // other albums with the same path. This returns
     // a) <album> if is contains all the songs and no others, or
     // b) <album>/cd1, <album>/cd2 etc. for disc sets
-    // but does *not* return any path when albums are mixed together. That could be because of 
+    // but does *not* return any path when albums are mixed together. That could be because of
     // deliberate file organisation, or (more likely) because of a tagging error in album name
     // or Musicbrainzalbumid. Thus it avoids finding somme generic music path.
     strSQL = PrepareSQL("SELECT DISTINCT strPath, song.idPath FROM song "
@@ -5579,8 +5579,8 @@ int CMusicDatabase::GetDiscnumberForPathID(int idPath)
 }
 
 // Get old "artist path" - where artist.nfo and art was located v17 and below.
-// It is the path common to all albums by an (album) artist, but ensure it is unique 
-// to that artist and not shared with other artists. Previously this caused incorrect nfo 
+// It is the path common to all albums by an (album) artist, but ensure it is unique
+// to that artist and not shared with other artists. Previously this caused incorrect nfo
 // and art to be applied to multiple artists.
 bool CMusicDatabase::GetOldArtistPath(int idArtist, std::string &basePath)
 {
@@ -5595,7 +5595,7 @@ bool CMusicDatabase::GetOldArtistPath(int idArtist, std::string &basePath)
       "JOIN song ON album_artist.idAlbum = song.idAlbum "
       "JOIN path ON song.idPath = path.idPath "
       "WHERE album_artist.idArtist = %ld "
-      "GROUP BY song.idPath", 
+      "GROUP BY song.idPath",
       idArtist);
 
     // run query
@@ -5608,7 +5608,7 @@ bool CMusicDatabase::GetOldArtistPath(int idArtist, std::string &basePath)
       return false;
     }
     else if (iRowsFound == 1)
-    { 
+    {
       // Special case for single path - assume that we're in an artist/album/songs filesystem
       URIUtils::GetParentPath(m_pDS2->fv("strPath").get_asString(), basePath);
       m_pDS2->close();
@@ -5629,10 +5629,10 @@ bool CMusicDatabase::GetOldArtistPath(int idArtist, std::string &basePath)
       m_pDS2->close();
     }
 
-    // Check any path found is unique to that album artist, and do *not* return any path 
+    // Check any path found is unique to that album artist, and do *not* return any path
     // that is shared with other album artists. That could be because of collaborations
-    // i.e. albums with more than one album artist, or because there are albums by the 
-    // artist on multiple music sources, or elsewhere in the folder hierarchy.    
+    // i.e. albums with more than one album artist, or because there are albums by the
+    // artist on multiple music sources, or elsewhere in the folder hierarchy.
     // Avoid returning some generic music path.
     if (!basePath.empty())
     {
@@ -5665,7 +5665,7 @@ bool CMusicDatabase::GetArtistPath(const CArtist& artist, std::string &path)
   path = CServiceBroker::GetSettings().GetString(CSettings::SETTING_MUSICLIBRARY_ARTISTSFOLDER);
   if (path.empty())
     return false; // No Artists folder not set;
-  // Get unique artist folder name 
+  // Get unique artist folder name
   std::string strFolder;
   if (GetArtistFolderName(artist, strFolder))
   {
@@ -5682,7 +5682,7 @@ bool CMusicDatabase::GetAlbumFolder(const CAlbum& album, const std::string &strA
 
   // First try to get a *unique* album folder name from the music file paths
   if (!strAlbumPath.empty())
-  {  
+  {
     // Get last folder from full path
     std::vector<std::string> folders = URIUtils::SplitPath(strAlbumPath);
     if (!folders.empty())
@@ -5700,7 +5700,7 @@ bool CMusicDatabase::GetAlbumFolder(const CAlbum& album, const std::string &strA
         "AND path.strPath LIKE '%%%s%%'",
         album.artistCredits[0].GetArtistId(), strFolder.c_str());
 
-      if (!m_pDS2->query(strSQL)) 
+      if (!m_pDS2->query(strSQL))
         return false;
       int iRowsFound = m_pDS2->num_rows();
       m_pDS2->close();
@@ -5714,7 +5714,7 @@ bool CMusicDatabase::GetAlbumFolder(const CAlbum& album, const std::string &strA
   else
   {
     // Create a valid unique folder name from album title
-    // @todo: Does UFT8 matter or need normalizing? 
+    // @todo: Does UFT8 matter or need normalizing?
     // @todo: Simplify punctuation removing unicode appostraphes, "..." etc.?
     strFolder = CUtil::MakeLegalFileName(album.strAlbum, LEGAL_WIN32_COMPAT);
     StringUtils::Replace(strFolder, " _ ", "_");
@@ -5727,7 +5727,7 @@ bool CMusicDatabase::GetAlbumFolder(const CAlbum& album, const std::string &strA
       "JOIN album ON album_artist.idAlbum = album.idAlbum "
       "WHERE album_artist.iOrder = 0 "
       "AND album_artist.idArtist = %ld "
-      "AND album.strAlbum LIKE '%s'  ", 
+      "AND album.strAlbum LIKE '%s'  ",
       album.artistCredits[0].GetArtistId(), album.strAlbum.c_str());
     std::string strValue = GetSingleValue(strSQL, m_pDS2);
     if (strValue.empty())
@@ -5747,11 +5747,11 @@ bool CMusicDatabase::GetArtistFolderName(const CArtist &artist, std::string &str
   return GetArtistFolderName(artist.strArtist, artist.strMusicBrainzArtistID, strFolder);
 }
 
-bool CMusicDatabase::GetArtistFolderName(const std::string &strArtist, const std::string &strMusicBrainzArtistID, 
+bool CMusicDatabase::GetArtistFolderName(const std::string &strArtist, const std::string &strMusicBrainzArtistID,
   std::string &strFolder)
 {
   // Create a valid unique folder name for artist
-  // @todo: Does UFT8 matter or need normalizing? 
+  // @todo: Does UFT8 matter or need normalizing?
   // @todo: Simplify punctuation removing unicode appostraphes, "..." etc.?
   strFolder = CUtil::MakeLegalFileName(strArtist, LEGAL_WIN32_COMPAT);
   StringUtils::Replace(strFolder, " _ ", "_");
@@ -5803,7 +5803,7 @@ int CMusicDatabase::GetArtistByMatch(const CArtist& artist)
   std::string strSQL;
   try
   {
-    if (NULL == m_pDB.get() || NULL == m_pDS.get()) 
+    if (NULL == m_pDB.get() || NULL == m_pDS.get())
       return false;
     // Match on MusicBrainz ID, definitively unique
     if (!artist.strMusicBrainzArtistID.empty())
@@ -5811,7 +5811,7 @@ int CMusicDatabase::GetArtistByMatch(const CArtist& artist)
         artist.strMusicBrainzArtistID.c_str());
     else
     // No MusicBrainz ID, artist by name with no mbid
-    strSQL = PrepareSQL("SELECT idArtist FROM artist WHERE strArtist LIKE '%s' AND strMusicBrainzArtistID IS NULL", 
+    strSQL = PrepareSQL("SELECT idArtist FROM artist WHERE strArtist LIKE '%s' AND strMusicBrainzArtistID IS NULL",
       artist.strArtist.c_str());
     if (!m_pDS->query(strSQL)) return false;
     int iRowsFound = m_pDS->num_rows();
@@ -5842,7 +5842,7 @@ bool CMusicDatabase::GetArtistFromSong(int idSong, CArtist &artist)
     std::string strSQL = PrepareSQL(
       "SELECT artistview.* FROM song_artist "
       "JOIN artistview ON song_artist.idArtist = artistview.idArtist "
-      "WHERE song_artist.idSong= %i AND song_artist.idRole = 1 AND song_artist.iOrder = 0", 
+      "WHERE song_artist.idSong= %i AND song_artist.idRole = 1 AND song_artist.iOrder = 0",
       idSong);
     if (!m_pDS->query(strSQL)) return false;
     int iRowsFound = m_pDS->num_rows();
@@ -5872,13 +5872,13 @@ bool CMusicDatabase::IsSongArtist(int idSong, int idArtist)
     "WHERE song_artist.idSong= %i AND "
     "song_artist.idArtist = %i AND song_artist.idRole = 1",
     idSong, idArtist);
-  return GetSingleValue(strSQL).empty(); 
+  return GetSingleValue(strSQL).empty();
 }
 
 bool CMusicDatabase::IsSongAlbumArtist(int idSong, int idArtist)
 {
   std::string strSQL = PrepareSQL(
-    "SELECT 1 FROM song JOIN album_artist ON song.idAlbum = album_artist.idAlbum "   
+    "SELECT 1 FROM song JOIN album_artist ON song.idAlbum = album_artist.idAlbum "
     "WHERE song.idSong = %i AND album_artist.idArtist = %i",
     idSong, idArtist);
   return GetSingleValue(strSQL).empty();
@@ -5974,8 +5974,8 @@ bool CMusicDatabase::UpdateArtistSortNames(int idArtist /*=-1*/)
   std::string strSQL;
   // MySQL syntax for GROUP_CONCAT is different from that in SQLite
   bool bisMySQL = StringUtils::EqualsNoCase(g_advancedSettings.m_databaseMusic.type, "mysql");
-  
-  BeginMultipleExecute();   
+
+  BeginMultipleExecute();
   if (bisMySQL)
     strSQL = "UPDATE album SET strArtistSort =  "
       "(SELECT GROUP_CONCAT("
@@ -6002,7 +6002,7 @@ bool CMusicDatabase::UpdateArtistSortNames(int idArtist /*=-1*/)
   ExecuteQuery(strSQL);
   CLog::Log(LOGDEBUG, "%s query: %s", __FUNCTION__, strSQL.c_str());
 
-  
+
   if (bisMySQL)
     strSQL = "UPDATE song SET strArtistSort = "
       "(SELECT GROUP_CONCAT("
@@ -6042,11 +6042,11 @@ bool CMusicDatabase::UpdateArtistSortNames(int idArtist /*=-1*/)
         "AND song_artist.idSong = song.idSong AND song_artist.idRole = 1)", idArtist);
   ExecuteQuery(strSQL);
   CLog::Log(LOGDEBUG, "%s query: %s", __FUNCTION__, strSQL.c_str());
- 
+
   if (CommitMultipleExecute())
     return true;
   else
-    CLog::Log(LOGERROR, "%s failed", __FUNCTION__); 
+    CLog::Log(LOGERROR, "%s failed", __FUNCTION__);
   return false;
 }
 
@@ -6135,7 +6135,7 @@ bool CMusicDatabase::GetCompilationAlbums(const std::string& strBaseDir, CFileIt
     return false;
 
   musicUrl.AddOption("compilation", true);
-  
+
   Filter filter;
   return GetAlbumsByWhere(musicUrl.ToString(), filter, items);
 }
@@ -6346,8 +6346,8 @@ bool CMusicDatabase::SetSongUserrating(const std::string &filePath, int userrati
     if (NULL == m_pDS.get()) return false;
 
     int songID = GetSongIDFromPath(filePath);
-    if (-1 == songID) return false;    
-    
+    if (-1 == songID) return false;
+
     return SetSongUserrating(songID, userrating);
   }
   catch (...)
@@ -6499,7 +6499,7 @@ bool CMusicDatabase::SetScraperAll(const std::string & strBaseDir, const ADDON::
     }
     else
       return false;  //Only artists and albums have info settings
-    
+
     std::string strSQLWhere;
     if (!BuildSQL(strSQLWhere, extFilter, strSQLWhere))
       return false;
@@ -6553,12 +6553,12 @@ bool CMusicDatabase::SetScraper(int id, const CONTENT_TYPE &content, const ADDON
   std::string strSQL;
   int idSetting = -1;
   try
-  { 
+  {
     BeginTransaction();
     // Fetch current info settings for item, 0 => default is used
     if (content == CONTENT_ARTISTS)
       strSQL = "SELECT idInfoSetting FROM artist WHERE idArtist = %i";
-    else 
+    else
       strSQL = "SELECT idInfoSetting FROM album WHERE idAlbum = %i";
     strSQL = PrepareSQL(strSQL, id);
     m_pDS->query(strSQL);
@@ -6625,7 +6625,7 @@ bool CMusicDatabase::GetScraper(int id, const CONTENT_TYPE &content, ADDON::Scra
       {
         scraper = std::dynamic_pointer_cast<ADDON::CScraper>(addon);
         if (scraper)
-          // Set settings 
+          // Set settings
           scraper->SetPathSettings(content, strSettings);
       }
     }
@@ -6727,21 +6727,21 @@ void CMusicDatabase::ExportToXML(const CLibExportSettings& settings,  CGUIDialog
       !settings.IsItemExported(ELIBEXPORT_ALBUMS))
     return;
 
-  if (!settings.IsSingleFile() && settings.m_skipnfo && !settings.m_artwork) 
+  if (!settings.IsSingleFile() && settings.m_skipnfo && !settings.m_artwork)
     return;
-  
+
   std::string strFolder;
   if (!settings.IsToLibFolders())
   {
     // Exporting to single file or separate files in a specified location
-    if (settings.m_strPath.empty()) 
+    if (settings.m_strPath.empty())
       return;
 
     strFolder = settings.m_strPath;
     if (!URIUtils::HasSlashAtEnd(strFolder))
       URIUtils::AddSlashAtEnd(strFolder);
     strFolder = URIUtils::GetDirectory(strFolder);
-    if (strFolder.empty()) 
+    if (strFolder.empty())
       return;
   }
   else
@@ -6749,17 +6749,17 @@ void CMusicDatabase::ExportToXML(const CLibExportSettings& settings,  CGUIDialog
     // Separate files with artists to library folder and albums to music folders.
     // Without an artist information folder can not export artist NFO files or images
     strFolder = CServiceBroker::GetSettings().GetString(CSettings::SETTING_MUSICLIBRARY_ARTISTSFOLDER);
-    if (!settings.IsItemExported(ELIBEXPORT_ALBUMS) && strFolder.empty()) 
+    if (!settings.IsItemExported(ELIBEXPORT_ALBUMS) && strFolder.empty())
       return;
   }
-  
+
   int iFailCount = 0;
   try
   {
     if (NULL == m_pDB.get()) return;
     if (NULL == m_pDS.get()) return;
     if (NULL == m_pDS2.get()) return;
-    
+
     // Create our xml document
     CXBMCTinyXML xmlDoc;
     TiXmlDeclaration decl("1.0", "UTF-8", "yes");
@@ -6816,7 +6816,7 @@ void CMusicDatabase::ExportToXML(const CLibExportSettings& settings,  CGUIDialog
           if (settings.IsToLibFolders())
           { // Save album.nfo and artwork with music files.
             // Most albums are under a unique folder, but if songs from various albums are mixed then
-            // avoid overwriting by not allow NFO and art to be exported 
+            // avoid overwriting by not allow NFO and art to be exported
             if (strAlbumPath.empty())
               CLog::Log(LOGDEBUG, "CMusicDatabase::%s - Not exporting album %s as unique path not found",
                 __FUNCTION__, album.strAlbum.c_str());
@@ -6904,9 +6904,9 @@ void CMusicDatabase::ExportToXML(const CLibExportSettings& settings,  CGUIDialog
         current++;
       }
     }
-    
-    if ((settings.IsItemExported(ELIBEXPORT_ALBUMARTISTS) || 
-         settings.IsItemExported(ELIBEXPORT_SONGARTISTS) || 
+
+    if ((settings.IsItemExported(ELIBEXPORT_ALBUMARTISTS) ||
+         settings.IsItemExported(ELIBEXPORT_SONGARTISTS) ||
         settings.IsItemExported(ELIBEXPORT_OTHERARTISTS)) && !strFolder.empty())
     {
       // Find artists to export
@@ -6925,7 +6925,7 @@ void CMusicDatabase::ExportToXML(const CLibExportSettings& settings,  CGUIDialog
       }
       else if (settings.IsItemExported(ELIBEXPORT_OTHERARTISTS))
         filter.AppendWhere("EXISTS (SELECT 1 FROM song_artist WHERE song_artist.idArtist = artist.idArtist AND song_artist.idRole > 1)", false);
-      
+
       if (!settings.m_unscraped)
         filter.AppendWhere("lastScraped IS NOT NULL", true);
 
@@ -7294,7 +7294,7 @@ bool CMusicDatabase::GetArtForItem(int songId, int albumId, int artistId, bool b
       return false;
 
     if (!(artistId > 0))
-    {      
+    {
       // Artist ID unknown, so lookup album artist for albums and songs
       std::string strSQL2;
       if (albumId > 0)
@@ -7505,7 +7505,7 @@ bool CMusicDatabase::GetFilter(CDbUrl &musicUrl, Filter &filter, SortDescription
     // But that requires much change, so for now get all roles as better than none
     idRole = -1000; //All roles
   }
-  
+
   std::string strRoleSQL; //Role < 0 means all roles, otherwise filter by role
   if(idRole > 0) strRoleSQL = PrepareSQL(" AND song_artist.idRole = %i ", idRole);
 
@@ -7577,7 +7577,7 @@ bool CMusicDatabase::GetFilter(CDbUrl &musicUrl, Filter &filter, SortDescription
           "WHERE song_artist.idSong = %i %s)", idSong, strRoleSQL.c_str()));
       }
       else
-      { // Artists can be only album artists, so for all artists (with linked albums or songs) 
+      { // Artists can be only album artists, so for all artists (with linked albums or songs)
         // we need to check both album_artist and song_artist tables.
         // Role is determined from song_artist table, so even if looking for album artists only
         // we can check those that have a specific role e.g. which album artist is a composer
@@ -7648,7 +7648,7 @@ bool CMusicDatabase::GetFilter(CDbUrl &musicUrl, Filter &filter, SortDescription
     option = options.find("year");
     if (option != options.end())
       filter.AppendWhere(PrepareSQL("albumview.iYear = %i", static_cast<int>(option->second.asInteger())));
-    
+
     option = options.find("compilation");
     if (option != options.end())
       filter.AppendWhere(PrepareSQL("albumview.bCompilation = %i", option->second.asBoolean() ? 1 : 0));
@@ -7672,7 +7672,7 @@ bool CMusicDatabase::GetFilter(CDbUrl &musicUrl, Filter &filter, SortDescription
     { // Artist name is not unique, so could get albums or songs from more than one.
       songArtistSub.AppendJoin("JOIN artist ON artist.idArtist = song_artist.idArtist");
       songArtistSub.AppendWhere(PrepareSQL("artist.strArtist like '%s'", artistname.c_str()));
-      
+
       albumArtistSub.AppendJoin("JOIN artist ON artist.idArtist = song_artist.idArtist");
       albumArtistSub.AppendWhere(PrepareSQL("artist.strArtist like '%s'", artistname.c_str()));
     }
@@ -7704,7 +7704,7 @@ bool CMusicDatabase::GetFilter(CDbUrl &musicUrl, Filter &filter, SortDescription
       {
         songArtistSub.BuildSQL(songArtistSQL);
         albumArtistSub.BuildSQL(albumArtistSQL);
-        if (idRole < 0 || (idRole == 1 && !albumArtistsOnly))  
+        if (idRole < 0 || (idRole == 1 && !albumArtistsOnly))
         { // Artist contributing to songs, any role, check OR album artist too
           // as artists can be just album artists but not song artists
           filter.AppendWhere(songArtistSQL + " OR " + albumArtistSQL);
@@ -7715,14 +7715,14 @@ bool CMusicDatabase::GetFilter(CDbUrl &musicUrl, Filter &filter, SortDescription
         }
         else // idRole = 1 and albumArtistsOnly
         { // Only look at album artists, not albums where artist features on songs
-          // This may want to be a separate option so you can choose to see all the albums where that artist 
+          // This may want to be a separate option so you can choose to see all the albums where that artist
           // appears on one or more songs without having to list all song artists in the artists node.
           filter.AppendWhere(albumArtistSQL);
         }
       }
     }
     else
-    { // No artist given 
+    { // No artist given
       if (idGenre > 0)
       { // Have genre option but not artist
         genreSub.param = "song.idAlbum = albumview.idAlbum";
@@ -7730,7 +7730,7 @@ bool CMusicDatabase::GetFilter(CDbUrl &musicUrl, Filter &filter, SortDescription
         filter.AppendWhere(genreSQL);
       }
       // Exclude any single albums (aka empty tagged albums)
-      // This causes "albums"  media filter artist selection to only offer album artists       
+      // This causes "albums"  media filter artist selection to only offer album artists
       option = options.find("show_singles");
       if (option == options.end() || !option->second.asBoolean())
         filter.AppendWhere(PrepareSQL("albumview.strReleaseType = '%s'", CAlbum::ReleaseTypeToString(CAlbum::Album).c_str()));
@@ -7747,11 +7747,11 @@ bool CMusicDatabase::GetFilter(CDbUrl &musicUrl, Filter &filter, SortDescription
     option = options.find("year");
     if (option != options.end())
       filter.AppendWhere(PrepareSQL("songview.iYear = %i", static_cast<int>(option->second.asInteger())));
-    
+
     option = options.find("compilation");
     if (option != options.end())
       filter.AppendWhere(PrepareSQL("songview.bCompilation = %i", option->second.asBoolean() ? 1 : 0));
-    
+
     if (idSong > 0)
       filter.AppendWhere(PrepareSQL("songview.idSong = %i", idSong));
 
@@ -7795,7 +7795,7 @@ bool CMusicDatabase::GetFilter(CDbUrl &musicUrl, Filter &filter, SortDescription
       }
       else
       {
-        if (albumArtistsOnly) // Only look at album artists, not where artist features on songs            
+        if (albumArtistsOnly) // Only look at album artists, not where artist features on songs
           filter.AppendWhere(albumArtistClause);
         else // Artist is song artist or album artist
           filter.AppendWhere("(" + songArtistClause + " OR " + albumArtistClause + ")");
diff --git a/xbmc/music/MusicDatabase.h b/xbmc/music/MusicDatabase.h
index 601c42cf8d..7e334c0091 100644
--- a/xbmc/music/MusicDatabase.h
+++ b/xbmc/music/MusicDatabase.h
@@ -238,14 +238,14 @@ public:
    \param strGenre the album genre(s)
    \param year the year
    \param strRecordLabel the recording label
-   \param strType album type (Musicbrainz release type e.g. "Broadcast, Soundtrack, live"), 
+   \param strType album type (Musicbrainz release type e.g. "Broadcast, Soundtrack, live"),
    \param bCompilation if the album is a compilation
    \param releaseType "album" or "single"
    \return the id of the album
    */
   int  AddAlbum(const std::string& strAlbum, const std::string& strMusicBrainzAlbumID,
                 const std::string& strReleaseGroupMBID,
-                const std::string& strArtist, const std::string& strArtistSort, 
+                const std::string& strArtist, const std::string& strArtistSort,
                 const std::string& strGenre, int year,
                 const std::string& strRecordLabel, const std::string& strType,
                 bool bCompilation, CAlbum::ReleaseType releaseType);
@@ -332,7 +332,7 @@ public:
   std::string GetRoleById(int id);
 
   /*! \brief Propagate artist sort name into the concatenated artist sort name strings
-  held for songs and albums 
+  held for songs and albums
   \param int idArtist to propagate sort name for, -1 means all artists
   */
   bool UpdateArtistSortNames(int idArtist = -1);
@@ -414,7 +414,7 @@ public:
 
   int GetArtistCountForRole(int role);
   int GetArtistCountForRole(const std::string& strRole);
-  
+
   /*! \brief Increment the playcount of an item
    Increments the playcount and updates the last played date
    \param item CFileItem to increment the playcount for
@@ -452,7 +452,7 @@ public:
   bool SetScraper(int id, const CONTENT_TYPE &content, const ADDON::ScraperPtr scraper);
   bool SetScraperAll(const std::string& strBaseDir, const ADDON::ScraperPtr scraper);
   bool GetScraper(int id, const CONTENT_TYPE &content, ADDON::ScraperPtr& scraper);
-  
+
   /*! \brief Check whether a given scraper is in use.
    \param scraperID the scraper to check for.
    \return true if the scraper is in use, false otherwise.
@@ -504,18 +504,18 @@ public:
 
   /*! \brief Fetch all related art for a database item.
   Fetches multiple pieces of art for a database item including that for related media types
-  Given song id art for the related album, artist(s) and albumartist(s) will also be fetched, looking up the 
+  Given song id art for the related album, artist(s) and albumartist(s) will also be fetched, looking up the
   album and artist when ids are not provided.
-  Given album id (and not song id) art for the related artist(s) will also be fetched, looking up the 
+  Given album id (and not song id) art for the related artist(s) will also be fetched, looking up the
   artist(s) when id are not provided.
   \param songId the id in the song table, -1 when song art not being fetched
   \param albumId the id in the album table, -1 when album art not being fetched
   \param artistId the id in the artist table, -1 when artist not known
   \param bPrimaryArtist true if art from only the first song artist or album artist is to be fetched
-  \param art [out] a vector, each element having media type e.g. "artist", "album" or "song", 
+  \param art [out] a vector, each element having media type e.g. "artist", "album" or "song",
   artType e.g. "thumb", "fanart", etc., prefix of "", "artist" or "albumartist" etc. giving the kind of artist
   relationship, and the original url of the art.
-  
+
   \return true if art is retrieved, false if no art is found.
   \sa SetArtForItem
   */
@@ -563,7 +563,7 @@ public:
 
   /*! \brief Fetch the distinct types of art held in the database for a type of media.
   \param mediaType the type of media, which corresponds to the table the item resides in (song/artist/album).
-  \param artTypes [out] the types of art e.g. "thumb", "fanart", etc. 
+  \param artTypes [out] the types of art e.g. "thumb", "fanart", etc.
   \return true if art is found, false if no art is found.
   */
   bool GetArtTypes(const MediaType &mediaType, std::vector<std::string> &artTypes);
@@ -571,7 +571,7 @@ public:
   /////////////////////////////////////////////////
   // Tag Scan Version
   /////////////////////////////////////////////////
-  /*! \brief Check if music files need all tags rescanning regardless of file being unchanged 
+  /*! \brief Check if music files need all tags rescanning regardless of file being unchanged
   because the tag processing has changed (which may happen without db version changes) since they
   where last scanned.
   \return -1 if an error occured, 0 if no scan is needed, or the version number of tags if not the same as current.
@@ -583,7 +583,7 @@ public:
   */
   void SetMusicNeedsTagScan(int version);
 
-  /*! \brief Set the version number of tag data 
+  /*! \brief Set the version number of tag data
   \param version the version number of db when tags last scanned, 0 (default) means current db version
   */
   void SetMusicTagScanVersion(int version = 0);
@@ -594,7 +594,7 @@ void SetLibraryLastUpdated();
 protected:
   std::map<std::string, int> m_genreCache;
   std::map<std::string, int> m_pathCache;
-  
+
   void CreateTables() override;
   void CreateAnalytics() override;
   int GetMinSchemaVersion() const override { return 32; }
diff --git a/xbmc/music/MusicDbUrl.cpp b/xbmc/music/MusicDbUrl.cpp
index b4f052f996..870c279789 100644
--- a/xbmc/music/MusicDbUrl.cpp
+++ b/xbmc/music/MusicDbUrl.cpp
@@ -157,7 +157,7 @@ bool CMusicDbUrl::validateOption(const std::string &key, const CVariant &value)
 {
   if (!CDbUrl::validateOption(key, value))
     return false;
-  
+
   // if the value is empty it will remove the option which is ok
   // otherwise we only care about the "filter" option here
   if (value.empty() || !StringUtils::EqualsNoCase(key, "filter"))
diff --git a/xbmc/music/MusicInfoLoader.cpp b/xbmc/music/MusicInfoLoader.cpp
index 2ba82db6a0..aa9ac9ed2c 100644
--- a/xbmc/music/MusicInfoLoader.cpp
+++ b/xbmc/music/MusicInfoLoader.cpp
@@ -91,17 +91,17 @@ bool CMusicInfoLoader::LoadAdditionalTagInfo(CFileItem* pItem)
     return false; // already have the information
 
   std::string path(pItem->GetPath());
-  // For songs in library set the (primary) song artist and album properties 
+  // For songs in library set the (primary) song artist and album properties
   // Use song Id (not path) as called for items from either library or file view,
   // but could also be listitem with tag loaded by a script
-  if (pItem->HasMusicInfoTag() && 
-      pItem->GetMusicInfoTag()->GetType() == MediaTypeSong && 
+  if (pItem->HasMusicInfoTag() &&
+      pItem->GetMusicInfoTag()->GetType() == MediaTypeSong &&
       pItem->GetMusicInfoTag()->GetDatabaseId() > 0)
   {
     CMusicDatabase database;
     database.Open();
     // May already have song artist ids as item property set when data read from
-    // db, but check property is valid array (scripts could set item properties 
+    // db, but check property is valid array (scripts could set item properties
     // incorrectly), otherwise fetch artist using song id.
     CArtist artist;
     bool artistfound = false;
@@ -198,11 +198,11 @@ bool CMusicInfoLoader::LoadItemLookup(CFileItem* pItem)
         m_databaseHits++;
       }
 
-      /* Note for songs from embedded or separate cuesheets strFileName is not unique, so only the first song from such a file 
+      /* Note for songs from embedded or separate cuesheets strFileName is not unique, so only the first song from such a file
          gets added to the song map. Any such songs from a cuesheet can be identified by having a non-zero offset value.
-         When the item we are looking up has a cue document or is a music file with a cuesheet embedded in the tags, it needs 
-         to have the cuesheet fully processed replacing that item with items for every track etc. This is done elsewhere, as 
-         changes to the list of items is not possible from here. This method only loads the item with the song from the database 
+         When the item we are looking up has a cue document or is a music file with a cuesheet embedded in the tags, it needs
+         to have the cuesheet fully processed replacing that item with items for every track etc. This is done elsewhere, as
+         changes to the list of items is not possible from here. This method only loads the item with the song from the database
          when it maps to a single song.
       */
 
diff --git a/xbmc/music/MusicLibraryQueue.cpp b/xbmc/music/MusicLibraryQueue.cpp
index 7111e2fe2f..dcd9446732 100644
--- a/xbmc/music/MusicLibraryQueue.cpp
+++ b/xbmc/music/MusicLibraryQueue.cpp
@@ -73,10 +73,10 @@ void CMusicLibraryQueue::ExportLibrary(const CLibExportSettings& settings, bool
 
   CMusicLibraryExportJob* exportJob = new CMusicLibraryExportJob(settings, progress);
   if (showDialog)
-  {    
+  {
     AddJob(exportJob);
 
-    // Wait for export to complete or be canceled, but render every 10ms so that the 
+    // Wait for export to complete or be canceled, but render every 10ms so that the
     // pointer movements work on dialog even when export is reporting progress infrequently
     if (progress)
       progress->Wait();
@@ -163,10 +163,10 @@ void CMusicLibraryQueue::CleanLibrary(bool showDialog /* = false */)
     }
   }
 
-  CMusicLibraryCleaningJob* cleaningJob = new CMusicLibraryCleaningJob(progress);  
+  CMusicLibraryCleaningJob* cleaningJob = new CMusicLibraryCleaningJob(progress);
   AddJob(cleaningJob);
 
-  // Wait for cleaning to complete or be canceled, but render every 20ms so that the 
+  // Wait for cleaning to complete or be canceled, but render every 20ms so that the
   // pointer movements work on dialog even when cleaning is reporting progress infrequently
   if (progress)
     progress->Wait(20);
diff --git a/xbmc/music/MusicLibraryQueue.h b/xbmc/music/MusicLibraryQueue.h
index 0280b0c3d4..e2635c89ea 100644
--- a/xbmc/music/MusicLibraryQueue.h
+++ b/xbmc/music/MusicLibraryQueue.h
@@ -69,7 +69,7 @@ public:
    \param[in] refresh Whether or not to refresh data for albums that have previously been scraped
   */
   void StartAlbumScan(const std::string& strDirectory, bool refresh = false);
-  
+
   /*!
    \brief Enqueue an artist scraping job fetching additional artist data.
    \param[in] strDirectory Virtual path that identifies which artists to process or "" (empty string) for all artists
@@ -100,7 +100,7 @@ public:
    is stilted and opportunities to cancel the process limited
    */
   void CleanLibraryModal();
-  
+
   /*!
    \brief Adds the given job to the queue.
    \param[in] job Music library job to be queued.
diff --git a/xbmc/music/MusicThumbLoader.cpp b/xbmc/music/MusicThumbLoader.cpp
index e2d20d7eff..aed911a440 100644
--- a/xbmc/music/MusicThumbLoader.cpp
+++ b/xbmc/music/MusicThumbLoader.cpp
@@ -68,7 +68,7 @@ bool CMusicThumbLoader::LoadItemCached(CFileItem* pItem)
   if (pItem->m_bIsShareOrDrive)
     return false;
 
-  if (pItem->HasMusicInfoTag() && (pItem->GetArt().empty() || 
+  if (pItem->HasMusicInfoTag() && (pItem->GetArt().empty() ||
     (pItem->GetArt().size() == 1 && pItem->HasArt("thumb"))))
   {
     if (FillLibraryArt(*pItem))
@@ -262,7 +262,7 @@ bool CMusicThumbLoader::FillLibraryArt(CFileItem &item)
       }
       art.insert(art.end(), artistart.begin(), artistart.end());
     }
-    artfound = !art.empty();    
+    artfound = !art.empty();
     m_musicDatabase->Close();
   }
 
@@ -294,7 +294,7 @@ bool CMusicThumbLoader::FillLibraryArt(CFileItem &item)
 
       // Add fallback art for "thumb" and "fanart" art types only
       // Set album thumb as the fallback used when song thumb is missing
-      // or use extra album thumb when part of disc set 
+      // or use extra album thumb when part of disc set
       if (tag.GetType() == MediaTypeSong && artitem.mediaType == MediaTypeAlbum)
       {
         if (artitem.artType == "thumb" && !bDiscSetThumbSet)
@@ -311,7 +311,7 @@ bool CMusicThumbLoader::FillLibraryArt(CFileItem &item)
       }
 
       // For albums and songs set fallback fanart from the artist.
-      // For songs prefer primary song artist over primary albumartist fanart as fallback fanart 
+      // For songs prefer primary song artist over primary albumartist fanart as fallback fanart
       if (artitem.prefix == "artist" && artitem.artType == "fanart")
         fanartfallback = artname;
       if (artitem.prefix == "albumartist" && artitem.artType == "fanart" && fanartfallback.empty())
diff --git a/xbmc/music/MusicThumbLoader.h b/xbmc/music/MusicThumbLoader.h
index 747da640a2..56a6789b3d 100644
--- a/xbmc/music/MusicThumbLoader.h
+++ b/xbmc/music/MusicThumbLoader.h
@@ -43,17 +43,17 @@ public:
   /*! \brief Helper function to fill all the art for a music library item
   This fetches the original url for each type of art, and sets fallback thumb and fanart.
   For songs the art for the related album and artist(s) is also set, and for albums that
-  of the related artist(s). Art type is named according to media type of the item, 
-  for example: 
-  artists may have "thumb", "fanart", "logo", "poster" etc., 
+  of the related artist(s). Art type is named according to media type of the item,
+  for example:
+  artists may have "thumb", "fanart", "logo", "poster" etc.,
   albums may have "thumb", "spine" etc. and "artist.thumb", "artist.fanart" etc.,
-  songs may have "thumb", "album.thumb", "artist.thumb", "artist.fanart", "artist.logo",... 
+  songs may have "thumb", "album.thumb", "artist.thumb", "artist.fanart", "artist.logo",...
   "artist1.thumb", "artist1.fanart",... "albumartist.thumb", "albumartist1.thumb" etc.
    \param item a music CFileItem
    \return true if we fill art, false if there is no art found
    */
   bool FillLibraryArt(CFileItem &item) override;
-  
+
   /*! \brief Fill the thumb of a music file/folder item
    First uses a cached thumb from a previous run, then checks for a local thumb
    and caches it for the next run
@@ -61,7 +61,7 @@ public:
    \return true if we fill the thumb, false otherwise
    */
   virtual bool FillThumb(CFileItem &item, bool folderThumbs = true);
-  
+
   static bool GetEmbeddedThumb(const std::string &path, EmbeddedArt &art);
 
 protected:
diff --git a/xbmc/music/MusicUtils.cpp b/xbmc/music/MusicUtils.cpp
index f620208474..a842f5c062 100644
--- a/xbmc/music/MusicUtils.cpp
+++ b/xbmc/music/MusicUtils.cpp
@@ -89,12 +89,12 @@ namespace MUSIC_UTILS
           // Check song album artists
           result = db.IsSongAlbumArtist(idSong, itemID);
         }
-      }      
+      }
       return result;
     }
 
     // Asynchronously update song, album or artist art in library
-    // and trigger update to album & artist art of the currently playing song 
+    // and trigger update to album & artist art of the currently playing song
     // and songs queued in the current playlist
     bool DoWork(void) override
     {
@@ -109,13 +109,13 @@ namespace MUSIC_UTILS
         db.SetArtForItem(itemID, type, m_artType, m_newArt);
       else
         db.RemoveArtForItem(itemID, type, m_artType);
-     
+
       /* Update the art of the songs of the current music playlist.
       Song thumb is often a fallback from the album and fanart is from the artist(s).
-      Clear the art if it is a song from the album or by the artist 
+      Clear the art if it is a song from the album or by the artist
       (as song or album artist) that has modified artwork. The new artwork gets
       loaded when the playlist is shown.
-      */      
+      */
       bool clearcache(false);
       CPlayList& playlist = CServiceBroker::GetPlaylistPlayer().GetPlaylist(PLAYLIST_MUSIC);
       for (int i = 0; i < playlist.size(); ++i)
@@ -141,7 +141,7 @@ namespace MUSIC_UTILS
         if (HasSongExtraArtChanged(songitem, type, itemID, db))
           g_application.UpdateCurrentPlayArt();
       }
-      
+
       db.Close();
       return true;
     }
@@ -315,7 +315,7 @@ namespace MUSIC_UTILS
     if (tag && tag->GetType() == MediaTypeSong && tag->GetDatabaseId() > 0)
       // Use song ID when known
       job = new CSetSongRatingJob(tag->GetDatabaseId(), userrating);
-    else 
+    else
       job = new CSetSongRatingJob(pItem->GetPath(), userrating);
     CJobManager::GetInstance().AddJob(job, NULL);
   }
diff --git a/xbmc/music/MusicUtils.h b/xbmc/music/MusicUtils.h
index bfbfbbac29..66ad917558 100644
--- a/xbmc/music/MusicUtils.h
+++ b/xbmc/music/MusicUtils.h
@@ -25,7 +25,7 @@
 namespace MUSIC_UTILS
 {
   /*! \brief Show a dialog to allow the selection of type of art from a list.
-  Input is a fileitem list, with each item having an "arttype" property 
+  Input is a fileitem list, with each item having an "arttype" property
   e.g. "thumb", current art URL (if art exists), and label. One of these art types
   can be selected, or a new art type added. The new art type is added as a new item
   in the list, as well as retuned as the selected art type.
@@ -36,10 +36,10 @@ namespace MUSIC_UTILS
   std::string ShowSelectArtTypeDialog(CFileItemList& artitems);
 
   /*! \brief Helper function to build a list of art types for a music library item.
-  This fetches the possible types of art for a song, album or artist, and the 
+  This fetches the possible types of art for a song, album or artist, and the
   current art URL (if the item has art of that type), for display on a dialog.
   \param musicitem a music CFileItem (song, album or artist)
-  \param artitems [out] a fileitem list,  each item having "arttype" property 
+  \param artitems [out] a fileitem list,  each item having "arttype" property
   e.g. "thumb", current art URL (if art exists), and localized label (for common arttypes)
   \return true if art types are retrieved, false if none is found.
   \sa ShowSelectArtTypeDialog
@@ -53,7 +53,7 @@ namespace MUSIC_UTILS
   then passed to the currently playing song (if there is one).
   \param item a shared pointer to a music CFileItem (song, album or artist)
   \param strType the type of art e.g. "fanart" or "thumb" etc.
-  \param strArt art URL, when empty the entry for that type of art is deleted. 
+  \param strArt art URL, when empty the entry for that type of art is deleted.
   */
   void UpdateArtJob(const CFileItemPtr pItem, const std::string& strType, const std::string& strArt);
 
diff --git a/xbmc/music/Song.cpp b/xbmc/music/Song.cpp
index 1564aeffdc..ed7f8968ae 100644
--- a/xbmc/music/Song.cpp
+++ b/xbmc/music/Song.cpp
@@ -40,7 +40,7 @@ CSong::CSong(CFileItem& item)
   //Set sort string before processing artist credits
   strArtistSort = tag.GetArtistSort();
   m_strComposerSort = tag.GetComposerSort();
-  
+
   // Determine artist credits from various tag arrays
   SetArtistCredits(tag.GetArtist(), tag.GetMusicBrainzArtistHints(), tag.GetMusicBrainzArtistID());
 
@@ -149,7 +149,7 @@ void CSong::SetArtistCredits(const std::vector<std::string>& names, const std::v
         artistHints = names;
     }
 
-    // Try to get number of artist sort names and musicbrainz ids to match. Split sort names 
+    // Try to get number of artist sort names and musicbrainz ids to match. Split sort names
     // further using multiple possible delimiters, over single separator applied in Tag loader
     if (artistSort.size() != mbids.size())
       artistSort = StringUtils::SplitMulti(artistSort, { ";", ":", "|", "#" });
@@ -169,7 +169,7 @@ void CSong::SetArtistCredits(const std::vector<std::string>& names, const std::v
       else
         artistName = artistId;
 
-      // Use artist sort name providing we have as many as we have mbid, 
+      // Use artist sort name providing we have as many as we have mbid,
       // otherwise something is wrong with them so ignore and leave blank
       if (artistSort.size() == mbids.size())
         artistCredits.emplace_back(StringUtils::Trim(artistName), StringUtils::Trim(artistSort[i]), artistId);
@@ -195,7 +195,7 @@ void CSong::SetArtistCredits(const std::vector<std::string>& names, const std::v
     for (size_t i = 0; i < artists.size(); i++)
     {
       artistCredits.emplace_back(StringUtils::Trim(artists[i]));
-      // Set artist sort name providing we have as many as we have artists, 
+      // Set artist sort name providing we have as many as we have artists,
       // otherwise something is wrong with them so ignore rather than guess.
       if (artistSort.size() == artists.size())
         artistCredits.back().SetSortName(StringUtils::Trim(artistSort[i]));
@@ -213,8 +213,8 @@ void CSong::MergeScrapedSong(const CSong& source, bool override)
     iTrack = source.iTrack;
   if (override)
   {
-    artistCredits = source.artistCredits; // Replace artists and store mbid returned by scraper   
-    strArtistDesc.clear();  // @todo: set artist display string e.g. "artist1 feat. artist2" when scraped 
+    artistCredits = source.artistCredits; // Replace artists and store mbid returned by scraper
+    strArtistDesc.clear();  // @todo: set artist display string e.g. "artist1 feat. artist2" when scraped
   }
 }
 
diff --git a/xbmc/music/Song.h b/xbmc/music/Song.h
index 97b91ee63b..f12a0f4bef 100644
--- a/xbmc/music/Song.h
+++ b/xbmc/music/Song.h
@@ -78,8 +78,8 @@ public:
   \return artist names as a vector of strings
   */
   const std::vector<std::string> GetArtist() const;
-  
-  /*! \brief Get artist sort name string 
+
+  /*! \brief Get artist sort name string
   \return artist sort name as a single string
   */
   const std::string GetArtistSort() const;
@@ -101,12 +101,12 @@ public:
   const std::vector<int> GetArtistIDArray() const;
 
   /*! \brief Get album artist names associated with song from tag data
-   Note for initial album processing only, normalised album artist data belongs to album 
+   Note for initial album processing only, normalised album artist data belongs to album
    and is stored in album artist credits
   \return album artist names as a vector of strings
   */
   const std::vector<std::string> GetAlbumArtist() const { return m_albumArtist; }
-  
+
   /*! \brief Get album artist sort name string
   \return album artist sort name as a single string
   */
@@ -126,13 +126,13 @@ public:
   //void AddArtistRole(const int &role, const std::string &artist);
   void AppendArtistRole(const CMusicRole& musicRole);
 
-  /*! \brief Set album artist vector. 
+  /*! \brief Set album artist vector.
    Album artist is held local to song until album created for inital processing only.
    Normalised album artist data belongs to album and is stored in album artist credits
   \param album artist names as a vector of strings
   */
   void SetAlbumArtist(const std::vector<std::string>& albumartists) { m_albumArtist = albumartists; }
-  
+
   /*! \brief Whether this song has any artists in artist credits vector
     Tests if artist credits has been populated yet, during processing there can be
     artists in the artist description but not yet in the credits
diff --git a/xbmc/music/dialogs/GUIDialogInfoProviderSettings.cpp b/xbmc/music/dialogs/GUIDialogInfoProviderSettings.cpp
index f1948f1b9a..ee6780faa9 100644
--- a/xbmc/music/dialogs/GUIDialogInfoProviderSettings.cpp
+++ b/xbmc/music/dialogs/GUIDialogInfoProviderSettings.cpp
@@ -81,18 +81,18 @@ bool CGUIDialogInfoProviderSettings::Show()
   if (ADDON::CAddonSystemSettings::GetInstance().GetActive(ADDON::ADDON_SCRAPER_ALBUMS, defaultScraper))
   {
     ADDON::ScraperPtr scraper = std::dynamic_pointer_cast<ADDON::CScraper>(defaultScraper);
-    dialog->SetAlbumScraper(scraper);    
+    dialog->SetAlbumScraper(scraper);
   }
 
-  // Get default artist scraper 
+  // Get default artist scraper
   if (ADDON::CAddonSystemSettings::GetInstance().GetActive(ADDON::ADDON_SCRAPER_ARTISTS, defaultScraper))
   {
     ADDON::ScraperPtr scraper = std::dynamic_pointer_cast<ADDON::CScraper>(defaultScraper);
     dialog->SetArtistScraper(scraper);
   }
-    
+
   dialog->m_strArtistInfoPath = CServiceBroker::GetSettings().GetString(CSettings::SETTING_MUSICLIBRARY_ARTISTSFOLDER);
-    
+
   dialog->Open();
 
   dialog->ResetDefaults();
@@ -109,7 +109,7 @@ int CGUIDialogInfoProviderSettings::Show(ADDON::ScraperPtr& scraper)
 
   dialog->m_showSingleScraper = true;
   dialog->m_singleScraperType = scraper->Content();
-  
+
   if (dialog->m_singleScraperType == CONTENT_ALBUMS)
     dialog->SetAlbumScraper(scraper);
   else
@@ -183,7 +183,7 @@ void CGUIDialogInfoProviderSettings::OnSettingAction(std::shared_ptr<const CSett
   CGUIDialogSettingsManualBase::OnSettingAction(setting);
 
   const std::string &settingId = setting->GetId();
-  
+
   if (settingId == CSettings::SETTING_MUSICLIBRARY_ALBUMSSCRAPER)
   {
     std::string currentScraperId;
@@ -221,7 +221,7 @@ void CGUIDialogInfoProviderSettings::OnSettingAction(std::shared_ptr<const CSett
   else if (settingId == SETTING_ALBUMSCRAPER_SETTINGS)
     CGUIDialogAddonSettings::ShowForAddon(m_albumscraper, false);
   else if (settingId == SETTING_ARTISTSCRAPER_SETTINGS)
-    CGUIDialogAddonSettings::ShowForAddon(m_artistscraper, false);  
+    CGUIDialogAddonSettings::ShowForAddon(m_artistscraper, false);
   else if (settingId == CSettings::SETTING_MUSICLIBRARY_ARTISTSFOLDER)
   {
     VECSOURCES shares;
@@ -265,7 +265,7 @@ void CGUIDialogInfoProviderSettings::Save()
   CLog::Log(LOGINFO, "%s called", __FUNCTION__);
   // Save Fetch addiitional info during update
   CServiceBroker::GetSettings().SetBool(CSettings::SETTING_MUSICLIBRARY_DOWNLOADINFO, m_fetchInfo);
-  // Save default scrapers and addon setting values 
+  // Save default scrapers and addon setting values
   CServiceBroker::GetSettings().SetString(CSettings::SETTING_MUSICLIBRARY_ALBUMSSCRAPER, m_albumscraper->ID());
   m_albumscraper->SaveSettings();
   CServiceBroker::GetSettings().SetString(CSettings::SETTING_MUSICLIBRARY_ARTISTSSCRAPER, m_artistscraper->ID());
@@ -389,9 +389,9 @@ void CGUIDialogInfoProviderSettings::InitializeSettings()
     CLog::Log(LOGERROR, "%s: unable to setup settings", __FUNCTION__);
     return;
   }
-  
+
   if (!m_showSingleScraper)
-  {    
+  {
     AddToggle(group1, CSettings::SETTING_MUSICLIBRARY_DOWNLOADINFO, 38333, SettingLevel::Basic, m_fetchInfo); // "Fetch additional information during scan"
   }
   else
diff --git a/xbmc/music/dialogs/GUIDialogMusicInfo.cpp b/xbmc/music/dialogs/GUIDialogMusicInfo.cpp
index 18469cc21d..a37def6d94 100644
--- a/xbmc/music/dialogs/GUIDialogMusicInfo.cpp
+++ b/xbmc/music/dialogs/GUIDialogMusicInfo.cpp
@@ -119,18 +119,18 @@ public:
         else
           // Fall back further to browse the Artist Info Folder itself
           artistItemPath = CServiceBroker::GetSettings().GetString(CSettings::SETTING_MUSICLIBRARY_ARTISTSFOLDER);
-      }        
+      }
       m_item->SetPath(artistItemPath);
-      
+
       // Store info as CArtist as well as item properties
       dialog->SetArtist(artist, oldartistpath);
 
-      // Fetch artist discography as scraped from online sources, but always 
+      // Fetch artist discography as scraped from online sources, but always
       // include all the albums in the music library
       dialog->SetDiscography(database);
     }
     else
-    { 
+    {
       // tag.GetType == MediaTypeAlbum
       int albumId = tag.GetDatabaseId();
       CAlbum album;
@@ -147,13 +147,13 @@ public:
       dialog->SetAlbum(album, album.strPath);
 
       // Set the list of songs and related art
-      dialog->SetSongs(album.songs);     
+      dialog->SetSongs(album.songs);
     }
     database.Close();
 
-    /* 
+    /*
       Load current art (to CGUIListItem.m_art)
-      For albums this includes related artist(s) art and artist fanart set as 
+      For albums this includes related artist(s) art and artist fanart set as
       fallback album fanart.
       Clear item art first to ensure fresh not cached/partial art
     */
@@ -168,7 +168,7 @@ public:
     dialog->SetArtTypeList(artlist);
     if (dialog->IsCancelled())
       return false;
-    
+
     // Tell waiting MusicDialog that job is complete
     dialog->FetchComplete();
 
@@ -257,7 +257,7 @@ public:
       tag.SetArtist(m_artist);
       CMusicDatabase::SetPropertiesFromArtist(*m_item, m_artist);
 
-      // Fetch artist discography as scraped from online sources, but always 
+      // Fetch artist discography as scraped from online sources, but always
       // include all the albums in the music library
       dialog->SetDiscography(database);
     }
@@ -353,7 +353,7 @@ bool CGUIDialogMusicInfo::OnMessage(CGUIMessage& message)
         m_hasUpdatedUserrating = true;
 
         // Asynchronously update song userrating in library
-        CSetUserratingJob *job = new CSetUserratingJob(m_item->GetMusicInfoTag()->GetAlbumId(), 
+        CSetUserratingJob *job = new CSetUserratingJob(m_item->GetMusicInfoTag()->GetAlbumId(),
                                                        m_item->GetMusicInfoTag()->GetUserrating());
         CJobManager::GetInstance().AddJob(job, NULL);
       }
@@ -361,12 +361,12 @@ bool CGUIDialogMusicInfo::OnMessage(CGUIMessage& message)
       {
         // Send a message to all windows to tell them to update the item.
         // This communicates changes to the music lib window.
-        // The music lib window item is updated to but changes to the rating when it is the sort 
+        // The music lib window item is updated to but changes to the rating when it is the sort
         // do not show on screen until refresh() that fetches the list from scratch, sorts etc.
         CGUIMessage msg(GUI_MSG_NOTIFY_ALL, 0, 0, GUI_MSG_UPDATE_ITEM, 0, m_item);
         CServiceBroker::GetGUI()->GetWindowManager().SendMessage(msg);
       }
-    
+
       CGUIMessage msg(GUI_MSG_LABEL_RESET, GetID(), CONTROL_LIST);
       OnMessage(msg);
       m_albumSongs->Clear();
@@ -474,8 +474,8 @@ bool CGUIDialogMusicInfo::SetItem(CFileItem* item)
 void CGUIDialogMusicInfo::SetAlbum(const CAlbum& album, const std::string &path)
 {
   m_album = album;
-  m_item->SetPath(album.strPath); 
-  
+  m_item->SetPath(album.strPath);
+
   m_startUserrating = m_album.iUserrating;
   m_fallbackartpath.clear();
   m_bArtistInfo = false;
@@ -516,7 +516,7 @@ void CGUIDialogMusicInfo::SetDiscography(CMusicDatabase& database) const
     loader.LoadItem(item.get());
     if (item->GetMusicInfoTag()->GetDatabaseId() == -1)
       item->SetArt("thumb", "DefaultAlbumCover.png");
-  } 
+  }
 }
 
 void CGUIDialogMusicInfo::Update()
@@ -543,7 +543,7 @@ void CGUIDialogMusicInfo::Update()
   const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
 
   // Disable the Choose Art button if the user isn't allowed it
-  CONTROL_ENABLE_ON_CONDITION(CONTROL_BTN_GET_THUMB, 
+  CONTROL_ENABLE_ON_CONDITION(CONTROL_BTN_GET_THUMB,
     profileManager.GetCurrentProfile().canWriteDatabases() || g_passwordManager.bMasterUser);
 }
 
@@ -586,7 +586,7 @@ void CGUIDialogMusicInfo::RefreshInfo()
   // Double check we have permission (button should be hidden when not)
   const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
   if (!profileManager.GetCurrentProfile().canWriteDatabases() && !g_passwordManager.bMasterUser)
-    return; 
+    return;
 
   // Check if scanning
   if (g_application.IsMusicScanning())
@@ -620,7 +620,7 @@ void CGUIDialogMusicInfo::RefreshInfo()
   // Start separate job to scrape info and fill list of art types.
   CJobManager::GetInstance().AddJob(new CRefreshInfoJob(dlgProgress), nullptr, CJob::PRIORITY_HIGH);
 
-  // Wait for refresh to complete or be canceled, but render every 10ms so that the 
+  // Wait for refresh to complete or be canceled, but render every 10ms so that the
   // pointer movements works on dialog even when job is reporting progress infrequently
   if (dlgProgress)
     dlgProgress->Wait(10);
@@ -636,7 +636,7 @@ void CGUIDialogMusicInfo::RefreshInfo()
     if (m_bArtistInfo)
       HELPERS::ShowOKDialogText(CVariant{ 21889 }, CVariant{ 20199 });
     else
-      HELPERS::ShowOKDialogText(CVariant{ 185 }, CVariant{ 500 });      
+      HELPERS::ShowOKDialogText(CVariant{ 185 }, CVariant{ 500 });
     return;
   }
 
@@ -698,7 +698,7 @@ void CGUIDialogMusicInfo::AddItemPathToFileBrowserSources(VECSOURCES &sources, c
     if (item.GetMusicInfoTag()->GetType() == MediaTypeSong)
       itemDir = URIUtils::GetParentPath(item.GetMusicInfoTag()->GetURL());
 
-    // For artist add Artist Info Folder path to browser sources 
+    // For artist add Artist Info Folder path to browser sources
     if (item.GetMusicInfoTag()->GetType() == MediaTypeArtist)
     {
       artistFolder = CServiceBroker::GetSettings().GetString(CSettings::SETTING_MUSICLIBRARY_ARTISTSFOLDER);
@@ -714,7 +714,7 @@ void CGUIDialogMusicInfo::AddItemPathToFileBrowserSources(VECSOURCES &sources, c
     itemSource.strPath = itemDir;
     sources.push_back(itemSource);
   }
-  
+
   // For artist add Artist Info Folder path to browser sources
   if (!artistFolder.empty() && CDirectory::Exists(artistFolder))
   {
@@ -769,7 +769,7 @@ void CGUIDialogMusicInfo::OnGetArt()
     items.Add(item);
   }
   else if (m_item->HasArt("thumb"))
-  { 
+  {
     // For missing art of that type add the thumb (when it exists and not a fallback)
     CGUIListItem::ArtMap::const_iterator i = primeArt.find("thumb");
     if (i != primeArt.end())
@@ -857,12 +857,12 @@ void CGUIDialogMusicInfo::OnGetArt()
         localArt = item.GetLocalFanart();
       else
       { // Check case and ext insenitively for local images with type as name
-        // e.g. <arttype>.jpg 
+        // e.g. <arttype>.jpg
         CFileItemList items;
         CDirectory::GetDirectory(path, items,
             CServiceBroker::GetFileExtensionProvider().GetPictureExtensions(),
             DIR_FLAG_NO_FILE_DIRS | DIR_FLAG_READ_CACHE | DIR_FLAG_NO_FILE_INFO);
-        
+
         for (int j = 0; j < items.Size(); j++)
         {
           std::string strCandidate = URIUtils::GetFileName(items[j]->GetPath());
@@ -875,7 +875,7 @@ void CGUIDialogMusicInfo::OnGetArt()
         }
       }
     }
-  } 
+  }
   if (!localArt.empty() && CFile::Exists(localArt))
   {
     CFileItemPtr item(new CFileItem("Local Art: " + localArt, false));
@@ -886,7 +886,7 @@ void CGUIDialogMusicInfo::OnGetArt()
 
   // No art
   if (bHasArt && !bFallback)
-  { // Actually has this type of art (not a fallback) so 
+  { // Actually has this type of art (not a fallback) so
     // allow the user to delete it by selecting "no art".
     CFileItemPtr item(new CFileItem("thumb://None", false));
     if (m_bArtistInfo)
@@ -899,7 +899,7 @@ void CGUIDialogMusicInfo::OnGetArt()
 
   //! @todo: Add support for extracting embedded art from song files to use for album
 
-  // Clear local images of this type from cache so user will see any recent 
+  // Clear local images of this type from cache so user will see any recent
   // local file changes immediately
   for (auto& item : items)
   {
@@ -917,13 +917,13 @@ void CGUIDialogMusicInfo::OnGetArt()
     CTextureCache::GetInstance().ClearCachedImage(thumb);
     // Remove any thumbnail of local image too (created when browsing files)
     std::string thumbthumb(CTextureUtils::GetWrappedThumbURL(thumb));
-    CTextureCache::GetInstance().ClearCachedImage(thumbthumb);    
+    CTextureCache::GetInstance().ClearCachedImage(thumbthumb);
   }
 
   // Show list of possible art for user selection
-  // Note that during selection thumbs of *all* images shown are cached. When 
+  // Note that during selection thumbs of *all* images shown are cached. When
   // browsing folders there could be many irrelevant thumbs cached that are
-  // never used by Kodi again, but there is no obvious way to clear these 
+  // never used by Kodi again, but there is no obvious way to clear these
   // thumbs from the cache automatically.
   std::string result;
   VECSOURCES sources(*CMediaSourceSettings::GetInstance().GetSources("music"));
@@ -932,7 +932,7 @@ void CGUIDialogMusicInfo::OnGetArt()
   if (CGUIDialogFileBrowser::ShowAndGetImage(items, sources, g_localizeStrings.Get(13511), result) &&
     result != "thumb://Current")
   {
-    // User didn't choose the one they have. 
+    // User didn't choose the one they have.
     // Overwrite with the new art or clear it
     std::string newArt;
     if (StringUtils::StartsWith(result, "thumb://Remote"))
@@ -970,8 +970,8 @@ void CGUIDialogMusicInfo::OnGetArt()
       }
     }
 
-    // Get new artwork to show in other places e.g. on music lib window, but this does 
-    // not update artist, album or fallback art for the currently playing song as it 
+    // Get new artwork to show in other places e.g. on music lib window, but this does
+    // not update artist, album or fallback art for the currently playing song as it
     // is a different item with different ID and media type
     CGUIMessage msg(GUI_MSG_NOTIFY_ALL, 0, 0, GUI_MSG_UPDATE_ITEM, 0, m_item);
     CServiceBroker::GetGUI()->GetWindowManager().SendMessage(msg);
@@ -988,7 +988,7 @@ void CGUIDialogMusicInfo::OnSetUserrating() const
   if (userrating < 0) // Nothing selected, so rating unchanged
     return;
 
-  SetUserrating(userrating);  
+  SetUserrating(userrating);
 }
 
 
diff --git a/xbmc/music/dialogs/GUIDialogSongInfo.cpp b/xbmc/music/dialogs/GUIDialogSongInfo.cpp
index 45d8b3297c..caaa0abf4c 100644
--- a/xbmc/music/dialogs/GUIDialogSongInfo.cpp
+++ b/xbmc/music/dialogs/GUIDialogSongInfo.cpp
@@ -65,7 +65,7 @@ public:
   {
     CGUIDialogSongInfo *dialog = CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIDialogSongInfo>(WINDOW_DIALOG_SONG_INFO);
     if (!dialog)
-      return false; 
+      return false;
     if (dialog->IsCancelled())
       return false;
     CFileItemPtr m_song = dialog->GetCurrentListItem();
@@ -81,7 +81,7 @@ public:
     if (dialog->IsCancelled())
       return false;
     // Fetch album and primary song artist data from library as properties
-    // and lyrics by scanning tags from file 
+    // and lyrics by scanning tags from file
     MUSIC_INFO::CMusicInfoLoader::LoadAdditionalTagInfo(m_song.get());
     if (dialog->IsCancelled())
       return false;
@@ -96,8 +96,8 @@ public:
     if (dialog->IsCancelled())
       return false;
 
-    // Load song art. 
-    // For songs in library this includes related album and artist(s) art.  
+    // Load song art.
+    // For songs in library this includes related album and artist(s) art.
     // Also fetches artist art for non library songs when artist can be found
     // uniquely by name, otherwise just embedded or cached thumb is fetched.
     CMusicThumbLoader loader;
@@ -150,7 +150,7 @@ bool CGUIDialogSongInfo::OnMessage(CGUIMessage& message)
 
         // Send a message to all windows to tell them to update the fileitem
         // This communicates the rating change to the music lib window, current playlist and OSD.
-        // The music lib window item is updated to but changes to the rating when it is the sort 
+        // The music lib window item is updated to but changes to the rating when it is the sort
         // do not show on screen until refresh() that fetchs the list from scratch, sorts etc.
         CGUIMessage msg(GUI_MSG_NOTIFY_ALL, 0, 0, GUI_MSG_UPDATE_ITEM, 0, m_song);
         CServiceBroker::GetGUI()->GetWindowManager().SendMessage(msg);
@@ -160,7 +160,7 @@ bool CGUIDialogSongInfo::OnMessage(CGUIMessage& message)
       break;
     }
   case GUI_MSG_WINDOW_INIT:
-    CGUIDialog::OnMessage(message);    
+    CGUIDialog::OnMessage(message);
     Update();
     m_cancelled = false;
     break;
@@ -242,7 +242,7 @@ void CGUIDialogSongInfo::OnInitWindow()
 {
   // Enable album info button when we know album
   m_albumId = m_song->GetMusicInfoTag()->GetAlbumId();
-  
+
   CONTROL_ENABLE_ON_CONDITION(CONTROL_ALBUMINFO, m_albumId > 0);
 
   // Disable music user rating button for plugins as they don't have tables to save this
@@ -295,14 +295,14 @@ bool CGUIDialogSongInfo::SetSong(CFileItem* item)
   m_cancelled = false;  // SetSong happens before win_init
   // In a separate job fetch song info and fill list of art types.
   int jobid = CJobManager::GetInstance().AddJob(new CGetSongInfoJob(), nullptr, CJob::PRIORITY_LOW);
-  
+
   // Wait to get all data before show, allowing user to to cancel if fetch is slow
   if (!CGUIDialogBusy::WaitOnEvent(m_event, TIME_TO_BUSY_DIALOG))
   {
     // Cancel job still waiting in queue (unlikely)
     CJobManager::GetInstance().CancelJob(jobid);
     // Flag to stop job already in progress
-    m_cancelled = true; 
+    m_cancelled = true;
     return false;
   }
 
@@ -333,7 +333,7 @@ std::string CGUIDialogSongInfo::GetContent()
   1.  Current art
   2.  Local art (thumb found by filename)
   3.  Embedded art (@todo)
-  4.  None 
+  4.  None
   Note that songs are not scraped, hence there is no list of urls for possible remote art
 */
 void CGUIDialogSongInfo::OnGetArt()
@@ -359,7 +359,7 @@ void CGUIDialogSongInfo::OnGetArt()
     // Add item for current artwork, could a fallback from album/artist
     CFileItemPtr item(new CFileItem("thumb://Current", false));
     item->SetArt("thumb", m_song->GetArt(type));
-    item->SetIconImage("DefaultPicture.png");    
+    item->SetIconImage("DefaultPicture.png");
     item->SetLabel(g_localizeStrings.Get(13512));  //! @todo: label fallback art so user knows?
     items.Add(item);
   }
@@ -394,7 +394,7 @@ void CGUIDialogSongInfo::OnGetArt()
     }
   }
 
-  // Clear these local images from cache so user will see any recent 
+  // Clear these local images from cache so user will see any recent
   // local file changes immediately
   for (auto& item : items)
   {
@@ -408,7 +408,7 @@ void CGUIDialogSongInfo::OnGetArt()
   }
 
   if (bHasArt && !bFallback)
-  { // Actually has this type of art (not a fallback) so 
+  { // Actually has this type of art (not a fallback) so
     // allow the user to delete it by selecting "no art".
     CFileItemPtr item(new CFileItem("thumb://None", false));
     item->SetArt("thumb", "DefaultAlbumCover.png");
@@ -428,13 +428,13 @@ void CGUIDialogSongInfo::OnGetArt()
     CFileItem pathItem(albumpath, true);
     CGUIDialogMusicInfo::AddItemPathToFileBrowserSources(sources, pathItem);
   }
-  else  // Add parent folder of song 
+  else  // Add parent folder of song
     CGUIDialogMusicInfo::AddItemPathToFileBrowserSources(sources, *m_song);
   g_mediaManager.GetLocalDrives(sources);
   if (CGUIDialogFileBrowser::ShowAndGetImage(items, sources, g_localizeStrings.Get(13511), result) &&
-    result != "thumb://Current") 
+    result != "thumb://Current")
   {
-    // User didn't choose the one they have, or the fallback image. 
+    // User didn't choose the one they have, or the fallback image.
     // Overwrite with the new art or clear it
     std::string newArt;
     if (result == "thumb://Thumb")
@@ -450,7 +450,7 @@ void CGUIDialogSongInfo::OnGetArt()
 
     // Asynchronously update that type of art in the database
     MUSIC_UTILS::UpdateArtJob(m_song, type, newArt);
-  
+
     // Update local song with current art
     if (newArt.empty())
     {
@@ -458,7 +458,7 @@ void CGUIDialogSongInfo::OnGetArt()
       primeArt.erase(type);
       m_song->SetArt(primeArt);
     }
-    else    
+    else
       // Add or modify the type of art
       m_song->SetArt(type, newArt);
 
@@ -475,7 +475,7 @@ void CGUIDialogSongInfo::OnGetArt()
       }
     }
 
-    // Get new artwork to show in other places e.g. on music lib window, 
+    // Get new artwork to show in other places e.g. on music lib window,
     // current playlist and player OSD.
     CGUIMessage msg(GUI_MSG_NOTIFY_ALL, 0, 0, GUI_MSG_UPDATE_ITEM, 0, m_song);
     CServiceBroker::GetGUI()->GetWindowManager().SendMessage(msg);
diff --git a/xbmc/music/infoscanner/MusicAlbumInfo.cpp b/xbmc/music/infoscanner/MusicAlbumInfo.cpp
index 68f0ffd1d1..57d546d0ce 100644
--- a/xbmc/music/infoscanner/MusicAlbumInfo.cpp
+++ b/xbmc/music/infoscanner/MusicAlbumInfo.cpp
@@ -37,7 +37,7 @@ CMusicAlbumInfo::CMusicAlbumInfo(const std::string& strAlbum, const std::string&
   const std::string& strAlbumInfo, const CScraperUrl& strAlbumURL)
 {
   m_album.strAlbum = strAlbum;
-  //Just setting artist desc, not populating album artist credits. 
+  //Just setting artist desc, not populating album artist credits.
   m_album.strArtistDesc = strArtist;
   m_strTitle2 = strAlbumInfo;
   m_albumURL = strAlbumURL;
diff --git a/xbmc/music/infoscanner/MusicInfoScanner.cpp b/xbmc/music/infoscanner/MusicInfoScanner.cpp
index c4a2dbbe4b..86533c3e91 100644
--- a/xbmc/music/infoscanner/MusicInfoScanner.cpp
+++ b/xbmc/music/infoscanner/MusicInfoScanner.cpp
@@ -37,7 +37,7 @@
 #include "filesystem/File.h"
 #include "filesystem/MusicDatabaseDirectory.h"
 #include "filesystem/MusicDatabaseDirectory/DirectoryNode.h"
-#include "filesystem/SmartPlaylistDirectory.h" 
+#include "filesystem/SmartPlaylistDirectory.h"
 #include "GUIInfoManager.h"
 #include "guilib/GUIComponent.h"
 #include "guilib/GUIKeyboardFactory.h"
@@ -107,7 +107,7 @@ void CMusicInfoScanner::Process()
 
       return;
     }
-    
+
     unsigned int tick = XbmcThreads::SystemClockMillis();
     m_musicDatabase.Open();
     m_bCanInterrupt = true;
@@ -141,7 +141,7 @@ void CMusicInfoScanner::Process()
           /*
            * Note that this will skip scanning (if m_bClean is disabled) if the directory really
            * doesn't exist. Since the music scanner is fed with a list of existing paths from the DB
-           * and cleans out all songs under that path as its first step before re-adding files, if 
+           * and cleans out all songs under that path as its first step before re-adding files, if
            * the entire source is offline we totally empty the music database in one go.
            */
           CLog::Log(LOGWARNING, "%s directory '%s' does not exist - skipping scan.", __FUNCTION__, it->c_str());
@@ -153,7 +153,7 @@ void CMusicInfoScanner::Process()
         m_albumsAdded.clear();
         bool scancomplete = DoScan(*it);
         if (scancomplete)
-        { 
+        {
           if (m_albumsAdded.size() > 0)
           {
             // Set local art for added album disc sets and primary album artists
@@ -161,12 +161,12 @@ void CMusicInfoScanner::Process()
 
             if (m_flags & SCAN_ONLINE)
               // Download additional album and artist information for the recently added albums.
-              // This also identifies any local artist thumb and fanart if it exists, and gives it priority, 
+              // This also identifies any local artist thumb and fanart if it exists, and gives it priority,
               // otherwise it is set to the first available from the remote thumbs and fanart that was scraped.
               ScrapeInfoAddedAlbums();
           }
         }
-        else 
+        else
         {
           commit = false;
           break;
@@ -197,7 +197,7 @@ void CMusicInfoScanner::Process()
       m_fileCountReader.StopThread();
 
       m_musicDatabase.EmptyCache();
-      
+
       tick = XbmcThreads::SystemClockMillis() - tick;
       CLog::Log(LOGNOTICE, "My Music: Scanning for music info using worker thread, operation took %s", StringUtils::SecondsToTimeString(tick / 1000).c_str());
     }
@@ -240,7 +240,7 @@ void CMusicInfoScanner::Process()
         CDirectoryNode::GetDatabaseInfo(*it, params);
         // Only scrape information for artists that have not been scraped before
         // For refresh of information the lastscraped date is optionally clearered elsewhere
-        if (m_musicDatabase.HasArtistBeenScraped(params.GetArtistId())) 
+        if (m_musicDatabase.HasArtistBeenScraped(params.GetArtistId()))
             continue;
 
         CArtist artist;
@@ -275,15 +275,15 @@ void CMusicInfoScanner::Process()
   }
   m_musicDatabase.Close();
   CLog::Log(LOGDEBUG, "%s - Finished scan", __FUNCTION__);
-  
+
   m_bRunning = false;
   ANNOUNCEMENT::CAnnouncementManager::GetInstance().Announce(ANNOUNCEMENT::AudioLibrary, "xbmc", "OnScanFinished");
-  
+
   // we need to clear the musicdb cache and update any active lists
   CUtil::DeleteMusicDatabaseDirectoryCache();
   CGUIMessage msg(GUI_MSG_SCAN_FINISHED, 0, 0, 0);
   CServiceBroker::GetGUI()->GetWindowManager().SendThreadMessage(msg);
-  
+
   if (m_handle)
     m_handle->MarkFinished();
   m_handle = NULL;
@@ -292,7 +292,7 @@ void CMusicInfoScanner::Process()
 void CMusicInfoScanner::Start(const std::string& strDirectory, int flags)
 {
   m_fileCountReader.StopThread();
-  
+
   m_pathsToScan.clear();
   m_seenPaths.clear();
   m_albumsAdded.clear();
@@ -307,7 +307,7 @@ void CMusicInfoScanner::Start(const std::string& strDirectory, int flags)
   }
   else
     m_pathsToScan.insert(strDirectory);
-  
+
   m_bClean = g_advancedSettings.m_bMusicLibraryCleanOnUpdate;
 
   m_scanType = 0;
@@ -608,7 +608,7 @@ static bool SortSongsByTrack(const CSong& song, const CSong& song2)
 void CMusicInfoScanner::FileItemsToAlbums(CFileItemList& items, VECALBUMS& albums, MAPSONGS* songsMap /* = NULL */)
 {
   /*
-   * Step 1: Convert the FileItems into Songs. 
+   * Step 1: Convert the FileItems into Songs.
    * If they're MB tagged, create albums directly from the FileItems.
    * If they're non-MB tagged, index them by album name ready for step 2.
    */
@@ -794,11 +794,11 @@ void CMusicInfoScanner::FileItemsToAlbums(CFileItemList& items, VECALBUMS& album
       if (sortnames.size() != common.size())
           // Split artist sort names further using multiple possible delimiters, over single separator applied in Tag loader
         sortnames = StringUtils::SplitMulti(sortnames, { ";", ":", "|", "#" });
-      
+
       for (size_t i = 0; i < common.size(); i++)
       {
         album.artistCredits.emplace_back(StringUtils::Trim(common[i]));
-        // Set artist sort name providing we have as many as we have artists, 
+        // Set artist sort name providing we have as many as we have artists,
         // otherwise something is wrong with them so ignore rather than guess.
         if (sortnames.size() == common.size())
           album.artistCredits.back().SetSortName(StringUtils::Trim(sortnames[i]));
@@ -828,7 +828,7 @@ CMusicInfoScanner::UpdateAlbumInfo(CAlbum& album,
                                    bool bAllowSelection,
                                    CGUIDialogProgress* pDialog)
 {
-  m_musicDatabase.Open();  
+  m_musicDatabase.Open();
   INFO_RET result = UpdateDatabaseAlbumInfo(album, scraper, bAllowSelection, pDialog);
   m_musicDatabase.Close();
   return result;
@@ -862,10 +862,10 @@ int CMusicInfoScanner::RetrieveMusicInfo(const std::string& strDirectory, CFileI
   FileItemsToAlbums(scannedItems, albums, &songsMap);
 
   /*
-  Set thumb for songs and, if only one album in folder, store the thumb for 
+  Set thumb for songs and, if only one album in folder, store the thumb for
   the album (music db) and the folder path (in Textures db) too.
   The album and path thumb is either set to the folder art, or failing that to
-  the art embedded in the first music file. 
+  the art embedded in the first music file.
   Song thumb is only set when it varies, otherwise it is cleared so that it will
   fallback to the album art (that may be from the first file, or that of the
   folder or set later by scraping from NFO files or remote sources). Clearing
@@ -874,7 +874,7 @@ int CMusicInfoScanner::RetrieveMusicInfo(const std::string& strDirectory, CFileI
   However even if all songs are from one album this may not be the album
   folder. It could be just a subfolder containing some of the songs from a disc
   set e.g. CD1, CD2 etc., or the album could spread across many folders.  In
-  this case the album art gets reset every time a folder with songs from just 
+  this case the album art gets reset every time a folder with songs from just
   that album is processed, and needs to be corrected later once all the parts
   of the album have been scanned.
   */
@@ -907,7 +907,7 @@ int CMusicInfoScanner::RetrieveMusicInfo(const std::string& strDirectory, CFileI
     album->strPath = strDirectory;
     m_musicDatabase.AddAlbum(*album);
     m_albumsAdded.insert(album->idAlbum);
-    
+
     numAdded += album->songs.size();
   }
   return numAdded;
@@ -1111,7 +1111,7 @@ void MUSIC_INFO::CMusicInfoScanner::RetrieveLocalArt()
   if (m_handle)
   {
     m_handle->SetTitle(g_localizeStrings.Get(506)); //"Checking media files..."
-   //!@todo: title = Checking for local art 
+   //!@todo: title = Checking for local art
   }
 
   std::set<int> artistsArtDone; // artists processed to avoid unsuccessful repeats
@@ -1138,7 +1138,7 @@ void MUSIC_INFO::CMusicInfoScanner::RetrieveLocalArt()
       if (album.strPath.empty())
         album.strPath = pathpair.first.c_str();
       else
-        // When more than one album path is the common path 
+        // When more than one album path is the common path
         URIUtils::GetCommonPath(album.strPath, pathpair.first.c_str());
     }
     /*
@@ -1146,7 +1146,7 @@ void MUSIC_INFO::CMusicInfoScanner::RetrieveLocalArt()
 
     Providing all songs from an album are are under a unique common album
     folder (no songs from other albums) then thumb has been set to local art,
-    or failing that to embedded art, during scanning by FindArtForAlbums(). 
+    or failing that to embedded art, during scanning by FindArtForAlbums().
     But when songs are also spread over multiple subfolders within it e.g. disc
     sets, it will have been set to either the art of the last subfolder that was
     processed (if there is any), or from the first song in that subfolder with
@@ -1165,13 +1165,13 @@ void MUSIC_INFO::CMusicInfoScanner::RetrieveLocalArt()
 
     //Automatically fetch local art from disc set subfolders
     if (paths.size() > 1)
-    {          
-      SetDiscSetArtwork(album, paths);    
+    {
+      SetDiscSetArtwork(album, paths);
     }
 
     /*
-    Local album artist art 
-    
+    Local album artist art
+
     Look in the nominated "Artist Information Folder" for thumbs and fanart.
     Failing that, for backward compatibility, fallback to the folder immediately
     above the album folder.
@@ -1179,7 +1179,7 @@ void MUSIC_INFO::CMusicInfoScanner::RetrieveLocalArt()
     for the first album artist if the album is a collaboration e.g. composer,
     conductor, orchestra, or by several pop artists in their own right.
     Avoids repeatedly processing the same artist by maintaining a set.
-    
+
     Adding the album may have added new artists, or provide art for an existing
     (song) artist, but does not replace any artwork already set. Hence once art
     has been found for an album artist, art is not searched for in other folders.
@@ -1291,9 +1291,9 @@ CMusicInfoScanner::UpdateDatabaseAlbumInfo(CAlbum& album,
           StringUtils::Format(g_localizeStrings.Get(24147).c_str(), MediaTypeAlbum, album.strAlbum.c_str()),
           CScraperUrl::GetThumbURL(album.thumbURL.GetFirstThumb()), CURL::GetRedacted(album.strPath), EventLevel::Warning)));
       }
-    }    
+    }
   }
-  
+
   // Restore original album and artist name, possibly changed by manual entry
   // to get info but should not change outside merge
   album.strAlbum = origAlbum;
@@ -1361,11 +1361,11 @@ CMusicInfoScanner::UpdateDatabaseArtistInfo(CArtist& artist,
       }
     }
   }
-  
+
   // Restore original artist name, possibly changed by manual entry to get info
   // but should not change outside merge
   artist.strArtist = origArtist;
-    
+
   if (artistDownloadStatus == INFO_ADDED)
   {
     artist.MergeScrapedArtist(artistInfo.GetArtist(), CServiceBroker::GetSettings().GetBool(CSettings::SETTING_MUSICLIBRARY_OVERRIDETAGS));
@@ -1390,7 +1390,7 @@ CMusicInfoScanner::UpdateDatabaseArtistInfo(CArtist& artist,
       artfolder = artist.strPath;
     else
     {
-      // Fallback to the old location local to music files (when there is a 
+      // Fallback to the old location local to music files (when there is a
       // unique folder). If there is no folder for the artist, and *only* the
       // artist, this will be blank
       m_musicDatabase.GetOldArtistPath(artist.idArtist, artfolder);
@@ -1425,7 +1425,7 @@ CMusicInfoScanner::DownloadAlbumInfo(const CAlbum& album,
   /*
   When the mbid is derived from tags scraping of album information is done directly
   using that ID, otherwise the lookup is based on album and artist names and can mis-identify the
-  album (i.e. classical music has many "Symphony No. 5"). To be able to correct any mistakes a 
+  album (i.e. classical music has many "Symphony No. 5"). To be able to correct any mistakes a
   manual refresh of artist information uses either the mbid if derived from tags or the album
   and artist names, not any previously scraped mbid.
   */
@@ -1530,7 +1530,7 @@ CMusicInfoScanner::DownloadAlbumInfo(const CAlbum& album,
           CMusicAlbumInfo& info = scraper.GetAlbum(i);
           double relevance = info.GetRelevance();
           if (relevance < 0)
-            relevance = CUtil::AlbumRelevance(info.GetAlbum().strAlbum, album.strAlbum, 
+            relevance = CUtil::AlbumRelevance(info.GetAlbum().strAlbum, album.strAlbum,
                         info.GetAlbum().GetAlbumArtistString(),
                         album.GetAlbumArtistString());
 
@@ -1632,10 +1632,10 @@ CMusicInfoScanner::DownloadAlbumInfo(const CAlbum& album,
     ScannerWait(1000);
 
   albumInfo = scraper.GetAlbum(iSelectedAlbum);
-  
+
   if (result == CInfoScanner::COMBINED_NFO || result == CInfoScanner::OVERRIDE_NFO)
     nfoReader.GetDetails(albumInfo.GetAlbum(), NULL, true);
-  
+
   return INFO_ADDED;
 }
 
@@ -1645,11 +1645,11 @@ void CMusicInfoScanner::GetAlbumArtwork(long id, const CAlbum &album)
   {
     // Check current album thumb
     std::string artURL = m_musicDatabase.GetArtForItem(id, MediaTypeAlbum, "thumb");
-    // Use first scraped album image (if there is one) when 
-    // a) no thumb or 
+    // Use first scraped album image (if there is one) when
+    // a) no thumb or
     // b) thumb is embedded in music file and "prefer online album art" enabled
-    if (artURL.empty() || 
-        (StringUtils::StartsWith(artURL, "image://") && 
+    if (artURL.empty() ||
+        (StringUtils::StartsWith(artURL, "image://") &&
          CServiceBroker::GetSettings().GetBool(CSettings::SETTING_MUSICLIBRARY_PREFERONLINEALBUMART)))
     {
       std::string thumb = CScraperUrl::GetThumbURL(album.thumbURL.GetFirstThumb());
@@ -1683,7 +1683,7 @@ CMusicInfoScanner::DownloadArtistInfo(const CArtist& artist,
   /*
   When the mbid is derived from tags scraping of artist information is done directly
   using that ID, otherwise the lookup is based on name and can mis-identify the artist
-  (many have same name). To be able to correct any mistakes a manual refresh of artist 
+  (many have same name). To be able to correct any mistakes a manual refresh of artist
   information uses either the mbid if derived from tags or the artist name, not any previously
   scraped mbid.
   */
@@ -1699,7 +1699,7 @@ CMusicInfoScanner::DownloadArtistInfo(const CArtist& artist,
     }
   }
 
-  // Handle nfo files 
+  // Handle nfo files
   CInfoScanner::INFO_TYPE result = CInfoScanner::NO_NFO;
   CNfoFile nfoReader;
   std::string strNfo;
@@ -1715,7 +1715,7 @@ CMusicInfoScanner::DownloadArtistInfo(const CArtist& artist,
   {
     strNfo = URIUtils::AddFileToFolder(path, "artist.nfo");
     existsNFO = XFILE::CFile::Exists(strNfo);
-  }  
+  }
 
   // If not there fall back local to music files (historic location for those album artists with a unique folder)
   if (!existsNFO)
@@ -1770,7 +1770,7 @@ CMusicInfoScanner::DownloadArtistInfo(const CArtist& artist,
     /*
     Finding artist using xml scraper makes a request for data from Musicbrainz.
     MusicBrainz rate-limits queries to 1 per sec, once we hit the rate-limiter
-    the server returns 503 errors for all calls from that IP address. To stay 
+    the server returns 503 errors for all calls from that IP address. To stay
     below the rate-limit threshold wait 1s before proceeding
     */
     if (!info->IsPython())
@@ -1916,13 +1916,13 @@ std::vector<std::string> CMusicInfoScanner::GetArtTypesToScan(const MediaType& m
   if (mediaType == MediaTypeArtist)
   {
     arttypes = { "thumb", "fanart" };
-    arttypes.insert(arttypes.end(), g_advancedSettings.m_musicArtistExtraArt.begin(), 
+    arttypes.insert(arttypes.end(), g_advancedSettings.m_musicArtistExtraArt.begin(),
       g_advancedSettings.m_musicArtistExtraArt.end());
   }
   else if (mediaType == MediaTypeAlbum)
   {
     arttypes = { "thumb" };
-    arttypes.insert(arttypes.end(), g_advancedSettings.m_musicAlbumExtraArt.begin(), 
+    arttypes.insert(arttypes.end(), g_advancedSettings.m_musicAlbumExtraArt.begin(),
       g_advancedSettings.m_musicAlbumExtraArt.end());
   }
 
@@ -1936,7 +1936,7 @@ std::vector<std::string> CMusicInfoScanner::GetMissingArtTypes(const MediaType&
   // Get default types of art that are automatically fetched during scanning
   arttypes = GetArtTypesToScan(mediaType);
 
-  // Find the types which are missing from the given art 
+  // Find the types which are missing from the given art
   if (art.empty())
     missing = arttypes;
   else
@@ -1947,7 +1947,7 @@ std::vector<std::string> CMusicInfoScanner::GetMissingArtTypes(const MediaType&
         missing.emplace_back(type);
     }
   }
-  
+
   return missing;
 }
 
@@ -1955,7 +1955,7 @@ bool CMusicInfoScanner::SetArtistArtwork(CArtist& artist, const std::vector<std:
 {
   if (missing.empty())
     return false; // All types of artist art found
-   
+
   // Any extra type of art missing, fetch the image files from the art folder.
   // Thumbs and fanart have own advanced settings for file names, what other
   // art types to fetch automatically is optional too, but local file name must
@@ -1969,8 +1969,8 @@ bool CMusicInfoScanner::SetArtistArtwork(CArtist& artist, const std::vector<std:
       break;
     }
   if (extratype)
-      CDirectory::GetDirectory(artfolder, items, 
-        CServiceBroker::GetFileExtensionProvider().GetPictureExtensions(), 
+      CDirectory::GetDirectory(artfolder, items,
+        CServiceBroker::GetFileExtensionProvider().GetPictureExtensions(),
         DIR_FLAG_NO_FILE_DIRS | DIR_FLAG_READ_CACHE | DIR_FLAG_NO_FILE_INFO);
 
   // Get missing art
@@ -2002,7 +2002,7 @@ bool CMusicInfoScanner::SetArtistArtwork(CArtist& artist, const std::vector<std:
         }
       }
     }
-    // No local art, use first from scraped lists. 
+    // No local art, use first from scraped lists.
     // Fanart has own list. Art type is encoded into the scraper XML held in
     // thumbURL as optional "aspect=" field. Type "thumb" or "" returns URLs for
     // all types of art including those without aspect. Those URL without aspect
@@ -2013,7 +2013,7 @@ bool CMusicInfoScanner::SetArtistArtwork(CArtist& artist, const std::vector<std:
         strArt = CScraperUrl::GetThumbURL(artist.thumbURL.GetFirstThumb());
       else if (type == "fanart")
         strArt = artist.fanart.GetImageURL();
-      else 
+      else
         strArt = CScraperUrl::GetThumbURL(artist.thumbURL.GetFirstThumb(type));
     }
     // Add art to artist and library
@@ -2037,7 +2037,7 @@ bool CMusicInfoScanner::SetAlbumArtwork(CAlbum& album, std::vector<std::string>&
       return false; // No local or scraped art to process
   }
   else if (CServiceBroker::GetSettings().GetBool(CSettings::SETTING_MUSICLIBRARY_PREFERONLINEALBUMART))
-  {  
+  {
     // When "prefer online album art" enabled, and we have a scraped cover then
     // if the thumb is embedded replace it by adding "thumb" to the missing types
     std::map<std::string, std::string>::iterator it;
@@ -2095,7 +2095,7 @@ bool CMusicInfoScanner::SetAlbumArtwork(CAlbum& album, std::vector<std::string>&
         }
       }
     }
-    // No local art, use first from scraped list. 
+    // No local art, use first from scraped list.
     // Art type is encoded into the scraper XML held in thumbURL as optional
     // "aspect=" field. Type "thumb" or "" returns URLs for all types of art
     // including those without aspect. Those URL without aspect are also
@@ -2130,10 +2130,10 @@ void CMusicInfoScanner::SetDiscSetArtwork(CAlbum& album, const std::vector<std::
   When we have a true disc set - subfolders AND songs tagged with same unique
   discnumber in each subfolder - save the local art (all types) for each disc.
   */
- 
+
   if (paths.size() <= 1)
     return;  // No disc subfolders to process
-  
+
   // Get default types of art that are to be automatically fetched during scanning
   std::vector<std::string> arttypes;
   arttypes = GetArtTypesToScan(MediaTypeAlbum);
@@ -2203,7 +2203,7 @@ void CMusicInfoScanner::SetDiscSetArtwork(CAlbum& album, const std::vector<std::
       }
     }
   }
-  
+
   // Finally if we still don't have album thumb then use the art from the
   // first disc in the set with a thumb
   if (!firstDiscThumb.empty() && album.art.find("thumb") == album.art.end())
@@ -2249,7 +2249,7 @@ int CMusicInfoScanner::CountFiles(const CFileItemList &items, bool recursive)
   for (int i=0; i<items.Size(); ++i)
   {
     const CFileItemPtr pItem=items[i];
-    
+
     if (recursive && pItem->m_bIsFolder)
       count+=CountFilesRecursively(pItem->GetPath());
     else if (pItem->IsAudio() && !pItem->IsPlayList() && !pItem->IsNFO())
diff --git a/xbmc/music/infoscanner/MusicInfoScanner.h b/xbmc/music/infoscanner/MusicInfoScanner.h
index 7cd2d7f8e3..02c5d0afdb 100644
--- a/xbmc/music/infoscanner/MusicInfoScanner.h
+++ b/xbmc/music/infoscanner/MusicInfoScanner.h
@@ -58,7 +58,7 @@ public:
    This takes a list of FileItems and turns it into a tree of Albums,
    Artists, and Songs.
    Albums are defined uniquely by the album name and album artist.
-   
+
    \param songs [in/out] list of songs to categorise - albumartist field may be altered.
    \param albums [out] albums found within these songs.
    */
@@ -117,7 +117,7 @@ protected:
    \param pDialog [in] a progress dialog which this and downstream functions can update with status, if required
    */
   INFO_RET UpdateDatabaseAlbumInfo(CAlbum& album, const ADDON::ScraperPtr& scraper, bool bAllowSelection, CGUIDialogProgress* pDialog = NULL);
- 
+
   /*! \brief Scrape additional artist information and update the database.
    Search for the given artist using the given scraper.
    If info is found, update the database and artwork with the new
@@ -163,7 +163,7 @@ protected:
   */
   std::vector<std::string> GetArtTypesToScan(const MediaType& mediaType);
 
-  /*! \brief Get the types of art for an artist or album that can be 
+  /*! \brief Get the types of art for an artist or album that can be
    automatically found during scanning, and are not in the provided set of art
    \param mediaType [in] artist or album
    \param art [in] set of art type and file location (URL or path) pairs
@@ -235,9 +235,9 @@ protected:
   int CountFilesRecursively(const std::string& strPath);
 
   /*! \brief Resolve a MusicBrainzID to a URL
-   If we have a MusicBrainz ID for an artist or album, 
+   If we have a MusicBrainz ID for an artist or album,
    resolve it to an MB URL and set up the scrapers accordingly.
-   
+
    \param preferredScraper [in] A ScraperPtr to the preferred album/artist scraper.
    \param musicBrainzURL [out] will be populated with the MB URL for the artist/album.
    */
@@ -253,7 +253,7 @@ protected:
   CMusicDatabase m_musicDatabase;
 
   std::set<int> m_albumsAdded;
- 
+
   std::set<std::string> m_seenPaths;
   int m_flags;
   CThread m_fileCountReader;
diff --git a/xbmc/music/infoscanner/MusicInfoScraper.cpp b/xbmc/music/infoscanner/MusicInfoScraper.cpp
index c458002ca8..8e682d7b94 100644
--- a/xbmc/music/infoscanner/MusicInfoScraper.cpp
+++ b/xbmc/music/infoscanner/MusicInfoScraper.cpp
@@ -194,7 +194,7 @@ bool CMusicInfoScraper::CheckValidOrFallback(const std::string &fallbackScraper)
 {
   return true;
 //! @todo Handle fallback mechanism
-/* 
+/*
   if (m_scraper->Path() != fallbackScraper &&
       parser.Load("special://xbmc/system/scrapers/music/" + fallbackScraper))
   {
diff --git a/xbmc/music/jobs/MusicLibraryCleaningJob.cpp b/xbmc/music/jobs/MusicLibraryCleaningJob.cpp
index 099735c0ee..53a1c8ead7 100644
--- a/xbmc/music/jobs/MusicLibraryCleaningJob.cpp
+++ b/xbmc/music/jobs/MusicLibraryCleaningJob.cpp
@@ -24,7 +24,7 @@
 
 CMusicLibraryCleaningJob::CMusicLibraryCleaningJob(CGUIDialogProgress* progressDialog)
   : CMusicLibraryProgressJob(nullptr)
-{ 
+{
   if (progressDialog)
     SetProgressIndicators(nullptr, progressDialog);
   SetAutoClose(true);
diff --git a/xbmc/music/jobs/MusicLibraryCleaningJob.h b/xbmc/music/jobs/MusicLibraryCleaningJob.h
index 48d25d9321..e3ee175b79 100644
--- a/xbmc/music/jobs/MusicLibraryCleaningJob.h
+++ b/xbmc/music/jobs/MusicLibraryCleaningJob.h
@@ -46,5 +46,5 @@ protected:
   bool Work(CMusicDatabase &db) override;
 
 private:
- 
+
 };
diff --git a/xbmc/music/jobs/MusicLibraryExportJob.cpp b/xbmc/music/jobs/MusicLibraryExportJob.cpp
index 1e55f733d4..b553096dd0 100644
--- a/xbmc/music/jobs/MusicLibraryExportJob.cpp
+++ b/xbmc/music/jobs/MusicLibraryExportJob.cpp
@@ -26,7 +26,7 @@
 CMusicLibraryExportJob::CMusicLibraryExportJob(const CLibExportSettings& settings, CGUIDialogProgress* progressDialog)
   : CMusicLibraryProgressJob(NULL),
     m_settings(settings)
-{ 
+{
   if (progressDialog)
     SetProgressIndicators(NULL, progressDialog);
   SetAutoClose(true);
diff --git a/xbmc/music/jobs/MusicLibraryScanningJob.cpp b/xbmc/music/jobs/MusicLibraryScanningJob.cpp
index 49f0f37119..6297575961 100644
--- a/xbmc/music/jobs/MusicLibraryScanningJob.cpp
+++ b/xbmc/music/jobs/MusicLibraryScanningJob.cpp
@@ -21,7 +21,7 @@
 #include "MusicLibraryScanningJob.h"
 #include "music/MusicDatabase.h"
 
-CMusicLibraryScanningJob::CMusicLibraryScanningJob(const std::string& directory, int flags, bool showProgress /* = true */) 
+CMusicLibraryScanningJob::CMusicLibraryScanningJob(const std::string& directory, int flags, bool showProgress /* = true */)
   : m_scanner(),
     m_directory(directory),
     m_showProgress(showProgress),
diff --git a/xbmc/music/jobs/MusicLibraryScanningJob.h b/xbmc/music/jobs/MusicLibraryScanningJob.h
index 5c8d00d0c2..24d1d76990 100644
--- a/xbmc/music/jobs/MusicLibraryScanningJob.h
+++ b/xbmc/music/jobs/MusicLibraryScanningJob.h
@@ -27,7 +27,7 @@
 
 /*!
  \brief Music library job implementation for scanning items.
- Uses CMusicInfoScanner for scanning and can be run with  or 
+ Uses CMusicInfoScanner for scanning and can be run with  or
  without a visible progress bar.
  */
 class CMusicLibraryScanningJob : public CMusicLibraryJob
diff --git a/xbmc/music/tags/MusicInfoTag.cpp b/xbmc/music/tags/MusicInfoTag.cpp
index 37d3d95f18..91f736c8a5 100644
--- a/xbmc/music/tags/MusicInfoTag.cpp
+++ b/xbmc/music/tags/MusicInfoTag.cpp
@@ -274,8 +274,8 @@ void CMusicInfoTag::SetArtist(const std::string& strArtist)
 void CMusicInfoTag::SetArtist(const std::vector<std::string>& artists, bool FillDesc /* = false*/)
 {
   m_artist = artists;
-  if (m_strArtistDesc.empty() || FillDesc) 
-  { 
+  if (m_strArtistDesc.empty() || FillDesc)
+  {
     SetArtistDesc(StringUtils::Join(artists, g_advancedSettings.m_musicItemSeparator));
   }
 }
@@ -322,7 +322,7 @@ void CMusicInfoTag::SetAlbumArtist(const std::string& strAlbumArtist)
 void CMusicInfoTag::SetAlbumArtist(const std::vector<std::string>& albumArtists, bool FillDesc /* = false*/)
 {
   m_albumArtist = albumArtists;
-  if (m_strAlbumArtistDesc.empty() || FillDesc) 
+  if (m_strAlbumArtistDesc.empty() || FillDesc)
     SetAlbumArtistDesc(StringUtils::Join(albumArtists, g_advancedSettings.m_musicItemSeparator));
 }
 
@@ -585,7 +585,7 @@ void CMusicInfoTag::SetType(const MediaType mediaType)
 void CMusicInfoTag::SetArtist(const CArtist& artist)
 {
   SetArtist(artist.strArtist);
-  SetArtistSort(artist.strSortName); 
+  SetArtistSort(artist.strSortName);
   SetAlbumArtist(artist.strArtist);
   SetAlbumArtistSort(artist.strSortName);
   SetMusicBrainzArtistID({ artist.strMusicBrainzArtistID });
@@ -604,7 +604,7 @@ void CMusicInfoTag::SetAlbum(const CAlbum& album)
   //Set all artist infomation from album artist credits and artist description
   SetArtistDesc(album.GetAlbumArtistString());
   SetArtist(album.GetAlbumArtist());
-  SetArtistSort(album.GetAlbumArtistSort()); 
+  SetArtistSort(album.GetAlbumArtistSort());
   SetMusicBrainzArtistID(album.GetMusicBrainzAlbumArtistID());
   SetAlbumArtistDesc(album.GetAlbumArtistString());
   SetAlbumArtist(album.GetAlbumArtist());
@@ -641,7 +641,7 @@ void CMusicInfoTag::SetSong(const CSong& song)
   SetTitle(song.strTitle);
   SetGenre(song.genre);
   /* Set all artist infomation from song artist credits and artist description.
-     During processing e.g. Cue Sheets, song may only have artist description string 
+     During processing e.g. Cue Sheets, song may only have artist description string
      rather than a fully populated artist credits vector.
   */
   if (!song.HasArtistCredits())
@@ -720,7 +720,7 @@ void CMusicInfoTag::Serialize(CVariant& value) const
   value["musicbrainzartistid"] = m_musicBrainzArtistID;
   value["musicbrainzalbumid"] = m_strMusicBrainzAlbumID;
   value["musicbrainzreleasegroupid"] = m_strMusicBrainzReleaseGroupID;
-  value["musicbrainzalbumartistid"] = m_musicBrainzAlbumArtistID; 
+  value["musicbrainzalbumartistid"] = m_musicBrainzAlbumArtistID;
   value["comment"] = m_strComment;
   value["contributors"] = CVariant(CVariant::VariantTypeArray);
   for (const auto& role : m_musicRoles)
@@ -814,7 +814,7 @@ void CMusicInfoTag::Archive(CArchive& ar)
     ar << m_lastPlayed;
     ar << m_dateAdded;
     ar << m_strComment;
-    ar << (int)m_musicRoles.size();   
+    ar << (int)m_musicRoles.size();
     for (VECMUSICROLES::const_iterator credit = m_musicRoles.begin(); credit != m_musicRoles.end(); ++credit)
     {
       ar << credit->GetRoleId();
@@ -999,7 +999,7 @@ void CMusicInfoTag::AppendArtistRole(const CMusicRole& ArtistRole)
 const std::string CMusicInfoTag::GetArtistStringForRole(const std::string& strRole) const
 {
   std::vector<std::string> artistvector;
-  for (VECMUSICROLES::const_iterator credit = m_musicRoles.begin(); credit != m_musicRoles.end(); ++credit) 
+  for (VECMUSICROLES::const_iterator credit = m_musicRoles.begin(); credit != m_musicRoles.end(); ++credit)
   {
     if (StringUtils::EqualsNoCase(credit->GetRoleDesc(), strRole))
       artistvector.push_back(credit->GetArtist());
diff --git a/xbmc/music/tags/MusicInfoTag.h b/xbmc/music/tags/MusicInfoTag.h
index 8ae4b3d9b2..07156ff8ca 100644
--- a/xbmc/music/tags/MusicInfoTag.h
+++ b/xbmc/music/tags/MusicInfoTag.h
@@ -116,7 +116,7 @@ public:
   void SetLoaded(bool bOnOff = true);
   void SetArtist(const CArtist& artist);
   void SetAlbum(const CAlbum& album);
-  void SetSong(const CSong& song);  
+  void SetSong(const CSong& song);
   void SetMusicBrainzTrackID(const std::string& strTrackID);
   void SetMusicBrainzArtistID(const std::vector<std::string>& musicBrainzArtistId);
   void SetMusicBrainzArtistHints(const std::vector<std::string>& musicBrainzArtistHints);
@@ -162,7 +162,7 @@ public:
    \param genre genre to add.
    */
   void AppendGenre(const std::string &genre);
-  
+
   void AddArtistRole(const std::string& Role, const std::string& strArtist);
   void AddArtistRole(const std::string& Role, const std::vector<std::string>& artists);
   void AppendArtistRole(const CMusicRole& ArtistRole);
diff --git a/xbmc/music/tags/MusicInfoTagLoaderFFmpeg.cpp b/xbmc/music/tags/MusicInfoTagLoaderFFmpeg.cpp
index b93f3bb0d3..33ac3962a4 100644
--- a/xbmc/music/tags/MusicInfoTagLoaderFFmpeg.cpp
+++ b/xbmc/music/tags/MusicInfoTagLoaderFFmpeg.cpp
@@ -82,35 +82,35 @@ bool CMusicInfoTagLoaderFFmpeg::Load(const std::string& strFileName, CMusicInfoT
     return false;
   }
 
-  /* ffmpeg supports the return of ID3v2 metadata but has its own naming system 
-     for some, but not all, of the keys. In particular the key for the conductor 
-     tag TPE3 is called "performer". 
+  /* ffmpeg supports the return of ID3v2 metadata but has its own naming system
+     for some, but not all, of the keys. In particular the key for the conductor
+     tag TPE3 is called "performer".
      See https://github.com/xbmc/FFmpeg/blob/master/libavformat/id3v2.c#L43
      Other keys are retuened using their 4 char name.
-     Only single frame values are returned even for v2.4 fomart tags e.g. while 
-     tagged with multiple TPE1 frames "artist1", "artist2", "artist3" only 
+     Only single frame values are returned even for v2.4 fomart tags e.g. while
+     tagged with multiple TPE1 frames "artist1", "artist2", "artist3" only
      "artist1" is returned by ffmpeg.
-     Hence, like with v2.3 format tags, multiple values for artist, genre etc. 
-     need to be combined when tagging into a single value using a known item 
+     Hence, like with v2.3 format tags, multiple values for artist, genre etc.
+     need to be combined when tagging into a single value using a known item
      separator e.g. "artist1 / artist2 / artist3"
 
-     Any changes to ID3v2 tag processing in CTagLoaderTagLib need to be 
+     Any changes to ID3v2 tag processing in CTagLoaderTagLib need to be
      repeated here
   */
   auto&& ParseTag = [&tag](AVDictionaryEntry* avtag)
-                          { 
+                          {
                             if (strcasecmp(avtag->key, "album") == 0)
                               tag.SetAlbum(avtag->value);
                             else if (strcasecmp(avtag->key, "artist") == 0)
                               tag.SetArtist(avtag->value);
-                            else if (strcasecmp(avtag->key, "album_artist") == 0 || 
+                            else if (strcasecmp(avtag->key, "album_artist") == 0 ||
                                      strcasecmp(avtag->key, "album artist") == 0)
                               tag.SetAlbumArtist(avtag->value);
                             else if (strcasecmp(avtag->key, "title") == 0)
                               tag.SetTitle(avtag->value);
                             else if (strcasecmp(avtag->key, "genre") == 0)
                               tag.SetGenre(avtag->value);
-                            else if (strcasecmp(avtag->key, "part_number") == 0 || 
+                            else if (strcasecmp(avtag->key, "part_number") == 0 ||
                                      strcasecmp(avtag->key, "track") == 0)
                               tag.SetTrackNumber(strtol(avtag->value, nullptr, 10));
                             else if (strcasecmp(avtag->key, "disc") == 0)
@@ -128,22 +128,22 @@ bool CMusicInfoTagLoaderFFmpeg::Load(const std::string& strFileName, CMusicInfoT
                               tag.AddArtistRole("Lyricist", avtag->value);
                             else if (strcasecmp(avtag->key, "TPE4") == 0)
                               tag.AddArtistRole("Remixer", avtag->value);
-                            else if (strcasecmp(avtag->key, "LABEL") == 0 || 
+                            else if (strcasecmp(avtag->key, "LABEL") == 0 ||
                                      strcasecmp(avtag->key, "TPUB") == 0)
                               tag.SetRecordLabel(avtag->value);
-                            else if (strcasecmp(avtag->key, "copyright") == 0 || 
+                            else if (strcasecmp(avtag->key, "copyright") == 0 ||
                                      strcasecmp(avtag->key, "TCOP") == 0) {} // Copyright message
                             else if (strcasecmp(avtag->key, "TDRC") == 0)
                               tag.SetYear(strtol(avtag->value, nullptr, 10));
                             else if (strcasecmp(avtag->key, "TDRL") == 0)
                               tag.SetYear(strtol(avtag->value, nullptr, 10));
                             else if (strcasecmp(avtag->key, "TDTG") == 0) {} // Tagging time
-                            else if (strcasecmp(avtag->key, "language") == 0 || 
+                            else if (strcasecmp(avtag->key, "language") == 0 ||
                                      strcasecmp(avtag->key, "TLAN") == 0) {} // Languages
-                            else if (strcasecmp(avtag->key, "mood") == 0 || 
+                            else if (strcasecmp(avtag->key, "mood") == 0 ||
                                      strcasecmp(avtag->key, "TMOO") == 0)
                               tag.SetMood(avtag->value);
-                            else if (strcasecmp(avtag->key, "artist-sort") == 0 || 
+                            else if (strcasecmp(avtag->key, "artist-sort") == 0 ||
                                      strcasecmp(avtag->key, "TSOP") == 0) {}
                             else if (strcasecmp(avtag->key, "TSO2") == 0) {}  // Album artist sort
                             else if (strcasecmp(avtag->key, "TSOC") == 0) {}  // composer sort
diff --git a/xbmc/music/tags/MusicInfoTagLoaderFactory.cpp b/xbmc/music/tags/MusicInfoTagLoaderFactory.cpp
index b245026841..2dfc970238 100644
--- a/xbmc/music/tags/MusicInfoTagLoaderFactory.cpp
+++ b/xbmc/music/tags/MusicInfoTagLoaderFactory.cpp
@@ -75,9 +75,9 @@ IMusicInfoTagLoader* CMusicInfoTagLoaderFactory::CreateLoader(const CFileItem& i
 
   if (strExtension == "aac" ||
       strExtension == "ape" || strExtension == "mac" ||
-      strExtension == "mp3" || 
-      strExtension == "wma" || 
-      strExtension == "flac" || 
+      strExtension == "mp3" ||
+      strExtension == "wma" ||
+      strExtension == "flac" ||
       strExtension == "m4a" || strExtension == "mp4" || strExtension == "m4b" ||
       strExtension == "m4v" ||
       strExtension == "mpc" || strExtension == "mpp" || strExtension == "mp+" ||
diff --git a/xbmc/music/tags/TagLibVFSStream.h b/xbmc/music/tags/TagLibVFSStream.h
index 4482976b54..176b17a111 100644
--- a/xbmc/music/tags/TagLibVFSStream.h
+++ b/xbmc/music/tags/TagLibVFSStream.h
@@ -38,7 +38,7 @@ namespace MUSIC_INFO
      * Destroys this ByteVectorStream instance.
      */
     ~TagLibVFSStream() override;
-    
+
     /*!
      * Returns the file name in the local file system encoding.
      */
diff --git a/xbmc/music/tags/TagLoaderTagLib.cpp b/xbmc/music/tags/TagLoaderTagLib.cpp
index 18ac3bd92a..3eca9921ae 100644
--- a/xbmc/music/tags/TagLoaderTagLib.cpp
+++ b/xbmc/music/tags/TagLoaderTagLib.cpp
@@ -292,7 +292,7 @@ bool CTagLoaderTagLib::ParseTag(ID3v2::Tag *id3v2, EmbeddedArt *art, MUSIC_INFO:
     if (it->second.isEmpty()) continue;
 
     if      (it->first == "TPE1")   SetArtist(tag, GetID3v2StringList(it->second));
-    else if (it->first == "TSOP")   SetArtistSort(tag, GetID3v2StringList(it->second));    
+    else if (it->first == "TSOP")   SetArtistSort(tag, GetID3v2StringList(it->second));
     else if (it->first == "TALB")   tag.SetAlbum(it->second.front()->toString().to8Bit(true));
     else if (it->first == "TPE2")   SetAlbumArtist(tag, GetID3v2StringList(it->second));
     else if (it->first == "TSO2")   SetAlbumArtistSort(tag, GetID3v2StringList(it->second));
@@ -381,7 +381,7 @@ bool CTagLoaderTagLib::ParseTag(ID3v2::Tag *id3v2, EmbeddedArt *art, MUSIC_INFO:
           CLog::Log(LOGDEBUG, "unrecognized user text tag detected: TXXX:%s", frame->description().toCString(true));
       }
     else if (it->first == "TIPL")
-      // Loop through and process the involved people list 
+      // Loop through and process the involved people list
       // For example Arranger, Engineer, Producer, DJMixer or Mixer
       // In fieldlist every odd field is a function, and every even is an artist or a comma delimited list of artists.
       for (ID3v2::FrameList::ConstIterator ip = it->second.begin(); ip != it->second.end(); ++ip)
@@ -531,20 +531,20 @@ bool CTagLoaderTagLib::ParseTag(APE::Tag *ape, EmbeddedArt *art, CMusicInfoTag&
       AddArtistRole(tag, "Writer", StringListToVectorString(it->second.toStringList()));
     else if ((it->first == "MIXARTIST") || (it->first == "REMIXER"))
       AddArtistRole(tag, "Remixer", StringListToVectorString(it->second.toStringList()));
-    else if (it->first == "ARRANGER") 
+    else if (it->first == "ARRANGER")
       AddArtistRole(tag, "Arranger", StringListToVectorString(it->second.toStringList()));
-    else if (it->first == "ENGINEER") 
+    else if (it->first == "ENGINEER")
       AddArtistRole(tag, "Engineer", StringListToVectorString(it->second.toStringList()));
-    else if (it->first == "PRODUCER") 
+    else if (it->first == "PRODUCER")
       AddArtistRole(tag, "Producer", StringListToVectorString(it->second.toStringList()));
-    else if (it->first == "DJMIXER") 
+    else if (it->first == "DJMIXER")
       AddArtistRole(tag, "DJMixer", StringListToVectorString(it->second.toStringList()));
     else if (it->first == "MIXER")
       AddArtistRole(tag, "Mixer", StringListToVectorString(it->second.toStringList()));
     else if (it->first == "PERFORMER")
       // Picard uses PERFORMER tag as musician credits list formatted "name (instrument)"
       AddArtistInstrument(tag, StringListToVectorString(it->second.toStringList()));
-    else if (it->first == "LABEL")   
+    else if (it->first == "LABEL")
       tag.SetRecordLabel(it->second.toString().to8Bit(true));
     else if (it->first == "COMPILATION")
       tag.SetCompilation(it->second.toString().toInt() == 1);
@@ -930,7 +930,7 @@ void CTagLoaderTagLib::SetArtist(CMusicInfoTag &tag, const std::vector<std::stri
   else
     // Fill both artist vector and artist desc from tag value.
     // Note desc may not be empty as it could have been set by previous parsing of ID3v2 before APE
-    tag.SetArtist(values, true); 
+    tag.SetArtist(values, true);
 }
 
 void CTagLoaderTagLib::SetArtistSort(CMusicInfoTag &tag, const std::vector<std::string> &values)
@@ -1052,7 +1052,7 @@ void CTagLoaderTagLib::AddArtistRole(CMusicInfoTag &tag, const std::vector<std::
   // Every odd entry is a function (e.g. Producer, Arranger etc.) or instrument (e.g. Orchestra, Vocal, Piano)
   // and every even is an artist or a comma delimited list of artists.
 
-  if (values.size() % 2 != 0) // Must contain an even number of entries 
+  if (values.size() % 2 != 0) // Must contain an even number of entries
     return;
 
   // Vector of possible separators
@@ -1074,12 +1074,12 @@ void CTagLoaderTagLib::AddArtistRole(CMusicInfoTag &tag, const std::vector<std::
 
 void CTagLoaderTagLib::AddArtistInstrument(CMusicInfoTag &tag, const std::vector<std::string> &values)
 {
-  /* Values is a musician credits list, each entry is artist name followed by instrument (or function) 
-     e.g. violin, drums, background vocals, solo, orchestra etc. in brackets. This is how Picard uses 
-     the PERFORMER tag. Multiple instruments may be in one tag 
-     e.g "Pierre Marchand (bass, drum machine and hammond organ)", 
-     these will be separated into individual roles. 
-     If there is not a pair of brackets then role is "performer" by default, and the whole entry is 
+  /* Values is a musician credits list, each entry is artist name followed by instrument (or function)
+     e.g. violin, drums, background vocals, solo, orchestra etc. in brackets. This is how Picard uses
+     the PERFORMER tag. Multiple instruments may be in one tag
+     e.g "Pierre Marchand (bass, drum machine and hammond organ)",
+     these will be separated into individual roles.
+     If there is not a pair of brackets then role is "performer" by default, and the whole entry is
      taken as artist name.
   */
   // Vector of possible separators
@@ -1087,7 +1087,7 @@ void CTagLoaderTagLib::AddArtistInstrument(CMusicInfoTag &tag, const std::vector
 
   for (size_t i = 0; i < values.size(); ++i)
   {
-    std::vector<std::string> roles;    
+    std::vector<std::string> roles;
     std::string strArtist = values[i];
     size_t firstLim = values[i].find_first_of("(");
     size_t lastLim = values[i].find_last_of(")");
@@ -1114,7 +1114,7 @@ void CTagLoaderTagLib::AddArtistInstrument(CMusicInfoTag &tag, const std::vector
 
 bool CTagLoaderTagLib::Load(const std::string& strFileName, CMusicInfoTag& tag, const std::string& fallbackFileExtension, EmbeddedArt *art /* = NULL */)
 {
-  // Dont try to read the tags for streams & shoutcast  
+  // Dont try to read the tags for streams & shoutcast
   if (URIUtils::IsInternetStream(strFileName))
     return false;
 
diff --git a/xbmc/music/windows/GUIWindowMusicBase.cpp b/xbmc/music/windows/GUIWindowMusicBase.cpp
index 769437dec3..976a242a5f 100644
--- a/xbmc/music/windows/GUIWindowMusicBase.cpp
+++ b/xbmc/music/windows/GUIWindowMusicBase.cpp
@@ -306,8 +306,8 @@ void CGUIWindowMusicBase::RefreshContent(const std::string& strContent)
   if ( CServiceBroker::GetGUI()->GetWindowManager().GetActiveWindow() == WINDOW_MUSIC_NAV &&
     m_vecItems->GetContent() == strContent &&
     m_vecItems->GetSortMethod() == SortByUserRating)
-    // When music library window is active and showing songs or albums sorted 
-    // by userrating refresh the list to resort items and show new userrating 
+    // When music library window is active and showing songs or albums sorted
+    // by userrating refresh the list to resort items and show new userrating
     Refresh(true);
 }
 
@@ -1123,7 +1123,7 @@ void CGUIWindowMusicBase::OnAssignContent(const std::string &path)
 {
   // Music scrapers are not source specific, so unlike video there is no content selection logic here.
   // Called on having added a music source, this starts scanning items into library when required
- 
+
   // "Add to library" yes/no dialog with additional "settings" custom button
   // "Do you want to add the media from this source to your library?"
   DialogResponse rep = DialogResponse::CUSTOM;
@@ -1133,9 +1133,9 @@ void CGUIWindowMusicBase::OnAssignContent(const std::string &path)
     if (rep == DialogResponse::CUSTOM)
       // Edit default info provider settings so can be applied during scan
       CGUIDialogInfoProviderSettings::Show();
-  }  
-  if (rep == DialogResponse::YES)  
+  }
+  if (rep == DialogResponse::YES)
     g_application.StartMusicScan(path, true);
-  
+
 }
 
diff --git a/xbmc/music/windows/GUIWindowMusicBase.h b/xbmc/music/windows/GUIWindowMusicBase.h
index 7cb7b1deba..0a52cd9328 100644
--- a/xbmc/music/windows/GUIWindowMusicBase.h
+++ b/xbmc/music/windows/GUIWindowMusicBase.h
@@ -94,7 +94,7 @@ protected:
   void OnItemInfoAll(const std::string strPath, bool refresh = false);
   virtual void OnQueueItem(int iItem);
   enum ALLOW_SELECTION { SELECTION_ALLOWED = 0, SELECTION_AUTO, SELECTION_FORCED };
-  
+
   void OnRipTrack(int iItem);
   void LoadPlayList(const std::string& strPlayList) override;
   virtual void OnRemoveSource(int iItem);
diff --git a/xbmc/music/windows/GUIWindowMusicNav.cpp b/xbmc/music/windows/GUIWindowMusicNav.cpp
index 6881a76098..6d09ab5f5f 100644
--- a/xbmc/music/windows/GUIWindowMusicNav.cpp
+++ b/xbmc/music/windows/GUIWindowMusicNav.cpp
@@ -301,8 +301,8 @@ bool CGUIWindowMusicNav::ManageInfoProvider(const CFileItemPtr item)
         if (content == CONTENT_ARTISTS)
           msgctxt = 38068;
         if (CGUIDialogYesNo::ShowAndGetInput(CVariant{ 20195 }, msgctxt)) // Change information provider, confirm for all shown
-        { 
-          // Set scraper for all items on curent view. 
+        {
+          // Set scraper for all items on curent view.
           std::string strPath = "musicdb://";
           if (content == CONTENT_ARTISTS)
             strPath += "artists";
@@ -316,24 +316,24 @@ bool CGUIWindowMusicNav::ManageInfoProvider(const CFileItemPtr item)
             musicUrl.RemoveOption("artistid");
           else
             musicUrl.RemoveOption("albumid");
-         strPath += musicUrl.GetOptions();        
+         strPath += musicUrl.GetOptions();
           result = m_musicdatabase.SetScraperAll(strPath, scraper);
         }
       }
       break;
     case INFOPROVIDERAPPLYOPTIONS::INFOPROVIDER_DEFAULT: // Change information provider for all items
       {
-        msgctxt = 38071; 
+        msgctxt = 38071;
         if (content == CONTENT_ARTISTS)
           msgctxt = 38070;
         if (CGUIDialogYesNo::ShowAndGetInput(CVariant{20195}, msgctxt)) // Change information provider, confirm default and clear
         {
           // Save scraper addon default setting values
           scraper->SaveSettings();
-          // Set default scraper 
+          // Set default scraper
           if (content == CONTENT_ARTISTS)
             CServiceBroker::GetSettings().SetString(CSettings::SETTING_MUSICLIBRARY_ARTISTSSCRAPER, scraper->ID());
-          else 
+          else
             CServiceBroker::GetSettings().SetString(CSettings::SETTING_MUSICLIBRARY_ALBUMSSCRAPER, scraper->ID());
           CServiceBroker::GetSettings().Save();
           // Clear all item specifc settings
@@ -351,7 +351,7 @@ bool CGUIWindowMusicNav::ManageInfoProvider(const CFileItemPtr item)
 
     // Refresh additional information using the new settings
     if (applyto == INFOPROVIDERAPPLYOPTIONS::INFOPROVIDER_ALLVIEW || applyto == INFOPROVIDERAPPLYOPTIONS::INFOPROVIDER_DEFAULT)
-    { 
+    {
       // Change information provider, all artists or albums
       if (CGUIDialogYesNo::ShowAndGetInput(CVariant{20195}, CVariant{38072}))
         OnItemInfoAll(m_vecItems->GetPath(), true);
@@ -390,7 +390,7 @@ bool CGUIWindowMusicNav::OnClick(int iItem, const std::string &player /* = "" */
   }
   if (item->IsMusicDb() && !item->m_bIsFolder)
     m_musicdatabase.SetPropertiesForFileItem(*item);
-    
+
   return CGUIWindowMusicBase::OnClick(iItem, player);
 }
 
@@ -480,7 +480,7 @@ bool CGUIWindowMusicNav::GetDirectory(const std::string &strDirectory, CFileItem
   }
   else if (items.IsPlayList())
     items.SetContent("songs");
-  else if (URIUtils::PathEquals(strDirectory, "special://musicplaylists/") || 
+  else if (URIUtils::PathEquals(strDirectory, "special://musicplaylists/") ||
            URIUtils::PathEquals(strDirectory, "library://music/playlists.xml/"))
     items.SetContent("playlists");
   else if (URIUtils::PathEquals(strDirectory, "plugin://music/"))
@@ -811,7 +811,7 @@ bool CGUIWindowMusicNav::OnContextButton(int itemNumber, CONTEXT_BUTTON button)
     Refresh();
     return true;
 
-  case CONTEXT_BUTTON_SET_CONTENT:    
+  case CONTEXT_BUTTON_SET_CONTENT:
     return ManageInfoProvider(item);
 
   default:
diff --git a/xbmc/network/AirPlayServer.cpp b/xbmc/network/AirPlayServer.cpp
index 2068f9c073..6464d45dfd 100644
--- a/xbmc/network/AirPlayServer.cpp
+++ b/xbmc/network/AirPlayServer.cpp
@@ -228,7 +228,7 @@ void ClearPhotoAssetCache()
   // remove all cached photos
   CFileItemList items;
   XFILE::CDirectory::GetDirectory("special://temp/", items, "", XFILE::DIR_FLAG_DEFAULTS);
-  
+
   for (int i = 0; i < items.Size(); ++i)
   {
     CFileItemPtr pItem = items[i];
@@ -241,7 +241,7 @@ void ClearPhotoAssetCache()
         XFILE::CFile::Delete(pItem->GetPath());
       }
     }
-  }  
+  }
 }
 
 void CAirPlayServer::StopServer(bool bWait)
@@ -272,7 +272,7 @@ bool CAirPlayServer::IsRunning()
 void CAirPlayServer::AnnounceToClients(int state)
 {
   CSingleLock lock (m_connectionLock);
-  
+
   std::vector<CTCPClient>::iterator it;
   for (it = m_connections.begin(); it != m_connections.end(); ++it)
   {
@@ -281,7 +281,7 @@ void CAirPlayServer::AnnounceToClients(int state)
     std::string response;
     int reverseSocket = INVALID_SOCKET;
     it->ComposeReverseEvent(reverseHeader, reverseBody, state);
-  
+
     // Send event status per reverse http socket (play, loading, paused)
     // if we have a reverse header and a reverse socket
     if (!reverseHeader.empty() && m_reverseSockets.find(it->m_sessionId) != m_reverseSockets.end())
@@ -292,12 +292,12 @@ void CAirPlayServer::AnnounceToClients(int state)
       response += reverseHeader;
     }
     response += "\r\n";
-  
+
     if (!reverseBody.empty())
     {
       response += reverseBody;
     }
-  
+
     // don't send it to the connection object
     // the reverse socket itself belongs to
     if (reverseSocket != INVALID_SOCKET && reverseSocket != it->m_socket)
@@ -421,12 +421,12 @@ void CAirPlayServer::Process()
         }
       }
     }
-    
+
     // by reannouncing the zeroconf service
     // we fix issues where xbmc is detected
     // as audio-only target on devices with
     // ios7 and later
-    handleZeroconfAnnouncement();    
+    handleZeroconfAnnouncement();
   }
 
   Deinitialize();
@@ -435,7 +435,7 @@ void CAirPlayServer::Process()
 bool CAirPlayServer::Initialize()
 {
   Deinitialize();
-  
+
   m_ServerSockets = CreateTCPServerSocket(m_port, !m_nonlocal, 10, "AIRPLAY");
   if (m_ServerSockets.empty())
     return false;
@@ -598,13 +598,13 @@ void CAirPlayServer::CTCPClient::ComposeReverseEvent( std::string& reverseHeader
 {
 
   if ( m_lastEvent != state )
-  { 
+  {
     switch(state)
     {
       case EVENT_PLAYING:
       case EVENT_LOADING:
       case EVENT_PAUSED:
-      case EVENT_STOPPED:      
+      case EVENT_STOPPED:
         reverseBody = StringUtils::Format(EVENT_INFO, m_sessionCounter, eventStrings[state]);
         CLog::Log(LOGDEBUG, "AIRPLAY: sending event: %s", eventStrings[state]);
         break;
@@ -732,7 +732,7 @@ bool CAirPlayServer::CTCPClient::checkAuthorization(const std::string& authStr,
 void CAirPlayServer::backupVolume()
 {
   CSingleLock lock(ServerInstanceLock);
-  
+
   if (ServerInstance && ServerInstance->m_origVolume == -1)
     ServerInstance->m_origVolume = (int)g_application.GetVolume();
 }
@@ -754,7 +754,7 @@ void dumpPlist(DllLibPlist *pLibPlist, plist_t *dict)
   uint32_t len = 0;
   pLibPlist->plist_to_xml(*dict,&plist, &len);
   CLog::Log(LOGDEBUG, "AIRPLAY-DUMP: %s", plist);
-  
+
 }
 
 std::string getStringFromPlist(DllLibPlist *pLibPlist,plist_t node)
@@ -782,7 +782,7 @@ int CAirPlayServer::CTCPClient::ProcessRequest( std::string& responseHeader,
 
   int status = AIRPLAY_STATUS_OK;
   bool needAuth = false;
-  
+
   if (m_sessionId.empty())
     m_sessionId = "00000000-0000-0000-0000-000000000000";
 
@@ -835,7 +835,7 @@ int CAirPlayServer::CTCPClient::ProcessRequest( std::string& responseHeader,
         }
       }
   }
-  
+
   // The volume command is used to change playback volume.
   // A value argument should be supplied which indicates how loud we should get.
   // 0.000000 => silent
@@ -858,7 +858,7 @@ int CAirPlayServer::CTCPClient::ProcessRequest( std::string& responseHeader,
         if(oldVolume != volume && CServiceBroker::GetSettings().GetBool(CSettings::SETTING_SERVICES_AIRPLAYVOLUMECONTROL))
         {
           backupVolume();
-          g_application.SetVolume(volume);          
+          g_application.SetVolume(volume);
           CApplicationMessenger::GetInstance().PostMsg(TMSG_VOLUME_SHOW, oldVolume < volume ? ACTION_VOLUME_UP : ACTION_VOLUME_DOWN);
         }
       }
@@ -882,8 +882,8 @@ int CAirPlayServer::CTCPClient::ProcessRequest( std::string& responseHeader,
     }
     else if (contentType == "application/x-apple-binary-plist")
     {
-      CAirPlayServer::m_isPlaying++;    
-      
+      CAirPlayServer::m_isPlaying++;
+
       if (m_pLibPlist->Load())
       {
         m_pLibPlist->EnableDelayedUnload(false);
@@ -909,7 +909,7 @@ int CAirPlayServer::CTCPClient::ProcessRequest( std::string& responseHeader,
             location = getStringFromPlist(m_pLibPlist, tmpNode);
             tmpNode = NULL;
           }
-          
+
           tmpNode = m_pLibPlist->plist_dict_get_item(dict, "rate");
           if (tmpNode)
           {
@@ -952,7 +952,7 @@ int CAirPlayServer::CTCPClient::ProcessRequest( std::string& responseHeader,
     }
     else
     {
-      CAirPlayServer::m_isPlaying++;        
+      CAirPlayServer::m_isPlaying++;
       // Get URL to play
       std::string contentLocation = "Content-Location: ";
       size_t start = body.find(contentLocation);
@@ -1006,13 +1006,13 @@ int CAirPlayServer::CTCPClient::ProcessRequest( std::string& responseHeader,
     else if (method == "GET")
     {
       CLog::Log(LOGDEBUG, "AIRPLAY: got GET request %s", uri.c_str());
-      
+
       if (g_application.GetAppPlayer().GetTotalTime())
       {
         float position = ((float) g_application.GetAppPlayer().GetTime()) / 1000;
         responseBody = StringUtils::Format("duration: %.6f\r\nposition: %.6f\r\n", (float)g_application.GetAppPlayer().GetTotalTime() / 1000, position);
       }
-      else 
+      else
       {
         status = AIRPLAY_STATUS_METHOD_NOT_ALLOWED;
       }
@@ -1020,7 +1020,7 @@ int CAirPlayServer::CTCPClient::ProcessRequest( std::string& responseHeader,
     else
     {
       const char* found = strstr(queryString.c_str(), "position=");
-      
+
       if (found && g_application.GetAppPlayer().HasPlayer())
       {
         int64_t position = (int64_t) (atof(found + strlen("position=")) * 1000.0);
@@ -1068,7 +1068,7 @@ int CAirPlayServer::CTCPClient::ProcessRequest( std::string& responseHeader,
       bool showPhoto = true;
       bool receivePhoto = true;
 
-      
+
       if (photoAction == "cacheOnly")
         showPhoto = false;
       else if (photoAction == "displayCached")
@@ -1077,12 +1077,12 @@ int CAirPlayServer::CTCPClient::ProcessRequest( std::string& responseHeader,
         if (photoCacheId.length())
           CLog::Log(LOGDEBUG, "AIRPLAY: Trying to show from cache asset: %s", photoCacheId.c_str());
       }
-      
+
       if (photoCacheId.length())
         tmpFileName += photoCacheId;
       else
         tmpFileName += "airplay_photo";
-             
+
       if( receivePhoto && m_httpParser->getContentLength() > 3 &&
           m_httpParser->getBody()[1] == 'P' &&
           m_httpParser->getBody()[2] == 'N' &&
@@ -1162,7 +1162,7 @@ int CAirPlayServer::CTCPClient::ProcessRequest( std::string& responseHeader,
     else
     {
       responseBody = StringUtils::Format(PLAYBACK_INFO_NOT_READY);
-      responseHeader = "Content-Type: text/x-apple-plist+xml\r\n";     
+      responseHeader = "Content-Type: text/x-apple-plist+xml\r\n";
     }
   }
 
@@ -1182,7 +1182,7 @@ int CAirPlayServer::CTCPClient::ProcessRequest( std::string& responseHeader,
   {
     // DRM, ignore for now.
   }
-  
+
   else if (uri == "/setProperty")
   {
     status = AIRPLAY_STATUS_NOT_FOUND;
@@ -1196,7 +1196,7 @@ int CAirPlayServer::CTCPClient::ProcessRequest( std::string& responseHeader,
   else if (uri == "/fp-setup")
   {
     status = AIRPLAY_STATUS_PRECONDITION_FAILED;
-  }  
+  }
 
   else if (uri == "200") //response OK from the event reverse message
   {
diff --git a/xbmc/network/AirTunesServer.cpp b/xbmc/network/AirTunesServer.cpp
index adafa7e387..075d7afd24 100644
--- a/xbmc/network/AirTunesServer.cpp
+++ b/xbmc/network/AirTunesServer.cpp
@@ -132,7 +132,7 @@ void CAirTunesServer::RefreshMetadata()
     tag.SetTitle(m_metadata[1]);//title
   if (m_metadata[2].length())
     tag.SetArtist(m_metadata[2]);//artist
-  
+
   CApplicationMessenger::GetInstance().PostMsg(TMSG_UPDATE_CURRENT_ITEM, 1, -1, static_cast<void*>(new CFileItem(tag)));
 }
 
@@ -163,11 +163,11 @@ void CAirTunesServer::SetMetadataFromBuffer(const char *buffer, unsigned int siz
 
   if(metadata["asal"].length())
     m_metadata[0] = metadata["asal"];//album
-  if(metadata["minm"].length())    
+  if(metadata["minm"].length())
     m_metadata[1] = metadata["minm"];//title
-  if(metadata["asar"].length())    
+  if(metadata["asar"].length())
     m_metadata[2] = metadata["asar"];//artist
-  
+
   RefreshMetadata();
 }
 
@@ -183,7 +183,7 @@ void CAirTunesServer::Announce(AnnouncementFlag flag, const char *sender, const
       if (m_pDACP)
         m_pDACP->Play();
     }
-    
+
     if (strcmp(message, "OnStop") == 0 && m_streamStarted)
     {
       CSingleLock lock(m_dacpLock);
@@ -238,7 +238,7 @@ void CAirTunesServer::Process()
       currentActions.insert(currentActions.begin(), m_actionQueue.begin(), m_actionQueue.end());
       m_actionQueue.clear();
     }
-    
+
     for (auto currentAction : currentActions)
     {
       CSingleLock lock(m_dacpLock);
@@ -300,7 +300,7 @@ void CAirTunesServer::SetCoverArtFromBuffer(const char *buffer, unsigned int siz
     return;
 
   CSingleLock lock(m_metadataLock);
-  
+
   if (IsJPEG(buffer, size))
     tmpFilename = TMP_COVERART_PATH_JPG;
 
@@ -392,7 +392,7 @@ void* CAirTunesServer::AudioOutputFunctions::audio_init(void *cls, int bits, int
   // no metadata will be sent).  If there *is* metadata, it will be received
   // in a later call to audio_set_metadata/audio_set_coverart.
   ResetMetadata();
-  
+
   // browse for dacp services protocol which gives us the remote control service
   CZeroconfBrowser::GetInstance()->Start();
   CZeroconfBrowser::GetInstance()->AddServiceType(ZEROCONF_DACP_SERVICE);
@@ -481,7 +481,7 @@ void  CAirTunesServer::AudioOutputFunctions::audio_destroy(void *cls, void *sess
   XFILE::CPipeFile *pipe=(XFILE::CPipeFile *)cls;
   pipe->SetEof();
   pipe->Close();
-  
+
   CAirTunesServer::FreeDACPRemote();
   m_dacp_id.clear();
   m_active_remote_header.clear();
@@ -499,7 +499,7 @@ void  CAirTunesServer::AudioOutputFunctions::audio_destroy(void *cls, void *sess
     CApplicationMessenger::GetInstance().SendMsg(TMSG_MEDIA_STOP);
     CLog::Log(LOGDEBUG, "AIRTUNES: AirPlay not running - stopping player");
   }
-  
+
   m_streamStarted = false;
 
   // no need to browse for dacp services while we don't receive
@@ -517,7 +517,7 @@ void shairplay_log(void *cls, int level, const char *msg)
 
   switch(level)
   {
-    case RAOP_LOG_EMERG:    // system is unusable 
+    case RAOP_LOG_EMERG:    // system is unusable
       xbmcLevel = LOGFATAL;
       break;
     case RAOP_LOG_ALERT:    // action must be taken immediately
@@ -692,13 +692,13 @@ bool CAirTunesServer::Initialize(const std::string &password)
     ao.audio_set_progress   = AudioOutputFunctions::audio_set_progress;
     m_pLibShairplay->EnableDelayedUnload(false);
     m_pRaop = m_pLibShairplay->raop_init(1, &ao, RSA_KEY);//1 - we handle one client at a time max
-    ret = m_pRaop != NULL;    
+    ret = m_pRaop != NULL;
 
     if(ret)
     {
-      char macAdr[6];    
+      char macAdr[6];
       unsigned short port = (unsigned short)m_port;
-      
+
       m_pLibShairplay->raop_set_log_level(m_pRaop, RAOP_LOG_WARNING);
       if(g_advancedSettings.CanLogComponent(LOGAIRTUNES))
       {
diff --git a/xbmc/network/AirTunesServer.h b/xbmc/network/AirTunesServer.h
index 642a243955..cca9e2b870 100644
--- a/xbmc/network/AirTunesServer.h
+++ b/xbmc/network/AirTunesServer.h
@@ -51,7 +51,7 @@ public:
   static void EnableActionProcessing(bool enable);
   // IACtionListener
   bool OnAction(const CAction &action) override;
-  
+
   //CThread
   void Process() override;
 
diff --git a/xbmc/network/DllLibPlist.h b/xbmc/network/DllLibPlist.h
index 3b4cf8932d..89d103d4f8 100644
--- a/xbmc/network/DllLibPlist.h
+++ b/xbmc/network/DllLibPlist.h
@@ -58,7 +58,7 @@ class DllLibPlist : public DllDynamic, DllLibPlistInterface
 
 
   BEGIN_METHOD_RESOLVE()
-    RESOLVE_METHOD_RENAME(plist_new_dict,         plist_new_dict)    
+    RESOLVE_METHOD_RENAME(plist_new_dict,         plist_new_dict)
     RESOLVE_METHOD_RENAME(plist_free,             plist_free)
     RESOLVE_METHOD_RENAME(plist_dict_get_size,    plist_dict_get_size)
     RESOLVE_METHOD_RENAME(plist_from_bin,         plist_from_bin)
diff --git a/xbmc/network/DllLibShairplay.h b/xbmc/network/DllLibShairplay.h
index 6243db5b1e..d26f66da19 100644
--- a/xbmc/network/DllLibShairplay.h
+++ b/xbmc/network/DllLibShairplay.h
@@ -31,7 +31,7 @@ class DllLibShairplayInterface
 public:
   virtual ~DllLibShairplayInterface() = default;
 
-  
+
   virtual raop_t *    raop_init(int max_clients, raop_callbacks_t *callbacks, const char *pemkey)=0;
   virtual raop_t *    raop_init_from_keyfile(int max_clients, raop_callbacks_t *callbacks, const char *keyfile)=0;
   virtual void        raop_set_log_level(raop_t *raop, int level)=0;
@@ -39,7 +39,7 @@ public:
   virtual int         raop_is_running(raop_t *raop)=0;
   virtual int         raop_start(raop_t *raop, unsigned short *port, const char *hwaddr, int hwaddrlen, const char *password)=0;
   virtual void        raop_stop(raop_t *raop)=0;
-  virtual void        raop_destroy(raop_t *raop)=0;  
+  virtual void        raop_destroy(raop_t *raop)=0;
 };
 
 class DllLibShairplay : public DllDynamic, DllLibShairplayInterface
@@ -52,10 +52,10 @@ class DllLibShairplay : public DllDynamic, DllLibShairplayInterface
   DEFINE_METHOD1(int,       raop_is_running,        (raop_t *p1))
   DEFINE_METHOD5(int,       raop_start,             (raop_t *p1, unsigned short *p2, const char *p3, int p4, const char *p5))
   DEFINE_METHOD1(void,      raop_stop,              (raop_t *p1))
-  DEFINE_METHOD1(void,      raop_destroy,           (raop_t *p1)) 
+  DEFINE_METHOD1(void,      raop_destroy,           (raop_t *p1))
 
   BEGIN_METHOD_RESOLVE()
-    RESOLVE_METHOD_RENAME(raop_init,              raop_init)    
+    RESOLVE_METHOD_RENAME(raop_init,              raop_init)
     RESOLVE_METHOD_RENAME(raop_init_from_keyfile, raop_init_from_keyfile)
     RESOLVE_METHOD_RENAME(raop_set_log_level,     raop_set_log_level)
     RESOLVE_METHOD_RENAME(raop_set_log_callback,  raop_set_log_callback)
diff --git a/xbmc/network/EventClient.cpp b/xbmc/network/EventClient.cpp
index c8d9bee60c..6608ca2cc5 100644
--- a/xbmc/network/EventClient.cpp
+++ b/xbmc/network/EventClient.cpp
@@ -110,7 +110,7 @@ void CEventButtonState::Load()
         - (unsigned char)'0'; // convert <num> to int
       m_joystickName = m_joystickName.substr(2); // extract joyname
     }
-    
+
     if (m_mapName.length() > 3 &&
         (StringUtils::StartsWith(m_mapName, "CC")) ) // custom map - CC:<controllerName>
     {
diff --git a/xbmc/network/Network.cpp b/xbmc/network/Network.cpp
index e3df460d97..5533b71929 100644
--- a/xbmc/network/Network.cpp
+++ b/xbmc/network/Network.cpp
@@ -313,7 +313,7 @@ bool CNetworkBase::WakeOnLan(const char* mac)
     CLog::Log(LOGERROR, "%s - Unable to create socket (%s)", __FUNCTION__, strerror (errno));
     return false;
   }
- 
+
   // Set socket options
   struct sockaddr_in saddr;
   saddr.sin_family = AF_INET;
@@ -327,7 +327,7 @@ bool CNetworkBase::WakeOnLan(const char* mac)
     closesocket(packet);
     return false;
   }
- 
+
   // Build the magic packet (6 x 0xff + 16 x MAC address)
   ptr = buf;
   for (i = 0; i < 6; i++)
@@ -336,7 +336,7 @@ bool CNetworkBase::WakeOnLan(const char* mac)
   for (j = 0; j < 16; j++)
     for (i = 0; i < 6; i++)
       *ptr++ = ethaddr[i];
- 
+
   // Send the magic packet
   if (sendto (packet, (char *)buf, 102, 0, (struct sockaddr *)&saddr, sizeof (saddr)) < 0)
   {
@@ -377,8 +377,8 @@ static const char* ConnectHostPort(SOCKET soc, const struct sockaddr_in& addr, s
 
     { // wait for connect to complete
       fd_set wset;
-      FD_ZERO(&wset); 
-      FD_SET(soc, &wset); 
+      FD_ZERO(&wset);
+      FD_SET(soc, &wset);
 
       result = select(FD_SETSIZE, 0, &wset, 0, &timeOut);
     }
@@ -406,8 +406,8 @@ static const char* ConnectHostPort(SOCKET soc, const struct sockaddr_in& addr, s
   if (tryRead)
   {
     fd_set rset;
-    FD_ZERO(&rset); 
-    FD_SET(soc, &rset); 
+    FD_ZERO(&rset);
+    FD_SET(soc, &rset);
 
     result = select(FD_SETSIZE, &rset, 0, 0, &timeOut);
 
@@ -433,20 +433,20 @@ bool CNetworkBase::PingHost(unsigned long ipaddr, unsigned short port, unsigned
   if (port == 0) // use icmp ping
     return PingHost (ipaddr, timeOutMs);
 
-  struct sockaddr_in addr; 
-  addr.sin_family = AF_INET; 
-  addr.sin_port = htons(port); 
-  addr.sin_addr.s_addr = ipaddr; 
+  struct sockaddr_in addr;
+  addr.sin_family = AF_INET;
+  addr.sin_port = htons(port);
+  addr.sin_addr.s_addr = ipaddr;
 
-  SOCKET soc = socket(AF_INET, SOCK_STREAM, 0); 
+  SOCKET soc = socket(AF_INET, SOCK_STREAM, 0);
 
   const char* err_msg = "invalid socket";
 
   if (soc != INVALID_SOCKET)
   {
-    struct timeval tmout; 
-    tmout.tv_sec = timeOutMs / 1000; 
-    tmout.tv_usec = (timeOutMs % 1000) * 1000; 
+    struct timeval tmout;
+    tmout.tv_sec = timeOutMs / 1000;
+    tmout.tv_usec = (timeOutMs % 1000) * 1000;
 
     err_msg = ConnectHostPort (soc, addr, tmout, readability_check);
 
diff --git a/xbmc/network/NetworkServices.cpp b/xbmc/network/NetworkServices.cpp
index 1ccbfbe000..8260dd3310 100644
--- a/xbmc/network/NetworkServices.cpp
+++ b/xbmc/network/NetworkServices.cpp
@@ -212,7 +212,7 @@ bool CNetworkServices::OnSettingChanging(std::shared_ptr<const CSetting> setting
 #ifdef HAS_AIRPLAY
     else
     {
-      // cannot disable 
+      // cannot disable
       if (IsAirPlayServerRunning() || IsAirTunesServerRunning())
       {
         HELPERS::ShowOKDialogText(CVariant{1259}, CVariant{34303});
@@ -248,12 +248,12 @@ bool CNetworkServices::OnSettingChanging(std::shared_ptr<const CSetting> setting
         return false;
       }
 #endif //HAS_AIRTUNES
-      
+
       if (!StartAirPlayServer())
       {
         HELPERS::ShowOKDialogText(CVariant{1273}, CVariant{33100});
         return false;
-      }      
+      }
     }
     else
     {
@@ -262,7 +262,7 @@ bool CNetworkServices::OnSettingChanging(std::shared_ptr<const CSetting> setting
       if (!StopAirTunesServer(true))
         ret = false;
 #endif //HAS_AIRTUNES
-      
+
       if (!StopAirPlayServer(true))
         ret = false;
 
@@ -498,7 +498,7 @@ void CNetworkServices::Start()
     CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Warning, g_localizeStrings.Get(33102), g_localizeStrings.Get(33100));
   if (m_settings.GetBool(CSettings::SETTING_SERVICES_ESENABLED) && !StartJSONRPCServer())
     CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Warning, g_localizeStrings.Get(33103), g_localizeStrings.Get(33100));
-  
+
   // note - airtunesserver has to start before airplay server (ios7 client detection bug)
   StartAirTunesServer();
   StartAirPlayServer();
@@ -576,7 +576,7 @@ bool CNetworkServices::StopWebserver()
     CLog::Log(LOGWARNING, "Webserver: Failed to stop.");
     return false;
   }
-  
+
 #ifdef HAS_ZEROCONF
 #ifdef HAS_WEB_INTERFACE
   CZeroconf::GetInstance()->RemoveService("servers.webserver");
@@ -600,14 +600,14 @@ bool CNetworkServices::StartAirPlayServer()
 
   if (IsAirPlayServerRunning())
     return true;
-  
+
   if (!CAirPlayServer::StartServer(g_advancedSettings.m_airPlayPort, true))
     return false;
-  
+
   if (!CAirPlayServer::SetCredentials(m_settings.GetBool(CSettings::SETTING_SERVICES_USEAIRPLAYPASSWORD),
                                       m_settings.GetString(CSettings::SETTING_SERVICES_AIRPLAYPASSWORD)))
     return false;
-  
+
 #ifdef HAS_ZEROCONF
   std::vector<std::pair<std::string, std::string> > txt;
   CNetworkInterface* iface = CServiceBroker::GetNetwork().GetFirstConnectedInterface();
@@ -775,7 +775,7 @@ bool CNetworkServices::StopEventServer(bool bWait, bool promptuser)
   {
     if (server->GetNumberOfClients() > 0)
     {
-      if (HELPERS::ShowYesNoDialogText(CVariant{13140}, CVariant{13141}, CVariant{""}, CVariant{""}, 10000) != 
+      if (HELPERS::ShowYesNoDialogText(CVariant{13140}, CVariant{13141}, CVariant{""}, CVariant{""}, 10000) !=
         DialogResponse::YES)
       {
         CLog::Log(LOGNOTICE, "ES: Not stopping event server");
@@ -989,7 +989,7 @@ bool CNetworkServices::StopUPnPServer()
 #endif // HAS_UPNP
   return false;
 }
-  
+
 bool CNetworkServices::StartRss()
 {
   if (IsRssRunning())
diff --git a/xbmc/network/NetworkServices.h b/xbmc/network/NetworkServices.h
index 9beb1fe49c..bcf692a4e4 100644
--- a/xbmc/network/NetworkServices.h
+++ b/xbmc/network/NetworkServices.h
@@ -43,7 +43,7 @@ class CNetworkServices : public ISettingCallback
 public:
   CNetworkServices(CSettings &settings);
   ~CNetworkServices() override;
-  
+
   bool OnSettingChanging(std::shared_ptr<const CSetting> setting) override;
   void OnSettingChanged(std::shared_ptr<const CSetting> setting) override;
   bool OnSettingUpdate(std::shared_ptr<CSetting> setting, const char *oldSettingId, const TiXmlNode *oldSettingNode) override;
@@ -85,7 +85,7 @@ public:
   bool StartUPnPServer();
   bool IsUPnPServerRunning();
   bool StopUPnPServer();
-  
+
   bool StartRss();
   bool IsRssRunning();
   bool StopRss();
diff --git a/xbmc/network/Socket.cpp b/xbmc/network/Socket.cpp
index 64ea77b506..8f6642e9af 100644
--- a/xbmc/network/Socket.cpp
+++ b/xbmc/network/Socket.cpp
@@ -102,7 +102,7 @@ bool CPosixUDPSocket::Bind(bool localOnly, int port, int range)
     }
 #else
     CLog::Log(LOGERROR, "UDP: Could not create socket");
-#endif    
+#endif
     CLog::Log(LOGERROR, "UDP: %s", strerror(errno));
     return false;
   }
diff --git a/xbmc/network/Socket.h b/xbmc/network/Socket.h
index dd00109aef..151ebe2058 100644
--- a/xbmc/network/Socket.h
+++ b/xbmc/network/Socket.h
@@ -125,7 +125,7 @@ namespace SOCKETS
           hash = 0xfffffffeu;
         return (unsigned long)htonl(hash);
       }
-      else 
+      else
         return (unsigned long)saddr.saddr4.sin_addr.s_addr;
     }
   };
diff --git a/xbmc/network/WakeOnAccess.cpp b/xbmc/network/WakeOnAccess.cpp
index cb0246e5c2..bded41fcca 100644
--- a/xbmc/network/WakeOnAccess.cpp
+++ b/xbmc/network/WakeOnAccess.cpp
@@ -286,7 +286,7 @@ public:
 
     if (m_dialog)
     {
-      m_dialog->SetHeading(CVariant{heading}); 
+      m_dialog->SetHeading(CVariant{heading});
       m_dialog->SetLine(0, CVariant{""});
       m_dialog->SetLine(1, CVariant{""});
       m_dialog->SetLine(2, CVariant{""});
@@ -319,7 +319,7 @@ public:
     {
       if (waitObj.SuccessWaiting())
         return Success;
-            
+
       if (m_dialog)
       {
         if (!m_dialog->IsActive())
@@ -371,7 +371,7 @@ private:
 class PingResponseWaiter : public WaitCondition, private IJobCallback
 {
 public:
-  PingResponseWaiter (bool async, const CWakeOnAccess::WakeUpEntry& server) 
+  PingResponseWaiter (bool async, const CWakeOnAccess::WakeUpEntry& server)
     : m_server(server), m_jobId(0), m_hostOnline(false)
   {
     if (async)
@@ -519,7 +519,7 @@ bool CWakeOnAccess::WakeUpHost(const WakeUpEntry& server)
       else
       {
         CLog::Log(LOGNOTICE, "WakeOnAccess timeout/cancel while waiting for network");
-        return false; // timedout or canceled ; give up 
+        return false; // timedout or canceled ; give up
       }
     }
   }
@@ -542,7 +542,7 @@ bool CWakeOnAccess::WakeUpHost(const WakeUpEntry& server)
   {
     PingResponseWaiter waitObj (dlg.HasDialog(), server); // wait for ping response ..
 
-    ProgressDialogHelper::wait_result 
+    ProgressDialogHelper::wait_result
       result = dlg.ShowAndWait (waitObj, server.wait_online1_sec, LOCALIZED(13030));
 
     if (result == ProgressDialogHelper::TimedOut)
@@ -799,7 +799,7 @@ void CWakeOnAccess::OnSettingsLoaded()
   LoadFromXML();
 }
 
-void CWakeOnAccess::SetEnabled(bool enabled) 
+void CWakeOnAccess::SetEnabled(bool enabled)
 {
   m_enabled = enabled;
 
@@ -835,7 +835,7 @@ void CWakeOnAccess::LoadFromXML()
   if (XMLUtils::GetInt(pRootElement, "netinittimeout", tmp, 0, 5 * 60))
     m_netinit_sec = tmp;
   CLog::Log(LOGNOTICE,"  -Network init timeout : [%d] sec", m_netinit_sec);
-  
+
   if (XMLUtils::GetInt(pRootElement, "netsettletime", tmp, 0, 5 * 1000))
     m_netsettle_ms = tmp;
   CLog::Log(LOGNOTICE,"  -Network settle time  : [%d] ms", m_netsettle_ms);
diff --git a/xbmc/network/WebServer.cpp b/xbmc/network/WebServer.cpp
index f74fe7f1c4..5a82070569 100644
--- a/xbmc/network/WebServer.cpp
+++ b/xbmc/network/WebServer.cpp
@@ -200,7 +200,7 @@ int CWebServer::HandlePartialRequest(struct MHD_Connection *connection, Connecti
   // reset con_cls and set it if still necessary
   *con_cls = nullptr;
 
-  if (!IsAuthenticated(request)) 
+  if (!IsAuthenticated(request))
     return AskForAuthentication(request);
 
   // check if this is the first call to AnswerToConnection for this request
@@ -381,7 +381,7 @@ int CWebServer::FinalizeRequest(const std::shared_ptr<IHTTPRequestHandler>& hand
   const HTTPRequest &request = handler->GetRequest();
   const HTTPResponseDetails &responseDetails = handler->GetResponseDetails();
 
-  // if the request handler has set a content type and it hasn't been set as a header, add it 
+  // if the request handler has set a content type and it hasn't been set as a header, add it
   if (!responseDetails.contentType.empty())
     handler->AddResponseHeader(MHD_HTTP_HEADER_CONTENT_TYPE, responseDetails.contentType);
 
@@ -1077,7 +1077,7 @@ static void logFromMHD(void* unused, const char* fmt, va_list ap)
     {
       if (errDsc.at(errDsc.length() - 1) == '\n')
         errDsc.erase(errDsc.length() - 1);
-      
+
       // Most common error is "aborted connection", so log it at LOGDEBUG level
       CLog::Log(LOGDEBUG, "CWebServer [MHD]: %s", errDsc.c_str());
     }
@@ -1195,7 +1195,7 @@ bool CWebServer::Start(uint16_t port, const std::string &username, const std::st
       m_daemon_ip6 = StartMHD(MHD_USE_IPv6, port);
     }
     m_daemon_ip4 = StartMHD(0, port);
-    
+
     m_running = (m_daemon_ip6 != nullptr) || (m_daemon_ip4 != nullptr);
     if (m_running)
     {
@@ -1219,7 +1219,7 @@ bool CWebServer::Stop()
 
   if (m_daemon_ip4 != nullptr)
     MHD_stop_daemon(m_daemon_ip4);
-    
+
   m_running = false;
   CLog::Log(LOGNOTICE, "CWebServer[%hu]: Stopped", m_port);
   m_port = 0;
diff --git a/xbmc/network/Zeroconf.cpp b/xbmc/network/Zeroconf.cpp
index b0c1b54575..bfb491e1cb 100644
--- a/xbmc/network/Zeroconf.cpp
+++ b/xbmc/network/Zeroconf.cpp
@@ -49,7 +49,7 @@ class CZeroconfDummy : public CZeroconf
     return false;
   }
 
-  virtual bool doForceReAnnounceService(const std::string&){return false;} 
+  virtual bool doForceReAnnounceService(const std::string&){return false;}
   virtual bool doRemoveService(const std::string& fcr_ident){return false;}
   virtual void doStop(){}
 };
@@ -174,7 +174,7 @@ CZeroconf::CPublish::CPublish(const std::string& fcr_identifier, const PublishIn
   m_servmap.insert(std::make_pair(fcr_identifier, pubinfo));
 }
 
-CZeroconf::CPublish::CPublish(const tServiceMap& servmap) 
+CZeroconf::CPublish::CPublish(const tServiceMap& servmap)
   : m_servmap(servmap)
 {
 }
diff --git a/xbmc/network/Zeroconf.h b/xbmc/network/Zeroconf.h
index 8f2704b3ef..ed6e81bf68 100644
--- a/xbmc/network/Zeroconf.h
+++ b/xbmc/network/Zeroconf.h
@@ -54,7 +54,7 @@ public:
                       const std::string& fcr_name,
                       unsigned int f_port,
                       std::vector<std::pair<std::string, std::string> > txt /*= std::vector<std::pair<std::string, std::string> >()*/);
-  
+
   //tries to rebroadcast that service on the network without removing/readding
   //this can be achieved by changing a fake txt record. Implementations should
   //implement it by doing so.
@@ -105,7 +105,7 @@ protected:
   //methods to implement for concrete implementations
   //update this service
   virtual bool doForceReAnnounceService(const std::string& fcr_identifier) = 0;
-  
+
   //removes the service if published
   virtual bool doRemoveService(const std::string& fcr_ident) = 0;
 
diff --git a/xbmc/network/ZeroconfBrowser.cpp b/xbmc/network/ZeroconfBrowser.cpp
index a89e0151a1..196ed01e5e 100644
--- a/xbmc/network/ZeroconfBrowser.cpp
+++ b/xbmc/network/ZeroconfBrowser.cpp
@@ -60,7 +60,7 @@ CZeroconfBrowser::CZeroconfBrowser():mp_crit_sec(new CCriticalSection),m_started
   AddServiceType("_ftp._tcp.");
   AddServiceType("_webdav._tcp.");
 #ifdef HAS_FILESYSTEM_NFS
-  AddServiceType("_nfs._tcp.");  
+  AddServiceType("_nfs._tcp.");
 #endif// HAS_FILESYSTEM_NFS
   AddServiceType("_sftp-ssh._tcp.");
 }
@@ -224,7 +224,7 @@ void CZeroconfBrowser::ZeroconfService::SetPort(int f_port)
 void CZeroconfBrowser::ZeroconfService::SetTxtRecords(const tTxtRecordMap& txt_records)
 {
   m_txtrecords_map = txt_records;
-  
+
   CLog::Log(LOGDEBUG,"CZeroconfBrowser: dump txt-records");
   for(tTxtRecordMap::const_iterator it = m_txtrecords_map.begin(); it != m_txtrecords_map.end(); ++it)
   {
diff --git a/xbmc/network/ZeroconfBrowser.h b/xbmc/network/ZeroconfBrowser.h
index 7d8515c802..2aadffc805 100644
--- a/xbmc/network/ZeroconfBrowser.h
+++ b/xbmc/network/ZeroconfBrowser.h
@@ -73,7 +73,7 @@ public:
 
       void SetPort(int f_port);
       int GetPort() const {return m_port;}
-    
+
       void SetTxtRecords(const tTxtRecordMap& txt_records);
       const tTxtRecordMap& GetTxtRecords() const { return m_txtrecords_map;}
       ///@}
@@ -90,9 +90,9 @@ public:
       //used for mdns in case dns resolution fails
       //we store the hostname and resolve with mdns functions again
       std::string m_hostname;
-      
+
       //1 entry below stores the txt-record as a key value map for this service
-      tTxtRecordMap m_txtrecords_map;    
+      tTxtRecordMap m_txtrecords_map;
   };
 
   // starts browsing
diff --git a/xbmc/network/cddb.cpp b/xbmc/network/cddb.cpp
index c1a58ce850..02b7600d6d 100644
--- a/xbmc/network/cddb.cpp
+++ b/xbmc/network/cddb.cpp
@@ -479,8 +479,8 @@ void Xcddb::parseData(const char *buffer)
   std::map<std::string, std::string> keywords;
   std::list<std::string> keywordsOrder; // remember order of keywords as it appears in data received from CDDB
 
-  // Collect all the keywords and put them in map. 
-  // Multiple occurrences of the same keyword indicate that 
+  // Collect all the keywords and put them in map.
+  // Multiple occurrences of the same keyword indicate that
   // the data contained on those lines should be concatenated
   char *line;
   const char trenner[3] = {'\n', '\r', '\0'};
@@ -512,7 +512,7 @@ void Xcddb::parseData(const char *buffer)
     }
   }
 
-  // parse keywords 
+  // parse keywords
   for (std::list<std::string>::const_iterator it = keywordsOrder.begin(); it != keywordsOrder.end(); ++it)
   {
     std::string strKeyword = *it;
diff --git a/xbmc/network/dacp/dacp.h b/xbmc/network/dacp/dacp.h
index a2153d147b..f09a052d5c 100644
--- a/xbmc/network/dacp/dacp.h
+++ b/xbmc/network/dacp/dacp.h
@@ -27,7 +27,7 @@ class CDACP
 {
   public:
     CDACP(const std::string &active_remote_header, const std::string &hostname, int port);
-  
+
     void BeginFwd();
     void BeginRewnd();
     void ToggleMute();
diff --git a/xbmc/network/httprequesthandler/HTTPJsonRpcHandler.h b/xbmc/network/httprequesthandler/HTTPJsonRpcHandler.h
index 3f794f0d68..361754237e 100644
--- a/xbmc/network/httprequesthandler/HTTPJsonRpcHandler.h
+++ b/xbmc/network/httprequesthandler/HTTPJsonRpcHandler.h
@@ -31,7 +31,7 @@ class CHTTPJsonRpcHandler : public IHTTPRequestHandler
 public:
   CHTTPJsonRpcHandler() = default;
   ~CHTTPJsonRpcHandler() override = default;
-  
+
   // implementations of IHTTPRequestHandler
   IHTTPRequestHandler* Create(const HTTPRequest &request) const override { return new CHTTPJsonRpcHandler(request); }
   bool CanHandleRequest(const HTTPRequest &request) const override;
diff --git a/xbmc/network/httprequesthandler/HTTPPythonHandler.h b/xbmc/network/httprequesthandler/HTTPPythonHandler.h
index adf4d90e0d..d0d295b2ec 100644
--- a/xbmc/network/httprequesthandler/HTTPPythonHandler.h
+++ b/xbmc/network/httprequesthandler/HTTPPythonHandler.h
@@ -30,7 +30,7 @@ class CHTTPPythonHandler : public IHTTPRequestHandler
 public:
   CHTTPPythonHandler();
   ~CHTTPPythonHandler() override = default;
-  
+
   IHTTPRequestHandler* Create(const HTTPRequest &request) const override { return new CHTTPPythonHandler(request); }
   bool CanHandleRequest(const HTTPRequest &request) const override;
   bool CanHandleRanges() const override { return false; }
diff --git a/xbmc/network/httprequesthandler/HTTPVfsHandler.h b/xbmc/network/httprequesthandler/HTTPVfsHandler.h
index 984a634846..a79f36ddb9 100644
--- a/xbmc/network/httprequesthandler/HTTPVfsHandler.h
+++ b/xbmc/network/httprequesthandler/HTTPVfsHandler.h
@@ -29,7 +29,7 @@ class CHTTPVfsHandler : public CHTTPFileHandler
 public:
   CHTTPVfsHandler() = default;
   ~CHTTPVfsHandler() override = default;
-  
+
   IHTTPRequestHandler* Create(const HTTPRequest &request) const override { return new CHTTPVfsHandler(request); }
   bool CanHandleRequest(const HTTPRequest &request) const override;
 
diff --git a/xbmc/network/httprequesthandler/HTTPWebinterfaceAddonsHandler.h b/xbmc/network/httprequesthandler/HTTPWebinterfaceAddonsHandler.h
index 07cde91b43..4076a96313 100644
--- a/xbmc/network/httprequesthandler/HTTPWebinterfaceAddonsHandler.h
+++ b/xbmc/network/httprequesthandler/HTTPWebinterfaceAddonsHandler.h
@@ -29,7 +29,7 @@ class CHTTPWebinterfaceAddonsHandler : public IHTTPRequestHandler
 public:
   CHTTPWebinterfaceAddonsHandler() = default;
   ~CHTTPWebinterfaceAddonsHandler() override = default;
-  
+
   IHTTPRequestHandler* Create(const HTTPRequest &request) const override { return new CHTTPWebinterfaceAddonsHandler(request); }
   bool CanHandleRequest(const HTTPRequest &request) const override;
 
diff --git a/xbmc/network/httprequesthandler/HTTPWebinterfaceHandler.cpp b/xbmc/network/httprequesthandler/HTTPWebinterfaceHandler.cpp
index 60951fad5d..38353898e7 100644
--- a/xbmc/network/httprequesthandler/HTTPWebinterfaceHandler.cpp
+++ b/xbmc/network/httprequesthandler/HTTPWebinterfaceHandler.cpp
@@ -57,7 +57,7 @@ int CHTTPWebinterfaceHandler::ResolveUrl(const std::string &url, std::string &pa
   // determine the addon and addon's path
   if (!ResolveAddon(url, addon, path))
     return MHD_HTTP_NOT_FOUND;
-  
+
   if (XFILE::CDirectory::Exists(path))
   {
     if (URIUtils::GetFileName(path).empty())
diff --git a/xbmc/network/httprequesthandler/HTTPWebinterfaceHandler.h b/xbmc/network/httprequesthandler/HTTPWebinterfaceHandler.h
index 075063199f..87ad6fd065 100644
--- a/xbmc/network/httprequesthandler/HTTPWebinterfaceHandler.h
+++ b/xbmc/network/httprequesthandler/HTTPWebinterfaceHandler.h
@@ -30,7 +30,7 @@ class CHTTPWebinterfaceHandler : public CHTTPFileHandler
 public:
   CHTTPWebinterfaceHandler() = default;
   ~CHTTPWebinterfaceHandler() override = default;
-  
+
   IHTTPRequestHandler* Create(const HTTPRequest &request) const override { return new CHTTPWebinterfaceHandler(request); }
   bool CanHandleRequest(const HTTPRequest &request) const override;
 
diff --git a/xbmc/network/httprequesthandler/IHTTPRequestHandler.cpp b/xbmc/network/httprequesthandler/IHTTPRequestHandler.cpp
index 7f7769470d..7328009c0f 100644
--- a/xbmc/network/httprequesthandler/IHTTPRequestHandler.cpp
+++ b/xbmc/network/httprequesthandler/IHTTPRequestHandler.cpp
@@ -116,7 +116,7 @@ bool IHTTPRequestHandler::AddPostData(const char *data, size_t size)
 {
   if (size > 0)
     return appendPostData(data, size);
-  
+
   return true;
 }
 
diff --git a/xbmc/network/httprequesthandler/IHTTPRequestHandler.h b/xbmc/network/httprequesthandler/IHTTPRequestHandler.h
index 27ff1489c9..b4874bdf11 100644
--- a/xbmc/network/httprequesthandler/IHTTPRequestHandler.h
+++ b/xbmc/network/httprequesthandler/IHTTPRequestHandler.h
@@ -151,7 +151,7 @@ public:
   * \details This is only used if the response can be cached.
   */
   virtual bool GetLastModifiedDate(CDateTime &lastModified) const { return false; }
- 
+
   /*!
    * \brief Returns the ranges with raw data belonging to the response.
    *
diff --git a/xbmc/network/mdns/ZeroconfBrowserMDNS.cpp b/xbmc/network/mdns/ZeroconfBrowserMDNS.cpp
index 6c8db658a2..3531df466b 100644
--- a/xbmc/network/mdns/ZeroconfBrowserMDNS.cpp
+++ b/xbmc/network/mdns/ZeroconfBrowserMDNS.cpp
@@ -151,7 +151,7 @@ void DNSSD_API CZeroconfBrowserMDNS::ResolveCallback(DNSServiceRef
   }
 
   DNSServiceErrorType err;
-  CZeroconfBrowser::ZeroconfService::tTxtRecordMap recordMap; 
+  CZeroconfBrowser::ZeroconfService::tTxtRecordMap recordMap;
   std::string strIP;
   CZeroconfBrowserMDNS* p_instance = static_cast<CZeroconfBrowserMDNS*> ( context );
 
@@ -325,7 +325,7 @@ bool CZeroconfBrowserMDNS::doResolveService(CZeroconfBrowser::ZeroconfService& f
 {
   DNSServiceErrorType err;
   DNSServiceRef sdRef = NULL;
-  
+
   //start resolving
   m_resolving_service = fr_service;
   m_resolved_event.Reset();
@@ -349,7 +349,7 @@ bool CZeroconfBrowserMDNS::doResolveService(CZeroconfBrowser::ZeroconfService& f
 #if defined(HAS_MDNS_EMBEDDED)
   // when using the embedded mdns service the call to DNSServiceProcessResult
   // above will not block until the resolving was finished - instead we have to
-  // wait for resolve to return or timeout  
+  // wait for resolve to return or timeout
   m_resolved_event.WaitMSec(f_timeout * 1000);
 #endif //HAS_MDNS_EMBEDDED
   fr_service = m_resolving_service;
diff --git a/xbmc/network/upnp/UPnP.cpp b/xbmc/network/upnp/UPnP.cpp
index 97279030eb..7bd807b2d0 100644
--- a/xbmc/network/upnp/UPnP.cpp
+++ b/xbmc/network/upnp/UPnP.cpp
@@ -388,7 +388,7 @@ public:
 
     playerCoreFactory.OnPlayerDiscovered((const char*)device->GetUUID()
                                           ,(const char*)device->GetFriendlyName());
-    
+
     m_registeredRenderers.insert(std::string(device->GetUUID().GetChars()));
     return true;
   }
diff --git a/xbmc/network/upnp/UPnPPlayer.cpp b/xbmc/network/upnp/UPnPPlayer.cpp
index 893b2c576b..cd468836a2 100644
--- a/xbmc/network/upnp/UPnPPlayer.cpp
+++ b/xbmc/network/upnp/UPnPPlayer.cpp
@@ -603,7 +603,7 @@ bool CUPnPPlayer::OnAction(const CAction &action)
       {
         //stop on remote system
         m_stopremote = HELPERS::ShowYesNoDialogText(CVariant{37022}, CVariant{37023}) == DialogResponse::YES;
-        
+
         return false; /* let normal code handle the action */
       }
     default:
diff --git a/xbmc/network/upnp/UPnPServer.cpp b/xbmc/network/upnp/UPnPServer.cpp
index 8d56b979a1..fdb4db2b37 100644
--- a/xbmc/network/upnp/UPnPServer.cpp
+++ b/xbmc/network/upnp/UPnPServer.cpp
@@ -290,7 +290,7 @@ CUPnPServer::Build(CFileItemPtr                  item,
             object->m_ObjectID = "0";
             object->m_ParentID = "-1";
             // root has 5 children
-            
+
             //This is dead code because of the HACK a few lines up setting with_count to false
             //if (with_count) {
             //    ((PLT_MediaContainer*)object)->m_ChildrenCount = 5;
@@ -1210,13 +1210,13 @@ CUPnPServer::ServeFile(const NPT_HttpRequest&              request,
 
     // set getCaptionInfo.sec - sets subtitle uri for Samsung devices
     const NPT_String* captionInfoHeader = request.GetHeaders().GetHeaderValue("getCaptionInfo.sec");
-    if (captionInfoHeader) 
+    if (captionInfoHeader)
     {
       NPT_String *sub_uri, movie;
       movie = "subtitle://" + md5;
 
       NPT_AutoLock lock(m_FileMutex);
-      if (NPT_SUCCEEDED(m_FileMap.Get(movie, sub_uri))) 
+      if (NPT_SUCCEEDED(m_FileMap.Get(movie, sub_uri)))
       {
         response.GetHeaders().SetHeader("CaptionInfo.sec", sub_uri->GetChars(), false);
       }
diff --git a/xbmc/network/upnp/UPnPSettings.cpp b/xbmc/network/upnp/UPnPSettings.cpp
index 9360f8ee71..bd842041c1 100644
--- a/xbmc/network/upnp/UPnPSettings.cpp
+++ b/xbmc/network/upnp/UPnPSettings.cpp
@@ -64,7 +64,7 @@ bool CUPnPSettings::Load(const std::string &file)
 
   if (!CFile::Exists(file))
     return false;
-  
+
   CXBMCTinyXML doc;
   if (!doc.LoadFile(file))
   {
diff --git a/xbmc/network/upnp/UPnPSettings.h b/xbmc/network/upnp/UPnPSettings.h
index 08ba8a49fc..164035847b 100644
--- a/xbmc/network/upnp/UPnPSettings.h
+++ b/xbmc/network/upnp/UPnPSettings.h
@@ -29,7 +29,7 @@ class CUPnPSettings : public ISettingsHandler
 {
 public:
   static CUPnPSettings& GetInstance();
-  
+
   void OnSettingsUnloaded() override;
 
   bool Load(const std::string &file);
diff --git a/xbmc/network/websocket/WebSocket.cpp b/xbmc/network/websocket/WebSocket.cpp
index 8fd34b7a87..7508d4687b 100644
--- a/xbmc/network/websocket/WebSocket.cpp
+++ b/xbmc/network/websocket/WebSocket.cpp
@@ -197,7 +197,7 @@ CWebSocketFrame::CWebSocketFrame(WebSocketFrameOpcode opcode, const char* data /
   {
     dataByte |= 127 & MASK_LENGTH;
     buffer.push_back(dataByte);
-    
+
     uint64_t dataLength = Endian_SwapBE64(m_length);
     buffer.append((const char*)&dataLength, 8);
   }
@@ -336,7 +336,7 @@ const CWebSocketMessage* CWebSocket::Handle(const char* &buffer, size_t &length,
               if (msg != NULL)
                 msg->AddFrame(Pong(frame->GetApplicationData()));
               break;
-            
+
             case WebSocketConnectionClose:
               CLog::Log(LOGINFO, "WebSocket: connection closed by client");
 
diff --git a/xbmc/network/websocket/WebSocket.h b/xbmc/network/websocket/WebSocket.h
index 4938dcb93d..43ce572fdd 100644
--- a/xbmc/network/websocket/WebSocket.h
+++ b/xbmc/network/websocket/WebSocket.h
@@ -19,7 +19,7 @@
  */
 
 #pragma once
- 
+
 #include <stdint.h>
 #include <vector>
 
diff --git a/xbmc/network/websocket/WebSocketManager.cpp b/xbmc/network/websocket/WebSocketManager.cpp
index b572f4edde..87b320c78d 100644
--- a/xbmc/network/websocket/WebSocketManager.cpp
+++ b/xbmc/network/websocket/WebSocketManager.cpp
@@ -66,7 +66,7 @@ CWebSocket* CWebSocketManager::Handle(const char* data, unsigned int length, std
 
     return NULL;
   }
-  
+
   CWebSocket *websocket = NULL;
   if (strncmp(value, "8", 1) == 0)
     websocket = new CWebSocketV8();
diff --git a/xbmc/network/websocket/WebSocketV13.cpp b/xbmc/network/websocket/WebSocketV13.cpp
index 94f85295ef..3adaa78611 100644
--- a/xbmc/network/websocket/WebSocketV13.cpp
+++ b/xbmc/network/websocket/WebSocketV13.cpp
@@ -147,7 +147,7 @@ bool CWebSocketV13::Handshake(const char* data, size_t length, std::string &resp
   char *responseBuffer;
   int responseLength = httpResponse.Create(responseBuffer);
   response = std::string(responseBuffer, responseLength);
-  
+
   m_state = WebSocketStateConnected;
 
   return true;
diff --git a/xbmc/network/websocket/WebSocketV8.cpp b/xbmc/network/websocket/WebSocketV8.cpp
index 54b79b37cf..68da03eeb9 100644
--- a/xbmc/network/websocket/WebSocketV8.cpp
+++ b/xbmc/network/websocket/WebSocketV8.cpp
@@ -129,7 +129,7 @@ bool CWebSocketV8::Handshake(const char* data, size_t length, std::string &respo
   char *responseBuffer;
   int responseLength = httpResponse.Create(responseBuffer);
   response = std::string(responseBuffer, responseLength);
-  
+
   m_state = WebSocketStateConnected;
 
   return true;
diff --git a/xbmc/peripherals/Peripherals.h b/xbmc/peripherals/Peripherals.h
index f419c8854c..51eca10b78 100644
--- a/xbmc/peripherals/Peripherals.h
+++ b/xbmc/peripherals/Peripherals.h
@@ -239,7 +239,7 @@ namespace PERIPHERALS
     EventPollHandlePtr RegisterEventPoller() { return m_eventScanner.RegisterPollHandle(); }
 
     /*!
-     * 
+     *
      */
     void OnUserNotification();
 
diff --git a/xbmc/peripherals/addons/AddonButtonMap.cpp b/xbmc/peripherals/addons/AddonButtonMap.cpp
index 5e2d805c99..05be885073 100644
--- a/xbmc/peripherals/addons/AddonButtonMap.cpp
+++ b/xbmc/peripherals/addons/AddonButtonMap.cpp
@@ -590,7 +590,7 @@ CAddonButtonMap::DriverMap CAddonButtonMap::CreateLookupTable(const FeatureMap&
         break;
     }
   }
-  
+
   return driverMap;
 }
 
diff --git a/xbmc/peripherals/addons/PeripheralAddon.h b/xbmc/peripherals/addons/PeripheralAddon.h
index c6b40f646e..804a24aac0 100644
--- a/xbmc/peripherals/addons/PeripheralAddon.h
+++ b/xbmc/peripherals/addons/PeripheralAddon.h
@@ -177,7 +177,7 @@ namespace PERIPHERALS
 
     /* @brief Thread synchronization */
     CCriticalSection    m_critSection;
-    
+
     AddonInstance_Peripheral m_struct;
 
     CSharedSection      m_dllSection;
diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
index 7c6ce6fdf0..562a054d94 100644
--- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
@@ -287,7 +287,7 @@ bool CPeripheralCecAdapter::OpenConnection(void)
     m_bStarted = false;
     return bIsOpen;
   }
-  
+
   // open the CEC adapter
   CLog::Log(LOGDEBUG, "%s - opening a connection to the CEC adapter: %s", __FUNCTION__, m_strComPort.c_str());
 
@@ -602,7 +602,7 @@ void CPeripheralCecAdapter::OnTvStandby(void)
   case LOCALISED_ID_HIBERNATE:
     m_bStarted = false;
     KODI::MESSAGING::CApplicationMessenger::GetInstance().PostMsg(TMSG_SYSTEM_POWERDOWN, TMSG_HIBERNATE);
-    break;    
+    break;
   case LOCALISED_ID_QUIT:
     m_bStarted = false;
     KODI::MESSAGING::CApplicationMessenger::GetInstance().PostMsg(TMSG_QUIT);
diff --git a/xbmc/peripherals/devices/PeripheralImon.cpp b/xbmc/peripherals/devices/PeripheralImon.cpp
index 78f78c35f6..a54d048c40 100644
--- a/xbmc/peripherals/devices/PeripheralImon.cpp
+++ b/xbmc/peripherals/devices/PeripheralImon.cpp
@@ -40,7 +40,7 @@ void CPeripheralImon::OnDeviceRemoved()
   if (m_bImonConflictsWithDInput)
   {
     if (--m_lCountOfImonsConflictWithDInput == 0)
-      ActionOnImonConflict(false);    
+      ActionOnImonConflict(false);
   }
 }
 
@@ -51,7 +51,7 @@ bool CPeripheralImon::InitialiseFeature(const PeripheralFeature feature)
 #if defined(TARGET_WINDOWS)
     if (HasSetting("disable_winjoystick") && GetSettingBool("disable_winjoystick"))
       m_bImonConflictsWithDInput = true;
-    else 
+    else
 #endif // TARGET_WINDOWS
       m_bImonConflictsWithDInput = false;
 
diff --git a/xbmc/peripherals/devices/PeripheralImon.h b/xbmc/peripherals/devices/PeripheralImon.h
index 6918f9b540..275d301225 100644
--- a/xbmc/peripherals/devices/PeripheralImon.h
+++ b/xbmc/peripherals/devices/PeripheralImon.h
@@ -37,7 +37,7 @@ namespace PERIPHERALS
     void OnSettingChanged(const std::string &strChangedSetting) override;
     void OnDeviceRemoved() override;
     void AddSetting(const std::string &strKey, std::shared_ptr<const CSetting> setting, int order) override;
-    inline bool IsImonConflictsWithDInput() 
+    inline bool IsImonConflictsWithDInput()
     { return m_bImonConflictsWithDInput;}
     static inline long GetCountOfImonsConflictWithDInput()
     { return m_lCountOfImonsConflictWithDInput; }
diff --git a/xbmc/peripherals/dialogs/GUIDialogPeripheralSettings.cpp b/xbmc/peripherals/dialogs/GUIDialogPeripheralSettings.cpp
index 8b3d2ecb70..5eb7076146 100644
--- a/xbmc/peripherals/dialogs/GUIDialogPeripheralSettings.cpp
+++ b/xbmc/peripherals/dialogs/GUIDialogPeripheralSettings.cpp
@@ -164,7 +164,7 @@ void CGUIDialogPeripheralSettings::InitializeSettings()
     CLog::Log(LOGERROR, "CGUIDialogPeripheralSettings: unable to setup settings");
     return;
   }
-  
+
   std::vector<SettingPtr> settings = peripheral->GetSettings();
   for (std::vector<SettingPtr>::iterator itSetting = settings.begin(); itSetting != settings.end(); ++itSetting)
   {
diff --git a/xbmc/pictures/GUIWindowPictures.cpp b/xbmc/pictures/GUIWindowPictures.cpp
index 0d32839b95..e3ff876240 100644
--- a/xbmc/pictures/GUIWindowPictures.cpp
+++ b/xbmc/pictures/GUIWindowPictures.cpp
@@ -334,7 +334,7 @@ bool CGUIWindowPictures::ShowPicture(int iItem, bool startSlideShow)
   for (int i = 0; i < (int)m_vecItems->Size();++i)
   {
     CFileItemPtr pItem = m_vecItems->Get(i);
-    if (!pItem->m_bIsFolder && !(URIUtils::IsRAR(pItem->GetPath()) || 
+    if (!pItem->m_bIsFolder && !(URIUtils::IsRAR(pItem->GetPath()) ||
           URIUtils::IsZIP(pItem->GetPath())) && (pItem->IsPicture() || (
                                 CServiceBroker::GetSettings().GetBool(CSettings::SETTING_PICTURES_SHOWVIDEOS) &&
                                 pItem->IsVideo())))
@@ -350,7 +350,7 @@ bool CGUIWindowPictures::ShowPicture(int iItem, bool startSlideShow)
 
   if (startSlideShow)
     pSlideShow->StartSlideShow();
-  else 
+  else
   {
     CVariant param;
     param["player"]["speed"] = 1;
@@ -388,7 +388,7 @@ void CGUIWindowPictures::OnSlideShowRecursive(const std::string &strPicture)
 {
   CGUIWindowSlideShow *pSlideShow = CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIWindowSlideShow>(WINDOW_SLIDESHOW);
   if (pSlideShow)
-  {   
+  {
     std::string strExtensions;
     CFileItemList items;
     CGUIViewState* viewState=CGUIViewState::GetViewState(GetID(), items);
@@ -423,7 +423,7 @@ void CGUIWindowPictures::OnSlideShow(const std::string &strPicture)
 {
   CGUIWindowSlideShow *pSlideShow = CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIWindowSlideShow>(WINDOW_SLIDESHOW);
   if (pSlideShow)
-  {    
+  {
     std::string strExtensions;
     CFileItemList items;
     CGUIViewState* viewState=CGUIViewState::GetViewState(GetID(), items);
diff --git a/xbmc/pictures/GUIWindowSlideShow.cpp b/xbmc/pictures/GUIWindowSlideShow.cpp
index 3375e71ad2..311daaec4c 100644
--- a/xbmc/pictures/GUIWindowSlideShow.cpp
+++ b/xbmc/pictures/GUIWindowSlideShow.cpp
@@ -241,7 +241,7 @@ void CGUIWindowSlideShow::Reset()
 }
 
 void CGUIWindowSlideShow::OnDeinitWindow(int nextWindowID)
-{ 
+{
   if (m_Resolution != CDisplaySettings::GetInstance().GetCurrentResolution())
   {
     //FIXME: Use GUI resolution for now
@@ -512,7 +512,7 @@ void CGUIWindowSlideShow::Process(unsigned int currentTime, CDirtyRegionList &re
         CLog::Log(LOGDEBUG, "Loading the thumb %s for next video %d: %s", picturePath.c_str(), m_iNextSlide, item->GetPath().c_str());
       else
         CLog::Log(LOGDEBUG, "Loading the next image %d: %s", m_iNextSlide, item->GetPath().c_str());
-      
+
       int maxWidth, maxHeight;
       GetCheckedSize((float)res.iWidth * m_fZoom,
                      (float)res.iHeight * m_fZoom,
@@ -528,7 +528,7 @@ void CGUIWindowSlideShow::Process(unsigned int currentTime, CDirtyRegionList &re
       return;
     bSlideShow = false;
   }
-  
+
   // render the current image
   if (m_Image[m_iCurrentPic].IsLoaded())
   {
@@ -692,7 +692,7 @@ EVENT_RESULT CGUIWindowSlideShow::OnMouseEvent(const CPoint &point, const CMouse
       result |= EVENT_RESULT_PAN_VERTICAL;
 
     return (EVENT_RESULT)result;
-  }  
+  }
   else if (event.m_id == ACTION_GESTURE_BEGIN)
   {
     m_firstGesturePoint = point;
@@ -1135,7 +1135,7 @@ void CGUIWindowSlideShow::OnLoadPic(int iPic, int iSlideNumber, const std::strin
     CLog::Log(LOGDEBUG, "Finished background loading slot %d, %d: %s", iPic, iSlideNumber, m_slides.at(iSlideNumber)->GetPath().c_str());
     m_Image[iPic].SetTexture(iSlideNumber, pTexture, GetDisplayEffect(iSlideNumber));
     m_Image[iPic].SetOriginalSize(pTexture->GetOriginalWidth(), pTexture->GetOriginalHeight(), bFullSize);
-    
+
     m_Image[iPic].m_bIsComic = false;
     if (URIUtils::IsInRAR(m_slides.at(m_iCurrentSlide)->GetPath()) || URIUtils::IsInZIP(m_slides.at(m_iCurrentSlide)->GetPath())) // move to top for cbr/cbz
     {
@@ -1185,7 +1185,7 @@ int CGUIWindowSlideShow::CurrentSlide() const
 }
 
 void CGUIWindowSlideShow::AddFromPath(const std::string &strPath,
-                                      bool bRecursive, 
+                                      bool bRecursive,
                                       SortBy method, SortOrder order, SortAttribute sortAttributes,
                                       const std::string &strExtensions)
 {
@@ -1203,10 +1203,10 @@ void CGUIWindowSlideShow::AddFromPath(const std::string &strPath,
   }
 }
 
-void CGUIWindowSlideShow::RunSlideShow(const std::string &strPath, 
+void CGUIWindowSlideShow::RunSlideShow(const std::string &strPath,
                                        bool bRecursive /* = false */, bool bRandom /* = false */,
                                        bool bNotRandom /* = false */, const std::string &beginSlidePath /* = "" */,
-                                       bool startSlideShow /* = true */, SortBy method /* = SortByLabel */, 
+                                       bool startSlideShow /* = true */, SortBy method /* = SortByLabel */,
                                        SortOrder order /* = SortOrderAscending */, SortAttribute sortAttributes /* = SortAttributeNone */,
                                        const std::string &strExtensions)
 {
@@ -1233,7 +1233,7 @@ void CGUIWindowSlideShow::RunSlideShow(const std::string &strPath,
 
   if (startSlideShow)
     StartSlideShow();
-  else 
+  else
   {
     CVariant param;
     param["player"]["speed"] = 0;
diff --git a/xbmc/pictures/GUIWindowSlideShow.h b/xbmc/pictures/GUIWindowSlideShow.h
index 6e63e4a51b..3b196c7872 100644
--- a/xbmc/pictures/GUIWindowSlideShow.h
+++ b/xbmc/pictures/GUIWindowSlideShow.h
@@ -87,7 +87,7 @@ public:
                     SortAttribute sortAttributes = SortAttributeNone,
                     const std::string &strExtensions="");
   void AddFromPath(const std::string &strPath, bool bRecursive,
-                   SortBy method = SortByLabel, 
+                   SortBy method = SortByLabel,
                    SortOrder order = SortOrderAscending,
                    SortAttribute sortAttributes = SortAttributeNone,
                    const std::string &strExtensions="");
diff --git a/xbmc/pictures/PictureInfoTag.h b/xbmc/pictures/PictureInfoTag.h
index 0658ffda24..420224060d 100644
--- a/xbmc/pictures/PictureInfoTag.h
+++ b/xbmc/pictures/PictureInfoTag.h
@@ -47,7 +47,7 @@ public:
 
   /**
    * GetDateTimeTaken() -- Returns the EXIF DateTimeOriginal for current picture
-   * 
+   *
    * The exif library returns DateTimeOriginal if available else the other
    * DateTime tags. See libexif CExifParse::ProcessDir for details.
    */
diff --git a/xbmc/pictures/PictureThumbLoader.cpp b/xbmc/pictures/PictureThumbLoader.cpp
index 6c6b0e0fbb..77dc80fd0c 100644
--- a/xbmc/pictures/PictureThumbLoader.cpp
+++ b/xbmc/pictures/PictureThumbLoader.cpp
@@ -186,7 +186,7 @@ void CPictureThumbLoader::ProcessFoldersAndArchives(CFileItem *pItem)
       CFileItemList items;
 
       CDirectory::GetDirectory(pathToUrl, items, CServiceBroker::GetFileExtensionProvider().GetPictureExtensions(), DIR_FLAG_NO_FILE_DIRS);
-      
+
       // create the folder thumb by choosing 4 random thumbs within the folder and putting
       // them into one thumb.
       // count the number of images
diff --git a/xbmc/platform/Environment.h b/xbmc/platform/Environment.h
index 4728a56562..64d201f762 100644
--- a/xbmc/platform/Environment.h
+++ b/xbmc/platform/Environment.h
@@ -23,7 +23,7 @@
 /**
  * \file utils\Environment.h
  * \brief Declares CEnvironment class for platform-independent environment variables manipulations.
- * 		
+ *
  */
 #include <string>
 
@@ -33,9 +33,9 @@
  * @brief   Platform-independent environment variables manipulations.
  *
  * 	Provide analog for POSIX functions:
- * 	+ setenv  
- * 	+ unsetenv  
- * 	+ putenv  
+ * 	+ setenv
+ * 	+ unsetenv
+ * 	+ putenv
  * 	+ getenv
  *
  * 	You can generally use the functions as you would normally in POSIX-style.
@@ -45,12 +45,12 @@
  * 	2. CEnvironment::putenv  uses copy of provided string (rather than string itself) to change environment,
  *                           so you can free parameter variable right after call of function.
  * 	3. CEnvironment::getenv  returns a copy of environment variable value instead of pointer to value.
- * 	4. CEnvironment::setenv  can be used to unset variables. Just pass empty string for 'value' parameter.  
- * 	5. CEnvironment::putenv  can be used to unset variables. Set parameter to 'var=' (Windows style) or   
- *                           just 'var' (POSIX style), and 'var' will be unset.  
- * 	
+ * 	4. CEnvironment::setenv  can be used to unset variables. Just pass empty string for 'value' parameter.
+ * 	5. CEnvironment::putenv  can be used to unset variables. Set parameter to 'var=' (Windows style) or
+ *                           just 'var' (POSIX style), and 'var' will be unset.
+ *
  * 	All 'std::string' types are supposed to be in UTF-8 encoding.
- * 	All functions work on all platforms. Special care is taken on Windows platform where Environment is changed for process itself, 
+ * 	All functions work on all platforms. Special care is taken on Windows platform where Environment is changed for process itself,
  * 	for process runtime library and for all runtime libraries (MSVCRT) loaded by third-party modules.
  * 	Functions internally make all necessary UTF-8 <-> wide conversions.*
  */
@@ -63,7 +63,7 @@ public:
    *     int overwrite = 1);
    * \brief Sets or unsets environment variable.
    * \param name      The environment variable name to add/modify/delete.
-   * \param value     The environment variable new value. If set to empty string, variable will be 
+   * \param value     The environment variable new value. If set to empty string, variable will be
    * 					deleted from the environment.
    * \param overwrite (optional) If set to non-zero, existing variable will be overwritten. If set to zero and
    * 					variable is already present, then variable will be unchanged and function returns success.
@@ -81,7 +81,7 @@ public:
   /**
    * \fn static int CEnvironment::putenv(const std::string &envstring);
    * \brief Adds/modifies/deletes environment variable.
-   * \param envstring The variable-value string in form 'var=value'. If set to 'var=' or 'var', then variable 
+   * \param envstring The variable-value string in form 'var=value'. If set to 'var=' or 'var', then variable
    * 					will be deleted from the environment.
    * \return Zero on success, non-zero on error.
    */
@@ -96,11 +96,11 @@ public:
   static std::string getenv(const std::string &name);
 private:
 #ifdef TARGET_WINDOWS
-  enum updateAction:int 
+  enum updateAction:int
   {
-    addOrUpdateOnly = -2, 
-    deleteVariable = -1, 
-    addOnly =  0, 
+    addOrUpdateOnly = -2,
+    deleteVariable = -1,
+    addOnly =  0,
     autoDetect = 1
   };
   static int win_setenv(const std::string &name, const std::string &value = "", updateAction action = autoDetect);
diff --git a/xbmc/platform/Platform.h b/xbmc/platform/Platform.h
index f7e3d6f14f..f529fa45a5 100644
--- a/xbmc/platform/Platform.h
+++ b/xbmc/platform/Platform.h
@@ -30,21 +30,21 @@ class CPlatform
 public:
   /**\brief Creates the Platform object
    *
-   *@return the platform object 
+   *@return the platform object
   */
   static CPlatform *CreateInstance();
-  
+
   /**\brief C'tor */
   CPlatform();
-  
+
   /**\brief D'tor */
   virtual ~CPlatform();
-  
+
   /**\brief Called at an early stage of application startup
    *
    * This method can be used to do platform specific environment preparation
    * or initialisation (like setting environment variables for example)
    */
   virtual void Init();
-  
+
 };
diff --git a/xbmc/platform/android/activity/AndroidFeatures.cpp b/xbmc/platform/android/activity/AndroidFeatures.cpp
index 21b53678f5..d1e660ce73 100644
--- a/xbmc/platform/android/activity/AndroidFeatures.cpp
+++ b/xbmc/platform/android/activity/AndroidFeatures.cpp
@@ -27,7 +27,7 @@
 
 bool CAndroidFeatures::HasNeon()
 {
-  if (android_getCpuFamily() == ANDROID_CPU_FAMILY_ARM) 
+  if (android_getCpuFamily() == ANDROID_CPU_FAMILY_ARM)
     return ((android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0);
   return false;
 }
@@ -43,7 +43,7 @@ int CAndroidFeatures::GetVersion()
     JNIEnv *jenv = xbmc_jnienv();
 
     jclass jcOsBuild = jenv->FindClass("android/os/Build$VERSION");
-    if (jcOsBuild == NULL) 
+    if (jcOsBuild == NULL)
     {
       CLog::Log(LOGERROR, "%s: Error getting class android.os.Build.VERSION", __PRETTY_FUNCTION__);
       return version;
diff --git a/xbmc/platform/android/activity/AndroidTouch.cpp b/xbmc/platform/android/activity/AndroidTouch.cpp
index 068069122f..53b734d6d6 100644
--- a/xbmc/platform/android/activity/AndroidTouch.cpp
+++ b/xbmc/platform/android/activity/AndroidTouch.cpp
@@ -51,7 +51,7 @@ bool CAndroidTouch::onTouchEvent(AInputEvent* event)
   int32_t eventAction = AMotionEvent_getAction(event);
   int8_t touchAction = eventAction & AMOTION_EVENT_ACTION_MASK;
   size_t touchPointer = eventAction >> AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT;
-  
+
   TouchInput touchEvent = TouchInputAbort;
   switch (touchAction)
   {
diff --git a/xbmc/platform/android/activity/EventLoop.h b/xbmc/platform/android/activity/EventLoop.h
index 126a726646..48a340f8f5 100644
--- a/xbmc/platform/android/activity/EventLoop.h
+++ b/xbmc/platform/android/activity/EventLoop.h
@@ -24,18 +24,18 @@
 
 #include "IActivityHandler.h"
 #include "IInputHandler.h"
- 
+
 class CEventLoop
 {
 public:
   CEventLoop(android_app* application);
-  
+
   void run(IActivityHandler &activityHandler, IInputHandler &inputHandler);
-  
+
 protected:
   void activate();
   void deactivate();
-  
+
   void processActivity(int32_t command);
   int32_t processInput(AInputEvent* event);
 
diff --git a/xbmc/platform/android/activity/JNIMainActivity.h b/xbmc/platform/android/activity/JNIMainActivity.h
index daf6df29af..74ecfbae15 100644
--- a/xbmc/platform/android/activity/JNIMainActivity.h
+++ b/xbmc/platform/android/activity/JNIMainActivity.h
@@ -47,7 +47,7 @@ public:
   static void unregisterMediaButtonEventReceiver();
 
   CJNIRect getDisplayRect();
-  
+
 private:
   static CJNIMainActivity *m_appInstance;
 
diff --git a/xbmc/platform/android/activity/JNIXBMCAudioManagerOnAudioFocusChangeListener.cpp b/xbmc/platform/android/activity/JNIXBMCAudioManagerOnAudioFocusChangeListener.cpp
index 4a37c9dfea..5d13266d59 100644
--- a/xbmc/platform/android/activity/JNIXBMCAudioManagerOnAudioFocusChangeListener.cpp
+++ b/xbmc/platform/android/activity/JNIXBMCAudioManagerOnAudioFocusChangeListener.cpp
@@ -54,7 +54,7 @@ void CJNIXBMCAudioManagerOnAudioFocusChangeListener::RegisterNatives(JNIEnv* env
   jclass cClass = env->FindClass(s_className.c_str());
   if(cClass)
   {
-    JNINativeMethod methods[] = 
+    JNINativeMethod methods[] =
     {
       {"_onAudioFocusChange", "(I)V", (void*)&CJNIXBMCAudioManagerOnAudioFocusChangeListener::_onAudioFocusChange},
     };
diff --git a/xbmc/platform/android/activity/JNIXBMCAudioManagerOnAudioFocusChangeListener.h b/xbmc/platform/android/activity/JNIXBMCAudioManagerOnAudioFocusChangeListener.h
index 34cdfe2117..cb47db4704 100644
--- a/xbmc/platform/android/activity/JNIXBMCAudioManagerOnAudioFocusChangeListener.h
+++ b/xbmc/platform/android/activity/JNIXBMCAudioManagerOnAudioFocusChangeListener.h
@@ -28,14 +28,14 @@ class CJNIXBMCAudioManagerOnAudioFocusChangeListener : public CJNIAudioManagerAu
 {
 public:
   CJNIXBMCAudioManagerOnAudioFocusChangeListener();
-  CJNIXBMCAudioManagerOnAudioFocusChangeListener(const CJNIXBMCAudioManagerOnAudioFocusChangeListener& other); 
+  CJNIXBMCAudioManagerOnAudioFocusChangeListener(const CJNIXBMCAudioManagerOnAudioFocusChangeListener& other);
   explicit CJNIXBMCAudioManagerOnAudioFocusChangeListener(const jni::jhobject &object) : CJNIBase(object) {}
   virtual ~CJNIXBMCAudioManagerOnAudioFocusChangeListener();
-  
+
   static void RegisterNatives(JNIEnv* env);
-    
+
   void onAudioFocusChange(int focusChange) override;
-  
+
 protected:
-  static void _onAudioFocusChange(JNIEnv* env, jobject thiz, jint focusChange);  
+  static void _onAudioFocusChange(JNIEnv* env, jobject thiz, jint focusChange);
 };
diff --git a/xbmc/platform/android/activity/JNIXBMCNsdManagerDiscoveryListener.cpp b/xbmc/platform/android/activity/JNIXBMCNsdManagerDiscoveryListener.cpp
index 0ae884eff5..326f2eaa47 100644
--- a/xbmc/platform/android/activity/JNIXBMCNsdManagerDiscoveryListener.cpp
+++ b/xbmc/platform/android/activity/JNIXBMCNsdManagerDiscoveryListener.cpp
@@ -57,7 +57,7 @@ void CJNIXBMCNsdManagerDiscoveryListener::RegisterNatives(JNIEnv* env)
   jclass cClass = env->FindClass(s_className.c_str());
   if(cClass)
   {
-    JNINativeMethod methods[] = 
+    JNINativeMethod methods[] =
     {
       {"_onDiscoveryStarted", "(Ljava/lang/String;)V", (void*)&CJNIXBMCNsdManagerDiscoveryListener::_onDiscoveryStarted},
       {"_onDiscoveryStopped", "(Ljava/lang/String;)V", (void*)&CJNIXBMCNsdManagerDiscoveryListener::_onDiscoveryStopped},
diff --git a/xbmc/platform/android/activity/JNIXBMCNsdManagerDiscoveryListener.h b/xbmc/platform/android/activity/JNIXBMCNsdManagerDiscoveryListener.h
index 063cd24cd7..66196c3377 100644
--- a/xbmc/platform/android/activity/JNIXBMCNsdManagerDiscoveryListener.h
+++ b/xbmc/platform/android/activity/JNIXBMCNsdManagerDiscoveryListener.h
@@ -31,12 +31,12 @@ class CJNIXBMCNsdManagerDiscoveryListener : public CJNINsdManagerDiscoveryListen
 {
 public:
   CJNIXBMCNsdManagerDiscoveryListener();
-  CJNIXBMCNsdManagerDiscoveryListener(const CJNIXBMCNsdManagerDiscoveryListener& other); 
+  CJNIXBMCNsdManagerDiscoveryListener(const CJNIXBMCNsdManagerDiscoveryListener& other);
   explicit CJNIXBMCNsdManagerDiscoveryListener(const jni::jhobject &object) : CJNIBase(object) {}
   virtual ~CJNIXBMCNsdManagerDiscoveryListener();
-  
+
   static void RegisterNatives(JNIEnv* env);
-   
+
   // CJNINsdManagerDiscoveryListener interface
 public:
   void onDiscoveryStarted(const std::string& serviceType) = 0;
diff --git a/xbmc/platform/android/activity/JNIXBMCNsdManagerRegistrationListener.cpp b/xbmc/platform/android/activity/JNIXBMCNsdManagerRegistrationListener.cpp
index 951736972f..4a3483a6cb 100644
--- a/xbmc/platform/android/activity/JNIXBMCNsdManagerRegistrationListener.cpp
+++ b/xbmc/platform/android/activity/JNIXBMCNsdManagerRegistrationListener.cpp
@@ -57,7 +57,7 @@ void CJNIXBMCNsdManagerRegistrationListener::RegisterNatives(JNIEnv* env)
   jclass cClass = env->FindClass(s_className.c_str());
   if(cClass)
   {
-    JNINativeMethod methods[] = 
+    JNINativeMethod methods[] =
     {
       {"_onRegistrationFailed", "(Landroid/net/nsd/NsdServiceInfo;I)V", (void*)&CJNIXBMCNsdManagerRegistrationListener::_onRegistrationFailed},
       {"_onServiceRegistered", "(Landroid/net/nsd/NsdServiceInfo;)V", (void*)&CJNIXBMCNsdManagerRegistrationListener::_onServiceRegistered},
diff --git a/xbmc/platform/android/activity/JNIXBMCNsdManagerRegistrationListener.h b/xbmc/platform/android/activity/JNIXBMCNsdManagerRegistrationListener.h
index 875635bcf2..3c21c2302c 100644
--- a/xbmc/platform/android/activity/JNIXBMCNsdManagerRegistrationListener.h
+++ b/xbmc/platform/android/activity/JNIXBMCNsdManagerRegistrationListener.h
@@ -31,19 +31,19 @@ class CJNIXBMCNsdManagerRegistrationListener : public CJNINsdManagerRegistration
 {
 public:
   CJNIXBMCNsdManagerRegistrationListener();
-  CJNIXBMCNsdManagerRegistrationListener(const CJNIXBMCNsdManagerRegistrationListener& other); 
+  CJNIXBMCNsdManagerRegistrationListener(const CJNIXBMCNsdManagerRegistrationListener& other);
   explicit CJNIXBMCNsdManagerRegistrationListener(const jni::jhobject &object) : CJNIBase(object) {}
   virtual ~CJNIXBMCNsdManagerRegistrationListener();
 
   static void RegisterNatives(JNIEnv* env);
-  
+
   // CJNINsdManagerRegistrationListener interface
 public:
   void onRegistrationFailed(const CJNINsdServiceInfo& serviceInfo, int errorCode) override {}
   void onServiceRegistered(const CJNINsdServiceInfo& serviceInfo) override {}
   void onServiceUnregistered(const CJNINsdServiceInfo& serviceInfo) override {}
   void onUnregistrationFailed(const CJNINsdServiceInfo& serviceInfo, int errorCode) override {}
-  
+
 protected:
   static void _onRegistrationFailed(JNIEnv* env, jobject thiz, jobject serviceInfo, jint errorCode);
   static void _onServiceRegistered(JNIEnv* env, jobject thiz, jobject serviceInfo);
diff --git a/xbmc/platform/android/activity/JNIXBMCNsdManagerResolveListener.cpp b/xbmc/platform/android/activity/JNIXBMCNsdManagerResolveListener.cpp
index 3023511f46..12dae4bc4a 100644
--- a/xbmc/platform/android/activity/JNIXBMCNsdManagerResolveListener.cpp
+++ b/xbmc/platform/android/activity/JNIXBMCNsdManagerResolveListener.cpp
@@ -56,7 +56,7 @@ void CJNIXBMCNsdManagerResolveListener::RegisterNatives(JNIEnv* env)
   jclass cClass = env->FindClass(s_className.c_str());
   if(cClass)
   {
-    JNINativeMethod methods[] = 
+    JNINativeMethod methods[] =
     {
       {"_onResolveFailed", "(Landroid/net/nsd/NsdServiceInfo;I)V", (void*)&CJNIXBMCNsdManagerResolveListener::_onResolveFailed},
       {"_onServiceResolved", "(Landroid/net/nsd/NsdServiceInfo;)V", (void*)&CJNIXBMCNsdManagerResolveListener::_onServiceResolved},
diff --git a/xbmc/platform/android/activity/JNIXBMCNsdManagerResolveListener.h b/xbmc/platform/android/activity/JNIXBMCNsdManagerResolveListener.h
index 546b31029f..57bccc839c 100644
--- a/xbmc/platform/android/activity/JNIXBMCNsdManagerResolveListener.h
+++ b/xbmc/platform/android/activity/JNIXBMCNsdManagerResolveListener.h
@@ -31,13 +31,13 @@ class CJNIXBMCNsdManagerResolveListener : public CJNINsdManagerResolveListener,
 {
 public:
 public:
-  CJNIXBMCNsdManagerResolveListener();  
-  CJNIXBMCNsdManagerResolveListener(const CJNIXBMCNsdManagerResolveListener& other); 
+  CJNIXBMCNsdManagerResolveListener();
+  CJNIXBMCNsdManagerResolveListener(const CJNIXBMCNsdManagerResolveListener& other);
   explicit CJNIXBMCNsdManagerResolveListener(const jni::jhobject &object) : CJNIBase(object) {}
   virtual ~CJNIXBMCNsdManagerResolveListener();
 
   static void RegisterNatives(JNIEnv* env);
-  
+
   // CJNINsdManagerResolveListener interface
   void onResolveFailed(const CJNINsdServiceInfo& serviceInfo, int errorCode) = 0;
   void onServiceResolved(const CJNINsdServiceInfo& serviceInfo) = 0;
@@ -45,7 +45,7 @@ public:
 protected:
   static void _onResolveFailed(JNIEnv* env, jobject thiz, jobject serviceInfo, jint errorCode);
   static void _onServiceResolved(JNIEnv* env, jobject thiz, jobject serviceInfo);
-  
+
 };
 
 }
diff --git a/xbmc/platform/android/activity/JNIXBMCSurfaceTextureOnFrameAvailableListener.cpp b/xbmc/platform/android/activity/JNIXBMCSurfaceTextureOnFrameAvailableListener.cpp
index c11d7e7b06..4cbe784265 100644
--- a/xbmc/platform/android/activity/JNIXBMCSurfaceTextureOnFrameAvailableListener.cpp
+++ b/xbmc/platform/android/activity/JNIXBMCSurfaceTextureOnFrameAvailableListener.cpp
@@ -53,7 +53,7 @@ void CJNIXBMCSurfaceTextureOnFrameAvailableListener::RegisterNatives(JNIEnv* env
   jclass cClass = env->FindClass(s_className.c_str());
   if(cClass)
   {
-    JNINativeMethod methods[] = 
+    JNINativeMethod methods[] =
     {
       {"_onFrameAvailable", "(Landroid/graphics/SurfaceTexture;)V", (void*)&CJNIXBMCSurfaceTextureOnFrameAvailableListener::_onFrameAvailable},
     };
diff --git a/xbmc/platform/android/activity/JNIXBMCSurfaceTextureOnFrameAvailableListener.h b/xbmc/platform/android/activity/JNIXBMCSurfaceTextureOnFrameAvailableListener.h
index f4f4b640a8..a849d894c6 100644
--- a/xbmc/platform/android/activity/JNIXBMCSurfaceTextureOnFrameAvailableListener.h
+++ b/xbmc/platform/android/activity/JNIXBMCSurfaceTextureOnFrameAvailableListener.h
@@ -31,11 +31,11 @@ public:
   CJNIXBMCSurfaceTextureOnFrameAvailableListener(const CJNIXBMCSurfaceTextureOnFrameAvailableListener& other);
   CJNIXBMCSurfaceTextureOnFrameAvailableListener(const jni::jhobject &object) : CJNIBase(object) {}
   virtual ~CJNIXBMCSurfaceTextureOnFrameAvailableListener();
-  
+
   static void RegisterNatives(JNIEnv* env);
-    
+
   void onFrameAvailable(CJNISurfaceTexture) {}
-  
+
 protected:
-  static void _onFrameAvailable(JNIEnv* env, jobject thiz, jobject surface);  
+  static void _onFrameAvailable(JNIEnv* env, jobject thiz, jobject surface);
 };
diff --git a/xbmc/platform/android/activity/JNIXBMCVideoView.cpp b/xbmc/platform/android/activity/JNIXBMCVideoView.cpp
index c9bb517ae7..1068542273 100644
--- a/xbmc/platform/android/activity/JNIXBMCVideoView.cpp
+++ b/xbmc/platform/android/activity/JNIXBMCVideoView.cpp
@@ -41,7 +41,7 @@ void CJNIXBMCVideoView::RegisterNatives(JNIEnv* env)
   jclass cClass = env->FindClass(s_className.c_str());
   if(cClass)
   {
-    JNINativeMethod methods[] = 
+    JNINativeMethod methods[] =
     {
       {"_surfaceChanged", "(Landroid/view/SurfaceHolder;III)V", (void*)&CJNIXBMCVideoView::_surfaceChanged},
       {"_surfaceCreated", "(Landroid/view/SurfaceHolder;)V", (void*)&CJNIXBMCVideoView::_surfaceCreated},
diff --git a/xbmc/platform/android/activity/JNIXBMCVideoView.h b/xbmc/platform/android/activity/JNIXBMCVideoView.h
index 5f593bac53..59148c5c01 100644
--- a/xbmc/platform/android/activity/JNIXBMCVideoView.h
+++ b/xbmc/platform/android/activity/JNIXBMCVideoView.h
@@ -37,7 +37,7 @@ public:
   ~CJNIXBMCVideoView();
 
   static void RegisterNatives(JNIEnv* env);
-  
+
   static CJNIXBMCVideoView* createVideoView(CJNISurfaceHolderCallback* callback);
 
   // CJNISurfaceHolderCallback interface
diff --git a/xbmc/platform/android/activity/XBMCApp.cpp b/xbmc/platform/android/activity/XBMCApp.cpp
index 33a582ab10..0f1c709c69 100644
--- a/xbmc/platform/android/activity/XBMCApp.cpp
+++ b/xbmc/platform/android/activity/XBMCApp.cpp
@@ -347,7 +347,7 @@ void CXBMCApp::onLostFocus()
 
 void CXBMCApp::Initialize()
 {
-  g_application.m_ServiceManager->GetAnnouncementManager().AddAnnouncer(CXBMCApp::get());  
+  g_application.m_ServiceManager->GetAnnouncementManager().AddAnnouncer(CXBMCApp::get());
 }
 
 void CXBMCApp::Deinitialize()
@@ -607,7 +607,7 @@ void CXBMCApp::UpdateSessionMetadata()
 //      .putString(CJNIMediaMetadata::METADATA_KEY_DISPLAY_ICON_URI, thumb)
 //      .putString(CJNIMediaMetadata::METADATA_KEY_ALBUM_ART_URI, thumb)
       ;
-  
+
   std::string thumb;
   if (m_playback_state & PLAYBACK_STATE_VIDEO)
   {
diff --git a/xbmc/platform/android/activity/XBMCApp.h b/xbmc/platform/android/activity/XBMCApp.h
index f672732713..d8fac28db9 100644
--- a/xbmc/platform/android/activity/XBMCApp.h
+++ b/xbmc/platform/android/activity/XBMCApp.h
@@ -141,7 +141,7 @@ public:
   static ANativeWindow* GetNativeWindow(int timeout);
   static int SetBuffersGeometry(int width, int height, int format);
   static int android_printf(const char *format, ...);
-  
+
   static int GetBatteryLevel();
   static bool EnableWakeLock(bool on);
   static bool HasFocus() { return m_hasFocus; }
diff --git a/xbmc/platform/android/activity/android_main.cpp b/xbmc/platform/android/activity/android_main.cpp
index f6a1d489fd..68e582900d 100644
--- a/xbmc/platform/android/activity/android_main.cpp
+++ b/xbmc/platform/android/activity/android_main.cpp
@@ -143,7 +143,7 @@ extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *reserved)
     return -1;
 
   std::string pkgRoot = CCompileInfo::GetClass();
-  
+
   std::string mainClass = pkgRoot + "/Main";
   std::string bcReceiver = pkgRoot + "/XBMCBroadcastReceiver";
   std::string settingsObserver = pkgRoot + "/XBMCSettingsContentObserver";
@@ -163,7 +163,7 @@ extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *reserved)
   jclass cMain = env->FindClass(mainClass.c_str());
   if(cMain)
   {
-    JNINativeMethod methods[] = 
+    JNINativeMethod methods[] =
     {
       {"_onNewIntent", "(Landroid/content/Intent;)V", (void*)&CJNIMainActivity::_onNewIntent},
       {"_onActivityResult", "(IILandroid/content/Intent;)V", (void*)&CJNIMainActivity::_onActivityResult},
@@ -177,7 +177,7 @@ extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *reserved)
   jclass cBroadcastReceiver = env->FindClass(bcReceiver.c_str());
   if(cBroadcastReceiver)
   {
-    JNINativeMethod methods[] = 
+    JNINativeMethod methods[] =
     {
       {"_onReceive", "(Landroid/content/Intent;)V", (void*)&CJNIBroadcastReceiver::_onReceive},
     };
@@ -187,7 +187,7 @@ extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *reserved)
   jclass cSettingsObserver = env->FindClass(settingsObserver.c_str());
   if(cSettingsObserver)
   {
-    JNINativeMethod methods[] = 
+    JNINativeMethod methods[] =
     {
       {"_onVolumeChanged", "(I)V", (void*)&CJNIMainActivity::_onVolumeChanged},
     };
@@ -197,7 +197,7 @@ extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *reserved)
   jclass cInputDeviceListener = env->FindClass(inputDeviceListener.c_str());
   if(cInputDeviceListener)
   {
-    JNINativeMethod methods[] = 
+    JNINativeMethod methods[] =
     {
       { "_onInputDeviceAdded", "(I)V", (void*)&CJNIMainActivity::_onInputDeviceAdded },
       { "_onInputDeviceChanged", "(I)V", (void*)&CJNIMainActivity::_onInputDeviceChanged },
diff --git a/xbmc/platform/android/filesystem/APKDirectory.cpp b/xbmc/platform/android/filesystem/APKDirectory.cpp
index 5b5fddfcc0..b5f59bc02e 100644
--- a/xbmc/platform/android/filesystem/APKDirectory.cpp
+++ b/xbmc/platform/android/filesystem/APKDirectory.cpp
@@ -80,13 +80,13 @@ bool CAPKDirectory::GetDirectory(const CURL& url, CFileItemList &items)
     if (zip_stat_index(zip_archive, zip_index, zip_flags, &sb) != -1)
     {
       g_charsetConverter.unknownToUTF8(test_name);
-      CFileItemPtr pItem(new CFileItem(test_name));      
+      CFileItemPtr pItem(new CFileItem(test_name));
       pItem->m_dwSize    = sb.size;
-      pItem->m_dateTime  = sb.mtime;    
+      pItem->m_dateTime  = sb.mtime;
       pItem->m_bIsFolder = dir_marker > 0 ;
       pItem->SetPath(host + "/" + test_name);
       pItem->SetLabel(test_name.substr(path.size()));
-      items.Add(pItem);      
+      items.Add(pItem);
     }
   }
   zip_close(zip_archive);
diff --git a/xbmc/platform/android/filesystem/APKFile.cpp b/xbmc/platform/android/filesystem/APKFile.cpp
index 290611b822..65d0f1b396 100644
--- a/xbmc/platform/android/filesystem/APKFile.cpp
+++ b/xbmc/platform/android/filesystem/APKFile.cpp
@@ -65,7 +65,7 @@ bool CAPKFile::Open(const CURL& url)
   m_zip_index = zip_name_locate(m_zip_archive, path.c_str(), zip_flags);
   if (m_zip_index == -1)
   {
-    // might not be an error if caller is just testing for presence/absence 
+    // might not be an error if caller is just testing for presence/absence
     CLog::Log(LOGDEBUG, "CAPKFile::Open: Unable to locate file : '%s'",
       path.c_str());
     zip_close(m_zip_archive);
diff --git a/xbmc/platform/android/filesystem/AndroidAppDirectory.cpp b/xbmc/platform/android/filesystem/AndroidAppDirectory.cpp
index cccc03b817..4dd7067fff 100644
--- a/xbmc/platform/android/filesystem/AndroidAppDirectory.cpp
+++ b/xbmc/platform/android/filesystem/AndroidAppDirectory.cpp
@@ -44,7 +44,7 @@ bool CAndroidAppDirectory::GetDirectory(const CURL& url, CFileItemList &items)
 {
   std::string dirname = url.GetFileName();
   URIUtils::RemoveSlashAtEnd(dirname);
-  CLog::Log(LOGDEBUG, "CAndroidAppDirectory::GetDirectory: %s",dirname.c_str()); 
+  CLog::Log(LOGDEBUG, "CAndroidAppDirectory::GetDirectory: %s",dirname.c_str());
   std::string appName = CCompileInfo::GetAppName();
   StringUtils::ToLower(appName);
   std::string className = CCompileInfo::GetPackage();
diff --git a/xbmc/platform/android/network/ZeroconfAndroid.cpp b/xbmc/platform/android/network/ZeroconfAndroid.cpp
index 1251833228..b474cac97c 100644
--- a/xbmc/platform/android/network/ZeroconfAndroid.cpp
+++ b/xbmc/platform/android/network/ZeroconfAndroid.cpp
@@ -40,20 +40,20 @@ bool CZeroconfAndroid::doPublishService(const std::string& fcr_identifier, const
   CLog::Log(LOGDEBUG, "ZeroconfAndroid: identifier: %s type: %s name:%s port:%i", fcr_identifier.c_str(), fcr_type.c_str(), fcr_name.c_str(), f_port);
 
   struct tServiceRef newService;
-  
+
   newService.serviceInfo.setServiceName(fcr_name);
   newService.serviceInfo.setServiceType(fcr_type);
   newService.serviceInfo.setHost(CJNIInetAddress::getLocalHost());
   newService.serviceInfo.setPort(f_port);
-  
+
   for (auto it : txt)
   {
 //    CLog::Log(LOGDEBUG, "ZeroconfAndroid: key:%s, value:%s", it.first.c_str(),it.second.c_str());
     newService.serviceInfo.setAttribute(it.first, it.second);
   }
-  
+
   m_manager.registerService(newService.serviceInfo, 1 /* PROTOCOL_DNS_SD */, newService.registrationListener);
-  
+
   CSingleLock lock(m_data_guard);
   newService.updateNumber = 0;
   m_services.insert(make_pair(fcr_identifier, newService));
diff --git a/xbmc/platform/android/network/ZeroconfAndroid.h b/xbmc/platform/android/network/ZeroconfAndroid.h
index cde1fcbc61..390c8bf344 100644
--- a/xbmc/platform/android/network/ZeroconfAndroid.h
+++ b/xbmc/platform/android/network/ZeroconfAndroid.h
@@ -33,14 +33,14 @@ class CZeroconfAndroid : public CZeroconf
 public:
   CZeroconfAndroid();
   virtual ~CZeroconfAndroid();
-  
+
   // CZeroconf interface
 protected:
   bool doPublishService(const std::string& fcr_identifier, const std::string& fcr_type, const std::string& fcr_name, unsigned int f_port, const std::vector<std::pair<std::string, std::string> >& txt);
   bool doForceReAnnounceService(const std::string& fcr_identifier);
   bool doRemoveService(const std::string& fcr_ident);
   void doStop();
-  
+
 private:
   jni::CJNINsdManager m_manager;
 
diff --git a/xbmc/platform/android/network/ZeroconfBrowserAndroid.cpp b/xbmc/platform/android/network/ZeroconfBrowserAndroid.cpp
index 864d354072..c7c4c0ede8 100644
--- a/xbmc/platform/android/network/ZeroconfBrowserAndroid.cpp
+++ b/xbmc/platform/android/network/ZeroconfBrowserAndroid.cpp
@@ -50,7 +50,7 @@ CZeroconfBrowserAndroid::~CZeroconfBrowserAndroid()
 bool CZeroconfBrowserAndroid::doAddServiceType(const std::string& fcr_service_type)
 {
   CZeroconfBrowserAndroidDiscover* discover = new CZeroconfBrowserAndroidDiscover(this);
-  
+
   // Remove trailing dot
 //  std::string nsdType = fcr_service_type;
 //  if (nsdType.compare(nsdType.size() - 1, 1, ".") == 0)
@@ -120,10 +120,10 @@ bool CZeroconfBrowserAndroid::doResolveService(CZeroconfBrowser::ZeroconfService
   jni::CJNINsdServiceInfo service;
   service.setServiceName(fr_service.GetName());
   service.setServiceType(fr_service.GetType());
-  
+
   CZeroconfBrowserAndroidResolve resolver;
   m_manager.resolveService(service, resolver);
-  
+
   if (!resolver.m_resolutionDone.WaitMSec(f_timeout * 1000))
   {
     CLog::Log(LOGERROR, "ZeroconfBrowserAndroid: DNSServiceResolve Timeout error");
@@ -135,25 +135,25 @@ bool CZeroconfBrowserAndroid::doResolveService(CZeroconfBrowser::ZeroconfService
     CLog::Log(LOGERROR, "ZeroconfBrowserAndroid: DNSServiceResolve returned (error = %ld)", resolver.m_errorCode);
     return false;
   }
-   
+
   fr_service.SetHostname(resolver.m_retServiceInfo.getHost().getHostName());
   fr_service.SetIP(resolver.m_retServiceInfo.getHost().getHostAddress());
   fr_service.SetPort(resolver.m_retServiceInfo.getPort());
-  
-  CZeroconfBrowser::ZeroconfService::tTxtRecordMap recordMap; 
+
+  CZeroconfBrowser::ZeroconfService::tTxtRecordMap recordMap;
   jni::CJNISet<jni::jhstring> txtKey = resolver.m_retServiceInfo.getAttributes().keySet();
   jni::CJNIIterator<jni::jhstring> it = txtKey.iterator();
   while (it.hasNext())
   {
     jni::jhstring k = it.next();
     jni::jhbyteArray v = resolver.m_retServiceInfo.getAttributes().get(k);
-  
+
     std::string key = jni::jcast<std::string>(k);
     std::vector<char> vv = jni::jcast<std::vector<char>>(v);
     std::string value = std::string(vv.begin(), vv.end());
 
     CLog::Log(LOGDEBUG, "ZeroconfBrowserAndroid: TXT record %s = %s (%d)", key.c_str(), value.c_str(), vv.size());
-    
+
     recordMap.insert(std::make_pair(key, value));
   }
   fr_service.SetTxtRecords(recordMap);
@@ -241,7 +241,7 @@ void CZeroconfBrowserAndroidDiscover::onServiceFound(const jni::CJNINsdServiceIn
   {
     jni::jhstring k = it.next();
     jni::jhbyteArray v = serviceInfo.getAttributes().get(k);
-  
+
     std::string key = jni::jcast<std::string>(k);
     std::vector<char> vv = jni::jcast<std::vector<char>>(v);
     std::string value = std::string(vv.begin(), vv.end());
diff --git a/xbmc/platform/android/network/ZeroconfBrowserAndroid.h b/xbmc/platform/android/network/ZeroconfBrowserAndroid.h
index 0515e7960f..54de241ea0 100644
--- a/xbmc/platform/android/network/ZeroconfBrowserAndroid.h
+++ b/xbmc/platform/android/network/ZeroconfBrowserAndroid.h
@@ -36,7 +36,7 @@ class CZeroconfBrowserAndroidDiscover : public jni::CJNIXBMCNsdManagerDiscoveryL
 public:
   explicit CZeroconfBrowserAndroidDiscover(CZeroconfBrowserAndroid* browser);
   bool IsActive() { return m_isActive; }
-  
+
   // CJNINsdManagerDiscoveryListener interface
 public:
   void onDiscoveryStarted(const std::string& serviceType);
@@ -45,7 +45,7 @@ public:
   void onServiceLost(const jni::CJNINsdServiceInfo& serviceInfo);
   void onStartDiscoveryFailed(const std::string& serviceType, int errorCode);
   void onStopDiscoveryFailed(const std::string& serviceType, int errorCode);
-  
+
 protected:
   CZeroconfBrowserAndroid* m_browser;
   bool m_isActive;
@@ -55,12 +55,12 @@ class CZeroconfBrowserAndroidResolve : public jni::CJNIXBMCNsdManagerResolveList
 {
 public:
   CZeroconfBrowserAndroidResolve();
-  
+
   // CJNINsdManagerResolveListener interface
 public:
   void onResolveFailed(const jni::CJNINsdServiceInfo& serviceInfo, int errorCode);
   void onServiceResolved(const jni::CJNINsdServiceInfo& serviceInfo);
-  
+
   CEvent m_resolutionDone;
   int m_errorCode;
   jni::CJNINsdServiceInfo m_retServiceInfo;
@@ -69,18 +69,18 @@ public:
 class CZeroconfBrowserAndroid : public CZeroconfBrowser
 {
   friend class CZeroconfBrowserAndroidDiscover;
-  
+
 public:
   CZeroconfBrowserAndroid();
   virtual ~CZeroconfBrowserAndroid();
-  
+
   // CZeroconfBrowser interface
 protected:
   bool doAddServiceType(const std::string& fcr_service_type);
   bool doRemoveServiceType(const std::string& fcr_service_type);
   std::vector<ZeroconfService> doGetFoundServices();
   bool doResolveService(ZeroconfService& fr_service, double f_timeout);
-  
+
   void addDiscoveredService(CZeroconfBrowserAndroidDiscover* browser, const CZeroconfBrowser::ZeroconfService& fcr_service);
   void removeDiscoveredService(CZeroconfBrowserAndroidDiscover* browser, const CZeroconfBrowser::ZeroconfService& fcr_service);
 
@@ -90,7 +90,7 @@ private:
   //shared variables (with guard)
   CCriticalSection m_data_guard;
   typedef std::map<std::string, CZeroconfBrowserAndroidDiscover*> tBrowserMap;
-  // tBrowserMap maps service types the corresponding browser  
+  // tBrowserMap maps service types the corresponding browser
   tBrowserMap m_service_browsers;
   //tDiscoveredServicesMap maps browsers to their discovered services + a ref-count for each service
   //ref-count is needed, because a service might pop up more than once, if there's more than one network-iface
diff --git a/xbmc/platform/android/powermanagement/AndroidPowerSyscall.cpp b/xbmc/platform/android/powermanagement/AndroidPowerSyscall.cpp
index 90563cf19a..4a72b3f7ad 100644
--- a/xbmc/platform/android/powermanagement/AndroidPowerSyscall.cpp
+++ b/xbmc/platform/android/powermanagement/AndroidPowerSyscall.cpp
@@ -17,7 +17,7 @@
  *  <http://www.gnu.org/licenses/>.
  *
  */
- 
+
 #if defined (TARGET_ANDROID)
 
 #include "AndroidPowerSyscall.h"
@@ -45,7 +45,7 @@ int CAndroidPowerSyscall::BatteryLevel(void)
 }
 
 bool CAndroidPowerSyscall::PumpPowerEvents(IPowerEventsCallback *callback)
-{    
+{
   return true;
 }
 
diff --git a/xbmc/platform/android/storage/AndroidStorageProvider.cpp b/xbmc/platform/android/storage/AndroidStorageProvider.cpp
index 35fb179577..64d919a0de 100644
--- a/xbmc/platform/android/storage/AndroidStorageProvider.cpp
+++ b/xbmc/platform/android/storage/AndroidStorageProvider.cpp
@@ -218,7 +218,7 @@ void CAndroidStorageProvider::GetRemovableDrives(VECSOURCES &removableDrives)
 std::set<std::string> CAndroidStorageProvider::GetRemovableDrivesLinux()
 {
   std::set<std::string> result;
-  
+
   // mounted usb disks
   char*                               buf     = NULL;
   FILE*                               pipe;
diff --git a/xbmc/platform/darwin/AutoPool.h b/xbmc/platform/darwin/AutoPool.h
index d0ff978bf0..68923ce842 100644
--- a/xbmc/platform/darwin/AutoPool.h
+++ b/xbmc/platform/darwin/AutoPool.h
@@ -37,7 +37,7 @@ extern "C"
   //
   void* Cocoa_Create_AutoReleasePool(void);
   void Cocoa_Destroy_AutoReleasePool(void* pool);
-  
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/xbmc/platform/darwin/Credits.html b/xbmc/platform/darwin/Credits.html
index 6790d76bc4..933cf908fc 100644
--- a/xbmc/platform/darwin/Credits.html
+++ b/xbmc/platform/darwin/Credits.html
@@ -4,13 +4,13 @@
 body { font-family: Verdana, Arial; }
 a { cursor: pointer; }
 a:hover { cursor: pointer; }
-table 
-{ 
-width: 100%; 
-font-family: 
-Verdana, Arial; 
-font-size: 10px; 
-cursor: pointer; 
+table
+{
+width: 100%;
+font-family:
+Verdana, Arial;
+font-size: 10px;
+cursor: pointer;
 padding-top: 5px;
 padding-bottom: 5px;
 }
diff --git a/xbmc/platform/darwin/NSLogDebugHelpers.h b/xbmc/platform/darwin/NSLogDebugHelpers.h
index 6fa170ad0e..249f92caad 100644
--- a/xbmc/platform/darwin/NSLogDebugHelpers.h
+++ b/xbmc/platform/darwin/NSLogDebugHelpers.h
@@ -38,7 +38,7 @@
 #define ELOG(s, ...) NSLog(@"[ERROR] " s, ##__VA_ARGS__)
 #define DLOG(s, ...) LOG(s, ##__VA_ARGS__)
 #else
-#define LOG(s, ...) 
+#define LOG(s, ...)
 #define ILOG(s, ...) NSLog(@"[INFO]  " s, ##__VA_ARGS__)
 #define ELOG(s, ...) NSLog(@"[ERROR] " s, ##__VA_ARGS__)
 #define DLOG(s, ...) LOG(s, ##__VA_ARGS__)
diff --git a/xbmc/platform/darwin/PlatformDarwin.cpp b/xbmc/platform/darwin/PlatformDarwin.cpp
index 23f8b2abcc..ed96f32d9d 100644
--- a/xbmc/platform/darwin/PlatformDarwin.cpp
+++ b/xbmc/platform/darwin/PlatformDarwin.cpp
@@ -24,12 +24,12 @@
 
 CPlatformDarwin::CPlatformDarwin()
 {
-  
+
 }
 
 CPlatformDarwin::~CPlatformDarwin()
 {
-  
+
 }
 
 void CPlatformDarwin::Init()
diff --git a/xbmc/platform/darwin/PlatformDarwin.h b/xbmc/platform/darwin/PlatformDarwin.h
index 1248a691bf..fe91d62608 100644
--- a/xbmc/platform/darwin/PlatformDarwin.h
+++ b/xbmc/platform/darwin/PlatformDarwin.h
@@ -27,9 +27,9 @@ class CPlatformDarwin : public CPlatform
   public:
     /**\brief C'tor */
     CPlatformDarwin();
-  
+
     /**\brief D'tor */
     virtual ~CPlatformDarwin();
-  
+
     void Init() override;
 };
diff --git a/xbmc/platform/darwin/ios/IOSEAGLView.h b/xbmc/platform/darwin/ios/IOSEAGLView.h
index 44ddde256d..f949c0448b 100644
--- a/xbmc/platform/darwin/ios/IOSEAGLView.h
+++ b/xbmc/platform/darwin/ios/IOSEAGLView.h
@@ -26,7 +26,7 @@
 // The view content is basically an EAGL surface you render your OpenGL scene into.
 // Note that setting the view non-opaque will only work if the EAGL surface has an alpha channel.
 @interface IOSEAGLView : UIView
-{    
+{
 @private
   EAGLContext *context;
   // The pixel dimensions of the CAEAGLLayer.
@@ -38,7 +38,7 @@
 	GLuint program;
 	//
 	GLfloat rotz;
-	
+
 	BOOL animating;
   BOOL xbmcAlive;
   BOOL readyToRun;
diff --git a/xbmc/platform/darwin/ios/IOSExternalTouchController.h b/xbmc/platform/darwin/ios/IOSExternalTouchController.h
index aff9aaa04d..c9e37f2d81 100644
--- a/xbmc/platform/darwin/ios/IOSExternalTouchController.h
+++ b/xbmc/platform/darwin/ios/IOSExternalTouchController.h
@@ -21,7 +21,7 @@
 #import <UIKit/UIKit.h>
 
 
-@interface IOSExternalTouchController : UIViewController 
+@interface IOSExternalTouchController : UIViewController
 {
   UIWindow      *_internalWindow;
   UIView        *_touchView;
diff --git a/xbmc/platform/darwin/ios/IOSKeyboard.mm b/xbmc/platform/darwin/ios/IOSKeyboard.mm
index 243bcb016f..14f136e276 100644
--- a/xbmc/platform/darwin/ios/IOSKeyboard.mm
+++ b/xbmc/platform/darwin/ios/IOSKeyboard.mm
@@ -58,7 +58,7 @@ bool CIOSKeyboard::ShowAndGetInput(char_callback_t pCallback, const std::string
     // basically as long as g_pIosKeyboard exists...
     [g_xbmcController nativeKeyboardActive:true];
   }
-  
+
   m_pCharCallback = pCallback;
 
   // init keyboard stuff
diff --git a/xbmc/platform/darwin/ios/XBMCController.h b/xbmc/platform/darwin/ios/XBMCController.h
index 2a259f685e..361031bd92 100644
--- a/xbmc/platform/darwin/ios/XBMCController.h
+++ b/xbmc/platform/darwin/ios/XBMCController.h
@@ -40,7 +40,7 @@ typedef enum
   UIWindow *m_window;
   IOSEAGLView  *m_glView;
   int m_screensaverTimeout;
-	
+
   /* Touch handling */
   CGSize screensize;
   CGPoint lastGesturePoint;
@@ -49,7 +49,7 @@ typedef enum
   int  m_screenIdx;
 
   UIInterfaceOrientation orientation;
-  
+
   bool m_isPlayingBeforeInactive;
   UIBackgroundTaskIdentifier m_bgTask;
   NSTimer *m_networkAutoSuspendTimer;
diff --git a/xbmc/platform/darwin/ios/XBMCDebugHelpers.h b/xbmc/platform/darwin/ios/XBMCDebugHelpers.h
index 7f6420abdc..402138283c 100644
--- a/xbmc/platform/darwin/ios/XBMCDebugHelpers.h
+++ b/xbmc/platform/darwin/ios/XBMCDebugHelpers.h
@@ -38,7 +38,7 @@
 #define ELOG(s, ...) NSLog(@"[ERROR] " s, ##__VA_ARGS__)
 #define DLOG(s, ...) LOG(s, ##__VA_ARGS__)
 #else
-#define LOG(s, ...) 
+#define LOG(s, ...)
 #define ILOG(s, ...) NSLog(@"[INFO]  " s, ##__VA_ARGS__)
 #define ELOG(s, ...) NSLog(@"[ERROR] " s, ##__VA_ARGS__)
 #define DLOG(s, ...) LOG(s, ##__VA_ARGS__)
diff --git a/xbmc/platform/darwin/osx/CocoaInterface.h b/xbmc/platform/darwin/osx/CocoaInterface.h
index 8af93d0e39..8c1b04ca8f 100644
--- a/xbmc/platform/darwin/osx/CocoaInterface.h
+++ b/xbmc/platform/darwin/osx/CocoaInterface.h
@@ -37,7 +37,7 @@ extern "C"
   //
   void Cocoa_DoAppleScript(const char* scriptSource);
   void Cocoa_DoAppleScriptFile(const char* filePath);
-  
+
   // Devices
   //
   char* Cocoa_MountPoint2DeviceName(char *path);
diff --git a/xbmc/platform/darwin/osx/HotKeyController.h b/xbmc/platform/darwin/osx/HotKeyController.h
index 7431445cfd..89ae87df2e 100644
--- a/xbmc/platform/darwin/osx/HotKeyController.h
+++ b/xbmc/platform/darwin/osx/HotKeyController.h
@@ -5,21 +5,21 @@
 //  SOURCE: http://github.com/sweetfm/SweetFM/blob/master/Source/HMediaKeys.h
 //
 //
-//  Permission is hereby granted, free of charge, to any person 
+//  Permission is hereby granted, free of charge, to any person
 //  obtaining a copy of this software and associated documentation
 //  files (the "Software"), to deal in the Software without restriction,
-//  including without limitation the rights to use, copy, modify, 
-//  merge, publish, distribute, sublicense, and/or sell copies of 
-//  the Software, and to permit persons to whom the Software is 
+//  including without limitation the rights to use, copy, modify,
+//  merge, publish, distribute, sublicense, and/or sell copies of
+//  the Software, and to permit persons to whom the Software is
 //  furnished to do so, subject to the following conditions:
 //
-//  The above copyright notice and this permission notice shall be 
+//  The above copyright notice and this permission notice shall be
 //  included in all copies or substantial portions of the Software.
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
-//  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
 //  OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR 
-//  ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF 
+//  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
+//  ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
 //  CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 //  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
diff --git a/xbmc/platform/darwin/osx/XBMCHelper.cpp b/xbmc/platform/darwin/osx/XBMCHelper.cpp
index 471b62dff5..178235775e 100644
--- a/xbmc/platform/darwin/osx/XBMCHelper.cpp
+++ b/xbmc/platform/darwin/osx/XBMCHelper.cpp
@@ -79,7 +79,7 @@ XBMCHelper::XBMCHelper()
   // Compute the helper filename.
   m_helperFile = m_homepath + "/tools/darwin/runtime/";
   m_helperFile += XBMC_HELPER_PROGRAM;
-  
+
   // Compute the local (pristine) launch agent filename.
   m_launchAgentLocalFile = m_homepath + "/tools/darwin/runtime/";
   m_launchAgentLocalFile += XBMC_LAUNCH_PLIST;
@@ -292,7 +292,7 @@ void XBMCHelper::Install()
   // Load template.
   std::string plistData = ReadFile(m_launchAgentLocalFile.c_str());
 
-  if (plistData != "") 
+  if (plistData != "")
   {
       std::string launchd_args;
 
@@ -300,7 +300,7 @@ void XBMCHelper::Install()
       int start = plistData.find("${PATH}");
       plistData.replace(start, 7, m_helperFile.c_str(), m_helperFile.length());
 
-      // Replace ARG1 with a single argument, additional args 
+      // Replace ARG1 with a single argument, additional args
       // will need ARG2, ARG3 added to plist.
       launchd_args = "-x";
       start = plistData.find("${ARG1}");
@@ -327,7 +327,7 @@ void XBMCHelper::Uninstall()
   std::string cmd = "/bin/launchctl unload ";
   cmd += m_launchAgentInstallFile;
   system(cmd.c_str());
-  
+
   //this also stops the helper, so restart it here again, if not disabled
   if(m_mode != APPLE_REMOTE_DISABLED)
     Start();
@@ -364,7 +364,7 @@ std::string XBMCHelper::ReadFile(const char* fileName)
 {
   std::string ret = "";
   std::ifstream is;
-  
+
   is.open(fileName);
   if( is.good() )
   {
@@ -496,7 +496,7 @@ static int GetBSDProcessList(kinfo_proc **procList, size_t *procCount)
 
       if (err == -1)
         err = errno;
-        
+
       if (err == 0)
       {
         done = true;
diff --git a/xbmc/platform/darwin/osx/network/ZeroconfBrowserOSX.cpp b/xbmc/platform/darwin/osx/network/ZeroconfBrowserOSX.cpp
index 103e88ae82..1bbe51d609 100644
--- a/xbmc/platform/darwin/osx/network/ZeroconfBrowserOSX.cpp
+++ b/xbmc/platform/darwin/osx/network/ZeroconfBrowserOSX.cpp
@@ -35,7 +35,7 @@ namespace
 {
   //helper for getting a the txt-records list
   //returns true on success, false if nothing found or error
-  CZeroconfBrowser::ZeroconfService::tTxtRecordMap GetTxtRecords(CFNetServiceRef serviceRef)  
+  CZeroconfBrowser::ZeroconfService::tTxtRecordMap GetTxtRecords(CFNetServiceRef serviceRef)
   {
     CFIndex idx = 0;
     CZeroconfBrowser::ZeroconfService::tTxtRecordMap recordMap;
@@ -84,13 +84,13 @@ namespace
     struct sockaddr_in address;
     char buffer[256];
     CFArrayRef addressResults = CFNetServiceGetAddressing( (CFNetServiceRef)serviceRef );
-    
+
     if ( addressResults != NULL )
     {
       CFIndex numAddressResults = CFArrayGetCount( addressResults );
       CFDataRef sockAddrRef = NULL;
       struct sockaddr sockHdr;
-      
+
       for ( idx = 0; idx < numAddressResults; idx++ )
       {
         sockAddrRef = (CFDataRef)CFArrayGetValueAtIndex( addressResults, idx );
@@ -140,7 +140,7 @@ void CZeroconfBrowserOSX::BrowserCallback(CFNetServiceBrowserRef browser, CFOpti
   if (error->error == noErr)
   {
     //make sure we receive a service
-    assert(!(flags&kCFNetServiceFlagIsDomain));  
+    assert(!(flags&kCFNetServiceFlagIsDomain));
     CFNetServiceRef service = (CFNetServiceRef)domainOrService;
     assert(service);
     //get our instance
@@ -160,13 +160,13 @@ void CZeroconfBrowserOSX::BrowserCallback(CFNetServiceBrowserRef browser, CFOpti
 
     if (flags & kCFNetServiceFlagRemove)
     {
-      CLog::Log(LOGDEBUG, "CZeroconfBrowserOSX::BrowserCallback service named: %s, type: %s, domain: %s disappeared", 
+      CLog::Log(LOGDEBUG, "CZeroconfBrowserOSX::BrowserCallback service named: %s, type: %s, domain: %s disappeared",
         s.GetName().c_str(), s.GetType().c_str(), s.GetDomain().c_str());
-      p_this->removeDiscoveredService(browser, flags, s);      
+      p_this->removeDiscoveredService(browser, flags, s);
     }
     else
     {
-      CLog::Log(LOGDEBUG, "CZeroconfBrowserOSX::BrowserCallback found service named: %s, type: %s, domain: %s", 
+      CLog::Log(LOGDEBUG, "CZeroconfBrowserOSX::BrowserCallback found service named: %s, type: %s, domain: %s",
         s.GetName().c_str(), s.GetType().c_str(), s.GetDomain().c_str());
       p_this->addDiscoveredService(browser, flags, s);
     }
@@ -257,7 +257,7 @@ bool CZeroconfBrowserOSX::doAddServiceType(const std::string& fcr_service_type)
   if (result == false)
   {
     // Something went wrong so lets clean up.
-    CFNetServiceBrowserUnscheduleFromRunLoop(p_browser, m_runloop, kCFRunLoopCommonModes);         
+    CFNetServiceBrowserUnscheduleFromRunLoop(p_browser, m_runloop, kCFRunLoopCommonModes);
     CFRelease(p_browser);
     p_browser = NULL;
     CLog::Log(LOGERROR, "CFNetServiceBrowserSearchForServices returned"
@@ -287,7 +287,7 @@ bool CZeroconfBrowserOSX::doRemoveServiceType(const std::string &fcr_service_typ
     m_service_browsers.erase(it);
   }
   assert(browser);
-    
+
   //now kill the browser
   CFStreamError streamerror;
   CFNetServiceBrowserStopSearch(browser, &streamerror);
diff --git a/xbmc/platform/darwin/osx/network/ZeroconfBrowserOSX.h b/xbmc/platform/darwin/osx/network/ZeroconfBrowserOSX.h
index e36b8d449a..dbc8c97263 100644
--- a/xbmc/platform/darwin/osx/network/ZeroconfBrowserOSX.h
+++ b/xbmc/platform/darwin/osx/network/ZeroconfBrowserOSX.h
@@ -62,10 +62,10 @@ private:
   void addDiscoveredService(CFNetServiceBrowserRef browser, CFOptionFlags flags, ZeroconfService const &fcr_service);
   /// removes the service from list of found services
   void removeDiscoveredService(CFNetServiceBrowserRef browser, CFOptionFlags flags, ZeroconfService const &fcr_service);
-  
+
   //CF runloop ref; we're using main-threads runloop
   CFRunLoopRef m_runloop;
-  
+
   //shared variables (with guard)
   //! @todo split the guard for discovered, resolved access?
   CCriticalSection m_data_guard;
diff --git a/xbmc/platform/darwin/osx/network/ZeroconfOSX.cpp b/xbmc/platform/darwin/osx/network/ZeroconfOSX.cpp
index 12832a074e..32eebdfade 100644
--- a/xbmc/platform/darwin/osx/network/ZeroconfOSX.cpp
+++ b/xbmc/platform/darwin/osx/network/ZeroconfOSX.cpp
@@ -91,12 +91,12 @@ bool CZeroconfOSX::doPublishService(const std::string& fcr_identifier,
                                                     (UInt8 *)it->second.c_str(),
                                                     strlen(it->second.c_str())
                                                   );
-                                                  
+
       CFDictionaryAddValue(txtDict,key, value);
       CFRelease(key);
       CFRelease(value);
-    }    
-    
+    }
+
     //add txt records to service
     txtData = CFNetServiceCreateTXTDataWithDictionary(NULL, txtDict);
     CFNetServiceSetTXTData(netService, txtData);
@@ -144,7 +144,7 @@ bool CZeroconfOSX::doForceReAnnounceService(const std::string& fcr_identifier)
     CFRelease(txtDictMutable);
     CFRelease(txtDict);
     CFRelease(txtData);
-  } 
+  }
   return ret;
 }
 
diff --git a/xbmc/platform/darwin/osx/peripherals/PeripheralBusUSB.cpp b/xbmc/platform/darwin/osx/peripherals/PeripheralBusUSB.cpp
index d5c788dcde..7dc441042a 100644
--- a/xbmc/platform/darwin/osx/peripherals/PeripheralBusUSB.cpp
+++ b/xbmc/platform/darwin/osx/peripherals/PeripheralBusUSB.cpp
@@ -118,7 +118,7 @@ PeripheralType CPeripheralBusUSB::GetType(int iDeviceClass)
 }
 
 void CPeripheralBusUSB::DeviceDetachCallback(void *refCon, io_service_t service, natural_t messageType, void *messageArgument)
-{ 
+{
   if (messageType == kIOMessageServiceIsTerminated)
   {
     USBDevicePrivateData *privateDataRef = (USBDevicePrivateData*)refCon;
@@ -132,7 +132,7 @@ void CPeripheralBusUSB::DeviceDetachCallback(void *refCon, io_service_t service,
         ++it;
     }
     privateDataRef->refCon->ScanForDevices();
-    
+
     CLog::Log(LOGDEBUG, "USB Device Detach:%s, %s\n",
       privateDataRef->deviceName.c_str(), privateDataRef->result.m_strLocation.c_str());
     IOObjectRelease(privateDataRef->notification);
@@ -199,7 +199,7 @@ void CPeripheralBusUSB::DeviceAttachCallback(CPeripheralBusUSB* refCon, io_itera
       SInt32 interfaceScore;
       IOCFPlugInInterface **interfacePlugin;
       //create intermediate plugin for interface access
-      result = IOCreatePlugInInterfaceForService(usbInterface, 
+      result = IOCreatePlugInInterfaceForService(usbInterface,
         kIOUSBInterfaceUserClientTypeID, kIOCFPlugInInterfaceID, &interfacePlugin, &interfaceScore);
       if (result != kIOReturnSuccess)
       {
@@ -268,14 +268,14 @@ void CPeripheralBusUSB::DeviceAttachCallback(CPeripheralBusUSB* refCon, io_itera
         privateDataRef->result.m_iSequence = refCon->GetNumberOfPeripheralsWithId(privateDataRef->result.m_iVendorId, privateDataRef->result.m_iProductId);
         if (!refCon->m_scan_results.ContainsResult(privateDataRef->result))
         {
-          // register this usb device for an interest notification callback. 
+          // register this usb device for an interest notification callback.
           result = IOServiceAddInterestNotification(refCon->m_notify_port,
             usbDevice,                      // service
             kIOGeneralInterest,             // interestType
             (IOServiceInterestCallback)DeviceDetachCallback, // callback
             privateDataRef,                 // refCon
             &privateDataRef->notification); // notification
-            
+
           if (result == kIOReturnSuccess)
           {
             refCon->m_scan_results.m_results.push_back(privateDataRef->result);
diff --git a/xbmc/platform/darwin/osx/powermanagement/CocoaPowerSyscall.cpp b/xbmc/platform/darwin/osx/powermanagement/CocoaPowerSyscall.cpp
index 1a16cd6691..8dcb0d3879 100644
--- a/xbmc/platform/darwin/osx/powermanagement/CocoaPowerSyscall.cpp
+++ b/xbmc/platform/darwin/osx/powermanagement/CocoaPowerSyscall.cpp
@@ -17,7 +17,7 @@
  *  <http://www.gnu.org/licenses/>.
  *
  */
- 
+
 #if defined (TARGET_DARWIN)
 // defined in PlatformDefs.h but I don't want to include that here
 typedef unsigned char BYTE;
@@ -250,8 +250,8 @@ bool CCocoaPowerSyscall::PumpPowerEvents(IPowerEventsCallback *callback)
   {
     callback->OnWake();
     m_OnResume = false;
-  } 
-  
+  }
+
   if (m_HasBattery && m_OnBattery && !m_SentBatteryMessage)
   {
     if (m_BatteryPercent < 10)
@@ -260,7 +260,7 @@ bool CCocoaPowerSyscall::PumpPowerEvents(IPowerEventsCallback *callback)
       m_SentBatteryMessage = true;
     }
   }
-    
+
   return true;
 }
 
@@ -308,7 +308,7 @@ void CCocoaPowerSyscall::DeleteOSPowerCallBacks(void)
   IOServiceClose(m_root_port);
   // destroy the notification port allocated by IORegisterForSystemPower
   IONotificationPortDestroy(m_notify_port);
-  
+
   // we no longer want power source change notifications
   if (m_HasBattery)
   {
@@ -326,7 +326,7 @@ void CCocoaPowerSyscall::OSPowerCallBack(void *refcon, io_service_t service, nat
 #if !defined(TARGET_DARWIN_IOS)
   CCocoaAutoPool autopool;
   CCocoaPowerSyscall  *ctx;
-  
+
   ctx = (CCocoaPowerSyscall*)refcon;
 
   switch (msg_type)
@@ -367,7 +367,7 @@ void CCocoaPowerSyscall::OSPowerCallBack(void *refcon, io_service_t service, nat
 #if !defined(TARGET_DARWIN_IOS)
 static bool stringsAreEqual(CFStringRef a, CFStringRef b)
 {
-	if (a == nil || b == nil) 
+	if (a == nil || b == nil)
 		return 0;
 	return (CFStringCompare (a, b, 0) == kCFCompareEqualTo);
 }
@@ -376,7 +376,7 @@ static bool stringsAreEqual(CFStringRef a, CFStringRef b)
 void CCocoaPowerSyscall::OSPowerSourceCallBack(void *refcon)
 {
 #if !defined(TARGET_DARWIN_IOS)
-  // Called whenever any power source is added, removed, or changes. 
+  // Called whenever any power source is added, removed, or changes.
   // When on battery, we get called periodically as battery level changes.
   CCocoaAutoPool autopool;
   CCocoaPowerSyscall  *ctx = (CCocoaPowerSyscall*)refcon;
@@ -396,7 +396,7 @@ void CCocoaPowerSyscall::OSPowerSourceCallBack(void *refcon)
     if ((CFBooleanRef)CFDictionaryGetValue(description, CFSTR(kIOPSIsPresentKey)) == kCFBooleanFalse)
       continue;
 
-    if (stringsAreEqual((CFStringRef)CFDictionaryGetValue(description, CFSTR (kIOPSTransportTypeKey)), CFSTR (kIOPSInternalType))) 
+    if (stringsAreEqual((CFStringRef)CFDictionaryGetValue(description, CFSTR (kIOPSTransportTypeKey)), CFSTR (kIOPSInternalType)))
     {
       CFStringRef currentState = (CFStringRef)CFDictionaryGetValue(description, CFSTR (kIOPSPowerSourceStateKey));
 
@@ -420,7 +420,7 @@ void CCocoaPowerSyscall::OSPowerSourceCallBack(void *refcon)
         ctx->m_OnBattery = true;
         ctx->m_BatteryPercent = (int)((double)curCapacity/(double)maxCapacity * 100);
       }
-		} 
+		}
   }
 
   CFRelease(power_sources_list);
diff --git a/xbmc/platform/darwin/osx/smc.c b/xbmc/platform/darwin/osx/smc.c
index 4d4f1948dd..3478755a76 100644
--- a/xbmc/platform/darwin/osx/smc.c
+++ b/xbmc/platform/darwin/osx/smc.c
@@ -6,12 +6,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, 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; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
@@ -29,7 +29,7 @@ UInt32 _strtoul(const char *str, int size, int base)
 {
   UInt32 total = 0;
   int i;
-  
+
   for (i = 0; i < size; i++)
   {
     if (base == 16)
@@ -55,9 +55,9 @@ kern_return_t SMCOpen(void)
   mach_port_t   masterPort;
   io_iterator_t iterator;
   io_object_t   device;
-  
+
   kern_return_t result = IOMasterPort(MACH_PORT_NULL, &masterPort);
-  
+
   CFMutableDictionaryRef matchingDictionary = IOServiceMatching("AppleSMC");
   result = IOServiceGetMatchingServices(masterPort, matchingDictionary, &iterator);
   if (result != kIOReturnSuccess)
@@ -65,7 +65,7 @@ kern_return_t SMCOpen(void)
     printf("Error: IOServiceGetMatchingServices() = %08x\n", result);
     return 1;
   }
-  
+
   device = IOIteratorNext(iterator);
   IOObjectRelease(iterator);
   if (device == 0)
@@ -73,7 +73,7 @@ kern_return_t SMCOpen(void)
     printf("Error: no SMC found\n");
     return 1;
   }
-  
+
   result = IOServiceOpen(device, mach_task_self(), 0, &conn);
   IOObjectRelease(device);
   if (result != kIOReturnSuccess)
@@ -81,7 +81,7 @@ kern_return_t SMCOpen(void)
     printf("Error: IOServiceOpen() = %08x\n", result);
     return 1;
   }
-  
+
   return kIOReturnSuccess;
 }
 
@@ -95,10 +95,10 @@ kern_return_t SMCCall(int index, SMCKeyData_t *inputStructure, SMCKeyData_t *out
 {
   size_t   structureInputSize;
   size_t   structureOutputSize;
-  
+
   structureInputSize = sizeof(SMCKeyData_t);
   structureOutputSize = sizeof(SMCKeyData_t);
-  
+
 #if MAC_OS_X_VERSION_10_5
   return IOConnectCallStructMethod( conn, index,
                                    // inputStructure
@@ -112,7 +112,7 @@ kern_return_t SMCCall(int index, SMCKeyData_t *inputStructure, SMCKeyData_t *out
                                              inputStructure,        /* inputStructure */
                                              outputStructure);       /* outputStructure */
 #endif
-  
+
 }
 
 kern_return_t SMCReadKey(UInt32ConstChar_t key, SMCVal_t *val)
@@ -120,29 +120,29 @@ kern_return_t SMCReadKey(UInt32ConstChar_t key, SMCVal_t *val)
   kern_return_t result;
   SMCKeyData_t  inputStructure;
   SMCKeyData_t  outputStructure;
-  
+
   memset(&inputStructure, 0, sizeof(SMCKeyData_t));
   memset(&outputStructure, 0, sizeof(SMCKeyData_t));
   memset(val, 0, sizeof(SMCVal_t));
-  
+
   inputStructure.key = _strtoul(key, 4, 16);
   inputStructure.data8 = SMC_CMD_READ_KEYINFO;
-  
+
   result = SMCCall(KERNEL_INDEX_SMC, &inputStructure, &outputStructure);
   if (result != kIOReturnSuccess)
     return result;
-  
+
   val->dataSize = outputStructure.keyInfo.dataSize;
   _ultostr(val->dataType, outputStructure.keyInfo.dataType);
   inputStructure.keyInfo.dataSize = val->dataSize;
   inputStructure.data8 = SMC_CMD_READ_BYTES;
-  
+
   result = SMCCall(KERNEL_INDEX_SMC, &inputStructure, &outputStructure);
   if (result != kIOReturnSuccess)
     return result;
-  
+
   memcpy(val->bytes, outputStructure.bytes, sizeof(outputStructure.bytes));
-  
+
   return kIOReturnSuccess;
 }
 
diff --git a/xbmc/platform/darwin/osx/smc.h b/xbmc/platform/darwin/osx/smc.h
index 5937face6d..82e136360b 100644
--- a/xbmc/platform/darwin/osx/smc.h
+++ b/xbmc/platform/darwin/osx/smc.h
@@ -6,12 +6,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, 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; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
diff --git a/xbmc/platform/darwin/osx/storage/DarwinStorageProvider.cpp b/xbmc/platform/darwin/osx/storage/DarwinStorageProvider.cpp
index 566c87ba05..dddd69f360 100644
--- a/xbmc/platform/darwin/osx/storage/DarwinStorageProvider.cpp
+++ b/xbmc/platform/darwin/osx/storage/DarwinStorageProvider.cpp
@@ -29,7 +29,7 @@
 #include <DiskArbitration/DiskArbitration.h>
 #include <IOKit/storage/IOCDMedia.h>
 #include <IOKit/storage/IODVDMedia.h>
-#include "platform/darwin/DarwinUtils.h"  
+#include "platform/darwin/DarwinUtils.h"
 #endif
 #include "platform/darwin/osx/CocoaInterface.h"
 
@@ -58,7 +58,7 @@ void CDarwinStorageProvider::GetLocalDrives(VECSOURCES &localDrives)
   share.strName = g_localizeStrings.Get(21440);
   share.m_ignore = true;
   localDrives.push_back(share);
-  
+
 #if defined(TARGET_DARWIN_IOS)
   // iOS Inbox folder
   share.strPath = "special://envhome/Documents/Inbox";
@@ -80,7 +80,7 @@ void CDarwinStorageProvider::GetLocalDrives(VECSOURCES &localDrives)
   share.strName = "Volumes";
   share.m_ignore = true;
   localDrives.push_back(share);
-  
+
   // This will pick up all local non-removable disks including the Root Disk.
   DASessionRef session = DASessionCreate(kCFAllocatorDefault);
   if (session)
diff --git a/xbmc/platform/linux/DBusReserve.cpp b/xbmc/platform/linux/DBusReserve.cpp
index e9a5477dae..3d9001826f 100644
--- a/xbmc/platform/linux/DBusReserve.cpp
+++ b/xbmc/platform/linux/DBusReserve.cpp
@@ -33,7 +33,7 @@
 CDBusReserve::CDBusReserve()
 {
   CDBusError error;
-  
+
   m_conn.Connect(DBUS_BUS_SESSION);
 }
 
@@ -53,7 +53,7 @@ bool CDBusReserve::AcquireDevice(const std::string& device)
   CDBusError error;
   int res;
 
-  // currently only max prio is supported since 
+  // currently only max prio is supported since
   // we don't implement the RequestRelease interface
   int prio = INT_MAX;
 
@@ -125,7 +125,7 @@ bool CDBusReserve::AcquireDevice(const std::string& device)
   }
 
   res = dbus_bus_request_name(m_conn, service.c_str()
-                                  , DBUS_NAME_FLAG_DO_NOT_QUEUE 
+                                  , DBUS_NAME_FLAG_DO_NOT_QUEUE
                                   | (prio == INT_MAX ? 0 : DBUS_NAME_FLAG_ALLOW_REPLACEMENT)
                                   | DBUS_NAME_FLAG_REPLACE_EXISTING
                                   , error);
diff --git a/xbmc/platform/linux/DllBCM.h b/xbmc/platform/linux/DllBCM.h
index 20af9dfc64..4770692123 100644
--- a/xbmc/platform/linux/DllBCM.h
+++ b/xbmc/platform/linux/DllBCM.h
@@ -172,9 +172,9 @@ public:
   virtual int vc_tv_hdmi_audio_supported(uint32_t audio_format, uint32_t num_channels,
                                                   EDID_AudioSampleRate fs, uint32_t bitrate)
   { return ::vc_tv_hdmi_audio_supported(audio_format, num_channels, fs, bitrate); };
-  virtual bool ResolveExports() 
+  virtual bool ResolveExports()
     { return true; }
-  virtual bool Load() 
+  virtual bool Load()
   {
     CLog::Log(LOGDEBUG, "DllBcm: Using omx system library");
     return true;
diff --git a/xbmc/platform/linux/DllOMX.h b/xbmc/platform/linux/DllOMX.h
index c6b116b817..d5bb8e7f87 100644
--- a/xbmc/platform/linux/DllOMX.h
+++ b/xbmc/platform/linux/DllOMX.h
@@ -57,15 +57,15 @@ public:
 class DllOMX : public DllDynamic, DllOMXInterface
 {
 public:
-  virtual OMX_ERRORTYPE OMX_Init(void) 
+  virtual OMX_ERRORTYPE OMX_Init(void)
     { return ::OMX_Init(); };
-  virtual OMX_ERRORTYPE OMX_Deinit(void) 
+  virtual OMX_ERRORTYPE OMX_Deinit(void)
     { return ::OMX_Deinit(); };
   virtual OMX_ERRORTYPE OMX_GetHandle(OMX_HANDLETYPE *pHandle, OMX_STRING cComponentName, OMX_PTR pAppData, OMX_CALLBACKTYPE *pCallBacks)
     { return ::OMX_GetHandle(pHandle, cComponentName, pAppData, pCallBacks); };
   virtual OMX_ERRORTYPE OMX_FreeHandle(OMX_HANDLETYPE hComponent)
     { return ::OMX_FreeHandle(hComponent); };
-  virtual OMX_ERRORTYPE OMX_GetComponentsOfRole(OMX_STRING role, OMX_U32 *pNumComps, OMX_U8 **compNames) 
+  virtual OMX_ERRORTYPE OMX_GetComponentsOfRole(OMX_STRING role, OMX_U32 *pNumComps, OMX_U8 **compNames)
     { return ::OMX_GetComponentsOfRole(role, pNumComps, compNames); };
   virtual OMX_ERRORTYPE OMX_GetRolesOfComponent(OMX_STRING compName, OMX_U32 *pNumRoles, OMX_U8 **roles)
     { return ::OMX_GetRolesOfComponent(compName, pNumRoles, roles); };
@@ -73,9 +73,9 @@ public:
     { return ::OMX_ComponentNameEnum(cComponentName, nNameLength, nIndex); };
   virtual OMX_ERRORTYPE OMX_SetupTunnel(OMX_HANDLETYPE hOutput, OMX_U32 nPortOutput, OMX_HANDLETYPE hInput, OMX_U32 nPortInput)
     { return ::OMX_SetupTunnel(hOutput, nPortOutput, hInput, nPortInput); };
-  virtual bool ResolveExports() 
+  virtual bool ResolveExports()
     { return true; }
-  virtual bool Load() 
+  virtual bool Load()
   {
     CLog::Log(LOGDEBUG, "DllOMX: Using omx system library");
     return true;
diff --git a/xbmc/platform/linux/LinuxTimezone.cpp b/xbmc/platform/linux/LinuxTimezone.cpp
index 35e4d7762e..0529deb76d 100644
--- a/xbmc/platform/linux/LinuxTimezone.cpp
+++ b/xbmc/platform/linux/LinuxTimezone.cpp
@@ -197,7 +197,7 @@ void CLinuxTimezone::SetTimezone(std::string timezoneName)
 #else
   bool use_timezone = false;
 #endif
-  
+
   if (use_timezone)
   {
     static char env_var[255];
diff --git a/xbmc/platform/linux/OMXCore.cpp b/xbmc/platform/linux/OMXCore.cpp
index 991f771350..1f0852fe33 100644
--- a/xbmc/platform/linux/OMXCore.cpp
+++ b/xbmc/platform/linux/OMXCore.cpp
@@ -163,7 +163,7 @@ OMX_ERRORTYPE COMXCoreTunnel::Establish(bool enable_ports /* = true */, bool dis
     omx_err = m_src_component->SetStateForComponent(OMX_StateIdle);
     if(omx_err != OMX_ErrorNone)
     {
-      CLog::Log(LOGERROR, "COMXCoreTunnel::Establish - Error setting state to idle %s omx_err(0x%08x)", 
+      CLog::Log(LOGERROR, "COMXCoreTunnel::Establish - Error setting state to idle %s omx_err(0x%08x)",
           m_src_component->GetName().c_str(), (int)omx_err);
       return omx_err;
     }
@@ -214,9 +214,9 @@ OMX_ERRORTYPE COMXCoreTunnel::Establish(bool enable_ports /* = true */, bool dis
   if(m_src_component->GetComponent() && m_dst_component->GetComponent())
   {
     omx_err = m_DllOMX->OMX_SetupTunnel(m_src_component->GetComponent(), m_src_port, m_dst_component->GetComponent(), m_dst_port);
-    if(omx_err != OMX_ErrorNone) 
+    if(omx_err != OMX_ErrorNone)
     {
-      CLog::Log(LOGERROR, "COMXCoreTunnel::Establish - could not setup tunnel src %s port %d dst %s port %d omx_err(0x%08x)\n", 
+      CLog::Log(LOGERROR, "COMXCoreTunnel::Establish - could not setup tunnel src %s port %d dst %s port %d omx_err(0x%08x)\n",
           m_src_component->GetName().c_str(), m_src_port, m_dst_component->GetName().c_str(), m_dst_port, (int)omx_err);
       return omx_err;
     }
@@ -234,7 +234,7 @@ OMX_ERRORTYPE COMXCoreTunnel::Establish(bool enable_ports /* = true */, bool dis
     omx_err = m_src_component->EnablePort(m_src_port, false);
     if(omx_err != OMX_ErrorNone)
     {
-      CLog::Log(LOGERROR, "COMXCoreTunnel::Establish - Error enable port %d on component %s omx_err(0x%08x)", 
+      CLog::Log(LOGERROR, "COMXCoreTunnel::Establish - Error enable port %d on component %s omx_err(0x%08x)",
           m_src_port, m_src_component->GetName().c_str(), (int)omx_err);
       return omx_err;
     }
@@ -245,7 +245,7 @@ OMX_ERRORTYPE COMXCoreTunnel::Establish(bool enable_ports /* = true */, bool dis
     omx_err = m_dst_component->EnablePort(m_dst_port, false);
     if(omx_err != OMX_ErrorNone)
     {
-      CLog::Log(LOGERROR, "COMXCoreTunnel::Establish - Error enable port %d on component %s omx_err(0x%08x)", 
+      CLog::Log(LOGERROR, "COMXCoreTunnel::Establish - Error enable port %d on component %s omx_err(0x%08x)",
           m_dst_port, m_dst_component->GetName().c_str(), (int)omx_err);
       return omx_err;
     }
@@ -264,7 +264,7 @@ OMX_ERRORTYPE COMXCoreTunnel::Establish(bool enable_ports /* = true */, bool dis
       omx_err = m_dst_component->SetStateForComponent(OMX_StateIdle);
       if(omx_err != OMX_ErrorNone)
       {
-        CLog::Log(LOGERROR, "COMXCoreComponent::Establish - Error setting state to idle %s omx_err(0x%08x)", 
+        CLog::Log(LOGERROR, "COMXCoreComponent::Establish - Error setting state to idle %s omx_err(0x%08x)",
             m_src_component->GetName().c_str(), (int)omx_err);
         return omx_err;
       }
@@ -358,7 +358,7 @@ OMX_ERRORTYPE COMXCoreComponent::EmptyThisBuffer(OMX_BUFFERHEADERTYPE *omx_buffe
   omx_err = OMX_EmptyThisBuffer(m_handle, omx_buffer);
   if (omx_err != OMX_ErrorNone)
   {
-    CLog::Log(LOGERROR, "COMXCoreComponent::EmptyThisBuffer component(%s) - failed with result(0x%x)\n", 
+    CLog::Log(LOGERROR, "COMXCoreComponent::EmptyThisBuffer component(%s) - failed with result(0x%x)\n",
         m_componentName.c_str(), omx_err);
   }
 
@@ -378,7 +378,7 @@ OMX_ERRORTYPE COMXCoreComponent::FillThisBuffer(OMX_BUFFERHEADERTYPE *omx_buffer
   omx_err = OMX_FillThisBuffer(m_handle, omx_buffer);
   if (omx_err != OMX_ErrorNone)
   {
-    CLog::Log(LOGERROR, "COMXCoreComponent::FillThisBuffer component(%s) - failed with result(0x%x)\n", 
+    CLog::Log(LOGERROR, "COMXCoreComponent::FillThisBuffer component(%s) - failed with result(0x%x)\n",
         m_componentName.c_str(), omx_err);
   }
 
@@ -417,7 +417,7 @@ void COMXCoreComponent::FlushInput()
 
   if(omx_err != OMX_ErrorNone)
   {
-    CLog::Log(LOGERROR, "COMXCoreComponent::FlushInput - Error on component %s omx_err(0x%08x)", 
+    CLog::Log(LOGERROR, "COMXCoreComponent::FlushInput - Error on component %s omx_err(0x%08x)",
               m_componentName.c_str(), (int)omx_err);
   }
   WaitForCommand(OMX_CommandFlush, m_input_port);
@@ -432,7 +432,7 @@ void COMXCoreComponent::FlushOutput()
 
   if(omx_err != OMX_ErrorNone)
   {
-    CLog::Log(LOGERROR, "COMXCoreComponent::FlushOutput - Error on component %s omx_err(0x%08x)", 
+    CLog::Log(LOGERROR, "COMXCoreComponent::FlushOutput - Error on component %s omx_err(0x%08x)",
               m_componentName.c_str(), (int)omx_err);
   }
   WaitForCommand(OMX_CommandFlush, m_output_port);
@@ -605,7 +605,7 @@ OMX_ERRORTYPE COMXCoreComponent::AllocInputBuffers()
     buffer->nInputPortIndex = m_input_port;
     buffer->nFilledLen      = 0;
     buffer->nOffset         = 0;
-    buffer->pAppPrivate     = (void*)i;  
+    buffer->pAppPrivate     = (void*)i;
     m_omx_input_buffers.push_back(buffer);
     m_omx_input_available.push(buffer);
   }
@@ -802,7 +802,7 @@ OMX_ERRORTYPE COMXCoreComponent::DisableAllPorts()
   OMX_INDEXTYPE idxTypes[] = {
     OMX_IndexParamAudioInit,
     OMX_IndexParamImageInit,
-    OMX_IndexParamVideoInit, 
+    OMX_IndexParamVideoInit,
     OMX_IndexParamOtherInit
   };
 
@@ -832,7 +832,7 @@ OMX_ERRORTYPE COMXCoreComponent::DisableAllPorts()
         omx_err = OMX_SendCommand(m_handle, OMX_CommandPortDisable, ports.nStartPortNumber+j, NULL);
         if(omx_err != OMX_ErrorNone)
         {
-          CLog::Log(LOGERROR, "COMXCoreComponent::DisableAllPorts - Error disable port %d on component %s omx_err(0x%08x)", 
+          CLog::Log(LOGERROR, "COMXCoreComponent::DisableAllPorts - Error disable port %d on component %s omx_err(0x%08x)",
             (int)(ports.nStartPortNumber) + j, m_componentName.c_str(), (int)omx_err);
         }
         omx_err = WaitForCommand(OMX_CommandPortDisable, ports.nStartPortNumber+j);
@@ -847,11 +847,11 @@ OMX_ERRORTYPE COMXCoreComponent::DisableAllPorts()
 
 void COMXCoreComponent::RemoveEvent(OMX_EVENTTYPE eEvent, OMX_U32 nData1, OMX_U32 nData2)
 {
-  for (std::vector<omx_event>::iterator it = m_omx_events.begin(); it != m_omx_events.end(); ) 
+  for (std::vector<omx_event>::iterator it = m_omx_events.begin(); it != m_omx_events.end(); )
   {
     omx_event event = *it;
 
-    if(event.eEvent == eEvent && event.nData1 == nData1 && event.nData2 == nData2) 
+    if(event.eEvent == eEvent && event.nData1 == nData1 && event.nData2 == nData2)
     {
       it = m_omx_events.erase(it);
       continue;
@@ -895,7 +895,7 @@ OMX_ERRORTYPE COMXCoreComponent::WaitForEvent(OMX_EVENTTYPE eventType, long time
   struct timespec endtime;
   clock_gettime(CLOCK_REALTIME, &endtime);
   add_timespecs(endtime, timeout);
-  while(true) 
+  while(true)
   {
     for (std::vector<omx_event>::iterator it = m_omx_events.begin(); it != m_omx_events.end(); ++it)
     {
@@ -917,13 +917,13 @@ OMX_ERRORTYPE COMXCoreComponent::WaitForEvent(OMX_EVENTTYPE eventType, long time
         pthread_mutex_unlock(&m_omx_event_mutex);
         return OMX_ErrorNone;
       }
-      else if(event.eEvent == OMX_EventError) 
+      else if(event.eEvent == OMX_EventError)
       {
         m_omx_events.erase(it);
         pthread_mutex_unlock(&m_omx_event_mutex);
         return (OMX_ERRORTYPE)event.nData1;
       }
-      else if(event.eEvent == eventType) 
+      else if(event.eEvent == eventType)
       {
 #ifdef OMX_DEBUG_EVENTS
         CLog::Log(LOGDEBUG, "COMXCoreComponent::WaitForEvent %s remove event event.eEvent 0x%08x event.nData1 0x%08x event.nData2 %d\n",
@@ -939,7 +939,7 @@ OMX_ERRORTYPE COMXCoreComponent::WaitForEvent(OMX_EVENTTYPE eventType, long time
     if (m_resource_error)
       break;
     int retcode = pthread_cond_timedwait(&m_omx_event_cond, &m_omx_event_mutex, &endtime);
-    if (retcode != 0) 
+    if (retcode != 0)
     {
       if (timeout > 0)
         CLog::Log(LOGERROR, "COMXCoreComponent::WaitForEvent %s wait event 0x%08x timeout %ld\n",
@@ -956,7 +956,7 @@ OMX_ERRORTYPE COMXCoreComponent::WaitForEvent(OMX_EVENTTYPE eventType, long time
 OMX_ERRORTYPE COMXCoreComponent::WaitForCommand(OMX_U32 command, OMX_U32 nData2, long timeout)
 {
 #ifdef OMX_DEBUG_EVENTS
-  CLog::Log(LOGDEBUG, "COMXCoreComponent::WaitForCommand %s wait event.eEvent 0x%08x event.command 0x%08x event.nData2 %d\n", 
+  CLog::Log(LOGDEBUG, "COMXCoreComponent::WaitForCommand %s wait event.eEvent 0x%08x event.command 0x%08x event.nData2 %d\n",
       m_componentName.c_str(), (int)OMX_EventCmdComplete, (int)command, (int)nData2);
 #endif
 
@@ -964,7 +964,7 @@ OMX_ERRORTYPE COMXCoreComponent::WaitForCommand(OMX_U32 command, OMX_U32 nData2,
   struct timespec endtime;
   clock_gettime(CLOCK_REALTIME, &endtime);
   add_timespecs(endtime, timeout);
-  while(true) 
+  while(true)
   {
     for (std::vector<omx_event>::iterator it = m_omx_events.begin(); it != m_omx_events.end(); ++it)
     {
@@ -984,14 +984,14 @@ OMX_ERRORTYPE COMXCoreComponent::WaitForCommand(OMX_U32 command, OMX_U32 nData2,
         m_omx_events.erase(it);
         pthread_mutex_unlock(&m_omx_event_mutex);
         return OMX_ErrorNone;
-      } 
-      else if(event.eEvent == OMX_EventError) 
+      }
+      else if(event.eEvent == OMX_EventError)
       {
         m_omx_events.erase(it);
         pthread_mutex_unlock(&m_omx_event_mutex);
         return (OMX_ERRORTYPE)event.nData1;
-      } 
-      else if(event.eEvent == OMX_EventCmdComplete && event.nData1 == command && event.nData2 == nData2) 
+      }
+      else if(event.eEvent == OMX_EventCmdComplete && event.nData1 == command && event.nData2 == nData2)
       {
 
 #ifdef OMX_DEBUG_EVENTS
@@ -1009,9 +1009,9 @@ OMX_ERRORTYPE COMXCoreComponent::WaitForCommand(OMX_U32 command, OMX_U32 nData2,
       break;
     int retcode = pthread_cond_timedwait(&m_omx_event_cond, &m_omx_event_mutex, &endtime);
     if (retcode != 0) {
-      CLog::Log(LOGERROR, "COMXCoreComponent::WaitForCommand %s wait timeout event.eEvent 0x%08x event.command 0x%08x event.nData2 %d\n", 
+      CLog::Log(LOGERROR, "COMXCoreComponent::WaitForCommand %s wait timeout event.eEvent 0x%08x event.command 0x%08x event.nData2 %d\n",
         m_componentName.c_str(), (int)OMX_EventCmdComplete, (int)command, (int)nData2);
-      
+
       pthread_mutex_unlock(&m_omx_event_mutex);
       return OMX_ErrorTimeout;
     }
@@ -1042,11 +1042,11 @@ OMX_ERRORTYPE COMXCoreComponent::SetStateForComponent(OMX_STATETYPE state)
     }
     else
     {
-      CLog::Log(LOGERROR, "COMXCoreComponent::SetStateForComponent - %s failed with omx_err(0x%x)\n", 
+      CLog::Log(LOGERROR, "COMXCoreComponent::SetStateForComponent - %s failed with omx_err(0x%x)\n",
         m_componentName.c_str(), omx_err);
     }
   }
-  else 
+  else
   {
     omx_err = WaitForCommand(OMX_CommandStateSet, state);
     if (omx_err != OMX_ErrorNone)
@@ -1077,9 +1077,9 @@ OMX_ERRORTYPE COMXCoreComponent::SetParameter(OMX_INDEXTYPE paramIndex, OMX_PTR
   OMX_ERRORTYPE omx_err;
 
   omx_err = OMX_SetParameter(m_handle, paramIndex, paramStruct);
-  if(omx_err != OMX_ErrorNone) 
+  if(omx_err != OMX_ErrorNone)
   {
-    CLog::Log(LOGERROR, "COMXCoreComponent::SetParameter - %s failed with omx_err(0x%x)\n", 
+    CLog::Log(LOGERROR, "COMXCoreComponent::SetParameter - %s failed with omx_err(0x%x)\n",
               m_componentName.c_str(), omx_err);
   }
   return omx_err;
@@ -1093,9 +1093,9 @@ OMX_ERRORTYPE COMXCoreComponent::GetParameter(OMX_INDEXTYPE paramIndex, OMX_PTR
   OMX_ERRORTYPE omx_err;
 
   omx_err = OMX_GetParameter(m_handle, paramIndex, paramStruct);
-  if(omx_err != OMX_ErrorNone) 
+  if(omx_err != OMX_ErrorNone)
   {
-    CLog::Log(LOGERROR, "COMXCoreComponent::GetParameter - %s failed with omx_err(0x%x)\n", 
+    CLog::Log(LOGERROR, "COMXCoreComponent::GetParameter - %s failed with omx_err(0x%x)\n",
               m_componentName.c_str(), omx_err);
   }
   return omx_err;
@@ -1109,9 +1109,9 @@ OMX_ERRORTYPE COMXCoreComponent::SetConfig(OMX_INDEXTYPE configIndex, OMX_PTR co
   OMX_ERRORTYPE omx_err;
 
   omx_err = OMX_SetConfig(m_handle, configIndex, configStruct);
-  if(omx_err != OMX_ErrorNone) 
+  if(omx_err != OMX_ErrorNone)
   {
-    CLog::Log(LOGERROR, "COMXCoreComponent::SetConfig - %s failed with omx_err(0x%x)\n", 
+    CLog::Log(LOGERROR, "COMXCoreComponent::SetConfig - %s failed with omx_err(0x%x)\n",
               m_componentName.c_str(), omx_err);
   }
   return omx_err;
@@ -1125,9 +1125,9 @@ OMX_ERRORTYPE COMXCoreComponent::GetConfig(OMX_INDEXTYPE configIndex, OMX_PTR co
   OMX_ERRORTYPE omx_err;
 
   omx_err = OMX_GetConfig(m_handle, configIndex, configStruct);
-  if(omx_err != OMX_ErrorNone) 
+  if(omx_err != OMX_ErrorNone)
   {
-    CLog::Log(LOGERROR, "COMXCoreComponent::GetConfig - %s failed with omx_err(0x%x)\n", 
+    CLog::Log(LOGERROR, "COMXCoreComponent::GetConfig - %s failed with omx_err(0x%x)\n",
               m_componentName.c_str(), omx_err);
   }
   return omx_err;
@@ -1141,9 +1141,9 @@ OMX_ERRORTYPE COMXCoreComponent::SendCommand(OMX_COMMANDTYPE cmd, OMX_U32 cmdPar
   OMX_ERRORTYPE omx_err;
 
   omx_err = OMX_SendCommand(m_handle, cmd, cmdParam, cmdParamData);
-  if(omx_err != OMX_ErrorNone) 
+  if(omx_err != OMX_ErrorNone)
   {
-    CLog::Log(LOGERROR, "COMXCoreComponent::SendCommand - %s failed with omx_err(0x%x)\n", 
+    CLog::Log(LOGERROR, "COMXCoreComponent::SendCommand - %s failed with omx_err(0x%x)\n",
               m_componentName.c_str(), omx_err);
   }
   return omx_err;
@@ -1161,7 +1161,7 @@ OMX_ERRORTYPE COMXCoreComponent::EnablePort(unsigned int port,  bool wait)
   OMX_ERRORTYPE omx_err = OMX_GetParameter(m_handle, OMX_IndexParamPortDefinition, &portFormat);
   if(omx_err != OMX_ErrorNone)
   {
-    CLog::Log(LOGERROR, "COMXCoreComponent::EnablePort - Error get port %d status on component %s omx_err(0x%08x)", 
+    CLog::Log(LOGERROR, "COMXCoreComponent::EnablePort - Error get port %d status on component %s omx_err(0x%08x)",
         port, m_componentName.c_str(), (int)omx_err);
   }
 
@@ -1170,7 +1170,7 @@ OMX_ERRORTYPE COMXCoreComponent::EnablePort(unsigned int port,  bool wait)
     omx_err = OMX_SendCommand(m_handle, OMX_CommandPortEnable, port, NULL);
     if(omx_err != OMX_ErrorNone)
     {
-      CLog::Log(LOGERROR, "COMXCoreComponent::EnablePort - Error enable port %d on component %s omx_err(0x%08x)", 
+      CLog::Log(LOGERROR, "COMXCoreComponent::EnablePort - Error enable port %d on component %s omx_err(0x%08x)",
           port, m_componentName.c_str(), (int)omx_err);
         return omx_err;
     }
@@ -1195,7 +1195,7 @@ OMX_ERRORTYPE COMXCoreComponent::DisablePort(unsigned int port, bool wait)
   OMX_ERRORTYPE omx_err = OMX_GetParameter(m_handle, OMX_IndexParamPortDefinition, &portFormat);
   if(omx_err != OMX_ErrorNone)
   {
-    CLog::Log(LOGERROR, "COMXCoreComponent::DisablePort - Error get port %d status on component %s omx_err(0x%08x)", 
+    CLog::Log(LOGERROR, "COMXCoreComponent::DisablePort - Error get port %d status on component %s omx_err(0x%08x)",
         port, m_componentName.c_str(), (int)omx_err);
   }
 
@@ -1204,7 +1204,7 @@ OMX_ERRORTYPE COMXCoreComponent::DisablePort(unsigned int port, bool wait)
     omx_err = OMX_SendCommand(m_handle, OMX_CommandPortDisable, port, NULL);
     if(omx_err != OMX_ErrorNone)
     {
-      CLog::Log(LOGERROR, "COMXCoreComponent::DIsablePort - Error disable port %d on component %s omx_err(0x%08x)", 
+      CLog::Log(LOGERROR, "COMXCoreComponent::DIsablePort - Error disable port %d on component %s omx_err(0x%08x)",
           port, m_componentName.c_str(), (int)omx_err);
       return omx_err;
     }
@@ -1321,7 +1321,7 @@ bool COMXCoreComponent::Initialize( const std::string &component_name, OMX_INDEX
   m_ignore_error = OMX_ErrorNone;
 
   m_componentName = component_name;
-  
+
   m_callbacks.EventHandler    = &COMXCoreComponent::DecoderEventHandlerCallback;
   m_callbacks.EmptyBufferDone = &COMXCoreComponent::DecoderEmptyBufferDoneCallback;
   m_callbacks.FillBufferDone  = &COMXCoreComponent::DecoderFillBufferDoneCallback;
@@ -1345,7 +1345,7 @@ bool COMXCoreComponent::Initialize( const std::string &component_name, OMX_INDEX
   omx_err = OMX_GetParameter(m_handle, index, &port_param);
   if (omx_err != OMX_ErrorNone)
   {
-    CLog::Log(LOGERROR, "COMXCoreComponent::Initialize - could not get port_param for component %s omx_err(0x%08x)\n", 
+    CLog::Log(LOGERROR, "COMXCoreComponent::Initialize - could not get port_param for component %s omx_err(0x%08x)\n",
         component_name.c_str(), (int)omx_err);
   }
 
@@ -1533,7 +1533,7 @@ OMX_ERRORTYPE COMXCoreComponent::DecoderEventHandler(
   switch (eEvent)
   {
     case OMX_EventCmdComplete:
-      
+
       switch(nData1)
       {
         case OMX_CommandStateSet:
@@ -1711,7 +1711,7 @@ void COMXCore::Deinitialize()
     if (omx_err != OMX_ErrorNone)
     {
       CLog::Log(LOGERROR, "COMXCore::Deinitialize - OMXCore failed to deinit, omx_err(0x%08x)", omx_err);
-    }  
+    }
     m_DllOMX->Unload();
   }
 }
diff --git a/xbmc/platform/linux/PlatformDefs.h b/xbmc/platform/linux/PlatformDefs.h
index 2410acf68d..c322c5f0ce 100644
--- a/xbmc/platform/linux/PlatformDefs.h
+++ b/xbmc/platform/linux/PlatformDefs.h
@@ -97,7 +97,7 @@
 #endif
 #endif
 #endif
-	
+
 #ifndef PRIdS
 #define PRIdS "zd"
 #endif
diff --git a/xbmc/platform/linux/PosixMountProvider.cpp b/xbmc/platform/linux/PosixMountProvider.cpp
index 6dd113232e..1d04504a36 100644
--- a/xbmc/platform/linux/PosixMountProvider.cpp
+++ b/xbmc/platform/linux/PosixMountProvider.cpp
@@ -104,7 +104,7 @@ std::vector<std::string> CPosixMountProvider::GetDiskUsage()
 #else
   FILE* pipe = popen("df -h", "r");
 #endif
-  
+
   static const char* excludes[] = {"rootfs","devtmpfs","tmpfs","none","/dev/loop", "udev", NULL};
 
   if (pipe)
diff --git a/xbmc/platform/linux/PosixMountProvider.h b/xbmc/platform/linux/PosixMountProvider.h
index c316897816..82857b18dc 100644
--- a/xbmc/platform/linux/PosixMountProvider.h
+++ b/xbmc/platform/linux/PosixMountProvider.h
@@ -22,7 +22,7 @@
 
 #include <string>
 #include <vector>
- 
+
 #include "storage/IStorageProvider.h"
 
 class CPosixMountProvider : public IStorageProvider
diff --git a/xbmc/platform/linux/network/NetworkLinux.cpp b/xbmc/platform/linux/network/NetworkLinux.cpp
index b541c509ce..ea8598e6a4 100644
--- a/xbmc/platform/linux/network/NetworkLinux.cpp
+++ b/xbmc/platform/linux/network/NetworkLinux.cpp
@@ -243,7 +243,7 @@ std::string CNetworkInterfaceLinux::GetCurrentDefaultGateway(void)
    for (next = buf; next < lim; next += rtm->rtm_msglen) {
       rtm = (struct rt_msghdr *)next;
       sa = (struct sockaddr *)(rtm + 1);
-      sa = (struct sockaddr *)(SA_SIZE(sa) + (char *)sa);	
+      sa = (struct sockaddr *)(SA_SIZE(sa) + (char *)sa);
       sockin = (struct sockaddr_in *)sa;
       if (inet_ntop(AF_INET, &sockin->sin_addr.s_addr,
          line, sizeof(line)) == NULL) {
@@ -339,16 +339,16 @@ std::vector<CNetworkInterface*>& CNetworkLinux::GetInterfaceList(void)
 CNetworkInterface* CNetworkLinux::GetFirstConnectedInterface(void)
 {
     CNetworkInterface *pNetIf=CNetworkBase::GetFirstConnectedInterface();
-    
+
     // no connected Interfaces found? - requeryInterfaceList
     if (!pNetIf)
     {
-        CLog::Log(LOGDEBUG,"%s no connected interface found - requery list",__FUNCTION__);        
-        queryInterfaceList();        
+        CLog::Log(LOGDEBUG,"%s no connected interface found - requery list",__FUNCTION__);
+        queryInterfaceList();
         //retry finding a connected if
         pNetIf = CNetworkBase::GetFirstConnectedInterface();
     }
-    
+
     return pNetIf;
 }
 
@@ -376,7 +376,7 @@ void CNetworkLinux::GetMacAddress(const std::string& interfaceName, char rawMac[
   {
     if(interfaceName == interface->ifa_name)
     {
-      if ( (interface->ifa_addr->sa_family == AF_LINK) && (((const struct sockaddr_dl *) interface->ifa_addr)->sdl_type == IFT_ETHER) ) 
+      if ( (interface->ifa_addr->sa_family == AF_LINK) && (((const struct sockaddr_dl *) interface->ifa_addr)->sdl_type == IFT_ETHER) )
       {
         dlAddr = (const struct sockaddr_dl *) interface->ifa_addr;
         base = (const uint8_t *) &dlAddr->sdl_data[dlAddr->sdl_nlen];
@@ -495,7 +495,7 @@ std::vector<std::string> CNetworkLinux::GetNameServers(void)
       }
     }
     pclose(pipe);
-  } 
+  }
   if (result.empty())
     CLog::Log(LOGWARNING, "Unable to determine nameserver");
 #elif defined(TARGET_ANDROID)
@@ -545,7 +545,7 @@ bool CNetworkLinux::PingHost(unsigned long remote_ip, unsigned int timeout_ms)
 {
   char cmd_line [64];
 
-  struct in_addr host_ip; 
+  struct in_addr host_ip;
   host_ip.s_addr = remote_ip;
 
 #if defined (TARGET_DARWIN) || defined (TARGET_FREEBSD)
@@ -581,35 +581,35 @@ bool CNetworkInterfaceLinux::GetHostMacAddress(unsigned long host_ip, std::strin
   struct sockaddr_inarp *sin;
   struct sockaddr_dl *sdl;
   int mib[6];
-  
+
   mac = "";
-  
+
   mib[0] = CTL_NET;
   mib[1] = PF_ROUTE;
   mib[2] = 0;
   mib[3] = AF_INET;
   mib[4] = NET_RT_FLAGS;
   mib[5] = RTF_LLINFO;
-  
+
   if (sysctl(mib, ARRAY_SIZE(mib), NULL, &needed, NULL, 0) == 0)
-  {   
+  {
     buf = (char*)malloc(needed);
     if (buf)
-    {      
+    {
       if (sysctl(mib, ARRAY_SIZE(mib), buf, &needed, NULL, 0) == 0)
-      {        
-        for (next = buf; next < buf + needed; next += rtm->rtm_msglen) 
+      {
+        for (next = buf; next < buf + needed; next += rtm->rtm_msglen)
         {
-          
+
           rtm = (struct rt_msghdr *)next;
           sin = (struct sockaddr_inarp *)(rtm + 1);
           sdl = (struct sockaddr_dl *)(sin + 1);
-          
+
           if (host_ip != sin->sin_addr.s_addr || sdl->sdl_alen < 6)
             continue;
-          
+
           u_char *cp = (u_char*)LLADDR(sdl);
-          
+
           mac = StringUtils::Format("%02X:%02X:%02X:%02X:%02X:%02X",
                                     cp[0], cp[1], cp[2], cp[3], cp[4], cp[5]);
           ret = true;
@@ -649,7 +649,7 @@ bool CNetworkInterfaceLinux::GetHostMacAddress(unsigned long host_ip, std::strin
 
   struct sockaddr* res = &areq.arp_ha;
   mac = StringUtils::Format("%02X:%02X:%02X:%02X:%02X:%02X",
-    (uint8_t) res->sa_data[0], (uint8_t) res->sa_data[1], (uint8_t) res->sa_data[2], 
+    (uint8_t) res->sa_data[0], (uint8_t) res->sa_data[1], (uint8_t) res->sa_data[2],
     (uint8_t) res->sa_data[3], (uint8_t) res->sa_data[4], (uint8_t) res->sa_data[5]);
 
   for (int i=0; i<6; ++i)
diff --git a/xbmc/platform/linux/network/NetworkLinux.h b/xbmc/platform/linux/network/NetworkLinux.h
index 5db3475f28..a7f46d47dd 100644
--- a/xbmc/platform/linux/network/NetworkLinux.h
+++ b/xbmc/platform/linux/network/NetworkLinux.h
@@ -54,7 +54,7 @@ public:
 
    // Returns the list of access points in the area
    std::vector<NetworkAccessPoint> GetAccessPoints(void) override;
-    
+
 private:
    void WriteSettings(FILE* fw, NetworkAssignment assignment, std::string& ipAddress, std::string& networkMask, std::string& defaultGateway, std::string& essId, std::string& key, EncMode& encryptionMode);
    std::string     m_interfaceName;
@@ -71,8 +71,8 @@ public:
 
    // Return the list of interfaces
    std::vector<CNetworkInterface*>& GetInterfaceList(void) override;
-   CNetworkInterface* GetFirstConnectedInterface(void) override;        
-    
+   CNetworkInterface* GetFirstConnectedInterface(void) override;
+
    // Ping remote host
    bool PingHost(unsigned long host, unsigned int timeout_ms = 2000) override;
 
diff --git a/xbmc/platform/linux/network/ZeroconfAvahi.cpp b/xbmc/platform/linux/network/ZeroconfAvahi.cpp
index 492e5829a9..abb1fc2ccc 100644
--- a/xbmc/platform/linux/network/ZeroconfAvahi.cpp
+++ b/xbmc/platform/linux/network/ZeroconfAvahi.cpp
@@ -194,19 +194,19 @@ bool CZeroconfAvahi::doRemoveService(const std::string& fcr_ident)
   {
     return false;
   }
-  
+
   if (it->second->mp_group)
   {
     avahi_entry_group_free(it->second->mp_group);
     it->second->mp_group = 0;
   }
-  
+
   if(it->second->mp_txt)
   {
     avahi_string_list_free(it->second->mp_txt);
     it->second->mp_txt = NULL;
   }
-  
+
   m_services.erase(it);
   return true;
 }
@@ -221,7 +221,7 @@ void CZeroconfAvahi::doStop()
       avahi_entry_group_free(it->second->mp_group);
       it->second->mp_group = 0;
     }
-    
+
     if(it->second->mp_txt)
     {
       avahi_string_list_free(it->second->mp_txt);
diff --git a/xbmc/platform/linux/network/ZeroconfBrowserAvahi.cpp b/xbmc/platform/linux/network/ZeroconfBrowserAvahi.cpp
index e20772a4c6..3998984058 100644
--- a/xbmc/platform/linux/network/ZeroconfBrowserAvahi.cpp
+++ b/xbmc/platform/linux/network/ZeroconfBrowserAvahi.cpp
@@ -293,7 +293,7 @@ CZeroconfBrowser::ZeroconfService::tTxtRecordMap GetTxtRecords(AvahiStringList *
 {
   AvahiStringList *i = NULL;
   CZeroconfBrowser::ZeroconfService::tTxtRecordMap recordMap;
-  
+
   for( i = txt; i; i = i->next )
   {
     char *key, *value;
@@ -307,7 +307,7 @@ CZeroconfBrowser::ZeroconfService::tTxtRecordMap GetTxtRecords(AvahiStringList *
         std::string(value)
       )
     );
-    
+
     if( key )
       avahi_free(key);
     if( value )
diff --git a/xbmc/platform/linux/rpi/rpi_user_vcsm.h b/xbmc/platform/linux/rpi/rpi_user_vcsm.h
index 60141a6c29..b92986c84e 100644
--- a/xbmc/platform/linux/rpi/rpi_user_vcsm.h
+++ b/xbmc/platform/linux/rpi/rpi_user_vcsm.h
@@ -175,7 +175,7 @@ void vcsm_status( VCSM_STATUS_T status, int pid );
 ** handle to gain access to the memory associated with the opaque handle.
 ** When finished using the memory, the user calls vcsm_unlock_xx (see those
 ** function definition for more details on the one that can be used).
-** 
+**
 ** A well behaved application should make every attempt to lock/unlock
 ** only for the duration it needs to access the memory data associated with
 ** the opaque handle.
@@ -194,7 +194,7 @@ unsigned int vcsm_malloc( unsigned int size, char *name );
 ** handle to gain access to the memory associated with the opaque handle.
 ** When finished using the memory, the user calls vcsm_unlock_xx (see those
 ** function definition for more details on the one that can be used).
-** 
+**
 ** A well behaved application should make every attempt to lock/unlock
 ** only for the duration it needs to access the memory data associated with
 ** the opaque handle.
diff --git a/xbmc/platform/overrides/android/PlatformAndroid.cpp b/xbmc/platform/overrides/android/PlatformAndroid.cpp
index 2629f5a39c..7a6220b1cc 100644
--- a/xbmc/platform/overrides/android/PlatformAndroid.cpp
+++ b/xbmc/platform/overrides/android/PlatformAndroid.cpp
@@ -29,12 +29,12 @@ CPlatform* CPlatform::CreateInstance()
 
 CPlatformAndroid::CPlatformAndroid()
 {
-  
+
 }
 
 CPlatformAndroid::~CPlatformAndroid()
 {
-  
+
 }
 
 void CPlatformAndroid::Init()
diff --git a/xbmc/platform/overrides/android/PlatformAndroid.h b/xbmc/platform/overrides/android/PlatformAndroid.h
index 90b2c52718..cca998e7df 100644
--- a/xbmc/platform/overrides/android/PlatformAndroid.h
+++ b/xbmc/platform/overrides/android/PlatformAndroid.h
@@ -27,9 +27,9 @@ class CPlatformAndroid : public CPlatform
   public:
     /**\brief C'tor */
     CPlatformAndroid();
-  
+
     /**\brief D'tor */
     virtual ~CPlatformAndroid();
-  
+
     void Init() override;
 };
diff --git a/xbmc/platform/overrides/windowsstore/PlatformWin10.h b/xbmc/platform/overrides/windowsstore/PlatformWin10.h
index 9a39088613..0860dbf9e9 100644
--- a/xbmc/platform/overrides/windowsstore/PlatformWin10.h
+++ b/xbmc/platform/overrides/windowsstore/PlatformWin10.h
@@ -27,9 +27,9 @@ class CPlatformWin10 : public CPlatform
   public:
     /**\brief C'tor */
     CPlatformWin10();
-  
+
     /**\brief D'tor */
     virtual ~CPlatformWin10();
-  
+
     void Init() override;
 };
diff --git a/xbmc/platform/posix/Filesystem.cpp b/xbmc/platform/posix/Filesystem.cpp
index d9a96a7374..eb367d3020 100644
--- a/xbmc/platform/posix/Filesystem.cpp
+++ b/xbmc/platform/posix/Filesystem.cpp
@@ -97,7 +97,7 @@ std::string create_temp_directory(std::error_code &ec)
     ec.assign(errno, std::system_category());
     return std::string();
   }
-  
+
   ec.clear();
   return std::string(tmp);
 }
diff --git a/xbmc/platform/posix/filesystem/PosixDirectory.cpp b/xbmc/platform/posix/filesystem/PosixDirectory.cpp
index 993b01a1c3..a55cf4d529 100644
--- a/xbmc/platform/posix/filesystem/PosixDirectory.cpp
+++ b/xbmc/platform/posix/filesystem/PosixDirectory.cpp
@@ -111,7 +111,7 @@ bool CPosixDirectory::Create(const CURL& url)
 {
   if (!Create(url.Get()))
     return Exists(url);
-  
+
   return true;
 }
 
diff --git a/xbmc/platform/posix/filesystem/PosixFile.cpp b/xbmc/platform/posix/filesystem/PosixFile.cpp
index 5e768c706c..d0f1537fe4 100644
--- a/xbmc/platform/posix/filesystem/PosixFile.cpp
+++ b/xbmc/platform/posix/filesystem/PosixFile.cpp
@@ -53,7 +53,7 @@ static std::string getFilename(const CURL& url)
   std::string filename(url.GetFileName());
   if (IsAliasShortcut(filename, false))
     TranslateAliasShortcut(filename);
-  
+
   return filename;
 }
 
@@ -62,14 +62,14 @@ bool CPosixFile::Open(const CURL& url)
 {
   if (m_fd >= 0)
     return false;
-  
+
   const std::string filename(getFilename(url));
   if (filename.empty())
     return false;
-  
+
   m_fd = open(filename.c_str(), O_RDONLY, S_IRUSR | S_IRGRP | S_IROTH);
   m_filePos = 0;
-  
+
   return m_fd != -1;
 }
 
@@ -77,18 +77,18 @@ bool CPosixFile::OpenForWrite(const CURL& url, bool bOverWrite /* = false*/ )
 {
   if (m_fd >= 0)
     return false;
-  
+
   const std::string filename(getFilename(url));
   if (filename.empty())
     return false;
-  
+
   m_fd = open(filename.c_str(), O_RDWR | O_CREAT | (bOverWrite ? O_TRUNC : 0), S_IWUSR | S_IRUSR | S_IRGRP | S_IWGRP | S_IROTH);
   if (m_fd < 0)
     return false;
-  
+
   m_filePos = 0;
   m_allowWrite = true;
-  
+
   return true;
 }
 
@@ -109,21 +109,21 @@ ssize_t CPosixFile::Read(void* lpBuf, size_t uiBufSize)
 {
   if (m_fd < 0)
     return -1;
-  
+
   assert(lpBuf != NULL || uiBufSize == 0);
   if (lpBuf == NULL && uiBufSize != 0)
     return -1;
 
   if (uiBufSize > SSIZE_MAX)
     uiBufSize = SSIZE_MAX;
-  
+
   const ssize_t res = read(m_fd, lpBuf, uiBufSize);
   if (res < 0)
   {
     Seek(0, SEEK_CUR); // force update file position
     return -1;
   }
-  
+
   if (m_filePos >= 0)
   {
     m_filePos += res; // if m_filePos was known - update it
@@ -158,17 +158,17 @@ ssize_t CPosixFile::Write(const void* lpBuf, size_t uiBufSize)
 
   if (uiBufSize > SSIZE_MAX)
     uiBufSize = SSIZE_MAX;
-  
+
   const ssize_t res = write(m_fd, lpBuf, uiBufSize);
   if (res < 0)
   {
     Seek(0, SEEK_CUR); // force update file position
     return -1;
   }
-  
+
   if (m_filePos >= 0)
     m_filePos += res; // if m_filePos was known - update it
-  
+
   return res;
 }
 
@@ -176,7 +176,7 @@ int64_t CPosixFile::Seek(int64_t iFilePosition, int iWhence /* = SEEK_SET*/)
 {
   if (m_fd < 0)
     return -1;
-  
+
 #ifdef TARGET_ANDROID
   //! @todo properly support with detection in configure
   //! Android special case: Android doesn't substitute off64_t for off_t and similar functions
@@ -186,10 +186,10 @@ int64_t CPosixFile::Seek(int64_t iFilePosition, int iWhence /* = SEEK_SET*/)
   // check for parameter overflow
   if (sizeof(int64_t) != sizeof(off_t) && iFilePosition != filePosOffT)
     return -1;
-  
+
   m_filePos = lseek(m_fd, filePosOffT, iWhence);
 #endif // !TARGET_ANDROID
-  
+
   return m_filePos;
 }
 
@@ -197,12 +197,12 @@ int CPosixFile::Truncate(int64_t size)
 {
   if (m_fd < 0)
     return -1;
-  
+
   const off_t sizeOffT = (off_t) size;
   // check for parameter overflow
   if (sizeof(int64_t) != sizeof(off_t) && size != sizeOffT)
     return -1;
-  
+
   return ftruncate(m_fd, sizeOffT);
 }
 
@@ -213,7 +213,7 @@ int64_t CPosixFile::GetPosition()
 
   if (m_filePos < 0)
     m_filePos = lseek(m_fd, 0, SEEK_CUR);
-  
+
   return m_filePos;
 }
 
@@ -225,7 +225,7 @@ int64_t CPosixFile::GetLength()
   struct stat64 st;
   if (fstat64(m_fd, &st) != 0)
     return -1;
-  
+
   return st.st_size;
 }
 
@@ -258,7 +258,7 @@ int CPosixFile::IoControl(EIoControl request, void* param)
       // restore file position
       if (Seek(orgPos, SEEK_SET) != orgPos)
         return 0; // seeking is not possible
-      
+
       return seekPossible ? 1 : 0;
     }
     else
@@ -268,7 +268,7 @@ int CPosixFile::IoControl(EIoControl request, void* param)
       // restore file position
       if (Seek(0, SEEK_SET) != 0)
         return 0; // seeking is not possible
-      
+
       if (seekPossible)
         return 1;
 
@@ -278,7 +278,7 @@ int CPosixFile::IoControl(EIoControl request, void* param)
         return 0; // size of file is 1 byte or more and seeking not possible
     }
   }
-  
+
   return -1;
 }
 
@@ -288,13 +288,13 @@ bool CPosixFile::Delete(const CURL& url)
   const std::string filename(getFilename(url));
   if (filename.empty())
     return false;
-  
+
   if (unlink(filename.c_str()) == 0)
     return true;
-  
+
   if (errno == EACCES || errno == EPERM)
     CLog::LogF(LOGWARNING, "Can't access file \"%s\"", filename.c_str());
-  
+
   return false;
 }
 
@@ -303,13 +303,13 @@ bool CPosixFile::Rename(const CURL& url, const CURL& urlnew)
   const std::string name(getFilename(url)), newName(getFilename(urlnew));
   if (name.empty() || newName.empty())
     return false;
-  
+
   if (name == newName)
     return true;
-  
+
   if (rename(name.c_str(), newName.c_str()) == 0)
     return true;
-  
+
   if (errno == EACCES || errno == EPERM)
     CLog::LogF(LOGWARNING, "Can't access file \"%s\" for rename to \"%s\"", name.c_str(), newName.c_str());
 
@@ -334,7 +334,7 @@ bool CPosixFile::Exists(const CURL& url)
   const std::string filename(getFilename(url));
   if (filename.empty())
     return false;
-  
+
   struct stat64 st;
   return stat64(filename.c_str(), &st) == 0 && !S_ISDIR(st.st_mode);
 }
@@ -345,7 +345,7 @@ int CPosixFile::Stat(const CURL& url, struct __stat64* buffer)
   const std::string filename(getFilename(url));
   if (filename.empty() || !buffer)
     return -1;
-  
+
   return stat64(filename.c_str(), buffer);
 }
 
@@ -354,7 +354,7 @@ int CPosixFile::Stat(struct __stat64* buffer)
   assert(buffer != NULL);
   if (m_fd < 0 || !buffer)
     return -1;
-  
+
   return fstat64(m_fd, buffer);
 }
 
diff --git a/xbmc/platform/posix/filesystem/PosixFile.h b/xbmc/platform/posix/filesystem/PosixFile.h
index 6899cb1cf2..9a099bd7dd 100644
--- a/xbmc/platform/posix/filesystem/PosixFile.h
+++ b/xbmc/platform/posix/filesystem/PosixFile.h
@@ -24,17 +24,17 @@
 
 namespace XFILE
 {
-  
+
   class CPosixFile : public IFile
   {
   public:
     CPosixFile();
     ~CPosixFile() override;
-    
+
     bool Open(const CURL& url) override;
     bool OpenForWrite(const CURL& url, bool bOverWrite = false) override;
     void Close() override;
-    
+
     ssize_t Read(void* lpBuf, size_t uiBufSize) override;
     ssize_t Write(const void* lpBuf, size_t uiBufSize) override;
     int64_t Seek(int64_t iFilePosition, int iWhence = SEEK_SET) override;
@@ -43,7 +43,7 @@ namespace XFILE
     int64_t GetLength() override;
     void Flush() override;
     int IoControl(EIoControl request, void* param) override;
-    
+
     bool Delete(const CURL& url) override;
     bool Rename(const CURL& url, const CURL& urlnew) override;
     bool Exists(const CURL& url) override;
@@ -56,5 +56,5 @@ namespace XFILE
     int64_t m_lastDropPos;
     bool    m_allowWrite;
   };
-  
+
 }
diff --git a/xbmc/platform/posix/filesystem/SMBFile.cpp b/xbmc/platform/posix/filesystem/SMBFile.cpp
index 85f136e893..2043965d85 100644
--- a/xbmc/platform/posix/filesystem/SMBFile.cpp
+++ b/xbmc/platform/posix/filesystem/SMBFile.cpp
@@ -501,7 +501,7 @@ int CSMBFile::Stat(const CURL& url, struct __stat64* buffer)
 int CSMBFile::Truncate(int64_t size)
 {
   if (m_fd == -1) return 0;
-/* 
+/*
  * This would force us to be dependant on SMBv3.2 which is GPLv3
  * This is only used by the TagLib writers, which are not currently in use
  * So log and warn until we implement TagLib writing & can re-implement this better.
@@ -525,9 +525,9 @@ ssize_t CSMBFile::Read(void *lpBuf, size_t uiBufSize)
   if (m_fd == -1)
     return -1;
 
-  // Some external libs (libass) use test read with zero size and 
-  // null buffer pointer to check whether file is readable, but 
-  // libsmbclient always return "-1" if called with null buffer 
+  // Some external libs (libass) use test read with zero size and
+  // null buffer pointer to check whether file is readable, but
+  // libsmbclient always return "-1" if called with null buffer
   // regardless of buffer size.
   // To overcome this, force return "0" in that case.
   if (uiBufSize == 0 && lpBuf == NULL)
diff --git a/xbmc/platform/posix/main.cpp b/xbmc/platform/posix/main.cpp
index 09a30cb9bc..efe97c7b48 100644
--- a/xbmc/platform/posix/main.cpp
+++ b/xbmc/platform/posix/main.cpp
@@ -25,7 +25,7 @@
 
 #if defined(TARGET_DARWIN_OSX) || defined(TARGET_FREEBSD)
   #include "Util.h"
-  // SDL redefines main as SDL_main 
+  // SDL redefines main as SDL_main
   #ifdef HAS_SDL
     #include <SDL/SDL.h>
   #endif
@@ -89,7 +89,7 @@ int main(int argc, char* argv[])
   if (setrlimit(RLIMIT_CORE, &rlim) == -1)
     CLog::Log(LOGDEBUG, "Failed to set core size limit (%s)", strerror(errno));
 #endif
-  
+
   // Set up global SIGINT/SIGTERM handler
   struct sigaction signalHandler;
   std::memset(&signalHandler, 0, sizeof(signalHandler));
@@ -99,11 +99,11 @@ int main(int argc, char* argv[])
   sigaction(SIGTERM, &signalHandler, nullptr);
 
   setlocale(LC_NUMERIC, "C");
- 
+
   // Initialize before CAppParamParser so it can set the log level
   g_advancedSettings.Initialize();
   CAppParamParser appParamParser;
   appParamParser.Parse(argv, argc);
-  
+
   return XBMC_Run(true, appParamParser);
 }
diff --git a/xbmc/platform/win10/CMakeLists.txt b/xbmc/platform/win10/CMakeLists.txt
index 72527b4ea8..8afa40ea70 100644
--- a/xbmc/platform/win10/CMakeLists.txt
+++ b/xbmc/platform/win10/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(SOURCES input/RemoteControlXbox.cpp
             Environment.cpp
             Win10App.cpp
-            MessagePrinter.cpp        
+            MessagePrinter.cpp
             ../win32/CharsetConverter.cpp
             ../win32/dxerr.cpp
             ../win32/Filesystem.cpp
diff --git a/xbmc/platform/win10/Win10App.cpp b/xbmc/platform/win10/Win10App.cpp
index ce57afbe33..53c935634f 100644
--- a/xbmc/platform/win10/Win10App.cpp
+++ b/xbmc/platform/win10/Win10App.cpp
@@ -36,7 +36,7 @@
 #include <winrt/Windows.Storage.AccessCache.h>
 
 using namespace KODI::PLATFORM::WINDOWS10;
-namespace winrt 
+namespace winrt
 {
   using namespace Windows::Foundation;
 }
@@ -55,16 +55,16 @@ void App::Initialize(const CoreApplicationView& applicationView)
   // Register event handlers for app lifecycle. This example includes Activated, so that we
   // can make the CoreWindow active and start rendering on the window.
   applicationView.Activated({ this, &App::OnActivated });
-  
+
   CoreApplication::Suspending({ this, &App::OnSuspending });
   CoreApplication::Resuming({ this, &App::OnResuming });
-  // TODO 
+  // TODO
   // CoreApplication::UnhandledErrorDetected += ref new EventHandler<UnhandledErrorDetectedEventArgs^>(this, &App::OnUnhandledErrorDetected);
 
   //Initialize COM
   CoInitializeEx(nullptr, COINIT_MULTITHREADED);
 
-  // At this point we have access to the device. 
+  // At this point we have access to the device.
   // We can create the device-dependent resources.
   CWinEventsWin10::InitOSKeymap();
 
@@ -94,7 +94,7 @@ void App::Run()
     g_advancedSettings.Initialize();
     // fix the case then window opened in FS, but current setting is RES_WINDOW
     // the proper way is make window params related to setting, but in this setting isn't loaded yet
-    // perhaps we should observe setting changes and change window's Preffered props 
+    // perhaps we should observe setting changes and change window's Preffered props
     bool fullscreen = ApplicationView::GetForCurrentView().IsFullScreenMode();
     g_advancedSettings.m_startFullScreen = fullscreen;
 
diff --git a/xbmc/platform/win10/filesystem/WinLibraryFile.cpp b/xbmc/platform/win10/filesystem/WinLibraryFile.cpp
index 7200b1dd0c..12872cb8bf 100644
--- a/xbmc/platform/win10/filesystem/WinLibraryFile.cpp
+++ b/xbmc/platform/win10/filesystem/WinLibraryFile.cpp
@@ -39,7 +39,7 @@
 
 using namespace XFILE;
 using namespace KODI::PLATFORM::WINDOWS;
-namespace winrt 
+namespace winrt
 {
   using namespace Windows::Foundation;
 }
@@ -98,7 +98,7 @@ void CWinLibraryFile::Close()
   if (m_fileStream != nullptr)
   {
     // see https://docs.microsoft.com/en-us/uwp/api/windows.storage.streams.irandomaccessstream
-    // m_fileStream->Close(); // where it is? 
+    // m_fileStream->Close(); // where it is?
     m_fileStream = nullptr;
   }
   if (m_sFile)
@@ -191,7 +191,7 @@ bool CWinLibraryFile::Delete(const CURL & url)
       Wait(file.DeleteAsync());
     }
     catch(const winrt::hresult_error&)
-    { 
+    {
       return false;
     }
     return true;
@@ -290,7 +290,7 @@ bool CWinLibraryFile::OpenIntenal(const CURL &url, FileAccessMode mode)
       m_sFile = GetFile(url);
     }
     else if (mode == FileAccessMode::ReadWrite)
-    { 
+    {
       auto destFolder = CURL(URIUtils::GetParentPath(url.Get()));
       auto folder = CWinLibraryDirectory::GetFolder(destFolder);
       if (folder)
@@ -330,7 +330,7 @@ StorageFile CWinLibraryFile::GetFile(const CURL& url)
     std::string filePath = URIUtils::FixSlashesAndDups(url.GetFileName(), '\\');
     if (url.GetHostName() == "removable")
     {
-      // here filePath has the form e\path\file.ext where first segment is 
+      // here filePath has the form e\path\file.ext where first segment is
       // drive letter, we should make path form like regular e:\path\file.ext
       auto index = filePath.find('\\');
       if (index == std::string::npos)
diff --git a/xbmc/platform/win10/input/RemoteControlXbox.cpp b/xbmc/platform/win10/input/RemoteControlXbox.cpp
index 9fd1c6758c..57bc19b955 100644
--- a/xbmc/platform/win10/input/RemoteControlXbox.cpp
+++ b/xbmc/platform/win10/input/RemoteControlXbox.cpp
@@ -29,7 +29,7 @@
 #define XBOX_REMOTE_DEVICE_ID L"GIP:0000F50000000001"
 #define XBOX_REMOTE_DEVICE_NAME "Xbox One Game Controller"
 
-namespace winrt 
+namespace winrt
 {
   using namespace Windows::Foundation;
 }
diff --git a/xbmc/platform/win10/network/NetworkWin10.cpp b/xbmc/platform/win10/network/NetworkWin10.cpp
index 0353db7b9b..a6f294482f 100644
--- a/xbmc/platform/win10/network/NetworkWin10.cpp
+++ b/xbmc/platform/win10/network/NetworkWin10.cpp
@@ -106,7 +106,7 @@ std::string GetMaskByPrefix(ADDRESS_FAMILY family, uint8_t prefix)
     int i, j;
 
     memset(&sa.sin6_addr, 0x0, sizeof(sa.sin6_addr));
-    for (i = prefix, j = 0; i > 0; i -= 8, j++) 
+    for (i = prefix, j = 0; i > 0; i -= 8, j++)
     {
       if (i >= 8)
         sa.sin6_addr.s6_addr[j] = 0xff;
@@ -211,7 +211,7 @@ void CNetworkInterfaceWin10::GetSettings(NetworkAssignment& assignment, std::str
 
       if (adapter->Dhcpv4Enabled)
         assignment = NETWORK_DHCP;
-      else 
+      else
         assignment = NETWORK_STATIC;
 
       PIP_ADAPTER_UNICAST_ADDRESS_LH address = m_adapterAddr->FirstUnicastAddress;
@@ -489,7 +489,7 @@ bool CNetworkWin10::PingHost(unsigned long host, unsigned int timeout_ms /* = 20
   SetLastError(ERROR_SUCCESS);
 
   DWORD dwRetVal = IcmpSendEcho2(hIcmpFile, nullptr, nullptr, nullptr,
-                                 host, SendData, sizeof(SendData), nullptr, 
+                                 host, SendData, sizeof(SendData), nullptr,
                                  ReplyBuffer, sizeof(ReplyBuffer), timeout_ms);
 
   DWORD lastErr = GetLastError();
diff --git a/xbmc/platform/win10/peripherals/PeripheralBusUSB.cpp b/xbmc/platform/win10/peripherals/PeripheralBusUSB.cpp
index 951b2d8ac1..35e85ddb6b 100644
--- a/xbmc/platform/win10/peripherals/PeripheralBusUSB.cpp
+++ b/xbmc/platform/win10/peripherals/PeripheralBusUSB.cpp
@@ -51,7 +51,7 @@ bool CPeripheralBusUSB::PerformDeviceScan(PeripheralScanResults &results)
 bool CPeripheralBusUSB::PerformDeviceScan(const GUID *guid, const PeripheralType defaultType, PeripheralScanResults &results)
 {
   bool bReturn(false);
- 
+
   CLog::Log(LOGDEBUG, "%s is not implemented", __FUNCTION__);
 
   return bReturn;
diff --git a/xbmc/platform/win10/storage/Win10StorageProvider.cpp b/xbmc/platform/win10/storage/Win10StorageProvider.cpp
index fd04becdea..3fb6eb1408 100644
--- a/xbmc/platform/win10/storage/Win10StorageProvider.cpp
+++ b/xbmc/platform/win10/storage/Win10StorageProvider.cpp
@@ -32,7 +32,7 @@
 #include <winrt/Windows.Foundation.Collections.h>
 #include <winrt/Windows.Storage.h>
 
-namespace winrt 
+namespace winrt
 {
   using namespace Windows::Foundation;
 }
@@ -95,7 +95,7 @@ void CStorageProvider::GetRemovableDrives(VECSOURCES &removableDrives)
 
   // get drives which we have direct access for (in case of broad file system access)
   GetDrivesByType(removableDrives, REMOVABLE_DRIVES, true);
-  
+
   try
   {
     auto devicesView = Wait(winrt::Windows::Storage::KnownFolders::RemovableDevices().GetFoldersAsync());
@@ -176,7 +176,7 @@ std::vector<std::string> CStorageProvider::GetDiskUsage()
       continue;
 
     std::string strDrive = std::string(1, driveLetter) + ":\\";
-    if (DRIVE_FIXED == GetDriveTypeA(strDrive.c_str()) 
+    if (DRIVE_FIXED == GetDriveTypeA(strDrive.c_str())
       && GetDiskFreeSpaceExA((strDrive.c_str()), nullptr, &ULTotal, &ULTotalFree))
     {
       strRet = StringUtils::Format("%s %d MB %s", strDrive.c_str(), int(ULTotalFree.QuadPart / (1024 * 1024)), g_localizeStrings.Get(160).c_str());
diff --git a/xbmc/platform/win32/Environment.cpp b/xbmc/platform/win32/Environment.cpp
index 2052d6ce95..a376488bdc 100644
--- a/xbmc/platform/win32/Environment.cpp
+++ b/xbmc/platform/win32/Environment.cpp
@@ -64,8 +64,8 @@ int CEnvironment::win_setenv(const std::string &name, const std::string &value /
     EnvString = Wname + L"=" + Wvalue;
 
   #ifdef _DEBUG
-    // Most dependencies are built in release and use non-debug runtime libs, 
-    // and so we have to sync environment vars for these during debug because 
+    // Most dependencies are built in release and use non-debug runtime libs,
+    // and so we have to sync environment vars for these during debug because
     // they don't share environments between themselves
     typedef int(_cdecl * wputenvPtr) (const wchar_t *envstring);
     static const wchar_t *modulesList[] =
@@ -74,14 +74,14 @@ int CEnvironment::win_setenv(const std::string &name, const std::string &value /
       { L"ucrtbase.dll" },
       { nullptr } // Terminating NULL for list
     };
-  
+
     // Check all modules each function run, because modules can be loaded/unloaded at runtime
     for (int i = 0; modulesList[i]; i++)
     {
       HMODULE hModule;
       if (!GetModuleHandleExW(0, modulesList[i], &hModule) || hModule == nullptr) // Flag 0 ensures that module will be kept loaded until it'll be freed
          continue; // Module not loaded
-  
+
       wputenvPtr wputenvFunc = (wputenvPtr)GetProcAddress(hModule, "_wputenv");
       if (wputenvFunc != nullptr && wputenvFunc(EnvString.c_str()) != 0)
          retValue |= 2; // At lest one external runtime library Environment update failed
diff --git a/xbmc/platform/win32/IMMNotificationClient.h b/xbmc/platform/win32/IMMNotificationClient.h
index 0b707bf05b..31186a0630 100644
--- a/xbmc/platform/win32/IMMNotificationClient.h
+++ b/xbmc/platform/win32/IMMNotificationClient.h
@@ -158,7 +158,7 @@ public:
 
   HRESULT STDMETHODCALLTYPE OnPropertyValueChanged(LPCWSTR pwstrDeviceId, const PROPERTYKEY key)
   {
-    CLog::Log(LOGDEBUG, "%s: Changed device property of %s is {{%8.8x-%4.4x-%4.4x-%2.2x%2.2x-%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x}}#%d", 
+    CLog::Log(LOGDEBUG, "%s: Changed device property of %s is {{%8.8x-%4.4x-%4.4x-%2.2x%2.2x-%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x}}#%d",
               __FUNCTION__, FromW(pwstrDeviceId), key.fmtid.Data1, key.fmtid.Data2, key.fmtid.Data3,
                                            key.fmtid.Data4[0], key.fmtid.Data4[1],
                                            key.fmtid.Data4[2], key.fmtid.Data4[3],
diff --git a/xbmc/platform/win32/WIN32Util.cpp b/xbmc/platform/win32/WIN32Util.cpp
index 192d7aa053..c289ad60ee 100644
--- a/xbmc/platform/win32/WIN32Util.cpp
+++ b/xbmc/platform/win32/WIN32Util.cpp
@@ -330,7 +330,7 @@ std::string CWIN32Util::GetSpecialFolder(int csidl)
   }
   else
     strProfilePath = "";
-  
+
   delete[] buf;
   return strProfilePath;
 }
@@ -430,7 +430,7 @@ std::wstring CWIN32Util::ConvertPathToWin32Form(const std::string& pathUtf8)
   {
     std::string formedPath("\\\\?\\UNC"); // start from "\\?\UNC" prefix
     formedPath += URIUtils::CanonicalizePath(URIUtils::FixSlashesAndDups(pathUtf8.substr(7), '\\'), '\\'); // fix duplicated and forward slashes, resolve relative path, don't touch "\\?\UNC" prefix,
-    convertResult = g_charsetConverter.utf8ToW(formedPath, result, false, false, true); 
+    convertResult = g_charsetConverter.utf8ToW(formedPath, result, false, false, true);
   }
   else if (pathUtf8.compare(0, 4, "\\\\?\\", 4) == 0) // pathUtf8 starts from "\\?\", but it's not UNC path
   {
@@ -472,7 +472,7 @@ std::wstring CWIN32Util::ConvertPathToWin32Form(const CURL& url)
   {
     if (url.GetHostName().empty())
       return std::wstring(); // empty string
-    
+
     std::wstring result;
     if (g_charsetConverter.utf8ToW("\\\\?\\UNC\\" +
           URIUtils::CanonicalizePath(URIUtils::FixSlashesAndDups(url.GetHostName() + '\\' + url.GetFileName(), '\\'), '\\'),
diff --git a/xbmc/platform/win32/WinMain.cpp b/xbmc/platform/win32/WinMain.cpp
index 0642126133..7d10bf47fc 100644
--- a/xbmc/platform/win32/WinMain.cpp
+++ b/xbmc/platform/win32/WinMain.cpp
@@ -52,8 +52,8 @@ LONG WINAPI CreateMiniDump(EXCEPTION_POINTERS* pEp)
 INT WINAPI WinMain(HINSTANCE hInst, HINSTANCE, LPSTR commandLine, INT)
 {
   using KODI::PLATFORM::WINDOWS::ToW;
-  // this fixes crash if OPENSSL_CONF is set to existed openssl.cfg  
-  // need to set it as soon as possible  
+  // this fixes crash if OPENSSL_CONF is set to existed openssl.cfg
+  // need to set it as soon as possible
   CEnvironment::unsetenv("OPENSSL_CONF");
 
   // Initializes CreateMiniDump to handle exceptions.
@@ -130,7 +130,7 @@ INT WINAPI WinMain(HINSTANCE hInst, HINSTANCE, LPSTR commandLine, INT)
   {
     // Initialize before CAppParamParser so it can set the log level
     g_advancedSettings.Initialize();
-    
+
     CAppParamParser appParamParser;
     appParamParser.Parse(argv, argc);
     // Create and run the app
diff --git a/xbmc/platform/win32/XBMC_PC.rc.in b/xbmc/platform/win32/XBMC_PC.rc.in
index b76f15dd04..2b87855098 100644
--- a/xbmc/platform/win32/XBMC_PC.rc.in
+++ b/xbmc/platform/win32/XBMC_PC.rc.in
@@ -27,18 +27,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE 
+1 TEXTINCLUDE
 BEGIN
     "resource.h\0"
 END
 
-2 TEXTINCLUDE 
+2 TEXTINCLUDE
 BEGIN
     "#include ""windows.h""\r\n"
     "\0"
 END
 
-3 TEXTINCLUDE 
+3 TEXTINCLUDE
 BEGIN
     "\r\n"
     "\0"
diff --git a/xbmc/platform/win32/dirent.h b/xbmc/platform/win32/dirent.h
index 6befc01cba..1f45bf0d71 100644
--- a/xbmc/platform/win32/dirent.h
+++ b/xbmc/platform/win32/dirent.h
@@ -33,7 +33,7 @@
  * capital W) in order to maintain compatibility with MingW.
  *
  * Version 1.12, Sep 30 2012, Toni Ronkko
- * Define PATH_MAX and NAME_MAX.  Added wide-character variants _wDIR, 
+ * Define PATH_MAX and NAME_MAX.  Added wide-character variants _wDIR,
  * _wdirent, _wopendir(), _wreaddir(), _wclosedir() and _wrewinddir().
  * Thanks to Edgar Buerkle and Jan Nijtmans for ideas and code.
  *
@@ -410,11 +410,11 @@ _wreaddir(
     if (datap) {
         size_t n;
         DWORD attr;
-        
+
         /* Pointer to directory entry to return */
         entp = &dirp->ent;
 
-        /* 
+        /*
          * Copy file name as wide-character string.  If the file name is too
          * long to fit in to the destination buffer, then truncate file name
          * to PATH_MAX characters and zero-terminate the buffer.
@@ -570,12 +570,12 @@ dirent_next(
     return p;
 }
 
-/* 
+/*
  * Open directory stream using plain old C-string.
  */
 static DIR*
 opendir(
-    const char *dirname) 
+    const char *dirname)
 {
     struct DIR *dirp;
     int error;
@@ -608,7 +608,7 @@ opendir(
             }
 
         } else {
-            /* 
+            /*
              * Cannot convert file name to wide-character string.  This
              * occurs if the string contains invalid multi-byte sequences or
              * the output buffer is too small to contain the resulting
@@ -646,7 +646,7 @@ opendir(
  */
 static struct dirent*
 readdir(
-    DIR *dirp) 
+    DIR *dirp)
 {
     WIN32_FIND_DATAW *datap;
     struct dirent *entp;
@@ -661,7 +661,7 @@ readdir(
         error = dirent_wcstombs_s(
             &n, dirp->ent.d_name, MAX_PATH + 1, datap->cFileName, MAX_PATH);
 
-        /* 
+        /*
          * If the file name cannot be represented by a multi-byte string,
          * then attempt to use old 8+3 file name.  This allows traditional
          * Unix-code to access some file names despite of unicode
@@ -674,7 +674,7 @@ readdir(
         if (error  &&  datap->cAlternateFileName[0] != '\0') {
             error = dirent_wcstombs_s(
                 &n, dirp->ent.d_name, MAX_PATH + 1, datap->cAlternateFileName,
-                sizeof (datap->cAlternateFileName) / 
+                sizeof (datap->cAlternateFileName) /
                     sizeof (datap->cAlternateFileName[0]));
         }
 
@@ -702,7 +702,7 @@ readdir(
             entp->d_reclen = sizeof (struct dirent);
 
         } else {
-            /* 
+            /*
              * Cannot convert file name to multi-byte string so construct
              * an erroneous directory entry and return that.  Note that
              * we cannot return NULL as that would stop the processing
@@ -730,7 +730,7 @@ readdir(
  */
 static int
 closedir(
-    DIR *dirp) 
+    DIR *dirp)
 {
     int ok;
     if (dirp) {
@@ -757,7 +757,7 @@ closedir(
  */
 static void
 rewinddir(
-    DIR* dirp) 
+    DIR* dirp)
 {
     /* Rewind wide-character string directory stream */
     _wrewinddir (dirp->wdirp);
diff --git a/xbmc/platform/win32/dxerr.cpp b/xbmc/platform/win32/dxerr.cpp
index 7b5fa204ee..04b1b8336e 100644
--- a/xbmc/platform/win32/dxerr.cpp
+++ b/xbmc/platform/win32/dxerr.cpp
@@ -3470,7 +3470,7 @@ void WINAPI DXGetErrorDescriptionW( _In_ HRESULT hr, _Out_cap_(count) WCHAR* des
     // First try to see if FormatMessage knows this hr
     UINT icount = static_cast<UINT>( std::min<size_t>( count, 32767 ) );
 
-    DWORD result = FormatMessageW( FORMAT_MESSAGE_FROM_SYSTEM, nullptr, hr, 
+    DWORD result = FormatMessageW( FORMAT_MESSAGE_FROM_SYSTEM, nullptr, hr,
                                    MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), desc, icount, nullptr );
 
     if (result > 0)
diff --git a/xbmc/platform/win32/dxerr.h b/xbmc/platform/win32/dxerr.h
index 52e674c8c0..617200046a 100644
--- a/xbmc/platform/win32/dxerr.h
+++ b/xbmc/platform/win32/dxerr.h
@@ -46,15 +46,15 @@ void WINAPI DXGetErrorDescriptionW( _In_ HRESULT hr, _Out_cap_(count) WCHAR* des
 //
 //  Desc:  Outputs a formatted error message to the debug stream
 //
-//  Args:  WCHAR* strFile   The current file, typically passed in using the 
+//  Args:  WCHAR* strFile   The current file, typically passed in using the
 //                         __FILEW__ macro.
-//         DWORD dwLine    The current line number, typically passed in using the 
+//         DWORD dwLine    The current line number, typically passed in using the
 //                         __LINE__ macro.
 //         HRESULT hr      An HRESULT that will be traced to the debug stream.
 //         CHAR* strMsg    A string that will be traced to the debug stream (may be NULL)
 //         BOOL bPopMsgBox If TRUE, then a message box will popup also containing the passed info.
 //
-//  Return: The hr that was passed in.  
+//  Return: The hr that was passed in.
 //--------------------------------------------------------------------------------------
 HRESULT WINAPI DXTraceW( _In_z_ const WCHAR* strFile, _In_ DWORD dwLine, _In_ HRESULT hr, _In_opt_ const WCHAR* strMsg, _In_ bool bPopMsgBox );
 
diff --git a/xbmc/platform/win32/filesystem/Win32File.cpp b/xbmc/platform/win32/filesystem/Win32File.cpp
index 7730e59263..9a25c7fcb2 100644
--- a/xbmc/platform/win32/filesystem/Win32File.cpp
+++ b/xbmc/platform/win32/filesystem/Win32File.cpp
@@ -81,7 +81,7 @@ bool CWin32File::Open(const CURL& url)
 
   m_filepathnameW = pathnameW;
 #ifdef TARGET_WINDOWS_STORE
-  m_hFile = CreateFile2(pathnameW.c_str(), GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, 
+  m_hFile = CreateFile2(pathnameW.c_str(), GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,
                         OPEN_EXISTING, NULL);
 #else
   m_hFile = CreateFileW(pathnameW.c_str(), GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,
@@ -109,7 +109,7 @@ bool CWin32File::OpenForWrite(const CURL& url, bool bOverWrite /*= false*/)
   assert((pathnameW.compare(4, 4, L"UNC\\", 4) == 0 && m_smbFile) || !m_smbFile);
 
 #ifdef TARGET_WINDOWS_STORE
-  m_hFile = CreateFile2(pathnameW.c_str(), GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, 
+  m_hFile = CreateFile2(pathnameW.c_str(), GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ,
                         bOverWrite ? CREATE_ALWAYS : OPEN_ALWAYS, NULL);
 #else
   m_hFile = CreateFileW(pathnameW.c_str(), GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ,
@@ -120,7 +120,7 @@ bool CWin32File::OpenForWrite(const CURL& url, bool bOverWrite /*= false*/)
 
   if (m_hFile == INVALID_HANDLE_VALUE)
     return false;
-    
+
   const bool newlyCreated = (GetLastError() != ERROR_ALREADY_EXISTS);
   m_filepathnameW = pathnameW;
 
@@ -171,7 +171,7 @@ void CWin32File::Close()
 {
   if (m_hFile != INVALID_HANDLE_VALUE)
     CloseHandle(m_hFile);
-  
+
   m_hFile = INVALID_HANDLE_VALUE;
   m_filePos = -1;
   m_allowWrite = false;
@@ -322,7 +322,7 @@ int CWin32File::Truncate(int64_t toSize)
   int64_t prevPos = GetPosition();
   if (prevPos < 0)
     return -1;
-  
+
   if (Seek(toSize) != toSize)
   {
     Seek(prevPos);
@@ -432,7 +432,7 @@ bool CWin32File::SetHidden(const CURL& url, bool hidden)
   const DWORD attrs = GetFileAttributesW(pathnameW.c_str());
   if (attrs == INVALID_FILE_ATTRIBUTES || (attrs & FILE_ATTRIBUTE_DIRECTORY) != 0)
     return false;
-  
+
   // check whether attribute is already set/cleared
   if (((attrs & FILE_ATTRIBUTE_HIDDEN) != 0) == hidden)
     return true;
@@ -496,7 +496,7 @@ int CWin32File::Stat(const CURL& url, struct __stat64* statData)
 
   if (hSearch == INVALID_HANDLE_VALUE)
     return -1;
-  
+
   FindClose(hSearch);
 
   /* set st_gid */
@@ -694,7 +694,7 @@ int CWin32File::Stat(struct __stat64* statData)
   else
     statData->st_dev = 0;
   statData->st_rdev = statData->st_dev;
-  
+
   /* set st_mode */
   statData->st_mode = _S_IREAD; // Always assume Read permission for file owner
 #ifdef TARGET_WINDOWS_STORE
diff --git a/xbmc/platform/win32/filesystem/Win32SMBDirectory.cpp b/xbmc/platform/win32/filesystem/Win32SMBDirectory.cpp
index d55b4e5adf..9d6660509d 100644
--- a/xbmc/platform/win32/filesystem/Win32SMBDirectory.cpp
+++ b/xbmc/platform/win32/filesystem/Win32SMBDirectory.cpp
@@ -92,7 +92,7 @@ bool CWin32SMBDirectory::GetDirectory(const CURL& url, CFileItemList &items)
   { // empty share name means that requested list of hosts or list of shares
     if (GetNetworkResources(url, items))
       return true;
-    
+
     // try to connect and authenticate
     CURL authConnUrl(url);
     if (!ConnectAndAuthenticate(authConnUrl, (m_flags & DIR_FLAG_ALLOW_PROMPT) != 0))
@@ -139,7 +139,7 @@ bool CWin32SMBDirectory::GetDirectory(const CURL& url, CFileItemList &items)
       {
         if ((m_flags & DIR_FLAG_ALLOW_PROMPT) != 0)
           RequireAuthentication(authUrl);
-        
+
         return false;
       }
 
@@ -157,7 +157,7 @@ bool CWin32SMBDirectory::GetDirectory(const CURL& url, CFileItemList &items)
     std::wstring itemNameW(findData.cFileName);
     if (itemNameW == L"." || itemNameW == L".." || itemNameW.empty())
       continue;
-    
+
     std::string itemName;
     if (!g_charsetConverter.wToUTF8(itemNameW, itemName, true) || itemName.empty())
     {
@@ -173,18 +173,18 @@ bool CWin32SMBDirectory::GetDirectory(const CURL& url, CFileItemList &items)
     else
       pItem->SetPath(pathWithSlash + itemName);
 
-    if ((findData.dwFileAttributes & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM)) != 0 
+    if ((findData.dwFileAttributes & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM)) != 0
           || itemName.front() == '.') // mark files starting from dot as hidden
       pItem->SetProperty("file:hidden", true);
 
-    // calculation of size and date costs a little on win32 
+    // calculation of size and date costs a little on win32
     // so DIR_FLAG_NO_FILE_INFO flag is ignored
     FILETIME localTime;
     if (FileTimeToLocalFileTime(&findData.ftLastWriteTime, &localTime) == TRUE)
       pItem->m_dateTime = localTime;
     else
       pItem->m_dateTime.SetValid(false);
- 
+
     if (!pItem->m_bIsFolder)
         pItem->m_dwSize = (__int64(findData.nFileSizeHigh) << 32) + findData.nFileSizeLow;
 
@@ -192,7 +192,7 @@ bool CWin32SMBDirectory::GetDirectory(const CURL& url, CFileItemList &items)
   } while (FindNextFileW(hSearch, &findData));
 
   FindClose(hSearch);
-  
+
   return true;
 }
 
@@ -244,7 +244,7 @@ bool CWin32SMBDirectory::Exists(const CURL& url)
   return RealExists(url, true);
 }
 
-// this functions can check for: 
+// this functions can check for:
 // * presence of directory on remove share (smb://server/share/dir)
 // * presence of remote share on server (smb://server/share)
 // * presence of smb server in network (smb://server)
@@ -254,7 +254,7 @@ bool CWin32SMBDirectory::RealExists(const CURL& url, bool tryToConnect)
 
   if (url.GetHostName().empty())
     return true; // 'root' of network is always exist
-    
+
   //! @todo use real caseless string comparison everywhere in this function
   if (url.GetShareName().empty() || url.GetShareName() == url.GetFileName())
   {
@@ -284,7 +284,7 @@ bool CWin32SMBDirectory::RealExists(const CURL& url, bool tryToConnect)
       baseUrl.SetProtocol("smb");
       baseUrl.SetHostName(url.GetHostName()); // scan server for shares
     }
-    
+
     if (!GetNetworkResources(baseUrl, entries))
     {
       if (tryToConnect && !url.GetShareName().empty())
@@ -351,7 +351,7 @@ bool CWin32SMBDirectory::GetNetworkResources(const CURL& basePath, CFileItemList
   std::string hostName(basePath.GetHostName());
   if (hostName.empty())
     return localGetNetworkResources(NULL, basePath.Get(), items, false); // get all servers from network
-  
+
   // get all shares from server
   std::string basePathStr(basePath.Get());
   if (basePathStr.empty())
@@ -430,7 +430,7 @@ static bool localGetNetworkResources(struct _NETRESOURCEW* basePathToScanPtr, co
     DWORD bufSize = buf.size();
     result = WNetEnumResourceW(netEnum, &resCount, buf.get(), &bufSize);
     if (result == NO_ERROR)
-    { 
+    {
       if (bufSize > buf.size())
       { // buffer is too small
         buf.allocate(bufSize); // discard buffer content and extend the buffer
@@ -443,7 +443,7 @@ static bool localGetNetworkResources(struct _NETRESOURCEW* basePathToScanPtr, co
       for (unsigned int i = 0; i < resCount && !errorFlag; i++)
       {
         _NETRESOURCEW& curResource = ((_NETRESOURCEW*)buf.get())[i];
-        
+
         /* check and collect servers */
         if (!getShares && curResource.dwDisplayType == RESOURCEDISPLAYTYPE_SERVER)
         {
@@ -471,7 +471,7 @@ static bool localGetNetworkResources(struct _NETRESOURCEW* basePathToScanPtr, co
           else
             CLog::LogF(LOGERROR, "Skipping server with empty remote name");
         }
-        
+
         /* check and collect shares */
         if (getShares && (curResource.dwDisplayType == RESOURCEDISPLAYTYPE_SHARE ||
                           curResource.dwDisplayType == RESOURCEDISPLAYTYPE_SHAREADMIN) &&
@@ -580,7 +580,7 @@ static bool localGetShares(const std::wstring& serverNameToScan, const std::stri
   assert(urlPrefixForItems.back() == '/');
 
   CFileItemList locItems; // store items locally until last one is successfully loaded
-  
+
   NET_API_STATUS enumResult;
   DWORD hEnumResume = 0;
   bool errorFlag = false;
@@ -628,7 +628,7 @@ bool CWin32SMBDirectory::ConnectAndAuthenticate(CURL& url, bool allowPromptForCr
   assert(url.IsProtocol("smb"));
   if (url.GetHostName().empty())
     return false; // can't connect to empty host name
-  
+
   if (url.GetUserName().empty() && url.GetPassWord().empty())
     CPasswordManager::GetInstance().AuthenticateURL(url); // set username and password if any
 
@@ -700,7 +700,7 @@ bool CWin32SMBDirectory::ConnectAndAuthenticate(CURL& url, bool allowPromptForCr
       CLog::LogF(LOGDEBUG, "Connected to \"%s\" %s", serverShareName.c_str(), loginDescr.c_str());
       return true;
     }
-    
+
     if (connRes == ERROR_ACCESS_DENIED || connRes == ERROR_BAD_USERNAME || connRes == ERROR_INVALID_PASSWORD ||
         connRes == ERROR_LOGON_FAILURE || connRes == ERROR_LOGON_TYPE_NOT_GRANTED || connRes == ERROR_LOGON_NOT_GRANTED)
     {
diff --git a/xbmc/platform/win32/filesystem/Win32SMBFile.cpp b/xbmc/platform/win32/filesystem/Win32SMBFile.cpp
index 12c03ff25b..2f1c0db5a6 100644
--- a/xbmc/platform/win32/filesystem/Win32SMBFile.cpp
+++ b/xbmc/platform/win32/filesystem/Win32SMBFile.cpp
@@ -110,7 +110,7 @@ bool CWin32SMBFile::SetHidden(const CURL& url, bool hidden)
     if (attrs == INVALID_FILE_ATTRIBUTES)
       return false;
   }
-  
+
   if ((attrs & FILE_ATTRIBUTE_DIRECTORY) != 0)
     return false;
 
diff --git a/xbmc/platform/win32/network/NetworkWin32.cpp b/xbmc/platform/win32/network/NetworkWin32.cpp
index b02f03816c..703241ce91 100644
--- a/xbmc/platform/win32/network/NetworkWin32.cpp
+++ b/xbmc/platform/win32/network/NetworkWin32.cpp
@@ -256,7 +256,7 @@ bool CNetworkWin32::PingHost(unsigned long host, unsigned int timeout_ms /* = 20
 
   SetLastError(ERROR_SUCCESS);
 
-  DWORD dwRetVal = IcmpSendEcho(hIcmpFile, host, SendData, sizeof(SendData), 
+  DWORD dwRetVal = IcmpSendEcho(hIcmpFile, host, SendData, sizeof(SendData),
                                 NULL, ReplyBuffer, sizeof(ReplyBuffer), timeout_ms);
 
   DWORD lastErr = GetLastError();
@@ -309,8 +309,8 @@ bool CNetworkInterfaceWin32::GetHostMacAddress(unsigned long host, std::string&
   {
     if (PhysAddrLen == 6)
     {
-      mac = StringUtils::Format("%02X:%02X:%02X:%02X:%02X:%02X", 
-        bPhysAddr[0], bPhysAddr[1], bPhysAddr[2], 
+      mac = StringUtils::Format("%02X:%02X:%02X:%02X:%02X:%02X",
+        bPhysAddr[0], bPhysAddr[1], bPhysAddr[2],
         bPhysAddr[3], bPhysAddr[4], bPhysAddr[5]);
       return true;
     }
diff --git a/xbmc/platform/win32/network/NetworkWin32.h b/xbmc/platform/win32/network/NetworkWin32.h
index e6e9ea679c..50ebb55d97 100644
--- a/xbmc/platform/win32/network/NetworkWin32.h
+++ b/xbmc/platform/win32/network/NetworkWin32.h
@@ -19,7 +19,7 @@
  */
 
 #pragma once
- 
+
 #include <string>
 #include <vector>
 #include "network/Network.h"
diff --git a/xbmc/platform/win32/utils/Win32InterfaceForCLog.h b/xbmc/platform/win32/utils/Win32InterfaceForCLog.h
index 8f32983c1f..dd296ec0c5 100644
--- a/xbmc/platform/win32/utils/Win32InterfaceForCLog.h
+++ b/xbmc/platform/win32/utils/Win32InterfaceForCLog.h
@@ -24,7 +24,7 @@
 
 typedef void* HANDLE; // forward declaration, to avoid inclusion of whole Windows.h
 
-class CWin32InterfaceForCLog 
+class CWin32InterfaceForCLog
 {
 public:
   CWin32InterfaceForCLog();
diff --git a/xbmc/platform/win32/utils/gpu_memcpy_sse4.h b/xbmc/platform/win32/utils/gpu_memcpy_sse4.h
index 4e0cb9a254..450d695c4e 100644
--- a/xbmc/platform/win32/utils/gpu_memcpy_sse4.h
+++ b/xbmc/platform/win32/utils/gpu_memcpy_sse4.h
@@ -52,7 +52,7 @@ inline void* gpu_memcpy(void* d, const void* s, size_t size)
     __m128i* pTrg = (__m128i*)d;
     __m128i* pTrgEnd = pTrg + ((size - reminder) >> 4);
     __m128i* pSrc = (__m128i*)s;
-    
+
     // Make sure source is synced - doesn't hurt if not needed.
     _mm_sfence();
 
diff --git a/xbmc/playlists/PlayListFactory.cpp b/xbmc/playlists/PlayListFactory.cpp
index 2863164cc3..58a1f866f6 100644
--- a/xbmc/playlists/PlayListFactory.cpp
+++ b/xbmc/playlists/PlayListFactory.cpp
@@ -112,7 +112,7 @@ bool CPlayListFactory::IsPlaylist(const CFileItem& item)
   std::string strMimeType = item.GetMimeType();
   StringUtils::ToLower(strMimeType);
 
-/* These are a bit uncertain 
+/* These are a bit uncertain
   if(strMimeType == "video/x-ms-asf"
   || strMimeType == "video/x-ms-asx"
   || strMimeType == "video/x-ms-wmv"
diff --git a/xbmc/playlists/SmartPlayList.h b/xbmc/playlists/SmartPlayList.h
index 51e686915b..da373c59e4 100644
--- a/xbmc/playlists/SmartPlayList.h
+++ b/xbmc/playlists/SmartPlayList.h
@@ -145,7 +145,7 @@ public:
   /*! \brief get the where clause for a playlist
    We handle playlists inside playlists separately in order to ensure we don't introduce infinite loops
    by playlist A including playlist B which also (perhaps via other playlists) then includes playlistA.
-   
+
    \param db the database to use to format up results
    \param referencedPlaylists a set of playlists to know when we reach a cycle
    \param needWhere whether we need to prepend the where clause with "WHERE "
diff --git a/xbmc/powermanagement/IPowerSyscall.h b/xbmc/powermanagement/IPowerSyscall.h
index 186a90ee81..a2e2651b05 100644
--- a/xbmc/powermanagement/IPowerSyscall.h
+++ b/xbmc/powermanagement/IPowerSyscall.h
@@ -57,7 +57,7 @@ public:
   virtual bool CanReboot()    = 0;
 
   virtual int  CountPowerFeatures() = 0;
-  
+
 // Battery related functions
   virtual int  BatteryLevel() = 0;
 
@@ -68,7 +68,7 @@ public:
    power related events back to xbmc through the callback.
 
    return true if an event occured and false if not.
-   
+
    \param callback the callback to signal to
    */
   virtual bool PumpPowerEvents(IPowerEventsCallback *callback) = 0;
diff --git a/xbmc/profiles/Profile.cpp b/xbmc/profiles/Profile.cpp
index 4fc9dee1ae..9b0ae591ee 100644
--- a/xbmc/profiles/Profile.cpp
+++ b/xbmc/profiles/Profile.cpp
@@ -40,7 +40,7 @@ void CProfile::CLock::Validate()
 {
   if (mode != LOCK_MODE_EVERYONE && (code == "-" || code.empty()))
     mode = LOCK_MODE_EVERYONE;
-  
+
   if (code.empty() || mode == LOCK_MODE_EVERYONE)
     code = "-";
 }
@@ -73,7 +73,7 @@ void CProfile::setDate()
 void CProfile::Load(const TiXmlNode *node, int nextIdProfile)
 {
   if (!XMLUtils::GetInt(node, "id", m_id))
-    m_id = nextIdProfile; 
+    m_id = nextIdProfile;
 
   XMLUtils::GetString(node, "name", m_name);
   XMLUtils::GetPath(node, "directory", m_directory);
@@ -92,13 +92,13 @@ void CProfile::Load(const TiXmlNode *node, int nextIdProfile)
   XMLUtils::GetBoolean(node, "lockpictures", m_locks.pictures);
   XMLUtils::GetBoolean(node, "lockprograms", m_locks.programs);
   XMLUtils::GetBoolean(node, "lockgames", m_locks.games);
-  
+
   int lockMode = m_locks.mode;
   XMLUtils::GetInt(node, "lockmode", lockMode);
   m_locks.mode = (LockType)lockMode;
   if (m_locks.mode > LOCK_MODE_QWERTY || m_locks.mode < LOCK_MODE_EVERYONE)
     m_locks.mode = LOCK_MODE_EVERYONE;
-  
+
   XMLUtils::GetString(node, "lockcode", m_locks.code);
   XMLUtils::GetString(node, "lastdate", m_date);
 }
diff --git a/xbmc/profiles/Profile.h b/xbmc/profiles/Profile.h
index e5cad0c454..65a5e768ea 100644
--- a/xbmc/profiles/Profile.h
+++ b/xbmc/profiles/Profile.h
@@ -53,7 +53,7 @@ public:
 
   CProfile(const std::string &directory = "", const std::string &name = "", const int id = -1);
   ~CProfile(void);
-  
+
   void Load(const TiXmlNode *node, int nextIdProfile);
   void Save(TiXmlNode *root) const;
 
diff --git a/xbmc/profiles/ProfilesManager.cpp b/xbmc/profiles/ProfilesManager.cpp
index dda255e9e7..ad0fef405f 100644
--- a/xbmc/profiles/ProfilesManager.cpp
+++ b/xbmc/profiles/ProfilesManager.cpp
@@ -167,11 +167,11 @@ bool CProfilesManager::Load(const std::string &file)
         XMLUtils::GetBoolean(rootElement, XML_LOGIN_SCREEN, m_usingLoginScreen);
         XMLUtils::GetInt(rootElement, XML_AUTO_LOGIN, m_autoLoginProfile);
         XMLUtils::GetInt(rootElement, XML_NEXTID, m_nextProfileId);
-        
+
         std::string defaultDir("special://home/userdata");
         if (!CDirectory::Exists(defaultDir))
           defaultDir = "special://xbmc/userdata";
-        
+
         const TiXmlElement* pProfile = rootElement->FirstChildElement(XML_PROFILE);
         while (pProfile)
         {
@@ -239,7 +239,7 @@ bool CProfilesManager::Save(const std::string &file) const
   XMLUtils::SetInt(pRoot, XML_LAST_LOADED, m_currentProfile);
   XMLUtils::SetBoolean(pRoot, XML_LOGIN_SCREEN, m_usingLoginScreen);
   XMLUtils::SetInt(pRoot, XML_AUTO_LOGIN, m_autoLoginProfile);
-  XMLUtils::SetInt(pRoot, XML_NEXTID, m_nextProfileId);      
+  XMLUtils::SetInt(pRoot, XML_NEXTID, m_nextProfileId);
 
   for (std::vector<CProfile>::const_iterator profile = m_profiles.begin(); profile != m_profiles.end(); ++profile)
     profile->Save(pRoot);
diff --git a/xbmc/profiles/dialogs/GUIDialogLockSettings.cpp b/xbmc/profiles/dialogs/GUIDialogLockSettings.cpp
index a182c731c5..e66b492de0 100644
--- a/xbmc/profiles/dialogs/GUIDialogLockSettings.cpp
+++ b/xbmc/profiles/dialogs/GUIDialogLockSettings.cpp
@@ -226,7 +226,7 @@ void CGUIDialogLockSettings::OnCancel()
 void CGUIDialogLockSettings::SetupView()
 {
   CGUIDialogSettingsManualBase::SetupView();
-  
+
   // set the title
   if (m_getUser)
     SetHeading(StringUtils::Format(g_localizeStrings.Get(20152).c_str(), CURL::Decode(m_url).c_str()));
@@ -293,7 +293,7 @@ void CGUIDialogLockSettings::InitializeSettings()
     settingsLevelOptions.push_back(std::make_pair(10038, LOCK_LEVEL::ADVANCED));
     settingsLevelOptions.push_back(std::make_pair(10039, LOCK_LEVEL::EXPERT));
     AddList(groupDetails, SETTING_LOCK_SETTINGS, 20043, SettingLevel::Basic, static_cast<int>(m_locks.settings), settingsLevelOptions, 20043);
-    
+
     AddToggle(groupDetails, SETTING_LOCK_ADDONMANAGER, 24090, SettingLevel::Basic, m_locks.addonManager);
   }
 
diff --git a/xbmc/programs/GUIWindowPrograms.cpp b/xbmc/programs/GUIWindowPrograms.cpp
index f11e13c4e5..a6cbaeaa73 100644
--- a/xbmc/programs/GUIWindowPrograms.cpp
+++ b/xbmc/programs/GUIWindowPrograms.cpp
@@ -161,7 +161,7 @@ std::string CGUIWindowPrograms::GetStartFolder(const std::string &dir)
     return "addons://sources/executable/";
   else if (lower == "androidapps")
     return "androidapp://sources/apps/";
-    
+
   SetupShares();
   VECSOURCES shares;
   m_rootDir.GetSources(shares);
diff --git a/xbmc/pvr/addons/PVRClients.h b/xbmc/pvr/addons/PVRClients.h
index e99629c893..85d9a3e413 100644
--- a/xbmc/pvr/addons/PVRClients.h
+++ b/xbmc/pvr/addons/PVRClients.h
@@ -377,7 +377,7 @@ namespace PVR
     * @return The edit decision list (empty on error).
     */
     std::vector<PVR_EDL_ENTRY> GetRecordingEdl(const CPVRRecording &recording);
-    
+
     /*!
     * @brief Retrieve the edit decision list (EDL) for a given EPG tag from the backend.
     * @param epgTag The EPG tag.
diff --git a/xbmc/pvr/channels/PVRChannelGroup.cpp b/xbmc/pvr/channels/PVRChannelGroup.cpp
index 14a386d9c2..41e7a6e010 100644
--- a/xbmc/pvr/channels/PVRChannelGroup.cpp
+++ b/xbmc/pvr/channels/PVRChannelGroup.cpp
@@ -692,7 +692,7 @@ bool CPVRChannelGroup::RemoveDeletedChannels(const CPVRChannelGroup &channels)
 
       if (possiblyRemovedGroup != m_sortedMembers.end())
         m_sortedMembers.erase(possiblyRemovedGroup);
-      
+
       //We have to start over from the beginning, list can have been modified and
       //resorted, there's no safe way to continue where we left of
       it = m_sortedMembers.begin();
diff --git a/xbmc/pvr/channels/PVRChannelGroups.cpp b/xbmc/pvr/channels/PVRChannelGroups.cpp
index 21f5d57a18..0e84eb6d68 100644
--- a/xbmc/pvr/channels/PVRChannelGroups.cpp
+++ b/xbmc/pvr/channels/PVRChannelGroups.cpp
@@ -85,7 +85,7 @@ bool CPVRChannelGroups::Update(const CPVRChannelGroup &group, bool bUpdateFromCl
 
     if (!updateGroup)
     {
-      // create a new group if none was found. Copy the properties immediately 
+      // create a new group if none was found. Copy the properties immediately
       // so the group doesn't get flagged as "changed" further down.
       updateGroup = CPVRChannelGroupPtr(new CPVRChannelGroup(group.IsRadio(), group.GroupID(), group.GroupName()));
       m_groups.push_back(updateGroup);
diff --git a/xbmc/pvr/channels/PVRRadioRDSInfoTag.h b/xbmc/pvr/channels/PVRRadioRDSInfoTag.h
index 5dc55bb0e2..31c5c8d925 100644
--- a/xbmc/pvr/channels/PVRRadioRDSInfoTag.h
+++ b/xbmc/pvr/channels/PVRRadioRDSInfoTag.h
@@ -48,7 +48,7 @@ private:
 
   CPVRRadioRDSInfoTag(const CPVRRadioRDSInfoTag& tag) = delete;
   const CPVRRadioRDSInfoTag& operator =(const CPVRRadioRDSInfoTag& tag) = delete;
-  
+
 public:
   ~CPVRRadioRDSInfoTag() override;
 
diff --git a/xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.h b/xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.h
index 0cba4ec1b0..d9de3f1681 100644
--- a/xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.h
+++ b/xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.h
@@ -58,7 +58,7 @@ namespace PVR
 
     // specialization of CGUIDialogSettingsManualBase
     void InitializeSettings() override;
-    
+
   private:
     void InitializeTypesList();
     void InitializeChannelsList();
diff --git a/xbmc/pvr/epg/EpgInfoTag.h b/xbmc/pvr/epg/EpgInfoTag.h
index be251b2d8b..7775b0399d 100644
--- a/xbmc/pvr/epg/EpgInfoTag.h
+++ b/xbmc/pvr/epg/EpgInfoTag.h
@@ -451,7 +451,7 @@ namespace PVR
      * @return True if something changed, false otherwise.
      */
     bool Update(const CPVREpgInfoTag &tag, bool bUpdateBroadcastId = true);
-    
+
     /*!
      * @brief Retrieve the edit decision list (EDL) of an EPG tag.
      * @return The edit decision list (empty on error)
diff --git a/xbmc/pvr/recordings/PVRRecordings.h b/xbmc/pvr/recordings/PVRRecordings.h
index 09b10c0c6a..352decc7be 100644
--- a/xbmc/pvr/recordings/PVRRecordings.h
+++ b/xbmc/pvr/recordings/PVRRecordings.h
@@ -141,6 +141,6 @@ namespace PVR
      * @param count the new playcount or INCREMENT_PLAY_COUNT to denote that the current playcount(s) are to be incremented by one
      * @return true if all playcounts were changed
      */
-    bool ChangeRecordingsPlayCount(const CFileItemPtr &item, int count);    
+    bool ChangeRecordingsPlayCount(const CFileItemPtr &item, int count);
   };
 }
diff --git a/xbmc/pvr/windows/GUIEPGGridContainer.cpp b/xbmc/pvr/windows/GUIEPGGridContainer.cpp
index 74f3a9b675..f530384eec 100644
--- a/xbmc/pvr/windows/GUIEPGGridContainer.cpp
+++ b/xbmc/pvr/windows/GUIEPGGridContainer.cpp
@@ -330,7 +330,7 @@ void CGUIEPGGridContainer::ProcessProgressIndicator(unsigned int currentTime, CD
   {
     m_guiProgressIndicatorTexture.SetVisible(false);
   }
-  
+
   m_guiProgressIndicatorTexture.Process(currentTime);
 }
 
diff --git a/xbmc/rendering/MatrixGL.cpp b/xbmc/rendering/MatrixGL.cpp
index 1f99f8169f..ea91fcd85d 100644
--- a/xbmc/rendering/MatrixGL.cpp
+++ b/xbmc/rendering/MatrixGL.cpp
@@ -141,7 +141,7 @@ void CMatrixGL::Rotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
 }
 
 #if defined(HAS_NEON) && !defined(__LP64__)
-  
+
 static inline void Matrix4Mul(float* src_mat_1, const float* src_mat_2)
 {
   asm volatile (
@@ -175,7 +175,7 @@ static inline void Matrix4Mul(float* src_mat_1, const float* src_mat_2)
 
     // output = result registers
     "vstmia %1, { q0-q3 }"
-    : //no output 
+    : //no output
     : "r" (src_mat_2), "r" (src_mat_1)       // input - note *value* of pointer doesn't change
     : "memory", "q0", "q1", "q2", "q3", "q4", "q5", "q6", "q7", "q8", "q9", "q10", "q11" //clobber
     );
diff --git a/xbmc/rendering/dx/DeviceResources.cpp b/xbmc/rendering/dx/DeviceResources.cpp
index 520f5e94d0..c9b98e04d0 100644
--- a/xbmc/rendering/dx/DeviceResources.cpp
+++ b/xbmc/rendering/dx/DeviceResources.cpp
@@ -47,7 +47,7 @@ namespace winrt
 #ifdef _DEBUG
 #define breakOnDebug __debugbreak()
 #else
-#define breakOnDebug 
+#define breakOnDebug
 #endif
 #define LOG_HR(hr) CLog::LogF(LOGERROR, "function call at line %d ends with error: %s", __LINE__, DX::GetErrorDescription(hr).c_str());
 #define CHECK_ERR() if (FAILED(hr)) { LOG_HR(hr); breakOnDebug; return; }
@@ -101,7 +101,7 @@ void DX::DeviceResources::Release()
   ReleaseBackBuffer();
   OnDeviceLost(true);
 
-  // leave fullscreen before destroying 
+  // leave fullscreen before destroying
   BOOL bFullScreen;
   m_swapChain->GetFullscreenState(&bFullScreen, nullptr);
   if (!!bFullScreen)
@@ -297,7 +297,7 @@ void DX::DeviceResources::CreateDeviceIndependentResources()
 }
 
 // Configures the Direct3D device, and stores handles to it and the device context.
-void DX::DeviceResources::CreateDeviceResources() 
+void DX::DeviceResources::CreateDeviceResources()
 {
   CLog::LogF(LOGDEBUG, "creating DirectX 11 device.");
 
@@ -424,7 +424,7 @@ void DX::DeviceResources::ReleaseBackBuffer()
 
   m_backBufferTex.Release();
   m_d3dDepthStencilView = nullptr;
-  if (m_deferrContext) 
+  if (m_deferrContext)
   {
     // Clear the previous window size specific context.
     ID3D11RenderTargetView* nullViews[] = { nullptr, nullptr, nullptr, nullptr };
@@ -501,7 +501,7 @@ HRESULT DX::DeviceResources::CreateSwapChain(DXGI_SWAP_CHAIN_DESC1& desc, DXGI_S
     nullptr,
     ppSwapChain
   ); RETURN_ERR(hr);
-  hr = m_dxgiFactory->MakeWindowAssociation(m_window, /*DXGI_MWA_NO_WINDOW_CHANGES |*/ DXGI_MWA_NO_ALT_ENTER); 
+  hr = m_dxgiFactory->MakeWindowAssociation(m_window, /*DXGI_MWA_NO_WINDOW_CHANGES |*/ DXGI_MWA_NO_ALT_ENTER);
 #else
   hr = m_dxgiFactory->CreateSwapChainForCoreWindow(
     m_d3dDevice.Get(),
@@ -564,7 +564,7 @@ void DX::DeviceResources::ResizeBuffers()
       // If the device was removed for any reason, a new device and swap chain will need to be created.
       HandleDeviceLost(hr == DXGI_ERROR_DEVICE_REMOVED);
 
-      // Everything is set up now. Do not continue execution of this method. HandleDeviceLost will reenter this method 
+      // Everything is set up now. Do not continue execution of this method. HandleDeviceLost will reenter this method
       // and correctly set up the new device.
       return;
     }
@@ -591,8 +591,8 @@ void DX::DeviceResources::ResizeBuffers()
     scFSDesc.Windowed = windowed;
 
     ComPtr<IDXGISwapChain1> swapChain;
-    if ( m_d3dFeatureLevel >= D3D_FEATURE_LEVEL_11_0 
-      && !bHWStereoEnabled 
+    if ( m_d3dFeatureLevel >= D3D_FEATURE_LEVEL_11_0
+      && !bHWStereoEnabled
       && g_advancedSettings.m_bTry10bitOutput)
     {
       swapChainDesc.Format = DXGI_FORMAT_R10G10B10A2_UNORM;
@@ -640,7 +640,7 @@ void DX::DeviceResources::ResizeBuffers()
 }
 
 // These resources need to be recreated every time the window size is changed.
-void DX::DeviceResources::CreateWindowSizeDependentResources() 
+void DX::DeviceResources::CreateWindowSizeDependentResources()
 {
   ReleaseBackBuffer();
 
@@ -783,8 +783,8 @@ void DX::DeviceResources::ValidateDevice()
   // If the adapter LUIDs don't match, or if the device reports that it has been removed,
   // a new D3D device must be created.
   HRESULT hr = m_d3dDevice->GetDeviceRemovedReason();
-  if ( previousDesc.AdapterLuid.LowPart != currentDesc.AdapterLuid.LowPart 
-    || previousDesc.AdapterLuid.HighPart != currentDesc.AdapterLuid.HighPart 
+  if ( previousDesc.AdapterLuid.LowPart != currentDesc.AdapterLuid.LowPart
+    || previousDesc.AdapterLuid.HighPart != currentDesc.AdapterLuid.HighPart
     || FAILED(hr))
   {
     // Release references to resources related to the old device.
@@ -804,7 +804,7 @@ void DX::DeviceResources::OnDeviceLost(bool removed)
   // tell any shared resources
   for (auto res : m_resources)
   {
-    // the most of resources like textures and buffers try to 
+    // the most of resources like textures and buffers try to
     // receive and save their status from current device.
     // `removed` means that we have no possibility
     // to use the device anymore, tell all resouces about this.
@@ -853,7 +853,7 @@ bool DX::DeviceResources::Begin()
 {
   HRESULT hr = m_swapChain->Present(0, DXGI_PRESENT_TEST);
 
-  // If the device was removed either by a disconnection or a driver upgrade, we 
+  // If the device was removed either by a disconnection or a driver upgrade, we
   // must recreate all device resources.
   if (hr == DXGI_ERROR_DEVICE_REMOVED || hr == DXGI_ERROR_DEVICE_RESET)
   {
@@ -884,7 +884,7 @@ void DX::DeviceResources::Present()
   DXGI_PRESENT_PARAMETERS parameters = { 0 };
   HRESULT hr = m_swapChain->Present1(1, 0, &parameters);
 
-  // If the device was removed either by a disconnection or a driver upgrade, we 
+  // If the device was removed either by a disconnection or a driver upgrade, we
   // must recreate all device resources.
   if (hr == DXGI_ERROR_DEVICE_REMOVED || hr == DXGI_ERROR_DEVICE_RESET)
   {
@@ -987,8 +987,8 @@ bool DX::DeviceResources::CreateFactory()
 
 void DX::DeviceResources::SetMonitor(HMONITOR monitor)
 {
-  HandleOutputChange([monitor](DXGI_OUTPUT_DESC outputDesc) { 
-    return outputDesc.Monitor == monitor; 
+  HandleOutputChange([monitor](DXGI_OUTPUT_DESC outputDesc) {
+    return outputDesc.Monitor == monitor;
   });
 }
 
@@ -1078,7 +1078,7 @@ void DX::DeviceResources::SetWindowPos(winrt::Rect rect)
   });
 }
 
-// Call this method when the app suspends. It provides a hint to the driver that the app 
+// Call this method when the app suspends. It provides a hint to the driver that the app
 // is entering an idle state and that temporary buffers can be reclaimed for use by other apps.
 void DX::DeviceResources::Trim() const
 {
diff --git a/xbmc/rendering/dx/DeviceResources.h b/xbmc/rendering/dx/DeviceResources.h
index 7bec62c7f7..7ae3fa5b88 100644
--- a/xbmc/rendering/dx/DeviceResources.h
+++ b/xbmc/rendering/dx/DeviceResources.h
@@ -102,7 +102,7 @@ namespace DX
     void GetOutput(IDXGIOutput** ppOutput) const;
     void GetAdapterDesc(DXGI_ADAPTER_DESC *desc) const;
     void GetDisplayMode(DXGI_MODE_DESC *mode) const;
-    
+
     D3D11_VIEWPORT GetScreenViewport() const { return m_screenViewport; }
     void SetViewPort(D3D11_VIEWPORT& viewPort) const;
 
diff --git a/xbmc/rendering/dx/GUIWindowTestPatternDX.cpp b/xbmc/rendering/dx/GUIWindowTestPatternDX.cpp
index 54b90669ea..c8162d96a1 100644
--- a/xbmc/rendering/dx/GUIWindowTestPatternDX.cpp
+++ b/xbmc/rendering/dx/GUIWindowTestPatternDX.cpp
@@ -208,7 +208,7 @@ void CGUIWindowTestPatternDX::DrawContrastBrightnessPattern(int top, int left, i
   CD3DHelper::XMStoreColor(&xcolor_black, color_black);
 
   // draw border lines
-  Vertex vert[] = 
+  Vertex vert[] =
   {
     { XMFLOAT3((float)left, y5p, 0.5f), xcolor_white, XMFLOAT2(0.0f, 0.0f), XMFLOAT2(0.0f, 0.0f) },
     { XMFLOAT3(x50p, y5p, 0.5f), xcolor_white, XMFLOAT2(0.0f, 0.0f), XMFLOAT2(0.0f, 0.0f) },
@@ -335,7 +335,7 @@ void CGUIWindowTestPatternDX::DrawRectangle(float x, float y, float x2, float y2
   XMFLOAT4 float4;
   CD3DHelper::XMStoreColor(&float4, color);
 
-  Vertex vert[] = 
+  Vertex vert[] =
   {
     { XMFLOAT3( x, y, 0.5f), float4, XMFLOAT2(0.0f, 0.0f), XMFLOAT2(0.0f, 0.0f) },
     { XMFLOAT3(x2, y, 0.5f), float4, XMFLOAT2(0.0f, 0.0f), XMFLOAT2(0.0f, 0.0f) },
@@ -375,7 +375,7 @@ void CGUIWindowTestPatternDX::UpdateVertexBuffer(Vertex *vertices, unsigned coun
     }
     return;
   }
-  else // update 
+  else // update
   {
     ComPtr<ID3D11DeviceContext> pContext = DX::DeviceResources::Get()->GetD3DContext();
     D3D11_MAPPED_SUBRESOURCE res;
diff --git a/xbmc/rendering/gl/GUIWindowTestPatternGL.h b/xbmc/rendering/gl/GUIWindowTestPatternGL.h
index db61ec44bb..773c12924d 100644
--- a/xbmc/rendering/gl/GUIWindowTestPatternGL.h
+++ b/xbmc/rendering/gl/GUIWindowTestPatternGL.h
@@ -38,6 +38,6 @@ private:
   void DrawContrastBrightnessPattern(int top, int left, int bottom, int right) override;
   void DrawCircle(int originX, int originY, int radius) override;
   void BeginRender() override;
-  void EndRender() override;  
+  void EndRender() override;
 };
 
diff --git a/xbmc/rendering/gl/RenderSystemGL.h b/xbmc/rendering/gl/RenderSystemGL.h
index b123429b39..d4874aae20 100644
--- a/xbmc/rendering/gl/RenderSystemGL.h
+++ b/xbmc/rendering/gl/RenderSystemGL.h
@@ -110,7 +110,7 @@ protected:
 
   int m_glslMajor = 0;
   int m_glslMinor = 0;
-  
+
   GLint m_viewPort[4];
 
   std::unique_ptr<CGLShader*[]> m_pShader;
diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp
index 294c419046..11063cabd4 100644
--- a/xbmc/settings/AdvancedSettings.cpp
+++ b/xbmc/settings/AdvancedSettings.cpp
@@ -201,7 +201,7 @@ void CAdvancedSettings::Initialize()
   m_allExcludeFromScanRegExps.push_back("[\\/]\\.\\_");
   m_allExcludeFromScanRegExps.push_back("\\.DS_Store");
   m_allExcludeFromScanRegExps.push_back("\\.AppleDouble");
-  
+
   m_moviesExcludeFromScanRegExps.clear();
   m_moviesExcludeFromScanRegExps.push_back("-trailer");
   m_moviesExcludeFromScanRegExps.push_back("[!-._ \\\\/]sample[-._ \\\\/]");
@@ -210,14 +210,14 @@ void CAdvancedSettings::Initialize()
                                         m_allExcludeFromScanRegExps.begin(),
                                         m_allExcludeFromScanRegExps.end());
 
-  
+
   m_tvshowExcludeFromScanRegExps.clear();
   m_tvshowExcludeFromScanRegExps.push_back("[!-._ \\\\/]sample[-._ \\\\/]");
   m_tvshowExcludeFromScanRegExps.insert(m_tvshowExcludeFromScanRegExps.end(),
                                         m_allExcludeFromScanRegExps.begin(),
                                         m_allExcludeFromScanRegExps.end());
 
-  
+
   m_audioExcludeFromScanRegExps.clear();
   m_audioExcludeFromScanRegExps.insert(m_audioExcludeFromScanRegExps.end(),
                                         m_allExcludeFromScanRegExps.begin(),
@@ -878,7 +878,7 @@ void CAdvancedSettings::ParseSettingsFile(const std::string &file)
 
   //airtunes + airplay
   XMLUtils::GetInt(pRootElement,     "airtunesport", m_airTunesPort);
-  XMLUtils::GetInt(pRootElement,     "airplayport", m_airPlayPort);  
+  XMLUtils::GetInt(pRootElement,     "airplayport", m_airPlayPort);
 
   XMLUtils::GetBoolean(pRootElement, "handlemounting", m_handleMounting);
 
@@ -1199,7 +1199,7 @@ void CAdvancedSettings::ParseSettingsFile(const std::string &file)
   {
     XMLUtils::GetBoolean(pRootElement, "enablemultimediakeys", m_enableMultimediaKeys);
   }
-  
+
   pElement = pRootElement->FirstChildElement("gui");
   if (pElement)
   {
diff --git a/xbmc/settings/DiscSettings.cpp b/xbmc/settings/DiscSettings.cpp
index d68634cb24..6941ec244e 100644
--- a/xbmc/settings/DiscSettings.cpp
+++ b/xbmc/settings/DiscSettings.cpp
@@ -28,7 +28,7 @@
 #include "dialogs/GUIDialogKaiToast.h"
 #include "guilib/LocalizeStrings.h"
 #include "utils/log.h"
-#include "messaging/helpers/DialogOKHelper.h" 
+#include "messaging/helpers/DialogOKHelper.h"
 #include "utils/Variant.h"
 
 #include <libbluray/bluray-version.h>
diff --git a/xbmc/settings/DiscSettings.h b/xbmc/settings/DiscSettings.h
index 5fc811f1ce..3e5bc40c20 100644
--- a/xbmc/settings/DiscSettings.h
+++ b/xbmc/settings/DiscSettings.h
@@ -41,7 +41,7 @@ public:
 
   static CDiscSettings& GetInstance();
   void OnSettingChanged(std::shared_ptr<const CSetting> setting) override;
- 
+
 protected:
   CDiscSettings();
   ~CDiscSettings() override;
diff --git a/xbmc/settings/LibExportSettings.cpp b/xbmc/settings/LibExportSettings.cpp
index 374ce3939f..2f25dee259 100644
--- a/xbmc/settings/LibExportSettings.cpp
+++ b/xbmc/settings/LibExportSettings.cpp
@@ -29,7 +29,7 @@
 
 CLibExportSettings::CLibExportSettings()
 {
-  m_exporttype = ELIBEXPORT_SINGLEFILE;  
+  m_exporttype = ELIBEXPORT_SINGLEFILE;
   m_itemstoexport = ELIBEXPORT_ALBUMS + ELIBEXPORT_ALBUMARTISTS;
   m_overwrite = false;
   m_artwork = false;
@@ -47,8 +47,8 @@ bool CLibExportSettings::operator!=(const CLibExportSettings &right) const
     return true;
   if (m_itemstoexport != right.m_itemstoexport)
     return true;
-  
-  if (m_artwork != right.m_artwork)      
+
+  if (m_artwork != right.m_artwork)
     return true;
   if (m_unscraped != right.m_unscraped)
     return true;
diff --git a/xbmc/settings/LibExportSettings.h b/xbmc/settings/LibExportSettings.h
index f651added8..4ea23959c7 100644
--- a/xbmc/settings/LibExportSettings.h
+++ b/xbmc/settings/LibExportSettings.h
@@ -62,7 +62,7 @@ public:
   bool IsSingleFile() const;
   bool IsSeparateFiles() const;
   bool IsToLibFolders() const;
-  
+
   std::string m_strPath;
   bool m_overwrite;
   bool m_artwork;
diff --git a/xbmc/settings/MediaSettings.cpp b/xbmc/settings/MediaSettings.cpp
index 9a3e8bf928..497730bdef 100644
--- a/xbmc/settings/MediaSettings.cpp
+++ b/xbmc/settings/MediaSettings.cpp
@@ -156,7 +156,7 @@ bool CMediaSettings::Load(const TiXmlNode *settings)
     if (!XMLUtils::GetInt(pElement, "needsupdate", m_musicNeedsUpdate, 0, INT_MAX))
       m_musicNeedsUpdate = 0;
   }
-  
+
   // Read the watchmode settings for the various media views
   pElement = settings->FirstChildElement("myvideos");
   if (pElement != NULL)
diff --git a/xbmc/settings/MediaSourceSettings.h b/xbmc/settings/MediaSourceSettings.h
index c56127a090..d9bfb0e7be 100644
--- a/xbmc/settings/MediaSourceSettings.h
+++ b/xbmc/settings/MediaSourceSettings.h
@@ -34,7 +34,7 @@ public:
   static CMediaSourceSettings& GetInstance();
 
   static std::string GetSourcesFile();
-  
+
   void OnSettingsLoaded() override;
   void OnSettingsUnloaded() override;
 
diff --git a/xbmc/settings/SettingAddon.cpp b/xbmc/settings/SettingAddon.cpp
index 8566f5fda1..c4b3b38899 100644
--- a/xbmc/settings/SettingAddon.cpp
+++ b/xbmc/settings/SettingAddon.cpp
@@ -32,7 +32,7 @@ CSettingAddon::CSettingAddon(const std::string &id, CSettingsManager *settingsMa
 CSettingAddon::CSettingAddon(const std::string &id, int label, const std::string &value, CSettingsManager *settingsManager /* = nullptr */)
   : CSettingString(id, label, value, settingsManager)
 { }
-  
+
 CSettingAddon::CSettingAddon(const std::string &id, const CSettingAddon &setting)
   : CSettingString(id, setting)
 {
@@ -50,14 +50,14 @@ bool CSettingAddon::Deserialize(const TiXmlNode *node, bool update /* = false */
 
   if (!CSettingString::Deserialize(node, update))
     return false;
-    
+
   if (m_control != nullptr &&
      (m_control->GetType() != "button" || m_control->GetFormat() != "addon"))
   {
     CLog::Log(LOGERROR, "CSettingAddon: invalid <control> of \"%s\"", m_id.c_str());
     return false;
   }
-    
+
   bool ok = false;
   std::string strAddonType;
   auto constraints = node->FirstChild("constraints");
@@ -84,7 +84,7 @@ bool CSettingAddon::Deserialize(const TiXmlNode *node, bool update /* = false */
 void CSettingAddon::copyaddontype(const CSettingAddon &setting)
 {
   CSettingString::Copy(setting);
-  
+
   CExclusiveLock lock(m_critical);
   m_addonType = setting.m_addonType;
 }
diff --git a/xbmc/settings/SettingControl.cpp b/xbmc/settings/SettingControl.cpp
index dd55b43965..52083c0c4e 100644
--- a/xbmc/settings/SettingControl.cpp
+++ b/xbmc/settings/SettingControl.cpp
@@ -145,7 +145,7 @@ bool CSettingControlButton::Deserialize(const TiXmlNode *node, bool update /* =
 {
   if (!ISettingControl::Deserialize(node, update))
     return false;
-  
+
   XMLUtils::GetInt(node, SETTING_XML_ELM_CONTROL_HEADING, m_heading);
   XMLUtils::GetBoolean(node, SETTING_XML_ELM_CONTROL_HIDEVALUE, m_hideValue);
 
@@ -224,7 +224,7 @@ bool CSettingControlList::Deserialize(const TiXmlNode *node, bool update /* = fa
 {
   if (!CSettingControlFormattedRange::Deserialize(node, update))
     return false;
-  
+
   XMLUtils::GetInt(node, SETTING_XML_ELM_CONTROL_HEADING, m_heading);
   XMLUtils::GetBoolean(node, SETTING_XML_ELM_CONTROL_MULTISELECT, m_multiselect);
   XMLUtils::GetBoolean(node, SETTING_XML_ELM_CONTROL_HIDEVALUE, m_hideValue);
diff --git a/xbmc/settings/SettingControl.h b/xbmc/settings/SettingControl.h
index fa5246983a..5446c956ac 100644
--- a/xbmc/settings/SettingControl.h
+++ b/xbmc/settings/SettingControl.h
@@ -193,7 +193,7 @@ public:
   // specialization of CSettingControlFormattedRange
   bool Deserialize(const TiXmlNode *node, bool update = false) override;
   bool SetFormat(const std::string &format) override;
-  
+
   int GetHeading() const { return m_heading; }
   void SetHeading(int heading) { m_heading = heading; }
   bool CanMultiSelect() const { return m_multiselect; }
diff --git a/xbmc/settings/SettingDateTime.cpp b/xbmc/settings/SettingDateTime.cpp
index 55ed4b4da1..575c9edf0c 100644
--- a/xbmc/settings/SettingDateTime.cpp
+++ b/xbmc/settings/SettingDateTime.cpp
@@ -28,7 +28,7 @@ CSettingDate::CSettingDate(const std::string &id, CSettingsManager *settingsMana
 CSettingDate::CSettingDate(const std::string &id, int label, const std::string &value, CSettingsManager *settingsManager /* = NULL */)
   : CSettingString(id, label, value, settingsManager)
 { }
-  
+
 CSettingDate::CSettingDate(const std::string &id, const CSettingDate &setting)
   : CSettingString(id, setting)
 { }
diff --git a/xbmc/settings/SettingPath.cpp b/xbmc/settings/SettingPath.cpp
index c42217032f..d85f55ed04 100644
--- a/xbmc/settings/SettingPath.cpp
+++ b/xbmc/settings/SettingPath.cpp
@@ -35,7 +35,7 @@ CSettingPath::CSettingPath(const std::string &id, CSettingsManager *settingsMana
 CSettingPath::CSettingPath(const std::string &id, int label, const std::string &value, CSettingsManager *settingsManager /* = nullptr */)
   : CSettingString(id, label, value, settingsManager)
 { }
-  
+
 CSettingPath::CSettingPath(const std::string &id, const CSettingPath &setting)
   : CSettingString(id, setting)
 {
@@ -53,14 +53,14 @@ bool CSettingPath::Deserialize(const TiXmlNode *node, bool update /* = false */)
 
   if (!CSettingString::Deserialize(node, update))
     return false;
-    
+
   if (m_control != nullptr &&
      (m_control->GetType() != "button" || (m_control->GetFormat() != "path" && m_control->GetFormat() != "file")))
   {
     CLog::Log(LOGERROR, "CSettingPath: invalid <control> of \"%s\"", m_id.c_str());
     return false;
   }
-    
+
   auto constraints = node->FirstChild(XML_ELM_CONSTRAINTS);
   if (constraints != nullptr)
   {
diff --git a/xbmc/settings/SkinSettings.cpp b/xbmc/settings/SkinSettings.cpp
index e41bdc38f6..762f67704f 100644
--- a/xbmc/settings/SkinSettings.cpp
+++ b/xbmc/settings/SkinSettings.cpp
@@ -97,7 +97,7 @@ bool CSkinSettings::Load(const TiXmlNode *settings)
     return false;
 
   const TiXmlElement *rootElement = settings->FirstChildElement(XML_SKINSETTINGS);
-  
+
   // return true in the case skinsettings is missing. It just means that
   // it's been migrated and it's not an error
   if (rootElement == nullptr)
diff --git a/xbmc/settings/dialogs/GUIDialogContentSettings.cpp b/xbmc/settings/dialogs/GUIDialogContentSettings.cpp
index 737e4d7f94..ef4db5b42d 100644
--- a/xbmc/settings/dialogs/GUIDialogContentSettings.cpp
+++ b/xbmc/settings/dialogs/GUIDialogContentSettings.cpp
@@ -366,7 +366,7 @@ void CGUIDialogContentSettings::InitializeSettings()
       std::shared_ptr<CSettingBool> settingScanRecursive = AddToggle(groupDetails, SETTING_SCAN_RECURSIVE, 20346, SettingLevel::Basic, m_scanRecursive, false, m_showScanSettings);
       std::shared_ptr<CSettingBool> settingContainsSingleItem = AddToggle(groupDetails, SETTING_CONTAINS_SINGLE_ITEM, 20383, SettingLevel::Basic, m_containsSingleItem, false, m_showScanSettings);
       AddToggle(groupDetails, SETTING_NO_UPDATING, 20432, SettingLevel::Basic, m_noUpdating, false, m_showScanSettings);
-      
+
       // define an enable dependency with (m_useDirectoryNames && !m_containsSingleItem) || !m_useDirectoryNames
       CSettingDependency dependencyScanRecursive(SettingDependencyType::Enable, GetSettingsManager());
       dependencyScanRecursive.Or()
diff --git a/xbmc/settings/dialogs/GUIDialogLibExportSettings.cpp b/xbmc/settings/dialogs/GUIDialogLibExportSettings.cpp
index b50e797acd..f7a77f24f0 100644
--- a/xbmc/settings/dialogs/GUIDialogLibExportSettings.cpp
+++ b/xbmc/settings/dialogs/GUIDialogLibExportSettings.cpp
@@ -274,7 +274,7 @@ void CGUIDialogLibExportSettings::UpdateButtons()
   if (m_settings.IsSingleFile() ||
       m_settings.IsSeparateFiles())
     enableExport = !m_settings.m_strPath.empty();
- 
+
   CONTROL_ENABLE_ON_CONDITION(CONTROL_SETTINGS_OKAY_BUTTON, enableExport);
   if (!enableExport)
     SetFocus(CSettings::SETTING_MUSICLIBRARY_EXPORT_FOLDER);
@@ -305,7 +305,7 @@ void CGUIDialogLibExportSettings::InitializeSettings()
   entries.push_back(std::make_pair(38303, ELIBEXPORT_TOLIBRARYFOLDER));
   AddList(groupDetails, CSettings::SETTING_MUSICLIBRARY_EXPORT_FILETYPE, 38304, SettingLevel::Basic, m_settings.GetExportType(), entries, 38304); // "Choose kind of export output"
   AddButton(groupDetails, CSettings::SETTING_MUSICLIBRARY_EXPORT_FOLDER, 38305, SettingLevel::Basic);
-  
+
   entries.clear();
   entries.push_back(std::make_pair(132, ELIBEXPORT_ALBUMS));  //ablums
   entries.push_back(std::make_pair(38043, ELIBEXPORT_ALBUMARTISTS)); //album artists
@@ -316,7 +316,7 @@ void CGUIDialogLibExportSettings::InitializeSettings()
   AddToggle(groupDetails, CSettings::SETTING_MUSICLIBRARY_EXPORT_UNSCRAPED, 38308, SettingLevel::Basic, m_settings.m_unscraped);
   AddToggle(groupDetails, CSettings::SETTING_MUSICLIBRARY_EXPORT_ARTWORK, 38307, SettingLevel::Basic, m_settings.m_artwork);
   AddToggle(groupDetails, CSettings::SETTING_MUSICLIBRARY_EXPORT_SKIPNFO, 38309, SettingLevel::Basic, m_settings.m_skipnfo);
-  AddToggle(groupDetails, CSettings::SETTING_MUSICLIBRARY_EXPORT_OVERWRITE, 38310, SettingLevel::Basic, m_settings.m_overwrite); 
+  AddToggle(groupDetails, CSettings::SETTING_MUSICLIBRARY_EXPORT_OVERWRITE, 38310, SettingLevel::Basic, m_settings.m_overwrite);
 }
 
 void CGUIDialogLibExportSettings::SetLabel2(const std::string &settingid, const std::string &label)
diff --git a/xbmc/settings/dialogs/GUIDialogSettingsBase.cpp b/xbmc/settings/dialogs/GUIDialogSettingsBase.cpp
index 9338880919..c4c203b8ec 100644
--- a/xbmc/settings/dialogs/GUIDialogSettingsBase.cpp
+++ b/xbmc/settings/dialogs/GUIDialogSettingsBase.cpp
@@ -126,12 +126,12 @@ bool CGUIDialogSettingsBase::OnMessage(CGUIMessage &message)
         CGUIMessage message(GUI_MSG_UPDATE_ITEM, GetID(), m_delayedSetting->GetID());
         OnMessage(message);
       }
-      
+
       CGUIDialog::OnMessage(message);
       FreeControls();
       return true;
     }
-    
+
     case GUI_MSG_FOCUSED:
     {
       CGUIDialog::OnMessage(message);
@@ -216,7 +216,7 @@ bool CGUIDialogSettingsBase::OnMessage(CGUIMessage &message)
 
       break;
     }
-    
+
     case GUI_MSG_UPDATE_ITEM:
     {
       if (m_delayedSetting != NULL && m_delayedSetting->GetID() == message.GetControlId())
@@ -247,7 +247,7 @@ bool CGUIDialogSettingsBase::OnMessage(CGUIMessage &message)
       }
       break;
     }
-    
+
     case GUI_MSG_UPDATE:
     {
       if (IsActive() && HasID(message.GetSenderId()))
@@ -304,7 +304,7 @@ bool CGUIDialogSettingsBase::OnAction(const CAction &action)
 bool CGUIDialogSettingsBase::OnBack(int actionID)
 {
   m_lastControlID = 0; // don't save the control as we go to a different window each time
-  
+
   // if the setting dialog is not a window but a dialog we need to close differently
   if (!IsDialog())
     return CGUIWindow::OnBack(actionID);
@@ -395,7 +395,7 @@ void CGUIDialogSettingsBase::SetupControls(bool createSettings /* = true */)
   SettingSectionPtr section = GetSection();
   if (section == NULL)
     return;
-  
+
   // update the screen string
   if (section->GetLabel() >= 0)
     SetHeading(section->GetLabel());
@@ -586,7 +586,7 @@ std::set<std::string> CGUIDialogSettingsBase::CreateSettings()
     AddSeparator(group->GetWidth(), iControlID);
     AddSetting(m_resetSetting, group->GetWidth(), iControlID);
   }
-  
+
   // update our settings (turns controls on/off as appropriate)
   UpdateSettings();
 
@@ -672,7 +672,7 @@ CGUIControl* CGUIDialogSettingsBase::AddSetting(std::shared_ptr<CSetting> pSetti
       pControl = new CGUIEditControl(*m_pOriginalEdit);
     if (pControl == NULL)
       return NULL;
-      
+
     static_cast<CGUIEditControl*>(pControl)->SetLabel(label);
     pSettingControl.reset(new CGUIControlEditSetting(static_cast<CGUIEditControl*>(pControl), iControlID, pSetting, this));
   }
@@ -695,7 +695,7 @@ CGUIControl* CGUIDialogSettingsBase::AddSetting(std::shared_ptr<CSetting> pSetti
         pControl = new CGUIButtonControl(*m_pOriginalButton);
       if (pControl == NULL)
         return NULL;
-      
+
       static_cast<CGUIButtonControl*>(pControl)->SetLabel(label);
       pSettingControl.reset(new CGUIControlButtonSetting(static_cast<CGUIButtonControl*>(pControl), iControlID, pSetting, this));
     }
@@ -705,7 +705,7 @@ CGUIControl* CGUIDialogSettingsBase::AddSetting(std::shared_ptr<CSetting> pSetti
         pControl = new CGUISettingsSliderControl(*m_pOriginalSlider);
       if (pControl == NULL)
         return NULL;
-      
+
       static_cast<CGUISettingsSliderControl*>(pControl)->SetText(label);
       pSettingControl.reset(new CGUIControlSliderSetting(static_cast<CGUISettingsSliderControl*>(pControl), iControlID, pSetting, this));
     }
@@ -772,11 +772,11 @@ CGUIControl* CGUIDialogSettingsBase::AddSettingControl(CGUIControl *pControl, Ba
     pSettingControl.reset();
     return NULL;
   }
-  
+
   pControl->SetID(iControlID++);
   pControl->SetVisible(true);
   pControl->SetWidth(width);
-  
+
   CGUIControlGroupList *group = dynamic_cast<CGUIControlGroupList *>(GetControl(SETTINGS_GROUP_ID));
   if (group != NULL)
   {
@@ -784,7 +784,7 @@ CGUIControl* CGUIDialogSettingsBase::AddSettingControl(CGUIControl *pControl, Ba
     group->AddControl(pControl);
   }
   m_settingControls.push_back(pSettingControl);
-  
+
   return pControl;
 }
 
diff --git a/xbmc/settings/dialogs/GUIDialogSettingsBase.h b/xbmc/settings/dialogs/GUIDialogSettingsBase.h
index f5a6099bdb..eed9ea2782 100644
--- a/xbmc/settings/dialogs/GUIDialogSettingsBase.h
+++ b/xbmc/settings/dialogs/GUIDialogSettingsBase.h
@@ -106,10 +106,10 @@ protected:
   virtual std::shared_ptr<CSetting> GetSetting(const std::string &settingId) = 0;
   virtual unsigned int GetDelayMs() const { return 1500; }
   virtual std::string GetLocalizedString(uint32_t labelId) const;
-  
+
   virtual void OnOkay() { m_confirmed = true; }
   virtual void OnCancel() { }
-  
+
   virtual void SetupView();
   virtual std::set<std::string> CreateSettings();
   virtual void UpdateSettings();
@@ -128,7 +128,7 @@ protected:
 
   virtual CGUIControl* AddSetting(std::shared_ptr<CSetting> pSetting, float width, int &iControlID);
   virtual CGUIControl* AddSettingControl(CGUIControl *pControl, BaseSettingControlPtr pSettingControl, float width, int &iControlID);
-  
+
   virtual void SetupControls(bool createSettings = true);
   virtual void FreeControls();
   virtual void DeleteControls();
@@ -138,7 +138,7 @@ protected:
   virtual void SetDescription(const CVariant &label);
 
   virtual void OnResetSettings();
-  
+
   /*!
     \brief A setting control has been interacted with by the user
 
@@ -158,18 +158,18 @@ protected:
 
   BaseSettingControlPtr GetSettingControl(const std::string &setting);
   BaseSettingControlPtr GetSettingControl(int controlId);
-  
+
   CGUIControl* AddSeparator(float width, int &iControlID);
   CGUIControl* AddGroupLabel(std::shared_ptr<CSettingGroup> group, float width, int &iControlID);
 
   std::vector<std::shared_ptr<CSettingCategory>> m_categories;
   std::vector<BaseSettingControlPtr> m_settingControls;
-  
+
   int m_iSetting;
   int m_iCategory;
   std::shared_ptr<CSettingAction> m_resetSetting;
   std::shared_ptr<CSettingCategory> m_dummyCategory;
-  
+
   CGUISpinControlEx *m_pOriginalSpin;
   CGUISettingsSliderControl *m_pOriginalSlider;
   CGUIRadioButtonControl *m_pOriginalRadioButton;
@@ -179,7 +179,7 @@ protected:
   CGUIImage *m_pOriginalImage;
   CGUILabelControl *m_pOriginalGroupTitle;
   bool m_newOriginalEdit;
-  
+
   BaseSettingControlPtr m_delayedSetting; ///< Current delayed setting \sa CBaseSettingControl::SetDelayed()
   CTimer m_delayedTimer;                  ///< Delayed setting timer
 
diff --git a/xbmc/settings/dialogs/GUIDialogSettingsManualBase.cpp b/xbmc/settings/dialogs/GUIDialogSettingsManualBase.cpp
index 071df84b9e..4970b7b16b 100644
--- a/xbmc/settings/dialogs/GUIDialogSettingsManualBase.cpp
+++ b/xbmc/settings/dialogs/GUIDialogSettingsManualBase.cpp
@@ -608,7 +608,7 @@ std::shared_ptr<CSettingList> CGUIDialogSettingsManualBase::AddList(SettingGroup
   std::shared_ptr<CSettingString> settingDefinition = std::make_shared<CSettingString>(id, GetSettingsManager());
   if (settingDefinition == NULL)
     return NULL;
-  
+
   settingDefinition->SetOptionsFiller(filler, this);
 
   std::shared_ptr<CSettingList> setting = std::make_shared<CSettingList>(id, settingDefinition, label, GetSettingsManager());
@@ -644,7 +644,7 @@ std::shared_ptr<CSettingList> CGUIDialogSettingsManualBase::AddList(SettingGroup
   std::shared_ptr<CSettingInt> settingDefinition = std::make_shared<CSettingInt>(id, GetSettingsManager());
   if (settingDefinition == NULL)
     return NULL;
-  
+
   settingDefinition->SetTranslatableOptions(entries);
 
   std::shared_ptr<CSettingList> setting = std::make_shared<CSettingList>(id, settingDefinition, label, GetSettingsManager());
@@ -680,7 +680,7 @@ std::shared_ptr<CSettingList> CGUIDialogSettingsManualBase::AddList(SettingGroup
   std::shared_ptr<CSettingInt> settingDefinition = std::make_shared<CSettingInt>(id, GetSettingsManager());
   if (settingDefinition == NULL)
     return NULL;
-  
+
   settingDefinition->SetOptions(entries);
 
   std::shared_ptr<CSettingList> setting = std::make_shared<CSettingList>(id, settingDefinition, label, GetSettingsManager());
@@ -716,7 +716,7 @@ std::shared_ptr<CSettingList> CGUIDialogSettingsManualBase::AddList(SettingGroup
   std::shared_ptr<CSettingInt> settingDefinition = std::make_shared<CSettingInt>(id, GetSettingsManager());
   if (settingDefinition == NULL)
     return NULL;
-  
+
   settingDefinition->SetOptionsFiller(filler, this);
 
   std::shared_ptr<CSettingList> setting = std::make_shared<CSettingList>(id, settingDefinition, label, GetSettingsManager());
@@ -954,7 +954,7 @@ std::shared_ptr<CSettingList> CGUIDialogSettingsManualBase::AddRange(SettingGrou
   std::shared_ptr<CSettingInt> settingDefinition = std::make_shared<CSettingInt>(id, GetSettingsManager());
   if (settingDefinition == NULL)
     return NULL;
-  
+
   settingDefinition->SetMinimum(minimum);
   settingDefinition->SetStep(step);
   settingDefinition->SetMaximum(maximum);
@@ -971,7 +971,7 @@ std::shared_ptr<CSettingList> CGUIDialogSettingsManualBase::AddRange(SettingGrou
     return NULL;
   // setting the default will also set the actual value on an unchanged setting
   setting->SetDefault(settingValues);
-  
+
   setting->SetControl(GetRangeControl(format, delayed, formatLabel, valueFormatLabel, valueFormatString));
   setting->SetMinimumItems(2);
   setting->SetMaximumItems(2);
@@ -993,7 +993,7 @@ std::shared_ptr<CSettingList> CGUIDialogSettingsManualBase::AddRange(SettingGrou
   std::shared_ptr<CSettingNumber> settingDefinition = std::make_shared<CSettingNumber>(id, GetSettingsManager());
   if (settingDefinition == NULL)
     return NULL;
-  
+
   settingDefinition->SetMinimum(minimum);
   settingDefinition->SetStep(step);
   settingDefinition->SetMaximum(maximum);
@@ -1010,7 +1010,7 @@ std::shared_ptr<CSettingList> CGUIDialogSettingsManualBase::AddRange(SettingGrou
     return NULL;
   // setting the default will also set the actual value on an unchanged setting
   setting->SetDefault(settingValues);
-  
+
   setting->SetControl(GetRangeControl(format, delayed, formatLabel, valueFormatLabel, valueFormatString));
   setting->SetMinimumItems(2);
   setting->SetMaximumItems(2);
@@ -1059,7 +1059,7 @@ std::shared_ptr<ISettingControl> CGUIDialogSettingsManualBase::GetEditControl(co
   std::shared_ptr<CSettingControlEdit> control = std::make_shared<CSettingControlEdit>();
   if (!control->SetFormat(format))
     return NULL;
-  
+
   control->SetDelayed(delayed);
   control->SetHidden(hidden);
   control->SetVerifyNewValue(verifyNewValue);
@@ -1074,7 +1074,7 @@ std::shared_ptr<ISettingControl> CGUIDialogSettingsManualBase::GetButtonControl(
   std::shared_ptr<CSettingControlButton> control = std::make_shared<CSettingControlButton>();
   if (!control->SetFormat(format))
     return NULL;
-  
+
   control->SetDelayed(delayed);
   control->SetHeading(heading);
   control->SetHideValue(hideValue);
@@ -1090,7 +1090,7 @@ std::shared_ptr<ISettingControl> CGUIDialogSettingsManualBase::GetSpinnerControl
   std::shared_ptr<CSettingControlSpinner> control = std::make_shared<CSettingControlSpinner>();
   if (!control->SetFormat(format))
     return NULL;
-  
+
   control->SetDelayed(delayed);
   if (formatLabel >= 0)
     control->SetFormatLabel(formatLabel);
diff --git a/xbmc/settings/lib/ISetting.cpp b/xbmc/settings/lib/ISetting.cpp
index a1c9242ce8..a5b7f46ac8 100644
--- a/xbmc/settings/lib/ISetting.cpp
+++ b/xbmc/settings/lib/ISetting.cpp
@@ -30,7 +30,7 @@ ISetting::ISetting(const std::string &id, CSettingsManager *settingsManager /* =
   , m_settingsManager(settingsManager)
   , m_requirementCondition(settingsManager)
 { }
-  
+
 bool ISetting::Deserialize(const TiXmlNode *node, bool update /* = false */)
 {
   if (node == nullptr)
diff --git a/xbmc/settings/lib/Setting.cpp b/xbmc/settings/lib/Setting.cpp
index cbe6a71eac..f3c08f279c 100644
--- a/xbmc/settings/lib/Setting.cpp
+++ b/xbmc/settings/lib/Setting.cpp
@@ -43,7 +43,7 @@ bool CheckSettingOptionsValidity(const TValue& value, const std::vector<std::pai
 CSetting::CSetting(const std::string &id, CSettingsManager *settingsManager /* = nullptr */)
   : ISetting(id, settingsManager)
 { }
-  
+
 CSetting::CSetting(const std::string &id, const CSetting &setting)
   : ISetting(id, setting.m_settingsManager)
 {
@@ -69,7 +69,7 @@ bool CSetting::Deserialize(const TiXmlNode *node, bool update /* = false */)
   int level = -1;
   if (XMLUtils::GetInt(node, SETTING_XML_ELM_LEVEL, level))
     m_level = static_cast<SettingLevel>(level);
-    
+
   if (m_level < SettingLevel::Basic || m_level > SettingLevel::Internal)
     m_level = SettingLevel::Standard;
 
@@ -130,10 +130,10 @@ bool CSetting::Deserialize(const TiXmlNode *node, bool update /* = false */)
       updateElem = updateElem->NextSiblingElement(SETTING_XML_ELM_UPDATE);
     }
   }
-    
+
   return true;
 }
-  
+
 bool CSetting::IsEnabled() const
 {
   if (m_dependencies.empty() && m_parentSetting.empty())
@@ -198,10 +198,10 @@ bool CSetting::OnSettingChanging(std::shared_ptr<const CSetting> setting)
 {
   if (m_callback == nullptr)
     return true;
-    
+
   return m_callback->OnSettingChanging(setting);
 }
-  
+
 void CSetting::OnSettingChanged(std::shared_ptr<const CSetting> setting)
 {
   if (m_callback == nullptr)
@@ -242,7 +242,7 @@ void CSetting::Copy(const CSetting &setting)
   SetRequirementsMet(setting.MeetsRequirements());
   m_callback = setting.m_callback;
   m_level = setting.m_level;
- 
+
   if (setting.m_control != nullptr)
   {
     m_control = m_settingsManager->CreateControl(setting.m_control->GetType());
@@ -358,7 +358,7 @@ bool CSettingList::Deserialize(const TiXmlNode *node, bool update /* = false */)
 SettingType CSettingList::GetElementType() const
 {
   CSharedLock lock(m_critical);
-  
+
   if (m_definition == nullptr)
     return SettingType::Unknown;
 
@@ -487,7 +487,7 @@ void CSettingList::copy(const CSettingList &setting)
 
   copy(setting.m_values, m_values);
   copy(setting.m_defaults, m_defaults);
-  
+
   if (setting.m_definition != nullptr)
   {
     auto definitionCopy = setting.m_definition->Clone(m_id + ".definition");
@@ -560,11 +560,11 @@ std::string CSettingList::toString(const SettingList &values) const
 
   return StringUtils::Join(strValues, m_delimiter);
 }
-  
+
 CSettingBool::CSettingBool(const std::string &id, CSettingsManager *settingsManager /* = nullptr */)
   : CTraitedSetting(id, settingsManager)
 { }
-  
+
 CSettingBool::CSettingBool(const std::string &id, const CSettingBool &setting)
   : CTraitedSetting(id, setting)
 {
@@ -590,7 +590,7 @@ bool CSettingBool::Deserialize(const TiXmlNode *node, bool update /* = false */)
 
   if (!CSetting::Deserialize(node, update))
     return false;
-    
+
   // get the default value
   bool value;
   if (XMLUtils::GetBoolean(node, SETTING_XML_ELM_DEFAULT, value))
@@ -603,7 +603,7 @@ bool CSettingBool::Deserialize(const TiXmlNode *node, bool update /* = false */)
 
   return true;
 }
-  
+
 bool CSettingBool::FromString(const std::string &value)
 {
   bool bValue;
@@ -656,7 +656,7 @@ bool CSettingBool::SetValue(bool value)
   OnSettingChanged(shared_from_base<CSettingBool>());
   return true;
 }
-  
+
 void CSettingBool::SetDefault(bool value)
 {
   CExclusiveLock lock(m_critical);
@@ -673,7 +673,7 @@ void CSettingBool::copy(const CSettingBool &setting)
   m_value = setting.m_value;
   m_default = setting.m_default;
 }
-  
+
 bool CSettingBool::fromString(const std::string &strValue, bool &value) const
 {
   if (StringUtils::EqualsNoCase(strValue, "true"))
@@ -693,7 +693,7 @@ bool CSettingBool::fromString(const std::string &strValue, bool &value) const
 CSettingInt::CSettingInt(const std::string &id, CSettingsManager *settingsManager /* = nullptr */)
   : CTraitedSetting(id, settingsManager)
 { }
-  
+
 CSettingInt::CSettingInt(const std::string &id, const CSettingInt &setting)
   : CTraitedSetting(id, setting)
 {
@@ -971,7 +971,7 @@ bool CSettingInt::fromString(const std::string &strValue, int &value)
   char *end = nullptr;
   value = (int)strtol(strValue.c_str(), &end, 10);
   if (end != nullptr && *end != '\0')
-    return false; 
+    return false;
 
   return true;
 }
@@ -979,7 +979,7 @@ bool CSettingInt::fromString(const std::string &strValue, int &value)
 CSettingNumber::CSettingNumber(const std::string &id, CSettingsManager *settingsManager /* = nullptr */)
   : CTraitedSetting(id, settingsManager)
 { }
-  
+
 CSettingNumber::CSettingNumber(const std::string &id, const CSettingNumber &setting)
   : CTraitedSetting(id, setting)
 {
@@ -1016,7 +1016,7 @@ bool CSettingNumber::Deserialize(const TiXmlNode *node, bool update /* = false *
 
   if (!CSetting::Deserialize(node, update))
     return false;
-    
+
   // get the default value
   double value;
   if (XMLUtils::GetDouble(node, SETTING_XML_ELM_DEFAULT, value))
@@ -1026,7 +1026,7 @@ bool CSettingNumber::Deserialize(const TiXmlNode *node, bool update /* = false *
     CLog::Log(LOGERROR, "CSettingNumber: error reading the default value of \"%s\"", m_id.c_str());
     return false;
   }
-    
+
   auto constraints = node->FirstChild(SETTING_XML_ELM_CONSTRAINTS);
   if (constraints != nullptr)
   {
@@ -1151,7 +1151,7 @@ bool CSettingNumber::fromString(const std::string &strValue, double &value)
 CSettingString::CSettingString(const std::string &id, CSettingsManager *settingsManager /* = nullptr */)
   : CTraitedSetting(id, settingsManager)
 { }
-  
+
 CSettingString::CSettingString(const std::string &id, const CSettingString &setting)
   : CTraitedSetting(id, setting)
 {
@@ -1255,7 +1255,7 @@ bool CSettingString::SetValue(const std::string &value)
 
   if (value == m_value)
     return true;
-    
+
   if (!CheckValidity(value))
     return false;
 
@@ -1364,17 +1364,17 @@ void CSettingString::copy(const CSettingString &setting)
   m_optionsFillerData = setting.m_optionsFillerData;
   m_dynamicOptions = setting.m_dynamicOptions;
 }
-  
+
 CSettingAction::CSettingAction(const std::string &id, CSettingsManager *settingsManager /* = nullptr */)
   : CSetting(id, settingsManager)
 { }
-  
+
 CSettingAction::CSettingAction(const std::string &id, int label, CSettingsManager *settingsManager /* = nullptr */)
   : CSetting(id, settingsManager)
 {
   SetLabel(label);
 }
-  
+
 CSettingAction::CSettingAction(const std::string &id, const CSettingAction &setting)
   : CSetting(id, setting)
   , m_data(setting.m_data)
@@ -1393,6 +1393,6 @@ bool CSettingAction::Deserialize(const TiXmlNode *node, bool update /* = false *
     return false;
 
   m_data = XMLUtils::GetString(node, SETTING_XML_ELM_DATA);
-    
+
   return true;
 }
diff --git a/xbmc/settings/lib/Setting.h b/xbmc/settings/lib/Setting.h
index c520821270..d6b152698a 100644
--- a/xbmc/settings/lib/Setting.h
+++ b/xbmc/settings/lib/Setting.h
@@ -187,7 +187,7 @@ public:
   bool Equals(const std::string &value) const override;
   bool CheckValidity(const std::string &value) const override;
   void Reset() override;
-  
+
   SettingType GetElementType() const;
   std::shared_ptr<CSetting> GetDefinition() { return m_definition; }
   std::shared_ptr<const CSetting> GetDefinition() const { return m_definition; }
@@ -199,7 +199,7 @@ public:
   void SetMinimumItems(int minimumItems) { m_minimumItems = minimumItems; }
   int GetMaximumItems() const { return m_maximumItems; }
   void SetMaximumItems(int maximumItems) { m_maximumItems = maximumItems; }
-  
+
   bool FromString(const std::vector<std::string> &value);
 
   const SettingList& GetValue() const { return m_values; }
diff --git a/xbmc/settings/lib/SettingConditions.cpp b/xbmc/settings/lib/SettingConditions.cpp
index c8b9c91924..2f33b5b0de 100644
--- a/xbmc/settings/lib/SettingConditions.cpp
+++ b/xbmc/settings/lib/SettingConditions.cpp
@@ -65,7 +65,7 @@ bool CSettingConditionCombination::Check() const
     const auto combination = std::static_pointer_cast<const CSettingConditionCombination>(operation);
     if (combination == nullptr)
       continue;
-    
+
     if (combination->Check())
       ok = true;
     else if (m_operation == BooleanLogicOperationAnd)
diff --git a/xbmc/settings/lib/SettingConditions.h b/xbmc/settings/lib/SettingConditions.h
index ffa8151e7e..2b9a14b742 100644
--- a/xbmc/settings/lib/SettingConditions.h
+++ b/xbmc/settings/lib/SettingConditions.h
@@ -54,7 +54,7 @@ public:
     : ISettingCondition(settingsManager)
   { }
   ~CSettingConditionItem() override = default;
-  
+
   bool Deserialize(const TiXmlNode *node) override;
   const char* GetTag() const override { return SETTING_XML_ELM_CONDITION; }
   bool Check() const override;
diff --git a/xbmc/settings/lib/SettingDependency.cpp b/xbmc/settings/lib/SettingDependency.cpp
index 184719ba1c..6a408ab797 100644
--- a/xbmc/settings/lib/SettingDependency.cpp
+++ b/xbmc/settings/lib/SettingDependency.cpp
@@ -113,7 +113,7 @@ bool CSettingDependencyCondition::Check() const
       m_operator == SettingDependencyOperator::Unknown ||
       m_settingsManager == nullptr)
     return false;
-  
+
   bool result = false;
   switch (m_target)
   {
@@ -162,7 +162,7 @@ bool CSettingDependencyCondition::Check() const
         case SettingDependencyOperator::Unknown:
         default:
           break;
-      }        
+      }
 
       break;
     }
@@ -343,7 +343,7 @@ bool CSettingDependency::Deserialize(const TiXmlNode *node)
   auto elem = node->ToElement();
   if (elem == nullptr)
     return false;
-  
+
   auto strType = elem->Attribute(SETTING_XML_ATTR_TYPE);
   if (strType == nullptr || strlen(strType) <= 0 || !setType(strType))
   {
diff --git a/xbmc/settings/lib/SettingDependency.h b/xbmc/settings/lib/SettingDependency.h
index 5c43a17e13..6969708606 100644
--- a/xbmc/settings/lib/SettingDependency.h
+++ b/xbmc/settings/lib/SettingDependency.h
@@ -62,7 +62,7 @@ public:
 
   bool Deserialize(const TiXmlNode *node) override;
   bool Check() const override;
-  
+
   const std::string& GetName() const { return m_name; }
   const std::string& GetSetting() const { return m_setting; }
   SettingDependencyTarget GetTarget() const { return m_target; }
@@ -71,7 +71,7 @@ public:
 private:
   bool setTarget(const std::string &target);
   bool setOperator(const std::string &op);
-  
+
   SettingDependencyTarget m_target = SettingDependencyTarget::Unknown;
   SettingDependencyOperator m_operator = SettingDependencyOperator::Equals;
 };
diff --git a/xbmc/settings/lib/SettingSection.cpp b/xbmc/settings/lib/SettingSection.cpp
index 32bb578b0a..248c59fae2 100644
--- a/xbmc/settings/lib/SettingSection.cpp
+++ b/xbmc/settings/lib/SettingSection.cpp
@@ -112,7 +112,7 @@ bool CSettingGroup::Deserialize(const TiXmlNode *node, bool update /* = false */
       SettingPtr setting;
       if (settingIt != m_settings.end())
         setting = *settingIt;
-      
+
       update = (setting != nullptr);
       if (!update)
       {
@@ -127,7 +127,7 @@ bool CSettingGroup::Deserialize(const TiXmlNode *node, bool update /* = false */
         if (setting == nullptr)
           CLog::Log(LOGERROR, "CSettingGroup: unknown setting type \"%s\" of \"%s\"", settingType, settingId.c_str());
       }
-      
+
       if (setting == nullptr)
         CLog::Log(LOGERROR, "CSettingGroup: unable to create new setting \"%s\"", settingId.c_str());
       else if (!setting->Deserialize(settingElement, update))
@@ -135,10 +135,10 @@ bool CSettingGroup::Deserialize(const TiXmlNode *node, bool update /* = false */
       else if (!update)
         addISetting(settingElement, setting, m_settings);
     }
-      
+
     settingElement = settingElement->NextSiblingElement(SETTING_XML_ELM_SETTING);
   }
-    
+
   return true;
 }
 
@@ -197,7 +197,7 @@ bool CSettingCategory::Deserialize(const TiXmlNode *node, bool update /* = false
   auto accessNode = node->FirstChild(SETTING_XML_ELM_ACCESS);
   if (accessNode != nullptr && !m_accessCondition.Deserialize(accessNode))
     return false;
-    
+
   auto groupNode = node->FirstChild(SETTING_XML_ELM_GROUP);
   while (groupNode != nullptr)
   {
@@ -213,7 +213,7 @@ bool CSettingCategory::Deserialize(const TiXmlNode *node, bool update /* = false
       SettingGroupPtr group;
       if (groupIt != m_groups.end())
         group = *groupIt;
-      
+
       update = (group != nullptr);
       if (!update)
         group = std::make_shared<CSettingGroup>(groupId, m_settingsManager);
@@ -226,10 +226,10 @@ bool CSettingCategory::Deserialize(const TiXmlNode *node, bool update /* = false
       else
         CLog::Log(LOGWARNING, "CSettingCategory: unable to read group \"%s\"", groupId.c_str());
     }
-      
+
     groupNode = groupNode->NextSibling(SETTING_XML_ELM_GROUP);
   }
-    
+
   return true;
 }
 
@@ -264,13 +264,13 @@ void CSettingCategory::AddGroups(const SettingGroupList &groups)
 CSettingSection::CSettingSection(const std::string &id, CSettingsManager *settingsManager /* = nullptr */)
   : ISetting(id, settingsManager)
 { }
-  
+
 bool CSettingSection::Deserialize(const TiXmlNode *node, bool update /* = false */)
 {
   // handle <visible> conditions
   if (!ISetting::Deserialize(node, update))
     return false;
-    
+
   auto categoryNode = node->FirstChild(SETTING_XML_ELM_CATEGORY);
   while (categoryNode != nullptr)
   {
@@ -286,7 +286,7 @@ bool CSettingSection::Deserialize(const TiXmlNode *node, bool update /* = false
       SettingCategoryPtr category;
       if (categoryIt != m_categories.end())
         category = *categoryIt;
-      
+
       update = (category != nullptr);
       if (!update)
         category = std::make_shared<CSettingCategory>(categoryId, m_settingsManager);
@@ -299,10 +299,10 @@ bool CSettingSection::Deserialize(const TiXmlNode *node, bool update /* = false
       else
         CLog::Log(LOGWARNING, "CSettingSection: unable to read category \"%s\"", categoryId.c_str());
     }
-      
+
     categoryNode = categoryNode->NextSibling(SETTING_XML_ELM_CATEGORY);
   }
-    
+
   return true;
 }
 
diff --git a/xbmc/settings/lib/SettingUpdate.cpp b/xbmc/settings/lib/SettingUpdate.cpp
index 4575a04115..ac9e95c214 100644
--- a/xbmc/settings/lib/SettingUpdate.cpp
+++ b/xbmc/settings/lib/SettingUpdate.cpp
@@ -32,7 +32,7 @@ bool CSettingUpdate::Deserialize(const TiXmlNode *node)
   auto elem = node->ToElement();
   if (elem == nullptr)
     return false;
-  
+
   auto strType = elem->Attribute(SETTING_XML_ATTR_TYPE);
   if (strType == nullptr || strlen(strType) <= 0 || !setType(strType))
   {
diff --git a/xbmc/settings/lib/SettingsManager.cpp b/xbmc/settings/lib/SettingsManager.cpp
index d82e50eebc..3744fda814 100644
--- a/xbmc/settings/lib/SettingsManager.cpp
+++ b/xbmc/settings/lib/SettingsManager.cpp
@@ -131,7 +131,7 @@ bool CSettingsManager::Initialize(const TiXmlElement *root)
         CLog::Log(LOGWARNING, "CSettingsManager: unable to read section \"%s\"", sectionId.c_str());
       }
     }
-      
+
     sectionNode = sectionNode->NextSibling(SETTING_XML_ELM_SECTION);
   }
 
@@ -530,7 +530,7 @@ void* CSettingsManager::GetSettingOptionsFiller(SettingConstPtr setting)
 
       break;
     }
-    
+
     case SettingOptionsFillerType::String:
     {
       if (setting->GetType() != SettingType::String)
@@ -763,7 +763,7 @@ void CSettingsManager::AddCondition(const std::string &identifier, SettingCondit
 
   m_conditions.AddCondition(identifier, condition, data);
 }
-  
+
 bool CSettingsManager::Serialize(TiXmlNode *parent) const
 {
   if (parent == nullptr)
@@ -796,7 +796,7 @@ bool CSettingsManager::Serialize(TiXmlNode *parent) const
 
   return true;
 }
-  
+
 bool CSettingsManager::Deserialize(const TiXmlNode *node, bool &updated, std::map<std::string, SettingPtr> *loadedSettings /* = nullptr */)
 {
   updated = false;
@@ -847,13 +847,13 @@ bool CSettingsManager::OnSettingChanging(std::shared_ptr<const CSetting> setting
 
   return true;
 }
-  
+
 void CSettingsManager::OnSettingChanged(std::shared_ptr<const CSetting> setting)
 {
   CSharedLock lock(m_settingsCritical);
   if (!m_loaded || setting == nullptr)
     return;
-    
+
   auto settingIt = FindSetting(setting->GetId());
   if (settingIt == m_settings.end())
     return;
@@ -1089,7 +1089,7 @@ bool CSettingsManager::LoadSetting(const TiXmlNode *node, SettingPtr setting, bo
 
       settingElement = settingElement->NextSiblingElement(SETTING_XML_ELM_SETTING);
     }
-  } 
+  }
 
   if (settingElement == nullptr)
     return false;
diff --git a/xbmc/settings/lib/SettingsManager.h b/xbmc/settings/lib/SettingsManager.h
index 12708376ed..0fb49f4f09 100644
--- a/xbmc/settings/lib/SettingsManager.h
+++ b/xbmc/settings/lib/SettingsManager.h
@@ -225,7 +225,7 @@ public:
    When a setting control definition for a registered custom setting control
    type is found its ISettingControlCreator implementation is called to create
    and deserialize the setting control definition.
-   
+
    \param controlType String representation of the custom setting control type
    \param settingControlCreator ISettingControlCreator implementation
    */
diff --git a/xbmc/settings/windows/GUIControlSettings.cpp b/xbmc/settings/windows/GUIControlSettings.cpp
index 392c6e2a62..35fb0040ed 100644
--- a/xbmc/settings/windows/GUIControlSettings.cpp
+++ b/xbmc/settings/windows/GUIControlSettings.cpp
@@ -277,7 +277,7 @@ CGUIControlSpinExSetting::CGUIControlSpinExSetting(CGUISpinControlEx *pSpin, int
     return;
 
   m_pSpin->SetID(id);
-  
+
   FillControl();
 }
 
@@ -305,15 +305,15 @@ bool CGUIControlSpinExSetting::OnClick()
 
       break;
     }
-    
+
     case SettingType::String:
       SetValid(std::static_pointer_cast<CSettingString>(m_pSetting)->SetValue(m_pSpin->GetStringValue()));
       break;
-    
+
     default:
       return false;
   }
-  
+
   return IsValid();
 }
 
@@ -445,7 +445,7 @@ bool CGUIControlListSetting::OnClick()
       options.Size() <= 0 ||
      (!control->CanMultiSelect() && options.Size() <= 1))
     return false;
-  
+
   dialog->Reset();
   dialog->SetHeading(CVariant{Localize(m_pSetting->GetLabel())});
   dialog->SetItems(options);
@@ -483,7 +483,7 @@ bool CGUIControlListSetting::OnClick()
     case SettingType::List:
       ret = CSettingUtils::SetList(std::static_pointer_cast<CSettingList>(m_pSetting), values);
       break;
-    
+
     default:
       return false;
   }
@@ -502,7 +502,7 @@ void CGUIControlListSetting::Update(bool updateDisplayOnly /* = false */)
     return;
 
   CGUIControlBaseSetting::Update();
-  
+
   CFileItemList options;
   std::shared_ptr<const CSettingControlList> control = std::static_pointer_cast<const CSettingControlList>(m_pSetting->GetControl());
   bool optionsValid = GetItems(m_pSetting, options);
@@ -607,7 +607,7 @@ bool CGUIControlButtonSetting::OnClick()
 {
   if (m_pButton == NULL)
     return false;
-  
+
   std::shared_ptr<const ISettingControl> control = m_pSetting->GetControl();
   const std::string &controlType = control->GetType();
   const std::string &controlFormat = control->GetFormat();
@@ -718,7 +718,7 @@ void CGUIControlButtonSetting::Update(bool updateDisplayOnly /* = false */)
     return;
 
   CGUIControlBaseSetting::Update();
-  
+
   std::string strText;
   std::shared_ptr<const ISettingControl> control = m_pSetting->GetControl();
   const std::string &controlType = control->GetType();
@@ -761,7 +761,7 @@ void CGUIControlButtonSetting::Update(bool updateDisplayOnly /* = false */)
 
       case SettingType::Action:
       {
-        // CSettingAction. 
+        // CSettingAction.
         // Note: This can be removed once all settings use a proper control & format combination.
         // CSettingAction is strictly speaking not designed to have a label2, it does not even have a value.
         strText = m_pButton->GetLabel2();
@@ -793,7 +793,7 @@ void CGUIControlButtonSetting::Update(bool updateDisplayOnly /* = false */)
           settingNumber->GetValue(), settingNumber->GetMinimum(), settingNumber->GetStep(), settingNumber->GetMaximum(), m_localizer);
         break;
       }
-    
+
       default:
         break;
     }
@@ -869,7 +869,7 @@ void CGUIControlButtonSetting::OnSliderChange(void *data, CGUISliderControl *sli
           settingNumber->GetValue(), settingNumber->GetMinimum(), settingNumber->GetStep(), settingNumber->GetMaximum(), m_localizer);
       break;
     }
-    
+
     default:
       break;
   }
@@ -979,7 +979,7 @@ CGUIControlSliderSetting::CGUIControlSliderSetting(CGUISettingsSliderControl *pS
     return;
 
   m_pSlider->SetID(id);
-  
+
   switch (m_pSetting->GetType())
   {
     case SettingType::Integer:
@@ -1028,11 +1028,11 @@ bool CGUIControlSliderSetting::OnClick()
     case SettingType::Number:
       SetValid(std::static_pointer_cast<CSettingNumber>(m_pSetting)->SetValue(m_pSlider->GetFloatValue()));
       break;
-    
+
     default:
       return false;
   }
-  
+
   return IsValid();
 }
 
@@ -1079,7 +1079,7 @@ void CGUIControlSliderSetting::Update(bool updateDisplayOnly /* = false */)
         value, settingNumber->GetMinimum(), settingNumber->GetStep(), settingNumber->GetMaximum(), m_localizer);
       break;
     }
-    
+
     default:
       break;
   }
@@ -1117,7 +1117,7 @@ CGUIControlRangeSetting::CGUIControlRangeSetting(CGUISettingsSliderControl *pSli
 
   m_pSlider->SetID(id);
   m_pSlider->SetRangeSelection(true);
-  
+
   if (m_pSetting->GetType() == SettingType::List)
   {
     std::shared_ptr<CSettingList> settingList = std::static_pointer_cast<CSettingList>(m_pSetting);
@@ -1181,11 +1181,11 @@ bool CGUIControlRangeSetting::OnClick()
       values.push_back(m_pSlider->GetFloatValue(CGUISliderControl::RangeSelectorLower));
       values.push_back(m_pSlider->GetFloatValue(CGUISliderControl::RangeSelectorUpper));
       break;
-    
+
     default:
       return false;
   }
-  
+
   if (values.size() != 2)
     return false;
 
@@ -1301,7 +1301,7 @@ void CGUIControlRangeSetting::Update(bool updateDisplayOnly /* = false */)
         strText = strTextLower;
       break;
     }
-    
+
     default:
       strText.clear();
       break;
diff --git a/xbmc/settings/windows/GUIControlSettings.h b/xbmc/settings/windows/GUIControlSettings.h
index 7a0141c3d7..be958bc91a 100644
--- a/xbmc/settings/windows/GUIControlSettings.h
+++ b/xbmc/settings/windows/GUIControlSettings.h
@@ -50,7 +50,7 @@ class CGUIControlBaseSetting : protected ILocalizer
 public:
   CGUIControlBaseSetting(int id, std::shared_ptr<CSetting> pSetting, ILocalizer* localizer);
   ~CGUIControlBaseSetting() override = default;
-  
+
   int GetID() const { return m_id; }
   std::shared_ptr<CSetting> GetSetting() { return m_pSetting; }
 
@@ -211,7 +211,7 @@ class CGUIControlRangeSetting : public CGUIControlBaseSetting
 public:
   CGUIControlRangeSetting(CGUISettingsSliderControl* pSlider, int id, std::shared_ptr<CSetting> pSetting, ILocalizer* localizer);
   ~CGUIControlRangeSetting() override;
-  
+
   CGUIControl* GetControl() override { return reinterpret_cast<CGUIControl*>(m_pSlider); }
   bool OnClick() override;
   void Update(bool updateDisplayOnly = false) override;
diff --git a/xbmc/settings/windows/GUIWindowSettingsCategory.cpp b/xbmc/settings/windows/GUIWindowSettingsCategory.cpp
index bca4e75317..0e50be3090 100644
--- a/xbmc/settings/windows/GUIWindowSettingsCategory.cpp
+++ b/xbmc/settings/windows/GUIWindowSettingsCategory.cpp
@@ -91,7 +91,7 @@ bool CGUIWindowSettingsCategory::OnMessage(CGUIMessage &message)
 
       return true;
     }
-    
+
     case GUI_MSG_FOCUSED:
     {
       if (!m_returningFromSkinLoad)
@@ -132,7 +132,7 @@ bool CGUIWindowSettingsCategory::OnAction(const CAction &action)
       //Test if we can access the new level
       if (!g_passwordManager.CheckSettingLevelLock(CViewStateSettings::GetInstance().GetNextSettingLevel(), true))
         return false;
-      
+
       CViewStateSettings::GetInstance().CycleSettingLevel();
       CServiceBroker::GetSettings().Save();
 
diff --git a/xbmc/storage/MediaManager.cpp b/xbmc/storage/MediaManager.cpp
index 88eff3e3ab..e15a4c3108 100644
--- a/xbmc/storage/MediaManager.cpp
+++ b/xbmc/storage/MediaManager.cpp
@@ -446,7 +446,7 @@ CCdInfo* CMediaManager::GetCdInfo(const std::string& devicePath)
 #ifdef TARGET_WINDOWS
   if(!m_bhasoptical)
     return NULL;
-  
+
   std::string strDevice = TranslateDevicePath(devicePath, false);
   std::map<std::string,CCdInfo*>::iterator it;
   {
@@ -505,7 +505,7 @@ std::string CMediaManager::GetDiskLabel(const std::string& devicePath)
   auto cached = m_mapDiscInfo.find(mediaPath);
   if (cached != m_mapDiscInfo.end())
     return cached->second.name;
-  
+
   // try to minimize the chance of a "device not ready" dialog
   std::string drivePath = g_mediaManager.TranslateDevicePath(devicePath, true);
   if (g_mediaManager.GetDriveStatus(drivePath) != DRIVE_CLOSED_MEDIA_PRESENT)
@@ -561,7 +561,7 @@ std::string CMediaManager::GetDiskUniqueId(const std::string& devicePath)
     mediaPath = g_mediaManager.TranslateDevicePath(devicePath);
   }
 #endif
-  
+
   DiscInfo info = GetDiscInfo(mediaPath);
   if (info.empty())
   {
@@ -684,7 +684,7 @@ void CMediaManager::ProcessEvents()
     // else TranslateDevicePath wouldn't give the correct device
     m_strFirstAvailDrive = m_platformStorage->GetFirstOpticalDeviceFileName();
 #endif
-    
+
     CGUIMessage msg(GUI_MSG_NOTIFY_ALL,0,0,GUI_MSG_UPDATE_SOURCES);
     CServiceBroker::GetGUI()->GetWindowManager().SendThreadMessage(msg);
   }
@@ -726,12 +726,12 @@ CMediaManager::DiscInfo CMediaManager::GetDiscInfo(const std::string& mediaPath)
   if (mediaPath.empty())
     return info;
 
-  // Try finding VIDEO_TS/VIDEO_TS.IFO - this indicates a DVD disc is inserted 
+  // Try finding VIDEO_TS/VIDEO_TS.IFO - this indicates a DVD disc is inserted
   std::string pathVideoTS = URIUtils::AddFileToFolder(mediaPath, "VIDEO_TS");
   if (CFile::Exists(URIUtils::AddFileToFolder(pathVideoTS, "VIDEO_TS.IFO")))
   {
     info.type = "DVD";
-    // correct the filename if needed 
+    // correct the filename if needed
     if (StringUtils::StartsWith(pathVideoTS, "dvd://") ||
       StringUtils::StartsWith(pathVideoTS, "iso9660://"))
       pathVideoTS = g_mediaManager.TranslateDevicePath("");
diff --git a/xbmc/storage/MediaManager.h b/xbmc/storage/MediaManager.h
index 3994b708e3..d4dc478841 100644
--- a/xbmc/storage/MediaManager.h
+++ b/xbmc/storage/MediaManager.h
@@ -110,7 +110,7 @@ protected:
 
 private:
   IStorageProvider *m_platformStorage;
-  
+
   struct DiscInfo
   {
     std::string name;
diff --git a/xbmc/storage/cdioSupport.cpp b/xbmc/storage/cdioSupport.cpp
index b4a8451410..b28acbf450 100644
--- a/xbmc/storage/cdioSupport.cpp
+++ b/xbmc/storage/cdioSupport.cpp
@@ -197,7 +197,7 @@ char* CLibcdio::GetDeviceFileName()
 {
   CSingleLock lock(*this);
 
-  // If We don't have a DVD device initially present (Darwin or a USB DVD drive), 
+  // If We don't have a DVD device initially present (Darwin or a USB DVD drive),
   // We have to keep checking in case one appears.
   if (s_defaultDevice && strlen(s_defaultDevice) == 0)
   {
@@ -642,13 +642,13 @@ void CCdIoSupport::GetCdTextInfo(xbmc_cdtext_t &xcdt, int trackNum)
 #else
   //! @todo - remove after Ubuntu 16.04 (Xenial) is EOL
   cdtext_t *pcdtext = (cdtext_t *)::cdio_get_cdtext(cdio, trackNum);
-#endif 
-  
+#endif
+
   if (pcdtext == NULL)
     return ;
 
 #if defined(LIBCDIO_VERSION_NUM) && (LIBCDIO_VERSION_NUM >= 84)
-  for (int i=0; i < MAX_CDTEXT_FIELDS; i++) 
+  for (int i=0; i < MAX_CDTEXT_FIELDS; i++)
     if (cdtext_get_const(pcdtext, (cdtext_field_t)i, trackNum))
       xcdt[(cdtext_field_t)i] = cdtext_field2str((cdtext_field_t)i);
 #else
diff --git a/xbmc/test/TestBasicEnvironment.cpp b/xbmc/test/TestBasicEnvironment.cpp
index 2b1dfbbe42..01c85626ee 100644
--- a/xbmc/test/TestBasicEnvironment.cpp
+++ b/xbmc/test/TestBasicEnvironment.cpp
@@ -63,9 +63,9 @@ void TestBasicEnvironment::SetUp()
 //in guisettings init below
 #ifdef TARGET_DARWIN
   std::string frameworksPath = CUtil::GetFrameworksPath();
-  CSpecialProtocol::SetXBMCFrameworksPath(frameworksPath);    
+  CSpecialProtocol::SetXBMCFrameworksPath(frameworksPath);
 #endif
-  /** 
+  /**
    * @todo Something should be done about all the asserts in GUISettings so
    * that the initialization of these components won't be needed.
    */
diff --git a/xbmc/threads/Condition.h b/xbmc/threads/Condition.h
index bfd06a03a0..6277981b51 100644
--- a/xbmc/threads/Condition.h
+++ b/xbmc/threads/Condition.h
@@ -45,7 +45,7 @@ namespace XbmcThreads
   public:
     ConditionVariable() = default;
 
-    inline void wait(CCriticalSection& lock) 
+    inline void wait(CCriticalSection& lock)
     {
       int count  = lock.count;
       lock.count = 0;
@@ -53,8 +53,8 @@ namespace XbmcThreads
       lock.count = count;
     }
 
-    inline bool wait(CCriticalSection& lock, unsigned long milliseconds) 
-    { 
+    inline bool wait(CCriticalSection& lock, unsigned long milliseconds)
+    {
       int count  = lock.count;
       lock.count = 0;
       std::cv_status res = cond.wait_for(lock.get_underlying(), std::chrono::milliseconds(milliseconds));
@@ -65,19 +65,19 @@ namespace XbmcThreads
     inline void wait(CSingleLock& lock) { wait(lock.get_underlying()); }
     inline bool wait(CSingleLock& lock, unsigned long milliseconds) { return wait(lock.get_underlying(), milliseconds); }
 
-    inline void notifyAll() 
-    { 
+    inline void notifyAll()
+    {
       cond.notify_all();
     }
 
-    inline void notify() 
-    { 
+    inline void notify()
+    {
       cond.notify_one();
     }
   };
 
   /**
-   * This is a condition variable along with its predicate. This allows the use of a 
+   * This is a condition variable along with its predicate. This allows the use of a
    *  condition variable without the spurious returns since the state being monitored
    *  is also part of the condition.
    *
diff --git a/xbmc/threads/Event.cpp b/xbmc/threads/Event.cpp
index 0da67f2b42..03bee0c3c8 100644
--- a/xbmc/threads/Event.cpp
+++ b/xbmc/threads/Event.cpp
@@ -58,7 +58,7 @@ void CEvent::Set()
   // http://www.boost.org/doc/libs/1_41_0/doc/html/thread/synchronization.html#thread.synchronization.condvar_ref
   {
     CSingleLock slock(mutex);
-    signaled = true; 
+    signaled = true;
   }
 
   condVar.notifyAll();
@@ -75,11 +75,11 @@ namespace XbmcThreads
 {
   /**
    * This will block until any one of the CEvents in the group are
-   * signaled at which point a pointer to that CEvents will be 
+   * signaled at which point a pointer to that CEvents will be
    * returned.
    */
-  CEvent* CEventGroup::wait() 
-  { 
+  CEvent* CEventGroup::wait()
+  {
     return wait(std::numeric_limits<unsigned int>::max());
   }
 
@@ -93,15 +93,15 @@ namespace XbmcThreads
   //  CEvent::groupListMutex -> CEventGroup::mutex -> CEvent::mutex
   //
   // Notice that this method doesn't grab the CEvent::groupListMutex at all. This
-  // is fine. It just grabs the CEventGroup::mutex and THEN the individual 
+  // is fine. It just grabs the CEventGroup::mutex and THEN the individual
   // CEvent::mutex's
-  CEvent* CEventGroup::wait(unsigned int milliseconds)  
-  { 
+  CEvent* CEventGroup::wait(unsigned int milliseconds)
+  {
     CSingleLock lock(mutex); // grab CEventGroup::mutex
-    numWaits++; 
+    numWaits++;
 
     // ==================================================
-    // This block checks to see if any child events are 
+    // This block checks to see if any child events are
     // signaled and sets 'signaled' to the first one it
     // finds.
     // ==================================================
@@ -109,7 +109,7 @@ namespace XbmcThreads
     for (auto* cur : events)
     {
       CSingleLock lock2(cur->mutex);
-      if (cur->signaled) 
+      if (cur->signaled)
         signaled = cur;
     }
     // ==================================================
@@ -118,15 +118,15 @@ namespace XbmcThreads
     {
       // both of these release the CEventGroup::mutex
       if (milliseconds == std::numeric_limits<unsigned int>::max())
-        condVar.wait(mutex); 
+        condVar.wait(mutex);
       else
-        condVar.wait(mutex,milliseconds); 
+        condVar.wait(mutex,milliseconds);
     } // at this point the CEventGroup::mutex is reacquired
-    numWaits--; 
+    numWaits--;
 
     // signaled should have been set by a call to CEventGroup::Set
     CEvent* ret = signaled;
-    if (numWaits == 0) 
+    if (numWaits == 0)
     {
       if (signaled)
         // This acquires and releases the CEvent::mutex. This is fine since the
diff --git a/xbmc/threads/Event.h b/xbmc/threads/Event.h
index 9c0b199d97..df492c5130 100644
--- a/xbmc/threads/Event.h
+++ b/xbmc/threads/Event.h
@@ -53,7 +53,7 @@ class CEvent
   std::unique_ptr<std::vector<XbmcThreads::CEventGroup*>> groups;
 
   /**
-   * To satisfy the TightConditionVariable requirements and allow the 
+   * To satisfy the TightConditionVariable requirements and allow the
    *  predicate being monitored to include both the signaled and interrupted
    *  states.
    */
@@ -73,7 +73,7 @@ class CEvent
   CEvent& operator=(const CEvent&) = delete;
 
 public:
-  inline CEvent(bool manual = false, bool signaled_ = false) : 
+  inline CEvent(bool manual = false, bool signaled_ = false) :
     manualReset(manual), signaled(signaled_), numWaits(0), condVar(actualCv,signaled) {}
 
   inline void Reset() { CSingleLock lock(mutex); signaled = false; }
@@ -87,11 +87,11 @@ public:
    *  to be triggered. The method will return 'true' if the Event
    *  was triggered. Otherwise it will return false.
    */
-  inline bool WaitMSec(unsigned int milliSeconds) 
+  inline bool WaitMSec(unsigned int milliSeconds)
   { CSingleLock lock(mutex); numWaits++; condVar.wait(mutex,milliSeconds); numWaits--; return prepReturn(); }
 
   /**
-   * This will wait for the Event to be triggered. The method will return 
+   * This will wait for the Event to be triggered. The method will return
    * 'true' if the Event was triggered. If it was either interrupted
    * it will return false. Otherwise it will return false.
    */
@@ -99,7 +99,7 @@ public:
   { CSingleLock lock(mutex); numWaits++; condVar.wait(mutex); numWaits--; return prepReturn(); }
 
   /**
-   * This is mostly for testing. It allows a thread to make sure there are 
+   * This is mostly for testing. It allows a thread to make sure there are
    *  the right amount of other threads waiting.
    */
   inline int getNumWaits() { CSingleLock lock(mutex); return numWaits; }
@@ -141,7 +141,7 @@ namespace XbmcThreads
 
     /**
      * This will block until any one of the CEvents in the group are
-     * signaled at which point a pointer to that CEvents will be 
+     * signaled at which point a pointer to that CEvents will be
      * returned.
      */
     CEvent* wait();
@@ -155,7 +155,7 @@ namespace XbmcThreads
     CEvent* wait(unsigned int milliseconds);
 
     /**
-     * This is mostly for testing. It allows a thread to make sure there are 
+     * This is mostly for testing. It allows a thread to make sure there are
      *  the right amount of other threads waiting.
      */
     inline int getNumWaits() { CSingleLock lock(mutex); return numWaits; }
diff --git a/xbmc/threads/Helpers.h b/xbmc/threads/Helpers.h
index ad08720a4b..06502eb8ed 100644
--- a/xbmc/threads/Helpers.h
+++ b/xbmc/threads/Helpers.h
@@ -23,8 +23,8 @@
 namespace XbmcThreads
 {
   /**
-   * This will create a new predicate from an old predicate P with 
-   *  inverse truth value. This predicate is safe to use in a 
+   * This will create a new predicate from an old predicate P with
+   *  inverse truth value. This predicate is safe to use in a
    *  TightConditionVariable<P>
    */
   template <class P> class InversePredicate
diff --git a/xbmc/threads/Lockables.h b/xbmc/threads/Lockables.h
index f1ff540177..b563fef792 100644
--- a/xbmc/threads/Lockables.h
+++ b/xbmc/threads/Lockables.h
@@ -29,7 +29,7 @@ namespace XbmcThreads
    * This template will take any implementation of the "Lockable" concept
    * and allow it to be used as an "Exitable Lockable."
    *
-   * Something that implements the "Lockable concept" simply means that 
+   * Something that implements the "Lockable concept" simply means that
    * it has the three methods:
    *
    *   lock();
@@ -73,8 +73,8 @@ namespace XbmcThreads
      *  only once, and so it backs out ALMOST all the way, but
      *  leaves one still there.
      */
-    inline unsigned int exit(unsigned int leave = 0) 
-    { 
+    inline unsigned int exit(unsigned int leave = 0)
+    {
       // it's possible we don't actually own the lock
       // so we will try it.
       unsigned int ret = 0;
@@ -82,9 +82,9 @@ namespace XbmcThreads
       {
         if (leave < (count - 1))
         {
-          ret = count - 1 - leave;  // The -1 is because we don't want 
+          ret = count - 1 - leave;  // The -1 is because we don't want
                                     //  to count the try_lock increment.
-          // We must NOT compare "count" in this loop since 
+          // We must NOT compare "count" in this loop since
           // as soon as the last unlock is called another thread
           // can modify it.
           for (unsigned int i = 0; i < ret; i++)
@@ -93,7 +93,7 @@ namespace XbmcThreads
         unlock(); // undo the try_lock before returning
       }
 
-      return ret; 
+      return ret;
     }
 
     /**
@@ -101,13 +101,13 @@ namespace XbmcThreads
      */
     inline void restore(unsigned int restoreCount)
     {
-      for (unsigned int i = 0; i < restoreCount; i++) 
+      for (unsigned int i = 0; i < restoreCount; i++)
         lock();
     }
 
     /**
-     * Some implementations (see pthreads) require access to the underlying 
-     *  CCriticalSection, which is also implementation specific. This 
+     * Some implementations (see pthreads) require access to the underlying
+     *  CCriticalSection, which is also implementation specific. This
      *  provides access to it through the same method on the guard classes
      *  UniqueLock, and SharedLock.
      *
diff --git a/xbmc/threads/Timer.h b/xbmc/threads/Timer.h
index c1f033660e..738c82f50e 100644
--- a/xbmc/threads/Timer.h
+++ b/xbmc/threads/Timer.h
@@ -29,7 +29,7 @@ class ITimerCallback
 {
 public:
   virtual ~ITimerCallback() = default;
-  
+
   virtual void OnTimeout() = 0;
 };
 
@@ -49,10 +49,10 @@ public:
 
   float GetElapsedSeconds() const;
   float GetElapsedMilliseconds() const;
-  
+
 protected:
   void Process() override;
-  
+
 private:
   std::function<void()> m_callback;
   uint32_t m_timeout;
diff --git a/xbmc/threads/platform/README.platform b/xbmc/threads/platform/README.platform
index e92880de26..be9a087ca4 100644
--- a/xbmc/threads/platform/README.platform
+++ b/xbmc/threads/platform/README.platform
@@ -47,5 +47,5 @@ ConditionVariable - must be implemented to handle a ConditionVariable concept:
    void notifyAll();
    void notify();
 
-where L is a typename template variable that must satisfy Lockable concept 
+where L is a typename template variable that must satisfy Lockable concept
 defined above.
diff --git a/xbmc/threads/platform/win/Win32Exception.cpp b/xbmc/threads/platform/win/Win32Exception.cpp
index 98aa40be9b..da5903f0d4 100644
--- a/xbmc/threads/platform/win/Win32Exception.cpp
+++ b/xbmc/threads/platform/win/Win32Exception.cpp
@@ -291,6 +291,6 @@ bool win32_exception::ShouldHook()
 
     ::FreeLibrary(module);
   }
-  
+
   return result;
 }
diff --git a/xbmc/threads/test/TestEvent.cpp b/xbmc/threads/test/TestEvent.cpp
index a53117de30..05cfb04ca8 100644
--- a/xbmc/threads/test/TestEvent.cpp
+++ b/xbmc/threads/test/TestEvent.cpp
@@ -41,7 +41,7 @@ public:
   volatile bool waiting;
 
   waiter(CEvent& o, bool& flag) : event(o), result(flag), waiting(false) {}
-  
+
   void Run() override
   {
     waiting = true;
@@ -60,7 +60,7 @@ public:
   volatile bool waiting;
 
   timed_waiter(CEvent& o, int& flag, int waitTimeMillis) : event(o), waitTime(waitTimeMillis), result(flag), waiting(false) {}
-  
+
   void Run() override
   {
     waiting = true;
@@ -542,7 +542,7 @@ public:
   volatile bool waiting;
 
   mass_waiter() : event(*g_event), waiting(false) {}
-  
+
   void Run() override
   {
     waiting = true;
@@ -561,7 +561,7 @@ public:
   volatile bool waiting;
 
   poll_mass_waiter() : event(*g_event), waiting(false) {}
-  
+
   void Run() override
   {
     waiting = true;
diff --git a/xbmc/threads/test/TestHelpers.h b/xbmc/threads/test/TestHelpers.h
index c40ad446f0..e36b426e6e 100644
--- a/xbmc/threads/test/TestHelpers.h
+++ b/xbmc/threads/test/TestHelpers.h
@@ -38,7 +38,7 @@ template<class E> inline static bool waitForWaiters(E& event, int numWaiters, in
   }
   return false;
 }
-  
+
 inline static bool waitForThread(std::atomic<long>& mutex, int numWaiters, int milliseconds)
 {
   CCriticalSection sec;
@@ -70,7 +70,7 @@ class thread
 
 //  inline thread(const thread& other) { }
 public:
-  inline explicit thread(IRunnable& runnable) : 
+  inline explicit thread(IRunnable& runnable) :
     f(&runnable), cthread(new CThread(f, "DumbThread"))
   {
     cthread->Create();
diff --git a/xbmc/threads/test/TestSharedSection.cpp b/xbmc/threads/test/TestSharedSection.cpp
index 9e74fde3f6..499e75856e 100644
--- a/xbmc/threads/test/TestSharedSection.cpp
+++ b/xbmc/threads/test/TestSharedSection.cpp
@@ -41,12 +41,12 @@ public:
   volatile bool haslock;
   volatile bool obtainedlock;
 
-  inline locker(CSharedSection& o, std::atomic<long>* mutex_ = NULL, CEvent* wait_ = NULL) : 
+  inline locker(CSharedSection& o, std::atomic<long>* mutex_ = NULL, CEvent* wait_ = NULL) :
     sec(o), wait(wait_), mutex(mutex_), haslock(false), obtainedlock(false) {}
-  
-  inline locker(CSharedSection& o, CEvent* wait_ = NULL) : 
+
+  inline locker(CSharedSection& o, CEvent* wait_ = NULL) :
     sec(o), wait(wait_), mutex(NULL), haslock(false), obtainedlock(false) {}
-  
+
   void Run() override
   {
     AtomicGuard g(mutex);
@@ -157,7 +157,7 @@ TEST(TestSharedSection, TwoCase)
     EXPECT_TRUE(l2.haslock);
 
     event.Set();
-    
+
     EXPECT_TRUE(waitThread2.timed_join(MILLIS(10000)));
   }
 }
@@ -214,7 +214,7 @@ TEST(TestMultipleSharedSection, General)
     EXPECT_TRUE(l5.haslock);
 
     event.Set();
-    
+
     EXPECT_TRUE(waitThread1.timed_join(MILLIS(10000)));
     EXPECT_TRUE(waitThread2.timed_join(MILLIS(10000)));
     EXPECT_TRUE(waitThread3.timed_join(MILLIS(10000)));
diff --git a/xbmc/utils/BitstreamWriter.h b/xbmc/utils/BitstreamWriter.h
index 273b5b1288..64add4f030 100644
--- a/xbmc/utils/BitstreamWriter.h
+++ b/xbmc/utils/BitstreamWriter.h
@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 
-class CBitstreamWriter 
+class CBitstreamWriter
 {
 public:
   CBitstreamWriter(uint8_t *buffer, unsigned int buffer_size, int writer_le);
diff --git a/xbmc/utils/BooleanLogic.h b/xbmc/utils/BooleanLogic.h
index c4c00979b5..29134643db 100644
--- a/xbmc/utils/BooleanLogic.h
+++ b/xbmc/utils/BooleanLogic.h
@@ -80,7 +80,7 @@ public:
 protected:
   virtual CBooleanLogicOperation* newOperation() { return new CBooleanLogicOperation(); }
   virtual CBooleanLogicValue* newValue() { return new CBooleanLogicValue(); }
-  
+
   BooleanLogicOperation m_operation;
   CBooleanLogicOperations m_operations;
   CBooleanLogicValues m_values;
diff --git a/xbmc/utils/CPUInfo.cpp b/xbmc/utils/CPUInfo.cpp
index cd2c6627a0..9931186c71 100644
--- a/xbmc/utils/CPUInfo.cpp
+++ b/xbmc/utils/CPUInfo.cpp
@@ -129,7 +129,7 @@ CCPUInfo::CCPUInfo(void)
 
   size_t len = 4;
   std::string cpuVendor;
-  
+
   // The number of cores.
   if (sysctlbyname("hw.activecpu", &m_cpuCount, &len, NULL, 0) == -1)
       m_cpuCount = 1;
@@ -150,7 +150,7 @@ CCPUInfo::CCPUInfo(void)
   len = 512;
   if (sysctlbyname("machdep.cpu.vendor", &buffer, &len, NULL, 0) == 0)
     cpuVendor = buffer;
-  
+
 #endif
   // Go through each core.
   for (int i=0; i<m_cpuCount; i++)
@@ -240,7 +240,7 @@ CCPUInfo::CCPUInfo(void)
   }
   else
     m_cpuQueryFreq = nullptr;
-  
+
   if (PdhOpenQueryW(nullptr, 0, &m_cpuQueryLoad) == ERROR_SUCCESS)
   {
     for (size_t i = 0; i < m_cores.size(); i++)
@@ -282,9 +282,9 @@ CCPUInfo::CCPUInfo(void)
   if (m_fProcTemperature == NULL)
     m_fProcTemperature = fopen("/proc/acpi/thermal_zone/TZ0/temperature", "r");
   // read from the new location of the temperature data on new kernels, 2.6.39, 3.0 etc
-  if (m_fProcTemperature == NULL)   
+  if (m_fProcTemperature == NULL)
     m_fProcTemperature = fopen("/sys/class/hwmon/hwmon0/temp1_input", "r");
-  if (m_fProcTemperature == NULL)   
+  if (m_fProcTemperature == NULL)
     m_fProcTemperature = fopen("/sys/class/thermal/thermal_zone0/temp", "r");  // On Raspberry PIs
 
   m_fCPUFreq = fopen ("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq", "r");
@@ -556,10 +556,10 @@ float CCPUInfo::getCPUFrequency()
   if (sysctlbyname("hw.cpufrequency", &hz, &len, NULL, 0) == -1)
     return 0.f;
   return hz / 1000000.0;
-#elif defined(TARGET_WINDOWS_STORE) 
+#elif defined(TARGET_WINDOWS_STORE)
   CLog::Log(LOGDEBUG, "%s is not implemented", __FUNCTION__);
   return 0.f;
-#elif defined(TARGET_WINDOWS_DESKTOP) 
+#elif defined(TARGET_WINDOWS_DESKTOP)
   if (m_cpuFreqCounter && PdhCollectQueryData(m_cpuQueryFreq) == ERROR_SUCCESS)
   {
     PDH_RAW_COUNTER cnt;
@@ -570,7 +570,7 @@ float CCPUInfo::getCPUFrequency()
       return float(cnt.FirstValue);
     }
   }
-  
+
   if (!m_cores.empty())
     return float(m_cores.begin()->second.m_fSpeed);
   else
@@ -617,7 +617,7 @@ bool CCPUInfo::getTemperature(CTemperature& temperature)
 {
   int         value = 0;
   char        scale = 0;
-  
+
 #ifdef TARGET_POSIX
 #if defined(TARGET_DARWIN_OSX)
   value = SMCGetTemperature(SMC_KEY_CPU_TEMP);
@@ -646,11 +646,11 @@ bool CCPUInfo::getTemperature(CTemperature& temperature)
     // procfs is deprecated in the linux kernel, we should move away from
     // using it for temperature data.  It doesn't seem that sysfs has a
     // general enough interface to bother implementing ATM.
-    
+
     rewind(m_fProcTemperature);
     fflush(m_fProcTemperature);
     ret = fscanf(m_fProcTemperature, "temperature: %d %c", &value, &scale);
-    
+
     // read from the temperature file of the new kernels
     if (!ret)
     {
@@ -662,7 +662,7 @@ bool CCPUInfo::getTemperature(CTemperature& temperature)
   }
 
   if (ret != 2)
-    return false; 
+    return false;
 #endif
 #endif // TARGET_POSIX
 
@@ -672,7 +672,7 @@ bool CCPUInfo::getTemperature(CTemperature& temperature)
     temperature = CTemperature::CreateFromFahrenheit(value);
   else
     return false;
-  
+
   return true;
 }
 
@@ -700,7 +700,7 @@ bool CCPUInfo::readProcStat(unsigned long long& user, unsigned long long& nice,
 #if defined(TARGET_WINDOWS)
   nice = 0;
   io = 0;
-#if defined (TARGET_WINDOWS_DESKTOP) 
+#if defined (TARGET_WINDOWS_DESKTOP)
   FILETIME idleTime;
   FILETIME kernelTime;
   FILETIME userTime;
@@ -727,7 +727,7 @@ bool CCPUInfo::readProcStat(unsigned long long& user, unsigned long long& nice,
         const LONGLONG deltaTotal = coreTotal - curCore.m_total,
                        deltaIdle  = coreIdle - curCore.m_idle;
         const double load = (double(deltaTotal - deltaIdle) * 100.0) / double(deltaTotal);
-        
+
         // win32 has some problems with calculation of load if load close to zero
         curCore.m_fPct = (load < 0) ? 0 : load;
         if (load >= 0 || deltaTotal > 5 * 10 * 1000 * 1000) // do not update (smooth) values for 5 seconds on negative loads
@@ -891,7 +891,7 @@ std::string CCPUInfo::GetCoresUsageString() const
         strCores += StringUtils::Format("CPU%d: %3.0f%%", it->first, it->second.m_fPct);
     }
   }
-  else 
+  else
   {
     strCores += StringUtils::Format("%3.0f%%", double(m_lastUsedPercentage));
   }
diff --git a/xbmc/utils/CPUInfo.h b/xbmc/utils/CPUInfo.h
index 0b18db7fe5..0e27b08d4a 100644
--- a/xbmc/utils/CPUInfo.h
+++ b/xbmc/utils/CPUInfo.h
@@ -129,7 +129,7 @@ private:
   unsigned long long m_ioTicks;
 
   int          m_lastUsedPercentage;
-  XbmcThreads::EndTime m_nextUsedReadTime; 
+  XbmcThreads::EndTime m_nextUsedReadTime;
   std::string  m_cpuModel;
   std::string  m_cpuBogoMips;
   std::string  m_cpuHardware;
diff --git a/xbmc/utils/CharsetConverter.cpp b/xbmc/utils/CharsetConverter.cpp
index 80d260daf8..c3cea1641a 100644
--- a/xbmc/utils/CharsetConverter.cpp
+++ b/xbmc/utils/CharsetConverter.cpp
@@ -54,7 +54,7 @@
   #define UTF16_CHARSET "UTF-16" ENDIAN_SUFFIX
   #define UTF32_CHARSET "UTF-32" ENDIAN_SUFFIX
   #define UTF8_SOURCE "UTF-8"
-  #define WCHAR_CHARSET UTF16_CHARSET 
+  #define WCHAR_CHARSET UTF16_CHARSET
 #if _DEBUG && !defined(TARGET_WINDOWS_STORE)
   #pragma comment(lib, "libiconvd.lib")
 #else
@@ -71,7 +71,7 @@
   #define UTF16_CHARSET "UTF-16" ENDIAN_SUFFIX
   #define UTF32_CHARSET "UTF-32" ENDIAN_SUFFIX
   #define UTF8_SOURCE "UTF-8"
-  #define WCHAR_CHARSET UTF32_CHARSET 
+  #define WCHAR_CHARSET UTF32_CHARSET
 #else
   #define UTF16_CHARSET "UTF-16" ENDIAN_SUFFIX
   #define UTF32_CHARSET "UTF-32" ENDIAN_SUFFIX
@@ -94,7 +94,7 @@ enum SpecialCharset
 {
   NotSpecialCharset = 0,
   SystemCharset,
-  UserCharset /* locale.charset */, 
+  UserCharset /* locale.charset */,
   SubtitleCharset /* subtitles.charset */,
   AsciiCharset
 };
@@ -200,7 +200,7 @@ iconv_t CConverterType::GetConverter(CSingleLock& converterLock)
       m_targetCharset = ResolveSpecialCharset(m_targetSpecialCharset);
 
     m_iconv = iconv_open(m_targetCharset.c_str(), m_sourceCharset.c_str());
-    
+
     if (m_iconv == NO_ICONV)
       CLog::Log(LOGERROR, "%s: iconv_open() for \"%s\" -> \"%s\" failed, errno = %d (%s)",
                 __FUNCTION__, m_sourceCharset.c_str(), m_targetCharset.c_str(), errno, strerror(errno));
@@ -286,13 +286,13 @@ enum StdConversionType /* Keep it in sync with CCharsetConverter::CInnerConverte
   NumberOfStdConversionTypes /* Dummy sentinel entry */
 };
 
-/* We don't want to pollute header file with many additional includes and definitions, so put 
+/* We don't want to pollute header file with many additional includes and definitions, so put
    here all staff that require usage of types defined in this file or in additional headers */
 class CCharsetConverter::CInnerConverter
 {
 public:
   static bool logicalToVisualBiDi(const std::u32string& stringSrc, std::u32string& stringDst, FriBidiCharType base = FRIBIDI_TYPE_LTR, const bool failOnBadString = false);
-  
+
   template<class INPUT,class OUTPUT>
   static bool stdConvert(StdConversionType convertType, const INPUT& strSource, OUTPUT& strDest, bool failOnInvalidChar = false);
   template<class INPUT,class OUTPUT>
@@ -509,7 +509,7 @@ bool CCharsetConverter::CInnerConverter::logicalToVisualBiDi(const std::u32strin
       lineEnd = srcLen;
     else
       lineEnd++; // include '\n'
-    
+
     const size_t lineLen = lineEnd - lineStart;
 
     FriBidiChar* visual = (FriBidiChar*) malloc((lineLen + 1) * sizeof(FriBidiChar));
@@ -719,7 +719,7 @@ bool CCharsetConverter::wToUtf32(const std::wstring& wStringSrc, std::u32string&
 
 // The bVisualBiDiFlip forces a flip of characters for hebrew/arabic languages, only set to false if the flipping
 // of the string is already made or the string is not displayed in the GUI
-bool CCharsetConverter::utf8ToW(const std::string& utf8StringSrc, std::wstring& wStringDst, bool bVisualBiDiFlip /*= true*/, 
+bool CCharsetConverter::utf8ToW(const std::string& utf8StringSrc, std::wstring& wStringDst, bool bVisualBiDiFlip /*= true*/,
                                 bool forceLTRReadingOrder /*= false*/, bool failOnBadChar /*= false*/)
 {
   // Try to flip hebrew/arabic characters, if any
@@ -735,7 +735,7 @@ bool CCharsetConverter::utf8ToW(const std::string& utf8StringSrc, std::wstring&
 
     return CInnerConverter::stdConvert(Utf32ToW, utf32flipped, wStringDst, failOnBadChar) && bidiResult;
   }
-  
+
   return CInnerConverter::stdConvert(Utf8toW, utf8StringSrc, wStringDst, failOnBadChar);
 }
 
@@ -779,7 +779,7 @@ bool CCharsetConverter::ToUtf8(const std::string& strSourceCharset, const std::s
     utf8StringDst = stringSrc;
     return true;
   }
-  
+
   return CInnerConverter::customConvert(strSourceCharset, "UTF-8", stringSrc, utf8StringDst, failOnBadChar);
 }
 
diff --git a/xbmc/utils/CharsetDetection.cpp b/xbmc/utils/CharsetDetection.cpp
index d2c76f8bd7..59b33056d3 100644
--- a/xbmc/utils/CharsetDetection.cpp
+++ b/xbmc/utils/CharsetDetection.cpp
@@ -26,7 +26,7 @@
 #include "LangInfo.h"
 #include "utils/log.h"
 
-/* XML declaration can be virtually any size (with many-many whitespaces) 
+/* XML declaration can be virtually any size (with many-many whitespaces)
  * but for in real world we don't need to process megabytes of data
  * so limit search for XML declaration to reasonable value */
 const size_t CCharsetDetection::m_XmlDeclarationMaxLength = 250;
@@ -92,7 +92,7 @@ bool CCharsetDetection::DetectXmlEncoding(const char* const xmlContent, const si
       if (detectedEncoding == "UTF-7")
         return true;
 
-      /* XML declaration was detected in UTF-8 mode (by 'GetXmlEncodingFromDeclaration') so we know 
+      /* XML declaration was detected in UTF-8 mode (by 'GetXmlEncodingFromDeclaration') so we know
        * that text in single byte encoding, but declaration itself wrongly specify multibyte encoding */
       detectedEncoding.clear();
       return false;
@@ -283,7 +283,7 @@ bool CCharsetDetection::ConvertHtmlToUtf8(const std::string& htmlContent, std::s
     usedHtmlCharset = "UTF-8"; // any charset can be used for empty content, use UTF-8 as default
     return false;
   }
-  
+
   // this is relaxed implementation of http://www.w3.org/TR/2013/CR-html5-20130806/single-page.html#determining-the-character-encoding
 
   // try to get charset from Byte Order Mark
@@ -510,7 +510,7 @@ std::string CCharsetDetection::GetHtmlEncodingFromHead(const std::string& htmlCo
 
     if (pos == std::string::npos)
       return "";
-  
+
     // "next byte" label
     pos++;
   }
@@ -576,7 +576,7 @@ size_t CCharsetDetection::GetHtmlAttribute(const std::string& htmlContent, size_
     }
     return std::string::npos; // no closing quote is found
   }
-   
+
   appendCharAsAsciiUpperCase(attrValue, htmlC[pos]);
   pos++;
 
diff --git a/xbmc/utils/CharsetDetection.h b/xbmc/utils/CharsetDetection.h
index 2af5745e58..ea66d55622 100644
--- a/xbmc/utils/CharsetDetection.h
+++ b/xbmc/utils/CharsetDetection.h
@@ -56,7 +56,7 @@ public:
    * @return true if charset is properly detected and HTML is correctly converted, false if charset is only guessed
    */
   static inline bool ConvertHtmlToUtf8(const std::string& htmlContent, std::string& converted, const std::string& serverReportedCharset = "")
-  { 
+  {
     std::string usedHtmlCharset;
     return ConvertHtmlToUtf8(htmlContent, converted, serverReportedCharset, usedHtmlCharset);
   }
diff --git a/xbmc/utils/FileUtils.cpp b/xbmc/utils/FileUtils.cpp
index cc3d7f2a28..9502ec40b7 100644
--- a/xbmc/utils/FileUtils.cpp
+++ b/xbmc/utils/FileUtils.cpp
@@ -138,7 +138,7 @@ bool CFileUtils::RemoteAccessAllowed(const std::string &strPath)
   {
     std::string strPlaylistsPath = CServiceBroker::GetSettings().GetString(CSettings::SETTING_SYSTEM_PLAYLISTSPATH);
     URIUtils::RemoveSlashAtEnd(strPlaylistsPath);
-    if (StringUtils::StartsWithNoCase(realPath, strPlaylistsPath)) 
+    if (StringUtils::StartsWithNoCase(realPath, strPlaylistsPath))
       return true;
   }
   bool isSource;
diff --git a/xbmc/utils/GlobalsHandling.h b/xbmc/utils/GlobalsHandling.h
index 6f5dd23eba..c552f97c33 100644
--- a/xbmc/utils/GlobalsHandling.h
+++ b/xbmc/utils/GlobalsHandling.h
@@ -26,17 +26,17 @@
  * This file contains the pattern for moving "globals" from the BSS Segment to the heap.
  * A note on usage of this pattern for globals replacement:
  *
- * This pattern uses a singleton pattern and some compiler/C preprocessor sugar to allow 
- * "global" variables to be lazy instantiated and initialized and moved from the BSS segment 
- * to the heap (that is, they are instantiated on the heap when they are first used rather 
- * than relying on the startup code to initialize the BSS segment). This eliminates the 
+ * This pattern uses a singleton pattern and some compiler/C preprocessor sugar to allow
+ * "global" variables to be lazy instantiated and initialized and moved from the BSS segment
+ * to the heap (that is, they are instantiated on the heap when they are first used rather
+ * than relying on the startup code to initialize the BSS segment). This eliminates the
  * problem associated with global variable dependencies across compilation units.
  *
- * Reference counting from the BSS segment is used to destruct these globals at the time the 
- * last compilation unit that knows about it is finalized by the post-main shutdown. The book 
- * keeping is done by smuggling a smart pointer into every file that references a particular 
- * "global class" through the use of a 'static' declaration of an instance of that smart 
- * pointer in the header file of the global class (did you ever think you'd see a file scope 
+ * Reference counting from the BSS segment is used to destruct these globals at the time the
+ * last compilation unit that knows about it is finalized by the post-main shutdown. The book
+ * keeping is done by smuggling a smart pointer into every file that references a particular
+ * "global class" through the use of a 'static' declaration of an instance of that smart
+ * pointer in the header file of the global class (did you ever think you'd see a file scope
  * 'static' variable in a header file - on purpose?)
  *
  * There are two different ways to use this pattern when replacing global variables.
@@ -106,12 +106,12 @@ namespace xbmcutil
    *
    * Currently THIS IS NOT THREAD SAFE! Why not just add a lock you ask?
    *  Because this singleton is used to initialize global variables and
-   *  there is an issue with having the lock used prior to its 
+   *  there is an issue with having the lock used prior to its
    *  initialization. No matter what, if this class is used as a replacement
    *  for global variables there's going to be a race condition if it's used
    *  anywhere else. So currently this is the only prescribed use.
    *
-   * Therefore this hack depends on the fact that compilation unit global/static 
+   * Therefore this hack depends on the fact that compilation unit global/static
    *  initialization is done in a single thread.
    */
   template <class T> class GlobalsSingleton
@@ -131,15 +131,15 @@ namespace xbmcutil
 
     /**
      * Is it possible that getInstance can be called prior to the shared_ptr 'instance'
-     *  being initialized as a global? If so, then the shared_ptr constructor would 
-     *  effectively 'reset' the shared pointer after it had been set by the prior 
-     *  getInstance call, and a second instance would be created. We really don't 
+     *  being initialized as a global? If so, then the shared_ptr constructor would
+     *  effectively 'reset' the shared pointer after it had been set by the prior
+     *  getInstance call, and a second instance would be created. We really don't
      *  want this to happen so 'instance' is a pointer to a smart pointer so that
-     *  we can deterministically handle its construction. It is guarded by the 
+     *  we can deterministically handle its construction. It is guarded by the
      *  Deleter class above so that when the bss segment that this static is
      *  sitting in is deinitialized, the shared_ptr pointer will be cleaned up.
      */
-    static Deleter<std::shared_ptr<T> > instance; 
+    static Deleter<std::shared_ptr<T> > instance;
 
     /**
      * See 'getQuick' below.
@@ -148,7 +148,7 @@ namespace xbmcutil
   public:
 
     /**
-     * Retrieve an instance of the singleton using a shared pointer for 
+     * Retrieve an instance of the singleton using a shared pointer for
      *  reference counting.
      */
     inline static std::shared_ptr<T> getInstance()
@@ -165,7 +165,7 @@ namespace xbmcutil
     /**
      * This is for quick access when using form (2) of the pattern. Before 'mdd' points
      * it out, this might be a case of 'solving problems we don't have' but this access
-     * is used frequently within the event loop so any help here should benefit the 
+     * is used frequently within the event loop so any help here should benefit the
      * overall performance and there is nothing complicated or tricky here and not
      * a lot of code to maintain.
      */
@@ -183,19 +183,19 @@ namespace xbmcutil
   template <class T> T* GlobalsSingleton<T>::quick;
 
   /**
-   * This is another bit of hackery that will act as a flag for 
+   * This is another bit of hackery that will act as a flag for
    *  whether or not a global/static has been initialized yet. An instance
    *  should be placed in the cpp file after the static/global it's meant to
-   *  monitor. 
+   *  monitor.
    */
   class InitFlag {  public:  explicit InitFlag(bool& flag) { flag = true; }  };
 }
 
 /**
  * For pattern (2) above, you can use the following macro. This pattern is safe to
- * use in all cases but may be very slightly less efficient. 
+ * use in all cases but may be very slightly less efficient.
  *
- * Also, you must also use a #define to replace the actual global variable since 
+ * Also, you must also use a #define to replace the actual global variable since
  * there's no way to use a macro to add a #define. An example would be:
  *
  * XBMC_GLOBAL_REF(CWinSystemWin32DX, g_Windowing);
diff --git a/xbmc/utils/HTMLUtil.cpp b/xbmc/utils/HTMLUtil.cpp
index 1cdc6e6c0e..b3e9481a58 100644
--- a/xbmc/utils/HTMLUtil.cpp
+++ b/xbmc/utils/HTMLUtil.cpp
@@ -223,7 +223,7 @@ void CHTMLUtil::ConvertHTMLToW(const std::wstring& strHTML, std::wstring& strStr
     size_t i = iPos;
     while (iPos < strStripped.size() &&
           (base == 16 ? iswxdigit(strStripped[iPos]) : iswdigit(strStripped[iPos])))
-      iPos++; 
+      iPos++;
 
     num = strStripped.substr(i, iPos-i);
     wchar_t val = (wchar_t)wcstol(num.c_str(),NULL,base);
diff --git a/xbmc/utils/HttpHeader.cpp b/xbmc/utils/HttpHeader.cpp
index 829fb0a007..883d8f7412 100644
--- a/xbmc/utils/HttpHeader.cpp
+++ b/xbmc/utils/HttpHeader.cpp
@@ -50,7 +50,7 @@ void CHttpHeader::Parse(const std::string& strData)
 
     const size_t nextLine = lineEnd + 1;
     if (lineEnd > pos && strDataC[lineEnd - 1] == '\x0d') // use '\x0d' instead of '\r' to be platform independent
-      lineEnd--; 
+      lineEnd--;
 
     if (m_headerdone)
       Clear(); // clear previous header and process new one
@@ -113,7 +113,7 @@ void CHttpHeader::AddParam(const std::string& param, const std::string& value, c
   if (overwrite)
   { // delete ALL parameters with the same name
     // note: 'GetValue' always returns last added parameter,
-    //       so you probably don't need to overwrite 
+    //       so you probably don't need to overwrite
     for (size_t i = 0; i < m_params.size();)
     {
       if (m_params[i].first == paramLower)
diff --git a/xbmc/utils/HttpParser.cpp b/xbmc/utils/HttpParser.cpp
index 901f67df7c..2c7c4bc433 100644
--- a/xbmc/utils/HttpParser.cpp
+++ b/xbmc/utils/HttpParser.cpp
@@ -102,7 +102,7 @@ HttpParser::parseHeader()
         State nextState = p_error;
 
         for ( unsigned d = 0; d < sizeof(fsm) / sizeof(FSM); ++d ) {
-            if ( fsm[d].curState == _state && 
+            if ( fsm[d].curState == _state &&
                     ( c == fsm[d].c || fsm[d].c == ANY ) ) {
 
                 nextState = fsm[d].nextState;
@@ -227,7 +227,7 @@ HttpParser::getQueryString() const
     return pos;
 }
 
-const char* 
+const char*
 HttpParser::getBody() const
 {
     if ( _contentLength > 0 ) {
@@ -238,7 +238,7 @@ HttpParser::getBody() const
 }
 
 // key should be in lower case.
-const char* 
+const char*
 HttpParser::getValue( const char* key ) const
 {
     for( IntArray::const_iterator iter = _keys.begin();
diff --git a/xbmc/utils/HttpParser.h b/xbmc/utils/HttpParser.h
index 2db2a9ad4f..86d3a0bd19 100644
--- a/xbmc/utils/HttpParser.h
+++ b/xbmc/utils/HttpParser.h
@@ -30,13 +30,13 @@
 #include <string>
 #include <string.h>
 
-// A class to incrementally parse an HTTP header as it comes in. It 
-// lets you know when it has received all required bytes, as specified 
+// A class to incrementally parse an HTTP header as it comes in. It
+// lets you know when it has received all required bytes, as specified
 // by the content-length header (if present). If there is no content-length,
 // it will stop reading after the final "\n\r".
 //
 // Example usage:
-// 
+//
 //    HttpParser parser;
 //    HttpParser::status_t status;
 //
@@ -86,7 +86,7 @@ private:
     unsigned _contentLength;
     unsigned _contentStart;
     unsigned _uriIndex;
-    
+
     typedef std::vector<unsigned> IntArray;
     IntArray _keys;
 
diff --git a/xbmc/utils/HttpResponse.cpp b/xbmc/utils/HttpResponse.cpp
index a03725c9df..bb986414f0 100644
--- a/xbmc/utils/HttpResponse.cpp
+++ b/xbmc/utils/HttpResponse.cpp
@@ -17,7 +17,7 @@
  *  <http://www.gnu.org/licenses/>.
  *
  */
- 
+
 #include <stdio.h>
 
 #include "HttpResponse.h"
diff --git a/xbmc/utils/Job.h b/xbmc/utils/Job.h
index d77733b6df..c23d4a7e16 100644
--- a/xbmc/utils/Job.h
+++ b/xbmc/utils/Job.h
@@ -44,18 +44,18 @@ class IJobCallback
 public:
   /*!
    \brief Destructor for job call back objects.
-   
+
    \sa CJobManager and CJob
    */
   virtual ~IJobCallback() = default;
 
   /*!
    \brief The callback used when a job completes.
-   
+
    OnJobComplete is called at the completion of the job's DoWork() function, and is used
    to return information to the caller on the result of the job.  On returning form this function
    the CJobManager will destroy this job.
-   
+
    \param jobID the unique id of the job (as retrieved from CJobManager::AddJob)
    \param success the result from the DoWork call
    \param job the job that has been processed.  The job will be destroyed after this function returns
@@ -65,10 +65,10 @@ public:
 
   /*!
    \brief An optional callback function that a job may call while processing.
-   
+
    OnJobProgress may be called periodically by a job during it's DoWork() function.  It is used
    by the job to report on progress.
-   
+
    \param jobID the unique id of the job (as retrieved from CJobManager::AddJob)
    \param progress the current progress of the job, out of total.
    \param total the total amount of work to be processed.
@@ -83,20 +83,20 @@ class CJobManager;
 /*!
  \ingroup jobs
  \brief Base class for jobs that are executed asynchronously.
- 
+
  Clients of the CJobManager should subclass CJob and provide the DoWork() function. Data should be
  passed to the job on creation, and any data sharing between the job and the client should be kept to within
  the callback functions if possible, and guarded with critical sections as appropriate.
- 
+
  Jobs typically fall into two groups: small jobs that perform a single function, and larger jobs that perform a
  sequence of functions.  Clients with small jobs should implement the IJobCallback::OnJobComplete() callback to receive results.
  Clients with larger jobs may wish to implement both the IJobCallback::OnJobComplete() and IJobCallback::OnJobProgress()
  callbacks to receive updates.  Jobs may be cancelled at any point by the client via CJobManager::CancelJob(), however
  effort should be taken to ensure that any callbacks and cancellation is suitably guarded against simultaneous thread access.
- 
+
  Handling cancellation of jobs within the OnJobProgress callback is a threadsafe operation, as all execution is
  then in the Job thread.
- 
+
  \sa CJobManager and IJobCallback
  */
 class CJob
@@ -117,32 +117,32 @@ public:
 
   /*!
    \brief Destructor for job objects.
-   
+
    Jobs are destroyed by the CJobManager after the OnJobComplete() callback is complete.
    CJob subclasses  should therefore supply a virtual destructor to cleanup any memory allocated by
    complete or cancelled jobs.
-   
+
    \sa CJobManager
    */
   virtual ~CJob() = default;
 
   /*!
    \brief Main workhorse function of CJob instances
-   
+
    All CJob subclasses must implement this function, performing all processing.  Once this function
    is complete, the OnJobComplete() callback is called, and the job is then destroyed.
-   
+
    \sa CJobManager, IJobCallback::OnJobComplete()
    */
   virtual bool DoWork() = 0;  // function to do the work
 
   /*!
    \brief Function that returns the type of job.
-   
+
    CJob subclasses may optionally implement this function to specify the type of job.
    This is useful for the CJobManager::AddLIFOJob() routine, which preempts similar jobs
    with the new job.
-   
+
    \return a unique character string describing the job.
    \sa CJobManager
    */
@@ -155,14 +155,14 @@ public:
 
   /*!
    \brief Function for longer jobs to report progress and check whether they have been cancelled.
-   
+
    Jobs that contain loops that may take time should check this routine each iteration of the loop,
    both to (optionally) report progress, and to check for cancellation.
-   
-   \param progress the amount of the job performed, out of total. 
+
+   \param progress the amount of the job performed, out of total.
    \param total the total amount of processing to be performed
    \return if true, the job has been asked to cancel.
-   
+
    \sa IJobCallback::OnJobProgress()
    */
   virtual bool ShouldCancel(unsigned int progress, unsigned int total) const;
diff --git a/xbmc/utils/JobManager.h b/xbmc/utils/JobManager.h
index 3cf8466c6d..c0373749d5 100644
--- a/xbmc/utils/JobManager.h
+++ b/xbmc/utils/JobManager.h
@@ -171,10 +171,10 @@ public:
 protected:
   /*!
    \brief Returns if we still have jobs waiting to be processed
-   NOTE: This function does not take into account the jobs that are currently processing 
+   NOTE: This function does not take into account the jobs that are currently processing
    */
   bool QueueEmpty() const;
-  
+
 private:
   void QueueNextJob();
 
diff --git a/xbmc/utils/LabelFormatter.cpp b/xbmc/utils/LabelFormatter.cpp
index 9e3ed4da13..e2c56b9776 100644
--- a/xbmc/utils/LabelFormatter.cpp
+++ b/xbmc/utils/LabelFormatter.cpp
@@ -379,7 +379,7 @@ void CLabelFormatter::SplitMask(unsigned int label, const std::string &mask)
   while ((findStart = reg.RegFind(work.c_str())) >= 0)
   { // we've found a match
     m_staticContent[label].push_back(work.substr(0, findStart));
-    m_dynamicContent[label].push_back(CMaskString("", 
+    m_dynamicContent[label].push_back(CMaskString("",
           reg.GetMatch(1)[0], ""));
     work = work.substr(findStart + reg.GetFindLen());
   }
diff --git a/xbmc/utils/LabelFormatter.h b/xbmc/utils/LabelFormatter.h
index 9111953fb4..6ad5968aa8 100644
--- a/xbmc/utils/LabelFormatter.h
+++ b/xbmc/utils/LabelFormatter.h
@@ -66,7 +66,7 @@ private:
     CMaskString(const std::string &prefix, char content, const std::string &postfix) :
       m_prefix(prefix),
       m_postfix(postfix),
-      m_content(content)      
+      m_content(content)
     {};
     std::string m_prefix;
     std::string m_postfix;
diff --git a/xbmc/utils/LangCodeExpander.cpp b/xbmc/utils/LangCodeExpander.cpp
index 369344b5fd..f104423951 100644
--- a/xbmc/utils/LangCodeExpander.cpp
+++ b/xbmc/utils/LangCodeExpander.cpp
@@ -27,7 +27,7 @@
 #include "utils/XBMCTinyXML.h"
 
 #define MAKECODE(a, b, c, d)  ((((long)(a)) << 24) | (((long)(b)) << 16) | (((long)(c)) << 8) | (long)(d))
-#define MAKETWOCHARCODE(a, b) ((((long)(a)) << 8) | (long)(b)) 
+#define MAKETWOCHARCODE(a, b) ((((long)(a)) << 8) | (long)(b))
 
 typedef struct LCENTRY
 {
diff --git a/xbmc/utils/LangCodeExpander.h b/xbmc/utils/LangCodeExpander.h
index a3ab42ea50..c6e92db2f8 100644
--- a/xbmc/utils/LangCodeExpander.h
+++ b/xbmc/utils/LangCodeExpander.h
@@ -50,7 +50,7 @@ public:
   *   \param[in] lang2 The second language string to compare given as english language name.
   *   \return true if the two language strings represent the same language, false otherwise.
   *   For example "Abkhaz" and "Abkhazian" represent the same language.
-  */ 
+  */
   bool CompareFullLanguageNames(const std::string& lang1, const std::string& lang2);
 
   /** \brief Determines if two languages given as ISO 639-1, ISO 639-2/T, or ISO 639-2/B codes represent the same language.
@@ -58,16 +58,16 @@ public:
   *   \param[in] code2 The second language to compare given as ISO 639-1, ISO 639-2/T, or ISO 639-2/B code.
   *   \return true if the two language codes represent the same language, false otherwise.
   *   For example "ger", "deu" and "de" represent the same language.
-  */ 
+  */
   bool CompareISO639Codes(const std::string& code1, const std::string& code2);
 
   /** \brief Converts a language given as 2-Char (ISO 639-1),
   *          3-Char (ISO 639-2/T or ISO 639-2/B),
-  *          or full english name string to a 2-Char (ISO 639-1) code.  
+  *          or full english name string to a 2-Char (ISO 639-1) code.
   *   \param[out] code The 2-Char language code of the given language lang.
   *   \param[in] lang The language that should be converted.
-  *   \return true if the conversion succeeded, false otherwise. 
-  */ 
+  *   \return true if the conversion succeeded, false otherwise.
+  */
   bool ConvertToISO6391(const std::string& lang, std::string& code);
 
   /** \brief Converts a language given as 2-Char (ISO 639-1),
@@ -126,7 +126,7 @@ protected:
   *          to its string representation.
   *   \param[in] code The language code given as a long, see #MAKECODE(a, b, c, d).
   *   \param[out] ret The string representation of the given language code code.
-  */ 
+  */
   static void CodeToString(long code, std::string& ret);
 
   static bool LookupInISO639Tables(const std::string& code, std::string& desc);
@@ -137,7 +137,7 @@ protected:
   *   \param[in] desc The english language name for which a code is looked for.
   *   \param[out] code The ISO 639-1, ISO 639-2/T, or ISO 639-2/B code of the given language desc.
   *   \return true if the a code was found, false otherwise.
-  */ 
+  */
   bool ReverseLookup(const std::string& desc, std::string& code);
 
 
diff --git a/xbmc/utils/Locale.h b/xbmc/utils/Locale.h
index 3e1e47cd72..f8a63d447f 100644
--- a/xbmc/utils/Locale.h
+++ b/xbmc/utils/Locale.h
@@ -43,7 +43,7 @@ public:
 
   /*!
    \brief Parses the given string representation and turns it into a locale.
-   
+
    \param locale String representation of a locale
    */
   static CLocale FromString(const std::string& locale);
@@ -57,7 +57,7 @@ public:
    \details A locale is considered valid if at least the language code is set.
    */
   bool IsValid() const { return m_valid; }
-  
+
   /*!
    \brief Returns the (lower-case) ISO 639-1 language code of the locale.
    */
@@ -74,7 +74,7 @@ public:
    \brief Returns the modifier of the locale.
    */
   const std::string& GetModifier() const { return m_modifier; }
-  
+
   /*!
    \brief Returns the full string representation of the locale.
 
@@ -111,7 +111,7 @@ public:
    ISO 3166-1 Alpha-2 code.
    */
   std::string ToShortStringLC() const;
-  
+
   /*!
    \brief Checks if the given string representation of a locale exactly matches
           the locale.
diff --git a/xbmc/utils/Mime.cpp b/xbmc/utils/Mime.cpp
index b36b23c38d..e61ceea02e 100644
--- a/xbmc/utils/Mime.cpp
+++ b/xbmc/utils/Mime.cpp
@@ -547,7 +547,7 @@ std::string CMime::GetMimeType(const CFileItem &item)
 
 std::string CMime::GetMimeType(const CURL &url, bool lookup)
 {
-  
+
   std::string strMimeType;
 
   if( url.IsProtocol("shout") || url.IsProtocol("http") || url.IsProtocol("https"))
diff --git a/xbmc/utils/Observer.cpp b/xbmc/utils/Observer.cpp
index ef7e867574..f32b1f3d3e 100644
--- a/xbmc/utils/Observer.cpp
+++ b/xbmc/utils/Observer.cpp
@@ -59,7 +59,7 @@ void Observable::UnregisterObserver(Observer *obs)
 
 void Observable::NotifyObservers(const ObservableMessage message /* = ObservableMessageNone */)
 {
-  // Make sure the set/compare is atomic 
+  // Make sure the set/compare is atomic
   // so we don't clobber the variable in a race condition
   auto bNotify = m_bObservableChanged.exchange(false);
 
diff --git a/xbmc/utils/POUtils.cpp b/xbmc/utils/POUtils.cpp
index 6937fafb2d..62facddac4 100644
--- a/xbmc/utils/POUtils.cpp
+++ b/xbmc/utils/POUtils.cpp
@@ -48,7 +48,7 @@ bool CPODocument::LoadFile(const std::string &pofilename)
     CLog::Log(LOGERROR, "%s: can't load file \"%s\" or file is too small", __FUNCTION__,  pofilename.c_str());
     return false;
   }
-  
+
   m_strBuffer = '\n';
   m_strBuffer.append(buf.get(), buf.size());
   buf.clear();
@@ -221,7 +221,7 @@ std::string CPODocument::UnescapeString(const std::string &strInput)
         case '\'': oescchar = '\''; break;
         case '\\': oescchar = '\\'; break;
 
-        default: 
+        default:
         {
           CLog::Log(LOGERROR,
                     "POParser: warning, unhandled escape character. Problematic entry: %s",
diff --git a/xbmc/utils/RecentlyAddedJob.cpp b/xbmc/utils/RecentlyAddedJob.cpp
index 355d8cb681..43d80803e6 100644
--- a/xbmc/utils/RecentlyAddedJob.cpp
+++ b/xbmc/utils/RecentlyAddedJob.cpp
@@ -41,7 +41,7 @@
 CRecentlyAddedJob::CRecentlyAddedJob(int flag)
 {
   m_flag = flag;
-} 
+}
 
 bool CRecentlyAddedJob::UpdateVideo()
 {
@@ -57,17 +57,17 @@ bool CRecentlyAddedJob::UpdateVideo()
   CVideoDatabase videodatabase;
   CVideoThumbLoader loader;
   loader.OnLoaderStart();
-  
+
   videodatabase.Open();
 
   if (videodatabase.GetRecentlyAddedMoviesNav("videodb://recentlyaddedmovies/", items, NUM_ITEMS))
-  {  
+  {
     for (; i < items.Size(); ++i)
     {
       auto item = items.Get(i);
       std::string   value = StringUtils::Format("%i", i + 1);
       std::string   strRating = StringUtils::Format("%.1f", item->GetVideoInfoTag()->GetRating().rating);
-      
+
       home->SetProperty("LatestMovie." + value + ".Title"       , item->GetLabel());
       home->SetProperty("LatestMovie." + value + ".Rating"      , strRating);
       home->SetProperty("LatestMovie." + value + ".Year"        , item->GetVideoInfoTag()->GetYear());
@@ -82,7 +82,7 @@ bool CRecentlyAddedJob::UpdateVideo()
       home->SetProperty("LatestMovie." + value + ".Thumb"       , item->GetArt("thumb"));
       home->SetProperty("LatestMovie." + value + ".Fanart"      , item->GetArt("fanart"));
     }
-  } 
+  }
   for (; i < NUM_ITEMS; ++i)
   {
     std::string value = StringUtils::Format("%i", i + 1);
@@ -96,10 +96,10 @@ bool CRecentlyAddedJob::UpdateVideo()
     home->SetProperty("LatestMovie." + value + ".Trailer"     , "");
     home->SetProperty("LatestMovie." + value + ".Fanart"      , "");
   }
- 
+
   i = 0;
-  CFileItemList  TVShowItems; 
- 
+  CFileItemList  TVShowItems;
+
   if (videodatabase.GetRecentlyAddedEpisodesNav("videodb://recentlyaddedepisodes/", TVShowItems, NUM_ITEMS))
   {
     for (; i < TVShowItems.Size(); ++i)
@@ -113,7 +113,7 @@ bool CRecentlyAddedJob::UpdateVideo()
 
       home->SetProperty("LatestEpisode." + value + ".ShowTitle"     , item->GetVideoInfoTag()->m_strShowTitle);
       home->SetProperty("LatestEpisode." + value + ".EpisodeTitle"  , item->GetVideoInfoTag()->m_strTitle);
-      home->SetProperty("LatestEpisode." + value + ".Rating"        , strRating);      
+      home->SetProperty("LatestEpisode." + value + ".Rating"        , strRating);
       home->SetProperty("LatestEpisode." + value + ".Plot"          , item->GetVideoInfoTag()->m_strPlot);
       home->SetProperty("LatestEpisode." + value + ".EpisodeNo"     , EpisodeNo);
       home->SetProperty("LatestEpisode." + value + ".EpisodeSeason" , EpisodeSeason);
@@ -132,13 +132,13 @@ bool CRecentlyAddedJob::UpdateVideo()
       home->SetProperty("LatestEpisode." + value + ".SeasonThumb"   , seasonThumb);
       home->SetProperty("LatestEpisode." + value + ".Fanart"        , item->GetArt("fanart"));
     }
-  } 
+  }
   for (; i < NUM_ITEMS; ++i)
   {
     std::string value = StringUtils::Format("%i", i + 1);
     home->SetProperty("LatestEpisode." + value + ".ShowTitle"     , "");
     home->SetProperty("LatestEpisode." + value + ".EpisodeTitle"  , "");
-    home->SetProperty("LatestEpisode." + value + ".Rating"        , "");      
+    home->SetProperty("LatestEpisode." + value + ".Rating"        , "");
     home->SetProperty("LatestEpisode." + value + ".Plot"          , "");
     home->SetProperty("LatestEpisode." + value + ".EpisodeNo"     , "");
     home->SetProperty("LatestEpisode." + value + ".EpisodeSeason" , "");
@@ -148,7 +148,7 @@ bool CRecentlyAddedJob::UpdateVideo()
     home->SetProperty("LatestEpisode." + value + ".ShowThumb"     , "");
     home->SetProperty("LatestEpisode." + value + ".SeasonThumb"   , "");
     home->SetProperty("LatestEpisode." + value + ".Fanart"        , "");
-  }  
+  }
 
   i = 0;
   CFileItemList MusicVideoItems;
@@ -194,10 +194,10 @@ bool CRecentlyAddedJob::UpdateVideo()
 bool CRecentlyAddedJob::UpdateMusic()
 {
   auto home = CServiceBroker::GetGUI()->GetWindowManager().GetWindow(WINDOW_HOME);
-  
+
   if ( home == nullptr )
     return false;
-  
+
   CLog::Log(LOGDEBUG, "CRecentlyAddedJob::UpdateMusic() - Running RecentlyAdded home screen update");
 
   int            i = 0;
@@ -205,9 +205,9 @@ bool CRecentlyAddedJob::UpdateMusic()
   CMusicDatabase musicdatabase;
   CMusicThumbLoader loader;
   loader.OnLoaderStart();
-  
+
   musicdatabase.Open();
-  
+
   if (musicdatabase.GetRecentlyAddedAlbumSongs("musicdb://songs/", musicItems, NUM_ITEMS))
   {
     long idAlbum = -1;
@@ -217,7 +217,7 @@ bool CRecentlyAddedJob::UpdateMusic()
     {
       auto item = musicItems.Get(i);
       std::string   value = StringUtils::Format("%d", i + 1);
-      
+
       std::string   strRating;
       std::string   strAlbum  = item->GetMusicInfoTag()->GetAlbum();
       std::string   strArtist = item->GetMusicInfoTag()->GetArtistString();
@@ -236,10 +236,10 @@ bool CRecentlyAddedJob::UpdateMusic()
       }
 
       strRating = StringUtils::Format("%c", item->GetMusicInfoTag()->GetUserrating());
-      
+
       home->SetProperty("LatestSong." + value + ".Title"   , item->GetMusicInfoTag()->GetTitle());
       home->SetProperty("LatestSong." + value + ".Year"    , item->GetMusicInfoTag()->GetYear());
-      home->SetProperty("LatestSong." + value + ".Artist"  , strArtist);      
+      home->SetProperty("LatestSong." + value + ".Artist"  , strArtist);
       home->SetProperty("LatestSong." + value + ".Album"   , strAlbum);
       home->SetProperty("LatestSong." + value + ".Rating"  , strRating);
       home->SetProperty("LatestSong." + value + ".Path"    , item->GetMusicInfoTag()->GetURL());
@@ -252,17 +252,17 @@ bool CRecentlyAddedJob::UpdateMusic()
     std::string value = StringUtils::Format("%i", i + 1);
     home->SetProperty("LatestSong." + value + ".Title"   , "");
     home->SetProperty("LatestSong." + value + ".Year"    , "");
-    home->SetProperty("LatestSong." + value + ".Artist"  , "");      
+    home->SetProperty("LatestSong." + value + ".Artist"  , "");
     home->SetProperty("LatestSong." + value + ".Album"   , "");
     home->SetProperty("LatestSong." + value + ".Rating"  , "");
     home->SetProperty("LatestSong." + value + ".Path"    , "");
     home->SetProperty("LatestSong." + value + ".Thumb"   , "");
     home->SetProperty("LatestSong." + value + ".Fanart"  , "");
   }
-  
+
   i = 0;
   VECALBUMS albums;
-  
+
   if (musicdatabase.GetRecentlyAddedAlbums(albums, NUM_ITEMS))
   {
     size_t j = 0;
@@ -288,7 +288,7 @@ bool CRecentlyAddedJob::UpdateMusic()
       }
 
       std::string strDBpath = StringUtils::Format("musicdb://albums/%li/", album.idAlbum);
-      
+
       home->SetProperty("LatestAlbum." + value + ".Title"   , album.strAlbum);
       home->SetProperty("LatestAlbum." + value + ".Year"    , album.iYear);
       home->SetProperty("LatestAlbum." + value + ".Artist"  , album.GetAlbumArtistString());
@@ -304,13 +304,13 @@ bool CRecentlyAddedJob::UpdateMusic()
     std::string value = StringUtils::Format("%i", i + 1);
     home->SetProperty("LatestAlbum." + value + ".Title"   , "");
     home->SetProperty("LatestAlbum." + value + ".Year"    , "");
-    home->SetProperty("LatestAlbum." + value + ".Artist"  , "");      
+    home->SetProperty("LatestAlbum." + value + ".Artist"  , "");
     home->SetProperty("LatestAlbum." + value + ".Rating"  , "");
     home->SetProperty("LatestAlbum." + value + ".Path"    , "");
     home->SetProperty("LatestAlbum." + value + ".Thumb"   , "");
-    home->SetProperty("LatestAlbum." + value + ".Fanart"  , "");            
+    home->SetProperty("LatestAlbum." + value + ".Fanart"  , "");
   }
-  
+
   musicdatabase.Close();
   return true;
 }
@@ -318,15 +318,15 @@ bool CRecentlyAddedJob::UpdateMusic()
 bool CRecentlyAddedJob::UpdateTotal()
 {
   auto home = CServiceBroker::GetGUI()->GetWindowManager().GetWindow(WINDOW_HOME);
-  
+
   if ( home == nullptr )
     return false;
-  
+
   CLog::Log(LOGDEBUG, "CRecentlyAddedJob::UpdateTotal() - Running RecentlyAdded home screen update");
-  
-  CVideoDatabase videodatabase;  
+
+  CVideoDatabase videodatabase;
   CMusicDatabase musicdatabase;
-  
+
   musicdatabase.Open();
 
   CMusicDbUrl musicUrl;
@@ -343,7 +343,7 @@ bool CRecentlyAddedJob::UpdateTotal()
   int MusSongTotals   = atoi(musicdatabase.GetSingleValue("songview"       , "count(1)").c_str());
   int MusAlbumTotals  = atoi(musicdatabase.GetSingleValue("songview"       , "count(distinct strAlbum)").c_str());
   musicdatabase.Close();
- 
+
   videodatabase.Open();
   int tvShowCount     = atoi(videodatabase.GetSingleValue("tvshow_view"     , "count(1)").c_str());
   int movieTotals     = atoi(videodatabase.GetSingleValue("movie_view"      , "count(1)").c_str());
@@ -354,13 +354,13 @@ bool CRecentlyAddedJob::UpdateTotal()
   int EpCount         = atoi(videodatabase.GetSingleValue("tvshow_view"     , "sum(totalcount)").c_str());
   int TvShowsWatched  = atoi(videodatabase.GetSingleValue("tvshow_view"     , "sum(watchedcount = totalcount)").c_str());
   videodatabase.Close();
-  
+
   home->SetProperty("TVShows.Count"         , tvShowCount);
   home->SetProperty("TVShows.Watched"       , TvShowsWatched);
   home->SetProperty("TVShows.UnWatched"     , tvShowCount - TvShowsWatched);
   home->SetProperty("Episodes.Count"        , EpCount);
   home->SetProperty("Episodes.Watched"      , EpWatched);
-  home->SetProperty("Episodes.UnWatched"    , EpCount-EpWatched);  
+  home->SetProperty("Episodes.UnWatched"    , EpCount-EpWatched);
   home->SetProperty("Movies.Count"          , movieTotals);
   home->SetProperty("Movies.Watched"        , movieWatched);
   home->SetProperty("Movies.UnWatched"      , movieTotals - movieWatched);
@@ -370,7 +370,7 @@ bool CRecentlyAddedJob::UpdateTotal()
   home->SetProperty("Music.SongsCount"      , MusSongTotals);
   home->SetProperty("Music.AlbumsCount"     , MusAlbumTotals);
   home->SetProperty("Music.ArtistsCount"    , MusArtistTotals);
-  
+
   return true;
 }
 
@@ -380,12 +380,12 @@ bool CRecentlyAddedJob::DoWork()
   bool ret = true;
   if (m_flag & Audio)
     ret &= UpdateMusic();
-  
+
   if (m_flag & Video)
     ret &= UpdateVideo();
-  
+
   if (m_flag & Totals)
     ret &= UpdateTotal();
-    
-  return ret; 
+
+  return ret;
 }
diff --git a/xbmc/utils/RegExp.cpp b/xbmc/utils/RegExp.cpp
index ad017dedbc..a905998c65 100644
--- a/xbmc/utils/RegExp.cpp
+++ b/xbmc/utils/RegExp.cpp
@@ -20,7 +20,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <algorithm> 
+#include <algorithm>
 #include "RegExp.h"
 #include "log.h"
 #include "utils/StringUtils.h"
@@ -348,7 +348,7 @@ int CRegExp::PrivateRegFind(size_t bufferLen, const char *str, unsigned int star
   {
     CLog::Log(LOGERROR, "PCRE: Called without a string to match");
     return -1;
-  } 
+  }
 
   if (startoffset > bufferLen)
   {
@@ -385,7 +385,7 @@ int CRegExp::PrivateRegFind(size_t bufferLen, const char *str, unsigned int star
       CLog::Log(LOGERROR, "PCRE: Match limit reached");
       return -1;
 
-#ifdef PCRE_ERROR_SHORTUTF8 
+#ifdef PCRE_ERROR_SHORTUTF8
     case PCRE_ERROR_SHORTUTF8:
       {
         const size_t startPos = (m_subject.length() > fragmentLen) ? CUtf8Utils::RFindValidUtf8Char(m_subject, m_subject.length() - fragmentLen) : 0;
@@ -448,8 +448,8 @@ std::string CRegExp::GetReplaceString(const std::string& sReplaceExp) const
       const char nextChar = expr[pos];
       if (nextChar == '&' || nextChar == '\\')
       { // this is "\&" or "\\" combination
-        result.push_back(nextChar); // add '&' or '\' to result 
-        pos++; 
+        result.push_back(nextChar); // add '&' or '\' to result
+        pos++;
       }
       else if (isdigit(nextChar))
       { // this is "\0" - "\9" combination
@@ -559,8 +559,8 @@ void CRegExp::Cleanup()
 {
   if (m_re)
   {
-    pcre_free(m_re); 
-    m_re = NULL; 
+    pcre_free(m_re);
+    m_re = NULL;
   }
 
   if (m_sd)
diff --git a/xbmc/utils/RegExp.h b/xbmc/utils/RegExp.h
index c8ef21ca66..fe9fbf6937 100644
--- a/xbmc/utils/RegExp.h
+++ b/xbmc/utils/RegExp.h
@@ -43,7 +43,7 @@ public:
   {
     NoStudy          = 0, // do not study expression
     StudyRegExp      = 1, // study expression (slower compilation, faster find)
-    StudyWithJitComp      // study expression and JIT-compile it, if possible (heavyweight optimization) 
+    StudyWithJitComp      // study expression and JIT-compile it, if possible (heavyweight optimization)
   };
   enum utf8Mode
   {
@@ -63,7 +63,7 @@ public:
   /**
    * Create new CRegExp object and compile regexp expression in one step
    * @warning Use only with hardcoded regexp when you're sure that regexp is compiled without errors
-   * @param caseless    Matching will be case insensitive if set to true 
+   * @param caseless    Matching will be case insensitive if set to true
    *                    or case sensitive if set to false
    * @param utf8        Control UTF-8 processing
    * @param re          The regular expression
@@ -78,7 +78,7 @@ public:
   /**
    * Compile (prepare) regular expression
    * @param re          The regular expression
-   * @param study (optional) Controls study of expression, useful if expression will be used 
+   * @param study (optional) Controls study of expression, useful if expression will be used
    *                         several times
    * @return true on success, false on any error
    */
@@ -98,7 +98,7 @@ public:
    * Find first match of regular expression in given string
    * @param str         The string to match against regular expression
    * @param startoffset (optional) The string offset to start matching
-   * @param maxNumberOfCharsToTest (optional) The maximum number of characters to test (match) in 
+   * @param maxNumberOfCharsToTest (optional) The maximum number of characters to test (match) in
    *                                          string. If set to -1 string checked up to the end.
    * @return staring position of match in string, negative value in case of error or no match
    */
diff --git a/xbmc/utils/ScopeGuard.h b/xbmc/utils/ScopeGuard.h
index 82405ad11b..9aa882f99c 100644
--- a/xbmc/utils/ScopeGuard.h
+++ b/xbmc/utils/ScopeGuard.h
@@ -32,7 +32,7 @@ namespace UTILS
 
     This is not necessary but recommended to cut down on some typing
     using CSocketHandle = CScopeGuard<SOCKET, INVALID_SOCKET, closesocket>;
-    
+
     CSocketHandle sh(closesocket, open(thingy));
  */
 template<typename Handle, Handle invalid, typename Deleter>
@@ -74,7 +74,7 @@ public:
   }
 
   /*! \brief release the managed handle so that it won't be auto closed
-   
+
       \return The handle being managed by the guard
    */
   Handle release()
@@ -113,7 +113,7 @@ public:
     m_deleter = std::move(rhs.m_deleter);
     return *this;
   }
-  
+
 private:
   Handle m_handle;
   std::function<Deleter> m_deleter;
diff --git a/xbmc/utils/ScraperUrl.cpp b/xbmc/utils/ScraperUrl.cpp
index acbc697a20..a5bd528d51 100644
--- a/xbmc/utils/ScraperUrl.cpp
+++ b/xbmc/utils/ScraperUrl.cpp
@@ -264,7 +264,7 @@ bool CScraperUrl::Get(const SUrlEntry& scrURL, std::string& strHTML, XFILE::CCur
   {
     CXBMCTinyXML xmlDoc;
     xmlDoc.Parse(strHTML, reportedCharset);
-    
+
     std::string realXmlCharset(xmlDoc.GetUsedCharset());
     if (!realXmlCharset.empty())
     {
@@ -368,7 +368,7 @@ void CScraperUrl::AddElement(std::string url, std::string aspect, std::string re
   }
   else
     nUrl.m_type = URL_TYPE_GENERAL;
-  
+
   nUrl.m_aspect = aspect;
 
   m_url.push_back(nUrl);
@@ -378,7 +378,7 @@ std::string CScraperUrl::GetThumbURL(const CScraperUrl::SUrlEntry &entry)
 {
   if (entry.m_spoof.empty())
     return entry.m_url;
-  
+
   return entry.m_url + "|Referer=" + CURL::Encode(entry.m_spoof);
 }
 
diff --git a/xbmc/utils/SortUtils.cpp b/xbmc/utils/SortUtils.cpp
index 29668c878e..0900798a65 100644
--- a/xbmc/utils/SortUtils.cpp
+++ b/xbmc/utils/SortUtils.cpp
@@ -67,7 +67,7 @@ std::string ByLabel(SortAttribute attributes, const SortItem &values)
 std::string ByFile(SortAttribute attributes, const SortItem &values)
 {
   CURL url(values.at(FieldPath).asString());
-  
+
   return StringUtils::Format("%s %" PRId64, url.GetFileNameWithoutPath().c_str(), values.at(FieldStartOffset).asInteger());
 }
 
@@ -239,7 +239,7 @@ std::string ByYear(SortAttribute attributes, const SortItem &values)
     label += StringUtils::Format(" %i", (int)track.asInteger());
 
   label += " " + ByLabel(attributes, values);
- 
+
   return label;
 }
 
@@ -456,7 +456,7 @@ bool preliminarySort(const SortItem &left, const SortItem &right, bool handleFol
     leftSortSpecial = (SortSpecial)itLeft->second.asInteger();
   if ((itRight = right.find(FieldSortSpecial)) != right.end() && itRight->second.asInteger() <= (int64_t)SortSpecialOnBottom)
     rightSortSpecial = (SortSpecial)itRight->second.asInteger();
-  
+
   // one has a special sort
   if (leftSortSpecial != rightSortSpecial)
   {
@@ -469,7 +469,7 @@ bool preliminarySort(const SortItem &left, const SortItem &right, bool handleFol
       result = true;
       return true;
     }
-    
+
     // otherwise right is sorted above left
     result = false;
     return true;
diff --git a/xbmc/utils/SortUtils.h b/xbmc/utils/SortUtils.h
index ae2881d41b..c680db082c 100644
--- a/xbmc/utils/SortUtils.h
+++ b/xbmc/utils/SortUtils.h
@@ -213,14 +213,14 @@ public:
   static void Sort(const SortDescription &sortDescription, DatabaseResults& items);
   static void Sort(const SortDescription &sortDescription, SortItems& items);
   static bool SortFromDataset(const SortDescription &sortDescription, const MediaType &mediaType, const std::unique_ptr<dbiplus::Dataset> &dataset, DatabaseResults &results);
-  
+
   static const Fields& GetFieldsForSorting(SortBy sortBy);
   static std::string RemoveArticles(const std::string &label);
-  
+
   typedef std::string (*SortPreparator) (SortAttribute, const SortItem&);
   typedef bool (*Sorter) (const DatabaseResult &, const DatabaseResult &);
   typedef bool (*SorterIndirect) (const SortItemPtr &, const SortItemPtr &);
-  
+
 private:
   static const SortPreparator& getPreparator(SortBy sortBy);
   static Sorter getSorter(SortOrder sortOrder, SortAttribute attributes);
diff --git a/xbmc/utils/Stopwatch.cpp b/xbmc/utils/Stopwatch.cpp
index 336e69917e..da61184606 100644
--- a/xbmc/utils/Stopwatch.cpp
+++ b/xbmc/utils/Stopwatch.cpp
@@ -20,7 +20,7 @@
 
 #include "Stopwatch.h"
 #if defined(TARGET_POSIX)
-#include "threads/SystemClock.h" 
+#include "threads/SystemClock.h"
 #if !defined(TARGET_DARWIN) && !defined(TARGET_FREEBSD)
 #include <sys/sysinfo.h>
 #endif
diff --git a/xbmc/utils/Stopwatch.h b/xbmc/utils/Stopwatch.h
index 8a0943e335..c40d7a48ba 100644
--- a/xbmc/utils/Stopwatch.h
+++ b/xbmc/utils/Stopwatch.h
@@ -90,7 +90,7 @@ public:
     int64_t totalTicks = (m_isRunning ? GetTicks() : m_stopTick) - m_startTick;
     return (float)totalTicks * m_timerPeriod;
   }
-  
+
   /*!
     \brief  Retrieve time elapsed between the last call to Start(), StartZero()
             or Reset() and; if running, now; if stopped, the last call to Stop().
diff --git a/xbmc/utils/StringUtils.cpp b/xbmc/utils/StringUtils.cpp
index 7505aa82ee..bdf9025700 100644
--- a/xbmc/utils/StringUtils.cpp
+++ b/xbmc/utils/StringUtils.cpp
@@ -228,7 +228,7 @@ std::string StringUtils::FormatV(const char *fmt, va_list args)
   int size = FORMAT_BLOCK_SIZE;
   va_list argCopy;
 
-  while (1) 
+  while (1)
   {
     char *cstr = reinterpret_cast<char*>(malloc(sizeof(char) * size));
     if (!cstr)
@@ -271,7 +271,7 @@ std::wstring StringUtils::FormatV(const wchar_t *fmt, va_list args)
 
   int size = FORMAT_BLOCK_SIZE;
   va_list argCopy;
-  
+
   while (1)
   {
     wchar_t *cstr = reinterpret_cast<wchar_t*>(malloc(sizeof(wchar_t) * size));
@@ -281,7 +281,7 @@ std::wstring StringUtils::FormatV(const wchar_t *fmt, va_list args)
     va_copy(argCopy, args);
     int nActual = vswprintf(cstr, size, fmt, argCopy);
     va_end(argCopy);
-    
+
     if (nActual > -1 && nActual < size) // We got a valid result
     {
       std::wstring str(cstr, nActual);
@@ -305,7 +305,7 @@ std::wstring StringUtils::FormatV(const wchar_t *fmt, va_list args)
       size++; // increment for null-termination
 #endif // TARGET_WINDOWS
   }
-  
+
   return L"";
 }
 
@@ -436,12 +436,12 @@ std::string StringUtils::Mid(const std::string &str, size_t first, size_t count
 {
   if (first + count > str.size())
     count = str.size() - first;
-  
+
   if (first > str.size())
     return std::string();
-  
+
   assert(first + count <= str.size());
-  
+
   return str.substr(first, count);
 }
 
@@ -545,7 +545,7 @@ int StringUtils::Replace(std::string &str, char oldChar, char newChar)
       replacedChars++;
     }
   }
-  
+
   return replacedChars;
 }
 
@@ -556,14 +556,14 @@ int StringUtils::Replace(std::string &str, const std::string &oldStr, const std:
 
   int replacedChars = 0;
   size_t index = 0;
-  
+
   while (index < str.size() && (index = str.find(oldStr, index)) != std::string::npos)
   {
     str.replace(index, oldStr.size(), newStr);
     index += newStr.size();
     replacedChars++;
   }
-  
+
   return replacedChars;
 }
 
@@ -700,7 +700,7 @@ std::vector<std::string> StringUtils::Split(const std::string& input, const std:
 std::vector<std::string> StringUtils::SplitMulti(const std::vector<std::string> &input, const std::vector<std::string> &delimiters, unsigned int iMaxStrings /* = 0 */)
 {
   if (input.empty())
-    return std::vector<std::string>(); 
+    return std::vector<std::string>();
 
   std::vector<std::string> results(input);
 
@@ -724,8 +724,8 @@ std::vector<std::string> StringUtils::SplitMulti(const std::vector<std::string>
     return results;
   }
 
-  // Control the number of strings input is split into, keeping the original strings. 
-  // Note iMaxStrings > input.size() 
+  // Control the number of strings input is split into, keeping the original strings.
+  // Note iMaxStrings > input.size()
   int iNew = iMaxStrings - results.size();
   for (size_t di = 0; di < delimiters.size(); di++)
   {
@@ -997,11 +997,11 @@ std::string StringUtils::BinaryStringToString(const std::string& in)
   out.reserve(in.size() / 2);
   for (const char *cur = in.c_str(), *end = cur + in.size(); cur != end; ++cur) {
     if (*cur == '\\') {
-      ++cur;                                                                             
+      ++cur;
       if (cur == end) {
         break;
       }
-      if (isdigit(*cur)) {                                                             
+      if (isdigit(*cur)) {
         char* end;
         unsigned long num = strtol(cur, &end, 10);
         cur = end - 1;
diff --git a/xbmc/utils/StringUtils.h b/xbmc/utils/StringUtils.h
index 5c62da760b..361c1a29b0 100644
--- a/xbmc/utils/StringUtils.h
+++ b/xbmc/utils/StringUtils.h
@@ -224,13 +224,13 @@ public:
       StringUtils::Replace(str, delimiters[di], delimiters[0]);
     return SplitTo(dest, str, delimiters[0]);
   }
-  
+
   /*! \brief Splits the given input strings using the given delimiters into further separate strings.
 
   If the given input string vector is empty the result will be an empty array (not
   an array containing an empty string).
 
-  Delimiter strings are applied in order, so once the (optional) maximum number of 
+  Delimiter strings are applied in order, so once the (optional) maximum number of
   items is produced no other delimiters are applied. This produces different results
   to applying all delimiters at once e.g. "a/b#c/d" becomes "a", "b#c", "d" rather
   than "a", "b", "c/d"
@@ -276,27 +276,27 @@ public:
   /* The next several isasciiXX and asciiXXvalue functions are locale independent (US-ASCII only),
    * as opposed to standard ::isXX (::isalpha, ::isdigit...) which are locale dependent.
    * Next functions get parameter as char and don't need double cast ((int)(unsigned char) is required for standard functions). */
-  inline static bool isasciidigit(char chr) // locale independent 
+  inline static bool isasciidigit(char chr) // locale independent
   {
-    return chr >= '0' && chr <= '9'; 
+    return chr >= '0' && chr <= '9';
   }
-  inline static bool isasciixdigit(char chr) // locale independent 
+  inline static bool isasciixdigit(char chr) // locale independent
   {
-    return (chr >= '0' && chr <= '9') || (chr >= 'a' && chr <= 'f') || (chr >= 'A' && chr <= 'F'); 
+    return (chr >= '0' && chr <= '9') || (chr >= 'a' && chr <= 'f') || (chr >= 'A' && chr <= 'F');
   }
-  static int asciidigitvalue(char chr); // locale independent 
-  static int asciixdigitvalue(char chr); // locale independent 
+  static int asciidigitvalue(char chr); // locale independent
+  static int asciixdigitvalue(char chr); // locale independent
   inline static bool isasciiuppercaseletter(char chr) // locale independent
   {
-    return (chr >= 'A' && chr <= 'Z'); 
+    return (chr >= 'A' && chr <= 'Z');
   }
   inline static bool isasciilowercaseletter(char chr) // locale independent
   {
-    return (chr >= 'a' && chr <= 'z'); 
+    return (chr >= 'a' && chr <= 'z');
   }
   inline static bool isasciialphanum(char chr) // locale independent
   {
-    return isasciiuppercaseletter(chr) || isasciilowercaseletter(chr) || isasciidigit(chr); 
+    return isasciiuppercaseletter(chr) || isasciilowercaseletter(chr) || isasciidigit(chr);
   }
   static std::string SizeToString(int64_t size);
   static const std::string Empty;
diff --git a/xbmc/utils/SysfsUtils.cpp b/xbmc/utils/SysfsUtils.cpp
index 4f0c2345c3..6dac658823 100644
--- a/xbmc/utils/SysfsUtils.cpp
+++ b/xbmc/utils/SysfsUtils.cpp
@@ -60,9 +60,9 @@ int SysfsUtils::GetString(const std::string& path, std::string& valstr)
     while ((len = read(fd, buf, 256)) > 0)
       valstr.append(buf, len);
     close(fd);
- 
+
     StringUtils::Trim(valstr);
-    
+
     return 0;
   }
 
diff --git a/xbmc/utils/SystemInfo.cpp b/xbmc/utils/SystemInfo.cpp
index 36b422a8a1..39fad23de9 100644
--- a/xbmc/utils/SystemInfo.cpp
+++ b/xbmc/utils/SystemInfo.cpp
@@ -99,7 +99,7 @@ static bool sysGetVersionExWByRef(OSVERSIONINFOEXW& osVerInfo)
 {
   ZeroMemory(&osVerInfo, sizeof(osVerInfo));
   osVerInfo.dwOSVersionInfoSize = sizeof(osVerInfo);
-  
+
   typedef NTSTATUS(__stdcall *RtlGetVersionPtr)(RTL_OSVERSIONINFOEXW* pOsInfo);
   static HMODULE hNtDll = GetModuleHandleW(L"ntdll.dll");
   if (hNtDll != NULL)
@@ -161,7 +161,7 @@ static std::string getValueFromOs_release(std::string key)
 
   if (content[valStart] == '\n')
     return "";
-  
+
   // find end of value string
   seachPos = valStart;
   do
@@ -421,7 +421,7 @@ bool CSysInfo::Load(const TiXmlNode *settings)
 {
   if (settings == NULL)
     return false;
-  
+
   const TiXmlElement *pElement = settings->FirstChildElement("general");
   if (pElement)
     XMLUtils::GetInt(pElement, "systemtotaluptime", m_iSystemTimeTotalUp, 0, INT_MAX);
@@ -859,7 +859,7 @@ CSysInfo::WindowsVersion CSysInfo::GetWindowsVersion()
         m_WinVer = WindowsVersionWin7;
       else if (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 2)
         m_WinVer = WindowsVersionWin8;
-      else if (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 3) 
+      else if (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 3)
         m_WinVer = WindowsVersionWin8_1;
       else if (osvi.dwMajorVersion == 10 && osvi.dwMinorVersion == 0 && osvi.dwBuildNumber < 16299)
         m_WinVer = WindowsVersionWin10;
@@ -1087,7 +1087,7 @@ std::string CSysInfo::GetUserAgent()
 #if defined(TARGET_DARWIN_IOS)
   std::string iDevStr(GetModelName()); // device model name with number of model version
   size_t iDevStrDigit = iDevStr.find_first_of("0123456789");
-  std::string iDev(iDevStr, 0, iDevStrDigit);  // device model name without number 
+  std::string iDev(iDevStr, 0, iDevStrDigit);  // device model name without number
   if (iDevStrDigit == 0)
     iDev = "unknown";
   result += iDev + "; ";
@@ -1175,7 +1175,7 @@ std::string CSysInfo::GetUserAgent()
   StringUtils::Replace(iDevVer, ',', '.');
   result += " HW_" + iDev + "/" + iDevVer;
 #endif
-  // add more device IDs here if needed. 
+  // add more device IDs here if needed.
   // keep only one device ID in result! Form:
   // result += " HW_" + "deviceID" + "/" + "1.0"; // '1.0' if device has no version
 
@@ -1208,7 +1208,7 @@ std::string CSysInfo::GetDeviceName()
     CServiceBroker::GetNetwork().GetHostName(hostname);
     return StringUtils::Format("%s (%s)", friendlyName.c_str(), hostname.c_str());
   }
-  
+
   return friendlyName;
 }
 
@@ -1300,11 +1300,11 @@ std::string CSysInfo::GetBuildTargetPlatformVersionDecoded(void)
   if (__MAC_OS_X_VERSION_MIN_REQUIRED % 10)
     return StringUtils::Format("version %d.%d", (__MAC_OS_X_VERSION_MIN_REQUIRED / 100) % 100, (__MAC_OS_X_VERSION_MIN_REQUIRED / 10) % 10);
   else
-    return StringUtils::Format("version %d.%d.%d", (__MAC_OS_X_VERSION_MIN_REQUIRED / 100) % 100, 
+    return StringUtils::Format("version %d.%d.%d", (__MAC_OS_X_VERSION_MIN_REQUIRED / 100) % 100,
       (__MAC_OS_X_VERSION_MIN_REQUIRED / 10) % 10, __MAC_OS_X_VERSION_MIN_REQUIRED % 10);
 #endif // defined(MAC_OS_X_VERSION_10_10) && __MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_10
 #elif defined(TARGET_DARWIN_IOS)
-  return StringUtils::Format("version %d.%d.%d", (__IPHONE_OS_VERSION_MIN_REQUIRED / 10000) % 100, 
+  return StringUtils::Format("version %d.%d.%d", (__IPHONE_OS_VERSION_MIN_REQUIRED / 10000) % 100,
                              (__IPHONE_OS_VERSION_MIN_REQUIRED / 100) % 100, __IPHONE_OS_VERSION_MIN_REQUIRED % 100);
 #elif defined(TARGET_FREEBSD)
   // FIXME: should works well starting from FreeBSD 8.1
@@ -1337,7 +1337,7 @@ std::string CSysInfo::GetBuildTargetPlatformVersionDecoded(void)
 
 std::string CSysInfo::GetBuildTargetCpuFamily(void)
 {
-#if defined(__thumb__) || defined(_M_ARMT) 
+#if defined(__thumb__) || defined(_M_ARMT)
   return "ARM (Thumb)";
 #elif defined(__arm__) || defined(_M_ARM) || defined (__aarch64__)
   return "ARM";
diff --git a/xbmc/utils/URIUtils.cpp b/xbmc/utils/URIUtils.cpp
index d29f8ca535..b31c994b62 100644
--- a/xbmc/utils/URIUtils.cpp
+++ b/xbmc/utils/URIUtils.cpp
@@ -243,10 +243,10 @@ std::vector<std::string> URIUtils::SplitPath(const std::string& strPath)
 
   // split the filename portion of the URL up into separate dirs
   std::vector<std::string> dirs = StringUtils::Split(url.GetFileName(), sep);
-  
+
   // we start with the root path
   std::string dir = url.GetWithoutFilename();
-  
+
   if (!dir.empty())
     dirs.insert(dirs.begin(), dir);
 
@@ -961,7 +961,7 @@ bool URIUtils::IsDAV(const std::string& strFile)
   CURL url(strFile);
   if (HasParentInHostname(url))
     return IsDAV(url.GetHostName());
-  
+
   return IsProtocol(strFile, "dav") ||
          IsProtocol(strFile, "davs");
 }
@@ -1231,7 +1231,7 @@ std::string URIUtils::CanonicalizePath(const std::string& path, const char slash
   return result;
 }
 
-std::string URIUtils::AddFileToFolder(const std::string& strFolder, 
+std::string URIUtils::AddFileToFolder(const std::string& strFolder,
                                 const std::string& strFile)
 {
   if (IsURL(strFolder))
@@ -1310,7 +1310,7 @@ std::string URIUtils::GetRealPath(const std::string &path)
   CURL url(path);
   url.SetHostName(GetRealPath(url.GetHostName()));
   url.SetFileName(resolvePath(url.GetFileName()));
-  
+
   return url.Get();
 }
 
@@ -1363,7 +1363,7 @@ bool URIUtils::UpdateUrlEncoding(std::string &strFilename)
 {
   if (strFilename.empty())
     return false;
-  
+
   CURL url(strFilename);
   // if this is a stack:// URL we need to work with its filename
   if (URIUtils::IsStack(strFilename))
@@ -1394,7 +1394,7 @@ bool URIUtils::UpdateUrlEncoding(std::string &strFilename)
   std::string newFilename = url.Get();
   if (newFilename == strFilename)
     return false;
-  
+
   strFilename = newFilename;
   return true;
 }
diff --git a/xbmc/utils/URIUtils.h b/xbmc/utils/URIUtils.h
index b8d2e72188..1cf8c21fab 100644
--- a/xbmc/utils/URIUtils.h
+++ b/xbmc/utils/URIUtils.h
@@ -64,7 +64,7 @@ public:
   static void RemoveExtension(std::string& strFileName);
   static std::string ReplaceExtension(const std::string& strFile,
                                      const std::string& strNewExtension);
-  static void Split(const std::string& strFileNameAndPath, 
+  static void Split(const std::string& strFileNameAndPath,
                     std::string& strPath, std::string& strFileName);
   static std::vector<std::string> SplitPath(const std::string& strPath);
 
diff --git a/xbmc/utils/Utf8Utils.cpp b/xbmc/utils/Utf8Utils.cpp
index aa72f19855..75351d976c 100644
--- a/xbmc/utils/Utf8Utils.cpp
+++ b/xbmc/utils/Utf8Utils.cpp
@@ -109,7 +109,7 @@ inline size_t CUtf8Utils::SizeOfUtf8Char(const char* const str)
 
   /* U+0080 - U+07FF in UTF-8 */                    /* binary representation and range */
   if (chr >= 0xC2 && chr <= 0xDF                    /* C2=1100 0010 - DF=1101 1111 */
-      // as str is null terminated, 
+      // as str is null terminated,
       && ((strU[1] & 0xC0) == 0x80))  /* C0=1100 0000, 80=1000 0000 - BF=1011 1111 */
     return 2;  // valid UTF-8 2 bytes sequence
 
diff --git a/xbmc/utils/Utf8Utils.h b/xbmc/utils/Utf8Utils.h
index 55515dbd43..8531385d9e 100644
--- a/xbmc/utils/Utf8Utils.h
+++ b/xbmc/utils/Utf8Utils.h
@@ -28,11 +28,11 @@ public:
   enum utf8CheckResult
   {
     plainAscii = -1, // only US-ASCII characters (valid for UTF-8 too)
-    hiAscii    =  0, // non-UTF-8 sequence with high ASCII characters 
+    hiAscii    =  0, // non-UTF-8 sequence with high ASCII characters
                      // (possible single-byte national encoding like WINDOWS-1251, multi-byte encoding like UTF-32 or invalid UTF-8)
     utf8string =  1  // valid UTF-8 sequences, but not US-ASCII only
   };
-  
+
   /**
    * Check given string for valid UTF-8 sequences
    * @param str string to check
@@ -47,7 +47,7 @@ public:
 
   static size_t FindValidUtf8Char(const std::string& str, const size_t startPos = 0);
   static size_t RFindValidUtf8Char(const std::string& str, const size_t startPos);
-  
+
   static size_t SizeOfUtf8Char(const std::string& str, const size_t charStart = 0);
 private:
   static size_t SizeOfUtf8Char(const char* const str);
diff --git a/xbmc/utils/Variant.cpp b/xbmc/utils/Variant.cpp
index cda9e96d83..9e8f0efb64 100644
--- a/xbmc/utils/Variant.cpp
+++ b/xbmc/utils/Variant.cpp
@@ -409,7 +409,7 @@ int64_t CVariant::asInteger(int64_t fallback) const
     default:
       return fallback;
   }
-  
+
   return fallback;
 }
 
@@ -435,7 +435,7 @@ uint64_t CVariant::asUnsignedInteger(uint64_t fallback) const
     default:
       return fallback;
   }
-  
+
   return fallback;
 }
 
@@ -461,7 +461,7 @@ double CVariant::asDouble(double fallback) const
     default:
       return fallback;
   }
-  
+
   return fallback;
 }
 
@@ -482,7 +482,7 @@ float CVariant::asFloat(float fallback) const
     default:
       return fallback;
   }
-  
+
   return fallback;
 }
 
@@ -509,7 +509,7 @@ bool CVariant::asBoolean(bool fallback) const
     default:
       return fallback;
   }
-  
+
   return fallback;
 }
 
@@ -530,7 +530,7 @@ std::string CVariant::asString(const std::string &fallback /* = "" */) const
     default:
       return fallback;
   }
-  
+
   return fallback;
 }
 
@@ -551,7 +551,7 @@ std::wstring CVariant::asWideString(const std::wstring &fallback /* = L"" */) co
     default:
       return fallback;
   }
-  
+
   return fallback;
 }
 
diff --git a/xbmc/utils/Variant.h b/xbmc/utils/Variant.h
index 693371e872..57c8ae77c2 100644
--- a/xbmc/utils/Variant.h
+++ b/xbmc/utils/Variant.h
@@ -80,7 +80,7 @@ public:
   ~CVariant();
 
 
-  
+
   bool isInteger() const;
   bool isSignedInteger() const;
   bool isUnsignedInteger() const;
diff --git a/xbmc/utils/Vector.h b/xbmc/utils/Vector.h
index 256bbc592e..723d1258bd 100644
--- a/xbmc/utils/Vector.h
+++ b/xbmc/utils/Vector.h
@@ -25,7 +25,7 @@ class CVector
 public:
   CVector() = default;
   constexpr CVector(float xCoord, float yCoord):x(xCoord), y(yCoord) {}
-  
+
   constexpr CVector operator+(const CVector &other) const
   {
     return CVector(x + other.x, y + other.y);
@@ -38,14 +38,14 @@ public:
 
   CVector& operator+=(const CVector &other);
   CVector& operator-=(const CVector &other);
-  
+
   constexpr float scalar(const CVector &other) const
   {
     return x * other.x + y * other.y;
   }
 
   float length() const;
-  
+
   float x = 0;
   float y = 0;
 };
diff --git a/xbmc/utils/XBMCTinyXML.cpp b/xbmc/utils/XBMCTinyXML.cpp
index cab73dbedb..75f3a0604d 100644
--- a/xbmc/utils/XBMCTinyXML.cpp
+++ b/xbmc/utils/XBMCTinyXML.cpp
@@ -188,7 +188,7 @@ bool CXBMCTinyXML::Parse(const std::string& data, TiXmlEncoding encoding /*= TIX
   if (InternalParse(data, TIXML_ENCODING_UNKNOWN))
   {
     if (!m_SuggestedCharset.empty())
-      CLog::Log(LOGWARNING, "%s: Processed %s as unknown encoding instead of suggested \"%s\"", __FUNCTION__, 
+      CLog::Log(LOGWARNING, "%s: Processed %s as unknown encoding instead of suggested \"%s\"", __FUNCTION__,
                   (value.empty() ? "XML data" : ("file \"" + value + "\"").c_str()), m_SuggestedCharset.c_str());
     else if (!detectedCharset.empty())
       CLog::Log(LOGWARNING, "%s: Processed %s as unknown encoding instead of detected \"%s\"", __FUNCTION__,
diff --git a/xbmc/utils/XMLUtils.h b/xbmc/utils/XMLUtils.h
index c67dfd7c11..6880500871 100644
--- a/xbmc/utils/XMLUtils.h
+++ b/xbmc/utils/XMLUtils.h
@@ -39,7 +39,7 @@ public:
   static bool GetDouble(const TiXmlNode* pRootNode, const char* strTag, double &value);
   static bool GetInt(const TiXmlNode* pRootNode, const char* strTag, int& iIntValue);
   static bool GetBoolean(const TiXmlNode* pRootNode, const char* strTag, bool& bBoolValue);
-  
+
   /*! \brief Get a string value from the xml tag
    If the specified tag isn't found strStringvalue is not modified and will contain whatever
    value it had before the method call.
@@ -52,10 +52,10 @@ public:
   static bool GetString(const TiXmlNode* pRootNode, const char* strTag, std::string& strStringValue);
 
   /*! \brief Get a string value from the xml tag
-      
+
    \param[in]  pRootNode the xml node that contains the tag
    \param[in]  strTag the tag to read from
-   
+
    \return the value in the specified tag or an empty string if the tag isn't found
    */
   static std::string GetString(const TiXmlNode* pRootNode, const char* strTag);
diff --git a/xbmc/utils/XSLTUtils.cpp b/xbmc/utils/XSLTUtils.cpp
index ed1a1a892f..544fa2371f 100644
--- a/xbmc/utils/XSLTUtils.cpp
+++ b/xbmc/utils/XSLTUtils.cpp
@@ -112,6 +112,6 @@ bool XSLTUtils::SetStylesheet(const std::string& stylesheet)
     m_xmlStylesheet = NULL;
     return false;
   }
-  
+
   return true;
 }
diff --git a/xbmc/utils/test/TestBitstreamStats.cpp b/xbmc/utils/test/TestBitstreamStats.cpp
index 8b67d91ba5..5d1a80eb47 100644
--- a/xbmc/utils/test/TestBitstreamStats.cpp
+++ b/xbmc/utils/test/TestBitstreamStats.cpp
@@ -31,7 +31,7 @@ class CTestBitstreamStatsThread : public CThread
 public:
   CTestBitstreamStatsThread() :
     CThread("TestBitstreamStats"){}
-  
+
 };
 
 TEST(TestBitstreamStats, General)
diff --git a/xbmc/utils/test/TestDatabaseUtils.cpp b/xbmc/utils/test/TestDatabaseUtils.cpp
index f456fe729e..ec2bd6ad93 100644
--- a/xbmc/utils/test/TestDatabaseUtils.cpp
+++ b/xbmc/utils/test/TestDatabaseUtils.cpp
@@ -1364,7 +1364,7 @@ TEST(TestDatabaseUtils, BuildLimitClause)
 // class DatabaseUtils
 // {
 // public:
-// 
-// 
+//
+//
 //   static std::string BuildLimitClause(int end, int start = 0);
 // };
diff --git a/xbmc/utils/test/TestGlobalsHandlingPattern1.h b/xbmc/utils/test/TestGlobalsHandlingPattern1.h
index d5462dadc2..9f227d471f 100644
--- a/xbmc/utils/test/TestGlobalsHandlingPattern1.h
+++ b/xbmc/utils/test/TestGlobalsHandlingPattern1.h
@@ -37,10 +37,10 @@ namespace xbmcutil
       int somethingToAccess;
 
       TestGlobalPattern1() : somethingToAccess(0) { ctorCalled = true; }
-      ~TestGlobalPattern1() 
-      { 
+      ~TestGlobalPattern1()
+      {
         std::cout << "Clean shutdown of TestGlobalPattern1" << std::endl << std::flush;
-        dtorCalled = true; 
+        dtorCalled = true;
       }
 
       void beHappy() { if (somethingToAccess) throw somethingToAccess; }
diff --git a/xbmc/utils/test/TestHttpRangeUtils.cpp b/xbmc/utils/test/TestHttpRangeUtils.cpp
index dea1d38284..eae0064a4b 100644
--- a/xbmc/utils/test/TestHttpRangeUtils.cpp
+++ b/xbmc/utils/test/TestHttpRangeUtils.cpp
@@ -189,7 +189,7 @@ TEST(TestHttpRanges, GetAll)
   ranges_raw.push_back(range_0);
   ranges_raw.push_back(range_1);
   ranges_raw.push_back(range_2);
-  
+
   CHttpRanges ranges(ranges_raw);
 
   const HttpRanges& ranges_raw_get = ranges.Get();
diff --git a/xbmc/utils/test/TestJobManager.cpp b/xbmc/utils/test/TestJobManager.cpp
index 6dee22d123..9a812de97f 100644
--- a/xbmc/utils/test/TestJobManager.cpp
+++ b/xbmc/utils/test/TestJobManager.cpp
@@ -124,7 +124,7 @@ public:
   {
     {
       CSingleLock lock(m_package.jobCreatedMutex);
-    
+
       m_package.ready = true;
       m_package.jobCreatedCond.notifyAll();
     }
@@ -159,7 +159,7 @@ WaitForJobToStartProcessing(CJob::PRIORITY priority, JobControlPackage &package)
   return job;
 }
 }
-  
+
 TEST_F(TestJobManager, PauseLowPriorityJob)
 {
   JobControlPackage package;
diff --git a/xbmc/utils/test/TestStringUtils.cpp b/xbmc/utils/test/TestStringUtils.cpp
index 6d8a23c579..7529e80543 100644
--- a/xbmc/utils/test/TestStringUtils.cpp
+++ b/xbmc/utils/test/TestStringUtils.cpp
@@ -46,7 +46,7 @@ TEST(TestStringUtils, ToUpper)
 TEST(TestStringUtils, ToLower)
 {
   std::string refstr = "test";
-  
+
   std::string varstr = "TeSt";
   StringUtils::ToLower(varstr);
   EXPECT_STREQ(refstr.c_str(), varstr.c_str());
@@ -88,7 +88,7 @@ TEST(TestStringUtils, ToCapitalize)
 TEST(TestStringUtils, EqualsNoCase)
 {
   std::string refstr = "TeSt";
-  
+
   EXPECT_TRUE(StringUtils::EqualsNoCase(refstr, "TeSt"));
   EXPECT_TRUE(StringUtils::EqualsNoCase(refstr, "tEsT"));
 }
@@ -97,15 +97,15 @@ TEST(TestStringUtils, Left)
 {
   std::string refstr, varstr;
   std::string origstr = "test";
-  
+
   refstr = "";
   varstr = StringUtils::Left(origstr, 0);
   EXPECT_STREQ(refstr.c_str(), varstr.c_str());
-  
+
   refstr = "te";
   varstr = StringUtils::Left(origstr, 2);
   EXPECT_STREQ(refstr.c_str(), varstr.c_str());
-  
+
   refstr = "test";
   varstr = StringUtils::Left(origstr, 10);
   EXPECT_STREQ(refstr.c_str(), varstr.c_str());
@@ -115,27 +115,27 @@ TEST(TestStringUtils, Mid)
 {
   std::string refstr, varstr;
   std::string origstr = "test";
-  
+
   refstr = "";
   varstr = StringUtils::Mid(origstr, 0, 0);
   EXPECT_STREQ(refstr.c_str(), varstr.c_str());
-  
+
   refstr = "te";
   varstr = StringUtils::Mid(origstr, 0, 2);
   EXPECT_STREQ(refstr.c_str(), varstr.c_str());
-  
+
   refstr = "test";
   varstr = StringUtils::Mid(origstr, 0, 10);
   EXPECT_STREQ(refstr.c_str(), varstr.c_str());
-  
+
   refstr = "st";
   varstr = StringUtils::Mid(origstr, 2);
   EXPECT_STREQ(refstr.c_str(), varstr.c_str());
-  
+
   refstr = "st";
   varstr = StringUtils::Mid(origstr, 2, 2);
   EXPECT_STREQ(refstr.c_str(), varstr.c_str());
-  
+
   refstr = "es";
   varstr = StringUtils::Mid(origstr, 1, 2);
   EXPECT_STREQ(refstr.c_str(), varstr.c_str());
@@ -145,15 +145,15 @@ TEST(TestStringUtils, Right)
 {
   std::string refstr, varstr;
   std::string origstr = "test";
-  
+
   refstr = "";
   varstr = StringUtils::Right(origstr, 0);
   EXPECT_STREQ(refstr.c_str(), varstr.c_str());
-  
+
   refstr = "st";
   varstr = StringUtils::Right(origstr, 2);
   EXPECT_STREQ(refstr.c_str(), varstr.c_str());
-  
+
   refstr = "test";
   varstr = StringUtils::Right(origstr, 10);
   EXPECT_STREQ(refstr.c_str(), varstr.c_str());
@@ -162,7 +162,7 @@ TEST(TestStringUtils, Right)
 TEST(TestStringUtils, Trim)
 {
   std::string refstr = "test test";
-  
+
   std::string varstr = " test test   ";
   StringUtils::Trim(varstr);
   EXPECT_STREQ(refstr.c_str(), varstr.c_str());
@@ -171,7 +171,7 @@ TEST(TestStringUtils, Trim)
 TEST(TestStringUtils, TrimLeft)
 {
   std::string refstr = "test test   ";
-  
+
   std::string varstr = " test test   ";
   StringUtils::TrimLeft(varstr);
   EXPECT_STREQ(refstr.c_str(), varstr.c_str());
@@ -180,7 +180,7 @@ TEST(TestStringUtils, TrimLeft)
 TEST(TestStringUtils, TrimRight)
 {
   std::string refstr = " test test";
-  
+
   std::string varstr = " test test   ";
   StringUtils::TrimRight(varstr);
   EXPECT_STREQ(refstr.c_str(), varstr.c_str());
@@ -189,18 +189,18 @@ TEST(TestStringUtils, TrimRight)
 TEST(TestStringUtils, Replace)
 {
   std::string refstr = "text text";
-  
+
   std::string varstr = "test test";
   EXPECT_EQ(StringUtils::Replace(varstr, 's', 'x'), 2);
   EXPECT_STREQ(refstr.c_str(), varstr.c_str());
-  
+
   EXPECT_EQ(StringUtils::Replace(varstr, 's', 'x'), 0);
   EXPECT_STREQ(refstr.c_str(), varstr.c_str());
-  
+
   varstr = "test test";
   EXPECT_EQ(StringUtils::Replace(varstr, "s", "x"), 2);
   EXPECT_STREQ(refstr.c_str(), varstr.c_str());
-  
+
   EXPECT_EQ(StringUtils::Replace(varstr, "s", "x"), 0);
   EXPECT_STREQ(refstr.c_str(), varstr.c_str());
 }
@@ -208,13 +208,13 @@ TEST(TestStringUtils, Replace)
 TEST(TestStringUtils, StartsWith)
 {
   std::string refstr = "test";
-  
+
   EXPECT_FALSE(StringUtils::StartsWithNoCase(refstr, "x"));
-  
+
   EXPECT_TRUE(StringUtils::StartsWith(refstr, "te"));
   EXPECT_TRUE(StringUtils::StartsWith(refstr, "test"));
   EXPECT_FALSE(StringUtils::StartsWith(refstr, "Te"));
-  
+
   EXPECT_TRUE(StringUtils::StartsWithNoCase(refstr, "Te"));
   EXPECT_TRUE(StringUtils::StartsWithNoCase(refstr, "TesT"));
 }
@@ -222,13 +222,13 @@ TEST(TestStringUtils, StartsWith)
 TEST(TestStringUtils, EndsWith)
 {
   std::string refstr = "test";
-  
+
   EXPECT_FALSE(StringUtils::EndsWithNoCase(refstr, "x"));
-  
+
   EXPECT_TRUE(StringUtils::EndsWith(refstr, "st"));
   EXPECT_TRUE(StringUtils::EndsWith(refstr, "test"));
   EXPECT_FALSE(StringUtils::EndsWith(refstr, "sT"));
-  
+
   EXPECT_TRUE(StringUtils::EndsWithNoCase(refstr, "sT"));
   EXPECT_TRUE(StringUtils::EndsWithNoCase(refstr, "TesT"));
 }
@@ -282,7 +282,7 @@ TEST(TestStringUtils, Split)
 
   EXPECT_EQ(1U, StringUtils::Split("a bc  d ef ghi ", "").size());
   EXPECT_STREQ("a bc  d ef ghi ", StringUtils::Split("a bc  d ef ghi ", "").at(0).c_str());
-  
+
   // test overload with char as delimiter
   EXPECT_EQ(4U, StringUtils::Split("a bc  d ef ghi ", ' ', 4).size());
   EXPECT_STREQ("d ef ghi ", StringUtils::Split("a bc  d ef ghi ", ' ', 4).at(3).c_str());
diff --git a/xbmc/utils/test/TestURIUtils.cpp b/xbmc/utils/test/TestURIUtils.cpp
index 7543a65d2f..8847f91ac5 100644
--- a/xbmc/utils/test/TestURIUtils.cpp
+++ b/xbmc/utils/test/TestURIUtils.cpp
@@ -508,10 +508,10 @@ TEST_F(TestURIUtils, HasEncodedFilename)
 TEST_F(TestURIUtils, GetRealPath)
 {
   std::string ref;
-  
+
   ref = "/path/to/file/";
   EXPECT_STREQ(ref.c_str(), URIUtils::GetRealPath(ref).c_str());
-  
+
   ref = "path/to/file";
   EXPECT_STREQ(ref.c_str(), URIUtils::GetRealPath("../path/to/file").c_str());
   EXPECT_STREQ(ref.c_str(), URIUtils::GetRealPath("./path/to/file").c_str());
@@ -529,7 +529,7 @@ TEST_F(TestURIUtils, GetRealPath)
 #ifdef TARGET_WINDOWS
   ref = "\\\\path\\to\\file\\";
   EXPECT_STREQ(ref.c_str(), URIUtils::GetRealPath(ref).c_str());
-  
+
   ref = "path\\to\\file";
   EXPECT_STREQ(ref.c_str(), URIUtils::GetRealPath("..\\path\\to\\file").c_str());
   EXPECT_STREQ(ref.c_str(), URIUtils::GetRealPath(".\\path\\to\\file").c_str());
@@ -548,14 +548,14 @@ TEST_F(TestURIUtils, GetRealPath)
   // test rar/zip paths
   ref = "rar://%2fpath%2fto%2frar/subpath/to/file";
   EXPECT_STRCASEEQ(ref.c_str(), URIUtils::GetRealPath(ref).c_str());
-  
+
   // test rar/zip paths
   ref = "rar://%2fpath%2fto%2frar/subpath/to/file";
   EXPECT_STRCASEEQ(ref.c_str(), URIUtils::GetRealPath("rar://%2fpath%2fto%2frar/../subpath/to/file").c_str());
   EXPECT_STRCASEEQ(ref.c_str(), URIUtils::GetRealPath("rar://%2fpath%2fto%2frar/./subpath/to/file").c_str());
   EXPECT_STRCASEEQ(ref.c_str(), URIUtils::GetRealPath("rar://%2fpath%2fto%2frar/subpath/to/./file").c_str());
   EXPECT_STRCASEEQ(ref.c_str(), URIUtils::GetRealPath("rar://%2fpath%2fto%2frar/subpath/to/some/../file").c_str());
-  
+
   EXPECT_STRCASEEQ(ref.c_str(), URIUtils::GetRealPath("rar://%2fpath%2fto%2f.%2frar/subpath/to/file").c_str());
   EXPECT_STRCASEEQ(ref.c_str(), URIUtils::GetRealPath("rar://%2fpath%2fto%2fsome%2f..%2frar/subpath/to/file").c_str());
 
@@ -574,19 +574,19 @@ TEST_F(TestURIUtils, UpdateUrlEncoding)
 
   oldUrl = "rar://%2fpath%2fto%2farchive%2fsome%2darchive%2efile%2erar/video.avi";
   newUrl = "rar://%2fpath%2fto%2farchive%2fsome-archive.file.rar/video.avi";
-  
+
   EXPECT_TRUE(URIUtils::UpdateUrlEncoding(oldUrl));
   EXPECT_STRCASEEQ(newUrl.c_str(), oldUrl.c_str());
-  
+
   oldUrl = "/path/to/some/long%2dnamed%2efile";
   newUrl = "/path/to/some/long%2dnamed%2efile";
-  
+
   EXPECT_FALSE(URIUtils::UpdateUrlEncoding(oldUrl));
   EXPECT_STRCASEEQ(newUrl.c_str(), oldUrl.c_str());
-  
+
   oldUrl = "/path/to/some/long-named.file";
   newUrl = "/path/to/some/long-named.file";
-  
+
   EXPECT_FALSE(URIUtils::UpdateUrlEncoding(oldUrl));
   EXPECT_STRCASEEQ(newUrl.c_str(), oldUrl.c_str());
 }
diff --git a/xbmc/utils/test/TestVariant.cpp b/xbmc/utils/test/TestVariant.cpp
index 6be4caf5c0..d105c9e799 100644
--- a/xbmc/utils/test/TestVariant.cpp
+++ b/xbmc/utils/test/TestVariant.cpp
@@ -142,18 +142,18 @@ TEST(TestVariant, VariantFromMap)
   std::map<std::string, std::string> strMap;
   strMap["key"] = "value";
   CVariant a = strMap;
-  
+
   EXPECT_TRUE(a.isObject());
   EXPECT_TRUE(a.size() == 1);
   EXPECT_EQ(CVariant::VariantTypeObject, a.type());
   EXPECT_TRUE(a.isMember("key"));
   EXPECT_TRUE(a["key"].isString());
   EXPECT_STREQ(a["key"].asString().c_str(), "value");
-  
+
   std::map<std::string, CVariant> variantMap;
   variantMap["key"] = CVariant("value");
   CVariant b = variantMap;
-  
+
   EXPECT_TRUE(b.isObject());
   EXPECT_TRUE(b.size() == 1);
   EXPECT_EQ(CVariant::VariantTypeObject, b.type());
diff --git a/xbmc/utils/test/Testrfft.cpp b/xbmc/utils/test/Testrfft.cpp
index 4bd5d7335b..5bdab26c62 100644
--- a/xbmc/utils/test/Testrfft.cpp
+++ b/xbmc/utils/test/Testrfft.cpp
@@ -22,7 +22,7 @@
 
 #include "gtest/gtest.h"
 
-#if defined(TARGET_WINDOWS) && !defined(_USE_MATH_DEFINES)  
+#if defined(TARGET_WINDOWS) && !defined(_USE_MATH_DEFINES)
 #define _USE_MATH_DEFINES
 #endif
 
diff --git a/xbmc/video/GUIViewStateVideo.cpp b/xbmc/video/GUIViewStateVideo.cpp
index aba2787aab..88f3f279ed 100644
--- a/xbmc/video/GUIViewStateVideo.cpp
+++ b/xbmc/video/GUIViewStateVideo.cpp
@@ -186,7 +186,7 @@ CGUIViewStateWindowVideoNav::CGUIViewStateWindowVideoNav(const CFileItemList& it
       {
         AddSortMethod(SortByLabel, sortAttributes, 551, LABEL_MASKS("%T","", "%T",""));  // Title, empty | Title, empty
         SetSortMethod(SortByLabel);
-        
+
         const CViewState *viewState = CViewStateSettings::GetInstance().Get("videonavgenres");
         SetViewAsControl(viewState->m_viewMode);
         SetSortOrder(viewState->m_sortDescription.sortOrder);
@@ -323,7 +323,7 @@ CGUIViewStateWindowVideoNav::CGUIViewStateWindowVideoNav(const CFileItemList& it
     AddSortMethod(SortBySize, 553, LABEL_MASKS("%L", "%I", "%L", "%I"));  // Label, Size | Label, Size
     AddSortMethod(SortByDate, 552, LABEL_MASKS("%L", "%J", "%L", "%J"));  // Label, Date | Label, Date
     AddSortMethod(SortByFile, 561, LABEL_MASKS("%L", "%I", "%L", ""));  // Label, Size | Label, empty
-    
+
     const CViewState *viewState = CViewStateSettings::GetInstance().Get("videofiles");
     SetSortMethod(viewState->m_sortDescription);
     SetViewAsControl(viewState->m_viewMode);
@@ -495,7 +495,7 @@ CGUIViewStateVideoMusicVideos::CGUIViewStateVideoMusicVideos(const CFileItemList
 
    if (CMediaSettings::GetInstance().GetWatchedMode(items.GetContent()) == WatchedModeAll)
     AddSortMethod(SortByPlaycount, 567, LABEL_MASKS("%T", "%V"));  // Title, Playcount | empty, empty
-  
+
   std::string strTrack=CServiceBroker::GetSettings().GetString(CSettings::SETTING_MUSICFILES_TRACKFORMAT);
   AddSortMethod(SortByTrackNumber, 554, LABEL_MASKS(strTrack, "%N"));  // Userdefined, Track Number | empty, empty
 
diff --git a/xbmc/video/PlayerController.cpp b/xbmc/video/PlayerController.cpp
index 9da1be5871..d96d20a70f 100644
--- a/xbmc/video/PlayerController.cpp
+++ b/xbmc/video/PlayerController.cpp
@@ -383,7 +383,7 @@ bool CPlayerController::OnAction(const CAction &action)
         CServiceBroker::GetSettings().SetInt(CSettings::SETTING_SUBTITLES_ALIGN, subalign);
         CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Info,
                                               g_localizeStrings.Get(21460),
-                                              g_localizeStrings.Get(21461 + subalign), 
+                                              g_localizeStrings.Get(21461 + subalign),
                                               TOAST_DISPLAY_TIME, false);
         CServiceBroker::GetWinSystem()->GetGfxContext().SetResInfo(CServiceBroker::GetWinSystem()->GetGfxContext().GetVideoResolution(), res_info);
         return true;
diff --git a/xbmc/video/VideoDatabase.cpp b/xbmc/video/VideoDatabase.cpp
index e34fd75084..f33763e93e 100644
--- a/xbmc/video/VideoDatabase.cpp
+++ b/xbmc/video/VideoDatabase.cpp
@@ -479,7 +479,7 @@ void CVideoDatabase::CreateViews()
               "    bookmark.idFile=musicvideo.idFile AND bookmark.type=1");
 
   CLog::Log(LOGINFO, "create movie_view");
-  
+
   std::string movieview = PrepareSQL("CREATE VIEW movie_view AS SELECT"
                                       "  movie.*,"
                                       "  sets.strSet AS strSet,"
@@ -1484,13 +1484,13 @@ int CVideoDatabase::AddRatings(int mediaId, const char *mediaType, const RatingM
         id = m_pDS->fv(0).get_asInt();
         m_pDS->close();
         strSQL = PrepareSQL("UPDATE rating SET rating = %f, votes = %i WHERE rating_id = %i", i.second.rating, i.second.votes, id);
-        m_pDS->exec(strSQL);        
+        m_pDS->exec(strSQL);
       }
       if (i.first == defaultRating)
         ratingid = id;
     }
     return ratingid;
-    
+
   }
   catch (...)
   {
@@ -2350,7 +2350,7 @@ int CVideoDatabase::SetDetailsForMovie(const std::string& strFilenameAndPath, CV
                                       "    ON files.idFile=movie.idFile "
                                       "  JOIN uniqueid "
                                       "    ON movie.idMovie=uniqueid.media_id AND uniqueid.media_type='movie' AND uniqueid.value='%s'"
-                                      "WHERE movie.premiered LIKE '%i%%' AND movie.idMovie!=%i AND files.playCount > 0", 
+                                      "WHERE movie.premiered LIKE '%i%%' AND movie.idMovie!=%i AND files.playCount > 0",
                                       details.GetUniqueID().c_str(), details.GetYear(), idMovie);
       m_pDS->query(strSQL);
 
@@ -2640,7 +2640,7 @@ bool CVideoDatabase::UpdateDetailsForTvShow(int idTvShow, CVideoInfoTag &details
   if (details.m_iUserRating > 0 && details.m_iUserRating < 11)
     sql += PrepareSQL(", userrating = %i", details.m_iUserRating);
   else
-    sql += ", userrating = NULL";  
+    sql += ", userrating = NULL";
   if (details.GetDuration() > 0)
     sql += PrepareSQL(", duration = %i", details.GetDuration());
   else
@@ -2759,7 +2759,7 @@ int CVideoDatabase::SetDetailsForEpisode(const std::string& strFilenameAndPath,
       std::string strSQL = PrepareSQL("SELECT files.playCount, files.lastPlayed "
                                       "FROM episode INNER JOIN files ON files.idFile=episode.idFile "
                                       "WHERE episode.c%02d=%i AND episode.c%02d=%i AND episode.idShow=%i "
-                                      "AND episode.idEpisode!=%i AND files.playCount > 0", 
+                                      "AND episode.idEpisode!=%i AND files.playCount > 0",
                                       VIDEODB_ID_EPISODE_SEASON, details.m_iSeason, VIDEODB_ID_EPISODE_EPISODE,
                                       details.m_iEpisode, idShow, idEpisode);
       m_pDS->query(strSQL);
@@ -3792,7 +3792,7 @@ bool CVideoDatabase::GetStreamDetails(CVideoInfoTag& tag) const
 
   return retVal;
 }
- 
+
 bool CVideoDatabase::GetResumePoint(CVideoInfoTag& tag)
 {
   if (tag.m_iFileId < 0)
@@ -3860,7 +3860,7 @@ CVideoInfoTag CVideoDatabase::GetDetailsForMovie(const dbiplus::sql_record* cons
 
   details.m_iDbId = idMovie;
   details.m_type = MediaTypeMovie;
-  
+
   details.m_set.id = record->at(VIDEODB_DETAILS_MOVIE_SET_ID).get_asInt();
   details.m_set.title = record->at(VIDEODB_DETAILS_MOVIE_SET_NAME).get_asString();
   details.m_set.overview = record->at(VIDEODB_DETAILS_MOVIE_SET_OVERVIEW).get_asString();
@@ -3875,7 +3875,7 @@ CVideoInfoTag CVideoDatabase::GetDetailsForMovie(const dbiplus::sql_record* cons
                          record->at(VIDEODB_DETAILS_MOVIE_TOTAL_TIME).get_asInt(),
                          record->at(VIDEODB_DETAILS_MOVIE_PLAYER_STATE).get_asString());
   details.m_iUserRating = record->at(VIDEODB_DETAILS_MOVIE_USER_RATING).get_asInt();
-  details.SetRating(record->at(VIDEODB_DETAILS_MOVIE_RATING).get_asFloat(), 
+  details.SetRating(record->at(VIDEODB_DETAILS_MOVIE_RATING).get_asFloat(),
                     record->at(VIDEODB_DETAILS_MOVIE_VOTES).get_asInt(),
                     record->at(VIDEODB_DETAILS_MOVIE_RATING_TYPE).get_asString(), true);
   details.SetUniqueID(record->at(VIDEODB_DETAILS_MOVIE_UNIQUEID_VALUE).get_asString(), record->at(VIDEODB_DETAILS_MOVIE_UNIQUEID_TYPE).get_asString() ,true);
@@ -3958,7 +3958,7 @@ CVideoInfoTag CVideoDatabase::GetDetailsForTvShow(const dbiplus::sql_record* con
   details.SetPlayCount(record->at(VIDEODB_DETAILS_TVSHOW_NUM_WATCHED).get_asInt());
   details.m_strShowTitle = details.m_strTitle;
   details.m_iUserRating = record->at(VIDEODB_DETAILS_TVSHOW_USER_RATING).get_asInt();
-  details.SetRating(record->at(VIDEODB_DETAILS_TVSHOW_RATING).get_asFloat(), 
+  details.SetRating(record->at(VIDEODB_DETAILS_TVSHOW_RATING).get_asFloat(),
                     record->at(VIDEODB_DETAILS_TVSHOW_VOTES).get_asInt(),
                     record->at(VIDEODB_DETAILS_TVSHOW_RATING_TYPE).get_asString(), true);
   details.SetUniqueID(record->at(VIDEODB_DETAILS_TVSHOW_UNIQUEID_VALUE).get_asString(), record->at(VIDEODB_DETAILS_TVSHOW_UNIQUEID_TYPE).get_asString(), true);
@@ -4038,8 +4038,8 @@ CVideoInfoTag CVideoDatabase::GetDetailsForEpisode(const dbiplus::sql_record* co
                          record->at(VIDEODB_DETAILS_EPISODE_TOTAL_TIME).get_asInt(),
                          record->at(VIDEODB_DETAILS_EPISODE_PLAYER_STATE).get_asString());
   details.m_iUserRating = record->at(VIDEODB_DETAILS_EPISODE_USER_RATING).get_asInt();
-  details.SetRating(record->at(VIDEODB_DETAILS_EPISODE_RATING).get_asFloat(), 
-                    record->at(VIDEODB_DETAILS_EPISODE_VOTES).get_asInt(), 
+  details.SetRating(record->at(VIDEODB_DETAILS_EPISODE_RATING).get_asFloat(),
+                    record->at(VIDEODB_DETAILS_EPISODE_VOTES).get_asInt(),
                     record->at(VIDEODB_DETAILS_EPISODE_RATING_TYPE).get_asString(), true);
   details.SetUniqueID(record->at(VIDEODB_DETAILS_EPISODE_UNIQUEID_VALUE).get_asString(), record->at(VIDEODB_DETAILS_EPISODE_UNIQUEID_TYPE).get_asString(), true);
   movieTime += XbmcThreads::SystemClockMillis() - time; time = XbmcThreads::SystemClockMillis();
@@ -4060,10 +4060,10 @@ CVideoInfoTag CVideoDatabase::GetDetailsForEpisode(const dbiplus::sql_record* co
       GetUniqueIDs(details.m_iDbId, MediaTypeEpisode, details);
 
     details.m_strPictureURL.Parse();
-    
+
     if (getDetails &  VideoDbDetailsBookmark)
       GetBookMarkForEpisode(details, details.m_EpBookmark);
-    
+
     if (getDetails & VideoDbDetailsStream)
       GetStreamDetails(details);
 
@@ -4087,7 +4087,7 @@ CVideoInfoTag CVideoDatabase::GetDetailsForMusicVideo(const dbiplus::sql_record*
   GetDetailsFromDB(record, VIDEODB_ID_MUSICVIDEO_MIN, VIDEODB_ID_MUSICVIDEO_MAX, DbMusicVideoOffsets, details);
   details.m_iDbId = idMVideo;
   details.m_type = MediaTypeMusicVideo;
-  
+
   details.m_iFileId = record->at(VIDEODB_DETAILS_FILEID).get_asInt();
   details.m_strPath = record->at(VIDEODB_DETAILS_MUSICVIDEO_PATH).get_asString();
   std::string strFileName = record->at(VIDEODB_DETAILS_MUSICVIDEO_FILE).get_asString();
@@ -4104,7 +4104,7 @@ CVideoInfoTag CVideoDatabase::GetDetailsForMusicVideo(const dbiplus::sql_record*
     details.SetYear(record->at(VIDEODB_DETAILS_MUSICVIDEO_PREMIERED).get_asInt());
   else
     details.SetPremieredFromDBDate(premieredString);
-  
+
   movieTime += XbmcThreads::SystemClockMillis() - time; time = XbmcThreads::SystemClockMillis();
 
   if (getDetails)
@@ -5154,7 +5154,7 @@ void CVideoDatabase::UpdateTables(int iVersion)
         "WHERE "
         "episode.idShow = %d AND "
         "episode.c%02d = %d",
-        m_pDS->fv(0).get_asInt(), m_pDS->fv(1).get_asInt(), 
+        m_pDS->fv(0).get_asInt(), m_pDS->fv(1).get_asInt(),
         VIDEODB_ID_EPISODE_SEASON, m_pDS->fv(2).get_asInt()));
 
       m_pDS->next();
@@ -5230,7 +5230,7 @@ void CVideoDatabase::UpdateTables(int iVersion)
     }
     m_pDS->close();
   }
-  
+
   if (iVersion < 105)
   {
     m_pDS->exec("ALTER TABLE movie ADD premiered TEXT");
@@ -5614,7 +5614,7 @@ void CVideoDatabase::EraseVideoSettings(const std::string &path /* = ""*/)
     }
     else
       CLog::Log(LOGINFO, "Deleting settings information for all files");
-    
+
     m_pDS->exec(sql);
   }
   catch (...)
@@ -6560,8 +6560,8 @@ bool CVideoDatabase::GetSeasonsByWhere(const std::string& strBaseDir, const Filt
         pItem->GetVideoInfoTag()->SetPremieredFromDBDate(m_pDS->fv(VIDEODB_ID_SEASON_TVSHOW_PREMIERED).get_asString());
         pItem->GetVideoInfoTag()->m_firstAired.SetFromDBDate(m_pDS->fv(VIDEODB_ID_SEASON_PREMIERED).get_asString());
         pItem->GetVideoInfoTag()->m_iUserRating = m_pDS->fv(VIDEODB_ID_SEASON_USER_RATING).get_asInt();
-        // season premiered date based on first episode airdate associated to the season		
-        // tvshow premiered date is used as a fallback		
+        // season premiered date based on first episode airdate associated to the season
+        // tvshow premiered date is used as a fallback
         if (pItem->GetVideoInfoTag()->m_firstAired.IsValid())
           pItem->GetVideoInfoTag()->SetPremiered(pItem->GetVideoInfoTag()->m_firstAired);
         else if (pItem->GetVideoInfoTag()->HasPremiered())
@@ -6711,7 +6711,7 @@ std::string CVideoDatabase::GetItemById(const std::string &itemType, int id)
     return GetGenreById(id);
   else if (StringUtils::EqualsNoCase(itemType, "years"))
     return StringUtils::Format("%d", id);
-  else if (StringUtils::EqualsNoCase(itemType, "actors") || 
+  else if (StringUtils::EqualsNoCase(itemType, "actors") ||
            StringUtils::EqualsNoCase(itemType, "directors") ||
            StringUtils::EqualsNoCase(itemType, "artists"))
     return GetPersonById(id);
@@ -6802,7 +6802,7 @@ bool CVideoDatabase::GetMoviesByWhere(const std::string& strBaseDir, const Filte
     if (total < iRowsFound)
       total = iRowsFound;
     items.SetProperty("total", total);
-    
+
     DatabaseResults results;
     results.reserve(iRowsFound);
 
@@ -6882,7 +6882,7 @@ bool CVideoDatabase::GetTvShowsByWhere(const std::string& strBaseDir, const Filt
     if (NULL == m_pDS.get()) return false;
 
     int total = -1;
-    
+
     std::string strSQL = "SELECT %s FROM tvshow_view ";
     CVideoDbUrl videoUrl;
     std::string strSQLExtra;
@@ -6910,7 +6910,7 @@ bool CVideoDatabase::GetTvShowsByWhere(const std::string& strBaseDir, const Filt
     if (total < iRowsFound)
       total = iRowsFound;
     items.SetProperty("total", total);
-    
+
     DatabaseResults results;
     results.reserve(iRowsFound);
     if (!SortUtils::SortFromDataset(sorting, MediaTypeTvShow, m_pDS, results))
@@ -6923,7 +6923,7 @@ bool CVideoDatabase::GetTvShowsByWhere(const std::string& strBaseDir, const Filt
     {
       unsigned int targetRow = (unsigned int)i.at(FieldRow).asInteger();
       const dbiplus::sql_record* const record = data.at(targetRow);
-      
+
       CFileItemPtr pItem(new CFileItem());
       CVideoInfoTag movie = GetDetailsForTvShow(record, getDetails, pItem.get());
       if (m_profileManager.GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE ||
@@ -6975,7 +6975,7 @@ bool CVideoDatabase::GetEpisodesNav(const std::string& strBaseDir, CFileItemList
   }
   else if (idYear != -1)
     videoUrl.AddOption("year", idYear);
-  
+
   if (idDirector != -1)
     videoUrl.AddOption("directorid", idDirector);
 
@@ -7008,7 +7008,7 @@ bool CVideoDatabase::GetEpisodesByWhere(const std::string& strBaseDir, const Fil
     if (NULL == m_pDS.get()) return false;
 
     int total = -1;
-    
+
     std::string strSQL = "select %s from episode_view ";
     CVideoDbUrl videoUrl;
     std::string strSQLExtra;
@@ -7036,12 +7036,12 @@ bool CVideoDatabase::GetEpisodesByWhere(const std::string& strBaseDir, const Fil
     if (total < iRowsFound)
       total = iRowsFound;
     items.SetProperty("total", total);
-    
+
     DatabaseResults results;
     results.reserve(iRowsFound);
     if (!SortUtils::SortFromDataset(sorting, MediaTypeEpisode, m_pDS, results))
       return false;
-    
+
     // get data from returned rows
     items.Reserve(results.size());
     CLabelFormatter formatter("%H. %T", "");
@@ -7059,7 +7059,7 @@ bool CVideoDatabase::GetEpisodesByWhere(const std::string& strBaseDir, const Fil
       {
         CFileItemPtr pItem(new CFileItem(movie));
         formatter.FormatLabel(pItem.get());
-      
+
         int idEpisode = record->at(0).get_asInt();
 
         CVideoDbUrl itemUrl = videoUrl;
@@ -7849,7 +7849,7 @@ bool CVideoDatabase::GetMusicVideosByWhere(const std::string &baseDir, const Fil
     if (NULL == m_pDS.get()) return false;
 
     int total = -1;
-    
+
     std::string strSQL = "select %s from musicvideo_view ";
     CVideoDbUrl videoUrl;
     std::string strSQLExtra;
@@ -7877,12 +7877,12 @@ bool CVideoDatabase::GetMusicVideosByWhere(const std::string &baseDir, const Fil
     if (total < iRowsFound)
       total = iRowsFound;
     items.SetProperty("total", total);
-    
+
     DatabaseResults results;
     results.reserve(iRowsFound);
     if (!SortUtils::SortFromDataset(sorting, MediaTypeMusicVideo, m_pDS, results))
       return false;
-    
+
     // get data from returned rows
     items.Reserve(results.size());
     // get songs from returned subtable
@@ -7891,7 +7891,7 @@ bool CVideoDatabase::GetMusicVideosByWhere(const std::string &baseDir, const Fil
     {
       unsigned int targetRow = (unsigned int)i.at(FieldRow).asInteger();
       const dbiplus::sql_record* const record = data.at(targetRow);
-      
+
       CVideoInfoTag musicvideo = GetDetailsForMusicVideo(record, getDetails);
       if (!checkLocks || m_profileManager.GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE || g_passwordManager.bMasterUser ||
           g_passwordManager.IsDatabasePathUnlocked(musicvideo.m_strPath, *CMediaSourceSettings::GetInstance().GetSources("video")))
@@ -9606,7 +9606,7 @@ bool CVideoDatabase::ImportArtFromXML(const TiXmlNode *node, std::map<std::strin
 
 void CVideoDatabase::ConstructPath(std::string& strDest, const std::string& strPath, const std::string& strFileName)
 {
-  if (URIUtils::IsStack(strFileName) || 
+  if (URIUtils::IsStack(strFileName) ||
       URIUtils::IsInArchive(strFileName) || URIUtils::IsPlugin(strPath))
     strDest = strFileName;
   else
@@ -9779,7 +9779,7 @@ void CVideoDatabase::AnnounceUpdate(std::string content, int id)
 bool CVideoDatabase::GetItemsForPath(const std::string &content, const std::string &strPath, CFileItemList &items)
 {
   std::string path(strPath);
-  
+
   if(URIUtils::IsMultiPath(path))
   {
     std::vector<std::string> paths;
@@ -9790,7 +9790,7 @@ bool CVideoDatabase::GetItemsForPath(const std::string &content, const std::stri
 
     return items.Size() > 0;
   }
-  
+
   int pathID = GetPathId(path);
   if (pathID < 0)
     return false;
@@ -9941,7 +9941,7 @@ bool CVideoDatabase::GetFilter(CDbUrl &videoUrl, Filter &filter, SortDescription
 
         AppendIdLinkFilter("director", "actor", "tvshow", "episode", "idShow", options, filter);
         AppendLinkFilter("director", "actor", "tvshow", "episode", "idShow", options, filter);
-      
+
         option = options.find("year");
         if (option != options.end())
         {
diff --git a/xbmc/video/VideoDatabase.h b/xbmc/video/VideoDatabase.h
index 54a0b44219..f024d79624 100644
--- a/xbmc/video/VideoDatabase.h
+++ b/xbmc/video/VideoDatabase.h
@@ -600,7 +600,7 @@ public:
   void SetVideoSettings(int idFile, const CVideoSettings &settings);
 
   /**
-   * Erases settings for all files beginning with the specified path. Defaults 
+   * Erases settings for all files beginning with the specified path. Defaults
    * to an empty path, meaning all settings will be erased.
    * @param path partial path, e.g. pvr://channels
    */
@@ -662,7 +662,7 @@ public:
    \return true if the scraper is in use, false otherwise.
    */
   bool ScraperInUse(const std::string &scraperID) const;
-  
+
   // scanning hashes and paths scanned
   bool SetPathHash(const std::string &path, const std::string &hash);
   bool GetPathHash(const std::string &path, std::string &hash);
@@ -742,7 +742,7 @@ public:
   bool GetSeasonsNav(const std::string& strBaseDir, CFileItemList& items, int idActor=-1, int idDirector=-1, int idGenre=-1, int idYear=-1, int idShow=-1, bool getLinkedMovies = true);
   bool GetEpisodesNav(const std::string& strBaseDir, CFileItemList& items, int idGenre=-1, int idYear=-1, int idActor=-1, int idDirector=-1, int idShow=-1, int idSeason=-1, const SortDescription &sortDescription = SortDescription(), int getDetails = VideoDbDetailsNone);
   bool GetMusicVideosNav(const std::string& strBaseDir, CFileItemList& items, int idGenre=-1, int idYear=-1, int idArtist=-1, int idDirector=-1, int idStudio=-1, int idAlbum=-1, int idTag=-1, const SortDescription &sortDescription = SortDescription(), int getDetails = VideoDbDetailsNone);
-  
+
   bool GetRecentlyAddedMoviesNav(const std::string& strBaseDir, CFileItemList& items, unsigned int limit=0, int getDetails = VideoDbDetailsNone);
   bool GetRecentlyAddedEpisodesNav(const std::string& strBaseDir, CFileItemList& items, unsigned int limit=0, int getDetails = VideoDbDetailsNone);
   bool GetRecentlyAddedMusicVideosNav(const std::string& strBaseDir, CFileItemList& items, unsigned int limit=0, int getDetails = VideoDbDetailsNone);
@@ -798,7 +798,7 @@ public:
   bool GetSeasonsByWhere(const std::string& strBaseDir, const Filter &filter, CFileItemList& items, bool appendFullShowPath = true, const SortDescription &sortDescription = SortDescription());
   bool GetEpisodesByWhere(const std::string& strBaseDir, const Filter &filter, CFileItemList& items, bool appendFullShowPath = true, const SortDescription &sortDescription = SortDescription(), int getDetails = VideoDbDetailsNone);
   bool GetMusicVideosByWhere(const std::string &baseDir, const Filter &filter, CFileItemList& items, bool checkLocks = true, const SortDescription &sortDescription = SortDescription(), int getDetails = VideoDbDetailsNone);
-  
+
   // retrieve sorted and limited items
   bool GetSortedVideos(const MediaType &mediaType, const std::string& strBaseDir, const SortDescription &sortDescription, CFileItemList& items, const Filter &filter = Filter());
 
diff --git a/xbmc/video/VideoDbUrl.cpp b/xbmc/video/VideoDbUrl.cpp
index ab8fd85bd0..223585a52a 100644
--- a/xbmc/video/VideoDbUrl.cpp
+++ b/xbmc/video/VideoDbUrl.cpp
@@ -212,7 +212,7 @@ bool CVideoDbUrl::validateOption(const std::string &key, const CVariant &value)
   CSmartPlaylist xspFilter;
   if (!xspFilter.LoadFromJson(value.asString()))
     return false;
-  
+
   // check if the filter playlist matches the item type
   return (xspFilter.GetType() == m_itemType ||
          (xspFilter.GetType() == "movies" && m_itemType == "sets"));
diff --git a/xbmc/video/VideoInfoScanner.cpp b/xbmc/video/VideoInfoScanner.cpp
index 67647c7e38..4ed9106af1 100644
--- a/xbmc/video/VideoInfoScanner.cpp
+++ b/xbmc/video/VideoInfoScanner.cpp
@@ -172,10 +172,10 @@ namespace VIDEO
     {
       CLog::Log(LOGERROR, "VideoInfoScanner: Exception while scanning.");
     }
-    
+
     m_bRunning = false;
     ANNOUNCEMENT::CAnnouncementManager::GetInstance().Announce(ANNOUNCEMENT::VideoLibrary, "xbmc", "OnScanFinished");
-    
+
     if (m_handle)
       m_handle->MarkFinished();
     m_handle = NULL;
@@ -1740,13 +1740,13 @@ namespace VIDEO
         item.SetPath(file->strPath);
         if (!imdb.GetEpisodeDetails(guide->cScraperUrl, *item.GetVideoInfoTag(), pDlgProgress))
           return INFO_NOT_FOUND; //! @todo should we just skip to the next episode?
-          
+
         // Only set season/epnum from filename when it is not already set by a scraper
         if (item.GetVideoInfoTag()->m_iSeason == -1)
           item.GetVideoInfoTag()->m_iSeason = guide->iSeason;
         if (item.GetVideoInfoTag()->m_iEpisode == -1)
           item.GetVideoInfoTag()->m_iEpisode = guide->iEpisode;
-          
+
         if (AddVideo(&item, CONTENT_TVSHOWS, file->isFolder, useLocal, &showInfo) < 0)
           return INFO_ERROR;
       }
diff --git a/xbmc/video/VideoInfoTag.cpp b/xbmc/video/VideoInfoTag.cpp
index a60535082b..029ef9880c 100644
--- a/xbmc/video/VideoInfoTag.cpp
+++ b/xbmc/video/VideoInfoTag.cpp
@@ -298,7 +298,7 @@ bool CVideoInfoTag::Save(TiXmlNode *node, const std::string &tag, bool savePathI
     season.InsertEndChild(value);
     movie->InsertEndChild(season);
   }
- 
+
   TiXmlElement resume("resume");
   XMLUtils::SetFloat(&resume, "position", (float)m_resumePoint.timeInSeconds);
   XMLUtils::SetFloat(&resume, "total", (float)m_resumePoint.totalTimeInSeconds);
@@ -904,16 +904,16 @@ void CVideoInfoTag::ParseNative(const TiXmlElement* movie, bool prioritise)
   if (XMLUtils::GetString(movie, "tagline", value))
     SetTagLine(value);
 
-  
+
   if (XMLUtils::GetString(movie, "runtime", value) && !value.empty())
     m_duration = GetDurationFromMinuteString(StringUtils::Trim(value));
-  
+
   if (XMLUtils::GetString(movie, "mpaa", value))
     SetMPAARating(value);
 
   XMLUtils::GetInt(movie, "playcount", m_playCount);
   XMLUtils::GetDate(movie, "lastplayed", m_lastPlayed);
-  
+
   if (XMLUtils::GetString(movie, "file", value))
     SetFile(value);
 
@@ -956,7 +956,7 @@ void CVideoInfoTag::ParseNative(const TiXmlElement* movie, bool prioritise)
     if (XMLUtils::GetInt(movie, "year", year))
       SetYear(year);
   }
-  
+
   if (XMLUtils::GetString(movie, "status", value))
     SetStatus(value);
 
@@ -964,7 +964,7 @@ void CVideoInfoTag::ParseNative(const TiXmlElement* movie, bool prioritise)
     SetProductionCode(value);
 
   XMLUtils::GetDate(movie, "aired", m_firstAired);
-  
+
   if (XMLUtils::GetString(movie, "album", value))
     SetAlbum(value);
 
@@ -994,7 +994,7 @@ void CVideoInfoTag::ParseNative(const TiXmlElement* movie, bool prioritise)
   if (prioritise && iThumbCount && iThumbCount != m_strPictureURL.m_url.size())
   {
     rotate(m_strPictureURL.m_url.begin(),
-           m_strPictureURL.m_url.begin()+iThumbCount, 
+           m_strPictureURL.m_url.begin()+iThumbCount,
            m_strPictureURL.m_url.end());
     m_strPictureURL.m_xml = xmlAdd;
   }
@@ -1045,10 +1045,10 @@ void CVideoInfoTag::ParseNative(const TiXmlElement* movie, bool prioritise)
     {
       SActorInfo info;
       info.strName = actor->FirstChild()->Value();
-      
+
       if (XMLUtils::GetString(node, "role", value))
         info.strRole = StringUtils::Trim(value);
-      
+
       XMLUtils::GetInt(node, "order", info.order);
       const TiXmlElement* thumb = node->FirstChildElement("thumb");
       while (thumb)
diff --git a/xbmc/video/VideoThumbLoader.cpp b/xbmc/video/VideoThumbLoader.cpp
index 9c7b8f7563..e871092b26 100644
--- a/xbmc/video/VideoThumbLoader.cpp
+++ b/xbmc/video/VideoThumbLoader.cpp
@@ -557,7 +557,7 @@ std::string CVideoThumbLoader::GetLocalArt(const CFileItem &item, const std::str
 
   /* Cache directory for (sub) folders on streamed filesystems. We need to do this
      else entering (new) directories from the app thread becomes much slower. This
-     is caused by the fact that Curl Stat/Exist() is really slow and that the 
+     is caused by the fact that Curl Stat/Exist() is really slow and that the
      thumbloader thread accesses the streamed filesystem at the same time as the
      App thread and the latter has to wait for it.
    */
diff --git a/xbmc/video/VideoThumbLoader.h b/xbmc/video/VideoThumbLoader.h
index 8e6d664523..b61b6ee72e 100644
--- a/xbmc/video/VideoThumbLoader.h
+++ b/xbmc/video/VideoThumbLoader.h
@@ -61,7 +61,7 @@ public:
   CFileItem  m_item;
   bool       m_thumb; ///< extract thumb?
   int64_t    m_pos; ///< position to extract thumb from
-  bool m_fillStreamDetails; ///< fill in stream details? 
+  bool m_fillStreamDetails; ///< fill in stream details?
 };
 
 class CVideoThumbLoader : public CThumbLoader, public CJobQueue
diff --git a/xbmc/video/dialogs/GUIDialogAudioSettings.cpp b/xbmc/video/dialogs/GUIDialogAudioSettings.cpp
index a26dd1408f..27959dfe7e 100644
--- a/xbmc/video/dialogs/GUIDialogAudioSettings.cpp
+++ b/xbmc/video/dialogs/GUIDialogAudioSettings.cpp
@@ -75,7 +75,7 @@ void CGUIDialogAudioSettings::FrameMove()
   if (g_application.GetAppPlayer().HasPlayer())
   {
     const CVideoSettings videoSettings = g_application.GetAppPlayer().GetVideoSettings();
-    
+
     // these settings can change on the fly
     //! @todo (needs special handling): m_settingsManager->SetInt(SETTING_AUDIO_STREAM, g_application.GetAppPlayer().GetAudioStream());
     GetSettingsManager()->SetNumber(SETTING_AUDIO_DELAY, videoSettings.m_AudioDelay);
@@ -111,7 +111,7 @@ void CGUIDialogAudioSettings::OnSettingChanged(std::shared_ptr<const CSetting> s
     return;
 
   CGUIDialogSettingsManualBase::OnSettingChanged(setting);
-  
+
   const std::string &settingId = setting->GetId();
   if (settingId == SETTING_AUDIO_VOLUME)
   {
@@ -150,7 +150,7 @@ void CGUIDialogAudioSettings::OnSettingAction(std::shared_ptr<const CSetting> se
     return;
 
   CGUIDialogSettingsManualBase::OnSettingAction(setting);
-  
+
   const std::string &settingId = setting->GetId();
   if (settingId == SETTING_AUDIO_MAKE_DEFAULT)
     Save();
@@ -225,7 +225,7 @@ void CGUIDialogAudioSettings::InitializeSettings()
   bool usePopup = g_SkinInfo->HasSkinFile("DialogSlider.xml");
 
   const CVideoSettings videoSettings = g_application.GetAppPlayer().GetVideoSettings();
-  
+
   if (g_application.GetAppPlayer().HasPlayer())
   {
     g_application.GetAppPlayer().GetAudioCapabilities(m_audioCaps);
@@ -261,7 +261,7 @@ void CGUIDialogAudioSettings::InitializeSettings()
     std::shared_ptr<CSettingNumber> settingAudioDelay = AddSlider(groupAudio, SETTING_AUDIO_DELAY, 297, SettingLevel::Basic, videoSettings.m_AudioDelay, 0, -g_advancedSettings.m_videoAudioDelayRange, 0.025f, g_advancedSettings.m_videoAudioDelayRange, 297, usePopup);
     std::static_pointer_cast<CSettingControlSlider>(settingAudioDelay->GetControl())->SetFormatter(SettingFormatterDelay);
   }
-  
+
   // audio stream setting
   if (SupportsAudioFeature(IPC_AUD_SELECT_STREAM))
     AddAudioStreams(groupAudio, SETTING_AUDIO_STREAM);
diff --git a/xbmc/video/dialogs/GUIDialogSubtitleSettings.cpp b/xbmc/video/dialogs/GUIDialogSubtitleSettings.cpp
index 45c03b378e..500c682ea2 100644
--- a/xbmc/video/dialogs/GUIDialogSubtitleSettings.cpp
+++ b/xbmc/video/dialogs/GUIDialogSubtitleSettings.cpp
@@ -95,7 +95,7 @@ void CGUIDialogSubtitleSettings::OnSettingChanged(std::shared_ptr<const CSetting
     return;
 
   CGUIDialogSettingsManualBase::OnSettingChanged(setting);
-  
+
   const std::string &settingId = setting->GetId();
   if (settingId == SETTING_SUBTITLE_ENABLE)
   {
@@ -158,7 +158,7 @@ void CGUIDialogSubtitleSettings::OnSettingAction(std::shared_ptr<const CSetting>
     return;
 
   CGUIDialogSettingsManualBase::OnSettingAction(setting);
-  
+
   const std::string &settingId = setting->GetId();
   if (settingId == SETTING_SUBTITLE_BROWSER)
   {
@@ -251,7 +251,7 @@ void CGUIDialogSubtitleSettings::InitializeSettings()
   bool usePopup = g_SkinInfo->HasSkinFile("DialogSlider.xml");
 
   const CVideoSettings videoSettings = g_application.GetAppPlayer().GetVideoSettings();
-  
+
   if (g_application.GetAppPlayer().HasPlayer())
   {
     g_application.GetAppPlayer().GetSubtitleCapabilities(m_subtitleCapabilities);
diff --git a/xbmc/video/dialogs/GUIDialogSubtitles.cpp b/xbmc/video/dialogs/GUIDialogSubtitles.cpp
index 6312d9223b..744dd5aae6 100644
--- a/xbmc/video/dialogs/GUIDialogSubtitles.cpp
+++ b/xbmc/video/dialogs/GUIDialogSubtitles.cpp
@@ -213,7 +213,7 @@ void CGUIDialogSubtitles::Process(unsigned int currentTime, CDirtyRegionList &di
       }
       m_updateSubsList = false;
     }
-    
+
     int control = GetFocusedControlID();
     // nothing has focus
     if (!control)
@@ -254,7 +254,7 @@ void CGUIDialogSubtitles::FillServices()
   else
     // Set default service for filemode and movies
     defaultService = CServiceBroker::GetSettings().GetString(CSettings::SETTING_SUBTITLES_MOVIE);
-  
+
   std::string service = addons.front()->ID();
   for (VECADDONS::const_iterator addonIt = addons.begin(); addonIt != addons.end(); ++addonIt)
   {
@@ -580,7 +580,7 @@ void CGUIDialogSubtitles::OnDownloadComplete(const CFileItemList *items, const s
   // Notify window manager that a subtitle was downloaded
   CGUIMessage msg(GUI_MSG_SUBTITLE_DOWNLOADED, 0, 0);
   CServiceBroker::GetGUI()->GetWindowManager().SendThreadMessage(msg);
-  
+
   // Close the window
   Close();
 }
diff --git a/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp b/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
index d8fda9da2f..39ed9e731f 100644
--- a/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
+++ b/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
@@ -175,18 +175,18 @@ void CGUIDialogVideoBookmarks::OnPopupMenu(int item)
 {
   if (item < 0 || item >= (int) m_bookmarks.size())
     return;
-  
+
   // highlight the item
   (*m_vecItems)[item]->Select(true);
-  
+
   CContextButtons choices;
   choices.Add(1, (m_bookmarks[item].type == CBookmark::EPISODE ? 20405 : 20404)); // "Remove episode bookmark" or "Remove bookmark"
-  
+
   int button = CGUIDialogContextMenu::ShowAndGetChoice(choices);
-  
+
   // unhighlight the item
   (*m_vecItems)[item]->Select(false);
-  
+
   if (button == 1)
     Delete(item);
 }
@@ -235,10 +235,10 @@ void CGUIDialogVideoBookmarks::OnRefreshList()
 {
   m_bookmarks.clear();
   std::vector<CFileItemPtr> items;
-  
+
   // open the d/b and retrieve the bookmarks for the current movie
   m_filePath = g_application.CurrentFile();
-  if (g_application.CurrentFileItem().HasProperty("original_listitem_url") && 
+  if (g_application.CurrentFileItem().HasProperty("original_listitem_url") &&
      !URIUtils::IsVideoDb(g_application.CurrentFileItem().GetProperty("original_listitem_url").asString()))
      m_filePath = g_application.CurrentFileItem().GetProperty("original_listitem_url").asString();
 
@@ -253,7 +253,7 @@ void CGUIDialogVideoBookmarks::OnRefreshList()
 
   // cycle through each stored bookmark and add it to our list control
   for (unsigned int i = 0; i < m_bookmarks.size(); ++i)
-  {   
+  {
     std::string bookmarkTime;
     if (m_bookmarks[i].type == CBookmark::EPISODE)
       bookmarkTime = StringUtils::Format("%s %li %s %li", g_localizeStrings.Get(20373).c_str(), m_bookmarks[i].seasonNumber, g_localizeStrings.Get(20359).c_str(), m_bookmarks[i].episodeNumber);
@@ -387,7 +387,7 @@ void CGUIDialogVideoBookmarks::ClearBookmarks()
   CVideoDatabase videoDatabase;
   videoDatabase.Open();
   std::string path = g_application.CurrentFile();
-  if (g_application.CurrentFileItem().HasProperty("original_listitem_url") && 
+  if (g_application.CurrentFileItem().HasProperty("original_listitem_url") &&
      !URIUtils::IsVideoDb(g_application.CurrentFileItem().GetProperty("original_listitem_url").asString()))
     path = g_application.CurrentFileItem().GetProperty("original_listitem_url").asString();
   videoDatabase.ClearBookMarksOfFile(path, CBookmark::STANDARD);
@@ -457,7 +457,7 @@ bool CGUIDialogVideoBookmarks::AddBookmark(CVideoInfoTag* tag)
   else
   {
     std::string path = g_application.CurrentFile();
-    if (g_application.CurrentFileItem().HasProperty("original_listitem_url") && 
+    if (g_application.CurrentFileItem().HasProperty("original_listitem_url") &&
        !URIUtils::IsVideoDb(g_application.CurrentFileItem().GetProperty("original_listitem_url").asString()))
       path = g_application.CurrentFileItem().GetProperty("original_listitem_url").asString();
     videoDatabase.AddBookMarkToFile(path, bookmark, CBookmark::STANDARD);
@@ -528,8 +528,8 @@ bool CGUIDialogVideoBookmarks::OnAddBookmark()
 {
   if (!g_application.CurrentFileItem().IsVideo())
     return false;
-  
-  if (CGUIDialogVideoBookmarks::AddBookmark()) 
+
+  if (CGUIDialogVideoBookmarks::AddBookmark())
   {
     CServiceBroker::GetGUI()->GetWindowManager().SendMessage(GUI_MSG_REFRESH_LIST, 0, WINDOW_DIALOG_VIDEO_BOOKMARKS);
     CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Info,
@@ -555,10 +555,10 @@ bool CGUIDialogVideoBookmarks::OnAddEpisodeBookmark()
       if(bReturn)
       {
         CServiceBroker::GetGUI()->GetWindowManager().SendMessage(GUI_MSG_REFRESH_LIST, 0, WINDOW_DIALOG_VIDEO_BOOKMARKS);
-        CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Info, 
+        CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Info,
                                               g_localizeStrings.Get(298),   // "Bookmarks"
                                               g_localizeStrings.Get(21363));// "Episode Bookmark created"
- 
+
       }
     }
     videoDatabase.Close();
diff --git a/xbmc/video/dialogs/GUIDialogVideoBookmarks.h b/xbmc/video/dialogs/GUIDialogVideoBookmarks.h
index b9aeb954e5..0591250042 100644
--- a/xbmc/video/dialogs/GUIDialogVideoBookmarks.h
+++ b/xbmc/video/dialogs/GUIDialogVideoBookmarks.h
@@ -41,16 +41,16 @@ public:
 
   /*!
    \brief Creates a bookmark of the currently playing video file.
-   
+
           NOTE: sends a GUI_MSG_REFRESH_LIST message to DialogVideoBookmark on success
    \return True if creation of bookmark was succesful
    \sa OnAddEpisodeBookmark
    */
   static bool OnAddBookmark();
-  
+
   /*!
    \brief Creates an episode bookmark of the currently playing file
-   
+
           An episode bookmark specifies the end/beginning of episodes on files like: S01E01E02
           Fails if the current video isn't a multi-episode file
           NOTE: sends a GUI_MSG_REFRESH_LIST message to DialogVideoBookmark on success
@@ -58,8 +58,8 @@ public:
    \sa OnAddBookmark
    **/
   static bool OnAddEpisodeBookmark();
-  
-  
+
+
   void Update();
 protected:
   void GotoBookmark(int iItem);
diff --git a/xbmc/video/dialogs/GUIDialogVideoInfo.cpp b/xbmc/video/dialogs/GUIDialogVideoInfo.cpp
index 93644eb37a..2fa4dbae44 100644
--- a/xbmc/video/dialogs/GUIDialogVideoInfo.cpp
+++ b/xbmc/video/dialogs/GUIDialogVideoInfo.cpp
@@ -82,7 +82,7 @@ using namespace KODI::MESSAGING;
 #define CONTROL_LIST                50
 
 // predicate used by sorting and set_difference
-bool compFileItemsByDbId(const CFileItemPtr& lhs, const CFileItemPtr& rhs) 
+bool compFileItemsByDbId(const CFileItemPtr& lhs, const CFileItemPtr& rhs)
 {
   return lhs->HasVideoInfoTag() && rhs->HasVideoInfoTag() && lhs->GetVideoInfoTag()->m_iDbId < rhs->GetVideoInfoTag()->m_iDbId;
 }
@@ -298,7 +298,7 @@ void CGUIDialogVideoInfo::SetUserrating(int userrating) const
   if (userrating != m_movieItem->GetVideoInfoTag()->m_iUserRating)
   {
     m_movieItem->GetVideoInfoTag()->SetUserrating(userrating);
-    
+
     // send a message to all windows to tell them to update the fileitem (eg playlistplayer, media windows)
     CGUIMessage msg(GUI_MSG_NOTIFY_ALL, 0, 0, GUI_MSG_UPDATE_ITEM, 0, m_movieItem);
     CServiceBroker::GetGUI()->GetWindowManager().SendMessage(msg);
@@ -311,11 +311,11 @@ void CGUIDialogVideoInfo::SetMovie(const CFileItem *item)
 
   // setup cast list
   ClearCastList();
-  
+
   // When the scraper throws an error, the video tag can be null here
   if (!item->HasVideoInfoTag())
     return;
-  
+
   MediaType type = item->GetVideoInfoTag()->m_type;
 
   m_startUserrating = m_movieItem->GetVideoInfoTag()->m_iUserRating;
@@ -617,7 +617,7 @@ void CGUIDialogVideoInfo::Play(bool resume)
     Close(true);
     if (resume)
       movie.m_lStartOffset = STARTOFFSET_RESUME;
-    else if (!CGUIWindowVideoBase::ShowResumeMenu(movie)) 
+    else if (!CGUIWindowVideoBase::ShowResumeMenu(movie))
     {
       // The Resume dialog was closed without any choice
       Open();
@@ -1320,7 +1320,7 @@ bool CGUIDialogVideoInfo::DeleteVideoItemFromDatabase(const CFileItemPtr &item,
   CGUIDialogYesNo* pDialog = CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIDialogYesNo>(WINDOW_DIALOG_YES_NO);
   if (pDialog == nullptr)
     return false;
-  
+
   int heading = -1;
   VIDEODB_CONTENT_TYPE type = static_cast<VIDEODB_CONTENT_TYPE>(item->GetVideoContentType());
   switch (type)
@@ -1459,7 +1459,7 @@ bool CGUIDialogVideoInfo::ManageMovieSets(const CFileItemPtr &item)
   std::sort(original.begin(), original.end(), compFileItemsByDbId);
   VECFILEITEMS selected = selectedItems.GetList();
   std::sort(selected.begin(), selected.end(), compFileItemsByDbId);
-  
+
   bool refreshNeeded = false;
   // update the "added" items
   VECFILEITEMS addedItems;
@@ -1586,7 +1586,7 @@ bool CGUIDialogVideoInfo::GetSetForMovie(const CFileItem *movieItem, CFileItemPt
   dialog->SetItems(listItems);
   if (currentSetId >= 0)
   {
-    for (int listIndex = 0; listIndex < listItems.Size(); listIndex++) 
+    for (int listIndex = 0; listIndex < listItems.Size(); listIndex++)
     {
       if (listItems.Get(listIndex)->GetVideoInfoTag()->m_iDbId == currentSetId)
       {
@@ -1797,8 +1797,8 @@ bool CGUIDialogVideoInfo::ManageVideoItemArtwork(const CFileItemPtr &item, const
         musicdb.GetOldArtistPath(idArtist, artistOldPath);  // Old artist path, local to music files
         CArtist artist;
         musicdb.GetArtist(idArtist, artist); // Need name and mbid for artist folder name
-        musicdb.GetArtistPath(artist, artistPath);  // Artist path in artist info folder      
-        
+        musicdb.GetArtistPath(artist, artistPath);  // Artist path in artist info folder
+
         currentThumb = musicdb.GetArtForItem(idArtist, MediaTypeArtist, "thumb");
         if (currentThumb.empty())
           currentThumb = videodb.GetArtForItem(item->GetVideoInfoTag()->m_iDbId, item->GetVideoInfoTag()->m_type, artType);
@@ -1895,10 +1895,10 @@ bool CGUIDialogVideoInfo::ManageVideoItemArtwork(const CFileItemPtr &item, const
       noneitem->SetIconImage("DefaultVideo.png");
   }
   else
-  {    
+  {
     std::string strThumb;
     bool existsThumb = false;
-    // First look for artist thumb in the primary location       
+    // First look for artist thumb in the primary location
     if (!artistPath.empty())
     {
       strThumb = URIUtils::AddFileToFolder(artistPath, "folder.jpg");
@@ -1925,7 +1925,7 @@ bool CGUIDialogVideoInfo::ManageVideoItemArtwork(const CFileItemPtr &item, const
 
   if (!local)
     items.Add(noneitem);
-  
+
   std::string result;
   VECSOURCES sources=*CMediaSourceSettings::GetInstance().GetSources("video");
   g_mediaManager.GetLocalDrives(sources);
@@ -1935,7 +1935,7 @@ bool CGUIDialogVideoInfo::ManageVideoItemArtwork(const CFileItemPtr &item, const
 
   if (result == "thumb://Current")
     result = currentThumb;   // user chose the one they have
-  
+
   // delete the thumbnail if that's what the user wants, else overwrite with the
   // new thumbnail
   if (result == "thumb://None")
@@ -2006,7 +2006,7 @@ bool CGUIDialogVideoInfo::UpdateVideoItemSortTitle(const CFileItemPtr &pItem)
     currentTitle = detail.m_strTitle;
   else
     currentTitle = detail.m_strSortTitle;
-  
+
   // get the new sort title
   if (!CGUIKeyboardFactory::ShowAndGetInput(currentTitle, CVariant{g_localizeStrings.Get(16107)}, false))
     return false;
@@ -2091,7 +2091,7 @@ bool CGUIDialogVideoInfo::OnGetFanart(const CFileItemPtr &videoItem)
   CVideoThumbLoader loader;
   CFileItem item(*videoItem);
   loader.LoadItem(&item);
-  
+
   CFileItemList items;
   if (item.HasArt("fanart"))
   {
diff --git a/xbmc/video/windows/GUIWindowVideoBase.cpp b/xbmc/video/windows/GUIWindowVideoBase.cpp
index 67dbe2c3c7..a87d06324a 100644
--- a/xbmc/video/windows/GUIWindowVideoBase.cpp
+++ b/xbmc/video/windows/GUIWindowVideoBase.cpp
@@ -168,7 +168,7 @@ bool CGUIWindowVideoBase::OnMessage(CGUIMessage& message)
           }
 
           // not playing video, or playback speed == 1
-          return OnResumeItem(iItem);          
+          return OnResumeItem(iItem);
         }
         else if (iAction == ACTION_DELETE_ITEM)
         {
@@ -362,7 +362,7 @@ bool CGUIWindowVideoBase::ShowIMDB(CFileItemPtr item, const ScraperPtr &info2, b
     bHasInfo = true;
     movieDetails = *item->GetVideoInfoTag();
   }
-  
+
   bool needsRefresh = false;
   if (bHasInfo)
   {
@@ -634,7 +634,7 @@ bool CGUIWindowVideoBase::OnFileAction(int iItem, int action, std::string player
   // Reset the current start offset. The actual resume
   // option is set in the switch, based on the action passed.
   item->m_lStartOffset = 0;
-  
+
   switch (action)
   {
   case SELECT_ACTION_CHOOSE:
@@ -690,7 +690,7 @@ bool CGUIWindowVideoBase::OnFileAction(int iItem, int action, std::string player
   return OnClick(iItem, player);
 }
 
-bool CGUIWindowVideoBase::OnItemInfo(int iItem) 
+bool CGUIWindowVideoBase::OnItemInfo(int iItem)
 {
   if (iItem < 0 || iItem >= m_vecItems->Size())
     return false;
@@ -875,7 +875,7 @@ void CGUIWindowVideoBase::GetContextButtons(int itemNumber, CContextButtons &but
       }
 
       //if the item isn't a folder or script, is a member of a list rather than a single item
-      //and we're not on the last element of the list, 
+      //and we're not on the last element of the list,
       //then add add either 'play from here' or 'play only this' depending on default behaviour
       if (!(item->m_bIsFolder || item->IsScript()) && m_vecItems->Size() > 1 && itemNumber < m_vecItems->Size()-1)
       {
@@ -928,7 +928,7 @@ bool CGUIWindowVideoBase::OnPlayStackPart(int iItem)
     {
       std::string resumeString = CGUIWindowVideoBase::GetResumeString(*(parts[selectedFile].get()));
       stack->m_lStartOffset = 0;
-      if (!resumeString.empty()) 
+      if (!resumeString.empty())
       {
         CContextButtons choices;
         choices.Add(SELECT_ACTION_RESUME, resumeString);
@@ -974,7 +974,7 @@ bool CGUIWindowVideoBase::OnContextButton(int itemNumber, CONTEXT_BUTTON button)
     }
   case CONTEXT_BUTTON_PLAY_PART:
     {
-      if (OnPlayStackPart(itemNumber)) 
+      if (OnPlayStackPart(itemNumber))
       {
         // call CGUIMediaWindow::OnClick() as otherwise autoresume will kick in
         CGUIMediaWindow::OnClick(itemNumber);
@@ -1610,7 +1610,7 @@ bool CGUIWindowVideoBase::OnUnAssignContent(const std::string &path, int header,
     }
   }
   db.Close();
-  
+
   return false;
 }
 
@@ -1624,7 +1624,7 @@ void CGUIWindowVideoBase::OnAssignContent(const std::string &path)
   ADDON::ScraperPtr info = db.GetScraperForPath(path, settings);
 
   ADDON::ScraperPtr info2(info);
-  
+
   if (CGUIDialogContentSettings::Show(info, settings))
   {
     if(settings.exclude || (!info && info2))
diff --git a/xbmc/video/windows/GUIWindowVideoNav.cpp b/xbmc/video/windows/GUIWindowVideoNav.cpp
index 6aa05807d0..01912c1433 100644
--- a/xbmc/video/windows/GUIWindowVideoNav.cpp
+++ b/xbmc/video/windows/GUIWindowVideoNav.cpp
@@ -127,7 +127,7 @@ bool CGUIWindowVideoNav::OnMessage(CGUIMessage& message)
       {
         message.SetStringParam("");
       }
-      
+
       if (!CGUIWindowVideoBase::OnMessage(message))
         return false;
 
@@ -322,7 +322,7 @@ int CGUIWindowVideoNav::GetFirstUnwatchedItemIndex(bool includeAllSeasons, bool
 
       CVideoInfoTag *pTag = pItem->GetVideoInfoTag();
 
-      // Does the episode belong to the unwatched season and Is the episode unwatched, and is its episode number 
+      // Does the episode belong to the unwatched season and Is the episode unwatched, and is its episode number
       // lower than the currently identified first unwatched episode
       if (pTag->m_iSeason == iUnwatchedSeason && pTag->GetPlayCount() == 0 && pTag->m_iEpisode < iUnwatchedEpisode)
       {
@@ -539,7 +539,7 @@ bool CGUIWindowVideoNav::GetDirectory(const std::string &strDirectory, CFileItem
     else if (!items.IsVirtualDirectoryRoot())
     { // load info from the database
       std::string label;
-      if (items.GetLabel().empty() && m_rootDir.IsSource(items.GetPath(), CMediaSourceSettings::GetInstance().GetSources("video"), &label)) 
+      if (items.GetLabel().empty() && m_rootDir.IsSource(items.GetPath(), CMediaSourceSettings::GetInstance().GetSources("video"), &label))
         items.SetLabel(label);
       if (!items.IsSourcesPath() && !items.IsLibraryFolder())
         LoadVideoInfo(items);
@@ -650,7 +650,7 @@ void CGUIWindowVideoNav::LoadVideoInfo(CFileItemList &items, CVideoDatabase &dat
         database.GetPlayCounts(items.GetPath(), items);
         fetchedPlayCounts = true;
       }
-      
+
       // set the watched overlay
       if (pItem->IsVideo())
         pItem->SetOverlayImage(CGUIListItem::ICON_OVERLAY_UNWATCHED, pItem->HasVideoInfoTag() && pItem->GetVideoInfoTag()->GetPlayCount() > 0);
@@ -752,7 +752,7 @@ void CGUIWindowVideoNav::DoSearch(const std::string& strSearch, CFileItemList& i
 
   m_database.GetMusicVideosByAlbum(strSearch, tempItems);
   AppendAndClearSearchItems(tempItems, "[" + g_localizeStrings.Get(558) + "] ", items);
-  
+
   // get matching genres
   m_database.GetMovieGenresByName(strSearch, tempItems);
   AppendAndClearSearchItems(tempItems, "[" + strGenre + " - " + g_localizeStrings.Get(20342) + "] ", items);
@@ -1072,7 +1072,7 @@ bool CGUIWindowVideoNav::OnContextButton(int itemNumber, CONTEXT_BUTTON button)
         type = "actor";
       else if (button == CONTEXT_BUTTON_SET_ARTIST_THUMB)
         type = MediaTypeArtist;
-      
+
       bool result = CGUIDialogVideoInfo::ManageVideoItemArtwork(m_vecItems->Get(itemNumber), type);
       Refresh();
 
@@ -1150,7 +1150,7 @@ bool CGUIWindowVideoNav::OnClick(int iItem, const std::string &player)
     {
       HELPERS::ShowOKDialogText(CVariant{257}, CVariant{662});
       return true;
-    }	  
+    }
   }
   else if (StringUtils::StartsWithNoCase(item->GetPath(), "newtag://"))
   {
diff --git a/xbmc/view/GUIViewState.cpp b/xbmc/view/GUIViewState.cpp
index 9757b9df36..09696b99b4 100644
--- a/xbmc/view/GUIViewState.cpp
+++ b/xbmc/view/GUIViewState.cpp
@@ -301,7 +301,7 @@ void CGUIViewState::AddSortMethod(SortBy sortBy, SortAttribute sortAttributes, i
     // the following sort methods are sorted in descending order by default
     if (sortBy == SortByDate || sortBy == SortBySize || sortBy == SortByPlaycount ||
         sortBy == SortByRating || sortBy == SortByProgramCount ||
-        sortBy == SortByBitrate || sortBy == SortByListeners || 
+        sortBy == SortByBitrate || sortBy == SortByListeners ||
         sortBy == SortByUserRating || sortBy == SortByLastPlayed)
       sortOrder = SortOrderDescending;
     else
@@ -354,7 +354,7 @@ void CGUIViewState::SetSortMethod(SortDescription sortDescription)
 
 bool CGUIViewState::ChooseSortMethod()
 {
-  
+
   CGUIDialogSelect *dialog = CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIDialogSelect>(WINDOW_DIALOG_SELECT);
   if (!dialog)
     return false;
@@ -464,7 +464,7 @@ void CGUIViewState::AddAddonsSource(const std::string &content, const std::strin
   if (XFILE::CAddonsDirectory::GetScriptsAndPlugins(content, items))
   { // add the plugin source
     CMediaSource source;
-    source.strPath = "addons://sources/" + content + "/";    
+    source.strPath = "addons://sources/" + content + "/";
     source.strName = label;
     if (!thumb.empty() && CServiceBroker::GetGUI()->GetTextureManager().HasTexture(thumb))
       source.m_strThumbnailImage = thumb;
diff --git a/xbmc/view/GUIViewState.h b/xbmc/view/GUIViewState.h
index 99035497fd..03ae5a3982 100644
--- a/xbmc/view/GUIViewState.h
+++ b/xbmc/view/GUIViewState.h
@@ -71,7 +71,7 @@ protected:
   virtual void SaveViewState() = 0;
   virtual void SaveViewToDb(const std::string &path, int windowID, CViewState *viewState = NULL);
   void LoadViewState(const std::string &path, int windowID);
-  
+
   /*! \brief Add the addons source for the given content type, if the user has suitable addons
    \param content the type of addon content desired
    \param label the name of the addons source
diff --git a/xbmc/view/ViewDatabase.cpp b/xbmc/view/ViewDatabase.cpp
index 9402a1120a..07b3bee70b 100644
--- a/xbmc/view/ViewDatabase.cpp
+++ b/xbmc/view/ViewDatabase.cpp
@@ -108,7 +108,7 @@ void CViewDatabase::UpdateTables(int version)
                 "sortOrder integer,"
                 "sortAttributes integer,"
                 "skin text)\n");
-    
+
     m_pDS->query("SELECT * FROM tmp_view");
     while (!m_pDS->eof())
     {
diff --git a/xbmc/weather/GUIWindowWeather.cpp b/xbmc/weather/GUIWindowWeather.cpp
index a3341ded19..b3a5f7b3fe 100644
--- a/xbmc/weather/GUIWindowWeather.cpp
+++ b/xbmc/weather/GUIWindowWeather.cpp
@@ -111,7 +111,7 @@ bool CGUIWindowWeather::OnMessage(CGUIMessage& message)
     {
       if (message.GetSenderId() == 0 && m_maxLocation > 0) //handle only message from builtin
       {
-        // Clamp location between 1 and m_maxLocation 
+        // Clamp location between 1 and m_maxLocation
         int v = (CServiceBroker::GetWeatherManager().GetArea() + message.GetParam1() - 1) % m_maxLocation + 1;
         if (v < 1) v += m_maxLocation;
         SetLocation(v);
@@ -145,7 +145,7 @@ void CGUIWindowWeather::UpdateLocations()
   unsigned int iCurWeather = CServiceBroker::GetWeatherManager().GetArea();
 
   if (iCurWeather > m_maxLocation)
-  {  
+  {
     CServiceBroker::GetWeatherManager().SetArea(m_maxLocation);
     iCurWeather = m_maxLocation;
     ClearProperties();
@@ -295,7 +295,7 @@ void CGUIWindowWeather::ClearProperties()
   SetProperty("Current.DewPoint", "");
   SetProperty("Current.Humidity", "");
   SetProperty("Current.FanartCode", "");
-  
+
   // Future weather
   std::string day;
   for (int i = 0; i < NUM_DAYS; i++)
diff --git a/xbmc/windowing/GraphicContext.cpp b/xbmc/windowing/GraphicContext.cpp
index 0280f7fd5a..64d73f0ac9 100644
--- a/xbmc/windowing/GraphicContext.cpp
+++ b/xbmc/windowing/GraphicContext.cpp
@@ -1145,7 +1145,7 @@ void CGraphicContext::SetMediaDir(const std::string &strMediaDir)
 const std::string& CGraphicContext::GetMediaDir() const
 {
   return m_strMediaDir;
-  
+
 }
 
 void CGraphicContext::Flip(bool rendered, bool videoLayer)
diff --git a/xbmc/windowing/X11/VideoSyncDRM.cpp b/xbmc/windowing/X11/VideoSyncDRM.cpp
index 3fe4e343e2..cfcc29b20d 100644
--- a/xbmc/windowing/X11/VideoSyncDRM.cpp
+++ b/xbmc/windowing/X11/VideoSyncDRM.cpp
@@ -45,7 +45,7 @@ static drmVBlankSeqType CrtcSel(void)
   }
   return (drmVBlankSeqType)ret;
 }
-  
+
 bool CVideoSyncDRM::Setup(PUPDATECLOCK func)
 {
   CLog::Log(LOGDEBUG, "CVideoSyncDRM::%s - setting up DRM", __FUNCTION__);
diff --git a/xbmc/windowing/X11/XRandR.cpp b/xbmc/windowing/X11/XRandR.cpp
index 7b88bff8d8..0aab898407 100644
--- a/xbmc/windowing/X11/XRandR.cpp
+++ b/xbmc/windowing/X11/XRandR.cpp
@@ -329,7 +329,7 @@ bool CXRandR::SetMode(XOutput output, XMode mode)
   char cmd[255];
 
   if (getenv("KODI_BIN_HOME"))
-    snprintf(cmd, sizeof(cmd), "%s/%s-xrandr --screen %d --output %s --mode %s", 
+    snprintf(cmd, sizeof(cmd), "%s/%s-xrandr --screen %d --output %s --mode %s",
                getenv("KODI_BIN_HOME"),appname.c_str(),
                outputFound.screen, outputFound.name.c_str(), modeFound.id.c_str());
   else
diff --git a/xbmc/windowing/XBMC_events.h b/xbmc/windowing/XBMC_events.h
index 6f16c9e4c7..438f75b798 100644
--- a/xbmc/windowing/XBMC_events.h
+++ b/xbmc/windowing/XBMC_events.h
@@ -3,7 +3,7 @@
  *      Copyright (C) 1997-2009 Sam Lantinga
  *      Sam Lantinga
  *      slouken@libsdl.org
- *  
+ *
  *      Copyright (C) 2005-2015 Team Kodi
  *      http://kodi.tv
  *
diff --git a/xbmc/windowing/osx/VideoSyncIos.cpp b/xbmc/windowing/osx/VideoSyncIos.cpp
index d36247e6c8..cf3e281f21 100644
--- a/xbmc/windowing/osx/VideoSyncIos.cpp
+++ b/xbmc/windowing/osx/VideoSyncIos.cpp
@@ -29,18 +29,18 @@
 bool CVideoSyncIos::Setup(PUPDATECLOCK func)
 {
   CLog::Log(LOGDEBUG, "CVideoSyncIos::%s setting up OSX", __FUNCTION__);
-  
+
   //init the vblank timestamp
   m_LastVBlankTime = CurrentHostCounter();
   UpdateClock = func;
   m_abortEvent.Reset();
-  
+
   bool setupOk = InitDisplayLink();
   if (setupOk)
   {
     m_winSystem.Register(this);
   }
-  
+
   return setupOk;
 }
 
@@ -75,14 +75,14 @@ void CVideoSyncIos::IosVblankHandler()
   int           NrVBlanks;
   double        VBlankTime;
   int64_t       nowtime = CurrentHostCounter();
-  
+
   //calculate how many vblanks happened
   VBlankTime = (double)(nowtime - m_LastVBlankTime) / (double)CurrentHostFrequency();
   NrVBlanks = MathUtils::round_int(VBlankTime * m_fps);
-  
+
   //save the timestamp of this vblank so we can calculate how many happened next time
   m_LastVBlankTime = nowtime;
-  
+
   //update the vblank timestamp, update the clock and send a signal that we got a vblank
   UpdateClock(NrVBlanks, nowtime, m_refClock);
 }
diff --git a/xbmc/windowing/osx/VideoSyncIos.h b/xbmc/windowing/osx/VideoSyncIos.h
index 4dea2a0d99..b019bc6218 100644
--- a/xbmc/windowing/osx/VideoSyncIos.h
+++ b/xbmc/windowing/osx/VideoSyncIos.h
@@ -30,19 +30,19 @@ class CVideoSyncIos : public CVideoSync, IDispResource
 public:
   CVideoSyncIos(void *clock, CWinSystemIOS &winSystem) :
     CVideoSync(clock), m_winSystem(winSystem) {}
-  
+
   // CVideoSync interface
   virtual bool Setup(PUPDATECLOCK func) override;
   virtual void Run(CEvent& stopEvent) override;
   virtual void Cleanup() override;
   virtual float GetFps() override;
-  
+
   // IDispResource interface
   virtual void OnResetDisplay() override;
 
   // used in the displaylink callback
   void IosVblankHandler();
-  
+
 private:
   // CVideoSyncDarwin interface
   virtual bool InitDisplayLink();
diff --git a/xbmc/windowing/osx/VideoSyncOsx.cpp b/xbmc/windowing/osx/VideoSyncOsx.cpp
index c0e8530193..85217bd708 100644
--- a/xbmc/windowing/osx/VideoSyncOsx.cpp
+++ b/xbmc/windowing/osx/VideoSyncOsx.cpp
@@ -33,7 +33,7 @@
 bool CVideoSyncOsx::Setup(PUPDATECLOCK func)
 {
   CLog::Log(LOGDEBUG, "CVideoSyncOsx::%s setting up OSX", __FUNCTION__);
-  
+
   //init the vblank timestamp
   m_LastVBlankTime = 0;
   UpdateClock = func;
@@ -42,7 +42,7 @@ bool CVideoSyncOsx::Setup(PUPDATECLOCK func)
   m_lostEvent.Reset();
 
   CServiceBroker::GetWinSystem()->Register(this);
-  
+
   return true;
 }
 
@@ -105,7 +105,7 @@ void CVideoSyncOsx::VblankHandler(int64_t nowtime, uint32_t timebase)
   int           NrVBlanks;
   double        VBlankTime;
   int64_t       Now = CurrentHostCounter();
-  
+
   if (m_LastVBlankTime != 0)
   {
     VBlankTime = (double)(nowtime - m_LastVBlankTime) / (double)timebase;
@@ -124,17 +124,17 @@ static CVReturn DisplayLinkCallBack(CVDisplayLinkRef displayLink, const CVTimeSt
 {
   // Create an autorelease pool (necessary to call into non-Obj-C code from Obj-C code)
   void* pool = Cocoa_Create_AutoReleasePool();
-  
+
   CVideoSyncOsx *VideoSyncOsx = reinterpret_cast<CVideoSyncOsx*>(displayLinkContext);
 
   if (inOutputTime->flags & kCVTimeStampHostTimeValid)
     VideoSyncOsx->VblankHandler(inOutputTime->hostTime, CVGetHostClockFrequency());
   else
     VideoSyncOsx->VblankHandler(CVGetCurrentHostTime(), CVGetHostClockFrequency());
-  
+
   // Destroy the autorelease pool
   Cocoa_Destroy_AutoReleasePool(pool);
-  
+
   return kCVReturnSuccess;
 }
 
diff --git a/xbmc/windowing/osx/VideoSyncOsx.h b/xbmc/windowing/osx/VideoSyncOsx.h
index 5e077448d3..08ed749e78 100644
--- a/xbmc/windowing/osx/VideoSyncOsx.h
+++ b/xbmc/windowing/osx/VideoSyncOsx.h
@@ -33,21 +33,21 @@ public:
     m_LastVBlankTime(0),
     m_displayLost(false),
     m_displayReset(false){};
-  
+
   // CVideoSync interface
   virtual bool Setup(PUPDATECLOCK func) override;
   virtual void Run(CEvent& stopEvent) override;
   virtual void Cleanup() override;
   virtual float GetFps() override;
   virtual void RefreshChanged() override;
-  
+
   // IDispResource interface
   virtual void OnLostDisplay() override;
   virtual void OnResetDisplay() override;
 
   // used in the displaylink callback
   void VblankHandler(int64_t nowtime, uint32_t timebase);
-  
+
 private:
   virtual bool InitDisplayLink();
   virtual void DeinitDisplayLink();
diff --git a/xbmc/windowing/win10/WinEventsWin10.h b/xbmc/windowing/win10/WinEventsWin10.h
index 5564b95cf1..88fa14eb76 100644
--- a/xbmc/windowing/win10/WinEventsWin10.h
+++ b/xbmc/windowing/win10/WinEventsWin10.h
@@ -38,7 +38,7 @@ public:
   bool MessagePump() override;
   virtual size_t GetQueueSize();
 
-  // initialization 
+  // initialization
   void InitEventHandlers(const winrt::Windows::UI::Core::CoreWindow&);
   static void InitOSKeymap(void);
 
diff --git a/xbmc/windowing/win10/WinSystemWin10.cpp b/xbmc/windowing/win10/WinSystemWin10.cpp
index 62a499e702..046028f0cd 100644
--- a/xbmc/windowing/win10/WinSystemWin10.cpp
+++ b/xbmc/windowing/win10/WinSystemWin10.cpp
@@ -434,11 +434,11 @@ bool CWinSystemWin10::AddResolution(const RESOLUTION_INFO &res)
   for (unsigned int i = RES_CUSTOM; i < CDisplaySettings::GetInstance().ResolutionInfoSize(); i++)
   {
     RESOLUTION_INFO& info = CDisplaySettings::GetInstance().GetResolutionInfo(i);
-    if ( info.iWidth == res.iWidth 
-      && info.iHeight == res.iHeight 
-      && info.iScreenWidth == res.iScreenWidth 
-      && info.iScreenHeight == res.iScreenHeight 
-      && info.fRefreshRate == res.fRefreshRate 
+    if ( info.iWidth == res.iWidth
+      && info.iHeight == res.iHeight
+      && info.iScreenWidth == res.iScreenWidth
+      && info.iScreenHeight == res.iScreenHeight
+      && info.fRefreshRate == res.fRefreshRate
       && info.dwFlags == res.dwFlags)
       return false; // already have this resolution
   }
diff --git a/xbmc/windowing/windows/VideoSyncD3D.cpp b/xbmc/windowing/windows/VideoSyncD3D.cpp
index 92a2ad1533..6eec3a460c 100644
--- a/xbmc/windowing/windows/VideoSyncD3D.cpp
+++ b/xbmc/windowing/windows/VideoSyncD3D.cpp
@@ -135,7 +135,7 @@ float CVideoSyncD3D::GetFps()
 
   if (m_fps == 0.0)
     m_fps = 60.0f;
-  
+
   if (m_fps == 23 || m_fps == 29 || m_fps == 59)
     m_fps++;
 
diff --git a/xbmc/windowing/windows/WinSystemWin32.cpp b/xbmc/windowing/windows/WinSystemWin32.cpp
index 7bbdc3d7b7..fe859a73d3 100644
--- a/xbmc/windowing/windows/WinSystemWin32.cpp
+++ b/xbmc/windowing/windows/WinSystemWin32.cpp
@@ -640,7 +640,7 @@ MONITOR_DETAILS* CWinSystemWin32::GetDisplayDetails(const std::string& name)
     auto it = std::find_if(m_displays.begin(), m_displays.end(), [&nameW](MONITOR_DETAILS& m)
     {
       if (nameW[0] == '\\') // name is device name
-        return m.DeviceNameW == nameW; 
+        return m.DeviceNameW == nameW;
       return m.MonitorNameW == nameW;
     });
     if (it != m_displays.end())
diff --git a/xbmc/windowing/windows/WinSystemWin32.h b/xbmc/windowing/windows/WinSystemWin32.h
index 9288e3a838..71ac00b704 100644
--- a/xbmc/windowing/windows/WinSystemWin32.h
+++ b/xbmc/windowing/windows/WinSystemWin32.h
@@ -32,7 +32,7 @@ static const DWORD FULLSCREEN_WINDOW_STYLE = WS_POPUP | WS_SYSMENU | WS_CLIPCHIL
 static const DWORD FULLSCREEN_WINDOW_EX_STYLE = WS_EX_APPWINDOW;
 
 /* Controls the way the window appears and behaves. */
-enum WINDOW_STATE 
+enum WINDOW_STATE
 {
   WINDOW_STATE_FULLSCREEN = 1,    // Exclusive fullscreen
   WINDOW_STATE_FULLSCREEN_WINDOW, // Non-exclusive fullscreen window
@@ -50,14 +50,14 @@ static const char* window_state_names[] =
 };
 
 /* WINDOW_STATE restricted to fullscreen modes. */
-enum WINDOW_FULLSCREEN_STATE 
+enum WINDOW_FULLSCREEN_STATE
 {
   WINDOW_FULLSCREEN_STATE_FULLSCREEN = WINDOW_STATE_FULLSCREEN,
   WINDOW_FULLSCREEN_STATE_FULLSCREEN_WINDOW = WINDOW_STATE_FULLSCREEN_WINDOW
 };
 
 /* WINDOW_STATE restricted to windowed modes. */
-enum WINDOW_WINDOW_STATE 
+enum WINDOW_WINDOW_STATE
 {
   WINDOW_WINDOW_STATE_WINDOWED = WINDOW_STATE_WINDOWED,
   WINDOW_WINDOW_STATE_BORDERLESS = WINDOW_STATE_BORDERLESS
@@ -121,7 +121,7 @@ public:
   bool IsMinimized() const { return m_bMinimized; }
   void SetMinimized(bool minimized) { m_bMinimized = minimized; }
   void GetConnectedOutputs(std::vector<std::string> *outputs);
-  
+
   // touchscreen support
   typedef BOOL(WINAPI *pGetGestureInfo)(HGESTUREINFO, PGESTUREINFO);
   typedef BOOL(WINAPI *pSetGestureConfig)(HWND, DWORD, UINT, PGESTURECONFIG, UINT);
diff --git a/xbmc/windowing/windows/WinSystemWin32DX.cpp b/xbmc/windowing/windows/WinSystemWin32DX.cpp
index e5c2b2dd59..cb79a72300 100644
--- a/xbmc/windowing/windows/WinSystemWin32DX.cpp
+++ b/xbmc/windowing/windows/WinSystemWin32DX.cpp
@@ -55,7 +55,7 @@ std::unique_ptr<CWinSystemBase> CWinSystemBase::CreateWinSystem()
   std::unique_ptr<CWinSystemBase> winSystem(new CWinSystemWin32DX());
   return winSystem;
 }
- 
+
 CWinSystemWin32DX::CWinSystemWin32DX() : CRenderSystemDX()
   , m_hDriverModule(nullptr)
   , m_hHook(nullptr)
@@ -124,9 +124,9 @@ bool CWinSystemWin32DX::ResizeWindow(int newWidth, int newHeight, int newLeft, i
 
 void CWinSystemWin32DX::OnMove(int x, int y)
 {
-  // do not handle moving at window creation because MonitorFromWindow 
+  // do not handle moving at window creation because MonitorFromWindow
   // returns default system monitor in case of m_hWnd is null
-  if (!m_hWnd) 
+  if (!m_hWnd)
     return;
 
   HMONITOR newMonitor = MonitorFromWindow(m_hWnd, MONITOR_DEFAULTTONEAREST);
diff --git a/xbmc/windowing/windows/WinSystemWin32DX.h b/xbmc/windowing/windows/WinSystemWin32DX.h
index 2f37a8fde4..207e32cbdc 100644
--- a/xbmc/windowing/windows/WinSystemWin32DX.h
+++ b/xbmc/windowing/windows/WinSystemWin32DX.h
@@ -58,7 +58,7 @@ public:
    \sa Unregister, ID3DResource
   */
   void Register(ID3DResource *resource) const
-  { 
+  {
     m_deviceResources->Register(resource);
   };
   /*!
@@ -67,7 +67,7 @@ public:
    \sa Register, ID3DResource
   */
   void Unregister(ID3DResource *resource) const
-  { 
+  {
     m_deviceResources->Unregister(resource);
   };
 
diff --git a/xbmc/windows/GUIMediaWindow.cpp b/xbmc/windows/GUIMediaWindow.cpp
index c68c42a5e9..9b0c8ee4e3 100644
--- a/xbmc/windows/GUIMediaWindow.cpp
+++ b/xbmc/windows/GUIMediaWindow.cpp
@@ -272,7 +272,7 @@ bool CGUIMediaWindow::OnMessage(CGUIMessage& message)
         m_filter.Reset();
       }
       m_strFilterPath.clear();
-      
+
       // Call ClearFileItems() after our window has finished doing any WindowClose
       // animations
       ClearFileItems();
@@ -548,7 +548,7 @@ bool CGUIMediaWindow::OnMessage(CGUIMessage& message)
           resetHistory = true;
         }
         if (resetHistory)
-        {  
+        {
           m_vecItems->RemoveDiscCache(GetID());
           SetHistoryForPath(m_vecItems->GetPath());
         }
@@ -738,11 +738,11 @@ bool CGUIMediaWindow::GetDirectory(const std::string &strDirectory, CFileItemLis
 
     if (strDirectory.empty())
       SetupShares();
-    
+
     CFileItemList dirItems;
     if (!GetDirectoryItems(pathToUrl, dirItems, UseFileDirectories()))
       return false;
-    
+
     // assign fetched directory items
     items.Assign(dirItems);
 
@@ -861,7 +861,7 @@ bool CGUIMediaWindow::Update(const std::string &strDirectory, bool updateFilterP
 
   // check the given path for filter data
   UpdateFilterPath(path, *m_vecItems, updateFilterPath);
-    
+
   // if we're getting the root source listing
   // make sure the path history is clean
   if (URIUtils::PathEquals(path, GetRootPath()))
@@ -976,7 +976,7 @@ void CGUIMediaWindow::OnPrepareFileItems(CFileItemList &items)
  *
  * This function will be called by Update() before
  * any additional formatting, filtering or sorting is applied.
- * 
+ *
  * \note Override this function to define a custom caching behaviour.
  */
 void CGUIMediaWindow::OnCacheFileItems(CFileItemList &items)
@@ -1494,18 +1494,18 @@ bool CGUIMediaWindow::OnPlayAndQueueMedia(const CFileItemPtr &item, std::string
     CServiceBroker::GetPlaylistPlayer().ClearPlaylist(iPlaylist);
     CServiceBroker::GetPlaylistPlayer().Reset();
     int mediaToPlay = 0;
-    
-    // first try to find mainDVD file (VIDEO_TS.IFO). 
+
+    // first try to find mainDVD file (VIDEO_TS.IFO).
     // If we find this we should not allow to queue VOB files
-    std::string mainDVD; 
-    for (int i = 0; i < m_vecItems->Size(); i++) 
-    { 
-      std::string path = URIUtils::GetFileName(m_vecItems->Get(i)->GetPath()); 
-      if (StringUtils::EqualsNoCase(path, "VIDEO_TS.IFO")) 
-      { 
-        mainDVD = path; 
-        break; 
-      } 
+    std::string mainDVD;
+    for (int i = 0; i < m_vecItems->Size(); i++)
+    {
+      std::string path = URIUtils::GetFileName(m_vecItems->Get(i)->GetPath());
+      if (StringUtils::EqualsNoCase(path, "VIDEO_TS.IFO"))
+      {
+        mainDVD = path;
+        break;
+      }
     }
 
     // now queue...
@@ -1877,7 +1877,7 @@ void CGUIMediaWindow::UpdateFilterPath(const std::string &strDirectory, const CF
     else
       m_strFilterPath = items.GetPath();
   }
-  
+
   // maybe the filter path can contain a filter
   if (!canfilter && CanContainFilter(m_strFilterPath))
     canfilter = true;
@@ -1911,7 +1911,7 @@ void CGUIMediaWindow::UpdateFilterPath(const std::string &strDirectory, const CF
 void CGUIMediaWindow::OnFilterItems(const std::string &filter)
 {
   m_viewControl.Clear();
-  
+
   CFileItemList items;
   items.Copy(*m_vecItems, false); // use the original path - it'll likely be relied on for other things later.
   items.Append(*m_unfilteredItems);
@@ -1921,7 +1921,7 @@ void CGUIMediaWindow::OnFilterItems(const std::string &filter)
   // we need to clear the sort state and re-sort the items
   m_vecItems->ClearSortState();
   m_vecItems->Append(items);
-  
+
   // if the filter has changed, get the new filter path
   if (filtered && m_canFilterAdvanced)
   {
@@ -1934,7 +1934,7 @@ void CGUIMediaWindow::OnFilterItems(const std::string &filter)
     else if (m_strFilterPath.empty())
       m_strFilterPath = items.GetPath();
   }
-  
+
   GetGroupedItems(*m_vecItems);
   FormatAndSort(*m_vecItems);
 
@@ -2015,7 +2015,7 @@ bool CGUIMediaWindow::GetFilteredItems(const std::string &filter, CFileItemList
   std::string trimmedFilter(filter);
   StringUtils::TrimLeft(trimmedFilter);
   StringUtils::ToLower(trimmedFilter);
-  
+
   if (trimmedFilter.empty())
     return result;
 
@@ -2041,10 +2041,10 @@ bool CGUIMediaWindow::GetFilteredItems(const std::string &filter, CFileItemList
      match = item->GetLayout()->GetAllText();
      else*/
     match = item->GetLabel(); // Filter label only for now
-    
+
     if (numericMatch)
       StringUtils::WordToDigits(match);
-    
+
     size_t pos = StringUtils::FindWords(match.c_str(), trimmedFilter.c_str());
     if (pos != std::string::npos)
       filteredItems.Add(item);
diff --git a/xbmc/windows/GUIWindowDebugInfo.cpp b/xbmc/windows/GUIWindowDebugInfo.cpp
index 8d842e9734..63c43e2b04 100644
--- a/xbmc/windows/GUIWindowDebugInfo.cpp
+++ b/xbmc/windows/GUIWindowDebugInfo.cpp
@@ -117,7 +117,7 @@ void CGUIWindowDebugInfo::Process(unsigned int currentTime, CDirtyRegionList &di
     double dCPU = m_resourceCounter.GetCPUUsage();
     std::string ucAppName = lcAppName;
     StringUtils::ToUpper(ucAppName);
-    info = StringUtils::Format("LOG: %s%s.log\n" 
+    info = StringUtils::Format("LOG: %s%s.log\n"
                                 "MEM: %" PRIu64"/%" PRIu64" KB - FPS: %2.1f fps\n"
                                 "CPU: %s (CPU-%s %4.2f%%%s)",
                                 CSpecialProtocol::TranslatePath("special://logpath").c_str(), lcAppName.c_str(),
diff --git a/xbmc/windows/GUIWindowFileManager.cpp b/xbmc/windows/GUIWindowFileManager.cpp
index 5d2985a7ff..df4b20cd8b 100644
--- a/xbmc/windows/GUIWindowFileManager.cpp
+++ b/xbmc/windows/GUIWindowFileManager.cpp
@@ -523,7 +523,7 @@ bool CGUIWindowFileManager::Update(int iList, const std::string &strDirectory)
     pItem->SetArt("thumb", "DefaultFolder.png");
     pItem->SetLabelPreformatted(true);
     m_vecItems[iList]->Add(pItem);
-    
+
     #ifdef TARGET_DARWIN_IOS
       CFileItemPtr iItem(new CFileItem("special://envhome/Documents/Inbox", true));
       iItem->SetLabel("Inbox");
diff --git a/xbmc/windows/GUIWindowFileManager.h b/xbmc/windows/GUIWindowFileManager.h
index ec8c89144c..5b5810ad20 100644
--- a/xbmc/windows/GUIWindowFileManager.h
+++ b/xbmc/windows/GUIWindowFileManager.h
@@ -34,7 +34,7 @@ class CGUIDialogProgress;
 
 class CGUIWindowFileManager :
       public CGUIWindow,
-      public CJobQueue 
+      public CJobQueue
 {
 public:
 
diff --git a/xbmc/windows/GUIWindowHome.cpp b/xbmc/windows/GUIWindowHome.cpp
index e3a6ee55c4..c5c1d4b8fd 100644
--- a/xbmc/windows/GUIWindowHome.cpp
+++ b/xbmc/windows/GUIWindowHome.cpp
@@ -35,13 +35,13 @@
 
 using namespace ANNOUNCEMENT;
 
-CGUIWindowHome::CGUIWindowHome(void) : CGUIWindow(WINDOW_HOME, "Home.xml"), 
+CGUIWindowHome::CGUIWindowHome(void) : CGUIWindow(WINDOW_HOME, "Home.xml"),
                                        m_recentlyAddedRunning(false),
                                        m_cumulativeUpdateFlag(0)
 {
   m_updateRA = (Audio | Video | Totals);
   m_loadType = KEEP_IN_MEMORY;
-  
+
   CAnnouncementManager::GetInstance().AddAnnouncer(this);
 }
 
@@ -64,7 +64,7 @@ bool CGUIWindowHome::OnAction(const CAction &action)
 }
 
 void CGUIWindowHome::OnInitWindow()
-{  
+{
   // for shared databases (ie mysql) always force an update on return to home
   // this is a temporary solution until remote announcements can be delivered
   if (StringUtils::EqualsNoCase(g_advancedSettings.m_databaseVideo.type, "mysql") ||