diff options
168 files changed, 295 insertions, 294 deletions
diff --git a/cmake/scripts/common/AddonHelpers.dox b/cmake/scripts/common/AddonHelpers.dox index d3acec011d..522e0e724c 100644 --- a/cmake/scripts/common/AddonHelpers.dox +++ b/cmake/scripts/common/AddonHelpers.dox @@ -11,7 +11,7 @@ process the construction. -------------------------------------------------------------------------------- -<b>Here a minmal example of the for addon used CMakeLists.txt:</b> +<b>Here's a minimal example of the addon used for CMakeLists.txt:</b> ~~~~~~~~~~~~~{.cmake} cmake_minimum_required(VERSION 3.5) diff --git a/cmake/scripts/common/CheckTargetPlatform.cmake b/cmake/scripts/common/CheckTargetPlatform.cmake index d776085810..29206c050d 100644 --- a/cmake/scripts/common/CheckTargetPlatform.cmake +++ b/cmake/scripts/common/CheckTargetPlatform.cmake @@ -48,7 +48,7 @@ endfunction() function(check_install_permissions install_dir have_perms) # param[in] install_dir directory to check for write permissions - # param[out] have_perms wether we have permissions to install to install_dir + # param[out] have_perms whether we have permissions to install to install_dir set(testfile_lib ${install_dir}/lib/kodi/.cmake-inst-test) set(testfile_share ${install_dir}/share/kodi/.cmake-inst-test) diff --git a/cmake/scripts/common/Macros.cmake b/cmake/scripts/common/Macros.cmake index 4e0ca360e7..9b7fc161e9 100644 --- a/cmake/scripts/common/Macros.cmake +++ b/cmake/scripts/common/Macros.cmake @@ -573,7 +573,7 @@ function(core_find_git_rev stamp) else() find_package(Git) if(GIT_FOUND AND EXISTS ${CMAKE_SOURCE_DIR}/.git) - # get tree status i.e. clean working tree vs dirty (uncommited or unstashed changes, etc.) + # get tree status i.e. clean working tree vs dirty (uncommitted or unstashed changes, etc.) execute_process(COMMAND ${GIT_EXECUTABLE} update-index --ignore-submodules -q --refresh WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) execute_process(COMMAND ${GIT_EXECUTABLE} diff-files --ignore-submodules --quiet -- diff --git a/cmake/scripts/common/ProjectMacros.cmake b/cmake/scripts/common/ProjectMacros.cmake index 313cf4ec87..67920c5f4d 100644 --- a/cmake/scripts/common/ProjectMacros.cmake +++ b/cmake/scripts/common/ProjectMacros.cmake @@ -3,7 +3,7 @@ # Pack a skin xbt file # Arguments: # input input directory to pack -# output ouput xbt file +# output output xbt file # On return: # xbt is added to ${XBT_FILES} function(pack_xbt input output) diff --git a/cmake/treedata/windowsstore/subdirs.txt b/cmake/treedata/windowsstore/subdirs.txt index da42566b58..792d1050da 100644 --- a/cmake/treedata/windowsstore/subdirs.txt +++ b/cmake/treedata/windowsstore/subdirs.txt @@ -7,8 +7,8 @@ xbmc/platform/win10 platform/win10 xbmc/platform/win10/filesystem platform/win10/filesystem xbmc/platform/win10/network platform/win10/network xbmc/platform/win10/peripherals platform/win10/peripherals -xbmc/platform/win10/powermanagement platfrom/win10/powermanagement -xbmc/platform/win10/storage platfrom/win10/storage +xbmc/platform/win10/powermanagement platform/win10/powermanagement +xbmc/platform/win10/storage platform/win10/storage xbmc/platform/win32/filesystem platform/win32/filesystem xbmc/platform/win32/utils platform/win32/utils xbmc/rendering/dx rendering/dx diff --git a/docs/codeofconduct/ModeratorGuidelines.md b/docs/codeofconduct/ModeratorGuidelines.md index 3a0b7c94c6..7a6ef0418c 100644 --- a/docs/codeofconduct/ModeratorGuidelines.md +++ b/docs/codeofconduct/ModeratorGuidelines.md @@ -36,7 +36,7 @@ As suggested by keith on the slack channel, I thought it might be useful to have - Also if you move a thread, leave a note in it to say that you've done so. - Discussions isn't for support requests - that's what the main support sections are for. - Threads moved to off-topic can still be posted to by anyone, but normal users cannot start threads in that section. -- If you bin a thread that contains dodgy links, please remember to edit it and remove them. The bin is publically visible, so can be harvested for such things by enterprising idiots. +- If you bin a thread that contains dodgy links, please remember to edit it and remove them. The bin is publicly visible, so can be harvested for such things by enterprising idiots. **Warnings and banning** - Banning someone is an extreme measure, and should only be done "off the cuff" for short-term duration (certainly no more than a 2 week ban, ideally less) as a direct result of threatening or insulting behaviour (for the latter, something that goes materially beyond a simple breach of 2.1 of the Forum Rules). diff --git a/project/Win32BuildSetup/genNsisInstaller.nsi b/project/Win32BuildSetup/genNsisInstaller.nsi index ed8626a567..8127b46b89 100644 --- a/project/Win32BuildSetup/genNsisInstaller.nsi +++ b/project/Win32BuildSetup/genNsisInstaller.nsi @@ -372,7 +372,7 @@ Function .onInit ${Endif} ${If} $HotFixID != "" nsExec::ExecToStack 'cmd /Q /C "%SYSTEMROOT%\System32\wbem\wmic.exe /?"' - Pop $0 ; return value (it always 0 even if an error occured) + Pop $0 ; return value (it always 0 even if an error occurred) Pop $1 ; command output ${If} $0 != 0 ${OrIf} $1 == "" @@ -380,7 +380,7 @@ Function .onInit Quit ${EndIf} nsExec::ExecToStack 'cmd /Q /C "%SYSTEMROOT%\System32\findstr.exe /?"' - Pop $0 ; return value (it always 0 even if an error occured) + Pop $0 ; return value (it always 0 even if an error occurred) Pop $1 ; command output ${If} $0 != 0 ${OrIf} $1 == "" @@ -388,7 +388,7 @@ Function .onInit Quit ${EndIf} nsExec::ExecToStack 'cmd /Q /C "%SYSTEMROOT%\System32\wbem\wmic.exe qfe get hotfixid | %SYSTEMROOT%\System32\findstr.exe "^KB$HotFixID[^0-9]""' - Pop $0 ; return value (it always 0 even if an error occured) + Pop $0 ; return value (it always 0 even if an error occurred) Pop $1 ; command output ${If} $0 != 0 ${OrIf} $1 == "" diff --git a/system/keymaps/joystick.xml b/system/keymaps/joystick.xml index a88b9a2aa5..2db760b4c0 100644 --- a/system/keymaps/joystick.xml +++ b/system/keymaps/joystick.xml @@ -22,7 +22,7 @@ <!-- eg <b>ActivateWindow(Music)</b> --> <!-- would automatically go to Music on the press of the B button. --> <!-- --> -<!-- Buttons can be overloaded with hold durations, in miliseconds: --> +<!-- Buttons can be overloaded with hold durations, in milliseconds: --> <!-- <joystick profile="game.controller.default"> --> <!-- <a>Select</a> --> <!-- <a holdtime="500">ContextMenu</a> --> diff --git a/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.cpp b/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.cpp index 6f1657f181..19ff811e58 100644 --- a/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.cpp +++ b/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.cpp @@ -60,7 +60,8 @@ void CWiiRemote::MessageCallback(cwiid_wiimote_t *wiiremote, int mesg_count, uni /* The MessageCallback for the Wiiremote. This callback is used for error reports, mainly to see if the connection has been broken - This callback is also used for getting the IR sources, if this is done in update as with buttons we usually only get 1 IR source at a time wich is much harder to calculate */ + This callback is also used for getting the IR sources, if this is done in update as with + buttons we usually only get 1 IR source at a time which is much harder to calculate */ void CWiiRemote::MessageCallback(cwiid_wiimote_t *wiiremote, int mesg_count, union cwiid_mesg mesg[], struct timespec *timestamp) { for (int i=0; i < mesg_count; i++) @@ -399,7 +400,7 @@ void CWiiRemote::DisconnectNow(bool startConnectThread) #ifdef CWIID_OLD /* This is a harsh check if there really is a connection, It will mainly be used in CWIID < 6.0 - as it doesn't report connect error, wich is needed to see if the Wiiremote suddenly disconnected. + as it doesn't report connect error, which is needed to see if the Wiiremote suddenly disconnected. This could possible be done with bluetooth specific queries but I cannot find how to do it. */ bool CWiiRemote::CheckConnection() { @@ -571,7 +572,7 @@ void CWiiRemote::ProcessNunchuck(struct cwiid_nunchuk_mesg &Nunchuck) } } -/* Tell cwiid wich data will be reported */ +/* Tell cwiid which data will be reported */ void CWiiRemote::SetRptMode() { //Sets our wiiremote to report something, for example IR, Buttons #ifdef CWIID_OLD diff --git a/tools/codegenerator/SwigTypeParser.groovy b/tools/codegenerator/SwigTypeParser.groovy index 8d8a644698..ab4e5292f9 100644 --- a/tools/codegenerator/SwigTypeParser.groovy +++ b/tools/codegenerator/SwigTypeParser.groovy @@ -146,7 +146,7 @@ public class SwigTypeParser } /** - * This will resolve typedefs anbd handle qualifiers, pointers, + * This will resolve typedefs and handle qualifiers, pointers, * references, and typedef of typedefs to resolve all the way down to the * most basic types. */ diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp index e75fc8b260..06c22e2ef2 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp @@ -335,7 +335,7 @@ bool CApplication::Create(const CAppParamParser ¶ms) m_pSettingsComponent.reset(new CSettingsComponent()); m_pSettingsComponent->Init(params); - // Announement service + // Announcement service m_pAnnouncementManager = std::make_shared<ANNOUNCEMENT::CAnnouncementManager>(); m_pAnnouncementManager->Start(); CServiceBroker::RegisterAnnouncementManager(m_pAnnouncementManager); @@ -4604,7 +4604,7 @@ void CApplication::UpdateCurrentPlayArt() { if (!m_appPlayer.IsPlayingAudio()) return; - //Clear and reload the art for the currenty playing item to show updated art on OSD + //Clear and reload the art for the currently playing item to show updated art on OSD m_itemCurrentFile->ClearArt(); CMusicThumbLoader loader; loader.LoadItem(m_itemCurrentFile.get()); @@ -4674,7 +4674,7 @@ bool CApplication::SetLanguage(const std::string &strLanguage) bool CApplication::LoadLanguage(bool reload) { - // load the configured langauge + // load the configured language if (!g_langInfo.SetLanguage("", reload)) return false; diff --git a/xbmc/Application.h b/xbmc/Application.h index f0f351f85c..22d1bb3b34 100644 --- a/xbmc/Application.h +++ b/xbmc/Application.h @@ -429,8 +429,8 @@ private: mutable CCriticalSection m_critSection; /*!< critical section for all changes to this class, except for changes to triggers */ CCriticalSection m_frameMoveGuard; /*!< critical section for synchronizing GUI actions from inside and outside (python) */ - std::atomic_uint m_WaitingExternalCalls; /*!< counts threads wich are waiting to be processed in FrameMove */ - unsigned int m_ProcessedExternalCalls = 0; /*!< counts calls wich are processed during one "door open" cycle in FrameMove */ + std::atomic_uint m_WaitingExternalCalls; /*!< counts threads which are waiting to be processed in FrameMove */ + unsigned int m_ProcessedExternalCalls = 0; /*!< counts calls which are processed during one "door open" cycle in FrameMove */ unsigned int m_ProcessedExternalDecay = 0; /*!< counts to close door after a few frames of no python activity */ CApplicationPlayer m_appPlayer; CEvent m_playerEvent; diff --git a/xbmc/AutoSwitch.cpp b/xbmc/AutoSwitch.cpp index e36316293d..14adb8e2bc 100644 --- a/xbmc/AutoSwitch.cpp +++ b/xbmc/AutoSwitch.cpp @@ -119,7 +119,7 @@ bool CAutoSwitch::ByFiles(bool bHideParentDirItems, const CFileItemList& vecItem bool bThumbs = false; int iCompare = 0; - // parent directorys are visible, increment + // parent directories are visible, increment if (!bHideParentDirItems) { iCompare = 1; diff --git a/xbmc/DynamicDll.h b/xbmc/DynamicDll.h index f2e26217cf..8325af184f 100644 --- a/xbmc/DynamicDll.h +++ b/xbmc/DynamicDll.h @@ -212,8 +212,8 @@ public: \ // // DEFINE_FUNC_ALIGNED 0-X // -// Defines a function for an export from a dll, wich -// require a aligned stack on function call +// Defines a function for an export from a dll, which +// requires an aligned stack on function call // Use DEFINE_FUNC_ALIGNED for each function to be resolved. // // result: Result of the function @@ -233,7 +233,7 @@ public: \ // __asm sub esp, [s]; // __asm and esp, ~15; // __asm add esp, [s] -// m_test(p1, p2, p3); //return value will still be correct aslong as we don't mess with it +// m_test(p1, p2, p3); //return value will still be correct as long as we don't mess with it // __asm mov esp,[o]; // }; diff --git a/xbmc/FileItem.cpp b/xbmc/FileItem.cpp index 3c97d90ce6..23a86ff33d 100644 --- a/xbmc/FileItem.cpp +++ b/xbmc/FileItem.cpp @@ -2067,7 +2067,7 @@ bool CFileItem::LoadTracksFromCueDocument(CFileItemList& scannedItems) } if ( tag.Loaded() && oneFilePerTrack && ! ( tag.GetAlbum().empty() || tag.GetArtist().empty() || tag.GetTitle().empty() ) ) { - // If there are multiple files in a cue file, the tags from the files should be prefered if they exist. + // If there are multiple files in a cue file, the tags from the files should be preferred if they exist. scannedItems.Add(CFileItemPtr(new CFileItem(song, tag))); } else diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp index 67bebee0d2..ec28cf0f0a 100644 --- a/xbmc/GUIInfoManager.cpp +++ b/xbmc/GUIInfoManager.cpp @@ -1637,7 +1637,7 @@ const infomap weather[] = {{ "isfetched", WEATHER_IS_FETCHED }, /// \table_row3{ <b>`System.StereoscopicMode`</b>, /// \anchor System_StereoscopicMode /// _string_, -/// @return The prefered stereoscopic mode. +/// @return The preferred stereoscopic mode. /// @note Configured in settings > video > playback). /// <p><hr> /// @skinning_v13 **[New Infolabel]** \link System_StereoscopicMode @@ -2137,7 +2137,7 @@ const infomap musicpartymode[] = {{ "enabled", MUSICPM_ENABLED }, /// where any_custom_role could be an instrument violin or some other production activity e.g. sound engineer. /// The roles listed (composer\, arranger etc.) are standard ones but there are many possible. /// Music file tagging allows for the musicians and all other people involved in the recording to be added\, Kodi -/// will gathers and stores that data\, and it is availlable to GUI. +/// will gathers and stores that data\, and it is available to GUI. /// <p><hr> /// @skinning_v17 **[New Infolabel]** \link MusicPlayer_Property_Role_Mixer `MusicPlayer.Property(Role.Mixer)`\endlink /// <p> @@ -6646,7 +6646,7 @@ const infomap container_str[] = {{ "property", CONTAINER_PROPERTY }, /// \table_row3{ <b>`ListItem.AlbumStatus`</b>, /// \anchor ListItem_AlbumStatus /// _string_, -/// @return The Musicbrainz release status of the album (offical, bootleg, promotion etc) +/// @return The Musicbrainz release status of the album (official, bootleg, promotion etc) /// <p><hr> /// @skinning_v19 **[New Infolabel]** \link ListItem_AlbumStatus `ListItem.AlbumStatus`\endlink /// } diff --git a/xbmc/InfoScanner.h b/xbmc/InfoScanner.h index 39fd449023..208f9140ac 100644 --- a/xbmc/InfoScanner.h +++ b/xbmc/InfoScanner.h @@ -70,6 +70,6 @@ protected: bool m_showDialog = false; //!< Whether or not to show progress bar dialog CGUIDialogProgressBarHandle* m_handle = nullptr; //!< Progress bar handle bool m_bRunning = false; //!< Whether or not scanner is running - bool m_bCanInterrupt = false; //!< Whether or not scanner is currently interruptable + bool m_bCanInterrupt = false; //!< Whether or not scanner is currently interruptible bool m_bClean = false; //!< Whether or not to perform cleaning during scanning }; diff --git a/xbmc/PlayListPlayer.cpp b/xbmc/PlayListPlayer.cpp index 3e7d2a64eb..dd0f5a6d72 100644 --- a/xbmc/PlayListPlayer.cpp +++ b/xbmc/PlayListPlayer.cpp @@ -318,7 +318,7 @@ bool CPlayListPlayer::Play(int iSong, CURL::GetRedacted(item->GetDynPath())); playlist.SetUnPlayable(m_iCurrentSong); - // abort on 100 failed CONSECTUTIVE songs + // abort on 100 failed CONSECUTIVE songs if (!m_iFailedSongs) m_failedSongsStart = playAttempt; m_iFailedSongs++; diff --git a/xbmc/Util.cpp b/xbmc/Util.cpp index d363097368..2aa8541bbc 100644 --- a/xbmc/Util.cpp +++ b/xbmc/Util.cpp @@ -709,7 +709,7 @@ int64_t CUtil::ToInt64(uint32_t high, uint32_t low) /*! \brief Finds next unused filename that matches padded int format identifier provided \param[in] fn_template filename template consisting of a padded int format identifier (eg screenshot%03d) - \param[in] max maximum number to search for avaialble name + \param[in] max maximum number to search for available name \return "" on failure, string next available name matching format identifier on success */ diff --git a/xbmc/Util.h b/xbmc/Util.h index 908981fe80..4f33059d79 100644 --- a/xbmc/Util.h +++ b/xbmc/Util.h @@ -143,14 +143,14 @@ public: static double AlbumRelevance(const std::string& strAlbumTemp1, const std::string& strAlbum1, const std::string& strArtistTemp1, const std::string& strArtist1); static bool MakeShortenPath(std::string StrInput, std::string& StrOutput, size_t iTextMaxLength); - /*! \brief Checks wether the supplied path supports Write file operations (e.g. Rename, Delete, ...) + /*! \brief Checks whether the supplied path supports Write file operations (e.g. Rename, Delete, ...) \param strPath the path to be checked \return true if Write file operations are supported, false otherwise */ static bool SupportsWriteFileOperations(const std::string& strPath); - /*! \brief Checks wether the supplied path supports Read file operations (e.g. Copy, ...) + /*! \brief Checks whether the supplied path supports Read file operations (e.g. Copy, ...) \param strPath the path to be checked diff --git a/xbmc/cdrip/CDDARipJob.cpp b/xbmc/cdrip/CDDARipJob.cpp index 234d231c99..4070c397ad 100644 --- a/xbmc/cdrip/CDDARipJob.cpp +++ b/xbmc/cdrip/CDDARipJob.cpp @@ -63,7 +63,7 @@ bool CCDDARipJob::DoWork() { CLog::Log(LOGINFO, "CCDDARipJob::{} - Start ripping track {} to {}", __func__, m_input, m_output); - // if we are ripping to a samba share, rip it to hd first and then copy it it the share + // if we are ripping to a samba share, rip it to hd first and then copy it to the share CFileItem file(m_output, false); if (file.IsRemote()) m_output = SetupTempFile(); diff --git a/xbmc/cores/AudioEngine/Interfaces/AEStream.h b/xbmc/cores/AudioEngine/Interfaces/AEStream.h index c6dc98bb93..c0f20f68bc 100644 --- a/xbmc/cores/AudioEngine/Interfaces/AEStream.h +++ b/xbmc/cores/AudioEngine/Interfaces/AEStream.h @@ -187,7 +187,7 @@ public: virtual void SetAmplification(float amplify) = 0; /** - * Sets the stream ffmpeg informations if present. + * Sets the stream ffmpeg information if present. + @param profile * @param matrix_encoding * @param audio_service_type diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp index 569986cbb3..f1ce810abe 100644 --- a/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp +++ b/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp @@ -678,7 +678,7 @@ void CAESinkAUDIOTRACK::GetDelay(AEDelayStatus& status) uint64_t stamp = m_timestampPos; stamp += (1ULL << 32); stamphead = (stamp & UINT64_UPPER_BYTES) | stamphead; - CLog::Log(LOGDEBUG, "Wraparound happend old: {} new: {}", m_timestampPos, stamphead); + CLog::Log(LOGDEBUG, "Wraparound happened old: {} new: {}", m_timestampPos, stamphead); } m_timestampPos = stamphead; diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp index 24154df0ec..0b34a7fa3a 100644 --- a/xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp +++ b/xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp @@ -343,7 +343,7 @@ bool CAESinkDARWINOSX::Initialize(AEAudioFormat &format, std::string &device) void CAESinkDARWINOSX::SetHogMode(bool on) { //! @todo Auto hogging sets this for us. Figure out how/when to turn it off or use it - //! It appears that leaving this set will aslo restore the previous stream format when the + //! It appears that leaving this set will also restore the previous stream format when the //! Application exits. If auto hogging is set and we try to set hog mode, we will deadlock //! From the SDK docs: "If the AudioDevice is in a non-mixable mode, the HAL will automatically take hog mode on behalf of the first process to start an IOProc." //! diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkDARWINTVOS.mm b/xbmc/cores/AudioEngine/Sinks/AESinkDARWINTVOS.mm index a05e914571..ecd2c616e1 100644 --- a/xbmc/cores/AudioEngine/Sinks/AESinkDARWINTVOS.mm +++ b/xbmc/cores/AudioEngine/Sinks/AESinkDARWINTVOS.mm @@ -65,7 +65,7 @@ static void dumpAVAudioSessionProperties() static_cast<long>([mySession outputNumberOfChannels])); // maximumOutputNumberOfChannels provides hints to tvOS audio settings // if 2, then audio is set to two channel stereo. iOS return this unless hdmi connected - // if 6, then audio is set to Digial Dolby 5.1 OR hdmi path detected sink can only handle 6 channels. + // if 6, then audio is set to Digital Dolby 5.1 OR hdmi path detected sink can only handle 6 channels. // if 8, then audio is set to Best Quality AND hdmi path detected sink can handle 8 channels. CLog::Log(LOGINFO, "{} maximumOutputNumberOfChannels {}", __PRETTY_FUNCTION__, static_cast<long>([mySession maximumOutputNumberOfChannels])); @@ -363,7 +363,7 @@ unsigned int CAAudioUnitSink::write(uint8_t* data, unsigned int frames, unsigned if (!m_started) timeout = 4500; - // we are using a timer here for beeing sure for timeouts + // we are using a timer here for being sure for timeouts // condvar can be woken spuriously as signaled XbmcThreads::EndTime timer(timeout); condVar.wait(mutex, std::chrono::milliseconds(timeout)); @@ -437,7 +437,7 @@ bool CAAudioUnitSink::setupAudio() CLog::Log(LOGINFO, "{} setting buffer duration to {:f}", __PRETTY_FUNCTION__, bufferseconds); setAVAudioSessionProperties(bufferseconds, samplerate, channels); - // Get the real output samplerate, the requested might not avaliable + // Get the real output samplerate, the requested might not available Float64 realisedSampleRate = [[AVAudioSession sharedInstance] sampleRate]; if (m_outputFormat.mSampleRate != realisedSampleRate) { @@ -746,12 +746,12 @@ bool CAESinkDARWINTVOS::Initialize(AEAudioFormat& format, std::string& device) CAChannelIndex channel_index = CAChannel_PCM_6CHAN; if (maxChannels == 6 && format.m_channelLayout.Count() == 6) { - // if 6, then audio is set to Digial Dolby 5.1, need to use DD mapping + // if 6, then audio is set to Digital Dolby 5.1, need to use DD mapping channel_index = CAChannel_PCM_DD5_1; } else if (format.m_channelLayout.Count() == 5) { - // if 5, then audio is set to Digial Dolby 5.0, need to use DD mapping + // if 5, then audio is set to Digital Dolby 5.0, need to use DD mapping channel_index = CAChannel_PCM_DD5_1; } else diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp index 5ece0e3b54..1d2ca72859 100644 --- a/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp +++ b/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp @@ -733,14 +733,14 @@ std::string CAESinkDirectSound::GetDefaultDevice() EXIT_ON_FAILURE(hr, "Could not allocate WASAPI device enumerator") hr = pEnumerator->GetDefaultAudioEndpoint(eRender, eMultimedia, pDevice.GetAddressOf()); - EXIT_ON_FAILURE(hr, "Retrival of audio endpoint enumeration failed.") + EXIT_ON_FAILURE(hr, "Retrieval of audio endpoint enumeration failed.") hr = pDevice->OpenPropertyStore(STGM_READ, pProperty.GetAddressOf()); EXIT_ON_FAILURE(hr, "Retrieval of DirectSound endpoint properties failed.") PropVariantInit(&varName); hr = pProperty->GetValue(PKEY_AudioEndpoint_FormFactor, &varName); - EXIT_ON_FAILURE(hr, "Retrival of DirectSound endpoint form factor failed.") + EXIT_ON_FAILURE(hr, "Retrieval of DirectSound endpoint form factor failed.") aeDeviceType = winEndpoints[(EndpointFormFactor)varName.uiVal].aeDeviceType; PropVariantClear(&varName); diff --git a/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp b/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp index 10e624ce0b..6c677c5c60 100644 --- a/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp +++ b/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp @@ -259,7 +259,7 @@ void CAEStreamParser::GetPacket(uint8_t **buffer, unsigned int *bufferSize) /* This function looks for sync words across the types in parallel, and only does an exhaustive - test if it finds a syncword. Once sync has been established, the relevent sync function sets + test if it finds a syncword. Once sync has been established, the relevant sync function sets m_syncFunc to itself. This function will only be called again if total sync is lost, which allows is to switch stream types on the fly much like a real receiver does. */ diff --git a/xbmc/cores/DataCacheCore.h b/xbmc/cores/DataCacheCore.h index d1e0bdc880..6e1c41402a 100644 --- a/xbmc/cores/DataCacheCore.h +++ b/xbmc/cores/DataCacheCore.h @@ -109,7 +109,7 @@ public: float GetPlayPercentage(); /*! - * \brief Get the minumum time + * \brief Get the minimum time * * This will be zero for a typical video. With timeshift, this is the time, * in ms, that the player can go back. This can be before the start time. @@ -119,7 +119,7 @@ public: /*! * \brief Get the maximum time * - * This is the maximun time, in ms, that the player can skip forward. For a + * This is the maximum time, in ms, that the player can skip forward. For a * typical video, this will be the total length. For live TV without * timeshift this is zero, and for live TV with timeshift this will be the * buffer ahead. diff --git a/xbmc/cores/DllLoader/DllLoader.cpp b/xbmc/cores/DllLoader/DllLoader.cpp index 253b7f0de6..d7953debc8 100644 --- a/xbmc/cores/DllLoader/DllLoader.cpp +++ b/xbmc/cores/DllLoader/DllLoader.cpp @@ -113,7 +113,7 @@ DllLoader::~DllLoader() delete entry; } - // can't unload a system dll, as this might be happing during xbmc destruction + // can't unload a system dll, as this might be happening during xbmc destruction if(!m_bSystemDll) { DllLoaderContainer::UnRegisterDll(this); diff --git a/xbmc/cores/DllLoader/DllLoader.h b/xbmc/cores/DllLoader/DllLoader.h index 7c0b254425..517294d648 100644 --- a/xbmc/cores/DllLoader/DllLoader.h +++ b/xbmc/cores/DllLoader/DllLoader.h @@ -84,7 +84,7 @@ protected: void SetExports(Export* exports) { m_pStaticExports = exports; } protected: - // Just pointers; dont' delete... + // Just pointers; don't delete... ImportDirTable_t *ImportDirTable; ExportDirTable_t *ExportDirTable; bool m_bTrack; diff --git a/xbmc/cores/DllLoader/coff.cpp b/xbmc/cores/DllLoader/coff.cpp index cd8d88a807..b8084bafc6 100644 --- a/xbmc/cores/DllLoader/coff.cpp +++ b/xbmc/cores/DllLoader/coff.cpp @@ -443,7 +443,7 @@ void* CoffLoader::RVA2Data(unsigned long RVA) || RVA >= SectionHeader[Sctn].VirtualAddress + SectionHeader[Sctn].VirtualSize) { // RVA2Section is lying, let's use base address of dll instead, only works if - // DLL has been loaded fully into memory, wich we normally do + // DLL has been loaded fully into memory, which we normally do return (void*)(RVA + (unsigned long)hModule); } return SectionData[Sctn] + RVA - SectionHeader[Sctn].VirtualAddress; diff --git a/xbmc/cores/DllLoader/coff.h b/xbmc/cores/DllLoader/coff.h index 8d60f91c16..f421d43c9d 100644 --- a/xbmc/cores/DllLoader/coff.h +++ b/xbmc/cores/DllLoader/coff.h @@ -11,7 +11,7 @@ //#pragma message("including coff.h") // // COFF -- Common Object File Format -// Used commonly by Un*x and is imbedded in Windows PE +// Used commonly by Un*x and is embedded in Windows PE // file format. // diff --git a/xbmc/cores/DllLoader/dll.cpp b/xbmc/cores/DllLoader/dll.cpp index 190d951cdd..fb76305108 100644 --- a/xbmc/cores/DllLoader/dll.cpp +++ b/xbmc/cores/DllLoader/dll.cpp @@ -61,7 +61,7 @@ extern "C" HMODULE __stdcall dllLoadLibraryExtended(const char* lib_file, const if (sourcedll) { - /* also check for invalid paths wich begin with a \ */ + /* also check for invalid paths which begin with a \ */ if( libpath[0] == '\0' || libpath[0] == PATH_SEPARATOR_CHAR ) { /* use calling dll's path as base address for this call */ diff --git a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp index 0f231aca1d..117ae5e90e 100644 --- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp +++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp @@ -885,7 +885,7 @@ extern "C" return ret; } - // we have a valid data struture. get next item! + // we have a valid data structure. get next item! int iItem = vecDirsOpen[found].curr_index; if (iItem+1 < vecDirsOpen[found].items.Size()) // we have a winner! { @@ -1429,7 +1429,7 @@ extern "C" if (pFile != NULL) { int len = strlen(tmp); - // replace all '\n' occurences with '\r\n'... + // replace all '\n' occurrences with '\r\n'... char tmp2[2048]; int j = 0; for (int i = 0; i < len; i++) diff --git a/xbmc/cores/RetroPlayer/rendering/VideoRenderers/RPBaseRenderer.h b/xbmc/cores/RetroPlayer/rendering/VideoRenderers/RPBaseRenderer.h index 9f41ca790b..f177e9abaf 100644 --- a/xbmc/cores/RetroPlayer/rendering/VideoRenderers/RPBaseRenderer.h +++ b/xbmc/cores/RetroPlayer/rendering/VideoRenderers/RPBaseRenderer.h @@ -99,7 +99,7 @@ private: virtual void ManageRenderArea(const IRenderBuffer& renderBuffer); /*! - * \brief Performs whatever nessesary after a frame has been rendered + * \brief Performs whatever necessary after a frame has been rendered */ void PostRender(); diff --git a/xbmc/cores/RetroPlayer/savestates/ISavestate.h b/xbmc/cores/RetroPlayer/savestates/ISavestate.h index 2330bc5c71..fc7cd66b64 100644 --- a/xbmc/cores/RetroPlayer/savestates/ISavestate.h +++ b/xbmc/cores/RetroPlayer/savestates/ISavestate.h @@ -63,7 +63,7 @@ public: /// @name Game properties ///{ /*! - * \brief The name of the file beloning to this savestate's game + * \brief The name of the file belonging to this savestate's game */ virtual std::string GameFileName() const = 0; ///} diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp index fa83e5fa9b..efd862cceb 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp @@ -165,7 +165,7 @@ bool CDVDAudioCodecFFmpeg::AddData(const DemuxPacket &packet) int ret = avcodec_send_packet(m_pCodecContext, avpkt); - //! @todo: properly handle avpkt side_data. this works around our inproper use of the side_data + //! @todo: properly handle avpkt side_data. this works around our improper use of the side_data // as we pass pointers to ffmpeg allocated memory for the side_data. we should really be allocating // and storing our own AVPacket. This will require some extensive changes. av_buffer_unref(&avpkt->buf); diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.cpp index fed8cd5483..873088386d 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.cpp @@ -187,7 +187,7 @@ OverlayMessage CDVDOverlayCodecTX3G::Decode(DemuxPacket* pPacket) styleRec.textColorARGB = UTILS::COLOR::ConvertToARGB(sampleData.ReadNextUnsignedInt()); styleRec.textColorAlphaCh = (styleRec.textColorARGB & 0xFF000000) >> 24; // clamp bgnChar/bgnChar to textLength, we alloc enough space above and - // this fixes borken encoders that do not handle endChar correctly. + // this fixes broken encoders that do not handle endChar correctly. if (styleRec.startChar > textLength) styleRec.startChar = textLength; if (styleRec.endChar > textLength) @@ -232,7 +232,7 @@ OverlayMessage CDVDOverlayCodecTX3G::Decode(DemuxPacket* pPacket) } } - if (*curPos == '{') // erase unsupport tags + if (*curPos == '{') // erase unsupported tags skipChars = true; // Skip all \r because it causes the line to display empty box "tofu" diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/AddonVideoCodec.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/AddonVideoCodec.h index b746b7cbbc..730bd4de1e 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/AddonVideoCodec.h +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/AddonVideoCodec.h @@ -38,7 +38,7 @@ private: /*! * @brief All picture members can be expected to be set correctly except decodedData and pts. - * GetFrameBuffer has to set decodedData to a valid memory adress and return true. + * GetFrameBuffer has to set decodedData to a valid memory address and return true. * In case buffer allocation fails, return false. */ bool GetFrameBuffer(VIDEOCODEC_PICTURE &picture); diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.h index ab8bb81375..b23fd48383 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.h +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.h @@ -126,14 +126,14 @@ public: /** * Open the decoder, returns true on success - * Decoders not capable of runnung multiple instances should return false in case + * Decoders not capable of running multiple instances should return false in case * there is already a instance open */ virtual bool Open(CDVDStreamInfo &hints, CDVDCodecOptions &options) = 0; /** * Reconfigure the decoder, returns true on success - * Decoders not capable of runnung multiple instances may be capable of reconfiguring + * Decoders not capable of running multiple instances may be capable of reconfiguring * the running instance. If Reconfigure returns false, player will close / open * the decoder */ diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp index cfe12f0445..328cd51ec5 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp @@ -1152,7 +1152,7 @@ CDVDVideoCodec::VCReturn CDVDVideoCodecAndroidMediaCodec::GetPicture(VideoPictur // try to fetch an input buffer if (m_indexInputBuffer < 0) { - m_indexInputBuffer = m_codec->dequeueInputBuffer(5000 /*timout*/); + m_indexInputBuffer = m_codec->dequeueInputBuffer(5000 /*timeout*/); if (xbmc_jnienv()->ExceptionCheck()) { xbmc_jnienv()->ExceptionClear(); diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp index 5b86cbdbca..6dc2a91f03 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp @@ -389,7 +389,7 @@ bool CDVDVideoCodecDRMPRIME::AddData(const DemuxPacket& packet) int ret = avcodec_send_packet(m_pCodecContext, avpkt); - //! @todo: properly handle avpkt side_data. this works around our inproper use of the side_data + //! @todo: properly handle avpkt side_data. this works around our improper use of the side_data // as we pass pointers to ffmpeg allocated memory for the side_data. we should really be allocating // and storing our own AVPacket. This will require some extensive changes. av_buffer_unref(&avpkt->buf); diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp index b1fa81965e..795300cadb 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp @@ -584,7 +584,7 @@ bool CDVDVideoCodecFFmpeg::AddData(const DemuxPacket &packet) int ret = avcodec_send_packet(m_pCodecContext, avpkt); - //! @todo: properly handle avpkt side_data. this works around our inproper use of the side_data + //! @todo: properly handle avpkt side_data. this works around our improper use of the side_data // as we pass pointers to ffmpeg allocated memory for the side_data. we should really be allocating // and storing our own AVPacket. This will require some extensive changes. av_buffer_unref(&avpkt->buf); diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DXVA.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DXVA.cpp index 69d1fb3ea7..a7a67c3577 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DXVA.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DXVA.cpp @@ -440,7 +440,7 @@ bool CContext::GetFormatAndConfig(AVCodecContext* avctx, D3D11_VIDEO_DECODER_DES HRESULT res = m_pD3D11Device->CheckVideoDecoderFormat(mode.guid, render_targets_dxgi[j], &format_supported); if (FAILED(res) || !format_supported) { - CLog::LogFunction(LOGINFO, "DXVA", "Ouput format {} is not supported by '{}'", + CLog::LogFunction(LOGINFO, "DXVA", "Output format {} is not supported by '{}'", render_targets_dxgi[j], mode.name); continue; } diff --git a/xbmc/cores/VideoPlayer/DVDDemuxSPU.cpp b/xbmc/cores/VideoPlayer/DVDDemuxSPU.cpp index 1b1f110653..e22ffeada9 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxSPU.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxSPU.cpp @@ -492,7 +492,7 @@ CDVDOverlaySpu* CDVDDemuxSPU::ParseRLE(CDVDOverlaySpu* pSPU, uint8_t* pUnparsedD pSPU->width, pSPU->height, pSPU->x, pSPU->y ); // forced spu's (menu overlays) retrieve their alpha/color information from InputStreamNavigator::GetCurrentButtonInfo - // also they may contain completely covering data wich is supposed to be hidden normally + // also they may contain completely covering data which is supposed to be hidden normally // since whole spu is drawn, if this is done for forced, that may be displayed // so we must trust what is given if( !pSPU->bForced ) diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp index ebfaac4b78..d1c3b14b89 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp @@ -1734,7 +1734,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) } else { - // Note: libass only supports a single font directory to look for aditional fonts + // Note: libass only supports a single font directory to look for additional fonts // (c.f. ass_set_fonts_dir). To support both user defined fonts (those placed in // special://home/media/Fonts/) and fonts extracted by the demuxer, make it extract // fonts to the user directory with a known, easy to identify, prefix (tmp.font.*). diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxUtils.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxUtils.cpp index 632a78820d..66127c200f 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxUtils.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxUtils.cpp @@ -35,7 +35,7 @@ void CDVDDemuxUtils::FreeDemuxPacket(DemuxPacket* pPacket) avPkt->side_data = static_cast<AVPacketSideData*>(pPacket->pSideData); avPkt->side_data_elems = pPacket->iSideDataElems; - //! @todo: properly handle avpkt side_data. this works around our inproper use of the side_data + //! @todo: properly handle avpkt side_data. this works around our improper use of the side_data // as we pass pointers to ffmpeg allocated memory for the side_data. we should really be allocating // and storing our own AVPacket. This will require some extensive changes. @@ -103,7 +103,7 @@ void CDVDDemuxUtils::StoreSideData(DemuxPacket *pkt, AVPacket *src) pkt->pSideData = avPkt->side_data; pkt->iSideDataElems = avPkt->side_data_elems; - //! @todo: properly handle avpkt side_data. this works around our inproper use of the side_data + //! @todo: properly handle avpkt side_data. this works around our improper use of the side_data // as we pass pointers to ffmpeg allocated memory for the side_data. we should really be allocating // and storing our own AVPacket. This will require some extensive changes. av_buffer_unref(&avPkt->buf); diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.cpp index 027e4b398c..ad785ab6d1 100644 --- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.cpp +++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.cpp @@ -576,7 +576,7 @@ int CDVDInputStreamNavigator::ProcessBlock(uint8_t* dest_buffer, int* read) break; } - /* if we have any buttons or are not in vts domain we assume we are in meny */ + /* if we have any buttons or are not in vts domain we assume we are in menu */ bool menu = pci->hli.hl_gi.hli_ss || (0 == m_dll.dvdnav_is_domain_vts(m_dvdnav)); if (menu != m_bInMenu) { diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvd_reader.h b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvd_reader.h index ce4281f9ce..113f2616a3 100644 --- a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvd_reader.h +++ b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvd_reader.h @@ -37,7 +37,7 @@ struct iovec /** * The DVD access interface. * - * This file contains the functions that form the interface to to + * This file contains the functions that form the interface to * reading files located on a DVD. */ @@ -105,7 +105,7 @@ typedef struct { * path/vts_01_1.vob * * @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. + * @return If successful a read handle is returned. Otherwise 0 is returned. * * dvd = DVDOpen(path); */ @@ -171,7 +171,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. - * @return If successful a a file read handle is returned, otherwise 0. + * @return If successful a file read handle is returned, otherwise 0. * * dvd_file = DVDOpenFile(dvd, titlenum, domain); */ dvd_file_t *DVDOpenFile( dvd_reader_t *, int, dvd_read_domain_t ); diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav_internal.h b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav_internal.h index 36969eae8c..c6efcb2334 100644 --- a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav_internal.h +++ b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav_internal.h @@ -82,7 +82,7 @@ static inline int _private_gettimeofday( struct timeval *tv, void *tz ) #endif typedef enum { - DSI_ILVU_PRE = 1 << 15, /* set during the last 3 VOBU preceeding an interleaved block. */ + DSI_ILVU_PRE = 1 << 15, /* set during the last 3 VOBU preceding an interleaved block. */ DSI_ILVU_BLOCK = 1 << 14, /* set for all VOBU in an interleaved block */ DSI_ILVU_FIRST = 1 << 13, /* set for the first VOBU for a given angle or scene within a ILVU, or the first VOBU in the preparation (PREU) sequence */ DSI_ILVU_LAST = 1 << 12, /* set for the last VOBU for a given angle or scene within a ILVU, or the last VOBU in the preparation (PREU) sequence */ diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/nav_types.h b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/nav_types.h index 9ee6a228ef..aa33f23d4d 100644 --- a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/nav_types.h +++ b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/nav_types.h @@ -107,7 +107,7 @@ typedef struct { /** * Button Color Information Table - * Each entry being a 32bit word that contains the color indexs and alpha + * Each entry being a 32bit word that contains the color indexes 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 * that the indexes reference is in the PGC. diff --git a/xbmc/cores/VideoPlayer/DVDOverlayContainer.h b/xbmc/cores/VideoPlayer/DVDOverlayContainer.h index 96900701cb..98f337386a 100644 --- a/xbmc/cores/VideoPlayer/DVDOverlayContainer.h +++ b/xbmc/cores/VideoPlayer/DVDOverlayContainer.h @@ -25,7 +25,7 @@ public: /*! * \brief Adds an overlay into the container by processing the existing overlay collection first * - * \details Processes the overlay collection whenever a new overlay is added. Usefull to change + * \details Processes the overlay collection whenever a new overlay is added. Useful to change * the overlay's PTS values of previously added overlays if the collection itself is sequential. This * is, for example, the case of ASS subtitles in which a single call to ass_render_frame generates all * the subtitle images on a single call even if two subtitles exist at the same time frame. Other cases diff --git a/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitlesLibass.cpp b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitlesLibass.cpp index 3d2c2e52e3..81cdce24b8 100644 --- a/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitlesLibass.cpp +++ b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitlesLibass.cpp @@ -53,7 +53,7 @@ std::string GetDefaultFontPath(std::string& font) return ""; } -// Convert RGB/ARGB to RGBA by appling also the opacity value +// Convert RGB/ARGB to RGBA by also applying the opacity value COLOR::Color ConvColor(COLOR::Color argbColor, int opacity = 100) { return COLOR::ConvertToRGBA(COLOR::ChangeOpacity(argbColor, (100.0f - opacity) / 100.0f)); @@ -298,7 +298,7 @@ void CDVDSubtitlesLibass::ApplyStyle(style subStyle, renderOpts opts) (subStyle.assOverrideStyles == OverrideStyles::STYLES || subStyle.assOverrideStyles == OverrideStyles::STYLES_POSITIONS)) { - // With styles overrided the PlayResY will be changed to 288 + // With styles overridden the PlayResY will be changed to 288 playResY = 288; scale = 288. / 720; } diff --git a/xbmc/cores/VideoPlayer/DVDSubtitles/SubtitlesAdapter.cpp b/xbmc/cores/VideoPlayer/DVDSubtitles/SubtitlesAdapter.cpp index 72d1c32dd0..b1c2c2ff15 100644 --- a/xbmc/cores/VideoPlayer/DVDSubtitles/SubtitlesAdapter.cpp +++ b/xbmc/cores/VideoPlayer/DVDSubtitles/SubtitlesAdapter.cpp @@ -83,7 +83,7 @@ CDVDOverlay* CSubtitlesAdapter::CreateOverlay() // Side effects that happens when you create each overlay based on each Libass Event: // - A small delay when switching on/off the overlay renderer, cause subtitles - // flickering when Events have close timing. A possibile cause of the + // flickering when Events have close timing. A possible cause of the // delay could be the async implementation of overlay management chain. // - When an overlay disable the renderer, Libass has no possibility to // complete the rendering of text animations (not sure if related to previous problem) diff --git a/xbmc/cores/VideoPlayer/DVDSubtitles/webvtt/WebVTTHandler.cpp b/xbmc/cores/VideoPlayer/DVDSubtitles/webvtt/WebVTTHandler.cpp index 5bd94486d3..baf12e890a 100644 --- a/xbmc/cores/VideoPlayer/DVDSubtitles/webvtt/WebVTTHandler.cpp +++ b/xbmc/cores/VideoPlayer/DVDSubtitles/webvtt/WebVTTHandler.cpp @@ -748,7 +748,7 @@ void CWebVTTHandler::CalculateTextPosition(std::string& subtitleText) } // The vertical margin should always referred from the top to simulate - // the corrent cue box position without a cue box. + // the current cue box position without a cue box. // But if the vertical margin is too high and the text size is very large, // in some cases the text could go off-screen. // To try ensure that the text does not go off-screen, diff --git a/xbmc/cores/VideoPlayer/DVDSubtitles/webvtt/WebVTTISOHandler.cpp b/xbmc/cores/VideoPlayer/DVDSubtitles/webvtt/WebVTTISOHandler.cpp index 5b339213a0..c19ca35010 100644 --- a/xbmc/cores/VideoPlayer/DVDSubtitles/webvtt/WebVTTISOHandler.cpp +++ b/xbmc/cores/VideoPlayer/DVDSubtitles/webvtt/WebVTTISOHandler.cpp @@ -21,7 +21,7 @@ // WebVTT in MP4 encapsulated subtitles (ISO/IEC 14496-30:2014) // This format type that differ from the text WebVTT, it makes use // of ISO BMFF byte stream where the data are enclosed in boxes (first 4 byte -// speficy the size and next 4 byte specify the type). +// specify the size and next 4 byte specify the type). // Start/Stop times info are not included, the start time is the current pts // provided from the decoder, the stop time is defined from the pts of the next // packages (depends from the box type). diff --git a/xbmc/cores/VideoPlayer/PTSTracker.cpp b/xbmc/cores/VideoPlayer/PTSTracker.cpp index c6461c9cd1..c5fdbf1a76 100644 --- a/xbmc/cores/VideoPlayer/PTSTracker.cpp +++ b/xbmc/cores/VideoPlayer/PTSTracker.cpp @@ -253,7 +253,7 @@ bool CPtsTracker::CheckPattern(std::vector<double>& pattern) } //calculate how long each frame should last from the saved pattern -//Retreive also information of max and min frame rate duration, for VFR files case +//also retrieve information of max and min frame rate duration, for VFR files case double CPtsTracker::CalcFrameDuration() { if (!m_pattern.empty()) diff --git a/xbmc/cores/VideoPlayer/VideoPlayer.cpp b/xbmc/cores/VideoPlayer/VideoPlayer.cpp index f520fcd822..91979aa95b 100644 --- a/xbmc/cores/VideoPlayer/VideoPlayer.cpp +++ b/xbmc/cores/VideoPlayer/VideoPlayer.cpp @@ -4078,7 +4078,7 @@ int CVideoPlayer::OnDiscNavResult(void* pData, int iMessage) // if we remember the old vobunits boundaries // when a packet comes out of demuxer that has // pts values outside that boundary, it belongs - // to the new vobunit, wich has new timestamps + // to the new vobunit, which has new timestamps UpdatePlayState(0); } break; diff --git a/xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp b/xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp index 40d25fa1d6..1f8928682e 100644 --- a/xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp +++ b/xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp @@ -1451,7 +1451,7 @@ unsigned int CDVDRadioRDSData::DecodeRTPlus(uint8_t *msgElement, unsigned int le printf(" RTp-Unkn. : %02i - %s\n", rtp_typ[i], m_RTPlus_Temptext); break; #endif // RDS_IMPROVE_CHECK - /// Unused and not needed data informations + /// Unused and not needed data information case RTPLUS_STATIONNAME_SHORT: //!< Must be rechecked under DAB case RTPLUS_INFO_DATE_TIME: break; diff --git a/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp b/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp index 8cfe882265..f4293ae7fc 100644 --- a/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp +++ b/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp @@ -664,7 +664,7 @@ bool CVideoPlayerVideo::ProcessDecoderOutput(double &frametime, double &pts) m_picture.iDuration = frametime; // validate picture timing, - // if both dts/pts invalid, use pts calulated from picture.iDuration + // if both dts/pts invalid, use pts calculated from picture.iDuration // if pts invalid use dts, else use picture.pts as passed if (m_picture.dts == DVD_NOPTS_VALUE && m_picture.pts == DVD_NOPTS_VALUE) { @@ -711,7 +711,7 @@ bool CVideoPlayerVideo::ProcessDecoderOutput(double &frametime, double &pts) } } - // if frame has a pts (usually originiating from demux packet), use that + // if frame has a pts (usually originating from demux packet), use that if (m_picture.pts != DVD_NOPTS_VALUE) { pts = m_picture.pts; diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/BaseRenderer.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/BaseRenderer.cpp index f67ba34da2..5f5f409187 100644 --- a/xbmc/cores/VideoPlayer/VideoRenderers/BaseRenderer.cpp +++ b/xbmc/cores/VideoPlayer/VideoRenderers/BaseRenderer.cpp @@ -158,7 +158,7 @@ void CBaseRenderer::CalcDestRect(float offsetX, } else { - // maximize the movie hight + // maximize the movie height newHeight = std::min(width, height); newWidth = newHeight / outputFrameRatio; if (newWidth > width) diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h index 3fae32c023..554160aa10 100644 --- a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h +++ b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h @@ -100,7 +100,7 @@ public: bool CheckConfiguration(int cmsToken, AVColorPrimaries srcPrimaries); /*! - \brief Get a 3D LUT dimention and data size for video color correction + \brief Get a 3D LUT dimension and data size for video color correction \param format required format of CLUT data \param clutSize pointer to CLUT resolution \param dataSize pointer to CLUT data size diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/ConversionMatrix.h b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/ConversionMatrix.h index 6ded6db067..1b47278f3b 100644 --- a/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/ConversionMatrix.h +++ b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/ConversionMatrix.h @@ -42,7 +42,7 @@ public: if (m_mat[i][j] == other.m_mat[i][j]) continue; - // some floating point comparisions should be done by checking if the difference is within a tolerance + // some floating point comparisons should be done by checking if the difference is within a tolerance if (std::abs(m_mat[i][j] - other.m_mat[i][j]) <= (std::max(std::abs(other.m_mat[i][j]), std::abs(m_mat[i][j])) * 1e-2f)) continue; diff --git a/xbmc/cores/paplayer/PAPlayer.cpp b/xbmc/cores/paplayer/PAPlayer.cpp index cf72ff6bd7..249a3c4a42 100644 --- a/xbmc/cores/paplayer/PAPlayer.cpp +++ b/xbmc/cores/paplayer/PAPlayer.cpp @@ -632,7 +632,7 @@ inline void PAPlayer::ProcessStreams(double &freeBufferTime) /* if it was the last stream */ if (itt == m_streams.end()) { - /* if it didnt trigger the next queue item */ + /* if it didn't trigger the next queue item */ if (!si->m_prepareTriggered) { if (si->m_waitOnDrain) diff --git a/xbmc/dbwrappers/mysqldataset.cpp b/xbmc/dbwrappers/mysqldataset.cpp index 194cdf8785..2a02a7ef90 100644 --- a/xbmc/dbwrappers/mysqldataset.cpp +++ b/xbmc/dbwrappers/mysqldataset.cpp @@ -664,7 +664,7 @@ std::string MysqlDatabase::vprepare(const char *format, va_list args) #define etPERCENT 8 /* Percent symbol. %% */ #define etCHARX 9 /* Characters. %c */ /* The rest are extensions, not normally found in printf() */ -#define etSQLESCAPE 10 /* Strings with '\'' doubled. Stings with '\\' escaped. %q */ +#define etSQLESCAPE 10 /* Strings with '\'' doubled. Strings with '\\' escaped. %q */ #define etSQLESCAPE2 11 /* Strings with '\'' doubled and enclosed in '', NULL pointers replaced by SQL NULL. %Q */ #define etPOINTER 14 /* The %p conversion */ diff --git a/xbmc/filesystem/CurlFile.cpp b/xbmc/filesystem/CurlFile.cpp index 7cfe0929b6..1dbaf1cf5e 100644 --- a/xbmc/filesystem/CurlFile.cpp +++ b/xbmc/filesystem/CurlFile.cpp @@ -713,7 +713,7 @@ void CCurlFile::SetRequestHeaders(CReadState* state) void CCurlFile::SetCorrectHeaders(CReadState* state) { CHttpHeader& h = state->m_httpheader; - /* workaround for shoutcast server wich doesn't set content type on standard mp3 */ + /* workaround for shoutcast server which doesn't set content type on standard mp3 */ if( h.GetMimeType().empty() ) { if( !h.GetValue("icy-notice1").empty() @@ -781,8 +781,8 @@ void CCurlFile::ParseAndCorrectUrl(CURL &url2) url2.SetOptions(""); } - /* this is uggly, depending on from where */ - /* we get the link it may or may not be */ + /* this is ugly, depending on where we get */ + /* the link from, it may or may not be */ /* url encoded. if handed from ftpdirectory */ /* it won't be so let's handle that case */ @@ -1610,8 +1610,8 @@ int CCurlFile::Stat(const CURL& url, struct __stat64* buffer) // Note: CURLINFO_CONTENT_TYPE returns the last received content-type response header value. // In case there is authentication required there might be multiple requests involved and if - // the last request whch actually returns the data does not return a content-type header, but - // one of the preceeding requests, CURLINFO_CONTENT_TYPE returns not the content type of the + // the last request which actually returns the data does not return a content-type header, but + // one of the preceding requests, CURLINFO_CONTENT_TYPE returns not the content type of the // actual resource requested! m_state contains only the values of the last request, which is // what we want here. const std::string mimeType = m_state->m_httpheader.GetMimeType(); @@ -1888,7 +1888,7 @@ int8_t CCurlFile::CReadState::FillBuffer(unsigned int want) case CURLM_CALL_MULTI_PERFORM: { // we don't keep calling here as that can easily overwrite our buffer which we want to avoid - // docs says we should call it soon after, but aslong as we are reading data somewhere + // docs says we should call it soon after, but as long as we are reading data somewhere // this aught to be soon enough. should stay in socket otherwise continue; } diff --git a/xbmc/filesystem/IDirectory.h b/xbmc/filesystem/IDirectory.h index f66be0c15f..5667dc3b56 100644 --- a/xbmc/filesystem/IDirectory.h +++ b/xbmc/filesystem/IDirectory.h @@ -98,7 +98,7 @@ public: /*! \brief Recursively removes the directory \param url Directory to remove. - \return Returns \e false if not succesful + \return Returns \e false if not successful */ virtual bool RemoveRecursive(const CURL& url) { return false; } diff --git a/xbmc/filesystem/IFile.h b/xbmc/filesystem/IFile.h index cc0feea5ab..d76d6ed1ad 100644 --- a/xbmc/filesystem/IFile.h +++ b/xbmc/filesystem/IFile.h @@ -100,7 +100,7 @@ public: virtual void Flush() { } virtual int Truncate(int64_t size) { return -1; } - /* Returns the minium size that can be read from input stream. * + /* Returns the minimum size that can be read from input stream. * * For example cdrom access where access could be sector based. * * This will cause file system to buffer read requests, to * * to meet the requirement of CFile. * diff --git a/xbmc/filesystem/NFSFile.cpp b/xbmc/filesystem/NFSFile.cpp index 454e5c4814..bc6902fe28 100644 --- a/xbmc/filesystem/NFSFile.cpp +++ b/xbmc/filesystem/NFSFile.cpp @@ -327,7 +327,7 @@ void CNfsConnection::Deinit() m_pNfsContext = NULL; } clearMembers(); - // clear any keep alive timouts on deinit + // clear any keep alive timeouts on deinit m_KeepAliveTimeouts.clear(); } @@ -335,7 +335,7 @@ void CNfsConnection::Deinit() void CNfsConnection::CheckIfIdle() { /* We check if there are open connections. This is done without a lock to not halt the mainthread. It should be thread safe as - worst case scenario is that m_OpenConnections could read 0 and then changed to 1 if this happens it will enter the if wich will lead to another check, wich is locked. */ + worst case scenario is that m_OpenConnections could read 0 and then changed to 1 if this happens it will enter the if which will lead to another check, which is locked. */ if (m_OpenConnections == 0 && m_pNfsContext != NULL) { /* I've set the the maximum IDLE time to be 1 min and 30 sec. */ CSingleLock lock(*this); @@ -473,7 +473,7 @@ void CNfsConnection::AddIdleConnection() { CSingleLock lock(*this); m_OpenConnections--; - /* If we close a file we reset the idle timer so that we don't have any wierd behaviours if a user + /* If we close a file we reset the idle timer so that we don't have any weird behaviours if a user leaves the movie paused for a long while and then press stop */ m_IdleTimeout = 180; } diff --git a/xbmc/games/controllers/types/ControllerGrid.h b/xbmc/games/controllers/types/ControllerGrid.h index 68854ea196..b87f9767ea 100644 --- a/xbmc/games/controllers/types/ControllerGrid.h +++ b/xbmc/games/controllers/types/ControllerGrid.h @@ -108,7 +108,7 @@ private: * \brief Draw a controller to the column at the specified height * * \param port The controller's port node - * \param height The hight to draw the controller at + * \param height The height to draw the controller at * \param column[in/out] The column to draw to * \param grid[in/out] The grid to add additional columns to * diff --git a/xbmc/guilib/FFmpegImage.cpp b/xbmc/guilib/FFmpegImage.cpp index e10f7a0cd1..6089577bff 100644 --- a/xbmc/guilib/FFmpegImage.cpp +++ b/xbmc/guilib/FFmpegImage.cpp @@ -429,7 +429,7 @@ bool CFFmpegImage::DecodeFrame(AVFrame* frame, unsigned int width, unsigned int int size = av_image_fill_arrays(pictureRGB->data, pictureRGB->linesize, NULL, AV_PIX_FMT_RGB32, width, height, 16); if (size < 0) { - CLog::LogF(LOGERROR, "Could not allocate AVFrame member with {} x {} pixes", width, height); + CLog::LogF(LOGERROR, "Could not allocate AVFrame member with {} x {} pixels", width, height); av_frame_free(&pictureRGB); return false; } diff --git a/xbmc/guilib/GUIControlGroup.cpp b/xbmc/guilib/GUIControlGroup.cpp index 1dee6c862a..f737f9fef3 100644 --- a/xbmc/guilib/GUIControlGroup.cpp +++ b/xbmc/guilib/GUIControlGroup.cpp @@ -238,7 +238,7 @@ bool CGUIControlGroup::OnMessage(CGUIMessage& message) break; } bool handled(false); - //not intented for any specific control, send to all childs and our base handler. + //not intended for any specific control, send to all childs and our base handler. if (message.GetControlId() == 0) { for (auto *control : m_children) diff --git a/xbmc/guilib/GUIFont.cpp b/xbmc/guilib/GUIFont.cpp index 9583a263b8..5493595e90 100644 --- a/xbmc/guilib/GUIFont.cpp +++ b/xbmc/guilib/GUIFont.cpp @@ -224,7 +224,7 @@ void CGUIFont::DrawScrollingText(float x, CServiceBroker::GetWinSystem()->GetGfxContext().RestoreClipRegion(); } -// remaps unsupported font glpyhs to other suitable ones +// remaps unsupported font glyphs to other suitable ones wchar_t CGUIFont::RemapGlyph(wchar_t letter) { if (letter == 0x2019 || letter == 0x2018) return 0x0027; // single quotes diff --git a/xbmc/guilib/GUILabelControl.dox b/xbmc/guilib/GUILabelControl.dox index c66ae0029a..8501c93114 100644 --- a/xbmc/guilib/GUILabelControl.dox +++ b/xbmc/guilib/GUILabelControl.dox @@ -39,10 +39,10 @@ size, colour, location and contents of the text to be displayed. -------------------------------------------------------------------------------- \section Label_Control_sect2 Auto size labels -Wrapping your label in a grouplist with the auto width and appropriate minium and -maximum values. Allows the labels width to dynamically change relative to how -long the label text is. This allows a image or other control to be aligned to -the right of the actual label text no matter how wide the label is. +Wrapping your label in a grouplist with the auto width and appropriate minimum +and maximum values. Allows the labels width to dynamically change relative to +how long the label text is. This allows a image or other control to be aligned +to the right of the actual label text no matter how wide the label is. ~~~~~~~~~~~~~ <width min="29" max="200">auto</width> diff --git a/xbmc/guilib/GUIMessage.h b/xbmc/guilib/GUIMessage.h index b4ccac01fa..fd64718393 100644 --- a/xbmc/guilib/GUIMessage.h +++ b/xbmc/guilib/GUIMessage.h @@ -150,7 +150,7 @@ #define GUI_MSG_REFRESH_TIMER 50 /*! - \brief Called if state has changed wich could lead to GUI changes + \brief Called if state has changed which could lead to GUI changes */ #define GUI_MSG_STATE_CHANGED 51 diff --git a/xbmc/guilib/GUIShaderDX.h b/xbmc/guilib/GUIShaderDX.h index d12b45de60..6e70599738 100644 --- a/xbmc/guilib/GUIShaderDX.h +++ b/xbmc/guilib/GUIShaderDX.h @@ -73,7 +73,7 @@ public: float GetClipYFactor(void) const { return m_clipYFactor; } float GetClipYOffset(void) const { return m_clipYOffset; } - // need to use aligned allocation bacause we use XMMATRIX in structures. + // need to use aligned allocation because we use XMMATRIX in structures. void* operator new (size_t size) { void* ptr = KODI::MEMORY::AlignedMalloc(size, __alignof(CGUIShaderDX)); diff --git a/xbmc/guilib/GUIWindowManager.cpp b/xbmc/guilib/GUIWindowManager.cpp index 7731d35b6b..f8856a79aa 100644 --- a/xbmc/guilib/GUIWindowManager.cpp +++ b/xbmc/guilib/GUIWindowManager.cpp @@ -1397,7 +1397,7 @@ void CGUIWindowManager::DeInitialize() { CSingleLock lock(CServiceBroker::GetWinSystem()->GetGfxContext()); - // Need a copy bacause addon-dialogs remove itself on Close() + // Need a copy because addon-dialogs removes itself on Close() std::unordered_map<int, CGUIWindow*> closeMap(m_mapWindows); for (const auto& entry : closeMap) { diff --git a/xbmc/guilib/Shader.h b/xbmc/guilib/Shader.h index 07f49a1b7d..d86ca2b79b 100644 --- a/xbmc/guilib/Shader.h +++ b/xbmc/guilib/Shader.h @@ -124,11 +124,11 @@ namespace Shaders { // compile and link the shaders virtual bool CompileAndLink() = 0; - // override to to perform custom tasks on successful compilation + // override to perform custom tasks on successful compilation // and linkage. E.g. obtaining handles to shader attributes. virtual void OnCompiledAndLinked() {} - // override to to perform custom tasks before shader is enabled + // override to perform custom tasks before shader is enabled // and after it is disabled. Return false in OnDisabled() to // disable shader. // E.g. setting attributes, disabling texture unites, etc diff --git a/xbmc/guilib/guiinfo/SystemGUIInfo.cpp b/xbmc/guilib/guiinfo/SystemGUIInfo.cpp index d0a87e178d..fb8174ad4a 100644 --- a/xbmc/guilib/guiinfo/SystemGUIInfo.cpp +++ b/xbmc/guilib/guiinfo/SystemGUIInfo.cpp @@ -469,7 +469,7 @@ bool CSystemGUIInfo::GetBool(bool& value, const CGUIListItem *gitem, int context value = false; return true; case SYSTEM_ETHERNET_LINK_ACTIVE: - // wtf: not implementated - always returns true?! + // wtf: not implemented - always returns true?! value = true; return true; case SYSTEM_PLATFORM_LINUX: diff --git a/xbmc/input/InputTranslator.h b/xbmc/input/InputTranslator.h index 19975ac328..70047f51f0 100644 --- a/xbmc/input/InputTranslator.h +++ b/xbmc/input/InputTranslator.h @@ -20,7 +20,7 @@ public: /*! * \brief Get the closest cardinal direction to the given vector * - * This function assumes a right-handed cartesian coordinate system; postive + * This function assumes a right-handed cartesian coordinate system; positive * X is right, positive Y is up. * * Ties are resolved in the clockwise direction: (0.5, 0.5) will resolve to @@ -38,7 +38,7 @@ public: * \brief Get the closest cardinal or intercardinal direction to the given * vector * - * This function assumes a right-handed cartesian coordinate system; postive + * This function assumes a right-handed cartesian coordinate system; positive * X is right, positive Y is up. * * Ties are resolved in the clockwise direction. diff --git a/xbmc/input/joysticks/DriverPrimitive.h b/xbmc/input/joysticks/DriverPrimitive.h index 07d80e3f7c..abe372411d 100644 --- a/xbmc/input/joysticks/DriverPrimitive.h +++ b/xbmc/input/joysticks/DriverPrimitive.h @@ -154,7 +154,7 @@ public: unsigned int Range() const { return m_range; } /*! - * \brief The keybord symbol (valid for keys) + * \brief The keyboard symbol (valid for keys) */ KEYBOARD::KeySymbol Keycode() const { return m_keycode; } diff --git a/xbmc/input/joysticks/interfaces/IButtonMap.h b/xbmc/input/joysticks/interfaces/IButtonMap.h index f98ee86276..caa547c38b 100644 --- a/xbmc/input/joysticks/interfaces/IButtonMap.h +++ b/xbmc/input/joysticks/interfaces/IButtonMap.h @@ -317,7 +317,7 @@ public: /*! * \brief Revert changes to the button map since the last time it was loaded - * or commited to disk + * or committed to disk */ virtual void RevertButtonMap() = 0; }; diff --git a/xbmc/interfaces/generic/ScriptInvocationManager.cpp b/xbmc/interfaces/generic/ScriptInvocationManager.cpp index 703e2e8203..492bc6cae0 100644 --- a/xbmc/interfaces/generic/ScriptInvocationManager.cpp +++ b/xbmc/interfaces/generic/ScriptInvocationManager.cpp @@ -74,7 +74,7 @@ void CScriptInvocationManager::Uninitialize() // execute Process() once more to handle the remaining scripts Process(); - // it is safe to relese early, thread must be in m_scripts too + // it is safe to release early, thread must be in m_scripts too m_lastInvokerThread = nullptr; // make sure all scripts are done diff --git a/xbmc/interfaces/json-rpc/schema/methods.json b/xbmc/interfaces/json-rpc/schema/methods.json index 8335d2123a..0542029a48 100644 --- a/xbmc/interfaces/json-rpc/schema/methods.json +++ b/xbmc/interfaces/json-rpc/schema/methods.json @@ -2241,7 +2241,7 @@ "transport": "Response", "permission": "ReadData", "params": [ - { "name": "broadcastid", "$ref": "Library.Id", "required": true, "description": "the id of the broadcast to to check for playability" } + { "name": "broadcastid", "$ref": "Library.Id", "required": true, "description": "the id of the broadcast to check for playability" } ], "returns": "boolean" }, diff --git a/xbmc/interfaces/swig/AddonModuleXbmcgui.i b/xbmc/interfaces/swig/AddonModuleXbmcgui.i index 6b3b8079e1..b86940180e 100644 --- a/xbmc/interfaces/swig/AddonModuleXbmcgui.i +++ b/xbmc/interfaces/swig/AddonModuleXbmcgui.i @@ -91,7 +91,7 @@ using namespace xbmcgui; } else { - // for backwards compatability in python scripts + // for backwards compatibility in python scripts PyObject* o1 = PyLong_FromLong(a1->id); return PyObject_RichCompare(o1, obj2, method); } diff --git a/xbmc/listproviders/IListProvider.h b/xbmc/listproviders/IListProvider.h index 024394cdbb..f92d99c534 100644 --- a/xbmc/listproviders/IListProvider.h +++ b/xbmc/listproviders/IListProvider.h @@ -60,7 +60,7 @@ public: virtual void Reset() {} /*! \brief Free all GUI resources allocated by the items. - \param immediately true to free resources imediately, free resources async later otherwise. + \param immediately true to free resources immediately, free resources async later otherwise. */ virtual void FreeResources(bool immediately) {} diff --git a/xbmc/media/decoderfilter/DecoderFilterManager.cpp b/xbmc/media/decoderfilter/DecoderFilterManager.cpp index b9929414bd..3121ec9769 100644 --- a/xbmc/media/decoderfilter/DecoderFilterManager.cpp +++ b/xbmc/media/decoderfilter/DecoderFilterManager.cpp @@ -52,7 +52,7 @@ bool CDecoderFilter::isValid(const CDVDStreamInfo& streamInfo) const if ((flags & m_flags) != flags) return false; - // remove codec pitch for comparision + // remove codec pitch for comparison if (m_minHeight && (streamInfo.height & ~31) <= m_minHeight) return false; diff --git a/xbmc/messaging/ApplicationMessenger.h b/xbmc/messaging/ApplicationMessenger.h index a1c6b60d52..2024541f08 100644 --- a/xbmc/messaging/ApplicationMessenger.h +++ b/xbmc/messaging/ApplicationMessenger.h @@ -300,7 +300,7 @@ public: * \param [in,out] payload this is a void pointer that is meant to send larger objects to the receiver * what to send depends on the message * \param [in] strParam value depends on the message being sent, remains for backward compat - * \param [in] params value depends on the message being sent, kept for backward compatiblity + * \param [in] params value depends on the message being sent, kept for backward compatibility * \return meaning of the return varies based on the message */ int SendMsg(uint32_t messageId, int param1, int param2, void* payload, std::string strParam, std::vector<std::string> params); @@ -366,7 +366,7 @@ public: * \param [in,out] payload this is a void pointer that is meant to send larger objects to the receiver * what to send depends on the message * \param [in] strParam value depends on the message being sent, remains for backward compat - * \param [in] params value depends on the message being sent, kept for backward compatiblity + * \param [in] params value depends on the message being sent, kept for backward compatibility */ void PostMsg(uint32_t messageId, int param1, int param2, void* payload, std::string strParam, std::vector<std::string> params); diff --git a/xbmc/messaging/helpers/DialogHelper.h b/xbmc/messaging/helpers/DialogHelper.h index 5a660cfe3c..cf3d982502 100644 --- a/xbmc/messaging/helpers/DialogHelper.h +++ b/xbmc/messaging/helpers/DialogHelper.h @@ -65,7 +65,7 @@ DialogResponse ShowYesNoDialogText(CVariant heading, CVariant text, CVariant noL CVariant yesLabel = CVariant(), uint32_t autoCloseTimeout = 0); /*! -\brief This is a helper method to send a threadmessage to open a Yes/No dialog box with a cutom button +\brief This is a helper method to send a threadmessage to open a Yes/No dialog box with a custom button \param[in] heading The text to display as the dialog box header \param[in] text The text to display in the dialog body diff --git a/xbmc/music/Album.cpp b/xbmc/music/Album.cpp index 5f628b351b..efaa7acf68 100644 --- a/xbmc/music/Album.cpp +++ b/xbmc/music/Album.cpp @@ -78,11 +78,11 @@ void CAlbum::SetArtistCredits(const std::vector<std::string>& names, const std:: const std::vector<std::string> separators{ " feat. ", ";", ":", "|", "#", "/", ",", "&" }; // Establish tag consistency - // Do the number of musicbrainz ids and *both* number of names and number of hints mis-match? + // Do the number of musicbrainz ids and *both* number of names and number of hints mismatch? if (albumartistHints.size() != mbids.size() && names.size() != mbids.size()) { - // Tags mis-match - report it and then try to fix - CLog::Log(LOGDEBUG, "Mis-match in song file albumartist tags: {} mbid {} name album: {} {}", + // Tags mismatch - report it and then try to fix + CLog::Log(LOGDEBUG, "Mismatch in song file albumartist tags: {} mbid {} name album: {} {}", (int)mbids.size(), (int)names.size(), strAlbum, strArtistDesc); /* Most likely we have no hints and a single artist name like "Artist1 feat. Artist2" @@ -95,7 +95,7 @@ void CAlbum::SetArtistCredits(const std::vector<std::string>& names, const std:: musicbrainz so ignore them but raise warning. */ - // Do hints exist yet mis-match + // Do hints exist yet mismatch if (!albumartistHints.empty() && albumartistHints.size() != mbids.size()) { if (names.size() == mbids.size()) @@ -109,10 +109,10 @@ void CAlbum::SetArtistCredits(const std::vector<std::string>& names, const std:: // Extra hints, discard them. albumartistHints.resize(mbids.size()); } - // Do hints not exist or still mis-match, try album artists + // Do hints not exist or still mismatch, try album artists if (albumartistHints.size() != mbids.size()) albumartistHints = names; - // Still mis-match, try splitting the hints (now artists) until have matching number + // Still mismatch, try splitting the hints (now artists) until have matching number if (albumartistHints.size() < mbids.size()) albumartistHints = StringUtils::SplitMulti(albumartistHints, separators, mbids.size()); // Try matching on artists or artist hints field, if it is reliable @@ -142,7 +142,7 @@ void CAlbum::SetArtistCredits(const std::vector<std::string>& names, const std:: } else { // Either hints or album artists (or both) name matches number of musicbrainz id - // If hints mis-match, use album artists + // If hints mismatch, use album artists if (albumartistHints.size() != mbids.size()) albumartistHints = names; } @@ -216,9 +216,9 @@ void CAlbum::MergeScrapedAlbum(const CAlbum& source, bool override /* = true */) 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 + When overwriting 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 + database including album artist credits, song artist credits and song titles. However it is only appropriate when the music files are tagged with mbids, these are taken as definative, scraped mbids can not be depended on in this way. @@ -250,7 +250,7 @@ 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 artist name. - When overwritting the data derived from tags, AND the original and scraped album have the same + When overwriting 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 (providing they are not empty). @@ -321,7 +321,7 @@ void CAlbum::MergeScrapedAlbum(const CAlbum& source, bool override /* = true */) iVotes = source.iVotes; /* - When overwritting the data derived from tags, AND the original and scraped album have the same + When overwriting 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 artist credits. */ @@ -381,7 +381,7 @@ const std::string CAlbum::GetAlbumArtistString() const const std::string CAlbum::GetAlbumArtistSort() const { - //The stored artist sort name string takes precidence but a + //The stored artist sort name string takes precedence but a //value could be created from individual sort names held in artistcredits if (!strArtistSort.empty()) return strArtistSort; diff --git a/xbmc/music/GUIViewStateMusic.cpp b/xbmc/music/GUIViewStateMusic.cpp index 792cab1d77..8fcb4c1777 100644 --- a/xbmc/music/GUIViewStateMusic.cpp +++ b/xbmc/music/GUIViewStateMusic.cpp @@ -245,7 +245,7 @@ CGUIViewStateMusicDatabase::CGUIViewStateMusicDatabase(const CFileItemList& item AddSortMethod(SortByArtistThenYear, sortAttribute, 578, LABEL_MASKS("%A - %T", "%Y")); // Artist, Title, Year| empty, empty AddSortMethod(SortByTitle, sortAttribute, 556, LABEL_MASKS("%T - %A", "%D")); // Title, Artist, Duration| empty, empty AddSortMethod(SortByLabel, sortAttribute, 551, LABEL_MASKS(strTrack, "%D")); - AddSortMethod(SortByTime, 180, LABEL_MASKS("%T - %A", "%D")); // Titel, Artist, Duration| empty, empty + AddSortMethod(SortByTime, 180, LABEL_MASKS("%T - %A", "%D")); // Title, Artist, Duration| empty, empty AddSortMethod(SortByRating, 563, LABEL_MASKS("%T - %A", "%R")); // Title - Artist, Rating AddSortMethod(SortByUserRating, 38018, LABEL_MASKS("%T - %A", "%r")); // Title - Artist, UserRating AddSortMethod(SortByYear, 562, LABEL_MASKS("%T - %A", "%Y")); // Title, Artist, Year @@ -274,7 +274,7 @@ CGUIViewStateMusicDatabase::CGUIViewStateMusicDatabase(const CFileItemList& item AddSortMethod(SortByArtist, sortAttribute, 557, LABEL_MASKS("%A - %T", "%D")); // Artist, Title, Duration| empty, empty AddSortMethod(SortByArtistThenYear, sortAttribute, 578, LABEL_MASKS("%A - %T", "%Y")); // Artist, Title, Year| empty, empty AddSortMethod(SortByLabel, sortAttribute, 551, LABEL_MASKS(strTrack, "%D")); - AddSortMethod(SortByTime, 180, LABEL_MASKS("%T - %A", "%D")); // Titel, Artist, Duration| empty, empty + AddSortMethod(SortByTime, 180, LABEL_MASKS("%T - %A", "%D")); // Title, Artist, Duration| empty, empty AddSortMethod(SortByRating, 563, LABEL_MASKS("%T - %A", "%R")); // Title - Artist, Rating AddSortMethod(SortByUserRating, 38018, LABEL_MASKS("%T - %A", "%r")); // Title - Artist, UserRating AddSortMethod(SortByYear, 562, LABEL_MASKS("%T - %A", "%Y")); // Title, Artist, Year @@ -361,16 +361,16 @@ CGUIViewStateMusicSmartPlaylist::CGUIViewStateMusicSmartPlaylist(const CFileItem std::string strTrack=settings->GetString(CSettings::SETTING_MUSICFILES_TRACKFORMAT); AddSortMethod(SortByTrackNumber, 554, LABEL_MASKS(strTrack, "%D")); // Userdefined, Duration| empty, empty AddSortMethod(SortByTitle, sortAttribute, 556, LABEL_MASKS("%T - %A", "%D")); // Title, Artist, Duration| empty, empty - AddSortMethod(SortByAlbum, sortAttribute, 558, LABEL_MASKS("%B - %T - %A", "%D")); // Album, Titel, Artist, Duration| empty, empty - AddSortMethod(SortByArtist, sortAttribute, 557, LABEL_MASKS("%A - %T", "%D")); // Artist, Titel, Duration| empty, empty - AddSortMethod(SortByArtistThenYear, sortAttribute, 578, LABEL_MASKS("%A - %T", "%Y")); // Artist, Titel, Year| empty, empty + AddSortMethod(SortByAlbum, sortAttribute, 558, LABEL_MASKS("%B - %T - %A", "%D")); // Album, Title, Artist, Duration| empty, empty + AddSortMethod(SortByArtist, sortAttribute, 557, LABEL_MASKS("%A - %T", "%D")); // Artist, Title, Duration| empty, empty + AddSortMethod(SortByArtistThenYear, sortAttribute, 578, LABEL_MASKS("%A - %T", "%Y")); // Artist, Title, Year| empty, empty AddSortMethod(SortByLabel, sortAttribute, 551, LABEL_MASKS(strTrack, "%D")); - AddSortMethod(SortByTime, 180, LABEL_MASKS("%T - %A", "%D")); // Titel, Artist, Duration| empty, empty - AddSortMethod(SortByRating, 563, LABEL_MASKS("%T - %A", "%R")); // Titel, Artist, Rating| empty, empty + AddSortMethod(SortByTime, 180, LABEL_MASKS("%T - %A", "%D")); // Title, Artist, Duration| empty, empty + AddSortMethod(SortByRating, 563, LABEL_MASKS("%T - %A", "%R")); // Title, Artist, Rating| empty, empty AddSortMethod(SortByUserRating, 38018, LABEL_MASKS("%T - %A", "%r")); // Title - Artist, UserRating AddSortMethod(SortByYear, 562, LABEL_MASKS("%T - %A", "%Y")); // Title, Artist, Year AddSortMethod(SortByDateAdded, 570, LABEL_MASKS("%T - %A", "%a")); // Title - Artist, DateAdded | empty, empty - AddSortMethod(SortByPlaycount, 567, LABEL_MASKS("%T - %A", "%V")); // Titel - Artist, PlayCount + AddSortMethod(SortByPlaycount, 567, LABEL_MASKS("%T - %A", "%V")); // Title - Artist, PlayCount if (!CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool( CSettings::SETTING_MUSICLIBRARY_USEORIGINALDATE)) AddSortMethod(SortByOrigDate, 38079, @@ -458,12 +458,12 @@ CGUIViewStateMusicPlaylist::CGUIViewStateMusicPlaylist(const CFileItemList& item AddSortMethod(SortByPlaylistOrder, 559, LABEL_MASKS(strTrack, "%D")); AddSortMethod(SortByTrackNumber, 554, LABEL_MASKS(strTrack, "%D")); // Userdefined, Duration| empty, empty AddSortMethod(SortByTitle, sortAttribute, 556, LABEL_MASKS("%T - %A", "%D")); // Title, Artist, Duration| empty, empty - AddSortMethod(SortByAlbum, sortAttribute, 558, LABEL_MASKS("%B - %T - %A", "%D")); // Album, Titel, Artist, Duration| empty, empty - AddSortMethod(SortByArtist, sortAttribute, 557, LABEL_MASKS("%A - %T", "%D")); // Artist, Titel, Duration| empty, empty - AddSortMethod(SortByArtistThenYear, sortAttribute, 578, LABEL_MASKS("%A - %T", "%Y")); // Artist, Titel, Year| empty, empty + AddSortMethod(SortByAlbum, sortAttribute, 558, LABEL_MASKS("%B - %T - %A", "%D")); // Album, Title, Artist, Duration| empty, empty + AddSortMethod(SortByArtist, sortAttribute, 557, LABEL_MASKS("%A - %T", "%D")); // Artist, Title, Duration| empty, empty + AddSortMethod(SortByArtistThenYear, sortAttribute, 578, LABEL_MASKS("%A - %T", "%Y")); // Artist, Title, Year| empty, empty AddSortMethod(SortByLabel, sortAttribute, 551, LABEL_MASKS(strTrack, "%D")); - AddSortMethod(SortByTime, 180, LABEL_MASKS("%T - %A", "%D")); // Titel - Artist, Duration| empty, empty - AddSortMethod(SortByRating, 563, LABEL_MASKS("%T - %A", "%R")); // Titel - Artist, Rating| empty, empty + AddSortMethod(SortByTime, 180, LABEL_MASKS("%T - %A", "%D")); // Title - Artist, Duration| empty, empty + AddSortMethod(SortByRating, 563, LABEL_MASKS("%T - %A", "%R")); // Title - Artist, Rating| empty, empty AddSortMethod(SortByUserRating, 38018, LABEL_MASKS("%T - %A", "%r")); // Title - Artist, UserRating SetSortMethod(SortByPlaylistOrder); const CViewState *viewState = CViewStateSettings::GetInstance().Get("musicfiles"); @@ -543,7 +543,7 @@ CGUIViewStateWindowMusicNav::CGUIViewStateWindowMusicNav(const CFileItemList& it AddSortMethod(SortByAlbum, sortAttribute, 558, LABEL_MASKS("%B - %T - %A", "%D")); // Album, Title, Artist, Duration| empty, empty AddSortMethod(SortByArtist, sortAttribute, 557, LABEL_MASKS("%A - %T", "%D")); // Artist, Title, Duration| empty, empty AddSortMethod(SortByArtistThenYear, sortAttribute, 578, LABEL_MASKS("%A - %T", "%Y")); // Artist(year), Title, Year| empty, empty - AddSortMethod(SortByTime, 180, LABEL_MASKS("%T - %A", "%D")); // Titel, Artist, Duration| empty, empty + AddSortMethod(SortByTime, 180, LABEL_MASKS("%T - %A", "%D")); // Title, Artist, Duration| empty, empty AddSortMethod(SortByYear, 562, LABEL_MASKS("%T - %A", "%Y")); // Title, Artist, Year SetSortMethod(SortByLabel); diff --git a/xbmc/music/MusicDatabase.cpp b/xbmc/music/MusicDatabase.cpp index 00beb70e02..c93ae58865 100644 --- a/xbmc/music/MusicDatabase.cpp +++ b/xbmc/music/MusicDatabase.cpp @@ -2540,7 +2540,7 @@ bool CMusicDatabase::AddSongGenres(int idSong, const std::vector<std::string>& g std::vector<std::string> modgenres = genres; for (auto& strGenre : modgenres) { - int idGenre = AddGenre(strGenre); // Genre string trimed and matched case insensitively + int idGenre = AddGenre(strGenre); // Genre string trimmed and matched case-insensitively strSQL = PrepareSQL("INSERT INTO song_genre (idGenre, idSong, iOrder) VALUES(%i,%i,%i)", idGenre, idSong, index++); if (!ExecuteQuery(strSQL)) @@ -2773,7 +2773,7 @@ bool CMusicDatabase::GetGenresByArtist(int idArtist, CFileItem* item) return false; if (m_pDS->num_rows() == 0) { - //No song genres, but query sucessfull + //No song genres, but query successful m_pDS->close(); return true; } @@ -2816,7 +2816,7 @@ bool CMusicDatabase::GetGenresByAlbum(int idAlbum, CFileItem* item) return false; if (m_pDS->num_rows() == 0) { - //No song genres, but query sucessfull + //No song genres, but query successful m_pDS->close(); return true; } @@ -4510,7 +4510,7 @@ int CMusicDatabase::Cleanup(CGUIDialogProgress* progressDialog /*= nullptr*/) ret = ERROR_REORG_ARTIST; goto error; } - //Genres, roles and info settings progess in one step + //Genres, roles and info settings progress in one step if (progressDialog) { progressDialog->SetLine(1, CVariant{322}); @@ -6556,7 +6556,7 @@ bool CMusicDatabase::GetArtistsByWhereJSON( extFilter.AppendField(JSONtoDBArtist[0].fieldDB); dbfieldindex.emplace_back(0); // Output "artist" - // Check each otional artist db field that could be retrieved (not "artist") + // Check each optional artist db field that could be retrieved (not "artist") for (unsigned int i = 1; i < NUM_ARTIST_FIELDS; i++) { bool foundJSON = fields.find(JSONtoDBArtist[i].fieldJSON) != fields.end(); @@ -7268,7 +7268,7 @@ bool CMusicDatabase::GetAlbumsByWhereJSON( if (fields.find(JSONtoDBAlbum[0].fieldJSON) != fields.end()) dbfieldindex.emplace_back(0); // Output "title" else - dbfieldindex.emplace_back(-1); // fetch but not outout + dbfieldindex.emplace_back(-1); // fetch but not output // Check each optional album db field that could be retrieved (not label) for (unsigned int i = 1; i < NUM_ALBUM_FIELDS; i++) @@ -8310,7 +8310,7 @@ std::string CMusicDatabase::AlphanumericSortSQL(const std::string& strField, Use custom collation ALPHANUM in SQLite. This handles natural number order, case sensitivity and locale UFT-8 order for accents using the same functionality as fileitem list sorting. Natural number order is not significant for where clause comparison and use of calculated fields - means there is no advantage in defining as column defualt in table create than per query (which + means there is no advantage in defining as column default in table create than per query (which also makes looking at the db with other tools difficult). MySQL does not have callback collation, but all tables are defined with utf8_general_ci an @@ -9262,7 +9262,7 @@ void CMusicDatabase::UpdateTables(int version) "bScrapedMBID INTEGER NOT NULL DEFAULT 0, " "idInfoSetting INTEGER NOT NULL DEFAULT 0, " "dateAdded TEXT, dateNew TEXT, dateModified TEXT)"); - // Concatentate fanart URLs into strImage field + // Concatenate fanart URLs into strImage field // Prepare SQL to convert CONCAT to || in SQLite m_pDS->exec(PrepareSQL("INSERT INTO artist_new " "(idArtist, strArtist, strMusicBrainzArtistID, " @@ -9287,7 +9287,7 @@ void CMusicDatabase::UpdateTables(int version) m_pDS->exec("DROP TABLE artist"); m_pDS->exec("ALTER TABLE artist_new RENAME TO artist"); } - // Set the verion of tag scanning required. + // Set the version 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 @@ -9533,7 +9533,7 @@ bool CMusicDatabase::GetAlbumPaths(int idAlbum, std::vector<std::pair<std::strin // 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 // deliberate file organisation, or (more likely) because of a tagging error in album name - // or Musicbrainzalbumid. Thus it avoids finding somme generic music path. + // or Musicbrainzalbumid. Thus it avoids finding some generic music path. strSQL = PrepareSQL("SELECT DISTINCT strPath, song.idPath FROM song " "JOIN path ON song.idPath = path.idPath " "WHERE song.idAlbum = %ld " @@ -10234,7 +10234,7 @@ bool CMusicDatabase::GetSources(CFileItemList& items) } // Get data from returned rows - // Item has source ID in MusicInfotag, multipath in path, and indiviual paths in property + // Item has source ID in MusicInfotag, multipath in path, and individual paths in property CVariant sourcePaths(CVariant::VariantTypeArray); int idSource = -1; while (!m_pDS->eof()) @@ -10315,7 +10315,7 @@ bool CMusicDatabase::GetSourcesByArtist(int idArtist, CFileItem* item) return false; if (m_pDS->num_rows() == 0) { - //No sources, but query sucessfull + //No sources, but query successful m_pDS->close(); return true; } @@ -11898,7 +11898,7 @@ void CMusicDatabase::ExportToXML(const CLibExportSettings& settings, if (settings.m_artwork) { // Save art in album folder - // Note thumb resoluton may be lower than original when overwriting + // Note thumb resolution may be lower than original when overwriting std::map<std::string, std::string> artwork; std::string savedArtfile; if (GetArtForItem(album.idAlbum, MediaTypeAlbum, artwork)) @@ -13112,7 +13112,7 @@ int CMusicDatabase::GetOrderFilter(const std::string& type, filter.AppendField(sortSQL); // Add artistsortname as scalar query field iFieldsAdded++; } - // Natural number case insensitve sort + // Natural number case-insensitive sort filter.AppendOrder(AlphanumericSortSQL(name, sorting.sortOrder)); } else if (StringUtils::EndsWith(name, "strAlbum") || StringUtils::EndsWith(name, "strTitle")) @@ -13124,11 +13124,11 @@ int CMusicDatabase::GetOrderFilter(const std::string& type, filter.AppendField(sortSQL); // Add sortname as scalar query field iFieldsAdded++; } - // Natural number case insensitve sort + // Natural number case-insensitive sort filter.AppendOrder(AlphanumericSortSQL(name, sorting.sortOrder)); } else if (StringUtils::EndsWith(name, "strGenres")) - // Natural number case insensitve sort + // Natural number case-insensitive sort filter.AppendOrder(AlphanumericSortSQL(name, sorting.sortOrder)); else filter.AppendOrder(name + DESC); diff --git a/xbmc/music/MusicDatabase.h b/xbmc/music/MusicDatabase.h index fce7fe93d7..9b6f188284 100644 --- a/xbmc/music/MusicDatabase.h +++ b/xbmc/music/MusicDatabase.h @@ -178,7 +178,7 @@ public: \param song [in/out] the song to update, artist ids are returned in artist credits \param bArtists to update artist credits and contributors, default is true \param bArtists to check and log if artist links have changed, default is true - \return true if sucessfull + \return true if successful */ bool UpdateSong(CSong& song, bool bArtists = true, bool bArtistLinks = true); @@ -957,7 +957,7 @@ private: const std::string& strField, const std::string& strSortField); - /*! \brief Build SQL for sorting field naturally and case insensitvely (in SQLite). + /*! \brief Build SQL for sorting field naturally and case-insensitively (in SQLite). \param strField field name \param sortOrder the sort order \return SQL string e.g. @@ -973,7 +973,7 @@ private: /*! \brief Initially fills source table from sources.xml for use only at migration of db from an earlier version than 72 - returns true when successfuly done + returns true when successfully done */ bool MigrateSources(); diff --git a/xbmc/music/MusicUtils.cpp b/xbmc/music/MusicUtils.cpp index c8bb5e9349..b0c09cb849 100644 --- a/xbmc/music/MusicUtils.cpp +++ b/xbmc/music/MusicUtils.cpp @@ -196,7 +196,7 @@ namespace MUSIC_UTILS } } - // Add art types currently assigned to to the media item + // Add art types currently assigned to the media item void AddCurrentArtTypes(std::vector<std::string>& artTypes, const CMusicInfoTag& tag, CMusicDatabase& db) { diff --git a/xbmc/music/MusicUtils.h b/xbmc/music/MusicUtils.h index 5c395bcc88..d4f4c9e572 100644 --- a/xbmc/music/MusicUtils.h +++ b/xbmc/music/MusicUtils.h @@ -16,7 +16,7 @@ namespace MUSIC_UTILS 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. + in the list, as well as returned as the selected art type. \param artitems [in/out] a fileitem list to display \return the selected art type e.g. "fanart" or empty string when cancelled. \sa FillArtTypesList @@ -67,7 +67,7 @@ namespace MUSIC_UTILS std::vector<std::string> GetArtTypesToScan(const MediaType& mediaType); /*! \brief Validate string is acceptable as the name of an additional art type - - limited length, and ascii alphanumberic charaters only + - limited length, and ascii alphanumberic characters only \param potentialArtType [in] potential art type name \return true if the art type is valid */ diff --git a/xbmc/music/Song.cpp b/xbmc/music/Song.cpp index fa1803ada8..1aed76a895 100644 --- a/xbmc/music/Song.cpp +++ b/xbmc/music/Song.cpp @@ -99,8 +99,8 @@ void CSong::SetArtistCredits(const std::vector<std::string>& names, const std::v // Establish tag consistency - do the number of musicbrainz ids and number of names in hints or artist match if (mbids.size() != artistHints.size() && mbids.size() != names.size()) { - // Tags mis-match - report it and then try to fix - CLog::Log(LOGDEBUG, "Mis-match in song file tags: {} mbid {} names {} {}", (int)mbids.size(), + // Tags mismatch - report it and then try to fix + CLog::Log(LOGDEBUG, "Mismatch in song file tags: {} mbid {} names {} {}", (int)mbids.size(), (int)names.size(), strTitle, strArtistDesc); /* Most likely we have no hints and a single artist name like "Artist1 feat. Artist2" @@ -112,7 +112,7 @@ void CSong::SetArtistCredits(const std::vector<std::string>& names, const std::v separators so attempt to split them. Or we could have more hints or artist names than musicbrainz id so ignore them but raise warning. */ - // Do hints exist yet mis-match + // Do hints exist yet mismatch if (artistHints.size() > 0 && artistHints.size() != mbids.size()) { @@ -127,10 +127,10 @@ void CSong::SetArtistCredits(const std::vector<std::string>& names, const std::v // Extra hints, discard them. artistHints.resize(mbids.size()); } - // Do hints not exist or still mis-match, try artists + // Do hints not exist or still mismatch, try artists if (artistHints.size() != mbids.size()) artistHints = names; - // Still mis-match, try splitting the hints (now artists) until have matching number + // Still mismatch, try splitting the hints (now artists) until have matching number if (artistHints.size() < mbids.size()) { artistHints = StringUtils::SplitMulti(artistHints, separators, mbids.size()); @@ -138,7 +138,7 @@ void CSong::SetArtistCredits(const std::vector<std::string>& names, const std::v } else { // Either hints or artist names (or both) matches number of musicbrainz id - // If hints mis-match, use artists + // If hints mismatch, use artists if (artistHints.size() != mbids.size()) artistHints = names; } @@ -300,7 +300,7 @@ const std::vector<std::string> CSong::GetArtist() const const std::string CSong::GetArtistSort() const { - //The stored artist sort name string takes precidence but a + //The stored artist sort name string takes precedence but a //value could be created from individual sort names held in artistcredits if (!strArtistSort.empty()) return strArtistSort; diff --git a/xbmc/music/Song.h b/xbmc/music/Song.h index 11d15639a1..3fc127a60f 100644 --- a/xbmc/music/Song.h +++ b/xbmc/music/Song.h @@ -120,7 +120,7 @@ public: void AppendArtistRole(const CMusicRole& musicRole); /*! \brief Set album artist vector. - Album artist is held local to song until album created for inital processing only. + Album artist is held local to song until album created for initial 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 */ diff --git a/xbmc/music/dialogs/GUIDialogMusicInfo.cpp b/xbmc/music/dialogs/GUIDialogMusicInfo.cpp index 9dc22c8a88..51af3666a1 100644 --- a/xbmc/music/dialogs/GUIDialogMusicInfo.cpp +++ b/xbmc/music/dialogs/GUIDialogMusicInfo.cpp @@ -446,7 +446,7 @@ bool CGUIDialogMusicInfo::SetItem(CFileItem* item) // In a separate job fetch info and fill list of art types. int jobid = CJobManager::GetInstance().AddJob(new CGetInfoJob(), nullptr, CJob::PRIORITY_LOW); - // Wait to get all data before show, allowing user to to cancel if fetch is slow + // Wait to get all data before show, allowing user to cancel if fetch is slow if (!CGUIDialogBusy::WaitOnEvent(m_event, TIME_TO_BUSY_DIALOG)) { // Cancel job still waiting in queue (unlikely) @@ -618,7 +618,7 @@ void CGUIDialogMusicInfo::RefreshInfo() return; } - // Show message when scraper was unsuccesfull + // Show message when scraper was unsuccessful if (!HasScrapedInfo()) { if (m_bArtistInfo) diff --git a/xbmc/music/dialogs/GUIDialogSongInfo.cpp b/xbmc/music/dialogs/GUIDialogSongInfo.cpp index 405ae25d08..0d583e9bbb 100644 --- a/xbmc/music/dialogs/GUIDialogSongInfo.cpp +++ b/xbmc/music/dialogs/GUIDialogSongInfo.cpp @@ -138,7 +138,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 - // do not show on screen until refresh() that fetchs the list from scratch, sorts etc. + // 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_song); CServiceBroker::GetGUI()->GetWindowManager().SendMessage(msg); } @@ -283,7 +283,7 @@ bool CGUIDialogSongInfo::SetSong(CFileItem* item) // 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 + // Wait to get all data before show, allowing user to cancel if fetch is slow if (!CGUIDialogBusy::WaitOnEvent(m_event, TIME_TO_BUSY_DIALOG)) { // Cancel job still waiting in queue (unlikely) diff --git a/xbmc/music/infoscanner/MusicInfoScanner.cpp b/xbmc/music/infoscanner/MusicInfoScanner.cpp index 41e297ccd9..4d9f3ed9ec 100644 --- a/xbmc/music/infoscanner/MusicInfoScanner.cpp +++ b/xbmc/music/infoscanner/MusicInfoScanner.cpp @@ -849,7 +849,7 @@ void CMusicInfoScanner::FileItemsToAlbums(CFileItemList& items, VECALBUMS& album album artist as the artist with Musicbrainz ID 89ad4ac3-39f7-470e-963a-56509c546377. If adding this artist for the first time then the name will be set to either the primary artist read from tags when 3a, or the localized value for "various artists" when not 3a. - This means that tag values are no longer translated into the current langauge. + This means that tag values are no longer translated into the current language. */ album.artistCredits.emplace_back(various, VARIOUSARTISTS_MBID); else @@ -1347,7 +1347,7 @@ CMusicInfoScanner::UpdateDatabaseAlbumInfo(CAlbum& album, // Check album art. // Fill any gaps with local art files or use first available from scraped URL list (when it has - // been successfuly scraped) as controlled by whitelist. Do this even when no info added + // been successfully scraped) as controlled by whitelist. Do this even when no info added // (cancelled, not found or error), there may be new local art files. if (CServiceBroker::GetSettingsComponent()->GetSettings()->GetInt( CSettings::SETTING_MUSICLIBRARY_ARTWORKLEVEL) != @@ -1417,7 +1417,7 @@ CMusicInfoScanner::UpdateDatabaseArtistInfo(CArtist& artist, // Check artist art. // Fill any gaps with local art files, or use first available from scraped - // list (when it has been successfuly scraped). Do this even when no info + // list (when it has been successfully scraped). Do this even when no info // added (cancelled, not found or error), there may be new local art files. // Get individual artist subfolder within the Artist Information Folder m_musicDatabase.GetArtistPath(artist, artist.strPath); @@ -2169,7 +2169,7 @@ bool CMusicInfoScanner::AddLocalArtwork(std::map<std::string, std::string>& art, CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool( CSettings::SETTING_MUSICLIBRARY_USEALLLOCALART)); - // Not useall and empty whiltelist means no extra art is picked up from either place + // Not useall and empty whitelist means no extra art is picked up from either place if (!bUseAll && whitelistarttypes.empty()) return false; @@ -2260,7 +2260,7 @@ bool CMusicInfoScanner::AddRemoteArtwork(std::map<std::string, std::string>& art CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool( CSettings::SETTING_MUSICLIBRARY_USEALLREMOTEART)); - // not useall and empty whiltelist means no extra art is picked up from either place + // not useall and empty whitelist means no extra art is picked up from either place if (!bUseAll && whitelistarttypes.empty()) return false; diff --git a/xbmc/music/infoscanner/MusicInfoScanner.h b/xbmc/music/infoscanner/MusicInfoScanner.h index 4802c22ff5..d5d54701f8 100644 --- a/xbmc/music/infoscanner/MusicInfoScanner.h +++ b/xbmc/music/infoscanner/MusicInfoScanner.h @@ -170,7 +170,7 @@ protected: /*! \brief Add extra remote artwork for albums and artists This common utility fills the gaps in artwork using the first available art of each type from the - possibile art URL results of previous scraping. + possible art URL results of previous scraping. The art types applied are determined by whitelist and usealllocalart settings. \param art [in/out] map of art type and file location (URL or path) pairs \param mediaType [in] artist or album @@ -183,7 +183,7 @@ protected: /*! \brief Add art for an artist This scans the given folder for local art and/or applies the first available art of each type - from the possibile art URLs previously scraped. Art is added to any already stored by previous + from the possible art URLs previously scraped. Art is added to any already stored by previous scanning etc.The art types processed are determined by whitelist and other art settings. When usealllocalart is enabled then all local image files are applied as art (providing name is valid for an art type), and then the URL list of remote art is checked adding the first available @@ -197,7 +197,7 @@ protected: /*! \brief Add art for an album This scans the album folder, and any disc set subfolders, for local art and/or applies the first - available art of each type from the possibile art URLs previously scraped. Only those subfolders + available art of each type from the possible art URLs previously scraped. Only those subfolders beneath the album folder containing music files tagged with same unique disc number are scanned. Art is added to any already stored by previous scanning, only "thumb" is optionally replaced. The art types processed are determined by whitelist and other art settings. When usealllocalart is diff --git a/xbmc/music/tags/MusicInfoTag.cpp b/xbmc/music/tags/MusicInfoTag.cpp index 305ec8f119..62548bf5d5 100644 --- a/xbmc/music/tags/MusicInfoTag.cpp +++ b/xbmc/music/tags/MusicInfoTag.cpp @@ -169,7 +169,7 @@ std::string CMusicInfoTag::GetYearString() const { /* Get year as YYYY from release or original dates depending on setting This is how GUI and by year sorting swiches to using original year. - For ripper and non-library items (libray entries have both values): + For ripper and non-library items (library entries have both values): when release date missing try to fallback to original date when original date missing use release date */ @@ -795,7 +795,7 @@ void CMusicInfoTag::SetArtist(const CArtist& artist) void CMusicInfoTag::SetAlbum(const CAlbum& album) { Clear(); - //Set all artist infomation from album artist credits and artist description + //Set all artist information from album artist credits and artist description SetArtistDesc(album.GetAlbumArtistString()); SetArtist(album.GetAlbumArtist()); SetArtistSort(album.GetAlbumArtistSort()); @@ -839,7 +839,7 @@ void CMusicInfoTag::SetSong(const CSong& song) Clear(); SetTitle(song.strTitle); SetGenre(song.genre); - /* Set all artist infomation from song artist credits and artist description. + /* Set all artist information from song artist credits and artist description. During processing e.g. Cue Sheets, song may only have artist description string rather than a fully populated artist credits vector. */ diff --git a/xbmc/music/windows/GUIWindowMusicBase.cpp b/xbmc/music/windows/GUIWindowMusicBase.cpp index 6d821e9160..cb40f476ba 100644 --- a/xbmc/music/windows/GUIWindowMusicBase.cpp +++ b/xbmc/music/windows/GUIWindowMusicBase.cpp @@ -1105,7 +1105,7 @@ void CGUIWindowMusicBase::OnInitWindow() { CGUIMediaWindow::OnInitWindow(); // Prompt for rescan of library to read music file tags that were not processed by previous versions - // and accomodate any changes to the way some tags are processed + // and accommodate any changes to the way some tags are processed if (m_musicdatabase.GetMusicNeedsTagScan() != 0) { if (CServiceBroker::GetGUI() diff --git a/xbmc/music/windows/GUIWindowMusicNav.cpp b/xbmc/music/windows/GUIWindowMusicNav.cpp index e39e9fa6d9..f117173f7b 100644 --- a/xbmc/music/windows/GUIWindowMusicNav.cpp +++ b/xbmc/music/windows/GUIWindowMusicNav.cpp @@ -261,7 +261,7 @@ bool CGUIWindowMusicNav::ManageInfoProvider(const CFileItemPtr& item) 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 current view. std::string strPath = "musicdb://"; if (content == CONTENT_ARTISTS) strPath += "artists"; @@ -296,7 +296,7 @@ bool CGUIWindowMusicNav::ManageInfoProvider(const CFileItemPtr& item) else settings->SetString(CSettings::SETTING_MUSICLIBRARY_ALBUMSSCRAPER, scraper->ID()); settings->Save(); - // Clear all item specifc settings + // Clear all item specific settings if (content == CONTENT_ARTISTS) result = m_musicdatabase.SetScraperAll("musicdb://artists/", nullptr); else @@ -897,7 +897,7 @@ void CGUIWindowMusicNav::AddSearchFolder() } if (!haveSearchSource && needSearchSource) { - // add earch share + // add search share CMediaSource share; share.strName=g_localizeStrings.Get(137); // Search share.strPath = "musicsearch://"; diff --git a/xbmc/network/WakeOnAccess.cpp b/xbmc/network/WakeOnAccess.cpp index dd7f211fb4..5145897dfd 100644 --- a/xbmc/network/WakeOnAccess.cpp +++ b/xbmc/network/WakeOnAccess.cpp @@ -48,7 +48,7 @@ #define DEFAULT_TIMEOUT_SEC (5*60) // at least 5 minutes between each magic packets #define DEFAULT_WAIT_FOR_ONLINE_SEC_1 (40) // wait at 40 seconds after sending magic packet #define DEFAULT_WAIT_FOR_ONLINE_SEC_2 (40) // same for extended wait -#define DEFAULT_WAIT_FOR_SERVICES_SEC (5) // wait 5 seconds after host go online to launch file sharing deamons +#define DEFAULT_WAIT_FOR_SERVICES_SEC (5) // wait 5 seconds after host go online to launch file sharing daemons static CDateTime upnpInitReady; @@ -471,7 +471,7 @@ bool CWakeOnAccess::WakeUpHost(const std::string& hostName, const std::string& c if (FindOrTouchHostEntry(hostName, upnpMode, server)) { - CLog::Log(LOGINFO, "WakeOnAccess [{}] trigged by accessing : {}", server.friendlyName, + CLog::Log(LOGINFO, "WakeOnAccess [{}] triggered by accessing : {}", server.friendlyName, customMessage); NestDetect nesting ; // detect recursive calls on gui thread.. @@ -551,7 +551,7 @@ bool CWakeOnAccess::WakeUpHost(const WakeUpEntry& server) // we have ping response ; just add extra wait-for-services before returning if requested { - WaitCondition waitObj ; // wait uninterruptable fixed time for services .. + WaitCondition waitObj ; // wait uninterruptible fixed time for services .. dlg.ShowAndWait (waitObj, server.wait_services_sec, LOCALIZED(13032)); @@ -624,7 +624,7 @@ static void AddHost (const std::string& host, std::vector<std::string>& hosts) { for (const auto& it : hosts) if (StringUtils::EqualsNoCase(host, it)) - return; // allready there .. + return; // already there .. if (!host.empty()) hosts.push_back(host); diff --git a/xbmc/network/WebServer.cpp b/xbmc/network/WebServer.cpp index ef2c43a3ed..29ed4c20fa 100644 --- a/xbmc/network/WebServer.cpp +++ b/xbmc/network/WebServer.cpp @@ -75,7 +75,7 @@ CWebServer::CWebServer() pthread_attr_getstack(&attr, &stack_addr, &m_thread_stacksize); pthread_attr_destroy(&attr); // double the stack size under darwin, not sure why yet - // but it stoped crashing using Kodi iOS remote -> play video. + // but it stopped crashing using Kodi iOS remote -> play video. // non-darwin will pass a value of zero which means 'system default' m_thread_stacksize *= 2; m_logger->debug("increasing thread stack to {}", m_thread_stacksize); diff --git a/xbmc/network/Zeroconf.h b/xbmc/network/Zeroconf.h index dac1c82dfc..f91f0fc3c3 100644 --- a/xbmc/network/Zeroconf.h +++ b/xbmc/network/Zeroconf.h @@ -74,7 +74,7 @@ public: static CZeroconf* GetInstance(); // release the singleton; (save to call multiple times) static void ReleaseInstance(); - // returns false if ReleaseInstance() was called befores + // returns false if ReleaseInstance() was called before static bool IsInstantiated() { return smp_instance != 0; } // win32: process results from the bonjour daemon virtual void ProcessResults() {} diff --git a/xbmc/network/ZeroconfBrowser.h b/xbmc/network/ZeroconfBrowser.h index a73e5c8c16..5979e34186 100644 --- a/xbmc/network/ZeroconfBrowser.h +++ b/xbmc/network/ZeroconfBrowser.h @@ -111,7 +111,7 @@ public: static CZeroconfBrowser* GetInstance(); // release the singleton; (save to call multiple times) static void ReleaseInstance(); - // returns false if ReleaseInstance() was called befores + // returns false if ReleaseInstance() was called before static bool IsInstantiated() { return smp_instance != 0; } virtual void ProcessResults() {} diff --git a/xbmc/network/upnp/UPnPInternal.cpp b/xbmc/network/upnp/UPnPInternal.cpp index 2e5aa5f879..4679d1f0ed 100644 --- a/xbmc/network/upnp/UPnPInternal.cpp +++ b/xbmc/network/upnp/UPnPInternal.cpp @@ -675,7 +675,7 @@ BuildObject(CFileItem& item, { std::string preferredLanguage{"en"}; - /* trying to find subtitle with prefered language settings */ + /* trying to find subtitle with preferred language settings */ auto setting = settings->GetSetting("locale.subtitlelanguage"); if (!setting) CLog::Log(LOGERROR, "Failed to load setting for: {}", "locale.subtitlelanguage"); @@ -696,7 +696,7 @@ BuildObject(CFileItem& item, break; } } - /* if not found subtitle with prefered language, get the first one */ + /* if not found subtitle with preferred language, get the first one */ if (subtitlePath.empty()) { subtitlePath = subtitles[0]; diff --git a/xbmc/pictures/ExifParse.cpp b/xbmc/pictures/ExifParse.cpp index 30dc07aa66..e27942b571 100644 --- a/xbmc/pictures/ExifParse.cpp +++ b/xbmc/pictures/ExifParse.cpp @@ -15,7 +15,7 @@ //-------------------------------------------------------------------------- // Note: Jhead supports TAG_MAKER_NOTE exif field, -// but that is ommited for now - to make porting easier and addition smaller +// but that is omitted for now - to make porting easier and addition smaller #include "ExifParse.h" diff --git a/xbmc/pictures/JpegParse.cpp b/xbmc/pictures/JpegParse.cpp index ea38cb85f9..718ac5426a 100644 --- a/xbmc/pictures/JpegParse.cpp +++ b/xbmc/pictures/JpegParse.cpp @@ -123,7 +123,7 @@ bool CJpegParse::GetSection (CFile& infile, const unsigned short sectionLength) //-------------------------------------------------------------------------- // Deallocate memory allocated in GetSection. This function must always -// be paired by a preceeding GetSection call. +// be paired by a preceding GetSection call. //-------------------------------------------------------------------------- void CJpegParse::ReleaseSection (void) { @@ -245,7 +245,7 @@ bool CJpegParse::ExtractInfo (CFile& infile) case M_JFIF: // Regular jpegs always have this tag, exif images have the exif - // marker instead, althogh ACDsee will write images with both markers. + // marker instead, although ACDsee will write images with both markers. // this program will re-create this marker on absence of exif marker. // hence no need to keep the copy from the file. // fall through to default case diff --git a/xbmc/platform/android/filesystem/AndroidAppFile.cpp b/xbmc/platform/android/filesystem/AndroidAppFile.cpp index 600405ff2b..2f12c81d12 100644 --- a/xbmc/platform/android/filesystem/AndroidAppFile.cpp +++ b/xbmc/platform/android/filesystem/AndroidAppFile.cpp @@ -135,7 +135,7 @@ unsigned int CFileAndroidApp::ReadIcon(unsigned char** lpBuf, unsigned int* widt if (info.stride != info.width * 4) { - CLog::Log(LOGWARNING, "CFileAndroidApp::ReadIcon: Usupported icon format {}", info.format); + CLog::Log(LOGWARNING, "CFileAndroidApp::ReadIcon: Unsupported icon format {}", info.format); return 0; } diff --git a/xbmc/platform/darwin/ios-common/DarwinEmbedNowPlayingInfoManager.mm b/xbmc/platform/darwin/ios-common/DarwinEmbedNowPlayingInfoManager.mm index 0a843ff253..ec2716b6e0 100644 --- a/xbmc/platform/darwin/ios-common/DarwinEmbedNowPlayingInfoManager.mm +++ b/xbmc/platform/darwin/ios-common/DarwinEmbedNowPlayingInfoManager.mm @@ -79,7 +79,7 @@ dict[MPNowPlayingInfoPropertyPlaybackQueueCount] = total; /*! @Todo additional properties? - other properities can be set: + other properties can be set: MPMediaItemPropertyAlbumTrackCount MPMediaItemPropertyComposer MPMediaItemPropertyDiscCount diff --git a/xbmc/platform/darwin/network/ZeroconfDarwin.cpp b/xbmc/platform/darwin/network/ZeroconfDarwin.cpp index 4ce35d7f72..51cc92d0d9 100644 --- a/xbmc/platform/darwin/network/ZeroconfDarwin.cpp +++ b/xbmc/platform/darwin/network/ZeroconfDarwin.cpp @@ -164,7 +164,7 @@ void CZeroconfDarwin::registerCallback(CFNetServiceRef theService, CFStreamError CZeroconfDarwin* p_this = reinterpret_cast<CZeroconfDarwin*>(info); switch(error->error) { case kCFNetServicesErrorCollision: - CLog::Log(LOGERROR, "CZeroconfDarwin::registerCallback name collision occured"); + CLog::Log(LOGERROR, "CZeroconfDarwin::registerCallback name collision occurred"); break; default: CLog::Log(LOGERROR, diff --git a/xbmc/platform/darwin/peripherals/Input_Gamecontroller.mm b/xbmc/platform/darwin/peripherals/Input_Gamecontroller.mm index 001b4396ec..1046b59866 100644 --- a/xbmc/platform/darwin/peripherals/Input_Gamecontroller.mm +++ b/xbmc/platform/darwin/peripherals/Input_Gamecontroller.mm @@ -47,7 +47,7 @@ struct PlayerControllerState CCriticalSection m_controllerMutex; } -#pragma mark - Notificaton Observer +#pragma mark - Notification Observer - (void)addModeSwitchObserver { diff --git a/xbmc/platform/darwin/tvos/TVOSDisplayManager.mm b/xbmc/platform/darwin/tvos/TVOSDisplayManager.mm index be413ff7af..0134ee192f 100644 --- a/xbmc/platform/darwin/tvos/TVOSDisplayManager.mm +++ b/xbmc/platform/darwin/tvos/TVOSDisplayManager.mm @@ -181,7 +181,7 @@ // when isDisplayModeSwitchInProgress == NO, we have switched // and stablized. We might have switched to some other // rate than what we requested. setting preferredDisplayCriteria is - // only a request. For example, 30Hz might only be avaliable in HDR + // only a request. For example, 30Hz might only be available in HDR // and asking for 30Hz/SDR might result in 60Hz/SDR and // g_graphicsContext.SetFPS needs the actual refresh rate. refreshRate = [self getDisplayRate]; diff --git a/xbmc/platform/darwin/tvos/XBMCApplication.mm b/xbmc/platform/darwin/tvos/XBMCApplication.mm index eb0b2e1048..f0d71523ca 100644 --- a/xbmc/platform/darwin/tvos/XBMCApplication.mm +++ b/xbmc/platform/darwin/tvos/XBMCApplication.mm @@ -54,7 +54,7 @@ { // This function occurs: // * on the first start of Kodi - // * when Kodi has been activated after a beeing suspending by applicationWillResignActive() + // * when Kodi has been activated after being suspended by applicationWillResignActive() // * when Kodi has been foregrounded after applicationDidEnterBackground() } diff --git a/xbmc/platform/darwin/tvos/filesystem/TVOSDirectory.cpp b/xbmc/platform/darwin/tvos/filesystem/TVOSDirectory.cpp index 7f7ac678d3..0463943505 100644 --- a/xbmc/platform/darwin/tvos/filesystem/TVOSDirectory.cpp +++ b/xbmc/platform/darwin/tvos/filesystem/TVOSDirectory.cpp @@ -69,7 +69,7 @@ bool CTVOSDirectory::GetDirectory(const CURL& url, CFileItemList& items) // The directory request will point to the right path '.../home/userdata/..' // so we ask for files in ending directory, if we get xml file paths back // then we are re-vectoring them to persistent storage and need to - // create CFileItems that will tranlate into CTVOSFile object later + // create CFileItems that will translate into CTVOSFile object later // when accessed. // GetDirectoryContents will return full paths diff --git a/xbmc/platform/linux/powermanagement/LogindUPowerSyscall.cpp b/xbmc/platform/linux/powermanagement/LogindUPowerSyscall.cpp index 9d8c5a387a..34eed6e41b 100644 --- a/xbmc/platform/linux/powermanagement/LogindUPowerSyscall.cpp +++ b/xbmc/platform/linux/powermanagement/LogindUPowerSyscall.cpp @@ -160,7 +160,7 @@ bool CLogindUPowerSyscall::LogindSetPowerState(const char *state) { CDBusMessage message(LOGIND_DEST, LOGIND_PATH, LOGIND_IFACE, state); // The user_interaction boolean parameters can be used to control - // wether PolicyKit should interactively ask the user for authentication + // whether PolicyKit should interactively ask the user for authentication // credentials if it needs to. message.AppendArgument(false); return message.SendSystem() != NULL; diff --git a/xbmc/platform/posix/XHandle.cpp b/xbmc/platform/posix/XHandle.cpp index 08583dc1ca..b45f8890a1 100644 --- a/xbmc/platform/posix/XHandle.cpp +++ b/xbmc/platform/posix/XHandle.cpp @@ -34,7 +34,7 @@ CXHandle::CXHandle(HandleType nType) CXHandle::CXHandle(const CXHandle &src) { - // we shouldnt get here EVER. however, if we do - try to make the best. copy what we can + // we shouldn't get here EVER. however, if we do - try to make the best. copy what we can // and most importantly - not share any pointer. CLog::Log(LOGWARNING, "{}, copy handle.", __FUNCTION__); diff --git a/xbmc/platform/posix/filesystem/SMBDirectory.cpp b/xbmc/platform/posix/filesystem/SMBDirectory.cpp index 751ec33cdf..7397469a81 100644 --- a/xbmc/platform/posix/filesystem/SMBDirectory.cpp +++ b/xbmc/platform/posix/filesystem/SMBDirectory.cpp @@ -155,7 +155,7 @@ bool CSMBDirectory::GetDirectory(const CURL& url, CFileItemList &items) struct stat info = {}; if ((m_flags & DIR_FLAG_NO_FILE_INFO)==0 && CServiceBroker::GetSettingsComponent()->GetAdvancedSettings()->m_sambastatfiles) { - // make sure we use the authenticated path wich contains any default username + // make sure we use the authenticated path which contains any default username const std::string strFullName = strAuth + smb.URLEncode(strFile); lock.Enter(); @@ -170,7 +170,7 @@ bool CSMBDirectory::GetDirectory(const CURL& url, CFileItemList &items) char value[20]; // We poll for extended attributes which symbolizes bits but split up into a string. Where 0x02 is hidden and 0x12 is hidden directory. - // According to the libsmbclient.h it's supposed to return 0 if ok, or the length of the string. It seems always to return the length wich is 4 + // According to the libsmbclient.h it's supposed to return 0 if ok, or the length of the string. It seems always to return the length which is 4 if (smbc_getxattr(strFullName.c_str(), "system.dos_attr.mode", value, sizeof(value)) > 0) { long longvalue = strtol(value, NULL, 16); diff --git a/xbmc/platform/posix/filesystem/SMBFile.cpp b/xbmc/platform/posix/filesystem/SMBFile.cpp index 834d89e60f..410146545b 100644 --- a/xbmc/platform/posix/filesystem/SMBFile.cpp +++ b/xbmc/platform/posix/filesystem/SMBFile.cpp @@ -281,7 +281,7 @@ std::string CSMB::URLEncode(const std::string &value) void CSMB::CheckIfIdle() { /* We check if there are open connections. This is done without a lock to not halt the mainthread. It should be thread safe as - worst case scenario is that m_OpenConnections could read 0 and then changed to 1 if this happens it will enter the if wich will lead to another check, wich is locked. */ + worst case scenario is that m_OpenConnections could read 0 and then changed to 1 if this happens it will enter the if which will lead to another check, which is locked. */ if (m_OpenConnections == 0) { /* I've set the the maximum IDLE time to be 1 min and 30 sec. */ CSingleLock lock(*this); @@ -318,7 +318,7 @@ void CSMB::AddIdleConnection() { CSingleLock lock(*this); m_OpenConnections--; - /* If we close a file we reset the idle timer so that we don't have any wierd behaviours if a user + /* If we close a file we reset the idle timer so that we don't have any weird behaviours if a user leaves the movie paused for a long while and then press stop */ m_IdleTimeout = 180; } diff --git a/xbmc/platform/posix/utils/SharedMemory.cpp b/xbmc/platform/posix/utils/SharedMemory.cpp index 01da366dc4..6c1318e936 100644 --- a/xbmc/platform/posix/utils/SharedMemory.cpp +++ b/xbmc/platform/posix/utils/SharedMemory.cpp @@ -61,7 +61,7 @@ CFileHandle CSharedMemory::Open() CFileHandle CSharedMemory::OpenMemfd() { #if defined(SYS_memfd_create) && defined(HAVE_LINUX_MEMFD) - // This is specific to Linux >= 3.17, but preffered over shm_create if available + // This is specific to Linux >= 3.17, but preferred over shm_create if available // because it is race-free int fd = syscall(SYS_memfd_create, "kodi", MFD_CLOEXEC); if (fd < 0) diff --git a/xbmc/platform/win10/Environment.cpp b/xbmc/platform/win10/Environment.cpp index 84565468a8..649a2993a7 100644 --- a/xbmc/platform/win10/Environment.cpp +++ b/xbmc/platform/win10/Environment.cpp @@ -7,7 +7,7 @@ */ /** - * \file platfrom\win10\Environment.cpp + * \file platform\win10\Environment.cpp * \brief Implements CEnvironment WinRT specified class functions. */ diff --git a/xbmc/platform/win10/Win10App.cpp b/xbmc/platform/win10/Win10App.cpp index d8f11d43e5..51dc1d17d6 100644 --- a/xbmc/platform/win10/Win10App.cpp +++ b/xbmc/platform/win10/Win10App.cpp @@ -78,7 +78,7 @@ void App::Run() { // 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 Preferred props bool fullscreen = ApplicationView::GetForCurrentView().IsFullScreenMode(); CAppParamParser appParamParser; diff --git a/xbmc/platform/win10/filesystem/WinLibraryFile.cpp b/xbmc/platform/win10/filesystem/WinLibraryFile.cpp index c9b8eb0779..c01cd7d041 100644 --- a/xbmc/platform/win10/filesystem/WinLibraryFile.cpp +++ b/xbmc/platform/win10/filesystem/WinLibraryFile.cpp @@ -338,7 +338,7 @@ bool CWinLibraryFile::OpenIntenal(const CURL &url, FileAccessMode mode) catch (const winrt::hresult_error& ex) { std::string error = FromW(ex.message().c_str()); - CLog::LogF(LOGERROR, "an exception occurs while openning a file '{}' (mode: {}) : {}", + CLog::LogF(LOGERROR, "an exception occurs while opening a file '{}' (mode: {}) : {}", url.GetRedacted(), mode == FileAccessMode::Read ? "r" : "rw", error); return false; } @@ -379,7 +379,7 @@ StorageFile CWinLibraryFile::GetFile(const CURL& url) winrt::hstring token = GetTokenFromList(url, list); if (token.empty()) { - // serach in MRU list + // search in MRU list list = StorageApplicationPermissions::MostRecentlyUsedList(); token = GetTokenFromList(url, list); } diff --git a/xbmc/platform/win32/dirent.h b/xbmc/platform/win32/dirent.h index aa3b2d6121..20e38d8d5c 100644 --- a/xbmc/platform/win32/dirent.h +++ b/xbmc/platform/win32/dirent.h @@ -537,7 +537,7 @@ dirent_next( /* Got a file */ p = &dirp->data; } else { - /* The very last entry has been processed or an error occured */ + /* The very last entry has been processed or an error occurred */ FindClose (dirp->handle); dirp->handle = INVALID_HANDLE_VALUE; p = NULL; diff --git a/xbmc/powermanagement/IPowerSyscall.h b/xbmc/powermanagement/IPowerSyscall.h index b3f215516c..f54186ed6f 100644 --- a/xbmc/powermanagement/IPowerSyscall.h +++ b/xbmc/powermanagement/IPowerSyscall.h @@ -27,7 +27,7 @@ class IPowerSyscall public: /**\brief Called by power manager to create platform power system adapter * - * This method used to create platfrom specified power system adapter + * This method used to create platform specified power system adapter */ static IPowerSyscall* CreateInstance(); static void RegisterPowerSyscall(CreatePowerSyscallFunc createFunc); diff --git a/xbmc/profiles/Profile.h b/xbmc/profiles/Profile.h index 9eb9d0d3c1..42d4fbaa04 100644 --- a/xbmc/profiles/Profile.h +++ b/xbmc/profiles/Profile.h @@ -59,7 +59,7 @@ public: bool canWriteSources() const { return m_bCanWriteSources; } bool hasAddons() const { return m_bAddons; } /** - \brief Returns wich settings levels are locked for the current profile + \brief Returns which settings levels are locked for the current profile \sa LOCK_LEVEL::SETTINGS_LOCK */ LOCK_LEVEL::SETTINGS_LOCK settingsLockLevel() const { return m_locks.settings; } diff --git a/xbmc/programs/GUIViewStatePrograms.cpp b/xbmc/programs/GUIViewStatePrograms.cpp index 2ca33fc4e9..722ad3ab8e 100644 --- a/xbmc/programs/GUIViewStatePrograms.cpp +++ b/xbmc/programs/GUIViewStatePrograms.cpp @@ -24,7 +24,7 @@ using namespace XFILE; CGUIViewStateWindowPrograms::CGUIViewStateWindowPrograms(const CFileItemList& items) : CGUIViewState(items) { - AddSortMethod(SortByLabel, 551, LABEL_MASKS("%K", "%I", "%L", ""), // Titel, Size | Foldername, empty + AddSortMethod(SortByLabel, 551, LABEL_MASKS("%K", "%I", "%L", ""), // Title, Size | Foldername, empty CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool(CSettings::SETTING_FILELISTS_IGNORETHEWHENSORTING) ? SortAttributeIgnoreArticle : SortAttributeNone); const CViewState *viewState = CViewStateSettings::GetInstance().Get("programs"); diff --git a/xbmc/pvr/addons/PVRClient.cpp b/xbmc/pvr/addons/PVRClient.cpp index 0db5c5a55e..3fbbc5e5d0 100644 --- a/xbmc/pvr/addons/PVRClient.cpp +++ b/xbmc/pvr/addons/PVRClient.cpp @@ -729,7 +729,7 @@ PVR_ERROR CPVRClient::SetEPGMaxFutureDays(int iFutureDays) // This class wraps an EPG_TAG (PVR Addon API struct) to ensure that the string members of // that struct, which are const char pointers, stay valid until the EPG_TAG gets destructed. // Please note that this struct is also used to transfer huge amount of EPG_TAGs from -// addon to Kodi. Thus, changing the struct to contain char arrays is not recommened, +// addon to Kodi. Thus, changing the struct to contain char arrays is not recommended, // because this would lead to huge amount of string copies when transferring epg data // from addon to Kodi. class CAddonEpgTag : public EPG_TAG diff --git a/xbmc/pvr/addons/PVRClient.h b/xbmc/pvr/addons/PVRClient.h index 582f52f071..df3f05dfb9 100644 --- a/xbmc/pvr/addons/PVRClient.h +++ b/xbmc/pvr/addons/PVRClient.h @@ -778,7 +778,7 @@ public: PVR_ERROR SeekLiveStream(int64_t iFilePosition, int iWhence, int64_t& iPosition); /*! - * @brief Get the lenght of the currently playing live stream, if any. + * @brief Get the length of the currently playing live stream, if any. * @param iLength The total length of the stream that's currently being read or -1 on error. * @return PVR_ERROR_NO_ERROR on success, respective error code otherwise. */ @@ -892,7 +892,7 @@ public: PVR_ERROR SeekRecordedStream(int64_t iFilePosition, int iWhence, int64_t& iPosition); /*! - * @brief Get the lenght of the currently playing recording stream, if any. + * @brief Get the length of the currently playing recording stream, if any. * @param iLength The total length of the stream that's currently being read or -1 on error. * @return PVR_ERROR_NO_ERROR on success, respective error code otherwise. */ diff --git a/xbmc/pvr/addons/PVRClients.h b/xbmc/pvr/addons/PVRClients.h index bf6c490453..f1edc34331 100644 --- a/xbmc/pvr/addons/PVRClients.h +++ b/xbmc/pvr/addons/PVRClients.h @@ -348,7 +348,7 @@ namespace PVR void OnSystemSleep(); /*! - * @brief Propagate "system wakup" event to clients + * @brief Propagate "system wakeup" event to clients */ void OnSystemWake(); diff --git a/xbmc/pvr/channels/PVRChannel.h b/xbmc/pvr/channels/PVRChannel.h index cbad9f2704..7cfa55f10e 100644 --- a/xbmc/pvr/channels/PVRChannel.h +++ b/xbmc/pvr/channels/PVRChannel.h @@ -369,7 +369,7 @@ namespace PVR * Get the EPG tag that was previously active on this channel. * Will return an empty tag if there is none. * - * @return The EPG tag that was previously activ. + * @return The EPG tag that was previously active. */ std::shared_ptr<CPVREpgInfoTag> GetEPGPrevious() const; diff --git a/xbmc/pvr/epg/EpgInfoTag.h b/xbmc/pvr/epg/EpgInfoTag.h index 7192b4737c..7cf12a8ae4 100644 --- a/xbmc/pvr/epg/EpgInfoTag.h +++ b/xbmc/pvr/epg/EpgInfoTag.h @@ -432,7 +432,7 @@ namespace PVR unsigned int Flags() const { return m_iFlags; } /*! - * @brief Split the given string into tokens. Interpretes occurences of EPG_STRING_TOKEN_SEPARATOR in the string as separator. + * @brief Split the given string into tokens. Interprets occurrences of EPG_STRING_TOKEN_SEPARATOR in the string as separator. * @param str The string to tokenize. * @return the tokens. */ diff --git a/xbmc/pvr/filesystem/PVRGUIDirectory.h b/xbmc/pvr/filesystem/PVRGUIDirectory.h index f827dd961f..d6e024c524 100644 --- a/xbmc/pvr/filesystem/PVRGUIDirectory.h +++ b/xbmc/pvr/filesystem/PVRGUIDirectory.h @@ -38,7 +38,7 @@ public: virtual ~CPVRGUIDirectory() = default; /*! - * @brief Check existense of this directory. + * @brief Check existence of this directory. * @return True if the directory exists, false otherwise. */ bool Exists() const; diff --git a/xbmc/pvr/guilib/GUIEPGGridContainer.cpp b/xbmc/pvr/guilib/GUIEPGGridContainer.cpp index 21bb65ca50..45e80fd6d9 100644 --- a/xbmc/pvr/guilib/GUIEPGGridContainer.cpp +++ b/xbmc/pvr/guilib/GUIEPGGridContainer.cpp @@ -717,7 +717,7 @@ void CGUIEPGGridContainer::UpdateItems() { channelUid = prevSelectedEpgTag->UniqueChannelID(); - // As gap tags do not have a unique broadcast id, we will look for the real tag preceeding + // As gap tags do not have a unique broadcast id, we will look for the real tag preceding // the gap tag and add the respective offset to restore the gap tag selection, assuming that // the real tag is still the predecessor of the gap tag after the grid model update. diff --git a/xbmc/pvr/guilib/GUIEPGGridContainerModel.cpp b/xbmc/pvr/guilib/GUIEPGGridContainerModel.cpp index 5746a1588c..31ec5a9f87 100644 --- a/xbmc/pvr/guilib/GUIEPGGridContainerModel.cpp +++ b/xbmc/pvr/guilib/GUIEPGGridContainerModel.cpp @@ -632,7 +632,7 @@ int CGUIEPGGridContainerModel::GetBlock(const CDateTime& datetime) const diff = (datetime - m_gridStart).GetSecondsTotal(); // block is after grid start // Note: Subtract 1 second from diff to ensure that events ending exactly at block boundary - // are unambigious. Example: An event ending at 5:00:00 shall be mapped to block 9 and + // are unambiguous. Example: An event ending at 5:00:00 shall be mapped to block 9 and // an event starting at 5:00:00 shall be mapped to block 10, not both at block 10. // Only exception is grid end, because there is no successor. if (datetime >= m_gridEnd) diff --git a/xbmc/pvr/guilib/PVRGUIActions.cpp b/xbmc/pvr/guilib/PVRGUIActions.cpp index 5d631e5774..321afd8ed5 100644 --- a/xbmc/pvr/guilib/PVRGUIActions.cpp +++ b/xbmc/pvr/guilib/PVRGUIActions.cpp @@ -2335,7 +2335,7 @@ namespace PVR 19309); // (Auto-close of this reminder will schedule a recording...) else if (m_settings.GetBoolValue(CSettings::SETTING_PVRREMINDERS_AUTOSWITCH)) text += "\n\n" + g_localizeStrings.Get( - 19331); // (Auto-close of this reminder will swicth to channel...) + 19331); // (Auto-close of this reminder will switch to channel...) } else { diff --git a/xbmc/pvr/guilib/PVRGUIActions.h b/xbmc/pvr/guilib/PVRGUIActions.h index b01e9e6232..918a49c391 100644 --- a/xbmc/pvr/guilib/PVRGUIActions.h +++ b/xbmc/pvr/guilib/PVRGUIActions.h @@ -151,7 +151,7 @@ namespace PVR /*! * @brief Get the timer rule for a given timer - * @param item containg an item to query the timer rule for. item must be a timer or an epg tag. + * @param item containing an item to query the timer rule for. item must be a timer or an epg tag. * @return The timer rule item, or nullptr if none was found. */ std::shared_ptr<CFileItem> GetTimerRule(const std::shared_ptr<CFileItem>& item) const; @@ -403,7 +403,7 @@ namespace PVR /*! * @brief Get a channel group member for the given channel, either from the currently active * group or if not found there, from the 'all channels' group. - * @param cahnnel the channel. + * @param channel the channel. * @return the group member or nullptr if not found. */ std::shared_ptr<CPVRChannelGroupMember> GetChannelGroupMember( @@ -575,7 +575,7 @@ namespace PVR /*! * @brief Start playback of the given item. * @param bFullscreen start playback fullscreen or not. - * @param epgProps propeties to be used instead of calling to the client if supplied. + * @param epgProps properties to be used instead of calling to the client if supplied. * @param item containing a channel or a recording. */ void StartPlayback(CFileItem* item, diff --git a/xbmc/pvr/guilib/PVRGUIChannelNavigator.h b/xbmc/pvr/guilib/PVRGUIChannelNavigator.h index 5b61c6c976..522379a669 100644 --- a/xbmc/pvr/guilib/PVRGUIChannelNavigator.h +++ b/xbmc/pvr/guilib/PVRGUIChannelNavigator.h @@ -29,13 +29,13 @@ namespace PVR /*! * @brief Select the next channel in currently playing channel group, relative to the currently selected channel. - * @param eSwitchMode controls whether only the channel info OSD is triggered or whther additionally a (delayed) channel switch will be done. + * @param eSwitchMode controls whether only the channel info OSD is triggered or whether additionally a (delayed) channel switch will be done. */ void SelectNextChannel(ChannelSwitchMode eSwitchMode); /*! * @brief Select the previous channel in currently playing channel group, relative to the currently selected channel. - * @param eSwitchMode controls whether only the channel info OSD is triggered or whther additionally a (delayed) channel switch will be done. + * @param eSwitchMode controls whether only the channel info OSD is triggered or whether additionally a (delayed) channel switch will be done. */ void SelectPreviousChannel(ChannelSwitchMode eSwitchMode); diff --git a/xbmc/pvr/guilib/PVRGUIProgressHandler.h b/xbmc/pvr/guilib/PVRGUIProgressHandler.h index 8c7d297664..7660edb77f 100644 --- a/xbmc/pvr/guilib/PVRGUIProgressHandler.h +++ b/xbmc/pvr/guilib/PVRGUIProgressHandler.h @@ -42,7 +42,7 @@ namespace PVR void UpdateProgress(const std::string& strText, int iCurrent, int iMax); /*! - * @brief Destroy the progress dialog. This happens asynchrounous, instance must not be touched anymore after calling this method. + * @brief Destroy the progress dialog. This happens asynchronous, instance must not be touched anymore after calling this method. */ void DestroyProgress(); diff --git a/xbmc/pvr/providers/PVRProviders.cpp b/xbmc/pvr/providers/PVRProviders.cpp index 5a5bcfc534..34f65b6506 100644 --- a/xbmc/pvr/providers/PVRProviders.cpp +++ b/xbmc/pvr/providers/PVRProviders.cpp @@ -134,7 +134,7 @@ bool CPVRProviders::Update() } // Default client providers are the add-ons themselves, we retrieve both enabled - // and disbled add-ons as we don't want them removed from the DB + // and disabled add-ons as we don't want them removed from the DB CPVRProviders newAddonProviderList; std::vector<int> disabledClients; std::vector<CVariant> clientProviderInfos = diff --git a/xbmc/pvr/recordings/PVRRecording.h b/xbmc/pvr/recordings/PVRRecording.h index a808211e37..53cdebefb3 100644 --- a/xbmc/pvr/recordings/PVRRecording.h +++ b/xbmc/pvr/recordings/PVRRecording.h @@ -11,8 +11,8 @@ /* * DESCRIPTION: * - * CPVRRecordingInfoTag is part of the Kodi PVR system to support recording entrys, - * stored on a other Backend like VDR or MythTV. + * CPVRRecordingInfoTag is part of the Kodi PVR system to support recording entries, + * stored on another Backend like VDR or MythTV. * * The recording information tag holds data about name, length, recording time * and so on of recorded stream stored on the backend. @@ -168,7 +168,7 @@ namespace PVR /*! * @brief Update this recording's size. The value will be obtained from the backend if it supports server-side size retrieval. - * @return true if the the updated value is differnt, false otherwise. + * @return true if the the updated value is different, false otherwise. */ bool UpdateRecordingSize(); diff --git a/xbmc/pvr/recordings/PVRRecordingsPath.cpp b/xbmc/pvr/recordings/PVRRecordingsPath.cpp index 1321b5ee6b..d7d5aab6d9 100644 --- a/xbmc/pvr/recordings/PVRRecordingsPath.cpp +++ b/xbmc/pvr/recordings/PVRRecordingsPath.cpp @@ -144,7 +144,7 @@ std::string CPVRRecordingsPath::GetUnescapedSubDirectoryPath(const std::string& strUsePath.erase(0, strUnescapedDirectoryPath.size()); strUsePath = TrimSlashes(strUsePath); - /* check for more occurences */ + /* check for more occurrences */ size_t iDelimiter = strUsePath.find('/'); if (iDelimiter == std::string::npos) strReturn = strUsePath; diff --git a/xbmc/rendering/dx/DeviceResources.cpp b/xbmc/rendering/dx/DeviceResources.cpp index 20a1c639de..b58a1e6df3 100644 --- a/xbmc/rendering/dx/DeviceResources.cpp +++ b/xbmc/rendering/dx/DeviceResources.cpp @@ -297,7 +297,7 @@ bool DX::DeviceResources::SetFullScreen(bool fullscreen, RESOLUTION_INFO& res) } } - // resize backbuffer to proper hanlde fullscreen/stereo transition + // resize backbuffer to proper handle fullscreen/stereo transition if (recreate) ResizeBuffers(); @@ -868,7 +868,7 @@ void DX::DeviceResources::OnDeviceLost(bool removed) // 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. + // to use the device anymore, tell all resources about this. res->OnDestroyDevice(removed); } } diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp index 25d97f7a1f..8d0eba5296 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp @@ -990,7 +990,7 @@ void CAdvancedSettings::ParseSettingsFile(const std::string &file) if (pTrailerMatching) GetCustomRegexps(pTrailerMatching, m_trailerMatchRegExps); - //everything thats a trailer is not a movie + //everything that's a trailer is not a movie m_moviesExcludeFromScanRegExps.insert(m_moviesExcludeFromScanRegExps.end(), m_trailerMatchRegExps.begin(), m_trailerMatchRegExps.end()); diff --git a/xbmc/settings/MediaSourceSettings.cpp b/xbmc/settings/MediaSourceSettings.cpp index 30c224c060..408f0d356d 100644 --- a/xbmc/settings/MediaSourceSettings.cpp +++ b/xbmc/settings/MediaSourceSettings.cpp @@ -359,7 +359,7 @@ bool CMediaSourceSettings::GetSource(const std::string &category, const TiXmlNod return false; std::vector<std::string> verifiedPaths; - // disallowed for files, or theres only a single path in the vector + // disallowed for files, or there's only a single path in the vector if (StringUtils::EqualsNoCase(category, "files") || vecPaths.size() == 1) verifiedPaths.push_back(vecPaths[0]); // multiple paths? diff --git a/xbmc/settings/lib/Setting.cpp b/xbmc/settings/lib/Setting.cpp index abb4eccdc4..7972f32e76 100644 --- a/xbmc/settings/lib/Setting.cpp +++ b/xbmc/settings/lib/Setting.cpp @@ -1430,7 +1430,7 @@ bool CSettingString::Deserialize(const TiXmlNode *node, bool update /* = false * // get allowempty (needs to be parsed before parsing the default value) XMLUtils::GetBoolean(constraints, SETTING_XML_ELM_ALLOWEMPTY, m_allowEmpty); - // Values other than those in options contraints allowed to be added + // Values other than those in options constraints allowed to be added XMLUtils::GetBoolean(constraints, SETTING_XML_ELM_ALLOWNEWOPTION, m_allowNewOption); // get the entries diff --git a/xbmc/settings/lib/SettingsManager.cpp b/xbmc/settings/lib/SettingsManager.cpp index 4750817d3b..0ed28d1ebc 100644 --- a/xbmc/settings/lib/SettingsManager.cpp +++ b/xbmc/settings/lib/SettingsManager.cpp @@ -1061,7 +1061,7 @@ bool CSettingsManager::LoadSetting(const TiXmlNode* node, const SettingPtr& sett settingId = setting->GetReferencedId(); const TiXmlElement* settingElement = nullptr; - // try to split the setting identifier into category and subsetting identifer (v1-) + // try to split the setting identifier into category and subsetting identifier (v1-) std::string categoryTag, settingTag; if (ParseSettingIdentifier(settingId, categoryTag, settingTag)) { diff --git a/xbmc/storage/IStorageProvider.h b/xbmc/storage/IStorageProvider.h index a77fdf8010..938158bb78 100644 --- a/xbmc/storage/IStorageProvider.h +++ b/xbmc/storage/IStorageProvider.h @@ -53,7 +53,7 @@ public: /**\brief Called by media manager to create platform storage provider * - * This method used to create platfrom specified storage provider + * This method used to create platform specified storage provider */ static IStorageProvider* CreateInstance(); }; diff --git a/xbmc/utils/BitstreamConverter.cpp b/xbmc/utils/BitstreamConverter.cpp index bcbcdd513a..f2224a5457 100644 --- a/xbmc/utils/BitstreamConverter.cpp +++ b/xbmc/utils/BitstreamConverter.cpp @@ -369,7 +369,7 @@ bool CBitstreamConverter::Open(enum AVCodecID codec, uint8_t *in_extradata, int { CLog::Log(LOGINFO, "CBitstreamConverter::Open annexb to bitstream init"); // video content is from x264 or from bytestream h264 (AnnexB format) - // NAL reformating to bitstream format needed + // NAL reformatting to bitstream format needed AVIOContext *pb; if (avio_open_dyn_buf(&pb) < 0) return false; diff --git a/xbmc/utils/Fanart.cpp b/xbmc/utils/Fanart.cpp index 1b64c6f362..5e385eebe9 100644 --- a/xbmc/utils/Fanart.cpp +++ b/xbmc/utils/Fanart.cpp @@ -146,7 +146,7 @@ bool CFanart::ParseColors(const std::string &colorsIn, std::string &colorsOut) // 1: The TVDB RGB Int Triplets, pipe separate with leading/trailing pipes "|68,69,59|69,70,58|78,78,68|" // Essentially we read the colors in using the proper format, and store them in our own fixed temporary format (3 DWORDS), and then - // write them back in in the specified format. + // write them back in the specified format. if (colorsIn.empty()) return false; diff --git a/xbmc/utils/FileUtils.cpp b/xbmc/utils/FileUtils.cpp index 5fa8c702e3..68e857af2d 100644 --- a/xbmc/utils/FileUtils.cpp +++ b/xbmc/utils/FileUtils.cpp @@ -152,7 +152,7 @@ bool CFileUtils::RemoteAccessAllowed(const std::string &strPath) // Check auto-mounted sources VECSOURCES sources; CServiceBroker::GetMediaManager().GetRemovableDrives( - sources); // Sources returned allways have m_allowsharing = true + sources); // Sources returned always have m_allowsharing = true //! @todo Make sharing of auto-mounted sources user configurable int sourceIndex = CUtil::GetMatchingSource(realPath, sources, isSource); if (sourceIndex >= 0 && sourceIndex < static_cast<int>(sources.size()) && @@ -214,7 +214,7 @@ CDateTime CFileUtils::GetModificationDate(const int& code, const std::string& st addedTime = std::min(static_cast<time_t>(buffer.st_ctime), static_cast<time_t>(buffer.st_mtime)); } - // Perfer the earliest of ctime and mtime, fallback to other + // Prefer the earliest of ctime and mtime, fallback to other else { addedTime = diff --git a/xbmc/utils/StringUtils.cpp b/xbmc/utils/StringUtils.cpp index 93f8cda7c3..8b00ad166f 100644 --- a/xbmc/utils/StringUtils.cpp +++ b/xbmc/utils/StringUtils.cpp @@ -1152,7 +1152,7 @@ int64_t StringUtils::AlphaNumericCompare(const wchar_t* left, const wchar_t* rig else { // Fetch collation facet from locale to do comparison of wide char although on some - // platforms this is not langauge specific but just compares unicode + // platforms this is not language specific but just compares unicode const std::collate<wchar_t>& coll = std::use_facet<std::collate<wchar_t>>(g_langInfo.GetSystemLocale()); int cmp_res = coll.compare(&lc, &lc + 1, &rc, &rc + 1); @@ -1331,7 +1331,7 @@ int StringUtils::AlphaNumericCollation(int nKey1, const void* pKey1, int nKey2, else { // Fetch collation facet from locale to do comparison of wide char although on some - // platforms this is not langauge specific but just compares unicode + // platforms this is not language specific but just compares unicode const std::collate<wchar_t>& coll = std::use_facet<std::collate<wchar_t>>(g_langInfo.GetSystemLocale()); int cmp_res = coll.compare(&lc, &lc + 1, &rc, &rc + 1); diff --git a/xbmc/utils/URIUtils.cpp b/xbmc/utils/URIUtils.cpp index b459b8e997..d45ea0fba2 100644 --- a/xbmc/utils/URIUtils.cpp +++ b/xbmc/utils/URIUtils.cpp @@ -100,7 +100,7 @@ bool URIUtils::HasExtension(const std::string& strFileName, const std::string& s std::string::const_reverse_iterator itExtensions = strExtensions.rbegin(); while (itExtensions != strExtensions.rend()) { - // Iterate backwards over strFileName untill we hit a '.' or a mismatch + // Iterate backwards over strFileName until we hit a '.' or a mismatch for (std::string::const_reverse_iterator itFileName = strFileName.rbegin(); itFileName != strFileName.rend() && itExtensions != strExtensions.rend() && tolower(*itFileName) == *itExtensions; diff --git a/xbmc/video/GUIViewStateVideo.cpp b/xbmc/video/GUIViewStateVideo.cpp index e4612f2a46..ecc3a8607e 100644 --- a/xbmc/video/GUIViewStateVideo.cpp +++ b/xbmc/video/GUIViewStateVideo.cpp @@ -266,9 +266,9 @@ CGUIViewStateWindowVideoNav::CGUIViewStateWindowVideoNav(const CFileItemList& it AddSortMethod(SortByArtist, sortAttributes, 557, LABEL_MASKS("%A - %T", "%Y")); // Artist - Title, Year | empty, empty AddSortMethod(SortByArtistThenYear, sortAttributes, 578, LABEL_MASKS("%A - %T", "%Y")); // Artist, Title, Year| empty, empty AddSortMethod(SortByYear, 562, LABEL_MASKS("%T - %A", "%Y")); // Title, Artist, Year| empty, empty - AddSortMethod(SortByTime, 180, LABEL_MASKS("%T - %A", "%D")); // Titel, Artist, Duration| empty, empty + AddSortMethod(SortByTime, 180, LABEL_MASKS("%T - %A", "%D")); // Title, Artist, Duration| empty, empty AddSortMethod(SortByDateAdded, 570, LABEL_MASKS("%T - %A", "%a")); // Title - Artist, DateAdded | empty, empty - AddSortMethod(SortByPlaycount, 567, LABEL_MASKS("%T - %A", "%V")); // Titel - Artist, PlayCount + AddSortMethod(SortByPlaycount, 567, LABEL_MASKS("%T - %A", "%V")); // Title - Artist, PlayCount AddSortMethod(SortByMPAA, 20074, LABEL_MASKS("%T - %A", "%O")); // Title - Artist, MPAARating AddSortMethod(SortByUserRating, 38018, LABEL_MASKS("%T - %A", "%r")); // Title - Artist, UserRating @@ -480,9 +480,9 @@ CGUIViewStateVideoMusicVideos::CGUIViewStateVideoMusicVideos(const CFileItemList AddSortMethod(SortByArtist, sortAttributes, 557, LABEL_MASKS("%A - %T", "%Y")); // Artist - Title, Year | empty, empty AddSortMethod(SortByArtistThenYear, sortAttributes, 578, LABEL_MASKS("%A - %T", "%Y")); // Artist, Title, Year| empty, empty AddSortMethod(SortByYear, 562, LABEL_MASKS("%T - %A", "%Y")); // Title, Artist, Year| empty, empty - AddSortMethod(SortByTime, 180, LABEL_MASKS("%T - %A", "%D")); // Titel, Artist, Duration| empty, empty + AddSortMethod(SortByTime, 180, LABEL_MASKS("%T - %A", "%D")); // Title, Artist, Duration| empty, empty AddSortMethod(SortByDateAdded, 570, LABEL_MASKS("%T - %A", "%a")); // Title - Artist, DateAdded | empty, empty - AddSortMethod(SortByPlaycount, 567, LABEL_MASKS("%T - %A", "%V")); // Titel - Artist, PlayCount + AddSortMethod(SortByPlaycount, 567, LABEL_MASKS("%T - %A", "%V")); // Title - Artist, PlayCount AddSortMethod(SortByMPAA, 20074, LABEL_MASKS("%T - %A", "%O")); // Title - Artist, MPAARating AddSortMethod(SortByUserRating, 38018, LABEL_MASKS("%T - %A", "%r")); // Title - Artist, UserRating diff --git a/xbmc/video/VideoDatabase.cpp b/xbmc/video/VideoDatabase.cpp index d4da167fc6..c5a6e09ad0 100644 --- a/xbmc/video/VideoDatabase.cpp +++ b/xbmc/video/VideoDatabase.cpp @@ -217,10 +217,10 @@ void CVideoDatabase::CreateForeignLinkIndex(const char *table, const char *forei void CVideoDatabase::CreateAnalytics() { - /* indexes should be added on any columns that are used in in */ + /* indexes should be added on any columns that are used in */ /* a where or a join. primary key on a column is the same as a */ /* unique index on that column, so there is no need to add any */ - /* index if no other columns are refered */ + /* index if no other columns are referred */ /* order of indexes are important, for an index to be considered all */ /* columns up to the column in question have to have been specified */ @@ -3347,7 +3347,7 @@ void CVideoDatabase::ClearBookMarkOfFile(const std::string& strFilenameAndPath, if (nullptr == m_pDS) return; - /* a little bit uggly, we clear first bookmark that is within one second of given */ + /* a little bit ugly, we clear first bookmark that is within one second of given */ /* should be no problem since we never add bookmarks that are closer than that */ double mintime = bookmark.timeInSeconds - 0.5; double maxtime = bookmark.timeInSeconds + 0.5; @@ -11077,7 +11077,7 @@ CDateTime CVideoDatabase::GetDateAdded(const std::string& filename, { if (!dateAdded.IsValid()) { - // supress warnings if we have plugin source + // suppress warnings if we have plugin source if (!URIUtils::IsPlugin(filename)) { const auto dateAddedSetting = diff --git a/xbmc/video/dialogs/GUIDialogVideoBookmarks.h b/xbmc/video/dialogs/GUIDialogVideoBookmarks.h index 2f2d6ef42d..801afcdd37 100644 --- a/xbmc/video/dialogs/GUIDialogVideoBookmarks.h +++ b/xbmc/video/dialogs/GUIDialogVideoBookmarks.h @@ -31,7 +31,7 @@ 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 + \return True if creation of bookmark was successful \sa OnAddEpisodeBookmark */ static bool OnAddBookmark(); diff --git a/xbmc/windowing/GraphicContext.h b/xbmc/windowing/GraphicContext.h index e1bdfcaab8..5f022bb528 100644 --- a/xbmc/windowing/GraphicContext.h +++ b/xbmc/windowing/GraphicContext.h @@ -82,7 +82,7 @@ public: void Flip(bool rendered, bool videoLayer); - // gfx contect interface + // gfx context interface int GetWidth() const; int GetHeight() const; bool SetViewPort(float fx, float fy , float fwidth, float fheight, bool intersectPrevious = false); diff --git a/xbmc/windowing/Resolution.cpp b/xbmc/windowing/Resolution.cpp index 47cce1051f..4dcd2480ff 100644 --- a/xbmc/windowing/Resolution.cpp +++ b/xbmc/windowing/Resolution.cpp @@ -135,7 +135,7 @@ void CResolutionUtils::FindResolutionFromWhitelist(float fps, int width, int hei const RESOLUTION_INFO info = CServiceBroker::GetWinSystem()->GetGfxContext().GetResInfo(i); // allow resolutions that are exact and have the correct refresh rate - // allow macroblock alignement / padding errors (e.g. 1080 mod16 == 8) + // allow macroblock alignment / padding errors (e.g. 1080 mod16 == 8) if (((height == info.iScreenHeight && width <= info.iScreenWidth + 8) || (width == info.iScreenWidth && height <= info.iScreenHeight + 8)) && (info.dwFlags & D3DPRESENTFLAG_MODEMASK) == (curr.dwFlags & D3DPRESENTFLAG_MODEMASK) && @@ -169,7 +169,7 @@ void CResolutionUtils::FindResolutionFromWhitelist(float fps, int width, int hei const RESOLUTION_INFO info = CServiceBroker::GetWinSystem()->GetGfxContext().GetResInfo(i); // allow resolutions that are exact and have double the refresh rate - // allow macroblock alignement / padding errors (e.g. 1080 mod16 == 8) + // allow macroblock alignment / padding errors (e.g. 1080 mod16 == 8) if (((height == info.iScreenHeight && width <= info.iScreenWidth + 8) || (width == info.iScreenWidth && height <= info.iScreenHeight + 8)) && (info.dwFlags & D3DPRESENTFLAG_MODEMASK) == (curr.dwFlags & D3DPRESENTFLAG_MODEMASK) && @@ -208,7 +208,7 @@ void CResolutionUtils::FindResolutionFromWhitelist(float fps, int width, int hei const RESOLUTION_INFO info = CServiceBroker::GetWinSystem()->GetGfxContext().GetResInfo(i); // allow resolutions that are exact and have 2.5 times the refresh rate - // allow macroblock alignement / padding errors (e.g. 1080 mod16 == 8) + // allow macroblock alignment / padding errors (e.g. 1080 mod16 == 8) if (((height == info.iScreenHeight && width <= info.iScreenWidth + 8) || (width == info.iScreenWidth && height <= info.iScreenHeight + 8)) && (info.dwFlags & D3DPRESENTFLAG_MODEMASK) == (curr.dwFlags & D3DPRESENTFLAG_MODEMASK) && diff --git a/xbmc/windowing/gbm/GBMUtils.cpp b/xbmc/windowing/gbm/GBMUtils.cpp index cf6ee7df4a..5267c93c8f 100644 --- a/xbmc/windowing/gbm/GBMUtils.cpp +++ b/xbmc/windowing/gbm/GBMUtils.cpp @@ -84,7 +84,7 @@ CGBMUtils::CGBMDevice::CGBMSurface::CGBMSurfaceBuffer* CGBMUtils::CGBMDevice::CG /* * We want to use call_once here because we want it to be logged the first time that * we have to release buffers. This means that the maximum amount of buffers had been reached. - * For mesa this should be 4 buffers but it may vary accross other implementations. + * For mesa this should be 4 buffers but it may vary across other implementations. */ std::call_once( flag, [this]() { CLog::Log(LOGDEBUG, "CGBMUtils - using {} buffers", m_buffers.size()); }); diff --git a/xbmc/windowing/tvos/WinSystemTVOS.mm b/xbmc/windowing/tvos/WinSystemTVOS.mm index c7bb994c50..f986e67032 100644 --- a/xbmc/windowing/tvos/WinSystemTVOS.mm +++ b/xbmc/windowing/tvos/WinSystemTVOS.mm @@ -233,8 +233,8 @@ bool CWinSystemTVOS::SetFullScreen(bool fullScreen, RESOLUTION_INFO& res, bool b bool CWinSystemTVOS::SwitchToVideoMode(int width, int height, double refreshrate) { - /*! @todo Currently support SDR dynamic range only. HDR shouldnt be done during a - * modeswitch. Look to create supplemental method to handle sdr/hdr enable + /*! @todo Currently support SDR dynamic range only. HDR shouldn't be done during + * a modeswitch. Look to create supplemental method to handle sdr/hdr enable */ [g_xbmcController.displayManager displayRateSwitch:refreshrate withDynamicRange:0 /*dynamicRange*/]; diff --git a/xbmc/windowing/wayland/WinSystemWayland.cpp b/xbmc/windowing/wayland/WinSystemWayland.cpp index bd87091fb9..bd17b44a19 100644 --- a/xbmc/windowing/wayland/WinSystemWayland.cpp +++ b/xbmc/windowing/wayland/WinSystemWayland.cpp @@ -611,7 +611,7 @@ bool CWinSystemWayland::SetResolutionExternal(bool fullScreen, RESOLUTION_INFO c bool CWinSystemWayland::ResizeWindow(int, int, int, int) { // CGraphicContext is "smart" and calls ResizeWindow or SetFullScreen depending - // on some state like wheter we were already full screen. But actually the processing + // on some state like whether we were already fullscreen. But actually the processing // here is always identical, so we are using a common function to handle both. auto& res = CDisplaySettings::GetInstance().GetResolutionInfo(RES_WINDOW); // The newWidth/newHeight parameters are taken from RES_WINDOW anyway, so we can just diff --git a/xbmc/windowing/win10/WinSystemWin10.cpp b/xbmc/windowing/win10/WinSystemWin10.cpp index 29bf6c93a5..2cd0211a6f 100644 --- a/xbmc/windowing/win10/WinSystemWin10.cpp +++ b/xbmc/windowing/win10/WinSystemWin10.cpp @@ -249,7 +249,7 @@ bool CWinSystemWin10::SetFullScreen(bool fullScreen, RESOLUTION_INFO& res, bool { if (state == WINDOW_STATE_WINDOWED) // go to a windowed state { - // need to restore resoultion if it was changed to not native + // need to restore resolution if it was changed to not native // because we do not support resolution change in windowed mode RestoreDesktopResolution(); } diff --git a/xbmc/windowing/windows/WinSystemWin32.cpp b/xbmc/windowing/windows/WinSystemWin32.cpp index 7b5d4021a0..285fb15200 100644 --- a/xbmc/windowing/windows/WinSystemWin32.cpp +++ b/xbmc/windowing/windows/WinSystemWin32.cpp @@ -535,7 +535,7 @@ bool CWinSystemWin32::SetFullScreen(bool fullScreen, RESOLUTION_INFO& res, bool if (state == WINDOW_STATE_WINDOWED) // go to a windowed state { - // need to restore resoultion if it was changed to not native + // need to restore resolution if it was changed to not native // because we do not support resolution change in windowed mode RestoreDesktopResolution(newMonitor); } diff --git a/xbmc/windowing/windows/WinSystemWin32DX.cpp b/xbmc/windowing/windows/WinSystemWin32DX.cpp index 175b88be06..eec401d0b0 100644 --- a/xbmc/windowing/windows/WinSystemWin32DX.cpp +++ b/xbmc/windowing/windows/WinSystemWin32DX.cpp @@ -312,7 +312,7 @@ void CWinSystemWin32DX::InitHooks(IDXGIOutput* pOutput) } else { - CLog::Log(LOGDEBUG, __FUNCTION__": Unable ot install and activate D3D11 hook."); + CLog::Log(LOGDEBUG, __FUNCTION__": Unable to install and activate D3D11 hook."); s_fnOpenAdapter10_2 = nullptr; FreeLibrary(m_hDriverModule); m_hDriverModule = nullptr; diff --git a/xbmc/windows/GUIWindowHome.cpp b/xbmc/windows/GUIWindowHome.cpp index a7292c707c..d0aa78f245 100644 --- a/xbmc/windows/GUIWindowHome.cpp +++ b/xbmc/windows/GUIWindowHome.cpp @@ -141,7 +141,7 @@ void CGUIWindowHome::OnJobComplete(unsigned int jobID, bool success, CJob *job) CSingleLock lockMe(*this); // the job is finished. - // did one come in in the meantime? + // did one come in the meantime? flag = m_cumulativeUpdateFlag; m_recentlyAddedRunning = false; /// we're done. } |