diff --git a/.codespellignore b/.codespellignore index eadf45774fc1..c5c9c8e31b5c 100644 --- a/.codespellignore +++ b/.codespellignore @@ -1,4 +1,4 @@ -Crate crate -InOut copyable +doubleclick +technics diff --git a/.codespellignorelines b/.codespellignorelines index e69de29bb2d1..ef19b5334e40 100644 --- a/.codespellignorelines +++ b/.codespellignorelines @@ -0,0 +1,38 @@ + qint64 nsecs = cpuTime * info.numer / info.denom; + virtual void process(CSAMPLE* pInOut, + CSAMPLE* pInOut, + pInOut, pInOut, + CSAMPLE* pInOut, + CSAMPLE* pInOut, +void EnginePregain::process(CSAMPLE* pInOut, const int iBufferSize) { +void EngineDelay::process(CSAMPLE* pInOut, const int iBufferSize) { +void EngineFilter::process(CSAMPLE* pInOut, const int iBufferSize) + pInOut[i] = (CSAMPLE) processSample(fbuf1, (double) pInOut[i]); + pInOut[i + 1] = (CSAMPLE) processSample(fbuf2, (double) pInOut[i + 1]); + m_pDelayBuffer[m_iDelayPos] = pInOut[i]; + pInOut[i] = m_pDelayBuffer[iDelaySourcePos]; + SampleUtil::applyRampingGain(&pInOut[0], m_fPrevGain, 0, iBufferSize / 2); + SampleUtil::applyRampingGain(&pInOut[iBufferSize / 2], 0, totalGain, iBufferSize / 2); + SampleUtil::applyRampingGain(pInOut, m_fPrevGain, totalGain, iBufferSize); + SampleUtil::applyGain(pInOut, totalGain, iBufferSize); + void process(CSAMPLE* pInOut, const int iBufferSize) override; + void process(CSAMPLE* pInOut, const int iBufferSize); + virtual void process(CSAMPLE* pInOut, const int iBufferSize); + "CSAMPLE_GAIN gain%(i)din, CSAMPLE_GAIN gain%(i)dout" + "gain%(i)dout == CSAMPLE_GAIN_ZERO) {" + "pSrc%(i)d, gain%(i)din, gain%(i)dout" % {"i": j} + "(gain%(i)dout - gain%(i)din) / (iNumSamples / 2);" + MOCK_METHOD2(process, void(CSAMPLE* pInOut, const int iBufferSize)); + const QString kName3 = QStringLiteral("I'm blue, da ba dee"); + float m_k2vg; // IIF factor + float m_k2vgNew; // IIF factor + -- Free Ekanayaka Thu, 27 Dec 2007 09:53:41 +0000 + + Copyright (C) 2010-2013 jus , 2014 Owen Williams , + Copyright (C) 2010-2014 jus + EXPECT_QSTRING_EQ("fo", map.at(test)); + jus + * @returns {Function} Returns the new pass-thru function. + Completely revised for &dhpackage; 1.11 by Max Linke + var latin_map={"Á":"A","Ă":"A","Ắ":"A","Ặ":"A","Ằ":"A","Ẳ":"A","Ẵ":"A","Ǎ":"A","Â":"A","Ấ":"A","Ậ":"A","Ầ":"A","Ẩ":"A","Ẫ":"A","Ä":"A","Ǟ":"A","Ȧ":"A","Ǡ":"A","Ạ":"A","Ȁ":"A","À":"A","Ả":"A","Ȃ":"A","Ā":"A","Ą":"A","Å":"A","Ǻ":"A","Ḁ":"A","Ⱥ":"A","Ã":"A","Ꜳ":"AA","Æ":"AE","Ǽ":"AE","Ǣ":"AE","Ꜵ":"AO","Ꜷ":"AU","Ꜹ":"AV","Ꜻ":"AV","Ꜽ":"AY","Ḃ":"B","Ḅ":"B","Ɓ":"B","Ḇ":"B","Ƀ":"B","Ƃ":"B","Ć":"C","Č":"C","Ç":"C","Ḉ":"C","Ĉ":"C","Ċ":"C","Ƈ":"C","Ȼ":"C","Ď":"D","Ḑ":"D","Ḓ":"D","Ḋ":"D","Ḍ":"D","Ɗ":"D","Ḏ":"D","Dz":"D","Dž":"D","Đ":"D","Ƌ":"D","DZ":"DZ","DŽ":"DZ","É":"E","Ĕ":"E","Ě":"E","Ȩ":"E","Ḝ":"E","Ê":"E","Ế":"E","Ệ":"E","Ề":"E","Ể":"E","Ễ":"E","Ḙ":"E","Ë":"E","Ė":"E","Ẹ":"E","Ȅ":"E","È":"E","Ẻ":"E","Ȇ":"E","Ē":"E","Ḗ":"E","Ḕ":"E","Ę":"E","Ɇ":"E","Ẽ":"E","Ḛ":"E","Ꝫ":"ET","Ḟ":"F","Ƒ":"F","Ǵ":"G","Ğ":"G","Ǧ":"G","Ģ":"G","Ĝ":"G","Ġ":"G","Ɠ":"G","Ḡ":"G","Ǥ":"G","Ḫ":"H","Ȟ":"H","Ḩ":"H","Ĥ":"H","Ⱨ":"H","Ḧ":"H","Ḣ":"H","Ḥ":"H","Ħ":"H","Í":"I","Ĭ":"I","Ǐ":"I","Î":"I","Ï":"I","Ḯ":"I","İ":"I","Ị":"I","Ȉ":"I","Ì":"I","Ỉ":"I","Ȋ":"I","Ī":"I","Į":"I","Ɨ":"I","Ĩ":"I","Ḭ":"I","Ꝺ":"D","Ꝼ":"F","Ᵹ":"G","Ꞃ":"R","Ꞅ":"S","Ꞇ":"T","Ꝭ":"IS","Ĵ":"J","Ɉ":"J","Ḱ":"K","Ǩ":"K","Ķ":"K","Ⱪ":"K","Ꝃ":"K","Ḳ":"K","Ƙ":"K","Ḵ":"K","Ꝁ":"K","Ꝅ":"K","Ĺ":"L","Ƚ":"L","Ľ":"L","Ļ":"L","Ḽ":"L","Ḷ":"L","Ḹ":"L","Ⱡ":"L","Ꝉ":"L","Ḻ":"L","Ŀ":"L","Ɫ":"L","Lj":"L","Ł":"L","LJ":"LJ","Ḿ":"M","Ṁ":"M","Ṃ":"M","Ɱ":"M","Ń":"N","Ň":"N","Ņ":"N","Ṋ":"N","Ṅ":"N","Ṇ":"N","Ǹ":"N","Ɲ":"N","Ṉ":"N","Ƞ":"N","Nj":"N","Ñ":"N","NJ":"NJ","Ó":"O","Ŏ":"O","Ǒ":"O","Ô":"O","Ố":"O","Ộ":"O","Ồ":"O","Ổ":"O","Ỗ":"O","Ö":"O","Ȫ":"O","Ȯ":"O","Ȱ":"O","Ọ":"O","Ő":"O","Ȍ":"O","Ò":"O","Ỏ":"O","Ơ":"O","Ớ":"O","Ợ":"O","Ờ":"O","Ở":"O","Ỡ":"O","Ȏ":"O","Ꝋ":"O","Ꝍ":"O","Ō":"O","Ṓ":"O","Ṑ":"O","Ɵ":"O","Ǫ":"O","Ǭ":"O","Ø":"O","Ǿ":"O","Õ":"O","Ṍ":"O","Ṏ":"O","Ȭ":"O","Ƣ":"OI","Ꝏ":"OO","Ɛ":"E","Ɔ":"O","Ȣ":"OU","Ṕ":"P","Ṗ":"P","Ꝓ":"P","Ƥ":"P","Ꝕ":"P","Ᵽ":"P","Ꝑ":"P","Ꝙ":"Q","Ꝗ":"Q","Ŕ":"R","Ř":"R","Ŗ":"R","Ṙ":"R","Ṛ":"R","Ṝ":"R","Ȑ":"R","Ȓ":"R","Ṟ":"R","Ɍ":"R","Ɽ":"R","Ꜿ":"C","Ǝ":"E","Ś":"S","Ṥ":"S","Š":"S","Ṧ":"S","Ş":"S","Ŝ":"S","Ș":"S","Ṡ":"S","Ṣ":"S","Ṩ":"S","ẞ":"SS","Ť":"T","Ţ":"T","Ṱ":"T","Ț":"T","Ⱦ":"T","Ṫ":"T","Ṭ":"T","Ƭ":"T","Ṯ":"T","Ʈ":"T","Ŧ":"T","Ɐ":"A","Ꞁ":"L","Ɯ":"M","Ʌ":"V","Ꜩ":"TZ","Ú":"U","Ŭ":"U","Ǔ":"U","Û":"U","Ṷ":"U","Ü":"U","Ǘ":"U","Ǚ":"U","Ǜ":"U","Ǖ":"U","Ṳ":"U","Ụ":"U","Ű":"U","Ȕ":"U","Ù":"U","Ủ":"U","Ư":"U","Ứ":"U","Ự":"U","Ừ":"U","Ử":"U","Ữ":"U","Ȗ":"U","Ū":"U","Ṻ":"U","Ų":"U","Ů":"U","Ũ":"U","Ṹ":"U","Ṵ":"U","Ꝟ":"V","Ṿ":"V","Ʋ":"V","Ṽ":"V","Ꝡ":"VY","Ẃ":"W","Ŵ":"W","Ẅ":"W","Ẇ":"W","Ẉ":"W","Ẁ":"W","Ⱳ":"W","Ẍ":"X","Ẋ":"X","Ý":"Y","Ŷ":"Y","Ÿ":"Y","Ẏ":"Y","Ỵ":"Y","Ỳ":"Y","Ƴ":"Y","Ỷ":"Y","Ỿ":"Y","Ȳ":"Y","Ɏ":"Y","Ỹ":"Y","Ź":"Z","Ž":"Z","Ẑ":"Z","Ⱬ":"Z","Ż":"Z","Ẓ":"Z","Ȥ":"Z","Ẕ":"Z","Ƶ":"Z","IJ":"IJ","Œ":"OE","ᴀ":"A","ᴁ":"AE","ʙ":"B","ᴃ":"B","ᴄ":"C","ᴅ":"D","ᴇ":"E","ꜰ":"F","ɢ":"G","ʛ":"G","ʜ":"H","ɪ":"I","ʁ":"R","ᴊ":"J","ᴋ":"K","ʟ":"L","ᴌ":"L","ᴍ":"M","ɴ":"N","ᴏ":"O","ɶ":"OE","ᴐ":"O","ᴕ":"OU","ᴘ":"P","ʀ":"R","ᴎ":"N","ᴙ":"R","ꜱ":"S","ᴛ":"T","ⱻ":"E","ᴚ":"R","ᴜ":"U","ᴠ":"V","ᴡ":"W","ʏ":"Y","ᴢ":"Z","á":"a","ă":"a","ắ":"a","ặ":"a","ằ":"a","ẳ":"a","ẵ":"a","ǎ":"a","â":"a","ấ":"a","ậ":"a","ầ":"a","ẩ":"a","ẫ":"a","ä":"a","ǟ":"a","ȧ":"a","ǡ":"a","ạ":"a","ȁ":"a","à":"a","ả":"a","ȃ":"a","ā":"a","ą":"a","ᶏ":"a","ẚ":"a","å":"a","ǻ":"a","ḁ":"a","ⱥ":"a","ã":"a","ꜳ":"aa","æ":"ae","ǽ":"ae","ǣ":"ae","ꜵ":"ao","ꜷ":"au","ꜹ":"av","ꜻ":"av","ꜽ":"ay","ḃ":"b","ḅ":"b","ɓ":"b","ḇ":"b","ᵬ":"b","ᶀ":"b","ƀ":"b","ƃ":"b","ɵ":"o","ć":"c","č":"c","ç":"c","ḉ":"c","ĉ":"c","ɕ":"c","ċ":"c","ƈ":"c","ȼ":"c","ď":"d","ḑ":"d","ḓ":"d","ȡ":"d","ḋ":"d","ḍ":"d","ɗ":"d","ᶑ":"d","ḏ":"d","ᵭ":"d","ᶁ":"d","đ":"d","ɖ":"d","ƌ":"d","ı":"i","ȷ":"j","ɟ":"j","ʄ":"j","dz":"dz","dž":"dz","é":"e","ĕ":"e","ě":"e","ȩ":"e","ḝ":"e","ê":"e","ế":"e","ệ":"e","ề":"e","ể":"e","ễ":"e","ḙ":"e","ë":"e","ė":"e","ẹ":"e","ȅ":"e","è":"e","ẻ":"e","ȇ":"e","ē":"e","ḗ":"e","ḕ":"e","ⱸ":"e","ę":"e","ᶒ":"e","ɇ":"e","ẽ":"e","ḛ":"e","ꝫ":"et","ḟ":"f","ƒ":"f","ᵮ":"f","ᶂ":"f","ǵ":"g","ğ":"g","ǧ":"g","ģ":"g","ĝ":"g","ġ":"g","ɠ":"g","ḡ":"g","ᶃ":"g","ǥ":"g","ḫ":"h","ȟ":"h","ḩ":"h","ĥ":"h","ⱨ":"h","ḧ":"h","ḣ":"h","ḥ":"h","ɦ":"h","ẖ":"h","ħ":"h","ƕ":"hv","í":"i","ĭ":"i","ǐ":"i","î":"i","ï":"i","ḯ":"i","ị":"i","ȉ":"i","ì":"i","ỉ":"i","ȋ":"i","ī":"i","į":"i","ᶖ":"i","ɨ":"i","ĩ":"i","ḭ":"i","ꝺ":"d","ꝼ":"f","ᵹ":"g","ꞃ":"r","ꞅ":"s","ꞇ":"t","ꝭ":"is","ǰ":"j","ĵ":"j","ʝ":"j","ɉ":"j","ḱ":"k","ǩ":"k","ķ":"k","ⱪ":"k","ꝃ":"k","ḳ":"k","ƙ":"k","ḵ":"k","ᶄ":"k","ꝁ":"k","ꝅ":"k","ĺ":"l","ƚ":"l","ɬ":"l","ľ":"l","ļ":"l","ḽ":"l","ȴ":"l","ḷ":"l","ḹ":"l","ⱡ":"l","ꝉ":"l","ḻ":"l","ŀ":"l","ɫ":"l","ᶅ":"l","ɭ":"l","ł":"l","lj":"lj","ſ":"s","ẜ":"s","ẛ":"s","ẝ":"s","ḿ":"m","ṁ":"m","ṃ":"m","ɱ":"m","ᵯ":"m","ᶆ":"m","ń":"n","ň":"n","ņ":"n","ṋ":"n","ȵ":"n","ṅ":"n","ṇ":"n","ǹ":"n","ɲ":"n","ṉ":"n","ƞ":"n","ᵰ":"n","ᶇ":"n","ɳ":"n","ñ":"n","nj":"nj","ó":"o","ŏ":"o","ǒ":"o","ô":"o","ố":"o","ộ":"o","ồ":"o","ổ":"o","ỗ":"o","ö":"o","ȫ":"o","ȯ":"o","ȱ":"o","ọ":"o","ő":"o","ȍ":"o","ò":"o","ỏ":"o","ơ":"o","ớ":"o","ợ":"o","ờ":"o","ở":"o","ỡ":"o","ȏ":"o","ꝋ":"o","ꝍ":"o","ⱺ":"o","ō":"o","ṓ":"o","ṑ":"o","ǫ":"o","ǭ":"o","ø":"o","ǿ":"o","õ":"o","ṍ":"o","ṏ":"o","ȭ":"o","ƣ":"oi","ꝏ":"oo","ɛ":"e","ᶓ":"e","ɔ":"o","ᶗ":"o","ȣ":"ou","ṕ":"p","ṗ":"p","ꝓ":"p","ƥ":"p","ᵱ":"p","ᶈ":"p","ꝕ":"p","ᵽ":"p","ꝑ":"p","ꝙ":"q","ʠ":"q","ɋ":"q","ꝗ":"q","ŕ":"r","ř":"r","ŗ":"r","ṙ":"r","ṛ":"r","ṝ":"r","ȑ":"r","ɾ":"r","ᵳ":"r","ȓ":"r","ṟ":"r","ɼ":"r","ᵲ":"r","ᶉ":"r","ɍ":"r","ɽ":"r","ↄ":"c","ꜿ":"c","ɘ":"e","ɿ":"r","ś":"s","ṥ":"s","š":"s","ṧ":"s","ş":"s","ŝ":"s","ș":"s","ṡ":"s","ṣ":"s","ṩ":"s","ʂ":"s","ᵴ":"s","ᶊ":"s","ȿ":"s","ɡ":"g","ß":"ss","ᴑ":"o","ᴓ":"o","ᴝ":"u","ť":"t","ţ":"t","ṱ":"t","ț":"t","ȶ":"t","ẗ":"t","ⱦ":"t","ṫ":"t","ṭ":"t","ƭ":"t","ṯ":"t","ᵵ":"t","ƫ":"t","ʈ":"t","ŧ":"t","ᵺ":"th","ɐ":"a","ᴂ":"ae","ǝ":"e","ᵷ":"g","ɥ":"h","ʮ":"h","ʯ":"h","ᴉ":"i","ʞ":"k","ꞁ":"l","ɯ":"m","ɰ":"m","ᴔ":"oe","ɹ":"r","ɻ":"r","ɺ":"r","ⱹ":"r","ʇ":"t","ʌ":"v","ʍ":"w","ʎ":"y","ꜩ":"tz","ú":"u","ŭ":"u","ǔ":"u","û":"u","ṷ":"u","ü":"u","ǘ":"u","ǚ":"u","ǜ":"u","ǖ":"u","ṳ":"u","ụ":"u","ű":"u","ȕ":"u","ù":"u","ủ":"u","ư":"u","ứ":"u","ự":"u","ừ":"u","ử":"u","ữ":"u","ȗ":"u","ū":"u","ṻ":"u","ų":"u","ᶙ":"u","ů":"u","ũ":"u","ṹ":"u","ṵ":"u","ᵫ":"ue","ꝸ":"um","ⱴ":"v","ꝟ":"v","ṿ":"v","ʋ":"v","ᶌ":"v","ⱱ":"v","ṽ":"v","ꝡ":"vy","ẃ":"w","ŵ":"w","ẅ":"w","ẇ":"w","ẉ":"w","ẁ":"w","ⱳ":"w","ẘ":"w","ẍ":"x","ẋ":"x","ᶍ":"x","ý":"y","ŷ":"y","ÿ":"y","ẏ":"y","ỵ":"y","ỳ":"y","ƴ":"y","ỷ":"y","ỿ":"y","ȳ":"y","ẙ":"y","ɏ":"y","ỹ":"y","ź":"z","ž":"z","ẑ":"z","ʑ":"z","ⱬ":"z","ż":"z","ẓ":"z","ȥ":"z","ẕ":"z","ᵶ":"z","ᶎ":"z","ʐ":"z","ƶ":"z","ɀ":"z","ff":"ff","ffi":"ffi","ffl":"ffl","fi":"fi","fl":"fl","ij":"ij","œ":"oe","st":"st","ₐ":"a","ₑ":"e","ᵢ":"i","ⱼ":"j","ₒ":"o","ᵣ":"r","ᵤ":"u","ᵥ":"v","ₓ":"x"}; + "curren" : 164, diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 988666c40812..6ece48c0fb79 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -77,7 +77,7 @@ jobs: qt_qpa_platform: offscreen - name: Windows 2019 (MSVC) os: windows-2019 - # TODO: Reenable FFmpeg after licensing issues have been clarified + # TODO: Re-enable FFmpeg after licensing issues have been clarified # Attention: If you change the cmake_args for the Windows CI build, # also adjust the for the local Windows build setup in # ./tools/windows_buildenv.bat @@ -151,7 +151,7 @@ jobs: # Studio on Windows comes with its own CMake version anyway. if: runner.os == 'macOS' || matrix.os == 'ubuntu-18.04' with: - # This should always match the mininum required version in + # This should always match the minimum required version in # our CMakeLists.txt cmake-version: '3.19.x' diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index fe4b6b3133f6..d14f4d9ef48a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -66,7 +66,7 @@ repos: --ignore-regex, "\\W(?:m_p*(?=[A-Z])|m_(?=\\w)|pp*(?=[A-Z])|k(?=[A-Z])|s_(?=\\w))", ] - exclude: ^(packaging/wix/LICENSE.rtf|src/dialog/dlgabout\.cpp|.*\.(?:pot?|ts|wxl))$ + exclude: ^(packaging/wix/LICENSE.rtf|src/dialog/dlgabout\.cpp|.*\.(?:pot?|ts|wxl|svg))$ - repo: https://github.com/pre-commit/mirrors-eslint rev: v8.12.0 hooks: diff --git a/cmake/ctest-to-junit.xsl b/cmake/ctest-to-junit.xsl index 8bd53978b6ac..ad4869944f0c 100644 --- a/cmake/ctest-to-junit.xsl +++ b/cmake/ctest-to-junit.xsl @@ -4,7 +4,7 @@ This XSLT stylesheet is taken from the jenkins-ctest-plugin by Version One, Inc. and Ryan Pavlik and is subject to the terms of the MIT License. -It was taken from this GitHub repositiory: +It was taken from this GitHub repository: https://github.com/rpavlik/jenkins-ctest-plugin Includes modifications by Jan Holthuis to add support for skipped/errored diff --git a/packaging/CPackDebInstall.cmake b/packaging/CPackDebInstall.cmake index 16e99ecb72da..a3198e1dd51d 100644 --- a/packaging/CPackDebInstall.cmake +++ b/packaging/CPackDebInstall.cmake @@ -23,7 +23,7 @@ if(NOT CPACK_DEBIAN_DEBCHANGE) endif() # We create a temporary debian folder that the debhelper below run as usual. -# The final debian folder is created indipendently by cpack +# The final debian folder is created independently by cpack message( NOTICE "Creating temporary debian folder for debhelper" ) file(COPY ${CPACK_DEBIAN_SOURCE_DIR}/packaging/debian DESTINATION ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}) @@ -69,7 +69,7 @@ function(run_dh DH_COMMAND) WORKING_DIRECTORY ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME} RESULT_VARIABLE CPACK_DEBIAN_DH_RET) if(NOT CPACK_DEBIAN_DH_RET EQUAL "0") - message(FATAL_ERROR "${DH_COMMAND} retuned exit code ${CPACK_DEBIAN_DH_RET}") + message(FATAL_ERROR "${DH_COMMAND} returned exit code ${CPACK_DEBIAN_DH_RET}") endif() endfunction() diff --git a/packaging/CPackDebUploadPPA.cmake b/packaging/CPackDebUploadPPA.cmake index b817b3f7631f..d3fe17754c1d 100644 --- a/packaging/CPackDebUploadPPA.cmake +++ b/packaging/CPackDebUploadPPA.cmake @@ -117,7 +117,7 @@ foreach(RELEASE ${CPACK_DEBIAN_DISTRIBUTION_RELEASES}) WORKING_DIRECTORY ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME} RESULT_VARIABLE CPACK_DEBIAN_DEBUILD_RET) if(NOT CPACK_DEBIAN_DEBUILD_RET EQUAL "0") - message(FATAL_ERROR "${CPACK_DEBIAN_DEBUILD} retuned exit code ${CPACK_DEBIAN_DEBUILD_RET}") + message(FATAL_ERROR "${CPACK_DEBIAN_DEBUILD} returned exit code ${CPACK_DEBIAN_DEBUILD_RET}") endif() endif() if (BUILD_MACHINE_RELEASE STREQUAL RELEASE AND DEB_BUILD) diff --git a/res/controllers/Behringer-BCD2000-scripts.js b/res/controllers/Behringer-BCD2000-scripts.js index 579632f9ff02..45110d5dee12 100644 --- a/res/controllers/Behringer-BCD2000-scripts.js +++ b/res/controllers/Behringer-BCD2000-scripts.js @@ -24,7 +24,7 @@ BehringerBCD2000.shutdown = function () { BehringerBCD2000.reset(); - // Reenable jog acceleration + // Re-enable jog acceleration if (!BehringerBCD2000.UseAcceleration) midi.sendShortMsg(0xB0, 0x63, 0x7F); }; diff --git a/res/controllers/Behringer-BCD3000-Advanced-scripts.js b/res/controllers/Behringer-BCD3000-Advanced-scripts.js index 8e0757bbfc26..fba853fbb0be 100644 --- a/res/controllers/Behringer-BCD3000-Advanced-scripts.js +++ b/res/controllers/Behringer-BCD3000-Advanced-scripts.js @@ -22,7 +22,7 @@ BehringerBCD3000.shutdown = function () { BehringerBCD3000.reset(); - // Reenable jog acceleration + // Re-enable jog acceleration if (!BehringerBCD3000.UseAcceleration) midi.sendShortMsg(0xB0, 0x63, 0x7F); }; diff --git a/res/controllers/Behringer-BCD3000-scripts.js b/res/controllers/Behringer-BCD3000-scripts.js index 044f56623454..3370ff64177a 100644 --- a/res/controllers/Behringer-BCD3000-scripts.js +++ b/res/controllers/Behringer-BCD3000-scripts.js @@ -24,7 +24,7 @@ BehringerBCD3000.shutdown = function () { BehringerBCD3000.reset(); - // Reenable jog acceleration + // Re-enable jog acceleration if (!BehringerBCD3000.UseAcceleration) midi.sendShortMsg(0xB0, 0x63, 0x7F); }; diff --git a/res/controllers/Denon-MC7000-scripts.js b/res/controllers/Denon-MC7000-scripts.js index 16d7efcc6ede..eeaca07f341e 100644 --- a/res/controllers/Denon-MC7000-scripts.js +++ b/res/controllers/Denon-MC7000-scripts.js @@ -682,8 +682,8 @@ MC7000.wheelTouch = function(channel, control, value, status, group) { // The wheel that actually controls the scratching MC7000.wheelTurn = function(channel, control, value, status, group) { - // TODO(all): check for latency and use it to normalize the jog factor so jog wont be - // depending on audio latency anymore. + // TODO(all): check for latency and use it to normalize the jog factor so + // jog won't be depending on audio latency anymore. // A: For a control that centers on 0: var numTicks = (value < 0x64) ? value : (value - 128); diff --git a/res/controllers/Gemini-FirstMix-scripts.js b/res/controllers/Gemini-FirstMix-scripts.js index 116b3dbac680..489d52f6a2f1 100644 --- a/res/controllers/Gemini-FirstMix-scripts.js +++ b/res/controllers/Gemini-FirstMix-scripts.js @@ -24,7 +24,7 @@ * Jogwheel: Normally (when the Scratch button for the deck is not lit), the jogwheels will "nudge" the playing track, speeding it up or slowing it down slightly. * Pressing the Scratch button will toggle the scratch mode. In scratch mode, the jogwheels will "scratch" the playing track but only while you are touching them (because the jogwheels are touch-sensitive). * - * Sel(ect) buttons: I didn't know what to do with these buttons so I left them undefined. + * SEL buttons: I didn't know what to do with these buttons so I left them undefined. * **/ diff --git a/res/controllers/Hercules DJ Control MP3 e2-scripts.js b/res/controllers/Hercules DJ Control MP3 e2-scripts.js index a019e21604d6..f4911c298b11 100644 --- a/res/controllers/Hercules DJ Control MP3 e2-scripts.js +++ b/res/controllers/Hercules DJ Control MP3 e2-scripts.js @@ -679,7 +679,7 @@ HerculesMP3e2.wheelOnOff = function() { HerculesMP3e2.jogWheel = function(midino, control, value, status, group) { var deck = (group == "[Channel1]") ? deckA : deckB; - // This function is called everytime the jog is moved + // This function is called every time the jog is moved if (value == 0x01) { if (superButtonHold == 2) { if ((deck == 1) || (deck == 3)) { @@ -1004,4 +1004,4 @@ HerculesMP3e2.filterMid = function(midino, control, value, status, group) { HerculesMP3e2.filterLow = function(midino, control, value, status, group) { HerculesMP3e2.filterKnob(group, "parameter1", value); -}; \ No newline at end of file +}; diff --git a/res/controllers/Hercules-DJ-Console-4-Mx-scripts.js b/res/controllers/Hercules-DJ-Console-4-Mx-scripts.js index 24841f173f0e..6febb67fdd74 100644 --- a/res/controllers/Hercules-DJ-Console-4-Mx-scripts.js +++ b/res/controllers/Hercules-DJ-Console-4-Mx-scripts.js @@ -1315,8 +1315,8 @@ Hercules4Mx.LoopEditRelease = function(group, fxbutton, value, extraparam) { Hercules4Mx.deactivateEditModeAction(); } Hercules4Mx.activateEditModeAction(Hercules4Mx.editModes.loop, deck); - var splitted = extraparam.split(";"); - if (splitted[0] === "roll") { + var split = extraparam.split(";"); + if (split[0] === "roll") { engine.setValue(group, "slip_enabled", 1); } else { engine.setValue(group, "slip_enabled", 0); @@ -1364,13 +1364,13 @@ Hercules4Mx.LoopButtonPush = function(group, fxbutton, value, extraparam) { if (Hercules4Mx.debuglog) { engine.log("Hercules4Mx.LoopButtonPush"); } - var splitted = extraparam.split(";"); - if (splitted[0] === "roll" && splitted.length === 2) { + var split = extraparam.split(";"); + if (split[0] === "roll" && split.length === 2) { if (engine.getValue(group, "loop_enabled") === 0 && value > 0) { engine.setValue(group, "slip_enabled", 1); } - Hercules4Mx.buttonPush(group, fxbutton, value, splitted[1]); - } else if (splitted.length === 1) { + Hercules4Mx.buttonPush(group, fxbutton, value, split[1]); + } else if (split.length === 1) { engine.setValue(group, "slip_enabled", 0); Hercules4Mx.buttonPush(group, fxbutton, value, extraparam); } diff --git a/res/controllers/Hercules-DJ-Console-Mk4-scripts.js b/res/controllers/Hercules-DJ-Console-Mk4-scripts.js index c66e8b347ecc..da200f7c267d 100644 --- a/res/controllers/Hercules-DJ-Console-Mk4-scripts.js +++ b/res/controllers/Hercules-DJ-Console-Mk4-scripts.js @@ -320,7 +320,7 @@ HerculesMk4.sync = function (midino, control, value, status, group) { }; HerculesMk4.jogWheel = function (midino, control, value, status, group) { - // This function is called everytime the jog is moved + // This function is called every time the jog is moved var direction=(value == 0x01)? 1: -1; diff --git a/res/controllers/Hercules_DJControl_Inpulse_200.midi.xml b/res/controllers/Hercules_DJControl_Inpulse_200.midi.xml index 1b87f171e74b..d9d36d6b1439 100644 --- a/res/controllers/Hercules_DJControl_Inpulse_200.midi.xml +++ b/res/controllers/Hercules_DJControl_Inpulse_200.midi.xml @@ -1303,7 +1303,7 @@ 0x07 0x05 - + [AutoDJ] enabled diff --git a/res/controllers/Hercules_DJControl_Jogvision.midi.xml b/res/controllers/Hercules_DJControl_Jogvision.midi.xml index aeb87ae3216f..d7723cd3b5a6 100644 --- a/res/controllers/Hercules_DJControl_Jogvision.midi.xml +++ b/res/controllers/Hercules_DJControl_Jogvision.midi.xml @@ -1721,7 +1721,7 @@ [Master] maximize_library - VIEW buton LED + VIEW button LED 0.5 1 0x90 diff --git a/res/controllers/KANE_QuNeo_scripts.js b/res/controllers/KANE_QuNeo_scripts.js index 249e5cbb7363..5f1eb17b5c47 100644 --- a/res/controllers/KANE_QuNeo_scripts.js +++ b/res/controllers/KANE_QuNeo_scripts.js @@ -1586,8 +1586,8 @@ KANE_QuNeo.assertJumpLEDs = function (deck, numBeats) { var old = KANE_QuNeo.jumpLoopLEDs[channel]; old.splice(old.indexOf(off[0]),1) // turn off the off stuff KANE_QuNeo.jumpLoopLEDs[channel] = old.concat(on); // turn on the new stuff - KANE_QuNeo.LEDs(0x91,off,0x00); // update offs - KANE_QuNeo.triggerVuMeter(deck); // update ons + KANE_QuNeo.LEDs(0x91,off,0x00); + KANE_QuNeo.triggerVuMeter(deck); } /****** (RLED) Rotary LEDs ******/ diff --git a/res/controllers/Novation-Launchpad MK2-scripts.js b/res/controllers/Novation-Launchpad MK2-scripts.js index 930c7d269f99..9a5793ed3f35 100644 --- a/res/controllers/Novation-Launchpad MK2-scripts.js +++ b/res/controllers/Novation-Launchpad MK2-scripts.js @@ -11942,7 +11942,7 @@ function nth(array, n) { * @since 4.0.0 * @category Util * @param {number} [n=0] The index of the argument to return. - * @returns {Function} Returns the new pass-thru function. + * @returns {Function} Returns the new passthrough function. * @example * * var func = _.nthArg(1); @@ -17785,19 +17785,19 @@ function assemble() { var str = ''; var first$$1 = true; Array.prototype.slice.call(arguments).forEach(function (arg) { - var appendend = void 0; + var append = void 0; if (Array.isArray(arg)) { - appendend = '[' + arg.toString() + ']'; + append = '[' + arg.toString() + ']'; } else if ((typeof arg === 'undefined' ? 'undefined' : _typeof(arg)) === 'object' && startsWith(arg.toString(), '[object')) { - appendend = stringify_1(arg, null, 2); + append = stringify_1(arg, null, 2); } else { - appendend = arg; + append = arg; } if (first$$1) { - str = appendend; + str = append; first$$1 = false; } else { - str = str + ' ' + appendend; + str = str + ' ' + append; } }); return str; diff --git a/res/controllers/Novation-Launchpad-Mini-scripts.js b/res/controllers/Novation-Launchpad-Mini-scripts.js index c62788c4d484..70ce8c481605 100644 --- a/res/controllers/Novation-Launchpad-Mini-scripts.js +++ b/res/controllers/Novation-Launchpad-Mini-scripts.js @@ -565,7 +565,6 @@ NLM.incomingData = function(channel, control, value, status, group) y = 8; x = 0; } - print( "COO: " + NLM.page + ":" + x + ":" + y); NLM.btns[NLM.page][x][y].pressed = pressed; NLM.btns[NLM.page][x][y].callback(); }; diff --git a/res/controllers/Novation-Launchpad-scripts.js b/res/controllers/Novation-Launchpad-scripts.js index e3a5dcce91af..fa7586783938 100644 --- a/res/controllers/Novation-Launchpad-scripts.js +++ b/res/controllers/Novation-Launchpad-scripts.js @@ -11942,7 +11942,7 @@ function nth(array, n) { * @since 4.0.0 * @category Util * @param {number} [n=0] The index of the argument to return. - * @returns {Function} Returns the new pass-thru function. + * @returns {Function} Returns the new passthrough function. * @example * * var func = _.nthArg(1); @@ -17785,19 +17785,19 @@ function assemble() { var str = ''; var first$$1 = true; Array.prototype.slice.call(arguments).forEach(function (arg) { - var appendend = void 0; + var append = void 0; if (Array.isArray(arg)) { - appendend = '[' + arg.toString() + ']'; + append = '[' + arg.toString() + ']'; } else if ((typeof arg === 'undefined' ? 'undefined' : _typeof(arg)) === 'object' && startsWith(arg.toString(), '[object')) { - appendend = stringify_1(arg, null, 2); + append = stringify_1(arg, null, 2); } else { - appendend = arg; + append = arg; } if (first$$1) { - str = appendend; + str = append; first$$1 = false; } else { - str = str + ' ' + appendend; + str = str + ' ' + append; } }); return str; diff --git a/res/controllers/Numark-Mixtrack-2-scripts.js b/res/controllers/Numark-Mixtrack-2-scripts.js index 435e1e902ca1..df15f6044c79 100644 --- a/res/controllers/Numark-Mixtrack-2-scripts.js +++ b/res/controllers/Numark-Mixtrack-2-scripts.js @@ -181,7 +181,7 @@ NumarkMixTrackII.jogWheel = function(channel, control, value, status, group) { } NumarkMixTrackII.scratch_timer[deck - 1] = engine.beginTimer(20, "NumarkMixTrackII.jogWheelStopScratch(" + deck + ")", true); } - } else { // en stop hace scratch siempre + } else { if (!NumarkMixTrackII.touch[deck - 1]) { if (NumarkMixTrackII.scratch_timer[deck - 1] != -1) { engine.stopTimer(NumarkMixTrackII.scratch_timer[deck - 1]); @@ -223,7 +223,6 @@ NumarkMixTrackII.wheelTouch = function(channel, control, value, status, group){ NumarkMixTrackII.scratch_timer[deck - 1] = engine.beginTimer(20, "NumarkMixTrackII.jogWheelStopScratch(" + deck + ")", true); } else { - // si esta en play y el modo scratch desactivado, al presionar el touch no hace nada if (!NumarkMixTrackII.scratch_mode[deck - 1] && engine.getValue(group, "play")) { return; } diff --git a/res/controllers/Numark-Mixtrack-Pro-scripts.js b/res/controllers/Numark-Mixtrack-Pro-scripts.js index e17300c84f1f..63018e5db3a5 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). @@ -592,7 +592,7 @@ NumarkMixTrackPro.jogWheel = function(channel, control, value, status, group) { NumarkMixTrackPro.scratchTimer[deck-1] = engine.beginTimer(20, "NumarkMixTrackPro.jogWheelStopScratch(" + deck + ")", true); } - } else { // en stop hace scratch siempre + } else { // stop scratching if (!NumarkMixTrackPro.touch[deck-1]){ @@ -639,7 +639,7 @@ NumarkMixTrackPro.wheelTouch = function(channel, control, value, status, group){ } else { - // si esta en play y el modo scratch desactivado, al presionar el touch no hace nada + // if playing and scratch mode is disabled, do nothing on press if (!NumarkMixTrackPro.scratchMode[deck-1] && engine.getValue(group, "play")) return; if (NumarkMixTrackPro.scratchTimer[deck-1] != -1) engine.stopTimer(NumarkMixTrackPro.scratchTimer[deck-1]); diff --git a/res/controllers/Numark-N4-scripts.js b/res/controllers/Numark-N4-scripts.js index 1bbc49231185..3183502afa9d 100644 --- a/res/controllers/Numark-N4-scripts.js +++ b/res/controllers/Numark-N4-scripts.js @@ -24,7 +24,7 @@ NumarkN4.cueReverseRoll=true; // enables the ability to do a reverse roll while NumarkN4.hotcuePageIndexBehavior=true; // possible ranges (0.0..3.0 where 0.06=6%) -NumarkN4.rateRanges = [0, // default (gets set via script later; don't modifify) +NumarkN4.rateRanges = [0, // default (gets set via script later; don't modify) 0.06, // one semitone 0.24, // for maximum freedom ]; @@ -581,7 +581,7 @@ NumarkN4.Deck = function(channel) { theDeck.blinkTimer=0; return; // return early so no new timer gets created. } - // this previouslyLoaded guard is needed because everytime a new track gets + // this previouslyLoaded guard is needed because every time a new track gets // loaded into a deck without previously ejecting, a new timer would get // spawned which conflicted with the old (still running) timers. if (!this.previouslyLoaded) { diff --git a/res/controllers/Pioneer-DDJ-200-scripts.js b/res/controllers/Pioneer-DDJ-200-scripts.js index 5cfc72745977..e1f03a234a2c 100644 --- a/res/controllers/Pioneer-DDJ-200-scripts.js +++ b/res/controllers/Pioneer-DDJ-200-scripts.js @@ -31,7 +31,7 @@ DDJ200.init = function() { DDJ200.switchPlayLED(d, ch); }); - // run switchSyncLED after sync toogle to set LEDs accordingly + // run switchSyncLED after sync toggle to set LEDs accordingly engine.makeConnection(vgroup, "sync_enabled", function(ch, vgroup) { var vDeckNo = script.deckFromGroup(vgroup); var d = (vDeckNo % 2) ? 0 : 1; diff --git a/res/controllers/Pioneer-DDJ-400.midi.xml b/res/controllers/Pioneer-DDJ-400.midi.xml index a2cc1d28eba6..d1abe4e38b11 100644 --- a/res/controllers/Pioneer-DDJ-400.midi.xml +++ b/res/controllers/Pioneer-DDJ-400.midi.xml @@ -206,7 +206,7 @@ - JOG DIAL PLATTER (DECK1) - touch - enabe (on touch) / disable (on release) Scraching/Pitch + JOG DIAL PLATTER (DECK1) - touch - enable (on touch) / disable (on release) Scratching/Pitch bend [Channel1] @@ -218,7 +218,7 @@ - JOG DIAL PLATTER +SHIFT (DECK1) - touch - enabe (on touch) / disable (on release) highspeed + JOG DIAL PLATTER +SHIFT (DECK1) - touch - enable (on touch) / disable (on release) highspeed Pitch bend [Channel1] @@ -271,7 +271,7 @@ - JOG DIAL PLATTER (DECK2) - touch - enabe (on touch) / disable (on release) Scraching/Pitch + JOG DIAL PLATTER (DECK2) - touch - enable (on touch) / disable (on release) Scratching/Pitch bend [Channel2] @@ -283,7 +283,7 @@ - JOG DIAL PLATTER +SHIFT (DECK2) - touch - enabe (on touch) / disable (on release) highspeed + JOG DIAL PLATTER +SHIFT (DECK2) - touch - enable (on touch) / disable (on release) highspeed Pitch bend [Channel2] diff --git a/res/controllers/Stanton-SCS3d-alternate-scripts.js b/res/controllers/Stanton-SCS3d-alternate-scripts.js index a4744e4a1bc2..2890da7d5bae 100644 --- a/res/controllers/Stanton-SCS3d-alternate-scripts.js +++ b/res/controllers/Stanton-SCS3d-alternate-scripts.js @@ -449,7 +449,7 @@ SCS3D.Agent = function(device) { // -> hello,me // -> hello,you function demux(action) { - return function(message, nd) { + return function(message, arg) { if (!message || message.length < 2) { print("ERROR: demux over invalid message: " + message); return false; @@ -459,10 +459,10 @@ SCS3D.Agent = function(device) { var i; for (i in message[1]) { var demuxd = [message[0], message[1][i], message[2]]; - changed = action(demuxd, nd) || changed; + changed = action(demuxd, arg) || changed; } } else { - changed = action(message, nd); + changed = action(message, arg); } return changed; }; diff --git a/res/controllers/Stanton-SCS3m-scripts.js b/res/controllers/Stanton-SCS3m-scripts.js index 230cb49661d0..bb89cc674fbc 100644 --- a/res/controllers/Stanton-SCS3m-scripts.js +++ b/res/controllers/Stanton-SCS3m-scripts.js @@ -310,7 +310,7 @@ SCS3M.Agent = function(device) { } // Register a handler for multiple engine values. It will be called - // everytime one of the values changes. + // every time one of the values changes. // controls: list of channel/control pairs to watch // handler: will receive list of control values as parameter in same order function watchmulti(controls, handler) { diff --git a/res/controllers/Traktor-Kontrol-S2-MK2-hid-scripts.js b/res/controllers/Traktor-Kontrol-S2-MK2-hid-scripts.js index e073bd841c4e..ff74204df4d7 100644 --- a/res/controllers/Traktor-Kontrol-S2-MK2-hid-scripts.js +++ b/res/controllers/Traktor-Kontrol-S2-MK2-hid-scripts.js @@ -553,8 +553,8 @@ TraktorS2MK2.shift = function(field) { }; TraktorS2MK2.loadTrackButton = function(field) { - var splitted = field.id.split("."); - var group = splitted[0]; + var split = field.id.split("."); + var group = split[0]; if (TraktorS2MK2.shiftPressed[group]) { engine.setValue(field.group, "eject", field.value); } else { @@ -565,8 +565,8 @@ TraktorS2MK2.loadTrackButton = function(field) { TraktorS2MK2.syncButton = function(field) { var now = Date.now(); - var splitted = field.id.split("."); - var group = splitted[0]; + var split = field.id.split("."); + var group = split[0]; // If shifted, just toggle. // TODO(later version): actually make this enable explicit master. if (TraktorS2MK2.shiftPressed[group]) { @@ -596,8 +596,8 @@ TraktorS2MK2.syncButton = function(field) { }; TraktorS2MK2.cueButton = function(field) { - var splitted = field.id.split("."); - var group = splitted[0]; + var split = field.id.split("."); + var group = split[0]; if (TraktorS2MK2.shiftPressed[group]) { if (ShiftCueButtonAction === "REWIND") { if (field.value === 0) { @@ -616,8 +616,8 @@ TraktorS2MK2.playButton = function(field) { if (field.value === 0) { return; } - var splitted = field.id.split("."); - var group = splitted[0]; + var split = field.id.split("."); + var group = split[0]; if (TraktorS2MK2.shiftPressed[group]) { var locked = engine.getValue(field.group, "keylock"); engine.setValue(field.group, "keylock", !locked); @@ -1180,8 +1180,8 @@ TraktorS2MK2.topEncoderPress = function(field) { }; TraktorS2MK2.leftEncoder = function(field) { - var splitted = field.id.split("."); - var group = splitted[0]; + var split = field.id.split("."); + var group = split[0]; var delta = TraktorS2MK2.encoderDirection(field.value, TraktorS2MK2.previousLeftEncoder[group]); TraktorS2MK2.previousLeftEncoder[group] = field.value; @@ -1211,8 +1211,8 @@ TraktorS2MK2.leftEncoder = function(field) { }; TraktorS2MK2.leftEncoderPress = function(field) { - var splitted = field.id.split("."); - var group = splitted[0]; + var split = field.id.split("."); + var group = split[0]; TraktorS2MK2.leftEncoderPressed[group] = (field.value > 0); if (TraktorS2MK2.shiftPressed[group] && field.value > 0) { script.triggerControl(group, "pitch_adjust_set_default"); @@ -1220,8 +1220,8 @@ TraktorS2MK2.leftEncoderPress = function(field) { }; TraktorS2MK2.rightEncoder = function(field) { - var splitted = field.id.split("."); - var group = splitted[0]; + var split = field.id.split("."); + var group = split[0]; var delta = TraktorS2MK2.encoderDirection(field.value, TraktorS2MK2.previousRightEncoder[group]); TraktorS2MK2.previousRightEncoder[group] = field.value; @@ -1244,8 +1244,8 @@ TraktorS2MK2.rightEncoderPress = function(field) { if (field.value === 0) { return; } - var splitted = field.id.split("."); - var group = splitted[0]; + var split = field.id.split("."); + var group = split[0]; var loopEnabled = engine.getValue(group, "loop_enabled"); // The actions triggered below change the state of loop_enabled, // so to simplify the logic, use script.triggerControl to only act diff --git a/res/controllers/Traktor-Kontrol-S2-MK3-hid-scripts.js b/res/controllers/Traktor-Kontrol-S2-MK3-hid-scripts.js index c98765289daa..7a0e6feec7da 100644 --- a/res/controllers/Traktor-Kontrol-S2-MK3-hid-scripts.js +++ b/res/controllers/Traktor-Kontrol-S2-MK3-hid-scripts.js @@ -187,7 +187,7 @@ TraktorS2MK3.registerInputPackets = function () { this.registerInputScaler(messageLong, "[Master]", "crossfader", 0x05, 0xFFFF, this.parameterHandler); /* do NOT map the "master" button because it also drives the analog output gain. - Disabling this mapping is the only way to have independant controls for the + Disabling this mapping is the only way to have independent controls for the digital master gain and the output level - the latter usually needs to be set at 100%. */ @@ -508,7 +508,7 @@ TraktorS2MK3.microphoneHandler = function (field) { } else { // Button is released, check if timer is still running if (TraktorS2MK3.microphonePressedTimer !== 0) { - // short klick -> permanent activation + // short click -> permanent activation TraktorS2MK3.microphonePressedTimer = 0; } else { engine.setValue("[Microphone]", "talkover", 0); diff --git a/res/controllers/Traktor-Kontrol-S4-MK2-hid-scripts.js b/res/controllers/Traktor-Kontrol-S4-MK2-hid-scripts.js index 1a92241b6944..a07564ff22e2 100644 --- a/res/controllers/Traktor-Kontrol-S4-MK2-hid-scripts.js +++ b/res/controllers/Traktor-Kontrol-S4-MK2-hid-scripts.js @@ -763,11 +763,11 @@ TraktorS4MK2.debugLights = function() { for (i = 0; i < 3; i++) { var ok = true; - var splitted = data_strings[i].split(/\s+/); - HIDDebug("i" + i + " " + splitted); - data[i].length = splitted.length; - for (j = 0; j < splitted.length; j++) { - var byte_str = splitted[j]; + var split = data_strings[i].split(/\s+/); + HIDDebug("i" + i + " " + split); + data[i].length = split.length; + for (j = 0; j < split.length; j++) { + var byte_str = split[j]; if (byte_str.length !== 2) { ok = false; HIDDebug("not two characters?? " + byte_str); @@ -875,28 +875,28 @@ TraktorS4MK2.longMessageCallback = function(packet, data) { // on the state of the deck switches. TraktorS4MK2.getGroupFromButton = function(name) { //HIDDebug("deckswitch status " + this.controller.left_deck_C + " " + this.controller.right_deck_D); - splitted = name.split("."); - if (splitted.length !== 2) { + split = name.split("."); + if (split.length !== 2) { HIDDebug("Traktor S4MK2: Tried to set from simple packet but not exactly one period in name: " + name); return; } - if (splitted[0][0] === "[") { - return splitted[0]; - } else if (splitted[0] === "deck1") { + if (split[0][0] === "[") { + return split[0]; + } else if (split[0] === "deck1") { if (TraktorS4MK2.controller.left_deck_C) { return "[Channel3]"; } else { return "[Channel1]"; } - } else if (splitted[0] === "deck2") { + } else if (split[0] === "deck2") { if (TraktorS4MK2.controller.right_deck_D) { return "[Channel4]"; } else { return "[Channel2]"; } } else { - HIDDebug("Traktor S4MK2: Unrecognized packet group: " + splitted[0]); + HIDDebug("Traktor S4MK2: Unrecognized packet group: " + split[0]); return ""; } }; @@ -935,8 +935,8 @@ TraktorS4MK2.deckSwitchHandler = function(field) { }; TraktorS4MK2.loadTrackHandler = function(field) { - var splitted = field.id.split("."); - var group = splitted[0]; + var split = field.id.split("."); + var group = split[0]; if (TraktorS4MK2.controller.shift_pressed[group]) { engine.setValue(field.group, "eject", field.value); } else { @@ -947,8 +947,8 @@ TraktorS4MK2.loadTrackHandler = function(field) { TraktorS4MK2.syncEnabledHandler = function(field) { var now = Date.now(); - var splitted = field.id.split("."); - var group = splitted[0]; + var split = field.id.split("."); + var group = split[0]; // If shifted, just toggle. // TODO(later version): actually make this enable explicit master. if (TraktorS4MK2.controller.shift_pressed[group]) { @@ -979,8 +979,8 @@ TraktorS4MK2.syncEnabledHandler = function(field) { }; TraktorS4MK2.cueHandler = function(field) { - var splitted = field.id.split("."); - var group = splitted[0]; + var split = field.id.split("."); + var group = split[0]; if (TraktorS4MK2.controller.shift_pressed[group]) { if (TraktorS4MK2.ShiftCueButtonAction === "REWIND") { if (field.value === 0) { @@ -1002,8 +1002,8 @@ TraktorS4MK2.playHandler = function(field) { if (field.value === 0) { return; } - var splitted = field.id.split("."); - var group = splitted[0]; + var split = field.id.split("."); + var group = split[0]; if (TraktorS4MK2.controller.shift_pressed[group]) { var locked = engine.getValue(field.group, "keylock"); engine.setValue(field.group, "keylock", !locked); @@ -1310,8 +1310,8 @@ TraktorS4MK2.callbackPregain = function(field) { TraktorS4MK2.callbackLoopMove = function(field) { // TODO: common-hid-packet-parser looks like it should do deltas, but I can't get them to work. - var splitted = field.id.split("."); - var group = splitted[0]; + var split = field.id.split("."); + var group = split[0]; prev_loopmove = TraktorS4MK2.controller.prev_loopmove[group]; TraktorS4MK2.controller.prev_loopmove[group] = field.value; var delta = 0; @@ -1342,8 +1342,8 @@ TraktorS4MK2.callbackLoopMove = function(field) { }; TraktorS4MK2.loopActivateHandler = function(field) { - var splitted = field.id.split("."); - var group = splitted[0]; + var split = field.id.split("."); + var group = split[0]; if (TraktorS4MK2.controller.shift_pressed[group]) { engine.setValue(field.group, "reloop_andstop", field.value); } else { @@ -1422,8 +1422,8 @@ TraktorS4MK2.displayCharLoopDot = function(deck, charPos, on) { }; TraktorS4MK2.callbackLoopSize = function(field) { - var splitted = field.id.split("."); - var group = splitted[0]; + var split = field.id.split("."); + var group = split[0]; prev_loopsize = TraktorS4MK2.controller.prev_loopsize[group]; TraktorS4MK2.controller.prev_loopsize[group] = field.value; var delta = 0; @@ -1453,8 +1453,8 @@ TraktorS4MK2.callbackLoopSize = function(field) { }; TraktorS4MK2.loopSetHandler = function(field) { - var splitted = field.id.split("."); - var group = splitted[0]; + var split = field.id.split("."); + var group = split[0]; if (TraktorS4MK2.controller.shift_pressed[group]) { engine.setValue(field.group, "pitch_adjust_set_default", field.value); } else { diff --git a/res/skins/Deere/skin_settings.xml b/res/skins/Deere/skin_settings.xml index a1c107a8a253..9b64259d23e2 100644 --- a/res/skins/Deere/skin_settings.xml +++ b/res/skins/Deere/skin_settings.xml @@ -220,7 +220,7 @@ horizontal