Skip to content

Commit

Permalink
Merge pull request mixxxdj#251 from Holzhaus/fixes-2.3
Browse files Browse the repository at this point in the history
Fixes for 2.3 branch
  • Loading branch information
Holzhaus authored Oct 25, 2020
2 parents d436817 + 99401b4 commit f6c5aa9
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 10 deletions.
2 changes: 2 additions & 0 deletions .rstcheck.cfg
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[rstcheck]
ignore_directives=mixxx:control
ignore_roles=hwlabel,mixxx:coref,mixxx:cogroupref
ignore_messages=(Undefined substitution referenced: "version")\.$
report=warning
2 changes: 1 addition & 1 deletion source/chapters/library.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
18 changes: 9 additions & 9 deletions source/hardware/controllers/hercules_djcontrol_jogvision.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Hercules DJControl Jogvision
- `Manufacturer's product page <https://www.hercules.com/en-us/product/djcontroljogvision-2old/>`__
- `Manufacturer's support and downloads page <https://support.hercules.com/en/product/djcontroljogvision-en/>`__
- `Forum thread <https://www.mixxx.org/forums/viewtopic.php?f=7&t=12580>`__

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.
Expand Down Expand Up @@ -34,23 +34,23 @@ 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.

.. note::
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.
Expand All @@ -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)
Expand Down

0 comments on commit f6c5aa9

Please sign in to comment.