diff options
41 files changed, 64 insertions, 64 deletions
diff --git a/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.cpp b/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.cpp index 3d232d26f8..a4efd8af65 100644 --- a/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.cpp +++ b/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.cpp @@ -163,7 +163,7 @@ void CWiiRemote::SetBluetoothAddress(const char *btaddr) bacpy(&m_btaddr, &b); } -void CWiiRemote::SetSensativity(float DeadX, float DeadY, int NumSamples) +void CWiiRemote::SetSensitivity(float DeadX, float DeadY, int NumSamples) { m_NumSamples = NumSamples; @@ -742,8 +742,8 @@ int main(int argc, char **argv) g_Ping = new CPacketHELO("WiiRemote", ICON_PNG, g_BluetoothIconPath.c_str()); g_WiiRemote.Initialize(my_addr, sockfd); g_WiiRemote.SetBluetoothAddress(btaddr); - g_WiiRemote.SetSensativity(DeadX, DeadY, NumSamples); - g_WiiRemote.SetSensativity(DeadX, DeadY, NumSamples); + g_WiiRemote.SetSensitivity(DeadX, DeadY, NumSamples); + g_WiiRemote.SetSensitivity(DeadX, DeadY, NumSamples); g_WiiRemote.SetJoystickMap(JoyMap); if (g_AllowMouse) g_WiiRemote.EnableMouseEmulation(); diff --git a/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.h b/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.h index 3a60479ca1..5dd7333fd3 100644 --- a/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.h +++ b/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.h @@ -90,7 +90,7 @@ public: bool Connect(); void SetBluetoothAddress(const char * btaddr); - void SetSensativity(float DeadX, float DeadY, int Samples); + void SetSensitivity(float DeadX, float DeadY, int Samples); void SetJoystickMap(const char *JoyMap); private: int m_NumSamples; diff --git a/tools/codegenerator/Helper.groovy b/tools/codegenerator/Helper.groovy index cf195a2dfe..2b474aeb16 100644 --- a/tools/codegenerator/Helper.groovy +++ b/tools/codegenerator/Helper.groovy @@ -43,7 +43,7 @@ public class Helper public static String newline = System.getProperty("line.separator"); public static File curTemplateFile = null; - public static void setTempateFile(File templateFile) { curTemplateFile = templateFile } + public static void setTemplateFile(File templateFile) { curTemplateFile = templateFile } /** * In order to use any of the typemap helper features, the Helper class needs to be initialized with @@ -57,7 +57,7 @@ public class Helper public static void setup(def template,List pclasses, Map poutTypemap, def defaultOutTypemap, Map pinTypemap, def defaultInTypemap) { - setTempateFile(template.binding.templateFile) + setTemplateFile(template.binding.templateFile) classes = pclasses ? pclasses : [] if (poutTypemap) outTypemap.putAll(poutTypemap) if (defaultOutTypemap) defaultOutTypeConversion = defaultOutTypemap diff --git a/xbmc/addons/test/TestAddonBuilder.cpp b/xbmc/addons/test/TestAddonBuilder.cpp index 51cd0b2f14..c30800b5f5 100644 --- a/xbmc/addons/test/TestAddonBuilder.cpp +++ b/xbmc/addons/test/TestAddonBuilder.cpp @@ -55,7 +55,7 @@ TEST_F(TestAddonBuilder, ShouldBuildDependencyAddons) EXPECT_EQ(deps, addon->GetDeps()); } -TEST_F(TestAddonBuilder, ShouldReturnDeivedType) +TEST_F(TestAddonBuilder, ShouldReturnDerivedType) { builder.SetType(ADDON_RESOURCE_LANGUAGE); auto addon = std::dynamic_pointer_cast<CLanguageResource>(builder.Build()); diff --git a/xbmc/addons/test/TestAddonFactory.cpp b/xbmc/addons/test/TestAddonFactory.cpp index c58539522c..00f37cd05c 100644 --- a/xbmc/addons/test/TestAddonFactory.cpp +++ b/xbmc/addons/test/TestAddonFactory.cpp @@ -57,7 +57,7 @@ TEST_F(TestAddonFactory, ShouldFailWhenAddonDoesNotHaveRequestedType) EXPECT_EQ(nullptr, addon); } -TEST_F(TestAddonFactory, ShouldPickFirstExtenstionWhenNotRequestingSpecificType) +TEST_F(TestAddonFactory, ShouldPickFirstExtensionWhenNotRequestingSpecificType) { cp_extension_t extensions[2] = { {&plugin, (char*)"xbmc.python.script", nullptr, nullptr, nullptr, nullptr}, @@ -71,7 +71,7 @@ TEST_F(TestAddonFactory, ShouldPickFirstExtenstionWhenNotRequestingSpecificType) EXPECT_EQ(ADDON_SCRIPT, addon->Type()); } -TEST_F(TestAddonFactory, ShouldIgnoreMetadataExtenstion) +TEST_F(TestAddonFactory, ShouldIgnoreMetadataExtension) { cp_extension_t extensions[2] = { {&plugin, (char*)"kodi.addon.metadata", nullptr, nullptr, nullptr, nullptr}, diff --git a/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioStream.cpp b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioStream.cpp index 7596537302..ced1200f21 100644 --- a/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioStream.cpp +++ b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioStream.cpp @@ -130,7 +130,7 @@ UInt32 CCoreAudioStream::GetDirection() // WARNING - don't rely on this method - the return value of // GetTerminalType is driver specific - the checked return // values are only recommendations from apple -bool CCoreAudioStream::IsDigitalOuptut(AudioStreamID id) +bool CCoreAudioStream::IsDigitalOutput(AudioStreamID id) { UInt32 type = GetTerminalType(id); // yes apple is mixing types here... diff --git a/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioStream.h b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioStream.h index 3f01060e85..ba6d883e8f 100644 --- a/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioStream.h +++ b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioStream.h @@ -60,7 +60,7 @@ public: bool GetAvailablePhysicalFormats(StreamFormatList *pList); static bool GetAvailableVirtualFormats(AudioStreamID id, StreamFormatList *pList); static bool GetAvailablePhysicalFormats(AudioStreamID id, StreamFormatList *pList); - static bool IsDigitalOuptut(AudioStreamID id); + static bool IsDigitalOutput(AudioStreamID id); static bool GetStartingChannelInDevice(AudioStreamID id, UInt32 &startingChannel); protected: diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFile.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFile.cpp index 6f2d4f98cb..87cdc52dac 100644 --- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFile.cpp +++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFile.cpp @@ -97,8 +97,8 @@ bool CDVDInputStreamFile::Open() return false; } - if (m_pFile->GetImplemenation() && (content.empty() || content == "application/octet-stream")) - m_content = m_pFile->GetImplemenation()->GetContent(); + if (m_pFile->GetImplementation() && (content.empty() || content == "application/octet-stream")) + m_content = m_pFile->GetImplementation()->GetContent(); m_eof = false; return true; diff --git a/xbmc/cores/VideoPlayer/Process/overrides/rbpi/ProcessInfoPi.cpp b/xbmc/cores/VideoPlayer/Process/overrides/rbpi/ProcessInfoPi.cpp index dab7a05956..f2fbe81aec 100644 --- a/xbmc/cores/VideoPlayer/Process/overrides/rbpi/ProcessInfoPi.cpp +++ b/xbmc/cores/VideoPlayer/Process/overrides/rbpi/ProcessInfoPi.cpp @@ -48,7 +48,7 @@ EINTERLACEMETHOD CProcessInfoPi::GetFallbackDeintMethod() bool CProcessInfoPi::AllowDTSHDDecode() { - if (g_RBP.RasberryPiVersion() == 1) + if (g_RBP.RaspberryPiVersion() == 1) return false; return true; } diff --git a/xbmc/cores/omxplayer/OMXAudioCodecOMX.cpp b/xbmc/cores/omxplayer/OMXAudioCodecOMX.cpp index 920ac4ab75..e399556582 100644 --- a/xbmc/cores/omxplayer/OMXAudioCodecOMX.cpp +++ b/xbmc/cores/omxplayer/OMXAudioCodecOMX.cpp @@ -65,7 +65,7 @@ bool COMXAudioCodecOMX::Open(CDVDStreamInfo &hints) { AVCodec* pCodec = NULL; - if (hints.codec == AV_CODEC_ID_DTS && g_RBP.RasberryPiVersion() > 1) + if (hints.codec == AV_CODEC_ID_DTS && g_RBP.RaspberryPiVersion() > 1) pCodec = avcodec_find_decoder_by_name("dcadec"); if (!pCodec) diff --git a/xbmc/dbwrappers/Database.cpp b/xbmc/dbwrappers/Database.cpp index bd7974aeba..383ddb1606 100644 --- a/xbmc/dbwrappers/Database.cpp +++ b/xbmc/dbwrappers/Database.cpp @@ -574,7 +574,7 @@ bool CDatabase::Compress(bool bForce /* =true */) return true; } -void CDatabase::Interupt() +void CDatabase::Interrupt() { m_pDS->interrupt(); } diff --git a/xbmc/dbwrappers/Database.h b/xbmc/dbwrappers/Database.h index 593a8eac47..cf4a795b31 100644 --- a/xbmc/dbwrappers/Database.h +++ b/xbmc/dbwrappers/Database.h @@ -78,7 +78,7 @@ public: bool IsOpen(); void Close(); bool Compress(bool bForce=true); - void Interupt(); + void Interrupt(); bool Open(const DatabaseSettings &db); diff --git a/xbmc/filesystem/AddonsDirectory.cpp b/xbmc/filesystem/AddonsDirectory.cpp index 94dfa65502..d7c9e5972a 100644 --- a/xbmc/filesystem/AddonsDirectory.cpp +++ b/xbmc/filesystem/AddonsDirectory.cpp @@ -153,7 +153,7 @@ static bool IsGameAddon(const AddonPtr& addon) IsGameSupportAddon(addon); } -static bool IsDependecyType(TYPE type) +static bool IsDependencyType(TYPE type) { return dependencyTypes.find(type) != dependencyTypes.end(); } @@ -351,7 +351,7 @@ static void GenerateMainCategoryListing(const CURL& path, const VECADDONS& addon for (unsigned int i = ADDON_UNKNOWN + 1; i < ADDON_MAX - 1; ++i) { const TYPE type = (TYPE)i; - if (!IsInfoProviderType(type) && !IsLookAndFeelType(type) && !IsDependecyType(type) && !IsGameType(type)) + if (!IsInfoProviderType(type) && !IsLookAndFeelType(type) && !IsDependencyType(type) && !IsGameType(type)) uncategorized.insert(static_cast<TYPE>(i)); } GenerateTypeListing(path, uncategorized, addons, items); diff --git a/xbmc/filesystem/File.h b/xbmc/filesystem/File.h index adcac32bd8..02649a5088 100644 --- a/xbmc/filesystem/File.h +++ b/xbmc/filesystem/File.h @@ -129,7 +129,7 @@ public: int IoControl(EIoControl request, void* param); - IFile *GetImplemenation() { return m_pFile; } + IFile *GetImplementation() { return m_pFile; } // CURL interface static bool Exists(const CURL& file, bool bUseCache = true); diff --git a/xbmc/filesystem/FileCache.cpp b/xbmc/filesystem/FileCache.cpp index afea2fe5d5..8e1c95c7e5 100644 --- a/xbmc/filesystem/FileCache.cpp +++ b/xbmc/filesystem/FileCache.cpp @@ -146,7 +146,7 @@ void CFileCache::SetCacheStrategy(CCacheStrategy *pCache, bool bDeleteCache /* = IFile *CFileCache::GetFileImp() { - return m_source.GetImplemenation(); + return m_source.GetImplementation(); } bool CFileCache::Open(const CURL& url) @@ -568,15 +568,15 @@ void CFileCache::StopThread(bool bWait /*= true*/) std::string CFileCache::GetContent() { - if (!m_source.GetImplemenation()) + if (!m_source.GetImplementation()) return IFile::GetContent(); - return m_source.GetImplemenation()->GetContent(); + return m_source.GetImplementation()->GetContent(); } std::string CFileCache::GetContentCharset(void) { - IFile* impl = m_source.GetImplemenation(); + IFile* impl = m_source.GetImplementation(); if (!impl) return IFile::GetContentCharset(); diff --git a/xbmc/filesystem/PipeFile.cpp b/xbmc/filesystem/PipeFile.cpp index 28230fb447..72250e6e7c 100644 --- a/xbmc/filesystem/PipeFile.cpp +++ b/xbmc/filesystem/PipeFile.cpp @@ -217,8 +217,8 @@ void CPipeFile::RemoveListener(IPipeListener *l) } } -void CPipeFile::SetOpenThreashold(int threashold) +void CPipeFile::SetOpenThreshold(int threshold) { - m_pipe->SetOpenThreashold(threashold); + m_pipe->SetOpenThreshold(threshold); } diff --git a/xbmc/filesystem/PipeFile.h b/xbmc/filesystem/PipeFile.h index 27204f10e5..2991d1a68e 100644 --- a/xbmc/filesystem/PipeFile.h +++ b/xbmc/filesystem/PipeFile.h @@ -76,7 +76,7 @@ public: bool IsEmpty(); bool IsClosed(); - void SetOpenThreashold(int threashold); + void SetOpenThreshold(int threshold); protected: int64_t m_pos; diff --git a/xbmc/filesystem/PipesManager.cpp b/xbmc/filesystem/PipesManager.cpp index 63627964d9..5f91ba67f0 100644 --- a/xbmc/filesystem/PipesManager.cpp +++ b/xbmc/filesystem/PipesManager.cpp @@ -46,7 +46,7 @@ Pipe::~Pipe() { } -void Pipe::SetOpenThreashold(int threshold) +void Pipe::SetOpenThreshold(int threshold) { m_nOpenThreshold = threshold; } diff --git a/xbmc/filesystem/PipesManager.h b/xbmc/filesystem/PipesManager.h index 33294b1330..9e4b31aa0b 100644 --- a/xbmc/filesystem/PipesManager.h +++ b/xbmc/filesystem/PipesManager.h @@ -87,7 +87,7 @@ class Pipe bool IsEof(); int GetAvailableRead(); - void SetOpenThreashold(int threshold); + void SetOpenThreshold(int threshold); protected: diff --git a/xbmc/filesystem/SFTPFile.cpp b/xbmc/filesystem/SFTPFile.cpp index 8fad5bd882..c97203b130 100644 --- a/xbmc/filesystem/SFTPFile.cpp +++ b/xbmc/filesystem/SFTPFile.cpp @@ -111,7 +111,7 @@ CSFTPSession::~CSFTPSession() Disconnect(); } -sftp_file CSFTPSession::CreateFileHande(const std::string &file) +sftp_file CSFTPSession::CreateFileHandle(const std::string &file) { if (m_connected) { @@ -603,7 +603,7 @@ bool CSFTPFile::Open(const CURL& url) if (m_session) { m_file = url.GetFileName().c_str(); - m_sftp_handle = m_session->CreateFileHande(m_file); + m_sftp_handle = m_session->CreateFileHandle(m_file); return (m_sftp_handle != NULL); } diff --git a/xbmc/filesystem/SFTPFile.h b/xbmc/filesystem/SFTPFile.h index 973b2df226..229ce4686b 100644 --- a/xbmc/filesystem/SFTPFile.h +++ b/xbmc/filesystem/SFTPFile.h @@ -60,7 +60,7 @@ public: CSFTPSession(const std::string &host, unsigned int port, const std::string &username, const std::string &password); virtual ~CSFTPSession(); - sftp_file CreateFileHande(const std::string &file); + sftp_file CreateFileHandle(const std::string &file); void CloseFileHandle(sftp_file handle); bool GetDirectory(const std::string &base, const std::string &folder, CFileItemList &items); bool DirectoryExists(const char *path); diff --git a/xbmc/input/ButtonTranslator.cpp b/xbmc/input/ButtonTranslator.cpp index 67455196f8..cc628c0316 100644 --- a/xbmc/input/ButtonTranslator.cpp +++ b/xbmc/input/ButtonTranslator.cpp @@ -911,7 +911,7 @@ CAction CButtonTranslator::GetGlobalAction(const CKey &key) return GetAction(-1, key, true); } -bool CButtonTranslator::HasLonpressMapping(int window, const CKey &key) +bool CButtonTranslator::HasLongpressMapping(int window, const CKey &key) { std::map<int, buttonMap>::const_iterator it = m_translatorMap.find(window); if (it != m_translatorMap.end()) @@ -940,11 +940,11 @@ bool CButtonTranslator::HasLonpressMapping(int window, const CKey &key) { // first check if we have a fallback for the window int fallbackWindow = GetFallbackWindow(window); - if (fallbackWindow > -1 && HasLonpressMapping(fallbackWindow, key)) + if (fallbackWindow > -1 && HasLongpressMapping(fallbackWindow, key)) return true; // fallback to default section - return HasLonpressMapping(-1, key); + return HasLongpressMapping(-1, key); } return false; diff --git a/xbmc/input/ButtonTranslator.h b/xbmc/input/ButtonTranslator.h index 1cbac59453..0ccd82ebc6 100644 --- a/xbmc/input/ButtonTranslator.h +++ b/xbmc/input/ButtonTranslator.h @@ -79,7 +79,7 @@ public: \param key to search a mapping for \return true if a longpress mapping exists */ - bool HasLonpressMapping(int window, const CKey &key); + bool HasLongpressMapping(int window, const CKey &key); /*! \brief Obtain the action configured for a given window and key \param window the window id diff --git a/xbmc/input/InputManager.cpp b/xbmc/input/InputManager.cpp index 4f1663fed9..a2015090c0 100644 --- a/xbmc/input/InputManager.cpp +++ b/xbmc/input/InputManager.cpp @@ -368,7 +368,7 @@ bool CInputManager::OnEvent(XBMC_Event& newEvent) // Do not repeat long presses break; } - if (!CButtonTranslator::GetInstance().HasLonpressMapping(g_windowManager.GetActiveWindowID(), key)) + if (!CButtonTranslator::GetInstance().HasLongpressMapping(g_windowManager.GetActiveWindowID(), key)) { m_LastKey.Reset(); OnKey(key); diff --git a/xbmc/linux/RBP.cpp b/xbmc/linux/RBP.cpp index 356d64b0b1..053c10deaf 100644 --- a/xbmc/linux/RBP.cpp +++ b/xbmc/linux/RBP.cpp @@ -103,7 +103,7 @@ bool CRBP::Initialize() return true; } -void CRBP::LogFirmwareVerison() +void CRBP::LogFirmwareVersion() { char response[1024]; m_DllBcmHost->vc_gencmd(response, sizeof response, "version"); diff --git a/xbmc/linux/RBP.h b/xbmc/linux/RBP.h index eff631d24c..10f5776fd4 100644 --- a/xbmc/linux/RBP.h +++ b/xbmc/linux/RBP.h @@ -61,12 +61,12 @@ public: ~CRBP(); bool Initialize(); - void LogFirmwareVerison(); + void LogFirmwareVersion(); void Deinitialize(); int GetArmMem() { return m_arm_mem; } int GetGpuMem() { return m_gpu_mem; } bool GetCodecMpg2() { return m_codec_mpg2_enabled; } - int RasberryPiVersion() { return g_cpuInfo.getCPUCount() == 1 ? 1 : 2; }; + int RaspberryPiVersion() { return g_cpuInfo.getCPUCount() == 1 ? 1 : 2; }; bool GetCodecWvc1() { return m_codec_wvc1_enabled; } void GetDisplaySize(int &width, int &height); DISPMANX_DISPLAY_HANDLE_T OpenDisplay(uint32_t device); diff --git a/xbmc/music/infoscanner/MusicInfoScanner.cpp b/xbmc/music/infoscanner/MusicInfoScanner.cpp index 6bf6628b21..41e248f154 100644 --- a/xbmc/music/infoscanner/MusicInfoScanner.cpp +++ b/xbmc/music/infoscanner/MusicInfoScanner.cpp @@ -416,7 +416,7 @@ bool CMusicInfoScanner::IsScanning() void CMusicInfoScanner::Stop(bool wait /* = false*/) { if (m_bCanInterrupt) - m_musicDatabase.Interupt(); + m_musicDatabase.Interrupt(); StopThread(wait); } diff --git a/xbmc/network/AirTunesServer.cpp b/xbmc/network/AirTunesServer.cpp index 466468539f..2f9e0f796b 100644 --- a/xbmc/network/AirTunesServer.cpp +++ b/xbmc/network/AirTunesServer.cpp @@ -365,7 +365,7 @@ void* CAirTunesServer::AudioOutputFunctions::audio_init(void *cls, int bits, int XFILE::CPipeFile *pipe=(XFILE::CPipeFile *)cls; const CURL pathToUrl(XFILE::PipesManager::GetInstance().GetUniquePipeName()); pipe->OpenForWrite(pathToUrl); - pipe->SetOpenThreashold(300); + pipe->SetOpenThreshold(300); Demux_BXA_FmtHeader header; strncpy(header.fourcc, "BXA ", 4); diff --git a/xbmc/network/cddb.cpp b/xbmc/network/cddb.cpp index 5831a1968d..0cf1caa34b 100644 --- a/xbmc/network/cddb.cpp +++ b/xbmc/network/cddb.cpp @@ -730,7 +730,7 @@ void Xcddb::addInexactListLine(int line_cnt, const char *line, int len) } //------------------------------------------------------------------------------------------------------------------- -void Xcddb::setCDDBIpAdress(const std::string& ip_address) +void Xcddb::setCDDBIpAddress(const std::string& ip_address) { m_cddb_ip_address = ip_address; } diff --git a/xbmc/network/cddb.h b/xbmc/network/cddb.h index ef2dc2ef9c..de8da75eca 100644 --- a/xbmc/network/cddb.h +++ b/xbmc/network/cddb.h @@ -67,7 +67,7 @@ class Xcddb public: Xcddb(); virtual ~Xcddb(); - void setCDDBIpAdress(const std::string& ip_address); + void setCDDBIpAddress(const std::string& ip_address); void setCacheDir(const std::string& pCacheDir ); // int queryCDinfo(int real_track_count, toc cdtoc[]); diff --git a/xbmc/network/websocket/WebSocket.h b/xbmc/network/websocket/WebSocket.h index 6e2c4ae954..769156c94c 100644 --- a/xbmc/network/websocket/WebSocket.h +++ b/xbmc/network/websocket/WebSocket.h @@ -69,7 +69,7 @@ public: virtual int8_t GetExtension() const { return m_extension; } virtual WebSocketFrameOpcode GetOpcode() const { return m_opcode; } virtual bool IsControlFrame() const { return (m_valid && (m_opcode & 0x8) == 0x8); } - virtual bool IsMasekd() const { return m_masked; } + virtual bool IsMasked() const { return m_masked; } virtual uint64_t GetLength() const { return m_length; } virtual int32_t GetMask() const { return m_mask; } virtual const char* GetFrameData() const { return m_data; } diff --git a/xbmc/platform/android/jni/InetAddress.h b/xbmc/platform/android/jni/InetAddress.h index a8fb0f8e78..42119b41f9 100644 --- a/xbmc/platform/android/jni/InetAddress.h +++ b/xbmc/platform/android/jni/InetAddress.h @@ -47,4 +47,4 @@ protected: static const char *m_classname; }; -typedef std::vector<CJNIInetAddress> CJNIInetAddresss; +typedef std::vector<CJNIInetAddress> CJNIInetAddresses; diff --git a/xbmc/platform/xbmc.cpp b/xbmc/platform/xbmc.cpp index 34e5ea67d4..5791e306ff 100644 --- a/xbmc/platform/xbmc.cpp +++ b/xbmc/platform/xbmc.cpp @@ -58,7 +58,7 @@ extern "C" int XBMC_Run(bool renderGUI, CFileItemList &playlist) #ifdef TARGET_RASPBERRY_PI if(!g_RBP.Initialize()) return false; - g_RBP.LogFirmwareVerison(); + g_RBP.LogFirmwareVersion(); #endif if (renderGUI && !g_application.CreateGUI()) diff --git a/xbmc/rendering/dx/RenderSystemDX.cpp b/xbmc/rendering/dx/RenderSystemDX.cpp index 0cd42d1a0c..a2cdc15039 100644 --- a/xbmc/rendering/dx/RenderSystemDX.cpp +++ b/xbmc/rendering/dx/RenderSystemDX.cpp @@ -772,7 +772,7 @@ bool CRenderSystemDX::CreateWindowSizeDependentResources() if (!bNeedRecreate && !bNeedResize) { - CheckInterlasedStereoView(); + CheckInterlacedStereoView(); return true; } @@ -1010,7 +1010,7 @@ bool CRenderSystemDX::CreateWindowSizeDependentResources() CPoint camPoint = { m_nBackBufferWidth * 0.5f, m_nBackBufferHeight * 0.5f }; SetCameraPosition(camPoint, m_nBackBufferWidth, m_nBackBufferHeight); - CheckInterlasedStereoView(); + CheckInterlacedStereoView(); if (bRestoreRTView) m_pContext->OMSetRenderTargets(1, &m_pRenderTargetView, m_depthStencilView); @@ -1025,7 +1025,7 @@ bool CRenderSystemDX::CreateWindowSizeDependentResources() return true; } -void CRenderSystemDX::CheckInterlasedStereoView(void) +void CRenderSystemDX::CheckInterlacedStereoView(void) { RENDER_STEREO_MODE stereoMode = g_graphicsContext.GetStereoMode(); diff --git a/xbmc/rendering/dx/RenderSystemDX.h b/xbmc/rendering/dx/RenderSystemDX.h index e2fcdf54a6..19f5964dba 100644 --- a/xbmc/rendering/dx/RenderSystemDX.h +++ b/xbmc/rendering/dx/RenderSystemDX.h @@ -115,7 +115,7 @@ protected: void OnResize(unsigned int width, unsigned int height); void SetFullScreenInternal(); void GetClosestDisplayModeToCurrent(IDXGIOutput* output, DXGI_MODE_DESC* outCurrentDisplayMode, bool useCached = false); - void CheckInterlasedStereoView(void); + void CheckInterlacedStereoView(void); void SetMaximumFrameLatency(uint8_t latency = -1) const; bool GetStereoEnabled() const; diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp index e745aebf57..89f0414803 100644 --- a/xbmc/settings/Settings.cpp +++ b/xbmc/settings/Settings.cpp @@ -728,7 +728,7 @@ bool CSettings::InitializeDefinitions() #elif defined(TARGET_RASPBERRY_PI) if (CFile::Exists(SETTINGS_XML_FOLDER "rbp.xml") && !Initialize(SETTINGS_XML_FOLDER "rbp.xml")) CLog::Log(LOGFATAL, "Unable to load rbp-specific settings definitions"); - if (g_RBP.RasberryPiVersion() > 1 && CFile::Exists(SETTINGS_XML_FOLDER "rbp2.xml") && !Initialize(SETTINGS_XML_FOLDER "rbp2.xml")) + if (g_RBP.RaspberryPiVersion() > 1 && CFile::Exists(SETTINGS_XML_FOLDER "rbp2.xml") && !Initialize(SETTINGS_XML_FOLDER "rbp2.xml")) CLog::Log(LOGFATAL, "Unable to load rbp2-specific settings definitions"); #elif defined(TARGET_FREEBSD) if (CFile::Exists(SETTINGS_XML_FOLDER "freebsd.xml") && !Initialize(SETTINGS_XML_FOLDER "freebsd.xml")) diff --git a/xbmc/settings/dialogs/GUIDialogAudioDSPManager.cpp b/xbmc/settings/dialogs/GUIDialogAudioDSPManager.cpp index b6301e490c..8a39ebbcb3 100644 --- a/xbmc/settings/dialogs/GUIDialogAudioDSPManager.cpp +++ b/xbmc/settings/dialogs/GUIDialogAudioDSPManager.cpp @@ -306,7 +306,7 @@ bool CGUIDialogAudioDSPManager::OnClickListActive(CGUIMessage &message) return false; } -bool CGUIDialogAudioDSPManager::OnClickRadioContinousSaving(CGUIMessage &message) +bool CGUIDialogAudioDSPManager::OnClickRadioContinuousSaving(CGUIMessage &message) { CGUIRadioButtonControl *radioButton = dynamic_cast<CGUIRadioButtonControl*>(GetControl(CONTROL_RADIO_BUTTON_CONTINUOUS_SAVING)); CGUIButtonControl *applyChangesButton = dynamic_cast<CGUIButtonControl*>(GetControl(CONTROL_BUTTON_APPLY_CHANGES)); @@ -383,7 +383,7 @@ bool CGUIDialogAudioDSPManager::OnMessageClick(CGUIMessage &message) case CONTROL_LIST_ACTIVE: return OnClickListActive(message); case CONTROL_RADIO_BUTTON_CONTINUOUS_SAVING: - return OnClickRadioContinousSaving(message); + return OnClickRadioContinuousSaving(message); case CONTROL_BUTTON_CLEAR_ACTIVE_MODES: return OnClickClearActiveModes(message); case CONTROL_BUTTON_APPLY_CHANGES: diff --git a/xbmc/settings/dialogs/GUIDialogAudioDSPManager.h b/xbmc/settings/dialogs/GUIDialogAudioDSPManager.h index 4843c39eea..3e13225969 100644 --- a/xbmc/settings/dialogs/GUIDialogAudioDSPManager.h +++ b/xbmc/settings/dialogs/GUIDialogAudioDSPManager.h @@ -53,7 +53,7 @@ namespace ActiveAE bool OnClickListAvailable(CGUIMessage &message); bool OnClickListActive(CGUIMessage &message); - bool OnClickRadioContinousSaving(CGUIMessage &message); + bool OnClickRadioContinuousSaving(CGUIMessage &message); bool OnClickApplyChanges(CGUIMessage &message); bool OnClickClearActiveModes(CGUIMessage &message); diff --git a/xbmc/utils/test/TestHttpHeader.cpp b/xbmc/utils/test/TestHttpHeader.cpp index 72a50e1a2f..45c8337858 100644 --- a/xbmc/utils/test/TestHttpHeader.cpp +++ b/xbmc/utils/test/TestHttpHeader.cpp @@ -75,7 +75,7 @@ "\r\n" // local helper function: replace substrings -std::string strReplc(const std::string& str, const std::string& from, const std::string& to) +std::string strReplace(const std::string& str, const std::string& from, const std::string& to) { std::string result; size_t prevPos = 0; @@ -175,14 +175,14 @@ TEST(TestHttpHeader, Parse) EXPECT_STREQ("http://www.Example.Com", testHdr.GetValue("Location").c_str()); // case-sensitive match of value /* check support for '\n' line endings */ - testHdr.Parse(strReplc(CHECK_HEADER_SMPL, "\r\n", "\n")); + testHdr.Parse(strReplace(CHECK_HEADER_SMPL, "\r\n", "\n")); EXPECT_TRUE(testHdr.IsHeaderDone()) << "Completed header has \"parsing not finished\" state"; EXPECT_STRCASEEQ(CHECK_HEADER_SMPL, testHdr.GetHeader().c_str()) << "Parsed header mismatch the original header"; EXPECT_TRUE(testHdr.IsHeaderDone()) << "Completed header has \"parsing not finished\" state"; - testHdr.Parse(strReplc(CHECK_HEADER_L1, "\r\n", "\n")); + testHdr.Parse(strReplace(CHECK_HEADER_L1, "\r\n", "\n")); EXPECT_STRCASEEQ(CHECK_HEADER_L1, testHdr.GetHeader().c_str()) << "Parsed header mismatch the original header"; EXPECT_TRUE(testHdr.IsHeaderDone()) << "Completed header has \"parsing not finished\" state"; - testHdr.Parse(strReplc(CHECK_HEADER_L2, "\r\n", "\n")); + testHdr.Parse(strReplace(CHECK_HEADER_L2, "\r\n", "\n")); EXPECT_STRCASEEQ(CHECK_HEADER_L2, testHdr.GetHeader().c_str()) << "Parsed header mismatch the original header"; EXPECT_TRUE(testHdr.IsHeaderDone()) << "Completed header has \"parsing not finished\" state"; testHdr.Parse(CHECK_PROT_LINE_200 "\n" CHECK_CNT_TYPE_NAME ": " CHECK_CONTENT_TYPE_HTML "\r\n"); // mixed "\n" and "\r\n" @@ -332,7 +332,7 @@ TEST(TestHttpHeader, Parse_Multiline) EXPECT_TRUE(testHdr.IsHeaderDone()) << "Completed header has \"parsing not finished\" state"; EXPECT_GE(strlen("Apache/2.4.7 (Unix) mod_wsgi/3.4 \tPython/2.7.5\t \t \tOpenSSL/1.0.1e"), testHdr.GetValue("Server").length()) << "Length of miltiline value is greater than length of original string"; EXPECT_LE(strlen("Apache/2.4.7 (Unix) mod_wsgi/3.4 Python/2.7.5 OpenSSL/1.0.1e"), testHdr.GetValue("Server").length()) << "Length of miltiline value is less than length of trimmed original string"; - EXPECT_STREQ("Apache/2.4.7(Unix)mod_wsgi/3.4Python/2.7.5OpenSSL/1.0.1e", strReplc(strReplc(testHdr.GetValue("Server"), " ", ""), "\t", "").c_str()) << "Multiline value with removed whitespaces does not match original string with removed whitespaces"; + EXPECT_STREQ("Apache/2.4.7(Unix)mod_wsgi/3.4Python/2.7.5OpenSSL/1.0.1e", strReplace(strReplace(testHdr.GetValue("Server"), " ", ""), "\t", "").c_str()) << "Multiline value with removed whitespaces does not match original string with removed whitespaces"; testHdr.Clear(); testHdr.Parse(CHECK_PROT_LINE_200 "\r\n"); @@ -343,7 +343,7 @@ TEST(TestHttpHeader, Parse_Multiline) EXPECT_TRUE(testHdr.IsHeaderDone()) << "Completed header has \"parsing not finished\" state"; EXPECT_GE(strlen("Apache/2.4.7 (Unix) mod_wsgi/3.4 \tPython/2.7.5\t \t \tOpenSSL/1.0.1e"), testHdr.GetValue("Server").length()) << "Length of miltiline value is greater than length of original string"; EXPECT_LE(strlen("Apache/2.4.7 (Unix) mod_wsgi/3.4 Python/2.7.5 OpenSSL/1.0.1e"), testHdr.GetValue("Server").length()) << "Length of miltiline value is less than length of trimmed original string"; - EXPECT_STREQ("Apache/2.4.7(Unix)mod_wsgi/3.4Python/2.7.5OpenSSL/1.0.1e", strReplc(strReplc(testHdr.GetValue("Server"), " ", ""), "\t", "").c_str()) << "Multiline value with removed whitespaces does not match original string with removed whitespaces"; + EXPECT_STREQ("Apache/2.4.7(Unix)mod_wsgi/3.4Python/2.7.5OpenSSL/1.0.1e", strReplace(strReplace(testHdr.GetValue("Server"), " ", ""), "\t", "").c_str()) << "Multiline value with removed whitespaces does not match original string with removed whitespaces"; } TEST(TestHttpHeader, GetValue) diff --git a/xbmc/utils/test/TestVariant.cpp b/xbmc/utils/test/TestVariant.cpp index 45ee687758..ad9f089907 100644 --- a/xbmc/utils/test/TestVariant.cpp +++ b/xbmc/utils/test/TestVariant.cpp @@ -236,7 +236,7 @@ TEST(TestVariant, swap) EXPECT_TRUE(a.isString()); } -TEST(TestVariant, interator_array) +TEST(TestVariant, iterator_array) { std::vector<std::string> strarray; strarray.push_back("string"); diff --git a/xbmc/video/VideoInfoScanner.cpp b/xbmc/video/VideoInfoScanner.cpp index 5f8dbf85bc..b3bef3e19f 100644 --- a/xbmc/video/VideoInfoScanner.cpp +++ b/xbmc/video/VideoInfoScanner.cpp @@ -126,7 +126,7 @@ namespace VIDEO m_itemCount = -1; // Database operations should not be canceled - // using Interupt() while scanning as it could + // using Interrupt() while scanning as it could // result in unexpected behaviour. m_bCanInterrupt = false; @@ -229,7 +229,7 @@ namespace VIDEO void CVideoInfoScanner::Stop() { if (m_bCanInterrupt) - m_database.Interupt(); + m_database.Interrupt(); m_bStop = true; } |