diff --git a/.tx/config b/.tx/config index 96e4a94912..f07f3ada0a 100644 --- a/.tx/config +++ b/.tx/config @@ -1,4 +1,4 @@ -[main] +[2.5] host = https://www.transifex.com [o:mixxx-dj-software:p:mixxx-dj-manual-26:r:404] diff --git a/netlify.toml b/netlify.toml index ba5594842f..35760da8f8 100644 --- a/netlify.toml +++ b/netlify.toml @@ -26,7 +26,8 @@ # also specified inline, and unsafe inline JS script blocks are allowed # because it's needed for RTD theme navigation and the search function: # https://github.com/readthedocs/sphinx_rtd_theme/issues/817 - Content-Security-Policy = "default-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline'" + # We also allow loading MathJax, which is needed to render math formulas. + Content-Security-Policy = "default-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' https://cdn.jsdelivr.net/npm/mathjax@3/ 'unsafe-inline'; font-src 'self' https://cdn.jsdelivr.net/npm/mathjax@3/" # Disable all browser features that we don't need. Unfortunately # there is no way to specify a default for all directives yet, so diff --git a/source/_static/Mixxx-200-Library-Add-to-Auto-DJ.png b/source/_static/Mixxx-200-Library-Add-to-Auto-DJ.png deleted file mode 100644 index f0a8598ae0..0000000000 Binary files a/source/_static/Mixxx-200-Library-Add-to-Auto-DJ.png and /dev/null differ diff --git a/source/_static/Mixxx-241-Library-Add-to-Auto-DJ.png b/source/_static/Mixxx-241-Library-Add-to-Auto-DJ.png new file mode 100644 index 0000000000..ffe38ce706 Binary files /dev/null and b/source/_static/Mixxx-241-Library-Add-to-Auto-DJ.png differ diff --git a/source/_static/Mixxx-241-Library-Auto-DJ.png b/source/_static/Mixxx-241-Library-Auto-DJ.png new file mode 100644 index 0000000000..bb0c40d581 Binary files /dev/null and b/source/_static/Mixxx-241-Library-Auto-DJ.png differ diff --git a/source/_static/controllers/denon_mc7000_mapping_settings.png b/source/_static/controllers/denon_mc7000_mapping_settings.png new file mode 100644 index 0000000000..31f1e509d5 Binary files /dev/null and b/source/_static/controllers/denon_mc7000_mapping_settings.png differ diff --git a/source/_static/controllers/numark_scratch.svg b/source/_static/controllers/numark_scratch.svg new file mode 100644 index 0000000000..138f9b21d5 --- /dev/null +++ b/source/_static/controllers/numark_scratch.svg @@ -0,0 +1,2 @@ + + diff --git a/source/_static/controllers/numark_scratch_performancepads.svg b/source/_static/controllers/numark_scratch_performancepads.svg new file mode 100644 index 0000000000..369897d54e --- /dev/null +++ b/source/_static/controllers/numark_scratch_performancepads.svg @@ -0,0 +1,2 @@ + + diff --git a/source/chapters/appendix/commandline_dev_tools.rst b/source/chapters/appendix/commandline_dev_tools.rst index e5c322f60e..70efc0831b 100644 --- a/source/chapters/appendix/commandline_dev_tools.rst +++ b/source/chapters/appendix/commandline_dev_tools.rst @@ -46,7 +46,7 @@ types, go to :ref:`file-format-compatibility`. --settings-path PATH Top-level directory where Mixxx will look for user settings files such as the library database and preferences configuration file. ---disable-vumetergl Do not use OpenGL vu meter +--enable-legacy-vumeter Do not use OpenGL vu meter --controller-debug Log all controller data Mixxx sends and receives as well as scripts it loads. --controller-abort-on-warning The controller mapping will issue more diff --git a/source/chapters/appendix/mixxx_controls.rst b/source/chapters/appendix/mixxx_controls.rst index 5fba887553..207355936b 100644 --- a/source/chapters/appendix/mixxx_controls.rst +++ b/source/chapters/appendix/mixxx_controls.rst @@ -832,6 +832,45 @@ Any control listed above for :mixxx:cogroupref:`[ChannelN]` will work for a samp .. versionadded:: 2.0.0 +.. mixxx:control:: [ChannelN],shift_cues_earlier + [PreviewDeckN],shift_cues_earlier + [SamplerN],shift_cues_earlier + + :range: binary + :feedback: All :term:`cue markers ` move left by 10ms. + + .. versionadded:: 2.3.0 + + +.. mixxx:control:: [ChannelN],shift_cues_later + [PreviewDeckN],shift_cues_later + [SamplerN],shift_cues_later + + :range: binary + :feedback: All :term:`cue markers ` move right by 10ms. + + .. versionadded:: 2.3.0 + + +.. mixxx:control:: [ChannelN],shift_cues_earlier_small + [PreviewDeckN],shift_cues_earlier_small + [SamplerN],shift_cues_earlier_small + + :range: binary + :feedback: All :term:`cue markers ` move left by 1ms. + + .. versionadded:: 2.3.0 + + +.. mixxx:control:: [ChannelN],shift_cues_later_small + [PreviewDeckN],shift_cues_later_small + [SamplerN],shift_cues_later_small + + :range: binary + :feedback: All :term:`cue markers ` move right by 1ms. + + .. versionadded:: 2.3.0 + .. mixxx:control:: [ChannelN],beats_undo_adjustment [PreviewDeckN],beats_undo_adjustment [SamplerN],beats_undo_adjustment @@ -2439,6 +2478,19 @@ Any control listed above for :mixxx:cogroupref:`[ChannelN]` will work for a samp .. versionadded:: 1.8.0 +.. mixxx:control:: [ChannelN],show_track_menu + + Toggle the track context menu for the track currently loaded in this deck. + The control value is `1` if there is already a menu shown for this deck. + The menu can be navigated with the :mixxx:coref:`MoveUp/Down <[Library],MoveUp>` controls + and selected actions or submenus can be activated with :mixxx:coref:`GoToItem <[Library],GoToItem>`. + + :range: Binary + :feedback: The deck's track context menu is shown or hidden. + + .. versionadded:: 2.5.0 + + .. mixxx:control:: [ChannelN],slip_enabled [PreviewDeckN],slip_enabled [SamplerN],slip_enabled @@ -2914,10 +2966,13 @@ Then you can use your :term:`MIDI` controller to control its volume and some oth .. note:: Although the first auxiliary group is named :mixxx:cogroupref:`[Auxiliary1]`, the group for the first microphone is just called :mixxx:cogroupref:`[Microphone] <[MicrophoneN]>`, not :mixxx:cogroupref:`[Microphone1] <[MicrophoneN]>`. -.. mixxx:control:: [MicrophoneN],input_configured +.. mixxx:control:: [ChannelN],input_configured + [MicrophoneN],input_configured [AuxiliaryN],input_configured 1 if there is input is configured for this channel, 0 if not. + In the case of :mixxx:cogroupref:`[ChannelN]` it corresponds to + Vinyl Control. A configured input is required to enable :mixxx:coref:`[ChannelN],passthrough` :range: binary, read-only :feedback: Configured channel in the sound preferences. @@ -3393,7 +3448,8 @@ Note that :mixxx:coref:`[Library],MoveUp` and other Move and Scroll controls emu The control value is `1` if there is already a menu shown for the current view. Note that the control is not aware of other track menus, for example those opened by right-clicking track text labels in decks. Only the most recent menu can be - navigated with the :mixxx:coref:`MoveUp/Down <[Library],MoveUp>` controls. + navigated with the :mixxx:coref:`MoveUp/Down <[Library],MoveUp>` controls and + selected actions or submenus can be activated with :mixxx:coref:`GoToItem <[Library],GoToItem>`. :range: Binary :feedback: Tracks table context menu is shown or hidden. @@ -4574,7 +4630,8 @@ In the meantime, skins and controller mappings that still use them will keep wor :range: binary :feedback: Waveform view - Loads the currently highlighted song into the first stopped deck + Performs the same action action like :mixxx:coref:`[Library],GoToItem` does when the tracks table has focus, + just regardless of the focus. .. deprecated:: 2.1.0 Use :mixxx:coref:`[Library],GoToItem` instead. diff --git a/source/chapters/djing_with_mixxx.rst b/source/chapters/djing_with_mixxx.rst index 38ed3f7c21..6242251c4b 100644 --- a/source/chapters/djing_with_mixxx.rst +++ b/source/chapters/djing_with_mixxx.rst @@ -392,7 +392,7 @@ Auto DJ .. sectionauthor:: S.Brandt -.. figure:: ../_static/Mixxx-111-Library-Auto-DJ.png +.. figure:: ../_static/Mixxx-241-Library-Auto-DJ.png :align: center :width: 100% :figwidth: 100% @@ -401,19 +401,31 @@ Auto DJ Mixxx library - Auto DJ view -Auto DJ allows you to automatically load tracks from the Auto DJ playlist when -the current track is nearly finished, and crossfade into it. See -:ref:`library-auto-dj`. +Auto DJ automatically loads tracks in the decks and mixes them. +Tracks can be manually added to the Auto DJ playlist, or automatically from assigned source crates or from the entire library. Auto DJ does not take into account the volume of each track, nor the frequency content, nor the rhythms, so it's not intended to be a replacement for a human DJ. However, it is good enough to give a human DJ a break without a major disruption to the mix. +For mixing, Auto DJ takes control of the :ref:`crossfader `. +Auto DJ requires at least one deck to be assigned to the left and right side of the crossfader. This can be done with the deck orientation switches next to the crossfader. If a deck's orientation is centered, the crossfader can't affect it. Note that in the official Tango skin, these switches are in the decks' transport controls row, and in Shade skin they don't exist because decks are statically assigned to the left and right side (bus). + +When Auto DJ is toggled on, it will use the first two opposing decks it finds. With default settings these would be decks 1 and 2, but depending on how the orientation switches are set, this could be any configuration, for example deck 4 on the left and deck 1 on the right. If no opposing decks are found Auto DJ won't start. + +.. note:: Note that Auto DJ is currently not aware which decks are currently visible, + i.e. it might pick currently hidden decks 3 and/or 4. Refer to the + :ref:`skin settings ` for how to toggle 4 decks. + +When you toggle Auto DJ off, the crossfader will stay on its last position. + +Each official Mixxx skin has an Auto DJ indicator icon, located either in the top toolbar or in the mixer. In some skins the crossfader is highlighted, too. + Loading tracks into Auto DJ --------------------------- To play tracks automatically, they must first be loaded into the Auto DJ playlist. The Auto DJ playlist is empty by default. -.. figure:: ../_static/Mixxx-200-Library-Add-to-Auto-DJ.png +.. figure:: ../_static/Mixxx-241-Library-Add-to-Auto-DJ.png :align: center :width: 50% :figwidth: 100% diff --git a/source/chapters/library.rst b/source/chapters/library.rst index ac6d28b05b..9b3e52e7ed 100644 --- a/source/chapters/library.rst +++ b/source/chapters/library.rst @@ -375,8 +375,7 @@ a crate, or even the whole library) for tracks that match your search query. * Type your search term(s). Mixxx filters the tracks as you type and shows only those matching the search term(s). Search terms can include an artist's name, a song title, BPM, etc. -* To clear the search string hit :kbd:`ESC` or click the clear button right next - to the input field. +* To clear the search string click the clear button right next to the input field. * Hit :kbd:`TAB` to cycle between the search and the list of results in the library. Use the :kbd:`↑` and :kbd:`↓` keys to scroll in the list of results. @@ -426,25 +425,35 @@ Mixxx supports the following filters: title:= "Track 1" artist:="DJ Flop" -* **Numeric filtering**: bitrate, bpm, played, rating, track, year +* **Numeric filtering**: bpm, bitrate, played, rating, track, year Examples :: - bpm:140 - bpm: >140 year: <2010 - bpm: >=140 + rating:<4 rating: <=4 - bpm: 140-150 + rating:3-5 played: >10 .. note:: You can put a space after the colon but currently there must be no space between the operator and the number. + * By default, `bpm:` finds tracks with the exact BPM but also half and double + values. If the half or double values are not integers, ranges are used. The + following example lists tracks with 125.2, [250-251] or [52-53] BPM -* **Special filtering**: key, duration, added, dateadded, datetime_added, date_added + :: + + bpm:125.2 + + * Use `bpm:=` to find exact matches only, i.e. exclude half/double values. + + * `bpm` also supports fuzzy searches, see Special Filtering below. + + +* **Special filtering**: bpm, key, duration, added, dateadded, datetime_added, date_added * Supports fuzzy matching of key searches. The following example lists tracks with harmonically compatible keys to C# minor. @@ -453,6 +462,16 @@ Mixxx supports the following filters: ~key:c#m + * Fuzzy BPM searches find tracks in the range of +/- N % of the current pitch + slider range. N can be set in :menuselection:`Preferences --> Library --> Track Search`. + With the default pitch slider range of 8% and the default BPM search range + of 75%, the following example lists tracks with BPM between 94 and 106. + + :: + + ~bpm:100 + + The following example lists all tracks by “Danger” over 3 minutes long that are rated 4 or 5. @@ -547,9 +566,6 @@ library columns. You are free to edit most metadata, and Mixxx offers a number of different ways to do so. Note that some information can not be edited, such as bitrate, size, length, type, filename, and location. -.. note:: Mixxx does not support editing the metadata of many tracks at a time - (bulk editing). - .. warning:: Mixxx won't touch your audio files by default. Changes to a track's metadata will be saved to the Mixxx library, but **not** to the track itself. @@ -563,7 +579,7 @@ Manual Edit **Track Inline editing**: To enable inline editing in the :ref:`library ` go to - :menuselection:`Preferences --> Library --> Miscellaneous` and check the box + :menuselection:`Preferences --> Library --> Track Table View` and check the box "Edit metadata after clicking selected track". Select any track in the :ref:`library ` and click on the @@ -582,7 +598,7 @@ Manual Edit .. _library-properties-editor: **Properties editor**: - To open the editor right-click on a **single track** in the library or any track + To open the editor right-click on selected tracks in the library or any track label in decks or samplers, then select :guilabel:`Properties` in the track menu. You can also double-click any track label in the decks or samplers to open the editor directly. @@ -682,24 +698,26 @@ mixing or for using Mixxx as media player. The Auto DJ features in detail: -* **Shuffle button**: Randomizes the order of tracks in the Auto DJ playlist. -* **Add Random button**: Adds a random track from track sources (crates) to the +* **Enable** toggle: Toggles the Auto DJ mode on or off. +* **Fade now** button: Triggers the transition to the next track. +* **Skip track** button: Skips the next track in the Auto DJ playlist. +* **Transition mode** selector: Choose a transition mode. +* **Transition time** spin-box: Determines the duration of the transition. A + negative value will add a pause between tracks. +* **Shuffle** button: Randomizes the order of tracks in the Auto DJ playlist. +* **Add Random track** button: Adds a random track from track sources (crates) to the Auto DJ queue. If no track sources are configured, the track is added from the library instead. -* **Skip track button**: Skips the next track in the Auto DJ playlist. -* **Fade now button**: Triggers the transition to the next track. -* **Transition time spin-box**: Determines the duration of the transition. A - negative value will add a pause between tracks. -* **Selection Info label**: Displays the duration and number of selected tracks. +* **Repeat the playlist** toggle: Re-queue played tracks. +* **Selection Info** label: Displays the duration and number of selected tracks. Press :kbd:`Ctrl` + :kbd:`A` to get the total duration of the AutoDJ queue. -* **Enable Auto DJ button**: Toggles the Auto DJ mode on or off. The :guilabel:`Skip track`, :guilabel:`Add Random` and :guilabel:`Fade now` buttons are only accessible if the Auto DJ mode is enabled. The Search field in -the upper left corner is disabled in Auto DJ. By default, Auto DJ removes tracks -after playing them but if you want it to play the same tracks over and over -again, you can activate the :guilabel:`Auto DJ Requeue` option in -:menuselection:`Preferences --> Auto DJ --> Re-queue tracks after playback`. +the upper left corner is disabled in Auto DJ. + +By default, Auto DJ removes tracks after playing them but if you want it to play the same +tracks over and over again, you can activate the :guilabel:`Repeat the playlist` toggle. .. _library-auto-dj-crates: diff --git a/source/chapters/livebroadcasting.rst b/source/chapters/livebroadcasting.rst index 196afb4406..e161ef1707 100644 --- a/source/chapters/livebroadcasting.rst +++ b/source/chapters/livebroadcasting.rst @@ -50,7 +50,7 @@ Streaming Servers server for stability and reliability reasons. Keep in mind that if want to stream audio to a significant number of listeners, you'll need enough bandwidth. Read the - `Shoutcast documentation `_ + `Shoutcast documentation `_ or `Icecast documentation `_ for server setup instructions. diff --git a/source/conf.py b/source/conf.py index 8b6881057e..3664a77299 100644 --- a/source/conf.py +++ b/source/conf.py @@ -444,6 +444,8 @@ # Ignore Twitter links because for some reason valid links sometimes fail # with "400 Bad Request" r"^https://twitter.com/\w+$", + # Ignore NI links entirely because they trip 403 in general. + r"^https://(?:www.)?native-instruments.com", # Ignore support links because we get 403 Client Errors (bad User Agent?) r"^https://support.native-instruments.com/", r"^https://support.serato.com/", @@ -456,6 +458,9 @@ "https://support.pioneerdj.com/hc/sections/*", "https://www.roland.com/global/products/dj-505/*", "https://web.archive.org/web/*", + "https://www.allen-heath.com/ahproducts/*", + "https://www.allen-heath.com/content/uploads/*", + "https://www.allen-heath.com/support/", ] # Avoid freezing during linkcheck diff --git a/source/glossary.rst b/source/glossary.rst index a134a6ea79..5f5a839073 100644 --- a/source/glossary.rst +++ b/source/glossary.rst @@ -386,6 +386,10 @@ Glossary of Terms track. DJs usually place hotcues at distinctive positions within a track such as drops, breaks or kicks and snares. Mixxx supports up to 36 hotcues. + cue marker + A catch-all term used in mixxx to refer to the :term:`cue point`, + :term:`hotcues ` and :ref:`intro and outro cues`. + bar In musical notation, a bar (or measure) is a segment of time defined by a given number of beats. Typically, a piece consists of several bars of the diff --git a/source/hardware/controllers/allen_heath_xone_k2_k1.rst b/source/hardware/controllers/allen_heath_xone_k2_k1.rst index 48c4013d29..9e9e27906e 100644 --- a/source/hardware/controllers/allen_heath_xone_k2_k1.rst +++ b/source/hardware/controllers/allen_heath_xone_k2_k1.rst @@ -10,10 +10,10 @@ Xone K1 is the same as the Xone K2 but without the built in audio interface and does not come with the EVA travel case that the K2 comes with. -- `Manufacturer’s product page `__ +- `Manufacturer’s product page `__ - `Forum thread `__ - `Manufacturer’s User Guide `__ -- `Blank template diagrams `__ +- `Blank template diagrams `__ .. versionadded:: 1.11 diff --git a/source/hardware/controllers/denon_mc7000.rst b/source/hardware/controllers/denon_mc7000.rst index 61721703d9..627d14e452 100644 --- a/source/hardware/controllers/denon_mc7000.rst +++ b/source/hardware/controllers/denon_mc7000.rst @@ -45,12 +45,62 @@ improve the mapping, then please discuss it in the `Denon MC7000 Mapping `__ thread. +Mapping Settings +~~~~~~~~~~~~~~~~ + +.. figure:: ../../_static/controllers/denon_mc7000_mapping_settings.png + :align: center + :width: 75% + :figwidth: 100% + :alt: Denon MC7000 mapping settings + :figclass: pretty-figures + + Denon MC7000 mapping settings + +The MC7000 mapping features a number of options that can be customized from the preferences under :guilabel:`Preferences` > :guilabel:`Controllers` after selecting your controller and the `DENON MC7000` mapping. + +Jogwheel Settings +----------------- + +.. csv-table:: + :header: "Setting", "Variable", "Default", "Range", "Description" + + Jogwheel sensitivity (:math:`s`), ``jogSensitivity``, 1.0, 0.05 to 10.0, "Sensitivity factor of the jog wheel (also depends on audio latency). Use 0.5 for half and 2 for double sensitivity. Recommendation: + + Set to 0.5 with audio buffer set to 50ms + + Set to 1 with audio buffer set to 25ms + + Set to 3 with audio buffer set to 5ms" + Enable jogwheel acceleration, ``jogAccelerationEnabled``, ``false``, ``true``/``false``, "If enabled, the track speed will accelerate faster than the physical jogwheel movement." + Acceleration exponent (:math:`x`), ``jogAccelerationExponent``, 0.8, 0.0 to 20.0, The exponent of the acceleration curve + Acceleration coefficient (:math:`c`), ``jogAccelerationCoefficient``, 1.0, 0.05 to 20.0, The coefficient of the acceleration curve + +Jogwheel Acceleration +^^^^^^^^^^^^^^^^^^^^^ + +Enabling jogwheel acceleration will increase the scratch speed in proportion to the physical speed at which the platters are turned, similar to Serato. The precise formula for computing the scratch speed :math:`S` from the physical platter ticks :math:`t` turned is as follows: + +.. math:: + S = \underbrace{st \vphantom{|}}_{\text{base speed}} \cdot \underbrace{c \cdot |st|^x}_{\text{acceleration factor}} + +where + +- :math:`s` is the jogwheel sensitivity +- :math:`t` is the number of physical platter ticks turned +- :math:`c` is the acceleration coefficient +- :math:`x` is the acceleration exponent + +.. warning:: Be aware that the absolute track position will drift relative to the jogwheel position when enabling jogwheel acceleration! While this is convenient for scrubbing, this may make it less suitable for precise scratching. + +.. hint:: An acceleration exponent :math:`x` of 0 and a coefficient :math:`c` of 1 are equivalent to no acceleration. + .. _denon_mc7000_uservariables: User Variables ~~~~~~~~~~~~~~ -User variables can be set to suit individual needs inside the :file:`Denon-MC7000-scripts.js` mapping file: +The mapping can further be customized to suit individual needs via user variables inside the :file:`Denon-MC7000-scripts.js` mapping file: - ``MC7000.experimental`` activate :ref:`experimental beat count feature ` (default: ``false``) - ``MC7000.needleSearchPlay`` activate :hwlabel:`NEEDLE DROP` sensor while a track is playing (default: ``false``) @@ -59,7 +109,6 @@ User variables can be set to suit individual needs inside the :file:`Denon-MC700 - ``MC7000.modeSingleLED`` set single LED on or off (default: 1). Can be toggled with :hwlabel:`SHIFT` + :hwlabel:`Deck` - ``MC7000.VinylModeOn`` set the Vinyl Mode on or off at Mixxx start which also triggers the Platter Ring LED function (default: 1) - ``MC7000.scratchParams`` set Scratch Parameters (default: 33+1/3, 1/10, 1/10/32) -- ``MC7000.jogSensitivity`` set the Jog Sensitivity (default: 1) - ``MC7000.SamplerQty`` set the sampler quantity (values 16 or 32, default: 16) diff --git a/source/hardware/controllers/dj_tech_cdj_101.rst b/source/hardware/controllers/dj_tech_cdj_101.rst index 2d67ba8781..eaf658b981 100644 --- a/source/hardware/controllers/dj_tech_cdj_101.rst +++ b/source/hardware/controllers/dj_tech_cdj_101.rst @@ -1,7 +1,7 @@ DJ Tech CDJ 101 =============== -`DJ Tech `__ is not to be +`DJ Tech `__ is not to be confused with `DJ TechTools `__, the makers of the MIDI Fighter series, Chroma Cables, and Chroma Caps. There is no (longer) a product page for this discontinued device. diff --git a/source/hardware/controllers/dj_tech_djm_101.rst b/source/hardware/controllers/dj_tech_djm_101.rst index a2bc3f96bd..e1c6db48c5 100644 --- a/source/hardware/controllers/dj_tech_djm_101.rst +++ b/source/hardware/controllers/dj_tech_djm_101.rst @@ -1,7 +1,7 @@ DJ Tech DJM 101 =============== -`DJ Tech `__ is not to be +`DJ Tech `__ is not to be confused with `DJ TechTools `__, the makers of the MIDI Fighter series, Chroma Cables, and Chroma Caps. There is no (longer) a product page for this discontinued device. diff --git a/source/hardware/controllers/dj_tech_imix_reload.rst b/source/hardware/controllers/dj_tech_imix_reload.rst index d485f63f98..90c3c871af 100644 --- a/source/hardware/controllers/dj_tech_imix_reload.rst +++ b/source/hardware/controllers/dj_tech_imix_reload.rst @@ -1,7 +1,7 @@ DJ Tech iMix Reload =================== -`DJ Tech `__ is not to be +`DJ Tech `__ is not to be confused with `DJ TechTools `__, the makers of the MIDI Fighter series, Chroma Cables, and Chroma Caps. There is no (longer) a product page for this discontinued device. diff --git a/source/hardware/controllers/dj_tech_kontrol_one.rst b/source/hardware/controllers/dj_tech_kontrol_one.rst index c1ce0ee77d..e48e6942a4 100644 --- a/source/hardware/controllers/dj_tech_kontrol_one.rst +++ b/source/hardware/controllers/dj_tech_kontrol_one.rst @@ -1,7 +1,7 @@ DJ Tech Kontrol One =================== -`DJ Tech `__ is not to be +`DJ Tech `__ is not to be confused with `DJ TechTools `__, the makers of the MIDI Fighter series, Chroma Cables, and Chroma Caps. There is no (longer) a product page for this discontinued device. diff --git a/source/hardware/controllers/dj_tech_mixer_one.rst b/source/hardware/controllers/dj_tech_mixer_one.rst index c3ba738083..2dfb9af6fb 100644 --- a/source/hardware/controllers/dj_tech_mixer_one.rst +++ b/source/hardware/controllers/dj_tech_mixer_one.rst @@ -1,12 +1,10 @@ DJ Tech Mixer One ================= -`DJ Tech `__ is not to be +`DJ Tech `__ is not to be confused with `DJ TechTools `__, the makers of the MIDI Fighter series, Chroma Cables, and Chroma Caps. -- `Manufacturer’s product page `__ - .. versionadded:: 1.10.1 .. note:: diff --git a/source/hardware/controllers/hercules_djcontrol_air.rst b/source/hardware/controllers/hercules_djcontrol_air.rst index d29409102f..9e5c9e09fb 100644 --- a/source/hardware/controllers/hercules_djcontrol_air.rst +++ b/source/hardware/controllers/hercules_djcontrol_air.rst @@ -38,7 +38,7 @@ Mapping Description :alt: Hercules DJControl AIR (schematic view) :figclass: pretty-figures - Hercules DJControl AIR (schematic view). This picture is taken from the `Getting Started Tutorial `__ (courtesy of Guillemot Corporation S.A.). + Hercules DJControl AIR (schematic view). This picture is taken from the Getting Started Tutorial (courtesy of Guillemot Corporation S.A.). We assume from the annotated picture above that each decks have same controls. diff --git a/source/hardware/controllers/hercules_djcontrol_compact.rst b/source/hardware/controllers/hercules_djcontrol_compact.rst index dd0b924259..f0cd558929 100644 --- a/source/hardware/controllers/hercules_djcontrol_compact.rst +++ b/source/hardware/controllers/hercules_djcontrol_compact.rst @@ -2,7 +2,6 @@ Hercules DJControl Compact ========================== - `Manufacturer’s product page `__ -- `MIDI mapping manual `__ The Hercules DJControl Compact is a simple controller for basic two-channel mixing. This device does not have a built in sound card, so diff --git a/source/hardware/controllers/hercules_djcontrol_instinct.rst b/source/hardware/controllers/hercules_djcontrol_instinct.rst index 8a0595b220..4cd16e97f2 100644 --- a/source/hardware/controllers/hercules_djcontrol_instinct.rst +++ b/source/hardware/controllers/hercules_djcontrol_instinct.rst @@ -41,7 +41,7 @@ Controls :alt: Hercules DJControl Instinct (schematic view) :figclass: pretty-figures - Hercules DJControl Instinct (schematic view). This picture is taken from `product poster `__ (courtesy of Guillemot Corporation S.A.). + Hercules DJControl Instinct (schematic view). This picture is taken from the product poster in the device manual (courtesy of Guillemot Corporation S.A.). 1. Jog Wheel for the deck on the side of the wheel 2. Action buttons for the deck on the side of the controls, depending on diff --git a/source/hardware/controllers/korg_kaoss_dj.rst b/source/hardware/controllers/korg_kaoss_dj.rst index 106b8128ec..37ba436d96 100644 --- a/source/hardware/controllers/korg_kaoss_dj.rst +++ b/source/hardware/controllers/korg_kaoss_dj.rst @@ -7,6 +7,8 @@ Korg Kaoss DJ controller - `Forum thread `__ - `Pull request on Github `__ +macOS: Please note that the Korg Kaoss DJ is only supported until `macOS Monterey `__ + .. versionadded:: 2.1 Mapping diff --git a/source/hardware/controllers/numark_scratch.rst b/source/hardware/controllers/numark_scratch.rst new file mode 100644 index 0000000000..4caae87e2a --- /dev/null +++ b/source/hardware/controllers/numark_scratch.rst @@ -0,0 +1,131 @@ +.. _numark_scratch: + +Numark Scratch +============== + +The Numark Scratch is a 24-bit 2 channel mixer designed for the scratch DJ. +It's equipped with an InnoFader crossfader and 8 performance pads across 3 modes, and +6 dedicated software FX selectors with dual toggle triggers. The Scratch is DVS ready under Mixxx + +- `Manufacturer’s product page `__ +- `Serato DJ Hardware Page `__ +- `Owner’s Manual `__ +- `Driver Download Page `__ +- `Mapping Forum Thread `__ + +.. versionadded:: 2.4.0 + +Drivers +------- + +You can download the latest Windows driver from the `manufacturer’s website `__. +The Scratch is class complaint on Mac and Linux. + +Audio Setup +----------- + +The mapping relies on the following channel assignments: + +===================== ================ +Output Channels Assigned to +===================== ================ +1-2 Master +3-4 Headphones +===================== ================ + +===================== ================ +Input Channels Assigned to +===================== ================ +1-2 (CH 1 Line/Phono) Vinyl Control 1 +3-4 (CH 2 Line/Phono) Vinyl Control 2 +5-6 (Mix) Record/Broadcast +===================== ================ + +The microphone, and external inputs are mixed +together in input channels 5-6, so Mixxx can record and broadcast them. + +The knobs for :hwlabel:`MASTER`, :hwlabel:`BOOTH`, :hwlabel:`MIC LEVEL`, :hwlabel:`MIC TONE` and :hwlabel:`CUE GAIN` 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/microphone levels to 100% (knob center position) + +.. note:: + The :hwlabel:`PC / LINE/PHONO` switches work only if the :guilabel:`Vinyl Control` input channels are assigned to software inputs. + So even if you do not intend to use timecode vinyl but want to pass through line or phono inputs directly to the left/right deck, you need assign these channels in the Sound Hardware preferences. + +Controller Mapping +------------------ + +Schematic +~~~~~~~~~~~~~~~~~~~~~~ + +.. figure:: ../../_static/controllers/numark_scratch.svg + :align: center + :width: 100% + :figwidth: 100% + :alt: Numark Scratch (schematic view) + :figclass: pretty-figures + + Numark Scratch (schematic view) + +======== ================================================== ========================================== +No. Control Function +======== ================================================== ========================================== +1 CHANNEL EQ/GAIN Adjust volume & the high / mid / low EQs per channel +2 :hwlabel:`BOOTH` Adjust Booth output level +3 :hwlabel:`MASTER` Adjust Master output level +4 :hwlabel:`LINE/PHONO` & :hwlabel:`PC` Toggle between LINE / PHONO or PC per channel +5 CUE :hwlabel:`MIX` Adjust monitoring between CUE and PGM +6 CUE :hwlabel:`GAIN` Adjust CUE level +7 FX :hwlabel:`DRY / WET` Adjust FX wet/dry depth +7 :hwlabel:`SHIFT` :hwlabel:`DRY / WET` Adjust the metaknob for all effects in the chain. +8 FX SELECT Toggle single FX +8 :hwlabel:`SHIFT` + FX SELECT Toggle multiple FX selections at the same time +9 FX :hwlabel:`HOLD / ON` paddle Push up to toggle FX on or push down to toggle FX momentarily +10 :hwlabel:`CUE` Press to cue channel for monitoring in headphones +11 :hwlabel:`SHIFT` Used with other controls that have SHIFT modifier function +12 CROSSFADER Crossfade audio between channel 1/2 +13 X-FADER :hwlabel:`REVERSE` & :hwlabel:`SLOPE` Toggle crossfader reverse, & adjust between crossfader curves +14 CHANNEL FADER Adjust per channel volume +15 PERFORMANCE PADS SEE PERFORMANCE PADS SECTION FOR MORE INFO +16 :hwlabel:`LOOP -/+` Turn right/left to increase/decrease loop size, press in to toggle loop on/off +16 :hwlabel:`SHIFT` + :hwlabel:`LOOP -/+` Turn for Library scroll, press in to load selected track to deck, double press to load instant double +17 :hwlabel:`FILTER` Adjust hardware Filter per channel +18 MIC :hwlabel:`TONE` & :hwlabel:`MIC` level Adjust microphone tone & level +======== ================================================== ========================================== + +Performance Pads +~~~~~~~~~~~~~~~~ + +.. figure:: ../../_static/controllers/numark_scratch_performancepads.svg + :align: center + :width: 65% + :figwidth: 100% + :alt: Numark Scratch (performance pads) + :figclass: pretty-figures + +To change modes, press the PAD MODE button repeatedly, which +will cycle through the available pade modes, which are as follows: + +**CUE** mode: Pads 1-4 trigger the respective hotcues, and if no hotcue point is set on that pad, will set a Cue point +in the respective pad/slot. Holding SHIFT while pressing a pad will clear the Cue point from that pad. + +**SAMPLER** mode: Press pads 1-4 to trigger samples loaded into the sample slot. Hold SHIFT while pressing a pad to +stop the sample playback once triggered. + +**ROLL** mode: In this mode holding pads 1-4 activates a loop roll of varying sizes. Release the pad to exit the loop roll. + +Mapping options +--------------- + + +There are various options that can be used to change some of the mixer's behavior. +Settings can be edited in the preference windows, under :guilabel:`Preferences` > :guilabel:`Controllers` > :guilabel:`Numark Scratch`. + +======================================================== =========================================== ============================ =================================== ================================================================================================================================================================================================================ +Setting Variable value Default Range Description +======================================================== =========================================== ============================ =================================== ================================================================================================================================================================================================================ +Invert the Loop Encoder functionality `invertLoopEncoderFunction` false true/false By default the Encoder manages looping and Shift + Encoder scrolls the library/loads track. If this setting is set to true, the Encoder scrolls the library/loads track and Shift + Encoder manages looping. +Keep pads and buttons dimmed when off `InactiveLightsAlwaysBacklit` true true/false Having this setting on will keep LED always dimmed, even when off. *Note* the :hwlabel:`PAD MODE` and :hwlabel:`CUE` buttons are hardware controlled and always dim when inactive. +Set the predefined size to use for the Roll mode `BeatLoopRollSize` 1/4,1/2,1,2 range 1/32..8 Define the size of loops for each of the deck pads, from left to right. +======================================================== =========================================== ============================ =================================== ================================================================================================================================================================================================================ diff --git a/source/hardware/controllers/pioneer_ddj_400.rst b/source/hardware/controllers/pioneer_ddj_400.rst index 0d36cedcfe..b1e62680d7 100644 --- a/source/hardware/controllers/pioneer_ddj_400.rst +++ b/source/hardware/controllers/pioneer_ddj_400.rst @@ -18,7 +18,7 @@ Pioneer DDJ-400 The Pioneer DDJ-400 is a 2 deck USB controller with an integrated audio interface designed for rekordbox. -- `Manufacturer's Product Page `__ +- `Manufacturer's Product Page `__ - `Midi Mappings `__ - `Hardware Diagram `__ - `Mapping Forum Thread `__