Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix various typos #4724

Merged
merged 2 commits into from
Apr 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2710,7 +2710,7 @@ if(BROADCAST)
message(STATUS "Installed libshout version: ${Shout_VERSION} is suffering from bug lp1913579")
endif()
if(NOT Shoutidjc_FOUND OR Shoutidjc_VERSION VERSION_LESS 2.4.6)
# Fall back to internal libraray in the lib tree
# Fall back to internal library in the lib tree
message(STATUS "Using internal libshout-idjc")
add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/lib/libshout-idjc")
target_include_directories(mixxx-lib SYSTEM PUBLIC lib/libshout-idjc/include)
Expand Down
2 changes: 1 addition & 1 deletion packaging/macos/entitlements.plist
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
-->
<key>com.apple.security.cs.allow-jit</key>
<true/>
<!-- Allow unsigend executable memory
<!-- Allow unsigned executable memory
This is necessary for controller mappings that use Qt's JavaScript JIT compiler.
-->
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
Expand Down
2 changes: 1 addition & 1 deletion res/controllers/Behringer-CMD-MM1-scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ CMDMM.fxChannel = function (physicalChannel,virtualChannel) {
this.input=components.Pot.prototype.input;
},
layer4: function () {
this.input = function (channael, control, value, status, group) {
this.input = function (channel, control, value, status, group) {
if (value>42&&value<=84) {
this.inKey="rate";
this.group="[Channel"+theDeck.virtualChannel+"]";
Expand Down
2 changes: 1 addition & 1 deletion res/controllers/Behringer-CMDStudio4a-scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ BehringerCMDStudio4a.vuMeterUpdate = function (value, group, control){
}

BehringerCMDStudio4a.initLEDs = function () {
// (re)Initialise any LEDs that are direcctly controlled by this script.
// (re)Initialise any LEDs that are directly controlled by this script.
// DEL buttons (one for each virtual deck).
midi.sendShortMsg(0x90, 0x2A, 0x00);
midi.sendShortMsg(0x91, 0x4A, 0x00);
Expand Down
2 changes: 1 addition & 1 deletion res/controllers/Gemini-CDMP-7000-scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
// back button doesn't toggle directory mode
// Set Master Tempo to Keylock, not sure what it is now
// many more bug fixes where found
// every once in a while scratch mode ignores vinyl button, hard to reproduce it's intermitent
// every once in a while scratch mode ignores vinyl button, hard to reproduce it's intermittent


// Todo:
Expand Down
2 changes: 1 addition & 1 deletion res/controllers/Hercules-DJ-Console-4-Mx-scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,7 @@ Hercules4Mx.onKillOrSourceChange4 = function(value, group, control) {
//Any of the shift buttons for effects has been pressed. This button simply changes
//the controller internal state, but we can use it for other reasons while the user maintains it pressed.
Hercules4Mx.pressEffectShift = function(midichan, control, value, status, group) {
// I don't diferentiate between decks. I don't expect two shift buttons being pressed at the same time.
// I don't differentiate between decks. I don't expect two shift buttons being pressed at the same time.
Hercules4Mx.shiftStatus.pressed = (value) ? true : false;
};
//Indicator of the shift effect state change. This happens always after shift is released
Expand Down
2 changes: 1 addition & 1 deletion res/controllers/Hercules_DJControl_Inpulse_300.midi.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2243,7 +2243,7 @@
<output>
<group>[EffectRack1_EffectUnit2_Effect3]</group>
<key>enabled</key>
<description>Effect On/Off buttonn</description>
<description>Effect On/Off button</description>
<minimum>0.5</minimum>
<maximum>1</maximum>
<status>0x92</status>
Expand Down
6 changes: 3 additions & 3 deletions res/controllers/Hercules_DJControl_Jogvision.midi.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1664,7 +1664,7 @@
<output>
<group>[EffectRack1_EffectUnit2_Effect1]</group>
<key>enabled</key>
<description>Effect On/Off buttonn</description>
<description>Effect On/Off button</description>
<minimum>0.5</minimum>
<maximum>1</maximum>
<status>0x91</status>
Expand All @@ -1675,7 +1675,7 @@
<output>
<group>[EffectRack1_EffectUnit2_Effect2]</group>
<key>enabled</key>
<description>Effect On/Off buttonn</description>
<description>Effect On/Off button</description>
<minimum>0.5</minimum>
<maximum>1</maximum>
<status>0x91</status>
Expand All @@ -1686,7 +1686,7 @@
<output>
<group>[EffectRack1_EffectUnit2_Effect3]</group>
<key>enabled</key>
<description>Effect On/Off buttonn</description>
<description>Effect On/Off button</description>
<minimum>0.5</minimum>
<maximum>1</maximum>
<status>0x91</status>
Expand Down
2 changes: 1 addition & 1 deletion res/controllers/Midi_for_light-scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ midi_for_light.sendMidiMtcFullFrame = function(value, group, control) { // sends
midi.sendSysexMsg(fullframe, 10);
};

midi_for_light.deckBeatOutputToMidi = function(value, group, control) { // send midi note for beat and the BPM vaelue
midi_for_light.deckBeatOutputToMidi = function(value, group, control) { // send midi note for beat and the BPM value
var deck = parseInt(group.substring(8, 9)) - 1;
var deck_bpm = parseInt(engine.getValue(group, "bpm")) - 50;

Expand Down
2 changes: 1 addition & 1 deletion res/controllers/Mixman DM2 (OS X).js
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ DM2.filter = function (channel, control, value, status) {
else if( f < 0.0 )
f = 0.0;

// print( "settiing [Channel" + deck + "] " + DM2.cc2mixxx[control] + " to " + f );
// print( "setting [Channel" + deck + "] " + DM2.cc2mixxx[control] + " to " + f );
engine.setValue( "[Channel" + deck + "]", DM2.cc2mixxx[control], f );
DM2.filter_active = 1;
}
Expand Down
2 changes: 1 addition & 1 deletion res/controllers/Numark-Mixtrack-Platinum-scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -1020,7 +1020,7 @@ MixtrackPlatinum.HeadGain.prototype = new components.Pot({
// control only if the control was moved when focus was switched. This
// is to avoid a phantom triggering of soft takeover that can happen if
// ignoreNextValue() is called un-conditionally when the control target
// is changed (like in shfit()/unshift()).
// is changed (like in shift()/unshift()).
if (this.ignore_next == "sampler" && !this.shifted) {
this.sampler.forEachComponent(function(component) {
engine.softTakeoverIgnoreNextValue(component.group, 'volume');
Expand Down
2 changes: 1 addition & 1 deletion res/controllers/Numark-Mixtrack-Pro-scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
// Stutter: Adjust BeatGrid in the correct place (useful to sync well).
// LED Blink at each Beat of the grid.
//
// Sync: If the other deck is stopped, only sync tempo (not fase).
// Sync: If the other deck is stopped, only sync tempo (not phase).
// LED Blink at Clip Gain (Peak indicator).
//
// Pitch: Up, Up; Down, Down. Pitch slide are inverted, to match with the screen (otherwise is very confusing).
Expand Down
4 changes: 2 additions & 2 deletions res/controllers/Numark-N4-scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ NumarkN4.topContainer = function(channel) {
if (displayFeedback === undefined) {
displayFeedback = true;
}
// when the layer becommes negative, the (layer+4) will force a positive/valid page indexOf
// when the layer becomes negative, the (layer+4) will force a positive/valid page indexOf
layer = NumarkN4.hotcuePageIndexBehavior ? (layer+4)%4 : Math.max(Math.min(layer, 3), 0); // clamp layer value to [0;3] range
this.hotCuePage = layer;
if (this.timer !== 0) {
Expand Down Expand Up @@ -349,7 +349,7 @@ NumarkN4.MixerTemplate = function() {
this.inKey="MoveVertical";
},
input: function(_midiChannel, _control, value, _status, _group) {
this.inSetValue(value===0x01?this.stepsize:-this.stepsize); // value "rescaling"; possibly ineffiecent.
this.inSetValue(value===0x01?this.stepsize:-this.stepsize); // value "rescaling"; possibly inefficient.
},
});
this.navigationEncoderButton = new components.Button({
Expand Down
2 changes: 1 addition & 1 deletion res/controllers/Reloop-Beatpad-scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -961,7 +961,7 @@ Jogger.prototype.onWheelMove = function(value, Do_iCut) {
// The jogwheel has 4 RGB leds , so there is 4 slots for each show.
// let's that we have toggle an Effect of the effect rack (show 1), the jog wheel
// will illuminate magenta, yellow, cyan or green depending of the effect.
// If above that we turn the lp/hp filter button to the right (High passs),
// If above that we turn the lp/hp filter button to the right (High pass),
// the right part will illuminate white (show 2), leaving the left part with the color of the effect.
// The left part of (slots 1 and 2), set to "null", will be considered as being transparent for the layer show n°2,
// leaving the corresponding slots below (show1) in order to be displayed.
Expand Down
2 changes: 1 addition & 1 deletion res/controllers/Vestax-VCI-300-scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
* is now only triggered in combination with Shift, while
* pressing the button without the Shift key toggles
* quantize on/off. Before it was just to easy to
* accidentilly trigger Sync by hitting the wrong button!
* accidentally trigger Sync by hitting the wrong button!
* - Disable the beat active indicator LED, because it has
* not proven to be helpful.
* - Reduce jog tempo sensitivity considerably
Expand Down
2 changes: 1 addition & 1 deletion res/skins/Deere (64 Samplers)/skin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
<Children>

<!-- Waveforms & spinnies are shown here as stack or
separatley in each deck -->
separately in each deck -->
<Template src="skin:../Deere/parallel_waveforms.xml"/>

<WidgetGroup><!-- Main section -->
Expand Down
2 changes: 1 addition & 1 deletion res/skins/Deere/skin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
<Children>

<!-- Waveforms & spinnies are shown here as stack or
separatley in each deck -->
separately in each deck -->
<Template src="skin:../Deere/parallel_waveforms.xml"/>

<WidgetGroup><!-- Main section -->
Expand Down
2 changes: 1 addition & 1 deletion res/skins/LateNight/fx_rack.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<SetVariable name="ArcThickness"><Variable name="ArcThicknessBig"/></SetVariable>
<SetVariable name="ArcUnipolar">true</SetVariable>

<!-- Let's reate Singletons for widgtes we use multiple times
<!-- Let's create Singletons for widgets we use multiple times
at different places in each effect unit:
* Meta knob
* Effect selector
Expand Down
2 changes: 1 addition & 1 deletion res/skins/LateNight/helpers/skin_settings_compact_deck.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
Description:
Optons for the compact deck
Options for the compact deck
-->
<Template>
<WidgetGroup>
Expand Down
2 changes: 1 addition & 1 deletion res/skins/LateNight/helpers/skin_settings_full_deck.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
Description:
Optons for the full deck
Options for the full deck
-->
<Template>
<WidgetGroup>
Expand Down
2 changes: 1 addition & 1 deletion res/skins/LateNight/helpers/skin_settings_mini_deck.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
Description:
Optons for the minimal deck
Options for the minimal deck
-->
<Template>
<WidgetGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/analyzer/analyzergain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ bool AnalyzerGain::processSamples(const CSAMPLE *pIn, const int iLen) {

void AnalyzerGain::storeResults(TrackPointer tio) {
//TODO: We are going to store values as relative peaks so that "0" means that no replaygain has been evaluated.
// This means that we are going to transform from dB to peaks and viceversa.
// This means that we are going to transform from dB to peaks and vice-versa.
// One may think to digg into replay_gain code and modify it so that
// it directly sends results as relative peaks.
// In that way there is no need to spend resources in calculating log10 or pow.
Expand Down
2 changes: 1 addition & 1 deletion src/engine/controls/clockcontrol.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ void ClockControl::updateIndicators(const double dRate,
}

// Position change more significiantly, but rate is zero. Occurs when pressing a cue point
// The m_internalState needs to be taken into account here to prevent uneccessary events (state 0 -> state 0)
// The m_internalState needs to be taken into account here to prevent unnecessary events (state 0 -> state 0)
if ((dRate == 0.0) && (m_internalState != StateMachine::outsideIndicationArea)) {
m_internalState = StateMachine::outsideIndicationArea;
m_pCOBeatActive->forceSet(0.0);
Expand Down
2 changes: 1 addition & 1 deletion src/engine/effects/engineeffect.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ bool EngineEffect::process(const ChannelHandle& inputHandle,
m_effectEnableStateForChannelMatrix[inputHandle][outputHandle];

// If the EngineEffect is fully disabled, do not let
// intermediate enabling/disabing signals from the chain override
// intermediate enabling/disabling signals from the chain override
// the EngineEffect's state.
if (effectiveEffectEnableState != EffectEnableState::Disabled) {
if (chainEnableState == EffectEnableState::Disabled) {
Expand Down
2 changes: 1 addition & 1 deletion src/engine/effects/engineeffectchain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ bool EngineEffectChain::process(const ChannelHandle& inputHandle,
EffectEnableState effectiveChainEnableState = channelStatus.enableState;

// If the channel is fully disabled, do not let intermediate
// enabling/disabing signals from the chain's enable switch override
// enabling/disabling signals from the chain's enable switch override
// the channel's state.
if (effectiveChainEnableState != EffectEnableState::Disabled) {
if (m_enableState != EffectEnableState::Enabled) {
Expand Down
2 changes: 1 addition & 1 deletion src/engine/enginebuffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ class EngineBuffer : public EngineObject {
friend class HotcueControlTest;
friend class LoopingControlTest;

LoopingControl* m_pLoopingControl; // used for testes
LoopingControl* m_pLoopingControl; // used for tests
FRIEND_TEST(LoopingControlTest, LoopScale_HalvesLoop);
FRIEND_TEST(SyncControlTest, TestDetermineBpmMultiplier);
FRIEND_TEST(EngineSyncTest, HalfDoubleBpmTest);
Expand Down
2 changes: 1 addition & 1 deletion src/mixxxmainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ MixxxMainWindow::~MixxxMainWindow() {
QPointer<WMainMenuBar> pMenuBar = m_pMenuBar.toWeakRef();
DEBUG_ASSERT(menuBar() == m_pMenuBar.get());
// We need to reset the parented pointer here that it does not become a
// dangling pinter after the object has been deleted.
// dangling pointer after the object has been deleted.
m_pMenuBar = nullptr;
setMenuBar(nullptr);
if (!pMenuBar.isNull()) {
Expand Down
2 changes: 1 addition & 1 deletion src/sources/soundsourceflac.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ void SoundSourceFLAC::flacMetadata(const FLAC__StreamMetadata* metadata) {

void SoundSourceFLAC::flacError(FLAC__StreamDecoderErrorStatus status) {
QString error;
// not much can be done at this point -- luckly the decoder seems to be
// not much can be done at this point -- luckily the decoder seems to be
// pretty forgiving -- bkgood
switch (status) {
case FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC:
Expand Down
2 changes: 1 addition & 1 deletion src/test/autodjprocessor_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ TEST_F(AutoDJProcessorTest, EnabledSuccess_DecksStopped_TrackLoadFailsRightDeck)

PlaylistTableModel* pAutoDJTableModel = pProcessor->getTableModel();
// Need three tracks -- one to be loaded in the left deck (succeeding), one
// to load in the righ deck (failing) and one to load in the right deck
// to load in the right deck (failing) and one to load in the right deck
// (succeeding).
pAutoDJTableModel->appendTrack(testId);
pAutoDJTableModel->appendTrack(testId);
Expand Down
2 changes: 1 addition & 1 deletion src/test/enginesynctest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2904,7 +2904,7 @@ TEST_F(EngineSyncTest, ChangeBeatGrid) {
}

TEST_F(EngineSyncTest, BeatMapQuantizePlay) {
// This test demonstates https://bugs.launchpad.net/mixxx/+bug/1874918
// This test demonstrates https://bugs.launchpad.net/mixxx/+bug/1874918
mixxx::BeatsPointer pBeats1 = mixxx::Beats::fromConstTempo(
m_pTrack1->getSampleRate(), mixxx::audio::kStartFramePos, mixxx::Bpm(120));
m_pTrack1->trySetBeats(pBeats1);
Expand Down
2 changes: 1 addition & 1 deletion src/track/track.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1200,7 +1200,7 @@ bool Track::setCuePointsWhileLocked(const QList<CuePointer>& cuePoints) {
// connect new cue points
for (const auto& pCue : qAsConst(m_cuePoints)) {
DEBUG_ASSERT(pCue->thread() == thread());
// Start listening to cue point updatess AFTER setting
// Start listening to cue point updates AFTER setting
// the track id. Otherwise we would receive unwanted
// signals about changed cue points that may cause all
// sorts of issues, e.g. when adding new tracks during
Expand Down
2 changes: 1 addition & 1 deletion src/waveform/visualplayposition.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace {
// The offset is limited to two callback intervals.
// This should be sufficiant to compensate jitter,
// This should be sufficient to compensate jitter,
// but does not continue in case of underflows.
constexpr int kMaxOffsetBufferCnt = 2;
constexpr int kMicrosPerMillis = 1000; // 1 ms contains 1000 µs
Expand Down
2 changes: 1 addition & 1 deletion src/waveform/waveformwidgetfactory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -916,7 +916,7 @@ void WaveformWidgetFactory::evaluateWidgets() {
}
}
} else {
// No sufficiant GL supptor
// No sufficient GL supptor
if (useOpenGles || useOpenGl || useOpenGLShaders) {
active = false;
}
Expand Down
2 changes: 1 addition & 1 deletion src/widget/wmainmenubar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ void WMainMenuBar::initialize() {
&WMainMenuBar::slotDeveloperStatsBase);
pDeveloperMenu->addAction(pDeveloperStatsBase);

// "D" cannont be used with Alt here as it is already by the Developer menu
// "D" cannot be used with Alt here as it is already by the Developer menu
QString scriptDebuggerTitle = tr("Deb&ugger Enabled");
QString scriptDebuggerText = tr("Enables the debugger during skin parsing");
bool scriptDebuggerEnabled = m_pConfig->getValueString(
Expand Down
2 changes: 1 addition & 1 deletion tools/clang_format.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def run_clang_format_on_lines(rootdir, file_to_format, stylepath=None):
"clang-format",
"--style=file",
# The --assume-filename argument sets the path for the .clang-format
# config file implcitly by assuming a different location of the file to
# config file implicitly by assuming a different location of the file to
# format
"--assume-filename={}".format(
os.path.join(
Expand Down