diff --git a/CMakeLists.txt b/CMakeLists.txt index 72c3783d7e7..63bce108ef7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/packaging/macos/entitlements.plist b/packaging/macos/entitlements.plist index 7193269b745..131339d1ae7 100644 --- a/packaging/macos/entitlements.plist +++ b/packaging/macos/entitlements.plist @@ -46,7 +46,7 @@ --> com.apple.security.cs.allow-jit - com.apple.security.cs.allow-unsigned-executable-memory diff --git a/res/controllers/Behringer-CMD-MM1-scripts.js b/res/controllers/Behringer-CMD-MM1-scripts.js index 666253640ca..2d0cad4f0d6 100644 --- a/res/controllers/Behringer-CMD-MM1-scripts.js +++ b/res/controllers/Behringer-CMD-MM1-scripts.js @@ -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+"]"; diff --git a/res/controllers/Behringer-CMDStudio4a-scripts.js b/res/controllers/Behringer-CMDStudio4a-scripts.js index 211bf30491e..3c562f2167d 100644 --- a/res/controllers/Behringer-CMDStudio4a-scripts.js +++ b/res/controllers/Behringer-CMDStudio4a-scripts.js @@ -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); diff --git a/res/controllers/Gemini-CDMP-7000-scripts.js b/res/controllers/Gemini-CDMP-7000-scripts.js index 68986670800..9cfd88320a0 100644 --- a/res/controllers/Gemini-CDMP-7000-scripts.js +++ b/res/controllers/Gemini-CDMP-7000-scripts.js @@ -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: diff --git a/res/controllers/Hercules-DJ-Console-4-Mx-scripts.js b/res/controllers/Hercules-DJ-Console-4-Mx-scripts.js index b9fec735823..ce9dbca3e6f 100644 --- a/res/controllers/Hercules-DJ-Console-4-Mx-scripts.js +++ b/res/controllers/Hercules-DJ-Console-4-Mx-scripts.js @@ -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 diff --git a/res/controllers/Hercules_DJControl_Inpulse_300.midi.xml b/res/controllers/Hercules_DJControl_Inpulse_300.midi.xml index d87b65055ac..8b7e204c126 100644 --- a/res/controllers/Hercules_DJControl_Inpulse_300.midi.xml +++ b/res/controllers/Hercules_DJControl_Inpulse_300.midi.xml @@ -2243,7 +2243,7 @@ [EffectRack1_EffectUnit2_Effect3] enabled - Effect On/Off buttonn + Effect On/Off button 0.5 1 0x92 diff --git a/res/controllers/Hercules_DJControl_Jogvision.midi.xml b/res/controllers/Hercules_DJControl_Jogvision.midi.xml index 1f7aa166a8d..5f3323da926 100644 --- a/res/controllers/Hercules_DJControl_Jogvision.midi.xml +++ b/res/controllers/Hercules_DJControl_Jogvision.midi.xml @@ -1664,7 +1664,7 @@ [EffectRack1_EffectUnit2_Effect1] enabled - Effect On/Off buttonn + Effect On/Off button 0.5 1 0x91 @@ -1675,7 +1675,7 @@ [EffectRack1_EffectUnit2_Effect2] enabled - Effect On/Off buttonn + Effect On/Off button 0.5 1 0x91 @@ -1686,7 +1686,7 @@ [EffectRack1_EffectUnit2_Effect3] enabled - Effect On/Off buttonn + Effect On/Off button 0.5 1 0x91 diff --git a/res/controllers/Midi_for_light-scripts.js b/res/controllers/Midi_for_light-scripts.js index 94bec0f454e..dac7126cec3 100644 --- a/res/controllers/Midi_for_light-scripts.js +++ b/res/controllers/Midi_for_light-scripts.js @@ -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; diff --git a/res/controllers/Mixman DM2 (OS X).js b/res/controllers/Mixman DM2 (OS X).js index 6c6d237ccb8..b025ff71188 100644 --- a/res/controllers/Mixman DM2 (OS X).js +++ b/res/controllers/Mixman DM2 (OS X).js @@ -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; } diff --git a/res/controllers/Numark-Mixtrack-Platinum-scripts.js b/res/controllers/Numark-Mixtrack-Platinum-scripts.js index 84f9219d81d..e9dcba0ed98 100644 --- a/res/controllers/Numark-Mixtrack-Platinum-scripts.js +++ b/res/controllers/Numark-Mixtrack-Platinum-scripts.js @@ -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'); diff --git a/res/controllers/Numark-Mixtrack-Pro-scripts.js b/res/controllers/Numark-Mixtrack-Pro-scripts.js index e17300c84f1..3855084c86e 100644 --- a/res/controllers/Numark-Mixtrack-Pro-scripts.js +++ b/res/controllers/Numark-Mixtrack-Pro-scripts.js @@ -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). diff --git a/res/controllers/Numark-N4-scripts.js b/res/controllers/Numark-N4-scripts.js index 9967cbf3038..0f9d9c2116e 100644 --- a/res/controllers/Numark-N4-scripts.js +++ b/res/controllers/Numark-N4-scripts.js @@ -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) { @@ -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({ diff --git a/res/controllers/Reloop-Beatpad-scripts.js b/res/controllers/Reloop-Beatpad-scripts.js index ea35aab3c51..12c71765497 100644 --- a/res/controllers/Reloop-Beatpad-scripts.js +++ b/res/controllers/Reloop-Beatpad-scripts.js @@ -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. diff --git a/res/controllers/Vestax-VCI-300-scripts.js b/res/controllers/Vestax-VCI-300-scripts.js index fbb74b62cd1..66f46da06fb 100644 --- a/res/controllers/Vestax-VCI-300-scripts.js +++ b/res/controllers/Vestax-VCI-300-scripts.js @@ -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 diff --git a/res/skins/Deere (64 Samplers)/skin.xml b/res/skins/Deere (64 Samplers)/skin.xml index e8fcfe88c57..f81e4b36ed8 100644 --- a/res/skins/Deere (64 Samplers)/skin.xml +++ b/res/skins/Deere (64 Samplers)/skin.xml @@ -200,7 +200,7 @@ + separately in each deck -->