diff --git a/res/controllers/Akai MPD24.midi.xml b/res/controllers/Akai MPD24.midi.xml index 9cf70dbe91c..167c91964b5 100644 --- a/res/controllers/Akai MPD24.midi.xml +++ b/res/controllers/Akai MPD24.midi.xml @@ -4,7 +4,8 @@ Akai MPD24 klico MIDI mapping for Akai MPD24 - http://mixxx.org/forums/viewtopic.php?f=7&t=39 + https://mixxx.discourse.group/t/akai-mpd24-midi-setup/9020 + akai_mpd24 diff --git a/res/controllers/Akai-LPD8-RK.midi.xml b/res/controllers/Akai-LPD8-RK.midi.xml index 9b1f39a5261..34811f8babd 100644 --- a/res/controllers/Akai-LPD8-RK.midi.xml +++ b/res/controllers/Akai-LPD8-RK.midi.xml @@ -1,10 +1,11 @@ - Akai LPD8 - RK + Akai LPD8 Rob K 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 - http://mixxx.org/forums/viewtopic.php?f=7&t=4477 + https://mixxx.discourse.group/t/akai-lpd8-mapping-4-decks-30-hotcues-loops-etc-v2/13064 + akai_lpd8 diff --git a/res/controllers/Allen and Heath Xone K2.midi.xml b/res/controllers/Allen and Heath Xone K2.midi.xml index 32e65f75a76..38769d0ac30 100644 --- a/res/controllers/Allen and Heath Xone K2.midi.xml +++ b/res/controllers/Allen and Heath Xone K2.midi.xml @@ -3,7 +3,7 @@ Allen&Heath Xone K2/K1 Be - https://mixxx.org/wiki/doku.php/allen_heath_xone_k2 + allen_heath_xone_k2_k1 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: diff --git a/res/controllers/American Audio RADIUS 2000 CH1.midi.xml b/res/controllers/American Audio RADIUS 2000 CH1.midi.xml index da4ba8d2258..7c86ab6248e 100644 --- a/res/controllers/American Audio RADIUS 2000 CH1.midi.xml +++ b/res/controllers/American Audio RADIUS 2000 CH1.midi.xml @@ -3,6 +3,7 @@ American Audio Radius 2000 CH1 Markus Steinbauer American Audio Radius 2000 mapping for Deck 1 + american_audio_radius_2000 diff --git a/res/controllers/American Audio RADIUS 2000 CH2.midi.xml b/res/controllers/American Audio RADIUS 2000 CH2.midi.xml index f1ee362fbce..a307b050c1b 100644 --- a/res/controllers/American Audio RADIUS 2000 CH2.midi.xml +++ b/res/controllers/American Audio RADIUS 2000 CH2.midi.xml @@ -3,6 +3,7 @@ American Audio Radius 2000 CH2 Markus Steinbauer American Audio Radius 2000 mapping for Deck 2 + american_audio_radius_2000 diff --git a/res/controllers/American Audio VMS2.midi.xml b/res/controllers/American Audio VMS2.midi.xml index b61abe00301..58d22a26cef 100644 --- a/res/controllers/American Audio VMS2.midi.xml +++ b/res/controllers/American Audio VMS2.midi.xml @@ -4,8 +4,8 @@ American Audio VMS2 Stefan Nuernberger MIDI mapping for the American Audio VMS2 controller. - https://www.mixxx.org/wiki/doku.php/american_audio_vms2 http://www.mixxx.org/forums/viewtopic.php?f=7&t=3202 + american_audio_vms2 diff --git a/res/controllers/American Audio VMS4.midi.xml b/res/controllers/American Audio VMS4.midi.xml index e1b83a2fc9d..c1593bdb471 100644 --- a/res/controllers/American Audio VMS4.midi.xml +++ b/res/controllers/American Audio VMS4.midi.xml @@ -3,9 +3,9 @@ American Audio VMS4/4.1 Anders Gunnarsson & Sean M. Pappalardo - http://mixxx.org/wiki/doku.php/american_audio_vms4 2-deck control/4-deck mixer preset for Mixxx 2.1. Assumes "Post EQ" mode. (See Wiki for full setup instructions.) + american_audio_vms4 diff --git a/res/controllers/Behringer BCD2000.midi.xml b/res/controllers/Behringer BCD2000.midi.xml index 2894bc746ef..7e06ce0171b 100644 --- a/res/controllers/Behringer BCD2000.midi.xml +++ b/res/controllers/Behringer BCD2000.midi.xml @@ -4,6 +4,7 @@ Golzo MIDI mapping for Behringer BCD2000 mixer http://www.mixxx.org/forums/viewtopic.php?f=7&t=3563 + behringer_b_control_deejay_bcd2000 diff --git a/res/controllers/Behringer BCD3000 Advanced.midi.xml b/res/controllers/Behringer BCD3000 Advanced.midi.xml index 614d61e389e..32a22419346 100644 --- a/res/controllers/Behringer BCD3000 Advanced.midi.xml +++ b/res/controllers/Behringer BCD3000 Advanced.midi.xml @@ -4,6 +4,7 @@ Joachim Advanced preset for BCD3000. See forums for more information. http://www.mixxx.org/forums/viewtopic.php?f=7&t=4013 + behringer_b_control_deejay_bcd3000 diff --git a/res/controllers/Behringer BCD3000.midi.xml b/res/controllers/Behringer BCD3000.midi.xml index 054ac53e1bf..53b65cf920c 100644 --- a/res/controllers/Behringer BCD3000.midi.xml +++ b/res/controllers/Behringer BCD3000.midi.xml @@ -3,7 +3,7 @@ Behringer BCD3000 Aposto MIDI Mapping for Behringer BCD3000 - http://mixxx.org/forums/viewtopic.php?f=3&t=845 + https://mixxx.discourse.group/t/behringer-bcd3000/10194 diff --git a/res/controllers/Behringer CMD MM1.midi.xml b/res/controllers/Behringer CMD MM1.midi.xml index f2ef597384c..7e35c02e7a5 100644 --- a/res/controllers/Behringer CMD MM1.midi.xml +++ b/res/controllers/Behringer CMD MM1.midi.xml @@ -10,7 +10,7 @@ Swiftb0y 4 deck mapping with options for controlling effect units. Refer to the Mixxx wiki page for how to configure it to control effect units. https://www.mixxx.org/forums/viewtopic.php?f=7&t=9276 - https://mixxx.org/wiki/doku.php/behringer_cmd_mm-1 + behringer_cmd_mm_1 diff --git a/res/controllers/Behringer CMD Micro.midi.xml b/res/controllers/Behringer CMD Micro.midi.xml index facb1f46b6e..d1cc0d23ad0 100644 --- a/res/controllers/Behringer CMD Micro.midi.xml +++ b/res/controllers/Behringer CMD Micro.midi.xml @@ -1,8 +1,9 @@ - Behringer CMD Micro (tecywiz121) + Behringer CMD Micro tecywiz121 + behringer_cmd_micro diff --git a/res/controllers/Behringer CMDStudio4a.midi.xml b/res/controllers/Behringer CMDStudio4a.midi.xml index ba51a19a80a..b94596f8809 100644 --- a/res/controllers/Behringer CMDStudio4a.midi.xml +++ b/res/controllers/Behringer CMDStudio4a.midi.xml @@ -4,8 +4,8 @@ Behringer CMD STUDIO 4a Craig Easton Controller mapping for the Behringer CMD STUDIO 4a. V 1.4 Created Jan 2016 for Mixxx 2.0.0 - http://www.mixxx.org/wiki/doku.php/behringer_cmd_studio_4a http://www.mixxx.org/forums/viewtopic.php?f=7&t=7868 + behringer_cmd_studio_4a diff --git a/res/controllers/DJ TechTools MIDI Fighter Twister.midi.xml b/res/controllers/DJ TechTools MIDI Fighter Twister.midi.xml index c83295c433a..273de7096ea 100644 --- a/res/controllers/DJ TechTools MIDI Fighter Twister.midi.xml +++ b/res/controllers/DJ TechTools MIDI Fighter Twister.midi.xml @@ -4,7 +4,7 @@ DJ TechTools MIDI Fighter Twister tock203 for 2 deck use - https://www.mixxx.org/wiki/doku.php/dj_tech_tools_midi_fighter_twister + dj_techtools_midi_figher_twister diff --git a/res/controllers/DJ-Tech CDJ-101.midi.xml b/res/controllers/DJ-Tech CDJ-101.midi.xml index 60d8f036520..cc7cc6d1bca 100644 --- a/res/controllers/DJ-Tech CDJ-101.midi.xml +++ b/res/controllers/DJ-Tech CDJ-101.midi.xml @@ -5,6 +5,7 @@ zestoi 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. http://www.mixxx.org/forums/viewtopic.php?f=7&t=3693 + dj_tech_cdj_101 diff --git a/res/controllers/DJ-Tech DJM-101.midi.xml b/res/controllers/DJ-Tech DJM-101.midi.xml index 6a5f2fc90c4..c1b09a43ee6 100644 --- a/res/controllers/DJ-Tech DJM-101.midi.xml +++ b/res/controllers/DJ-Tech DJM-101.midi.xml @@ -5,6 +5,7 @@ zestoi Mapping with full led feedback for the DJ-Tech DJM-101 http://www.mixxx.org/forums/viewtopic.php?f=7&t=3693 + dj_tech_djm_101 diff --git a/res/controllers/DJ-Tech Kontrol One.midi.xml b/res/controllers/DJ-Tech Kontrol One.midi.xml index 693e4be18f9..47d3c328d99 100644 --- a/res/controllers/DJ-Tech Kontrol One.midi.xml +++ b/res/controllers/DJ-Tech Kontrol One.midi.xml @@ -4,7 +4,8 @@ DJ-Tech Kontrol One Rob K Mapping for the DJ Tech Kontrol One modular scratch controller. Provides controls for Channel1 through Channel4. March 2013. - http://mixxx.org/forums/viewtopic.php?f=7&t=4863 + https://mixxx.discourse.group/t/dj-tech-kontrol-one-mapping-hotcue-loops-saves-loops-etc/13299 + dj_tech_kontrol_one diff --git a/res/controllers/DJ-Tech Mix-101.midi.xml b/res/controllers/DJ-Tech Mix-101.midi.xml index 71df95b8eed..25d27b78227 100644 --- a/res/controllers/DJ-Tech Mix-101.midi.xml +++ b/res/controllers/DJ-Tech Mix-101.midi.xml @@ -1,9 +1,10 @@ - DJ-Tech Mix-101 + DJ-Tech MIX-101 rasda - Midi mapping for DJ-Tech Mix-101 - http://mixxx.org/forums/viewtopic.php?f=7&t=3981 + MIDI mapping for DJ-Tech MIX-101 + https://mixxx.discourse.group/t/dj-tech-mix-101-mapping/12679 + dj_tech_mix_101 diff --git a/res/controllers/DJ-Tech Mixer One.midi.xml b/res/controllers/DJ-Tech Mixer One.midi.xml index 8b77020553d..8e09da443cf 100644 --- a/res/controllers/DJ-Tech Mixer One.midi.xml +++ b/res/controllers/DJ-Tech Mixer One.midi.xml @@ -5,6 +5,7 @@ Rob K 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. http://www.mixxx.org/forums/viewtopic.php?f=7&t=4693 + dj_tech_mixer_one diff --git a/res/controllers/DJ-Tech i-Mix Reload.midi.xml b/res/controllers/DJ-Tech i-Mix Reload.midi.xml index ca7a9056503..9096d9f3cc3 100644 --- a/res/controllers/DJ-Tech i-Mix Reload.midi.xml +++ b/res/controllers/DJ-Tech i-Mix Reload.midi.xml @@ -3,7 +3,8 @@ DJ-Tech i-Mix Reload vininim MIDI mapping for DJ-Tech i-Mix Reload - http://mixxx.org/forums/viewtopic.php?f=7&t=1637 + https://mixxx.discourse.group/t/dj-tech-i-mix-reload-mapping-for-trunk-as-of-date-of-post/10776 + dj_tech_imix_reload diff --git a/res/controllers/DJTechTools MIDI Fighter.midi.xml b/res/controllers/DJTechTools MIDI Fighter.midi.xml index 4f467035dd3..e65e0000642 100644 --- a/res/controllers/DJTechTools MIDI Fighter.midi.xml +++ b/res/controllers/DJTechTools MIDI Fighter.midi.xml @@ -1,9 +1,10 @@ - DJTechTools MIDIFighter + DJ TechTools MIDI Fighter RJ Ryan - Mapping for DJTechTools MIDIFighter Controller + Mapping for DJ TechTools MIDI Fighter Classic Controller + dj_techtools_midi_figher_classic diff --git a/res/controllers/Denon DN HS5500.midi.xml b/res/controllers/Denon DN HS5500.midi.xml index 1895d2c4b86..b11e6289133 100644 --- a/res/controllers/Denon DN HS5500.midi.xml +++ b/res/controllers/Denon DN HS5500.midi.xml @@ -4,7 +4,7 @@ Denon HS5500 Owen Williams http://www.mixxx.org/forums/viewtopic.php?f=7&t=6547 - + denon_dn_hs5500 diff --git a/res/controllers/Denon DN SC2000.midi.xml b/res/controllers/Denon DN SC2000.midi.xml index badd5cf6662..b751863ffc3 100644 --- a/res/controllers/Denon DN SC2000.midi.xml +++ b/res/controllers/Denon DN SC2000.midi.xml @@ -3,6 +3,7 @@ Denon DN SC2000 Jan Riewe, Moba http://www.mixxx.org/forums/viewtopic.php?f=7&t=2048 + denon_dn_sc2000 diff --git a/res/controllers/Denon MC3000.midi.xml b/res/controllers/Denon MC3000.midi.xml index 20f12def9ff..c8ca92d7df1 100644 --- a/res/controllers/Denon MC3000.midi.xml +++ b/res/controllers/Denon MC3000.midi.xml @@ -4,6 +4,7 @@ Denon MC3000 v0.995 BeMixxx Optimized for Denon MC3000 - Default Midi Channel + denon_mc3000 diff --git a/res/controllers/Denon MC4000.midi.xml b/res/controllers/Denon MC4000.midi.xml index 9b0480db3c2..c0109240f2a 100644 --- a/res/controllers/Denon MC4000.midi.xml +++ b/res/controllers/Denon MC4000.midi.xml @@ -4,7 +4,8 @@ Denon MC4000 Tim Rae 2-deck mapping for Denon MC4000 controller - http://mixxx.org/forums/viewtopic.php?f=7&t=7443 + https://mixxx.discourse.group/t/denon-mc4000-mapping/15311 + denon_mc4000 diff --git a/res/controllers/Denon-MC6000MK2.midi.xml b/res/controllers/Denon-MC6000MK2.midi.xml index 6cfad3f3eb8..eb913c35f91 100644 --- a/res/controllers/Denon-MC6000MK2.midi.xml +++ b/res/controllers/Denon-MC6000MK2.midi.xml @@ -4,7 +4,7 @@ Denon MC6000MK2 Uwe Klotz a/k/a tapir http://www.mixxx.org/forums/viewtopic.php?f=7&t=6251 - http://www.mixxx.org/wiki/doku.php/denon_mc6000mk2 + denon_mc6000mk2 diff --git a/res/controllers/Denon-MC7000.midi.xml b/res/controllers/Denon-MC7000.midi.xml index 7614768b561..42b470298e1 100644 --- a/res/controllers/Denon-MC7000.midi.xml +++ b/res/controllers/Denon-MC7000.midi.xml @@ -5,7 +5,7 @@ OsZ Denon MC7000 mapping. Check your Linux Kernel version to get the Audio Interface working - see WIKI page. https://www.mixxx.org/forums/ - https://www.mixxx.org/wiki/doku.php/denon_mc7000 + denon_mc7000 diff --git a/res/controllers/EKS Otus.hid.xml b/res/controllers/EKS Otus.hid.xml index 2456a05932a..674d5ad15e7 100644 --- a/res/controllers/EKS Otus.hid.xml +++ b/res/controllers/EKS Otus.hid.xml @@ -4,6 +4,7 @@ EKS Otus HID Ilkka Tuohela HID mapping for EKS Otus controllers + eks_otus diff --git a/res/controllers/Electrix Tweaker.midi.xml b/res/controllers/Electrix Tweaker.midi.xml index f74025583b1..d631e056555 100644 --- a/res/controllers/Electrix Tweaker.midi.xml +++ b/res/controllers/Electrix Tweaker.midi.xml @@ -22,7 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Electrix Tweaker Be 4-deck mapping for Electrix Tweaker with EQ and loop modes - http://mixxx.org/forums/viewtopic.php?f=7&t=7189 + https://mixxx.discourse.group/t/electrix-tweaker-mapping/15071 + electrix_tweaker diff --git a/res/controllers/Evolution_Xsession.midi.xml b/res/controllers/Evolution_Xsession.midi.xml index 8b2bac579af..7a7620fc113 100644 --- a/res/controllers/Evolution_Xsession.midi.xml +++ b/res/controllers/Evolution_Xsession.midi.xml @@ -4,6 +4,7 @@ Evolution X-Session Amias Channer MIDI Mapping for Evolution X-Session + evolution_x_session diff --git a/res/controllers/FaderFoxDJ2.midi.xml b/res/controllers/FaderFoxDJ2.midi.xml index 5f6a5b1e3fe..003872e9cb3 100644 --- a/res/controllers/FaderFoxDJ2.midi.xml +++ b/res/controllers/FaderFoxDJ2.midi.xml @@ -4,7 +4,7 @@ FaderFox DJ2 Sacha Berger, Gosseyn MIDI Mapping for FaderFoxDJ2 - http://www.mixxx.org/wiki/doku.php/faderfox_dj2 + faderfox_dj2 diff --git a/res/controllers/Gemini CDMP-7000 L audio.midi.xml b/res/controllers/Gemini CDMP-7000 L audio.midi.xml index 170fd4161a6..73de6cebf0f 100644 --- a/res/controllers/Gemini CDMP-7000 L audio.midi.xml +++ b/res/controllers/Gemini CDMP-7000 L audio.midi.xml @@ -4,7 +4,8 @@ Gemini CDMP-7000 L djtrinidad Gemini CDMP-7000 mapping for Deck 1 - http://mixxx.org/forums/viewtopic.php?f=7&t=6535 + https://mixxx.discourse.group/t/gemini-cdmp-7000-mapping/14482 + gemini_cdmp_7000 diff --git a/res/controllers/Gemini CDMP-7000 R audio.midi.xml b/res/controllers/Gemini CDMP-7000 R audio.midi.xml index 40a9eaf11e7..28e3abaf91c 100644 --- a/res/controllers/Gemini CDMP-7000 R audio.midi.xml +++ b/res/controllers/Gemini CDMP-7000 R audio.midi.xml @@ -4,7 +4,8 @@ Gemini CDMP-7000 R djtrinidad Gemini CDMP-7000 mapping for Deck 2 - http://mixxx.org/forums/viewtopic.php?f=7&t=6535 + https://mixxx.discourse.group/t/gemini-cdmp-7000-mapping/14482 + gemini_cdmp_7000 diff --git a/res/controllers/Gemini FirstMix.midi.xml b/res/controllers/Gemini FirstMix.midi.xml index 2fabc6d2b83..bafefdb95e1 100644 --- a/res/controllers/Gemini FirstMix.midi.xml +++ b/res/controllers/Gemini FirstMix.midi.xml @@ -3,6 +3,7 @@ Gemini FirstMix mcsquared88 http://www.mixxx.org/forums/viewtopic.php?f=7&t=3884 + gemini_firstmix diff --git a/res/controllers/Hercules DJ Console 4-Mx.midi.xml b/res/controllers/Hercules DJ Console 4-Mx.midi.xml index 419ad501ace..683d2626cc2 100644 --- a/res/controllers/Hercules DJ Console 4-Mx.midi.xml +++ b/res/controllers/Hercules DJ Console 4-Mx.midi.xml @@ -5,7 +5,7 @@ josepma Hercules DJ Console 4-Mx 2017-12-16 http://www.mixxx.org/forums/viewtopic.php?f=7&t=3023 - http://mixxx.org/wiki/doku.php/hercules_dj_console_4-mx + hercules_dj_console_4_mx diff --git a/res/controllers/Hercules DJ Console Mac Edition.midi.xml b/res/controllers/Hercules DJ Console Mac Edition.midi.xml index 8c7810f8de5..d9f3a072026 100644 --- a/res/controllers/Hercules DJ Console Mac Edition.midi.xml +++ b/res/controllers/Hercules DJ Console Mac Edition.midi.xml @@ -4,6 +4,7 @@ Hercules DJ Console Mac Edition Daniel Svensson MIDI Mapping for Hercules DJ Console (Mac Edition) + hercules_dj_console_mac_edition diff --git a/res/controllers/Hercules DJ Console Mk1.hid.xml b/res/controllers/Hercules DJ Console Mk1.hid.xml index 2e580fa2e23..8237a268842 100644 --- a/res/controllers/Hercules DJ Console Mk1.hid.xml +++ b/res/controllers/Hercules DJ Console Mk1.hid.xml @@ -1,10 +1,11 @@ - Hercules DJ Console Mk1 HID + Hercules DJ Console MK1 zestoi changes for mk1 by ewanuno - Native high-resolution HID script for the Hercules DJ Console Mk1 controller. + Native high-resolution HID script for the Hercules DJ Console MK1 controller. http://www.mixxx.org/forums/viewtopic.php?f=7&t=4081 + hercules_dj_console_mk1 diff --git a/res/controllers/Hercules DJ Console Mk2.hid.xml b/res/controllers/Hercules DJ Console Mk2.hid.xml index 824cceb009b..3e0e0e66c8d 100644 --- a/res/controllers/Hercules DJ Console Mk2.hid.xml +++ b/res/controllers/Hercules DJ Console Mk2.hid.xml @@ -4,6 +4,7 @@ Hercules DJ Console MK2 HID zestoi Native high-resolution HID script for the Hercules DJ Console MK2 controller. + hercules_dj_console_mk2 diff --git a/res/controllers/Hercules DJ Console Mk2.midi.xml b/res/controllers/Hercules DJ Console Mk2.midi.xml index 8aed0aaedf6..6f82444cca5 100644 --- a/res/controllers/Hercules DJ Console Mk2.midi.xml +++ b/res/controllers/Hercules DJ Console Mk2.midi.xml @@ -4,6 +4,7 @@ Hercules DJ Console Mk2 Garth Dahlstrom This is a complete mapping for a Hercules DJ Console Mk2. + hercules_dj_console_mk2 diff --git a/res/controllers/Hercules DJ Console Mk4.midi.xml b/res/controllers/Hercules DJ Console Mk4.midi.xml index a842d836509..ee70dd1e551 100644 --- a/res/controllers/Hercules DJ Console Mk4.midi.xml +++ b/res/controllers/Hercules DJ Console Mk4.midi.xml @@ -5,6 +5,7 @@ Dj kork This is a complete mapping for Hercules DJ Console mk4 controller. Requires scripting. http://www.mixxx.org/forums/viewtopic.php?f=7&t=3023 + hercules_dj_console_mk4 diff --git a/res/controllers/Hercules DJ Console RMX 2.midi.xml b/res/controllers/Hercules DJ Console RMX 2.midi.xml index 35e7315c259..803a972f0b3 100644 --- a/res/controllers/Hercules DJ Console RMX 2.midi.xml +++ b/res/controllers/Hercules DJ Console RMX 2.midi.xml @@ -3,9 +3,10 @@ schemaVersion="1"> - Hercules DJ Console RMX 2 + Hercules DJ Console RMX2 Circuitfry This console's mapping comes with a script. + hercules_dj_console_rmx2 diff --git a/res/controllers/Hercules DJ Console RMX Advanced.midi.xml b/res/controllers/Hercules DJ Console RMX Advanced.midi.xml index 773657d3e24..fd93d91817f 100644 --- a/res/controllers/Hercules DJ Console RMX Advanced.midi.xml +++ b/res/controllers/Hercules DJ Console RMX Advanced.midi.xml @@ -4,6 +4,7 @@ Hercules DJ Console RMX Advanced Anders Gunnarsson Hercules DJ Console RMX controller mapping with hotcues and loops, v1.9.0. Requires script v1.9.0 + hercules_dj_console_rmx diff --git a/res/controllers/Hercules DJ Console RMX.hid.xml b/res/controllers/Hercules DJ Console RMX.hid.xml index ef4191f2c48..b80cf92a9ad 100644 --- a/res/controllers/Hercules DJ Console RMX.hid.xml +++ b/res/controllers/Hercules DJ Console RMX.hid.xml @@ -1,10 +1,11 @@ - Hercules DJ Console RMX HID + Hercules DJ Console RMX HID richterskala Native HID script for the Hercules DJ Console RMX controller. http://www.mixxx.org/forums/viewtopic.php?f=7&t=6134 + hercules_dj_console_rmx diff --git a/res/controllers/Hercules DJ Console RMX.midi.xml b/res/controllers/Hercules DJ Console RMX.midi.xml index 28ba70d3156..3d34784ec8f 100644 --- a/res/controllers/Hercules DJ Console RMX.midi.xml +++ b/res/controllers/Hercules DJ Console RMX.midi.xml @@ -4,6 +4,7 @@ Hercules DJ Console RMX Anders Gunnarsson Hercules DJ Console RMX controller mapping, v1.9.0. Requires script v1.9.0 + hercules_dj_console_rmx diff --git a/res/controllers/Hercules DJ Control AIR.midi.xml b/res/controllers/Hercules DJ Control AIR.midi.xml index a7d09b055fa..01436ebc624 100644 --- a/res/controllers/Hercules DJ Control AIR.midi.xml +++ b/res/controllers/Hercules DJ Control AIR.midi.xml @@ -4,6 +4,7 @@ rojaro Mapping for Hercules DJ Control AIR http://www.mixxx.org/forums/viewtopic.php?f=7&t=3263 + hercules_djcontrol_air diff --git a/res/controllers/Hercules DJ Control Instinct.midi.xml b/res/controllers/Hercules DJ Control Instinct.midi.xml index f9a894069c2..2e007dbf87e 100644 --- a/res/controllers/Hercules DJ Control Instinct.midi.xml +++ b/res/controllers/Hercules DJ Control Instinct.midi.xml @@ -3,8 +3,8 @@ Hercules DJ Control Instinct Mich Wyser - http://mixxx.org/wiki/doku.php/hercules_dj_control_instinct http://www.mixxx.org/forums/viewtopic.php?f=7&t=3907 + hercules_djcontrol_instinct diff --git a/res/controllers/Hercules DJ Control MP3 e2.bulk.xml b/res/controllers/Hercules DJ Control MP3 e2.bulk.xml index ca32045a423..f0ea42887dd 100644 --- a/res/controllers/Hercules DJ Control MP3 e2.bulk.xml +++ b/res/controllers/Hercules DJ Control MP3 e2.bulk.xml @@ -4,6 +4,7 @@ Hercules DJ Control MP3 e2 / MP3 LE / Glow Neale Pickett Hercules DJ Control MP3 e2 / MP3 LE / Glow mapping. These three controllers have identical controls and share the same mapping. + hercules_djcontrol_mp3_e2 diff --git a/res/controllers/Hercules DJ Control MP3 e2.midi.xml b/res/controllers/Hercules DJ Control MP3 e2.midi.xml index c2837500e5e..5559cdd43e6 100644 --- a/res/controllers/Hercules DJ Control MP3 e2.midi.xml +++ b/res/controllers/Hercules DJ Control MP3 e2.midi.xml @@ -4,8 +4,8 @@ Hercules DJ Control MP3 e2 / MP3 LE / Glow Gianfe, Taucher and SBlaisot Hercules DJ Control MP3 e2 / MP3 LE / Glow mapping. These three controllers have identical controls and share the same mapping. - http://www.mixxx.org/wiki/doku.php/hercules_dj_control_mp3_e2 - http://mixxx.org/forums/viewtopic.php?f=7&t=7173 + https://mixxx.discourse.group/t/hercules-dj-control-mp3-e2-4-deck-mapping-for-mixxx-1-12/15056 + hercules_djcontrol_mp3_e2 diff --git a/res/controllers/Hercules DJ Control MP3.hid.xml b/res/controllers/Hercules DJ Control MP3.hid.xml index 664de3a0d3e..2eab09cf8d3 100644 --- a/res/controllers/Hercules DJ Control MP3.hid.xml +++ b/res/controllers/Hercules DJ Control MP3.hid.xml @@ -5,7 +5,8 @@ Shalty Adaptation for the MP3 reusing the work on the Mk1 by zestoy/ewanuno Native HID script for the Hercules DJ Control MP3 controller. - http://mixxx.org/forums/viewtopic.php?f=1&t=4966 + https://mixxx.discourse.group/t/hid-output-not-working-with-hercules-dj-control-windows/13365 + hercules_djcontrol_mp3 diff --git a/res/controllers/Hercules DJ Control MP3.midi.xml b/res/controllers/Hercules DJ Control MP3.midi.xml index 82fc7277d9e..87dd5c119a0 100644 --- a/res/controllers/Hercules DJ Control MP3.midi.xml +++ b/res/controllers/Hercules DJ Control MP3.midi.xml @@ -4,7 +4,7 @@ Hercules DJ Control MP3 Vittorio Colao Complete mapping for Hercules DJ Control MP3. - + hercules_djcontrol_mp3 diff --git a/res/controllers/Hercules DJControl Compact.midi.xml b/res/controllers/Hercules DJControl Compact.midi.xml index 29260add805..75cb4f7b508 100644 --- a/res/controllers/Hercules DJControl Compact.midi.xml +++ b/res/controllers/Hercules DJControl Compact.midi.xml @@ -7,7 +7,7 @@ who want the labeled "mid" knob to adjust high eq instead may use the MIDI wizard to remap it, or edit the controller XML file directly to change this setting. - http://mixxx.org/wiki/doku.php/djcontrol_compact + hercules_djcontrol_compact diff --git a/res/controllers/Hercules DJControl Starlight.midi.xml b/res/controllers/Hercules DJControl Starlight.midi.xml index 3ba160468e5..a33e8e83259 100644 --- a/res/controllers/Hercules DJControl Starlight.midi.xml +++ b/res/controllers/Hercules DJControl Starlight.midi.xml @@ -4,8 +4,8 @@ Hercules DJControl Starlight DJ Phatso for Hercules Technical Support, contributions by Kerrick Staley MIDI Preset for Hercules DJControl Starlight - https://mixxx.org/wiki/doku.php/hercules_dj_control_starlight - https://mixxx.org/forums/viewtopic.php?f=7&t=12570 + https://mixxx.discourse.group/t/hercules-djcontrol-starlight/17833 + hercules_djcontrol_starlight diff --git a/res/controllers/Hercules P32 DJ.midi.xml b/res/controllers/Hercules P32 DJ.midi.xml index 203ac3aff2c..bfda4b015ae 100644 --- a/res/controllers/Hercules P32 DJ.midi.xml +++ b/res/controllers/Hercules P32 DJ.midi.xml @@ -4,8 +4,8 @@ Hercules P32 DJ Be 4-deck mapping for Hercules P32 controller - http://mixxx.org/forums/viewtopic.php?f=7&t=8132 - http://mixxx.org/wiki/doku.php/hercules_p32_dj + https://mixxx.discourse.group/t/hercules-p32-dj-controller-mapping/15804 + hercules_p32_dj diff --git a/res/controllers/Ion Discover DJ.midi.xml b/res/controllers/Ion Discover DJ.midi.xml index 188ec3dfc07..fac10664805 100644 --- a/res/controllers/Ion Discover DJ.midi.xml +++ b/res/controllers/Ion Discover DJ.midi.xml @@ -5,6 +5,7 @@ Rick Prokup This preset provides functionality for the Ion Discover DJ controller for Mixxx http://www.mixxx.org/forums/viewtopic.php?f=7&t=939 + ion_discover_dj diff --git a/res/controllers/KANE_QuNeo.midi.xml b/res/controllers/KANE_QuNeo.midi.xml index e7de4de8b8b..46c8383fb78 100644 --- a/res/controllers/KANE_QuNeo.midi.xml +++ b/res/controllers/KANE_QuNeo.midi.xml @@ -3,8 +3,8 @@ Keith McMillen Instruments QuNeo Daniel Leja This is a fully customized DJ mapping for the QuNeo, complete with beat-jumping and pulsing LED sequencers. - http://mixxx.org/forums/viewtopic.php?f=7&amp;t=4130&amp;sid=bc90140a4dc6e650e06dae0df8562604--> - https://github.com/wolfbiter/kane-quneo-mixxx + https://mixxx.discourse.group/viewtopic.php?f=7&amp;t=4130&amp;sid=bc90140a4dc6e650e06dae0df8562604--> + keith_mcmillen_quneo diff --git a/res/controllers/Kontrol Dj KDJ500.midi.xml b/res/controllers/Kontrol Dj KDJ500.midi.xml index 62c875e092c..89e5139dd0d 100644 --- a/res/controllers/Kontrol Dj KDJ500.midi.xml +++ b/res/controllers/Kontrol Dj KDJ500.midi.xml @@ -1,8 +1,9 @@ - Kontrol Dj KDJ500 + Kontrol DJ KDJ500 bonkhead and dnine http://www.mixxx.org/forums/viewtopic.php?f=7&t=1609 + kontrol_dj_kdj500 diff --git a/res/controllers/Korg nanoKONTROL 2.midi.xml b/res/controllers/Korg nanoKONTROL 2.midi.xml index 69f2c0afa21..2d0e517b82a 100644 --- a/res/controllers/Korg nanoKONTROL 2.midi.xml +++ b/res/controllers/Korg nanoKONTROL 2.midi.xml @@ -1,13 +1,13 @@ - Korg nanoKONTROL 2 + Korg nanoKONTROL2 Rob K Controller mapping for the Korg Nanokontrol 2. Intended to supplement a standard DJ controller setup. Dedicated volume faders, and a large variety of controls for eight decks. Gives access to a lot of controls that wouldn't normally have room to be mapped onto a standard controller. Created Feb 2013 for Mixxx 1.11. - http://www.mixxx.org/forums/viewtopic.php?f=7&t=4759 + korg_nanokontrol2 diff --git a/res/controllers/Korg nanoKONTROL.midi.xml b/res/controllers/Korg nanoKONTROL.midi.xml index 77710d2a8ae..63c406ec992 100644 --- a/res/controllers/Korg nanoKONTROL.midi.xml +++ b/res/controllers/Korg nanoKONTROL.midi.xml @@ -4,6 +4,7 @@ ePoxi You must load the scene file first. Download it from the forums. http://www.mixxx.org/forums/viewtopic.php?f=7&t=1999 + korg_nanokontrol diff --git a/res/controllers/Korg nanoPAD2.midi.xml b/res/controllers/Korg nanoPAD2.midi.xml index 7fa27c91666..e2ec3a237e6 100644 --- a/res/controllers/Korg nanoPAD2.midi.xml +++ b/res/controllers/Korg nanoPAD2.midi.xml @@ -4,7 +4,8 @@ Korg nanoPAD2 Rob K This is a mapping for a Korg nanoPAD2. It provides 16 hotcue controls for deck 1, 14 for deck 2, with the ability to clear each hotcue. Also provides loop controls, kill frequency switches, mute button, reverse play, etc. - http://mixxx.org/forums/viewtopic.php?f=7&t=4477 + https://mixxx.discourse.group/t/akai-lpd8-mapping-4-decks-30-hotcues-loops-etc-v2/13064 + korg_nanopad2 diff --git a/res/controllers/Korg-KAOSS-DJ.midi.xml b/res/controllers/Korg-KAOSS-DJ.midi.xml index a89fcffed96..ad6f66a97a5 100644 --- a/res/controllers/Korg-KAOSS-DJ.midi.xml +++ b/res/controllers/Korg-KAOSS-DJ.midi.xml @@ -5,6 +5,7 @@ Seb Dooris, Fayaaz Ahmed, Lee Arromba Controller mapping for the Korg KAOSS DJ Controller. https://www.mixxx.org/forums/viewtopic.php?f=7&t=8479 + korg_kaoss_dj diff --git a/res/controllers/M-Audio_Xsession_pro.midi.xml b/res/controllers/M-Audio_Xsession_pro.midi.xml index 906a456cd2c..2e49149efcd 100644 --- a/res/controllers/M-Audio_Xsession_pro.midi.xml +++ b/res/controllers/M-Audio_Xsession_pro.midi.xml @@ -4,7 +4,7 @@ M-Audio X-Session Pro Karli MIDI Mapping for M-Audio X-Session Pro - http://mixxx.org/wiki/doku.php/m-audio_x-session_pro + m_audio_x_session_pro diff --git a/res/controllers/MidiTech-MidiControl.midi.xml b/res/controllers/MidiTech-MidiControl.midi.xml index 1f6e82116eb..813b47cee56 100644 --- a/res/controllers/MidiTech-MidiControl.midi.xml +++ b/res/controllers/MidiTech-MidiControl.midi.xml @@ -4,6 +4,7 @@ MidiTech MidiControl MIDI Mapping for MidiTech MidiControl + miditech_midicontrol diff --git a/res/controllers/Midi_for_light.midi.xml b/res/controllers/Midi_for_light.midi.xml index 4f913fe5374..9f9668dca46 100644 --- a/res/controllers/Midi_for_light.midi.xml +++ b/res/controllers/Midi_for_light.midi.xml @@ -4,7 +4,7 @@ MIDI for light Michael Stahl / DG3NEC MIDI-output for light control - http://mixxx.org/forums/viewtopic.php?f=7&t=7746 + https://mixxx.discourse.group/t/midi-for-light/15513 http://mixxx.org/wiki/doku.php/midi_for_light diff --git a/res/controllers/MixVibes U-Mix Control 2.midi.xml b/res/controllers/MixVibes U-Mix Control 2.midi.xml index ecf5f8123b6..291507b7773 100644 --- a/res/controllers/MixVibes U-Mix Control 2.midi.xml +++ b/res/controllers/MixVibes U-Mix Control 2.midi.xml @@ -4,6 +4,7 @@ peper A beta v0.2 preset for the MixVibes U-Mix Control 2. http://www.mixxx.org/forums/viewtopic.php?f=7&t=4469 + mixvibes_u_mix_control_2 diff --git a/res/controllers/MixVibes U-Mix Control Pro 2.midi.xml b/res/controllers/MixVibes U-Mix Control Pro 2.midi.xml index f6bf18ab57f..5da140ce37a 100644 --- a/res/controllers/MixVibes U-Mix Control Pro 2.midi.xml +++ b/res/controllers/MixVibes U-Mix Control Pro 2.midi.xml @@ -4,8 +4,8 @@ MixVibes U-Mix Control Pro 2 tomtom (thomas-8) V1.0.0 -> Please visit Forum and Wiki for more details. - http://mixxx.org/forums/viewtopic.php?f=7&t=4892 - http://www.mixxx.org/wiki/doku.php/umix_control_pro_2 + https://mixxx.discourse.group/t/v1-0-mixvibes-u-mix-control-pro-2-mapping/13322 + mixvibes_u_mix_control_2 diff --git a/res/controllers/Mixman DM2 (Linux).midi.xml b/res/controllers/Mixman DM2 (Linux).midi.xml index 68dedd590c4..32773dd3b43 100644 --- a/res/controllers/Mixman DM2 (Linux).midi.xml +++ b/res/controllers/Mixman DM2 (Linux).midi.xml @@ -4,7 +4,8 @@ Mixman DM2 (Linux) Jan Jockusch This is the DM2 mapping for the Linux driver (dm2linux.sourceforge.net) - + mixman_dm2 + diff --git a/res/controllers/Mixman DM2 (OS X).midi.xml b/res/controllers/Mixman DM2 (OS X).midi.xml index 417019aa174..344a545361e 100644 --- a/res/controllers/Mixman DM2 (OS X).midi.xml +++ b/res/controllers/Mixman DM2 (OS X).midi.xml @@ -3,6 +3,7 @@ Mixman DM2 (OS X) Joe M. MIDI Mapping for Mixman DM2 (OS/X Version) + mixman_dm2 diff --git a/res/controllers/Mixman DM2 (Windows).midi.xml b/res/controllers/Mixman DM2 (Windows).midi.xml index f244e5b2998..39f8082d45c 100644 --- a/res/controllers/Mixman DM2 (Windows).midi.xml +++ b/res/controllers/Mixman DM2 (Windows).midi.xml @@ -4,6 +4,7 @@ Mixman DM2 (Windows) Joe M. MIDI Mapping for Mixman DM2 (Windows) + mixman_dm2 diff --git a/res/controllers/Nintendo Wiimote.hid.xml b/res/controllers/Nintendo Wiimote.hid.xml index 340c7153b6d..d5db59c2138 100644 --- a/res/controllers/Nintendo Wiimote.hid.xml +++ b/res/controllers/Nintendo Wiimote.hid.xml @@ -4,6 +4,7 @@ Ilkka Tuohela HID mapping for Nintendo Wii Remote Game Controller http://www.mixxx.org/forums/viewtopic.php?f=7&t=3939 + nintendo_wiimote diff --git a/res/controllers/Novation Dicer.midi.xml b/res/controllers/Novation Dicer.midi.xml index 2902f751576..d79c76bc45d 100644 --- a/res/controllers/Novation Dicer.midi.xml +++ b/res/controllers/Novation Dicer.midi.xml @@ -3,8 +3,8 @@ Novation Dicer Shaun (DJPandemonium@gmail.com) Implements cuepoints, looping, loop rolls, basic effects, and navigation. - http://mixxx.org/forums/viewtopic.php?f=7&t=3583 - http://mixxx.org/wiki/doku.php/novation_dicer + https://mixxx.discourse.group/t/novation-dicer-mapping/12329 + novation_dicer diff --git a/res/controllers/Novation Launchpad MK2.midi.xml b/res/controllers/Novation Launchpad MK2.midi.xml index c9a252510ea..f623db42c33 100644 --- a/res/controllers/Novation Launchpad MK2.midi.xml +++ b/res/controllers/Novation Launchpad MK2.midi.xml @@ -5,6 +5,7 @@ Midiparse Novation Launchpad mapping for Mixxx https://github.com/szdavid92/mixxx-launchpad + novation_launchpad_mk2 diff --git a/res/controllers/Novation Launchpad.midi.xml b/res/controllers/Novation Launchpad.midi.xml index ec8a1c40bbf..c3e740413fd 100644 --- a/res/controllers/Novation Launchpad.midi.xml +++ b/res/controllers/Novation Launchpad.midi.xml @@ -5,6 +5,7 @@ Midiparse Novation Launchpad mapping for Mixxx https://github.com/szdavid92/mixxx-launchpad + novation_launchpad_mk1 diff --git a/res/controllers/Novation-Launchpad-Mini.midi.xml b/res/controllers/Novation-Launchpad-Mini.midi.xml index f291c0e0f3d..24e1fe74a93 100644 --- a/res/controllers/Novation-Launchpad-Mini.midi.xml +++ b/res/controllers/Novation-Launchpad-Mini.midi.xml @@ -4,7 +4,8 @@ Novation Launchpad Mini marczis Multi page mapping for the Novation Launchpad Mini - http://mixxx.org/forums/viewtopic.php?f=7&t=6335 + https://mixxx.discourse.group/t/novation-launchpad-mini-mapping-official-forum/14299 + novation_launchpad_mini diff --git a/res/controllers/Numark DJ2Go.midi.xml b/res/controllers/Numark DJ2Go.midi.xml index a41b291108f..651ad13dfab 100644 --- a/res/controllers/Numark DJ2Go.midi.xml +++ b/res/controllers/Numark DJ2Go.midi.xml @@ -5,6 +5,7 @@ Alimantado, mod by Coval 11-Sep-2012. Made to be close as possible to how DJ2Go works with VDJ. http://www.mixxx.org/forums/viewtopic.php?f=7&t=2732&start=140&sid=da4226f3f9a11932881d0e609ee7f2cc + numark_dj2go diff --git a/res/controllers/Numark MIXTRACK.midi.xml b/res/controllers/Numark MIXTRACK.midi.xml index 907d29a01b7..e31a3334184 100644 --- a/res/controllers/Numark MIXTRACK.midi.xml +++ b/res/controllers/Numark MIXTRACK.midi.xml @@ -4,6 +4,7 @@ Numark MIXTRACK Matteo (matteo@magm3.com), RAWRR, and uncleeugene Numark MixTrack Mapping v1.0b + numark_mixtrack diff --git a/res/controllers/Numark Mixtrack 2.midi.xml b/res/controllers/Numark Mixtrack 2.midi.xml index 8bf0d817be7..6363a230e78 100644 --- a/res/controllers/Numark Mixtrack 2.midi.xml +++ b/res/controllers/Numark Mixtrack 2.midi.xml @@ -4,7 +4,7 @@ Numark MixTrack (Pro) II SNOWY, Armen Rizal, ninomp, special thanks to Thomas Preston and Ricecows (rj@ricecows.net) Version v2.0 - http://www.mixxx.org/wiki/doku.php/numark_mixtrack_pro_ii + numark_mixtrack_pro_ii diff --git a/res/controllers/Numark Mixtrack Platinum.midi.xml b/res/controllers/Numark Mixtrack Platinum.midi.xml index f1cd45b52e7..9e8d721d8a7 100644 --- a/res/controllers/Numark Mixtrack Platinum.midi.xml +++ b/res/controllers/Numark Mixtrack Platinum.midi.xml @@ -5,7 +5,7 @@ Matthew Nicholson Numark Mixtrack Platinum mapping with support for LCD screens and 4 deck playback. https://www.mixxx.org/forums/viewtopic.php?f=7&t=8863 - https://www.mixxx.org/wiki/doku.php/numark_mixtrack_platinum + numark_mixtrack_platinum diff --git a/res/controllers/Numark Mixtrack Pro.midi.xml b/res/controllers/Numark Mixtrack Pro.midi.xml index 03b73760b40..f2ddff9750e 100644 --- a/res/controllers/Numark Mixtrack Pro.midi.xml +++ b/res/controllers/Numark Mixtrack Pro.midi.xml @@ -5,8 +5,8 @@ Modify by Darío José Freije 06/27/2012--> Numark MixTrack Pro Matteo (matteo@magm3.com), James Ralston, and D. J. Freije (dario2004@gmail.com) version v1.2 w/brake, backspin, blink beat Leds. - http://mixxx.org/forums/viewtopic.php?f=7&t=3828 - http://www.mixxx.org/wiki/doku.php/numark_mixtrack_pro + https://mixxx.discourse.group/t/numark-mixtrack-pro-with-backspin-and-more/12557 + numark_mixtrack_pro diff --git a/res/controllers/Numark N4.midi.xml b/res/controllers/Numark N4.midi.xml index d030912476a..68d1ba9a4cf 100644 --- a/res/controllers/Numark N4.midi.xml +++ b/res/controllers/Numark N4.midi.xml @@ -4,6 +4,7 @@ Numark N4 Swiftb0y 4 channel MIDI Mapping for Numark N4 + numark_n4 diff --git a/res/controllers/Numark NS7.midi.xml b/res/controllers/Numark NS7.midi.xml index 18d8316039d..4393016815c 100644 --- a/res/controllers/Numark NS7.midi.xml +++ b/res/controllers/Numark NS7.midi.xml @@ -4,6 +4,7 @@ Numark NS7 Anders Gunnarsson Numark NS7 controller preliminary mapping, v1.9.0 Requires script v1.9.0 + numark_ns7 diff --git a/res/controllers/Numark Omni Control.midi.xml b/res/controllers/Numark Omni Control.midi.xml index ade3dfe997a..f3c02411f73 100644 --- a/res/controllers/Numark Omni Control.midi.xml +++ b/res/controllers/Numark Omni Control.midi.xml @@ -3,6 +3,7 @@ Numark Omni Control Baxter Adaptation from the work of Smashuu and David Gnedt + numark_omni_control diff --git a/res/controllers/Numark Total Control.midi.xml b/res/controllers/Numark Total Control.midi.xml index c25f72032a7..55e7c3e8c7c 100644 --- a/res/controllers/Numark Total Control.midi.xml +++ b/res/controllers/Numark Total Control.midi.xml @@ -4,7 +4,8 @@ Numark Total Control Smashuu / David Gnedt Optimized for Traktor label card - http://www.mixxx.org/forums/viewtopic.php?f=7&t=1252 + http://www.mixxx.org/forums/viewtopic.php?f=7&t=1252 + numark_total_control diff --git a/res/controllers/Numark V7.midi.xml b/res/controllers/Numark V7.midi.xml index 64de9b0fac5..41e8a5c03b1 100644 --- a/res/controllers/Numark V7.midi.xml +++ b/res/controllers/Numark V7.midi.xml @@ -3,7 +3,8 @@ Numark V7 Mike Bucceroni - http://www.mixxx.org/forums/viewtopic.php?f=7&t=3974 + http://www.mixxx.org/forums/viewtopic.php?f=7&t=3974 + numark_v7 diff --git a/res/controllers/Numark iDJ Live II.midi.xml b/res/controllers/Numark iDJ Live II.midi.xml index ee0fb02ea43..11bf6d84b96 100644 --- a/res/controllers/Numark iDJ Live II.midi.xml +++ b/res/controllers/Numark iDJ Live II.midi.xml @@ -4,7 +4,7 @@ Numark iDJ Live II Nathan Korth Complete mapping for iDJ Live II - https://mixxx.org/wiki/doku.php/numark_idj_live_ii + numark_idj_live_ii diff --git a/res/controllers/Numark-Mixtrack-3.midi.xml b/res/controllers/Numark-Mixtrack-3.midi.xml index 4e0d2aad3d6..52a9f4c638f 100644 --- a/res/controllers/Numark-Mixtrack-3.midi.xml +++ b/res/controllers/Numark-Mixtrack-3.midi.xml @@ -5,7 +5,7 @@ Numark Mixtrack (Pro) 3 Stéphane Morin The Numark Mixtrack 3 and Numark Mixtrack Pro 3 are the same controller except that the Pro version has an integrated sound card. - http://mixxx.org/forums/viewtopic.php?f=7&t=7286 + https://mixxx.discourse.group/t/mixtrack-pro-3/15165 http://www.mixxx.org/wiki/doku.php/numark_mixtrack_pro_3 diff --git a/res/controllers/Pioneer CDJ-2000.midi.xml b/res/controllers/Pioneer CDJ-2000.midi.xml index 7aa8ed97dea..506da23a934 100644 --- a/res/controllers/Pioneer CDJ-2000.midi.xml +++ b/res/controllers/Pioneer CDJ-2000.midi.xml @@ -4,6 +4,7 @@ Pioneer CDJ-2000 Ilkka Tuohela <hile@iki.fi> Pioneer CDJ-2000 configuration for 2 decks on midi channels 1 and 2 + pioneer_cdj_2000 diff --git a/res/controllers/Pioneer CDJ-350 Ch1.midi.xml b/res/controllers/Pioneer CDJ-350 Ch1.midi.xml index 8d04b2e85a7..64161087376 100644 --- a/res/controllers/Pioneer CDJ-350 Ch1.midi.xml +++ b/res/controllers/Pioneer CDJ-350 Ch1.midi.xml @@ -4,6 +4,7 @@ Kazuaki and DJ Tiger This is an incomplete mapping for a single Pioneer CDJ 350. http://www.mixxx.org/forums/viewtopic.php?f=7&t=1917 + pioneer_cdj_350 diff --git a/res/controllers/Pioneer CDJ-350 Ch2.midi.xml b/res/controllers/Pioneer CDJ-350 Ch2.midi.xml index cc9546df667..e28ac9d0a6b 100644 --- a/res/controllers/Pioneer CDJ-350 Ch2.midi.xml +++ b/res/controllers/Pioneer CDJ-350 Ch2.midi.xml @@ -4,6 +4,7 @@ Kazuaki and DJ Tiger This is an incomplete mapping for a single Pioneer CDJ 350. http://www.mixxx.org/forums/viewtopic.php?f=7&t=1917 + pioneer_cdj_350 diff --git a/res/controllers/Pioneer CDJ-850.midi.xml b/res/controllers/Pioneer CDJ-850.midi.xml index 3822fa48a38..b3d91bc9fae 100644 --- a/res/controllers/Pioneer CDJ-850.midi.xml +++ b/res/controllers/Pioneer CDJ-850.midi.xml @@ -4,6 +4,7 @@ Pioneer CDJ-850 Ilkka Tuohela <hile@iki.fi> Pioneer CDJ-850 configuration for 2 decks on midi channels 1 and 2 + pioneer_cdj_850 diff --git a/res/controllers/Pioneer DDJ-SX.midi.xml b/res/controllers/Pioneer DDJ-SX.midi.xml index 1d62f27e3d2..6cf030f5b11 100644 --- a/res/controllers/Pioneer DDJ-SX.midi.xml +++ b/res/controllers/Pioneer DDJ-SX.midi.xml @@ -4,8 +4,8 @@ Pioneer DDJ-SX Maximilian Beiersdorfer, DJMaxergy Pioneer DDJ-SX controller mapping - http://mixxx.org/forums/viewtopic.php?f=7&t=8310 - http://mixxx.org/wiki/doku.php/pioneer_ddj-sx + https://mixxx.discourse.group/t/pioneer-ddj-sx-controller-mapping/15954 + pioneer_ddj_sx diff --git a/res/controllers/Pioneer-DDJ-SB.midi.xml b/res/controllers/Pioneer-DDJ-SB.midi.xml index 407ea89e8ca..3d5402a5c42 100644 --- a/res/controllers/Pioneer-DDJ-SB.midi.xml +++ b/res/controllers/Pioneer-DDJ-SB.midi.xml @@ -4,6 +4,7 @@ Pioneer DDJ-SB Joan Ardiaca Jové Pioneer DDJ-SB configuration for 4 decks. Use the tempo range buttons to switch decks. + pioneer_ddj_sb diff --git a/res/controllers/Pioneer-DDJ-SB2.midi.xml b/res/controllers/Pioneer-DDJ-SB2.midi.xml index 8778aecfe4a..34f9974fb0b 100644 --- a/res/controllers/Pioneer-DDJ-SB2.midi.xml +++ b/res/controllers/Pioneer-DDJ-SB2.midi.xml @@ -4,8 +4,8 @@ Pioneer DDJ-SB2 Be, Michael Stahl (DG3NEC) Pioneer DDJ-SB2 - http://mixxx.org/forums/viewtopic.php?f=7&t=7509 - http://mixxx.org/wiki/doku.php/pioneer_ddj-sb2 + https://mixxx.discourse.group/t/pinoneer-ddj-sb2-midi-mapping/15373 + pioneer_ddj_sb2 diff --git a/res/controllers/Reloop Beatmix 2-4.midi.xml b/res/controllers/Reloop Beatmix 2-4.midi.xml index 86e57e624ed..31c55bfa635 100644 --- a/res/controllers/Reloop Beatmix 2-4.midi.xml +++ b/res/controllers/Reloop Beatmix 2-4.midi.xml @@ -4,8 +4,8 @@ Reloop Beatmix 2/4 Sébastien Blaisot <sebastien@blaisot.org> Controller mapping for the Reloop Beatmix 2/4. - http://mixxx.org/forums/viewtopic.php?f=7&t=8428 - http://www.mixxx.org/wiki/doku.php/reloop_beatmix_4 + https://mixxx.discourse.group/t/reloop-beatmix-2-4-mapping/16049 + reloop_beatmix_2 diff --git a/res/controllers/Reloop Beatpad.midi.xml b/res/controllers/Reloop Beatpad.midi.xml index 4447c5a1740..086f792fb93 100644 --- a/res/controllers/Reloop Beatpad.midi.xml +++ b/res/controllers/Reloop Beatpad.midi.xml @@ -5,7 +5,7 @@ Chloé Avrillon (DJ Chloé) Controller mapping for the Reloop Beatpad. Have fun !!! http://www.mixxx.org/forums/viewtopic.php?f=7&t=7581 - http://www.mixxx.org/wiki/doku.php/reloop_beatpad + reloop_beatpad diff --git a/res/controllers/Reloop Digital Jockey 2 Controller Edition.midi.xml b/res/controllers/Reloop Digital Jockey 2 Controller Edition.midi.xml index 8cf6e5a67ea..7bf5399342a 100644 --- a/res/controllers/Reloop Digital Jockey 2 Controller Edition.midi.xml +++ b/res/controllers/Reloop Digital Jockey 2 Controller Edition.midi.xml @@ -4,6 +4,7 @@ Tobias Rafreider and Sandor Ivicsics This is a complete mapping for a Reloop Digital Jockey 2 Controller Edition or Reloop Digital Jockey 2 Interface Editiion http://www.mixxx.org/forums/viewtopic.php?f=7&t=1226 + reloop_digital_jockey_2_controller_edition diff --git a/res/controllers/Reloop Jockey 3 ME.midi.xml b/res/controllers/Reloop Jockey 3 ME.midi.xml index 37eee15e142..8685839a283 100644 --- a/res/controllers/Reloop Jockey 3 ME.midi.xml +++ b/res/controllers/Reloop Jockey 3 ME.midi.xml @@ -4,8 +4,8 @@ Reloop Jockey 3 ME Chris2000SP v1.0.3 Mapping for 2.0.x - https://www.mixxx.org/wiki/doku.php/reloop_jockey_3_me - https://mixxx.org/forums/viewtopic.php?f=7&t=5418 + https://mixxx.discourse.group/t/create-a-mapping-for-reloop-jockey-3-me/13703 + reloop_jockey_3_master_edition diff --git a/res/controllers/Reloop Terminal Mix 2-4.midi.xml b/res/controllers/Reloop Terminal Mix 2-4.midi.xml index bb440e87c7c..3f49eddf271 100644 --- a/res/controllers/Reloop Terminal Mix 2-4.midi.xml +++ b/res/controllers/Reloop Terminal Mix 2-4.midi.xml @@ -4,7 +4,7 @@ Reloop Terminal Mix 2/4 Sean M. Pappalardo (1.11), ronso0 (2.1 update) A complete 4-deck preset for a single Reloop Terminal Mix 2 or 4. - http://mixxx.org/wiki/doku.php/reloop_terminal_mix + reloop_terminal_mix_series diff --git a/res/controllers/Roland_DJ-505.midi.xml b/res/controllers/Roland_DJ-505.midi.xml index a26f4c18f21..c4eca0a1619 100644 --- a/res/controllers/Roland_DJ-505.midi.xml +++ b/res/controllers/Roland_DJ-505.midi.xml @@ -4,8 +4,8 @@ Roland DJ-505 Jan Holthuis 4-deck mapping for Roland DJ-505 controller - https://mixxx.org/wiki/doku.php/roland_dj-505 - https://mixxx.org/forums/viewtopic.php?f=7&t=12688 + https://mixxx.discourse.group/t/roland-dj-505/17916 + roland_dj_505 diff --git a/res/controllers/Sony SixxAxis.hid.xml b/res/controllers/Sony SixxAxis.hid.xml index 86418b61cc0..004b8800678 100644 --- a/res/controllers/Sony SixxAxis.hid.xml +++ b/res/controllers/Sony SixxAxis.hid.xml @@ -5,6 +5,7 @@ Ilkka Tuohela HID mapping for Sony SixxAxis Game Controller http://www.mixxx.org/forums/viewtopic.php?f=7&t=3940 + sony_sixxaxis diff --git a/res/controllers/Soundless_joyMIDI.midi.xml b/res/controllers/Soundless_joyMIDI.midi.xml index cb3d68f138a..b3e25cdd8cf 100644 --- a/res/controllers/Soundless_joyMIDI.midi.xml +++ b/res/controllers/Soundless_joyMIDI.midi.xml @@ -5,7 +5,7 @@ Ozzy Chiu Soundless Portable MIDI Controller https://www.mixxx.org/forums/viewtopic.php?f=7&t=13166 - https://www.mixxx.org/wiki/doku.php/soundless_studio_joymidi + soundless_studio_joymidi diff --git a/res/controllers/Stanton SCS.1d.midi.xml b/res/controllers/Stanton SCS.1d.midi.xml index 9c8e82bf16b..78f1f9e4d73 100644 --- a/res/controllers/Stanton SCS.1d.midi.xml +++ b/res/controllers/Stanton SCS.1d.midi.xml @@ -6,7 +6,7 @@ This is a work-in-progress preset for a single Stanton SCS.1d turntable controller. Requires scripting and native HSS1394 support on OSX and Windows, or ALSA's HSS1394 MIDI driver on Linux (in the ALSA tree as of 12 November 2012.) - http://mixxx.org/wiki/doku.php/stanton_scs.1d + stanton_scs1d diff --git a/res/controllers/Stanton SCS.1m.midi.xml b/res/controllers/Stanton SCS.1m.midi.xml index 18a37a37ec2..96cffe9030e 100644 --- a/res/controllers/Stanton SCS.1m.midi.xml +++ b/res/controllers/Stanton SCS.1m.midi.xml @@ -4,7 +4,7 @@ Stanton SCS.1m Sean M. Pappalardo This is a complete mapping for a single Stanton SCS.1m mixer controller. Requires scripting. - http://mixxx.org/wiki/doku.php/stanton_scs.1m + stanton_scs1m diff --git a/res/controllers/Stanton SCS.3d Alternate.midi.xml b/res/controllers/Stanton SCS.3d Alternate.midi.xml index 2fb9d7b5458..93a86828768 100644 --- a/res/controllers/Stanton SCS.3d Alternate.midi.xml +++ b/res/controllers/Stanton SCS.3d Alternate.midi.xml @@ -4,6 +4,7 @@ Stanton SCS.3d (alternate) sbalmer Alternate mapping for the Stanton SCS.3d controller with somewhat different controls and additional lights. + stanton_scs3d diff --git a/res/controllers/Stanton SCS.3m.midi.xml b/res/controllers/Stanton SCS.3m.midi.xml index 8071a3ecb0f..8cac9d45773 100644 --- a/res/controllers/Stanton SCS.3m.midi.xml +++ b/res/controllers/Stanton SCS.3m.midi.xml @@ -4,7 +4,7 @@ Stanton SCS.3m sbalmer Mapping for the Stanton SCS.3m controller. Supports four decks. - http://mixxx.org/wiki/doku.php/stanton_scs.3m + stanton_scs3m diff --git a/res/controllers/Stanton-DJC-4.midi.xml b/res/controllers/Stanton-DJC-4.midi.xml index c91fe88fd7c..7e8ea3a6f0d 100644 --- a/res/controllers/Stanton-DJC-4.midi.xml +++ b/res/controllers/Stanton-DJC-4.midi.xml @@ -4,7 +4,7 @@ Stanton DJC.4 Martin Bruset Solberg, Christoph Zimmermann The Stanton DJC.4 is a 4 deck controller with large, touch-sensitive jog wheels and a built-in audio interface (2 inputs, 2 outputs). It features 4 FX units and a master VU meter. - https://mixxx.org/wiki/doku.php/stanton_djc.4 + stanton_djc_4 diff --git a/res/controllers/TrakProDJ iPad.midi.xml b/res/controllers/TrakProDJ iPad.midi.xml index 3d318f3787f..a381378907e 100644 --- a/res/controllers/TrakProDJ iPad.midi.xml +++ b/res/controllers/TrakProDJ iPad.midi.xml @@ -4,6 +4,7 @@ TrakProDJ iPad Ilkka Tuohela <hile@iki.fi> TrakProDJ iPad application midi mapping + trakprodj diff --git a/res/controllers/Traktor Kontrol F1.hid.xml b/res/controllers/Traktor Kontrol F1.hid.xml index e97e450b94d..617daa741c3 100644 --- a/res/controllers/Traktor Kontrol F1.hid.xml +++ b/res/controllers/Traktor Kontrol F1.hid.xml @@ -5,6 +5,7 @@ Ilkka Tuohela HID mapping for Native Instruments Traktor Kontrol F1 Controller http://www.mixxx.org/forums/viewtopic.php?f=7&t=3810 + native_instruments_traktor_kontrol_f1 diff --git a/res/controllers/Traktor Kontrol S2 MK3.hid.xml b/res/controllers/Traktor Kontrol S2 MK3.hid.xml index 556a7e217a1..7ad2b482422 100644 --- a/res/controllers/Traktor Kontrol S2 MK3.hid.xml +++ b/res/controllers/Traktor Kontrol S2 MK3.hid.xml @@ -4,8 +4,8 @@ Traktor Kontrol S2 MK3 Michael Schmidt HID Mapping for Traktor Kontrol S2 MK3 - https://www.mixxx.org/wiki/doku.php/native_instruments_traktor_s2_mk3 https://www.mixxx.org/forums/viewtopic.php?f=7&t=12999 + native_instruments_traktor_kontrol_s2_mk3 diff --git a/res/controllers/Traktor Kontrol S2 Mk2.hid.xml b/res/controllers/Traktor Kontrol S2 Mk2.hid.xml index 14138ab346c..07984438dc8 100644 --- a/res/controllers/Traktor Kontrol S2 Mk2.hid.xml +++ b/res/controllers/Traktor Kontrol S2 Mk2.hid.xml @@ -4,7 +4,7 @@ Native Instruments Traktor Kontrol S2 MK2 Be Native Instruments Traktor Kontrol S2 MK2 - https://github.com/mixxxdj/mixxx/wiki/Native-Instruments-Traktor-Kontrol-S2-Mk2 + native_instruments_traktor_kontrol_s2_mk2 diff --git a/res/controllers/Traktor Kontrol S4 MK2.hid.xml b/res/controllers/Traktor Kontrol S4 MK2.hid.xml index 71271910595..77503797adc 100644 --- a/res/controllers/Traktor Kontrol S4 MK2.hid.xml +++ b/res/controllers/Traktor Kontrol S4 MK2.hid.xml @@ -4,7 +4,7 @@ Traktor Kontrol S4 MK2 Owen Williams, Fayaaz Ahmed HID Mapping for Traktor Kontrol S4 MK2 - http://mixxx.org/wiki/doku.php/traktor_s4_mk2 + native_instruments_traktor_kontrol_s4_mk2 diff --git a/res/controllers/Traktor Kontrol X1.midi.xml b/res/controllers/Traktor Kontrol X1.midi.xml index 54a7ec08856..d338c9d3278 100644 --- a/res/controllers/Traktor Kontrol X1.midi.xml +++ b/res/controllers/Traktor Kontrol X1.midi.xml @@ -4,6 +4,7 @@ Ilkka Tuohela <hile@iki.fi> MIDI mapping for Native Instruments Traktor Kontrol X1. http://www.mixxx.org/forums/viewtopic.php?f=7&t=3809 + native_instruments_traktor_kontrol_x1 diff --git a/res/controllers/Vestax Spin.midi.xml b/res/controllers/Vestax Spin.midi.xml index abc039b5013..35aa0cac734 100644 --- a/res/controllers/Vestax Spin.midi.xml +++ b/res/controllers/Vestax Spin.midi.xml @@ -4,6 +4,7 @@ Vestax Spin Bill Good, based on the work of Anders Gunnarsson Bill's controller mapping for Vestax Spin + script + vestax_spin diff --git a/res/controllers/Vestax Typhoon Enhanced.midi.xml b/res/controllers/Vestax Typhoon Enhanced.midi.xml index 59ca16084a3..30f3094eb77 100644 --- a/res/controllers/Vestax Typhoon Enhanced.midi.xml +++ b/res/controllers/Vestax Typhoon Enhanced.midi.xml @@ -4,7 +4,8 @@ Vestax Typhoon Enhanced bestdani bestdani's customized controller mapping for Vestax Typhoon in Mixxx 2.0+ and script. The controller actions differ from the description on the console. Therefore it enables more controls such as hotcues, relative pitch movements, slip mode and much more. Some elements are taken from Bill Good's original mapping. - http://mixxx.org/forums/viewtopic.php?p=14494#p14494 + https://mixxx.discourse.group/t/vestax-typhoon-mapping-for-mixxx-2-0/12551/1#p14494 + vestax_typhoon diff --git a/res/controllers/Vestax Typhoon.midi.xml b/res/controllers/Vestax Typhoon.midi.xml index ad3728be3df..3eb724c338a 100644 --- a/res/controllers/Vestax Typhoon.midi.xml +++ b/res/controllers/Vestax Typhoon.midi.xml @@ -4,7 +4,8 @@ Vestax Typhoon bestdani bestdani's controller capping for Vestax Typhoon in Mixxx 2.0+ and script. The controller reacts as described on the console. Some elements are taken from Bill Good's original mapping. - http://mixxx.org/forums/viewtopic.php?p=14494#p14494 + https://mixxx.discourse.group/t/vestax-typhoon-mapping-for-mixxx-2-0/12551/1#p14494 + vestax_typhoon diff --git a/res/controllers/Vestax VCI-100-3DEX.midi.xml b/res/controllers/Vestax VCI-100-3DEX.midi.xml index 76882f6b10d..9bccba717f8 100644 --- a/res/controllers/Vestax VCI-100-3DEX.midi.xml +++ b/res/controllers/Vestax VCI-100-3DEX.midi.xml @@ -1,9 +1,10 @@ - Vestax VCI-100 Mixvibes 3Dex editon + Vestax VCI-100 (MixVibes 3DEX Editon) Julius Alexander Kohout edler von Dolnobransky Preliminary controller mapping for Vestax VCI-100 with scripts + vestax_vci_100_mixvibes_3dex_edition diff --git a/res/controllers/Vestax VCI-100-hile.midi.xml b/res/controllers/Vestax VCI-100-hile.midi.xml index 49fba9c130e..f9937007d78 100644 --- a/res/controllers/Vestax VCI-100-hile.midi.xml +++ b/res/controllers/Vestax VCI-100-hile.midi.xml @@ -3,6 +3,7 @@ Vestax VCI-100 Hile Mod Ilkka Tuohela Modified Mapping for Vestax VCI-100 + vestax_vci_100mki diff --git a/res/controllers/Vestax VCI-100.midi.xml b/res/controllers/Vestax VCI-100.midi.xml index 22d9e57487b..b76bc265222 100644 --- a/res/controllers/Vestax VCI-100.midi.xml +++ b/res/controllers/Vestax VCI-100.midi.xml @@ -4,6 +4,7 @@ Vestax VCI-100 Anders Gunnarsson Preliminary controller mapping for Vestax VCI-100 with scripts + vestax_vci_100mki diff --git a/res/controllers/Vestax VCI-100MKII.midi.xml b/res/controllers/Vestax VCI-100MKII.midi.xml index 604b02e6fcc..499c54e9706 100644 --- a/res/controllers/Vestax VCI-100MKII.midi.xml +++ b/res/controllers/Vestax VCI-100MKII.midi.xml @@ -4,7 +4,7 @@ Vestax VCI-100MKII Takeshi Soejima 2018-4-15 - http://www.mixxx.org/wiki/doku.php/vestax_vci-100mkii + vestax_vci_100mkii diff --git a/res/controllers/Vestax VCI-300.midi.xml b/res/controllers/Vestax VCI-300.midi.xml index 68f35f91636..491e43f3edc 100644 --- a/res/controllers/Vestax VCI-300.midi.xml +++ b/res/controllers/Vestax VCI-300.midi.xml @@ -4,7 +4,7 @@ Vestax VCI-300 Uwe Klotz http://www.mixxx.org/forums/viewtopic.php?f=7&t=4021 - http://mixxx.org/wiki/doku.php/vestax_vci-300 + vestax_vci_300 diff --git a/res/controllers/Vestax VCI-400.midi.xml b/res/controllers/Vestax VCI-400.midi.xml index f5cca9bf7e3..cebe07e2895 100644 --- a/res/controllers/Vestax VCI-400.midi.xml +++ b/res/controllers/Vestax VCI-400.midi.xml @@ -4,7 +4,7 @@ Vestax VCI-400 Owen Williams, Tobias Rafreider Controller mapping for Vestax VCI-400 - http://mixxx.org/wiki/doku.php/vestax_vci-400 + vestax_vci_400 diff --git a/res/controllers/us428.midi.xml b/res/controllers/us428.midi.xml index e4f9927653e..d20fd7d5f1b 100644 --- a/res/controllers/us428.midi.xml +++ b/res/controllers/us428.midi.xml @@ -4,6 +4,7 @@ Tascam US-428 Auto-converted by madjesta's PHP script Automatic conversion of the file us428.midi.xml for Mixxx 1.6.2 + tascam_us_428 diff --git a/src/controllers/controllerpreset.h b/src/controllers/controllerpreset.h index e51092961de..1b222b05fe9 100644 --- a/src/controllers/controllerpreset.h +++ b/src/controllers/controllerpreset.h @@ -11,6 +11,8 @@ #include #include +#include "defs_urls.h" + class ControllerPresetVisitor; class ConstControllerPresetVisitor; @@ -123,6 +125,24 @@ class ControllerPreset { return m_forumlink; } + void setManualPage(const QString& manualPage) { + m_manualPage = manualPage; + setDirty(true); + } + + QString manualPage() const { + return m_manualPage; + } + + QString manualLink() const { + QString page = manualPage(); + if (page.isEmpty()) { + return {}; + } + + return MIXXX_MANUAL_CONTROLLERMANUAL_PREFIX + page + MIXXX_MANUAL_CONTROLLERMANUAL_SUFFIX; + } + inline void setWikiLink(const QString wikilink) { m_wikilink = wikilink; setDirty(true); @@ -174,6 +194,7 @@ class ControllerPreset { QString m_author; QString m_description; QString m_forumlink; + QString m_manualPage; QString m_wikilink; QString m_schemaVersion; QString m_mixxxVersion; diff --git a/src/controllers/controllerpresetfilehandler.cpp b/src/controllers/controllerpresetfilehandler.cpp index 6d147a6e885..7fe2f57392c 100644 --- a/src/controllers/controllerpresetfilehandler.cpp +++ b/src/controllers/controllerpresetfilehandler.cpp @@ -99,6 +99,8 @@ void ControllerPresetFileHandler::parsePresetInfo( preset->setDescription(description.isNull() ? "" : description.text()); QDomElement forums = info.firstChildElement("forums"); preset->setForumLink(forums.isNull() ? "" : forums.text()); + QDomElement manualPage = info.firstChildElement("manual"); + preset->setManualPage(manualPage.isNull() ? "" : manualPage.text()); QDomElement wiki = info.firstChildElement("wiki"); preset->setWikiLink(wiki.isNull() ? "" : wiki.text()); } diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp index 7b325a7f79f..99062359b9c 100644 --- a/src/controllers/dlgprefcontroller.cpp +++ b/src/controllers/dlgprefcontroller.cpp @@ -249,6 +249,18 @@ QString DlgPrefController::presetWikiLink( return url; } +QString DlgPrefController::presetManualLink( + const ControllerPresetPointer pPreset) const { + QString url; + if (pPreset) { + QString link = pPreset->manualLink(); + if (!link.isEmpty()) { + url = "Manual"; + } + } + return url; +} + QString DlgPrefController::presetScriptFileLinks( const ControllerPresetPointer pPreset) const { if (!pPreset || pPreset->getScriptFiles().empty()) { @@ -539,6 +551,11 @@ void DlgPrefController::slotShowPreset(ControllerPresetPointer preset) { supportLinks << forumLink; } + QString manualLink = presetManualLink(preset); + if (manualLink.length() > 0) { + supportLinks << manualLink; + } + QString wikiLink = presetWikiLink(preset); if (wikiLink.length() > 0) { supportLinks << wikiLink; diff --git a/src/controllers/dlgprefcontroller.h b/src/controllers/dlgprefcontroller.h index c50bffe6a38..7f84e2fca0b 100644 --- a/src/controllers/dlgprefcontroller.h +++ b/src/controllers/dlgprefcontroller.h @@ -72,6 +72,7 @@ class DlgPrefController : public DlgPreferencePage { QString presetAuthor(const ControllerPresetPointer pPreset) const; QString presetDescription(const ControllerPresetPointer pPreset) const; QString presetForumLink(const ControllerPresetPointer pPreset) const; + QString presetManualLink(const ControllerPresetPointer pPreset) const; QString presetWikiLink(const ControllerPresetPointer pPreset) const; QString presetScriptFileLinks(const ControllerPresetPointer pPreset) const; void applyPresetChanges(); diff --git a/src/defs_urls.h b/src/defs_urls.h index 3bc0d42812f..10ca25f26b8 100644 --- a/src/defs_urls.h +++ b/src/defs_urls.h @@ -27,6 +27,10 @@ #define MIXXX_MANUAL_CONTROLLERS_URL \ MIXXX_MANUAL_URL \ "/chapters/controlling_mixxx.html#using-midi-hid-controllers" +#define MIXXX_MANUAL_CONTROLLERMANUAL_PREFIX \ + MIXXX_MANUAL_URL \ + "/hardware/controllers/" +#define MIXXX_MANUAL_CONTROLLERMANUAL_SUFFIX ".html" #define MIXXX_MANUAL_SOUND_URL \ MIXXX_MANUAL_URL "/chapters/preferences.html#sound-hardware" #define MIXXX_MANUAL_LIBRARY_URL \