summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorluz.paz <luzpaz@users.noreply.github.com>2020-04-28 09:56:30 -0400
committerluz.paz <luzpaz@users.noreply.github.com>2020-04-28 09:56:30 -0400
commit03da043cf0d9508d3bd8a15eef79df15d2d4d475 (patch)
tree93a5624660503ad00d5cdcfc511f84367f254e85 /src
parent0b2e0088fe058738d88de53be72680970660851f (diff)
Fix various typos
Found via codespell v1.17.0.dev0 ``` codespell -q 3 -S *.ts,*.po,*.rtf,./.git,./src/library,./lib,./build/wix -L ba,chang,ect,everytime,german,hace,iff,jus,ith,lokal,nd,ons,pevent,pparent,preverse,seeked,sheat,sinc,splitted,substract,thru,tim,uint ```
Diffstat (limited to 'src')
-rw-r--r--src/controllers/colormapper.cpp2
-rw-r--r--src/controllers/dlgprefcontroller.h4
-rw-r--r--src/encoder/encoderwave.cpp2
-rw-r--r--src/engine/enginebuffer.cpp2
-rw-r--r--src/engine/sync/internalclock.cpp2
-rw-r--r--src/engine/sync/synccontrol.cpp8
-rw-r--r--src/library/basecoverartdelegate.h2
-rw-r--r--src/library/dao/trackdao.cpp2
-rw-r--r--src/library/externaltrackcollection.h2
-rw-r--r--src/library/library.cpp2
-rw-r--r--src/library/rekordbox/rekordboxfeature.cpp6
-rw-r--r--src/library/scanner/libraryscanner.cpp2
-rw-r--r--src/library/serato/seratofeature.cpp2
-rw-r--r--src/library/trackcollectionmanager.cpp4
-rw-r--r--src/network/webtask.cpp2
-rw-r--r--src/network/webtask.h2
-rw-r--r--src/skin/launchimage.h2
-rw-r--r--src/skin/legacyskinparser.cpp8
-rw-r--r--src/skin/skincontext.h2
-rw-r--r--src/sources/soundsourcewv.h2
-rw-r--r--src/test/enginesynctest.cpp4
-rw-r--r--src/track/serato/tags.cpp2
-rw-r--r--src/track/track.cpp2
-rw-r--r--src/util/assert.h2
-rw-r--r--src/waveform/renderers/waveformmarkrange.h2
-rw-r--r--src/widget/woverview.cpp2
26 files changed, 37 insertions, 37 deletions
diff --git a/src/controllers/colormapper.cpp b/src/controllers/colormapper.cpp
index e308c7b1d8..109da3ef3f 100644
--- a/src/controllers/colormapper.cpp
+++ b/src/controllers/colormapper.cpp
@@ -15,7 +15,7 @@ double colorDistance(QRgb a, QRgb b) {
// of colors into account. More accurate algorithms like the CIELAB2000
// Delta-E rely on sophisticated color space conversions and need a lot
// of costly computations. In contrast, this is a low-cost
- // approximation and should be sufficently accurate.
+ // approximation and should be sufficiently accurate.
// More details: https://www.compuphase.com/cmetric.htm
long mean_red = (static_cast<long>(qRed(a)) + static_cast<long>(qRed(b))) / 2;
long delta_red = static_cast<long>(qRed(a)) - static_cast<long>(qRed(b));
diff --git a/src/controllers/dlgprefcontroller.h b/src/controllers/dlgprefcontroller.h
index bd1ab3da8e..17e0d2c834 100644
--- a/src/controllers/dlgprefcontroller.h
+++ b/src/controllers/dlgprefcontroller.h
@@ -80,7 +80,7 @@ class DlgPrefController : public DlgPreferencePage {
/// Set dirty state (i.e. changes have been made).
///
- /// When this preferences page is marked as "dirty", changes have occured
+ /// When this preferences page is marked as "dirty", changes have occurred
/// that can be applied or discarded.
///
/// @param bDirty The new dialog's dirty state.
@@ -90,7 +90,7 @@ class DlgPrefController : public DlgPreferencePage {
/// Set dirty state (i.e. changes have been made).
///
- /// When this preferences page is marked as "dirty", changes have occured
+ /// When this preferences page is marked as "dirty", changes have occurred
/// that can be applied or discarded.
///
/// @param bDirty The new dialog's dirty state.
diff --git a/src/encoder/encoderwave.cpp b/src/encoder/encoderwave.cpp
index 6054ea2451..df30d3ed96 100644
--- a/src/encoder/encoderwave.cpp
+++ b/src/encoder/encoderwave.cpp
@@ -14,7 +14,7 @@
#include "recording/defs_recording.h"
-// The virtual file contex must return the length of the virtual file in bytes.
+// The virtual file context must return the length of the virtual file in bytes.
static sf_count_t sf_f_get_filelen (void *user_data)
{
EncoderCallback* pCallback = static_cast<EncoderCallback*>(user_data);
diff --git a/src/engine/enginebuffer.cpp b/src/engine/enginebuffer.cpp
index 370accb5b4..a2aab2004b 100644
--- a/src/engine/enginebuffer.cpp
+++ b/src/engine/enginebuffer.cpp
@@ -1361,7 +1361,7 @@ double EngineBuffer::getExactPlayPos() {
return getVisualPlayPos() * getTrackSamples();
} else {
// Track was just loaded and the first buffer was not processed yet.
- // asume it is at 0:00
+ // assume it is at 0:00
return 0.0;
}
}
diff --git a/src/engine/sync/internalclock.cpp b/src/engine/sync/internalclock.cpp
index 8d51851a7a..c2e7071424 100644
--- a/src/engine/sync/internalclock.cpp
+++ b/src/engine/sync/internalclock.cpp
@@ -75,7 +75,7 @@ void InternalClock::slotSyncMasterEnabledChangeRequest(double state) {
return;
}
if (mode == SYNC_MASTER_SOFT) {
- // user request: make master explicite
+ // user request: make master explicit
m_mode = SYNC_MASTER_EXPLICIT;
return;
}
diff --git a/src/engine/sync/synccontrol.cpp b/src/engine/sync/synccontrol.cpp
index 6b8335f844..dc9634b7d9 100644
--- a/src/engine/sync/synccontrol.cpp
+++ b/src/engine/sync/synccontrol.cpp
@@ -239,7 +239,7 @@ void SyncControl::setMasterParams(
double beatDistance, double baseBpm, double bpm) {
double masterBpmAdjustFactor = determineBpmMultiplier(fileBpm(), baseBpm);
if (isMaster(getSyncMode())) {
- // In Master mode we adjust the incomming Bpm for the inital sync.
+ // In Master mode we adjust the incoming Bpm for the initial sync.
bpm *= masterBpmAdjustFactor;
m_masterBpmAdjustFactor = kBpmUnity;
} else {
@@ -337,7 +337,7 @@ void SyncControl::trackBeatsUpdated(BeatsPointer pBeats) {
}
VERIFY_OR_DEBUG_ASSERT(m_pLocalBpm) {
- // object not initalized
+ // object not initialized
return;
}
@@ -400,7 +400,7 @@ void SyncControl::slotSyncMasterEnabledChangeRequest(double state) {
return;
}
if (mode == SYNC_MASTER_SOFT) {
- // user request: make master explicite
+ // user request: make master explicit
m_pSyncMode->setAndConfirm(SYNC_MASTER_EXPLICIT);
return;
}
@@ -452,7 +452,7 @@ void SyncControl::setLocalBpm(double local_bpm) {
m_pEngineSync->requestBpmUpdate(this, bpm);
} else {
DEBUG_ASSERT(isMaster(syncMode));
- // We might have adopted an adjust factor when becomming master.
+ // We might have adopted an adjust factor when becoming master.
// Keep it when reporting our bpm.
m_pEngineSync->notifyBpmChanged(this, bpm / m_masterBpmAdjustFactor);
}
diff --git a/src/library/basecoverartdelegate.h b/src/library/basecoverartdelegate.h
index cf7745705c..a200c83d44 100644
--- a/src/library/basecoverartdelegate.h
+++ b/src/library/basecoverartdelegate.h
@@ -36,7 +36,7 @@ class BaseCoverArtDelegate : public TableItemDelegate {
// (background) color is painted.
//
// It is useful to handle cases when the user scroll down
- // very fast or when they hold an arrow key. In thise case
+ // very fast or when they hold an arrow key. In this case
// it is NOT desirable to start multiple expensive file
// system operations in worker threads for loading and
// scaling cover images that are not even displayed after
diff --git a/src/library/dao/trackdao.cpp b/src/library/dao/trackdao.cpp
index 0860877317..a72dcb6cfe 100644
--- a/src/library/dao/trackdao.cpp
+++ b/src/library/dao/trackdao.cpp
@@ -1296,7 +1296,7 @@ TrackPointer TrackDAO::getTrackById(TrackId trackId) const {
// Listen to signals from Track objects and forward them to
// receivers. TrackDAO works as a relay for selected track signals
- // that allows receivers to use permament connections with
+ // that allows receivers to use permanent connections with
// TrackDAO instead of connecting to individual Track objects.
connect(pTrack.get(),
&Track::dirty,
diff --git a/src/library/externaltrackcollection.h b/src/library/externaltrackcollection.h
index 7838d8cbf9..92b24ae6b0 100644
--- a/src/library/externaltrackcollection.h
+++ b/src/library/externaltrackcollection.h
@@ -58,7 +58,7 @@ Q_OBJECT
Disconnected,
};
- // Check if the connection to the extenal track collection
+ // Check if the connection to the external track collection
// has been established, i.e. if the synchronization is active.
virtual ConnectionState connectionState() const = 0;
diff --git a/src/library/library.cpp b/src/library/library.cpp
index 600033a147..a685199bb9 100644
--- a/src/library/library.cpp
+++ b/src/library/library.cpp
@@ -164,7 +164,7 @@ Library::Library(
// TODO(XXX) Rekordbox feature added persistently as the only way to enable it to
// dynamically appear/disappear when correctly prepared removable devices
// are mounted/unmounted would be to have some form of timed thread to check
- // periodically. Not ideal perfomance wise.
+ // periodically. Not ideal performance wise.
if (m_pConfig->getValue(ConfigKey(kConfigGroup, "ShowRekordboxLibrary"), true)) {
addFeature(new RekordboxFeature(this, m_pConfig));
}
diff --git a/src/library/rekordbox/rekordboxfeature.cpp b/src/library/rekordbox/rekordboxfeature.cpp
index 4ce2a204f9..048d2ee074 100644
--- a/src/library/rekordbox/rekordboxfeature.cpp
+++ b/src/library/rekordbox/rekordboxfeature.cpp
@@ -891,7 +891,7 @@ void readAnalyze(TrackPointer track, double sampleRate, int timingOffset, bool i
memoryCues << memoryCue;
} break;
case rekordbox_anlz_t::CUE_ENTRY_TYPE_LOOP: {
- // As Mixxx can only have 1 saved loop, use the first occurance of a memory loop relative to the start of the track
+ // As Mixxx can only have 1 saved loop, use the first occurrence of a memory loop relative to the start of the track
if (position < cueLoopStartPosition) {
cueLoopStartPosition = position;
int endTime = static_cast<int>((*cueEntry)->loop_time()) - timingOffset;
@@ -936,7 +936,7 @@ void readAnalyze(TrackPointer track, double sampleRate, int timingOffset, bool i
memoryCues << memoryCue;
} break;
case rekordbox_anlz_t::CUE_ENTRY_TYPE_LOOP: {
- // As Mixxx can only have 1 saved loop, use the first occurance of a memory loop relative to the start of the track
+ // As Mixxx can only have 1 saved loop, use the first occurrence of a memory loop relative to the start of the track
if (position < cueLoopStartPosition) {
cueLoopStartPosition = position;
int endTime = static_cast<int>((*cueExtendedEntry)->loop_time()) - timingOffset;
@@ -1051,7 +1051,7 @@ TrackPointer RekordboxPlaylistModel::getTrack(const QModelIndex& index) const {
// exported from Rekordbox. This is caused by different MP3
// decoders treating MP3s encoded in a variety of different cases
// differently. The mp3guessenc library is used to determine which
- // case the MP3 is clasified in. See the following PR for more
+ // case the MP3 is classified in. See the following PR for more
// detailed information:
// https://github.com/mixxxdj/mixxx/pull/2119
diff --git a/src/library/scanner/libraryscanner.cpp b/src/library/scanner/libraryscanner.cpp
index a164ecdc5c..1629427c58 100644
--- a/src/library/scanner/libraryscanner.cpp
+++ b/src/library/scanner/libraryscanner.cpp
@@ -427,7 +427,7 @@ void LibraryScanner::cancelAndQuit() {
changeScannerState(CANCELING);
cancel();
// Quit the event loop gracefully and stay in CANCELING state until all
- // pendig signals are processed
+ // pending signals are processed
quit();
wait();
changeScannerState(IDLE);
diff --git a/src/library/serato/seratofeature.cpp b/src/library/serato/seratofeature.cpp
index 4d6d0896d5..b07d64ea9f 100644
--- a/src/library/serato/seratofeature.cpp
+++ b/src/library/serato/seratofeature.cpp
@@ -34,7 +34,7 @@
namespace {
// Serato Database Field IDs
-// The "magic" value is the short 4 byte ascii code intepreted as quint32, so
+// The "magic" value is the short 4 byte ascii code interpreted as quint32, so
// that we can use the value in a switch statement instead of going through
// a strcmp if/else ladder.
enum class FieldId : quint32 {
diff --git a/src/library/trackcollectionmanager.cpp b/src/library/trackcollectionmanager.cpp
index 7808e985b4..e717cee23e 100644
--- a/src/library/trackcollectionmanager.cpp
+++ b/src/library/trackcollectionmanager.cpp
@@ -65,7 +65,7 @@ TrackCollectionManager::TrackCollectionManager(
// TODO: Extract and decouple LibraryScanner from TrackCollectionManager
if (deleteTrackForTestingFn) {
// Exclude the library scanner from tests
- kLogger.info() << "Libary scanner is disabled in test mode";
+ kLogger.info() << "Library scanner is disabled in test mode";
} else {
m_pScanner = std::make_unique<LibraryScanner>(pDbConnectionPool, pConfig);
@@ -179,7 +179,7 @@ bool TrackCollectionManager::saveTrack(const TrackPointer& pTrack) {
}
// Export metadata and save the track in both the internal database
-// and external libaries.
+// and external libraries.
void TrackCollectionManager::saveEvictedTrack(Track* pTrack) noexcept {
saveTrack(pTrack, TrackMetadataExportMode::Immediate);
}
diff --git a/src/network/webtask.cpp b/src/network/webtask.cpp
index fc7f1b3f35..1b0950b642 100644
--- a/src/network/webtask.cpp
+++ b/src/network/webtask.cpp
@@ -193,7 +193,7 @@ void WebTask::slotStart(int timeoutMillis) {
return;
}
// Still idle after the request has been started
- // successfully, i.e. nothing happend yet in this
+ // successfully, i.e. nothing happened yet in this
// thread.
DEBUG_ASSERT(m_status == Status::Idle);
m_status = Status::Pending;
diff --git a/src/network/webtask.h b/src/network/webtask.h
index 3fc9beb91d..4a78a8fa79 100644
--- a/src/network/webtask.h
+++ b/src/network/webtask.h
@@ -187,7 +187,7 @@ class WebTask : public QObject {
// Handle status change requests by aborting a running request
// and return the request URL. If no request is running or if
- // the request has already been finished tha QUrl() must be
+ // the request has already been finished the QUrl() must be
// returned.
virtual QUrl doAbort() = 0;
virtual QUrl doTimeOut() = 0;
diff --git a/src/skin/launchimage.h b/src/skin/launchimage.h
index 7fb69f2ea3..ec1418e665 100644
--- a/src/skin/launchimage.h
+++ b/src/skin/launchimage.h
@@ -9,7 +9,7 @@ class QProgressBar;
// until the skin is ready to use.
// It shows a centered Image and a progress bar below.
// By default a symbolic Mixxx icon and logo is shown.
-// It can be modified in the skin.xml file at <skin> sction,
+// It can be modified in the skin.xml file at <skin> section,
// to match the skin like that:
// <LaunchImageStyle>
// LaunchImage { background-color: #202020; }
diff --git a/src/skin/legacyskinparser.cpp b/src/skin/legacyskinparser.cpp
index ac367d6da4..890fc57707 100644
--- a/src/skin/legacyskinparser.cpp
+++ b/src/skin/legacyskinparser.cpp
@@ -613,7 +613,7 @@ QWidget* LegacySkinParser::parseSplitter(const QDomElement& node) {
m_pParent = pSplitter;
if (!childrenNode.isNull()) {
- // Descend chilren
+ // Descend children
QDomNodeList children = childrenNode.childNodes();
for (int i = 0; i < children.count(); ++i) {
@@ -724,7 +724,7 @@ QWidget* LegacySkinParser::parseWidgetStack(const QDomElement& node) {
QDomNode childrenNode = m_pContext->selectNode(node, "Children");
if (!childrenNode.isNull()) {
- // Descend chilren
+ // Descend children
QDomNodeList children = childrenNode.childNodes();
for (int i = 0; i < children.count(); ++i) {
@@ -798,7 +798,7 @@ QWidget* LegacySkinParser::parseSizeAwareStack(const QDomElement& node) {
QDomNode childrenNode = m_pContext->selectNode(node, "Children");
if (!childrenNode.isNull()) {
- // Descend chilren
+ // Descend children
QDomNodeList children = childrenNode.childNodes();
for (int i = 0; i < children.count(); ++i) {
@@ -1277,7 +1277,7 @@ void LegacySkinParser::parseSingletonDefinition(const QDomElement& node) {
<< "SingletonDefinition requires a Children tag with one child";
}
- // Descend chilren, taking the first valid element.
+ // Descend children, taking the first valid element.
QDomNode child_node;
QDomNodeList children = childrenNode.childNodes();
for (int i = 0; i < children.count(); ++i) {
diff --git a/src/skin/skincontext.h b/src/skin/skincontext.h
index 9cd85a6ee2..2d66429105 100644
--- a/src/skin/skincontext.h
+++ b/src/skin/skincontext.h
@@ -32,7 +32,7 @@ class SkinContext {
const SkinContext* parent);
virtual ~SkinContext();
- // Not copyable
+ // Not copiable
SkinContext(const SkinContext&) = delete;
SkinContext& operator=(const SkinContext&) = delete;
diff --git a/src/sources/soundsourcewv.h b/src/sources/soundsourcewv.h
index 314158b630..fd7c3e733a 100644
--- a/src/sources/soundsourcewv.h
+++ b/src/sources/soundsourcewv.h
@@ -36,7 +36,7 @@ class SoundSourceWV : public SoundSource {
// A WavpackContext* type
// we cannot use the type directly, because it has
// changing definitions with different wavpack.h versions.
- // wavpack.h can't be included here, bacause it has concurrent definitions
+ // wavpack.h can't be included here, because it has concurrent definitions
// with other decoder's header.
void* m_wpc;
diff --git a/src/test/enginesynctest.cpp b/src/test/enginesynctest.cpp
index 6f78e12a44..cea9b2bed4 100644
--- a/src/test/enginesynctest.cpp
+++ b/src/test/enginesynctest.cpp
@@ -1529,7 +1529,7 @@ TEST_F(EngineSyncTest, SyncPhaseToPlayingNonSyncDeck) {
ProcessBuffer();
// We expect that the second deck (master) has adjusted the "beat_distance" of the
- // internal clock and the fist deck is advanced sightly but slower to slowly get
+ // internal clock and the fist deck is advanced slightly but slower to slowly get
// rid of the additional buffer ahead
// TODO: It does sounds odd to start the track 1 at a random position and adjust the
// phase later. Seeking into phase is the best option even with quantize off.
@@ -1803,7 +1803,7 @@ TEST_F(EngineSyncTest, QuantizeImpliesSyncPhase) {
EXPECT_DOUBLE_EQ(130, ControlObject::get(ConfigKey(m_sGroup1, "bpm")));
EXPECT_DOUBLE_EQ(100, ControlObject::get(ConfigKey(m_sGroup2, "bpm")));
- // we aligne here to the past beat, because beat_distance < 1.0/8
+ // we align here to the past beat, because beat_distance < 1.0/8
EXPECT_DOUBLE_EQ(
ControlObject::get(ConfigKey(m_sGroup1, "beat_distance")) / 130 * 100,
ControlObject::get(ConfigKey(m_sGroup2, "beat_distance")));
diff --git a/src/track/serato/tags.cpp b/src/track/serato/tags.cpp
index 19d0000388..affa42565b 100644
--- a/src/track/serato/tags.cpp
+++ b/src/track/serato/tags.cpp
@@ -108,7 +108,7 @@ double SeratoTags::findTimingOffsetMillis(const QString& filePath) {
// correctly align timing information (e.g. cue points) exported from
// Serato. This is caused by different MP3 decoders treating MP3s encoded
// in a variety of different cases differently. The mp3guessenc library is
- // used to determine which case the MP3 is clasified in. See the following
+ // used to determine which case the MP3 is classified in. See the following
// PR for more detailed information:
// https://github.com/mixxxdj/mixxx/pull/2119
diff --git a/src/track/track.cpp b/src/track/track.cpp
index 9aafa54b76..2d6e459f60 100644
--- a/src/track/track.cpp
+++ b/src/track/track.cpp
@@ -943,7 +943,7 @@ void Track::importPendingCueInfosMarkDirtyAndUnlock(
return;
}
// The sample rate can only be trusted after the audio
- // stream has been openend.
+ // stream has been opened.
DEBUG_ASSERT(m_streamInfo);
const auto sampleRate =
m_streamInfo->getSignalInfo().getSampleRate();
diff --git a/src/util/assert.h b/src/util/assert.h
index 37321e96cc..51ee2b7f7e 100644
--- a/src/util/assert.h
+++ b/src/util/assert.h
@@ -57,6 +57,6 @@ inline void mixxx_release_assert(const char* assertion, const char* file, int li
#define DEBUG_ASSERT(cond)
#endif
-/// Same as DEBUG_ASSERT, but if MIXXX_DEBUG_ASSERTIONS_FATAL is disabled run the specified fallback funtion.
+/// Same as DEBUG_ASSERT, but if MIXXX_DEBUG_ASSERTIONS_FATAL is disabled run the specified fallback function.
/// In most cases you should probably use this rather than DEBUG_ASSERT. Only use DEBUG_ASSERT if there is no appropriate fallback.
#define VERIFY_OR_DEBUG_ASSERT(cond) if ((!(cond)) && mixxx_maybe_debug_assert_return_true(#cond, __FILE__, __LINE__, ASSERT_FUNCTION))
diff --git a/src/waveform/renderers/waveformmarkrange.h b/src/waveform/renderers/waveformmarkrange.h
index deb3f09251..c7e683b1c5 100644
--- a/src/waveform/renderers/waveformmarkrange.h
+++ b/src/waveform/renderers/waveformmarkrange.h
@@ -19,7 +19,7 @@ class WaveformMarkRange {
const QDomNode& node,
const SkinContext& context,
const WaveformSignalColors& signalColors);
- // This class is only moveable, but not copyable!
+ // This class is only moveable, but not copiable!
WaveformMarkRange(WaveformMarkRange&&) = default;
WaveformMarkRange(const WaveformMarkRange&) = delete;
diff --git a/src/widget/woverview.cpp b/src/widget/woverview.cpp
index 2e51b42f2a..25b6930576 100644
--- a/src/widget/woverview.cpp
+++ b/src/widget/woverview.cpp
@@ -835,7 +835,7 @@ void WOverview::drawMarks(QPainter* pPainter, const float offset, const float ga
}
}
// Sometimes QFontMetrics::elidedText turns the QString into just an
- // elipsis character, so always show at least the hotcue number if
+ // ellipsis character, so always show at least the hotcue number if
// the label does not fit.
if ((text.isEmpty() || text == "…") && pMark->getHotCue() != Cue::kNoHotCue) {
text = QString::number(pMark->getHotCue() + 1);