aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/config-manager.cpp2
-rw-r--r--common/timer.h2
-rw-r--r--sound/audiostream.h2
-rw-r--r--sound/fmopl.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/common/config-manager.cpp b/common/config-manager.cpp
index 4ecc0e467c..3f02798f46 100644
--- a/common/config-manager.cpp
+++ b/common/config-manager.cpp
@@ -245,7 +245,7 @@ void ConfigManager::removeKey(const String &key, const String &dom) {
else if (_globalDomains.contains(dom))
_globalDomains[dom].remove(key);
else
- error("Removing key '%s' from non-existant domain '%s'", key.c_str(), dom.c_str());
+ error("Removing key '%s' from non-existent domain '%s'", key.c_str(), dom.c_str());
}
diff --git a/common/timer.h b/common/timer.h
index 91786aca10..503bc9cbe2 100644
--- a/common/timer.h
+++ b/common/timer.h
@@ -54,7 +54,7 @@ public:
/**
* Install a new timer callback. It will from now be called every interval microseconds.
- * The timer may be invoked from a seperate thread. Hence any timer code should be
+ * The timer may be invoked from a separate thread. Hence any timer code should be
* written following the same safety guidelines as any other threaded code.
*
* @note Although the interval is specified in microseconds, the actual timer resolution
diff --git a/sound/audiostream.h b/sound/audiostream.h
index 177848181c..1febb110a3 100644
--- a/sound/audiostream.h
+++ b/sound/audiostream.h
@@ -53,7 +53,7 @@ public:
* Returns the actual number of samples read, or -1 if
* a critical error occured (note: you *must* check if
* this value is less than what you requested, this can
- * happend when the stream is fully used up).
+ * happened when the stream is fully used up).
* For stereo stream, buffer will be filled with interleaved
* left and right channel samples.
*
diff --git a/sound/fmopl.cpp b/sound/fmopl.cpp
index 8d1f9526f1..a8e2a3c641 100644
--- a/sound/fmopl.cpp
+++ b/sound/fmopl.cpp
@@ -991,7 +991,7 @@ void OPLResetChip(FM_OPL *OPL) {
OPLWriteReg(OPL, 0x04,0); /* IRQ mask clear */
for(i = 0xff; i >= 0x20; i--)
OPLWriteReg(OPL,i,0);
- /* reset OPerator paramater */
+ /* reset OPerator parameter */
for(c = 0; c < OPL->max_ch ;c++ ) {
OPL_CH *CH = &OPL->P_CH[c];
/* OPL->P_CH[c].PAN = OPN_CENTER; */