Merge remote-tracking branch 'mixxx/2.3' into controls-fx-parameter-b…

…uttons
mixxxdj · Oct 28, 2020 · 87f7dc3 · 87f7dc3
2 parents 3b99c1c + b2efa10
commit 87f7dc3
Show file tree

Hide file tree

Showing 88 changed files with 2,794 additions and 1,810 deletions.
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
@@ -17,3 +17,8 @@ jobs:
     - uses: actions/labeler@main
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
+
+        # This works around bug https://github.com/actions/labeler/issues/104.
+        # The workaround was proposed here:
+        # https://github.com/wesnoth/wesnoth/commit/958c82d0867568057caaf58356502ec8c87d8366
+        sync-labels: ""
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -45,7 +45,7 @@ default_language_version:
   python: python3
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v3.2.0
+  rev: v3.3.0
   hooks:
   - id: check-byte-order-marker
     exclude: ^.*(\.cbproj|\.groupproj|\.props|\.sln|\.vcxproj|\.vcxproj.filters)$
@@ -66,14 +66,14 @@ repos:
     - manual
   - id: no-commit-to-branch
 - repo: https://github.com/codespell-project/codespell
-  rev: f7f304cb40596e4706be27ca44d1401396a97420
+  rev: v1.17.1
   hooks:
   - id: codespell
     # ignore-regex is substituted by ' '
     entry: tools/codespell.py --ignore-file .codespellignore --ignore-regex "\\W(?:m_p*(?=[A-Z])|m_(?=\\w)|pp*(?=[A-Z])|k(?=[A-Z])|s_(?=\\w))" --files
     exclude: ^(\.codespellignore|src/dialog/dlgabout\.cpp|.*\.(?:pot?|ts|wxl))$
 - repo: https://github.com/pre-commit/mirrors-eslint
-  rev: v7.11.0
+  rev: v7.12.1
   hooks:
   - id: eslint
     args: [--fix, --report-unused-disable-directives]
@@ -93,7 +93,7 @@ repos:
     language: python
     files: \.(c|cc|cxx|cpp|frag|glsl|h|hpp|hxx|ih|ispc|ipp|java|m|mm|proto|vert)$
 - repo: https://github.com/psf/black
-  rev: stable
+  rev: 20.8b1
   hooks:
   - id: black
     files: ^tools/.*$

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -75,10 +75,12 @@
 
 * Add controller mapping for Hercules DJControl Inpulse 200 [#2542](https://github.com/mixxxdj/mixxx/pull/2542)
 * Add controller mapping for Hercules DJControl Jogvision [#2370](https://github.com/mixxxdj/mixxx/pull/2370)
-* Fix missing manual in deb package [lp:1889776] (https://bugs.launchpad.net/mixxx/+bug/1889776)
-* Fix caching of duplicate tracks that reference the same file #3027
-* Fix loss of precision when dealing with floating-point sample positions while setting loop out position and seeking using vinyl control #3126 #3127
-* Prevent moving a loop beyond track end #3117 https://bugs.launchpad.net/mixxx/+bug/1799574
+* Fix missing manual in deb package [lp:1889776](https://bugs.launchpad.net/mixxx/+bug/1889776)
+* Fix caching of duplicate tracks that reference the same file [#3027](https://github.com/mixxxdj/mixxx/pull/3027)
+* Fix loss of precision when dealing with floating-point sample positions while setting loop out position and seeking using vinyl control [#3126](https://github.com/mixxxdj/mixxx/pull/3126) [#3127](https://github.com/mixxxdj/mixxx/pull/3127)
+* Prevent moving a loop beyond track end [#3117](https://github.com/mixxxdj/mixxx/pull/3117) [lp:1799574](https://bugs.launchpad.net/mixxx/+bug/1799574)
+* Use 6 instead of only 4 compatible musical keys (major/minor) [#3205](https://github.com/mixxxdj/mixxx/pull/3205)
+* Fix possible memory corruption using JACK on Linux [#3160](https://github.com/mixxxdj/mixxx/pull/3160)
 
 ## [2.2.4](https://launchpad.net/mixxx/+milestone/2.2.4) (2020-06-27)
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -701,6 +701,7 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/sources/audiosource.cpp
   src/sources/audiosourcestereoproxy.cpp
   src/sources/metadatasourcetaglib.cpp
+  src/sources/readaheadframebuffer.cpp
   src/sources/soundsource.cpp
   src/sources/soundsourceflac.cpp
   src/sources/soundsourceoggvorbis.cpp
@@ -1531,7 +1532,7 @@ if(KEYFINDER)
     set(KeyFinder_LIBRARY "lib/${CMAKE_STATIC_LIBRARY_PREFIX}keyfinder${CMAKE_STATIC_LIBRARY_SUFFIX}")
     ExternalProject_Add(keyfinder
       GIT_REPOSITORY https://github.com/ibsh/libKeyFinder.git
-      GIT_TAG faa563f0898b3cbfbd2ed0696deebc8a9b0c9af6
+      GIT_TAG v2.2.2
       GIT_SHALLOW TRUE
       INSTALL_DIR "${KeyFinder_INSTALL_DIR}"
       CMAKE_ARGS

diff --git a/build/depends.py b/build/depends.py
@@ -948,6 +948,7 @@ def sources(self, build):
                    "src/sources/audiosource.cpp",
                    "src/sources/audiosourcestereoproxy.cpp",
                    "src/sources/metadatasourcetaglib.cpp",
+                   "src/sources/readaheadframebuffer.cpp",
                    "src/sources/soundsource.cpp",
                    "src/sources/soundsourceproviderregistry.cpp",
                    "src/sources/soundsourceproxy.cpp",

diff --git a/lib/kaitai/custom_decoder.h b/lib/kaitai/custom_decoder.h
diff --git a/lib/kaitai/kaitaistream.cpp b/lib/kaitai/kaitaistream.cpp
diff --git a/lib/kaitai/kaitaistream.h b/lib/kaitai/kaitaistream.h
diff --git a/lib/kaitai/kaitaistruct.h b/lib/kaitai/kaitaistruct.h
diff --git a/res/controllers/Hercules_DJControl_Jogvision-scripts.js b/res/controllers/Hercules_DJControl_Jogvision-scripts.js
diff --git a/res/controllers/Hercules_DJControl_Jogvision.midi.xml b/res/controllers/Hercules_DJControl_Jogvision.midi.xml
@@ -5,7 +5,7 @@
     <author>DJ Phatso for Hercules Technical Support</author>
     <description>MIDI Mapping for Hercules DJControl Jogvision</description>
     <forums>https://www.mixxx.org/forums/viewtopic.php?f=7&amp;t=12580</forums>
-    <wiki>https://www.mixxx.org/wiki/doku.php/hercules_dj_control_jogvision</wiki>
+    <manual>hercules_djcontrol_jogvision</manual>
   </info>
   <controller id="Hercules DJControl Jogvision">
     <scriptfiles>
@@ -152,10 +152,20 @@
       <!-- LOAD A -->
       <control>
         <group>[Channel1]</group>
-        <key>LoadSelectedTrack</key>
+        <key>DJCJV.loadTrack</key>
         <description>LOAD A button</description>
         <status>0x90</status>
         <midino>0x51</midino>
+        <options>
+          <script-binding />
+        </options>
+      </control>
+      <control>
+        <group>[Channel1]</group>
+        <key>eject</key>
+        <description>EJECT A button</description>
+        <status>0x90</status>
+        <midino>0x53</midino>
         <options>
           <normal />
         </options>
@@ -196,22 +206,12 @@
       <!-- Loop Section -->
       <control>
         <group>[Channel1]</group>
-        <key>loop_halve</key>
+        <key>DJCJV.beatLoopChange</key>
         <description>Loop Half</description>
         <status>0x90</status>
         <midino>0x00</midino>
         <options>
-          <normal />
-        </options>
-      </control>
-      <control>
-        <group>[Channel1]</group>
-        <key>reloop_toggle</key>
-        <description>Loop On button</description>
-        <status>0x90</status>
-        <midino>0x01</midino>
-        <options>
-          <normal />
+          <script-binding />
         </options>
       </control>
       <control>
@@ -226,12 +226,12 @@
       </control>
       <control>
         <group>[Channel1]</group>
-        <key>loop_double</key>
+        <key>DJCJV.beatLoopChange</key>
         <description>Loop Double</description>
         <status>0x90</status>
         <midino>0x02</midino>
         <options>
-          <normal />
+          <script-binding />
         </options>
       </control>
       <!-- FX section -->
@@ -616,10 +616,20 @@
       <!-- LOAD B -->
       <control>
         <group>[Channel2]</group>
-        <key>LoadSelectedTrack</key>
+        <key>DJCJV.loadTrack</key>
         <description>LOAD B button</description>
         <status>0x91</status>
         <midino>0x51</midino>
+        <options>
+          <script-binding />
+        </options>
+      </control>
+      <control>
+        <group>[Channel2]</group>
+        <key>eject</key>
+        <description>EJECT B button</description>
+        <status>0x91</status>
+        <midino>0x53</midino>
         <options>
           <normal />
         </options>
@@ -660,22 +670,12 @@
       <!-- Loop Section -->
       <control>
         <group>[Channel2]</group>
-        <key>loop_halve</key>
+        <key>DJCJV.beatLoopChange</key>
         <description>Loop Half</description>
         <status>0x91</status>
         <midino>0x00</midino>
         <options>
-          <normal />
-        </options>
-      </control>
-      <control>
-        <group>[Channel2]</group>
-        <key>reloop_toggle</key>
-        <description>Loop On button</description>
-        <status>0x91</status>
-        <midino>0x01</midino>
-        <options>
-          <normal />
+          <script-binding />
         </options>
       </control>
       <control>
@@ -690,12 +690,12 @@
       </control>
       <control>
         <group>[Channel2]</group>
-        <key>loop_double</key>
+        <key>DJCJV.beatLoopChange</key>
         <description>Loop Double</description>
         <status>0x91</status>
         <midino>0x02</midino>
         <options>
-          <normal />
+          <script-binding />
         </options>
       </control>
       <!-- FX section -->
@@ -1039,12 +1039,12 @@
       <!-- Browser section (Encoder button) -->
       <control>
         <group>[Library]</group>
-        <key>MoveFocus</key>
+        <key>DJCJV.moveFocus</key>
         <description>Browser button</description>
         <status>0x90</status>
         <midino>0x4F</midino>
         <options>
-          <normal />
+          <script-binding />
         </options>
       </control>
       <!-- Crossfader -->
@@ -1061,12 +1061,12 @@
       <!-- Browser encoder -->
       <control>
         <group>[Library]</group>
-        <key>MoveVertical</key>
+        <key>DJCJV.browseLibrary</key>
         <description>Move Vertical (Browser Knob)</description>
         <status>0xB0</status>
         <midino>0x4E</midino>
         <options>
-          <selectknob />
+          <script-binding />
         </options>
       </control>
       <!-- CC's MIDI Channel 1 (0xB0 ) -->
@@ -1115,12 +1115,12 @@
       <!-- Gain -->
       <control>
         <group>[Channel1]</group>
-        <key>pregain</key>
+        <key>DJCJV.preGain</key>
         <description>Gain Deck A</description>
         <status>0xB0</status>
         <midino>0x4F</midino>
         <options>
-          <HercJog />
+          <script-binding />
         </options>
       </control>
       <!-- Filter -->
@@ -1213,7 +1213,7 @@
         <status>0xB0</status>
         <midino>0x47</midino>
         <options>
-          <HercJog />
+          <normal />
         </options>
       </control>
       <control>
@@ -1223,7 +1223,7 @@
         <status>0xB0</status>
         <midino>0x48</midino>
         <options>
-          <HercJog />
+          <normal />
         </options>
       </control>
       <control>
@@ -1233,17 +1233,17 @@
         <status>0xB0</status>
         <midino>0x49</midino>
         <options>
-          <HercJog />
+          <normal />
         </options>
       </control>
       <control>
         <group>[EffectRack1_EffectUnit1]</group>
-        <key>mix</key>
+        <key>DJCJV.mixLevel</key>
         <description>Effect Rack 1 - Dry/Wet Level</description>
         <status>0xB0</status>
         <midino>0x46</midino>
         <options>
-          <HercJog />
+          <script-binding />
         </options>
       </control>
       <!-- CC's MIDI Channel 2 (0xB1) -->
@@ -1292,12 +1292,12 @@
       <!-- Gain -->
       <control>
         <group>[Channel2]</group>
-        <key>pregain</key>
-        <description>Gain Deck A</description>
+        <key>DJCJV.preGain</key>
+        <description>Gain Deck B</description>
         <status>0xB1</status>
         <midino>0x4F</midino>
         <options>
-          <HercJog />
+          <script-binding />
         </options>
       </control>
       <!-- Filter -->
@@ -1390,7 +1390,7 @@
         <status>0xB1</status>
         <midino>0x47</midino>
         <options>
-          <HercJog />
+          <normal />
         </options>
       </control>
       <control>
@@ -1400,7 +1400,7 @@
         <status>0xB1</status>
         <midino>0x48</midino>
         <options>
-          <HercJog />
+          <normal />
         </options>
       </control>
       <control>
@@ -1410,17 +1410,17 @@
         <status>0xB1</status>
         <midino>0x49</midino>
         <options>
-          <HercJog />
+          <normal />
         </options>
       </control>
       <control>
         <group>[EffectRack1_EffectUnit2]</group>
-        <key>mix</key>
+        <key>DJCJV.mixLevel</key>
         <description>Effect Rack 1 - Dry/Wet Level</description>
         <status>0xB1</status>
         <midino>0x46</midino>
         <options>
-          <HercJog />
+          <script-binding />
         </options>
       </control>
     </controls>

diff --git a/res/skins/LateNight/controls/button_hotcue.xml b/res/skins/LateNight/controls/button_hotcue.xml
@@ -16,6 +16,7 @@
         <Group><Variable name="Group"/></Group>
         <Hotcue><Variable name="number"/></Hotcue>
         <NumberStates>2</NumberStates>
+        <DimBrightThreshold><Variable name="DimBrightThresholdHotcueBtn"/></DimBrightThreshold>
         <State>
           <Number>0</Number>
           <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_square.svg</Unpressed>

diff --git a/res/skins/LateNight/decks/overview.xml b/res/skins/LateNight/decks/overview.xml
@@ -18,6 +18,7 @@
     <PlayPosColor><Variable name="PlayPosColor"/></PlayPosColor>
     <EndOfTrackColor><Variable name="EndOfTrackColor"/></EndOfTrackColor>
     <LabelFontSize><Variable name="OverviewFontSize"/></LabelFontSize>
+    <DimBrightThreshold><Variable name="DimBrightThresholdOverview"/></DimBrightThreshold>
     <!--LabelTextColor>#fff</LabelTextColor>
     <LabelBackgroundColor>rgba(0,0,0,255)</LabelBackgroundColor>
     <LabelBackgroundColor>0,0,0,255</LabelBackgroundColor>