From 62992ae3549cdcf8d1f8c3e10710f25d39e233b4 Mon Sep 17 00:00:00 2001 From: NotYourAverageAl Date: Thu, 30 Jun 2022 21:09:45 +1000 Subject: [PATCH 01/14] Numark Scratch: add initial mapping doc --- source/_static/controllers/numark_scratch.svg | 577 ++++++++++++++++++ .../numark_scratch_performancepads.svg | 577 ++++++++++++++++++ .../hardware/controllers/numark_scratch.rst | 130 ++++ 3 files changed, 1284 insertions(+) create mode 100644 source/_static/controllers/numark_scratch.svg create mode 100644 source/_static/controllers/numark_scratch_performancepads.svg create mode 100644 source/hardware/controllers/numark_scratch.rst diff --git a/source/_static/controllers/numark_scratch.svg b/source/_static/controllers/numark_scratch.svg new file mode 100644 index 0000000000..217e0d0aa3 --- /dev/null +++ b/source/_static/controllers/numark_scratch.svg @@ -0,0 +1,577 @@ + +image/svg+xml4 +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 +13 +14 +15 +16 +17 +18 + \ No newline at end of file diff --git a/source/_static/controllers/numark_scratch_performancepads.svg b/source/_static/controllers/numark_scratch_performancepads.svg new file mode 100644 index 0000000000..58e7d49051 --- /dev/null +++ b/source/_static/controllers/numark_scratch_performancepads.svg @@ -0,0 +1,577 @@ + +image/svg+xml4 +Overview +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 +13 +14 +16 +17 +18 + \ No newline at end of file diff --git a/source/hardware/controllers/numark_scratch.rst b/source/hardware/controllers/numark_scratch.rst new file mode 100644 index 0000000000..4535e662d4 --- /dev/null +++ b/source/hardware/controllers/numark_scratch.rst @@ -0,0 +1,130 @@ +.. _numark_scratch: + +Numark Scratch +============== + +.. sectionauthor:: + Al Hadebe + +The Numark Scratch is a 24-bit 2 channel mixer designed for the scratch DJ. +It's equipped with an InnoFader crossfader and 8 performance pads across 3 modes, and +6 dedicated software FX selectors with dual toggle triggers. The Scratch is DVS ready under Mixxx + +- `Manufacturer’s product page `__ +- `Serato DJ Hardware Page `__ +- `Owner’s Manual `__ +- `Driver Download Page `__ +- `Mapping Forum Thread `__ + +.. versionadded:: 2.3.0 + +Drivers +------- + +You can download the latest Windows driver from the `manufacturer’s website `__. +The Scratch is class complaint on Mac. + +Audio Setup +----------- + +The mapping relies on the following channel assignments (for line/phono +input support, applying effects to the TR-S output, etc.): + +===================== ================ +Output Channels Assigned to +===================== ================ +1-2 Master +3-4 Headphones +===================== ================ + +===================== ================ +Input Channels Assigned to +===================== ================ +1-2 (CH 1 Line/Phono) Vinyl Control 1 +3-4 (CH 2 Line/Phono) Vinyl Control 2 +5-6 (Mix) Record/Broadcast +===================== ================ + +The microphone, and external inputs are mixed +together in input channels 5-6, so Mixxx can record and broadcast them. + +The knobs for :hwlabel:`MASTER`, :hwlabel:`BOOTH`, :hwlabel:`MIC LEVEL`, :hwlabel:`MIC TONE` and :hwlabel:`CUE GAIN` are controlling the hardware mixer of the built-in audio interface. +Hence, turning the knobs will not change values in the Mixxx :term:`GUI` and you’ll need to set the Mixxx knobs to their default values when using the controller: + +- Set the master/booth/headphones/microphone levels to 100% (knob center position) + +.. note:: + You should assign the :guilabel:`Vinyl Control` input channels even if you do not intend to use timecode vinyl. + These channel assignments are also needed to make the :hwlabel:`CH 1/2 PC/LINE/PHONO` switches work (i. e. passing through line or phono input to the left/right deck). + +Controller Mapping +------------------ + +Schematic +~~~~~~~~~~~~~~~~~~~~~~ + +.. figure:: ../../_static/controllers/numark_scratch.svg + :align: center + :width: 100% + :figwidth: 100% + :alt: Numark Scratch (schematic view) + :figclass: pretty-figures + + Numark Scratch (schematic view) + +======== ================================================== ========================================== +No. Control Function +======== ================================================== ========================================== +1 CHANNEL EQ/GAIN Adjust volume & the high / mid / low EQs per channel +2 :hwlabel:`BOOTH` Adjust Booth output level +3 :hwlabel:`MASTER` Adjust Master output level +4 :hwlabel:`LINE/PHONO` & :hwlabel:`PC` Toggle between LINE / PHONO or PC per channel +5 CUE :hwlabel:`MIX` Adjust monitoring between CUE and PGM +6 CUE :hwlabel:`GAIN` Adjust CUE level +7 FX :hwlabel:`DRY / WET` Adjust FX wet/dry depth +8 FX SELECT Toggle single FX +8 :hwlabel:`SHIFT` + FX SELECT Toggle multiple FX selections at the same time +9 FX :hwlabel:`HOLD / ON` paddle Push up to toggle FX on or push down to toggle FX momentarily +10 :hwlabel:`CUE` Press to cue channel for monitoring in headphones +11 :hwlabel:`SHIFT` Used with other controls that have SHIFT modifier function +12 CROSSFADER Crossfade audio between channel 1/2 +13 X-FADER :hwlabel:`REVERSE` & :hwlabel:`SLOPE` Toggle crossfader reverse, & adjust between crossfader curves +14 CHANNEL FADER Adjust per channel volume +15 PERFORMANCE PADS SEE PERFORMANCE PADS SECTION FOR MORE INFO +16 :hwlabel:`LOOP -/+` Turn right/left to increase/decrease loop size, press in to toggle loop on/off +16 :hwlabel:`SHIFT` + :hwlabel:`LOOP -/+` Turn for Library scroll, press in to load selected track to deck, double press to load instant double +17 :hwlabel:`FILTER` Adjust hardware Filter per channel +18 MIC :hwlabel:`TONE` & :hwlabel:`MIC` level Adjust microphone tone & level +======== ================================================== ========================================== + +Performance Pads +~~~~~~~~~~~~~~~~ + +Pad modes are similar to those found when used with Serato. +To change modes, press the PAD MODE button repeatedly, which +will cycle through the available pade modes, which are as follows: + +.. figure:: ../../_static/controllers/numark_scratch_performancepads.svg + :align: center + :width: 65% + :figwidth: 100% + :alt: Numark Scratch (performance pads) + :figclass: pretty-figures + + Numark Scratch (performance pads) + +========================== ===================== +Control Mode +========================== ===================== +:hwlabel:`PAD MODE` CUE Hot Cue Mode +:hwlabel:`PAD MODE` SAMPLE Sampler Mode +:hwlabel:`PAD MODE` ROLL Loop Roll Mode +========================== ===================== + +CUE mode: Pads 1-4 trigger Hotcue Cues, and if no Cue point is present on that pad/slot, will set a Cue point +in the respective pad/slot. Holding SHIFT while pressing a pad will clear the Cue point from that pad/slot. + +SAMPLER mode: Press pads 1-4 to trigger samples loaded into the sample slot. Hold SHIFT while pressing a pad to +stop the sample playback once triggered. + +ROLL mode: In this mode holding pads 1-4 activates a loop roll of varying sizes. Release the pad to exit the loop roll. \ No newline at end of file From 582424bb6e8db46ffab5f1de682b1e4a97ae0bf8 Mon Sep 17 00:00:00 2001 From: NotYourAverageAl Date: Thu, 30 Jun 2022 22:18:38 +1000 Subject: [PATCH 02/14] pre-comit fixes --- source/_static/controllers/numark_scratch.svg | 2 +- .../numark_scratch_performancepads.svg | 2 +- .../hardware/controllers/numark_scratch.rst | 19 ++++++++----------- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/source/_static/controllers/numark_scratch.svg b/source/_static/controllers/numark_scratch.svg index 217e0d0aa3..c2ae659d74 100644 --- a/source/_static/controllers/numark_scratch.svg +++ b/source/_static/controllers/numark_scratch.svg @@ -574,4 +574,4 @@ id="g424"> \ No newline at end of file + d="M 0,0 H 46.189" /> diff --git a/source/_static/controllers/numark_scratch_performancepads.svg b/source/_static/controllers/numark_scratch_performancepads.svg index 58e7d49051..603dfc76fb 100644 --- a/source/_static/controllers/numark_scratch_performancepads.svg +++ b/source/_static/controllers/numark_scratch_performancepads.svg @@ -574,4 +574,4 @@ id="g424"> \ No newline at end of file + d="M 0,0 H 46.189" /> diff --git a/source/hardware/controllers/numark_scratch.rst b/source/hardware/controllers/numark_scratch.rst index 4535e662d4..ed4c10ad1f 100644 --- a/source/hardware/controllers/numark_scratch.rst +++ b/source/hardware/controllers/numark_scratch.rst @@ -3,9 +3,6 @@ Numark Scratch ============== -.. sectionauthor:: - Al Hadebe - The Numark Scratch is a 24-bit 2 channel mixer designed for the scratch DJ. It's equipped with an InnoFader crossfader and 8 performance pads across 3 modes, and 6 dedicated software FX selectors with dual toggle triggers. The Scratch is DVS ready under Mixxx @@ -81,7 +78,7 @@ No. Control Function 4 :hwlabel:`LINE/PHONO` & :hwlabel:`PC` Toggle between LINE / PHONO or PC per channel 5 CUE :hwlabel:`MIX` Adjust monitoring between CUE and PGM 6 CUE :hwlabel:`GAIN` Adjust CUE level -7 FX :hwlabel:`DRY / WET` Adjust FX wet/dry depth +7 FX :hwlabel:`DRY / WET` Adjust FX wet/dry depth 8 FX SELECT Toggle single FX 8 :hwlabel:`SHIFT` + FX SELECT Toggle multiple FX selections at the same time 9 FX :hwlabel:`HOLD / ON` paddle Push up to toggle FX on or push down to toggle FX momentarily @@ -93,7 +90,7 @@ No. Control Function 15 PERFORMANCE PADS SEE PERFORMANCE PADS SECTION FOR MORE INFO 16 :hwlabel:`LOOP -/+` Turn right/left to increase/decrease loop size, press in to toggle loop on/off 16 :hwlabel:`SHIFT` + :hwlabel:`LOOP -/+` Turn for Library scroll, press in to load selected track to deck, double press to load instant double -17 :hwlabel:`FILTER` Adjust hardware Filter per channel +17 :hwlabel:`FILTER` Adjust hardware Filter per channel 18 MIC :hwlabel:`TONE` & :hwlabel:`MIC` level Adjust microphone tone & level ======== ================================================== ========================================== @@ -101,7 +98,7 @@ Performance Pads ~~~~~~~~~~~~~~~~ Pad modes are similar to those found when used with Serato. -To change modes, press the PAD MODE button repeatedly, which +To change modes, press the PAD MODE button repeatedly, which will cycle through the available pade modes, which are as follows: .. figure:: ../../_static/controllers/numark_scratch_performancepads.svg @@ -113,18 +110,18 @@ will cycle through the available pade modes, which are as follows: Numark Scratch (performance pads) -========================== ===================== -Control Mode +========================== ===================== +Control Mode ========================== ===================== :hwlabel:`PAD MODE` CUE Hot Cue Mode :hwlabel:`PAD MODE` SAMPLE Sampler Mode :hwlabel:`PAD MODE` ROLL Loop Roll Mode ========================== ===================== -CUE mode: Pads 1-4 trigger Hotcue Cues, and if no Cue point is present on that pad/slot, will set a Cue point +CUE mode: Pads 1-4 trigger Hotcue Cues, and if no Cue point is present on that pad/slot, will set a Cue point in the respective pad/slot. Holding SHIFT while pressing a pad will clear the Cue point from that pad/slot. -SAMPLER mode: Press pads 1-4 to trigger samples loaded into the sample slot. Hold SHIFT while pressing a pad to +SAMPLER mode: Press pads 1-4 to trigger samples loaded into the sample slot. Hold SHIFT while pressing a pad to stop the sample playback once triggered. -ROLL mode: In this mode holding pads 1-4 activates a loop roll of varying sizes. Release the pad to exit the loop roll. \ No newline at end of file +ROLL mode: In this mode holding pads 1-4 activates a loop roll of varying sizes. Release the pad to exit the loop roll. From 93f96d982948732732a42e09067a6244a3e8196f Mon Sep 17 00:00:00 2001 From: Al Hadebe Date: Sat, 17 Jun 2023 11:04:41 +1000 Subject: [PATCH 03/14] Add shift function to dry/wet knob for metaknob --- source/hardware/controllers/numark_scratch.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/source/hardware/controllers/numark_scratch.rst b/source/hardware/controllers/numark_scratch.rst index ed4c10ad1f..8b8e8d9381 100644 --- a/source/hardware/controllers/numark_scratch.rst +++ b/source/hardware/controllers/numark_scratch.rst @@ -79,6 +79,7 @@ No. Control Function 5 CUE :hwlabel:`MIX` Adjust monitoring between CUE and PGM 6 CUE :hwlabel:`GAIN` Adjust CUE level 7 FX :hwlabel:`DRY / WET` Adjust FX wet/dry depth +7 :hwlabel:`SHIFT` :hwlabel:`DRY / WET` Adjust the metaknob for all effects in the chain. 8 FX SELECT Toggle single FX 8 :hwlabel:`SHIFT` + FX SELECT Toggle multiple FX selections at the same time 9 FX :hwlabel:`HOLD / ON` paddle Push up to toggle FX on or push down to toggle FX momentarily From 15318acc5fdd375251a03c994d53bad9c3c4211a Mon Sep 17 00:00:00 2001 From: Al Hadebe Date: Sat, 17 Jun 2023 11:58:11 +1000 Subject: [PATCH 04/14] Update mapping SVGs --- source/_static/controllers/numark_scratch.svg | 579 +----------------- .../numark_scratch_performancepads.svg | 579 +----------------- 2 files changed, 4 insertions(+), 1154 deletions(-) diff --git a/source/_static/controllers/numark_scratch.svg b/source/_static/controllers/numark_scratch.svg index c2ae659d74..138f9b21d5 100644 --- a/source/_static/controllers/numark_scratch.svg +++ b/source/_static/controllers/numark_scratch.svg @@ -1,577 +1,2 @@ - -image/svg+xml4 -1 -2 -3 -4 -5 -6 -7 -8 -9 -10 -11 -12 -13 -14 -15 -16 -17 -18 - + + diff --git a/source/_static/controllers/numark_scratch_performancepads.svg b/source/_static/controllers/numark_scratch_performancepads.svg index 603dfc76fb..369897d54e 100644 --- a/source/_static/controllers/numark_scratch_performancepads.svg +++ b/source/_static/controllers/numark_scratch_performancepads.svg @@ -1,577 +1,2 @@ - -image/svg+xml4 -Overview -1 -2 -3 -4 -5 -6 -7 -8 -9 -10 -11 -12 -13 -14 -16 -17 -18 - + + From 376266ebfaee1f62404b071f93b5d77ec95b340d Mon Sep 17 00:00:00 2001 From: Al Hadebe Date: Fri, 23 Jun 2023 21:31:14 +1000 Subject: [PATCH 05/14] Update versionadded Co-authored-by: Swiftb0y <12380386+Swiftb0y@users.noreply.github.com> --- source/hardware/controllers/numark_scratch.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/hardware/controllers/numark_scratch.rst b/source/hardware/controllers/numark_scratch.rst index 8b8e8d9381..5284d8c1e4 100644 --- a/source/hardware/controllers/numark_scratch.rst +++ b/source/hardware/controllers/numark_scratch.rst @@ -13,7 +13,7 @@ It's equipped with an InnoFader crossfader and 8 performance pads across 3 modes - `Driver Download Page `__ - `Mapping Forum Thread `__ -.. versionadded:: 2.3.0 +.. versionadded:: 2.4.0 Drivers ------- From 4c1c2e0c167ae955f84a1e597689f59ceaec8ba5 Mon Sep 17 00:00:00 2001 From: Al Hadebe Date: Fri, 23 Jun 2023 21:31:34 +1000 Subject: [PATCH 06/14] Update class compliance info Co-authored-by: Swiftb0y <12380386+Swiftb0y@users.noreply.github.com> --- source/hardware/controllers/numark_scratch.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/hardware/controllers/numark_scratch.rst b/source/hardware/controllers/numark_scratch.rst index 5284d8c1e4..4ab2d0964e 100644 --- a/source/hardware/controllers/numark_scratch.rst +++ b/source/hardware/controllers/numark_scratch.rst @@ -19,7 +19,7 @@ Drivers ------- You can download the latest Windows driver from the `manufacturer’s website `__. -The Scratch is class complaint on Mac. +The Scratch is class complaint on Mac and Linux. Audio Setup ----------- From 07253034dea32980be8ba41b8101583e2b2b11da Mon Sep 17 00:00:00 2001 From: Al Hadebe Date: Fri, 23 Jun 2023 22:59:55 +1000 Subject: [PATCH 07/14] reduce redundancy. --- .../hardware/controllers/numark_scratch.rst | 23 +++++-------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/source/hardware/controllers/numark_scratch.rst b/source/hardware/controllers/numark_scratch.rst index 4ab2d0964e..6ad6f57db9 100644 --- a/source/hardware/controllers/numark_scratch.rst +++ b/source/hardware/controllers/numark_scratch.rst @@ -98,10 +98,6 @@ No. Control Function Performance Pads ~~~~~~~~~~~~~~~~ -Pad modes are similar to those found when used with Serato. -To change modes, press the PAD MODE button repeatedly, which -will cycle through the available pade modes, which are as follows: - .. figure:: ../../_static/controllers/numark_scratch_performancepads.svg :align: center :width: 65% @@ -109,20 +105,13 @@ will cycle through the available pade modes, which are as follows: :alt: Numark Scratch (performance pads) :figclass: pretty-figures - Numark Scratch (performance pads) - -========================== ===================== -Control Mode -========================== ===================== -:hwlabel:`PAD MODE` CUE Hot Cue Mode -:hwlabel:`PAD MODE` SAMPLE Sampler Mode -:hwlabel:`PAD MODE` ROLL Loop Roll Mode -========================== ===================== +To change modes, press the PAD MODE button repeatedly, which +will cycle through the available pade modes, which are as follows: -CUE mode: Pads 1-4 trigger Hotcue Cues, and if no Cue point is present on that pad/slot, will set a Cue point -in the respective pad/slot. Holding SHIFT while pressing a pad will clear the Cue point from that pad/slot. +**CUE** mode: Pads 1-4 trigger the respective hotcues, and if no hotcue point is set on that pad, will set a Cue point +in the respective pad/slot. Holding SHIFT while pressing a pad will clear the Cue point from that pad. -SAMPLER mode: Press pads 1-4 to trigger samples loaded into the sample slot. Hold SHIFT while pressing a pad to +**SAMPLER** mode: Press pads 1-4 to trigger samples loaded into the sample slot. Hold SHIFT while pressing a pad to stop the sample playback once triggered. -ROLL mode: In this mode holding pads 1-4 activates a loop roll of varying sizes. Release the pad to exit the loop roll. +**ROLL** mode: In this mode holding pads 1-4 activates a loop roll of varying sizes. Release the pad to exit the loop roll. From 6343071877696dc94ff9e9cb4aaf0d1777773d96 Mon Sep 17 00:00:00 2001 From: Al Hadebe Date: Sat, 24 Jun 2023 00:00:11 +1000 Subject: [PATCH 08/14] Clarify info on software inputs --- source/hardware/controllers/numark_scratch.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/hardware/controllers/numark_scratch.rst b/source/hardware/controllers/numark_scratch.rst index 6ad6f57db9..af7e7ea634 100644 --- a/source/hardware/controllers/numark_scratch.rst +++ b/source/hardware/controllers/numark_scratch.rst @@ -51,8 +51,8 @@ Hence, turning the knobs will not change values in the Mixxx :term:`GUI` and you - Set the master/booth/headphones/microphone levels to 100% (knob center position) .. note:: - You should assign the :guilabel:`Vinyl Control` input channels even if you do not intend to use timecode vinyl. - These channel assignments are also needed to make the :hwlabel:`CH 1/2 PC/LINE/PHONO` switches work (i. e. passing through line or phono input to the left/right deck). + The :hwlabel:`PC / LINE/PHONO` switches work only if the :guilabel:`Vinyl Control` input channels are assigned to software inputs. + So even if you do not intend to use timecode vinyl but want to pass through line or phono inputs directly to the left/right deck, you need assign these channels in the Sound Hardware preferences. Controller Mapping ------------------ From a516882ade8458048a0fa668f898f4eeec58d625 Mon Sep 17 00:00:00 2001 From: Al Hadebe Date: Sat, 16 Sep 2023 17:43:46 +1000 Subject: [PATCH 09/14] remove unnecessary comment --- source/hardware/controllers/numark_scratch.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/source/hardware/controllers/numark_scratch.rst b/source/hardware/controllers/numark_scratch.rst index af7e7ea634..2955f65ae7 100644 --- a/source/hardware/controllers/numark_scratch.rst +++ b/source/hardware/controllers/numark_scratch.rst @@ -24,8 +24,7 @@ The Scratch is class complaint on Mac and Linux. Audio Setup ----------- -The mapping relies on the following channel assignments (for line/phono -input support, applying effects to the TR-S output, etc.): +The mapping relies on the following channel assignments: ===================== ================ Output Channels Assigned to From 84c97291b18abf9a5218c8bcd93f9166388f2835 Mon Sep 17 00:00:00 2001 From: ronso0 Date: Thu, 23 May 2024 19:27:31 +0200 Subject: [PATCH 10/14] cmd line/dev tools: fix vu meter arg --- source/chapters/appendix/commandline_dev_tools.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/chapters/appendix/commandline_dev_tools.rst b/source/chapters/appendix/commandline_dev_tools.rst index e5c322f60e..70efc0831b 100644 --- a/source/chapters/appendix/commandline_dev_tools.rst +++ b/source/chapters/appendix/commandline_dev_tools.rst @@ -46,7 +46,7 @@ types, go to :ref:`file-format-compatibility`. --settings-path PATH Top-level directory where Mixxx will look for user settings files such as the library database and preferences configuration file. ---disable-vumetergl Do not use OpenGL vu meter +--enable-legacy-vumeter Do not use OpenGL vu meter --controller-debug Log all controller data Mixxx sends and receives as well as scripts it loads. --controller-abort-on-warning The controller mapping will issue more From 0e5e98017e29dae0ad4685cb355c22af2408fcd9 Mon Sep 17 00:00:00 2001 From: Swiftb0y <12380386+Swiftb0y@users.noreply.github.com> Date: Sun, 26 May 2024 12:54:00 +0200 Subject: [PATCH 11/14] fix/document-[ChannelN]-input_configured Co-authored-by: ronso0 --- source/chapters/appendix/mixxx_controls.rst | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source/chapters/appendix/mixxx_controls.rst b/source/chapters/appendix/mixxx_controls.rst index b9bd571675..68df48bb33 100644 --- a/source/chapters/appendix/mixxx_controls.rst +++ b/source/chapters/appendix/mixxx_controls.rst @@ -2876,10 +2876,13 @@ Then you can use your :term:`MIDI` controller to control its volume and some oth .. note:: Although the first auxiliary group is named :mixxx:cogroupref:`[Auxiliary1]`, the group for the first microphone is just called :mixxx:cogroupref:`[Microphone] <[MicrophoneN]>`, not :mixxx:cogroupref:`[Microphone1] <[MicrophoneN]>`. -.. mixxx:control:: [MicrophoneN],input_configured +.. mixxx:control:: [ChannelN],input_configured + [MicrophoneN],input_configured [AuxiliaryN],input_configured 1 if there is input is configured for this channel, 0 if not. + In the case of :mixxx:cogroupref:`[ChannelN]` it corresponds to + Vinyl Control. A configured input is required to enable :mixxx:coref:`[ChannelN],passthrough` :range: binary, read-only :feedback: Configured channel in the sound preferences. From 639877f2ce295f05f4b8a797909279b382ba1c42 Mon Sep 17 00:00:00 2001 From: ronso0 Date: Fri, 7 Jun 2024 00:30:13 +0200 Subject: [PATCH 12/14] controls: clarify action of [Playlis],LoadSelectedIntoFirstStopped --- source/chapters/appendix/mixxx_controls.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/chapters/appendix/mixxx_controls.rst b/source/chapters/appendix/mixxx_controls.rst index 68df48bb33..489f910114 100644 --- a/source/chapters/appendix/mixxx_controls.rst +++ b/source/chapters/appendix/mixxx_controls.rst @@ -4529,7 +4529,8 @@ In the meantime, skins and controller mappings that still use them will keep wor :range: binary :feedback: Waveform view - Loads the currently highlighted song into the first stopped deck + Performs the same action action like :mixxx:coref:`[Library],GoToItem` does when the tracks table has focus, + just regardless of the focus. .. deprecated:: 2.1.0 Use :mixxx:coref:`[Library],GoToItem` instead. From 3a9985c40161c613179caf6c8f0d97b772997236 Mon Sep 17 00:00:00 2001 From: mixxxbot Date: Sat, 8 Jun 2024 21:59:30 +0000 Subject: [PATCH 13/14] appendix/changelog: Update changelog for 2.4 branch --- source/chapters/appendix/changelog.rst | 36 ++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/source/chapters/appendix/changelog.rst b/source/chapters/appendix/changelog.rst index 0adc046a77..5c42545130 100644 --- a/source/chapters/appendix/changelog.rst +++ b/source/chapters/appendix/changelog.rst @@ -9,6 +9,42 @@ Changelog ========= +.. _v2-4-2: + +`2.4.2 `__ (unreleased) +---------------------------------------------------------------------------------- + +Controller Mappings +^^^^^^^^^^^^^^^^^^^ + + +* Korg Kaoss DJ: Update script `#12683 `__ +* Novation Dicer: Remove flanger mapping with quickeffect toggle + `#13196 `__ + `#13134 `__ +* Numark PartyMix: Fix EQ (script binding) display name `#13255 `__ +* Sony SIXAXIS: Fix mapping `#13319 `__ + +Fixes +^^^^^ + + +* Handle not supported files when dragging to waveforms and spinnies + `#13208 `__ + `#13271 `__ + `#13275 `__ +* Fix Sqlite 3.45 builds by using only single quotes for SQL strings + `#13247 `__ + `#13257 `__ +* LateNight: Use default colors for sampler overviews (like main decks) `#13274 `__ +* Library: Allow to drop files to decks with unsupported or no file extensions + `#13209 `__ + `#13204 `__ +* Update build environment with libdjinterop 0.21.0 `#13288 `__ +* Move to GitHub workflow runner macos-12 + `#13296 `__ + `#13248 `__ + .. _v2-4-1: `2.4.1 `__ (2024-05-08) From 7840a902c63289428b3fd0c490de2736af0781e4 Mon Sep 17 00:00:00 2001 From: mixxxbot Date: Thu, 13 Jun 2024 20:44:53 +0000 Subject: [PATCH 14/14] appendix/changelog: Update changelog for 2.4 branch --- source/chapters/appendix/changelog.rst | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/source/chapters/appendix/changelog.rst b/source/chapters/appendix/changelog.rst index 5c42545130..7a161c7e76 100644 --- a/source/chapters/appendix/changelog.rst +++ b/source/chapters/appendix/changelog.rst @@ -23,6 +23,7 @@ Controller Mappings `#13196 `__ `#13134 `__ * Numark PartyMix: Fix EQ (script binding) display name `#13255 `__ +* Numark Scratch: Add initial mapping `#4834 `__ * Sony SIXAXIS: Fix mapping `#13319 `__ Fixes @@ -44,6 +45,20 @@ Fixes * Move to GitHub workflow runner macos-12 `#13296 `__ `#13248 `__ +* Recording: with empty config, save default split size immediately + `#13304 `__ +* Allow to drop files with supported MIME type regardless off the file extensions + `#13209 `__ + `#13204 `__ +* Add support for Ubuntu Oracular Oriole and remove Lunar Lobster + `#13348 `__ +* Recordbox: Fix string decoding issues + `#13293 `__ + `#13291 `__ +* Mixer preferences: Don't update EQs/QuickEffects while applying `#13333 `__ +* Hardware preferences: Fix UX when applying config with missing/busy devices + `#13312 `__ +* Fix minor 64 bit CPU performance issue `#13355 `__ .. _v2-4-1: