Merge pull request #625 from ronso0/preview-play-toggle

LoadSelectedTrackAndPlay: describe special behaviour for preview decks
mixxxdj · Mar 5, 2024 · 8098789 · 8098789
2 parents 8a59d16 + 2cdb8ba
commit 8098789
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/source/_static/Mixxx-240-Keyboard-Mapping.png b/source/_static/Mixxx-240-Keyboard-Mapping.png
diff --git a/source/_static/Mixxx-250-Keyboard-Mapping.png b/source/_static/Mixxx-250-Keyboard-Mapping.png
diff --git a/source/_templates/keyboard_mapping_sheet.svg b/source/_templates/keyboard_mapping_sheet.svg
diff --git a/source/chapters/appendix/mixxx_controls.rst b/source/chapters/appendix/mixxx_controls.rst
@@ -1604,7 +1604,9 @@ Any control listed above for :mixxx:cogroupref:`[ChannelN]` will work for a samp
                    [PreviewDeckN],LoadSelectedTrackAndPlay
                    [SamplerN],LoadSelectedTrackAndPlay
 
-   Loads the currently highlighted track into the deck and starts playing
+   Loads the currently highlighted track into the deck and starts playing.
+
+   If the player is a preview deck and the selected track is already loaded, toggle play/pause.
 
    :range: binary
    :feedback: Track name & waveform change & Play/pause button

diff --git a/source/chapters/controlling_mixxx.rst b/source/chapters/controlling_mixxx.rst
@@ -59,7 +59,7 @@ Using a Keyboard
 
    Mixxx Keyboard shortcuts (for en-us keyboard layout)
 
-   :download:`Download the image <../_static/Mixxx-240-Keyboard-Mapping.png>`
+   :download:`Download the image <../_static/Mixxx-250-Keyboard-Mapping.png>`
 
 Controlling Mixxx with a keyboard is handy. Unlike mouse control, the keyboard
 allows you to manage things simultaneously. For example, you can start playing