Update documentation for updated Numark Mixtrack Pro mapping

source/hardware/controllers/numark_mixtrack_pro.rst

@@ -28,65 +28,89 @@ Mapping Description
 4.  **CHANNEL BASS:** Adjusts the low (bass) frequencies of the corresponding channel.
 5.  **CUE:** Sends pre-fader audio to the Cue Channel for headphone monitoring.
 6.  **CUE GAIN:** Adjusts the audio level of the Cue channel.
-7.  **CUE MIX:** Turn to mix between Cue and Program in the Headphone channel. When all the way to the left, only channels routed to CUE will be heard. When all the way right, only the Program mix
+7.  **CUE MIX:** Turn to mix between Cue and Program in the Headphone channel. When all the way to the left, only channels routed to Cue will be heard. When all the way right, only the Program mix
     will be heard.
 8.  **BROWSE KNOB:** Turn this knob to scroll through lists of tracks / library. When a file is selected, press the knob to load the currently highlighted song into the first stopped deck.
-9.  **BACK:** This button will switch the Browse Knob to scroll into the track list (FILE LED will illuminate) or into the library section (FOLDER LED will illuminate).
-10. **LOAD A / LOAD B:** Press one of these buttons while a track is selected to assign it to Deck A or Deck B, respectively.
-    **\*Only if the track is paused. Put the pitch in 0% at load**\ *(without mattering where the slider is)*.
+9.  **BACK:** This button will switch the Browse Knob to scroll into the track list (File LED will illuminate) or into the library section (Folder LED will illuminate).
+10. **LOAD A/B:** When a deck is paused and a track is selected, press one of these buttons to load the selected track into the respective deck.
+
+    * *Note:* The pitch is set to 0% at load.
+
 11. **CHANNEL FADER:** Adjusts the audio level on the corresponding channel.
 12. **MASTER FADER:** Adjusts the output volume of the Program mix.
 13. **CROSSFADER:** Blends audio playing between Decks A and B. Sliding this to the left plays Deck A and sliding to the right plays Deck B.
-14. **JOG WHEEL:** When the deck is playing, the JOG WHEEL will bend the track’s pitch. When the SCRATCH button is on, touching the top of the JOG WHEEL will scratch the selected track **(can do
-    backspin effect)**, and touching the border of the JOG WHEEL will bend the track’s pitch. When the deck is not playing, rotating the JOG WHEEL will scan through the track.
-15. **SCRATCH:** Turns Scratch Mode on or off. If Scratch Mode is on, the button will light up and the JOG WHEEL will scratch like a turntable when you spin it.
-16. **PLAY / PAUSE:** Starts or resumes playback if the Deck is paused. Pauses playback if the Deck is playing. LED ON when playing. LED OFF when stopped.
-17. **STUTTER:** Adjust BeatGrid in the correct place (useful to sync well).
-    **\*LED Blink at each Beat**\ *of the grid.*
-18. **CUE:** The CUE button will return and pause the track at the last set cue point. For temporary play of the cue point, you can hold down the CUE button. The track will play for as long as the
-    button is held down and will return to the cue point once it has been released (Until it has been pressed PLAY before release CUE, then playback will continue). LED ON when stopped. LED OFF when
-    playing.
-    **\*LED Blink at each Beat in the last 30 seconds of song.
-    \*Don’t set Cue accidentally at the end of the song (return to the latest cue).**
-19. **SYNC:** Automatically matches the corresponding Deck’s tempo and phase with the other Deck.
-    **\*If the other deck is stopped, only sync tempo (not phase).
-    \*LED Blink at Clip Gain**\ *(Peak indicator).
-    *\ **\*Pressing DELETE**\ *before SYNC: Set Pitch to 0%.*
+14. **JOG WHEEL:** When the deck is playing, the Jog Wheel will bend the track’s pitch. When the Scratch button is on, touching the top of the Jog Wheel will scratch the selected track **(can do
+    backspin effect)**, and touching the border of the Jog Wheel will bend the track’s pitch. When the deck is not playing, rotating the Jog Wheel will scan through the track.
+15. **SCRATCH:** Turns Scratch Mode on or off. If Scratch Mode is on, the button will light up and the Jog Wheel will scratch like a turntable when you spin it.
+16. **PLAY/PAUSE:** Starts or resumes playback if the Deck is paused. Pauses playback if the Deck is playing. LED is on when playing and off when stopped.
+
+    * **Delete + PLAY/PAUSE:** Start/stop playback with a vinyl speed-up/slow-down effect
+
+17. **STUTTER:** Adjust BeatGrid in the correct place (useful to sync well). The Stutter button will blink once per beat.
+18. **CUE:** Sets and navigates the track to a Cue point. Behavior emulates popular CDJs and depends on whether the relevant deck is currently playing:
+
+    * While paused:
+
+        * Press and release the Cue button to set the Cue point.
+        * Press and hold the Cue button to temporarily play the track from the last Cue point. When the button is released, playback will stop; or, while holding the Cue button, press the Play button to continue playback.
+
+    * While playing:
+
+        * Press and release the Cue button to return the track to the last set Cue point and pause.
+
+    * *Note:* The Cue button will blink once per beat during the last 30 seconds of the song.
+    * *Note:* If Cue is pressed at the end of the song, no cue will be set; instead, you will return to the most recent cue.
+    * **Delete + CUE:** Start playback from the beginning of the track
+
+19. **SYNC:** Automatically matches the corresponding Deck’s tempo and phase with the other Deck. If the other deck is stopped, only sync tempo (not phase). The Sync button lights up when the track is clipping.
+
+    * **Delete + SYNC:** Restore original song tempo
+
 20. **PITCH FADER:** Controls the track’s playback speed. An LED next to the fader will light up when set at 0%.
     **\* Pitch slide are inverted, to match with the screen**\ *(Up: +, Down: -, otherwise is very confusing).
     *\ **\* Soft-takeover to prevent sudden wide parameter changes**\ *when the on-screen control diverges from a hardware control. The control will have no effect until the position is close to that
     of the software, at which point it will take over and operate as usual.*
-21. **PITCH BEND ( + / – ):** Press or hold down either of these buttons to temporarily adjust the track’s playback speed. When released, the track playback will return to the speed designated by the
-    PITCH FADER.
+21. **PITCH BEND (+/–):** Press to increase or decrease the song pitch by one semitone without affecting the set tempo. Press both buttons together to reset to the original song pitch.
 22. **KEYLOCK:** This feature allows you to change the speed of the song without changing the key.
-23. **HOT CUE BUTTONS (1-3):** Assigns a Cue Point or returns the track to that Cue Point. When a HOT CUE BUTTON is unlit, you can assign a Cue Point by pressing it at the desired point in your track.
-    Once it is assigned, the HOT CUE BUTTON will light. To return to that Cue Point, simply press it.
-    **\*Pressing DELETE** before HOT CUE: Clear Hotcue.
-24. **DELETE:** Press this to enable second functions to some buttons (LED on). On having pressed another button, it is deactivated and LED turn off. Combinations:
-    **Delete + EFFECT:** Brake Effect (maintain pressed). Flanger Delay (Left. EFFECT CONTROL): Adjust the speed of Brake.
-    **Delete + HOTCUE:** Clear Hotcue.
-    **Delete + RELOOP:** Clear Loop.
-    **Delete + MANUAL:** Set Quantize ON (for best manual loop) or OFF.
-    **Delete + SYNC:** Set Pitch to 0%.
-25. **EFFECT:** Activate / deactivate Flanger. SELECT modify the Depth and LEFT. EFFECT CONTROL change the Delay.
-    **\*Pressing DELETE** before EFFECT: Brake (maintain pressed). Adjust Speed with Flanger Delay (Left. EFFECT CONTROL).
-26. **EFFECT SELECT:** Modify the Depth of Flanger effect, which will be displayed in the software.
-27. **LEFT EFFECT CONTROL:** Modify the Depth of Flanger effect, which will be displayed in the software.
-    **\*Used for change the speed of Brake effect too.
-    RIGHT EFFECT CONTROL:** Gain control of the deck (up to clip).
+23. **HOT CUE BUTTONS (1-3):** Assigns a Hot Cue point or returns the track to that Hot Cue point. When a Hot Cue button is unlit, you can assign a Hot Cue point by pressing it at the desired point in your track. Once it is assigned, the Hot Cue Button will light. To return to that Hot Cue point, simply press it.
+
+    * **Delete + HOT CUE:** Clear Hotcue.
+
+24. **DELETE:** Press this to enable additional functions on other controls. You can hold Delete while pressing the second key; or you can press Delete first, followed by the second key.
+
+    * **Delete + PLAY/PAUSE:** (16) Start/stop playback with a vinyl speed-up/slow-down effect
+    * **Delete + CUE:** (18) Start playback from the beginning of the track
+    * **Delete + SYNC:** (19) Restore original song tempo
+    * **Delete + HOT CUE:** (23) Clear Hotcue
+    * **Delete + MODE:** (28) Set Quantize ON (for best manual loop) or OFF
+
+25. **EFFECT:** Press to toggle *Effect Mode*, which changes the behavior of the knob to the left (26).
+26. **JUMP:** Turn the knob to jump forward or backward a certain number of beats, in time with the music. Press and turn the knob to set the number of beats to jump. Push and release the knob to reset to a 4-beat jump.
+
+    * (*Effect Mode*) **SELECT/ENABLE EFFECT:** Turn the knob to focus an effects slot. Press and turn the knob to switch the effect in the focused slot. Push and release the knob to enable/disable the effect in the focused slot.
+
+27.
+    * **LEFT CONTROL:** Turn to adjust the Meta knob of the first or focused effect.
+    * **RIGHT CONTROL:** Gain control of the deck (up to clip).
 28. **MODE:** Press this to switch between Autoloop Mode and Manual Mode, which changes the functions of the LOOP CONTROL buttons.
-    **\*Pressing DELETE** before MODE: Set Quantize ON (for best manual loop), or OFF.
-    **Autoloop Mode (LED ON)**:
-    • 1/2 X: Press this to halve the length of the loop.
-    • 1 BAR: Press this to set a 4 beat loop automatically and enable it (LED ON). **Press again to exit loop**.
-    • 2 X: Press this to double the length of the loop.
-    **Manual Mode (LED OFF)**:
-    • IN: Press this to set a “Loop In” point where your loop will begin (LED ON).
-    • OUT: Press this to set a “Loop Out” point where your loop will end, and enable it (LED ON).
-    • RELOOP: If the Deck is already looping when you press it (LED ON), exit loop. If not, jump to the start of the loop and enable it. (If no loop is set, nothing will happen.)
-    **\*Pressing DELETE** before RELOOP: Clear Loop.
-29. **OUTPUT 1** (RCA): This stereo RCA connection will output the Master Mix from your computer. Please use a stereo RCA cable to connect this output to a powered speaker or amplifier system.
-30. **OUTPUT 2** (RCA): This stereo RCA connection will output the Cue Channel from your computer for monitoring purposes. Please note that the Cue Channel is also output through the HEADPHONES output
+
+
+    * **Autoloop Mode (LED ON):**
+
+        * **1/2 X**: Press this to halve the length of the loop.
+        * **1 BAR**: Press this to set a 4 beat loop automatically and enable it (LED ON). **Press again to exit loop**.
+        * **2 X**: Press this to double the length of the loop.
+
+    * **Manual Mode (LED OFF):**
+
+        * **IN:** Press this to set a “Loop In” point where your loop will begin (LED ON).
+        * **OUT:** Press this to set a “Loop Out” point where your loop will end, and enable it (LED ON).
+        * **RELOOP:** If the Deck is already looping when you press it (LED ON), exit loop. If not, jump to the start of the loop and enable it. (If no loop is set, nothing will happen.)
+
+    * **Delete + MODE:** Set Quantize ON (for best manual loop) or OFF
+
+29. **OUTPUT 1 (RCA):** This stereo RCA connection will output the Master Mix from your computer. Please use a stereo RCA cable to connect this output to a powered speaker or amplifier system.
+30. **OUTPUT 2 (RCA):** This stereo RCA connection will output the Cue Channel from your computer for monitoring purposes. Please note that the Cue Channel is also output through the HEADPHONES output
     on the front panel.
 31. **HEADPHONES:** This stereo 1/4" output will output the signal being routed to the Cue Channel.
 32. **MIC GAIN:** This knob controls the microphone level being sent to the Master Mix.