From 21ad1b88755397e2b7c18f180a48f84f070273ca Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Sun, 25 Oct 2020 22:34:50 +0100 Subject: [PATCH 1/4] rstcheck: Ignore hwlabel rule --- .rstcheck.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/.rstcheck.cfg b/.rstcheck.cfg index 09b011dd8a..bec6cba868 100644 --- a/.rstcheck.cfg +++ b/.rstcheck.cfg @@ -1,3 +1,4 @@ [rstcheck] +ignore_roles=hwlabel ignore_messages=(Undefined substitution referenced: "version")\.$ report=warning From 37df81c91924b491100046ed71c2b66fd2a501fd Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Sun, 25 Oct 2020 22:35:21 +0100 Subject: [PATCH 2/4] Hercules DJControl Jogvision: Fix whitespace errors --- .../controllers/hercules_djcontrol_jogvision.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/source/hardware/controllers/hercules_djcontrol_jogvision.rst b/source/hardware/controllers/hercules_djcontrol_jogvision.rst index c97d54ce44..550bb759a9 100644 --- a/source/hardware/controllers/hercules_djcontrol_jogvision.rst +++ b/source/hardware/controllers/hercules_djcontrol_jogvision.rst @@ -4,7 +4,7 @@ Hercules DJControl Jogvision - `Manufacturer's product page `__ - `Manufacturer's support and downloads page `__ - `Forum thread `__ - + Whether you’re just getting started DJing or you’ve already refined your skills, you can let your creativity run wild. Enjoy excellent precision and comfort to create your mixes using the circular displays on the jog wheels to guide your movements and perfect your scratches, and have fun with the amazing contactless AIR Control sensor. @@ -34,11 +34,11 @@ Microphone Input 6.35mm jack Auxiliary Input 3.5mm jack ================ =================== -- Open :menuselection:`Preferences --> Sound Hardware` -- Select the :guilabel:`Output` tab -- From the :guilabel:`Master` drop-down menu, select the audio interface, then :guilabel:`Channels 1-2` -- From the :guilabel:`Headphones` drop-down menu, select the audio interface, then :guilabel:`Channels 3-4` -- Click :guilabel:`Apply` to save the changes. +- Open :menuselection:`Preferences --> Sound Hardware` +- Select the :guilabel:`Output` tab +- From the :guilabel:`Master` drop-down menu, select the audio interface, then :guilabel:`Channels 1-2` +- From the :guilabel:`Headphones` drop-down menu, select the audio interface, then :guilabel:`Channels 3-4` +- Click :guilabel:`Apply` to save the changes. Please refer to the user manual for more details about the audio configuration in Mixxx. @@ -46,11 +46,11 @@ Please refer to the user manual for more details about the audio configuration i The :hwlabel:`MASTER` and :hwlabel:`HEADPHONE` knobs, as well as the :hwlabel:`MASTER` button are hardware controls and interact directly with the integrated sound card’s output. - + Mapping configuration ~~~~~~~~~~~~~~~~~~~~~ -Edit the :file:`Hercules_DJControl_Jogvision-scripts.js`, and change the ``CFG.(user|fine)`` variables to fit your needs: +Edit the :file:`Hercules_DJControl_Jogvision-scripts.js`, and change the ``CFG.(user|fine)`` variables to fit your needs: .. hint:: This controller mapping can be customized by editing the corresponding Javascript file and editing the configuration options at the top of the file. From 59e130b3f8e3e79fbf55f5dbd7219d5af00585f0 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Sun, 25 Oct 2020 22:37:02 +0100 Subject: [PATCH 3/4] soruce: Fix typos found by codespell --- source/chapters/library.rst | 2 +- source/hardware/controllers/hercules_djcontrol_jogvision.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/chapters/library.rst b/source/chapters/library.rst index e862a1164b..000e817712 100644 --- a/source/chapters/library.rst +++ b/source/chapters/library.rst @@ -882,7 +882,7 @@ Using the Serato library Mixxx supports reading your Serato library and crates both from your local hard drive as well as portable USB drives. Smart crates are currently not supported. Serato stores information such as hot cues, track color and beatgrid in the file tags. -Regardless of whether a track is loaded into deck from the libray or directly from the file browser, Mixxx will import that information automatically if present. +Regardless of whether a track is loaded into deck from the library or directly from the file browser, Mixxx will import that information automatically if present. Saved loops are imported as well, but since Mixxx is lacking support for multiple saved loops, only the first loop is usable in Mixxx. All other saved loops can be used like regular hotcues for now. diff --git a/source/hardware/controllers/hercules_djcontrol_jogvision.rst b/source/hardware/controllers/hercules_djcontrol_jogvision.rst index 550bb759a9..3c06b266d9 100644 --- a/source/hardware/controllers/hercules_djcontrol_jogvision.rst +++ b/source/hardware/controllers/hercules_djcontrol_jogvision.rst @@ -60,7 +60,7 @@ All controls act as labeled, but there are some additional functionalities that ========================================================= ============================================================= Control Description ========================================================= ============================================================= -:hwlabel:`MODE` + :hwlabel:`LOOP ON` Set a loop_in mark (with curently defined loop_size), activate it, and enable slip mode +:hwlabel:`MODE` + :hwlabel:`LOOP ON` Set a loop_in mark (with currently defined loop_size), activate it, and enable slip mode :hwlabel:`MODE` + :hwlabel:`LOOP X½` / :hwlabel:`LOOP X2` Do a beatjump backward/forward :hwlabel:`MODE` + :hwlabel:`LOOP SIZE` knob Decrease/Increase pitch (only key, not tempo!) :hwlabel:`MODE` + Jog Wheel plate (playing) Scratch with 'Slip' on (deactivate 'Slip' when plate is released) From 99401b40d3e71348c933f3b5045688383551f689 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Sun, 25 Oct 2020 22:40:59 +0100 Subject: [PATCH 4/4] rstcheck: Ignore Mixxx Control roles/directives --- .rstcheck.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.rstcheck.cfg b/.rstcheck.cfg index bec6cba868..506f8116d3 100644 --- a/.rstcheck.cfg +++ b/.rstcheck.cfg @@ -1,4 +1,5 @@ [rstcheck] -ignore_roles=hwlabel +ignore_directives=mixxx:control +ignore_roles=hwlabel,mixxx:coref,mixxx:cogroupref ignore_messages=(Undefined substitution referenced: "version")\.$ report=warning