diff options
| author | Josh Soref <jsoref@users.noreply.github.com> | 2017-01-03 05:23:25 +0000 |
|---|---|---|
| committer | Josh Soref <jsoref@users.noreply.github.com> | 2017-01-03 05:23:25 +0000 |
| commit | 45d0a28a6a63170cf194447dc68ea12459106d80 (patch) | |
| tree | 9c229f679a0cd5d46079519b9a47d53ef576dcbd | |
| parent | b953c42a1958f9ef19205a39eea6bb755d66de74 (diff) | |
spelling: comments
399 files changed, 736 insertions, 736 deletions
diff --git a/CODING_GUIDELINES.dox b/CODING_GUIDELINES.dox index 48ac61b5c8..374d542659 100644 --- a/CODING_GUIDELINES.dox +++ b/CODING_GUIDELINES.dox @@ -146,7 +146,7 @@ doSomething(e); doSomething(f); // this is probably bad style anyway \subsection code_guidelines_3_1 No vertical alignment Do not use whitespaces to align value names together, this becomes problematic -on updates to see the change, if the whitspaces need to change on all. +on updates to see the change, if the whitespace need to change on all. This should be not used: ~~~~~~~~~~~~~ diff --git a/addons/metadata.common.imdb.com/changelog.txt b/addons/metadata.common.imdb.com/changelog.txt index 9d4ea1ba8f..06c044d431 100644 --- a/addons/metadata.common.imdb.com/changelog.txt +++ b/addons/metadata.common.imdb.com/changelog.txt @@ -39,7 +39,7 @@ - fixed: MetaCritic Score [B]2.7.3[/B] -- fixed: orginal title won't scrape in some cases +- fixed: original title won't scrape in some cases [B]2.7.2[/B] - changed: make sure to parse the intended page @@ -129,10 +129,10 @@ - reverted: fixchars removed from cast parsing, leads to Dharma Beta2 hanging, will be added back once next Beta is out [B]2.0.2[/B] -- fixed: some more cast won't get scraped under certain circumtances +- fixed: some more cast won't get scraped under certain circumstances [B]2.0.1[/B] -- fixed: cast won't get scraped under certain circumtances +- fixed: cast won't get scraped under certain circumstances [B]2.0.0[/B] - changed: adapted new IMDb layout diff --git a/addons/metadata.themoviedb.org/changelog.txt b/addons/metadata.themoviedb.org/changelog.txt index c407bdcf1e..92065c205a 100644 --- a/addons/metadata.themoviedb.org/changelog.txt +++ b/addons/metadata.themoviedb.org/changelog.txt @@ -104,7 +104,7 @@ - fixed: movies without release date won't find [B]3.0.7[/B] -- fixed: keep originaltitle; IMDb ID; remove TMDb title fallback, because it became obsolate +- fixed: keep originaltitle; IMDb ID; remove TMDb title fallback, because it became obsolete [B]3.0.6[/B] - updated chinese translation diff --git a/addons/metadata.tvdb.com/changelog.txt b/addons/metadata.tvdb.com/changelog.txt index d8698b406c..aae1ec2f9e 100644 --- a/addons/metadata.tvdb.com/changelog.txt +++ b/addons/metadata.tvdb.com/changelog.txt @@ -83,7 +83,7 @@ v1.2.4 - Added: support for imdb url nfo's v1.2.3 -- Fixed: fixed broken scraping under certain circumtaces +- Fixed: fixed broken scraping under certain circumstances v1.2.2 - Fixed: episodeguide url won't picked up sometimes diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po index eec9e8636a..0242b2c53d 100644 --- a/addons/resource.language.en_gb/resources/strings.po +++ b/addons/resource.language.en_gb/resources/strings.po @@ -1300,7 +1300,7 @@ msgctxt "#283" msgid "Search results" msgstr "" -#. generic "no search results found" label used in diferent places +#. generic "no search results found" label used in different places #: xbmc/pvr/windows/GUIWindowPVRSearch.cpp #: xbmc/video/dialogs/GUIDialogVideoInfo.cpp #: xbmc/video/windows/GUIWindowVideoBase.cpp @@ -2716,7 +2716,7 @@ msgctxt "#592" msgid "One" msgstr "" -#. Label used for buttons and select options as a reference to match all items or ocurrences. +#. Label used for buttons and select options as a reference to match all items or occurrences. #: xbmc/dialogs/GUIDialogMediaFilter.cpp #: xbmc/filesystem/AddonsDirectory.cpp #: xbmc/PlayListPlayer.cpp @@ -3498,7 +3498,7 @@ msgstr "" #empty strings from id 800 to 801 -#. Label of progess bar which shows the available/total space of pvr backend +#. Label of progress bar which shows the available/total space of pvr backend #: xbmc/pvr/PVRGUIInfo.cpp msgctxt "#802" msgid "%s of %s available" @@ -8911,7 +8911,7 @@ msgctxt "#19003" msgid "Find similar" msgstr "" -#. label for epg import progess control +#. label for epg import progress control #: xbmc/epg/EpgContainer.cpp msgctxt "#19004" msgid "Importing guide from clients" @@ -9090,7 +9090,7 @@ msgctxt "#19029" msgid "Channel" msgstr "" -#. generic 'now' label used in diffrent places +#. generic 'now' label used in different places #: addons/skin.estuary/1080i/DialogPVRRadioRDSInfo.xml #: addons/skin.estuary/1080i/MyWeather.xml #: xbmc/pvr/windows/GUIWindowPVRGuide.cpp @@ -9098,7 +9098,7 @@ msgctxt "#19030" msgid "Now" msgstr "" -#. generic 'next' label used in diffrent places in pvr context +#. generic 'next' label used in different places in pvr context #: addons/skin.estuary/1080i/DialogFullScreenInfo.xml #: addons/skin.estuary/1080i/DialogPVRRadioRDSInfo.xml #: addons/skin.estuary/1080i/MyPVRChannels.xml @@ -9454,7 +9454,7 @@ msgstr "" #. Label for "Instant recording action" setting #: system/settings/settings.xml -#: xbmc/pvr/PVRMananger.cpp +#: xbmc/pvr/PVRManager.cpp msgctxt "#19086" msgid "Instant recording action" msgstr "" @@ -9478,19 +9478,19 @@ msgid "Ask what to do" msgstr "" #. Label for "Instant recording action" dialog settings value -#: xbmc/pvr/PVRMananger.cpp +#: xbmc/pvr/PVRManager.cpp msgctxt "#19090" msgid "Record the next %d minutes" msgstr "" #. Label for "Instant recording action" dialog settings value -#: xbmc/pvr/PVRMananger.cpp +#: xbmc/pvr/PVRManager.cpp msgctxt "#19091" msgid "Record current show (%s)" msgstr "" #. Label for "Instant recording action" dialog settings value -#: xbmc/pvr/PVRMananger.cpp +#: xbmc/pvr/PVRManager.cpp msgctxt "#19092" msgid "Record next show (%s)" msgstr "" @@ -15041,7 +15041,7 @@ msgctxt "#24141" msgid "Add-on disabled" msgstr "" -#. The dependency on <addon id> version <addon version> coult not be satisfied. +#. The dependency on <addon id> version <addon version> could not be satisfied. #: xbmc/addons/AddonInstaller.cpp msgctxt "#24142" msgid "The dependency on %s version %s could not be satisfied." @@ -15262,7 +15262,7 @@ msgctxt "#29903" msgid "Composer" msgstr "" -#. Artits which sing the music (if present) +#. Artists which sing the music (if present) #: addons/skin.estuary/1080i/DialogPVRRadioRDSInfo.xml msgctxt "#29904" msgid "Artist" @@ -19714,7 +19714,7 @@ msgctxt "#36618" msgid "Add-ons will be given access to personal data stored on this device. By allowing, you agree that you are solely responsible for any loss of data, unwanted behaviour, or damage to your device. Proceed?" msgstr "" -#. Label of a setting, allow the user to specifiy high quality downscaling of pictures +#. Label of a setting, allow the user to specify high quality downscaling of pictures #: system/settings/settings.xml msgctxt "#36619" msgid "High quality downscaling" diff --git a/addons/service.xbmc.versioncheck/lib/versions.py b/addons/service.xbmc.versioncheck/lib/versions.py index af3cc076d2..6ffa16611c 100644 --- a/addons/service.xbmc.versioncheck/lib/versions.py +++ b/addons/service.xbmc.versioncheck/lib/versions.py @@ -19,7 +19,7 @@ from lib.common import log def compare_version(version_installed, versionlist): - # Create seperate version lists + # Create separate version lists versionlist_stable = versionlist['releases']['stable'] versionlist_rc = versionlist['releases']['releasecandidate'] versionlist_beta = versionlist['releases']['beta'] diff --git a/addons/service.xbmc.versioncheck/service.py b/addons/service.xbmc.versioncheck/service.py index c4292dc7ce..7537ff3faf 100644 --- a/addons/service.xbmc.versioncheck/service.py +++ b/addons/service.xbmc.versioncheck/service.py @@ -52,7 +52,7 @@ def _versioncheck(): versionlist = get_versionfilelist() # retrieve version installed version_installed = get_installedversion() - # copmpare installed and available + # compare installed and available oldversion, version_installed, version_available, version_stable = compare_version(version_installed, versionlist) return oldversion, version_installed, version_available, version_stable diff --git a/addons/skin.estuary/changelog.txt b/addons/skin.estuary/changelog.txt index 866bb393ae..41bd701486 100644 --- a/addons/skin.estuary/changelog.txt +++ b/addons/skin.estuary/changelog.txt @@ -41,4 +41,4 @@ • Updated language files from Transifex [B]0.0.1[/B] -• Initial commmit +• Initial commit diff --git a/cmake/modules/FindBluray.cmake b/cmake/modules/FindBluray.cmake index b8422ed207..0bba128796 100644 --- a/cmake/modules/FindBluray.cmake +++ b/cmake/modules/FindBluray.cmake @@ -12,7 +12,7 @@ # # and the following imported targets:: # -# Bluray::Bluray - The libblueray library +# Bluray::Bluray - The libbluray library if(PKG_CONFIG_FOUND) pkg_check_modules(PC_BLURAY libbluray>=0.7.0 QUIET) diff --git a/cmake/modules/FindLibXml2.cmake b/cmake/modules/FindLibXml2.cmake index caeb9459fa..d6e389af78 100644 --- a/cmake/modules/FindLibXml2.cmake +++ b/cmake/modules/FindLibXml2.cmake @@ -53,7 +53,7 @@ find_program(LIBXML2_XMLLINT_EXECUTABLE xmllint) # for backwards compat. with KDE 4.0.x: set(XMLLINT_EXECUTABLE "${LIBXML2_XMLLINT_EXECUTABLE}") -# Make sure to use static flags if apropriate +# Make sure to use static flags if appropriate if(PC_LIBXML_FOUND) if(${LIBXML2_LIBRARY} MATCHES ".+\.a$" AND PC_LIBXML_STATIC_LDFLAGS) set(LIBXML2_LIBRARY ${LIBXML2_LIBRARY} ${PC_LIBXML_STATIC_LDFLAGS}) diff --git a/cmake/scripts/common/PrepareEnv.cmake b/cmake/scripts/common/PrepareEnv.cmake index 1f68fdccae..6ecf121bb1 100644 --- a/cmake/scripts/common/PrepareEnv.cmake +++ b/cmake/scripts/common/PrepareEnv.cmake @@ -2,7 +2,7 @@ include(${CORE_SOURCE_DIR}/cmake/scripts/common/Macros.cmake) core_find_versions() -# in case we need to download something, set KODI_MIRROR to the default if not alread set +# in case we need to download something, set KODI_MIRROR to the default if not already set if(NOT DEFINED KODI_MIRROR) set(KODI_MIRROR "http://mirrors.kodi.tv") endif() diff --git a/cmake/scripts/linux/CodeCoverage.cmake b/cmake/scripts/linux/CodeCoverage.cmake index efc2208b07..f0a36fcdd3 100644 --- a/cmake/scripts/linux/CodeCoverage.cmake +++ b/cmake/scripts/linux/CodeCoverage.cmake @@ -14,7 +14,7 @@ # # Inspired by https://github.com/bilke/cmake-modules/blob/master/CodeCoverage.cmake -# Comiler and linker setup +# Compiler and linker setup set(CMAKE_C_FLAGS_COVERAGE "-g -O0 --coverage" CACHE STRING "Flags used by the C compiler during coverage builds." FORCE) set(CMAKE_CXX_FLAGS_COVERAGE "-g -O0 --coverage" CACHE STRING diff --git a/cmake/scripts/windows/ArchSetup.cmake b/cmake/scripts/windows/ArchSetup.cmake index 7183df7197..96345e9eca 100644 --- a/cmake/scripts/windows/ArchSetup.cmake +++ b/cmake/scripts/windows/ArchSetup.cmake @@ -29,7 +29,7 @@ set(SYSTEM_DEFINES -DNOMINMAX -D_USE_32BIT_TIME_T -DHAS_DX -D__STDC_CONSTANT_MAC -DPLT_HTTP_DEFAULT_SERVER="UPnP/1.0 DLNADOC/1.50 Kodi" $<$<CONFIG:Debug>:-DD3D_DEBUG_INFO -D_ITERATOR_DEBUG_LEVEL=0>) -# Make sure /FS is set for Visual Studio in order to prevent simultanious access to pdb files. +# Make sure /FS is set for Visual Studio in order to prevent simultaneous access to pdb files. if(CMAKE_GENERATOR MATCHES "Visual Studio") set(CMAKE_CXX_FLAGS "/MP /FS ${CMAKE_CXX_FLAGS}") endif() diff --git a/docs/README.armel b/docs/README.armel index 13367a8a84..1174a48070 100644 --- a/docs/README.armel +++ b/docs/README.armel @@ -158,7 +158,7 @@ Note. You will need the headers and shared object files for EGL and GLESv2 to co ----------------------------------------------------------------------------- In order to continue, you will need the SGX SDK from TI's website. -Once you have installed said SDK on a standard Linux machine, copy the neccessary .h and .so files to the appropriate directories in scratchbox: +Once you have installed said SDK on a standard Linux machine, copy the necessary .h and .so files to the appropriate directories in scratchbox: e.g /scratchbox/users/<username>/targets/<target_name>/usr/include/EGL/egl.h These files will also need to be transferred over to the board eventually. diff --git a/docs/README.ios.md b/docs/README.ios.md index f68813a097..0a3adb56da 100644 --- a/docs/README.ios.md +++ b/docs/README.ios.md @@ -36,7 +36,7 @@ The minimum version of iOS you need to run(!) Kodi is 6.0 atm. - On Mavericks (OSX 10.9.x) we recommend using Xcode 6.1. - On Yosemite (OSX 10.10.x) we recommend using Xcode 6.4. - On El Capitan (OSX 10.11.x) we recommend using Xcode 7.x or Xcode 8.x. -- On Sierra (macOS 10.12.x) we recomment using Xcode 8.x. +- On Sierra (macOS 10.12.x) we recommend using Xcode 8.x. ## 2 Getting the source code @@ -124,7 +124,7 @@ plugins and more). They can be built as shown below: #### 4.1.1 Generate CMake project files -Before you can use Xode to build Kodi, the Xcode project has to be generated +Before you can use Xcode to build Kodi, the Xcode project has to be generated with CMake. Note that CMake is compiled as parts of the depends doesn't have to be installed separately. Also a Toolchain-file has been generated with is used to configure CMake. @@ -210,7 +210,7 @@ Gestures can be adapted in [system/keymaps/touchscreen.xml](https://github.com/x If you are a developer with an official apple code signing identity you can deploy Kodi via xcode to work on it on non-jailbroken devices. For this to happen you just need to alter the Xcode project by setting your codesign -identity. Just select the "iPhone Developer" shortcut. It'ss also important +identity. Just select the "iPhone Developer" shortcut. It's also important that you select the signing on all 4 spots in the project settings. After that the last buildstep in our support script will do a full sign of all binaries and the bundle with the given identity (all `*.viz`, `*.pvr`, `*.so` files diff --git a/docs/README.linux b/docs/README.linux index 036d057734..62a2cc4467 100644 --- a/docs/README.linux +++ b/docs/README.linux @@ -184,7 +184,7 @@ The most useful options are, List the names of all tests instead of running them. The name of TEST(Foo, Bar) is "Foo.Bar". - --gtest_filter=POSTIVE_PATTERNS[-NEGATIVE_PATTERNS] + --gtest_filter=POSITIVE_PATTERNS[-NEGATIVE_PATTERNS] Run only the tests whose name matches one of the positive patterns but none of the negative patterns. '?' matches any single character; '*' matches any substring; ':' separates two patterns. diff --git a/docs/README.osx.md b/docs/README.osx.md index 4a9f660f16..7d48fafd9f 100644 --- a/docs/README.osx.md +++ b/docs/README.osx.md @@ -34,7 +34,7 @@ The minimum version of OSX you need to run(!) Kodi is 10.7 atm. - On Mavericks (OSX 10.9.x) we recommend using Xcode 6.1. - On Yosemite (OSX 10.10.x) we recommend using Xcode 6.4. - On El Capitan (OSX 10.11.x) we recommend using Xcode 7.x or Xcode 8.x. -- On Sierra (macOS 10.12.x) we recomment using Xcode 8.x. +- On Sierra (macOS 10.12.x) we recommend using Xcode 8.x. **ATTENTION**: You need to download and install XQuartz from <https://xquartz.macosforge.org/landing/> since its not part of macOS anymore since 10.8. @@ -124,7 +124,7 @@ plugins and more). They can be built as shown below: #### 4.1.1 Generate CMake project files -Before you can use Xode to build Kodi, the Xcode project has to be generated +Before you can use Xcode to build Kodi, the Xcode project has to be generated with CMake. Note that CMake is compiled as parts of the depends doesn't have to be installed separately. Also a Toolchain-file has been generated with is used to configure CMake. diff --git a/docs/README.raspberrypi b/docs/README.raspberrypi index 3a08f72f00..b13d763c91 100644 --- a/docs/README.raspberrypi +++ b/docs/README.raspberrypi @@ -19,7 +19,7 @@ image which includes Linux. The following steps were tested with Ubuntu 14.04 x64. (Note that building on a 32 bit machine requires slightly different setting). -The following commands build for newer Rapberry Pi 2 generation. In order to +The following commands build for newer Raspberry Pi 2 generation. In order to build for the first Raspberry Pi, the commands have to be adapted to use `--with-platform=raspberry-pi` instead of `--with-platform=raspberry-pi2`. diff --git a/docs/README.ubuntu b/docs/README.ubuntu index 3919adf8d9..65c857cc4f 100644 --- a/docs/README.ubuntu +++ b/docs/README.ubuntu @@ -124,7 +124,7 @@ We also supply a Makefile in lib/taglib to make it easy to install into /usr/loc $ make -C lib/taglib $ sudo make -C lib/taglib install -[NOTICE] crossguid / libcrossguid-dev all Linux destributions. +[NOTICE] crossguid / libcrossguid-dev all Linux distributions. Kodi now requires crossguid which is not available in Ubuntu repositories at this time. If build-deps PPA doesn't provide a pre-packaged version for your distribution, see (1.) below. diff --git a/doxygen_resources/Doxyfile.doxy b/doxygen_resources/Doxyfile.doxy index 1da8960d19..5628806c7f 100644 --- a/doxygen_resources/Doxyfile.doxy +++ b/doxygen_resources/Doxyfile.doxy @@ -1511,7 +1511,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # diff --git a/doxygen_resources/README.md b/doxygen_resources/README.md index 9544145baa..f92a5dcfb2 100644 --- a/doxygen_resources/README.md +++ b/doxygen_resources/README.md @@ -1,5 +1,5 @@ To generate doxygen documentation, -run doxygen on the "Doxyfile.doxy" configuration file in this directory. It will generate HTML documenation +run doxygen on the "Doxyfile.doxy" configuration file in this directory. It will generate HTML documentation in the ../docs folder (under "html") diff --git a/system/players/VideoPlayer/etc/fonts/conf.avail/65-fonts-persian.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/65-fonts-persian.conf index e30c4d9691..4c9f81c7bf 100644 --- a/system/players/VideoPlayer/etc/fonts/conf.avail/65-fonts-persian.conf +++ b/system/players/VideoPlayer/etc/fonts/conf.avail/65-fonts-persian.conf @@ -28,7 +28,7 @@ ChangeLog: 2005-04-03 Behdad Esfahbod: Initial revision. 2005-10-09 Behdad Esfahbod: Turned off back-slant and Tahoma sections. - 2005-11-30 Behdad Esfahbod: Set Titr susbtitution size to 24 points. + 2005-11-30 Behdad Esfahbod: Set Titr substitution size to 24 points. Todo: Add generic font "fantasy". Add some fonts into that category. diff --git a/system/players/VideoPlayer/etc/fonts/conf.avail/README b/system/players/VideoPlayer/etc/fonts/conf.avail/README index dbcfe2135f..a51be275dd 100644 --- a/system/players/VideoPlayer/etc/fonts/conf.avail/README +++ b/system/players/VideoPlayer/etc/fonts/conf.avail/README @@ -9,7 +9,7 @@ symlinks. The files are loaded in numeric order, the structure of the configuration has led to the following conventions in usage: - Files begining with: Contain: + Files beginning with: Contain: 00 through 09 Font directories 10 through 19 system rendering defaults (AA, etc) diff --git a/system/players/VideoPlayer/etc/fonts/conf.d/65-fonts-persian.conf b/system/players/VideoPlayer/etc/fonts/conf.d/65-fonts-persian.conf index e30c4d9691..4c9f81c7bf 100644 --- a/system/players/VideoPlayer/etc/fonts/conf.d/65-fonts-persian.conf +++ b/system/players/VideoPlayer/etc/fonts/conf.d/65-fonts-persian.conf @@ -28,7 +28,7 @@ ChangeLog: 2005-04-03 Behdad Esfahbod: Initial revision. 2005-10-09 Behdad Esfahbod: Turned off back-slant and Tahoma sections. - 2005-11-30 Behdad Esfahbod: Set Titr susbtitution size to 24 points. + 2005-11-30 Behdad Esfahbod: Set Titr substitution size to 24 points. Todo: Add generic font "fantasy". Add some fonts into that category. diff --git a/system/python/readme.txt b/system/python/readme.txt index c6819acdd7..7f58d57879 100644 --- a/system/python/readme.txt +++ b/system/python/readme.txt @@ -2,7 +2,7 @@ python directory structure DLLs dir: Library directory used by python. - python exensions (.pyd) from cvs can be placed here + python extensions (.pyd) from cvs can be placed here Lib dir: Library directory used by python. diff --git a/tools/EventClients/Clients/OSXRemote/HIDRemote/HIDRemote.h b/tools/EventClients/Clients/OSXRemote/HIDRemote/HIDRemote.h index 0c5b27373e..8a847aeae3 100644 --- a/tools/EventClients/Clients/OSXRemote/HIDRemote/HIDRemote.h +++ b/tools/EventClients/Clients/OSXRemote/HIDRemote/HIDRemote.h @@ -86,7 +86,7 @@ typedef enum { kHIDRemoteModeNone = 0L, - kHIDRemoteModeShared, // Share the remote with others - let's you listen to the remote control events as long as noone has an exclusive lock on it + kHIDRemoteModeShared, // Share the remote with others - let's you listen to the remote control events as long as no one has an exclusive lock on it // (RECOMMENDED ONLY FOR SPECIAL PURPOSES) kHIDRemoteModeExclusive, // Try to acquire an exclusive lock on the remote (NOT RECOMMENDED) @@ -194,9 +194,9 @@ typedef enum - (BOOL)hidRemote:(HIDRemote *)hidRemote // Invoked when new hardware is inspected inspectNewHardwareWithService:(io_service_t)service // prematchResult:(BOOL)prematchResult; // Return YES if HIDRemote should go on with this hardware and try - // to use it, or NO if it should not be persued further. + // to use it, or NO if it should not be pursued further. -// Exlusive lock lending +// Exclusive lock lending - (BOOL)hidRemote:(HIDRemote *)hidRemote lendExclusiveLockToApplicationWithInfo:(NSDictionary *)applicationInfo; @@ -328,7 +328,7 @@ typedef enum - (BOOL)_setupService:(io_object_t)service; - (void)_destructService:(io_object_t)service; -#pragma mark -- PRIVATE: Distributed notifiations handling -- +#pragma mark -- PRIVATE: Distributed notifications handling -- - (void)_postStatusWithAction:(NSString *)action; - (void)_handleNotifications:(NSNotification *)notification; - (void)_setSendStatusNotifications:(BOOL)doSend; diff --git a/tools/EventClients/Clients/OSXRemote/HIDRemote/HIDRemote.m b/tools/EventClients/Clients/OSXRemote/HIDRemote/HIDRemote.m index 0f54b7553f..c67067a4e5 100644 --- a/tools/EventClients/Clients/OSXRemote/HIDRemote/HIDRemote.m +++ b/tools/EventClients/Clients/OSXRemote/HIDRemote/HIDRemote.m @@ -696,7 +696,7 @@ static HIDRemote *sHIDRemote = nil; } -#pragma mark - PRIVATE: Distributed notifiations handling +#pragma mark - PRIVATE: Distributed notifications handling - (void)_postStatusWithAction:(NSString *)action { if (_sendStatusNotifications) @@ -1458,7 +1458,7 @@ static HIDRemote *sHIDRemote = nil; if ([HIDRemote OSXVersion] >= 0x1062) { // Support for the Aluminum Remote was added only with OS 10.6.2. Previous versions can not distinguish - // between the Center and the new, seperate Play/Pause button. They'll recognize both as presses of the + // between the Center and the new, separate Play/Pause button. They'll recognize both as presses of the // "Center" button. // // You CAN, however, receive Aluminum Remote button presses even under OS 10.5 when using Remote Buddy's @@ -1703,7 +1703,7 @@ static HIDRemote *sHIDRemote = nil; switch (buttonCode) { case kHIDRemoteButtonCodeIDChanged: - // Do nothing, this is handled seperately + // Do nothing, this is handled separately break; case kHIDRemoteButtonCodeUp: diff --git a/tools/EventClients/Clients/OSXRemote/XBMCHelper.m b/tools/EventClients/Clients/OSXRemote/XBMCHelper.m index b507611746..d3f0d38bcb 100644 --- a/tools/EventClients/Clients/OSXRemote/XBMCHelper.m +++ b/tools/EventClients/Clients/OSXRemote/XBMCHelper.m @@ -25,10 +25,10 @@ { [remote setDelegate:self]; [remote setSimulateHoldEvents:NO]; - //for now, we're using lending of exlusive lock + //for now, we're using lending of exclusive lock //kHIDRemoteModeExclusiveAuto isn't working, as we're a background daemon //one possibility would be to know when XBMC is running. Once we know that, - //we could aquire exclusive lock when it's running, and release _exclusive_ + //we could acquire exclusive lock when it's running, and release _exclusive_ //access once done [remote setExclusiveLockLendingEnabled:YES]; diff --git a/tools/EventClients/Clients/OSXRemote/xbmcclientwrapper.mm b/tools/EventClients/Clients/OSXRemote/xbmcclientwrapper.mm index 49980635e0..3bc580e51f 100644 --- a/tools/EventClients/Clients/OSXRemote/xbmcclientwrapper.mm +++ b/tools/EventClients/Clients/OSXRemote/xbmcclientwrapper.mm @@ -72,7 +72,7 @@ private: }; -//typedef is here, as is seems that I can't put it into iterface declaration +//typedef is here, as is seems that I can't put it into interface declaration //CPacketBUTTON is a pointer, as I'm not sure how well it's copy constructor is implemented typedef std::map<eATVClientEvent, CPacketBUTTON*> tEventMap; typedef std::map<XBMCClientEventSequence, CPacketBUTTON*> tSequenceMap; diff --git a/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.cpp b/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.cpp index 87af3590c1..3d232d26f8 100644 --- a/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.cpp +++ b/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.cpp @@ -127,7 +127,7 @@ void CWiiRemote::ErrorCallback(struct wiimote *wiiremote, const char *str, va_li #endif //Constructor -/*This constructor is never used but it shows how one would connect to just a specific Wiiremote by Mac-Adress*/ +/*This constructor is never used but it shows how one would connect to just a specific Wiiremote by Mac-Address*/ CWiiRemote::CWiiRemote(char *wii_btaddr) { SetBluetoothAddress(wii_btaddr); @@ -153,7 +153,7 @@ CWiiRemote::~CWiiRemote() } //---------------------Public------------------------------------------------------------------- -/* Basicly this just sets up standard control bits */ +/* Basically this just sets up standard control bits */ void CWiiRemote::SetBluetoothAddress(const char *btaddr) { static const bdaddr_t b = {{0, 0, 0, 0, 0, 0}}; /* BDADDR_ANY */ diff --git a/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.cpp b/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.cpp index 66c88e8735..e24c8ed2c9 100644 --- a/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.cpp +++ b/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.cpp @@ -77,12 +77,12 @@ void CWiiController::handleACC(float currentRoll, float currentPitch) if (m_currentAction == ACTION_NONE) { if ((g_deadzone - (abs((int)m_rel_roll)) < 5) && (abs((int)m_abs_pitch) < (g_deadzone / 1.5))) - // crossed the roll deadzone threshhold while inside the pitch deadzone + // crossed the roll deadzone threshold while inside the pitch deadzone { m_currentAction = ACTION_ROLL; } else if ((g_deadzone - (abs((int)m_rel_pitch)) < 5) && (abs((int)m_abs_roll) < (g_deadzone / 1.5))) - // crossed the pitch deadzone threshhold while inside the roll deadzone + // crossed the pitch deadzone threshold while inside the roll deadzone { m_currentAction = ACTION_PITCH; } @@ -174,7 +174,7 @@ return 0; float smoothDeg(float oldVal, float newVal) { -//If values go over 180 or under -180, weird things happen. This tranforms the values to -360 to 360 instead. +//If values go over 180 or under -180, weird things happen. This transforms the values to -360 to 360 instead. if (newVal - oldVal > 300) return (newVal - 360); diff --git a/tools/EventClients/README.txt b/tools/EventClients/README.txt index 591964fb98..51dcab17c3 100644 --- a/tools/EventClients/README.txt +++ b/tools/EventClients/README.txt @@ -49,9 +49,9 @@ can however be done using the program "sixaxis.c" available from: http://www.pabr.org/sixlinux/sixlinux.en.html -Once pairing for eiher or both has been done, run the ps3d.py program +Once pairing for either or both has been done, run the ps3d.py program as root after disabling any existing HID servers that might currently -be running. The program requires root prvilieges since it listens on +be running. The program requires root privileges since it listens on Bluetooth L2CAP PSMs 17 and 19. Using the PS3 Sixaxis Controller @@ -72,7 +72,7 @@ The executable depends on libcwiid and libbluetooth and is compiled using # g++ WiiRemote.cpp -lcwiid -o WiiRemote The WiiRemote will emulate mouse by default but can be disabled by running with --disable-mouseemulation The sensitivity of the mouseemulation can be set using the --deadzone_x or --deadzone_y where the number is -the percentage of the space is considered "dead", higher means more sensative. +the percentage of the space is considered "dead", higher means more sensitive. Other commands can be listed with --help The WiiRemote is mappable with keymap.xml where button id's are the following: diff --git a/tools/EventClients/examples/python/example_button1.py b/tools/EventClients/examples/python/example_button1.py index 7b208252cb..dd524a3788 100755 --- a/tools/EventClients/examples/python/example_button1.py +++ b/tools/EventClients/examples/python/example_button1.py @@ -51,7 +51,7 @@ def main(): # Every valid packet sent to XBMC acts as a ping, however if no valid # packets NEED to be sent (eg. the user hasn't pressed a key in 50 seconds) # then you can use the PacketPING class to send a ping packet (which is - # basically just an emppty packet). See below. + # basically just an empty packet). See below. # Once a client times out, it will need to reissue the HELO packet. # Currently, since this is a unidirectional protocol, there is no way diff --git a/tools/EventClients/lib/java/src/org/xbmc/eventclient/PacketBUTTON.java b/tools/EventClients/lib/java/src/org/xbmc/eventclient/PacketBUTTON.java index 2bb85c32d1..b4ba1bbff2 100644 --- a/tools/EventClients/lib/java/src/org/xbmc/eventclient/PacketBUTTON.java +++ b/tools/EventClients/lib/java/src/org/xbmc/eventclient/PacketBUTTON.java @@ -73,7 +73,7 @@ public class PacketBUTTON extends Packet { * <li>"LI:devicename" => LIRC remote map where 'devicename' is the * actual device's name</li></ul> * @param button_name a button name defined in the map specified in map_name. - * For example, if map_name is "KB" refering to the <keyboard> section in Keymap.xml + * For example, if map_name is "KB" referring to the <keyboard> section in Keymap.xml * then, valid button_names include "printscreen", "minus", "x", etc. * @param repeat this key press should repeat until released (default: 1) * Note that queued pressed cannot repeat. @@ -109,7 +109,7 @@ public class PacketBUTTON extends Packet { * <li>"LI:devicename" => LIRC remote map where 'devicename' is the * actual device's name</li></ul> * @param button_name a button name defined in the map specified in map_name. - * For example, if map_name is "KB" refering to the <keyboard> section in Keymap.xml + * For example, if map_name is "KB" referring to the <keyboard> section in Keymap.xml * then, valid button_names include "printscreen", "minus", "x", etc. * @param repeat this key press should repeat until released (default: 1) * Note that queued pressed cannot repeat. diff --git a/tools/EventClients/lib/java/src/org/xbmc/eventclient/PacketMOUSE.java b/tools/EventClients/lib/java/src/org/xbmc/eventclient/PacketMOUSE.java index 768e06a5ff..6c865ec7c4 100644 --- a/tools/EventClients/lib/java/src/org/xbmc/eventclient/PacketMOUSE.java +++ b/tools/EventClients/lib/java/src/org/xbmc/eventclient/PacketMOUSE.java @@ -30,7 +30,7 @@ public class PacketMOUSE extends Packet { /** * A MOUSE packets sets the mouse position in XBMC - * @param x horitontal position ranging from 0 to 65535 + * @param x horizontal position ranging from 0 to 65535 * @param y vertical position ranging from 0 to 65535 */ public PacketMOUSE(int x, int y) diff --git a/tools/EventClients/lib/java/src/org/xbmc/eventclient/XBMCClient.java b/tools/EventClients/lib/java/src/org/xbmc/eventclient/XBMCClient.java index e48eb92740..9642a6d76b 100644 --- a/tools/EventClients/lib/java/src/org/xbmc/eventclient/XBMCClient.java +++ b/tools/EventClients/lib/java/src/org/xbmc/eventclient/XBMCClient.java @@ -200,7 +200,7 @@ public class XBMCClient * <li>"LI:devicename" => LIRC remote map where 'devicename' is the * actual device's name</li></ul> * @param button_name a button name defined in the map specified in map_name. - * For example, if map_name is "KB" refering to the <keyboard> section in Keymap.xml + * For example, if map_name is "KB" referring to the <keyboard> section in Keymap.xml * then, valid button_names include "printscreen", "minus", "x", etc. * @param repeat this key press should repeat until released (default: 1) * Note that queued pressed cannot repeat. @@ -222,7 +222,7 @@ public class XBMCClient /** * Sets the mouse position in XBMC - * @param x horitontal position ranging from 0 to 65535 + * @param x horizontal position ranging from 0 to 65535 * @param y vertical position ranging from 0 to 65535 */ public void sendMouse(int x, int y) throws IOException diff --git a/tools/EventClients/lib/python/ps3/sixaxis.py b/tools/EventClients/lib/python/ps3/sixaxis.py index 0f5b370845..f5570065c9 100644 --- a/tools/EventClients/lib/python/ps3/sixaxis.py +++ b/tools/EventClients/lib/python/ps3/sixaxis.py @@ -81,7 +81,7 @@ axismap_sixaxis = { # to make sure all combination keys are checked first # we sort the keymap's button codes in reverse order -# this guranties that any bit combined button code +# this guarantees that any bit combined button code # will be processed first keymap_sixaxis_keys = keymap_sixaxis.keys() keymap_sixaxis_keys.sort() @@ -205,9 +205,9 @@ class sixaxis(): bytes.extend([0xFF, 0x72]) bytes.extend([0x00, 0x00, 0x00, 0x00]) bytes.extend([0x02]) # 0x02 LED1, 0x04 LED2 ... 0x10 LED4 - # The following sections should set the blink frequncy of + # The following sections should set the blink frequency of # the leds on the controller, but i've not figured out how. - # These values where suggusted in a mailing list, but no explination + # These values where suggested in a mailing list, but no explanation # for how they should be combined to the 5 bytes per led #0xFF = 0.5Hz #0x80 = 1Hz diff --git a/tools/EventClients/lib/python/xbmcclient.py b/tools/EventClients/lib/python/xbmcclient.py index f14c7ba68d..9b1e1679b2 100644 --- a/tools/EventClients/lib/python/xbmcclient.py +++ b/tools/EventClients/lib/python/xbmcclient.py @@ -337,7 +337,7 @@ class PacketBUTTON (Packet): "LI:devicename" => LIRC remote map where 'devicename' is the actual device's name button_name -- a button name defined in the map specified in map_name. - For example, if map_name is "KB" refering to the + For example, if map_name is "KB" referring to the <keyboard> section in Keymap.xml then, valid button_names include "printscreen", "minus", "x", etc. amount -- unimplemented for now; in the future it will be used for @@ -388,7 +388,7 @@ class PacketMOUSE (Packet): def __init__(self, x, y): """ Arguments: - x -- horitontal position ranging from 0 to 65535 + x -- horizontal position ranging from 0 to 65535 y -- vertical position ranging from 0 to 65535 The range will be mapped to the screen width and height in XBMC @@ -431,7 +431,7 @@ class PacketLOG (Packet): Keyword arguments: loglevel -- the loglevel, follows XBMC standard. logmessage -- the message to log - autoprint -- if the logmessage should automaticly be printed to stdout + autoprint -- if the logmessage should automatically be printed to stdout """ Packet.__init__(self) self.packettype = PT_LOG @@ -451,7 +451,7 @@ class PacketACTION (Packet): Keyword arguments: loglevel -- the loglevel, follows XBMC standard. logmessage -- the message to log - autoprint -- if the logmessage should automaticly be printed to stdout + autoprint -- if the logmessage should automatically be printed to stdout """ Packet.__init__(self) self.packettype = PT_ACTION @@ -513,7 +513,7 @@ class XBMCClient: def send_notification(self, title="", message="", icon_file=None): """Send a notification to the connected XBMC Keyword Arguments: - title -- The title/heading for the notifcation + title -- The title/heading for the notification message -- The message to be displayed icon_file -- location of an icon file, if any (png, jpg, gif) """ @@ -564,7 +564,7 @@ class XBMCClient: "LI:devicename" => LIRC remote map where 'devicename' is the actual device's name button -- a button name defined in the map specified in map, above. - For example, if map is "KB" refering to the <keyboard> + For example, if map is "KB" referring to the <keyboard> section in Keymap.xml then, valid buttons include "printscreen", "minus", "x", etc. """ @@ -585,7 +585,7 @@ class XBMCClient: "LI:devicename" => LIRC remote map where 'devicename' is the actual device's name button -- a button name defined in the map specified in map, above. - For example, if map is "KB" refering to the <keyboard> + For example, if map is "KB" referring to the <keyboard> section in Keymap.xml then, valid buttons include "printscreen", "minus", "x", etc. """ @@ -613,7 +613,7 @@ class XBMCClient: Keyword arguments: loglevel -- the loglevel, follows XBMC standard. logmessage -- the message to log - autoprint -- if the logmessage should automaticly be printed to stdout + autoprint -- if the logmessage should automatically be printed to stdout """ packet = PacketLOG(loglevel, logmessage) return packet.send(self.sock, self.addr, self.uid) diff --git a/tools/android/packaging/Makefile.in b/tools/android/packaging/Makefile.in index 20696ab859..7a2850b96b 100644 --- a/tools/android/packaging/Makefile.in +++ b/tools/android/packaging/Makefile.in @@ -25,8 +25,8 @@ endif X86OVERRIDES=XBMC_OVERRIDE_HOST=i686-android-linux XBMC_OVERRIDE_TOOLCHAIN=$(XBMC_X86_TOOLCHAIN) ARMOVERRIDES=XBMC_OVERRIDE_HOST=arm-linux-androideabi XBMC_OVERRIDE_TOOLCHAIN=$(XBMC_ARM_TOOLCHAIN) -#this fixes a android ndk fuckup where the pathes to -#prebuilt stuff follow different name shemes for +#this fixes a android ndk fuckup where the paths to +#prebuilt stuff follow different name schemes for #arm and x86 ifeq ($(findstring i686,$(CPU)),i686) ARCH=x86 diff --git a/tools/buildsteps/README b/tools/buildsteps/README index 0fc634940d..048ff84e98 100644 --- a/tools/buildsteps/README +++ b/tools/buildsteps/README @@ -1,4 +1,4 @@ -This folder holds all the platform dependend build scripts which are called from the jenkins buildserver. +This folder holds all the platform dependent build scripts which are called from the jenkins buildserver. The following ENV variables are available on all scripts: diff --git a/tools/buildsteps/android-arm64-v8a/configure-depends b/tools/buildsteps/android-arm64-v8a/configure-depends index 94de43f6c2..705bc53349 100644 --- a/tools/buildsteps/android-arm64-v8a/configure-depends +++ b/tools/buildsteps/android-arm64-v8a/configure-depends @@ -3,7 +3,7 @@ XBMC_PLATFORM_DIR=android . $WORKSPACE/tools/buildsteps/defaultenv NDK_ARCH=aarch64 -#the following pathes must exist on the slave and use the defined scheme here! +#the following paths must exist on the slave and use the defined scheme here! NDK_PATH=$ANDROID_DEV_ROOT/android-ndk-r$NDK_VERSION TOOLCHAIN=$ANDROID_DEV_ROOT/android-toolchain-$NDK_ARCH-$SDK_VERSION-r$NDK_VERSION diff --git a/tools/buildsteps/android/configure-depends b/tools/buildsteps/android/configure-depends index d0ff7790f2..edcfbc7032 100644 --- a/tools/buildsteps/android/configure-depends +++ b/tools/buildsteps/android/configure-depends @@ -3,7 +3,7 @@ XBMC_PLATFORM_DIR=android . $WORKSPACE/tools/buildsteps/defaultenv NDK_ARCH="arm" -#the following pathes must exist on the slave and use the defined scheme here! +#the following paths must exist on the slave and use the defined scheme here! NDK_PATH=$ANDROID_DEV_ROOT/android-ndk-r$NDK_VERSION TOOLCHAIN=$ANDROID_DEV_ROOT/android-toolchain-$NDK_ARCH-$SDK_VERSION-r$NDK_VERSION diff --git a/tools/buildsteps/androidx86/configure-depends b/tools/buildsteps/androidx86/configure-depends index 15b2802707..9a6e31ceed 100644 --- a/tools/buildsteps/androidx86/configure-depends +++ b/tools/buildsteps/androidx86/configure-depends @@ -3,7 +3,7 @@ XBMC_PLATFORM_DIR=android . $WORKSPACE/tools/buildsteps/defaultenv NDK_ARCH=x86 -#the following pathes must exist on the slave and use the defined scheme here! +#the following paths must exist on the slave and use the defined scheme here! NDK_PATH=$ANDROID_DEV_ROOT/android-ndk-r$NDK_VERSION TOOLCHAIN=$ANDROID_DEV_ROOT/android-toolchain-$NDK_ARCH-$SDK_VERSION-r$NDK_VERSION diff --git a/tools/buildsteps/win32/buildffmpeg.sh b/tools/buildsteps/win32/buildffmpeg.sh index 3eb683eae6..8b5ae23233 100644 --- a/tools/buildsteps/win32/buildffmpeg.sh +++ b/tools/buildsteps/win32/buildffmpeg.sh @@ -81,7 +81,7 @@ do_removeOption() { do_getFFmpegConfig if [[ "$tools" = "msvc" ]]; then - # this experimental feature for debuging purpose + # this experimental feature for debugging purpose do_removeOption "--enable-gnutls" do_removeOption "--disable-debug" do_addOption "--disable-gnutls" diff --git a/tools/codegenerator/Helper.groovy b/tools/codegenerator/Helper.groovy index cdb7b3ed0e..cf195a2dfe 100644 --- a/tools/codegenerator/Helper.groovy +++ b/tools/codegenerator/Helper.groovy @@ -267,7 +267,7 @@ public class Helper String relative = cwd.getAbsoluteFile().toURI().relativize(convertTemplate.getAbsoluteFile().toURI()).getPath() convertTemplate = new File(parent,relative) - // This is a fallback case which is hit occationally on OSX as a result + // This is a fallback case which is hit occasionally on OSX as a result // of case mismatches between the two paths in the relativize call above. if (!convertTemplate.exists()) convertTemplate = new File(parent,cur.toString()) @@ -291,7 +291,7 @@ public class Helper * </code> * @param apiType - is the Swig typecode that describes the parameter type from the native method * @param apiName - is the name of the parameter from the method parameter list in the api - * @param slName - is the name of the varialbe that holds the parameter from the scripting language + * @param slName - is the name of the variable that holds the parameter from the scripting language * @param method - is the node from the module xml that contains the method description * @return the code chunk as a string ready to be placed into the generated code. */ @@ -312,9 +312,9 @@ public class Helper * if (${slarg}) PyXBMCGetUnicodeString(${api},${slarg},"${api}"); * </code> * @param apiType - is the Swig typecode that describes the parameter type from the native method - * @param apiName - is the name of the varialbe that holds the api parameter + * @param apiName - is the name of the variable that holds the api parameter * @param paramName - is the name of the parameter from the method parameter list in the api - * @param slName - is the name of the varialbe that holds the parameter from the scripting language + * @param slName - is the name of the variable that holds the parameter from the scripting language * @param method - is the node from the module xml that contains the method description * @return the code chunk as a string ready to be placed into the generated code. */ @@ -397,7 +397,7 @@ public class Helper String relative = cwd.getAbsoluteFile().toURI().relativize(convertTemplate.getAbsoluteFile().toURI()).getPath() convertTemplate = new File(parent,relative) - // This is a fallback case which is hit occationally on OSX as a result + // This is a fallback case which is hit occasionally on OSX as a result // of case mismatches between the two paths in the relativize call above. if (!convertTemplate.exists()) convertTemplate = new File(parent,cur.toString()) diff --git a/tools/codegenerator/example/Example.call.template b/tools/codegenerator/example/Example.call.template index f9e84ed185..8674dd44fa 100644 --- a/tools/codegenerator/example/Example.call.template +++ b/tools/codegenerator/example/Example.call.template @@ -22,7 +22,7 @@ module.function.each { functionNode -> lvalue:${SwigTypeParser.SwigType_lstr(param.@type)} rvalue:${SwigTypeParser.SwigType_str(param.@type)} code to handle parameter ${index} { - // declare and set the value that came in from the scripting languge + // declare and set the value that came in from the scripting language ScriptingLanguageType sl_${param.@name} = /* set the value from the scripting language */; // declare and set the variable that will contain the api parameter ${SwigTypeParser.SwigType_lstr(param.@type)} p_${param.@name}; diff --git a/tools/codegenerator/example/Example.intypemap.template b/tools/codegenerator/example/Example.intypemap.template index de90963b60..b64a49cb7f 100644 --- a/tools/codegenerator/example/Example.intypemap.template +++ b/tools/codegenerator/example/Example.intypemap.template @@ -19,7 +19,7 @@ module.function.each { functionNode -> type:${SwigTypeParser.SwigType_str(param.@type)} lvalue-type:${SwigTypeParser.SwigType_lstr(param.@type)} code to handle parameter ${index} { - // declare and set the value that came in from the scripting languge + // declare and set the value that came in from the scripting language ScriptingLanguageType sl_${param.@name} = /* set the value from the scripting language */; // declare and set the variable that will contain the api parameter ${SwigTypeParser.SwigType_lstr(param.@type)} p_${param.@name}; diff --git a/tools/codegenerator/example/Example.returns.template b/tools/codegenerator/example/Example.returns.template index 074d30f8c5..9f6f75deac 100644 --- a/tools/codegenerator/example/Example.returns.template +++ b/tools/codegenerator/example/Example.returns.template @@ -22,7 +22,7 @@ module.function.each { functionNode -> type:${SwigTypeParser.SwigType_str(param.@type)} lvalue-type:${SwigTypeParser.SwigType_lstr(param.@type)} code to handle parameter ${index} { - // declare and set the value that came in from the scripting languge + // declare and set the value that came in from the scripting language ScriptingLanguageType sl_${param.@name} = /* set the value from the scripting language */; // declare and set the variable that will contain the api parameter ${SwigTypeParser.SwigType_lstr(param.@type)} p_${param.@name}; diff --git a/tools/depends/README b/tools/depends/README index a33e3077fa..5a273d38f5 100644 --- a/tools/depends/README +++ b/tools/depends/README @@ -21,7 +21,7 @@ TVOS: You can target the same --prefix path, each setup will be done in an isolated directory. The last configure/make you do is the one used for Kodi/Xcode. -#- Android (the pathes are examples and have to match those of docs/READM.android) +#- Android (the paths are examples and have to match those of docs/READM.android) #---------------------------------------------------------------------------- arm: @@ -65,5 +65,5 @@ Details: 2) cmake driven tend to be simple, setup cmake flags right and go. On rare cases, you might need to diddle the native cmake setup. - 3) hand crafted Makefiles typically require manual sed tweeks or patching. + 3) hand crafted Makefiles typically require manual sed tweaks or patching. diff --git a/xbmc-xrandr.c b/xbmc-xrandr.c index 50f04f37c3..14b35ad491 100644 --- a/xbmc-xrandr.c +++ b/xbmc-xrandr.c @@ -181,7 +181,7 @@ warning (const char *format, ...) va_end (ap); } -/* Because fmin requires C99 suppport */ +/* Because fmin requires C99 support */ static inline double dmin (double x, double y) { return x < y ? x : y; diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp index e793ddbd2d..83c07d18c1 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp @@ -2716,7 +2716,7 @@ void CApplication::FrameMove(bool processEvents, bool processGUI) // currently we calculate the repeat time (ie time from last similar keypress) just global as fps float frameTime = m_frameTime.GetElapsedSeconds(); m_frameTime.StartZero(); - // never set a frametime less than 2 fps to avoid problems when debuggin and on breaks + // never set a frametime less than 2 fps to avoid problems when debugging and on breaks if( frameTime > 0.5 ) frameTime = 0.5; if (processGUI && m_renderGUI) @@ -3954,7 +3954,7 @@ bool CApplication::WakeUpScreenSaverAndDPMS(bool bPowerOffKeyPressed /* = false if(result) { - // allow listeners to ignore the deactivation if it preceeds a powerdown/suspend etc + // allow listeners to ignore the deactivation if it precedes a powerdown/suspend etc CVariant data(CVariant::VariantTypeObject); data["shuttingdown"] = bPowerOffKeyPressed; CAnnouncementManager::GetInstance().Announce(GUI, "xbmc", "OnScreensaverDeactivated", data); @@ -4527,7 +4527,7 @@ void CApplication::ProcessSlow() } #endif - // Temporarely pause pausable jobs when viewing video/picture + // Temporarily pause pausable jobs when viewing video/picture int currentWindow = g_windowManager.GetActiveWindow(); if (CurrentFileItem().IsVideo() || CurrentFileItem().IsPicture() || currentWindow == WINDOW_FULLSCREEN_VIDEO || currentWindow == WINDOW_SLIDESHOW) { @@ -4613,7 +4613,7 @@ void CApplication::ProcessSlow() } // Global Idle Time in Seconds -// idle time will be resetet if on any OnKey() +// idle time will be reset if on any OnKey() // int return: system Idle time in seconds! 0 is no idle! int CApplication::GlobalIdleTime() { diff --git a/xbmc/Application.h b/xbmc/Application.h index 580fdce547..5dffa325ea 100644 --- a/xbmc/Application.h +++ b/xbmc/Application.h @@ -464,7 +464,7 @@ protected: CFileItemPtr m_stackFileItemToUpdate; std::string m_prevMedia; - ThreadIdentifier m_threadID; // application thread ID. Used in applicationMessanger to know where we are firing a thread with delay from. + ThreadIdentifier m_threadID; // application thread ID. Used in applicationMessenger to know where we are firing a thread with delay from. bool m_bInitializing; bool m_bPlatformDirectories; diff --git a/xbmc/ApplicationPlayer.cpp b/xbmc/ApplicationPlayer.cpp index 8966525bd8..300038bb62 100644 --- a/xbmc/ApplicationPlayer.cpp +++ b/xbmc/ApplicationPlayer.cpp @@ -74,7 +74,7 @@ void CApplicationPlayer::ClosePlayerGapless(std::string &playername) { // XXX: we had to stop the previous playing item, it was done in VideoPlayer::OpenFile. // but in paplayer::OpenFile, it sometimes just fade in without call CloseFile. - // but if we do not stop it, we can not distingush callbacks from previous + // but if we do not stop it, we can not distinguish callbacks from previous // item and current item, it will confused us then we can not make correct delay // callback after the starting state. CloseFile(true); diff --git a/xbmc/AutoSwitch.cpp b/xbmc/AutoSwitch.cpp index 1333860eaf..afaaf00594 100644 --- a/xbmc/AutoSwitch.cpp +++ b/xbmc/AutoSwitch.cpp @@ -130,7 +130,7 @@ bool CAutoSwitch::ByFiles(bool bHideParentDirItems, const CFileItemList& vecItem bool bThumbs = false; int iCompare = 0; - // parent directorys are visible, incrememt + // parent directorys are visible, increment if (!bHideParentDirItems) { iCompare = 1; diff --git a/xbmc/Autorun.cpp b/xbmc/Autorun.cpp index 22acf7eb45..f948f34d91 100644 --- a/xbmc/Autorun.cpp +++ b/xbmc/Autorun.cpp @@ -202,7 +202,7 @@ bool CAutorun::RunDisc(IDirectory* pDir, const std::string& strDrive, int& nAdde // Check if the current foldername indicates a Blu-Ray structure (default is "BDMV"). // A BR should also include an "AACS" folder for encryption, Sony-BRs can also include update folders for PS3 (PS3_UPDATE / PS3_VPRM). - //! @todo for the time beeing, the DVD autorun settings are used to determine if the BR should be started automatically. + //! @todo for the time being, the DVD autorun settings are used to determine if the BR should be started automatically. if (StringUtils::EqualsNoCase(name, "BDMV") && bAllowVideo && (bypassSettings || CServiceBroker::GetSettings().GetBool(CSettings::SETTING_DVDS_AUTORUN))) { @@ -223,7 +223,7 @@ bool CAutorun::RunDisc(IDirectory* pDir, const std::string& strDrive, int& nAdde // Check if the current foldername indicates a HD DVD structure (default is "HVDVD_TS"). // Most HD DVD will also include an "ADV_OBJ" folder for advanced content. This folder should be handled first. - //! @todo for the time beeing, the DVD autorun settings are used to determine if the HD DVD should be started automatically. + //! @todo for the time being, the DVD autorun settings are used to determine if the HD DVD should be started automatically. CFileItemList items, sitems; // Advanced Content HD DVD (most discs?) diff --git a/xbmc/ContextMenuManager.h b/xbmc/ContextMenuManager.h index 7da166681a..1f4f896343 100644 --- a/xbmc/ContextMenuManager.h +++ b/xbmc/ContextMenuManager.h @@ -74,7 +74,7 @@ namespace CONTEXTMENU bool ShowFor(const CFileItemPtr& fileItem, const CContextMenuItem& root=CContextMenuManager::MAIN); /*! - * Shortcut for continuing the context menu loop from an exisiting menu item. + * Shortcut for continuing the context menu loop from an existing menu item. */ bool LoopFrom(const IContextMenuItem& menu, const CFileItemPtr& fileItem); } diff --git a/xbmc/DatabaseManager.h b/xbmc/DatabaseManager.h index b6b4b22e07..59e683b476 100644 --- a/xbmc/DatabaseManager.h +++ b/xbmc/DatabaseManager.h @@ -45,7 +45,7 @@ public: */ static CDatabaseManager &GetInstance(); - /*! \brief Initalize the database manager + /*! \brief Initialize the database manager Checks that all databases are up to date, otherwise updates them. */ void Initialize(bool addonsOnly = false); @@ -67,7 +67,7 @@ public: std::atomic<bool> m_bIsUpgrading; private: - // private construction, and no assignements; use the provided singleton methods + // private construction, and no assignments; use the provided singleton methods CDatabaseManager(); CDatabaseManager(const CDatabaseManager&); CDatabaseManager const& operator=(CDatabaseManager const&); diff --git a/xbmc/DynamicDll.h b/xbmc/DynamicDll.h index a0b817f1d4..a189de851f 100644 --- a/xbmc/DynamicDll.h +++ b/xbmc/DynamicDll.h @@ -64,7 +64,7 @@ public: \ // // LOAD_SYMBOLS // -// Tells the dllloader to load Debug symblos when possible +// Tells the dllloader to load Debug symbols when possible #define LOAD_SYMBOLS() \ protected: \ virtual bool LoadSymbols() { return true; } @@ -179,7 +179,7 @@ public: \ // // DEFINE_METHOD_FP // -// Defines a function for an export from a dll as a fuction pointer. +// Defines a function for an export from a dll as a function pointer. // Use DEFINE_METHOD_FP for each function to be resolved. Functions // defined like this are not listed by IntelliSence. // @@ -233,7 +233,7 @@ public: \ // // Actual function call will expand to something like this // this will align the stack (esp) at the point of function -// entry as required by gcc compiled dlls, it is abit abfuscated +// entry as required by gcc compiled dlls, it is a bit obfuscated // to allow for different sized variables // // int64_t test(int64_t p1, char p2, char p3) diff --git a/xbmc/FileItem.cpp b/xbmc/FileItem.cpp index c856a400fe..109e667ff2 100644 --- a/xbmc/FileItem.cpp +++ b/xbmc/FileItem.cpp @@ -1275,7 +1275,7 @@ void CFileItem::FillInDefaultIcon() /* To reduce the average runtime of this code, this list should * be ordered with most frequently seen types first. Also bear * in mind the complexity of the code behind the check in the - * case of IsWhatater() returns false. + * case of IsWhatever() returns false. */ if (IsPVRChannel()) { diff --git a/xbmc/FileItem.h b/xbmc/FileItem.h index d840f8b462..e167c0c7e6 100644 --- a/xbmc/FileItem.h +++ b/xbmc/FileItem.h @@ -553,7 +553,7 @@ private: /*! \brief Return the current resume point for this item. - \return The resum point. + \return The resume point. */ CBookmark GetResumePoint() const; diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp index ba3b21ca64..82795324f9 100644 --- a/xbmc/GUIInfoManager.cpp +++ b/xbmc/GUIInfoManager.cpp @@ -2063,12 +2063,12 @@ const infomap musicplayer[] = {{ "title", MUSICPLAYER_TITLE }, /// \table_row3{ <b>`VideoPlayer.ChannelName`</b>, /// \anchor VideoPlayer_ChannelName /// _string_, -/// Name of the curently tuned channel (PVR). +/// Name of the currently tuned channel (PVR). /// } /// \table_row3{ <b>`VideoPlayer.ChannelNumber`</b>, /// \anchor VideoPlayer_ChannelNumber /// _string_, -/// Number of the curently tuned channel (PVR). +/// Number of the currently tuned channel (PVR). /// } /// \table_row3{ <b>`VideoPlayer.SubChannelNumber`</b>, /// \anchor VideoPlayer_SubChannelNumber @@ -2083,7 +2083,7 @@ const infomap musicplayer[] = {{ "title", MUSICPLAYER_TITLE }, /// \table_row3{ <b>`VideoPlayer.ChannelGroup`</b>, /// \anchor VideoPlayer_ChannelGroup /// _string_, -/// Group of the curently tuned channel (PVR). +/// Group of the currently tuned channel (PVR). /// } /// \table_row3{ <b>`VideoPlayer.ParentalRating`</b>, /// \anchor VideoPlayer_ParentalRating @@ -4409,7 +4409,7 @@ const infomap playlist[] = {{ "length", PLAYLIST_LENGTH }, /// \table_row3{ <b>`Pvr.TimeShiftProgress`</b>, /// \anchor Pvr_TimeShiftProgress /// _integer_, -/// Returns the position of currently timeshifted title on TV as interger +/// Returns the position of currently timeshifted title on TV as integer /// } /// \table_row3{ <b>`Pvr.TVNowRecordingTitle`</b>, /// \anchor Pvr_TVNowRecordingTitle @@ -4664,7 +4664,7 @@ const infomap pvr[] = {{ "isrecording", PVR_IS_RECORDING /// \table_row3{ <b>`ADSP.MasterName`</b>, /// \anchor ADSP_MasterName /// _string_, -/// Name of the curently selected and used master dsp mode +/// Name of the currently selected and used master dsp mode /// } /// \table_row3{ <b>`ADSP.MasterInfo`</b>, /// \anchor ADSP_MasterInfo @@ -4679,7 +4679,7 @@ const infomap pvr[] = {{ "isrecording", PVR_IS_RECORDING /// \table_row3{ <b>`ADSP.MasterOverrideIcon`</b>, /// \anchor ADSP_MasterOverrideIcon /// _path_, -/// Icon to overrite Kodi's codec icon with one of add-on\, e.g. Dolby +/// Icon to override Kodi's codec icon with one of add-on\, e.g. Dolby /// Digital EX on Dolby Digital /// } /// \table_end @@ -4748,7 +4748,7 @@ const infomap adsp[] = {{ "isactive", ADSP_IS_ACTIVE } /// \table_row3{ <b>`RDS.GetLine(number)`</b>, /// \anchor RDS_GetLine /// _string_, -/// Returns the last sended RDS text messages on givern number\, 0 is the +/// Returns the last sended RDS text messages on given number\, 0 is the /// last and 4 rows are supported (0-3) /// } /// \table_row3{ <b>`RDS.Title`</b>, @@ -5004,13 +5004,13 @@ const infomap adsp[] = {{ "isactive", ADSP_IS_ACTIVE } /// \table_row3{ <b>`RDS.EmailHotline`</b>, /// \anchor RDS_EmailHotline /// _string_, -/// The email adress of the radio stations hotline (if available)\n +/// The email address of the radio stations hotline (if available)\n /// (Only be available on RadiotextPlus) /// } /// \table_row3{ <b>`RDS.EmailStudio`</b>, /// \anchor RDS_EmailStudio /// _string_, -/// The email adress of the radio stations studio (if available)\n +/// The email address of the radio stations studio (if available)\n /// (Only be available on RadiotextPlus) /// } /// \table_end diff --git a/xbmc/GUIInfoManager.h b/xbmc/GUIInfoManager.h index 6934ecacbc..c723ff99f2 100644 --- a/xbmc/GUIInfoManager.h +++ b/xbmc/GUIInfoManager.h @@ -341,7 +341,7 @@ protected: int m_libraryHasCompilations; //Count of artists in music library contributing to song by role e.g. composers, conductors etc. - //For checking visibiliy of custom nodes for a role. + //For checking visibility of custom nodes for a role. std::vector<std::pair<std::string, int>> m_libraryRoleCounts; SPlayerVideoStreamInfo m_videoInfo; diff --git a/xbmc/MediaSource.h b/xbmc/MediaSource.h index 7dfe21a527..afa221d0c7 100644 --- a/xbmc/MediaSource.h +++ b/xbmc/MediaSource.h @@ -48,7 +48,7 @@ public: void FromNameAndPaths(const std::string &category, const std::string &name, const std::vector<std::string> &paths); bool IsWritable() const; - std::string strName; ///< Name of the share, can be choosen freely. + std::string strName; ///< Name of the share, can be chosen freely. std::string strStatus; ///< Status of the share (eg has disk etc.) std::string strDiskUniqueId; ///< removable:// + DVD Label + DVD ID for resume point storage, if available std::string strPath; ///< Path of the share, eg. iso9660:// or F: diff --git a/xbmc/PasswordManager.h b/xbmc/PasswordManager.h index b2db8ef310..8027763fce 100644 --- a/xbmc/PasswordManager.h +++ b/xbmc/PasswordManager.h @@ -85,7 +85,7 @@ public: void Clear(); private: - // private construction, and no assignements; use the provided singleton methods + // private construction, and no assignments; use the provided singleton methods CPasswordManager(); CPasswordManager(const CPasswordManager&); CPasswordManager const & operator=(CPasswordManager const&); diff --git a/xbmc/PlayListPlayer.cpp b/xbmc/PlayListPlayer.cpp index 577409c7fb..61b5c5d2c9 100644 --- a/xbmc/PlayListPlayer.cpp +++ b/xbmc/PlayListPlayer.cpp @@ -573,7 +573,7 @@ void CPlayListPlayer::ReShuffle(int iPlaylist, int iPosition) { GetPlaylist(iPlaylist).Shuffle(); } - // we're trying to shuffle new items into the curently playing playlist + // we're trying to shuffle new items into the currently playing playlist // so we shuffle starting at two positions below the current item else if (iPlaylist == m_iCurrentPlayList) { diff --git a/xbmc/TextureCache.h b/xbmc/TextureCache.h index 696a64b1ef..c8d4173f35 100644 --- a/xbmc/TextureCache.h +++ b/xbmc/TextureCache.h @@ -49,7 +49,7 @@ public: */ static CTextureCache &GetInstance(); - /*! \brief Initalize the texture cache + /*! \brief Initialize the texture cache */ void Initialize(); @@ -156,7 +156,7 @@ public: bool Export(const std::string &image, const std::string &destination, bool overwrite); bool Export(const std::string &image, const std::string &destination); //! @todo BACKWARD COMPATIBILITY FOR MUSIC THUMBS private: - // private construction, and no assignements; use the provided singleton methods + // private construction, and no assignments; use the provided singleton methods CTextureCache(); CTextureCache(const CTextureCache&); CTextureCache const& operator=(CTextureCache const&); diff --git a/xbmc/TextureCacheJob.h b/xbmc/TextureCacheJob.h index dc716eb133..e3e76e09c8 100644 --- a/xbmc/TextureCacheJob.h +++ b/xbmc/TextureCacheJob.h @@ -97,7 +97,7 @@ private: a image URL is much more likely to be static and the actual image at the URL is unlikely to change, so no point checking all the time. \param url the url to check - \return true if the image given by the URL should be checked for updates, false otehrwise + \return true if the image given by the URL should be checked for updates, false otherwise */ bool UpdateableURL(const std::string &url) const; diff --git a/xbmc/URL.cpp b/xbmc/URL.cpp index 4d506d88d1..fee73f5737 100644 --- a/xbmc/URL.cpp +++ b/xbmc/URL.cpp @@ -652,7 +652,7 @@ bool CURL::IsFullPath(const std::string &url) } std::string CURL::Decode(const std::string& strURLData) -//modified to be more accomodating - if a non hex value follows a % take the characters directly and don't raise an error. +//modified to be more accommodating - if a non hex value follows a % take the characters directly and don't raise an error. // However % characters should really be escaped like any other non safe character (www.rfc-editor.org/rfc/rfc1738.txt) { std::string strResult; diff --git a/xbmc/Util.cpp b/xbmc/Util.cpp index 4c6804ad02..f2d69da28c 100644 --- a/xbmc/Util.cpp +++ b/xbmc/Util.cpp @@ -1095,7 +1095,7 @@ void CUtil::SplitParams(const std::string ¶mString, std::vector<std::string> inFunction++; } if (!inFunction && ch == ',') - { // not in a function, so a comma signfies the end of this parameter + { // not in a function, so a comma signifies the end of this parameter if (whiteSpacePos) parameter = parameter.substr(0, whiteSpacePos); // trim off start and end quotes @@ -1262,7 +1262,7 @@ int CUtil::GetMatchingSource(const std::string& strPath1, VECSOURCES& VECSOURCES // if exact match, return it immediately if (iLenPath == iLenShare) { - // if the path EXACTLY matches an item in a concatentated path + // if the path EXACTLY matches an item in a concatenated path // set source name to true to load the full virtualpath bIsSourceName = false; if (vecPaths.size() > 1) diff --git a/xbmc/addons/AddonInstaller.h b/xbmc/addons/AddonInstaller.h index 252dc7ccf1..93d931d6a7 100644 --- a/xbmc/addons/AddonInstaller.h +++ b/xbmc/addons/AddonInstaller.h @@ -115,7 +115,7 @@ public: typedef std::map<std::string, CDownloadJob> JobMap; private: - // private construction, and no assignements; use the provided singleton methods + // private construction, and no assignments; use the provided singleton methods CAddonInstaller(); CAddonInstaller(const CAddonInstaller&); CAddonInstaller const& operator=(CAddonInstaller const&); diff --git a/xbmc/addons/AddonStatusHandler.cpp b/xbmc/addons/AddonStatusHandler.cpp index 660bc2c079..8c8c2202dc 100644 --- a/xbmc/addons/AddonStatusHandler.cpp +++ b/xbmc/addons/AddonStatusHandler.cpp @@ -39,7 +39,7 @@ namespace ADDON /********************************************************** * CAddonStatusHandler - AddOn Status Report Class * - * Used to informate the user about occurred errors and + * Used to inform the user about occurred errors and * changes inside Add-on's, and ask him what to do. * */ diff --git a/xbmc/addons/AddonStatusHandler.h b/xbmc/addons/AddonStatusHandler.h index e6e1ad40a9..804dcb78bc 100644 --- a/xbmc/addons/AddonStatusHandler.h +++ b/xbmc/addons/AddonStatusHandler.h @@ -29,10 +29,10 @@ namespace ADDON { /** * Class - CAddonStatusHandler - * Used to informate the user about occurred errors and + * Used to inform the user about occurred errors and * changes inside Add-on's, and ask him what to do. * It can executed in the same thread as the calling - * function or in a seperate thread. + * function or in a separate thread. */ class CAddonStatusHandler : private CThread { diff --git a/xbmc/addons/GUIDialogAddonInfo.h b/xbmc/addons/GUIDialogAddonInfo.h index aa998000c8..88ef528731 100644 --- a/xbmc/addons/GUIDialogAddonInfo.h +++ b/xbmc/addons/GUIDialogAddonInfo.h @@ -66,7 +66,7 @@ private: bool CanRun() const; /*! - * Returns true if current addon is of a type that can only have one activly + * Returns true if current addon is of a type that can only have one active * in use at a time and can be changed (e.g skins)*/ bool CanUse() const; diff --git a/xbmc/addons/GUIDialogAddonSettings.cpp b/xbmc/addons/GUIDialogAddonSettings.cpp index 64acac23a0..274d30361b 100644 --- a/xbmc/addons/GUIDialogAddonSettings.cpp +++ b/xbmc/addons/GUIDialogAddonSettings.cpp @@ -484,7 +484,7 @@ bool CGUIDialogAddonSettings::ShowVirtualKeyboard(int iControl) bool multiSelect = strMultiselect && strcmpi(strMultiselect, "true") == 0; if (multiSelect) { - // construct vector of addon IDs (IDs are comma seperated in single string) + // construct vector of addon IDs (IDs are comma separated in single string) std::vector<std::string> addonIDs = StringUtils::Split(value, ','); if (CGUIWindowAddonBrowser::SelectAddonID(types, addonIDs, false) == 1) { diff --git a/xbmc/addons/GUIDialogAddonSettings.h b/xbmc/addons/GUIDialogAddonSettings.h index be85195d52..ac9653bd73 100644 --- a/xbmc/addons/GUIDialogAddonSettings.h +++ b/xbmc/addons/GUIDialogAddonSettings.h @@ -63,8 +63,8 @@ private: std::vector<std::string> GetFileEnumValues(const std::string &path, const std::string &mask, const std::string &options) const; /*! \brief Translate list of addon IDs to list of addon names - \param addonIDslist comma seperated list of addon IDs - \return comma seperated list of addon names + \param addonIDslist comma separated list of addon IDs + \return comma separated list of addon names */ std::string GetAddonNames(const std::string& addonIDslist) const; diff --git a/xbmc/addons/GUIWindowAddonBrowser.h b/xbmc/addons/GUIWindowAddonBrowser.h index f621755c50..f1a509f392 100644 --- a/xbmc/addons/GUIWindowAddonBrowser.h +++ b/xbmc/addons/GUIWindowAddonBrowser.h @@ -56,7 +56,7 @@ public: \param addonIDs [in/out] array of (pre) selected addon IDs \param showNone whether there should be a "None" item in the list (defaults to false) \param showDetails whether to show details of the addons or not - \param multipleSelection allow selection of multiple addons, if set to true showNone will automaticly switch to false + \param multipleSelection allow selection of multiple addons, if set to true showNone will automatically switch to false \param showInstalled whether installed addons should be in the list \param showInstallable whether installable addons should be in the list \param showMore whether to show the "Get More" button (only makes sense if showInstalled is true and showInstallable is false) diff --git a/xbmc/addons/PVRClient.h b/xbmc/addons/PVRClient.h index 0e2de1d7f2..85e4590c12 100644 --- a/xbmc/addons/PVRClient.h +++ b/xbmc/addons/PVRClient.h @@ -126,7 +126,7 @@ namespace PVR PVR_CONNECTION_STATE GetPreviousConnectionState(void) const; /*! - * @brief signal to PVRMananager this client should be ignored + * @brief signal to PVRManager this client should be ignored * @return true if this client should be ignored */ bool IgnoreClient(void) const; @@ -307,7 +307,7 @@ namespace PVR /*! * @param deleted if set return deleted recording - * @return The total amount of recordingd on the server or -1 on error. + * @return The total amount of recordings on the server or -1 on error. */ int GetRecordingsAmount(bool deleted); @@ -532,7 +532,7 @@ namespace PVR /*! * @brief Open a recording on the server. * @param recording The recording to open. - * @return True if the stream has been opened succesfully, false otherwise. + * @return True if the stream has been opened successfully, false otherwise. */ bool OpenStream(const CPVRRecordingPtr &recording); diff --git a/xbmc/addons/Scraper.cpp b/xbmc/addons/Scraper.cpp index abf6cb6d9b..e47fd35836 100644 --- a/xbmc/addons/Scraper.cpp +++ b/xbmc/addons/Scraper.cpp @@ -977,7 +977,7 @@ std::vector<CScraperUrl> CScraper::FindMovie(XFILE::CCurlFile &fcurl, for ( ; pxeLink && pxeLink->FirstChild(); pxeLink = pxeLink->NextSiblingElement("url")) scurlMovie.ParseElement(pxeLink); - // calculate the relavance of this hit + // calculate the relevance of this hit std::string sCompareTitle = scurlMovie.strTitle; StringUtils::ToLower(sCompareTitle); std::string sMatchTitle = sTitle; diff --git a/xbmc/addons/Skin.cpp b/xbmc/addons/Skin.cpp index f9a078209b..85d3c36a8a 100644 --- a/xbmc/addons/Skin.cpp +++ b/xbmc/addons/Skin.cpp @@ -491,7 +491,7 @@ void CSkinInfo::SettingOptionsSkinFontsFiller(const CSetting *setting, std::vect void CSkinInfo::SettingOptionsSkinThemesFiller(const CSetting *setting, std::vector< std::pair<std::string, std::string> > &list, std::string ¤t, void *data) { - // get the choosen theme and remove the extension from the current theme (backward compat) + // get the chosen theme and remove the extension from the current theme (backward compat) std::string settingValue = ((const CSettingString*)setting)->GetValue(); URIUtils::RemoveExtension(settingValue); current = "SKINDEFAULT"; diff --git a/xbmc/addons/Skin.h b/xbmc/addons/Skin.h index bc1ca50dc9..d68a27479e 100644 --- a/xbmc/addons/Skin.h +++ b/xbmc/addons/Skin.h @@ -122,7 +122,7 @@ public: float effectsSlowDown, bool debugging); - /*! \brief Load resultion information from directories in Path(). + /*! \brief Load resolution information from directories in Path(). */ void Start(); diff --git a/xbmc/addons/interfaces/GUI/AddonGUIWindow.cpp b/xbmc/addons/interfaces/GUI/AddonGUIWindow.cpp index a9f9cb6beb..d0dab1393d 100644 --- a/xbmc/addons/interfaces/GUI/AddonGUIWindow.cpp +++ b/xbmc/addons/interfaces/GUI/AddonGUIWindow.cpp @@ -67,7 +67,7 @@ CGUIAddonWindow::~CGUIAddonWindow(void) bool CGUIAddonWindow::OnAction(const CAction &action) { - // Let addon decide whether it wants to hande action first + // Let addon decide whether it wants to handle action first if (CBOnAction && CBOnAction(m_clientHandle, action.GetID())) return true; @@ -164,7 +164,7 @@ bool CGUIAddonWindow::OnMessage(CGUIMessage& message) // inf->pObject = Action_FromAction(CAction(ACTION_CONTEXT_MENU)); // inf->pCallbackWindow = pCallbackWindow; // -// // aquire lock? +// // acquire lock? // PyXBMC_AddPendingCall(Py_XBMC_Event_OnAction, inf); // PulseActionEvent(); } @@ -281,7 +281,7 @@ void CGUIAddonWindow::PulseActionEvent() bool CGUIAddonWindow::OnClick(int iItem, const std::string &player) { // Hook Over calling CGUIMediaWindow::OnClick(iItem) results in it trying to PLAY the file item - // which if its not media is BAD and 99 out of 100 times undesireable. + // which if its not media is BAD and 99 out of 100 times undesirable. return false; } diff --git a/xbmc/addons/interfaces/Game/AddonCallbacksGame.h b/xbmc/addons/interfaces/Game/AddonCallbacksGame.h index b3cf26f509..45cfad0c81 100644 --- a/xbmc/addons/interfaces/Game/AddonCallbacksGame.h +++ b/xbmc/addons/interfaces/Game/AddonCallbacksGame.h @@ -68,4 +68,4 @@ private: } /* namespace Game */ -} /* namespace KoidAPI */ +} /* namespace KodiAPI */ diff --git a/xbmc/addons/kodi-addon-dev-kit/doxygen/Doxyfile b/xbmc/addons/kodi-addon-dev-kit/doxygen/Doxyfile index a63f67e3c4..184b34e70b 100644 --- a/xbmc/addons/kodi-addon-dev-kit/doxygen/Doxyfile +++ b/xbmc/addons/kodi-addon-dev-kit/doxygen/Doxyfile @@ -1572,7 +1572,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # diff --git a/xbmc/addons/kodi-addon-dev-kit/doxygen/General/DoxygenOnAddon.dox b/xbmc/addons/kodi-addon-dev-kit/doxygen/General/DoxygenOnAddon.dox index 6d99f53da8..7502e5e687 100644 --- a/xbmc/addons/kodi-addon-dev-kit/doxygen/General/DoxygenOnAddon.dox +++ b/xbmc/addons/kodi-addon-dev-kit/doxygen/General/DoxygenOnAddon.dox @@ -20,7 +20,7 @@ _ _ _ Start doxygen documentation for add-ons always with `///` and on Kodi itself with `/*!`, this makes it more easy to see for which place the documentation is. -<b>Here a axample on add-on about function coding style:</b> +<b>Here an example on add-on about function coding style:</b> \verbatim #ifdef DOXYGEN_SHOULD_USE_THIS @@ -73,8 +73,8 @@ Start doxygen documentation for add-ons always with `///` and on Kodi itself wit - \verbatim /// \ingroup\endverbatim - Define the group where the documentation part comes in. - \verbatim /// @brief\endverbatim - Add a small text of part there. - \verbatim /// TEXT_FIELD\endverbatim - Add a bigger text there if needed. -- \verbatim /// @param[in] VALUE_NAME VALUE_TEXT\endverbatim - To set input paramter defined by name and add a description. There the example also add a small table which is useful to descripe values. -- \verbatim /// @param[out] VALUE_NAME VALUE_TEXT\endverbatim - To set output paramter defined by name and add a description. +- \verbatim /// @param[in] VALUE_NAME VALUE_TEXT\endverbatim - To set input parameter defined by name and add a description. There the example also add a small table which is useful to describe values. +- \verbatim /// @param[out] VALUE_NAME VALUE_TEXT\endverbatim - To set output parameter defined by name and add a description. - \verbatim /// @return VALUE_TEXT\endverbatim - To add a description of return value. - \verbatim /// @throws ERROR_TYPE ERROR_TEXT\endverbatim - If also exception becomes handled, can you use this for description. - \verbatim /// TEXT_FIELD\endverbatim - Add a much bigger text there if needed. @@ -83,7 +83,7 @@ Start doxygen documentation for add-ons always with `///` and on Kodi itself wit @note Start all `VALUE_TEXT` at same character to hold a clean code on <c>*.cpp</c> or <c>*.h</c> files.\n\n The `#ifdef DOXYGEN_SHOULD_USE_THIS` on example above can be becomes used - if for Doxygen another function is needed to descripe. + if for Doxygen another function is needed to describe. If you want to prevent a part from doxygen can you define <b>`#ifndef DOXYGEN_SHOULD_SKIP_THIS`</b> or <b>`#ifdef DOXYGEN_SHOULD_USE_THIS`</b> on the related code. diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_adsp_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_adsp_dll.h index 350d2287df..dad2f41e97 100644 --- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_adsp_dll.h +++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_adsp_dll.h @@ -49,7 +49,7 @@ * to his type) about his given sample rate. * - About the from user selected master processing mode the related addon * becomes called now with MasterProcessSetMode(...) to handle it's - * selectionon the addon given by the own addon type identifier or by + * selection on the addon given by the own addon type identifier or by * KODI's useddatabase id, also the currently used stream type (e.g. * Music or Video) is send. * - If the addon supports only one master mode it can ignore this function @@ -179,7 +179,7 @@ extern "C" * surround upmix not needed on 5.1 audio stream. * @param addonSettings The add-ons audio settings. * @param pProperties The properties of the currently playing stream. - * @param handle On this becomes addon informated about stream id and can set function addresses which need on calls + * @param handle On this becomes addon informed about stream id and can set function addresses which need on calls * @return AE_DSP_ERROR_NO_ERROR if the properties were fetched successfully * and data can be performed. AE_DSP_ERROR_IGNORE_ME if format is not * supported, but without fault. diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_adsp_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_adsp_types.h index 447e696015..28990d1a8f 100644 --- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_adsp_types.h +++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_adsp_types.h @@ -442,7 +442,7 @@ extern "C" { struct AE_DSP_MODE { int iUniqueDBModeId; /*!< @brief (required) the inside add-on used identifier for the mode, set by KODI's audio DSP database */ - AE_DSP_MODE_TYPE iModeType; /*!< @brief (required) the processong mode type, see AE_DSP_MODE_TYPE */ + AE_DSP_MODE_TYPE iModeType; /*!< @brief (required) the processing mode type, see AE_DSP_MODE_TYPE */ char strModeName[AE_DSP_ADDON_STRING_LENGTH]; /*!< @brief (required) the addon name of the mode, used on KODI's logs */ unsigned int iModeNumber; /*!< @brief (required) number of this mode on the add-on, is used on process functions with value "mode_id" */ diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h index 75b8c427db..f049ef6f51 100644 --- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h +++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h @@ -122,7 +122,7 @@ extern "C" { const unsigned int PVR_TIMER_TYPE_IS_READONLY = 0x00000004; /*!< @brief timers of this type must not be edited by Kodi */ const unsigned int PVR_TIMER_TYPE_FORBIDS_NEW_INSTANCES = 0x00000008; /*!< @brief timers of this type must not be created by Kodi. All other operations are allowed, though */ - const unsigned int PVR_TIMER_TYPE_SUPPORTS_ENABLE_DISABLE = 0x00000010; /*!< @brief this type supports enabling/disabling of the timer (PVR_TIMER.state SCHEDULED|DISBALED) */ + const unsigned int PVR_TIMER_TYPE_SUPPORTS_ENABLE_DISABLE = 0x00000010; /*!< @brief this type supports enabling/disabling of the timer (PVR_TIMER.state SCHEDULED|DISABLED) */ const unsigned int PVR_TIMER_TYPE_SUPPORTS_CHANNELS = 0x00000020; /*!< @brief this type supports channels (PVR_TIMER.iClientChannelUid) */ const unsigned int PVR_TIMER_TYPE_SUPPORTS_START_TIME = 0x00000040; /*!< @brief this type supports a recording start time (PVR_TIMER.startTime) */ const unsigned int PVR_TIMER_TYPE_SUPPORTS_TITLE_EPG_MATCH = 0x00000080; /*!< @brief this type supports matching epg episode title using PVR_TIMER.strEpgSearchString */ @@ -166,7 +166,7 @@ extern "C" { /*! * @brief special PVR_TIMER.iClientChannelUid and PVR_RECORDING.iChannelUid value to indicate that no channel uid is available. */ - const int PVR_CHANNEL_INVALID_UID = -1; /*!< @brief denotes that no channel uid is avaliable. */ + const int PVR_CHANNEL_INVALID_UID = -1; /*!< @brief denotes that no channel uid is available. */ /*! * @brief PVR add-on error codes @@ -254,7 +254,7 @@ extern "C" { /*! * @brief PVR add-on capabilities. All capabilities are set to "false" as default. - * If a capabilty is set to true, then the corresponding methods from xbmc_pvr_dll.h need to be implemented. + * If a capability is set to true, then the corresponding methods from xbmc_pvr_dll.h need to be implemented. */ typedef struct PVR_ADDON_CAPABILITIES { @@ -500,7 +500,7 @@ extern "C" { */ typedef enum { - PVR_EDL_TYPE_CUT = 0, /*!< @brief cut (completly remove content) */ + PVR_EDL_TYPE_CUT = 0, /*!< @brief cut (completely remove content) */ PVR_EDL_TYPE_MUTE = 1, /*!< @brief mute audio */ PVR_EDL_TYPE_SCENE = 2, /*!< @brief scene markers (chapter seeking) */ PVR_EDL_TYPE_COMBREAK = 3 /*!< @brief commercial breaks */ diff --git a/xbmc/commons/Buffer.h b/xbmc/commons/Buffer.h index ae84639892..c30d6081ee 100644 --- a/xbmc/commons/Buffer.h +++ b/xbmc/commons/Buffer.h @@ -109,7 +109,7 @@ namespace XbmcCommons /** * Construct a buffer given an externally managed memory buffer. * The ownership of the buffer is assumed to be the code that called - * this constructor, therefore the Buffer descrutor will not free it. + * this constructor, therefore the Buffer destructor will not free it. * * The newly constructed buffer is considered empty and is ready to * have data written into it. @@ -125,7 +125,7 @@ namespace XbmcCommons /** * Construct a buffer buffer using the size buffer provided. The - * buffer will be internally managed and potentiall shared with + * buffer will be internally managed and potentially shared with * other Buffer instances. It will be freed upon destruction of * the last Buffer that references it. */ diff --git a/xbmc/commons/Exception.h b/xbmc/commons/Exception.h index 649d967530..4d9da1e79b 100644 --- a/xbmc/commons/Exception.h +++ b/xbmc/commons/Exception.h @@ -105,7 +105,7 @@ namespace XbmcCommons /** * This class forms the base class for unchecked exceptions. Unchecked exceptions * are those that really shouldn't be handled explicitly. For example, on windows - * when a access violaton is converted to a win32_exception, there's nothing + * when a access violation is converted to a win32_exception, there's nothing * that can be done in most code. The outer most stack frame might try to * do some error logging prior to shutting down, but that's really it. */ diff --git a/xbmc/contrib/kissfft/kiss_fft.c b/xbmc/contrib/kissfft/kiss_fft.c index 465d6c97a0..846549b1cd 100644 --- a/xbmc/contrib/kissfft/kiss_fft.c +++ b/xbmc/contrib/kissfft/kiss_fft.c @@ -15,7 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND #include "_kiss_fft_guts.h" /* The guts header contains all the multiplication and addition macros that are defined for - fixed or floating point complex numbers. It also delares the kf_ internal functions. + fixed or floating point complex numbers. It also declares the kf_ internal functions. */ static void kf_bfly2( diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp index d38afea2b5..176591a4bb 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp @@ -231,12 +231,12 @@ bool CActiveAEBufferPoolResample::Create(unsigned int totaltime, bool remap, boo if (m_useDSP) { - m_inputFormat.m_channelLayout = m_processor->GetChannelLayout(); /* Overide input format with DSP's supported format */ - m_inputFormat.m_sampleRate = m_processor->GetOutputSamplerate(); /* Overide input format with DSP's generated samplerate */ - m_inputFormat.m_dataFormat = m_processor->GetDataFormat(); /* Overide input format with DSP's processed data format, normally it is float */ + m_inputFormat.m_channelLayout = m_processor->GetChannelLayout(); /* Override input format with DSP's supported format */ + m_inputFormat.m_sampleRate = m_processor->GetOutputSamplerate(); /* Override input format with DSP's generated samplerate */ + m_inputFormat.m_dataFormat = m_processor->GetDataFormat(); /* Override input format with DSP's processed data format, normally it is float */ m_inputFormat.m_frames = m_processor->GetOutputFrames(); m_forceResampler = true; /* Force load of ffmpeg resampler, required to detect exact input and output channel alignment pointers */ - if (m_processor->GetChannelLayout().Count() > 2) /* Disable upmix for CActiveAEResample if DSP layout > 2.0, becomes perfomed by DSP */ + if (m_processor->GetChannelLayout().Count() > 2) /* Disable upmix for CActiveAEResample if DSP layout > 2.0, becomes performed by DSP */ upmix = false; m_dspBuffer = new CActiveAEBufferPool(m_inputFormat); /* Get dsp processing buffer class, based on dsp output format */ @@ -339,9 +339,9 @@ void CActiveAEBufferPoolResample::ChangeAudioDSP() m_useDSP = CServiceBroker::GetADSP().CreateDSPs(m_streamId, m_processor, m_dspFormat, m_format, m_stereoUpmix, m_resampleQuality, m_MatrixEncoding, m_AudioServiceType, m_Profile, wasActive); if (m_useDSP) { - m_inputFormat.m_channelLayout = m_processor->GetChannelLayout(); /* Overide input format with DSP's supported format */ - m_inputFormat.m_sampleRate = m_processor->GetOutputSamplerate(); /* Overide input format with DSP's generated samplerate */ - m_inputFormat.m_dataFormat = m_processor->GetDataFormat(); /* Overide input format with DSP's processed data format, normally it is float */ + m_inputFormat.m_channelLayout = m_processor->GetChannelLayout(); /* Override input format with DSP's supported format */ + m_inputFormat.m_sampleRate = m_processor->GetOutputSamplerate(); /* Override input format with DSP's generated samplerate */ + m_inputFormat.m_dataFormat = m_processor->GetDataFormat(); /* Override input format with DSP's processed data format, normally it is float */ m_inputFormat.m_frames = m_processor->GetOutputFrames(); m_changeResampler = true; /* Force load of ffmpeg resampler, required to detect exact input and output channel alignment pointers */ } @@ -556,7 +556,7 @@ void CActiveAEBufferPoolResample::ConfigureResampler(bool normalizelevels, bool if ((m_format.m_channelLayout.Count() < m_inputFormat.m_channelLayout.Count()) && !normalizelevels) normalize = false; - /* Disable upmix if DSP layout > 2.0, becomes perfomed by DSP */ + /* Disable upmix if DSP layout > 2.0, becomes performed by DSP */ bool ignoreUpmix = false; if (dspenabled && m_useDSP && m_processor->GetChannelLayout().Count() > 2) ignoreUpmix = true; diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/AudioDSPAddons/ActiveAEDSP.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/AudioDSPAddons/ActiveAEDSP.h index 96318475e0..a3bb886dd8 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/AudioDSPAddons/ActiveAEDSP.h +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/AudioDSPAddons/ActiveAEDSP.h @@ -322,7 +322,7 @@ namespace ActiveAE AE_DSP_STREAMTYPE LoadCurrentAudioSettings(void); /*! - * @brief Perfoms a update of all processing calls over the add-ons + * @brief Performs a update of all processing calls over the add-ons * @param bAsync if true the update becomes performed on background */ void TriggerModeUpdate(bool bAsync = true); @@ -405,7 +405,7 @@ namespace ActiveAE unsigned int m_usedProcessesCnt; /*!< the amount of used addon processes */ CActiveAEDSPProcessPtr m_usedProcesses[AE_DSP_STREAM_MAX_STREAMS]; /*!< Pointer to active process performing classes */ unsigned int m_activeProcessId; /*!< The currently active audio stream id of a playing file source */ - bool m_isValidAudioDSPSettings; /*!< if settings load was successfull it becomes true */ + bool m_isValidAudioDSPSettings; /*!< if settings load was successful it becomes true */ AE_DSP_MODELIST m_modes[AE_DSP_MODE_TYPE_MAX]; /*!< list of currently used dsp processing calls */ std::map<std::string, int> m_addonNameIds; /*!< map add-on names to IDs */ }; diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/AudioDSPAddons/ActiveAEDSPAddon.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/AudioDSPAddons/ActiveAEDSPAddon.h index 08f40b034f..2cf74236e6 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/AudioDSPAddons/ActiveAEDSPAddon.h +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/AudioDSPAddons/ActiveAEDSPAddon.h @@ -406,7 +406,7 @@ namespace ActiveAE bool LogError(const AE_DSP_ERROR error, const char *strMethod) const; bool m_bReadyToUse; /*!< true if this add-on is connected to the audio DSP, false otherwise */ - bool m_isInUse; /*!< true if this add-on currentyl processing data */ + bool m_isInUse; /*!< true if this add-on currently processing data */ AE_DSP_MENUHOOKS m_menuhooks; /*!< the menu hooks for this add-on */ int m_iClientId; /*!< database ID of the audio DSP */ diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/AudioDSPAddons/ActiveAEDSPDatabase.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/AudioDSPAddons/ActiveAEDSPDatabase.h index f92a82478f..ad6dd79c63 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/AudioDSPAddons/ActiveAEDSPDatabase.h +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/AudioDSPAddons/ActiveAEDSPDatabase.h @@ -64,7 +64,7 @@ namespace ActiveAE //@{ /*! * @brief Used to check for present mode types - * @param modeType The mode type identfier + * @param modeType The mode type identifier * @return True if modes present of given type */ bool ContainsModes(int modeType); @@ -77,7 +77,7 @@ namespace ActiveAE /*! * @brief Remove all modes from the database of a type. - * @param modeType The mode type identfier of functions to delete. + * @param modeType The mode type identifier of functions to delete. * @return True if the modes were deleted, false otherwise. */ bool DeleteModes(int modeType); diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/AudioDSPAddons/ActiveAEDSPMode.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/AudioDSPAddons/ActiveAEDSPMode.h index f0094d55bf..65fd1dd6dd 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/AudioDSPAddons/ActiveAEDSPMode.h +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/AudioDSPAddons/ActiveAEDSPMode.h @@ -175,7 +175,7 @@ namespace ActiveAE const std::string &IconOwnModePath(void) const; /*! - * @brief Get the path to a from addon set mode identification image to overirde the from KODI used one, e.g. Dolby Digital with Dolby Digital EX + * @brief Get the path to a from addon set mode identification image to override the from KODI used one, e.g. Dolby Digital with Dolby Digital EX * @return the path to the image or empty if not present */ const std::string &IconOverrideModePath(void) const; @@ -203,7 +203,7 @@ namespace ActiveAE //@{ /*! * @brief Get the identifier of this mode used on database - * @return the mode identifier or -1 if unknown and not safed to database + * @return the mode identifier or -1 if unknown and not saved to database */ int ModeID(void) const; @@ -221,7 +221,7 @@ namespace ActiveAE bool Delete(void); /*! - * @brief Ask database about this mode that it is alread known + * @brief Ask database about this mode that it is already known * @return true if present inside database */ bool IsKnown(void) const; diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/AudioDSPAddons/ActiveAEDSPProcess.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/AudioDSPAddons/ActiveAEDSPProcess.cpp index d9bfdbcff4..2128cbd627 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/AudioDSPAddons/ActiveAEDSPProcess.cpp +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/AudioDSPAddons/ActiveAEDSPProcess.cpp @@ -60,7 +60,7 @@ CActiveAEDSPProcess::CActiveAEDSPProcess(AE_DSP_STREAM_ID streamId) * Create predefined process arrays on every supported channel for audio dsp's. * All are set if used or not for safety reason and unsued ones can be used from * dsp addons as buffer arrays. - * If a bigger size is neeeded it becomes reallocated during DSP processing. + * If a bigger size is needed it becomes reallocated during DSP processing. */ m_processArraySize = MIN_DSP_ARRAY_SIZE; for (int i = 0; i < AE_DSP_CH_MAX; ++i) @@ -371,7 +371,7 @@ bool CActiveAEDSPProcess::Create(const AEAudioFormat &inputFormat, const AEAudio } /*! - * Now init all other dsp relavant addons + * Now init all other dsp relevant addons */ for (AE_DSP_ADDONMAP_ITR itr = addonMap.begin(); itr != addonMap.end(); ++itr) { @@ -1576,7 +1576,7 @@ void CActiveAEDSPProcess::SetFFMpegDSPProcessorArray(float *array_ffmpeg[2][AE_D * already present channel memory storage. */ - //! Initialize input channel alignmment for ffmpeg process array + //! Initialize input channel alignment for ffmpeg process array if (array_in) { if (m_addonSettings.lInChannelPresentFlags & AE_DSP_PRSNT_CH_FL) array_ffmpeg[FFMPEG_PROC_ARRAY_IN][m_idx_in[AE_CH_FL]] = array_in[AE_DSP_CH_FL]; @@ -1601,7 +1601,7 @@ void CActiveAEDSPProcess::SetFFMpegDSPProcessorArray(float *array_ffmpeg[2][AE_D if (m_addonSettings.lInChannelPresentFlags & AE_DSP_PRSNT_CH_BROC) array_ffmpeg[FFMPEG_PROC_ARRAY_IN][m_idx_in[AE_CH_BROC]] = array_in[AE_DSP_CH_BROC]; } - //! Initialize output channel alignmment for ffmpeg process array + //! Initialize output channel alignment for ffmpeg process array if (array_out) { if (m_addonSettings.lOutChannelPresentFlags & AE_DSP_PRSNT_CH_FL) array_ffmpeg[FFMPEG_PROC_ARRAY_OUT][m_idx_out[AE_CH_FL]] = array_out[AE_DSP_CH_FL]; diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/AudioDSPAddons/ActiveAEDSPProcess.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/AudioDSPAddons/ActiveAEDSPProcess.h index 10de3a1b9a..665cf5886c 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/AudioDSPAddons/ActiveAEDSPProcess.h +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/AudioDSPAddons/ActiveAEDSPProcess.h @@ -131,7 +131,7 @@ namespace ActiveAE CAEChannelInfo GetChannelLayout(); /*!> - * Get the currently used output data fromat + * Get the currently used output data format * @note Is normally float */ AEDataFormat GetDataFormat(); @@ -185,7 +185,7 @@ namespace ActiveAE /*!> * Returns the information class from the currently used dsp addon - * @return pointer to the info class, or unitialized class if no master processing present + * @return pointer to the info class, or uninitialized class if no master processing present */ CActiveAEDSPModePtr GetActiveMasterMode() const; @@ -210,7 +210,7 @@ namespace ActiveAE bool GetMasterModeStreamInfoString(std::string &strInfo); /*!> - * Get all dsp addon relavant information to detect processing mode type and base values. + * Get all dsp addon relevant information to detect processing mode type and base values. * @retval streamTypeUsed The current stream type processed by addon * @retval baseType The current base type type processed by addon * @retval iModeID The database identification code of the mode diff --git a/xbmc/cores/AudioEngine/Interfaces/AEStream.h b/xbmc/cores/AudioEngine/Interfaces/AEStream.h index 533f6715d4..dc50f8c82c 100644 --- a/xbmc/cores/AudioEngine/Interfaces/AEStream.h +++ b/xbmc/cores/AudioEngine/Interfaces/AEStream.h @@ -29,7 +29,7 @@ extern "C" { } /** - * Callback interafce for VideoPlayer clock needed by AE for sync + * Callback interface for VideoPlayer clock needed by AE for sync */ class IAEClockCallback { diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp index 8a01e384ce..232a36c8bc 100644 --- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp +++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp @@ -696,7 +696,7 @@ bool CAESinkALSA::InitializeHW(const ALSAConfig &inconfig, ALSAConfig &outconfig /* try the data format */ if (snd_pcm_hw_params_set_format(m_pcm, hw_params, fmt) < 0) { - /* if the chosen format is not supported, try each one in decending order */ + /* if the chosen format is not supported, try each one in descending order */ CLog::Log(LOGINFO, "CAESinkALSA::InitializeHW - Your hardware does not support %s, trying other formats", CAEUtil::DataFormatToStr(outconfig.format)); for (enum AEDataFormat i = AE_FMT_MAX; i > AE_FMT_INVALID; i = (enum AEDataFormat)((int)i - 1)) { @@ -801,7 +801,7 @@ bool CAESinkALSA::InitializeHW(const ALSAConfig &inconfig, ALSAConfig &outconfig { // try only BufferSize bufferSize = bufferSizeTemp; - snd_pcm_hw_params_copy(hw_params_copy, hw_params); // restory working copy + snd_pcm_hw_params_copy(hw_params_copy, hw_params); // restore working copy if (snd_pcm_hw_params_set_buffer_size_near(m_pcm, hw_params_copy, &bufferSize) != 0 || snd_pcm_hw_params(m_pcm, hw_params_copy) != 0) { @@ -1551,7 +1551,7 @@ void CAESinkALSA::EnumerateDevice(AEDeviceInfoList &list, const std::string &dev if (info.m_deviceType == AE_DEVTYPE_HDMI) { - // we don't trust ELD information and push back our supported formats explicitely + // we don't trust ELD information and push back our supported formats explicitly info.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_AC3); info.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_DTSHD); info.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_DTSHD_CORE); diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp index 7149b34d66..c44237f132 100644 --- a/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp +++ b/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp @@ -532,7 +532,7 @@ void CAESinkAUDIOTRACK::GetDelay(AEDelayStatus& status) // In their infinite wisdom, Google decided to make getPlaybackHeadPosition // return a 32bit "int" that you should "interpret as unsigned." As such, - // for wrap saftey, we need to do all ops on it in 32bit integer math. + // for wrap safety, we need to do all ops on it in 32bit integer math. uint32_t head_pos = (uint32_t)m_at_jni->getPlaybackHeadPosition(); diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkDARWINIOS.mm b/xbmc/cores/AudioEngine/Sinks/AESinkDARWINIOS.mm index c7a707dfcb..746e809b2e 100644 --- a/xbmc/cores/AudioEngine/Sinks/AESinkDARWINIOS.mm +++ b/xbmc/cores/AudioEngine/Sinks/AESinkDARWINIOS.mm @@ -251,7 +251,7 @@ unsigned int CAAudioUnitSink::write(uint8_t *data, unsigned int frames) 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, timeout); @@ -283,7 +283,7 @@ void CAAudioUnitSink::drain() bytes = m_buffer->GetReadSize(); // if we timeout and don't - // consum bytes - decrease maxNumTimeouts + // consume bytes - decrease maxNumTimeouts if (timer.IsTimePast() && bytes == totalBytes) maxNumTimeouts--; totalBytes = bytes; @@ -549,7 +549,7 @@ static void EnumerateDevices(AEDeviceInfoList &list) device.m_displayName = "Default"; device.m_displayNameExtra = ""; // TODO screen changing on ios needs to call - // devices changed once this is available in activae + // devices changed once this is available in active if (g_Windowing.GetCurrentScreen() > 0) { device.m_deviceType = AE_DEVTYPE_IEC958; //allow passthrough for tvout diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp index 2e9fd33672..86703c8d1b 100644 --- a/xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp +++ b/xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp @@ -51,7 +51,7 @@ static void EnumerateDevices(CADeviceList &list) //(allows transition from headphones to speaker and stuff //like that) //fixme taking the first stream device is wrong here - //we rather might need the concatination of all streams *sucks* + //we rather might need the concatenation of all streams *sucks* if(defaultDeviceName == devEnum.GetMasterDeviceName()) { struct CADeviceInstance deviceInstance; @@ -408,7 +408,7 @@ unsigned int CAESinkDARWINOSX::AddPackets(uint8_t **data, unsigned int frames, u 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, timeout); @@ -442,7 +442,7 @@ void CAESinkDARWINOSX::Drain() bytes = m_buffer->GetReadSize(); // if we timeout and don't - // consum bytes - decrease maxNumTimeouts + // consume bytes - decrease maxNumTimeouts if (timer.IsTimePast() && bytes == totalBytes) maxNumTimeouts--; totalBytes = bytes; diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp index f8100b3d17..f5b55e09a9 100644 --- a/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp +++ b/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp @@ -1011,7 +1011,7 @@ bool CAESinkWASAPI::InitializeExclusive(AEAudioFormat &format) /* The requested format is not supported by the device. Find something that works */ for (int layout = -1; layout <= (int)ARRAYSIZE(layoutsList); layout++) { - // if requested layout is not suppported, try standard layouts with at least + // if requested layout is not supported, try standard layouts with at least // the number of channels as requested // as the last resort try stereo if (layout == ARRAYSIZE(layoutsList)) diff --git a/xbmc/cores/AudioEngine/Sinks/osx/AEDeviceEnumerationOSX.cpp b/xbmc/cores/AudioEngine/Sinks/osx/AEDeviceEnumerationOSX.cpp index 24af5bf855..18ef8f5c39 100644 --- a/xbmc/cores/AudioEngine/Sinks/osx/AEDeviceEnumerationOSX.cpp +++ b/xbmc/cores/AudioEngine/Sinks/osx/AEDeviceEnumerationOSX.cpp @@ -247,7 +247,7 @@ unsigned int AEDeviceEnumerationOSX::GetNumPlanes() const if (m_isPlanar) return m_caStreamInfos.size(); else - return 1;//interlaved - one plane + return 1;//interleaved - one plane } bool AEDeviceEnumerationOSX::hasSampleRate(const AESampleRateList &list, const unsigned int samplerate) const diff --git a/xbmc/cores/AudioEngine/Sinks/osx/AEDeviceEnumerationOSX.h b/xbmc/cores/AudioEngine/Sinks/osx/AEDeviceEnumerationOSX.h index defd18d487..9eedf0abf0 100644 --- a/xbmc/cores/AudioEngine/Sinks/osx/AEDeviceEnumerationOSX.h +++ b/xbmc/cores/AudioEngine/Sinks/osx/AEDeviceEnumerationOSX.h @@ -34,7 +34,7 @@ struct CADeviceInstance }; typedef std::vector< std::pair<struct CADeviceInstance, CAEDeviceInfo> > CADeviceList; -//Hirarchy: +//Hierarchy: // Device // - 1..n streams // 1..n formats @@ -178,7 +178,7 @@ private: bool hasDataType(const AEDataTypeList &list, CAEStreamInfo::DataType type) const; /*! - * @brief Converts a CA format description to a list of AEFormat desciptions (as one format can result + * @brief Converts a CA format description to a list of AEFormat descriptions (as one format can result * in more then 1 AE format - e.x. AC3 ca format results in AC3 and DTS AE format * * @param formatDesc [in] - The CA format description to be converted @@ -191,7 +191,7 @@ private: /*! - * @brief Convet a CA channel label to an AE channel. + * @brief Convert a CA channel label to an AE channel. * @param CAChannelLabel - the CA channel label to be converted * @return the corresponding AEChannel */ diff --git a/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioChannelLayout.cpp b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioChannelLayout.cpp index d73b5abda7..80ce810a4a 100644 --- a/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioChannelLayout.cpp +++ b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioChannelLayout.cpp @@ -211,7 +211,7 @@ const char* CCoreAudioChannelLayout::ChannelLayoutToString(AudioChannelLayout& l } else { - // Predefinied layout 'tag' + // Predefined layout 'tag' UInt32 propSize = 0; AudioFormatGetPropertyInfo(kAudioFormatProperty_ChannelLayoutForTag, sizeof(layout.mChannelLayoutTag), &layout.mChannelLayoutTag, &propSize); @@ -260,7 +260,7 @@ bool CCoreAudioChannelLayout::AllChannelUnknown() } else { - // Predefinied layout 'tag' + // Predefined layout 'tag' UInt32 propSize = 0; AudioFormatGetPropertyInfo(kAudioFormatProperty_ChannelLayoutForTag, sizeof(m_pLayout->mChannelLayoutTag), &m_pLayout->mChannelLayoutTag, &propSize); diff --git a/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioDevice.cpp b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioDevice.cpp index 858f36d98b..97e6acae0f 100644 --- a/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioDevice.cpp +++ b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioDevice.cpp @@ -419,7 +419,7 @@ bool CCoreAudioDevice::SetHogStatus(bool hog) { OSStatus ret = AudioObjectSetPropertyData(m_DeviceId, &propertyAddress, 0, NULL, sizeof(m_HogPid), &m_HogPid); - // even if setting hogmode was successfull our PID might not get written + // even if setting hogmode was successful our PID might not get written // into m_HogPid (so it stays -1). Readback hogstatus for judging if we // had success on getting hog status // We do this only when AudioObjectSetPropertyData didn't set m_HogPid because diff --git a/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioStream.cpp b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioStream.cpp index c9169f1215..7596537302 100644 --- a/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioStream.cpp +++ b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioStream.cpp @@ -272,7 +272,7 @@ bool CCoreAudioStream::SetVirtualFormat(AudioStreamBasicDescription* pDesc) return false; } - // The AudioStreamSetProperty is not only asynchronious, + // The AudioStreamSetProperty is not only asynchronous, // it is also not Atomic, in its behaviour. // Therefore we check 5 times before we really give up. // FIXME: failing isn't actually implemented yet. @@ -358,7 +358,7 @@ bool CCoreAudioStream::SetPhysicalFormat(AudioStreamBasicDescription* pDesc) return false; } - // The AudioStreamSetProperty is not only asynchronious, + // The AudioStreamSetProperty is not only asynchronous, // it is also not Atomic, in its behaviour. // Therefore we check 5 times before we really give up. // FIXME: failing isn't actually implemented yet. diff --git a/xbmc/cores/AudioEngine/Sinks/test/TestAESinkDARWINOSX.cpp b/xbmc/cores/AudioEngine/Sinks/test/TestAESinkDARWINOSX.cpp index 07cde35d3a..8319af66b2 100644 --- a/xbmc/cores/AudioEngine/Sinks/test/TestAESinkDARWINOSX.cpp +++ b/xbmc/cores/AudioEngine/Sinks/test/TestAESinkDARWINOSX.cpp @@ -70,15 +70,15 @@ void addPassthroughFormats(std::vector<AudioStreamBasicDescription> &streamForma FillOutASBDForLPCM(streamFormat, 96000, 2, 16, 16, false, false, false); streamFormat.mFormatID = kAudioFormat60958AC3; - streamFormats.push_back(streamFormat); // stereoFormtsWithoutPassthrough.size() + 0 + streamFormats.push_back(streamFormat); // stereoFormatsWithoutPassthrough.size() + 0 FillOutASBDForLPCM(streamFormat, 48000, 2, 16, 16, false, false, false); streamFormat.mFormatID = kAudioFormat60958AC3; - streamFormats.push_back(streamFormat); // stereoFormtsWithoutPassthrough.size() + 1 + streamFormats.push_back(streamFormat); // stereoFormatsWithoutPassthrough.size() + 1 FillOutASBDForLPCM(streamFormat, 44100, 2, 16, 16, false, false, false); streamFormat.mFormatID = kAudioFormat60958AC3; - streamFormats.push_back(streamFormat); // stereoFormtsWithoutPassthrough.size() + 2 + streamFormats.push_back(streamFormat); // stereoFormatsWithoutPassthrough.size() + 2 } void initStereoFormatsWithoutPassthrough() diff --git a/xbmc/cores/AudioEngine/Utils/AEBitstreamPacker.h b/xbmc/cores/AudioEngine/Utils/AEBitstreamPacker.h index 5354600df0..67efae76e3 100644 --- a/xbmc/cores/AudioEngine/Utils/AEBitstreamPacker.h +++ b/xbmc/cores/AudioEngine/Utils/AEBitstreamPacker.h @@ -45,7 +45,7 @@ private: void PackDTSHD(CAEStreamInfo &info, uint8_t* data, int size); void PackEAC3(CAEStreamInfo &info, uint8_t* data, int size); - /* we keep the trueHD and dtsHD buffers seperate so that we can handle a fast stream switch */ + /* we keep the trueHD and dtsHD buffers separate so that we can handle a fast stream switch */ uint8_t *m_trueHD; unsigned int m_trueHDPos; diff --git a/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp b/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp index d1962e2e84..98c4f5b2db 100644 --- a/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp +++ b/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp @@ -279,10 +279,10 @@ void CAEStreamParser::GetPacket(uint8_t **buffer, unsigned int *bufferSize) /* SYNC FUNCTIONS */ /* - This function looks for sync words across the types in paralell, and only does an exhaustive + 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 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 reicever does. + allows is to switch stream types on the fly much like a real receiver does. */ unsigned int CAEStreamParser::DetectType(uint8_t *data, unsigned int size) { diff --git a/xbmc/cores/DllLoader/DllLoader.cpp b/xbmc/cores/DllLoader/DllLoader.cpp index 64387057c0..99fb98fd3a 100644 --- a/xbmc/cores/DllLoader/DllLoader.cpp +++ b/xbmc/cores/DllLoader/DllLoader.cpp @@ -806,7 +806,7 @@ void DllLoader::UnloadSymbols() RtlInitAnsiString(&name, GetName()); InitializeObjectAttributes(&attributes, &name, OBJ_CASE_INSENSITIVE, NULL); - // Try to unload the sybols from vs.net debugger + // Try to unload the symbols from vs.net debugger DbgUnLoadImageSymbols(&name, (ULONG)hModule, 0xFFFFFFFF); LPVOID pBaseAddress=GetXbdmBaseAddress(); diff --git a/xbmc/cores/DllLoader/dll.cpp b/xbmc/cores/DllLoader/dll.cpp index 6bb2a0e66c..a63ff3d49d 100644 --- a/xbmc/cores/DllLoader/dll.cpp +++ b/xbmc/cores/DllLoader/dll.cpp @@ -201,7 +201,7 @@ extern "C" FARPROC __stdcall dllGetProcAddress(HMODULE hModule, LPCSTR function) { DllTrackInfo* track = tracker_get_dlltrackinfo(loc); /* some dll's require us to always return a function or it will fail, other's */ - /* decide functionallity depending on if the functions exist and may fail */ + /* decide functionality depending on if the functions exist and may fail */ if( dll->IsSystemDll() && track && stricmp(track->pDll->GetName(), "CoreAVCDecoder.ax") == 0 ) { diff --git a/xbmc/cores/DllLoader/dll_tracker.h b/xbmc/cores/DllLoader/dll_tracker.h index 273e421d9d..3e73121923 100644 --- a/xbmc/cores/DllLoader/dll_tracker.h +++ b/xbmc/cores/DllLoader/dll_tracker.h @@ -115,7 +115,7 @@ void tracker_dll_free(DllLoader* pDll); // sets the dll base address and size void tracker_dll_set_addr(DllLoader* pDll, uintptr_t min, uintptr_t max); -// returns the name from the dll that contains this addres or "" if not found +// returns the name from the dll that contains this address or "" if not found const char* tracker_getdllname(uintptr_t caller); // returns a function pointer if there is one available for it, or NULL if not ofund diff --git a/xbmc/cores/DllLoader/exports/emu_kernel32.cpp b/xbmc/cores/DllLoader/exports/emu_kernel32.cpp index 948c09ab87..df39471f13 100644 --- a/xbmc/cores/DllLoader/exports/emu_kernel32.cpp +++ b/xbmc/cores/DllLoader/exports/emu_kernel32.cpp @@ -658,7 +658,7 @@ extern "C" UINT WINAPI dllGetSystemDirectoryA(LPTSTR lpBuffer, UINT uSize) //unsigned int len = strlen(systemdir); //if (len > uSize) return 0; //strcpy(lpBuffer, systemdir); - //not_implement("kernel32.dll incompete function dllGetSystemDirectory called\n"); //warning + //not_implement("kernel32.dll incomplete function dllGetSystemDirectory called\n"); //warning //CLog::Log(LOGDEBUG,"KERNEL32!GetSystemDirectoryA(0x%x, %d) => %s", lpBuffer, uSize, systemdir); //return len; #ifdef API_DEBUG @@ -868,8 +868,8 @@ extern "C" int WINAPI dllMultiByteToWideChar(UINT CodePage, DWORD dwFlags, LPCST if (ret > 0) { - // second fix, but only if cchWideChar == 0, and ofcours ret > 0 indicating the function - // returned the number of bytes needed, otherwise ret would be 0, meaning a successfull conversion + // second fix, but only if cchWideChar == 0, and of course ret > 0 indicating the function + // returned the number of bytes needed, otherwise ret would be 0, meaning a successful conversion if (cchWideChar == 0) { ret--; } @@ -912,8 +912,8 @@ extern "C" int WINAPI dllWideCharToMultiByte(UINT CodePage, DWORD dwFlags, LPCWS if (ret > 0) { - // second fix, but only if cbMultiByte == 0, and ofcours ret > 0 indicating the function - // returned the number of bytes needed, otherwise ret would be 0, meaning a successfull conversion + // second fix, but only if cbMultiByte == 0, and of course ret > 0 indicating the function + // returned the number of bytes needed, otherwise ret would be 0, meaning a successful conversion if (cbMultiByte == 0) { ret--; } diff --git a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp index a7f0b48a5d..bf2b8405e5 100644 --- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp +++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp @@ -385,7 +385,7 @@ extern "C" not_implement("msvcrt.dll fake function dll_onexit() called\n"); // register to dll unload list - // return func if succsesfully added to the dll unload list + // return func if successfully added to the dll unload list return NULL; } diff --git a/xbmc/cores/DllLoader/exports/util/EmuFileWrapper.cpp b/xbmc/cores/DllLoader/exports/util/EmuFileWrapper.cpp index 8927d410cd..387e521a18 100644 --- a/xbmc/cores/DllLoader/exports/util/EmuFileWrapper.cpp +++ b/xbmc/cores/DllLoader/exports/util/EmuFileWrapper.cpp @@ -132,7 +132,7 @@ void CEmuFileWrapper::UnRegisterFileObjectByDescriptor(int fd) CSingleLock lock(m_criticalSection); - // we assume the emulated function alreay deleted the CFile object + // we assume the emulated function already deleted the CFile object if (m_files[i].file_lock) { delete m_files[i].file_lock; diff --git a/xbmc/cores/DllLoader/exports/wrapper.c b/xbmc/cores/DllLoader/exports/wrapper.c index 1c5b6a9a15..f1f0b70ab5 100644 --- a/xbmc/cores/DllLoader/exports/wrapper.c +++ b/xbmc/cores/DllLoader/exports/wrapper.c @@ -460,7 +460,7 @@ struct mntent *__wrap_getmntent(FILE *fp) // GCC 4.3 in Ubuntu 8.10 defines _FORTIFY_SOURCE=2 which means, that fread, read etc // are actually #defines which are inlined when compiled with -O. Those defines -// actally call __*chk (for example, __fread_chk). We need to bypass this whole +// actually call __*chk (for example, __fread_chk). We need to bypass this whole // thing to actually call our wrapped functions. #if _FORTIFY_SOURCE > 1 diff --git a/xbmc/cores/DllLoader/ldt_keeper.c b/xbmc/cores/DllLoader/ldt_keeper.c index 3fe68541e6..8f46d4c1d0 100644 --- a/xbmc/cores/DllLoader/ldt_keeper.c +++ b/xbmc/cores/DllLoader/ldt_keeper.c @@ -5,7 +5,7 @@ * - avifile includes this file from C++ code * and initializes it at the start of player! * it might sound like a hack and it really is - but - * as aviplay is deconding video with more than just one + * as aviplay is decoding video with more than just one * thread currently it's necessary to do it this way * this might change in the future */ diff --git a/xbmc/cores/DllLoader/ldt_keeper.h b/xbmc/cores/DllLoader/ldt_keeper.h index 8f1457670a..7055c11579 100644 --- a/xbmc/cores/DllLoader/ldt_keeper.h +++ b/xbmc/cores/DllLoader/ldt_keeper.h @@ -5,7 +5,7 @@ * - avifile includes this file from C++ code * and initializes it at the start of player! * it might sound like a hack and it really is - but - * as aviplay is deconding video with more than just one + * as aviplay is decoding video with more than just one * thread currently it's necessary to do it this way * this might change in the future */ diff --git a/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp b/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp index ae82da3ade..c1ca547b02 100644 --- a/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp +++ b/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp @@ -721,7 +721,7 @@ void CExternalPlayer::GetCustomRegexpReplacers(TiXmlElement *pRootElement, CLog::Log(LOGDEBUG," Registering replacer:"); CLog::Log(LOGDEBUG," Match:[%s] Pattern:[%s] Replacement:[%s]", strMatch.c_str(), strPat.c_str(), strRep.c_str()); CLog::Log(LOGDEBUG," Global:[%s] Stop:[%s]", bGlobal?"true":"false", bStop?"true":"false"); - // keep literal commas since we use comma as a seperator + // keep literal commas since we use comma as a separator StringUtils::Replace(strMatch, ",",",,"); StringUtils::Replace(strPat, ",",",,"); StringUtils::Replace(strRep, ",",",,"); diff --git a/xbmc/cores/IPlayer.h b/xbmc/cores/IPlayer.h index bb467128f3..509a847c20 100644 --- a/xbmc/cores/IPlayer.h +++ b/xbmc/cores/IPlayer.h @@ -332,7 +332,7 @@ public: // Skip to next track/item inside the current media (if supported). virtual bool SkipNext(){return false;} - //Returns true if not playback (paused or stopped beeing filled) + //Returns true if not playback (paused or stopped being filled) virtual bool IsCaching() const {return false;}; //Cache filled in Percent virtual int GetCacheLevel() const {return -1;}; @@ -358,7 +358,7 @@ public: virtual void GetSubtitleCapabilities(std::vector<int> &subCaps) { subCaps.assign(1,IPC_SUBS_ALL); }; /*! - \breif hook into render loop of render thread + \brief hook into render loop of render thread */ virtual void FrameMove() {}; diff --git a/xbmc/cores/VideoPlayer/DVDClock.cpp b/xbmc/cores/VideoPlayer/DVDClock.cpp index d29cbe6308..f4ae45d816 100644 --- a/xbmc/cores/VideoPlayer/DVDClock.cpp +++ b/xbmc/cores/VideoPlayer/DVDClock.cpp @@ -124,7 +124,7 @@ void CDVDClock::Pause(bool pause) void CDVDClock::SetSpeed(int iSpeed) { - // this will sometimes be a little bit of due to rounding errors, ie clock might jump abit when changing speed + // this will sometimes be a little bit of due to rounding errors, ie clock might jump a bit when changing speed CSingleLock lock(m_critSection); if (m_paused) diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodec.h b/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodec.h index 9daa92eccc..2d6a055917 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodec.h +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodec.h @@ -107,7 +107,7 @@ public: virtual int GetBitRate() { return 0; } /* - * returns if the codec requests to use passtrough + * returns if the codec requests to use passthrough */ virtual bool NeedPassthrough() { return false; } diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/contrib/cc_decoder708.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/contrib/cc_decoder708.cpp index 4c5d524ba9..bf9ed42943 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/contrib/cc_decoder708.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/contrib/cc_decoder708.cpp @@ -338,7 +338,7 @@ int handle_708_C3 (cc708_service_decoder *decoder, unsigned char *data, int data // These are variable length commands, that can even span several segments // (they allow even downloading fonts or graphics). - //! @todo Implemen if a sample ever appears + //! @todo Implement if a sample ever appears return 0; // Unreachable, but otherwise there's compilers warnings } diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp index 7af78de73b..9f2270ef44 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp @@ -1533,7 +1533,7 @@ bool CAMLCodec::OpenDecoder(CDVDStreamInfo &hints) } am_private->gcodec.param = (void *)((std::uintptr_t)am_private->gcodec.param | (am_private->video_rotation_degree << 16)); - // translate from generic to firemware version dependent + // translate from generic to firmware version dependent m_dll->codec_init_para(&am_private->gcodec, &am_private->vcodec); int ret = m_dll->codec_init(&am_private->vcodec); @@ -1697,7 +1697,7 @@ void CAMLCodec::Reset() // restore the saved system blackout_policy value SysfsUtils::SetInt("/sys/class/video/blackout_policy", blackout_policy); - // reset some interal vars + // reset some internal vars m_1st_pts = 0; m_cur_pts = 0; m_ptsQueue.clear(); diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp index c73b0bb51a..36f079a6f9 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp @@ -69,7 +69,7 @@ enum MEDIACODEC_STATES static bool CanSurfaceRenderBlackList(const std::string &name) { - // All devices 'should' be capiable of surface rendering + // All devices 'should' be capable of surface rendering // but that seems to be hit or miss as most odd name devices // cannot surface render. static const char *cannotsurfacerender_decoders[] = { @@ -232,7 +232,7 @@ void CDVDMediaCodecInfo::ReleaseOutputBuffer(bool render) return; // release OutputBuffer and render if indicated - // then wait for rendered frame to become avaliable. + // then wait for rendered frame to become available. if (render) if (m_frameready) @@ -288,7 +288,7 @@ void CDVDMediaCodecInfo::UpdateTexImage() // this is key, after calling releaseOutputBuffer, we must // wait a little for MediaCodec to render to the surface. // Then we can updateTexImage without delay. If we do not - // wait, then video playback gets jerky. To optomize this, + // wait, then video playback gets jerky. To optimize this, // we hook the SurfaceTexture OnFrameAvailable callback // using CJNISurfaceTextureOnFrameAvailableListener and wait // on a CEvent to fire. 50ms seems to be a good max fallback. @@ -1422,7 +1422,7 @@ void CDVDVideoCodecAndroidMediaCodec::InitSurfaceTexture(void) // We MUST create the GLES texture on the main thread // to match where the valid GLES context is located. // It would be nice to move this out of here, we would need - // to create/fetch/create from g_RenderMananger. But g_RenderMananger + // to create/fetch/create from g_RenderManager. But g_RenderManager // does not know we are using MediaCodec until Configure and we // we need m_surfaceTexture valid before then. Chicken, meet Egg. if (g_application.IsCurrentThread()) diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.h index c167694564..b227898aeb 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.h +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.h @@ -61,7 +61,7 @@ public: CDVDMediaCodecInfo* Retain(); long Release(); - // meat and potatos + // meat and potatoes void Validate(bool state); bool WaitForFrame(int millis); // MediaCodec related diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h index 3b4b622e03..063396e03c 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h @@ -105,7 +105,7 @@ protected: int m_iScreenWidth; int m_iScreenHeight; - int m_iOrientation;// orientation of the video in degress counter clockwise + int m_iOrientation;// orientation of the video in degrees counter clockwise unsigned int m_uSurfacesCount; diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp index 24f3f81a9b..263b789e5d 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp @@ -69,7 +69,7 @@ std::shared_ptr<CIMXCodec> g_IMXCodec; std::list<VpuFrameBuffer*> m_recycleBuffers; -// Number of fb pages used for paning +// Number of fb pages used for panning const int CIMXContext::m_fbPages = 3; // Experiments show that we need at least one more (+1) VPU buffer than the min value returned by the VPU @@ -133,7 +133,7 @@ bool CIMXCodec::VpuAllocBuffers(VpuMemInfo *pMemBlock) m_decMemInfo.virtMem[m_decMemInfo.nVirtNum-1] = ptr; } else - { // Allocate contigous mem for DMA + { // Allocate contiguous mem for DMA vpuMem.nSize = size; if(!VpuAlloc(&vpuMem)) return false; @@ -903,7 +903,7 @@ void CIMXCodec::Process() inData.pPhyAddr = NULL; inData.pVirAddr = task->demux.pData; - // some streams have problem with getting intial info after seek into (during playback start). + // some streams have problem with getting initial info after seek into (during playback start). // feeding VPU with extra data helps if (!m_vpuFrameBuffers.size() && !task->IsEmpty() && m_decRet & VPU_DEC_NO_ENOUGH_INBUF) AddExtraData(&inData, true); @@ -1670,7 +1670,7 @@ void CIMXContext::PrepareTask(IPUTaskPtr &ipu, CRect srcRect, CRect dstRect) // the source rect otherwise the IPU task will fail // This is under the assumption that the srcRect is always // inside the input buffer rect. If that is not the case - // it needs to be projected to the ouput buffer rect as well + // it needs to be projected to the output buffer rect as well if (dstRect.x1 < 0) { srcRect.x1 -= dstRect.x1*srcWidth / dstWidth; diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DXVA.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DXVA.cpp index 4ea37ac7c9..2dc6995390 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DXVA.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DXVA.cpp @@ -333,7 +333,7 @@ bool CDXVAContext::GetInputAndTarget(int codec, bool bHighBitdepth, GUID &inGuid { outFormat = DXGI_FORMAT_UNKNOWN; - // iterate through our predifined dxva modes and find the first matching for desired codec + // iterate through our predefined dxva modes and find the first matching for desired codec // once we found a mode, get a target we support in render_targets_dxgi DXGI_FORMAT_UNKNOWN for (const dxva2_mode_t* mode = dxva2_modes; mode->name && outFormat == DXGI_FORMAT_UNKNOWN; mode++) { @@ -416,7 +416,7 @@ bool CDXVAContext::GetConfig(const D3D11_VIDEO_DECODER_DESC *format, D3D11_VIDEO // select first available if (config.ConfigBitstreamRaw == 0 && pConfig.ConfigBitstreamRaw != 0) config = pConfig; - // overide with preferred if found + // override with preferred if found if (config.ConfigBitstreamRaw != bitstream && pConfig.ConfigBitstreamRaw == bitstream) config = pConfig; } @@ -1055,7 +1055,7 @@ int CDecoder::Check(AVCodecContext* avctx) DXVA_Status_VC1 vc1; } status = {}; - /* I'm not sure, but MSDN says nothing about extentions functions in D3D11, try to using with same way as in DX9 */ + /* I'm not sure, but MSDN says nothing about extensions functions in D3D11, try to using with same way as in DX9 */ data.Function = DXVA_STATUS_REPORTING_FUNCTION; data.pPrivateOutputData = &status; data.PrivateOutputDataSize = avctx->codec_id == AV_CODEC_ID_H264 ? sizeof(DXVA_Status_H264) : sizeof(DXVA_Status_VC1); diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/OpenMaxVideo.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/OpenMaxVideo.cpp index caae4e9600..de6072f43b 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/OpenMaxVideo.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/OpenMaxVideo.cpp @@ -53,7 +53,7 @@ using namespace KODI::MESSAGING; #define CLASSNAME "COpenMaxVideo" -//! @todo These are Nvidia Tegra2 dependent, need to dynamiclly find the +//! @todo These are Nvidia Tegra2 dependent, need to dynamically find the //! right codec matched to video format. #define OMX_H264BASE_DECODER "OMX.Nvidia.h264.decode" // OMX.Nvidia.h264ext.decode segfaults, not sure why. @@ -283,7 +283,7 @@ void COpenMaxVideo::SetDropState(bool bDrop) CLASSNAME, __func__, omx_err); } - // And ingore all queued elements + // And ignore all queued elements ReleaseDemuxQueue(); pthread_mutex_unlock(&m_omx_queue_mutex); @@ -303,7 +303,7 @@ int COpenMaxVideo::EnqueueDemuxPacket(omx_demux_packet demux_packet) OMX_ERRORTYPE omx_err; OMX_BUFFERHEADERTYPE* omx_buffer; - // need to lock here to retreve an input buffer and pop the queue + // need to lock here to retrieve an input buffer and pop the queue omx_buffer = m_omx_input_avaliable.front(); m_omx_input_avaliable.pop(); @@ -348,7 +348,7 @@ int COpenMaxVideo::Decode(uint8_t* pData, int iSize, double dts, double pts) uint8_t *demuxer_content = pData; // we need to queue then de-queue the demux packet, seems silly but - // omx might not have a omx input buffer avaliable when we are called + // omx might not have a omx input buffer available when we are called // and we must store the demuxer packet and try again later. omx_demux_packet demux_packet; demux_packet.dts = dts; @@ -439,7 +439,7 @@ void COpenMaxVideo::ReleaseBuffer(OpenMaxVideoBuffer* releaseBuffer) if (!releaseBuffer) return; - //! @todo this is NOT multithreading safe. Buffer lifetime managment needs to be adopted. + //! @todo this is NOT multithreading safe. Buffer lifetime management needs to be adopted. pthread_mutex_lock(&m_omx_queue_mutex); OpenMaxVideoBuffer *buffer = releaseBuffer; @@ -534,7 +534,7 @@ OMX_ERRORTYPE COpenMaxVideo::DecoderEmptyBufferDone( CLASSNAME, __func__, pBuffer->nFilledLen, (double)pBuffer->nTimeStamp / 1000.0); #endif - // queue free input buffer to avaliable list. + // queue free input buffer to available list. pthread_mutex_lock(&m_omx_queue_mutex); ctx->m_omx_input_avaliable.push(pBuffer); if(!ctx->m_omx_input_avaliable.empty()) { diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp index 5d9a772555..b8100d3380 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp @@ -1174,7 +1174,7 @@ void CDecoder::FiniVAAPIOutput() CheckSuccess(vaDestroyContext(m_vaapiConfig.dpy, m_vaapiConfig.contextId)); m_vaapiConfig.contextId = VA_INVALID_ID; - // detroy surfaces + // destroy surfaces if (g_advancedSettings.CanLogComponent(LOGVIDEO)) CLog::Log(LOGDEBUG, "VAAPI::FiniVAAPIOutput destroying %d video surfaces", m_videoSurfaces.Size()); VASurfaceID surf; diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.h index 6fe4aaf527..a5e42c599c 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.h +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.h @@ -279,7 +279,7 @@ struct SDiMethods /** * COutput is embedded in CDecoder and embeds vpp * The class has its own OpenGl context which is shared with render thread - * COuput generated ready to render textures and passes them back to + * COutput generated ready to render textures and passes them back to * CDecoder */ class CPostproc; diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDPAU.cpp index e4a948dcef..f35debff78 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDPAU.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDPAU.cpp @@ -273,7 +273,7 @@ void CVDPAUContext::DestroyContext() m_vdpDevice = VDP_INVALID_HANDLE; } -void CVDPAUContext::SpewHardwareAvailable() //CopyrighVDPAUt (c) 2008 Wladimir J. van der Laan -- VDPInfo +void CVDPAUContext::SpewHardwareAvailable() //Copyright (c) 2008 Wladimir J. van der Laan -- VDPInfo { VdpStatus rv; CLog::Log(LOGNOTICE,"VDPAU Decoder capabilities:"); @@ -1115,7 +1115,7 @@ int CDecoder::Decode(AVCodecContext *avctx, AVFrame *pFrame) while (!retval) { bool drain = (m_codecControl & DVD_CODEC_CTRL_DRAIN); - // if all pics are drained, break the loop by settngn VC_BUFFER + // if all pics are drained, break the loop by setting VC_BUFFER if (drain && decoded <= 0 && processed <= 0 && render <= 0) drain = false; diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDPAU.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDPAU.h index 2f69406db0..228d409b56 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDPAU.h +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDPAU.h @@ -416,7 +416,7 @@ public: /** * COutput is embedded in CDecoder and embeds CMixer * The class has its own OpenGl context which is shared with render thread - * COuput generated ready to render textures and passes them back to + * COutput generated ready to render textures and passes them back to * CDecoder */ class COutput : private CThread diff --git a/xbmc/cores/VideoPlayer/DVDDemuxSPU.cpp b/xbmc/cores/VideoPlayer/DVDDemuxSPU.cpp index 24a37fbec3..9754aa4feb 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxSPU.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxSPU.cpp @@ -89,10 +89,10 @@ CDVDOverlaySpu* CDVDDemuxSPU::AddData(uint8_t* data, int iSize, double pts) // check if we are about to start a new packet if (pSPUData->iSize == pSPUData->iNeededSize) { - // for now we don't delete the memory assosiated with m_spuData.data + // for now we don't delete the memory associated with m_spuData.data pSPUData->iSize = 0; - // check spu data lenght, only needed / possible in the first spu pakcet + // check spu data length, only needed / possible in the first spu packet uint16_t length = data[0] << 8 | data[1]; if (length == 0) { @@ -179,7 +179,7 @@ CDVDOverlaySpu* CDVDDemuxSPU::ParsePacket(SPUData* pSPUData) pUnparsedData = pSPUData->data + 4; - // if it is set to 0 it means it's a menu overlay by defualt + // if it is set to 0 it means it's a menu overlay by default // this is not what we want too, cause you get strange results on a parse error pSPUInfo->iPTSStartTime = -1; @@ -329,7 +329,7 @@ CDVDOverlaySpu* CDVDDemuxSPU::ParsePacket(SPUData* pSPUData) } // parse the rle. - // this should be chnaged so it get's converted to a yuv overlay + // this should be changed so it get's converted to a yuv overlay return ParseRLE(pSPUInfo, pUnparsedData); } @@ -427,10 +427,10 @@ CDVDOverlaySpu* CDVDDemuxSPU::ParseRLE(CDVDOverlaySpu* pSPU, uint8_t* pUnparsedD return NULL; } - // keep trace of all occouring pixels, even keeping the background in mind + // keep trace of all occurring pixels, even keeping the background in mind stats[i_code & 0x3] += i_code >> 2; - // count the number of pixels for every occouring parts, without background + // count the number of pixels for every occurring parts, without background if (pSPU->alpha[i_code & 0x3] != 0x00) { // the last non background pixel is probably the border color diff --git a/xbmc/cores/VideoPlayer/DVDDemuxSPU.h b/xbmc/cores/VideoPlayer/DVDDemuxSPU.h index 771feace71..4eae710187 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxSPU.h +++ b/xbmc/cores/VideoPlayer/DVDDemuxSPU.h @@ -54,7 +54,7 @@ public: void FlushCurrentPacket(); // flushes current unparsed data // m_clut set by libdvdnav once in a time - // color lokup table is representing 16 different yuv colors + // color lookup table is representing 16 different yuv colors // [][0] = Y, [][1] = Cr, [][2] = Cb uint8_t m_clut[16][3]; bool m_bHasClut; diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.h index 9c1057128f..7ba76fb7b0 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.h +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.h @@ -164,7 +164,7 @@ public: bool bVFR; // variable framerate bool bPTSInvalid; // pts cannot be trusted (avi's). bool bForcedAspect; // aspect is forced from container - int iOrientation; // orientation of the video in degress counter clockwise + int iOrientation; // orientation of the video in degrees counter clockwise int iBitsPerPixel; std::string stereo_mode; // expected stereo mode }; diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp index 435cd2bf31..d4886d238a 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp @@ -344,7 +344,7 @@ bool CDVDDemuxFFmpeg::Open(CDVDInputStream* pInput, bool streaminfo, bool filein } else if (trySPDIFonly) { - // not dts either, return false in case we were explicitely + // not dts either, return false in case we were explicitly // requested to only check for S/PDIF padded compressed audio CLog::Log(LOGDEBUG, "%s - not spdif or dts file, falling back", __FUNCTION__); return false; @@ -508,7 +508,7 @@ bool CDVDDemuxFFmpeg::Open(CDVDInputStream* pInput, bool streaminfo, bool filein unsigned int nProgram = UINT_MAX; if (m_pFormatContext->nb_programs > 0) { - // select the corrrect program if requested + // select the correct program if requested CVariant programProp(pInput->GetProperty("program")); if (!programProp.isNull()) { @@ -826,7 +826,7 @@ double CDVDDemuxFFmpeg::ConvertTimestamp(int64_t pts, int den, int num) return DVD_NOPTS_VALUE; // do calculations in floats as they can easily overflow otherwise - // we don't care for having a completly exact timestamp anyway + // we don't care for having a completely exact timestamp anyway double timestamp = (double)pts * num / den; double starttime = 0.0f; @@ -1225,7 +1225,7 @@ int CDVDDemuxFFmpeg::GetNrOfStreams() const double CDVDDemuxFFmpeg::SelectAspect(AVStream* st, bool& forced) { - // trust matroshka container + // trust matroska container if (m_bMatroska && st->sample_aspect_ratio.num != 0) { forced = true; diff --git a/xbmc/cores/VideoPlayer/DVDFileInfo.cpp b/xbmc/cores/VideoPlayer/DVDFileInfo.cpp index 8709bbf8a0..e55bcc45bb 100644 --- a/xbmc/cores/VideoPlayer/DVDFileInfo.cpp +++ b/xbmc/cores/VideoPlayer/DVDFileInfo.cpp @@ -308,7 +308,7 @@ bool CDVDFileInfo::ExtractThumb(const std::string &strPath, } /** - * \brief Open the item pointed to by pItem and extact streamdetails + * \brief Open the item pointed to by pItem and extract streamdetails * \return true if the stream details have changed */ bool CDVDFileInfo::GetFileStreamDetails(CFileItem *pItem) diff --git a/xbmc/cores/VideoPlayer/DVDFileInfo.h b/xbmc/cores/VideoPlayer/DVDFileInfo.h index 1afecaf65a..8771d73b08 100644 --- a/xbmc/cores/VideoPlayer/DVDFileInfo.h +++ b/xbmc/cores/VideoPlayer/DVDFileInfo.h @@ -33,7 +33,7 @@ class CTextureDetails; class CDVDFileInfo { public: - // Extract a thumbnail immage from the media at strPath, optionally populating a streamdetails class with the data + // Extract a thumbnail image from the media at strPath, optionally populating a streamdetails class with the data static bool ExtractThumb(const std::string &strPath, CTextureDetails &details, CStreamDetails *pStreamDetails, int pos=-1); diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.h b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.h index 932f0e4093..3377d3f282 100644 --- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.h +++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.h @@ -163,7 +163,7 @@ public: virtual void SetReadRate(unsigned rate) {} /*! \brief Get the cache status - \return true when cache status was succesfully obtained + \return true when cache status was successfully obtained */ virtual bool GetCacheStatus(XFILE::SCacheStatus *status) { return false; } diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp index 10cb015f70..55bc913845 100644 --- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp +++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp @@ -432,7 +432,7 @@ bool CDVDInputStreamBluray::Open() return true; } -// close file and reset everyting +// close file and reset everything void CDVDInputStreamBluray::Close() { if (!m_dll) diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp index 45c2cb9bfa..4501ef5109 100644 --- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp @@ -79,7 +79,7 @@ bool CDVDInputStreamFFmpeg::Open() return true; } -// close file and reset everyting +// close file and reset everything void CDVDInputStreamFFmpeg::Close() { CDVDInputStream::Close(); diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFile.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFile.cpp index 3ada35c4d9..6f2d4f98cb 100644 --- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFile.cpp +++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFile.cpp @@ -104,7 +104,7 @@ bool CDVDInputStreamFile::Open() return true; } -// close file and reset everyting +// close file and reset everything void CDVDInputStreamFile::Close() { if (m_pFile) diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamMemory.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamMemory.cpp index 0f7000f3c3..46e00b2ce3 100644 --- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamMemory.cpp +++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamMemory.cpp @@ -48,7 +48,7 @@ bool CDVDInputStreamMemory::Open() return true; } -// close file and reset everyting +// close file and reset everything void CDVDInputStreamMemory::Close() { if (m_pData) delete[] m_pData; diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.cpp index 5b15ae572a..7990ba58b8 100644 --- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.cpp +++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.cpp @@ -269,7 +269,7 @@ int CDVDInputStreamNavigator::Read(uint8_t* buf, int buf_size) return iBytesRead; } -// not working yet, but it is the recommanded way for seeking +// not working yet, but it is the recommended way for seeking int64_t CDVDInputStreamNavigator::Seek(int64_t offset, int whence) { if(whence == SEEK_POSSIBLE) @@ -400,13 +400,13 @@ int CDVDInputStreamNavigator::ProcessBlock(uint8_t* dest_buffer, int* read) // Player applications should inform their audio decoder to switch channels { - //dvdnav_get_audio_logical_stream actually does the oposite to the docs.. + //dvdnav_get_audio_logical_stream actually does the opposite to the docs.. //taking a audiostream as given on dvd, it gives the physical stream that //refers to in the mpeg file dvdnav_audio_stream_change_event_t* event = (dvdnav_audio_stream_change_event_t*)buf; - //wroong... stupid docs.. + //wrong... stupid docs.. //event->logical = dvdnav_get_audio_logical_stream(m_dvdnav, event->physical); //logical should actually be set to the (vm->state).AST_REG @@ -483,7 +483,7 @@ int CDVDInputStreamNavigator::ProcessBlock(uint8_t* dest_buffer, int* read) if (times) { - // the times array stores the end timestampes of the chapters, e.g., times[0] stores the position/beginning of chapter 2 + // the times array stores the end timestamps of the chapters, e.g., times[0] stores the position/beginning of chapter 2 m_mapTitleChapters[m_iTitle][1] = 0; for (int i = 0; i < entries - 1; ++i) { diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamStack.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamStack.cpp index e91c014f67..8a14e6079f 100644 --- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamStack.cpp +++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamStack.cpp @@ -96,7 +96,7 @@ bool CDVDInputStreamStack::Open() return true; } -// close file and reset everyting +// close file and reset everything void CDVDInputStreamStack::Close() { CDVDInputStream::Close(); diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.h b/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.h index b64caae3f5..291755b628 100644 --- a/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.h +++ b/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.h @@ -49,7 +49,7 @@ public: //! \brief Read data from stream virtual int Read(uint8_t* buf, int buf_size) override; - //! \brief Seeek in stream + //! \brief Seek in stream virtual int64_t Seek(int64_t offset, int whence) override; //! \brief Pause stream diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvd_reader.h b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvd_reader.h index c702a15bb9..3ce8bc325e 100644 --- a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvd_reader.h +++ b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvd_reader.h @@ -210,7 +210,7 @@ int32_t DVDFileSeek( dvd_file_t *, int32_t ); /** * Reads the given number of bytes from the file. This call can only be used * on the information files, and may not be used for reading from a VOB. This - * reads from and increments the currrent seek position for the file. + * reads from and increments the current seek position for the file. * * @param dvd_file A file read handle. * @param data Pointer to a buffer to write the data into. diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/ifo_types.h b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/ifo_types.h index f82459e520..b1a194c918 100644 --- a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/ifo_types.h +++ b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/ifo_types.h @@ -561,7 +561,7 @@ typedef struct { uint8_t unknown1; uint8_t unknown2; uint8_t unknown3; - uint8_t unknown4; /* ?? allways 0x30 language?, text format? */ + uint8_t unknown4; /* ?? always 0x30 language?, text format? */ uint8_t unknown5; uint16_t offset; /* from first */ diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/nav_types.h b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/nav_types.h index d973f5158d..93a4e6bd34 100644 --- a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/nav_types.h +++ b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/nav_types.h @@ -97,7 +97,7 @@ typedef struct { * 1XXb: pan&scan buttons */ typedef struct { - uint16_t hli_ss; /**< status, only low 2 bits 0: no buttons, 1: different 2: equal 3: eual except for button cmds */ + uint16_t hli_ss; /**< status, only low 2 bits 0: no buttons, 1: different 2: equal 3: equal except for button cmds */ uint32_t hli_s_ptm; /**< start ptm of hli */ uint32_t hli_e_ptm; /**< end ptm of hli */ uint32_t btn_se_e_ptm; /**< end ptm of button select */ @@ -120,7 +120,7 @@ typedef struct { /** * Button Color Information Table - * Each entry beeing a 32bit word that contains the color indexs and alpha + * Each entry being a 32bit word that contains the color indexs and alpha * values to use. They are all represented by 4 bit number and stored * like this [Ci3, Ci2, Ci1, Ci0, A3, A2, A1, A0]. The actual palette * that the indexes reference is in the PGC. diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/vm.h b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/vm.h index b3e4715a49..07d4d28158 100644 --- a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/vm.h +++ b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/vm.h @@ -45,7 +45,7 @@ typedef struct { int vtsN; /* 0 is vmgm? */ pgc_t *pgc; /* either this or 'int pgcN' is enough? */ int pgcN; /* but provide pgcN for quick lookup */ - int pgN; /* is this needed? can allways fid pgN from cellN? */ + int pgN; /* is this needed? can always fid pgN from cellN? */ int cellN; int32_t cell_restart; /* get cell to restart */ int blockN; diff --git a/xbmc/cores/VideoPlayer/DVDMessage.h b/xbmc/cores/VideoPlayer/DVDMessage.h index 88988ef832..7291399222 100644 --- a/xbmc/cores/VideoPlayer/DVDMessage.h +++ b/xbmc/cores/VideoPlayer/DVDMessage.h @@ -22,7 +22,7 @@ #pragma once #ifdef __GNUC__ -// under gcc, inline will only take place if optimizations are applied (-O). this will force inline even whith optimizations. +// under gcc, inline will only take place if optimizations are applied (-O). this will force inline even with optimizations. #define XBMC_FORCE_INLINE __attribute__((always_inline)) #else #define XBMC_FORCE_INLINE diff --git a/xbmc/cores/VideoPlayer/DVDStreamInfo.h b/xbmc/cores/VideoPlayer/DVDStreamInfo.h index 4fc3802d5c..b087a110ad 100644 --- a/xbmc/cores/VideoPlayer/DVDStreamInfo.h +++ b/xbmc/cores/VideoPlayer/DVDStreamInfo.h @@ -66,7 +66,7 @@ public: int profile; // encoder profile of the stream reported by the decoder. used to qualify hw decoders. bool ptsinvalid; // pts cannot be trusted (avi's). bool forced_aspect; // aspect is forced from container - int orientation; // orientation of the video in degress counter clockwise + int orientation; // orientation of the video in degrees counter clockwise int bitsperpixel; std::string stereo_mode; // stereoscopic 3d mode diff --git a/xbmc/cores/VideoPlayer/DVDTSCorrection.cpp b/xbmc/cores/VideoPlayer/DVDTSCorrection.cpp index 4a9a3cf6f2..402836c405 100644 --- a/xbmc/cores/VideoPlayer/DVDTSCorrection.cpp +++ b/xbmc/cores/VideoPlayer/DVDTSCorrection.cpp @@ -281,7 +281,7 @@ bool CPullupCorrection::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 +//Retrieve also information of max and min frame rate duration, for VFR files case double CPullupCorrection::CalcFrameDuration() { if (!m_pattern.empty()) diff --git a/xbmc/cores/VideoPlayer/Edl.cpp b/xbmc/cores/VideoPlayer/Edl.cpp index 0292047347..c87fe21a79 100644 --- a/xbmc/cores/VideoPlayer/Edl.cpp +++ b/xbmc/cores/VideoPlayer/Edl.cpp @@ -750,7 +750,7 @@ int CEdl::RemoveCutTime(int iSeek) const return iSeek; /** - * @todo Consider an optimisation of using the (now unused) total cut time if the seek time + * @todo Consider an optimization of using the (now unused) total cut time if the seek time * requested is later than the end of the last recorded cut. For example, when calculating the * total duration for display. */ diff --git a/xbmc/cores/VideoPlayer/VideoPlayer.cpp b/xbmc/cores/VideoPlayer/VideoPlayer.cpp index 31fd17323e..1745976353 100644 --- a/xbmc/cores/VideoPlayer/VideoPlayer.cpp +++ b/xbmc/cores/VideoPlayer/VideoPlayer.cpp @@ -2079,7 +2079,7 @@ void CVideoPlayer::HandlePlaySpeed() else { // exceptions for which stream players won't start properly - // 1. videoplayer has not detected a keyframe within lenght of demux buffers + // 1. videoplayer has not detected a keyframe within length of demux buffers if (m_CurrentAudio.id >= 0 && m_CurrentVideo.id >= 0 && !m_VideoPlayerAudio->AcceptsData() && m_CurrentVideo.syncState == IDVDStreamPlayer::SYNC_STARTING && @@ -2814,7 +2814,7 @@ void CVideoPlayer::HandleMessages() if (speed != DVD_PLAYSPEED_PAUSE && m_playSpeed != DVD_PLAYSPEED_PAUSE && speed != m_playSpeed) m_callback.OnPlayBackSpeedChanged(speed / DVD_PLAYSPEED_NORMAL); - // notifiy GUI, skins may want to show the seekbar + // notify GUI, skins may want to show the seekbar g_infoManager.SetDisplayAfterSeek(); if (m_pInputStream->IsStreamType(DVDSTREAM_TYPE_PVRMANAGER) && speed != m_playSpeed) @@ -2886,8 +2886,8 @@ void CVideoPlayer::HandleMessages() { FlushBuffers(false); CDVDInputStreamPVRManager* input = dynamic_cast<CDVDInputStreamPVRManager*>(m_pInputStream); - //! @todo find a better solution for the "otherStreaHack" - //! a stream is not sopposed to be terminated before demuxer + //! @todo find a better solution for the "otherStreamHack" + //! a stream is not supposed to be terminated before demuxer if (input && input->IsOtherStreamHack()) { CloseDemuxer(); @@ -3630,7 +3630,7 @@ int64_t CVideoPlayer::GetTotalTimeInMsec() return llrint(m_State.time_total); } -// return length in seconds.. this should be changed to return in milleseconds throughout xbmc +// return length in seconds.. this should be changed to return in milliseconds throughout xbmc int64_t CVideoPlayer::GetTotalTime() { return GetTotalTimeInMsec(); @@ -3789,7 +3789,7 @@ bool CVideoPlayer::OpenStream(CCurrentStream& current, int64_t demuxerId, int iS { if(stream) { - /* mark stream as disabled, to disallaw further attempts*/ + /* mark stream as disabled, to disallow further attempts*/ CLog::Log(LOGWARNING, "%s - Unsupported stream %d. Stream disabled.", __FUNCTION__, stream->uniqueId); stream->disabled = true; } diff --git a/xbmc/cores/VideoPlayer/VideoPlayer.h b/xbmc/cores/VideoPlayer/VideoPlayer.h index 41ff6b4c86..1cc1abbf5a 100644 --- a/xbmc/cores/VideoPlayer/VideoPlayer.h +++ b/xbmc/cores/VideoPlayer/VideoPlayer.h @@ -164,7 +164,7 @@ public: int64_t demuxerId; // demuxer's id of current playing stream int id; // id of current playing stream int source; - double dts; // last dts from demuxer, used to find disncontinuities + double dts; // last dts from demuxer, used to find discontinuities double dur; // last frame expected duration int dispTime; // display time from input stream CDVDStreamInfo hint; // stream hints, used to notice stream changes diff --git a/xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp b/xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp index 4b9442c98b..e2698f31c2 100644 --- a/xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp +++ b/xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp @@ -434,7 +434,7 @@ void CVideoPlayerAudio::Process() if (m_streaminfo.codec == AV_CODEC_ID_FLAC && m_streaminfo.channellayout) audioframe.format.m_channelLayout = CAEUtil::GetAEChannelLayout(m_streaminfo.channellayout); - // we have succesfully decoded an audio frame, setup renderer to match + // we have successfully decoded an audio frame, setup renderer to match if (!m_dvdAudio.IsValidFormat(audioframe)) { if(m_speed) diff --git a/xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp b/xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp index 64ba9c9771..cd8be04b44 100644 --- a/xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp +++ b/xbmc/cores/VideoPlayer/VideoPlayerRadioRDS.cpp @@ -180,7 +180,7 @@ using namespace KODI::MESSAGING; * RDS and RBDS relevant */ -/// RDS Programm type id's +/// RDS Program type id's enum { RDS_PTY_NONE = 0, RDS_PTY_NEWS, @@ -216,7 +216,7 @@ enum { RDS_PTY_ALARM }; -/// RBDS Programm type id's +/// RBDS Program type id's enum { RBDS_PTY_NONE = 0, RBDS_PTY_NEWS, @@ -491,7 +491,7 @@ static char *rds_entitychar(char *text) static unsigned short crc16_ccitt(const unsigned char *data, int len, bool skipfirst) { // CRC16-CCITT: x^16 + x^12 + x^5 + 1 - // with start 0xffff and result invers + // with start 0xffff and result inverse unsigned short crc = 0xffff; if (skipfirst) @@ -1107,11 +1107,11 @@ unsigned int CDVDRadioRDSData::DecodeRT(uint8_t *msgElement, unsigned int len) } else { - // bool flagToogle = msgElement[UECP_ME_DATA] & 0x01 ? true : false; + // bool flagToggle = msgElement[UECP_ME_DATA] & 0x01 ? true : false; // int txQty = (msgElement[UECP_ME_DATA] >> 1) & 0x0F; // int bufConf = (msgElement[UECP_ME_DATA] >> 5) & 0x03; - //! byte 4 = RT-Status bitcodet (0=AB-flagcontrol, 1-4=Transmission-Number, 5+6=Buffer-Config, ingnored, always 0x01 ?) + //! byte 4 = RT-Status bitcodet (0=AB-flagcontrol, 1-4=Transmission-Number, 5+6=Buffer-Config, ignored, always 0x01 ?) char temptext[RT_MEL]; memset(temptext, 0x0, RT_MEL); for (unsigned int i = 1, ii = 0; i < msgLength; ++i) diff --git a/xbmc/cores/VideoPlayer/VideoPlayerTeletext.cpp b/xbmc/cores/VideoPlayer/VideoPlayerTeletext.cpp index c4a21264db..caf0cf2bf4 100644 --- a/xbmc/cores/VideoPlayer/VideoPlayerTeletext.cpp +++ b/xbmc/cores/VideoPlayer/VideoPlayerTeletext.cpp @@ -274,7 +274,7 @@ void CDVDTeletextData::Process() if ((vtx_rowbyte[0] == 0x02 || vtx_rowbyte[0] == 0x03) && (vtx_rowbyte[1] == 0x2C)) { /* clear rowbuffer */ - /* convert row from lsb to msb (begin with magazin number) */ + /* convert row from lsb to msb (begin with magazine number) */ for (int i = 4; i < 46; i++) { uint8_t upper = (vtx_rowbyte[i] >> 4) & 0xf; diff --git a/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp b/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp index f829dfc8c8..5298963d58 100644 --- a/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp +++ b/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp @@ -498,7 +498,7 @@ void CVideoPlayerVideo::Process() if (iDecoderState & VC_BUFFER) break; - // the decoder didn't need more data, flush the remaning buffer + // the decoder didn't need more data, flush the remaining buffer iDecoderState = m_pVideoCodec->Decode(NULL, 0, DVD_NOPTS_VALUE, DVD_NOPTS_VALUE); } } @@ -558,7 +558,7 @@ bool CVideoPlayerVideo::ProcessDecoderOutput(int &decoderState, double &frametim // check for a new picture if (decoderState & VC_PICTURE) { - // try to retrieve the picture (should never fail!), unless there is a demuxer bug ofcours + // try to retrieve the picture (should never fail!), unless there is a demuxer bug of course m_pVideoCodec->ClearPicture(&m_picture); if (m_pVideoCodec->GetPicture(&m_picture)) { @@ -568,7 +568,7 @@ bool CVideoPlayerVideo::ProcessDecoderOutput(int &decoderState, double &frametim 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) { @@ -582,7 +582,7 @@ bool CVideoPlayerVideo::ProcessDecoderOutput(int &decoderState, double &frametim if( m_fForcedAspectRatio != 0.0f ) m_picture.iDisplayWidth = (int) (m_picture.iDisplayHeight * m_fForcedAspectRatio); - /* 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; @@ -618,7 +618,7 @@ bool CVideoPlayerVideo::ProcessDecoderOutput(int &decoderState, double &frametim if (iResult & EOS_ABORT) { - //if we break here and we directly try to decode again wihout + //if we break here and we directly try to decode again without //flushing the video codec things break for some reason //i think the decoder (libmpeg2 atleast) still has a pointer //to the data, and when the packet is freed that will fail. @@ -745,7 +745,7 @@ int CVideoPlayerVideo::OutputPicture(const DVDVideoPicture* src, double pts) m_messageParent.Put(new CDVDMsg(CDVDMsg::PLAYER_AVCHANGE)); } - /* figure out steremode expected based on user settings and hints */ + /* figure out stereomode expected based on user settings and hints */ unsigned int stereo_flags = GetStereoModeFlags(GetStereoMode()); double config_framerate = m_bFpsInvalid ? 0.0 : m_fFrameRate; diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/BaseRenderer.h b/xbmc/cores/VideoPlayer/VideoRenderers/BaseRenderer.h index c7294cea37..155f4b02b5 100644 --- a/xbmc/cores/VideoPlayer/VideoRenderers/BaseRenderer.h +++ b/xbmc/cores/VideoPlayer/VideoRenderers/BaseRenderer.h @@ -134,7 +134,7 @@ protected: float m_sourceFrameRatio; float m_fps; - unsigned int m_renderOrientation; // orientation of the video in degress counter clockwise + unsigned int m_renderOrientation; // orientation of the video in degrees counter clockwise unsigned int m_oldRenderOrientation; // orientation of the previous frame // for drawing the texture with glVertex4f (holds all 4 corner points of the destination rect // with correct orientation based on m_renderOrientation diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/DXVAHD.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/DXVAHD.cpp index 5004aae966..9b361dbf75 100644 --- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/DXVAHD.cpp +++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/DXVAHD.cpp @@ -189,7 +189,7 @@ bool CProcessorHD::InitProcessor() D3D11_VIDEO_PROCESSOR_RATE_CONVERSION_CAPS convCaps; LOGIFERROR(m_pEnumerator->GetVideoProcessorRateConversionCaps(i, &convCaps)) - // check only deintelace caps + // check only deinterlace caps if ((convCaps.ProcessorCaps & 15) > maxProcCaps) { m_procIndex = i; @@ -369,7 +369,7 @@ bool CProcessorHD::CreateSurfaces() size_t idx; ID3D11Device* pD3DDevice = g_Windowing.Get3D11Device(); - // we cannot use texture array (like in decoder) for USAGE_DYNAMIC, so create separete textures + // we cannot use texture array (like in decoder) for USAGE_DYNAMIC, so create separate textures CD3D11_TEXTURE2D_DESC texDesc(m_textureFormat, FFALIGN(m_width, 16), FFALIGN(m_height, 16), 1, 1, D3D11_BIND_DECODER, D3D11_USAGE_DYNAMIC, D3D11_CPU_ACCESS_WRITE); D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC pivd = { 0, D3D11_VPIV_DIMENSION_TEXTURE2D }; pivd.Texture2D.ArraySlice = 0; diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.cpp index e62f9c8c07..2f9ed26a48 100644 --- a/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.cpp +++ b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.cpp @@ -376,7 +376,7 @@ void CLinuxRendererGL::ReleaseImage(int source, bool preserve) im.flags &= ~IMAGE_FLAG_INUSE; im.flags |= IMAGE_FLAG_READY; - /* if image should be preserved reserve it so it's not auto seleceted */ + /* if image should be preserved reserve it so it's not auto selected */ if( preserve ) im.flags |= IMAGE_FLAG_RESERVED; @@ -1526,7 +1526,7 @@ void CLinuxRendererGL::RenderRGB(int index, int field) void CLinuxRendererGL::RenderSoftware(int index, int field) { - // used for textues uploaded from rgba or CVPixelBuffers. + // used for textures uploaded from rgba or CVPixelBuffers. YUVPLANES &planes = m_buffers[index].fields[field]; glDisable(GL_DEPTH_TEST); diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.cpp index a8db936b3e..ab0db0da7d 100644 --- a/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.cpp +++ b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.cpp @@ -247,7 +247,7 @@ void CLinuxRendererGLES::ReleaseImage(int source, bool preserve) im.flags &= ~IMAGE_FLAG_INUSE; im.flags |= IMAGE_FLAG_READY; - /* if image should be preserved reserve it so it's not auto seleceted */ + /* if image should be preserved reserve it so it's not auto selected */ if( preserve ) im.flags |= IMAGE_FLAG_RESERVED; diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererGL.h b/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererGL.h index 0950968bf3..8c98525b4c 100644 --- a/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererGL.h +++ b/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererGL.h @@ -45,7 +45,7 @@ namespace OVERLAY { GLuint m_texture; float m_u; float m_v; - bool m_pma; /*< is alpha in texture premultipled in the values */ + bool m_pma; /*< is alpha in texture premultiplied in the values */ }; class COverlayGlyphGL : public COverlay diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp index 6c13514923..56b8db6716 100644 --- a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp +++ b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp @@ -1313,7 +1313,7 @@ void CRenderManager::PrepareNextRender() while (iter != m_queued.end()) { // the slot for rendering in time is [pts .. (pts + x * frametime)] - // renderer/drivers have internal queues, being slightliy late here does not mean that + // renderer/drivers have internal queues, being slightly late here does not mean that // we are really late. The likelihood that we recover decreases the greater m_lateframes // get. Skipping a frame is easier than having decoder dropping one (lateframes > 10) double x = (m_lateframes <= 6) ? 0.98 : 0; diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/VideoFilterShader.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/VideoFilterShader.cpp index fcfb3a0a13..c53287d01d 100644 --- a/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/VideoFilterShader.cpp +++ b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/VideoFilterShader.cpp @@ -152,7 +152,7 @@ ConvolutionFilterShader::~ConvolutionFilterShader() void ConvolutionFilterShader::OnCompiledAndLinked() { - // obtain shader attribute handles on successfull compilation + // obtain shader attribute handles on successful compilation m_hSourceTex = glGetUniformLocation(ProgramHandle(), "img"); m_hStepXY = glGetUniformLocation(ProgramHandle(), "stepxy"); m_hKernTex = glGetUniformLocation(ProgramHandle(), "kernelTex"); diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/WinVideoFilter.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/WinVideoFilter.cpp index 770ca6f14d..c35a925a32 100644 --- a/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/WinVideoFilter.cpp +++ b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/WinVideoFilter.cpp @@ -194,7 +194,7 @@ bool CWinShader::Execute(std::vector<ID3D11RenderTargetView*> *vecRT, unsigned i ID3D11DeviceContext* pContext = g_Windowing.Get3D11Context(); ID3D11RenderTargetView* oldRT = nullptr; - // The render target will be overriden: save the caller's original RT + // The render target will be overridden: save the caller's original RT if (vecRT != nullptr && !vecRT->empty()) pContext->OMGetRenderTargets(1, &oldRT, nullptr); @@ -867,7 +867,7 @@ void CConvolutionShaderSeparable::SetStepParams(UINT iPass) { if (m_oldRenderTarget) { - // get dimention of old render target + // get dimension of old render target ID3D11Resource* rtResource = nullptr; m_oldRenderTarget->GetResource(&rtResource); ID3D11Texture2D* rtTexture = nullptr; @@ -896,9 +896,9 @@ void CConvolutionShaderSeparable::SetStepParams(UINT iPass) // restore scissor g_Windowing.SetScissors(g_graphicsContext.StereoCorrection(g_graphicsContext.GetScissors())); } - // seting view port + // setting view port pContext->RSSetViewports(1, &viewPort); - // pass viewport dimention to the shaders + // pass viewport dimension to the shaders m_effect.SetFloatArray("g_viewPort", &viewPort.Width, 2); } diff --git a/xbmc/cores/omxplayer/OMXAudioCodec.h b/xbmc/cores/omxplayer/OMXAudioCodec.h index fbf80d7a56..a3879df6be 100644 --- a/xbmc/cores/omxplayer/OMXAudioCodec.h +++ b/xbmc/cores/omxplayer/OMXAudioCodec.h @@ -99,7 +99,7 @@ public: virtual int GetBitRate() { return 0; } /* - * returns if the codec requests to use passtrough + * returns if the codec requests to use passthrough */ virtual bool NeedPassthrough() { return false; } diff --git a/xbmc/cores/omxplayer/OMXPlayerAudio.cpp b/xbmc/cores/omxplayer/OMXPlayerAudio.cpp index 02ad3d8fbf..968724e81d 100644 --- a/xbmc/cores/omxplayer/OMXPlayerAudio.cpp +++ b/xbmc/cores/omxplayer/OMXPlayerAudio.cpp @@ -490,7 +490,7 @@ void OMXPlayerAudio::WaitForBuffers() m_messageQueue.WaitUntilEmpty(); // make sure almost all has been rendered - // leave 500ms to avound buffer underruns + // leave 500ms to avoid buffer underruns double delay = GetCacheTime(); if(delay > 0.5) Sleep((int)(1000 * (delay - 0.5))); diff --git a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp index 295ed624ba..b2c435bb2b 100644 --- a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp +++ b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp @@ -727,7 +727,7 @@ void OMXPlayerVideo::ResolutionUpdateCallBack(uint32_t width, uint32_t height, f ERenderFormat format = RENDER_FMT_BYPASS; - /* figure out steremode expected based on user settings and hints */ + /* figure out stereomode expected based on user settings and hints */ unsigned flags = GetStereoModeFlags(GetStereoMode()); if(m_bAllowFullscreen) diff --git a/xbmc/cores/omxplayer/OMXVideo.cpp b/xbmc/cores/omxplayer/OMXVideo.cpp index fd1b49e991..2e26a6eef7 100644 --- a/xbmc/cores/omxplayer/OMXVideo.cpp +++ b/xbmc/cores/omxplayer/OMXVideo.cpp @@ -629,7 +629,7 @@ bool COMXVideo::Open(CDVDStreamInfo &hints, OMXClock *clock, bool hdmi_clock_syn } - // Alloc buffers for the omx intput port. + // Alloc buffers for the omx input port. omx_err = m_omx_decoder.AllocInputBuffers(); if (omx_err != OMX_ErrorNone) { diff --git a/xbmc/cores/paplayer/PAPlayer.cpp b/xbmc/cores/paplayer/PAPlayer.cpp index ea4b385fae..477f205e25 100644 --- a/xbmc/cores/paplayer/PAPlayer.cpp +++ b/xbmc/cores/paplayer/PAPlayer.cpp @@ -289,7 +289,7 @@ bool PAPlayer::OpenFile(const CFileItem& file, const CPlayerOptions &options) void PAPlayer::UpdateCrossfadeTime(const CFileItem& file) { - // we explicitely disable crossfading for audio cds + // we explicitly disable crossfading for audio cds if(file.IsCDDA()) m_upcomingCrossfadeMS = 0; else diff --git a/xbmc/dbwrappers/dataset.cpp b/xbmc/dbwrappers/dataset.cpp index 2349573a19..65f9e4e788 100644 --- a/xbmc/dbwrappers/dataset.cpp +++ b/xbmc/dbwrappers/dataset.cpp @@ -338,7 +338,7 @@ bool Dataset::get_index_map_entry(const char *f_name) { return true; } } - // indexMap not found on the expected way, either first row strange retrival order + // indexMap not found on the expected way, either first row strange retrieval order FieldIndexMapEntry tmp(f_name); std::vector<unsigned int>::iterator ins(lower_bound(fieldIndexMap_Sorter.begin(), fieldIndexMap_Sorter.end(), tmp, FieldIndexMapComparator(fieldIndexMap_Entries))); if (ins == fieldIndexMap_Sorter.end() || (tmp < fieldIndexMap_Entries[*ins])) //new entry diff --git a/xbmc/dbwrappers/dataset.h b/xbmc/dbwrappers/dataset.h index 133b63abef..45a3464089 100644 --- a/xbmc/dbwrappers/dataset.h +++ b/xbmc/dbwrappers/dataset.h @@ -151,7 +151,7 @@ public: /*! \brief Prepare a SQL statement for execution or querying using C printf nomenclature. \param format - C printf compliant format string - \param ... - optional comma seperated list of variables for substitution in format string placeholders. + \param ... - optional comma separated list of variables for substitution in format string placeholders. \return escaped and formatted string. */ virtual std::string prepare(const char *format, ...); @@ -222,21 +222,21 @@ protected: Example: update wt_story set idobject set idobject=:NEW_idobject,body=:NEW_body where idobject=:OLD_idobject - Essentually fields idobject and body must present in the + Essentially fields idobject and body must present in the result set (select_sql statement) */ StringList insert_sql; // May be an array in complex queries /* Field values for inserting must has prefix :NEW_ and field name Example: insert into wt_story (idobject, body) values (:NEW_idobject, :NEW_body) - Essentually fields idobject and body must present in the + Essentially fields idobject and body must present in the result set (select_sql statement) */ StringList delete_sql; // May be an array in complex queries /* Field values for deleing must has prefix :OLD_ and field name Example: delete from wt_story where idobject=:OLD_idobject - Essentually field idobject must present in the + Essentially field idobject must present in the result set (select_sql statement) */ @@ -306,7 +306,7 @@ public: virtual int exec (const std::string &sql) = 0; virtual int exec() = 0; virtual const void* getExecRes()=0; -/* as open, but with our query exept Sql */ +/* as open, but with our query exec Sql */ virtual bool query(const std::string &sql) = 0; /* Close SQL Query*/ virtual void close(); @@ -332,14 +332,14 @@ public: virtual void first(); /* Go to next record in dataset */ virtual void next(); -/* Go to porevious record */ +/* Go to previous record */ virtual void prev(); /* Go to last record in dataset */ virtual void last(); /* Check for Ending dataset */ virtual bool eof(void) { return feof; } -/* Check for Begining dataset */ +/* Check for Beginning dataset */ virtual bool bof(void) { return fbof; } /* Start the insert mode */ @@ -355,7 +355,7 @@ public: virtual void deletion(); /* Cancel changes, made in insert or edit states of dataset */ virtual void cancel() {}; -/* interupt any pending database operation */ +/* interrupt any pending database operation */ virtual void interrupt() {}; virtual void setParamList(const ParamList ¶ms); diff --git a/xbmc/dbwrappers/mysqldataset.cpp b/xbmc/dbwrappers/mysqldataset.cpp index 69dcacb913..7c3fd00d8c 100644 --- a/xbmc/dbwrappers/mysqldataset.cpp +++ b/xbmc/dbwrappers/mysqldataset.cpp @@ -342,7 +342,7 @@ int MysqlDatabase::copy(const char *backup_name) { } mysql_free_result(res); - // we don't recreate views, indicies, or triggers on copy + // we don't recreate views, indices, or triggers on copy // as we'll be dropping and recreating them anyway } @@ -601,7 +601,7 @@ std::string MysqlDatabase::vprepare(const char *format, va_list args) */ #define etRADIX 1 /* Integer types. %d, %x, %o, and so forth */ #define etFLOAT 2 /* Floating point. %f */ -#define etEXP 3 /* Exponentional notation. %e and %E */ +#define etEXP 3 /* Exponential notation. %e and %E */ #define etGENERIC 4 /* Floating or exponential, depending on exponent. %g */ #define etSIZE 5 /* Return number of characters processed so far. %n */ #define etSTRING 6 /* Strings. %s */ diff --git a/xbmc/dbwrappers/mysqldataset.h b/xbmc/dbwrappers/mysqldataset.h index d9c20445d3..c8e9284083 100644 --- a/xbmc/dbwrappers/mysqldataset.h +++ b/xbmc/dbwrappers/mysqldataset.h @@ -147,7 +147,7 @@ or insert() operations default = false) */ virtual int exec (); virtual int exec (const std::string &sql); virtual const void* getExecRes(); -/* as open, but with our query exept Sql */ +/* as open, but with our query exec Sql */ virtual bool query(const std::string &query); /* func. closes a query */ virtual void close(void); @@ -159,7 +159,7 @@ or insert() operations default = false) */ virtual long nextid(const char *seq_name); /* sequence numbers */ virtual int num_rows(); -/* interupt any pending database operation */ +/* interrupt any pending database operation */ virtual void interrupt(); virtual bool bof(); diff --git a/xbmc/dbwrappers/sqlitedataset.h b/xbmc/dbwrappers/sqlitedataset.h index 1221abc574..29ed4672d3 100644 --- a/xbmc/dbwrappers/sqlitedataset.h +++ b/xbmc/dbwrappers/sqlitedataset.h @@ -119,7 +119,7 @@ protected: /* Delete SQL */ virtual void make_deletion(); - //static int sqlite_callback(void* res_ptr,int ncol, char** reslt, char** cols); + //static int sqlite_callback(void* res_ptr,int ncol, char** result, char** cols); /* This function works only with MySQL database Filling the fields information from select statement */ @@ -146,7 +146,7 @@ or insert() operations default = false) */ virtual int exec (); virtual int exec (const std::string &sql); virtual const void* getExecRes(); -/* as open, but with our query exept Sql */ +/* as open, but with our query exec Sql */ virtual bool query(const std::string &query); /* func. closes a query */ virtual void close(void); @@ -158,7 +158,7 @@ or insert() operations default = false) */ virtual long nextid(const char *seq_name); /* sequence numbers */ virtual int num_rows(); -/* interupt any pending database operation */ +/* interrupt any pending database operation */ virtual void interrupt(); virtual bool bof(); diff --git a/xbmc/dialogs/GUIDialogBoxBase.h b/xbmc/dialogs/GUIDialogBoxBase.h index bb0c334965..808ac241e9 100644 --- a/xbmc/dialogs/GUIDialogBoxBase.h +++ b/xbmc/dialogs/GUIDialogBoxBase.h @@ -52,7 +52,7 @@ protected: std::string GetDefaultLabel(int controlId) const; virtual int GetDefaultLabelID(int controlId) const; /*! \brief Get a localized string from a variant - If the varaint is already a string we return directly, else if it's an integer we return the corresponding + If the variant is already a string we return directly, else if it's an integer we return the corresponding localized string. \param var the variant to localize. */ diff --git a/xbmc/dialogs/GUIDialogKeyboardGeneric.cpp b/xbmc/dialogs/GUIDialogKeyboardGeneric.cpp index 32ab09d866..70d7952d9e 100644 --- a/xbmc/dialogs/GUIDialogKeyboardGeneric.cpp +++ b/xbmc/dialogs/GUIDialogKeyboardGeneric.cpp @@ -305,7 +305,7 @@ bool CGUIDialogKeyboardGeneric::OnMessage(CGUIMessage& message) case GUI_MSG_SET_TEXT: case GUI_MSG_INPUT_TEXT_EDIT: { - // the edit control only handles these messages if it is either focues + // the edit control only handles these messages if it is either focused // or its specific control ID is set in the message. As neither is the // case here (focus is on one of the keyboard buttons) we have to force // the control ID of the message to the control ID of the edit control diff --git a/xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp b/xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp index 1e40495e08..cec76ca4d5 100644 --- a/xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp +++ b/xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp @@ -637,7 +637,7 @@ bool CGUIDialogSmartPlaylistEditor::EditPlaylist(const std::string &path, const { // failed to load if (!StringUtils::StartsWithNoCase(editor->m_mode, "party")) return false; // only edit normal playlists that exist - // party mode playlists can be editted even if they don't exist + // party mode playlists can be edited even if they don't exist playlist.SetType(editor->m_mode == "partymusic" ? "songs" : "musicvideos"); } diff --git a/xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp b/xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp index 0b398b9823..2d5357f7d6 100644 --- a/xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp +++ b/xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp @@ -284,7 +284,7 @@ void CGUIDialogSmartPlaylistRule::OnBrowse() { CFileItemPtr item = items[i]; CSmartPlaylist playlist; - // don't list unloadable smartplaylists or any referencable smartplaylists + // don't list unloadable smartplaylists or any referenceable smartplaylists // which do not match the type of the current smartplaylist if (!playlist.Load(item->GetPath()) || (m_rule.m_field == FieldPlaylist && diff --git a/xbmc/epg/Epg.h b/xbmc/epg/Epg.h index 1643002902..13eb8c0828 100644 --- a/xbmc/epg/Epg.h +++ b/xbmc/epg/Epg.h @@ -171,7 +171,7 @@ namespace EPG CEpgInfoTagPtr GetTagBetween(const CDateTime &beginTime, const CDateTime &endTime) const; /*! - * Get all events occuring between the given begin and end time. + * Get all events occurring between the given begin and end time. * @param beginTime Minimum start time in UTC of the event. * @param endTime Maximum end time in UTC of the event. * @return The tags found or an empty vector if none was found. diff --git a/xbmc/epg/EpgInfoTag.h b/xbmc/epg/EpgInfoTag.h index 24281a0f7f..b3cb68b934 100644 --- a/xbmc/epg/EpgInfoTag.h +++ b/xbmc/epg/EpgInfoTag.h @@ -394,7 +394,7 @@ namespace EPG /*! * @brief Update the information in this tag with the info in the given tag. * @param tag The new info. - * @param bUpdateBroadcastId If set to false, the tag BroadcastId (locally unique) will not be chacked/updated + * @param bUpdateBroadcastId If set to false, the tag BroadcastId (locally unique) will not be checked/updated * @return True if something changed, false otherwise. */ bool Update(const CEpgInfoTag &tag, bool bUpdateBroadcastId = true); diff --git a/xbmc/epg/GUIEPGGridContainer.cpp b/xbmc/epg/GUIEPGGridContainer.cpp index 8ec861104b..1f2aa7fde0 100644 --- a/xbmc/epg/GUIEPGGridContainer.cpp +++ b/xbmc/epg/GUIEPGGridContainer.cpp @@ -692,7 +692,7 @@ void CGUIEPGGridContainer::UpdateItems() broadcastUid = prevSelectedEpgTag->UniqueBroadcastID(); } - else // "gap" tag seleceted + else // "gap" tag selected { const GridItem *prevItem(GetPrevItem(m_channelCursor)); if (prevItem) diff --git a/xbmc/epg/GUIEPGGridContainerModel.cpp b/xbmc/epg/GUIEPGGridContainerModel.cpp index dbc867cdd1..2fc8334976 100644 --- a/xbmc/epg/GUIEPGGridContainerModel.cpp +++ b/xbmc/epg/GUIEPGGridContainerModel.cpp @@ -346,7 +346,7 @@ void CGUIEPGGridContainerModel::FreeProgrammeMemory(int channel, int keepStart, m_gridIndex[channel][i].item->FreeMemory(); // FreeMemory() is smart enough to not cause any problems when called multiple times on same item // but we can make use of condition needed to not call FreeMemory() on item that is partially visible - // to avoid calling FreeMemory() multiple times on item that ocupy few blocks in a row + // to avoid calling FreeMemory() multiple times on item that occupy few blocks in a row last = m_gridIndex[channel][i].item; } } @@ -363,7 +363,7 @@ void CGUIEPGGridContainerModel::FreeProgrammeMemory(int channel, int keepStart, m_gridIndex[channel][i].item->FreeMemory(); // FreeMemory() is smart enough to not cause any problems when called multiple times on same item // but we can make use of condition needed to not call FreeMemory() on item that is partially visible - // to avoid calling FreeMemory() multiple times on item that ocupy few blocks in a row + // to avoid calling FreeMemory() multiple times on item that occupy few blocks in a row last = m_gridIndex[channel][i].item; } } diff --git a/xbmc/filesystem/APKFile.cpp b/xbmc/filesystem/APKFile.cpp index 690f94b6e9..f02305f875 100644 --- a/xbmc/filesystem/APKFile.cpp +++ b/xbmc/filesystem/APKFile.cpp @@ -206,7 +206,7 @@ int CAPKFile::Stat(const CURL& url, struct __stat64* buffer) { memset(buffer, 0, sizeof(struct __stat64)); - // do not use interal member vars here, + // do not use internal member vars here, // we might be called without opening std::string path = url.GetFileName(); std::string host = url.GetHostName(); diff --git a/xbmc/filesystem/BlurayDirectory.cpp b/xbmc/filesystem/BlurayDirectory.cpp index 6804bf8edd..8bf3b62d91 100644 --- a/xbmc/filesystem/BlurayDirectory.cpp +++ b/xbmc/filesystem/BlurayDirectory.cpp @@ -34,7 +34,7 @@ namespace XFILE { -#define MAIN_TITLE_LENGTH_PERCENT 70 /** Minumum length of main titles, based on longest title */ +#define MAIN_TITLE_LENGTH_PERCENT 70 /** Minimum length of main titles, based on longest title */ CBlurayDirectory::CBlurayDirectory() : m_dll(NULL) diff --git a/xbmc/filesystem/CurlFile.cpp b/xbmc/filesystem/CurlFile.cpp index e29ac93adc..826c391ff2 100644 --- a/xbmc/filesystem/CurlFile.cpp +++ b/xbmc/filesystem/CurlFile.cpp @@ -496,7 +496,7 @@ void CCurlFile::SetCommonOptions(CReadState* state) g_curlInterface.easy_setopt(h, CURLOPT_USERPWD, userpwd.c_str()); } - // make sure headers are seperated from the data stream + // make sure headers are separated from the data stream g_curlInterface.easy_setopt(h, CURLOPT_WRITEHEADER, state); g_curlInterface.easy_setopt(h, CURLOPT_HEADERFUNCTION, header_callback); g_curlInterface.easy_setopt(h, CURLOPT_HEADER, FALSE); @@ -707,7 +707,7 @@ void CCurlFile::ParseAndCorrectUrl(CURL &url2) if( url2.IsProtocol("ftp") || url2.IsProtocol("ftps") ) { - // we was using url optons for urls, keep the old code work and warning + // we was using url options for urls, keep the old code work and warning if (!url2.GetOptions().empty()) { CLog::Log(LOGWARNING, "%s: ftp url option is deprecated, please switch to use protocol option (change '?' to '|'), url: [%s]", __FUNCTION__, url2.GetRedacted().c_str()); @@ -1342,7 +1342,7 @@ int64_t CCurlFile::Seek(int64_t iFilePosition, int iWhence) m_state = m_oldState; m_oldState = NULL; } - // Retry without mutlisession + // Retry without multisession m_multisession = false; return Seek(iFilePosition, iWhence); } diff --git a/xbmc/filesystem/File.h b/xbmc/filesystem/File.h index 30f38965dc..adcac32bd8 100644 --- a/xbmc/filesystem/File.h +++ b/xbmc/filesystem/File.h @@ -72,7 +72,7 @@ public: * * Remarks: Open can only be called once. Calling * Open() on an already opened file will fail - * exept flag READ_REOPEN is set and the underlying + * except if flag READ_REOPEN is set and the underlying * file has an implementation of ReOpen(). */ bool Open(const CURL& file, const unsigned int flags = 0); diff --git a/xbmc/filesystem/FileCache.cpp b/xbmc/filesystem/FileCache.cpp index 451926655c..afea2fe5d5 100644 --- a/xbmc/filesystem/FileCache.cpp +++ b/xbmc/filesystem/FileCache.cpp @@ -517,7 +517,7 @@ int64_t CFileCache::Seek(int64_t iFilePosition, int iWhence) return -1; } - /* wait for any remainin data */ + /* wait for any remaining data */ if(m_seekPos < iTarget) { CLog::Log(LOGDEBUG,"%s - waiting for position %" PRId64".", __FUNCTION__, iTarget); diff --git a/xbmc/filesystem/HTTPDirectory.cpp b/xbmc/filesystem/HTTPDirectory.cpp index 0974f4fea6..9821c269df 100644 --- a/xbmc/filesystem/HTTPDirectory.cpp +++ b/xbmc/filesystem/HTTPDirectory.cpp @@ -136,7 +136,7 @@ bool CHTTPDirectory::GetDirectory(const CURL& url, CFileItemList &items) CURL url2(url); /* NOTE: Force any &...; encoding (e.g. &) into % encoding else CURL objects interpret them incorrectly - * due to the ; also being allowed as URL option seperator + * due to the ; also being allowed as URL option separator */ if (fileCharset.empty()) g_charsetConverter.unknownToUTF8(strLinkBase); diff --git a/xbmc/filesystem/IDirectory.h b/xbmc/filesystem/IDirectory.h index 246c4d029f..92504ed91c 100644 --- a/xbmc/filesystem/IDirectory.h +++ b/xbmc/filesystem/IDirectory.h @@ -65,7 +65,7 @@ public: \brief Get the \e items of the directory \e strPath. \param url Directory to read. \param items Retrieves the directory entries. - \return Returns \e true, if successfull. + \return Returns \e true, if successful. \sa CDirectoryFactory */ virtual bool GetDirectory(const CURL& url, CFileItemList &items) = 0; @@ -97,7 +97,7 @@ public: /*! \brief Removes the directory \param url Directory to remove. - \return Returns \e false if not succesfull + \return Returns \e false if not successful */ virtual bool Remove(const CURL& url) { return false; } diff --git a/xbmc/filesystem/IFileTypes.h b/xbmc/filesystem/IFileTypes.h index 7cafa2c69f..70fee2f201 100644 --- a/xbmc/filesystem/IFileTypes.h +++ b/xbmc/filesystem/IFileTypes.h @@ -37,7 +37,7 @@ namespace XFILE /* open without caching. regardless to file type. */ static const unsigned int READ_NO_CACHE = 0x08; -/* calcuate bitrate for file while reading */ +/* calculate bitrate for file while reading */ static const unsigned int READ_BITRATE = 0x10; /* indicate to the caller we will seek between multiple streams in the file frequently */ diff --git a/xbmc/filesystem/NFSDirectory.cpp b/xbmc/filesystem/NFSDirectory.cpp index a0ce883908..d00bd55cc8 100644 --- a/xbmc/filesystem/NFSDirectory.cpp +++ b/xbmc/filesystem/NFSDirectory.cpp @@ -138,7 +138,7 @@ bool CNFSDirectory::ResolveSymlink( const std::string &dirName, struct nfsdirent if(resolvedLink[0] == '/') { //use the special stat function for using an extra context - //because we are inside of a dir traversation + //because we are inside of a dir traversal //and just can't change the global nfs context here //without destroying something... fullpath = resolvedLink; @@ -195,7 +195,7 @@ bool CNFSDirectory::GetDirectory(const CURL& url, CFileItemList &items) if(!gNfsConnection.Connect(url,strDirName)) { - //connect has failed - so try to get the exported filesystms if no path is given to the url + //connect has failed - so try to get the exported filesystems if no path is given to the url if(url.GetShareName().empty()) { if(url.GetHostName().empty()) diff --git a/xbmc/filesystem/NFSFile.cpp b/xbmc/filesystem/NFSFile.cpp index e359758aac..c592e0973d 100644 --- a/xbmc/filesystem/NFSFile.cpp +++ b/xbmc/filesystem/NFSFile.cpp @@ -274,7 +274,7 @@ bool CNfsConnection::splitUrlIntoExportAndPath(const CURL& url,std::string &expo continue; exportPath = *it; //handle special case where root is exported - //in that case we don't want to stripp off to + //in that case we don't want to strip off to //much from the path if( exportPath == path ) relativePath = "//"; @@ -357,7 +357,7 @@ 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. */ if (m_OpenConnections == 0 && m_pNfsContext != NULL) - { /* I've set the the maxiumum IDLE time to be 1 min and 30 sec. */ + { /* I've set the the maximum IDLE time to be 1 min and 30 sec. */ CSingleLock lock(*this); if (m_OpenConnections == 0 /* check again - when locked */) { @@ -713,7 +713,7 @@ void CNFSFile::Close() int ret = 0; CLog::Log(LOGDEBUG,"CNFSFile::Close closing file %s", m_url.GetFileName().c_str()); // remove it from keep alive list before closing - // so keep alive code doens't process it anymore + // so keep alive code doesn't process it anymore gNfsConnection.removeFromKeepAliveList(m_pFileHandle); ret = gNfsConnection.GetImpl()->nfs_close(m_pNfsContext, m_pFileHandle); @@ -736,7 +736,7 @@ ssize_t CNFSFile::Write(const void* lpBuf, size_t uiBufSize) size_t numberOfBytesWritten = 0; int writtenBytes = 0; size_t leftBytes = uiBufSize; - //clamp max write chunksize to 32kb - fixme - this might be superfluious with future libnfs versions + //clamp max write chunksize to 32kb - fixme - this might be superfluous with future libnfs versions size_t chunkSize = gNfsConnection.GetMaxWriteChunkSize() > 32768 ? 32768 : (size_t)gNfsConnection.GetMaxWriteChunkSize(); CSingleLock lock(gNfsConnection); diff --git a/xbmc/filesystem/NFSFile.h b/xbmc/filesystem/NFSFile.h index fc474e5d11..c48e3a9f73 100644 --- a/xbmc/filesystem/NFSFile.h +++ b/xbmc/filesystem/NFSFile.h @@ -110,7 +110,7 @@ private: tOpenContextMap m_openContextMap;//unique map for tracking all open contexts uint64_t m_lastAccessedTime;//last access time for m_pNfsContext DllLibNfs *m_pLibNfs;//the lib - std::list<std::string> m_exportList;//list of exported pathes of current connected servers + std::list<std::string> m_exportList;//list of exported paths of current connected servers CCriticalSection keepAliveLock; CCriticalSection openContextLock; diff --git a/xbmc/filesystem/PVRDirectory.cpp b/xbmc/filesystem/PVRDirectory.cpp index 4fa8441bd9..0f8925ef7c 100644 --- a/xbmc/filesystem/PVRDirectory.cpp +++ b/xbmc/filesystem/PVRDirectory.cpp @@ -81,7 +81,7 @@ bool CPVRDirectory::GetDirectory(const CURL& url, CFileItemList &items) item->SetLabelPreformated(true); items.Add(item); - // Sort by name only. Labels are preformated. + // Sort by name only. Labels are preformatted. items.AddSortMethod(SortByLabel, 551 /* Name */, LABEL_MASKS("%L", "", "%L", "")); } return true; diff --git a/xbmc/filesystem/SMBDirectory.cpp b/xbmc/filesystem/SMBDirectory.cpp index df9c9592dd..c36f9a3a33 100644 --- a/xbmc/filesystem/SMBDirectory.cpp +++ b/xbmc/filesystem/SMBDirectory.cpp @@ -20,7 +20,7 @@ /* * know bugs: -* - when opening a server for the first time with ip adres and the second time +* - when opening a server for the first time with ip address and the second time * with server name, access to the server is denied. * - when browsing entire network, user can't go back one step * share = smb://, user selects a workgroup, user selects a server. diff --git a/xbmc/filesystem/SMBFile.cpp b/xbmc/filesystem/SMBFile.cpp index 5641847811..fc6c86f4b7 100644 --- a/xbmc/filesystem/SMBFile.cpp +++ b/xbmc/filesystem/SMBFile.cpp @@ -143,7 +143,7 @@ void CSMB::Init() // reads smb.conf so this MUST be after we create smb.conf // multiple smbc_init calls are ignored by libsmbclient. - // note: this is important as it initilizes the smb old + // note: this is important as it initializes the smb old // interface compatibility. Samba 3.4.0 or higher has the new interface. // note: we leak the following here once, not sure why yet. // 48 bytes -> smb_xmalloc_array @@ -174,7 +174,7 @@ void CSMB::Init() m_context->options.one_share_per_server = false; m_context->options.browse_max_lmb_count = 0; m_context->timeout = g_advancedSettings.m_sambaclienttimeout * 1000; - // we need to strdup these, they will get free'ed on smbc_free_context + // we need to strdup these, they will get free'd on smbc_free_context if (CServiceBroker::GetSettings().GetString(CSettings::SETTING_SMB_WORKGROUP).length() > 0) m_context->workgroup = strdup(CServiceBroker::GetSettings().GetString(CSettings::SETTING_SMB_WORKGROUP).c_str()); m_context->user = strdup("guest"); @@ -258,7 +258,7 @@ 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. */ if (m_OpenConnections == 0) - { /* I've set the the maxiumum IDLE time to be 1 min and 30 sec. */ + { /* I've set the the maximum IDLE time to be 1 min and 30 sec. */ CSingleLock lock(*this); if (m_OpenConnections == 0 /* check again - when locked */ && m_context != NULL) { diff --git a/xbmc/filesystem/StackDirectory.cpp b/xbmc/filesystem/StackDirectory.cpp index 61bac16a35..e43a95efde 100644 --- a/xbmc/filesystem/StackDirectory.cpp +++ b/xbmc/filesystem/StackDirectory.cpp @@ -186,7 +186,7 @@ namespace XFILE if (vecPaths.empty()) return false; - // because " , " is used as a seperator any "," in the real paths are double escaped + // because " , " is used as a separator any "," in the real paths are double escaped for (std::vector<std::string>::iterator itPath = vecPaths.begin(); itPath != vecPaths.end(); ++itPath) StringUtils::Replace(*itPath, ",,", ","); diff --git a/xbmc/filesystem/VirtualDirectory.cpp b/xbmc/filesystem/VirtualDirectory.cpp index 99e8eb32c9..ecf0a4f3bb 100644 --- a/xbmc/filesystem/VirtualDirectory.cpp +++ b/xbmc/filesystem/VirtualDirectory.cpp @@ -58,7 +58,7 @@ void CVirtualDirectory::SetSources(const VECSOURCES& vecSources) \brief Retrieve the shares or the content of a directory. \param strPath Specifies the path of the directory to retrieve or pass an empty string to get the shares. \param items Content of the directory. - \return Returns \e true, if directory access is successfull. + \return Returns \e true, if directory access is successful. \note If \e strPath is an empty string, the share \e items have thumbnails and icons set, else the thumbnails and icons have to be set manually. */ diff --git a/xbmc/filesystem/ZeroconfDirectory.cpp b/xbmc/filesystem/ZeroconfDirectory.cpp index 264f0b71f3..1753e2bd15 100644 --- a/xbmc/filesystem/ZeroconfDirectory.cpp +++ b/xbmc/filesystem/ZeroconfDirectory.cpp @@ -96,7 +96,7 @@ bool GetDirectoryFromTxtRecords(const CZeroconfBrowser::ZeroconfService& zerocon if( it != txtRecords.end() && !it->second.empty() ) { //from now on we treat the value as a path - everything else would mean - //a missconfigured zeroconf server. + //a misconfigured zeroconf server. path=it->second; } @@ -131,7 +131,7 @@ bool GetDirectoryFromTxtRecords(const CZeroconfBrowser::ZeroconfService& zerocon URIUtils::RemoveSlashAtEnd(urlStr);//we don't need the slash at and of url then } else//path doesn't start with slash - - {//this is some kind of missconfiguration - we fix it by adding a slash to the url + {//this is some kind of misconfiguration - we fix it by adding a slash to the url URIUtils::AddSlashAtEnd(urlStr); } diff --git a/xbmc/filesystem/iso9660.cpp b/xbmc/filesystem/iso9660.cpp index e6acf2de6e..676a98367d 100644 --- a/xbmc/filesystem/iso9660.cpp +++ b/xbmc/filesystem/iso9660.cpp @@ -91,7 +91,7 @@ const std::string iso9660::ParseName(struct iso9660_Directory& isodir) { if (isodir.FileName[iPos] == 'N' && isodir.FileName[iPos + 1] == 'M') { - // altername name + // alternate name // "N" "M" LEN_NM 1 FLAGS NAMECONTENT // BP1 BP2 BP3 BP4 BP5 BP6-LEN_NM int iNameLen = isodir.FileName[iPos + 2] - 5; @@ -377,7 +377,7 @@ struct iso_dirtree *iso9660::ReadRecursiveDirFromSector( DWORD sector, const cha if (bContinue) { - // int semipos = temp_text.find(";",0); //the directory is not seperate by ";",but by its length + // int semipos = temp_text.find(";",0); //the directory is not separate by ";",but by its length // if (semipos >= 0) // temp_text.erase(semipos,temp_text.length()-semipos); diff --git a/xbmc/filesystem/iso9660.h b/xbmc/filesystem/iso9660.h index 286a81b0ec..fdae1f07d7 100644 --- a/xbmc/filesystem/iso9660.h +++ b/xbmc/filesystem/iso9660.h @@ -94,7 +94,7 @@ struct iso9660_Directory #define Flag_NotExist 0x01 /* 1-file not exists */ #define Flag_Directory 0x02 /* 0-normal file, 1-directory */ #define Flag_Associated 0x03 /* 0-not associated file */ - #define Flag_Protection 0x04 /* 0-normal acces */ + #define Flag_Protection 0x04 /* 0-normal access */ #define Flag_Multi 0x07 /* 0-final Directory Record for the file */ BYTE ucRecordLength; //0 the number of bytes in the record (which must be even) diff --git a/xbmc/filesystem/udf25.cpp b/xbmc/filesystem/udf25.cpp index 76ccb9755c..ffb8dc54f9 100644 --- a/xbmc/filesystem/udf25.cpp +++ b/xbmc/filesystem/udf25.cpp @@ -48,7 +48,7 @@ | ((uint64_t)data[(p) + 6] << 48) \ | ((uint64_t)data[(p) + 7] << 56)) -/* This is wrong with regard to endianess */ +/* This is wrong with regard to endianness */ #define GETN(p, n, target) memcpy(target, &data[p], n) using namespace XFILE; diff --git a/xbmc/filesystem/udf25.h b/xbmc/filesystem/udf25.h index 1ee5cd81d6..4f2a6e3f7d 100644 --- a/xbmc/filesystem/udf25.h +++ b/xbmc/filesystem/udf25.h @@ -57,7 +57,7 @@ struct AD { }; /* Previously dvdread would assume files only had one AD chain, and since they - * are 1GB or less, this is most problably true. However, now we handle chains + * are 1GB or less, this is most probably true. However, now we handle chains * for large files. ECMA_167 does not specify the maximum number of chains, is * it as many as can fit in a 2048 block (minus ID 266 size), or some other * limit. For now, I have assumed that; diff --git a/xbmc/guilib/GUIControl.h b/xbmc/guilib/GUIControl.h index 29858fc87d..b4e0f43a6b 100644 --- a/xbmc/guilib/GUIControl.h +++ b/xbmc/guilib/GUIControl.h @@ -195,7 +195,7 @@ public: /*! \brief Set actions to perform on navigation Navigations are set if replace is true or if there is no previously set action - \param actionID id of the nagivation action + \param actionID id of the navigation action \param action CGUIAction to set \param replace Actions are set only if replace is true or there is no previously set action. Defaults to true \sa SetNavigationActions diff --git a/xbmc/guilib/GUIFadeLabelControl.dox b/xbmc/guilib/GUIFadeLabelControl.dox index d9c4cf981a..228584ae71 100644 --- a/xbmc/guilib/GUIFadeLabelControl.dox +++ b/xbmc/guilib/GUIFadeLabelControl.dox @@ -46,7 +46,7 @@ important, as `xml` tags are case-sensitive. | Tag | Description | |--------------------:|:--------------------------------------------------------------| -| label | Specifies the text which should be drawn. You should specify an entry from the strings.xml here, however you may also specify a piece of text yourself if you wish, though ofcourse it will not be localisable. [You may also specify more than one piece of information here by using the $INFO and $LOCALIZE formats](http://kodi.wiki/view/Label_Parsing). +| label | Specifies the text which should be drawn. You should specify an entry from the strings.xml here, however you may also specify a piece of text yourself if you wish, though of course it will not be localisable. [You may also specify more than one piece of information here by using the $INFO and $LOCALIZE formats](http://kodi.wiki/view/Label_Parsing). | info | Specifies the information that should be presented. Kodi will auto-fill in this info in place of the <b>`<label>`</b>. [See here for more information](http://kodi.wiki/view/InfoLabels). | font | Specifies the font to use from the font.xml file. | textcolor | Specified the color the text should be, in hex **AARRGGBB** format, or a name from the [colour theme](http://kodi.wiki/view/Colour_Themes). diff --git a/xbmc/guilib/GUIFontManager.cpp b/xbmc/guilib/GUIFontManager.cpp index 3235a408d8..2b88f430de 100644 --- a/xbmc/guilib/GUIFontManager.cpp +++ b/xbmc/guilib/GUIFontManager.cpp @@ -64,7 +64,7 @@ void GUIFontManager::RescaleFontSizeAndAspect(float *size, float *aspect, const } else { - // font streched like the rest of the UI, aspect parameter being the original aspect + // font stretched like the rest of the UI, aspect parameter being the original aspect // adjust aspect ratio *aspect *= sourceRes.fPixelRatio; diff --git a/xbmc/guilib/GUIFontTTF.h b/xbmc/guilib/GUIFontTTF.h index 21c714b8b5..167aeca11e 100644 --- a/xbmc/guilib/GUIFontTTF.h +++ b/xbmc/guilib/GUIFontTTF.h @@ -145,7 +145,7 @@ protected: CBaseTexture* m_texture; // texture that holds our rendered characters (8bit alpha only) unsigned int m_textureWidth; // width of our texture - unsigned int m_textureHeight; // heigth of our texture + unsigned int m_textureHeight; // height of our texture int m_posX; // current position in the texture int m_posY; diff --git a/xbmc/guilib/GUIFontTTFDX.cpp b/xbmc/guilib/GUIFontTTFDX.cpp index f87abf74f0..b1bb59fdcd 100644 --- a/xbmc/guilib/GUIFontTTFDX.cpp +++ b/xbmc/guilib/GUIFontTTFDX.cpp @@ -128,7 +128,7 @@ void CGUIFontTTFDX::LastEnd() // Store current GPU transform XMMATRIX view = pGUIShader->GetView(); - // Store currect scissor + // Store current scissor CRect scissor = g_graphicsContext.StereoCorrection(g_graphicsContext.GetScissors()); for (size_t i = 0; i < m_vertexTrans.size(); i++) diff --git a/xbmc/guilib/GUIFontTTFGL.cpp b/xbmc/guilib/GUIFontTTFGL.cpp index 60296c2311..e738c3fe89 100644 --- a/xbmc/guilib/GUIFontTTFGL.cpp +++ b/xbmc/guilib/GUIFontTTFGL.cpp @@ -210,7 +210,7 @@ void CGUIFontTTFGL::LastEnd() // Bind our pre-calculated array to GL_ELEMENT_ARRAY_BUFFER glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_elementArrayHandle); - // Store currect scissor + // Store current scissor CRect scissor = g_graphicsContext.StereoCorrection(g_graphicsContext.GetScissors()); for (size_t i = 0; i < m_vertexTrans.size(); i++) diff --git a/xbmc/guilib/GUIKeyboard.h b/xbmc/guilib/GUIKeyboard.h index f65d361102..9666ce4e58 100644 --- a/xbmc/guilib/GUIKeyboard.h +++ b/xbmc/guilib/GUIKeyboard.h @@ -59,7 +59,7 @@ class CGUIKeyboard : public ITimerCallback /*! *\brief This call should cancel a currently shown keyboard dialog. The implementation should - * return false from the modal ShowAndGetInput once anyone calls this metohod. + * return false from the modal ShowAndGetInput once anyone calls this method. */ virtual void Cancel() = 0; diff --git a/xbmc/guilib/GUILabelControl.dox b/xbmc/guilib/GUILabelControl.dox index cda2b4a95a..b728eb94e0 100644 --- a/xbmc/guilib/GUILabelControl.dox +++ b/xbmc/guilib/GUILabelControl.dox @@ -40,8 +40,8 @@ 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 relevalant to how -long the label text is. This allows a image or other control to be alligned to +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. ~~~~~~~~~~~~~ diff --git a/xbmc/guilib/GUIMessage.h b/xbmc/guilib/GUIMessage.h index 078e1f960d..69f3099a70 100644 --- a/xbmc/guilib/GUIMessage.h +++ b/xbmc/guilib/GUIMessage.h @@ -80,7 +80,7 @@ #define GUI_MSG_PAGE_UP 30 // page up #define GUI_MSG_PAGE_DOWN 31 // page down -#define GUI_MSG_MOVE_OFFSET 32 // Instruct the contorl to MoveUp or MoveDown by offset amount +#define GUI_MSG_MOVE_OFFSET 32 // Instruct the control to MoveUp or MoveDown by offset amount #define GUI_MSG_SET_TYPE 33 ///< Instruct a control to set it's type appropriately @@ -368,7 +368,7 @@ public: void SetParam2(int param2); void SetPointer(void* pointer); void SetLabel(const std::string& strLabel); - void SetLabel(int iString); // for convience - looks up in strings.xml + void SetLabel(int iString); // for convenience - looks up in strings.xml const std::string& GetLabel() const; void SetStringParam(const std::string &strParam); void SetStringParams(const std::vector<std::string> ¶ms); diff --git a/xbmc/guilib/GUITextLayout.cpp b/xbmc/guilib/GUITextLayout.cpp index 8c17f6740a..138740d9e3 100644 --- a/xbmc/guilib/GUITextLayout.cpp +++ b/xbmc/guilib/GUITextLayout.cpp @@ -307,7 +307,7 @@ void CGUITextLayout::BidiTransform(std::vector<CGUIString> &lines, bool forceLTR flippedText.push_back(sectionStyle | sectionFlipped[j]); } - // replace the original line with the proccessed one + // replace the original line with the processed one lines[i] = CGUIString(flippedText.begin(), flippedText.end(), line.m_carriageReturn); } } diff --git a/xbmc/guilib/GUITexture.cpp b/xbmc/guilib/GUITexture.cpp index 34237e445d..25cdeaaeab 100644 --- a/xbmc/guilib/GUITexture.cpp +++ b/xbmc/guilib/GUITexture.cpp @@ -432,7 +432,7 @@ bool CGUITextureBase::CalculateSize() m_diffuseScaleV = m_diffuseV; m_diffuseOffset = CPoint(0,0); } - else // stretch'ing diffuse + else // stretching diffuse { // scale diffuse up or down to match output rect size, rather than image size //(m_fX, mfY) -> (m_fX + m_fNW, m_fY + m_fNH) //(0,0) -> (m_fU*m_diffuseScaleU, m_fV*m_diffuseScaleV) diff --git a/xbmc/guilib/GUIToggleButtonControl.dox b/xbmc/guilib/GUIToggleButtonControl.dox index 9bbb8721e3..69cf0f8e76 100644 --- a/xbmc/guilib/GUIToggleButtonControl.dox +++ b/xbmc/guilib/GUIToggleButtonControl.dox @@ -12,7 +12,7 @@ the toggle button, the state will change, toggling the extra textures needed (pushed in and pushed out for instance). -------------------------------------------------------------------------------- -\section skin_Toogle_button_control_sect1 Example +\section skin_Toggle_button_control_sect1 Example ~~~~~~~~~~~~~ <control type="togglebutton" id="25"> @@ -51,7 +51,7 @@ needed (pushed in and pushed out for instance). -------------------------------------------------------------------------------- -\section skin_Toogle_button_control_sect2 Available tags +\section skin_Toggle_button_control_sect2 Available tags In addition to the Default Control Tags the following tags are available. Note that each tag is lower case only. This is important, as xml tags are case-sensitive. @@ -82,7 +82,7 @@ that each tag is lower case only. This is important, as xml tags are case-sensit -------------------------------------------------------------------------------- -\section skin_Toogle_button_control_sect3 See also +\section skin_Toggle_button_control_sect3 See also #### Development: - [Add-on development](http://kodi.wiki/view/Add-on_development) diff --git a/xbmc/guilib/GUIWindow.h b/xbmc/guilib/GUIWindow.h index 0b64939c11..e28cec6c38 100644 --- a/xbmc/guilib/GUIWindow.h +++ b/xbmc/guilib/GUIWindow.h @@ -184,7 +184,7 @@ public: */ void SetProperty(const std::string &key, const CVariant &value); - /*! \brief Retreive a property + /*! \brief Retrieve a property \param key name of the property to retrieve \return value of the property, empty if it doesn't exist */ diff --git a/xbmc/guilib/GUIWrappingListContainer.cpp b/xbmc/guilib/GUIWrappingListContainer.cpp index 439faafcf6..ee1666d8e0 100644 --- a/xbmc/guilib/GUIWrappingListContainer.cpp +++ b/xbmc/guilib/GUIWrappingListContainer.cpp @@ -125,7 +125,7 @@ bool CGUIWrappingListContainer::GetOffsetRange(int &minOffset, int &maxOffset) c void CGUIWrappingListContainer::ValidateOffset() { - // our minimal amount of items - we need to take into acount extra items to display wrapped items when scrolling + // our minimal amount of items - we need to take into account extra items to display wrapped items when scrolling unsigned int minItems = (unsigned int)m_itemsPerPage + ScrollCorrectionRange() + GetCacheCount() / 2; if (minItems <= m_items.size()) return; diff --git a/xbmc/guilib/Geometry.h b/xbmc/guilib/Geometry.h index a3bb4987be..2330c898ed 100644 --- a/xbmc/guilib/Geometry.h +++ b/xbmc/guilib/Geometry.h @@ -21,7 +21,7 @@ #pragma once #ifdef __GNUC__ -// under gcc, inline will only take place if optimizations are applied (-O). this will force inline even whith optimizations. +// under gcc, inline will only take place if optimizations are applied (-O). this will force inline even with optimizations. #define XBMC_FORCE_INLINE __attribute__((always_inline)) #else #define XBMC_FORCE_INLINE diff --git a/xbmc/guilib/GraphicContext.h b/xbmc/guilib/GraphicContext.h index 08bbfd7551..444ca5ae5e 100644 --- a/xbmc/guilib/GraphicContext.h +++ b/xbmc/guilib/GraphicContext.h @@ -26,7 +26,7 @@ #pragma once #ifdef __GNUC__ -// under gcc, inline will only take place if optimizations are applied (-O). this will force inline even whith optimizations. +// under gcc, inline will only take place if optimizations are applied (-O). this will force inline even with optimizations. #define XBMC_FORCE_INLINE __attribute__((always_inline)) #else #define XBMC_FORCE_INLINE diff --git a/xbmc/guilib/Resolution.cpp b/xbmc/guilib/Resolution.cpp index b86110cfe5..ea09d5e71d 100644 --- a/xbmc/guilib/Resolution.cpp +++ b/xbmc/guilib/Resolution.cpp @@ -221,7 +221,7 @@ RESOLUTION CResolutionUtils::FindClosestResolution(float fps, int width, bool is (info.dwFlags & D3DPRESENTFLAG_MODEMASK) != (curr.dwFlags & D3DPRESENTFLAG_MODEMASK) || info.fRefreshRate < (fRefreshRate * multiplier / 1.001) - 0.001) { - // evaluate all higher modes and evalute them + // evaluate all higher modes and evaluate them // concerning dimension and refreshrate weight // skip lower resolutions if ((width < orig.iScreenWidth) || // orig res large enough diff --git a/xbmc/guilib/Shader.h b/xbmc/guilib/Shader.h index 2321d9d095..853f9f9222 100644 --- a/xbmc/guilib/Shader.h +++ b/xbmc/guilib/Shader.h @@ -162,7 +162,7 @@ namespace Shaders { // compile and link the shaders virtual bool CompileAndLink() = 0; - // override to to perform custom tasks on successfull compilation + // override to to perform custom tasks on successful compilation // and linkage. E.g. obtaining handles to shader attributes. virtual void OnCompiledAndLinked() {} diff --git a/xbmc/guilib/StereoscopicsManager.cpp b/xbmc/guilib/StereoscopicsManager.cpp index b9e65f1630..299d0ba62f 100644 --- a/xbmc/guilib/StereoscopicsManager.cpp +++ b/xbmc/guilib/StereoscopicsManager.cpp @@ -458,7 +458,7 @@ bool CStereoscopicsManager::OnAction(const CAction &action) { RENDER_STEREO_MODE targetMode = GetPreferredPlaybackMode(); - // if we have an old userdefined steremode, use that one as toggle target + // if we have an old userdefined stereomode, use that one as toggle target if (m_stereoModeSetByUser != RENDER_STEREO_MODE_UNDEFINED) { // if user mode is set to OFF, he manually turned it off before. In this case use the last user applied mode diff --git a/xbmc/guilib/TransformMatrix.h b/xbmc/guilib/TransformMatrix.h index bf1650cb14..f5b9b6c006 100644 --- a/xbmc/guilib/TransformMatrix.h +++ b/xbmc/guilib/TransformMatrix.h @@ -27,7 +27,7 @@ #include <algorithm> #ifdef __GNUC__ -// under gcc, inline will only take place if optimizations are applied (-O). this will force inline even whith optimizations. +// under gcc, inline will only take place if optimizations are applied (-O). this will force inline even with optimizations. #define XBMC_FORCE_INLINE __attribute__((always_inline)) #else #define XBMC_FORCE_INLINE diff --git a/xbmc/input/InertialScrollingHandler.cpp b/xbmc/input/InertialScrollingHandler.cpp index d67b42f5a4..088622eb88 100644 --- a/xbmc/input/InertialScrollingHandler.cpp +++ b/xbmc/input/InertialScrollingHandler.cpp @@ -28,7 +28,7 @@ #include <cmath> -//time for reaching velocitiy 0 in secs +//time for reaching velocity 0 in secs #define TIME_TO_ZERO_SPEED 1.0f //time for decreasing the deaccelleration (for doing a smooth stop) in secs #define TIME_FOR_DEACELLERATION_DECREASE 0.5f @@ -53,7 +53,7 @@ bool CInertialScrollingHandler::CheckForInertialScrolling(const CAction* action) if(g_Windowing.HasInertialGestures()) { - return ret;//no need for emulating inertial scrolling - windowing does support it nativly. + return ret;//no need for emulating inertial scrolling - windowing does support it natively. } //reset screensaver during pan @@ -139,7 +139,7 @@ bool CInertialScrollingHandler::ProcessInertialScroll(float frameTime) float yMovement = 0.0; float xMovement = 0.0; - //decrease based on negativ acceleration + //decrease based on negative acceleration //calc the overall inertial scrolling time in secs float absoluteInertialTime = (CTimeUtils::GetFrameTime() - m_inertialStartTime)/(float)1000; @@ -155,7 +155,7 @@ bool CInertialScrollingHandler::ProcessInertialScroll(float frameTime) m_iFlickVelocity.y = m_inertialDeacceleration.y * frameTime + m_iFlickVelocity.y; m_iFlickVelocity.x = m_inertialDeacceleration.x * frameTime + m_iFlickVelocity.x; - //CLog::Log(LOGDEBUG,"velocity: %f dec: %f time: %f", m_iFlickVelocity.y, m_inertialDeacceleration.y, absolutInertialTime); + //CLog::Log(LOGDEBUG,"velocity: %f dec: %f time: %f", m_iFlickVelocity.y, m_inertialDeacceleration.y, absoluteInertialTime); //check if the signs are equal - which would mean we deaccelerated to long and reversed the direction if( (m_inertialDeacceleration.y < 0) == (m_iFlickVelocity.y < 0) ) @@ -168,7 +168,7 @@ bool CInertialScrollingHandler::ProcessInertialScroll(float frameTime) m_iFlickVelocity.x = 0; } - //did we scroll long enought for decrease the deacceleration? + //did we scroll long enough for decrease the deacceleration? if( absoluteInertialTime > TIME_TO_ZERO_SPEED - TIME_FOR_DEACELLERATION_DECREASE ) { //decrease deacceleration by deacceleration decrease factor diff --git a/xbmc/input/InputCodingTable.h b/xbmc/input/InputCodingTable.h index e380887fdd..f8f690654e 100644 --- a/xbmc/input/InputCodingTable.h +++ b/xbmc/input/InputCodingTable.h @@ -46,7 +46,7 @@ public: virtual void Deinitialize() {} /*! \brief Can be overridden if initialization is expensive to avoid calling initialize more than needed - \return true if initialization has beeen done and was successful, false otherwise. + \return true if initialization has been done and was successful, false otherwise. */ virtual bool IsInitialized() const { return true; } virtual bool GetWordListPage(const std::string& strCode, bool isFirstPage) = 0; diff --git a/xbmc/input/InputCodingTableKorean.cpp b/xbmc/input/InputCodingTableKorean.cpp index 69d0582c18..2006ea5579 100644 --- a/xbmc/input/InputCodingTableKorean.cpp +++ b/xbmc/input/InputCodingTableKorean.cpp @@ -237,7 +237,7 @@ std::wstring CInputCodingTableKorean::InputToKorean(const std::wstring& input) if (jongseong != -1) // If previous character has jongseong and this key is jungseong, // actually latest vowel is not jongseong. It's choseong of new character. { - // If jongseong of previous character is double consonant, we will seperate it to two vowel again. + // If jongseong of previous character is double consonant, we will separate it to two vowel again. // First part of double consonant is jongseong of previous character. // Second part of double consonant is choseong of current character. int newCho; diff --git a/xbmc/input/InputManager.h b/xbmc/input/InputManager.h index d2767722a2..ba31cfcbf3 100644 --- a/xbmc/input/InputManager.h +++ b/xbmc/input/InputManager.h @@ -137,7 +137,7 @@ public: /*! \brief Handle an input event * * \param newEvent event details - * \return true on succesfully handled event + * \return true on successfully handled event * \sa XBMC_Event */ bool OnEvent(XBMC_Event& newEvent); @@ -271,7 +271,7 @@ private: /*! \brief Process keyboard event and translate into an action * * \param CKey keypress details - * \return true on succesfully handled event + * \return true on successfully handled event * \sa CKey */ bool OnKey(const CKey& key); diff --git a/xbmc/input/KeyboardStat.cpp b/xbmc/input/KeyboardStat.cpp index 16f5764744..a7c708a280 100644 --- a/xbmc/input/KeyboardStat.cpp +++ b/xbmc/input/KeyboardStat.cpp @@ -197,7 +197,7 @@ void CKeyboardStat::ProcessKeyUp(void) } // Return the key name given a key ID -// Used to make the debug log more intelligable +// Used to make the debug log more intelligible // The KeyID includes the flags for ctrl, alt etc std::string CKeyboardStat::GetKeyName(int KeyID) @@ -232,7 +232,7 @@ std::string CKeyboardStat::GetKeyName(int KeyID) keyname += StringUtils::Format("%i", keyid); // in case this might be an universalremote keyid - // we also print the possile corresponding obc code + // we also print the possible corresponding obc code // so users can easily find it in their universalremote // map xml if (VKeyFound || keyid > 255) diff --git a/xbmc/input/KeyboardStat.h b/xbmc/input/KeyboardStat.h index ef50cc3a50..83b5891a75 100644 --- a/xbmc/input/KeyboardStat.h +++ b/xbmc/input/KeyboardStat.h @@ -27,7 +27,7 @@ // platform specific low level keyboard classes. // Here it must be done only once. Within the other mentioned classes it would have to be done several times. // -// Keyboards alyways deliver printable characters, logical keys for functional behaviour, modifiers ... alongside +// Keyboards always deliver printable characters, logical keys for functional behaviour, modifiers ... alongside // Based on the same hardware with the same scancodes (also alongside) but delivered with different labels to customers // the software must solve the mapping to the real labels. This is done here. // The mapping must be specified by an xml configuration that should be able to access everything available, diff --git a/xbmc/input/XBMC_keysym.h b/xbmc/input/XBMC_keysym.h index e7410ec432..eeb833d40e 100644 --- a/xbmc/input/XBMC_keysym.h +++ b/xbmc/input/XBMC_keysym.h @@ -24,7 +24,7 @@ #define XBMC_keysym_h // The XBMC_keysym identifies a physical key on the keyboard i.e. it is -// analogous to a scan code but is hardware independant. +// analogous to a scan code but is hardware independent. // These values are bazsed on the SDL_keysym standards, see: // // http://www.libsdl.org/tmp/SDL-1.3-docs/SDL__keysym_8h.html diff --git a/xbmc/input/joysticks/DeadzoneFilter.h b/xbmc/input/joysticks/DeadzoneFilter.h index c421a4d9d6..750ef4ed44 100644 --- a/xbmc/input/joysticks/DeadzoneFilter.h +++ b/xbmc/input/joysticks/DeadzoneFilter.h @@ -56,7 +56,7 @@ namespace JOYSTICK /*! * \brief Apply deadzone filtering to an axis * \param axisIndex The axis index - * \param axisValud The axis value + * \param axisValue The axis value * \return The value after applying deadzone filtering */ float FilterAxis(unsigned int axisIndex, float axisValue); diff --git a/xbmc/input/joysticks/IButtonMapper.h b/xbmc/input/joysticks/IButtonMapper.h index 0db3a716fb..9cbd199224 100644 --- a/xbmc/input/joysticks/IButtonMapper.h +++ b/xbmc/input/joysticks/IButtonMapper.h @@ -103,7 +103,7 @@ namespace JOYSTICK * when mapping ends and immediately sends Volume Down actions. * * The fix is to allow implementers to wait until all axes are motionless - * before deattaching themselves. + * before detaching themselves. * * Called in the same thread as \ref IButtonMapper::MapPrimitive. */ diff --git a/xbmc/input/linux/LinuxInputDevices.cpp b/xbmc/input/linux/LinuxInputDevices.cpp index 387513805b..b25b9dc11b 100644 --- a/xbmc/input/linux/LinuxInputDevices.cpp +++ b/xbmc/input/linux/LinuxInputDevices.cpp @@ -859,7 +859,7 @@ XBMC_Event CLinuxInputDevice::ReadEvent() //printf("read event readlen = %d device name %s m_fileName %s\n", readlen, m_deviceName, m_fileName.c_str()); - // sanity check if we realy read the event + // sanity check if we really read the event if(readlen != sizeof(levt)) { CLog::Log(LOGERROR,"CLinuxInputDevice: read error : %s\n", strerror(errno)); diff --git a/xbmc/input/touch/ITouchInputHandler.h b/xbmc/input/touch/ITouchInputHandler.h index 43c7a76cdf..22a960f558 100644 --- a/xbmc/input/touch/ITouchInputHandler.h +++ b/xbmc/input/touch/ITouchInputHandler.h @@ -58,7 +58,7 @@ public: * Handles the given touch event at the given location. * This takes into account all the currently active pointers * which need to be updated before calling this method to - * actually interprete and handle the changes in touch. + * actually interpret and handle the changes in touch. * * \param event The actual touch event (abort, down, up, move) * \param x The x coordinate (with sub-pixel) of the touch diff --git a/xbmc/input/touch/ITouchInputHandling.h b/xbmc/input/touch/ITouchInputHandling.h index f88cf9038b..f58ffc06c2 100644 --- a/xbmc/input/touch/ITouchInputHandling.h +++ b/xbmc/input/touch/ITouchInputHandling.h @@ -25,7 +25,7 @@ /*! * \ingroup touch - * \brief Convencience interface implementing ITouchActionHandler with an + * \brief Convenience interface implementing ITouchActionHandler with an * implementation that forwards any ITouchActionHandler-related calls * to a previously registered ITouchActionHandler * diff --git a/xbmc/input/touch/generic/GenericTouchActionHandler.h b/xbmc/input/touch/generic/GenericTouchActionHandler.h index eabf76b79f..4329e73316 100644 --- a/xbmc/input/touch/generic/GenericTouchActionHandler.h +++ b/xbmc/input/touch/generic/GenericTouchActionHandler.h @@ -71,7 +71,7 @@ public: int QuerySupportedGestures(float x, float y); private: - // private construction, and no assignements; use the provided singleton methods + // private construction, and no assignments; use the provided singleton methods CGenericTouchActionHandler() { } CGenericTouchActionHandler(const CGenericTouchActionHandler&); CGenericTouchActionHandler const& operator=(CGenericTouchActionHandler const&); diff --git a/xbmc/input/touch/generic/GenericTouchInputHandler.h b/xbmc/input/touch/generic/GenericTouchInputHandler.h index 1f294c83cf..3e892a65f1 100644 --- a/xbmc/input/touch/generic/GenericTouchInputHandler.h +++ b/xbmc/input/touch/generic/GenericTouchInputHandler.h @@ -55,7 +55,7 @@ public: virtual bool UpdateTouchPointer(int32_t pointer, float x, float y, int64_t time, float size = 0.0f); private: - // private construction, and no assignements; use the provided singleton methods + // private construction, and no assignments; use the provided singleton methods CGenericTouchInputHandler(); CGenericTouchInputHandler(const CGenericTouchInputHandler&); CGenericTouchInputHandler const& operator=(CGenericTouchInputHandler const&); diff --git a/xbmc/input/touch/generic/GenericTouchSwipeDetector.cpp b/xbmc/input/touch/generic/GenericTouchSwipeDetector.cpp index 01076f31ab..82a0aee9ae 100644 --- a/xbmc/input/touch/generic/GenericTouchSwipeDetector.cpp +++ b/xbmc/input/touch/generic/GenericTouchSwipeDetector.cpp @@ -28,11 +28,11 @@ // maximum time between touch down and up (in nanoseconds) #define SWIPE_MAX_TIME 500000000 -// maxmium swipe distance between touch down and up (in multiples of screen DPI) +// maximum swipe distance between touch down and up (in multiples of screen DPI) #define SWIPE_MIN_DISTANCE 0.5f // original maximum variance of the touch movement #define SWIPE_MAX_VARIANCE 0.2f -// tangens of the maximum angle (20 degrees) the touch movement may vary in a +// tangents of the maximum angle (20 degrees) the touch movement may vary in a // direction perpendicular to the swipe direction (in radians) // => tan(20 deg) = tan(20 * M_PI / 180) #define SWIPE_MAX_VARIANCE_ANGLE 0.36397023f diff --git a/xbmc/input/touch/generic/GenericTouchSwipeDetector.h b/xbmc/input/touch/generic/GenericTouchSwipeDetector.h index 528b6d6a07..8f21714c03 100644 --- a/xbmc/input/touch/generic/GenericTouchSwipeDetector.h +++ b/xbmc/input/touch/generic/GenericTouchSwipeDetector.h @@ -54,7 +54,7 @@ private: */ bool m_swipeDetected; /*! - * \brief Number of active pointeres + * \brief Number of active pointers */ unsigned int m_size; }; diff --git a/xbmc/interfaces/AnnouncementManager.cpp b/xbmc/interfaces/AnnouncementManager.cpp index 2c78f00cf1..c92b29a6a1 100644 --- a/xbmc/interfaces/AnnouncementManager.cpp +++ b/xbmc/interfaces/AnnouncementManager.cpp @@ -130,7 +130,7 @@ void CAnnouncementManager::DoAnnounce(AnnouncementFlag flag, const char *sender, CSingleLock lock (m_critSection); - // Make a copy of announers. They may be removed or even remove themselves during execution of IAnnouncer::Announce()! + // Make a copy of announcers. They may be removed or even remove themselves during execution of IAnnouncer::Announce()! std::vector<IAnnouncer *> announcers(m_announcers); for (unsigned int i = 0; i < announcers.size(); i++) announcers[i]->Announce(flag, sender, message, data); diff --git a/xbmc/interfaces/builtins/GUIBuiltins.cpp b/xbmc/interfaces/builtins/GUIBuiltins.cpp index ccee9af478..28bceca587 100644 --- a/xbmc/interfaces/builtins/GUIBuiltins.cpp +++ b/xbmc/interfaces/builtins/GUIBuiltins.cpp @@ -85,7 +85,7 @@ static int ActivateWindow(const std::vector<std::string>& params2) int iWindow = CButtonTranslator::TranslateWindow(strWindow); if (iWindow != WINDOW_INVALID) { - // compate the given directory param with the current active directory + // compare the given directory param with the current active directory bool bIsSameStartFolder = true; if (!params.empty()) { diff --git a/xbmc/interfaces/builtins/ProfileBuiltins.cpp b/xbmc/interfaces/builtins/ProfileBuiltins.cpp index f1dbbf8fbd..64f13976ff 100644 --- a/xbmc/interfaces/builtins/ProfileBuiltins.cpp +++ b/xbmc/interfaces/builtins/ProfileBuiltins.cpp @@ -132,7 +132,7 @@ static int MasterMode(const std::vector<std::string>& params) /// , /// Load the specified profile. If prompt is not specified\, and a password /// would be required for the requested profile\, this command will silently -/// fail. If promp' is specified and a password is required\, a password +/// fail. If prompt is specified and a password is required\, a password /// dialog will be shown. /// @param[in] profilename The profile name. /// @param[in] prompt Add "prompt" to allow unlocking dialogs (optional) diff --git a/xbmc/interfaces/json-rpc/JSONRPCUtils.h b/xbmc/interfaces/json-rpc/JSONRPCUtils.h index 19be294342..5590376c42 100644 --- a/xbmc/interfaces/json-rpc/JSONRPCUtils.h +++ b/xbmc/interfaces/json-rpc/JSONRPCUtils.h @@ -58,7 +58,7 @@ namespace JSONRPC \brief Permission categories for json rpc methods A JSON-RPC method will only be called if the caller - has the correct permissions to exectue the method. + has the correct permissions to execute the method. The method call needs to be perfectly threadsafe. */ enum OperationPermission diff --git a/xbmc/interfaces/json-rpc/ProfilesOperations.cpp b/xbmc/interfaces/json-rpc/ProfilesOperations.cpp index 7e2443261b..584c6b8f8f 100644 --- a/xbmc/interfaces/json-rpc/ProfilesOperations.cpp +++ b/xbmc/interfaces/json-rpc/ProfilesOperations.cpp @@ -123,7 +123,7 @@ JSONRPC_STATUS CProfilesOperations::LoadProfile(const std::string &method, ITran else if (encryption == "md5") md5pword2 = password; - // Verify profided password + // Verify provided password if (StringUtils::EqualsNoCase(strToVerify, md5pword2)) bLoadProfile = true; } diff --git a/xbmc/interfaces/legacy/AddonClass.h b/xbmc/interfaces/legacy/AddonClass.h index bf1c2a813a..9a58ba3c01 100644 --- a/xbmc/interfaces/legacy/AddonClass.h +++ b/xbmc/interfaces/legacy/AddonClass.h @@ -85,7 +85,7 @@ namespace XBMCAddon * This method is meant to be called from the destructor of the * lowest level class. * - * It's virtual because it's a conveinent place to receive messages that + * It's virtual because it's a convenient place to receive messages that * we're about to go be deleted but prior to any real tear-down. * * Any overloading classes need to remember to pass the call up the chain. @@ -174,7 +174,7 @@ namespace XBMCAddon /** * operator= should work with either another smart pointer or a pointer since it will - * be able to convert a pointer to a smart pointer using one of the above constuctors. + * be able to convert a pointer to a smart pointer using one of the above constructors. * * Note: There is a trick here. The temporary variable is necessary because otherwise the * following code will fail: diff --git a/xbmc/interfaces/legacy/CallbackHandler.cpp b/xbmc/interfaces/legacy/CallbackHandler.cpp index b6f55a83b9..d4e0c397c5 100644 --- a/xbmc/interfaces/legacy/CallbackHandler.cpp +++ b/xbmc/interfaces/legacy/CallbackHandler.cpp @@ -100,7 +100,7 @@ namespace XBMCAddon // we need to grab the object lock to see if the object of the call // is deallocating. holding this lock should prevent it from - // deallocating durring the execution of this call. + // deallocating during the execution of this call. #ifdef ENABLE_XBMC_TRACE_API CLog::Log(LOGDEBUG,"%sNEWADDON executing callback 0x%lx",_tg.getSpaces(),(long)(p->cb.get())); #endif @@ -123,7 +123,7 @@ namespace XBMCAddon } // since the state of the iterator may have been corrupted by - // the changing state of the list from another thread durring + // the changing state of the list from another thread during // the releasing fo the lock in the immediately preceeding // codeblock, we need to reset it before continuing the loop iter = g_callQueue.begin(); diff --git a/xbmc/interfaces/legacy/Dialog.h b/xbmc/interfaces/legacy/Dialog.h index 61e59a8dcd..2b09b5e8f0 100644 --- a/xbmc/interfaces/legacy/Dialog.h +++ b/xbmc/interfaces/legacy/Dialog.h @@ -339,7 +339,7 @@ namespace XBMCAddon /// @return If enableMultiple is False (default): returns filename and/or path as a string /// to the location of the highlighted item, if user pressed 'Ok' or a masked item /// was selected. Returns the default value if dialog was canceled. - /// If enableMultiple is True: returns tuple of marked filenames as a strin + /// If enableMultiple is True: returns tuple of marked filenames as a string /// if user pressed 'Ok' or a masked item was selected. Returns empty tuple if dialog was canceled.\n\n /// If type is 0 or 3 the enableMultiple parameter is ignore /// diff --git a/xbmc/interfaces/legacy/Dictionary.h b/xbmc/interfaces/legacy/Dictionary.h index 35d677ca35..4cdaba62be 100644 --- a/xbmc/interfaces/legacy/Dictionary.h +++ b/xbmc/interfaces/legacy/Dictionary.h @@ -26,12 +26,12 @@ namespace XBMCAddon { // This is a hack in order to handle int's as strings. The correct fix for - // this is to get rid of Alternative all togther and make the codegenerator + // this is to get rid of Alternative all together and make the codegenerator // finally handle overloading correctly. typedef String StringOrInt; /** - * This is a bit of a hack for dynamically typed languages. In somce + * This is a bit of a hack for dynamically typed languages. In some * cases python addon api calls handle dictionaries with variable * value types. In this case we coerce all of these types into * strings and then convert them back in the api. Yes, this is messy diff --git a/xbmc/interfaces/legacy/Exception.h b/xbmc/interfaces/legacy/Exception.h index f9b5143608..ec62e2200b 100644 --- a/xbmc/interfaces/legacy/Exception.h +++ b/xbmc/interfaces/legacy/Exception.h @@ -31,7 +31,7 @@ namespace XBMCAddon * UnimplementedException Can be used in places like the * Control hierarchy where the * requirements of dynamic language usage force us to add - * unimplmenented methods to a class hierarchy. See the + * unimplemented methods to a class hierarchy. See the * detailed explanation on the class Control for more. */ class UnimplementedException : public XbmcCommons::Exception diff --git a/xbmc/interfaces/legacy/File.h b/xbmc/interfaces/legacy/File.h index e40b8a3b81..faa448774b 100644 --- a/xbmc/interfaces/legacy/File.h +++ b/xbmc/interfaces/legacy/File.h @@ -195,8 +195,8 @@ namespace XBMCAddon /// Seek to position in file. /// /// @param seekBytes position in the file - /// @param iWhence where in a file to seek from[0 begining, - /// 1 current , 2 end possition] + /// @param iWhence where in a file to seek from[0 beginning, + /// 1 current , 2 end position] /// /// ///----------------------------------------------------------------------- diff --git a/xbmc/interfaces/legacy/InfoTagRadioRDS.h b/xbmc/interfaces/legacy/InfoTagRadioRDS.h index 59bc450d55..ac99e29c69 100644 --- a/xbmc/interfaces/legacy/InfoTagRadioRDS.h +++ b/xbmc/interfaces/legacy/InfoTagRadioRDS.h @@ -38,7 +38,7 @@ namespace XBMCAddon /// To get radio RDS info tag data of currently played PVR radio channel source. /// /// @note Info tag load is only be possible from present player class.\n - /// Also is all the data variable from radio channels and not known on begining + /// Also is all the data variable from radio channels and not known on beginning /// of radio receiving. /// /// diff --git a/xbmc/interfaces/legacy/LanguageHook.h b/xbmc/interfaces/legacy/LanguageHook.h index 76ca78fd57..9af69abff0 100644 --- a/xbmc/interfaces/legacy/LanguageHook.h +++ b/xbmc/interfaces/legacy/LanguageHook.h @@ -82,7 +82,7 @@ namespace XBMCAddon virtual CallbackHandler* GetCallbackHandler() { return NULL; } /** - * This is a callback method that can be overriden to receive a callback + * This is a callback method that can be overridden to receive a callback * when an AddonClass that has this language hook is on is being constructed. * It is called from the constructor of AddonClass so the implementor * cannot assume the subclasses have been built or that calling a @@ -91,7 +91,7 @@ namespace XBMCAddon virtual void Constructing(AddonClass* beingConstructed) { } /** - * This is a callback method that can be overriden to receive a callback + * This is a callback method that can be overridden to receive a callback * when an AddonClass that has this language hook is on is being destructed. * It is called from the destructor of AddonClass so the implementor * should assume the subclasses have been torn down and that calling a @@ -104,7 +104,7 @@ namespace XBMCAddon * I can think to do it requires an InheritableThreadLocal C++ equivalent, * I'm going to defer to this technique for now. * - * Currently (for python) the scripting languge has the Addon id injected + * Currently (for python) the scripting language has the Addon id injected * into it as a global variable. Therefore the only way to retrieve it is * to use scripting language specific calls. So until I figure out a * better way to do this, this is how I need to retrieve it. diff --git a/xbmc/interfaces/legacy/ListItem.h b/xbmc/interfaces/legacy/ListItem.h index 7cbb03eaf2..85e4a70134 100644 --- a/xbmc/interfaces/legacy/ListItem.h +++ b/xbmc/interfaces/legacy/ListItem.h @@ -537,8 +537,8 @@ namespace XBMCAddon /// |:------------:|:----------------------| /// | video | Video information /// | music | Music information - /// | pictures | Pictures informantion - /// | game | Game informantion + /// | pictures | Pictures informanion + /// | game | Game information /// /// @note To set pictures exif info, prepend `exif:` to the label. Exif values must be passed /// as strings, separate value pairs with a comma. <b>(eg. <c>{'exif:resolution': '720,480'}</c></b> diff --git a/xbmc/interfaces/legacy/ModuleXbmc.h b/xbmc/interfaces/legacy/ModuleXbmc.h index fcdb253e23..dcd06d0171 100644 --- a/xbmc/interfaces/legacy/ModuleXbmc.h +++ b/xbmc/interfaces/legacy/ModuleXbmc.h @@ -56,7 +56,7 @@ namespace XBMCAddon /// Write a string to Kodi's log file and the debug window. /// /// @param msg string - text to output. - /// @param level [opt] integer - log level to ouput at. + /// @param level [opt] integer - log level to output at. /// <em>(default=LOGDEBUG)</em> /// | Value: | Description: | /// |----------------:|---------------------------------------------------| @@ -641,7 +641,7 @@ namespace XBMCAddon /// /// @param filename string or unicode - filename/path to /// make legal - /// @paran fatX [opt] bool - True=Xbox file system(Default) + /// @param fatX [opt] bool - True=Xbox file system(Default) /// @return Legal filename or path as a string /// /// diff --git a/xbmc/interfaces/legacy/ModuleXbmcvfs.cpp b/xbmc/interfaces/legacy/ModuleXbmcvfs.cpp index ca27253896..d61033b2fb 100644 --- a/xbmc/interfaces/legacy/ModuleXbmcvfs.cpp +++ b/xbmc/interfaces/legacy/ModuleXbmcvfs.cpp @@ -52,7 +52,7 @@ namespace XBMCAddon return XFILE::CFile::Rename(file,newFile); } - // check for a file or folder existance, mimics Pythons os.path.exists() + // check for a file or folder existence, mimics Pythons os.path.exists() bool exists(const String& path) { DelayedCallGuard dg; diff --git a/xbmc/interfaces/legacy/ModuleXbmcvfs.h b/xbmc/interfaces/legacy/ModuleXbmcvfs.h index 0279415526..18b9c5b1ef 100644 --- a/xbmc/interfaces/legacy/ModuleXbmcvfs.h +++ b/xbmc/interfaces/legacy/ModuleXbmcvfs.h @@ -36,7 +36,7 @@ namespace XBMCAddon /// @{ /// @brief **Virtual file system functions on Kodi.** /// - /// Offers classes and functions offers acces to the Virtual File Server + /// Offers classes and functions offers access to the Virtual File Server /// (VFS) which you can use to manipulate files and folders. // @@ -125,7 +125,7 @@ namespace XBMCAddon /// \ingroup python_xbmcvfs /// @brief \python_func{ xbmcvfs.exists(path) } ///------------------------------------------------------------------------- - /// @brief Check for a file or folder existance + /// @brief Check for a file or folder existence /// /// @param path File or folder (folder must end with /// slash or backslash) diff --git a/xbmc/interfaces/legacy/Window.cpp b/xbmc/interfaces/legacy/Window.cpp index 68e88137db..c1dd7987a7 100644 --- a/xbmc/interfaces/legacy/Window.cpp +++ b/xbmc/interfaces/legacy/Window.cpp @@ -360,7 +360,7 @@ namespace XBMCAddon } if (!pControl) - // throw an exeption + // throw an exception throw WindowException("Unknown control type for python"); // we have a valid control here, fill in all the 'Control' data @@ -685,7 +685,7 @@ namespace XBMCAddon while (bModal && !g_application.m_bStop) { -//! @todo garbear added this code to the pythin window.cpp class and +//! @todo garbear added this code to the python window.cpp class and //! commented in XBPyThread.cpp. I'm not sure how to handle this //! in this native implementation. // // Check if XBPyThread::stop() raised a SystemExit exception @@ -749,7 +749,7 @@ namespace XBMCAddon pControl->pGUIControl->SetAction(ACTION_MOVE_LEFT, pControl->iControlLeft); pControl->pGUIControl->SetAction(ACTION_MOVE_RIGHT, pControl->iControlRight); - // add control to list and allocate recources for the control + // add control to list and allocate resources for the control vecControls.push_back(AddonClass::Ref<Control>(pControl)); pControl->pGUIControl->AllocResources(); diff --git a/xbmc/interfaces/legacy/Window.h b/xbmc/interfaces/legacy/Window.h index 746692c726..5c17488b1f 100644 --- a/xbmc/interfaces/legacy/Window.h +++ b/xbmc/interfaces/legacy/Window.h @@ -96,7 +96,7 @@ namespace XBMCAddon /// .. /// def onAction(self, action): /// if action.getId() == ACTION_PREVIOUS_MENU: - /// print('action recieved: previous') + /// print('action received: previous') /// .. /// ~~~~~~~~~~~~~ /// @@ -249,7 +249,7 @@ namespace XBMCAddon void setWindow(InterceptorBase* _window); /** - * This is a helper method since poping the previous window id is a common + * This is a helper method since popping the previous window id is a common * function. */ void popActiveWindowId(); @@ -340,14 +340,14 @@ namespace XBMCAddon /// # Define own function where becomes called from Kodi /// def onAction(self, action): /// if action.getId() == ACTION_PREVIOUS_MENU: - /// print('action recieved: previous') + /// print('action received: previous') /// self.close() /// if action.getId() == ACTION_SHOW_INFO: - /// print('action recieved: show info') + /// print('action received: show info') /// if action.getId() == ACTION_STOP: - /// print('action recieved: stop') + /// print('action received: stop') /// if action.getId() == ACTION_PAUSE: - /// print('action recieved: pause') + /// print('action received: pause') /// .. /// ~~~~~~~~~~~~~ /// @@ -376,7 +376,7 @@ namespace XBMCAddon /// **Example:** /// ~~~~~~~~~~~~~{.py} /// .. - /// # Define own funtion where becomes called from Kodi + /// # Define own function where becomes called from Kodi /// def onControl(self, control): /// print("Window.onControl(control=[%s])"%control) /// .. @@ -407,7 +407,7 @@ namespace XBMCAddon /// **Example:** /// ~~~~~~~~~~~~~{.py} /// .. - /// # Define own funtion where becomes called from Kodi + /// # Define own function where becomes called from Kodi /// def onClick(self,controlId): /// if controlId == 10: /// print("The control with Id 10 is clicked") @@ -439,7 +439,7 @@ namespace XBMCAddon /// **Example:** /// ~~~~~~~~~~~~~{.py} /// .. - /// # Define own funtion where becomes called from Kodi + /// # Define own function where becomes called from Kodi /// def onDoubleClick(self,controlId): /// if controlId == 10: /// print("The control with Id 10 is double clicked") @@ -470,7 +470,7 @@ namespace XBMCAddon /// **Example:** /// ~~~~~~~~~~~~~{.py} /// .. - /// # Define own funtion where becomes called from Kodi + /// # Define own function where becomes called from Kodi /// def onDoubleClick(self,controlId): /// if controlId == 10: /// print("The control with Id 10 is focused") @@ -499,7 +499,7 @@ namespace XBMCAddon /// **Example:** /// ~~~~~~~~~~~~~{.py} /// .. - /// # Define own funtion where becomes called from Kodi + /// # Define own function where becomes called from Kodi /// def onInit(self): /// print("Window.onInit method called from Kodi") /// .. diff --git a/xbmc/interfaces/legacy/WindowInterceptor.h b/xbmc/interfaces/legacy/WindowInterceptor.h index 0a004b688c..9d0d4f431b 100644 --- a/xbmc/interfaces/legacy/WindowInterceptor.h +++ b/xbmc/interfaces/legacy/WindowInterceptor.h @@ -54,7 +54,7 @@ namespace XBMCAddon * * ref(window)->UpCall() * - * durring the context of 'UpCall' it's possible that another call will + * during the context of 'UpCall' it's possible that another call will * be made back on the window from the xbmc core side (this happens in * sometimes in OnMessage). In that case, if upcall is still 'true', than * the call will wrongly proceed back to the xbmc core side rather than diff --git a/xbmc/interfaces/legacy/WindowXML.cpp b/xbmc/interfaces/legacy/WindowXML.cpp index 0cf166ace4..bfda4a43c3 100644 --- a/xbmc/interfaces/legacy/WindowXML.cpp +++ b/xbmc/interfaces/legacy/WindowXML.cpp @@ -46,7 +46,7 @@ namespace XBMCAddon /** * This class extends the Interceptor<CGUIMediaWindow> in order to - * add behavior for a few more virtual functions that were unneccessary + * add behavior for a few more virtual functions that were unnecessary * in the Window or WindowDialog. */ #define checkedb(methcall) ( window.isNotNull() ? xwin-> methcall : false ) @@ -453,7 +453,7 @@ namespace XBMCAddon { XBMC_TRACE; // Hook Over calling CGUIMediaWindow::OnClick(iItem) results in it trying to PLAY the file item - // which if its not media is BAD and 99 out of 100 times undesireable. + // which if its not media is BAD and 99 out of 100 times undesirable. return false; } diff --git a/xbmc/interfaces/legacy/swighelper.h b/xbmc/interfaces/legacy/swighelper.h index 00ff05faba..a0388b1dc3 100644 --- a/xbmc/interfaces/legacy/swighelper.h +++ b/xbmc/interfaces/legacy/swighelper.h @@ -32,7 +32,7 @@ * SWIGHIDDENVIRTUAL to 'hide' the polymorphic behavior from the scripting * language using the macro instead. * - * Note: You should not hide virtual destructors from the scripting langage. + * Note: You should not hide virtual destructors from the scripting language. */ #ifdef SWIG #define SWIGHIDDENVIRTUAL diff --git a/xbmc/interfaces/legacy/wsgi/WsgiResponseBody.h b/xbmc/interfaces/legacy/wsgi/WsgiResponseBody.h index 70103330ee..7dd5f6eee0 100644 --- a/xbmc/interfaces/legacy/wsgi/WsgiResponseBody.h +++ b/xbmc/interfaces/legacy/wsgi/WsgiResponseBody.h @@ -45,7 +45,7 @@ namespace XBMCAddon /// \python_func{ operator(status, response_headers[, exc_info]) } ///------------------------------------------------------------------------ /// - /// Callable implemention to write data to the response. + /// Callable implementation to write data to the response. /// /// @param data string data to write /// diff --git a/xbmc/interfaces/python/LanguageHook.cpp b/xbmc/interfaces/python/LanguageHook.cpp index 54fe87ddad..01c6e1d06a 100644 --- a/xbmc/interfaces/python/LanguageHook.cpp +++ b/xbmc/interfaces/python/LanguageHook.cpp @@ -79,7 +79,7 @@ namespace XBMCAddon // Ok ... we're going to get it even if it doesn't exist. If it doesn't exist then // we're going to assume we're not in control of the interpreter. This (apparently) // can be the case. E.g. Libspotify manages to call into a script using a ctypes - // extention but under the control of an Interpreter we know nothing about. In + // extension but under the control of an Interpreter we know nothing about. In // cases like this we're going to use a global interpreter AddonClass::Ref<PythonLanguageHook> PythonLanguageHook::GetIfExists(PyInterpreterState* interp) { @@ -109,13 +109,13 @@ namespace XBMCAddon /** * PythonCallbackHandler expects to be instantiated PER AddonClass instance - * that is to be used as a callback. This is why this cannot be instantited + * that is to be used as a callback. This is why this cannot be instantiated * once. * * There is an expectation that this method is called from the Python thread * that instantiated an AddonClass that has the potential for a callback. * - * See RetardedAsynchCallbackHandler for more details. + * See RetardedAsyncCallbackHandler for more details. * See PythonCallbackHandler for more details * See PythonCallbackHandler::PythonCallbackHandler for more details */ diff --git a/xbmc/interfaces/python/LanguageHook.h b/xbmc/interfaces/python/LanguageHook.h index f450dc170d..fc3c72436a 100644 --- a/xbmc/interfaces/python/LanguageHook.h +++ b/xbmc/interfaces/python/LanguageHook.h @@ -59,13 +59,13 @@ namespace XBMCAddon /** * PythonCallbackHandler expects to be instantiated PER AddonClass instance - * that is to be used as a callback. This is why this cannot be instantited + * that is to be used as a callback. This is why this cannot be instantiated * once. * * There is an expectation that this method is called from the Python thread * that instantiated an AddonClass that has the potential for a callback. * - * See RetardedAsynchCallbackHandler for more details. + * See RetardedAsyncCallbackHandler for more details. * See PythonCallbackHandler for more details * See PythonCallbackHandler::PythonCallbackHandler for more details */ diff --git a/xbmc/interfaces/python/PythonInvoker.cpp b/xbmc/interfaces/python/PythonInvoker.cpp index 2959423487..66f5d5a7dc 100644 --- a/xbmc/interfaces/python/PythonInvoker.cpp +++ b/xbmc/interfaces/python/PythonInvoker.cpp @@ -187,7 +187,7 @@ bool CPythonInvoker::execute(const std::string &script, const std::vector<std::s URIUtils::RemoveSlashAtEnd(scriptDir); addPath(scriptDir); - // add all addon module dependecies to path + // add all addon module dependencies to path if (m_addon) { std::set<std::string> paths; @@ -398,7 +398,7 @@ bool CPythonInvoker::execute(const std::string &script, const std::vector<std::s // run the gc before finishing // - // if the script exited by throwing a SystemExit excepton then going back + // if the script exited by throwing a SystemExit exception then going back // into the interpreter causes this python bug to get hit: // http://bugs.python.org/issue10582 // and that causes major failures. So we are not going to go back in diff --git a/xbmc/interfaces/python/PythonSwig.cpp.template b/xbmc/interfaces/python/PythonSwig.cpp.template index 8a0a5a129e..1af3ab210c 100644 --- a/xbmc/interfaces/python/PythonSwig.cpp.template +++ b/xbmc/interfaces/python/PythonSwig.cpp.template @@ -193,7 +193,7 @@ void doMethod(Node method, MethodType methodType) try { <% - // now do the input converstion if any are necessary + // now do the input conversion if any are necessary params.findAll({ !PythonTools.parameterCanBeUsedDirectly(it) || doAsMappingIndex }).each { %> ${Helper.getInConversion(it.@type, it.@name, 'py' + it.@name, method)} <% println() } %> <% @@ -201,7 +201,7 @@ void doMethod(Node method, MethodType methodType) boolean isDirectorCall = Helper.isDirector(method) if (isDirectorCall) { -%> // This is a director call comming from python so it explcitly calls the base class method. +%> // This is a director call coming from python so it explicitly calls the base class method. <% } // now do the method call itself @@ -430,14 +430,14 @@ void doClassMethodInfo(Node clazz, List initTypeCalls) %> //========================================================================= // This section contains the initialization for the - // Python extention for the Api class ${fullClassName} + // Python extension for the Api class ${fullClassName} //========================================================================= // All of the methods on this class static PyMethodDef ${classNameAsVariable}_methods[] = { <% normalMethods.each { %> {(char*)"${it.@sym_name}", (PyCFunction)${module.@name}_${PythonTools.getPyMethodName(it,MethodType.method)}, METH_VARARGS|METH_KEYWORDS, ${Helper.hasDoc(it) ? PythonTools.getPyMethodName(it,MethodType.method) + '__doc__' : 'NULL'} }, <% } - // now do all of the explcit feature:python:method's that may be in this class + // now do all of the explicit feature:python:method's that may be in this class List tmpl = [] tmpl.addAll(clazz.attributes().keySet()) List newMethodKeys = tmpl.findAll { it.startsWith('feature_python_method_') } diff --git a/xbmc/interfaces/python/PythonTools.groovy b/xbmc/interfaces/python/PythonTools.groovy index 01d8efe543..0d1bd70654 100644 --- a/xbmc/interfaces/python/PythonTools.groovy +++ b/xbmc/interfaces/python/PythonTools.groovy @@ -43,7 +43,7 @@ public class PythonTools /** * This method will take the parameter list from the method node passed - * and will convert it to a Pythonn argument string for PyArg_ParseTupleAndKeywords + * and will convert it to a Python argument string for PyArg_ParseTupleAndKeywords */ public static String makeFormatStringFromParameters(Node method) { @@ -72,7 +72,7 @@ public class PythonTools /** * This method gets the FULL class name as a variable including the * namespace. If converts all of the '::' references to '_' so - * that the result can be used in part, or in whold, as a variable name + * that the result can be used in part, or in whole, as a variable name */ public static String getClassNameAsVariable(Node clazz) { return Helper.findFullClassName(clazz).replaceAll('::','_') } diff --git a/xbmc/linux/XFileUtils.cpp b/xbmc/linux/XFileUtils.cpp index ae9701a5f9..0290f1a5e2 100644 --- a/xbmc/linux/XFileUtils.cpp +++ b/xbmc/linux/XFileUtils.cpp @@ -109,7 +109,7 @@ HANDLE CreateFile(LPCTSTR lpFileName, DWORD dwDesiredAccess, // we always open files with fileflag O_NONBLOCK to support // cdrom devices, but we then turn it of for actual reads - // apperently it's used for multiple things, read mode + // apparently it's used for multiple things, read mode // and how opens are handled. devices must be opened // with this flag set to work correctly flags |= O_NONBLOCK; diff --git a/xbmc/linux/XMemUtils.cpp b/xbmc/linux/XMemUtils.cpp index 8ba9bb8144..7a9abb9fc5 100644 --- a/xbmc/linux/XMemUtils.cpp +++ b/xbmc/linux/XMemUtils.cpp @@ -34,7 +34,7 @@ // aligned memory allocation. // in order to do so - we alloc extra space and store the original allocation in it (so that we can free later on). -// the returned address will be the nearest alligned address within the space allocated. +// the returned address will be the nearest aligned address within the space allocated. void *_aligned_malloc(size_t s, size_t alignTo) { char *pFull = (char*)malloc(s + alignTo + sizeof(char *)); diff --git a/xbmc/linux/XMemUtils.h b/xbmc/linux/XMemUtils.h index e6cd68a75f..45bf66a469 100644 --- a/xbmc/linux/XMemUtils.h +++ b/xbmc/linux/XMemUtils.h @@ -23,7 +23,7 @@ #include "linux/PlatformDefs.h" // aligned memory allocation and free. memory returned will be aligned to "alignTo" bytes. -// this is a linux (actually platfom free) implementation of the win32 CRT methods _aligned_malloc and _aligned_free. +// this is a linux (actually platform free) implementation of the win32 CRT methods _aligned_malloc and _aligned_free. void *_aligned_malloc(size_t s, size_t alignTo); void _aligned_free(void *p) ; diff --git a/xbmc/linux/imx/IMX.h b/xbmc/linux/imx/IMX.h index a269af07f4..101f562018 100644 --- a/xbmc/linux/imx/IMX.h +++ b/xbmc/linux/imx/IMX.h @@ -167,7 +167,7 @@ private: volatile bool m_abort; }; -// Generell description of a buffer used by +// General description of a buffer used by // the IMX context, e.g. for blitting class CIMXBuffer { public: diff --git a/xbmc/linux/rpi/rpi_user_vcsm.h b/xbmc/linux/rpi/rpi_user_vcsm.h index 0b68f4453e..60141a6c29 100644 --- a/xbmc/linux/rpi/rpi_user_vcsm.h +++ b/xbmc/linux/rpi/rpi_user_vcsm.h @@ -22,7 +22,7 @@ /* VideoCore Shared Memory - user interface library. ** ** This library provides all the necessary abstraction for any application to -** make use of the shared memory service which is distributed accross a kernel +** make use of the shared memory service which is distributed across a kernel ** driver and a videocore service. ** ** It is an application design decision to choose or not to use this service. @@ -84,11 +84,11 @@ ** stay valid following the unlock action corresponding to this lock. ** ** -** Unocking memory blocks. +** Unlocking memory blocks. ** ** When the memory block has been allocated in a host cached fashion, unlocking the ** memory block (and so forgiving its ownership) will trigger a cache flush unless -** explicitely asked not to flush the cache for performances reasons. +** explicitly asked not to flush the cache for performances reasons. ** ** For the above reason and when using host cached allocation, it is important that ** an application properly implements the lock/unlock mechanism to ensure cache will diff --git a/xbmc/messaging/ApplicationMessenger.cpp b/xbmc/messaging/ApplicationMessenger.cpp index 1880693594..f4d9f89afa 100644 --- a/xbmc/messaging/ApplicationMessenger.cpp +++ b/xbmc/messaging/ApplicationMessenger.cpp @@ -130,8 +130,8 @@ int CApplicationMessenger::SendMsg(ThreadMessage&& message, bool wait) m_vecMessages.push(msg); lock.Leave(); // this releases the lock on the vec of messages and // allows the ProcessMessage to execute and therefore - // delete the message itself. Therefore any accesss - // of the message itself after this point consittutes + // delete the message itself. Therefore any access + // of the message itself after this point constitutes // a race condition (yarc - "yet another race condition") // if (waitEvent) // ... it just so happens we have a spare reference to the diff --git a/xbmc/messaging/ThreadMessage.h b/xbmc/messaging/ThreadMessage.h index 8299f7fc32..86fd4d4741 100644 --- a/xbmc/messaging/ThreadMessage.h +++ b/xbmc/messaging/ThreadMessage.h @@ -128,7 +128,7 @@ public: void SetResult(int res) { //On posted messages result will be zero, since they can't - //retreive the response we silently ignore this to let message + //retrieve the response we silently ignore this to let message //handlers not have to worry about it if (result) *result = res; diff --git a/xbmc/music/Album.cpp b/xbmc/music/Album.cpp index cd695db3dc..90147646ea 100644 --- a/xbmc/music/Album.cpp +++ b/xbmc/music/Album.cpp @@ -72,14 +72,14 @@ CAlbum::CAlbum(const CFileItem& item) (int)tag.GetAlbumArtist().size(), strAlbum.c_str(), strArtistDesc.c_str()); /* - Most likey we have no hints and a single artist name like "Artist1 feat. Artist2" + Most likely we have no hints and a single artist name like "Artist1 feat. Artist2" or "Composer; Conductor, Orchestra, Soloist" or "Artist1/Artist2" where the expected single item separator (default = space-slash-space) as not been used. Comma and slash (no spaces) are poor delimiters as could be in name e.g. AC/DC, but here treat them as such in attempt to find artist names. When there are hints they could be poorly formatted using unexpected separators, so attempt to split them. Or we could have more hints or artist names than - musicbrainz so ingore them but raise warning. + musicbrainz so ignore them but raise warning. */ // Do hints exist yet mis-match @@ -143,7 +143,7 @@ CAlbum::CAlbum(const CFileItem& item) We try and get the mbrainzid <-> name matching from the hints and match on the same index. Some album artist hints could be blank (if populated from artist or artist hints). If not found, use the mbrainzid and hope we later on can update that entry - If we have more names than musicbrainz id they are ingored, but raise a warning. + If we have more names than musicbrainz id they are ignored, but raise a warning. */ if (i < musicBrainzAlbumArtistHints.size()) @@ -267,7 +267,7 @@ const std::vector<std::string> CAlbum::GetMusicBrainzAlbumArtistID() const const std::string CAlbum::GetAlbumArtistString() const { //Artist description may be different from the artists in artistcredits (see ALBUMARTISTS tag processing) - //but is takes precidence as a string because artistcredits is not always filled during processing + //but is takes precedence as a string because artistcredits is not always filled during processing if (!strArtistDesc.empty()) return strArtistDesc; std::vector<std::string> artistvector; diff --git a/xbmc/music/Album.h b/xbmc/music/Album.h index a967ed82d3..53d5605e41 100644 --- a/xbmc/music/Album.h +++ b/xbmc/music/Album.h @@ -92,7 +92,7 @@ public: const std::vector<std::string> GetMusicBrainzAlbumArtistID() const; std::string GetGenreString() const; - /*! \brief Get album artist names from the artist decription string (if it exists) + /*! \brief Get album artist names from the artist description string (if it exists) or concatenated from the vector of artistcredits objects \return album artist names as a single string */ diff --git a/xbmc/music/MusicDatabase.cpp b/xbmc/music/MusicDatabase.cpp index f6a7324063..decafb21d4 100644 --- a/xbmc/music/MusicDatabase.cpp +++ b/xbmc/music/MusicDatabase.cpp @@ -1064,7 +1064,7 @@ bool CMusicDatabase::GetAlbum(int idAlbum, CAlbum& album, bool getSongs /* = tru } int idSongArtistRole = record->at(songArtistOffset + artistCredit_idRole).get_asInt(); - //By query order song is the last one appened to the album song vector. + //By query order song is the last one appended to the album song vector. if (idSongArtistRole == ROLE_ARTIST) album.songs.back().artistCredits.emplace_back(GetArtistCreditFromDataset(record, songArtistOffset)); else @@ -1234,7 +1234,7 @@ int CMusicDatabase::AddArtist(const std::string& strArtist, const std::string& s } // 2) No MusicBrainz - search for any artist (MB ID or non) with the same name. - // With MusicBrainz IDs this could return multiple artists and is non-determinstic + // With MusicBrainz IDs this could return multiple artists and is non-deterministic // Always pick the first artist ID returned by the DB to return. } else @@ -3086,7 +3086,7 @@ bool CMusicDatabase::CleanupRoles() try { // Cleanup orphaned roles (ie those that don't belong to a song entry) - // Must be executed AFTER the song, and song_srtist tables have been cleaned. + // Must be executed AFTER the song, and song_artist tables have been cleaned. // Do not remove default role (ROLE_ARTIST) std::string strSQL = "DELETE FROM role WHERE idRole > 1 AND idRole NOT IN (SELECT idRole FROM song_artist)"; m_pDS->exec(strSQL); @@ -3785,7 +3785,7 @@ bool CMusicDatabase::GetArtistsNav(const std::string& strBaseDir, CFileItemList& musicUrl.AddOption("songid", idSong); // Override albumArtistsOnly parameter (usually externally set to SETTING_MUSICLIBRARY_SHOWCOMPILATIONARTISTS) - // when local option already present in muscic URL thus allowing it to be an option in custom nodes + // when local option already present in music URL thus allowing it to be an option in custom nodes if (!musicUrl.HasOption("albumartistsonly")) musicUrl.AddOption("albumartistsonly", albumArtistsOnly); @@ -4141,7 +4141,7 @@ bool CMusicDatabase::GetAlbumsByWhere(const std::string &baseDir, const Filter & // Get data from album, album_artist and artist tables to fully populate albums with album artists // All albums have at least one artist so inner join sufficient if (limited) - //Apply where clause and limits to albumview, then join as mutiple records in result set per album + //Apply where clause and limits to albumview, then join as multiple records in result set per album strSQL = "SELECT av.*, albumartistview.* " "FROM (SELECT albumview.* FROM albumview " + strSQLExtra + ") AS av " "JOIN albumartistview ON albumartistview.idalbum = av.idalbum "; @@ -4262,7 +4262,7 @@ bool CMusicDatabase::GetSongsFullByWhere(const std::string &baseDir, const Filte // All songs now have at least one artist so inner join sufficient // Need guaranteed ordering for dataset processing to extract songs if (limited) - //Apply where clause and limits to songview, then join as mutiple records in result set per song + //Apply where clause and limits to songview, then join as multiple records in result set per song strSQL = "SELECT sv.*, songartistview.* " "FROM (SELECT songview.* FROM songview " + strSQLExtra + ") AS sv " "JOIN songartistview ON songartistview.idsong = sv.idsong "; @@ -4955,7 +4955,7 @@ void CMusicDatabase::UpdateTables(int version) CLog::Log(LOGERROR, "Setting artist missing for albums without an artist has failed"); } } - //Remove temp indices, full analyics for database created later + //Remove temp indices, full analytics for database created later m_pDS->exec("DROP INDEX idxSongArtist1 ON song_artist"); m_pDS->exec("DROP INDEX idxAlbumArtist1 ON album_artist"); @@ -6676,7 +6676,7 @@ void CMusicDatabase::UpdateFileDateAdded(int songId, const std::string& strFileN if (NULL == m_pDB.get()) return; if (NULL == m_pDS.get()) return; - // 1 prefering to use the files mtime(if it's valid) and only using the file's ctime if the mtime isn't valid + // 1 preferring to use the files mtime(if it's valid) and only using the file's ctime if the mtime isn't valid if (g_advancedSettings.m_iMusicLibraryDateAdded == 1) dateAdded = CFileUtils::GetModificationDate(strFileNameAndPath, false); //2 using the newer datetime of the file's mtime and ctime diff --git a/xbmc/music/MusicDatabase.h b/xbmc/music/MusicDatabase.h index 54007c839c..f51a981a2d 100644 --- a/xbmc/music/MusicDatabase.h +++ b/xbmc/music/MusicDatabase.h @@ -219,7 +219,7 @@ public: \param strArtist the album artist name(s) \param strGenre the album genre(s) \param year the year - \param strRecordLabel the recording lable + \param strRecordLabel the recording label \param strType album type (Musicbrainz release type e.g. "Broadcast, Soundtrack, live"), \param bCompilation if the album is a compilation \param releaseType "album" or "single" diff --git a/xbmc/music/Song.cpp b/xbmc/music/Song.cpp index 1402968f0d..1d0d29e219 100644 --- a/xbmc/music/Song.cpp +++ b/xbmc/music/Song.cpp @@ -53,14 +53,14 @@ CSong::CSong(CFileItem& item) CLog::Log(LOGDEBUG, "Mis-match in song file tags: %i mbid %i names %s %s", (int)tag.GetMusicBrainzArtistID().size(), (int)artist.size(), strTitle.c_str(), strArtistDesc.c_str()); /* - Most likey we have no hints and a single artist name like "Artist1 feat. Artist2" + Most likely we have no hints and a single artist name like "Artist1 feat. Artist2" or "Composer; Conductor, Orchestra, Soloist" or "Artist1/Artist2" where the expected single item separator (default = space-slash-space) as not been used. Ampersand (&), comma and slash (no spaces) are poor delimiters as could be in name e.g. "AC/DC", "Earth, Wind & Fire", but here treat them as such in attempt to find artist names. When there are hints but count not match mbid they could be poorly formatted using unexpected separators so attempt to split them. Or we could have more hints or artist names than - musicbrainz id so ingore them but raise warning. + musicbrainz id so ignore them but raise warning. */ // Do hints exist yet mis-match if (musicBrainzArtistHints.size() > 0 && @@ -239,8 +239,8 @@ const std::vector<std::string> CSong::GetArtist() const { songartists.push_back(artistCredit->GetArtist()); } - //When artist credits have not been populated attempt to build an artist vector from the descrpition string - //This is a tempory fix, in the longer term other areas should query the song_artist table and populate + //When artist credits have not been populated attempt to build an artist vector from the description string + //This is a temporary fix, in the longer term other areas should query the song_artist table and populate //artist credits. Note that splitting the string may not give the same artists as held in the song_artist table if (songartists.empty() && !strArtistDesc.empty()) songartists = StringUtils::Split(strArtistDesc, g_advancedSettings.m_musicItemSeparator); @@ -261,7 +261,7 @@ const std::vector<std::string> CSong::GetMusicBrainzArtistID() const const std::string CSong::GetArtistString() const { //Artist description may be different from the artists in artistcredits (see ARTISTS tag processing) - //but is takes precidence as a string because artistcredits is not always filled during processing + //but is takes precedence as a string because artistcredits is not always filled during processing if (!strArtistDesc.empty()) return strArtistDesc; std::vector<std::string> artistvector; diff --git a/xbmc/music/Song.h b/xbmc/music/Song.h index 93d4eb6073..829baeaf49 100644 --- a/xbmc/music/Song.h +++ b/xbmc/music/Song.h @@ -82,7 +82,7 @@ public: */ const std::vector<std::string> GetMusicBrainzArtistID() const; - /*! \brief Get artist names from the artist decription string (if it exists) + /*! \brief Get artist names from the artist description string (if it exists) or concatenated from the vector of artistcredits objects \return artist names as a single string */ diff --git a/xbmc/music/infoscanner/MusicInfoScanner.cpp b/xbmc/music/infoscanner/MusicInfoScanner.cpp index 1852926b40..6bf6628b21 100644 --- a/xbmc/music/infoscanner/MusicInfoScanner.cpp +++ b/xbmc/music/infoscanner/MusicInfoScanner.cpp @@ -133,7 +133,7 @@ void CMusicInfoScanner::Process() m_fileCountReader.Create(); // 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; m_needsCleanup = false; @@ -1482,7 +1482,7 @@ bool CMusicInfoScanner::ResolveMusicBrainz(const std::string &strMusicBrainzID, Sleep(2000); // MusicBrainz rate-limits queries to 1 p.s - once we hit the rate-limiter // they start serving up the 'you hit the rate-limiter' page fast - meaning // we will never get below the rate-limit threshold again in a specific run. - // This helps us to avoidthe rate-limiter as far as possible. + // This helps us to avoid the rate-limiter as far as possible. CLog::Log(LOGDEBUG,"-- nfo-scraper: %s",preferredScraper->Name().c_str()); CLog::Log(LOGDEBUG,"-- nfo url: %s", musicBrainzURL.m_url[0].m_url.c_str()); bMusicBrainz = true; diff --git a/xbmc/music/tags/MusicInfoTag.cpp b/xbmc/music/tags/MusicInfoTag.cpp index 4f7e79953a..318d3b165d 100644 --- a/xbmc/music/tags/MusicInfoTag.cpp +++ b/xbmc/music/tags/MusicInfoTag.cpp @@ -754,10 +754,10 @@ void CMusicInfoTag::Serialize(CVariant& value) const value["artist"] = m_artist; // There are situations where the individual artist(s) are not queried from the song_artist and artist tables e.g. playlist, // only artist description from song table. Since processing of the ARTISTS tag was added the individual artists may not always - // be accurately derrived by simply splitting the artist desc. Hence m_artist is only populated when the individual artists are + // be accurately derived by simply splitting the artist desc. Hence m_artist is only populated when the individual artists are // queried, whereas GetArtistString() will always return the artist description. // To avoid empty artist array in JSON, when m_artist is empty then an attempt is made to split the artist desc into artists. - // A longer term soltion would be to ensure that when individual artists are to be returned then the song_artist and artist tables + // A longer term solution would be to ensure that when individual artists are to be returned then the song_artist and artist tables // are queried. if (m_artist.empty()) value["artist"] = StringUtils::Split(GetArtistString(), g_advancedSettings.m_musicItemSeparator); diff --git a/xbmc/music/tags/TagLibVFSStream.cpp b/xbmc/music/tags/TagLibVFSStream.cpp index 1362dfbdf1..19916f4dec 100644 --- a/xbmc/music/tags/TagLibVFSStream.cpp +++ b/xbmc/music/tags/TagLibVFSStream.cpp @@ -129,7 +129,7 @@ void TagLibVFSStream::insert(const ByteVector &data, TagLib::ulong start, TagLib // Now I'll explain the steps in this ugliness: // First, make sure that we're working with a buffer that is longer than - // the *differnce* in the tag sizes. We want to avoid overwriting parts + // the *difference* in the tag sizes. We want to avoid overwriting parts // that aren't yet in memory, so this is necessary. TagLib::ulong bufferLength = bufferSize(); diff --git a/xbmc/music/tags/TagLoaderTagLib.cpp b/xbmc/music/tags/TagLoaderTagLib.cpp index 088935e349..ebef0165b0 100644 --- a/xbmc/music/tags/TagLoaderTagLib.cpp +++ b/xbmc/music/tags/TagLoaderTagLib.cpp @@ -183,11 +183,11 @@ bool CTagLoaderTagLib::ParseTag(ASF::Tag *asf, EmbeddedArt *art, CMusicInfoTag& else if (it->first == "WM/Publisher") tag.SetRecordLabel(it->second.front().toString().to8Bit(true)); else if (it->first == "WM/AlbumArtistSortOrder") - {} // Known unsupported, supress warnings + {} // Known unsupported, suppress warnings else if (it->first == "WM/ArtistSortOrder") - {} // Known unsupported, supress warnings + {} // Known unsupported, suppress warnings else if (it->first == "WM/Script") - {} // Known unsupported, supress warnings + {} // Known unsupported, suppress warnings else if (it->first == "WM/Year") tag.SetYear(atoi(it->second.front().toString().toCString(true))); else if (it->first == "MusicBrainz/Artist Id") @@ -378,7 +378,7 @@ bool CTagLoaderTagLib::ParseTag(ID3v2::Tag *id3v2, MUSIC_INFO::EmbeddedArt *art, AddArtistRole(tag, StringListToVectorString(tiplframe->fieldList())); } else if (it->first == "TMCL") - // Loop through and process the musicain credits list + // Loop through and process the musician credits list // It is a mapping between the instrument and the person that played it, but also includes "orchestra" or "soloist". // In fieldlist every odd field is an instrument, and every even is an artist or a comma delimited list of artists. for (ID3v2::FrameList::ConstIterator ip = it->second.begin(); ip != it->second.end(); ++ip) @@ -598,7 +598,7 @@ bool CTagLoaderTagLib::ParseTag(Ogg::XiphComment *xiph, EmbeddedArt *art, CMusic else if (it->first == "CUESHEET") tag.SetCueSheet(it->second.front().to8Bit(true)); else if (it->first == "ENCODEDBY") - {} // Known but unsupported, supress warnings + {} // Known but unsupported, suppress warnings else if (it->first == "COMPOSER") AddArtistRole(tag, "Composer", StringListToVectorString(it->second)); else if (it->first == "CONDUCTOR") diff --git a/xbmc/music/windows/GUIWindowMusicBase.cpp b/xbmc/music/windows/GUIWindowMusicBase.cpp index 4aa63f8db7..19dfef5f57 100644 --- a/xbmc/music/windows/GUIWindowMusicBase.cpp +++ b/xbmc/music/windows/GUIWindowMusicBase.cpp @@ -645,7 +645,7 @@ void CGUIWindowMusicBase::OnQueueItem(int iItem) /// \param pItem The file item to add void CGUIWindowMusicBase::AddItemToPlayList(const CFileItemPtr &pItem, CFileItemList &queuedItems) { - if (!pItem->CanQueue() || pItem->IsRAR() || pItem->IsZIP() || pItem->IsParentFolder()) // no zip/rar enques thank you! + if (!pItem->CanQueue() || pItem->IsRAR() || pItem->IsZIP() || pItem->IsParentFolder()) // no zip/rar enqueues thank you! return; // fast lookup is needed here @@ -982,7 +982,7 @@ void CGUIWindowMusicBase::OnRipTrack(int iItem) void CGUIWindowMusicBase::PlayItem(int iItem) { - // restrictions should be placed in the appropiate window code + // restrictions should be placed in the appropriate window code // only call the base code if the item passes since this clears // the current playlist @@ -1163,7 +1163,7 @@ void CGUIWindowMusicBase::UpdateThumb(const CAlbum &album, const std::string &pa } // update the file listing - we have to update the whole lot, as it's likely that - // more than just our thumbnaias changed + // more than just our thumbnails changed //! @todo Ideally this would only be done when needed - at the moment we appear to be //! doing this for every lookup, possibly twice (see ShowAlbumInfo) Refresh(true); diff --git a/xbmc/network/AirTunesServer.cpp b/xbmc/network/AirTunesServer.cpp index 81f5711ab3..466468539f 100644 --- a/xbmc/network/AirTunesServer.cpp +++ b/xbmc/network/AirTunesServer.cpp @@ -231,7 +231,7 @@ void CAirTunesServer::Process() if (m_streamStarted) SetupRemoteControl();// check for remote controls - m_processActions.WaitMSec(1000);// timeout for beeing able to stop + m_processActions.WaitMSec(1000);// timeout for being able to stop std::list<CAction> currentActions; { CSingleLock lock(m_actionQueueLock);// copy and clear the source queue diff --git a/xbmc/network/EventClient.cpp b/xbmc/network/EventClient.cpp index 9715f2c7b9..028ce66af2 100644 --- a/xbmc/network/EventClient.cpp +++ b/xbmc/network/EventClient.cpp @@ -82,7 +82,7 @@ void CEventButtonState::Load() { m_iKeyCode = CButtonTranslator::TranslateRemoteString( m_buttonName.c_str() ); } - else if ( m_mapName.compare("R2") == 0 ) // xbox unviversal remote map + else if ( m_mapName.compare("R2") == 0 ) // xbox universal remote map { m_iKeyCode = CButtonTranslator::TranslateUniversalRemoteString( m_buttonName.c_str() ); } @@ -449,7 +449,7 @@ bool CEventClient::OnPacketBUTTON(CEventPacket *packet) { if(!active && it->m_bActive) { - /* since modifying the list invalidates the referse iteratator */ + /* since modifying the list invalidates the reverse iterator */ std::list<CEventButtonState>::iterator it2 = (++it).base(); /* if last event had an amount, we must resend without amount */ diff --git a/xbmc/network/EventPacket.h b/xbmc/network/EventPacket.h index d436612c61..05eafd51cb 100644 --- a/xbmc/network/EventPacket.h +++ b/xbmc/network/EventPacket.h @@ -54,7 +54,7 @@ namespace EVENTPACKET /************************************************************************/ /************************************************************************ - The payload format for each packet type is decribed below each + The payload format for each packet type is described below each packet type. Legend: diff --git a/xbmc/network/TCPServer.cpp b/xbmc/network/TCPServer.cpp index 7089911947..085bd9eca7 100644 --- a/xbmc/network/TCPServer.cpp +++ b/xbmc/network/TCPServer.cpp @@ -394,7 +394,7 @@ bool CTCPServer::InitializeBlue() sdp_uuid128_create(&svc_uuid, &bt_service_guid); sdp_set_service_id(record, svc_uuid); - // make the service record publicly browsable + // make the service record publicly browseable sdp_uuid16_create(&root_uuid, PUBLIC_BROWSE_GROUP); root_list = sdp_list_append(0, &root_uuid); sdp_set_browse_groups(record, root_list); diff --git a/xbmc/network/WakeOnAccess.cpp b/xbmc/network/WakeOnAccess.cpp index 4925bca7a9..5c1b2f56e9 100644 --- a/xbmc/network/WakeOnAccess.cpp +++ b/xbmc/network/WakeOnAccess.cpp @@ -426,7 +426,7 @@ bool CWakeOnAccess::WakeUpHost(const WakeUpEntry& server) // we have ping response ; just add extra wait-for-services before returning if requested { - WaitCondition waitObj ; // wait uninteruptable fixed time for services .. + WaitCondition waitObj ; // wait uninterruptable fixed time for services .. dlg.ShowAndWait (waitObj, server.wait_services_sec, LOCALIZED(13032)); diff --git a/xbmc/network/Zeroconf.h b/xbmc/network/Zeroconf.h index 64db79cf01..b7aae537c8 100644 --- a/xbmc/network/Zeroconf.h +++ b/xbmc/network/Zeroconf.h @@ -60,7 +60,7 @@ public: //implement it by doing so. // //fcr_identifier - the identifier of the already published service which should be reannounced - // returns true on successfull reannonuce - false if this service isn't published yet + // returns true on successful reannonuce - false if this service isn't published yet bool ForceReAnnounceService(const std::string& fcr_identifier); ///removes the specified service @@ -75,7 +75,7 @@ public: //started, get published now. bool Start(); - // unpublishs all services (but keeps them stored in this class) + // unpublishes all services (but keeps them stored in this class) // a call to Start() will republish them void Stop(); diff --git a/xbmc/network/cddb.h b/xbmc/network/cddb.h index 513a74e0b4..3606c5bc28 100644 --- a/xbmc/network/cddb.h +++ b/xbmc/network/cddb.h @@ -39,7 +39,7 @@ namespace CDDB //Can be removed if/when removing Xcddb::queryCDinfo(int real_track_count, toc cdtoc[]) //#define IN_PROGRESS -1 -//#define QUERRY_OK 7 +//#define QUERY_OK 7 //#define E_INEXACT_MATCH_FOUND 211 //#define W_CDDB_already_shook_hands 402 //#define E_CDDB_Handshake_not_successful 431 diff --git a/xbmc/network/osx/ZeroconfBrowserOSX.cpp b/xbmc/network/osx/ZeroconfBrowserOSX.cpp index eabc6d3a58..e43efdc95f 100644 --- a/xbmc/network/osx/ZeroconfBrowserOSX.cpp +++ b/xbmc/network/osx/ZeroconfBrowserOSX.cpp @@ -121,7 +121,7 @@ namespace CZeroconfBrowserOSX::CZeroconfBrowserOSX():m_runloop(0) { - //aquire the main threads event loop + //acquire the main threads event loop m_runloop = CFRunLoopGetMain(); } diff --git a/xbmc/network/osx/ZeroconfOSX.cpp b/xbmc/network/osx/ZeroconfOSX.cpp index 9b013c3b30..a2c6c248ec 100644 --- a/xbmc/network/osx/ZeroconfOSX.cpp +++ b/xbmc/network/osx/ZeroconfOSX.cpp @@ -29,7 +29,7 @@ CZeroconfOSX::CZeroconfOSX():m_runloop(0) { - //aquire the main threads event loop + //acquire the main threads event loop m_runloop = CFRunLoopGetMain(); } diff --git a/xbmc/network/upnp/UPnP.cpp b/xbmc/network/upnp/UPnP.cpp index 705a9227c7..c57dc55364 100644 --- a/xbmc/network/upnp/UPnP.cpp +++ b/xbmc/network/upnp/UPnP.cpp @@ -66,7 +66,7 @@ NPT_SET_LOCAL_LOGGER("xbmc.upnp") DLNA_ORG_PS = 'DLNA.ORG_PS' DLNA_ORG_PS_VAL = '1' -# Convertion Indicator +# Conversion Indicator # 1 transcoded # 0 not transcoded DLNA_ORG_CI = 'DLNA.ORG_CI' diff --git a/xbmc/network/upnp/UPnPInternal.h b/xbmc/network/upnp/UPnPInternal.h index bc83dd68f2..59260c8020 100644 --- a/xbmc/network/upnp/UPnPInternal.h +++ b/xbmc/network/upnp/UPnPInternal.h @@ -62,7 +62,7 @@ namespace UPNP { ECLIENTQUIRKS_NONE = 0x0 - /* Client requires folder's to be marked as storageFolers as verndor type (360)*/ + /* Client requires folder's to be marked as storageFolders as vendor type (360)*/ , ECLIENTQUIRKS_ONLYSTORAGEFOLDER = 0x01 /* Client can't handle subtypes for videoItems (360) */ diff --git a/xbmc/network/upnp/UPnPServer.cpp b/xbmc/network/upnp/UPnPServer.cpp index 853fa2462f..514016618f 100644 --- a/xbmc/network/upnp/UPnPServer.cpp +++ b/xbmc/network/upnp/UPnPServer.cpp @@ -867,7 +867,7 @@ CUPnPServer::OnSearchContainer(PLT_ActionReference& action, // all tracks of a specific genre else if (count == 2) id += "-1/-1/"; - // all tracks of a specific genre of a specfic artist + // all tracks of a specific genre of a specific artist else if (count == 3) id += "-1/"; } else if (id.StartsWith("musicdb://artists/")) { diff --git a/xbmc/network/upnp/UPnPServer.h b/xbmc/network/upnp/UPnPServer.h index 469b2301bb..d243845de0 100644 --- a/xbmc/network/upnp/UPnPServer.h +++ b/xbmc/network/upnp/UPnPServer.h @@ -99,7 +99,7 @@ public: } } - /* Samsungs devices get subtitles from header in response (for movie file), not from didl. + /* Samsung's devices get subtitles from header in response (for movie file), not from didl. It's a way to store subtitle uri generated when building didl, to use later in http response*/ NPT_Result AddSubtitleUriForSecResponse(NPT_String movie_md5, NPT_String subtitle_uri); diff --git a/xbmc/peripherals/bus/PeripheralBus.cpp b/xbmc/peripherals/bus/PeripheralBus.cpp index aaebc6213c..e4c88a7299 100644 --- a/xbmc/peripherals/bus/PeripheralBus.cpp +++ b/xbmc/peripherals/bus/PeripheralBus.cpp @@ -231,7 +231,7 @@ void CPeripheralBus::Process(void) // depending on bus implementation // needsPolling can be set properly - // only after unitial scan. + // only after initial scan. // if this is the case, bail out. if (!m_bNeedsPolling) break; diff --git a/xbmc/peripherals/devices/Peripheral.h b/xbmc/peripherals/devices/Peripheral.h index f31edd56ec..f77dfa1910 100644 --- a/xbmc/peripherals/devices/Peripheral.h +++ b/xbmc/peripherals/devices/Peripheral.h @@ -96,14 +96,14 @@ namespace PERIPHERALS /*! * @brief Initialises the peripheral. - * @return True when the peripheral has been initialised succesfully, false otherwise. + * @return True when the peripheral has been initialised successfully, false otherwise. */ bool Initialise(void); /*! * @brief Initialise one of the features of this peripheral. * @param feature The feature to initialise. - * @return True when the feature has been initialised succesfully, false otherwise. + * @return True when the feature has been initialised successfully, false otherwise. */ virtual bool InitialiseFeature(const PeripheralFeature feature) { return true; } diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp index d032ffd707..54dc37e751 100644 --- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp +++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp @@ -768,7 +768,7 @@ void CPeripheralCecAdapter::CecAlert(void *cbParam, const libcec_alert alert, co if (bReopenConnection) { - // Reopen the connection asynchronously. Otherwise a deadlock may occure. + // Reopen the connection asynchronously. Otherwise a deadlock may occur. // Reconnect means destruction and recreation of our libcec instance, but libcec // calls this callback function synchronously and must not be destroyed meanwhile. adapter->ReopenConnection(true); diff --git a/xbmc/pictures/GUIWindowSlideShow.cpp b/xbmc/pictures/GUIWindowSlideShow.cpp index 858b9a01e4..ab2e851af5 100644 --- a/xbmc/pictures/GUIWindowSlideShow.cpp +++ b/xbmc/pictures/GUIWindowSlideShow.cpp @@ -532,7 +532,7 @@ void CGUIWindowSlideShow::Process(unsigned int currentTime, CDirtyRegionList &re m_Image[m_iCurrentPic].Process(currentTime, regions); } - // Check if we should be transistioning immediately + // Check if we should be transitioning immediately if (m_bLoadNextPic && m_Image[m_iCurrentPic].IsLoaded()) { CLog::Log(LOGDEBUG, "Starting immediate transistion due to user wanting slide %s", m_slides.at(m_iNextSlide)->GetPath().c_str()); @@ -563,7 +563,7 @@ void CGUIWindowSlideShow::Process(unsigned int currentTime, CDirtyRegionList &re if (m_Image[1 - m_iCurrentPic].DisplayEffectNeedChange(effect)) m_Image[1 - m_iCurrentPic].Reset(effect); } - // set the appropriate transistion time + // set the appropriate transition time m_Image[1 - m_iCurrentPic].SetTransistionTime(0, m_Image[m_iCurrentPic].GetTransistionTime(1)); m_Image[1 - m_iCurrentPic].Pause(!m_bSlideShow || m_bPause || m_slides.at(m_iNextSlide)->IsVideo()); m_Image[1 - m_iCurrentPic].Process(currentTime, regions); @@ -1139,7 +1139,7 @@ void CGUIWindowSlideShow::OnLoadPic(int iPic, int iSlideNumber, const std::strin } else { // Failed to load image. What should be done?? - // We should wait for the current pic to finish rendering, then transistion it out, + // We should wait for the current pic to finish rendering, then transition it out, // release the texture, and try and reload this pic from scratch m_bErrorMessage = true; } diff --git a/xbmc/pictures/Picture.cpp b/xbmc/pictures/Picture.cpp index f782ce21e9..471cbfe039 100644 --- a/xbmc/pictures/Picture.cpp +++ b/xbmc/pictures/Picture.cpp @@ -300,7 +300,7 @@ bool CPicture::CreateTiledThumb(const std::vector<std::string> &files, const std { if (!texture->GetOrientation() || OrientateImage(scaled, width, height, texture->GetOrientation())) { - success = true; // Flag that we at least had one succesfull image processed + success = true; // Flag that we at least had one successful image processed // drop into the texture unsigned int posX = x*tile_width + (tile_width - width)/2; unsigned int posY = y*tile_height + (tile_height - height)/2; diff --git a/xbmc/pictures/SlideShowPicture.cpp b/xbmc/pictures/SlideShowPicture.cpp index 0187628bae..de85568711 100644 --- a/xbmc/pictures/SlideShowPicture.cpp +++ b/xbmc/pictures/SlideShowPicture.cpp @@ -650,8 +650,8 @@ void CSlideShowPic::Keep() bool CSlideShowPic::StartTransistion() { - // this is called if we need to start transistioning immediately to the new picture - if (m_bDrawNextImage) return false; // don't need to do anything as we are already transistioning + // this is called if we need to start transitioning immediately to the new picture + if (m_bDrawNextImage) return false; // don't need to do anything as we are already transitioning // decrease the number of display frame m_transistionEnd.start = m_iCounter; m_bTransistionImmediately = true; diff --git a/xbmc/pictures/SlideShowPicture.h b/xbmc/pictures/SlideShowPicture.h index 0255839277..51d2e61ee7 100644 --- a/xbmc/pictures/SlideShowPicture.h +++ b/xbmc/pictures/SlideShowPicture.h @@ -117,7 +117,7 @@ private: float m_bx[4], m_by[4]; float m_ox[4], m_oy[4]; - // transistion and display effects + // transition and display effects DISPLAY_EFFECT m_displayEffect; TRANSISTION m_transistionStart; TRANSISTION m_transistionEnd; diff --git a/xbmc/platform/android/activity/XBMCApp.cpp b/xbmc/platform/android/activity/XBMCApp.cpp index e11be38596..9cc28e9e66 100644 --- a/xbmc/platform/android/activity/XBMCApp.cpp +++ b/xbmc/platform/android/activity/XBMCApp.cpp @@ -843,7 +843,7 @@ void CXBMCApp::onNewIntent(CJNIIntent intent) void CXBMCApp::onVolumeChanged(int volume) { - // System volume was used; Reset Kodi volume to 100% if it'not, already + // System volume was used; Reset Kodi volume to 100% if it isn't, already if (g_application.GetVolume(false) != 1.0) CApplicationMessenger::GetInstance().PostMsg(TMSG_GUI_ACTION, WINDOW_INVALID, -1, static_cast<void*>( new CAction(ACTION_VOLUME_SET, static_cast<float>(CXBMCApp::GetMaxSystemVolume())))); diff --git a/xbmc/platform/android/activity/XBMCApp.h b/xbmc/platform/android/activity/XBMCApp.h index 0d0680183d..7116eee2c7 100644 --- a/xbmc/platform/android/activity/XBMCApp.h +++ b/xbmc/platform/android/activity/XBMCApp.h @@ -42,7 +42,7 @@ #include "guilib/Geometry.h" -// forward delares +// forward declares class CJNIWakeLock; class CAESinkAUDIOTRACK; class CVariant; diff --git a/xbmc/platform/android/jni/README b/xbmc/platform/android/jni/README index 8da8cddb1e..810c0dc163 100644 --- a/xbmc/platform/android/jni/README +++ b/xbmc/platform/android/jni/README @@ -80,7 +80,7 @@ The fix: CJNIFile myFile = getExternalFilesDir("foo"); if (myFile) externalDir myFile.getAbsolutePath(); - retrun externalDir; + return externalDir; } b. Java has an understanding of arrays like Type[] which contain size info. diff --git a/xbmc/platform/darwin/DarwinUtils.mm b/xbmc/platform/darwin/DarwinUtils.mm index a59e375480..2d62a5d960 100644 --- a/xbmc/platform/darwin/DarwinUtils.mm +++ b/xbmc/platform/darwin/DarwinUtils.mm @@ -393,7 +393,7 @@ int CDarwinUtils::GetFrameworkPath(bool forPython, char* path, size_t *pathsize if (pathname && strstr([pathname UTF8String], "Contents")) { strcpy(path, [pathname UTF8String]); - // ExectuablePath is <product>.app/Contents/MacOS/<executable> + // ExecutablePath is <product>.app/Contents/MacOS/<executable> char *lastSlash = strrchr(path, '/'); if (lastSlash) { diff --git a/xbmc/platform/darwin/OSXGNUReplacements.c b/xbmc/platform/darwin/OSXGNUReplacements.c index 6ebfd1398f..6ef95a6c59 100644 --- a/xbmc/platform/darwin/OSXGNUReplacements.c +++ b/xbmc/platform/darwin/OSXGNUReplacements.c @@ -263,7 +263,7 @@ getline (char **lineptr, size_t *n, FILE *stream) /* Compare strings while treating digits characters numerically. Copyright (C) 1997, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. - Contributed by Jean-Franois Bignolles <bignolle@ecoledoc.ibp.fr>, 1997. + Contributed by Jean-Francois Bignolles <bignolle@ecoledoc.ibp.fr>, 1997. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as diff --git a/xbmc/platform/darwin/ios/IOSEAGLView.mm b/xbmc/platform/darwin/ios/IOSEAGLView.mm index 466756910e..0f212d27c3 100644 --- a/xbmc/platform/darwin/ios/IOSEAGLView.mm +++ b/xbmc/platform/darwin/ios/IOSEAGLView.mm @@ -440,7 +440,7 @@ using namespace KODI::MESSAGING; [myLock unlockWithCondition:TRUE]; // grrr, xbmc does not shutdown properly and leaves - // several classes in an indeterminant state, we must exit and + // several classes in an indeterminate state, we must exit and // reload Lowtide/AppleTV, boo. [g_xbmcController enableScreenSaver]; [g_xbmcController enableSystemSleep]; diff --git a/xbmc/platform/darwin/ios/IOSExternalTouchController.mm b/xbmc/platform/darwin/ios/IOSExternalTouchController.mm index 60abff4c03..3e0a241f0b 100644 --- a/xbmc/platform/darwin/ios/IOSExternalTouchController.mm +++ b/xbmc/platform/darwin/ios/IOSExternalTouchController.mm @@ -49,7 +49,7 @@ const CGFloat timeFadeSecs = 2.0; _internalWindow = [[UIWindow alloc] initWithFrame:frame]; _touchView = [[UIView alloc] initWithFrame:frame]; - /* Turn on autoresizing for the whole hirarchy*/ + /* Turn on autoresizing for the whole hierarchy*/ [_touchView setAutoresizesSubviews:YES]; [_touchView setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight]; [_touchView setAlpha:0.0];//start with alpha 0 and fade in with animation below @@ -198,7 +198,7 @@ const CGFloat timeFadeSecs = 2.0; [[self view] addGestureRecognizer:doubleFingerSingleTap]; [doubleFingerSingleTap release]; - //1 finger single long tab - right mouse - alernative + //1 finger single long tab - right mouse - alternative UITapGestureRecognizer *singleFingerSingleLongTap = (UITapGestureRecognizer*)[[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(handleSingleFingerSingleLongTap:)]; singleFingerSingleLongTap.delaysTouchesBegan = YES; diff --git a/xbmc/platform/darwin/ios/IOSKeyboardView.mm b/xbmc/platform/darwin/ios/IOSKeyboardView.mm index 725d7d9d59..197c468091 100644 --- a/xbmc/platform/darwin/ios/IOSKeyboardView.mm +++ b/xbmc/platform/darwin/ios/IOSKeyboardView.mm @@ -162,7 +162,7 @@ static CEvent keyboardFinishedEvent; { LOG(@"%s: keyboard IsShowing %d", __PRETTY_FUNCTION__, _keyboardIsShowing); // Do not break the keyboard show up process, else we will lost - // keyboard did hide notifaction. + // keyboard did hide notification. return _keyboardIsShowing != 1; } @@ -184,7 +184,7 @@ static CEvent keyboardFinishedEvent; #if __IPHONE_8_0 // when compiled against ios 8.x sdk and runtime is ios // 5.1.1 (f.e. ipad1 which has 5.1.1 as latest available ios version) - // there is an incompatibility which somehowe prevents us from getting + // there is an incompatibility which somehow prevents us from getting // notified about "keyboardDidHide". This makes the keyboard // useless on those ios platforms. // Instead we are called here with "DidChangeFrame" and @@ -274,7 +274,7 @@ static CEvent keyboardFinishedEvent; // give back the control to whoever [_textField resignFirstResponder]; - // allways calld in the mainloop context + // always called in the mainloop context // detach the keyboard view from our main controller [g_xbmcController deactivateKeyboard:self]; diff --git a/xbmc/platform/darwin/ios/XBMCController.mm b/xbmc/platform/darwin/ios/XBMCController.mm index b961052ebb..380537e944 100644 --- a/xbmc/platform/darwin/ios/XBMCController.mm +++ b/xbmc/platform/darwin/ios/XBMCController.mm @@ -272,7 +272,7 @@ XBMCController *g_xbmcController; //3 finger single tap [self addTapGesture:3]; - //1 finger single long tap - right mouse - alernative + //1 finger single long tap - right mouse - alternative UILongPressGestureRecognizer *singleFingerSingleLongTap = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(handleSingleFingerSingleLongTap:)]; @@ -521,7 +521,7 @@ XBMCController *g_xbmcController; - (IBAction)handleTap:(UIGestureRecognizer *)sender { //Allow the tap gesture during init - //(for allowing the user to tap away any messagboxes during init) + //(for allowing the user to tap away any messageboxes during init) if( ([m_glView isReadyToRun] && [sender numberOfTouches] == 1) || [m_glView isXBMCAlive]) { CGPoint point = [sender locationOfTouch:0 inView:m_glView]; @@ -1005,7 +1005,7 @@ XBMCController *g_xbmcController; } } } - // these proprity keys are ios5+ only + // these property keys are ios5+ only NSNumber *elapsed = [item objectForKey:@"elapsed"]; if (elapsed) [dict setObject:elapsed forKey:MPNowPlayingInfoPropertyElapsedPlaybackTime]; @@ -1020,7 +1020,7 @@ XBMCController *g_xbmcController; [dict setObject:total forKey:MPNowPlayingInfoPropertyPlaybackQueueCount]; } /* - other properities can be set: + other properties can be set: MPMediaItemPropertyAlbumTrackCount MPMediaItemPropertyComposer MPMediaItemPropertyDiscCount diff --git a/xbmc/platform/darwin/osx/CocoaInterface.mm b/xbmc/platform/darwin/osx/CocoaInterface.mm index 7bac0c62b7..d71c92b6aa 100644 --- a/xbmc/platform/darwin/osx/CocoaInterface.mm +++ b/xbmc/platform/darwin/osx/CocoaInterface.mm @@ -44,7 +44,7 @@ //#define MAX_DISPLAYS 32 //static NSWindow* blankingWindows[MAX_DISPLAYS]; -//display link for display managment +//display link for display management static CVDisplayLinkRef displayLink = NULL; CGDirectDisplayID Cocoa_GetDisplayIDFromScreen(NSScreen *screen); diff --git a/xbmc/platform/darwin/osx/SDLMain.mm b/xbmc/platform/darwin/osx/SDLMain.mm index 50fd45714b..8aef535d2c 100644 --- a/xbmc/platform/darwin/osx/SDLMain.mm +++ b/xbmc/platform/darwin/osx/SDLMain.mm @@ -27,7 +27,7 @@ #import "platform/darwin/osx/HotKeyController.h" #import "platform/darwin/DarwinUtils.h" -// For some reaon, Apple removed setAppleMenu from the headers in 10.4, +// For some reason, Apple removed setAppleMenu from the headers in 10.4, // but the method still is there and works. To avoid warnings, we declare // it ourselves here. @interface NSApplication(SDL_Missing_Methods) @@ -309,7 +309,7 @@ static void setupWindowMenu(void) NSNotificationCenter *center = [NSNotificationCenter defaultCenter]; - // create media key handler singlton + // create media key handler singleton [[HotKeyController sharedController] enableTap]; // add media key notifications [center addObserver:self diff --git a/xbmc/platform/darwin/osx/smc.c b/xbmc/platform/darwin/osx/smc.c index 00b74ed485..4d4f1948dd 100644 --- a/xbmc/platform/darwin/osx/smc.c +++ b/xbmc/platform/darwin/osx/smc.c @@ -103,14 +103,14 @@ kern_return_t SMCCall(int index, SMCKeyData_t *inputStructure, SMCKeyData_t *out return IOConnectCallStructMethod( conn, index, // inputStructure inputStructure, structureInputSize, - // ouputStructure + // outputStructure outputStructure, &structureOutputSize ); #else return IOConnectMethodStructureIStructureO( conn, index, structureInputSize, /* structureInputSize */ &structureOutputSize, /* structureOutputSize */ inputStructure, /* inputStructure */ - outputStructure); /* ouputStructure */ + outputStructure); /* outputStructure */ #endif } diff --git a/xbmc/platform/win32/dirent.h b/xbmc/platform/win32/dirent.h index cf3fe56763..27a5750793 100644 --- a/xbmc/platform/win32/dirent.h +++ b/xbmc/platform/win32/dirent.h @@ -642,7 +642,7 @@ opendir( * to 1252 using chcp utility and use Lucida Console font, or (2) use * _cprintf function when writing to console. The _cprinf() will re-encode * ANSI strings to the console code page so many non-ASCII characters will - * display correcly. + * display correctly. */ static struct dirent* readdir( @@ -704,7 +704,7 @@ readdir( } else { /* * Cannot convert file name to multi-byte string so construct - * an errornous directory entry and return that. Note that + * an erroneous directory entry and return that. Note that * we cannot return NULL as that would stop the processing * of directory entries completely. */ @@ -793,7 +793,7 @@ dirent_mbstowcs_s( wcstr[n] = 0; } - /* Length of resuting multi-byte string WITH zero terminator */ + /* Length of resulting multi-byte string WITH zero terminator */ if (pReturnValue) { *pReturnValue = n + 1; } @@ -843,7 +843,7 @@ dirent_wcstombs_s( mbstr[n] = '\0'; } - /* Lenght of resulting multi-bytes string WITH zero-terminator */ + /* Length of resulting multi-bytes string WITH zero-terminator */ if (pReturnValue) { *pReturnValue = n + 1; } diff --git a/xbmc/platform/win32/dxerr.cpp b/xbmc/platform/win32/dxerr.cpp index 03e1cf7761..b8772dff60 100644 --- a/xbmc/platform/win32/dxerr.cpp +++ b/xbmc/platform/win32/dxerr.cpp @@ -85,7 +85,7 @@ const WCHAR* WINAPI DXGetErrorStringW( _In_ HRESULT hr ) { switch(hr) { -// Commmented out codes are actually alises for other codes +// Commented out codes are actually aliases for other codes // ------------------------------------------------------------- // Common Win32 error codes @@ -3477,7 +3477,7 @@ void WINAPI DXGetErrorDescriptionW( _In_ HRESULT hr, _Out_cap_(count) WCHAR* des switch (hr) { -// Commmented out codes are actually alises for other codes +// Commented out codes are actually aliases for other codes #if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP) diff --git a/xbmc/platform/win32/strverscmp.cpp b/xbmc/platform/win32/strverscmp.cpp index 0206db3422..b247f9c353 100644 --- a/xbmc/platform/win32/strverscmp.cpp +++ b/xbmc/platform/win32/strverscmp.cpp @@ -2,7 +2,7 @@ extern "C" { /* Compare strings while treating digits characters numerically. Copyright (C) 1997, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. - Contributed by Jean-Franois Bignolles <bignolle@ecoledoc.ibp.fr>, 1997. + Contributed by Jean-Francois Bignolles <bignolle@ecoledoc.ibp.fr>, 1997. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as diff --git a/xbmc/playlists/PlayListFactory.cpp b/xbmc/playlists/PlayListFactory.cpp index 9e9e83e4a2..7148f4a8aa 100644 --- a/xbmc/playlists/PlayListFactory.cpp +++ b/xbmc/playlists/PlayListFactory.cpp @@ -108,7 +108,7 @@ bool CPlayListFactory::IsPlaylist(const CFileItem& item) std::string strMimeType = item.GetMimeType(); StringUtils::ToLower(strMimeType); -/* These are abit uncertain +/* These are a bit uncertain if(strMimeType == "video/x-ms-asf" || strMimeType == "video/x-ms-asx" || strMimeType == "video/x-ms-wmv" diff --git a/xbmc/playlists/PlayListM3U.cpp b/xbmc/playlists/PlayListM3U.cpp index 2c561285bd..97e1506371 100644 --- a/xbmc/playlists/PlayListM3U.cpp +++ b/xbmc/playlists/PlayListM3U.cpp @@ -169,7 +169,7 @@ bool CPlayListM3U::Load(const std::string& strFileName) strInfo = URIUtils::GetFileName(strFileName); } - // should substitition occur befor or after charset conversion?? + // should substitution occur before or after charset conversion?? strFileName = URIUtils::SubstitutePath(strFileName); // Get the full path file name and add it to the the play list diff --git a/xbmc/playlists/PlayListPLS.cpp b/xbmc/playlists/PlayListPLS.cpp index 40b6a48527..10f0673708 100644 --- a/xbmc/playlists/PlayListPLS.cpp +++ b/xbmc/playlists/PlayListPLS.cpp @@ -39,7 +39,7 @@ using namespace XFILE; using namespace PLAYLIST; -#define START_PLAYLIST_MARKER "[playlist]" // may be case-insentive (equivalent to .ini file on win32) +#define START_PLAYLIST_MARKER "[playlist]" // may be case-insensitive (equivalent to .ini file on win32) #define PLAYLIST_NAME "PlaylistName" /*---------------------------------------------------------------------- @@ -364,7 +364,7 @@ bool CPlayListASX::LoadData(std::istream& stream) title = pTitle->FirstChild()->ValueStr(); while (pRef) - { // multiple references may apear for one entry + { // multiple references may appear for one entry // duration may exist on this level too value = XMLUtils::GetAttribute(pRef, "href"); if (!value.empty()) diff --git a/xbmc/profiles/ProfilesManager.h b/xbmc/profiles/ProfilesManager.h index 3b50860b3c..54ea517ab6 100644 --- a/xbmc/profiles/ProfilesManager.h +++ b/xbmc/profiles/ProfilesManager.h @@ -66,24 +66,24 @@ public: */ const CProfile& GetMasterProfile() const; - /*! \brief Retreive the current profile + /*! \brief Retrieve the current profile \return const reference to the current profile */ const CProfile& GetCurrentProfile() const; - /*! \brief Retreive the profile from an index + /*! \brief Retrieve the profile from an index \param unsigned index of the profile to retrieve \return const pointer to the profile, NULL if the index is invalid */ const CProfile* GetProfile(size_t index) const; - /*! \brief Retreive the profile from an index + /*! \brief Retrieve the profile from an index \param unsigned index of the profile to retrieve \return pointer to the profile, NULL if the index is invalid */ CProfile* GetProfile(size_t index); - /*! \brief Retreive index of a particular profile by name + /*! \brief Retrieve index of a particular profile by name \param name name of the profile index to retrieve \return index of this profile, -1 if invalid. */ @@ -124,7 +124,7 @@ public: */ void LoadMasterProfileForLogin(); - /*! \brief Retreive the last used profile index + /*! \brief Retrieve the last used profile index \return the last used profile that logged in. Does not count the master user during login. */ diff --git a/xbmc/pvr/PVRGUIActions.h b/xbmc/pvr/PVRGUIActions.h index 72c3392bf9..c56adc5521 100644 --- a/xbmc/pvr/PVRGUIActions.h +++ b/xbmc/pvr/PVRGUIActions.h @@ -50,7 +50,7 @@ namespace PVR /*! * @brief Open a window containing a list of epg tags 'similar' to a given item. * @param item containing epg data for matching. item must be an epg tag, a channel or a recording. - * @param windowToClose is the window to close before opening the window with the search reasults. + * @param windowToClose is the window to close before opening the window with the search results. * @return true on success, false otherwise. */ bool FindSimilar(const CFileItemPtr &item, CGUIWindow *windowToClose = nullptr) const; @@ -239,7 +239,7 @@ namespace PVR * @brief Delete a timer or timer rule, always showing a confirmation dialog. * @param item containing a timer or timer rule to delete. item must be a timer, an epg tag or a channel. * @param bIsRecording denotes whether the timer is currently recording (controls correct confirmation dialog). - * @param bDeleteRule denotes to delete a timer rule. For convenience, one can pass a timer creted by a rule. + * @param bDeleteRule denotes to delete a timer rule. For convenience, one can pass a timer created by a rule. * @return true, if the timer or timer rule was deleted successfully, false otherwise. */ bool DeleteTimer(const CFileItemPtr &item, bool bIsRecording, bool bDeleteRule) const; @@ -270,7 +270,7 @@ namespace PVR bool ConfirmDeleteRecording(const CFileItemPtr &item) const; /*! - * @brief Open a dialog to confirm to permaantly remove all deleted recordings. + * @brief Open a dialog to confirm to permanently remove all deleted recordings. * @return true, to proceed with delete, false otherwise. */ bool ConfirmDeleteAllRecordingsFromTrash() const; diff --git a/xbmc/pvr/PVRItem.cpp b/xbmc/pvr/PVRItem.cpp index b64dfc3c91..0485199903 100644 --- a/xbmc/pvr/PVRItem.cpp +++ b/xbmc/pvr/PVRItem.cpp @@ -92,7 +92,7 @@ namespace PVR CPVRTimerInfoTagPtr timer; const CEpgInfoTagPtr epgTag(m_item->GetPVRChannelInfoTag()->GetEPGNow()); if (epgTag) - timer = epgTag->Timer(); // cheap method, but not reliable as timers get set at epg tags asychrounously + timer = epgTag->Timer(); // cheap method, but not reliable as timers get set at epg tags asynchronously if (timer) return timer; diff --git a/xbmc/pvr/PVRManager.cpp b/xbmc/pvr/PVRManager.cpp index 738f049a15..70abecad27 100644 --- a/xbmc/pvr/PVRManager.cpp +++ b/xbmc/pvr/PVRManager.cpp @@ -682,7 +682,7 @@ bool CPVRManager::Load(bool bShowProgress) ShowProgressDialog(g_localizeStrings.Get(19239), 85); // Starting background threads m_guiInfo->Start(); - /* close the progess dialog */ + /* close the progress dialog */ if (bShowProgress) HideProgressDialog(); diff --git a/xbmc/pvr/PVRManager.h b/xbmc/pvr/PVRManager.h index 80e5cf897a..e44fc6ffde 100644 --- a/xbmc/pvr/PVRManager.h +++ b/xbmc/pvr/PVRManager.h @@ -322,7 +322,7 @@ namespace PVR * @brief Switch to the given channel. * @param channel The channel to switch to. * @param bPreview True to show a preview, false otherwise. - * @return Trrue if the switch was successful, false otherwise. + * @return True if the switch was successful, false otherwise. */ bool PerformChannelSwitch(const CPVRChannelPtr &channel, bool bPreview); @@ -530,16 +530,16 @@ namespace PVR void SearchMissingChannelIcons(void); /*! - * @brief Check if channel is parental locked. Ask for PIN if neccessary. + * @brief Check if channel is parental locked. Ask for PIN if necessary. * @param channel The channel to open. * @return True if channel is unlocked (by default or PIN unlocked), false otherwise. */ bool CheckParentalLock(const CPVRChannelPtr &channel); /*! - * @brief Check if parental lock is overriden at the given moment. + * @brief Check if parental lock is overridden at the given moment. * @param channel The channel to open. - * @return True if parental lock is overriden, false otherwise. + * @return True if parental lock is overridden, false otherwise. */ bool IsParentalLocked(const CPVRChannelPtr &channel); diff --git a/xbmc/pvr/addons/PVRClients.h b/xbmc/pvr/addons/PVRClients.h index f272079678..310d655ee3 100644 --- a/xbmc/pvr/addons/PVRClients.h +++ b/xbmc/pvr/addons/PVRClients.h @@ -217,7 +217,7 @@ namespace PVR * @brief Seek to a position in a stream. * Limited to recordings playback at the moment. * @param iFilePosition The position to seek to. - * @param iWhence Specify how to seek ("new position=pos", "new position=pos+actual postion" or "new position=filesize-pos") + * @param iWhence Specify how to seek ("new position=pos", "new position=pos+actual position" or "new position=filesize-pos") * @return The new stream position. */ int64_t SeekStream(int64_t iFilePosition, int iWhence = SEEK_SET); @@ -281,7 +281,7 @@ namespace PVR /*! * @brief Switch an opened live tv stream to another channel. * @param channel The channel to switch to. - * @return True if the switch was successfull, false otherwise. + * @return True if the switch was successful, false otherwise. */ bool SwitchChannel(const CPVRChannelPtr &channel); @@ -605,28 +605,28 @@ namespace PVR /*! * @brief Open addon settings dialog to add a channel * @param channel The channel to edit. - * @return True if the edit was successfull, false otherwise. + * @return True if the edit was successful, false otherwise. */ bool OpenDialogChannelAdd(const CPVRChannelPtr &channel); /*! * @brief Open addon settings dialog to related channel * @param channel The channel to edit. - * @return True if the edit was successfull, false otherwise. + * @return True if the edit was successful, false otherwise. */ bool OpenDialogChannelSettings(const CPVRChannelPtr &channel); /*! * @brief Inform addon to delete channel * @param channel The channel to delete. - * @return True if it was successfull, false otherwise. + * @return True if it was successful, false otherwise. */ bool DeleteChannel(const CPVRChannelPtr &channel); /*! * @brief Request the client to rename given channel * @param channel The channel to rename - * @return True if the edit was successfull, false otherwise. + * @return True if the edit was successful, false otherwise. */ bool RenameChannel(const CPVRChannelPtr &channel); @@ -693,7 +693,7 @@ namespace PVR bool GetCreatedClient(int iClientId, PVR_CLIENT &addon) const; /*! - * @bried Get all created clients. + * @brief Get all created clients. * @param clients Store the active clients in this map. * @return The amount of added clients. */ @@ -715,7 +715,7 @@ namespace PVR int m_playingClientId; /*!< the ID of the client that is currently playing */ bool m_bIsPlayingLiveTV; bool m_bIsPlayingRecording; - std::string m_strPlayingClientName; /*!< the name client that is currenty playing a stream or an empty string if nothing is playing */ + std::string m_strPlayingClientName; /*!< the name client that is currently playing a stream or an empty string if nothing is playing */ PVR_CLIENTMAP m_clientMap; /*!< a map of all known clients */ CCriticalSection m_critSection; std::map<std::string, int> m_addonNameIds; /*!< map add-on names to IDs */ diff --git a/xbmc/pvr/channels/PVRChannel.h b/xbmc/pvr/channels/PVRChannel.h index bc6081d8f8..31a172d414 100644 --- a/xbmc/pvr/channels/PVRChannel.h +++ b/xbmc/pvr/channels/PVRChannel.h @@ -85,7 +85,7 @@ namespace PVR /*! * @brief Persists the changes in the database. - * @return True if the changes were saved succesfully, false otherwise. + * @return True if the changes were saved successfully, false otherwise. */ bool Persist(); diff --git a/xbmc/pvr/channels/PVRChannelGroupInternal.h b/xbmc/pvr/channels/PVRChannelGroupInternal.h index 83c0922190..0c60ba6487 100644 --- a/xbmc/pvr/channels/PVRChannelGroupInternal.h +++ b/xbmc/pvr/channels/PVRChannelGroupInternal.h @@ -106,7 +106,7 @@ namespace PVR /*! * @brief Load all channels from the clients. - * @return True when updated succesfully, false otherwise. + * @return True when updated successfully, false otherwise. */ bool LoadFromClients(void); diff --git a/xbmc/pvr/channels/PVRChannelGroups.h b/xbmc/pvr/channels/PVRChannelGroups.h index 367bb31e12..3f819538e4 100644 --- a/xbmc/pvr/channels/PVRChannelGroups.h +++ b/xbmc/pvr/channels/PVRChannelGroups.h @@ -100,7 +100,7 @@ namespace PVR /*! * @brief Get a group given it's name. * @param strName The name. - * @return The group or NULL if it wan't found. + * @return The group or NULL if it wasn't found. */ CPVRChannelGroupPtr GetByName(const std::string &strName) const; diff --git a/xbmc/pvr/channels/PVRChannelGroupsContainer.h b/xbmc/pvr/channels/PVRChannelGroupsContainer.h index 25a8c6fcb9..24914fd53f 100644 --- a/xbmc/pvr/channels/PVRChannelGroupsContainer.h +++ b/xbmc/pvr/channels/PVRChannelGroupsContainer.h @@ -129,7 +129,7 @@ namespace PVR * @param strBase The directory path. * @param results The file list to store the results in. * @param bRadio Get radio channels or tv channels. - * @return True if the list was filled succesfully. + * @return True if the list was filled successfully. */ bool GetGroupsDirectory(CFileItemList *results, bool bRadio) const; @@ -183,7 +183,7 @@ namespace PVR /*! * @brief Create EPG tags for channels in all internal channel groups. - * @return True if EPG tags were created succesfully. + * @return True if EPG tags were created successfully. */ bool CreateChannelEpgs(void); diff --git a/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp b/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp index a3cba0c276..e8598956b3 100644 --- a/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp +++ b/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp @@ -292,7 +292,7 @@ bool CGUIDialogPVRChannelManager::OnClickButtonRadioParentalLocked(CGUIMessage & // ask for PIN first if (!g_PVRManager.CheckParentalPIN(g_localizeStrings.Get(19262).c_str())) - { // failed - reset to previou + { // failed - reset to previous SET_CONTROL_SELECTED(GetID(), RADIOBUTTON_PARENTAL_LOCK, !selected); return false; } diff --git a/xbmc/pvr/recordings/PVRRecordings.cpp b/xbmc/pvr/recordings/PVRRecordings.cpp index 117199d70e..b2ee8bb2c5 100644 --- a/xbmc/pvr/recordings/PVRRecordings.cpp +++ b/xbmc/pvr/recordings/PVRRecordings.cpp @@ -302,7 +302,7 @@ bool CPVRRecordings::GetDirectory(const std::string& strPath, CFileItemList &ite if (!recPath.IsDeleted() && bGrouped) GetSubDirectories(recPath, &items); - // get all files of the currrent directory or recursively all files starting at the current directory if in flatten mode + // get all files of the current directory or recursively all files starting at the current directory if in flatten mode for (const auto recording : m_recordings) { CPVRRecordingPtr current = recording.second; diff --git a/xbmc/pvr/timers/PVRTimerInfoTag.h b/xbmc/pvr/timers/PVRTimerInfoTag.h index 14a69f3a8f..c3087e6065 100644 --- a/xbmc/pvr/timers/PVRTimerInfoTag.h +++ b/xbmc/pvr/timers/PVRTimerInfoTag.h @@ -22,7 +22,7 @@ /* * DESCRIPTION: * - * CPVRTimerInfoTag is part of the PVRManager to support sheduled recordings. + * CPVRTimerInfoTag is part of the PVRManager to support scheduled recordings. * * The timer information tag holds data about current programmed timers for * the PVRManager. It is possible to create timers directly based upon diff --git a/xbmc/pvr/timers/PVRTimerType.h b/xbmc/pvr/timers/PVRTimerType.h index 14eb2f3e2b..a191749025 100644 --- a/xbmc/pvr/timers/PVRTimerType.h +++ b/xbmc/pvr/timers/PVRTimerType.h @@ -286,7 +286,7 @@ namespace PVR /*! * @brief Obtain a list with all possible values for the lifetime attribute. - * @param list out, the list with the values or an empty list, if liftime is not supported by this type. + * @param list out, the list with the values or an empty list, if lifetime is not supported by this type. */ void GetLifetimeValues(std::vector< std::pair<std::string, int> > &list) const; diff --git a/xbmc/pvr/windows/GUIWindowPVRBase.cpp b/xbmc/pvr/windows/GUIWindowPVRBase.cpp index cb6a02ea11..4289fc8569 100644 --- a/xbmc/pvr/windows/GUIWindowPVRBase.cpp +++ b/xbmc/pvr/windows/GUIWindowPVRBase.cpp @@ -168,7 +168,7 @@ void CGUIWindowPVRBase::OnInitWindow(void) } else { - CGUIWindow::OnInitWindow(); // do not call CGUIMediaWindow as it will do a Refresh which in no case works in this state (no cahnnelgroup!) + CGUIWindow::OnInitWindow(); // do not call CGUIMediaWindow as it will do a Refresh which in no case works in this state (no channelgroup!) ShowProgressDialog(g_localizeStrings.Get(19235), 0); // PVR manager is starting up } } diff --git a/xbmc/rendering/RenderSystem.h b/xbmc/rendering/RenderSystem.h index 081a2af8ad..c8a37d1f3b 100644 --- a/xbmc/rendering/RenderSystem.h +++ b/xbmc/rendering/RenderSystem.h @@ -81,7 +81,7 @@ enum RENDER_STEREO_MODE RENDER_STEREO_MODE_MONO, RENDER_STEREO_MODE_COUNT, - // psuevdo modes + // pseudo modes RENDER_STEREO_MODE_AUTO = 100, RENDER_STEREO_MODE_UNDEFINED = 999, }; diff --git a/xbmc/rendering/dx/RenderSystemDX.cpp b/xbmc/rendering/dx/RenderSystemDX.cpp index a99a153069..db8e2f1311 100644 --- a/xbmc/rendering/dx/RenderSystemDX.cpp +++ b/xbmc/rendering/dx/RenderSystemDX.cpp @@ -345,7 +345,7 @@ void CRenderSystemDX::SetFullScreenInternal() float currentRefreshRate = RATIONAL_TO_FLOAT(currentMode.RefreshRate); CLog::Log(LOGDEBUG, "%s - Current display mode is: %dx%d@%0.3f", __FUNCTION__, currentMode.Width, currentMode.Height, currentRefreshRate); - // use backbuffer dimention to find required display mode + // use backbuffer dimension to find required display mode toMatchMode.Width = m_nBackBufferWidth; toMatchMode.Height = m_nBackBufferHeight; bool useDefaultRefreshRate = 0 == m_refreshRate; @@ -864,7 +864,7 @@ bool CRenderSystemDX::CreateWindowSizeDependentResources() bHWStereoEnabled = false; hr = dxgiFactory2->CreateSwapChainForHwnd(m_pD3DDev, m_hFocusWnd, &scDesc1, &scFSDesc, nullptr, &m_pSwapChain1); - // fallback to split_horisontal mode. + // fallback to split_horizontal mode. g_graphicsContext.SetStereoMode(RENDER_STEREO_MODE_SPLIT_HORIZONTAL); } @@ -1009,7 +1009,7 @@ bool CRenderSystemDX::CreateWindowSizeDependentResources() if (bRestoreRTView) m_pContext->OMSetRenderTargets(1, &m_pRenderTargetView, m_depthStencilView); - // notify about resurection of display + // notify about resurrection of display if (m_bResizeRequred) OnDisplayBack(); @@ -1319,7 +1319,7 @@ bool CRenderSystemDX::ClearBuffers(color_t color) if ( m_stereoMode != RENDER_STEREO_MODE_OFF && m_stereoMode != RENDER_STEREO_MODE_MONO) { - // if stereo anaglyph/tab/sbs, data was cleared when left view was rendererd + // if stereo anaglyph/tab/sbs, data was cleared when left view was rendered if (m_stereoView == RENDER_STEREO_VIEW_RIGHT) { // execute command's queue @@ -1478,7 +1478,7 @@ bool CRenderSystemDX::TestRender() } // Now we fill the vertex buffer. To do this, we need to Lock() the VB to - // gain access to the vertices. This mechanism is required becuase vertex + // gain access to the vertices. This mechanism is required because vertex // buffers may be in device memory. VOID* pVertices; if( FAILED( pVB->Lock( 0, sizeof( vertices ), ( void** )&pVertices, 0 ) ) ) diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp index 07db1005dc..7c0fa70afe 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp @@ -310,7 +310,7 @@ void CAdvancedSettings::Initialize() m_iEdlCommBreakAutowait = 0; // Off by default m_iEdlCommBreakAutowind = 0; // Off by default - // Touchscreen default values if no adjustment is necessarry + // Touchscreen default values if no adjustment is necessary m_screenAlign_xOffset = 0; m_screenAlign_yOffset= 0; m_screenAlign_xStretchFactor = 1.0; diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h index 1b747edc0c..d9d48987ee 100644 --- a/xbmc/settings/AdvancedSettings.h +++ b/xbmc/settings/AdvancedSettings.h @@ -311,7 +311,7 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler int m_iSkipLoopFilter; unsigned int m_RestrictCapsMask; - float m_sleepBeforeFlip; ///< if greather than zero, XBMC waits for raster to be this amount through the frame prior to calling the flip + float m_sleepBeforeFlip; ///< if greater than zero, XBMC waits for raster to be this amount through the frame prior to calling the flip bool m_bVirtualShares; bool m_bAllowDeferredRendering; @@ -376,7 +376,7 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler bool m_useDisplayControlHWStereo; - /*!< @brief position behavior of ass subtitiles when setting "subtitle position on screen" set to "fixed" + /*!< @brief position behavior of ass subtitles when setting "subtitle position on screen" set to "fixed" True to show at the fixed position set in video calibration False to show at the bottom of video (default) */ bool m_videoAssFixedWorks; diff --git a/xbmc/settings/MediaSettings.h b/xbmc/settings/MediaSettings.h index 1b2ed1453d..e143f36460 100644 --- a/xbmc/settings/MediaSettings.h +++ b/xbmc/settings/MediaSettings.h @@ -61,7 +61,7 @@ public: const CAudioSettings& GetCurrentAudioSettings() const { return m_currentAudioSettings; } CAudioSettings& GetCurrentAudioSettings() { return m_currentAudioSettings; } - /*! \brief Retreive the watched mode for the given content type + /*! \brief Retrieve the watched mode for the given content type \param content Current content type \return the current watch mode for this content type, WATCH_MODE_ALL if the content type is unknown. \sa SetWatchMode diff --git a/xbmc/settings/dialogs/GUIDialogAudioDSPSettings.h b/xbmc/settings/dialogs/GUIDialogAudioDSPSettings.h index b90c2c50a9..6480f7e7aa 100644 --- a/xbmc/settings/dialogs/GUIDialogAudioDSPSettings.h +++ b/xbmc/settings/dialogs/GUIDialogAudioDSPSettings.h @@ -94,8 +94,8 @@ namespace ActiveAE std::vector<ActiveAE::CActiveAEDSPModePtr> m_ActiveModes; /*!< The process modes currently active on dsp processing stream */ std::vector<ActiveModeData> m_ActiveModesData; /*!< The process modes currently active on dsp processing stream info*/ std::vector<ActiveAE::CActiveAEDSPModePtr> m_MasterModes[AE_DSP_ASTREAM_MAX]; /*!< table about selectable and usable master processing modes */ - std::map<std::string, int> m_MenuPositions; /*!< The differnet menu selection positions */ - std::vector<int> m_MenuHierarchy; /*!< Menu selection flow hierachy */ + std::map<std::string, int> m_MenuPositions; /*!< The different menu selection positions */ + std::vector<int> m_MenuHierarchy; /*!< Menu selection flow hierarchy */ std::vector<MenuHookMember> m_Menus; /*!< storage about present addon menus on currently selected submenu */ std::vector< std::pair<std::string, int> > m_ModeList; /*!< currently present modes */ bool m_GetCPUUsage; /*!< if true cpu usage detection is active */ diff --git a/xbmc/test/TestBasicEnvironment.cpp b/xbmc/test/TestBasicEnvironment.cpp index 15c82ee4c9..6d34fed107 100644 --- a/xbmc/test/TestBasicEnvironment.cpp +++ b/xbmc/test/TestBasicEnvironment.cpp @@ -53,7 +53,7 @@ void TestBasicEnvironment::SetUp() if (!g_application.m_ServiceManager->Init1()) exit(1); - /* NOTE: The below is done to fix memleak warning about unitialized variable + /* NOTE: The below is done to fix memleak warning about uninitialized variable * in xbmcutil::GlobalsSingleton<CAdvancedSettings>::getInstance(). */ g_advancedSettings.Initialize(); diff --git a/xbmc/threads/Atomics.cpp b/xbmc/threads/Atomics.cpp index 6541b221ef..711e6809e5 100644 --- a/xbmc/threads/Atomics.cpp +++ b/xbmc/threads/Atomics.cpp @@ -21,7 +21,7 @@ #include "Atomics.h" /////////////////////////////////////////////////////////////////////////// -// Fast spinlock implmentation. No backoff when busy +// Fast spinlock implementation. No backoff when busy /////////////////////////////////////////////////////////////////////////// CAtomicSpinLock::CAtomicSpinLock(std::atomic_flag& lock) : m_Lock(lock) { diff --git a/xbmc/threads/Event.cpp b/xbmc/threads/Event.cpp index b7e5282de7..db7e0a269d 100644 --- a/xbmc/threads/Event.cpp +++ b/xbmc/threads/Event.cpp @@ -95,7 +95,7 @@ namespace XbmcThreads /** * This will block until any one of the CEvents in the group are - * signaled or the timeout is reachec. If an event is signaled then + * signaled or the timeout is reached. If an event is signaled then * it will return a pointer to that CEvent, otherwise it will return * NULL. */ diff --git a/xbmc/threads/Event.h b/xbmc/threads/Event.h index 5888f07fac..b97d3b9001 100644 --- a/xbmc/threads/Event.h +++ b/xbmc/threads/Event.h @@ -151,7 +151,7 @@ namespace XbmcThreads /** * This will block until any one of the CEvents in the group are - * signaled or the timeout is reachec. If an event is signaled then + * signaled or the timeout is reached. If an event is signaled then * it will return a pointer to that CEvent, otherwise it will return * NULL. */ diff --git a/xbmc/threads/Lockables.h b/xbmc/threads/Lockables.h index 865a258ea1..3f3e83ce34 100644 --- a/xbmc/threads/Lockables.h +++ b/xbmc/threads/Lockables.h @@ -36,7 +36,7 @@ namespace XbmcThreads * try_lock(); * unlock(); * - * "Exitable" specifially means that, no matter how deep the recursion + * "Exitable" specifically means that, no matter how deep the recursion * on the mutex/critical section, we can exit from it and then restore * the state. * @@ -72,7 +72,7 @@ namespace XbmcThreads */ inline unsigned int exit(unsigned int leave = 0) { - // it's possibe we don't actually own the lock + // it's possible we don't actually own the lock // so we will try it. unsigned int ret = 0; if (try_lock()) diff --git a/xbmc/threads/SystemClock.h b/xbmc/threads/SystemClock.h index cea72baa49..4a33fea110 100644 --- a/xbmc/threads/SystemClock.h +++ b/xbmc/threads/SystemClock.h @@ -38,7 +38,7 @@ namespace XbmcThreads * DO NOT compare the results from SystemClockMillis() to an expected end time * that was calculated by adding a number of milliseconds to some start time. * The reason is because the SystemClockMillis could wrap. Instead use this - * class which uses differences (which are safe accross a wrap). + * class which uses differences (which are safe across a wrap). */ class EndTime { diff --git a/xbmc/threads/platform/README.platform b/xbmc/threads/platform/README.platform index a85042f8b7..fc232c399f 100644 --- a/xbmc/threads/platform/README.platform +++ b/xbmc/threads/platform/README.platform @@ -43,8 +43,8 @@ ConditionVariable ConditionVariable - must be implemented to handle a ConditionVariable concept: - tempalte <class L> WaitResponse wait(L& lock); - tempalte <class L> WaitResponse wait(L& lock, int milliseconds); + template <class L> WaitResponse wait(L& lock); + template <class L> WaitResponse wait(L& lock, int milliseconds); void notifyAll(); void notify(); diff --git a/xbmc/threads/platform/pthreads/CriticalSection.h b/xbmc/threads/platform/pthreads/CriticalSection.h index 8de96a144e..983a951bc3 100644 --- a/xbmc/threads/platform/pthreads/CriticalSection.h +++ b/xbmc/threads/platform/pthreads/CriticalSection.h @@ -39,7 +39,7 @@ namespace XbmcThreads pthread_mutexattr_t* getRecursiveAttr(); pthread_mutex_t mutex; - // needs acces to 'mutex' + // needs access to 'mutex' friend class XbmcThreads::ConditionVariable; public: inline RecursiveMutex() { pthread_mutex_init(&mutex,getRecursiveAttr()); } diff --git a/xbmc/threads/platform/pthreads/ThreadImpl.cpp b/xbmc/threads/platform/pthreads/ThreadImpl.cpp index 086c17f32d..70eea3cc6b 100644 --- a/xbmc/threads/platform/pthreads/ThreadImpl.cpp +++ b/xbmc/threads/platform/pthreads/ThreadImpl.cpp @@ -103,7 +103,7 @@ void CThread::SetThreadInfo() // call will fail if (userMaxPrio > 0) { - // start thread with nice level of appication + // start thread with nice level of application int appNice = getpriority(PRIO_PROCESS, getpid()); if (setpriority(PRIO_PROCESS, m_ThreadOpaque.LwpId, appNice) != 0) if (logger) logger->Log(LOGERROR, "%s: error %s", __FUNCTION__, strerror(errno)); @@ -200,7 +200,7 @@ int CThread::GetPriority() { int iReturn; - // lwp id is valid after start signel has fired + // lwp id is valid after start signal has fired m_StartEvent.Wait(); CSingleLock lock(m_CriticalSection); diff --git a/xbmc/threads/platform/win/Condition.h b/xbmc/threads/platform/win/Condition.h index 1900c1df3a..fb73af8b05 100644 --- a/xbmc/threads/platform/win/Condition.h +++ b/xbmc/threads/platform/win/Condition.h @@ -35,7 +35,7 @@ namespace XbmcThreads { CONDITION_VARIABLE cond; - // SleepConditionVarialbeCS requires the condition variable be entered + // SleepConditionVariableCS requires the condition variable be entered // only once. struct AlmostExit { diff --git a/xbmc/threads/platform/win/CriticalSection.h b/xbmc/threads/platform/win/CriticalSection.h index 464a3a1495..2bc7694f2c 100644 --- a/xbmc/threads/platform/win/CriticalSection.h +++ b/xbmc/threads/platform/win/CriticalSection.h @@ -36,7 +36,7 @@ namespace XbmcThreads { CRITICAL_SECTION mutex; - // needs acces to 'mutex' + // needs access to 'mutex' friend class XbmcThreads::ConditionVariable; public: inline RecursiveMutex() diff --git a/xbmc/utils/DatabaseUtils.h b/xbmc/utils/DatabaseUtils.h index 5fa99d21ab..a3f967aab5 100644 --- a/xbmc/utils/DatabaseUtils.h +++ b/xbmc/utils/DatabaseUtils.h @@ -135,7 +135,7 @@ typedef enum { FieldDied, FieldStereoMode, FieldUserRating, - FieldRelevance, // Used for actors' appearences + FieldRelevance, // Used for actors' appearances FieldMax } Field; diff --git a/xbmc/utils/Fanart.cpp b/xbmc/utils/Fanart.cpp index d136cf6918..95744448cc 100644 --- a/xbmc/utils/Fanart.cpp +++ b/xbmc/utils/Fanart.cpp @@ -142,8 +142,8 @@ unsigned int CFanart::GetNumFanarts() const bool CFanart::ParseColors(const std::string &colorsIn, std::string &colorsOut) { // Formats: - // 0: XBMC ARGB Hexadecimal string comma seperated "FFFFFFFF,DDDDDDDD,AAAAAAAA" - // 1: The TVDB RGB Int Triplets, pipe seperate with leading/trailing pipes "|68,69,59|69,70,58|78,78,68|" + // 0: XBMC ARGB Hexadecimal string comma separated "FFFFFFFF,DDDDDDDD,AAAAAAAA" + // 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. diff --git a/xbmc/utils/Fanart.h b/xbmc/utils/Fanart.h index 53464e7074..040a85124b 100644 --- a/xbmc/utils/Fanart.h +++ b/xbmc/utils/Fanart.h @@ -74,7 +74,7 @@ public: /// /// Sets a particular fanart to be the "primary" fanart, or in other words, sets which fanart is actually used by XBMC /// - /// This is the one of the only instances in the public interface where there is any hint that more than one fanart exists, but its by neccesity. + /// This is the one of the only instances in the public interface where there is any hint that more than one fanart exists, but its by necessity. /// \param index: 0 based index of which fanart to set as the primary fanart /// \return A boolean value indicating success or failure. This should only return false if the specified index is not a valid fanart bool SetPrimaryFanart(unsigned int index); @@ -86,7 +86,7 @@ public: /// m_xml contains an XML formatted string which is all fanart packed into one string. /// /// This string is the "interface" as it were to the XBMC database, and MUST be kept in sync with the rest of the class. Therefore - /// anytime this string is changed, the change should be followed up by a call to CFanart::UnPack(). This XML formaytted string is + /// anytime this string is changed, the change should be followed up by a call to CFanart::UnPack(). This XML formatted string is /// also the interface used to pass the fanart data from the scraper to CFanart. std::string m_xml; private: @@ -96,11 +96,11 @@ private: /// /// Supported Formats: /// - /// * The TVDB RGB Int Triplets, pipe seperate with leading/trailing pipes "|68,69,59|69,70,58|78,78,68|" - /// * XBMC ARGB Hexadecimal string comma seperated "FFFFFFFF,DDDDDDDD,AAAAAAAA" + /// * The TVDB RGB Int Triplets, pipe separate with leading/trailing pipes "|68,69,59|69,70,58|78,78,68|" + /// * XBMC ARGB Hexadecimal string comma separated "FFFFFFFF,DDDDDDDD,AAAAAAAA" /// /// \param colorsIn: string containing colors in some format to be converted - /// \param colorsOut: XBMC ARGB Hexadecimal string comma seperated "FFFFFFFF,DDDDDDDD,AAAAAAAA" + /// \param colorsOut: XBMC ARGB Hexadecimal string comma separated "FFFFFFFF,DDDDDDDD,AAAAAAAA" /// \return boolean indicating success or failure. static bool ParseColors(const std::string&colorsIn, std::string&colorsOut); diff --git a/xbmc/utils/FileUtils.h b/xbmc/utils/FileUtils.h index 206469544c..2a0c4b8802 100644 --- a/xbmc/utils/FileUtils.h +++ b/xbmc/utils/FileUtils.h @@ -32,7 +32,7 @@ public: /*! \brief Get the modified date of a file if its invalid it returns the creation date - this behavior changes when you set bUseLatestDate \param strFileNameAndPath path to the file \param bUseLatestDate use the newer datetime of the files mtime and ctime - \return Returns the file date, can return a invalid date if problems occure + \return Returns the file date, can return a invalid date if problems occur */ static CDateTime GetModificationDate(const std::string& strFileNameAndPath, const bool& bUseLatestDate); }; diff --git a/xbmc/utils/GlobalsHandling.h b/xbmc/utils/GlobalsHandling.h index 1e18ede49e..f58eaff90f 100644 --- a/xbmc/utils/GlobalsHandling.h +++ b/xbmc/utils/GlobalsHandling.h @@ -40,7 +40,7 @@ * 'static' variable in a header file - on purpose?) * * There are two different ways to use this pattern when replacing global variables. - * The selection of which one to use depends on whether or not there is a possiblity + * The selection of which one to use depends on whether or not there is a possibility * that the code in the .cpp file for the global can be executed from a static method * somewhere. This may take some explanation. * @@ -48,7 +48,7 @@ * * 1) You can use the reference object std::shared_ptr to access the global variable. * - * This would be the preferred means since it is (very slightly) more efficent than + * This would be the preferred means since it is (very slightly) more efficient than * the alternative. To use this pattern you replace standard static references to * the global with access through the reference. If you use the C preprocessor to * do this for you can put the following code in the header file where the global's @@ -135,7 +135,7 @@ namespace xbmcutil * effectively 'reset' the shared pointer after it had been set by the prior * getInstance call, and a second instance would be created. We really don't * want this to happen so 'instance' is a pointer to a smart pointer so that - * we can deterministally handle its construction. It is guarded by the + * we can deterministically handle its construction. It is guarded by the * Deleter class above so that when the bss segment that this static is * sitting in is deinitialized, the shared_ptr pointer will be cleaned up. */ @@ -149,7 +149,7 @@ namespace xbmcutil /** * Retrieve an instance of the singleton using a shared pointer for - * referenece counting. + * reference counting. */ inline static std::shared_ptr<T> getInstance() { diff --git a/xbmc/utils/Job.h b/xbmc/utils/Job.h index 2378214fa2..89afe0b436 100644 --- a/xbmc/utils/Job.h +++ b/xbmc/utils/Job.h @@ -81,7 +81,7 @@ class CJobManager; /*! \ingroup jobs - \brief Base class for jobs that are executed asyncronously. + \brief Base class for jobs that are executed asynchronously. Clients of the CJobManager should subclass CJob and provide the DoWork() function. Data should be passed to the job on creation, and any data sharing between the job and the client should be kept to within diff --git a/xbmc/utils/JobManager.h b/xbmc/utils/JobManager.h index 371ef74529..48bcc5a537 100644 --- a/xbmc/utils/JobManager.h +++ b/xbmc/utils/JobManager.h @@ -329,7 +329,7 @@ protected: bool OnJobProgress(unsigned int progress, unsigned int total, const CJob *job) const; private: - // private construction, and no assignements; use the provided singleton methods + // private construction, and no assignments; use the provided singleton methods CJobManager(); CJobManager(const CJobManager&); CJobManager const& operator=(CJobManager const&); diff --git a/xbmc/utils/LabelFormatter.cpp b/xbmc/utils/LabelFormatter.cpp index 9f912bd3ec..9e3ed4da13 100644 --- a/xbmc/utils/LabelFormatter.cpp +++ b/xbmc/utils/LabelFormatter.cpp @@ -102,7 +102,7 @@ using namespace MUSIC_INFO; * %Y - Year * %Z - tvshow title * %a - Date Added - * %c - Relevance - Used for actors' appearences + * %c - Relevance - Used for actors' appearances * %d - Date and Time * %p - Last Played * %r - User Rating diff --git a/xbmc/utils/ScraperParser.h b/xbmc/utils/ScraperParser.h index 8129ef7e75..26e32e2a82 100644 --- a/xbmc/utils/ScraperParser.h +++ b/xbmc/utils/ScraperParser.h @@ -67,7 +67,7 @@ private: to a different type of XML document, ready to be output direct to the album loaders or similar \param input the input document - \param dest the output destation for the conversion + \param dest the output destination for the conversion \param element the current XML element \param bAppend append or clear the buffer */ diff --git a/xbmc/utils/SortUtils.h b/xbmc/utils/SortUtils.h index e49c4fe32e..76ce5bc92e 100644 --- a/xbmc/utils/SortUtils.h +++ b/xbmc/utils/SortUtils.h @@ -86,7 +86,7 @@ typedef enum { SortByAlbumType, /// __14__ : Sort by genre <em>(String: <b><c>Genre</c></b>)</em> SortByGenre, - /// __15__ : Sort by coutry <em>(String: <b><c>Country</c></b>)</em> + /// __15__ : Sort by country <em>(String: <b><c>Country</c></b>)</em> SortByCountry, /// __16__ : Sort by year <em>(String: <b><c>Year</c></b>)</em> SortByYear, diff --git a/xbmc/utils/StringUtils.h b/xbmc/utils/StringUtils.h index ce30461326..35efb8f56c 100644 --- a/xbmc/utils/StringUtils.h +++ b/xbmc/utils/StringUtils.h @@ -125,7 +125,7 @@ public: an array containing an empty string). Delimiter strings are applied in order, so once the (optional) maximum number of - items is produced no other delimters are applied. This produces different results + items is produced no other delimiters are applied. This produces different results to applying all delimiters at once e.g. "a/b#c/d" becomes "a", "b#c", "d" rather than "a", "b", "c/d" diff --git a/xbmc/utils/URIUtils.h b/xbmc/utils/URIUtils.h index 2fb4c02d38..8abf64e94b 100644 --- a/xbmc/utils/URIUtils.h +++ b/xbmc/utils/URIUtils.h @@ -50,7 +50,7 @@ public: /*! \brief Check if filename have any of the listed extensions \param strFileName Path or URL to check - \param strExtensions List of '.' prefixed lowercase extensions seperated with '|' + \param strExtensions List of '.' prefixed lowercase extensions separated with '|' \return \e true if strFileName have any one of the extensions. \note The check is case insensitive for strFileName, but requires strExtensions to be lowercase. Returns false when strFileName or @@ -90,7 +90,7 @@ public: static std::string SubstitutePath(const std::string& strPath, bool reverse = false); /*! \brief Check whether a URL is a given URL scheme. - Comparison is case-insensitve as per RFC1738 + Comparison is case-insensitive as per RFC1738 \param url a std::string path. \param type a lower-case scheme name, e.g. "smb". \return true if the url is of the given scheme, false otherwise. diff --git a/xbmc/utils/Weather.h b/xbmc/utils/Weather.h index 2f9f826375..c6bf1fc58f 100644 --- a/xbmc/utils/Weather.h +++ b/xbmc/utils/Weather.h @@ -107,9 +107,9 @@ private: void SetFromProperties(); - /*! \brief Formats a celcius temperature into a string based on the users locale + /*! \brief Formats a celsius temperature into a string based on the users locale \param text the string to format - \param temp the temperature (in degrees celcius). + \param temp the temperature (in degrees celsius). */ static void FormatTemperature(std::string &text, double temp); diff --git a/xbmc/utils/fstrcmp.c b/xbmc/utils/fstrcmp.c index 3b0cc233c1..57843a317c 100644 --- a/xbmc/utils/fstrcmp.c +++ b/xbmc/utils/fstrcmp.c @@ -83,7 +83,7 @@ static int similar_text(const char *str1, const char *str2, int len1, int len2) symbol tables occur. RETURNS - double; 0 if the strings are entirly dissimilar, 1 if the + double; 0 if the strings are entirely dissimilar, 1 if the strings are identical, and a number in between if they are similar. */ diff --git a/xbmc/utils/win32/gpu_memcpy_sse4.h b/xbmc/utils/win32/gpu_memcpy_sse4.h index 5fbea9d99d..fb0d07b72a 100644 --- a/xbmc/utils/win32/gpu_memcpy_sse4.h +++ b/xbmc/utils/win32/gpu_memcpy_sse4.h @@ -76,7 +76,7 @@ inline void* gpu_memcpy(void* d, const void* s, size_t size) xmm15 = _mm_stream_load_si128(pSrc + 15); #endif pSrc += regsInLoop; - // _mm_store_si128 emit the SSE2 intruction MOVDQA (aligned store) + // _mm_store_si128 emit the SSE2 instruction MOVDQA (aligned store) _mm_store_si128(pTrg , xmm0); _mm_store_si128(pTrg + 1, xmm1); _mm_store_si128(pTrg + 2, xmm2); @@ -110,7 +110,7 @@ inline void* gpu_memcpy(void* d, const void* s, size_t size) } } - // Copy last bytes - shouldn't happen as strides are modulu 16 + // Copy last bytes - shouldn't happen as strides are modulo 16 if (reminder) { __m128i temp = _mm_stream_load_si128(pSrc + end); diff --git a/xbmc/video/GUIViewStateVideo.cpp b/xbmc/video/GUIViewStateVideo.cpp index abcaee8b1f..7bfc9b2f3e 100644 --- a/xbmc/video/GUIViewStateVideo.cpp +++ b/xbmc/video/GUIViewStateVideo.cpp @@ -98,7 +98,7 @@ CGUIViewStateWindowVideoNav::CGUIViewStateWindowVideoNav(const CFileItemList& it case NODE_TYPE_ACTOR: { AddSortMethod(SortByLabel, 551, LABEL_MASKS("%T", "%R", "%L", "")); // Title, Rating | Label, empty - AddSortMethod(SortByRelevance, 38026, LABEL_MASKS("%T", "%c", "%L", "%c")); // Title, Actor's appearences (Relevance) | Label, Actor's appearences (Relevance) + AddSortMethod(SortByRelevance, 38026, LABEL_MASKS("%T", "%c", "%L", "%c")); // Title, Actor's appearances (Relevance) | Label, Actor's appearances (Relevance) SetSortMethod(SortByLabel); const CViewState *viewState = CViewStateSettings::GetInstance().Get("videonavactors"); @@ -200,10 +200,10 @@ CGUIViewStateWindowVideoNav::CGUIViewStateWindowVideoNav(const CFileItemList& it } else { - AddSortMethod(SortByEpisodeNumber, 20359, LABEL_MASKS("%H. %T","%R")); // Order. Title, Rating | emtpy, empty - AddSortMethod(SortByRating, 563, LABEL_MASKS("%H. %T", "%R")); // Order. Title, Rating | emtpy, empty - AddSortMethod(SortByUserRating, 38018, LABEL_MASKS("%H. %T", "%r")); // Order. Title, Userrating | emtpy, empty - AddSortMethod(SortByMPAA, 20074, LABEL_MASKS("%H. %T", "%O")); // Order. Title, MPAA | emtpy, empty + AddSortMethod(SortByEpisodeNumber, 20359, LABEL_MASKS("%H. %T","%R")); // Order. Title, Rating | empty, empty + AddSortMethod(SortByRating, 563, LABEL_MASKS("%H. %T", "%R")); // Order. Title, Rating | empty, empty + AddSortMethod(SortByUserRating, 38018, LABEL_MASKS("%H. %T", "%r")); // Order. Title, Userrating | empty, empty + AddSortMethod(SortByMPAA, 20074, LABEL_MASKS("%H. %T", "%O")); // Order. Title, MPAA | empty, empty AddSortMethod(SortByProductionCode, 20368, LABEL_MASKS("%H. %T","%P", "%H. %T","%P")); // Order. Title, ProductionCode | Episode. Title, ProductionCode AddSortMethod(SortByDate, 552, LABEL_MASKS("%H. %T","%J","%H. %T","%J")); // Order. Title, Date | Episode. Title, Date diff --git a/xbmc/video/Teletext.cpp b/xbmc/video/Teletext.cpp index c5230d22ff..b679d58a17 100644 --- a/xbmc/video/Teletext.cpp +++ b/xbmc/video/Teletext.cpp @@ -1647,7 +1647,7 @@ void CTeletextDecoder::Decode_ADIP() /* additional information table */ return; } - if (b1>8 || b2>9 || b3>9) /* ignore extries with invalid or hex page numbers */ + if (b1>8 || b2>9 || b3>9) /* ignore entries with invalid or hex page numbers */ { continue; } @@ -2747,7 +2747,7 @@ int CTeletextDecoder::RenderChar(color_t *buffer, // pointer to render buffer TextPageinfo_t* CTeletextDecoder::DecodePage(bool showl25, // 1=decode Level2.5-graphics unsigned char* PageChar, // page buffer, min. 25*40 - TextPageAttr_t *PageAtrb, // attribut buffer, min 25*40 + TextPageAttr_t *PageAtrb, // attribute buffer, min 25*40 bool HintMode, // 1=show hidden information bool showflof) // 1=decode FLOF-line { @@ -2899,7 +2899,7 @@ TextPageinfo_t* CTeletextDecoder::DecodePage(bool showl25, // 1=deco held_mosaic = ' '; dhset = 0; IgnoreAtBlackBgSubst = 0; - mosaic_pending = esc_pending = 0; // we need to render at least one mosaic char if 'esc' is received immediatly after mosac charset switch on + mosaic_pending = esc_pending = 0; // we need to render at least one mosaic char if 'esc' is received immediately after mosaic charset switch on if (boxed && memchr(&PageChar[row*40], start_box, 40) == 0) { diff --git a/xbmc/video/Teletext.h b/xbmc/video/Teletext.h index 40cb72a0d3..73f6008a73 100644 --- a/xbmc/video/Teletext.h +++ b/xbmc/video/Teletext.h @@ -111,7 +111,7 @@ private: int Ascender); TextPageinfo_t* DecodePage(bool showl25, // 1=decode Level2.5-graphics unsigned char* PageChar, // page buffer, min. 25*40 - TextPageAttr_t *PageAtrb, // attribut buffer, min 25*40 + TextPageAttr_t *PageAtrb, // attribute buffer, min 25*40 bool HintMode, // 1=show hidden information bool showflof); // 1=decode FLOF-line void Eval_l25(unsigned char* page_char, TextPageAttr_t *PageAtrb, bool HintMode); diff --git a/xbmc/video/TeletextDefines.h b/xbmc/video/TeletextDefines.h index 2a519f59b5..8ac64778f0 100644 --- a/xbmc/video/TeletextDefines.h +++ b/xbmc/video/TeletextDefines.h @@ -48,9 +48,9 @@ enum /* indices in atrtable */ ATR_MSGDRM1, /* message */ ATR_MSGDRM2, /* message */ ATR_MSGDRM3, /* message */ - ATR_MENUHIL0, /* hilit menu line */ - ATR_MENUHIL1, /* hilit menu line */ - ATR_MENUHIL2, /* hilit menu line */ + ATR_MENUHIL0, /* highlight menu line */ + ATR_MENUHIL1, /* highlight menu line */ + ATR_MENUHIL2, /* highlight menu line */ ATR_MENU0, /* menu line */ ATR_MENU1, /* menu line */ ATR_MENU2, /* menu line */ diff --git a/xbmc/video/VideoDatabase.cpp b/xbmc/video/VideoDatabase.cpp index 00844ff993..feb5968203 100644 --- a/xbmc/video/VideoDatabase.cpp +++ b/xbmc/video/VideoDatabase.cpp @@ -927,7 +927,7 @@ void CVideoDatabase::UpdateFileDateAdded(int idFile, const std::string& strFileN if (!finalDateAdded.IsValid()) { - // 1 prefering to use the files mtime(if it's valid) and only using the file's ctime if the mtime isn't valid + // 1 preferring to use the files mtime(if it's valid) and only using the file's ctime if the mtime isn't valid if (g_advancedSettings.m_iVideoLibraryDateAdded == 1) finalDateAdded = CFileUtils::GetModificationDate(strFileNameAndPath, false); //2 using the newer datetime of the file's mtime and ctime @@ -3122,7 +3122,7 @@ void CVideoDatabase::ClearBookMarkOfFile(const std::string& strFilenameAndPath, if (NULL == m_pDB.get()) return ; if (NULL == m_pDS.get()) return ; - /* a litle bit uggly, we clear first bookmark that is within one second of given */ + /* a little bit uggly, 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.5f; double maxtime = bookmark.timeInSeconds + 0.5f; @@ -3269,7 +3269,7 @@ void CVideoDatabase::DeleteMovie(int idMovie, bool bKeepId /* = false */) // keep the movie table entry, linking to tv shows, and bookmarks // so we can update the data in place - // the ancilliary tables are still purged + // the ancillary tables are still purged if (!bKeepId) { int idFile = GetDbId(PrepareSQL("SELECT idFile FROM movie WHERE idMovie=%i", idMovie)); @@ -3415,7 +3415,7 @@ void CVideoDatabase::DeleteEpisode(int idEpisode, bool bKeepId /* = false */) AnnounceRemove(MediaTypeEpisode, idEpisode); // keep episode table entry and bookmarks so we can update the data in place - // the ancilliary tables are still purged + // the ancillary tables are still purged if (!bKeepId) { int idFile = GetDbId(PrepareSQL("SELECT idFile FROM episode WHERE idEpisode=%i", idEpisode)); @@ -3454,7 +3454,7 @@ void CVideoDatabase::DeleteMusicVideo(int idMVideo, bool bKeepId /* = false */) BeginTransaction(); // keep the music video table entry and bookmarks so we can update data in place - // the ancilliary tables are still purged + // the ancillary tables are still purged if (!bKeepId) { int idFile = GetDbId(PrepareSQL("SELECT idFile FROM musicvideo WHERE idMVideo=%i", idMVideo)); diff --git a/xbmc/video/VideoDatabase.h b/xbmc/video/VideoDatabase.h index 716a4aa58a..392d3e607e 100644 --- a/xbmc/video/VideoDatabase.h +++ b/xbmc/video/VideoDatabase.h @@ -521,7 +521,7 @@ public: int SetDetailsForMovie(const std::string& strFilenameAndPath, CVideoInfoTag& details, const std::map<std::string, std::string> &artwork, int idMovie = -1); int SetDetailsForMovieSet(const CVideoInfoTag& details, const std::map<std::string, std::string> &artwork, int idSet = -1); - /*! \brief add a tvshow to the library, setting metdata detail + /*! \brief add a tvshow to the library, setting metadata detail First checks for whether this TV Show is already in the database (based on idTvShow, or via GetMatchingTvShow) and if present adds the paths to the show. If not present, we add a new show and set the show metadata. \param paths a vector<string,string> list of the path(s) and parent path(s) for the show. @@ -665,7 +665,7 @@ public: */ bool GetPathsLinkedToTvShow(int idShow, std::vector<std::string> &paths); - /*! \brief retrieve subpaths of a given path. Assumes a heirarchical folder structure + /*! \brief retrieve subpaths of a given path. Assumes a hierarchical folder structure \param basepath the root path to retrieve subpaths for \param subpaths the returned subpaths \return true if we successfully retrieve subpaths (may be zero), false on error diff --git a/xbmc/video/VideoInfoScanner.cpp b/xbmc/video/VideoInfoScanner.cpp index 4453aa66de..5f8dbf85bc 100644 --- a/xbmc/video/VideoInfoScanner.cpp +++ b/xbmc/video/VideoInfoScanner.cpp @@ -858,7 +858,7 @@ namespace VIDEO if (StringUtils::EqualsNoCase(strPathY, strPathX)) /* remove everything sorted below the video_ts.ifo file in the same path. - understandbly this wont stack correctly if there are other files in the the dvd folder. + understandably this wont stack correctly if there are other files in the the dvd folder. this should be unlikely and thus is being ignored for now but we can monitor the where the path changes and potentially remove the items above the video_ts.ifo file. */ diff --git a/xbmc/video/VideoInfoScanner.h b/xbmc/video/VideoInfoScanner.h index d7ca10b660..c1c8bb7acb 100644 --- a/xbmc/video/VideoInfoScanner.h +++ b/xbmc/video/VideoInfoScanner.h @@ -214,7 +214,7 @@ namespace VIDEO /*! \brief Decide whether a folder listing could use the "fast" hash Fast hashing can be done whenever the folder contains no scannable subfolders, as the fast hash technique uses modified time to determine when folder content changes, which - is generally not propogated up the directory tree. + is generally not propagated up the directory tree. \param items the directory listing \param excludes string array of exclude expressions \return true if this directory listing can be fast hashed, false otherwise diff --git a/xbmc/video/VideoLibraryQueue.h b/xbmc/video/VideoLibraryQueue.h index b3e04eb8ce..eeb6e219df 100644 --- a/xbmc/video/VideoLibraryQueue.h +++ b/xbmc/video/VideoLibraryQueue.h @@ -121,7 +121,7 @@ public: /*! \brief Cancels the given job and removes it from the queue. - \param[in] job Video library job to be canceld and removed from the queue. + \param[in] job Video library job to be canceled and removed from the queue. */ void CancelJob(CVideoLibraryJob *job); diff --git a/xbmc/video/VideoThumbLoader.cpp b/xbmc/video/VideoThumbLoader.cpp index 44ac745310..a1bb0d00fe 100644 --- a/xbmc/video/VideoThumbLoader.cpp +++ b/xbmc/video/VideoThumbLoader.cpp @@ -260,7 +260,7 @@ std::vector<std::string> CVideoThumbLoader::GetArtTypes(const std::string &type) /** * Look for a thumbnail for pItem. If one does not exist, look for an autogenerated * thumbnail. If that does not exist, attempt to autogenerate one. Finally, check - * for the existance of fanart and set properties accordingly. + * for the existence of fanart and set properties accordingly. * @return: true if pItem has been modified */ bool CVideoThumbLoader::LoadItem(CFileItem* pItem) diff --git a/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp b/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp index f46c72a866..ac501f769d 100644 --- a/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp +++ b/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp @@ -362,7 +362,7 @@ void CGUIDialogAudioSubtitleSettings::InitializeSettings() AddToggle(groupAudio, SETTING_AUDIO_PASSTHROUGH, 348, 0, m_passthrough); } - // subitlte settings + // subtitle settings m_subtitleVisible = g_application.m_pPlayer->GetSubtitleVisible(); // subtitle enabled setting AddToggle(groupSubtitles, SETTING_SUBTITLE_ENABLE, 13397, 0, m_subtitleVisible); diff --git a/xbmc/video/windows/GUIWindowVideoBase.cpp b/xbmc/video/windows/GUIWindowVideoBase.cpp index 5bd56dc564..909689dca1 100644 --- a/xbmc/video/windows/GUIWindowVideoBase.cpp +++ b/xbmc/video/windows/GUIWindowVideoBase.cpp @@ -460,7 +460,7 @@ void CGUIWindowVideoBase::OnQueueItem(int iItem) void CGUIWindowVideoBase::AddItemToPlayList(const CFileItemPtr &pItem, CFileItemList &queuedItems) { - if (!pItem->CanQueue() || pItem->IsRAR() || pItem->IsZIP() || pItem->IsParentFolder()) // no zip/rar enques thank you! + if (!pItem->CanQueue() || pItem->IsRAR() || pItem->IsZIP() || pItem->IsParentFolder()) // no zip/rar enqueues thank you! return; if (pItem->m_bIsFolder) @@ -1254,7 +1254,7 @@ void CGUIWindowVideoBase::LoadPlayList(const std::string& strPlayList, int iPlay void CGUIWindowVideoBase::PlayItem(int iItem, const std::string &player) { - // restrictions should be placed in the appropiate window code + // restrictions should be placed in the appropriate window code // only call the base code if the item passes since this clears // the currently playing temp playlist @@ -1370,7 +1370,7 @@ void CGUIWindowVideoBase::GetGroupedItems(CFileItemList &items) if (items.HasProperty(PROPERTY_GROUP_MIXED)) mixed = items.GetProperty(PROPERTY_GROUP_MIXED).asBoolean(); - // group == "none" completely supresses any grouping + // group == "none" completely suppresses any grouping if (!StringUtils::EqualsNoCase(group, "none")) { CQueryParams params; diff --git a/xbmc/video/windows/GUIWindowVideoNav.cpp b/xbmc/video/windows/GUIWindowVideoNav.cpp index c3c0ed5d62..ecec9b328c 100644 --- a/xbmc/video/windows/GUIWindowVideoNav.cpp +++ b/xbmc/video/windows/GUIWindowVideoNav.cpp @@ -132,7 +132,7 @@ bool CGUIWindowVideoNav::OnMessage(CGUIMessage& message) return false; // This needs to be done again, because the initialization of CGUIWindow overwrites it with default values - // Mostly affects cases where GUIWindowViedeoNav is constructed and we're already in a show, e.g. entering from the homesceen + // Mostly affects cases where GUIWindowVideoNav is constructed and we're already in a show, e.g. entering from the homescreen SelectFirstUnwatched(); return true; @@ -262,7 +262,7 @@ int CGUIWindowVideoNav::GetFirstUnwatchedItemIndex(bool includeAllSeasons, bool int iUnwatchedEpisode = INT_MAX; // Now run through the list of items and check episodes from the season identified above - // to find the first (lowest episode number) unwatched epsisode. + // to find the first (lowest episode number) unwatched episode. for (int i = 0; i < m_vecItems->Size(); ++i) { CFileItemPtr pItem = m_vecItems->Get(i); @@ -271,7 +271,7 @@ int CGUIWindowVideoNav::GetFirstUnwatchedItemIndex(bool includeAllSeasons, bool CVideoInfoTag *pTag = pItem->GetVideoInfoTag(); - // Does the episode belong to the unwatched season and Is the episode unwatched, and is its epsiode number + // Does the episode belong to the unwatched season and Is the episode unwatched, and is its episode number // lower than the currently identified first unwatched episode if (pTag->m_iSeason == iUnwatchedSeason && pTag->GetPlayCount() == 0 && pTag->m_iEpisode < iUnwatchedEpisode) { @@ -544,7 +544,7 @@ void CGUIWindowVideoNav::LoadVideoInfo(CFileItemList &items, CVideoDatabase &dat CFileItemList dbItems; /* NOTE: In the future when GetItemsForPath returns all items regardless of whether they're "in the library" - we won't need the fetchedPlayCounts code, and can "simply" do this directly on absense of content. */ + we won't need the fetchedPlayCounts code, and can "simply" do this directly on absence of content. */ bool fetchedPlayCounts = false; if (!content.empty()) { diff --git a/xbmc/windowing/WinSystem.h b/xbmc/windowing/WinSystem.h index 80ba5f6235..d67a2a9298 100644 --- a/xbmc/windowing/WinSystem.h +++ b/xbmc/windowing/WinSystem.h @@ -72,7 +72,7 @@ public: virtual void NotifyAppActiveChange(bool bActivated) {} virtual void ShowOSMouse(bool show) {}; virtual bool HasCursor(){ return true; } - //some plattforms have api for gesture inertial scrolling - default to false and use the InertialScrollingHandler + //some platforms have api for gesture inertial scrolling - default to false and use the InertialScrollingHandler virtual bool HasInertialGestures(){ return false; } //does the output expect limited color range (ie 16-235) virtual bool UseLimitedColor(); diff --git a/xbmc/windowing/egl/EGLNativeType.h b/xbmc/windowing/egl/EGLNativeType.h index aa5a1c5472..3000431f3c 100644 --- a/xbmc/windowing/egl/EGLNativeType.h +++ b/xbmc/windowing/egl/EGLNativeType.h @@ -58,7 +58,7 @@ public: \sa: Destroy() */ virtual ~CEGLNativeType(){}; -/*! \brief Unique identifier for this EGL implementaiton. +/*! \brief Unique identifier for this EGL implementation. It should be unique enough to set it apart from other possible implementations on a similar platform. */ diff --git a/xbmc/windowing/egl/EGLNativeTypeRaspberryPI.cpp b/xbmc/windowing/egl/EGLNativeTypeRaspberryPI.cpp index 2ac6541bb0..6ec0f110ca 100644 --- a/xbmc/windowing/egl/EGLNativeTypeRaspberryPI.cpp +++ b/xbmc/windowing/egl/EGLNativeTypeRaspberryPI.cpp @@ -362,7 +362,7 @@ bool CEGLNativeTypeRaspberryPI::SetNativeResolution(const RESOLUTION_INFO &res) (DISPMANX_RESOURCE_HANDLE_T)0, // src &src_rect, DISPMANX_PROTECTION_NONE, - &alpha, //alphe + &alpha, //alpha &clamp, //clamp transform); // transform @@ -488,7 +488,7 @@ bool CEGLNativeTypeRaspberryPI::ProbeResolutions(std::vector<RESOLUTION_INFO> &r /* read initial desktop resolution before probe resolutions. * probing will replace the desktop resolution when it finds the same one. - * we raplace it because probing will generate more detailed + * we replace it because probing will generate more detailed * resolution flags we don't get with vc_tv_get_state. */ diff --git a/xbmc/windowing/osx/WinSystemIOS.mm b/xbmc/windowing/osx/WinSystemIOS.mm index 89fb261d13..a2e74332a4 100644 --- a/xbmc/windowing/osx/WinSystemIOS.mm +++ b/xbmc/windowing/osx/WinSystemIOS.mm @@ -219,7 +219,7 @@ bool CWinSystemIOS::GetScreenResolution(int* w, int* h, double* fps, int screenI *w = screenSize.width; *h = screenSize.height; *fps = 0.0; - //if current mode is 0x0 (happens with external screens which arn't active) + //if current mode is 0x0 (happens with external screens which aren't active) //then use the preferred mode if(*h == 0 || *w ==0) { @@ -267,7 +267,7 @@ void CWinSystemIOS::UpdateResolutions() } } - //now just fill in the possible reolutions for the attached screens + //now just fill in the possible resolutions for the attached screens //and push to the resolution info vector FillInVideoModes(); } @@ -284,7 +284,7 @@ void CWinSystemIOS::FillInVideoModes() // atm we don't get refreshrate info from iOS // but this may change in the future. In that case // we will adapt this code for filling some - // usefull info into this local var :) + // useful info into this local var :) double refreshrate = 0.0; //screen 0 is mainscreen - 1 has to be the external one... UIScreen *aScreen = [[UIScreen screens]objectAtIndex:disp]; @@ -302,7 +302,7 @@ void CWinSystemIOS::FillInVideoModes() //That would cause problems with saving screen overscan calibration //because the wrong entry is picked on load. //So we just use UpdateDesktopResolutions for the current DESKTOP_RESOLUTIONS - //in UpdateResolutions. And on all othere resolutions make a unique + //in UpdateResolutions. And on all other resolutions make a unique //mode str by doing it without appending "Full Screen". //this is what linux does - though it feels that there shouldn't be //the same resolution twice... - thats why i add a FIXME here. @@ -416,7 +416,7 @@ void CWinSystemIOS::DeinitDisplayLink(void) [m_pDisplayLink->callbackClass SetVideoSyncImpl:nil]; } } -//------------DispalyLink stuff end +//------------DisplayLink stuff end //-------------------------------------------------------------- void CWinSystemIOS::PresentRenderImpl(bool rendered) diff --git a/xbmc/windowing/osx/WinSystemOSX.mm b/xbmc/windowing/osx/WinSystemOSX.mm index 355c868700..752e8655a8 100644 --- a/xbmc/windowing/osx/WinSystemOSX.mm +++ b/xbmc/windowing/osx/WinSystemOSX.mm @@ -747,7 +747,7 @@ bool CWinSystemOSX::ResizeWindow(int newWidth, int newHeight, int newLeft, int n [view setFrameSize:NSMakeSize(newWidth, newHeight)]; [context update]; // this is needed in case we traverse from fullscreen screen 2 - // to windowed on screen 1 directly where in ScreenChangedNotitication + // to windowed on screen 1 directly where in ScreenChangedNotification // we don't have a window to get the current screen on // in that case ResizeWindow is called at a later stage from SetFullScreen(false) // and we can grab the correct display number here then @@ -850,12 +850,12 @@ bool CWinSystemOSX::SetFullScreen(bool fullScreen, RESOLUTION_INFO& res, bool bl if (CServiceBroker::GetSettings().GetBool(CSettings::SETTING_VIDEOSCREEN_FAKEFULLSCREEN)) { - // This is Cocca Windowed FullScreen Mode + // This is Cocoa Windowed FullScreen Mode // Get the screen rect of our current display NSScreen* pScreen = [[NSScreen screens] objectAtIndex:res.iScreen]; NSRect screenRect = [pScreen frame]; - // remove frame origin offset of orginal display + // remove frame origin offset of original display screenRect.origin = NSZeroPoint; // make a new window to act as the windowedFullScreen @@ -989,7 +989,7 @@ bool CWinSystemOSX::SetFullScreen(bool fullScreen, RESOLUTION_INFO& res, bool bl // Assign view from old context, move back to original screen. [newContext setView:last_view]; [[last_view window] setFrameOrigin:last_window_origin]; - // return the mouse bounds in SDL view to prevous size + // return the mouse bounds in SDL view to previous size [ last_view setFrameSize:last_view_size ]; [ last_view setFrameOrigin:last_view_origin ]; // done with restoring windowed window, don't set last_view to NULL as we can lose it under dual displays. @@ -1064,7 +1064,7 @@ void CWinSystemOSX::UpdateResolutions() if (m_can_display_switch) { - // now just fill in the possible reolutions for the attached screens + // now just fill in the possible resolutions for the attached screens // and push to the resolution info vector FillInVideoModes(); } @@ -1311,7 +1311,7 @@ void CWinSystemOSX::FillInVideoModes() // That would cause problems with saving screen overscan calibration // because the wrong entry is picked on load. // So we just use UpdateDesktopResolutions for the current DESKTOP_RESOLUTIONS - // in UpdateResolutions. And on all othere resolutions make a unique + // in UpdateResolutions. And on all other resolutions make a unique // mode str by doing it without appending "Full Screen". // this is what linux does - though it feels that there shouldn't be // the same resolution twice... - thats why i add a FIXME here. @@ -1367,8 +1367,8 @@ bool CWinSystemOSX::IsObscured(void) if ([window isVisible] == NO) { - // not visable means the window is not showing. - // this should never really happen as we are always visable + // not visible means the window is not showing. + // this should never really happen as we are always visible // even when minimized in dock. m_obscured = true; return m_obscured; @@ -1430,7 +1430,7 @@ bool CWinSystemOSX::IsObscured(void) // Ignore known brightness tools for dimming the screen. They claim to cover // the whole XBMC window and therefore would make the framerate limiter - // kicking in. Unfortunatly even the alpha of these windows is 1.0 so + // kicking in. Unfortunately even the alpha of these windows is 1.0 so // we have to check the ownerName. if (CFStringCompare(ownerName, CFSTR("Shades"), 0) == kCFCompareEqualTo || CFStringCompare(ownerName, CFSTR("SmartSaver"), 0) == kCFCompareEqualTo || @@ -1461,7 +1461,7 @@ bool CWinSystemOSX::IsObscured(void) break; } - // handle overlaping windows above us that combine + // handle overlapping windows above us that combine // to obscure by collecting any partial overlaps, // then subtract them from our bounds and check // for any remaining area. diff --git a/xbmc/windowing/windows/WinSystemWin32.h b/xbmc/windowing/windows/WinSystemWin32.h index f220cefcd0..d5aebef1a4 100644 --- a/xbmc/windowing/windows/WinSystemWin32.h +++ b/xbmc/windowing/windows/WinSystemWin32.h @@ -66,7 +66,7 @@ struct MONITOR_DETAILS #define GC_ALLGESTURES 0x00000001 -// Zoom Gesture Confiration Flags +// Zoom Gesture Configuration Flags #define GC_ZOOM 0x00000001 // Pan Gesture Configuration Flags diff --git a/xbmc/windows/GUIMediaWindow.cpp b/xbmc/windows/GUIMediaWindow.cpp index 42549ac0d6..684dcd24d0 100644 --- a/xbmc/windows/GUIMediaWindow.cpp +++ b/xbmc/windows/GUIMediaWindow.cpp @@ -1088,7 +1088,7 @@ void CGUIMediaWindow::ShowShareErrorMessage(CFileItem* pItem) CGUIDialogOK::ShowAndGetInput(CVariant{220}, CVariant{idMessageText}); } -// \brief The functon goes up one level in the directory tree +// \brief The function goes up one level in the directory tree bool CGUIMediaWindow::GoParentFolder() { if (m_vecItems->IsVirtualDirectoryRoot()) @@ -1186,10 +1186,10 @@ void CGUIMediaWindow::GetDirectoryHistoryString(const CFileItem* pItem, std::str { if (pItem->m_bIsShareOrDrive) { - // We are in the virual directory + // We are in the virtual directory // History string of the DVD drive - // must be handel separately + // must be handled separately if (pItem->m_iDriveType == CMediaSource::SOURCE_TYPE_DVD) { // Remove disc label from item label @@ -1210,7 +1210,7 @@ void CGUIMediaWindow::GetDirectoryHistoryString(const CFileItem* pItem, std::str } else { - // Other items in virual directory + // Other items in virtual directory std::string strPath = pItem->GetPath(); URIUtils::RemoveSlashAtEnd(strPath); @@ -1393,7 +1393,7 @@ bool CGUIMediaWindow::OnPlayAndQueueMedia(const CFileItemPtr &item, std::string return true; } -// \brief Synchonize the fileitems with the playlistplayer +// \brief Synchronize the fileitems with the playlistplayer // It recreated the playlist of the playlistplayer based // on the fileitems of the window void CGUIMediaWindow::UpdateFileList() diff --git a/xbmc/windows/GUIWindowFileManager.cpp b/xbmc/windows/GUIWindowFileManager.cpp index 96a81b23bd..d2748f2f86 100644 --- a/xbmc/windows/GUIWindowFileManager.cpp +++ b/xbmc/windows/GUIWindowFileManager.cpp @@ -848,7 +848,7 @@ void CGUIWindowFileManager::GetDirectoryHistoryString(const CFileItem* pItem, st // We are in the virtual directory // History string of the DVD drive - // must be handel separately + // must be handled separately if (pItem->m_iDriveType == CMediaSource::SOURCE_TYPE_DVD) { // Remove disc label from item label |