From 1b730bd08408fc0c4d5ac135aba4f67e14dee334 Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Tue, 20 Oct 2020 23:08:26 +0200 Subject: [PATCH 01/42] Initial manual page for the NI Traktor Kontrol Z2 --- .../native_instruments_traktor_kontrol_z2.rst | 110 ++++++++++++++++++ 1 file changed, 110 insertions(+) create mode 100644 source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst new file mode 100644 index 0000000000..b1acd29fae --- /dev/null +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -0,0 +1,110 @@ +Native Instruments Traktor Kontrol Z2 +============= + +.. sectionauthor:: + Jörg Wartenberg + +.. figure:: ../../_static/controllers/native_instruments_traktor_z2.svg + :align: center + :width: 100% + :figwidth: 100% + :alt: Native Instruments Traktor Kontrol Z2 (schematic view) + :figclass: pretty-figures + + Native Instruments Traktor Kontrol Z2 (schematic view) + + +The Native Instruments Traktor Kontrol Z2 is a 2+2 channel USB :term:`HID` mixer/controller with an integrated audio interface. +It has two full channels and two further channels with limited controls. +The Traktor Z2 is intended for a :term:`DVS' systems and is provided with Traktor Scratch MK2 Vinyls and CDs. + +- `Manufacturer’s product page `__ +- `Virtual DJ Hardware Page `__ +- `Traktor Kontrol Z2 Manual `__ +- `Driver/Firmware-Updates Download Page `__ +- `Mapping Forum Thread <>`__ + +.. versionadded:: 2.4.0 + +Drivers +------- + +You can download the latest Windows & MacOS drivers and firmware from the `manufacturer’s website `__. +Since the Traktor Kontrol Z2 is a USB class compliant HID and audio device, the device is plug-and-play on Linux. + +NIHardwareService.exe on Windows and LEDs +----------------------------------------- +If you've a parallel installation of National Instruments Traktor 3 software, there will be a windows service C:\Program Files\Common Files\Native Instruments\Hardware\NIHardwareService.exe installed. It starts during while booting and takes over control of the LEDs of the Traktor Kontrol Z2. +The LEDs on the Traktor Kontrol Z2 will only work with Mixxx, if you: +-deinstall the Traktor 3 software +-stop the Windows service NIHardwareService.exe (e.g. by Windows task manager -> Show processes from all users -> select NIHardwareService.exe -> End process) + +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 (Mic/Aux) Microphone 1 +3-4 (CH 1 Line/Phono) Vinyl Control 1 +5-6 (CH 2 Line/Phono) Vinyl Control 2 +7-8 (Recording) Record/Broadcast +===================== ================ + +The microphone an auxiliary inputs are mixed with each other in the hardware. +together in input channels 5-6, so Mixxx can record and broadcast them. + +The knobs for :hwlabel:`MASTER`, :hwlabel:`BOOTH`, :hwlabel:`HP VOLUME` 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 levels to 100% (knob center position) +- Set cue/master mixing to cue-only (leftmost position) + +.. note:: + You should assign the :guilabel:`Vinyl Control` input channels even if you do not intend to use timecode vinyl. + +Controller Mapping +------------------ + +The control numbering in the schematic drawings matches the those found on the +specified page in the Manual. + + +Brows Section (p. 4) +~~~~~~~~~~~~~~~~~~~~~~ + +.. figure:: ../../_static/controllers/traktor_z2_browser.svg + :align: center + :width: 45% + :figwidth: 100% + :alt: Native Instruments Traktor Kontrol Z2 (browser section) + :figclass: pretty-figures + + Native Instruments Traktor Kontrol Z2 (Browse section) + +======== ============================================================= ========================================== +No. Control Function +======== ============================================================= ========================================== +1 :hwlabel:`LOAD/DUPLICATE A` (left) button Load song into deck A. +2 :hwlabel:`LOAD/DUPLICATE B` (right) button Load song into deck B. +3 :hwlabel:`SHIFT` + :hwlabel:`LOAD/DUPLICATE A` (left) button Duplicate track and play position from deck B to A +4 :hwlabel:`SHIFT` + :hwlabel:`LOAD/DUPLICATE B` (right) button Duplicate track and play position from deck A to B +5 Rotary Selector Turn to move tracklist cursor up/down. Press to toggle the selected item. +6 :hwlabel:`SHIFT` + Rotary Selector Turn to move sidebar cursor left right/down. +======== ============================================================= ========================================== + + +Known Issues +------------ + +- The two Traktor buttons on top are overruling the software. This can result in a state, where one channel of the hardware mixer is in external mixing mode, but Mixxx is expecting internal mixing mode. \ No newline at end of file From a1adcff6ac566c7710e164578857964a1dd6fa2f Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Tue, 20 Oct 2020 23:14:06 +0200 Subject: [PATCH 02/42] Fixed syntax failure --- .../controllers/native_instruments_traktor_kontrol_z2.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index b1acd29fae..b33527b830 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -1,5 +1,5 @@ Native Instruments Traktor Kontrol Z2 -============= +===================================== .. sectionauthor:: Jörg Wartenberg @@ -80,8 +80,8 @@ The control numbering in the schematic drawings matches the those found on the specified page in the Manual. -Brows Section (p. 4) -~~~~~~~~~~~~~~~~~~~~~~ +Browse Section +~~~~~~~~~~~~~~ .. figure:: ../../_static/controllers/traktor_z2_browser.svg :align: center From a67dcaf6df11fef121100bd1ce2b15878bd4dd7b Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Tue, 20 Oct 2020 23:18:47 +0200 Subject: [PATCH 03/42] Fixed syntax failure --- .../controllers/native_instruments_traktor_kontrol_z2.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index b33527b830..84cc3827b3 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -16,7 +16,7 @@ Native Instruments Traktor Kontrol Z2 The Native Instruments Traktor Kontrol Z2 is a 2+2 channel USB :term:`HID` mixer/controller with an integrated audio interface. It has two full channels and two further channels with limited controls. -The Traktor Z2 is intended for a :term:`DVS' systems and is provided with Traktor Scratch MK2 Vinyls and CDs. +The Traktor Z2 is intended for a :term:`DVS` systems and is provided with Traktor Scratch MK2 Vinyls and CDs. - `Manufacturer’s product page `__ - `Virtual DJ Hardware Page `__ From 1fc0f6863c17faae37803daa682ad0ea683e507d Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Tue, 20 Oct 2020 23:29:30 +0200 Subject: [PATCH 04/42] Fixed syntax failure --- .../controllers/native_instruments_traktor_kontrol_z2.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index 84cc3827b3..9c281da982 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -22,7 +22,6 @@ The Traktor Z2 is intended for a :term:`DVS` systems and is provided with Trakt - `Virtual DJ Hardware Page `__ - `Traktor Kontrol Z2 Manual `__ - `Driver/Firmware-Updates Download Page `__ -- `Mapping Forum Thread <>`__ .. versionadded:: 2.4.0 From 33fdd752bb46e51a6aea61b08f53cd095428e20f Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Tue, 20 Oct 2020 23:41:28 +0200 Subject: [PATCH 05/42] Commented out not yet existing image --- .../native_instruments_traktor_kontrol_z2.rst | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index 9c281da982..dbb82cae3c 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -4,12 +4,13 @@ Native Instruments Traktor Kontrol Z2 .. sectionauthor:: Jörg Wartenberg +.. .. figure:: ../../_static/controllers/native_instruments_traktor_z2.svg - :align: center - :width: 100% - :figwidth: 100% - :alt: Native Instruments Traktor Kontrol Z2 (schematic view) - :figclass: pretty-figures +.. :align: center +.. :width: 100% +.. :figwidth: 100% +.. :alt: Native Instruments Traktor Kontrol Z2 (schematic view) +.. :figclass: pretty-figures Native Instruments Traktor Kontrol Z2 (schematic view) From 26864050bf8bdfea2d104aab841ac630d9accc99 Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Tue, 20 Oct 2020 23:44:26 +0200 Subject: [PATCH 06/42] Removed image at all --- .../native_instruments_traktor_kontrol_z2.rst | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index dbb82cae3c..8ab246d927 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -4,16 +4,6 @@ Native Instruments Traktor Kontrol Z2 .. sectionauthor:: Jörg Wartenberg -.. -.. figure:: ../../_static/controllers/native_instruments_traktor_z2.svg -.. :align: center -.. :width: 100% -.. :figwidth: 100% -.. :alt: Native Instruments Traktor Kontrol Z2 (schematic view) -.. :figclass: pretty-figures - - Native Instruments Traktor Kontrol Z2 (schematic view) - The Native Instruments Traktor Kontrol Z2 is a 2+2 channel USB :term:`HID` mixer/controller with an integrated audio interface. It has two full channels and two further channels with limited controls. From 669288beb063e7a855005b5cac2c0bb5fbfb4e63 Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Tue, 20 Oct 2020 23:47:04 +0200 Subject: [PATCH 07/42] Removed further image reference --- .../controllers/native_instruments_traktor_kontrol_z2.rst | 7 ------- 1 file changed, 7 deletions(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index 8ab246d927..c46cc122b9 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -73,13 +73,6 @@ specified page in the Manual. Browse Section ~~~~~~~~~~~~~~ -.. figure:: ../../_static/controllers/traktor_z2_browser.svg - :align: center - :width: 45% - :figwidth: 100% - :alt: Native Instruments Traktor Kontrol Z2 (browser section) - :figclass: pretty-figures - Native Instruments Traktor Kontrol Z2 (Browse section) ======== ============================================================= ========================================== From 17932d20ccf78eacad66b47ef33327a2f2fb2e52 Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Tue, 20 Oct 2020 23:55:15 +0200 Subject: [PATCH 08/42] Fixed broken glossary reference --- .../controllers/native_instruments_traktor_kontrol_z2.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index c46cc122b9..be0f151ed1 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -7,7 +7,7 @@ Native Instruments Traktor Kontrol Z2 The Native Instruments Traktor Kontrol Z2 is a 2+2 channel USB :term:`HID` mixer/controller with an integrated audio interface. It has two full channels and two further channels with limited controls. -The Traktor Z2 is intended for a :term:`DVS` systems and is provided with Traktor Scratch MK2 Vinyls and CDs. +The Traktor Z2 is intended for a DVS systems and is provided with Traktor Scratch MK2 :term:`timecode` Vinyls and CDs. - `Manufacturer’s product page `__ - `Virtual DJ Hardware Page `__ From b75f52a318f52ec7a3f91bc19bfe8b1860f31d40 Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Wed, 21 Oct 2020 00:02:01 +0200 Subject: [PATCH 09/42] Formatting --- .../native_instruments_traktor_kontrol_z2.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index be0f151ed1..be5b625c35 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -11,7 +11,7 @@ The Traktor Z2 is intended for a DVS systems and is provided with Traktor Scratc - `Manufacturer’s product page `__ - `Virtual DJ Hardware Page `__ -- `Traktor Kontrol Z2 Manual `__ +- `Traktor Kontrol Z2 Manual (ZIP-file) `__ - `Driver/Firmware-Updates Download Page `__ .. versionadded:: 2.4.0 @@ -22,12 +22,12 @@ Drivers You can download the latest Windows & MacOS drivers and firmware from the `manufacturer’s website `__. Since the Traktor Kontrol Z2 is a USB class compliant HID and audio device, the device is plug-and-play on Linux. -NIHardwareService.exe on Windows and LEDs ------------------------------------------ +NIHardwareService.exe on Microsoft Windows and LEDs +--------------------------------------------------- If you've a parallel installation of National Instruments Traktor 3 software, there will be a windows service C:\Program Files\Common Files\Native Instruments\Hardware\NIHardwareService.exe installed. It starts during while booting and takes over control of the LEDs of the Traktor Kontrol Z2. The LEDs on the Traktor Kontrol Z2 will only work with Mixxx, if you: --deinstall the Traktor 3 software --stop the Windows service NIHardwareService.exe (e.g. by Windows task manager -> Show processes from all users -> select NIHardwareService.exe -> End process) +- deinstall the Traktor 3 software +- stop the Windows service NIHardwareService.exe (e.g. by Windows task manager -> Show processes from all users -> select NIHardwareService.exe -> End process) Audio Setup ----------- From 109706f87e4f219e501b65fe93889ad176fac2ed Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Wed, 21 Oct 2020 00:05:34 +0200 Subject: [PATCH 10/42] List syntax --- .../controllers/native_instruments_traktor_kontrol_z2.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index be5b625c35..cb07a6f56f 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -26,6 +26,7 @@ NIHardwareService.exe on Microsoft Windows and LEDs --------------------------------------------------- If you've a parallel installation of National Instruments Traktor 3 software, there will be a windows service C:\Program Files\Common Files\Native Instruments\Hardware\NIHardwareService.exe installed. It starts during while booting and takes over control of the LEDs of the Traktor Kontrol Z2. The LEDs on the Traktor Kontrol Z2 will only work with Mixxx, if you: + - deinstall the Traktor 3 software - stop the Windows service NIHardwareService.exe (e.g. by Windows task manager -> Show processes from all users -> select NIHardwareService.exe -> End process) From 6c54e0ed3d3595950b054c273127f74cdd947a47 Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Wed, 21 Oct 2020 00:11:13 +0200 Subject: [PATCH 11/42] Wording improved --- .../controllers/native_instruments_traktor_kontrol_z2.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index cb07a6f56f..ae78028742 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -25,10 +25,10 @@ Since the Traktor Kontrol Z2 is a USB class compliant HID and audio device, the NIHardwareService.exe on Microsoft Windows and LEDs --------------------------------------------------- If you've a parallel installation of National Instruments Traktor 3 software, there will be a windows service C:\Program Files\Common Files\Native Instruments\Hardware\NIHardwareService.exe installed. It starts during while booting and takes over control of the LEDs of the Traktor Kontrol Z2. -The LEDs on the Traktor Kontrol Z2 will only work with Mixxx, if you: +The LEDs on the Traktor Kontrol Z2 will only work with Mixxx, if you either: -- deinstall the Traktor 3 software -- stop the Windows service NIHardwareService.exe (e.g. by Windows task manager -> Show processes from all users -> select NIHardwareService.exe -> End process) +- Deinstall the Traktor 3 software +- Stop the Windows service NIHardwareService.exe (e.g. by Windows task manager -> Show processes from all users -> select NIHardwareService.exe -> End process) Audio Setup ----------- From 094c16b7dc20a1db558d8eb0b99f105202d3f868 Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Wed, 21 Oct 2020 00:14:55 +0200 Subject: [PATCH 12/42] Backslash quoting --- .../controllers/native_instruments_traktor_kontrol_z2.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index ae78028742..adafbb18fc 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -24,7 +24,7 @@ Since the Traktor Kontrol Z2 is a USB class compliant HID and audio device, the NIHardwareService.exe on Microsoft Windows and LEDs --------------------------------------------------- -If you've a parallel installation of National Instruments Traktor 3 software, there will be a windows service C:\Program Files\Common Files\Native Instruments\Hardware\NIHardwareService.exe installed. It starts during while booting and takes over control of the LEDs of the Traktor Kontrol Z2. +If you've a parallel installation of National Instruments Traktor 3 software, there will be a windows service C:\\Program Files\\Common Files\\Native Instruments\\Hardware\\NIHardwareService.exe installed. It starts during while booting and takes over control of the LEDs of the Traktor Kontrol Z2. The LEDs on the Traktor Kontrol Z2 will only work with Mixxx, if you either: - Deinstall the Traktor 3 software From 0dfd876fc18369c9eb9a9a99048d737319ccba25 Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Wed, 21 Oct 2020 00:19:26 +0200 Subject: [PATCH 13/42] Wording corrected --- .../controllers/native_instruments_traktor_kontrol_z2.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index adafbb18fc..c394135a15 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -24,7 +24,7 @@ Since the Traktor Kontrol Z2 is a USB class compliant HID and audio device, the NIHardwareService.exe on Microsoft Windows and LEDs --------------------------------------------------- -If you've a parallel installation of National Instruments Traktor 3 software, there will be a windows service C:\\Program Files\\Common Files\\Native Instruments\\Hardware\\NIHardwareService.exe installed. It starts during while booting and takes over control of the LEDs of the Traktor Kontrol Z2. +If you've a parallel installation of National Instruments Traktor 3 software, there will be a windows service C:\\Program Files\\Common Files\\Native Instruments\\Hardware\\NIHardwareService.exe installed. It starts at system boot and takes over control of the LEDs of the Traktor Kontrol Z2. The LEDs on the Traktor Kontrol Z2 will only work with Mixxx, if you either: - Deinstall the Traktor 3 software From 88508f387b661a15d8617fa459976e7c58c04599 Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Wed, 21 Oct 2020 00:23:58 +0200 Subject: [PATCH 14/42] Corrections --- .../controllers/native_instruments_traktor_kontrol_z2.rst | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index c394135a15..30365ff4be 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -22,7 +22,7 @@ Drivers You can download the latest Windows & MacOS drivers and firmware from the `manufacturer’s website `__. Since the Traktor Kontrol Z2 is a USB class compliant HID and audio device, the device is plug-and-play on Linux. -NIHardwareService.exe on Microsoft Windows and LEDs +NIHardwareService.exe on Microsoft Windows --------------------------------------------------- If you've a parallel installation of National Instruments Traktor 3 software, there will be a windows service C:\\Program Files\\Common Files\\Native Instruments\\Hardware\\NIHardwareService.exe installed. It starts at system boot and takes over control of the LEDs of the Traktor Kontrol Z2. The LEDs on the Traktor Kontrol Z2 will only work with Mixxx, if you either: @@ -33,8 +33,7 @@ The LEDs on the Traktor Kontrol Z2 will only work with Mixxx, if you either: 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 @@ -53,7 +52,7 @@ Input Channels Assigned to ===================== ================ The microphone an auxiliary inputs are mixed with each other in the hardware. -together in input channels 5-6, so Mixxx can record and broadcast them. +together in input channels 1-2, so Mixxx can record and broadcast them. The knobs for :hwlabel:`MASTER`, :hwlabel:`BOOTH`, :hwlabel:`HP VOLUME` 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: From fe01107a52f820937dfcb0f4bddda7d7f9900550 Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Wed, 21 Oct 2020 00:32:06 +0200 Subject: [PATCH 15/42] nihardwareservice -> Warning --- .../controllers/native_instruments_traktor_kontrol_z2.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index 30365ff4be..28dd5d381e 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -22,8 +22,8 @@ Drivers You can download the latest Windows & MacOS drivers and firmware from the `manufacturer’s website `__. Since the Traktor Kontrol Z2 is a USB class compliant HID and audio device, the device is plug-and-play on Linux. +.. warning:: NIHardwareService.exe on Microsoft Windows ---------------------------------------------------- If you've a parallel installation of National Instruments Traktor 3 software, there will be a windows service C:\\Program Files\\Common Files\\Native Instruments\\Hardware\\NIHardwareService.exe installed. It starts at system boot and takes over control of the LEDs of the Traktor Kontrol Z2. The LEDs on the Traktor Kontrol Z2 will only work with Mixxx, if you either: From 777a41709602ae6fe218a3ca274d97e5a167dbb8 Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Wed, 21 Oct 2020 00:35:28 +0200 Subject: [PATCH 16/42] Warning syntax --- .../native_instruments_traktor_kontrol_z2.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index 28dd5d381e..f50890b97d 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -23,12 +23,12 @@ You can download the latest Windows & MacOS drivers and firmware from the `manuf Since the Traktor Kontrol Z2 is a USB class compliant HID and audio device, the device is plug-and-play on Linux. .. warning:: -NIHardwareService.exe on Microsoft Windows -If you've a parallel installation of National Instruments Traktor 3 software, there will be a windows service C:\\Program Files\\Common Files\\Native Instruments\\Hardware\\NIHardwareService.exe installed. It starts at system boot and takes over control of the LEDs of the Traktor Kontrol Z2. -The LEDs on the Traktor Kontrol Z2 will only work with Mixxx, if you either: - -- Deinstall the Traktor 3 software -- Stop the Windows service NIHardwareService.exe (e.g. by Windows task manager -> Show processes from all users -> select NIHardwareService.exe -> End process) + NIHardwareService.exe on Microsoft Windows + If you've a parallel installation of National Instruments Traktor 3 software, there will be a windows service C:\\Program Files\\Common Files\\Native Instruments\\Hardware\\NIHardwareService.exe installed. It starts at system boot and takes over control of the LEDs of the Traktor Kontrol Z2. + The LEDs on the Traktor Kontrol Z2 will only work with Mixxx, if you either: + + - Deinstall the Traktor 3 software + - Stop the Windows service NIHardwareService.exe (e.g. by Windows task manager -> Show processes from all users -> select NIHardwareService.exe -> End process) Audio Setup ----------- From e6f4537e35e6791a5ea5b3ae22478dd791e256b2 Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Wed, 21 Oct 2020 00:42:03 +0200 Subject: [PATCH 17/42] Line breaks and bold text --- .../controllers/native_instruments_traktor_kontrol_z2.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index f50890b97d..9ada7ec301 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -23,8 +23,10 @@ You can download the latest Windows & MacOS drivers and firmware from the `manuf Since the Traktor Kontrol Z2 is a USB class compliant HID and audio device, the device is plug-and-play on Linux. .. warning:: - NIHardwareService.exe on Microsoft Windows + **NIHardwareService.exe** on Microsoft Windows + If you've a parallel installation of National Instruments Traktor 3 software, there will be a windows service C:\\Program Files\\Common Files\\Native Instruments\\Hardware\\NIHardwareService.exe installed. It starts at system boot and takes over control of the LEDs of the Traktor Kontrol Z2. + The LEDs on the Traktor Kontrol Z2 will only work with Mixxx, if you either: - Deinstall the Traktor 3 software From 8f020570b30345968a9b6542f313e24a79ddb973 Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Wed, 21 Oct 2020 00:48:37 +0200 Subject: [PATCH 18/42] Fixed width font --- .../controllers/native_instruments_traktor_kontrol_z2.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index 9ada7ec301..537832458d 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -25,7 +25,7 @@ Since the Traktor Kontrol Z2 is a USB class compliant HID and audio device, the .. warning:: **NIHardwareService.exe** on Microsoft Windows - If you've a parallel installation of National Instruments Traktor 3 software, there will be a windows service C:\\Program Files\\Common Files\\Native Instruments\\Hardware\\NIHardwareService.exe installed. It starts at system boot and takes over control of the LEDs of the Traktor Kontrol Z2. + If you've a parallel installation of National Instruments Traktor 3 software, there will be a windows service ``C:\\Program Files\\Common Files\\Native Instruments\\Hardware\\NIHardwareService.exe`` installed. It starts at system boot and takes over control of the LEDs of the Traktor Kontrol Z2. The LEDs on the Traktor Kontrol Z2 will only work with Mixxx, if you either: From 58c991ed9223c94fd48a0482d40b7809992ec90f Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Wed, 21 Oct 2020 00:54:14 +0200 Subject: [PATCH 19/42] Removed double backslashes again and reformatted --- .../controllers/native_instruments_traktor_kontrol_z2.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index 537832458d..cd7c7f8512 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -25,12 +25,12 @@ Since the Traktor Kontrol Z2 is a USB class compliant HID and audio device, the .. warning:: **NIHardwareService.exe** on Microsoft Windows - If you've a parallel installation of National Instruments Traktor 3 software, there will be a windows service ``C:\\Program Files\\Common Files\\Native Instruments\\Hardware\\NIHardwareService.exe`` installed. It starts at system boot and takes over control of the LEDs of the Traktor Kontrol Z2. + If you've a parallel installation of National Instruments Traktor 3 software, there will be a windows service ``C:\Program Files\Common Files\Native Instruments\Hardware\NIHardwareService.exe`` installed. It starts at system boot and takes over control of the LEDs of the Traktor Kontrol Z2. The LEDs on the Traktor Kontrol Z2 will only work with Mixxx, if you either: - Deinstall the Traktor 3 software - - Stop the Windows service NIHardwareService.exe (e.g. by Windows task manager -> Show processes from all users -> select NIHardwareService.exe -> End process) + - Stop the Windows service NIHardwareService.exe *e.g. by Windows task manager -> Show processes from all users -> select NIHardwareService.exe -> End process* Audio Setup ----------- From 1b0eba102a3bc674734a877ac0f201906838793b Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Wed, 21 Oct 2020 01:00:27 +0200 Subject: [PATCH 20/42] Added :file syntax and corrected grammar --- .../controllers/native_instruments_traktor_kontrol_z2.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index cd7c7f8512..11196d0e7d 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -25,9 +25,9 @@ Since the Traktor Kontrol Z2 is a USB class compliant HID and audio device, the .. warning:: **NIHardwareService.exe** on Microsoft Windows - If you've a parallel installation of National Instruments Traktor 3 software, there will be a windows service ``C:\Program Files\Common Files\Native Instruments\Hardware\NIHardwareService.exe`` installed. It starts at system boot and takes over control of the LEDs of the Traktor Kontrol Z2. + If you've a parallel installation of the National Instruments Traktor 3 software, there will be a Windows service :file:`C:\Program Files\Common Files\Native Instruments\Hardware\NIHardwareService.exe` installed. It starts at system boot and takes over control of the LEDs of the Traktor Kontrol Z2. - The LEDs on the Traktor Kontrol Z2 will only work with Mixxx, if you either: + The LEDs on the Traktor Kontrol Z2 will only reliable work with Mixxx, if you either: - Deinstall the Traktor 3 software - Stop the Windows service NIHardwareService.exe *e.g. by Windows task manager -> Show processes from all users -> select NIHardwareService.exe -> End process* From 9cafa8d00ab6bdb9b5d093ff199f938a269b67c1 Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Wed, 21 Oct 2020 01:03:37 +0200 Subject: [PATCH 21/42] Quoted backslashes again --- .../controllers/native_instruments_traktor_kontrol_z2.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index 11196d0e7d..55941fbc07 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -25,10 +25,9 @@ Since the Traktor Kontrol Z2 is a USB class compliant HID and audio device, the .. warning:: **NIHardwareService.exe** on Microsoft Windows - If you've a parallel installation of the National Instruments Traktor 3 software, there will be a Windows service :file:`C:\Program Files\Common Files\Native Instruments\Hardware\NIHardwareService.exe` installed. It starts at system boot and takes over control of the LEDs of the Traktor Kontrol Z2. - - The LEDs on the Traktor Kontrol Z2 will only reliable work with Mixxx, if you either: + If you've a parallel installation of the National Instruments Traktor 3 software, there will be a Windows service :file:`C:\\Program Files\\Common Files\\Native Instruments\\Hardware\\NIHardwareService.exe` installed. It starts at system boot and takes over control of the LEDs of the Traktor Kontrol Z2. + The LEDs on the Traktor Kontrol Z2 will only reliable work with Mixxx, if you either: - Deinstall the Traktor 3 software - Stop the Windows service NIHardwareService.exe *e.g. by Windows task manager -> Show processes from all users -> select NIHardwareService.exe -> End process* From ee8b7f6d55b63018a3325407f6b74095ed26d758 Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Wed, 21 Oct 2020 01:08:54 +0200 Subject: [PATCH 22/42] List syntax --- .../controllers/native_instruments_traktor_kontrol_z2.rst | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index 55941fbc07..ee813df847 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -26,10 +26,9 @@ Since the Traktor Kontrol Z2 is a USB class compliant HID and audio device, the **NIHardwareService.exe** on Microsoft Windows If you've a parallel installation of the National Instruments Traktor 3 software, there will be a Windows service :file:`C:\\Program Files\\Common Files\\Native Instruments\\Hardware\\NIHardwareService.exe` installed. It starts at system boot and takes over control of the LEDs of the Traktor Kontrol Z2. - - The LEDs on the Traktor Kontrol Z2 will only reliable work with Mixxx, if you either: - - Deinstall the Traktor 3 software - - Stop the Windows service NIHardwareService.exe *e.g. by Windows task manager -> Show processes from all users -> select NIHardwareService.exe -> End process* + The LEDs on the Traktor Kontrol Z2 will only reliable work with Mixxx, if you either: + - Deinstall the Traktor 3 software + - Stop the Windows service NIHardwareService.exe *e.g. by Windows task manager -> Show processes from all users -> select NIHardwareService.exe -> End process* Audio Setup ----------- From 895fec142708bf23e2b1e83167bca2aa09474c9e Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Wed, 21 Oct 2020 01:11:00 +0200 Subject: [PATCH 23/42] List syntax --- .../controllers/native_instruments_traktor_kontrol_z2.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index ee813df847..23a1597cd9 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -27,8 +27,9 @@ Since the Traktor Kontrol Z2 is a USB class compliant HID and audio device, the If you've a parallel installation of the National Instruments Traktor 3 software, there will be a Windows service :file:`C:\\Program Files\\Common Files\\Native Instruments\\Hardware\\NIHardwareService.exe` installed. It starts at system boot and takes over control of the LEDs of the Traktor Kontrol Z2. The LEDs on the Traktor Kontrol Z2 will only reliable work with Mixxx, if you either: - - Deinstall the Traktor 3 software - - Stop the Windows service NIHardwareService.exe *e.g. by Windows task manager -> Show processes from all users -> select NIHardwareService.exe -> End process* + + - Deinstall the Traktor 3 software + - Stop the Windows service NIHardwareService.exe *e.g. by Windows task manager -> Show processes from all users -> select NIHardwareService.exe -> End process* Audio Setup ----------- From 2e2ebde855708dc1cd4cad039632972b79cd2561 Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Wed, 21 Oct 2020 01:16:07 +0200 Subject: [PATCH 24/42] Language and line breaks --- .../controllers/native_instruments_traktor_kontrol_z2.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index 23a1597cd9..4c1f9a8ddc 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -25,8 +25,9 @@ Since the Traktor Kontrol Z2 is a USB class compliant HID and audio device, the .. warning:: **NIHardwareService.exe** on Microsoft Windows - If you've a parallel installation of the National Instruments Traktor 3 software, there will be a Windows service :file:`C:\\Program Files\\Common Files\\Native Instruments\\Hardware\\NIHardwareService.exe` installed. It starts at system boot and takes over control of the LEDs of the Traktor Kontrol Z2. - The LEDs on the Traktor Kontrol Z2 will only reliable work with Mixxx, if you either: + If you've a parallel installation of the National Instruments Traktor 3 software, there will be a Windows service + :file:`C:\\Program Files\\Common Files\\Native Instruments\\Hardware\\NIHardwareService.exe` installed. + It starts at system boot and takes over control of the LEDs of the Traktor Kontrol Z2. The LEDs on the Traktor Kontrol Z2 will only reliable work with Mixxx, if you either: - Deinstall the Traktor 3 software - Stop the Windows service NIHardwareService.exe *e.g. by Windows task manager -> Show processes from all users -> select NIHardwareService.exe -> End process* @@ -52,8 +53,7 @@ Input Channels Assigned to 7-8 (Recording) Record/Broadcast ===================== ================ -The microphone an auxiliary inputs are mixed with each other in the hardware. -together in input channels 1-2, so Mixxx can record and broadcast them. +The microphone and auxiliary inputs are mixed with each other in the hardware together in input channels 1-2, so Mixxx can record and broadcast them. The knobs for :hwlabel:`MASTER`, :hwlabel:`BOOTH`, :hwlabel:`HP VOLUME` 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: From 9939836123c41f35b1e4c1fd114451675aa02782 Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Wed, 21 Oct 2020 01:18:46 +0200 Subject: [PATCH 25/42] Line breaks --- .../controllers/native_instruments_traktor_kontrol_z2.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index 4c1f9a8ddc..3ea4c1ec5b 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -26,8 +26,9 @@ Since the Traktor Kontrol Z2 is a USB class compliant HID and audio device, the **NIHardwareService.exe** on Microsoft Windows If you've a parallel installation of the National Instruments Traktor 3 software, there will be a Windows service - :file:`C:\\Program Files\\Common Files\\Native Instruments\\Hardware\\NIHardwareService.exe` installed. - It starts at system boot and takes over control of the LEDs of the Traktor Kontrol Z2. The LEDs on the Traktor Kontrol Z2 will only reliable work with Mixxx, if you either: + :file:`C:\\Program Files\\Common Files\\Native Instruments\\Hardware\\NIHardwareService.exe` + installed. It starts at system boot and takes over control of the LEDs of the Traktor Kontrol Z2. + The LEDs on the Traktor Kontrol Z2 will only reliable work with Mixxx, if you either: - Deinstall the Traktor 3 software - Stop the Windows service NIHardwareService.exe *e.g. by Windows task manager -> Show processes from all users -> select NIHardwareService.exe -> End process* From 62f51db38154a6be72e9e3cf856f6c5f1aecb0cb Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Wed, 21 Oct 2020 01:22:45 +0200 Subject: [PATCH 26/42] Line breaks --- .../controllers/native_instruments_traktor_kontrol_z2.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index 3ea4c1ec5b..256e10caeb 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -26,8 +26,11 @@ Since the Traktor Kontrol Z2 is a USB class compliant HID and audio device, the **NIHardwareService.exe** on Microsoft Windows If you've a parallel installation of the National Instruments Traktor 3 software, there will be a Windows service + :file:`C:\\Program Files\\Common Files\\Native Instruments\\Hardware\\NIHardwareService.exe` + installed. It starts at system boot and takes over control of the LEDs of the Traktor Kontrol Z2. + The LEDs on the Traktor Kontrol Z2 will only reliable work with Mixxx, if you either: - Deinstall the Traktor 3 software From b1d12c2a9d93357987e024c589813b0480ff20d9 Mon Sep 17 00:00:00 2001 From: JoergAtGithub <64457745+JoergAtGithub@users.noreply.github.com> Date: Tue, 10 Nov 2020 23:07:12 +0100 Subject: [PATCH 27/42] Update source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst Co-authored-by: Jan Holthuis --- .../native_instruments_traktor_kontrol_z2.rst | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index 256e10caeb..e3c0dae403 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -23,18 +23,8 @@ You can download the latest Windows & MacOS drivers and firmware from the `manuf Since the Traktor Kontrol Z2 is a USB class compliant HID and audio device, the device is plug-and-play on Linux. .. warning:: - **NIHardwareService.exe** on Microsoft Windows - - If you've a parallel installation of the National Instruments Traktor 3 software, there will be a Windows service - - :file:`C:\\Program Files\\Common Files\\Native Instruments\\Hardware\\NIHardwareService.exe` - - installed. It starts at system boot and takes over control of the LEDs of the Traktor Kontrol Z2. - - The LEDs on the Traktor Kontrol Z2 will only reliable work with Mixxx, if you either: - - - Deinstall the Traktor 3 software - - Stop the Windows service NIHardwareService.exe *e.g. by Windows task manager -> Show processes from all users -> select NIHardwareService.exe -> End process* + If you have a parallel installation of Traktor on Windows, there will be a :file:`NIHardwareService.exe` process that takes control of the Traktor Kontrol Z2's LEDs. + To make the them work reliable with Mixxx, you either need to uninstall the Traktor software or stop the process by opening the task manager and killing the :file:`NIHardwareService.exe` process. Audio Setup ----------- @@ -95,4 +85,4 @@ No. Control Functio Known Issues ------------ -- The two Traktor buttons on top are overruling the software. This can result in a state, where one channel of the hardware mixer is in external mixing mode, but Mixxx is expecting internal mixing mode. \ No newline at end of file +- The two Traktor buttons on top are overruling the software. This can result in a state, where one channel of the hardware mixer is in external mixing mode, but Mixxx is expecting internal mixing mode. From f426c2854780ca37dd1e5f76bd12c9e9c020d2d2 Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Tue, 10 Nov 2020 23:20:40 +0100 Subject: [PATCH 28/42] Code style failures --- .../controllers/native_instruments_traktor_kontrol_z2.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index e3c0dae403..acad32f130 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -6,8 +6,8 @@ Native Instruments Traktor Kontrol Z2 The Native Instruments Traktor Kontrol Z2 is a 2+2 channel USB :term:`HID` mixer/controller with an integrated audio interface. -It has two full channels and two further channels with limited controls. -The Traktor Z2 is intended for a DVS systems and is provided with Traktor Scratch MK2 :term:`timecode` Vinyls and CDs. +It has two full channels and two further channels with limited controls. +The Traktor Z2 is intended for a DVS systems and is provided with Traktor Scratch MK2 :term:`timecode` Vinyls and CDs. - `Manufacturer’s product page `__ - `Virtual DJ Hardware Page `__ @@ -24,9 +24,9 @@ Since the Traktor Kontrol Z2 is a USB class compliant HID and audio device, the .. warning:: If you have a parallel installation of Traktor on Windows, there will be a :file:`NIHardwareService.exe` process that takes control of the Traktor Kontrol Z2's LEDs. - To make the them work reliable with Mixxx, you either need to uninstall the Traktor software or stop the process by opening the task manager and killing the :file:`NIHardwareService.exe` process. + To make the them work reliable with Mixxx, you either need to uninstall the Traktor software or stop the process by opening the task manager and killing the :file:`NIHardwareService.exe` process. -Audio Setup + Audio Setup ----------- The mapping relies on the following channel assignments: From 1898378181f1988c153dfacdc148ab4855256cf4 Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Tue, 10 Nov 2020 23:34:38 +0100 Subject: [PATCH 29/42] Merged changes --- .../native_instruments_traktor_kontrol_z2.rst | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index acad32f130..0c8b041410 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -6,8 +6,8 @@ Native Instruments Traktor Kontrol Z2 The Native Instruments Traktor Kontrol Z2 is a 2+2 channel USB :term:`HID` mixer/controller with an integrated audio interface. -It has two full channels and two further channels with limited controls. -The Traktor Z2 is intended for a DVS systems and is provided with Traktor Scratch MK2 :term:`timecode` Vinyls and CDs. +It has two full channels and two further channels with limited controls +The Traktor Z2 is intended for a DVS systems and is provided with Traktor Scratch MK2 :term:`timecode` Vinyls and CDs. - `Manufacturer’s product page `__ - `Virtual DJ Hardware Page `__ @@ -23,8 +23,13 @@ You can download the latest Windows & MacOS drivers and firmware from the `manuf Since the Traktor Kontrol Z2 is a USB class compliant HID and audio device, the device is plug-and-play on Linux. .. warning:: - If you have a parallel installation of Traktor on Windows, there will be a :file:`NIHardwareService.exe` process that takes control of the Traktor Kontrol Z2's LEDs. - To make the them work reliable with Mixxx, you either need to uninstall the Traktor software or stop the process by opening the task manager and killing the :file:`NIHardwareService.exe` process. + **NIHardwareService.exe** on Microsoft Windows + If you've a parallel installation of the National Instruments Traktor 3 software, there will be a Windows service :file:`NIHardwareService.exe` installed. It starts at system boot and takes over control of the LEDs of the Traktor Kontrol Z2. + . + The LEDs on the Traktor Kontrol Z2 will only reliable work with Mixxx, if you either: + + - Deinstall the Traktor 3 software + - Stop the Windows service NIHardwareService.exe *e.g. by Windows task manager -> Show processes from all users -> select NIHardwareService.exe -> End process* Audio Setup ----------- @@ -85,4 +90,4 @@ No. Control Functio Known Issues ------------ -- The two Traktor buttons on top are overruling the software. This can result in a state, where one channel of the hardware mixer is in external mixing mode, but Mixxx is expecting internal mixing mode. +- The two Traktor buttons on top are overruling the software. This can result in a state, where one channel of the hardware mixer is in external mixing mode, but Mixxx is expecting internal mixing mode. \ No newline at end of file From 694f74ba20871ebc3beedccf56a533e5e016b012 Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Tue, 10 Nov 2020 23:38:42 +0100 Subject: [PATCH 30/42] Code style failures --- .../controllers/native_instruments_traktor_kontrol_z2.rst | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index 0c8b041410..74c6a8dd05 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -6,8 +6,8 @@ Native Instruments Traktor Kontrol Z2 The Native Instruments Traktor Kontrol Z2 is a 2+2 channel USB :term:`HID` mixer/controller with an integrated audio interface. -It has two full channels and two further channels with limited controls -The Traktor Z2 is intended for a DVS systems and is provided with Traktor Scratch MK2 :term:`timecode` Vinyls and CDs. +It has two full channels and two further channels with limited controls +The Traktor Z2 is intended for a DVS systems and is provided with Traktor Scratch MK2 :term:`timecode` Vinyls and CDs. - `Manufacturer’s product page `__ - `Virtual DJ Hardware Page `__ @@ -25,9 +25,8 @@ Since the Traktor Kontrol Z2 is a USB class compliant HID and audio device, the .. warning:: **NIHardwareService.exe** on Microsoft Windows If you've a parallel installation of the National Instruments Traktor 3 software, there will be a Windows service :file:`NIHardwareService.exe` installed. It starts at system boot and takes over control of the LEDs of the Traktor Kontrol Z2. - . + The LEDs on the Traktor Kontrol Z2 will only reliable work with Mixxx, if you either: - - Deinstall the Traktor 3 software - Stop the Windows service NIHardwareService.exe *e.g. by Windows task manager -> Show processes from all users -> select NIHardwareService.exe -> End process* From f380890beaa9b790c3142f0abdc057503026cf60 Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Tue, 10 Nov 2020 23:40:58 +0100 Subject: [PATCH 31/42] Code style failures --- .../controllers/native_instruments_traktor_kontrol_z2.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index 74c6a8dd05..4967b333ed 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -89,4 +89,5 @@ No. Control Functio Known Issues ------------ -- The two Traktor buttons on top are overruling the software. This can result in a state, where one channel of the hardware mixer is in external mixing mode, but Mixxx is expecting internal mixing mode. \ No newline at end of file +- The two Traktor buttons on top are overruling the software. This can result in a state, where one channel of the hardware mixer is in external mixing mode, but Mixxx is expecting internal mixing mode. + From 2bb628fafad1878e282d756b0da65624011a3528 Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Tue, 10 Nov 2020 23:42:56 +0100 Subject: [PATCH 32/42] Code style failures --- .../controllers/native_instruments_traktor_kontrol_z2.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index 4967b333ed..8e7011d24b 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -90,4 +90,3 @@ Known Issues ------------ - The two Traktor buttons on top are overruling the software. This can result in a state, where one channel of the hardware mixer is in external mixing mode, but Mixxx is expecting internal mixing mode. - From cb8e4572b4d6143e588d08be53a5122acdd6c8c3 Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Thu, 12 Nov 2020 21:28:51 +0100 Subject: [PATCH 33/42] Shorter text for box about NiHardwareService.exe --- .../native_instruments_traktor_kontrol_z2.rst | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index 8e7011d24b..5f42235f23 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -23,12 +23,9 @@ You can download the latest Windows & MacOS drivers and firmware from the `manuf Since the Traktor Kontrol Z2 is a USB class compliant HID and audio device, the device is plug-and-play on Linux. .. warning:: - **NIHardwareService.exe** on Microsoft Windows - If you've a parallel installation of the National Instruments Traktor 3 software, there will be a Windows service :file:`NIHardwareService.exe` installed. It starts at system boot and takes over control of the LEDs of the Traktor Kontrol Z2. - - The LEDs on the Traktor Kontrol Z2 will only reliable work with Mixxx, if you either: - - Deinstall the Traktor 3 software - - Stop the Windows service NIHardwareService.exe *e.g. by Windows task manager -> Show processes from all users -> select NIHardwareService.exe -> End process* + **Parallel installation of Traktor software on Windows** + If you have a parallel installation of Traktor on Windows, there will be a :file:`NIHardwareService.exe` process that takes control of the Traktor Kontrol Z2's LEDs. + To make the them work reliable with Mixxx, you either need to uninstall the Traktor software, or stop the process by opening the task manager, selecting :guilabel:`Show processes from all users` and kill the :file:`NIHardwareService.exe` process. Audio Setup ----------- From 956fa158577f6d19c39021ae6bec06deaf54e773 Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Thu, 12 Nov 2020 21:31:35 +0100 Subject: [PATCH 34/42] Code style failures --- .../controllers/native_instruments_traktor_kontrol_z2.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index 5f42235f23..07261f95de 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -25,7 +25,7 @@ Since the Traktor Kontrol Z2 is a USB class compliant HID and audio device, the .. warning:: **Parallel installation of Traktor software on Windows** If you have a parallel installation of Traktor on Windows, there will be a :file:`NIHardwareService.exe` process that takes control of the Traktor Kontrol Z2's LEDs. - To make the them work reliable with Mixxx, you either need to uninstall the Traktor software, or stop the process by opening the task manager, selecting :guilabel:`Show processes from all users` and kill the :file:`NIHardwareService.exe` process. + To make the them work reliable with Mixxx, you either need to uninstall the Traktor software, or stop the process by opening the task manager, selecting :guilabel:`Show processes from all users` and kill the :file:`NIHardwareService.exe` process. Audio Setup ----------- From 28f91eba8181e129571dc892bf94300fcb4b33ba Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Thu, 12 Nov 2020 21:34:20 +0100 Subject: [PATCH 35/42] Code style failures --- .../controllers/native_instruments_traktor_kontrol_z2.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index 07261f95de..593a36178d 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -27,7 +27,7 @@ Since the Traktor Kontrol Z2 is a USB class compliant HID and audio device, the If you have a parallel installation of Traktor on Windows, there will be a :file:`NIHardwareService.exe` process that takes control of the Traktor Kontrol Z2's LEDs. To make the them work reliable with Mixxx, you either need to uninstall the Traktor software, or stop the process by opening the task manager, selecting :guilabel:`Show processes from all users` and kill the :file:`NIHardwareService.exe` process. - Audio Setup +Audio Setup ----------- The mapping relies on the following channel assignments: From 12c281e01d762fc8245f89b0376509f7366ad26e Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Fri, 15 Jan 2021 22:20:33 +0100 Subject: [PATCH 36/42] Explained the states of the Shift button --- .../native_instruments_traktor_kontrol_z2.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index 593a36178d..4f869cc09d 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -65,6 +65,16 @@ Controller Mapping The control numbering in the schematic drawings matches the those found on the specified page in the Manual. +Shift button states +~~~~~~~~~~~~~~~~~~~ + +============================== ================ ==================================================== +Shift button state Shift button LED Action +============================== ================ ==================================================== +unshifted Off +:hwlabel:`SHIFT` hold Bright Press and hold :hwlabel:`SHIFT` +:hwlabel:`SHIFT` locked Dimmed Short click on :hwlabel:`SHIFT` to toggle lock state +============================== ================ ==================================================== Browse Section ~~~~~~~~~~~~~~ From 7c0d354ad87c4bcb10e9ab49e0dbb0b7d952bb8d Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Sat, 6 Feb 2021 12:25:30 +0100 Subject: [PATCH 37/42] Described the mixer modes of the Z2 and the use of the Traktor buttons per channel --- .../native_instruments_traktor_kontrol_z2.rst | 37 ++++++++++++------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index 4f869cc09d..3c37ec75d3 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -59,11 +59,28 @@ Hence, turning the knobs will not change values in the Mixxx :term:`GUI` and you .. note:: You should assign the :guilabel:`Vinyl Control` input channels even if you do not intend to use timecode vinyl. -Controller Mapping ------------------- +Controls +-------- -The control numbering in the schematic drawings matches the those found on the -specified page in the Manual. +Mixer mode (Computer Internal vs. Direct mixer hardware) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +The Traktor Z2 allows not only mixing using the mixer hardware directly, but also mixing internal in the software of the connected computer. + +Unique to the Traktor Z2 is, that the mixer mode can be switched per channel. This allows the user to connect another computer and starting Mixxx, while playing a track from an analog source in direct mode, and than blend over seamless to another channel in Internal mixing mode controlled by Mixxx. + +The mixing mode of ChA and ChB is controlled by the two Traktor buttons on top: + +====================================== ================== ====================================== ==================================================== +Traktor button state Traktor button LED Action Behavior + +====================================== ================== ====================================== ==================================================== +Direct hardware mixing Off Press button to toggle Only Gain, EQ, Filter and Fader of channel operation (works without computer) +Computer Internal mixing (Passthrough) Dimmed :hwlabel:`SHIFT` hold + Traktor button Mixxx mixes the signal, but the channel is set to Passthrough . Similar to direct mode, but allows the use of features like software effects. +Computer Internal mixing Bright Press button to toggle Mixxx plays the track and mixes the signal internally. +====================================== ================== ====================================== ==================================================== + +.. note:: + Note, the selection of the mixing mode is a hardware function overruling the software. Only if all channels are switched to computer Internal mixing, you've all features of Mixxx available! Shift button states ~~~~~~~~~~~~~~~~~~~ @@ -71,9 +88,9 @@ Shift button states ============================== ================ ==================================================== Shift button state Shift button LED Action ============================== ================ ==================================================== -unshifted Off -:hwlabel:`SHIFT` hold Bright Press and hold :hwlabel:`SHIFT` -:hwlabel:`SHIFT` locked Dimmed Short click on :hwlabel:`SHIFT` to toggle lock state +Unshifted Off +Shift hold Bright Press and hold :hwlabel:`SHIFT` +Shift locked Dimmed Short click on :hwlabel:`SHIFT` to toggle lock state ============================== ================ ==================================================== Browse Section @@ -91,9 +108,3 @@ No. Control Functio 5 Rotary Selector Turn to move tracklist cursor up/down. Press to toggle the selected item. 6 :hwlabel:`SHIFT` + Rotary Selector Turn to move sidebar cursor left right/down. ======== ============================================================= ========================================== - - -Known Issues ------------- - -- The two Traktor buttons on top are overruling the software. This can result in a state, where one channel of the hardware mixer is in external mixing mode, but Mixxx is expecting internal mixing mode. From 36e1a2ac738bf1e51d59bb1bf69aea02010e9c9d Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Sat, 6 Feb 2021 13:26:51 +0100 Subject: [PATCH 38/42] Link fix and better wording --- .../controllers/native_instruments_traktor_kontrol_z2.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index 3c37ec75d3..ab3ac36dfb 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -68,19 +68,19 @@ The Traktor Z2 allows not only mixing using the mixer hardware directly, but als Unique to the Traktor Z2 is, that the mixer mode can be switched per channel. This allows the user to connect another computer and starting Mixxx, while playing a track from an analog source in direct mode, and than blend over seamless to another channel in Internal mixing mode controlled by Mixxx. -The mixing mode of ChA and ChB is controlled by the two Traktor buttons on top: +The mixing mode of channel A and B is controlled by the two Traktor buttons on top: ====================================== ================== ====================================== ==================================================== Traktor button state Traktor button LED Action Behavior ====================================== ================== ====================================== ==================================================== Direct hardware mixing Off Press button to toggle Only Gain, EQ, Filter and Fader of channel operation (works without computer) -Computer Internal mixing (Passthrough) Dimmed :hwlabel:`SHIFT` hold + Traktor button Mixxx mixes the signal, but the channel is set to Passthrough . Similar to direct mode, but allows the use of features like software effects. +Computer Internal mixing (Passthrough) Dimmed :hwlabel:`SHIFT` hold + Traktor button Mixxx mixes the signal, but the channel is set to :ref:`Passthrough'. Similar to direct mode, but allows the use of features like software effects. Computer Internal mixing Bright Press button to toggle Mixxx plays the track and mixes the signal internally. ====================================== ================== ====================================== ==================================================== .. note:: - Note, the selection of the mixing mode is a hardware function overruling the software. Only if all channels are switched to computer Internal mixing, you've all features of Mixxx available! + The selection of the mixing mode is a hardware function overruling the software. Only if all channels are switched to computer Internal mixing, you've all features of Mixxx available! Shift button states ~~~~~~~~~~~~~~~~~~~ From 72115b6a033c2732b86a4e06889f86aaa5752159 Mon Sep 17 00:00:00 2001 From: JoergAtGithub <64457745+JoergAtGithub@users.noreply.github.com> Date: Sat, 6 Feb 2021 13:31:23 +0100 Subject: [PATCH 39/42] Update source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst Co-authored-by: Jan Holthuis --- .../controllers/native_instruments_traktor_kontrol_z2.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index ab3ac36dfb..a0dbefff67 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -75,7 +75,7 @@ Traktor button state Traktor button LED Action ====================================== ================== ====================================== ==================================================== Direct hardware mixing Off Press button to toggle Only Gain, EQ, Filter and Fader of channel operation (works without computer) -Computer Internal mixing (Passthrough) Dimmed :hwlabel:`SHIFT` hold + Traktor button Mixxx mixes the signal, but the channel is set to :ref:`Passthrough'. Similar to direct mode, but allows the use of features like software effects. +Computer Internal mixing (Passthrough) Dimmed :hwlabel:`SHIFT` hold + Traktor button Mixxx mixes the signal, but the channel is set to :ref:`Passthrough `. Similar to direct mode, but allows the use of features like software effects. Computer Internal mixing Bright Press button to toggle Mixxx plays the track and mixes the signal internally. ====================================== ================== ====================================== ==================================================== From d3855d2d24fdc4ddb072238e25dde44eec514b0e Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Sat, 6 Feb 2021 13:54:50 +0100 Subject: [PATCH 40/42] Link fix by setting new label --- source/chapters/user_interface.rst | 2 ++ .../native_instruments_traktor_kontrol_z2.rst | 16 ++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/source/chapters/user_interface.rst b/source/chapters/user_interface.rst index a58b1993fc..a2ae2c2712 100644 --- a/source/chapters/user_interface.rst +++ b/source/chapters/user_interface.rst @@ -513,6 +513,8 @@ section. This button enables :term:`vinyl control`. When enabled in Mixxx, the track on the Mixxx deck is controlled by the external vinyl control. +.. _interface-passthrough: + **Pass button** This button enables passthrough. When enabled, audio from an external vinyl diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index a0dbefff67..d082e209a0 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -68,16 +68,16 @@ The Traktor Z2 allows not only mixing using the mixer hardware directly, but als Unique to the Traktor Z2 is, that the mixer mode can be switched per channel. This allows the user to connect another computer and starting Mixxx, while playing a track from an analog source in direct mode, and than blend over seamless to another channel in Internal mixing mode controlled by Mixxx. -The mixing mode of channel A and B is controlled by the two Traktor buttons on top: +The mixing mode of channel A and B is controlled by the two buttons with the Traktor symbol on top: -====================================== ================== ====================================== ==================================================== -Traktor button state Traktor button LED Action Behavior +====================================== ================== ========================================== ==================================================== +Traktor button state Traktor button LED Action Behavior -====================================== ================== ====================================== ==================================================== -Direct hardware mixing Off Press button to toggle Only Gain, EQ, Filter and Fader of channel operation (works without computer) -Computer Internal mixing (Passthrough) Dimmed :hwlabel:`SHIFT` hold + Traktor button Mixxx mixes the signal, but the channel is set to :ref:`Passthrough `. Similar to direct mode, but allows the use of features like software effects. -Computer Internal mixing Bright Press button to toggle Mixxx plays the track and mixes the signal internally. -====================================== ================== ====================================== ==================================================== +====================================== ================== ========================================== ==================================================== +Direct hardware mixing Off Press :hwlabel:`Traktor` to toggle Only Gain, EQ, Filter and Fader of channel operation (works without computer) +Computer Internal mixing (Passthrough) Dimmed :hwlabel:`SHIFT` hold + :hwlabel:`Traktor` Mixxx mixes the signal, but the channel is set to :ref:`Passthrough `. Similar to direct mode, but allows the use of features like software effects. +Computer Internal mixing Bright Press :hwlabel:`Traktor` to toggle Mixxx plays the track and mixes the signal internally. +====================================== ================== ========================================== ==================================================== .. note:: The selection of the mixing mode is a hardware function overruling the software. Only if all channels are switched to computer Internal mixing, you've all features of Mixxx available! From 9b7d3676c802873557ff1dfb216a1b04461d2dea Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Fri, 22 Oct 2021 21:13:56 +0200 Subject: [PATCH 41/42] Added schematic drawing of the Z2 controls provided by Mr. Rincewind (Russe) --- .../native_instruments_traktor_kontrol_z2.svg | 4017 +++++++++++++++++ .../native_instruments_traktor_kontrol_z2.rst | 7 + 2 files changed, 4024 insertions(+) create mode 100644 source/_static/controllers/native_instruments_traktor_kontrol_z2.svg diff --git a/source/_static/controllers/native_instruments_traktor_kontrol_z2.svg b/source/_static/controllers/native_instruments_traktor_kontrol_z2.svg new file mode 100644 index 0000000000..e5ec6d3b8d --- /dev/null +++ b/source/_static/controllers/native_instruments_traktor_kontrol_z2.svg @@ -0,0 +1,4017 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Circle Balloon + + + + + + + + + Dream Speaking + + + + + + + + + Rounded Balloon + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + TRAKTOR KONTROL Z2 + + + + + + + + + + + + + + + + + + + 1 + + 2 + + 3 + + 4 + + + FLUX + + + + ON + + + + C + A + + + + + + + + + + + + + + + 1 + + 2 + + 3 + + 4 + + + FLUX + + + + ON + + + + B + D + + + + + + + + + + + + + + + + + SHIFT + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A + + + + A + + + + A + + + + B + + + + B + + + + B + + + + + A + + + + B + + + + + + + + + + + + + + + + + + + 2 + + + + 1 + + + + + + 2 + + + + 1 + + + + + S + + + + Q + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A + C + MST + D + B + + XF REVERSE + + + ! + + + + + + 1 + 3 + 2 + 12 + 21 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 20 + 37 + 22 + 23 + 24 + 28 + 29 + 30 + 31 + 32 + 33 + 34 + 35 + 36 + 38 + 39 + 25 + 26 + 27 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index d082e209a0..e454de5747 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -62,6 +62,13 @@ Hence, turning the knobs will not change values in the Mixxx :term:`GUI` and you Controls -------- +.. figure:: ../../_static/controllers/native_instruments_traktor_kontrol_z2.svg + :align: center + :width: 100% + :figwidth: 100% + :alt: Native Instruments Traktor Z2 (schematic view) + :figclass: pretty-figures + Mixer mode (Computer Internal vs. Direct mixer hardware) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The Traktor Z2 allows not only mixing using the mixer hardware directly, but also mixing internal in the software of the connected computer. From c71fd115fca927455751c6e9c29a495007a0cb20 Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Fri, 5 Nov 2021 21:28:16 +0100 Subject: [PATCH 42/42] Added Z2 audio routing schematic Changed default channel assignment for Mic/Aux to Auxiliary 1, which makes more sense. --- .../native_instruments_traktor_kontrol_z2.svg | 4019 +---------------- ...ments_traktor_kontrol_z2_audio_routing.svg | 1410 ++++++ .../native_instruments_traktor_kontrol_z2.rst | 11 +- 3 files changed, 1421 insertions(+), 4019 deletions(-) create mode 100644 source/_static/controllers/native_instruments_traktor_kontrol_z2_audio_routing.svg diff --git a/source/_static/controllers/native_instruments_traktor_kontrol_z2.svg b/source/_static/controllers/native_instruments_traktor_kontrol_z2.svg index e5ec6d3b8d..69a6c43f06 100644 --- a/source/_static/controllers/native_instruments_traktor_kontrol_z2.svg +++ b/source/_static/controllers/native_instruments_traktor_kontrol_z2.svg @@ -1,4017 +1,2 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Circle Balloon - - - - - - - - - Dream Speaking - - - - - - - - - Rounded Balloon - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - TRAKTOR KONTROL Z2 - - - - - - - - - - - - - - - - - - - 1 - - 2 - - 3 - - 4 - - - FLUX - - - - ON - - - - C - A - - - - - - - - - - - - - - - 1 - - 2 - - 3 - - 4 - - - FLUX - - - - ON - - - - B - D - - - - - - - - - - - - - - - - - SHIFT - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A - - - - A - - - - A - - - - B - - - - B - - - - B - - - - - A - - - - B - - - - - - - - - - - - - - - - - - - 2 - - - - 1 - - - - - - 2 - - - - 1 - - - - - S - - - - Q - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A - C - MST - D - B - - XF REVERSE - - - ! - - - - - - 1 - 3 - 2 - 12 - 21 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 13 - 14 - 15 - 16 - 17 - 18 - 19 - 20 - 37 - 22 - 23 - 24 - 28 - 29 - 30 - 31 - 32 - 33 - 34 - 35 - 36 - 38 - 39 - 25 - 26 - 27 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +TRAKTOR KONTROL Z21234FLUXONCA1234FLUXONBDSHIFTAAABBBAB2121SQACMSTDBXF REVERSE!132122145678910111314151617181920372223242829303132333435363839252627 diff --git a/source/_static/controllers/native_instruments_traktor_kontrol_z2_audio_routing.svg b/source/_static/controllers/native_instruments_traktor_kontrol_z2_audio_routing.svg new file mode 100644 index 0000000000..322c3a4dcd --- /dev/null +++ b/source/_static/controllers/native_instruments_traktor_kontrol_z2_audio_routing.svg @@ -0,0 +1,1410 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A + + + + + + D + + + + + + + + + + + + + + + + + + + + + D + + + + + + A + + + + + + + + + + + + + + + + + + + + + A + + + + + + D + + + + + + + + + + + + + + + + + + + + + A + + + + + + D + + + + + + + + + Gain + + + + + + + + EQ + + + + + + + + Gain + + + + + + + + EQ + + + + + + + + LF + + + + + + + + Gain + + + + + + + + EQ + + + + + + + + LF + + + + + + + + CF + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Output Ch 1/2 + + + + + + + + + + + + + Main + + + + + + Input Ch1/2 + + + + + + Input Ch 3/4 + + + + + + Input Ch 5/6 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Head-phone + + + + + + + + + + + + + Input Ch 7/8 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Output Ch 3/4 + + + + + + + + Mixxx + + + + + + A + + + + + + Ph + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Ln + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Ph + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Ln + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + B + + + + + + Mic + + + + + + Mic/Aux + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Aux + + + + + + + + + + + + + + + + + + + Mono + + + + + + Stereo + + + + + + Booth + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SHIFT + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A + + + + + + B + + + + + + + + MasterGain + + + + + + + + + + + + + + + BoothGain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A + + + + + + + + + + + + + + + + + + + + B + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + If a channel is in Internal Mixing mode, there is no signal on it‘s orange section + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst index e454de5747..c6e5dc02be 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_z2.rst @@ -30,6 +30,13 @@ Since the Traktor Kontrol Z2 is a USB class compliant HID and audio device, the Audio Setup ----------- +.. figure:: ../../_static/controllers/native_instruments_traktor_kontrol_z2_audio_routing.svg + :align: center + :width: 100% + :figwidth: 100% + :alt: Native Instruments Traktor Z2 (schematic view) + :figclass: pretty-figures + The mapping relies on the following channel assignments: ===================== ================ @@ -42,13 +49,13 @@ Output Channels Assigned to ===================== ================ Input Channels Assigned to ===================== ================ -1-2 (Mic/Aux) Microphone 1 +1-2 (Mic/Aux) Auxiliary 1 3-4 (CH 1 Line/Phono) Vinyl Control 1 5-6 (CH 2 Line/Phono) Vinyl Control 2 7-8 (Recording) Record/Broadcast ===================== ================ -The microphone and auxiliary inputs are mixed with each other in the hardware together in input channels 1-2, so Mixxx can record and broadcast them. +The mono microphone input and the stereo auxiliary input are mixed with each other in the hardware together in input channels 1-2, so Mixxx can record and broadcast them. The knobs for :hwlabel:`MASTER`, :hwlabel:`BOOTH`, :hwlabel:`HP VOLUME` 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: