Merge branch '2.3' into controls-fx-parameter-buttons

README.md

@@ -75,7 +75,7 @@ development and community news:
 - Follow us on [Twitter] and [Facebook].
 - Subscribe to the [Mixxx Development Blog][blog].
 - Join the developer [mailing list].
-- Post on the [Mixxx forums][forums].
+- Post on the [Mixxx forums][discourse].
 
 ## License
 
@@ -109,3 +109,4 @@ license.
 [Mixxx glossary]: https://www.transifex.com/projects/p/mixxxdj/glossary/l/en/
 [hardware compatibility]: https://mixxx.org/wiki/doku.php/hardware_compatibility
 [zulip]: https://mixxx.zulipchat.com/
+[discourse]: https://mixxx.discourse.group/

res/controllers/Akai MPD24.midi.xml

@@ -4,7 +4,8 @@
     <name>Akai MPD24</name>
     <author>klico</author>
     <description>MIDI mapping for Akai MPD24</description>
-    <forums>http://mixxx.org/forums/viewtopic.php?f=7&amp;t=39</forums>
+    <forums>https://mixxx.discourse.group/t/akai-mpd24-midi-setup/9020</forums>
+    <manual>akai_mpd24</manual>
   </info>
 <controller id="Akai MPD24 MIDI 1">
   <controls>

res/controllers/Akai-LPD8-RK.midi.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <MixxxMIDIPreset mixxxVersion="1.10.1+" schemaVersion="1">
     <info>
-        <name>Akai LPD8 - RK</name>
+        <name>Akai LPD8</name>
         <author>Rob K</author>
         <description>This is a mapping for an Akai LPD8.  Provides access to transport controls, 30 hotcues, loop controls, basic beat jumping, for two decks and two samplers.  Prog 1 = Deck 1; Prog 2 = Deck 2; Prog 3 = Sampler 1; Prog 4 = Sampler 4.  PAD controls hotcues, CC controls Loops, PROG CHNG provides transport controls.  Intended for use as a supplementary controller on top of a standard DJ controller to give access to more hotcues, etc. but could be used as a standalone controller in a pinch.  Created Jan 1, 2013</description>
-        <forums>http://mixxx.org/forums/viewtopic.php?f=7&amp;t=4477</forums>
+        <forums>https://mixxx.discourse.group/t/akai-lpd8-mapping-4-decks-30-hotcues-loops-etc-v2/13064</forums>
+        <manual>akai_lpd8</manual>
     </info>
     <controller id="LPD8">
         <scriptfiles>

res/controllers/Allen and Heath Xone K2.midi.xml

@@ -3,7 +3,7 @@
     <info>
         <name>Allen&amp;Heath Xone K2/K1</name>
         <author>Be</author>
-        <wiki>https://mixxx.org/wiki/doku.php/allen_heath_xone_k2</wiki>
+        <manual>allen_heath_xone_k2_k1</manual>
         <description>This mapping can used with one or multiple Xone K2s/K1s. Multiple Xone K2s/K1s can be connected to each other via X-Link with one of them connected to the computer via USB. Alternatively, when using 2 K2s/K1s, they can both be connected with their own USB cable and this same mapping can be loaded for each.
 
 The layout of the mapping depends on the configured MIDI channel of the controller. Change the MIDI channel of the controller by pressing the bottom right encoder (labeled "Power On Setup/Scroll/Set") while plugging in the controller. Scroll with the encoder to select a MIDI channel. The letter in parentheses corresponds to the last lit button when selecting the channel:

res/controllers/American Audio RADIUS 2000 CH1.midi.xml

@@ -3,6 +3,7 @@
         <name>American Audio Radius 2000 CH1</name>
         <author>Markus Steinbauer</author>
         <description>American Audio Radius 2000 mapping for Deck 1</description>
+        <manual>american_audio_radius_2000</manual>
     </info>
     <controller id="Radius 2000 MIDI 1">
         <scriptfiles>

res/controllers/American Audio RADIUS 2000 CH2.midi.xml

@@ -3,6 +3,7 @@
         <name>American Audio Radius 2000 CH2</name>
         <author>Markus Steinbauer</author>
         <description>American Audio Radius 2000 mapping for Deck 2</description>
+        <manual>american_audio_radius_2000</manual>
     </info>
     <controller id="Radius 2000 MIDI 1">
         <scriptfiles>

res/controllers/American Audio VMS2.midi.xml

@@ -4,8 +4,8 @@
     <name>American Audio VMS2</name>
     <author>Stefan Nuernberger</author>
     <description>MIDI mapping for the American Audio VMS2 controller.</description>
-    <wiki>https://www.mixxx.org/wiki/doku.php/american_audio_vms2</wiki>
     <forums>http://www.mixxx.org/forums/viewtopic.php?f=7&amp;t=3202</forums>
+    <manual>american_audio_vms2</manual>
   </info>
   <controller id="American Audio VMS2">
     <scriptfiles>

res/controllers/American Audio VMS4.midi.xml

@@ -3,9 +3,9 @@
    <info>
       <name>American Audio VMS4/4.1</name>
       <author>Anders Gunnarsson &amp; Sean M. Pappalardo</author>
-      <wiki>http://mixxx.org/wiki/doku.php/american_audio_vms4</wiki>
       <description>2-deck control/4-deck mixer preset for Mixxx 2.1. 
 Assumes "Post EQ" mode. (See Wiki for full setup instructions.)</description>
+      <manual>american_audio_vms4</manual>
    </info>
    <controller id="American Audio VMS4">
       <scriptfiles>

res/controllers/Behringer BCD2000.midi.xml

@@ -4,6 +4,7 @@
       <author>Golzo</author>
       <description>MIDI mapping for Behringer BCD2000 mixer</description>
       <forums>http://www.mixxx.org/forums/viewtopic.php?f=7&amp;t=3563</forums>
+      <manual>behringer_b_control_deejay_bcd2000</manual>
     </info>
     <controller id="BCD2000 MIDI 1">
         <scriptfiles>

res/controllers/Behringer BCD3000 Advanced.midi.xml

@@ -4,6 +4,7 @@
       <author>Joachim</author>
       <description>Advanced preset for BCD3000. See forums for more information.</description>
       <forums>http://www.mixxx.org/forums/viewtopic.php?f=7&amp;t=4013</forums>
+      <manual>behringer_b_control_deejay_bcd3000</manual>
     </info>
     <controller id="BCD3000 MIDI 1">
         <scriptfiles>

res/controllers/Behringer BCD3000.midi.xml

@@ -3,7 +3,7 @@
         <name>Behringer BCD3000</name>
         <author>Aposto</author>
         <description>MIDI Mapping for Behringer BCD3000</description>
-        <forums>http://mixxx.org/forums/viewtopic.php?f=3&amp;t=845</forums>
+        <forums>https://mixxx.discourse.group/t/behringer-bcd3000/10194</forums>
     </info>
     <controller id="BCD3000 MIDI 1">
         <scriptfiles>

res/controllers/Behringer CMD MM1.midi.xml

@@ -10,7 +10,7 @@
         <author>Swiftb0y</author>
         <description>4 deck mapping with options for controlling effect units. Refer to the Mixxx wiki page for how to configure it to control effect units.</description>
         <forums>https://www.mixxx.org/forums/viewtopic.php?f=7&amp;t=9276</forums>
-        <wiki>https://mixxx.org/wiki/doku.php/behringer_cmd_mm-1</wiki>
+        <manual>behringer_cmd_mm_1</manual>
     </info>
     <controller id="CMD">
         <scriptfiles>

res/controllers/Behringer CMD Micro.midi.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <MixxxControllerPreset mixxxVersion="" schemaVersion="1">
     <info>
-        <name>Behringer CMD Micro (tecywiz121)</name>
+        <name>Behringer CMD Micro</name>
         <author>tecywiz121</author>
+        <manual>behringer_cmd_micro</manual>
     </info>
     <controller id="CMD">
         <scriptfiles>

res/controllers/Behringer CMDStudio4a.midi.xml

@@ -4,8 +4,8 @@
         <name>Behringer CMD STUDIO 4a</name>
         <author>Craig Easton</author>
         <description>Controller mapping for the Behringer CMD STUDIO 4a. V 1.4 Created Jan 2016 for Mixxx 2.0.0</description>
-        <wiki>http://www.mixxx.org/wiki/doku.php/behringer_cmd_studio_4a</wiki>
         <forums>http://www.mixxx.org/forums/viewtopic.php?f=7&amp;t=7868</forums>
+        <manual>behringer_cmd_studio_4a</manual>
     </info>
     <controller id="Behringer CMD STUDIO 4a">
         <scriptfiles>

res/controllers/DJ TechTools MIDI Fighter Twister.midi.xml

@@ -4,7 +4,7 @@
     <name>DJ TechTools MIDI Fighter Twister</name>
     <author>tock203</author>
     <description>for 2 deck use</description>
-    <wiki>https://www.mixxx.org/wiki/doku.php/dj_tech_tools_midi_fighter_twister</wiki>
+    <manual>dj_techtools_midi_figher_twister</manual>
   </info>
   <controller id="DJ TechTools MIDI Fighter Twister">
     <scriptfiles>

res/controllers/DJ-Tech CDJ-101.midi.xml

@@ -5,6 +5,7 @@
         <author>zestoi</author>
         <description>Select midi channel 1 or 2 on the CDJ-101 to select which deck to control in Mixxx. Hold down the push encoder for additional controls.</description>
         <forums>http://www.mixxx.org/forums/viewtopic.php?f=7&amp;t=3693</forums>
+        <manual>dj_tech_cdj_101</manual>
     </info>
     <controller id="DJ-Tech CDJ-101">
         <scriptfiles>

res/controllers/DJ-Tech DJM-101.midi.xml

@@ -5,6 +5,7 @@
         <author>zestoi</author>
         <description>Mapping with full led feedback for the DJ-Tech DJM-101</description>
         <forums>http://www.mixxx.org/forums/viewtopic.php?f=7&amp;t=3693</forums>
+        <manual>dj_tech_djm_101</manual>
     </info>
     <controller id="DJM-101">
         <scriptfiles>

res/controllers/DJ-Tech Kontrol One.midi.xml

@@ -4,7 +4,8 @@
         <name>DJ-Tech Kontrol One</name>
         <author>Rob K</author>
         <description>Mapping for the DJ Tech Kontrol One modular scratch controller.  Provides controls for Channel1 through Channel4.  March 2013.</description>
-        <forums>http://mixxx.org/forums/viewtopic.php?f=7&amp;t=4863</forums>
+        <forums>https://mixxx.discourse.group/t/dj-tech-kontrol-one-mapping-hotcue-loops-saves-loops-etc/13299</forums>
+        <manual>dj_tech_kontrol_one</manual>
     </info>
     <controller id="KONTROL1">
         <scriptfiles>

res/controllers/DJ-Tech Mix-101.midi.xml

@@ -1,9 +1,10 @@
 <MixxxMIDIPreset mixxxVersion="1.10.1+" schemaVersion="1">
     <info>
-      <name>DJ-Tech Mix-101</name>
+      <name>DJ-Tech MIX-101</name>
       <author>rasda</author>
-      <description>Midi mapping for DJ-Tech Mix-101</description>
-      <forums>http://mixxx.org/forums/viewtopic.php?f=7&amp;t=3981</forums>
+      <description>MIDI mapping for DJ-Tech MIX-101</description>
+      <forums>https://mixxx.discourse.group/t/dj-tech-mix-101-mapping/12679</forums>
+      <manual>dj_tech_mix_101</manual>
     </info>
     <controller id="Mix-101 MIDI 1">
     <scriptfiles/>

res/controllers/DJ-Tech Mixer One.midi.xml

@@ -5,6 +5,7 @@
         <author>Rob K</author>
         <description>DJ-Tech Mixer One preset. Pretty straightforward - all controls do what they're labelled to do on the controller, except (1) the Xfader slope knob controls master balance; and (2) the Inverse button mutes the master output momentarily.</description>
         <forums>http://www.mixxx.org/forums/viewtopic.php?f=7&amp;t=4693</forums>
+        <manual>dj_tech_mixer_one</manual>
     </info>
     <controller id="MIXER1">
         <scriptfiles>

res/controllers/DJ-Tech i-Mix Reload.midi.xml

@@ -3,7 +3,8 @@
     <name>DJ-Tech i-Mix Reload</name>
     <author>vininim</author>
     <description>MIDI mapping for DJ-Tech i-Mix Reload</description>
-    <forums>http://mixxx.org/forums/viewtopic.php?f=7&amp;t=1637</forums>
+    <forums>https://mixxx.discourse.group/t/dj-tech-i-mix-reload-mapping-for-trunk-as-of-date-of-post/10776</forums>
+    <manual>dj_tech_imix_reload</manual>
   </info>
   <controller id="DJ-Tech i-Mix Reload">
     <scriptfiles>

res/controllers/DJTechTools MIDI Fighter.midi.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <MixxxMIDIPreset schemaVersion="1" mixxxVersion="1.8.0+">
   <info>
-    <name>DJTechTools MIDIFighter</name>
+    <name>DJ TechTools MIDI Fighter</name>
     <author>RJ Ryan</author>
-    <description>Mapping for DJTechTools MIDIFighter Controller</description>
+    <description>Mapping for DJ TechTools MIDI Fighter Classic Controller</description>
+    <manual>dj_techtools_midi_figher_classic</manual>
   </info>
   <controller id="DJTechTools MIDIFighter" port="">
     <scriptfiles>

res/controllers/Denon DN HS5500.midi.xml

@@ -4,7 +4,7 @@
         <name>Denon HS5500</name>
         <author>Owen Williams</author>
         <forums>http://www.mixxx.org/forums/viewtopic.php?f=7&amp;t=6547</forums>
-        <wiki></wiki>
+        <manual>denon_dn_hs5500</manual>
     </info>
     <controller id="DN-HS5500">
         <scriptfiles>

res/controllers/Denon DN SC2000.midi.xml

@@ -3,6 +3,7 @@
           <name>Denon DN SC2000</name>
           <author>Jan Riewe, Moba</author>
           <forums>http://www.mixxx.org/forums/viewtopic.php?f=7&amp;t=2048</forums>
+          <manual>denon_dn_sc2000</manual>
     </info>
     <controller id="Denon DN-SC2000">
         <scriptfiles>

res/controllers/Denon MC3000.midi.xml

@@ -4,6 +4,7 @@
         <name>Denon MC3000 v0.995</name>
         <author>BeMixxx</author>
         <description>Optimized for Denon MC3000 - Default Midi Channel</description>
+        <manual>denon_mc3000</manual>
     </info>
     <controller id="MC3000 MIDI 1">    
     <scriptfiles>

res/controllers/Denon MC4000.midi.xml

@@ -4,7 +4,8 @@
         <name>Denon MC4000</name>
         <author>Tim Rae</author>
         <description>2-deck mapping for Denon MC4000 controller</description>
-        <forums>http://mixxx.org/forums/viewtopic.php?f=7&amp;t=7443</forums>
+        <forums>https://mixxx.discourse.group/t/denon-mc4000-mapping/15311</forums>
+        <manual>denon_mc4000</manual>
     </info>
     <controller id="MC4000">
         <scriptfiles>

res/controllers/Denon-MC6000MK2.midi.xml

@@ -4,7 +4,7 @@
         <name>Denon MC6000MK2</name>
         <author>Uwe Klotz a/k/a tapir</author>
         <forums>http://www.mixxx.org/forums/viewtopic.php?f=7&amp;t=6251</forums>
-        <wiki>http://www.mixxx.org/wiki/doku.php/denon_mc6000mk2</wiki>
+        <manual>denon_mc6000mk2</manual>
     </info>
     <controller id="MC6000MK2">
         <scriptfiles>

res/controllers/Denon-MC7000.midi.xml

@@ -5,7 +5,7 @@
     	<author>OsZ</author>
     	<description>Denon MC7000 mapping. Check your Linux Kernel version to get the Audio Interface working - see WIKI page.</description>
     	<forums>https://www.mixxx.org/forums/</forums>
-    	<wiki>https://www.mixxx.org/wiki/doku.php/denon_mc7000</wiki>
+        <manual>denon_mc7000</manual>
     </info>
     <controller id="DENON">
         <scriptfiles>

res/controllers/EKS Otus.hid.xml

@@ -4,6 +4,7 @@
         <name>EKS Otus HID</name>
         <author>Ilkka Tuohela</author>
         <description>HID mapping for EKS Otus controllers</description>
+        <manual>eks_otus</manual>
         <devices>
             <product protocol="hid" vendor_id="0x1157" product_id="0x300" usage_page="0xffa0" usage="0x1" interface_number="0x3" />
         </devices>

res/controllers/Electrix Tweaker.midi.xml

@@ -22,7 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
         <name>Electrix Tweaker</name>
         <author>Be</author>
         <description>4-deck mapping for Electrix Tweaker with EQ and loop modes</description>
-        <forums>http://mixxx.org/forums/viewtopic.php?f=7&amp;t=7189</forums>
+        <forums>https://mixxx.discourse.group/t/electrix-tweaker-mapping/15071</forums>
+        <manual>electrix_tweaker</manual>
     </info>
     <controller id="Tweaker">
         <scriptfiles>

res/controllers/Evolution_Xsession.midi.xml

@@ -4,6 +4,7 @@
     <name>Evolution X-Session</name>
     <author>Amias Channer</author>
     <description>MIDI Mapping for Evolution X-Session</description>
+    <manual>evolution_x_session</manual>
   </info>
   <controller id="Evolution Xsession" port="Port">
     <controls>

res/controllers/FaderFoxDJ2.midi.xml

@@ -4,7 +4,7 @@
     <name>FaderFox DJ2</name>
     <author>Sacha Berger, Gosseyn</author>
     <description>MIDI Mapping for FaderFoxDJ2</description>
-    <wiki>http://www.mixxx.org/wiki/doku.php/faderfox_dj2</wiki>
+    <manual>faderfox_dj2</manual>
   </info>
   <controller id="FaderFoxDJ2" port="Port">
     <controls>

res/controllers/Gemini CDMP-7000 L audio.midi.xml

@@ -4,7 +4,8 @@
       <name>Gemini CDMP-7000 L</name>
       <author>djtrinidad</author>
       <description>Gemini CDMP-7000 mapping for Deck 1</description>
-      <forums>http://mixxx.org/forums/viewtopic.php?f=7&amp;t=6535</forums>
+      <forums>https://mixxx.discourse.group/t/gemini-cdmp-7000-mapping/14482</forums>
+      <manual>gemini_cdmp_7000</manual>
     </info>
     <controller id="gemini">
         <scriptfiles>

res/controllers/Gemini CDMP-7000 R audio.midi.xml

@@ -4,7 +4,8 @@
       <name>Gemini CDMP-7000 R</name>
       <author>djtrinidad</author>
       <description>Gemini CDMP-7000 mapping for Deck 2</description>
-      <forums>http://mixxx.org/forums/viewtopic.php?f=7&amp;t=6535</forums>
+      <forums>https://mixxx.discourse.group/t/gemini-cdmp-7000-mapping/14482</forums>
+      <manual>gemini_cdmp_7000</manual>
     </info>
     <controller id="gemini">
         <scriptfiles>

res/controllers/Gemini FirstMix.midi.xml

@@ -3,6 +3,7 @@
       <name>Gemini FirstMix</name>
       <author>mcsquared88</author>
       <forums>http://www.mixxx.org/forums/viewtopic.php?f=7&amp;t=3884</forums>
+      <manual>gemini_firstmix</manual>
     </info>
     <controller id=" firstmix  ">
         <scriptfiles>

res/controllers/Hercules DJ Console 4-Mx.midi.xml

@@ -5,7 +5,7 @@
         <author>josepma</author>
         <description>Hercules DJ Console 4-Mx 2017-12-16</description>
         <forums>http://www.mixxx.org/forums/viewtopic.php?f=7&amp;t=3023</forums>
-        <wiki>http://mixxx.org/wiki/doku.php/hercules_dj_console_4-mx</wiki>
+        <manual>hercules_dj_console_4_mx</manual>
     </info>
     <controller id="DJ">
         <scriptfiles>

res/controllers/Hercules DJ Console Mac Edition.midi.xml

@@ -4,6 +4,7 @@
     <name>Hercules DJ Console Mac Edition</name>
     <author>Daniel Svensson</author>
     <description>MIDI Mapping for Hercules DJ Console (Mac Edition)</description>
+    <manual>hercules_dj_console_mac_edition</manual>
   </info>
   <controller id="Hercules DJ Console Mac Edition" port="Port">
     <controls>

res/controllers/Hercules DJ Console Mk1.hid.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <MixxxControllerPreset schemaVersion="1">
     <info>
-        <name>Hercules DJ Console Mk1 HID</name>
+        <name>Hercules DJ Console MK1</name>
         <author>zestoi changes for mk1 by ewanuno</author>
-        <description>Native high-resolution HID script for the Hercules DJ Console Mk1 controller.</description>
+        <description>Native high-resolution HID script for the Hercules DJ Console MK1 controller.</description>
         <forums>http://www.mixxx.org/forums/viewtopic.php?f=7&amp;t=4081</forums>
+        <manual>hercules_dj_console_mk1</manual>
     </info>
     <controller id="Hercules DJ Console Mk1 HID">
         <scriptfiles>

res/controllers/Hercules DJ Console Mk2.hid.xml

@@ -4,6 +4,7 @@
         <name>Hercules DJ Console MK2 HID</name>
         <author>zestoi</author>
         <description>Native high-resolution HID script for the Hercules DJ Console MK2 controller.</description>
+        <manual>hercules_dj_console_mk2</manual>
     </info>
     <controller id="Hercules DJ Console MK2 HID">
         <scriptfiles>

res/controllers/Hercules DJ Console Mk2.midi.xml

@@ -4,6 +4,7 @@
     <name>Hercules DJ Console Mk2</name>
     <author>Garth Dahlstrom</author>
     <description>This is a complete mapping for a Hercules DJ Console Mk2.</description>
+    <manual>hercules_dj_console_mk2</manual>
   </info>
   <controller id="Hercules DJ Console Mk2 MIDI">
     <scriptfiles>

res/controllers/Hercules DJ Console Mk4.midi.xml

@@ -5,6 +5,7 @@
         <author>Dj kork</author>
         <description>This is a complete mapping for Hercules DJ Console mk4 controller. Requires scripting.</description>
         <forums>http://www.mixxx.org/forums/viewtopic.php?f=7&amp;t=3023</forums>
+        <manual>hercules_dj_console_mk4</manual>
     </info>
     <controller id="Hercules DJ Control Mk4 gain v3" port="">
         <scriptfiles>