diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 8f51da9ead2..184dda254a5 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -24,7 +24,7 @@ jobs: # disable these checks for now when pushing directly (but still run these # on Pull Requests!). env: - SKIP: end-of-file-fixer,trailing-whitespace,clang-format,eslint,no-commit-to-branch + SKIP: clang-format,eslint,no-commit-to-branch - name: "Detect code style issues (pull_request)" uses: pre-commit/action@v2.0.0 diff --git a/res/controllers/Akai-LPD8-RK-scripts.js b/res/controllers/Akai-LPD8-RK-scripts.js index f93d4b010a2..efee7ca6d2f 100644 --- a/res/controllers/Akai-LPD8-RK-scripts.js +++ b/res/controllers/Akai-LPD8-RK-scripts.js @@ -591,5 +591,3 @@ LPD8RK.test = function (channel, control, value, status, group) { print("LPD8RK.looptype: ##"+LPD8RK.looptype+"##"); print("test: ##"+2+"##"); }; - - diff --git a/res/controllers/Behringer CMDStudio4a.midi.xml b/res/controllers/Behringer CMDStudio4a.midi.xml index b94596f8809..e24fca97ad7 100644 --- a/res/controllers/Behringer CMDStudio4a.midi.xml +++ b/res/controllers/Behringer CMDStudio4a.midi.xml @@ -2515,7 +2515,7 @@ - + diff --git a/res/controllers/Behringer-BCD3000-Advanced-scripts.js b/res/controllers/Behringer-BCD3000-Advanced-scripts.js index 8e0757bbfc2..1881e1c695b 100644 --- a/res/controllers/Behringer-BCD3000-Advanced-scripts.js +++ b/res/controllers/Behringer-BCD3000-Advanced-scripts.js @@ -223,4 +223,3 @@ BehringerBCD3000.keykey = function (channel, control, value, status, group) { // midi.sendShortMsg(0xB0, 0x07, 0x00); // } //}; - diff --git a/res/controllers/Behringer-BCD3000-scripts.js b/res/controllers/Behringer-BCD3000-scripts.js index 044f5662345..30c909e20b5 100644 --- a/res/controllers/Behringer-BCD3000-scripts.js +++ b/res/controllers/Behringer-BCD3000-scripts.js @@ -121,4 +121,3 @@ BehringerBCD3000.loop = function (channel, control, value, status, group) { engine.setValue(group, action, 1); }; - diff --git a/res/controllers/DJ-Tech-CDJ-101-scripts.js b/res/controllers/DJ-Tech-CDJ-101-scripts.js index fcaff8a7ab6..9d09e7a5c06 100644 --- a/res/controllers/DJ-Tech-CDJ-101-scripts.js +++ b/res/controllers/DJ-Tech-CDJ-101-scripts.js @@ -242,4 +242,3 @@ DJTechCDJ101.jogtop = function(channel, control, value, status, group) engine.scratchTick(parseInt(group.substring(8,9)), value); } } - diff --git a/res/controllers/DJ-Tech-DJM-101-scripts.js b/res/controllers/DJ-Tech-DJM-101-scripts.js index 240deea563f..ddf366f06c5 100644 --- a/res/controllers/DJ-Tech-DJM-101-scripts.js +++ b/res/controllers/DJ-Tech-DJM-101-scripts.js @@ -105,6 +105,3 @@ DJTechDJM101.pfl = function(value, group) // has to be a noteon msg in both case and seems more reliable issuing 0x7f for 'on' amd 0x0 for 'off' midi.sendShortMsg(0x90, group == "[Channel1]" ? 0x21 : 0x22, value > 0 ? 0x7f : 0); } - - - diff --git a/res/controllers/DJ-Tech-Kontrol-One-scripts.js b/res/controllers/DJ-Tech-Kontrol-One-scripts.js index 90332adafe2..ee7d1cd1083 100644 --- a/res/controllers/DJ-Tech-Kontrol-One-scripts.js +++ b/res/controllers/DJ-Tech-Kontrol-One-scripts.js @@ -1566,4 +1566,3 @@ for (i=1;i<12;i++){ len=KONTROL1.beatloopLengths[i]; KONTROL1.loopbuttonLEDs["beatloop_"+len+"_enabled"]=KONTROL1.getIt["b"+i]; } - diff --git a/res/controllers/Denon MC3000.midi.xml b/res/controllers/Denon MC3000.midi.xml index c8ca92d7df1..0276a225f3b 100644 --- a/res/controllers/Denon MC3000.midi.xml +++ b/res/controllers/Denon MC3000.midi.xml @@ -6,7 +6,7 @@ Optimized for Denon MC3000 - Default Midi Channel denon_mc3000 - + @@ -289,7 +289,7 @@ - + 0xe0 0x50 @@ -309,7 +309,7 @@ - + 0x90 1 @@ -320,7 +320,7 @@ 0x92 5 - Cue PFL deck2 (B) + Cue PFL deck2 (B) [Channel2] pfl @@ -334,12 +334,12 @@ 0x93 7 - Cue PFL deck4 (D) + Cue PFL deck4 (D) [Channel4] pfl - + 0x90 21 @@ -412,7 +412,7 @@ - + 0x90 23 @@ -486,7 +486,7 @@ - + 0x90 72 @@ -560,7 +560,7 @@ - + 0x80 23 @@ -634,7 +634,7 @@ - + 0x80 72 @@ -844,7 +844,7 @@ - + 0x90 0x42 @@ -1077,7 +1077,7 @@ mc3000.killMid - + BT Sample @@ -1098,7 +1098,7 @@ mc3000.killBass - + BT Browse @@ -1349,7 +1349,7 @@ - + 0x90 diff --git a/res/controllers/Denon MC4000.midi.xml b/res/controllers/Denon MC4000.midi.xml index c0109240f2a..3ddd8b174a7 100644 --- a/res/controllers/Denon MC4000.midi.xml +++ b/res/controllers/Denon MC4000.midi.xml @@ -429,7 +429,7 @@ - + @@ -579,7 +579,7 @@ - + [EffectRack1_EffectUnit1_Effect1] @@ -690,7 +690,7 @@ - [Channel1] @@ -710,10 +710,10 @@ - + - + [Master] @@ -737,7 +737,7 @@ - + [Channel2] @@ -787,7 +787,7 @@ - + [Sampler1] @@ -861,7 +861,7 @@ - + [Channel1] @@ -921,7 +921,7 @@ - + [Library] @@ -952,7 +952,7 @@ - + [EffectRack1_EffectUnit1_Effect1] @@ -1008,7 +1008,7 @@ - + diff --git a/res/controllers/Denon-MC3000-scripts.js b/res/controllers/Denon-MC3000-scripts.js index 818ea256b10..bf730418370 100644 --- a/res/controllers/Denon-MC3000-scripts.js +++ b/res/controllers/Denon-MC3000-scripts.js @@ -584,5 +584,3 @@ mc3000.playPositionSetLed = function (playposition, group) { mc3000.nearEnd[mc3000.groupToDeck(group)-1] = nearEnd; } } - - diff --git a/res/controllers/EKS-Otus.js b/res/controllers/EKS-Otus.js index 99f03cc05c0..079111e24ca 100644 --- a/res/controllers/EKS-Otus.js +++ b/res/controllers/EKS-Otus.js @@ -786,4 +786,3 @@ EksOtus.circleLEDs = function(position) { controller.setOutput("jog","wheel_"+(led_index),led_color); EksOtus.updateLEDs(); } - diff --git a/res/controllers/FaderFoxDJ2.midi.xml b/res/controllers/FaderFoxDJ2.midi.xml index 003872e9cb3..10e57d1e9ec 100644 --- a/res/controllers/FaderFoxDJ2.midi.xml +++ b/res/controllers/FaderFoxDJ2.midi.xml @@ -85,7 +85,7 @@ 0x0F - + [Channel1] rate_temp_up @@ -642,7 +642,7 @@ 0x80 0x22 - + [EffectRack1_EffectUnit1] diff --git a/res/controllers/Gemini-FirstMix-scripts.js b/res/controllers/Gemini-FirstMix-scripts.js index 116b3dbac68..a1a0e35ec65 100644 --- a/res/controllers/Gemini-FirstMix-scripts.js +++ b/res/controllers/Gemini-FirstMix-scripts.js @@ -262,4 +262,3 @@ firstmix.playbutton2 = function (channel, control, value, status, group) { midi.sendShortMsg(0x90,0x4C,0x7F); // Turn on the Play LED } } - diff --git a/res/controllers/HID-Keyboard.js b/res/controllers/HID-Keyboard.js index d18e280a11e..29efbc51838 100644 --- a/res/controllers/HID-Keyboard.js +++ b/res/controllers/HID-Keyboard.js @@ -27,4 +27,3 @@ HIDKeyboard.incomingData = function(data,length) { } controller.parsePacket(data,length); } - diff --git a/res/controllers/HID-Trackpad.js b/res/controllers/HID-Trackpad.js index febd3eeae8e..2a0c48f0e11 100644 --- a/res/controllers/HID-Trackpad.js +++ b/res/controllers/HID-Trackpad.js @@ -29,4 +29,3 @@ HIDTrackpad.incomingData = function(data,length) { } controller.parsePacket(data,length); } - diff --git a/res/controllers/Hercules DJ Console RMX 2.midi.xml b/res/controllers/Hercules DJ Console RMX 2.midi.xml index 803a972f0b3..90c125d55f3 100644 --- a/res/controllers/Hercules DJ Console RMX 2.midi.xml +++ b/res/controllers/Hercules DJ Console RMX 2.midi.xml @@ -1,5 +1,5 @@ - @@ -318,7 +318,7 @@ - + [Channel1] volume @@ -1114,7 +1114,7 @@ - + [EffectRack1_EffectUnit1_Effect1] enabled @@ -1948,7 +1948,7 @@ 0x90 0x1C 0.5 - + diff --git a/res/controllers/Hercules DJ Control MP3.midi.xml b/res/controllers/Hercules DJ Control MP3.midi.xml index 87dd5c119a0..0fbdbefe818 100644 --- a/res/controllers/Hercules DJ Control MP3.midi.xml +++ b/res/controllers/Hercules DJ Control MP3.midi.xml @@ -424,7 +424,3 @@ - - - - diff --git a/res/controllers/Hercules-DJ-Console-RMX-scripts.js b/res/controllers/Hercules-DJ-Console-RMX-scripts.js index 6072acee226..d6e6be76208 100644 --- a/res/controllers/Hercules-DJ-Console-RMX-scripts.js +++ b/res/controllers/Hercules-DJ-Console-RMX-scripts.js @@ -916,5 +916,3 @@ HerculesRMX.rateChange = function (value, group) { // } // } //}; - - diff --git a/res/controllers/Hercules-DJ-Control-Steel-scripts.js b/res/controllers/Hercules-DJ-Control-Steel-scripts.js index a7065949988..e9691f32073 100644 --- a/res/controllers/Hercules-DJ-Control-Steel-scripts.js +++ b/res/controllers/Hercules-DJ-Control-Steel-scripts.js @@ -1022,4 +1022,3 @@ HerculesSteel.rateChange = function (value, group) { engine.beginTimer(30, "HerculesSteel.GetDeck('" + group + "').Buttons.PitchReset.setLed(HerculesSteel.LedState.off)", true); } }; - diff --git a/res/controllers/Hercules-mp3e2-compat.js b/res/controllers/Hercules-mp3e2-compat.js index 7caa812f55c..35c6d6b9353 100644 --- a/res/controllers/Hercules-mp3e2-compat.js +++ b/res/controllers/Hercules-mp3e2-compat.js @@ -128,4 +128,3 @@ MP3e2.incomingData = function(data, length) { } } } - diff --git a/res/controllers/Korg-KAOSS-DJ-scripts.js b/res/controllers/Korg-KAOSS-DJ-scripts.js index 35827ebb10f..bc6bbea65cc 100644 --- a/res/controllers/Korg-KAOSS-DJ-scripts.js +++ b/res/controllers/Korg-KAOSS-DJ-scripts.js @@ -201,4 +201,4 @@ KAOSSDJ.controllerFxTouchUp = function(channel, control, value, status, group) { var deck = KAOSSDJ.getDeckByChannel(channel); engine.setValue('[EffectRack1_EffectUnit'+deck.deckNumber +']', 'mix', 0); engine.setValue('[EffectRack1_EffectUnit'+deck.deckNumber +']', 'super1', 0); -}; \ No newline at end of file +}; diff --git a/res/controllers/Korg-nanoPAD2-scripts.js b/res/controllers/Korg-nanoPAD2-scripts.js index c10cd959cda..1032728321a 100644 --- a/res/controllers/Korg-nanoPAD2-scripts.js +++ b/res/controllers/Korg-nanoPAD2-scripts.js @@ -196,6 +196,3 @@ NANOPAD2RK.muteOff = function (channel, control, value, status, group) { if (NANOPAD2RK.debug){print("MUTE");} }; - - - diff --git a/res/controllers/MixVibes-U-Mix-Control-Pro-2-scripts.js b/res/controllers/MixVibes-U-Mix-Control-Pro-2-scripts.js index e4f4b3e4fc0..268532f0902 100644 --- a/res/controllers/MixVibes-U-Mix-Control-Pro-2-scripts.js +++ b/res/controllers/MixVibes-U-Mix-Control-Pro-2-scripts.js @@ -25,4 +25,4 @@ ControlPro2.wheelTurn = function (channel, control, value, status, group) { return; } engine.scratchTick(deck,newValue); -} \ No newline at end of file +} diff --git a/res/controllers/Mixman DM2 (Linux).midi.xml b/res/controllers/Mixman DM2 (Linux).midi.xml index 32773dd3b43..34b05adf006 100644 --- a/res/controllers/Mixman DM2 (Linux).midi.xml +++ b/res/controllers/Mixman DM2 (Linux).midi.xml @@ -82,7 +82,7 @@ - + 0x90 0x34 [Flanger] diff --git a/res/controllers/Mixman DM2 (OS X).midi.xml b/res/controllers/Mixman DM2 (OS X).midi.xml index 344a545361e..c843cd1fd7f 100644 --- a/res/controllers/Mixman DM2 (OS X).midi.xml +++ b/res/controllers/Mixman DM2 (OS X).midi.xml @@ -437,4 +437,3 @@ - diff --git a/res/controllers/Nintendo-Wiimote.js b/res/controllers/Nintendo-Wiimote.js index ba0c44a83f7..5367e860967 100644 --- a/res/controllers/Nintendo-Wiimote.js +++ b/res/controllers/Nintendo-Wiimote.js @@ -912,4 +912,3 @@ Wiimote.accel = function(field) { HIDDebug(field.name + " DELTA " + field.delta); } } - diff --git a/res/controllers/Novation-Dicer-scripts.js b/res/controllers/Novation-Dicer-scripts.js index 1034756abcf..450a7047225 100644 --- a/res/controllers/Novation-Dicer-scripts.js +++ b/res/controllers/Novation-Dicer-scripts.js @@ -384,4 +384,4 @@ NovationDicer.cueButton = function(channel, control, value, status, group) midi.sendShortMsg(0x9f,0x3d,NovationDicer.softOrange); engine.setValue(group, "cue_default", 0); } -} \ No newline at end of file +} diff --git a/res/controllers/Novation-Launchpad-Mini-scripts.js b/res/controllers/Novation-Launchpad-Mini-scripts.js index c62788c4d48..9e0bf333b46 100644 --- a/res/controllers/Novation-Launchpad-Mini-scripts.js +++ b/res/controllers/Novation-Launchpad-Mini-scripts.js @@ -577,4 +577,3 @@ NLM.drawPage = function() { } } } - diff --git a/res/controllers/Numark NS7.midi.xml b/res/controllers/Numark NS7.midi.xml index 4393016815c..50cc8546782 100644 --- a/res/controllers/Numark NS7.midi.xml +++ b/res/controllers/Numark NS7.midi.xml @@ -204,7 +204,7 @@ 0xB0 0x45 - + [Channel2] @@ -398,7 +398,7 @@ 0xB0 0x4D - + [Master] @@ -433,7 +433,7 @@ 0xB0 0x40 - + [Channel1] @@ -465,7 +465,7 @@ 0xB0 0x08 - + [Channel2] @@ -543,7 +543,7 @@ 0.9 0.99 - + [Channel1] diff --git a/res/controllers/Numark Omni Control.midi.xml b/res/controllers/Numark Omni Control.midi.xml index f3c02411f73..3a2006e75dc 100644 --- a/res/controllers/Numark Omni Control.midi.xml +++ b/res/controllers/Numark Omni Control.midi.xml @@ -907,4 +907,3 @@ - diff --git a/res/controllers/Numark-DJ2Go-scripts.js b/res/controllers/Numark-DJ2Go-scripts.js index c1f1bd7e6e6..115e3777767 100644 --- a/res/controllers/Numark-DJ2Go-scripts.js +++ b/res/controllers/Numark-DJ2Go-scripts.js @@ -683,9 +683,3 @@ NumarkDJ2Go.loopOut = function(channel, control, value, status, group) { } } }; //loopOut - - - - - - diff --git a/res/controllers/Numark-Mixtrack-3.midi.xml b/res/controllers/Numark-Mixtrack-3.midi.xml index 52a9f4c638f..c3ffcac8846 100644 --- a/res/controllers/Numark-Mixtrack-3.midi.xml +++ b/res/controllers/Numark-Mixtrack-3.midi.xml @@ -936,4 +936,4 @@ - \ No newline at end of file + diff --git a/res/controllers/Numark-Omni-Control-scripts.js b/res/controllers/Numark-Omni-Control-scripts.js index 3063a7ff507..556069a4bf1 100644 --- a/res/controllers/Numark-Omni-Control-scripts.js +++ b/res/controllers/Numark-Omni-Control-scripts.js @@ -480,4 +480,3 @@ NumarkTotalControl.toggleQuantize = function(channel, control, value, status, gr engine.setValue("[Channel2]", "quantize", newValue); } } - diff --git a/res/controllers/Numark-V7-scripts.js b/res/controllers/Numark-V7-scripts.js index 9bc3b464670..87ea989bc0b 100644 --- a/res/controllers/Numark-V7-scripts.js +++ b/res/controllers/Numark-V7-scripts.js @@ -2127,4 +2127,3 @@ NumarkV7.ScratchB = function (channel, control, value, status, group) { // :P // // // /////////////////////////// - diff --git a/res/controllers/Pioneer-CDJ-2000-scripts.js b/res/controllers/Pioneer-CDJ-2000-scripts.js index 24251c293e8..ecc4c75f978 100644 --- a/res/controllers/Pioneer-CDJ-2000-scripts.js +++ b/res/controllers/Pioneer-CDJ-2000-scripts.js @@ -28,4 +28,3 @@ PioneerCDJ2000.select_track_knob = function(channel, control, value, status, gro } engine.setValue(group,'SelectTrackKnob',value); }; - diff --git a/res/controllers/Pioneer-CDJ-350-scripts.js b/res/controllers/Pioneer-CDJ-350-scripts.js index 7d98e28e256..35ef23acc2f 100644 --- a/res/controllers/Pioneer-CDJ-350-scripts.js +++ b/res/controllers/Pioneer-CDJ-350-scripts.js @@ -110,4 +110,4 @@ PioneerCDJ350.loop_end_plus = function(channel, control, value, status, group) return; } engine.setValue(group, "loop_end_position", engine.getValue(group, "loop_end_position") + 256); -}; \ No newline at end of file +}; diff --git a/res/controllers/Pioneer-CDJ-850-scripts.js b/res/controllers/Pioneer-CDJ-850-scripts.js index 3e180c4e9a8..dcbcce806eb 100644 --- a/res/controllers/Pioneer-CDJ-850-scripts.js +++ b/res/controllers/Pioneer-CDJ-850-scripts.js @@ -68,4 +68,3 @@ PioneerCDJ850.hotcue_last_delete = function(channel, control, value, status, gro engine.setValue(group,key,value); PioneerCDJ850.last_hotcue = 0; } - diff --git a/res/controllers/Pioneer-CDJ-HID.js b/res/controllers/Pioneer-CDJ-HID.js index c454e4bd41d..c01e0c67f3e 100644 --- a/res/controllers/Pioneer-CDJ-HID.js +++ b/res/controllers/Pioneer-CDJ-HID.js @@ -777,4 +777,3 @@ PioneerCDJHID.pregain = function (field) { script.absoluteNonLin(field.value, 0, 1, 5, 0, 65536) ); } - diff --git a/res/controllers/Pioneer-DDJ-SB-scripts.js b/res/controllers/Pioneer-DDJ-SB-scripts.js index 99a8e2f995c..cfb3f247745 100644 --- a/res/controllers/Pioneer-DDJ-SB-scripts.js +++ b/res/controllers/Pioneer-DDJ-SB-scripts.js @@ -954,4 +954,4 @@ PioneerDDJSB.softTakeoverEmulation = function (deck, index, currentValue) { return true; } return false; -}; \ No newline at end of file +}; diff --git a/res/controllers/Reloop-Digital-Jockey2-Controller-scripts.js b/res/controllers/Reloop-Digital-Jockey2-Controller-scripts.js index ec571512166..b3cb88eee22 100644 --- a/res/controllers/Reloop-Digital-Jockey2-Controller-scripts.js +++ b/res/controllers/Reloop-Digital-Jockey2-Controller-scripts.js @@ -933,4 +933,4 @@ DigitalJockey2Controller.LoopPlusMinus = function (channel, control, value, stat engine.setValue(group,"beatloop",nextBeatLoop); } } -} \ No newline at end of file +} diff --git a/res/controllers/Sony-SixxAxis.js b/res/controllers/Sony-SixxAxis.js index 4a39fd2e304..b712f5be88c 100644 --- a/res/controllers/Sony-SixxAxis.js +++ b/res/controllers/Sony-SixxAxis.js @@ -301,5 +301,3 @@ SonySixxAxis.jog_bend = function(group,direction,value) { if (direction=="down") engine.setValue(group,"jog",-6); } - - diff --git a/res/controllers/Stanton SCS.1d.midi.xml b/res/controllers/Stanton SCS.1d.midi.xml index 78f1f9e4d73..ada5b9cc505 100644 --- a/res/controllers/Stanton SCS.1d.midi.xml +++ b/res/controllers/Stanton SCS.1d.midi.xml @@ -23,7 +23,7 @@ - + 0x90 0x04 @@ -222,9 +222,9 @@ - + - + 0x90 0x37 @@ -351,9 +351,9 @@ - + - + 0xf9 [Master] @@ -362,9 +362,9 @@ - + - + 0x90 0x1E @@ -473,9 +473,9 @@ - + - + 0x90 0x06 @@ -521,9 +521,9 @@ - + - + 0x90 0x20 @@ -722,9 +722,9 @@ - + - + 0x90 0x16 @@ -779,9 +779,9 @@ - + - + 0x90 8 diff --git a/res/controllers/Stanton SCS.3d.midi.xml b/res/controllers/Stanton SCS.3d.midi.xml index 1af1274db6f..f27a06c4f7f 100644 --- a/res/controllers/Stanton SCS.3d.midi.xml +++ b/res/controllers/Stanton SCS.3d.midi.xml @@ -10,9 +10,9 @@ - + - + Device status inquiry response 0xf0 [Master] @@ -105,7 +105,7 @@ - + EQ [Master] @@ -125,7 +125,7 @@ - + Loop [Master] @@ -145,7 +145,7 @@ - + Trig [Master] @@ -165,7 +165,7 @@ - + Vinyl @@ -189,7 +189,7 @@ - + Deck [Master] @@ -209,7 +209,7 @@ - + B11 headphone cue [Master] @@ -229,7 +229,7 @@ - + B12 @@ -253,7 +253,7 @@ - + [Master] StantonSCS3d.B13 @@ -273,7 +273,7 @@ - + [Master] StantonSCS3d.B14 @@ -293,7 +293,7 @@ - + [Master] StantonSCS3d.C1relative @@ -303,7 +303,7 @@ - + [Master] StantonSCS3d.C1absolute @@ -331,7 +331,7 @@ - + [Master] StantonSCS3d.S3absolute @@ -358,7 +358,7 @@ - + [Master] StantonSCS3d.S4relative @@ -396,7 +396,7 @@ - + [Master] StantonSCS3d.S5absolute @@ -432,7 +432,7 @@ - + [Master] StantonSCS3d.playButton @@ -452,7 +452,7 @@ - + [Master] StantonSCS3d.cueButton @@ -472,7 +472,7 @@ - + [Master] StantonSCS3d.syncButton @@ -492,7 +492,7 @@ - + [Master] StantonSCS3d.tapButton @@ -512,7 +512,7 @@ - + [Master] StantonSCS3d.SurfaceButton @@ -530,7 +530,7 @@ - + [Master] StantonSCS3d.SurfaceButton @@ -548,7 +548,7 @@ - + [Master] StantonSCS3d.SurfaceButton @@ -566,7 +566,7 @@ - + [Master] StantonSCS3d.SurfaceButton @@ -584,7 +584,7 @@ - + [Master] StantonSCS3d.SurfaceButton @@ -602,7 +602,7 @@ - + [Master] StantonSCS3d.SurfaceButton @@ -620,7 +620,7 @@ - + [Master] StantonSCS3d.SurfaceButton @@ -638,7 +638,7 @@ - + [Master] StantonSCS3d.SurfaceButton @@ -656,7 +656,7 @@ - + - + diff --git a/res/controllers/Stanton-SCS1d-scripts.js b/res/controllers/Stanton-SCS1d-scripts.js index 0e31658cd35..7b9a3c81a0c 100644 --- a/res/controllers/Stanton-SCS1d-scripts.js +++ b/res/controllers/Stanton-SCS1d-scripts.js @@ -2111,4 +2111,4 @@ BUGS: - Dragging the window/tooltips screw up speed on Windows - use timestamps - Sticker drift - timestamps? - Manipulating other controls in vinyl mode makes speed jiggly - timestamps?? -*/ \ No newline at end of file +*/ diff --git a/res/controllers/Stanton-SCS1m-scripts.js b/res/controllers/Stanton-SCS1m-scripts.js index a54da1b7a53..e3aa8aaead7 100644 --- a/res/controllers/Stanton-SCS1m-scripts.js +++ b/res/controllers/Stanton-SCS1m-scripts.js @@ -804,4 +804,4 @@ StantonSCS1m.positionUpdates = function (value,deck) { StantonSCS1m.lastTime[deck]=message; } } -} \ No newline at end of file +} diff --git a/res/controllers/Stanton-SCS3d-scripts.js b/res/controllers/Stanton-SCS3d-scripts.js index 0d369ccf8ab..414d2f33ace 100644 --- a/res/controllers/Stanton-SCS3d-scripts.js +++ b/res/controllers/Stanton-SCS3d-scripts.js @@ -2282,4 +2282,4 @@ StantonSCS3d.circleLEDs = function (value) { * - FX B11 is now reverseroll (censor) instead of regular reverse * - FX B12 toggles this effect unit on this deck * - Mode + SYNC = toggle quantize - */ \ No newline at end of file + */ diff --git a/res/controllers/TrakProDJ-iPad-scripts.js b/res/controllers/TrakProDJ-iPad-scripts.js index 8c65a6ae759..0d0d6628f13 100644 --- a/res/controllers/TrakProDJ-iPad-scripts.js +++ b/res/controllers/TrakProDJ-iPad-scripts.js @@ -337,4 +337,3 @@ TrakProDJ.jog = function(channel, control, value, status, group) { } } }; - diff --git a/res/controllers/Traktor Kontrol S2 MK3.hid.xml b/res/controllers/Traktor Kontrol S2 MK3.hid.xml index 7ad2b482422..185bfd026f9 100644 --- a/res/controllers/Traktor Kontrol S2 MK3.hid.xml +++ b/res/controllers/Traktor Kontrol S2 MK3.hid.xml @@ -17,4 +17,3 @@ - diff --git a/res/controllers/Traktor Kontrol X1.midi.xml b/res/controllers/Traktor Kontrol X1.midi.xml index d338c9d3278..d856f825782 100644 --- a/res/controllers/Traktor Kontrol X1.midi.xml +++ b/res/controllers/Traktor Kontrol X1.midi.xml @@ -109,4 +109,3 @@ - diff --git a/res/controllers/Traktor-Kontrol-F1-scripts.js b/res/controllers/Traktor-Kontrol-F1-scripts.js index e4ffe666a46..303b571e8d0 100644 --- a/res/controllers/Traktor-Kontrol-F1-scripts.js +++ b/res/controllers/Traktor-Kontrol-F1-scripts.js @@ -824,4 +824,3 @@ KontrolF1.hotcue = function(button,field) { name = button.name + '_activate'; engine.setValue(button.group,name,true); } - diff --git a/res/controllers/Vestax VCI-100-3DEX.midi.xml b/res/controllers/Vestax VCI-100-3DEX.midi.xml index 9bccba717f8..3ec8b09fdc3 100644 --- a/res/controllers/Vestax VCI-100-3DEX.midi.xml +++ b/res/controllers/Vestax VCI-100-3DEX.midi.xml @@ -755,7 +755,7 @@ volume 0xB0 0x46 - + [Flanger] lfoPeriod @@ -780,7 +780,7 @@ volume 0xB0 0x54 - + [Flanger] lfoPeriod @@ -806,7 +806,7 @@ pregain 0xB0 0x4A - + [Sampler2] pregain diff --git a/res/controllers/Vestax VCI-100-hile.midi.xml b/res/controllers/Vestax VCI-100-hile.midi.xml index f9937007d78..59a29e063f4 100644 --- a/res/controllers/Vestax VCI-100-hile.midi.xml +++ b/res/controllers/Vestax VCI-100-hile.midi.xml @@ -100,4 +100,3 @@ - diff --git a/res/controllers/Vestax-Typhoon-scripts.js b/res/controllers/Vestax-Typhoon-scripts.js index e7ee02a2360..e96433305b3 100644 --- a/res/controllers/Vestax-Typhoon-scripts.js +++ b/res/controllers/Vestax-Typhoon-scripts.js @@ -797,4 +797,4 @@ VestaxTyphoon.loopOutPlus = function(channel, control, value, status, group){ midi.sendShortMsg(0x90+channel,0x42,0x00); } } -} \ No newline at end of file +} diff --git a/res/controllers/Vestax-VCI-100-hile.js b/res/controllers/Vestax-VCI-100-hile.js index 5f7a2ae148b..c24493a2377 100644 --- a/res/controllers/Vestax-VCI-100-hile.js +++ b/res/controllers/Vestax-VCI-100-hile.js @@ -536,4 +536,3 @@ HileVci100.jog_wheel = function(button,value) { engine.setValue(button.group,"jog",value); } } - diff --git a/res/controllers/Wireless-DJ-scripts.js b/res/controllers/Wireless-DJ-scripts.js index 98c60b38a05..a070378d6ba 100644 --- a/res/controllers/Wireless-DJ-scripts.js +++ b/res/controllers/Wireless-DJ-scripts.js @@ -262,4 +262,4 @@ WirelessDJ.magic_stripe_lsb = function(channel, control, value, status, group) { engine.setValue(group, "wheel", diff * WirelessDJ.jogSensibility); } -}; \ No newline at end of file +}; diff --git a/res/controllers/common-hid-devices.js b/res/controllers/common-hid-devices.js index b479057a87c..6d4e917bf2b 100644 --- a/res/controllers/common-hid-devices.js +++ b/res/controllers/common-hid-devices.js @@ -74,4 +74,3 @@ HIDKeyboardDevice = function() { HIDDebug("KEY RELEASE " + field.id) } } - diff --git a/res/images/library/ic_library_rekordbox.svg b/res/images/library/ic_library_rekordbox.svg index 6e5e4bb676f..c38540b237e 100644 --- a/res/images/library/ic_library_rekordbox.svg +++ b/res/images/library/ic_library_rekordbox.svg @@ -43,4 +43,4 @@ id="defs10" /> \ No newline at end of file + id="path4145" /> diff --git a/res/images/mixxx-icon-logo-symbolic.svg b/res/images/mixxx-icon-logo-symbolic.svg index 4c9904ee248..b649e72363f 100644 --- a/res/images/mixxx-icon-logo-symbolic.svg +++ b/res/images/mixxx-icon-logo-symbolic.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/res/keyboard/el_GR.kbd.cfg b/res/keyboard/el_GR.kbd.cfg index e11254e7e51..fe519aeef24 100644 --- a/res/keyboard/el_GR.kbd.cfg +++ b/res/keyboard/el_GR.kbd.cfg @@ -169,4 +169,4 @@ OptionsMenu_DeveloperTools Ctrl+Shift+T OptionsMenu_DeveloperStatsExperiment Ctrl+Shift+E OptionsMenu_DeveloperStatsBase Ctrl+Shift+B DeveloperMenu_EnableDebugger Ctrl+Shift+D -OptionsMenu_EnableShortcuts Ctrl+` \ No newline at end of file +OptionsMenu_EnableShortcuts Ctrl+` diff --git a/res/shaders/passthrough.vert b/res/shaders/passthrough.vert index 38ce32d8f83..1982f048111 100644 --- a/res/shaders/passthrough.vert +++ b/res/shaders/passthrough.vert @@ -5,4 +5,3 @@ void main(void) gl_TexCoord[0] = gl_MultiTexCoord0; gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } - diff --git a/res/skins/Deere (64 Samplers)/sample_decks.xml b/res/skins/Deere (64 Samplers)/sample_decks.xml index 41fb8d96bd4..0bcd5718efe 100644 --- a/res/skins/Deere (64 Samplers)/sample_decks.xml +++ b/res/skins/Deere (64 Samplers)/sample_decks.xml @@ -382,4 +382,3 @@ - diff --git a/res/skins/Deere/spacer_h.xml b/res/skins/Deere/spacer_h.xml index 6cf76bde790..635045587c1 100644 --- a/res/skins/Deere/spacer_h.xml +++ b/res/skins/Deere/spacer_h.xml @@ -11,7 +11,3 @@ A horizontal space filling widget. Grows to fit available space. - - - - diff --git a/res/skins/Deere/spacer_v.xml b/res/skins/Deere/spacer_v.xml index 61312ae3387..5977aba0694 100644 --- a/res/skins/Deere/spacer_v.xml +++ b/res/skins/Deere/spacer_v.xml @@ -10,7 +10,3 @@ A vertical space filling widget. Grows to fit available space. - - - - diff --git a/res/skins/Deere/statuslight_3state.xml b/res/skins/Deere/statuslight_3state.xml index 1d65635fb5b..61c4f6a9555 100644 --- a/res/skins/Deere/statuslight_3state.xml +++ b/res/skins/Deere/statuslight_3state.xml @@ -39,4 +39,4 @@ visible - \ No newline at end of file + diff --git a/res/skins/Shade/decks_row_small.xml b/res/skins/Shade/decks_row_small.xml index 56e31d2ff5f..6484b460ef5 100644 --- a/res/skins/Shade/decks_row_small.xml +++ b/res/skins/Shade/decks_row_small.xml @@ -28,4 +28,3 @@ - diff --git a/res/skins/Shade/effectrow.xml b/res/skins/Shade/effectrow.xml index cc300cf6cf9..4dc5a27bf50 100644 --- a/res/skins/Shade/effectrow.xml +++ b/res/skins/Shade/effectrow.xml @@ -68,4 +68,3 @@ - diff --git a/res/skins/Shade/effectunit_border.xml b/res/skins/Shade/effectunit_border.xml index a3eceee1d3f..7745c63b0e6 100644 --- a/res/skins/Shade/effectunit_border.xml +++ b/res/skins/Shade/effectunit_border.xml @@ -10,13 +10,12 @@ EffectRightBorder 3f,5f - - + + [EffectRack1_EffectUnit],focused_effect 0 visible - - + + - diff --git a/res/skins/Shade/effectunitsmall.xml b/res/skins/Shade/effectunitsmall.xml index f600600a21c..f3b4fb006a5 100644 --- a/res/skins/Shade/effectunitsmall.xml +++ b/res/skins/Shade/effectunitsmall.xml @@ -47,4 +47,3 @@ - diff --git a/res/skins/Shade/samplerrow.xml b/res/skins/Shade/samplerrow.xml index c46aa44c605..d64410eebe2 100644 --- a/res/skins/Shade/samplerrow.xml +++ b/res/skins/Shade/samplerrow.xml @@ -24,7 +24,7 @@ EffectLeftBorder 5f,40f style/style_bg_deck_border.png - + 0e,40f style/style_bg_looping.png @@ -54,13 +54,13 @@ EffectRightBorder 5f,40f style/style_bg_deck_border.png - + EffectRightBorder 3f,40f - - - + + + @@ -81,7 +81,7 @@ EffectLeftBorder 5f,40f style/style_bg_deck_border.png - + 0e,40f style/style_bg_looping.png @@ -118,13 +118,13 @@ EffectRightBorder 5f,40f style/style_bg_deck_border.png - + EffectRightBorder 3f,40f - - - + + + [Skin],sampler_row__expanded @@ -181,13 +181,13 @@ EffectRightBorder 5f,92f style/style_bg_deck_border.png - + EffectRightBorder 3f,40f - - - + + + @@ -247,13 +247,13 @@ EffectRightBorder 5f,92f style/style_bg_deck_border.png - + EffectRightBorder 3f,40f - - - + + + [Skin],sampler_row__expanded diff --git a/res/skins/Shade/srcrow.xml b/res/skins/Shade/srcrow.xml index 982aafd3bca..a7b7552a051 100644 --- a/res/skins/Shade/srcrow.xml +++ b/res/skins/Shade/srcrow.xml @@ -60,4 +60,3 @@ - diff --git a/src/test/mixxx_library_struct.tar.gz.readme b/src/test/mixxx_library_struct.tar.gz.readme index ebca6b75e05..38bae7865af 100644 --- a/src/test/mixxx_library_struct.tar.gz.readme +++ b/src/test/mixxx_library_struct.tar.gz.readme @@ -1,5 +1,4 @@ mixxx_library_struct.tar.gz contains a reference library tree that contains symlinks. -Unpack this somewhere to your mixxx library to check if the library scanner can still handle this. -The empty.mp3 must not appear more than one time in your library. -This test works only on file systems that support symlinks. - +Unpack this somewhere to your mixxx library to check if the library scanner can still handle this. +The empty.mp3 must not appear more than one time in your library. +This test works only on file systems that support symlinks. diff --git a/src/test/soundFileFormats/README.txt b/src/test/soundFileFormats/README.txt index 67e1a6a6d08..ba7d6bd1b10 100644 --- a/src/test/soundFileFormats/README.txt +++ b/src/test/soundFileFormats/README.txt @@ -13,4 +13,4 @@ If all of these are good, please add a "Yes" in the "Does it work?" column for y If any of these fails, please report a bug using the instructions on this page: http://mixxx.org/wiki/doku.php/reporting_bugs -When you're done, you can run ./generateFiles clean to delete all the generated files \ No newline at end of file +When you're done, you can run ./generateFiles clean to delete all the generated files diff --git a/src/util/desktophelper.h b/src/util/desktophelper.h index 0953b8515dc..24a277bfc9f 100644 --- a/src/util/desktophelper.h +++ b/src/util/desktophelper.h @@ -11,4 +11,4 @@ class DesktopHelper { static void openInFileBrowser(const QStringList& paths); }; -} // namespace mixxx \ No newline at end of file +} // namespace mixxx