[Scummvm-git-logs] scummvm master -> 4533e12280dac5d525fb7ad50c0916b808ecb240

bluegr noreply at scummvm.org
Sun Sep 15 23:13:52 UTC 2024


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4533e12280 JANITORIAL: BACKENDS: Fix typos


Commit: 4533e12280dac5d525fb7ad50c0916b808ecb240
    https://github.com/scummvm/scummvm/commit/4533e12280dac5d525fb7ad50c0916b808ecb240
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-16T02:13:34+03:00

Commit Message:
JANITORIAL: BACKENDS: Fix typos

Changed paths:
    backends/graphics/opengl/framebuffer.h
    backends/mixer/sdl/sdl-mixer.h
    backends/platform/android/events.cpp
    backends/platform/android/org/scummvm/scummvm/zip/ZipEntry.java
    backends/platform/atari/readme.txt
    backends/platform/ios7/ios7_gamepad_controller.mm
    backends/platform/ios7/ios7_keyboard.mm
    backends/platform/ios7/ios7_osys_misc.mm
    backends/platform/psp/png_loader.cpp
    backends/text-to-speech/macosx/macosx-text-to-speech.mm


diff --git a/backends/graphics/opengl/framebuffer.h b/backends/graphics/opengl/framebuffer.h
index 406a6f983a0..53ef00960db 100644
--- a/backends/graphics/opengl/framebuffer.h
+++ b/backends/graphics/opengl/framebuffer.h
@@ -62,7 +62,7 @@ public:
 		 * Newly drawn pixels mix with the framebuffer based on their alpha value
 		 * for transparency.
 		 *
-		 * Requires the image data being drawn to have its color values pre-multipled
+		 * Requires the image data being drawn to have its color values pre-multiplied
 		 * with the alpha value.
 		 */
 		kBlendModePremultipliedTransparency,
diff --git a/backends/mixer/sdl/sdl-mixer.h b/backends/mixer/sdl/sdl-mixer.h
index b9b7f74df79..2c8ea2232b8 100644
--- a/backends/mixer/sdl/sdl-mixer.h
+++ b/backends/mixer/sdl/sdl-mixer.h
@@ -76,7 +76,7 @@ protected:
 	virtual void callbackHandler(byte *samples, int len);
 
 	/**
-	 * The mixer callback entry point. Static functions can't be overrided
+	 * The mixer callback entry point. Static functions can't be overridden
 	 * by subclasses, so it invokes the non-static function callbackHandler()
 	 */
 	static void sdlCallback(void *this_, byte *samples, int len);
diff --git a/backends/platform/android/events.cpp b/backends/platform/android/events.cpp
index 77886f7a05b..cc605e9425c 100644
--- a/backends/platform/android/events.cpp
+++ b/backends/platform/android/events.cpp
@@ -1434,7 +1434,7 @@ bool OSystem_Android::pollEvent(Common::Event &event) {
 	if (pthread_self() == _main_thread) {
 		if (_screen_changeid != JNI::surface_changeid) {
 			_screen_changeid = JNI::surface_changeid;
-			// If we loose the surface, don't deinit as we loose the EGL context and this may lead to crashes
+			// If we lose the surface, don't deinit as we lose the EGL context and this may lead to crashes
 			// Keep a dangling surface until we get a resize
 			if (JNI::egl_surface_width > 0 && JNI::egl_surface_height > 0) {
 				// surface changed
diff --git a/backends/platform/android/org/scummvm/scummvm/zip/ZipEntry.java b/backends/platform/android/org/scummvm/scummvm/zip/ZipEntry.java
index 3da25c4ce14..667724c1645 100644
--- a/backends/platform/android/org/scummvm/scummvm/zip/ZipEntry.java
+++ b/backends/platform/android/org/scummvm/scummvm/zip/ZipEntry.java
@@ -642,7 +642,7 @@ public class ZipEntry implements ZipConstants, Cloneable {
                             // and compressed file size fields.
                             // If invalid zip64 extra fields, simply skip. Even
                             // it's rare, it's possible the entry size happens to
-                            // be the magic value and it "accidently" has some
+                            // be the magic value and it "accidentally" has some
                             // bytes in extra match the id.
                             if (sz >= 16) {
                                 size = get64(extra, off);
diff --git a/backends/platform/atari/readme.txt b/backends/platform/atari/readme.txt
index 4081e2128fc..7d82e22a38e 100644
--- a/backends/platform/atari/readme.txt
+++ b/backends/platform/atari/readme.txt
@@ -393,7 +393,7 @@ The least amount of cycles is spent when:
 - "Subtitles" as "Text and speech": this prevents any sampled speech to be
   mixed
 - all external audio files are deleted (typically *.wav); that way the mixer
-  wont have anything to mix. However beware, this is not allowed in every game!
+  won't have anything to mix. However beware, this is not allowed in every game!
 
 Sample rate
 ~~~~~~~~~~~
@@ -407,7 +407,7 @@ of them (esp. the ones from the 80s/90s) use simple samples like mono 11025 Hz
 Obviously, setting "output_channels" to "1" is the easiest improvement
 (unfortunately only on TT). Next best thing you can do is to buy an external DSP
 clock for your Falcon: nearly all games use sample frequencies which are
-multiplies of 44100 Hz: 22050, 11025, ... so with the external clock there wont
+multiplies of 44100 Hz: 22050, 11025, ... so with the external clock there won't
 be the need to resample them.
 
 There's one caveat, though: it is important whether your replay frequency is
@@ -504,7 +504,7 @@ Known issues
   it has improved the situation.
 
 - When using FreeMiNT, ScummVM requires a recent kernel (>= 2021), otherwise
-  keyboard handling wont work properly.
+  keyboard handling won't work properly.
 
 - When using EmuTOS, ScummVM requires a recent release (>= 1.3), otherwise
   various screen- and sound-related issues may appear.
@@ -519,7 +519,7 @@ Future plans
 - avoid loading music/speech files (and thus slowing down everything) if muted
 
 - cached audio/video streams (i.e. don't load only "audio_buffer_size" number
-  of samples but cache, say, 1 second so disk i/o wont be so stressed)
+  of samples but cache, say, 1 second so disk i/o won't be so stressed)
 
 - using Thorsten Otto's sharedlibs: https://tho-otto.de/sharedlibs.php for game
   engine plugins to relieve the huge binary size
diff --git a/backends/platform/ios7/ios7_gamepad_controller.mm b/backends/platform/ios7/ios7_gamepad_controller.mm
index 48af55ab30b..15113b5f25e 100644
--- a/backends/platform/ios7/ios7_gamepad_controller.mm
+++ b/backends/platform/ios7/ios7_gamepad_controller.mm
@@ -124,7 +124,7 @@
 	return self;
 }
 
-// Undocumented way to retreive the GCControllerView.
+// Undocumented way to retrieve the GCControllerView.
 // Drill down the layer structure to get the GCControllerView.
 // The view layers for iPhones are:
 // - TransitionView
diff --git a/backends/platform/ios7/ios7_keyboard.mm b/backends/platform/ios7/ios7_keyboard.mm
index 5e740f99ff8..c02086599b7 100644
--- a/backends/platform/ios7/ios7_keyboard.mm
+++ b/backends/platform/ios7/ios7_keyboard.mm
@@ -643,7 +643,7 @@
 		if (GCKeyboard.coalescedKeyboard != nil) {
 			if (didShow) {
 				// The inputAccessoryView is hidden by setting it to nil. Then when
-				// receving the UIKeyboardDidHideNotification the height will be 0.
+				// receiving the UIKeyboardDidHideNotification the height will be 0.
 				// Remember the height of the inputAccessoryView when it's presented
 				// so the main frame can be resized back to the proper size.
 				_inputAccessoryHeight = inputView.inputAccessoryView.frame.size.height;
diff --git a/backends/platform/ios7/ios7_osys_misc.mm b/backends/platform/ios7/ios7_osys_misc.mm
index 02cf68b28fb..176dcbe8a45 100644
--- a/backends/platform/ios7/ios7_osys_misc.mm
+++ b/backends/platform/ios7/ios7_osys_misc.mm
@@ -217,7 +217,7 @@ Common::HardwareInputSet *OSystem_iOS7::getHardwareInputSet() {
 	using namespace Common;
 
 	CompositeHardwareInputSet *inputSet = new CompositeHardwareInputSet();
-	// Mouse is alwyas supported, either through touch or device
+	// Mouse is always supported, either through touch or device
 	inputSet->addHardwareInputSet(new MouseHardwareInputSet(defaultMouseButtons));
 
 	if ([[iOS7AppDelegate iPhoneView] isGamepadControllerSupported]) {
diff --git a/backends/platform/psp/png_loader.cpp b/backends/platform/psp/png_loader.cpp
index f6bfb978fba..4cc443028bb 100644
--- a/backends/platform/psp/png_loader.cpp
+++ b/backends/platform/psp/png_loader.cpp
@@ -84,7 +84,7 @@ bool PngLoader::load() {
 		return false;
 	}
 
-	PSP_DEBUG_PRINT("succeded in loading image\n");
+	PSP_DEBUG_PRINT("succeeded in loading image\n");
 
 	if (_bitDepth == 4)		// 4-bit
 		_buffer->flipNibbles();	// required because of PNG 4-bit format
diff --git a/backends/text-to-speech/macosx/macosx-text-to-speech.mm b/backends/text-to-speech/macosx/macosx-text-to-speech.mm
index c87ffbd977d..54c7629c05e 100644
--- a/backends/text-to-speech/macosx/macosx-text-to-speech.mm
+++ b/backends/text-to-speech/macosx/macosx-text-to-speech.mm
@@ -137,7 +137,7 @@ bool MacOSXTextToSpeechManager::stop() {
 		_currentSpeech.clear(); // so that it immediately reports that it is no longer speaking
 		// Stop as soon as possible
 		// Also tell the MacOSXTextToSpeechManagerDelegate to ignore the next finishedSpeaking as
-		// it has already been handled, but we might have started another speach by the time we
+		// it has already been handled, but we might have started another speech by the time we
 		// receive it, and we don't want to stop that one.
 		[synthesizerDelegate ignoreNextFinishedSpeaking:YES];
 		[synthesizer stopSpeakingAtBoundary:NSSpeechImmediateBoundary];




More information about the Scummvm-git-logs mailing list