diff options
author | Pär Björklund <per.bjorklund@gmail.com> | 2017-01-04 11:50:25 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-04 11:50:25 +0100 |
commit | 2ddc58f940d570031175aa8ad23641bdb51c6342 (patch) | |
tree | 1b0102ed863cd4d98455cf3ef4e8fb93c39f15f7 | |
parent | 2255184e4a6999bcaeaf8045c2165fd21fc8a173 (diff) | |
parent | 21c4618505b3681cf3b6e8d0dc12da5166cd2c8d (diff) |
Merge pull request #11362 from jsoref/spelling-CLog
spelling: CLog
30 files changed, 45 insertions, 45 deletions
diff --git a/xbmc/Util.cpp b/xbmc/Util.cpp index 3e385c9bb2..a210d0d078 100644 --- a/xbmc/Util.cpp +++ b/xbmc/Util.cpp @@ -2015,12 +2015,12 @@ void CUtil::ScanForExternalSubtitles(const std::string& strMovie, std::vector<st { if (!g_application.getNetwork().IsAvailable() && !URIUtils::IsHD(CServiceBroker::GetSettings().GetString(CSettings::SETTING_SUBTITLES_CUSTOMPATH))) { - CLog::Log(LOGINFO, "CUtil::CacheSubtitles: disabling alternate subtitle directory for this session, it's nonaccessible"); + CLog::Log(LOGINFO, "CUtil::CacheSubtitles: disabling alternate subtitle directory for this session, it's inaccessible"); CMediaSettings::GetInstance().SetAdditionalSubtitleDirectoryChecked(-1); // disabled } else if (!CDirectory::Exists(CServiceBroker::GetSettings().GetString(CSettings::SETTING_SUBTITLES_CUSTOMPATH))) { - CLog::Log(LOGINFO, "CUtil::CacheSubtitles: disabling alternate subtitle directory for this session, it's nonexistant"); + CLog::Log(LOGINFO, "CUtil::CacheSubtitles: disabling alternate subtitle directory for this session, it's nonexistent"); CMediaSettings::GetInstance().SetAdditionalSubtitleDirectoryChecked(-1); // disabled } diff --git a/xbmc/addons/AddonDatabase.cpp b/xbmc/addons/AddonDatabase.cpp index 4750b423d4..6ab2bcf142 100644 --- a/xbmc/addons/AddonDatabase.cpp +++ b/xbmc/addons/AddonDatabase.cpp @@ -172,7 +172,7 @@ void CAddonDatabase::CreateTables() void CAddonDatabase::CreateAnalytics() { - CLog::Log(LOGINFO, "%s creating indicies", __FUNCTION__); + CLog::Log(LOGINFO, "%s creating indices", __FUNCTION__); m_pDS->exec("CREATE INDEX idxAddons ON addons(addonID)"); m_pDS->exec("CREATE UNIQUE INDEX ix_addonlinkrepo_1 ON addonlinkrepo ( idAddon, idRepo )\n"); m_pDS->exec("CREATE UNIQUE INDEX ix_addonlinkrepo_2 ON addonlinkrepo ( idRepo, idAddon )\n"); diff --git a/xbmc/addons/AddonManager.cpp b/xbmc/addons/AddonManager.cpp index c41b1a2dfd..d0300fad4d 100644 --- a/xbmc/addons/AddonManager.cpp +++ b/xbmc/addons/AddonManager.cpp @@ -237,7 +237,7 @@ static bool LoadManifest(std::set<std::string>& system, std::set<std::string>& o auto root = doc.RootElement(); if (!root || root->ValueStr() != "addons") { - CLog::Log(LOGERROR, "ADDONS: malformatted manifest"); + CLog::Log(LOGERROR, "ADDONS: malformed manifest"); return false; } diff --git a/xbmc/addons/Skin.cpp b/xbmc/addons/Skin.cpp index d860936271..f9a078209b 100644 --- a/xbmc/addons/Skin.cpp +++ b/xbmc/addons/Skin.cpp @@ -735,7 +735,7 @@ bool CSkinInfo::SettingsFromXML(const CXBMCTinyXML &doc, bool loadDefaults /* = else if (setting->GetType() == "bool") m_bools.insert(std::pair<int, CSkinSettingBoolPtr>(number++, std::dynamic_pointer_cast<CSkinSettingBool>(setting))); else - CLog::Log(LOGWARNING, "CSkinInfo: ignoring setting of unknwon type \"%s\"", setting->GetType().c_str()); + CLog::Log(LOGWARNING, "CSkinInfo: ignoring setting of unknown type \"%s\"", setting->GetType().c_str()); } return true; diff --git a/xbmc/addons/interfaces/Addon/AddonCallbacksAddon.cpp b/xbmc/addons/interfaces/Addon/AddonCallbacksAddon.cpp index 1d4c7a5261..af60ec26cc 100644 --- a/xbmc/addons/interfaces/Addon/AddonCallbacksAddon.cpp +++ b/xbmc/addons/interfaces/Addon/AddonCallbacksAddon.cpp @@ -207,7 +207,7 @@ bool CAddonCallbacksAddon::GetAddonSetting(void *addonData, const char *strSetti if (!addonHelper->m_addon->ReloadSettings()) { - CLog::Log(LOGERROR, "CAddonCallbacksAddon - %s - could't get settings for add-on '%s'", __FUNCTION__, addonHelper->m_addon->Name().c_str()); + CLog::Log(LOGERROR, "CAddonCallbacksAddon - %s - couldn't get settings for add-on '%s'", __FUNCTION__, addonHelper->m_addon->Name().c_str()); return false; } diff --git a/xbmc/addons/interfaces/AudioDSP/AddonCallbacksAudioDSP.cpp b/xbmc/addons/interfaces/AudioDSP/AddonCallbacksAudioDSP.cpp index 1bf15fb19c..acbede0169 100644 --- a/xbmc/addons/interfaces/AudioDSP/AddonCallbacksAudioDSP.cpp +++ b/xbmc/addons/interfaces/AudioDSP/AddonCallbacksAudioDSP.cpp @@ -139,7 +139,7 @@ void CAddonCallbacksADSP::ADSPRegisterMode(void* addonData, AE_DSP_MODES::AE_DSP if (idMode > AE_DSP_INVALID_ADDON_ID) { - CLog::Log(LOGDEBUG, "Audio DSP - %s - successfull registered mode %s of %s adsp-addon", __FUNCTION__, mode->strModeName, addon->Name().c_str()); + CLog::Log(LOGDEBUG, "Audio DSP - %s - successfully registered mode %s of %s adsp-addon", __FUNCTION__, mode->strModeName, addon->Name().c_str()); } else { diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp index d66993a095..8a01e384ce 100644 --- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp +++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp @@ -806,7 +806,7 @@ bool CAESinkALSA::InitializeHW(const ALSAConfig &inconfig, ALSAConfig &outconfig || snd_pcm_hw_params(m_pcm, hw_params_copy) != 0) { // set default that Alsa would choose - CLog::Log(LOGWARNING, "CAESinkAlsa::IntializeHW - Using default alsa values - set failed"); + CLog::Log(LOGWARNING, "CAESinkAlsa::InitializeHW - Using default alsa values - set failed"); if (snd_pcm_hw_params(m_pcm, hw_params) != 0) { CLog::Log(LOGDEBUG, "CAESinkALSA::InitializeHW - Could not init a valid sink"); diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp index dbba74277a..f8100b3d17 100644 --- a/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp +++ b/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp @@ -1118,7 +1118,7 @@ initialize: audioSinkBufferDurationMsec = (REFERENCE_TIME)500000; if (IsUSBDevice()) { - CLog::Log(LOGDEBUG, __FUNCTION__": detected USB device, increating buffer size"); + CLog::Log(LOGDEBUG, __FUNCTION__": detected USB device, increasing buffer size"); audioSinkBufferDurationMsec = (REFERENCE_TIME)1000000; } audioSinkBufferDurationMsec = (REFERENCE_TIME)((audioSinkBufferDurationMsec / format.m_frameSize) * format.m_frameSize); //even number of frames diff --git a/xbmc/cores/RetroPlayer/RetroPlayerAudio.cpp b/xbmc/cores/RetroPlayer/RetroPlayerAudio.cpp index 8679b5c790..3511434182 100644 --- a/xbmc/cores/RetroPlayer/RetroPlayerAudio.cpp +++ b/xbmc/cores/RetroPlayer/RetroPlayerAudio.cpp @@ -139,7 +139,7 @@ void CRetroPlayerAudio::AddData(const uint8_t* data, unsigned int size) int consumed = m_pAudioCodec->Decode(const_cast<uint8_t*>(data), size, DVD_NOPTS_VALUE, DVD_NOPTS_VALUE); if (consumed < 0) { - CLog::Log(LOGERROR, "CRretroPlayerAudio::AddData - Decode Error (%d)", consumed); + CLog::Log(LOGERROR, "CRetroPlayerAudio::AddData - Decode Error (%d)", consumed); m_pAudioCodec.reset(); return; } diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp index b1147d2efd..24f3f81a9b 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp @@ -1391,7 +1391,7 @@ void CIMXContext::OnResetDisplay() bool CIMXContext::TaskRestart() { - CLog::Log(LOGINFO, "iMX : %s - restarting IMX rendererer\n", __FUNCTION__); + CLog::Log(LOGINFO, "iMX : %s - restarting IMX renderer\n", __FUNCTION__); // Stop the ipu thread Stop(); MemMap(); @@ -1966,7 +1966,7 @@ bool CIMXContext::CaptureDisplay(unsigned char *&buffer, int iWidth, int iHeight CLog::Log(LOGERROR, "iMX : Error allocating capture buffer\n"); if (m_bufferCapture && g2d_free(m_bufferCapture)) - CLog::Log(LOGERROR, "iMX : Error while freeing capture buuffer\n"); + CLog::Log(LOGERROR, "iMX : Error while freeing capture buffer\n"); if (m_g2dHandle && !g2d_close(m_g2dHandle)) m_g2dHandle = NULL; diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/OpenMaxVideo.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/OpenMaxVideo.cpp index 4b94f25b66..caae4e9600 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/OpenMaxVideo.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/OpenMaxVideo.cpp @@ -947,7 +947,7 @@ OMX_ERRORTYPE COpenMaxVideo::DecoderEventHandler( else if (ctx->m_omx_output_port == (int)nData2) { sem_post(ctx->m_omx_flush_output); - CLog::Log(LOGDEBUG, "COpenMax::%s - OMX_CommandFlush ouput\n",__func__); + CLog::Log(LOGDEBUG, "COpenMax::%s - OMX_CommandFlush output\n",__func__); } else */ diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp index 8a7765865a..435cd2bf31 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp @@ -346,7 +346,7 @@ bool CDVDDemuxFFmpeg::Open(CDVDInputStream* pInput, bool streaminfo, bool filein { // not dts either, return false in case we were explicitely // requested to only check for S/PDIF padded compressed audio - CLog::Log(LOGDEBUG, "%s - not spdif or dts file, fallbacking", __FUNCTION__); + CLog::Log(LOGDEBUG, "%s - not spdif or dts file, falling back", __FUNCTION__); return false; } } diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.cpp index 0887764e85..e62f9c8c07 100644 --- a/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.cpp +++ b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.cpp @@ -788,7 +788,7 @@ void CLinuxRendererGL::UpdateVideoFilter() if(!Supports(m_scalingMethod)) { - CLog::Log(LOGWARNING, "CLinuxRendererGL::UpdateVideoFilter - choosen scaling method %d, is not supported by renderer", (int)m_scalingMethod); + CLog::Log(LOGWARNING, "CLinuxRendererGL::UpdateVideoFilter - chosen scaling method %d, is not supported by renderer", (int)m_scalingMethod); m_scalingMethod = VS_SCALINGMETHOD_LINEAR; } diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.cpp index 94cac36708..a8db936b3e 100644 --- a/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.cpp +++ b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.cpp @@ -533,7 +533,7 @@ void CLinuxRendererGLES::UpdateVideoFilter() if(!Supports(m_scalingMethod)) { - CLog::Log(LOGWARNING, "CLinuxRendererGLES::UpdateVideoFilter - choosen scaling method %d, is not supported by renderer", (int)m_scalingMethod); + CLog::Log(LOGWARNING, "CLinuxRendererGLES::UpdateVideoFilter - chosen scaling method %d, is not supported by renderer", (int)m_scalingMethod); m_scalingMethod = VS_SCALINGMETHOD_LINEAR; } diff --git a/xbmc/cores/omxplayer/OMXAudio.cpp b/xbmc/cores/omxplayer/OMXAudio.cpp index be50e7a01d..fcec25db0c 100644 --- a/xbmc/cores/omxplayer/OMXAudio.cpp +++ b/xbmc/cores/omxplayer/OMXAudio.cpp @@ -789,7 +789,7 @@ bool COMXAudio::Initialize(AEAudioFormat format, OMXClock *clock, CDVDStreamInfo omx_err = m_omx_decoder.SetParameter(OMX_IndexParamPortDefinition, &port_param); if(omx_err != OMX_ErrorNone) { - CLog::Log(LOGERROR, "COMXAudio::Initialize error set OMX_IndexParamPortDefinition (intput) omx_err(0x%08x)\n", omx_err); + CLog::Log(LOGERROR, "COMXAudio::Initialize error set OMX_IndexParamPortDefinition (input) omx_err(0x%08x)\n", omx_err); return false; } @@ -1181,7 +1181,7 @@ unsigned int COMXAudio::AddPackets(const void* data, unsigned int len, double dt omx_err = m_omx_decoder.EmptyThisBuffer(omx_buffer); if (omx_err != OMX_ErrorNone) { - CLog::Log(LOGERROR, "%s::%s - OMX_EmptyThisBuffer() finaly failed\n", CLASSNAME, __func__); + CLog::Log(LOGERROR, "%s::%s - OMX_EmptyThisBuffer() finally failed\n", CLASSNAME, __func__); m_omx_decoder.DecoderEmptyBufferDone(m_omx_decoder.GetComponent(), omx_buffer); return 0; } diff --git a/xbmc/filesystem/CurlFile.cpp b/xbmc/filesystem/CurlFile.cpp index 5f63397ba5..9171adc66a 100644 --- a/xbmc/filesystem/CurlFile.cpp +++ b/xbmc/filesystem/CurlFile.cpp @@ -1848,10 +1848,10 @@ bool CCurlFile::GetContentType(const CURL &url, std::string &content, const std: content = "x-directory/normal"; else content = file.GetContent(); - CLog::Log(LOGDEBUG, "CCurlFile::GetConentType - %s -> %s", redactUrl.c_str(), content.c_str()); + CLog::Log(LOGDEBUG, "CCurlFile::GetContentType - %s -> %s", redactUrl.c_str(), content.c_str()); return true; } - CLog::Log(LOGDEBUG, "CCurlFile::GetConentType - %s -> failed", redactUrl.c_str()); + CLog::Log(LOGDEBUG, "CCurlFile::GetContentType - %s -> failed", redactUrl.c_str()); content.clear(); return false; } diff --git a/xbmc/filesystem/SFTPFile.cpp b/xbmc/filesystem/SFTPFile.cpp index 18e7558c6d..c78bb994a9 100644 --- a/xbmc/filesystem/SFTPFile.cpp +++ b/xbmc/filesystem/SFTPFile.cpp @@ -335,7 +335,7 @@ bool CSFTPSession::VerifyKnownHost(ssh_session session) case SSH_SERVER_FILE_NOT_FOUND: CLog::Log(LOGINFO, "SFTPSession: Server file was not found, creating a new one"); case SSH_SERVER_NOT_KNOWN: - CLog::Log(LOGINFO, "SFTPSession: Server unkown, we trust it for now"); + CLog::Log(LOGINFO, "SFTPSession: Server unknown, we trust it for now"); if (ssh_write_knownhost(session) < 0) { CLog::Log(LOGERROR, "CSFTPSession: Failed to save host '%s'", strerror(errno)); diff --git a/xbmc/interfaces/legacy/CallbackHandler.cpp b/xbmc/interfaces/legacy/CallbackHandler.cpp index c4cb958203..fd2e9798fd 100644 --- a/xbmc/interfaces/legacy/CallbackHandler.cpp +++ b/xbmc/interfaces/legacy/CallbackHandler.cpp @@ -117,7 +117,7 @@ namespace XBMCAddon catch (XbmcCommons::Exception& e) { e.LogThrowMessage(); } catch (...) { - CLog::Log(LOGERROR,"Unknown exception while executeing callback 0x%lx", (long)(p->cb.get())); + CLog::Log(LOGERROR,"Unknown exception while executing callback 0x%lx", (long)(p->cb.get())); } } } diff --git a/xbmc/linux/DBusReserve.cpp b/xbmc/linux/DBusReserve.cpp index 6c91b3fa8c..908e18ba2e 100644 --- a/xbmc/linux/DBusReserve.cpp +++ b/xbmc/linux/DBusReserve.cpp @@ -84,7 +84,7 @@ bool CDBusReserve::AcquireDevice(const std::string& device) } else if(res == DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) { - CLog::Log(LOGDEBUG, "CDBusReserve::AcquireDevice(%s): Request name succeded", device.c_str()); + CLog::Log(LOGDEBUG, "CDBusReserve::AcquireDevice(%s): Request name succeeded", device.c_str()); m_devs.push_back(device); return true; } @@ -162,7 +162,7 @@ bool CDBusReserve::ReleaseDevice(const std::string& device) std::vector<std::string>::iterator it = find(m_devs.begin(), m_devs.end(), device); if(it == m_devs.end()) { - CLog::Log(LOGDEBUG, "CDBusReserve::ReleaseDevice(%s): device wasn't aquired here", device.c_str()); + CLog::Log(LOGDEBUG, "CDBusReserve::ReleaseDevice(%s): device wasn't acquired here", device.c_str()); return false; } m_devs.erase(it); diff --git a/xbmc/linux/OMXCore.cpp b/xbmc/linux/OMXCore.cpp index 90f246b0c5..d86692fc96 100644 --- a/xbmc/linux/OMXCore.cpp +++ b/xbmc/linux/OMXCore.cpp @@ -592,7 +592,7 @@ OMX_ERRORTYPE COMXCoreComponent::AllocInputBuffers() m_input_buffer_count = portFormat.nBufferCountActual; m_input_buffer_size = portFormat.nBufferSize; - CLog::Log(LOGDEBUG, "COMXCoreComponent::AllocInputBuffers component(%s) - port(%d), nBufferCountMin(%u), nBufferCountActual(%u), nBufferSize(%u), nBufferAlignmen(%u)\n", + CLog::Log(LOGDEBUG, "COMXCoreComponent::AllocInputBuffers component(%s) - port(%d), nBufferCountMin(%u), nBufferCountActual(%u), nBufferSize(%u), nBufferAlignment(%u)\n", m_componentName.c_str(), GetInputPort(), portFormat.nBufferCountMin, portFormat.nBufferCountActual, portFormat.nBufferSize, portFormat.nBufferAlignment); @@ -658,7 +658,7 @@ OMX_ERRORTYPE COMXCoreComponent::AllocOutputBuffers() m_output_buffer_count = portFormat.nBufferCountActual; m_output_buffer_size = portFormat.nBufferSize; - CLog::Log(LOGDEBUG, "COMXCoreComponent::AllocOutputBuffers component(%s) - port(%d), nBufferCountMin(%u), nBufferCountActual(%u), nBufferSize(%u) nBufferAlignmen(%u)\n", + CLog::Log(LOGDEBUG, "COMXCoreComponent::AllocOutputBuffers component(%s) - port(%d), nBufferCountMin(%u), nBufferCountActual(%u), nBufferSize(%u) nBufferAlignment(%u)\n", m_componentName.c_str(), m_output_port, portFormat.nBufferCountMin, portFormat.nBufferCountActual, portFormat.nBufferSize, portFormat.nBufferAlignment); @@ -1264,7 +1264,7 @@ OMX_ERRORTYPE COMXCoreComponent::UseEGLImage(OMX_BUFFERHEADERTYPE** ppBufferHdr, return omx_err; } - CLog::Log(LOGDEBUG, "%s::%s component(%s) - port(%d), nBufferCountMin(%u), nBufferCountActual(%u), nBufferSize(%u) nBufferAlignmen(%u)\n", + CLog::Log(LOGDEBUG, "%s::%s component(%s) - port(%d), nBufferCountMin(%u), nBufferCountActual(%u), nBufferSize(%u) nBufferAlignment(%u)\n", CLASSNAME, __func__, m_componentName.c_str(), m_output_port, portFormat.nBufferCountMin, portFormat.nBufferCountActual, portFormat.nBufferSize, portFormat.nBufferAlignment); diff --git a/xbmc/linux/XFileUtils.cpp b/xbmc/linux/XFileUtils.cpp index 78789553b1..ae9701a5f9 100644 --- a/xbmc/linux/XFileUtils.cpp +++ b/xbmc/linux/XFileUtils.cpp @@ -128,7 +128,7 @@ HANDLE CreateFile(LPCTSTR lpFileName, DWORD dwDesiredAccess, fd = open(igFileName.c_str(), flags, mode); if (fd != -1) { - CLog::Log(LOGWARNING,"%s, successfuly opened <%s> instead of <%s>", __FUNCTION__, igFileName.c_str(), lpFileName); + CLog::Log(LOGWARNING,"%s, successfully opened <%s> instead of <%s>", __FUNCTION__, igFileName.c_str(), lpFileName); strResultFile = igFileName; } } diff --git a/xbmc/music/infoscanner/MusicInfoScanner.cpp b/xbmc/music/infoscanner/MusicInfoScanner.cpp index 5eb4229f03..1852926b40 100644 --- a/xbmc/music/infoscanner/MusicInfoScanner.cpp +++ b/xbmc/music/infoscanner/MusicInfoScanner.cpp @@ -721,7 +721,7 @@ void CMusicInfoScanner::FileItemsToAlbums(CFileItemList& items, VECALBUMS& album if (!compilation && !songsByAlbumName->first.empty() && isCompilation) { compilation = true; - CLog::Log(LOGDEBUG, "Album '%s' is a compilation as all songs are marked aspart of a compilation", songsByAlbumName->first.c_str()); + CLog::Log(LOGDEBUG, "Album '%s' is a compilation as all songs are marked as part of a compilation", songsByAlbumName->first.c_str()); } /* diff --git a/xbmc/network/AirPlayServer.cpp b/xbmc/network/AirPlayServer.cpp index 83473d54e1..9484b9e07e 100644 --- a/xbmc/network/AirPlayServer.cpp +++ b/xbmc/network/AirPlayServer.cpp @@ -718,7 +718,7 @@ bool CAirPlayServer::CTCPClient::checkAuthorization(const std::string& authStr, } else { - CLog::Log(LOGDEBUG, "AirAuth: successfull authentication from AirPlay client"); + CLog::Log(LOGDEBUG, "AirAuth: successful authentication from AirPlay client"); } } m_bAuthenticated = authValid; diff --git a/xbmc/network/cddb.cpp b/xbmc/network/cddb.cpp index 4267697bfc..eb45f9bd66 100644 --- a/xbmc/network/cddb.cpp +++ b/xbmc/network/cddb.cpp @@ -211,7 +211,7 @@ bool Xcddb::queryCDinfo(CCdInfo* pInfo, int inexact_list_select) std::string read_buffer = getInexactCommand(inexact_list_select); if (read_buffer.empty()) { - CLog::Log(LOGERROR, "Xcddb::queryCDinfo_inexaxt_list_select Size of inexaxt_list_select are 0"); + CLog::Log(LOGERROR, "Xcddb::queryCDinfo_inexact_list_select Size of inexact_list_select are 0"); m_lastError = E_PARAMETER_WRONG; return false; } @@ -222,8 +222,8 @@ bool Xcddb::queryCDinfo(CCdInfo* pInfo, int inexact_list_select) Recv(false); // Clear pending data on our connection if (!Send(read_buffer.c_str())) { - CLog::Log(LOGERROR, "Xcddb::queryCDinfo_inexaxt_list_select Error sending \"%s\"", read_buffer.c_str()); - CLog::Log(LOGERROR, "Xcddb::queryCDinfo_inexaxt_list_select pInfo == NULL"); + CLog::Log(LOGERROR, "Xcddb::queryCDinfo_inexact_list_select Error sending \"%s\"", read_buffer.c_str()); + CLog::Log(LOGERROR, "Xcddb::queryCDinfo_inexact_list_select pInfo == NULL"); m_lastError = E_NETWORK_ERROR_SEND; return false; } @@ -242,7 +242,7 @@ bool Xcddb::queryCDinfo(CCdInfo* pInfo, int inexact_list_select) case 403: //Database entry is corrupt. case 409: //No handshake. default: - CLog::Log(LOGERROR, "Xcddb::queryCDinfo_inexaxt_list_select Error: \"%s\"", recv_buffer.c_str()); + CLog::Log(LOGERROR, "Xcddb::queryCDinfo_inexact_list_select Error: \"%s\"", recv_buffer.c_str()); return false; } @@ -251,7 +251,7 @@ bool Xcddb::queryCDinfo(CCdInfo* pInfo, int inexact_list_select) // Quit if ( ! Send("quit") ) { - CLog::Log(LOGERROR, "Xcddb::queryCDinfo_inexaxt_list_select Error sending \"%s\"", "quit"); + CLog::Log(LOGERROR, "Xcddb::queryCDinfo_inexact_list_select Error sending \"%s\"", "quit"); m_lastError = E_NETWORK_ERROR_SEND; return false; } @@ -265,7 +265,7 @@ bool Xcddb::queryCDinfo(CCdInfo* pInfo, int inexact_list_select) case 530: //error, closing connection. default: - CLog::Log(LOGERROR, "Xcddb::queryCDinfo_inexaxt_list_select Error: \"%s\"", recv_buffer.c_str()); + CLog::Log(LOGERROR, "Xcddb::queryCDinfo_inexact_list_select Error: \"%s\"", recv_buffer.c_str()); return false; } @@ -274,7 +274,7 @@ bool Xcddb::queryCDinfo(CCdInfo* pInfo, int inexact_list_select) // Close connection if ( !closeSocket() ) { - CLog::Log(LOGERROR, "Xcddb::queryCDinfo_inexaxt_list_select Error closing socket"); + CLog::Log(LOGERROR, "Xcddb::queryCDinfo_inexact_list_select Error closing socket"); m_lastError = E_NETWORK_ERROR_SEND; return false; } diff --git a/xbmc/network/upnp/UPnP.cpp b/xbmc/network/upnp/UPnP.cpp index d50a7d01c4..705a9227c7 100644 --- a/xbmc/network/upnp/UPnP.cpp +++ b/xbmc/network/upnp/UPnP.cpp @@ -215,7 +215,7 @@ public: path += id.c_str(); } - CLog::Log(LOGDEBUG, "UPNP: notfified container update %s", (const char*)path); + CLog::Log(LOGDEBUG, "UPNP: notified container update %s", (const char*)path); CGUIMessage message(GUI_MSG_NOTIFY_ALL, 0, 0, GUI_MSG_UPDATE_PATH); message.SetStringParam(path.GetChars()); g_windowManager.SendThreadMessage(message); diff --git a/xbmc/rendering/dx/RenderSystemDX.cpp b/xbmc/rendering/dx/RenderSystemDX.cpp index 21c571db1d..a99a153069 100644 --- a/xbmc/rendering/dx/RenderSystemDX.cpp +++ b/xbmc/rendering/dx/RenderSystemDX.cpp @@ -203,7 +203,7 @@ void CRenderSystemDX::OnMove() SetMonitor(newMonitor); if (m_needNewDevice) { - CLog::Log(LOGDEBUG, "%s - Adapter changed, reseting render system.", __FUNCTION__); + CLog::Log(LOGDEBUG, "%s - Adapter changed, resetting render system.", __FUNCTION__); ResetRenderSystem(m_nBackBufferWidth, m_nBackBufferHeight, m_bFullScreenDevice, m_refreshRate); } } @@ -1852,7 +1852,7 @@ void CRenderSystemDX::InitHooks() if (!deviceFound) return; - CLog::Log(LOGDEBUG, __FUNCTION__": Hookind into UserModeDriver on device %S. ", displayDevice.DeviceKey); + CLog::Log(LOGDEBUG, __FUNCTION__": Hooking into UserModeDriver on device %S. ", displayDevice.DeviceKey); wchar_t* keyName = #ifndef _M_X64 // on x64 system and x32 build use UserModeDriverNameWow key @@ -1916,7 +1916,7 @@ void CRenderSystemDX::InitHooks() } if (lstat != ERROR_SUCCESS) - CLog::Log(LOGDEBUG, __FUNCTION__": error open regystry key with error %ld.", lstat); + CLog::Log(LOGDEBUG, __FUNCTION__": error open registry key with error %ld.", lstat); if (hKey != 0) RegCloseKey(hKey); diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp index b807232652..07db1005dc 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp @@ -991,7 +991,7 @@ void CAdvancedSettings::ParseSettingsFile(const std::string &file) if (!strFrom.empty() && !strTo.empty()) { - CLog::Log(LOGDEBUG," Registering substition pair:"); + CLog::Log(LOGDEBUG," Registering substitution pair:"); CLog::Log(LOGDEBUG," From: [%s]", strFrom.c_str()); CLog::Log(LOGDEBUG," To: [%s]", strTo.c_str()); m_pathSubstitutions.push_back(std::make_pair(strFrom,strTo)); diff --git a/xbmc/utils/UrlOptions.cpp b/xbmc/utils/UrlOptions.cpp index 773e300c13..9f351dac1b 100644 --- a/xbmc/utils/UrlOptions.cpp +++ b/xbmc/utils/UrlOptions.cpp @@ -121,7 +121,7 @@ void CUrlOptions::AddOptions(const std::string &options) { // remove leading ?, #, ; or | if present if (!m_strLead.empty()) - CLog::Log(LOGWARNING, "%s: original leading str %s overrided by %c", __FUNCTION__, m_strLead.c_str(), strOptions.at(0)); + CLog::Log(LOGWARNING, "%s: original leading str %s overridden by %c", __FUNCTION__, m_strLead.c_str(), strOptions.at(0)); m_strLead = strOptions.at(0); strOptions.erase(0, 1); } diff --git a/xbmc/video/VideoDatabase.cpp b/xbmc/video/VideoDatabase.cpp index 03f9f967b7..0999b5f947 100644 --- a/xbmc/video/VideoDatabase.cpp +++ b/xbmc/video/VideoDatabase.cpp @@ -233,7 +233,7 @@ void CVideoDatabase::CreateAnalytics() /* advantage of a index that has been created on ( bar_id, foo_id ) */ /* however an index on ( foo_id, bar_id ) will be considered for use */ - CLog::Log(LOGINFO, "%s - creating indicies", __FUNCTION__); + CLog::Log(LOGINFO, "%s - creating indices", __FUNCTION__); m_pDS->exec("CREATE INDEX ix_bookmark ON bookmark (idFile, type)"); m_pDS->exec("CREATE UNIQUE INDEX ix_settings ON settings ( idFile )\n"); m_pDS->exec("CREATE UNIQUE INDEX ix_stacktimes ON stacktimes ( idFile )\n"); diff --git a/xbmc/view/ViewDatabase.cpp b/xbmc/view/ViewDatabase.cpp index f6821d30d1..d595086dff 100644 --- a/xbmc/view/ViewDatabase.cpp +++ b/xbmc/view/ViewDatabase.cpp @@ -62,7 +62,7 @@ void CViewDatabase::CreateTables() void CViewDatabase::CreateAnalytics() { - CLog::Log(LOGINFO, "%s - creating indicies", __FUNCTION__); + CLog::Log(LOGINFO, "%s - creating indices", __FUNCTION__); m_pDS->exec("CREATE INDEX idxViews ON view(path)"); m_pDS->exec("CREATE INDEX idxViewsWindow ON view(window)"); } |