From c78fa7604a1cdee5fbf1d5f85d0bfdf91f0569cb Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Sun, 20 Sep 2020 14:39:14 +0200 Subject: [PATCH 1/8] controllers: Add support for manual links --- src/controllers/controllerpreset.h | 10 ++++++++++ src/controllers/controllerpresetfilehandler.cpp | 2 ++ src/controllers/dlgprefcontroller.cpp | 17 +++++++++++++++++ src/controllers/dlgprefcontroller.h | 1 + 4 files changed, 30 insertions(+) diff --git a/src/controllers/controllerpreset.h b/src/controllers/controllerpreset.h index e51092961de2..14c6cbca4ef0 100644 --- a/src/controllers/controllerpreset.h +++ b/src/controllers/controllerpreset.h @@ -123,6 +123,15 @@ class ControllerPreset { return m_forumlink; } + inline void setManualPath(const QString manualPath) { + m_manualPath = manualPath; + setDirty(true); + } + + inline QString manualPath() const { + return m_manualPath; + } + inline void setWikiLink(const QString wikilink) { m_wikilink = wikilink; setDirty(true); @@ -174,6 +183,7 @@ class ControllerPreset { QString m_author; QString m_description; QString m_forumlink; + QString m_manualPath; QString m_wikilink; QString m_schemaVersion; QString m_mixxxVersion; diff --git a/src/controllers/controllerpresetfilehandler.cpp b/src/controllers/controllerpresetfilehandler.cpp index 6d147a6e8858..a9e9b4e16b19 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 manualPath = info.firstChildElement("manual"); + preset->setManualPath(manualPath.isNull() ? "" : manualPath.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 7b325a7f79f0..81f95248b669 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 manualPath = pPreset->manualPath(); + if (manualPath.length() > 0) { + 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 c50bffe6a38a..7f84e2fca0b1 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(); From 3d181acea5ce013616e43440dd3702b547767b5c Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Sun, 20 Sep 2020 16:16:14 +0200 Subject: [PATCH 2/8] controllers: Add manual pages to controller mappings --- res/controllers/Akai MPD24.midi.xml | 1 + res/controllers/Akai-LPD8-RK.midi.xml | 3 ++- res/controllers/Allen and Heath Xone K2.midi.xml | 1 + res/controllers/American Audio RADIUS 2000 CH1.midi.xml | 1 + res/controllers/American Audio RADIUS 2000 CH2.midi.xml | 1 + res/controllers/American Audio VMS2.midi.xml | 1 + res/controllers/American Audio VMS4.midi.xml | 1 + res/controllers/Behringer BCD2000.midi.xml | 1 + res/controllers/Behringer BCD3000 Advanced.midi.xml | 1 + res/controllers/Behringer CMD MM1.midi.xml | 1 + res/controllers/Behringer CMD Micro.midi.xml | 3 ++- res/controllers/Behringer CMDStudio4a.midi.xml | 1 + res/controllers/DJ TechTools MIDI Fighter Twister.midi.xml | 1 + res/controllers/DJ-Tech CDJ-101.midi.xml | 1 + res/controllers/DJ-Tech DJM-101.midi.xml | 1 + res/controllers/DJ-Tech Kontrol One.midi.xml | 1 + res/controllers/DJ-Tech Mix-101.midi.xml | 5 +++-- res/controllers/DJ-Tech Mixer One.midi.xml | 1 + res/controllers/DJ-Tech i-Mix Reload.midi.xml | 1 + res/controllers/DJTechTools MIDI Fighter.midi.xml | 5 +++-- res/controllers/Denon DN HS5500.midi.xml | 2 +- res/controllers/Denon DN SC2000.midi.xml | 1 + res/controllers/Denon MC3000.midi.xml | 1 + res/controllers/Denon MC4000.midi.xml | 1 + res/controllers/Denon-MC6000MK2.midi.xml | 1 + res/controllers/Denon-MC7000.midi.xml | 1 + res/controllers/EKS Otus.hid.xml | 1 + res/controllers/Electrix Tweaker.midi.xml | 1 + res/controllers/Evolution_Xsession.midi.xml | 1 + res/controllers/FaderFoxDJ2.midi.xml | 1 + res/controllers/Gemini CDMP-7000 L audio.midi.xml | 1 + res/controllers/Gemini CDMP-7000 R audio.midi.xml | 1 + res/controllers/Gemini FirstMix.midi.xml | 1 + res/controllers/Hercules DJ Console 4-Mx.midi.xml | 1 + res/controllers/Hercules DJ Console Mac Edition.midi.xml | 1 + res/controllers/Hercules DJ Console Mk1.hid.xml | 5 +++-- res/controllers/Hercules DJ Console Mk2.hid.xml | 1 + res/controllers/Hercules DJ Console Mk2.midi.xml | 1 + res/controllers/Hercules DJ Console Mk4.midi.xml | 1 + res/controllers/Hercules DJ Console RMX 2.midi.xml | 3 ++- res/controllers/Hercules DJ Console RMX Advanced.midi.xml | 1 + res/controllers/Hercules DJ Console RMX.hid.xml | 3 ++- res/controllers/Hercules DJ Console RMX.midi.xml | 1 + res/controllers/Hercules DJ Control AIR.midi.xml | 1 + res/controllers/Hercules DJ Control Instinct.midi.xml | 1 + res/controllers/Hercules DJ Control MP3 e2.bulk.xml | 1 + res/controllers/Hercules DJ Control MP3 e2.midi.xml | 1 + res/controllers/Hercules DJ Control MP3.hid.xml | 1 + res/controllers/Hercules DJ Control MP3.midi.xml | 2 +- res/controllers/Hercules DJControl Compact.midi.xml | 1 + res/controllers/Hercules DJControl Starlight.midi.xml | 1 + res/controllers/Hercules P32 DJ.midi.xml | 1 + res/controllers/Ion Discover DJ.midi.xml | 1 + res/controllers/KANE_QuNeo.midi.xml | 1 + res/controllers/Kontrol Dj KDJ500.midi.xml | 3 ++- res/controllers/Korg nanoKONTROL 2.midi.xml | 4 ++-- res/controllers/Korg nanoKONTROL.midi.xml | 1 + res/controllers/Korg nanoPAD2.midi.xml | 1 + res/controllers/Korg-KAOSS-DJ.midi.xml | 1 + res/controllers/M-Audio_Xsession_pro.midi.xml | 1 + res/controllers/MidiTech-MidiControl.midi.xml | 1 + res/controllers/MixVibes U-Mix Control 2.midi.xml | 1 + res/controllers/MixVibes U-Mix Control Pro 2.midi.xml | 1 + res/controllers/Mixman DM2 (Linux).midi.xml | 3 ++- res/controllers/Mixman DM2 (OS X).midi.xml | 1 + res/controllers/Mixman DM2 (Windows).midi.xml | 1 + res/controllers/Nintendo Wiimote.hid.xml | 1 + res/controllers/Novation Dicer.midi.xml | 1 + res/controllers/Novation Launchpad MK2.midi.xml | 1 + res/controllers/Novation Launchpad.midi.xml | 1 + res/controllers/Novation-Launchpad-Mini.midi.xml | 1 + res/controllers/Numark DJ2Go.midi.xml | 1 + res/controllers/Numark MIXTRACK.midi.xml | 1 + res/controllers/Numark Mixtrack 2.midi.xml | 1 + res/controllers/Numark Mixtrack Platinum.midi.xml | 1 + res/controllers/Numark Mixtrack Pro.midi.xml | 1 + res/controllers/Numark N4.midi.xml | 1 + res/controllers/Numark NS7.midi.xml | 1 + res/controllers/Numark Omni Control.midi.xml | 1 + res/controllers/Numark Total Control.midi.xml | 3 ++- res/controllers/Numark V7.midi.xml | 3 ++- res/controllers/Numark iDJ Live II.midi.xml | 1 + res/controllers/Pioneer CDJ-2000.midi.xml | 1 + res/controllers/Pioneer CDJ-350 Ch1.midi.xml | 1 + res/controllers/Pioneer CDJ-350 Ch2.midi.xml | 1 + res/controllers/Pioneer CDJ-850.midi.xml | 1 + res/controllers/Pioneer DDJ-SX.midi.xml | 1 + res/controllers/Pioneer-DDJ-SB.midi.xml | 1 + res/controllers/Pioneer-DDJ-SB2.midi.xml | 1 + res/controllers/Reloop Beatmix 2-4.midi.xml | 1 + res/controllers/Reloop Beatpad.midi.xml | 1 + .../Reloop Digital Jockey 2 Controller Edition.midi.xml | 1 + res/controllers/Reloop Jockey 3 ME.midi.xml | 1 + res/controllers/Reloop Terminal Mix 2-4.midi.xml | 1 + res/controllers/Roland_DJ-505.midi.xml | 1 + res/controllers/Sony SixxAxis.hid.xml | 1 + res/controllers/Soundless_joyMIDI.midi.xml | 1 + res/controllers/Stanton SCS.1d.midi.xml | 1 + res/controllers/Stanton SCS.1m.midi.xml | 1 + res/controllers/Stanton SCS.3d Alternate.midi.xml | 1 + res/controllers/Stanton SCS.3m.midi.xml | 1 + res/controllers/Stanton-DJC-4.midi.xml | 1 + res/controllers/TrakProDJ iPad.midi.xml | 1 + res/controllers/Traktor Kontrol F1.hid.xml | 1 + res/controllers/Traktor Kontrol S2 MK3.hid.xml | 1 + res/controllers/Traktor Kontrol S2 Mk2.hid.xml | 1 + res/controllers/Traktor Kontrol S4 MK2.hid.xml | 1 + res/controllers/Traktor Kontrol X1.midi.xml | 1 + res/controllers/Vestax Spin.midi.xml | 1 + res/controllers/Vestax Typhoon Enhanced.midi.xml | 1 + res/controllers/Vestax Typhoon.midi.xml | 1 + res/controllers/Vestax VCI-100-3DEX.midi.xml | 3 ++- res/controllers/Vestax VCI-100-hile.midi.xml | 1 + res/controllers/Vestax VCI-100.midi.xml | 1 + res/controllers/Vestax VCI-100MKII.midi.xml | 1 + res/controllers/Vestax VCI-300.midi.xml | 1 + res/controllers/Vestax VCI-400.midi.xml | 1 + res/controllers/us428.midi.xml | 1 + 118 files changed, 134 insertions(+), 19 deletions(-) diff --git a/res/controllers/Akai MPD24.midi.xml b/res/controllers/Akai MPD24.midi.xml index 9cf70dbe91c2..961771fe721f 100644 --- a/res/controllers/Akai MPD24.midi.xml +++ b/res/controllers/Akai MPD24.midi.xml @@ -5,6 +5,7 @@ klico MIDI mapping for Akai MPD24 http://mixxx.org/forums/viewtopic.php?f=7&t=39 + /hardware/controllers/akai_mpd24.html diff --git a/res/controllers/Akai-LPD8-RK.midi.xml b/res/controllers/Akai-LPD8-RK.midi.xml index 9b1f39a52617..51a8cc6b7ded 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 + /hardware/controllers/akai_lpd8.html diff --git a/res/controllers/Allen and Heath Xone K2.midi.xml b/res/controllers/Allen and Heath Xone K2.midi.xml index 32e65f75a769..16c78493f531 100644 --- a/res/controllers/Allen and Heath Xone K2.midi.xml +++ b/res/controllers/Allen and Heath Xone K2.midi.xml @@ -4,6 +4,7 @@ Allen&Heath Xone K2/K1 Be https://mixxx.org/wiki/doku.php/allen_heath_xone_k2 + /hardware/controllers/allen_heath_xone_k2_k1.html 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 da4ba8d2258a..63a5896100b4 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 + /hardware/controllers/american_audio_radius_2000.html diff --git a/res/controllers/American Audio RADIUS 2000 CH2.midi.xml b/res/controllers/American Audio RADIUS 2000 CH2.midi.xml index f1ee362fbce7..41ffbddb70ee 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 + /hardware/controllers/american_audio_radius_2000.html diff --git a/res/controllers/American Audio VMS2.midi.xml b/res/controllers/American Audio VMS2.midi.xml index b61abe003013..ef5f0a5ad980 100644 --- a/res/controllers/American Audio VMS2.midi.xml +++ b/res/controllers/American Audio VMS2.midi.xml @@ -6,6 +6,7 @@ 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 + /hardware/controllers/american_audio_vms2.html diff --git a/res/controllers/American Audio VMS4.midi.xml b/res/controllers/American Audio VMS4.midi.xml index e1b83a2fc9d5..12af3445650d 100644 --- a/res/controllers/American Audio VMS4.midi.xml +++ b/res/controllers/American Audio VMS4.midi.xml @@ -6,6 +6,7 @@ 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.) + /hardware/controllers/american_audio_vms4.html diff --git a/res/controllers/Behringer BCD2000.midi.xml b/res/controllers/Behringer BCD2000.midi.xml index 2894bc746efd..38e3f2d1ed36 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 + /hardware/controllers/behringer_b_control_deejay_bcd2000.html diff --git a/res/controllers/Behringer BCD3000 Advanced.midi.xml b/res/controllers/Behringer BCD3000 Advanced.midi.xml index 614d61e389e3..4750b3faa908 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 + /hardware/controllers/behringer_b_control_deejay_bcd3000.html diff --git a/res/controllers/Behringer CMD MM1.midi.xml b/res/controllers/Behringer CMD MM1.midi.xml index f2ef597384c5..4e1656cf64ab 100644 --- a/res/controllers/Behringer CMD MM1.midi.xml +++ b/res/controllers/Behringer CMD MM1.midi.xml @@ -11,6 +11,7 @@ 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 + /hardware/controllers/behringer_cmd_mm_1.html diff --git a/res/controllers/Behringer CMD Micro.midi.xml b/res/controllers/Behringer CMD Micro.midi.xml index facb1f46b6e3..e858da12a688 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 + /hardware/controllers/behringer_cmd_micro.html diff --git a/res/controllers/Behringer CMDStudio4a.midi.xml b/res/controllers/Behringer CMDStudio4a.midi.xml index ba51a19a80a7..c078b14c5a03 100644 --- a/res/controllers/Behringer CMDStudio4a.midi.xml +++ b/res/controllers/Behringer CMDStudio4a.midi.xml @@ -6,6 +6,7 @@ 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 + /hardware/controllers/behringer_cmd_studio_4a.html diff --git a/res/controllers/DJ TechTools MIDI Fighter Twister.midi.xml b/res/controllers/DJ TechTools MIDI Fighter Twister.midi.xml index c83295c433a9..e0edb014176b 100644 --- a/res/controllers/DJ TechTools MIDI Fighter Twister.midi.xml +++ b/res/controllers/DJ TechTools MIDI Fighter Twister.midi.xml @@ -5,6 +5,7 @@ tock203 for 2 deck use https://www.mixxx.org/wiki/doku.php/dj_tech_tools_midi_fighter_twister + /hardware/controllers/dj_techtools_midi_figher_twister.html diff --git a/res/controllers/DJ-Tech CDJ-101.midi.xml b/res/controllers/DJ-Tech CDJ-101.midi.xml index 60d8f0365209..61146034cbf4 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 + /hardware/controllers/dj_tech_cdj_101.html diff --git a/res/controllers/DJ-Tech DJM-101.midi.xml b/res/controllers/DJ-Tech DJM-101.midi.xml index 6a5f2fc90c45..380c26a970e3 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 + /hardware/controllers/dj_tech_djm_101.html diff --git a/res/controllers/DJ-Tech Kontrol One.midi.xml b/res/controllers/DJ-Tech Kontrol One.midi.xml index 693e4be18f94..47d8f01a57bc 100644 --- a/res/controllers/DJ-Tech Kontrol One.midi.xml +++ b/res/controllers/DJ-Tech Kontrol One.midi.xml @@ -5,6 +5,7 @@ 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 + /hardware/controllers/dj_tech_kontrol_one.html diff --git a/res/controllers/DJ-Tech Mix-101.midi.xml b/res/controllers/DJ-Tech Mix-101.midi.xml index 71df95b8eed2..0097d27560bf 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 + MIDI mapping for DJ-Tech MIX-101 http://mixxx.org/forums/viewtopic.php?f=7&t=3981 + /hardware/controllers/dj_tech_mix_101.html diff --git a/res/controllers/DJ-Tech Mixer One.midi.xml b/res/controllers/DJ-Tech Mixer One.midi.xml index 8b77020553d5..e8a4b1bddc6f 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 + /hardware/controllers/dj_tech_mixer_one.html diff --git a/res/controllers/DJ-Tech i-Mix Reload.midi.xml b/res/controllers/DJ-Tech i-Mix Reload.midi.xml index ca7a90565038..2e3a6605d928 100644 --- a/res/controllers/DJ-Tech i-Mix Reload.midi.xml +++ b/res/controllers/DJ-Tech i-Mix Reload.midi.xml @@ -4,6 +4,7 @@ vininim MIDI mapping for DJ-Tech i-Mix Reload http://mixxx.org/forums/viewtopic.php?f=7&t=1637 + /hardware/controllers/dj_tech_imix_reload.html diff --git a/res/controllers/DJTechTools MIDI Fighter.midi.xml b/res/controllers/DJTechTools MIDI Fighter.midi.xml index 4f467035dd32..530d9275fe52 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 + /hardware/controllers/dj_techtools_midi_figher_classic.html diff --git a/res/controllers/Denon DN HS5500.midi.xml b/res/controllers/Denon DN HS5500.midi.xml index 1895d2c4b86b..32b3bf8a3ae3 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 - + /hardware/controllers/denon_dn_hs5500.html diff --git a/res/controllers/Denon DN SC2000.midi.xml b/res/controllers/Denon DN SC2000.midi.xml index badd5cf66622..dfcc5e08f464 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 + /hardware/controllers/denon_dn_sc2000.html diff --git a/res/controllers/Denon MC3000.midi.xml b/res/controllers/Denon MC3000.midi.xml index 20f12def9ff0..c1df5425abb4 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 + /hardware/controllers/denon_mc3000.html diff --git a/res/controllers/Denon MC4000.midi.xml b/res/controllers/Denon MC4000.midi.xml index 9b0480db3c2e..27d916cf40f9 100644 --- a/res/controllers/Denon MC4000.midi.xml +++ b/res/controllers/Denon MC4000.midi.xml @@ -5,6 +5,7 @@ Tim Rae 2-deck mapping for Denon MC4000 controller http://mixxx.org/forums/viewtopic.php?f=7&t=7443 + /hardware/controllers/denon_mc4000.html diff --git a/res/controllers/Denon-MC6000MK2.midi.xml b/res/controllers/Denon-MC6000MK2.midi.xml index 6cfad3f3eb83..f159d1053add 100644 --- a/res/controllers/Denon-MC6000MK2.midi.xml +++ b/res/controllers/Denon-MC6000MK2.midi.xml @@ -5,6 +5,7 @@ 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 + /hardware/controllers/denon_mc6000mk2.html diff --git a/res/controllers/Denon-MC7000.midi.xml b/res/controllers/Denon-MC7000.midi.xml index 7614768b5617..6fd694c23f1c 100644 --- a/res/controllers/Denon-MC7000.midi.xml +++ b/res/controllers/Denon-MC7000.midi.xml @@ -6,6 +6,7 @@ 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 + /hardware/controllers/denon_mc7000.html diff --git a/res/controllers/EKS Otus.hid.xml b/res/controllers/EKS Otus.hid.xml index 2456a05932a2..3306e856dd54 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 + /hardware/controllers/eks_otus.html diff --git a/res/controllers/Electrix Tweaker.midi.xml b/res/controllers/Electrix Tweaker.midi.xml index f74025583b1f..5391f8ef0392 100644 --- a/res/controllers/Electrix Tweaker.midi.xml +++ b/res/controllers/Electrix Tweaker.midi.xml @@ -23,6 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Be 4-deck mapping for Electrix Tweaker with EQ and loop modes http://mixxx.org/forums/viewtopic.php?f=7&t=7189 + /hardware/controllers/electrix_tweaker.html diff --git a/res/controllers/Evolution_Xsession.midi.xml b/res/controllers/Evolution_Xsession.midi.xml index 8b2bac579afb..436263df6870 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 + /hardware/controllers/evolution_x_session.html diff --git a/res/controllers/FaderFoxDJ2.midi.xml b/res/controllers/FaderFoxDJ2.midi.xml index 5f6a5b1e3fea..3a9521fe2d60 100644 --- a/res/controllers/FaderFoxDJ2.midi.xml +++ b/res/controllers/FaderFoxDJ2.midi.xml @@ -5,6 +5,7 @@ Sacha Berger, Gosseyn MIDI Mapping for FaderFoxDJ2 http://www.mixxx.org/wiki/doku.php/faderfox_dj2 + /hardware/controllers/faderfox_dj2.html diff --git a/res/controllers/Gemini CDMP-7000 L audio.midi.xml b/res/controllers/Gemini CDMP-7000 L audio.midi.xml index 170fd4161a6a..fba65491f2a3 100644 --- a/res/controllers/Gemini CDMP-7000 L audio.midi.xml +++ b/res/controllers/Gemini CDMP-7000 L audio.midi.xml @@ -5,6 +5,7 @@ djtrinidad Gemini CDMP-7000 mapping for Deck 1 http://mixxx.org/forums/viewtopic.php?f=7&t=6535 + /hardware/controllers/gemini_cdmp_7000.html diff --git a/res/controllers/Gemini CDMP-7000 R audio.midi.xml b/res/controllers/Gemini CDMP-7000 R audio.midi.xml index 40a9eaf11e75..67f240648466 100644 --- a/res/controllers/Gemini CDMP-7000 R audio.midi.xml +++ b/res/controllers/Gemini CDMP-7000 R audio.midi.xml @@ -5,6 +5,7 @@ djtrinidad Gemini CDMP-7000 mapping for Deck 2 http://mixxx.org/forums/viewtopic.php?f=7&t=6535 + /hardware/controllers/gemini_cdmp_7000.html diff --git a/res/controllers/Gemini FirstMix.midi.xml b/res/controllers/Gemini FirstMix.midi.xml index 2fabc6d2b83f..0a250d7be8dc 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 + /hardware/controllers/gemini_firstmix.html diff --git a/res/controllers/Hercules DJ Console 4-Mx.midi.xml b/res/controllers/Hercules DJ Console 4-Mx.midi.xml index 419ad501ace8..40ecebd8cf8d 100644 --- a/res/controllers/Hercules DJ Console 4-Mx.midi.xml +++ b/res/controllers/Hercules DJ Console 4-Mx.midi.xml @@ -6,6 +6,7 @@ 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 + /hardware/controllers/hercules_dj_console_4_mx.html diff --git a/res/controllers/Hercules DJ Console Mac Edition.midi.xml b/res/controllers/Hercules DJ Console Mac Edition.midi.xml index 8c7810f8de5c..994b313d8c40 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) + /hardware/controllers/hercules_dj_console_mac_edition.html diff --git a/res/controllers/Hercules DJ Console Mk1.hid.xml b/res/controllers/Hercules DJ Console Mk1.hid.xml index 2e580fa2e23e..f36ee7c44f62 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 + /hardware/controllers/hercules_dj_console_mk1.html diff --git a/res/controllers/Hercules DJ Console Mk2.hid.xml b/res/controllers/Hercules DJ Console Mk2.hid.xml index 824cceb009bd..4698a3424d0f 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. + /hardware/controllers/hercules_dj_console_mk2.html diff --git a/res/controllers/Hercules DJ Console Mk2.midi.xml b/res/controllers/Hercules DJ Console Mk2.midi.xml index 8aed0aaedf6c..4cb9b1e6cfe5 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. + /hardware/controllers/hercules_dj_console_mk2.html diff --git a/res/controllers/Hercules DJ Console Mk4.midi.xml b/res/controllers/Hercules DJ Console Mk4.midi.xml index a842d8365096..b435b362b584 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 + /hardware/controllers/hercules_dj_console_mk4.html diff --git a/res/controllers/Hercules DJ Console RMX 2.midi.xml b/res/controllers/Hercules DJ Console RMX 2.midi.xml index 35e7315c259b..f3ddf34b8a88 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. + /hardware/controllers/hercules_dj_console_rmx2.html diff --git a/res/controllers/Hercules DJ Console RMX Advanced.midi.xml b/res/controllers/Hercules DJ Console RMX Advanced.midi.xml index 773657d3e249..e33890fd91b2 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 + /hardware/controllers/hercules_dj_console_rmx.html diff --git a/res/controllers/Hercules DJ Console RMX.hid.xml b/res/controllers/Hercules DJ Console RMX.hid.xml index ef4191f2c487..ad8e5d16a2fc 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 + /hardware/controllers/hercules_dj_console_rmx.html diff --git a/res/controllers/Hercules DJ Console RMX.midi.xml b/res/controllers/Hercules DJ Console RMX.midi.xml index 28ba70d3156a..e5a360e11872 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 + /hardware/controllers/hercules_dj_console_rmx.html diff --git a/res/controllers/Hercules DJ Control AIR.midi.xml b/res/controllers/Hercules DJ Control AIR.midi.xml index a7d09b055faf..7288b5317462 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 + /hardware/controllers/hercules_djcontrol_air.html diff --git a/res/controllers/Hercules DJ Control Instinct.midi.xml b/res/controllers/Hercules DJ Control Instinct.midi.xml index f9a894069c29..cd490be87c21 100644 --- a/res/controllers/Hercules DJ Control Instinct.midi.xml +++ b/res/controllers/Hercules DJ Control Instinct.midi.xml @@ -5,6 +5,7 @@ http://mixxx.org/wiki/doku.php/hercules_dj_control_instinct http://www.mixxx.org/forums/viewtopic.php?f=7&t=3907 + /hardware/controllers/hercules_djcontrol_instinct.html diff --git a/res/controllers/Hercules DJ Control MP3 e2.bulk.xml b/res/controllers/Hercules DJ Control MP3 e2.bulk.xml index ca32045a4238..4c05ed946b23 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. + /hardware/controllers/hercules_djcontrol_mp3_e2.html diff --git a/res/controllers/Hercules DJ Control MP3 e2.midi.xml b/res/controllers/Hercules DJ Control MP3 e2.midi.xml index c2837500e5e8..7671d6f5ee89 100644 --- a/res/controllers/Hercules DJ Control MP3 e2.midi.xml +++ b/res/controllers/Hercules DJ Control MP3 e2.midi.xml @@ -6,6 +6,7 @@ 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 + /hardware/controllers/hercules_djcontrol_mp3_e2.html diff --git a/res/controllers/Hercules DJ Control MP3.hid.xml b/res/controllers/Hercules DJ Control MP3.hid.xml index 664de3a0d3ea..ebdbeccd3090 100644 --- a/res/controllers/Hercules DJ Control MP3.hid.xml +++ b/res/controllers/Hercules DJ Control MP3.hid.xml @@ -6,6 +6,7 @@ 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 + /hardware/controllers/hercules_djcontrol_mp3.html diff --git a/res/controllers/Hercules DJ Control MP3.midi.xml b/res/controllers/Hercules DJ Control MP3.midi.xml index 82fc7277d9ed..98281678824f 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. - + /hardware/controllers/hercules_djcontrol_mp3.html diff --git a/res/controllers/Hercules DJControl Compact.midi.xml b/res/controllers/Hercules DJControl Compact.midi.xml index 29260add8053..f0676936f5e7 100644 --- a/res/controllers/Hercules DJControl Compact.midi.xml +++ b/res/controllers/Hercules DJControl Compact.midi.xml @@ -8,6 +8,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 + /hardware/controllers/hercules_djcontrol_compact.html diff --git a/res/controllers/Hercules DJControl Starlight.midi.xml b/res/controllers/Hercules DJControl Starlight.midi.xml index 3ba160468e5e..5ad532bccbf6 100644 --- a/res/controllers/Hercules DJControl Starlight.midi.xml +++ b/res/controllers/Hercules DJControl Starlight.midi.xml @@ -6,6 +6,7 @@ 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 + /hardware/controllers/hercules_djcontrol_starlight.html diff --git a/res/controllers/Hercules P32 DJ.midi.xml b/res/controllers/Hercules P32 DJ.midi.xml index 203ac3aff2c6..2c7bb7bf3acd 100644 --- a/res/controllers/Hercules P32 DJ.midi.xml +++ b/res/controllers/Hercules P32 DJ.midi.xml @@ -6,6 +6,7 @@ 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 + /hardware/controllers/hercules_p32_dj.html diff --git a/res/controllers/Ion Discover DJ.midi.xml b/res/controllers/Ion Discover DJ.midi.xml index 188ec3dfc07c..c9825f420a68 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 + /hardware/controllers/ion_discover_dj.html diff --git a/res/controllers/KANE_QuNeo.midi.xml b/res/controllers/KANE_QuNeo.midi.xml index e7de4de8b8b7..aa034dce66d9 100644 --- a/res/controllers/KANE_QuNeo.midi.xml +++ b/res/controllers/KANE_QuNeo.midi.xml @@ -5,6 +5,7 @@ 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 + /hardware/controllers/keith_mcmillen_quneo.html diff --git a/res/controllers/Kontrol Dj KDJ500.midi.xml b/res/controllers/Kontrol Dj KDJ500.midi.xml index 62c875e092c0..b157278c6636 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 + /hardware/controllers/kontrol_dj_kdj500.html diff --git a/res/controllers/Korg nanoKONTROL 2.midi.xml b/res/controllers/Korg nanoKONTROL 2.midi.xml index 69f2c0afa218..73c5396bc6ef 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 + /hardware/controllers/korg_nanokontrol2.html diff --git a/res/controllers/Korg nanoKONTROL.midi.xml b/res/controllers/Korg nanoKONTROL.midi.xml index 77710d2a8ae9..1237c6a376d4 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 + /hardware/controllers/korg_nanokontrol.html diff --git a/res/controllers/Korg nanoPAD2.midi.xml b/res/controllers/Korg nanoPAD2.midi.xml index 7fa27c91666a..3a6384439df5 100644 --- a/res/controllers/Korg nanoPAD2.midi.xml +++ b/res/controllers/Korg nanoPAD2.midi.xml @@ -5,6 +5,7 @@ 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 + /hardware/controllers/korg_nanopad2.html diff --git a/res/controllers/Korg-KAOSS-DJ.midi.xml b/res/controllers/Korg-KAOSS-DJ.midi.xml index a89fcffed96f..fac979d9699e 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 + /hardware/controllers/korg_kaoss_dj.html diff --git a/res/controllers/M-Audio_Xsession_pro.midi.xml b/res/controllers/M-Audio_Xsession_pro.midi.xml index 906a456cd2c4..152ac137148f 100644 --- a/res/controllers/M-Audio_Xsession_pro.midi.xml +++ b/res/controllers/M-Audio_Xsession_pro.midi.xml @@ -5,6 +5,7 @@ Karli MIDI Mapping for M-Audio X-Session Pro http://mixxx.org/wiki/doku.php/m-audio_x-session_pro + /hardware/controllers/m_audio_x_session_pro.html diff --git a/res/controllers/MidiTech-MidiControl.midi.xml b/res/controllers/MidiTech-MidiControl.midi.xml index 1f6e82116eb6..f673748446dd 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 + /hardware/controllers/miditech_midicontrol.html diff --git a/res/controllers/MixVibes U-Mix Control 2.midi.xml b/res/controllers/MixVibes U-Mix Control 2.midi.xml index ecf5f8123b6e..35c22d7c1075 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 + /hardware/controllers/mixvibes_u_mix_control_2.html 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 f6bf18ab57f3..cb7ba90f7951 100644 --- a/res/controllers/MixVibes U-Mix Control Pro 2.midi.xml +++ b/res/controllers/MixVibes U-Mix Control Pro 2.midi.xml @@ -6,6 +6,7 @@ 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 + /hardware/controllers/mixvibes_u_mix_control_2.html diff --git a/res/controllers/Mixman DM2 (Linux).midi.xml b/res/controllers/Mixman DM2 (Linux).midi.xml index 68dedd590c49..e6d3a7a46620 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) - + /hardware/controllers/mixman_dm2.html + diff --git a/res/controllers/Mixman DM2 (OS X).midi.xml b/res/controllers/Mixman DM2 (OS X).midi.xml index 417019aa1741..562384459927 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) + /hardware/controllers/mixman_dm2.html diff --git a/res/controllers/Mixman DM2 (Windows).midi.xml b/res/controllers/Mixman DM2 (Windows).midi.xml index f244e5b2998c..88f34e9c70ec 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) + /hardware/controllers/mixman_dm2.html diff --git a/res/controllers/Nintendo Wiimote.hid.xml b/res/controllers/Nintendo Wiimote.hid.xml index 340c7153b6da..047aec7578c5 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 + /hardware/controllers/nintendo_wiimote.html diff --git a/res/controllers/Novation Dicer.midi.xml b/res/controllers/Novation Dicer.midi.xml index 2902f751576a..6d2917a1fafa 100644 --- a/res/controllers/Novation Dicer.midi.xml +++ b/res/controllers/Novation Dicer.midi.xml @@ -5,6 +5,7 @@ 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 + /hardware/controllers/novation_dicer.html diff --git a/res/controllers/Novation Launchpad MK2.midi.xml b/res/controllers/Novation Launchpad MK2.midi.xml index c9a252510ea4..ab556e2b44df 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 + /hardware/controllers/novation_launchpad_mk2.html diff --git a/res/controllers/Novation Launchpad.midi.xml b/res/controllers/Novation Launchpad.midi.xml index ec8a1c40bbf6..53adf4489d9c 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 + /hardware/controllers/novation_launchpad_mk1.html diff --git a/res/controllers/Novation-Launchpad-Mini.midi.xml b/res/controllers/Novation-Launchpad-Mini.midi.xml index f291c0e0f3d8..4fa2942e7902 100644 --- a/res/controllers/Novation-Launchpad-Mini.midi.xml +++ b/res/controllers/Novation-Launchpad-Mini.midi.xml @@ -5,6 +5,7 @@ marczis Multi page mapping for the Novation Launchpad Mini http://mixxx.org/forums/viewtopic.php?f=7&t=6335 + /hardware/controllers/novation_launchpad_mini.html diff --git a/res/controllers/Numark DJ2Go.midi.xml b/res/controllers/Numark DJ2Go.midi.xml index a41b291108fb..8f9b7c5e6e01 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 + /hardware/controllers/numark_dj2go.html diff --git a/res/controllers/Numark MIXTRACK.midi.xml b/res/controllers/Numark MIXTRACK.midi.xml index 907d29a01b7d..575abef84a48 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 + /hardware/controllers/numark_mixtrack.html diff --git a/res/controllers/Numark Mixtrack 2.midi.xml b/res/controllers/Numark Mixtrack 2.midi.xml index 8bf0d817be7d..27bf7f4f1597 100644 --- a/res/controllers/Numark Mixtrack 2.midi.xml +++ b/res/controllers/Numark Mixtrack 2.midi.xml @@ -5,6 +5,7 @@ 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 + /hardware/controllers/numark_mixtrack_pro_ii.html diff --git a/res/controllers/Numark Mixtrack Platinum.midi.xml b/res/controllers/Numark Mixtrack Platinum.midi.xml index f1cd45b52e73..39d9ff1f1053 100644 --- a/res/controllers/Numark Mixtrack Platinum.midi.xml +++ b/res/controllers/Numark Mixtrack Platinum.midi.xml @@ -6,6 +6,7 @@ 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 + /hardware/controllers/numark_mixtrack_platinum.html diff --git a/res/controllers/Numark Mixtrack Pro.midi.xml b/res/controllers/Numark Mixtrack Pro.midi.xml index 03b73760b401..ac712c031261 100644 --- a/res/controllers/Numark Mixtrack Pro.midi.xml +++ b/res/controllers/Numark Mixtrack Pro.midi.xml @@ -7,6 +7,7 @@ Modify by Darío José Freije 06/27/2012--> 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 + /hardware/controllers/numark_mixtrack_pro.html diff --git a/res/controllers/Numark N4.midi.xml b/res/controllers/Numark N4.midi.xml index d030912476a5..94b1626853e2 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 + /hardware/controllers/numark_n4.html diff --git a/res/controllers/Numark NS7.midi.xml b/res/controllers/Numark NS7.midi.xml index 18d8316039d7..6d1bc1ed4d4e 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 + /hardware/controllers/numark_ns7.html diff --git a/res/controllers/Numark Omni Control.midi.xml b/res/controllers/Numark Omni Control.midi.xml index ade3dfe997a9..487dc166fdb7 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 + /hardware/controllers/numark_omni_control.html diff --git a/res/controllers/Numark Total Control.midi.xml b/res/controllers/Numark Total Control.midi.xml index c25f72032a7b..ca82e30cfff7 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 + /hardware/controllers/numark_total_control.html diff --git a/res/controllers/Numark V7.midi.xml b/res/controllers/Numark V7.midi.xml index 64de9b0fac5d..8b9f97ef26fc 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 + /hardware/controllers/numark_v7.html diff --git a/res/controllers/Numark iDJ Live II.midi.xml b/res/controllers/Numark iDJ Live II.midi.xml index ee0fb02ea43d..6041e1d36d1f 100644 --- a/res/controllers/Numark iDJ Live II.midi.xml +++ b/res/controllers/Numark iDJ Live II.midi.xml @@ -5,6 +5,7 @@ Nathan Korth Complete mapping for iDJ Live II https://mixxx.org/wiki/doku.php/numark_idj_live_ii + /hardware/controllers/numark_idj_live_ii.html diff --git a/res/controllers/Pioneer CDJ-2000.midi.xml b/res/controllers/Pioneer CDJ-2000.midi.xml index 7aa8ed97dead..fc0af7b1e457 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 + /hardware/controllers/pioneer_cdj_2000.html diff --git a/res/controllers/Pioneer CDJ-350 Ch1.midi.xml b/res/controllers/Pioneer CDJ-350 Ch1.midi.xml index 8d04b2e85a74..c5983a8be3b4 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 + /hardware/controllers/pioneer_cdj_350.html diff --git a/res/controllers/Pioneer CDJ-350 Ch2.midi.xml b/res/controllers/Pioneer CDJ-350 Ch2.midi.xml index cc9546df6677..e3ef5dad0647 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 + /hardware/controllers/pioneer_cdj_350.html diff --git a/res/controllers/Pioneer CDJ-850.midi.xml b/res/controllers/Pioneer CDJ-850.midi.xml index 3822fa48a38d..9c63adc6328e 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 + /hardware/controllers/pioneer_cdj_850.html diff --git a/res/controllers/Pioneer DDJ-SX.midi.xml b/res/controllers/Pioneer DDJ-SX.midi.xml index 1d62f27e3d2d..42e6cd96b85d 100644 --- a/res/controllers/Pioneer DDJ-SX.midi.xml +++ b/res/controllers/Pioneer DDJ-SX.midi.xml @@ -6,6 +6,7 @@ Pioneer DDJ-SX controller mapping http://mixxx.org/forums/viewtopic.php?f=7&t=8310 http://mixxx.org/wiki/doku.php/pioneer_ddj-sx + /hardware/controllers/pioneer_ddj_sx.html diff --git a/res/controllers/Pioneer-DDJ-SB.midi.xml b/res/controllers/Pioneer-DDJ-SB.midi.xml index 407ea89e8ca9..3bff8258e87a 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. + /hardware/controllers/pioneer_ddj_sb.html diff --git a/res/controllers/Pioneer-DDJ-SB2.midi.xml b/res/controllers/Pioneer-DDJ-SB2.midi.xml index 8778aecfe4ae..f8a58dd41ecf 100644 --- a/res/controllers/Pioneer-DDJ-SB2.midi.xml +++ b/res/controllers/Pioneer-DDJ-SB2.midi.xml @@ -6,6 +6,7 @@ Pioneer DDJ-SB2 http://mixxx.org/forums/viewtopic.php?f=7&t=7509 http://mixxx.org/wiki/doku.php/pioneer_ddj-sb2 + /hardware/controllers/pioneer_ddj_sb2.html diff --git a/res/controllers/Reloop Beatmix 2-4.midi.xml b/res/controllers/Reloop Beatmix 2-4.midi.xml index 86e57e624edf..1c454548aaac 100644 --- a/res/controllers/Reloop Beatmix 2-4.midi.xml +++ b/res/controllers/Reloop Beatmix 2-4.midi.xml @@ -6,6 +6,7 @@ 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 + /hardware/controllers/reloop_beatmix_2.html diff --git a/res/controllers/Reloop Beatpad.midi.xml b/res/controllers/Reloop Beatpad.midi.xml index 4447c5a17409..172d11aee9ea 100644 --- a/res/controllers/Reloop Beatpad.midi.xml +++ b/res/controllers/Reloop Beatpad.midi.xml @@ -6,6 +6,7 @@ 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 + /hardware/controllers/reloop_beatpad.html 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 8cf6e5a67eaf..4cc9a880dc48 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 + /hardware/controllers/reloop_digital_jockey_2_controller_edition.html diff --git a/res/controllers/Reloop Jockey 3 ME.midi.xml b/res/controllers/Reloop Jockey 3 ME.midi.xml index 37eee15e142c..10b3da709fb1 100644 --- a/res/controllers/Reloop Jockey 3 ME.midi.xml +++ b/res/controllers/Reloop Jockey 3 ME.midi.xml @@ -6,6 +6,7 @@ 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 + /hardware/controllers/reloop_jockey_3_master_edition.html diff --git a/res/controllers/Reloop Terminal Mix 2-4.midi.xml b/res/controllers/Reloop Terminal Mix 2-4.midi.xml index bb440e87c7c6..adfc034ba064 100644 --- a/res/controllers/Reloop Terminal Mix 2-4.midi.xml +++ b/res/controllers/Reloop Terminal Mix 2-4.midi.xml @@ -5,6 +5,7 @@ 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 + /hardware/controllers/reloop_terminal_mix_series.html diff --git a/res/controllers/Roland_DJ-505.midi.xml b/res/controllers/Roland_DJ-505.midi.xml index a26f4c18f210..5f56dabe97a1 100644 --- a/res/controllers/Roland_DJ-505.midi.xml +++ b/res/controllers/Roland_DJ-505.midi.xml @@ -6,6 +6,7 @@ 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 + /hardware/controllers/roland_dj_505.html diff --git a/res/controllers/Sony SixxAxis.hid.xml b/res/controllers/Sony SixxAxis.hid.xml index 86418b61cc08..26b7d13ab55b 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 + /hardware/controllers/sony_sixxaxis.html diff --git a/res/controllers/Soundless_joyMIDI.midi.xml b/res/controllers/Soundless_joyMIDI.midi.xml index cb3d68f138a1..c955045af967 100644 --- a/res/controllers/Soundless_joyMIDI.midi.xml +++ b/res/controllers/Soundless_joyMIDI.midi.xml @@ -6,6 +6,7 @@ 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 + /hardware/controllers/soundless_studio_joymidi.html diff --git a/res/controllers/Stanton SCS.1d.midi.xml b/res/controllers/Stanton SCS.1d.midi.xml index 9c8e82bf16b8..4ce49fb93cba 100644 --- a/res/controllers/Stanton SCS.1d.midi.xml +++ b/res/controllers/Stanton SCS.1d.midi.xml @@ -7,6 +7,7 @@ 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 + /hardware/controllers/stanton_scs1d.html diff --git a/res/controllers/Stanton SCS.1m.midi.xml b/res/controllers/Stanton SCS.1m.midi.xml index 18a37a37ec2d..49712c640207 100644 --- a/res/controllers/Stanton SCS.1m.midi.xml +++ b/res/controllers/Stanton SCS.1m.midi.xml @@ -5,6 +5,7 @@ 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 + /hardware/controllers/stanton_scs1m.html diff --git a/res/controllers/Stanton SCS.3d Alternate.midi.xml b/res/controllers/Stanton SCS.3d Alternate.midi.xml index 2fb9d7b5458d..d8afb47d0103 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. + /hardware/controllers/stanton_scs3d.html diff --git a/res/controllers/Stanton SCS.3m.midi.xml b/res/controllers/Stanton SCS.3m.midi.xml index 8071a3ecb0f3..9f473171cb66 100644 --- a/res/controllers/Stanton SCS.3m.midi.xml +++ b/res/controllers/Stanton SCS.3m.midi.xml @@ -5,6 +5,7 @@ sbalmer Mapping for the Stanton SCS.3m controller. Supports four decks. http://mixxx.org/wiki/doku.php/stanton_scs.3m + /hardware/controllers/stanton_scs3m.html diff --git a/res/controllers/Stanton-DJC-4.midi.xml b/res/controllers/Stanton-DJC-4.midi.xml index c91fe88fd7c0..9c87f00589d5 100644 --- a/res/controllers/Stanton-DJC-4.midi.xml +++ b/res/controllers/Stanton-DJC-4.midi.xml @@ -5,6 +5,7 @@ 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 + /hardware/controllers/stanton_djc_4.html diff --git a/res/controllers/TrakProDJ iPad.midi.xml b/res/controllers/TrakProDJ iPad.midi.xml index 3d318f3787f2..dd2cd4bbfdc3 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 + /hardware/controllers/trakprodj.html diff --git a/res/controllers/Traktor Kontrol F1.hid.xml b/res/controllers/Traktor Kontrol F1.hid.xml index e97e450b94dd..898e3e980f95 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 + /hardware/controllers/native_instruments_traktor_kontrol_f1.html diff --git a/res/controllers/Traktor Kontrol S2 MK3.hid.xml b/res/controllers/Traktor Kontrol S2 MK3.hid.xml index 556a7e217a1e..c516ee501135 100644 --- a/res/controllers/Traktor Kontrol S2 MK3.hid.xml +++ b/res/controllers/Traktor Kontrol S2 MK3.hid.xml @@ -6,6 +6,7 @@ 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 + /hardware/controllers/native_instruments_traktor_kontrol_s2_mk3.html diff --git a/res/controllers/Traktor Kontrol S2 Mk2.hid.xml b/res/controllers/Traktor Kontrol S2 Mk2.hid.xml index 14138ab346c5..0bd6939478e2 100644 --- a/res/controllers/Traktor Kontrol S2 Mk2.hid.xml +++ b/res/controllers/Traktor Kontrol S2 Mk2.hid.xml @@ -5,6 +5,7 @@ Be Native Instruments Traktor Kontrol S2 MK2 https://github.com/mixxxdj/mixxx/wiki/Native-Instruments-Traktor-Kontrol-S2-Mk2 + /hardware/controllers/native_instruments_traktor_kontrol_s2_mk2.html diff --git a/res/controllers/Traktor Kontrol S4 MK2.hid.xml b/res/controllers/Traktor Kontrol S4 MK2.hid.xml index 712719105957..d68e0d9689d5 100644 --- a/res/controllers/Traktor Kontrol S4 MK2.hid.xml +++ b/res/controllers/Traktor Kontrol S4 MK2.hid.xml @@ -5,6 +5,7 @@ Owen Williams, Fayaaz Ahmed HID Mapping for Traktor Kontrol S4 MK2 http://mixxx.org/wiki/doku.php/traktor_s4_mk2 + /hardware/controllers/native_instruments_traktor_kontrol_s4_mk2.html diff --git a/res/controllers/Traktor Kontrol X1.midi.xml b/res/controllers/Traktor Kontrol X1.midi.xml index 54a7ec088561..ab740ed2f034 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 + /hardware/controllers/native_instruments_traktor_kontrol_x1.html diff --git a/res/controllers/Vestax Spin.midi.xml b/res/controllers/Vestax Spin.midi.xml index abc039b50138..930067d628f6 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 + /hardware/controllers/vestax_spin.html diff --git a/res/controllers/Vestax Typhoon Enhanced.midi.xml b/res/controllers/Vestax Typhoon Enhanced.midi.xml index 59ca16084a34..aadc7815087e 100644 --- a/res/controllers/Vestax Typhoon Enhanced.midi.xml +++ b/res/controllers/Vestax Typhoon Enhanced.midi.xml @@ -5,6 +5,7 @@ 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 + /hardware/controllers/vestax_typhoon.html diff --git a/res/controllers/Vestax Typhoon.midi.xml b/res/controllers/Vestax Typhoon.midi.xml index ad3728be3df8..70ea6c7817e3 100644 --- a/res/controllers/Vestax Typhoon.midi.xml +++ b/res/controllers/Vestax Typhoon.midi.xml @@ -5,6 +5,7 @@ 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 + /hardware/controllers/vestax_typhoon.html diff --git a/res/controllers/Vestax VCI-100-3DEX.midi.xml b/res/controllers/Vestax VCI-100-3DEX.midi.xml index 76882f6b10dc..8a2f4441044c 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 + /hardware/controllers/vestax_vci_100_mixvibes_3dex_edition.html diff --git a/res/controllers/Vestax VCI-100-hile.midi.xml b/res/controllers/Vestax VCI-100-hile.midi.xml index 49fba9c130e4..f78310784b61 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 + /hardware/controllers/vestax_vci_100mki.html diff --git a/res/controllers/Vestax VCI-100.midi.xml b/res/controllers/Vestax VCI-100.midi.xml index 22d9e57487b9..9a0242cef156 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 + /hardware/controllers/vestax_vci_100mki.html diff --git a/res/controllers/Vestax VCI-100MKII.midi.xml b/res/controllers/Vestax VCI-100MKII.midi.xml index 604b02e6fcc5..24a57e619581 100644 --- a/res/controllers/Vestax VCI-100MKII.midi.xml +++ b/res/controllers/Vestax VCI-100MKII.midi.xml @@ -5,6 +5,7 @@ Takeshi Soejima 2018-4-15 http://www.mixxx.org/wiki/doku.php/vestax_vci-100mkii + /hardware/controllers/vestax_vci_100mkii.html diff --git a/res/controllers/Vestax VCI-300.midi.xml b/res/controllers/Vestax VCI-300.midi.xml index 68f35f91636a..fa1f569cae6d 100644 --- a/res/controllers/Vestax VCI-300.midi.xml +++ b/res/controllers/Vestax VCI-300.midi.xml @@ -5,6 +5,7 @@ Uwe Klotz http://www.mixxx.org/forums/viewtopic.php?f=7&t=4021 http://mixxx.org/wiki/doku.php/vestax_vci-300 + /hardware/controllers/vestax_vci_300.html diff --git a/res/controllers/Vestax VCI-400.midi.xml b/res/controllers/Vestax VCI-400.midi.xml index f5cca9bf7e30..56d7c46fd4de 100644 --- a/res/controllers/Vestax VCI-400.midi.xml +++ b/res/controllers/Vestax VCI-400.midi.xml @@ -5,6 +5,7 @@ Owen Williams, Tobias Rafreider Controller mapping for Vestax VCI-400 http://mixxx.org/wiki/doku.php/vestax_vci-400 + /hardware/controllers/vestax_vci_400.html diff --git a/res/controllers/us428.midi.xml b/res/controllers/us428.midi.xml index e4f9927653ea..c900f1c35214 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 + /hardware/controllers/tascam_us_428.html From d7cca8a50354108d9930f0c48dfe41634854b9e9 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Sun, 20 Sep 2020 21:20:38 +0200 Subject: [PATCH 3/8] controllers/controllerpreset: Use const reference --- src/controllers/controllerpreset.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controllers/controllerpreset.h b/src/controllers/controllerpreset.h index 14c6cbca4ef0..c84aac5ec2e3 100644 --- a/src/controllers/controllerpreset.h +++ b/src/controllers/controllerpreset.h @@ -123,7 +123,7 @@ class ControllerPreset { return m_forumlink; } - inline void setManualPath(const QString manualPath) { + inline void setManualPath(const QString& manualPath) { m_manualPath = manualPath; setDirty(true); } From dbb5c45d9124c2d1a5ca9a8c8d90f388d9818a72 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Sun, 20 Sep 2020 21:26:35 +0200 Subject: [PATCH 4/8] controllers/controllerpreset: Remove redunant inline keyword --- src/controllers/controllerpreset.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/controllers/controllerpreset.h b/src/controllers/controllerpreset.h index c84aac5ec2e3..4e97d5bed0ca 100644 --- a/src/controllers/controllerpreset.h +++ b/src/controllers/controllerpreset.h @@ -123,12 +123,12 @@ class ControllerPreset { return m_forumlink; } - inline void setManualPath(const QString& manualPath) { + void setManualPath(const QString& manualPath) { m_manualPath = manualPath; setDirty(true); } - inline QString manualPath() const { + QString manualPath() const { return m_manualPath; } From 20b220c0219af4e77f1bddc06097c32b73ec44e1 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Mon, 21 Sep 2020 22:56:49 +0200 Subject: [PATCH 5/8] controllers: Update Forum links Done using this python script: import re import requests import sys def replace_forum_url(matchobj): oldurl = matchobj.group(0).decode().replace("&", "&") oldurl = "https://mixxx.discourse.group" + oldurl.partition("forums")[2] print(oldurl) req = requests.head(oldurl, allow_redirects=True) return req.url.replace("&", "&").encode() for file in sys.argv[1:]: with open(file, mode="rb") as f: content = f.read() content = re.sub(rb'https?://mixxx.org/forums/[\w\?&;=\/\.]+', replace_forum_url, content) with open(file, mode="wb") as f: f.write(content) --- res/controllers/Akai MPD24.midi.xml | 2 +- res/controllers/Akai-LPD8-RK.midi.xml | 2 +- res/controllers/Behringer BCD3000.midi.xml | 2 +- res/controllers/DJ-Tech Kontrol One.midi.xml | 2 +- res/controllers/DJ-Tech Mix-101.midi.xml | 2 +- res/controllers/DJ-Tech i-Mix Reload.midi.xml | 2 +- res/controllers/Denon MC4000.midi.xml | 2 +- res/controllers/Electrix Tweaker.midi.xml | 2 +- res/controllers/Gemini CDMP-7000 L audio.midi.xml | 2 +- res/controllers/Gemini CDMP-7000 R audio.midi.xml | 2 +- res/controllers/Hercules DJ Control MP3 e2.midi.xml | 2 +- res/controllers/Hercules DJ Control MP3.hid.xml | 2 +- res/controllers/Hercules DJControl Starlight.midi.xml | 2 +- res/controllers/Hercules P32 DJ.midi.xml | 2 +- res/controllers/KANE_QuNeo.midi.xml | 2 +- res/controllers/Korg nanoPAD2.midi.xml | 2 +- res/controllers/Midi_for_light.midi.xml | 2 +- res/controllers/MixVibes U-Mix Control Pro 2.midi.xml | 2 +- res/controllers/Novation Dicer.midi.xml | 2 +- res/controllers/Novation-Launchpad-Mini.midi.xml | 2 +- res/controllers/Numark Mixtrack Pro.midi.xml | 2 +- res/controllers/Numark-Mixtrack-3.midi.xml | 2 +- res/controllers/Pioneer DDJ-SX.midi.xml | 2 +- res/controllers/Pioneer-DDJ-SB2.midi.xml | 2 +- res/controllers/Reloop Beatmix 2-4.midi.xml | 2 +- res/controllers/Reloop Jockey 3 ME.midi.xml | 2 +- res/controllers/Roland_DJ-505.midi.xml | 2 +- res/controllers/Vestax Typhoon Enhanced.midi.xml | 2 +- res/controllers/Vestax Typhoon.midi.xml | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/res/controllers/Akai MPD24.midi.xml b/res/controllers/Akai MPD24.midi.xml index 961771fe721f..dd076b75590b 100644 --- a/res/controllers/Akai MPD24.midi.xml +++ b/res/controllers/Akai MPD24.midi.xml @@ -4,7 +4,7 @@ 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 /hardware/controllers/akai_mpd24.html diff --git a/res/controllers/Akai-LPD8-RK.midi.xml b/res/controllers/Akai-LPD8-RK.midi.xml index 51a8cc6b7ded..a8d80e586aec 100644 --- a/res/controllers/Akai-LPD8-RK.midi.xml +++ b/res/controllers/Akai-LPD8-RK.midi.xml @@ -4,7 +4,7 @@ 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 /hardware/controllers/akai_lpd8.html diff --git a/res/controllers/Behringer BCD3000.midi.xml b/res/controllers/Behringer BCD3000.midi.xml index 054ac53e1bf9..53b65cf920c5 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/DJ-Tech Kontrol One.midi.xml b/res/controllers/DJ-Tech Kontrol One.midi.xml index 47d8f01a57bc..29f5083e6ea2 100644 --- a/res/controllers/DJ-Tech Kontrol One.midi.xml +++ b/res/controllers/DJ-Tech Kontrol One.midi.xml @@ -4,7 +4,7 @@ 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 /hardware/controllers/dj_tech_kontrol_one.html diff --git a/res/controllers/DJ-Tech Mix-101.midi.xml b/res/controllers/DJ-Tech Mix-101.midi.xml index 0097d27560bf..3b101aac027e 100644 --- a/res/controllers/DJ-Tech Mix-101.midi.xml +++ b/res/controllers/DJ-Tech Mix-101.midi.xml @@ -3,7 +3,7 @@ DJ-Tech MIX-101 rasda MIDI mapping for DJ-Tech MIX-101 - http://mixxx.org/forums/viewtopic.php?f=7&t=3981 + https://mixxx.discourse.group/t/dj-tech-mix-101-mapping/12679 /hardware/controllers/dj_tech_mix_101.html diff --git a/res/controllers/DJ-Tech i-Mix Reload.midi.xml b/res/controllers/DJ-Tech i-Mix Reload.midi.xml index 2e3a6605d928..4e849ef845b7 100644 --- a/res/controllers/DJ-Tech i-Mix Reload.midi.xml +++ b/res/controllers/DJ-Tech i-Mix Reload.midi.xml @@ -3,7 +3,7 @@ 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 /hardware/controllers/dj_tech_imix_reload.html diff --git a/res/controllers/Denon MC4000.midi.xml b/res/controllers/Denon MC4000.midi.xml index 27d916cf40f9..e0bd622be156 100644 --- a/res/controllers/Denon MC4000.midi.xml +++ b/res/controllers/Denon MC4000.midi.xml @@ -4,7 +4,7 @@ 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 /hardware/controllers/denon_mc4000.html diff --git a/res/controllers/Electrix Tweaker.midi.xml b/res/controllers/Electrix Tweaker.midi.xml index 5391f8ef0392..7530e6a879bb 100644 --- a/res/controllers/Electrix Tweaker.midi.xml +++ b/res/controllers/Electrix Tweaker.midi.xml @@ -22,7 +22,7 @@ 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 /hardware/controllers/electrix_tweaker.html diff --git a/res/controllers/Gemini CDMP-7000 L audio.midi.xml b/res/controllers/Gemini CDMP-7000 L audio.midi.xml index fba65491f2a3..f4ee60c85826 100644 --- a/res/controllers/Gemini CDMP-7000 L audio.midi.xml +++ b/res/controllers/Gemini CDMP-7000 L audio.midi.xml @@ -4,7 +4,7 @@ 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 /hardware/controllers/gemini_cdmp_7000.html diff --git a/res/controllers/Gemini CDMP-7000 R audio.midi.xml b/res/controllers/Gemini CDMP-7000 R audio.midi.xml index 67f240648466..ba62dc44f394 100644 --- a/res/controllers/Gemini CDMP-7000 R audio.midi.xml +++ b/res/controllers/Gemini CDMP-7000 R audio.midi.xml @@ -4,7 +4,7 @@ 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 /hardware/controllers/gemini_cdmp_7000.html diff --git a/res/controllers/Hercules DJ Control MP3 e2.midi.xml b/res/controllers/Hercules DJ Control MP3 e2.midi.xml index 7671d6f5ee89..89a7651039ac 100644 --- a/res/controllers/Hercules DJ Control MP3 e2.midi.xml +++ b/res/controllers/Hercules DJ Control MP3 e2.midi.xml @@ -5,7 +5,7 @@ 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 /hardware/controllers/hercules_djcontrol_mp3_e2.html diff --git a/res/controllers/Hercules DJ Control MP3.hid.xml b/res/controllers/Hercules DJ Control MP3.hid.xml index ebdbeccd3090..ed000dfd533d 100644 --- a/res/controllers/Hercules DJ Control MP3.hid.xml +++ b/res/controllers/Hercules DJ Control MP3.hid.xml @@ -5,7 +5,7 @@ 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 /hardware/controllers/hercules_djcontrol_mp3.html diff --git a/res/controllers/Hercules DJControl Starlight.midi.xml b/res/controllers/Hercules DJControl Starlight.midi.xml index 5ad532bccbf6..13ac71da1eff 100644 --- a/res/controllers/Hercules DJControl Starlight.midi.xml +++ b/res/controllers/Hercules DJControl Starlight.midi.xml @@ -5,7 +5,7 @@ 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 /hardware/controllers/hercules_djcontrol_starlight.html diff --git a/res/controllers/Hercules P32 DJ.midi.xml b/res/controllers/Hercules P32 DJ.midi.xml index 2c7bb7bf3acd..0c371d6be5b0 100644 --- a/res/controllers/Hercules P32 DJ.midi.xml +++ b/res/controllers/Hercules P32 DJ.midi.xml @@ -4,7 +4,7 @@ Hercules P32 DJ Be 4-deck mapping for Hercules P32 controller - http://mixxx.org/forums/viewtopic.php?f=7&t=8132 + https://mixxx.discourse.group/t/hercules-p32-dj-controller-mapping/15804 http://mixxx.org/wiki/doku.php/hercules_p32_dj /hardware/controllers/hercules_p32_dj.html diff --git a/res/controllers/KANE_QuNeo.midi.xml b/res/controllers/KANE_QuNeo.midi.xml index aa034dce66d9..df604a0c1fca 100644 --- a/res/controllers/KANE_QuNeo.midi.xml +++ b/res/controllers/KANE_QuNeo.midi.xml @@ -3,7 +3,7 @@ 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://mixxx.discourse.group/viewtopic.php?f=7&amp;t=4130&amp;sid=bc90140a4dc6e650e06dae0df8562604--> https://github.com/wolfbiter/kane-quneo-mixxx /hardware/controllers/keith_mcmillen_quneo.html diff --git a/res/controllers/Korg nanoPAD2.midi.xml b/res/controllers/Korg nanoPAD2.midi.xml index 3a6384439df5..ad54ef7d6729 100644 --- a/res/controllers/Korg nanoPAD2.midi.xml +++ b/res/controllers/Korg nanoPAD2.midi.xml @@ -4,7 +4,7 @@ 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 /hardware/controllers/korg_nanopad2.html diff --git a/res/controllers/Midi_for_light.midi.xml b/res/controllers/Midi_for_light.midi.xml index 4f913fe5374a..9f9668dca46c 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 Pro 2.midi.xml b/res/controllers/MixVibes U-Mix Control Pro 2.midi.xml index cb7ba90f7951..af1191a35c4f 100644 --- a/res/controllers/MixVibes U-Mix Control Pro 2.midi.xml +++ b/res/controllers/MixVibes U-Mix Control Pro 2.midi.xml @@ -4,7 +4,7 @@ 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 + https://mixxx.discourse.group/t/v1-0-mixvibes-u-mix-control-pro-2-mapping/13322 http://www.mixxx.org/wiki/doku.php/umix_control_pro_2 /hardware/controllers/mixvibes_u_mix_control_2.html diff --git a/res/controllers/Novation Dicer.midi.xml b/res/controllers/Novation Dicer.midi.xml index 6d2917a1fafa..b882b4d83527 100644 --- a/res/controllers/Novation Dicer.midi.xml +++ b/res/controllers/Novation Dicer.midi.xml @@ -3,7 +3,7 @@ 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 + https://mixxx.discourse.group/t/novation-dicer-mapping/12329 http://mixxx.org/wiki/doku.php/novation_dicer /hardware/controllers/novation_dicer.html diff --git a/res/controllers/Novation-Launchpad-Mini.midi.xml b/res/controllers/Novation-Launchpad-Mini.midi.xml index 4fa2942e7902..df7ea3ec7a12 100644 --- a/res/controllers/Novation-Launchpad-Mini.midi.xml +++ b/res/controllers/Novation-Launchpad-Mini.midi.xml @@ -4,7 +4,7 @@ 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 /hardware/controllers/novation_launchpad_mini.html diff --git a/res/controllers/Numark Mixtrack Pro.midi.xml b/res/controllers/Numark Mixtrack Pro.midi.xml index ac712c031261..db56c4258201 100644 --- a/res/controllers/Numark Mixtrack Pro.midi.xml +++ b/res/controllers/Numark Mixtrack Pro.midi.xml @@ -5,7 +5,7 @@ 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 + https://mixxx.discourse.group/t/numark-mixtrack-pro-with-backspin-and-more/12557 http://www.mixxx.org/wiki/doku.php/numark_mixtrack_pro /hardware/controllers/numark_mixtrack_pro.html diff --git a/res/controllers/Numark-Mixtrack-3.midi.xml b/res/controllers/Numark-Mixtrack-3.midi.xml index 4e0d2aad3d64..52a9f4c638f1 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 DDJ-SX.midi.xml b/res/controllers/Pioneer DDJ-SX.midi.xml index 42e6cd96b85d..dc94924d9f9f 100644 --- a/res/controllers/Pioneer DDJ-SX.midi.xml +++ b/res/controllers/Pioneer DDJ-SX.midi.xml @@ -4,7 +4,7 @@ Pioneer DDJ-SX Maximilian Beiersdorfer, DJMaxergy Pioneer DDJ-SX controller mapping - http://mixxx.org/forums/viewtopic.php?f=7&t=8310 + https://mixxx.discourse.group/t/pioneer-ddj-sx-controller-mapping/15954 http://mixxx.org/wiki/doku.php/pioneer_ddj-sx /hardware/controllers/pioneer_ddj_sx.html diff --git a/res/controllers/Pioneer-DDJ-SB2.midi.xml b/res/controllers/Pioneer-DDJ-SB2.midi.xml index f8a58dd41ecf..3c9f633c9c36 100644 --- a/res/controllers/Pioneer-DDJ-SB2.midi.xml +++ b/res/controllers/Pioneer-DDJ-SB2.midi.xml @@ -4,7 +4,7 @@ Pioneer DDJ-SB2 Be, Michael Stahl (DG3NEC) Pioneer DDJ-SB2 - http://mixxx.org/forums/viewtopic.php?f=7&t=7509 + https://mixxx.discourse.group/t/pinoneer-ddj-sb2-midi-mapping/15373 http://mixxx.org/wiki/doku.php/pioneer_ddj-sb2 /hardware/controllers/pioneer_ddj_sb2.html diff --git a/res/controllers/Reloop Beatmix 2-4.midi.xml b/res/controllers/Reloop Beatmix 2-4.midi.xml index 1c454548aaac..dc6415e0f946 100644 --- a/res/controllers/Reloop Beatmix 2-4.midi.xml +++ b/res/controllers/Reloop Beatmix 2-4.midi.xml @@ -4,7 +4,7 @@ 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 + https://mixxx.discourse.group/t/reloop-beatmix-2-4-mapping/16049 http://www.mixxx.org/wiki/doku.php/reloop_beatmix_4 /hardware/controllers/reloop_beatmix_2.html diff --git a/res/controllers/Reloop Jockey 3 ME.midi.xml b/res/controllers/Reloop Jockey 3 ME.midi.xml index 10b3da709fb1..0682cbc9c14c 100644 --- a/res/controllers/Reloop Jockey 3 ME.midi.xml +++ b/res/controllers/Reloop Jockey 3 ME.midi.xml @@ -5,7 +5,7 @@ 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 /hardware/controllers/reloop_jockey_3_master_edition.html diff --git a/res/controllers/Roland_DJ-505.midi.xml b/res/controllers/Roland_DJ-505.midi.xml index 5f56dabe97a1..09cf3fac5887 100644 --- a/res/controllers/Roland_DJ-505.midi.xml +++ b/res/controllers/Roland_DJ-505.midi.xml @@ -5,7 +5,7 @@ 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 /hardware/controllers/roland_dj_505.html diff --git a/res/controllers/Vestax Typhoon Enhanced.midi.xml b/res/controllers/Vestax Typhoon Enhanced.midi.xml index aadc7815087e..c1e61d196f3d 100644 --- a/res/controllers/Vestax Typhoon Enhanced.midi.xml +++ b/res/controllers/Vestax Typhoon Enhanced.midi.xml @@ -4,7 +4,7 @@ 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 /hardware/controllers/vestax_typhoon.html diff --git a/res/controllers/Vestax Typhoon.midi.xml b/res/controllers/Vestax Typhoon.midi.xml index 70ea6c7817e3..8c7ec99f0126 100644 --- a/res/controllers/Vestax Typhoon.midi.xml +++ b/res/controllers/Vestax Typhoon.midi.xml @@ -4,7 +4,7 @@ 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 /hardware/controllers/vestax_typhoon.html From b03a4168e61b0c4def383cf62152d70f9c6308ea Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Mon, 21 Sep 2020 23:04:15 +0200 Subject: [PATCH 6/8] controllers: Remove obsolete wiki links --- res/controllers/Allen and Heath Xone K2.midi.xml | 1 - res/controllers/American Audio VMS2.midi.xml | 1 - res/controllers/American Audio VMS4.midi.xml | 1 - res/controllers/Behringer CMD MM1.midi.xml | 1 - res/controllers/Behringer CMDStudio4a.midi.xml | 1 - res/controllers/DJ TechTools MIDI Fighter Twister.midi.xml | 1 - res/controllers/Denon-MC6000MK2.midi.xml | 1 - res/controllers/Denon-MC7000.midi.xml | 1 - res/controllers/FaderFoxDJ2.midi.xml | 1 - res/controllers/Hercules DJ Console 4-Mx.midi.xml | 1 - res/controllers/Hercules DJ Control Instinct.midi.xml | 1 - res/controllers/Hercules DJ Control MP3 e2.midi.xml | 1 - res/controllers/Hercules DJControl Compact.midi.xml | 1 - res/controllers/Hercules DJControl Starlight.midi.xml | 1 - res/controllers/Hercules P32 DJ.midi.xml | 1 - res/controllers/KANE_QuNeo.midi.xml | 1 - res/controllers/M-Audio_Xsession_pro.midi.xml | 1 - res/controllers/MixVibes U-Mix Control Pro 2.midi.xml | 1 - res/controllers/Novation Dicer.midi.xml | 1 - res/controllers/Numark Mixtrack 2.midi.xml | 1 - res/controllers/Numark Mixtrack Platinum.midi.xml | 1 - res/controllers/Numark Mixtrack Pro.midi.xml | 1 - res/controllers/Numark iDJ Live II.midi.xml | 1 - res/controllers/Pioneer DDJ-SX.midi.xml | 1 - res/controllers/Pioneer-DDJ-SB2.midi.xml | 1 - res/controllers/Reloop Beatmix 2-4.midi.xml | 1 - res/controllers/Reloop Beatpad.midi.xml | 1 - res/controllers/Reloop Jockey 3 ME.midi.xml | 1 - res/controllers/Reloop Terminal Mix 2-4.midi.xml | 1 - res/controllers/Roland_DJ-505.midi.xml | 1 - res/controllers/Soundless_joyMIDI.midi.xml | 1 - res/controllers/Stanton SCS.1d.midi.xml | 1 - res/controllers/Stanton SCS.1m.midi.xml | 1 - res/controllers/Stanton SCS.3m.midi.xml | 1 - res/controllers/Stanton-DJC-4.midi.xml | 1 - res/controllers/Traktor Kontrol S2 MK3.hid.xml | 1 - res/controllers/Traktor Kontrol S2 Mk2.hid.xml | 1 - res/controllers/Traktor Kontrol S4 MK2.hid.xml | 1 - res/controllers/Vestax VCI-100MKII.midi.xml | 1 - res/controllers/Vestax VCI-300.midi.xml | 1 - res/controllers/Vestax VCI-400.midi.xml | 1 - 41 files changed, 41 deletions(-) diff --git a/res/controllers/Allen and Heath Xone K2.midi.xml b/res/controllers/Allen and Heath Xone K2.midi.xml index 16c78493f531..3757a1118717 100644 --- a/res/controllers/Allen and Heath Xone K2.midi.xml +++ b/res/controllers/Allen and Heath Xone K2.midi.xml @@ -3,7 +3,6 @@ Allen&Heath Xone K2/K1 Be - https://mixxx.org/wiki/doku.php/allen_heath_xone_k2 /hardware/controllers/allen_heath_xone_k2_k1.html 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. diff --git a/res/controllers/American Audio VMS2.midi.xml b/res/controllers/American Audio VMS2.midi.xml index ef5f0a5ad980..80572405781b 100644 --- a/res/controllers/American Audio VMS2.midi.xml +++ b/res/controllers/American Audio VMS2.midi.xml @@ -4,7 +4,6 @@ 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 /hardware/controllers/american_audio_vms2.html diff --git a/res/controllers/American Audio VMS4.midi.xml b/res/controllers/American Audio VMS4.midi.xml index 12af3445650d..a2a0d27387c9 100644 --- a/res/controllers/American Audio VMS4.midi.xml +++ b/res/controllers/American Audio VMS4.midi.xml @@ -3,7 +3,6 @@ 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.) /hardware/controllers/american_audio_vms4.html diff --git a/res/controllers/Behringer CMD MM1.midi.xml b/res/controllers/Behringer CMD MM1.midi.xml index 4e1656cf64ab..aed4ea73bd25 100644 --- a/res/controllers/Behringer CMD MM1.midi.xml +++ b/res/controllers/Behringer CMD MM1.midi.xml @@ -10,7 +10,6 @@ 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 /hardware/controllers/behringer_cmd_mm_1.html diff --git a/res/controllers/Behringer CMDStudio4a.midi.xml b/res/controllers/Behringer CMDStudio4a.midi.xml index c078b14c5a03..74c88d189018 100644 --- a/res/controllers/Behringer CMDStudio4a.midi.xml +++ b/res/controllers/Behringer CMDStudio4a.midi.xml @@ -4,7 +4,6 @@ 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 /hardware/controllers/behringer_cmd_studio_4a.html diff --git a/res/controllers/DJ TechTools MIDI Fighter Twister.midi.xml b/res/controllers/DJ TechTools MIDI Fighter Twister.midi.xml index e0edb014176b..4b547f83e801 100644 --- a/res/controllers/DJ TechTools MIDI Fighter Twister.midi.xml +++ b/res/controllers/DJ TechTools MIDI Fighter Twister.midi.xml @@ -4,7 +4,6 @@ DJ TechTools MIDI Fighter Twister tock203 for 2 deck use - https://www.mixxx.org/wiki/doku.php/dj_tech_tools_midi_fighter_twister /hardware/controllers/dj_techtools_midi_figher_twister.html diff --git a/res/controllers/Denon-MC6000MK2.midi.xml b/res/controllers/Denon-MC6000MK2.midi.xml index f159d1053add..b4a4548a705e 100644 --- a/res/controllers/Denon-MC6000MK2.midi.xml +++ b/res/controllers/Denon-MC6000MK2.midi.xml @@ -4,7 +4,6 @@ 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 /hardware/controllers/denon_mc6000mk2.html diff --git a/res/controllers/Denon-MC7000.midi.xml b/res/controllers/Denon-MC7000.midi.xml index 6fd694c23f1c..2596bcfcfa38 100644 --- a/res/controllers/Denon-MC7000.midi.xml +++ b/res/controllers/Denon-MC7000.midi.xml @@ -5,7 +5,6 @@ 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 /hardware/controllers/denon_mc7000.html diff --git a/res/controllers/FaderFoxDJ2.midi.xml b/res/controllers/FaderFoxDJ2.midi.xml index 3a9521fe2d60..e7e2d795c2dc 100644 --- a/res/controllers/FaderFoxDJ2.midi.xml +++ b/res/controllers/FaderFoxDJ2.midi.xml @@ -4,7 +4,6 @@ FaderFox DJ2 Sacha Berger, Gosseyn MIDI Mapping for FaderFoxDJ2 - http://www.mixxx.org/wiki/doku.php/faderfox_dj2 /hardware/controllers/faderfox_dj2.html diff --git a/res/controllers/Hercules DJ Console 4-Mx.midi.xml b/res/controllers/Hercules DJ Console 4-Mx.midi.xml index 40ecebd8cf8d..9e2bd082cb43 100644 --- a/res/controllers/Hercules DJ Console 4-Mx.midi.xml +++ b/res/controllers/Hercules DJ Console 4-Mx.midi.xml @@ -5,7 +5,6 @@ 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 /hardware/controllers/hercules_dj_console_4_mx.html diff --git a/res/controllers/Hercules DJ Control Instinct.midi.xml b/res/controllers/Hercules DJ Control Instinct.midi.xml index cd490be87c21..ba4d4a127762 100644 --- a/res/controllers/Hercules DJ Control Instinct.midi.xml +++ b/res/controllers/Hercules DJ Control Instinct.midi.xml @@ -3,7 +3,6 @@ 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 /hardware/controllers/hercules_djcontrol_instinct.html diff --git a/res/controllers/Hercules DJ Control MP3 e2.midi.xml b/res/controllers/Hercules DJ Control MP3 e2.midi.xml index 89a7651039ac..e273333c6eb7 100644 --- a/res/controllers/Hercules DJ Control MP3 e2.midi.xml +++ b/res/controllers/Hercules DJ Control MP3 e2.midi.xml @@ -4,7 +4,6 @@ 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 https://mixxx.discourse.group/t/hercules-dj-control-mp3-e2-4-deck-mapping-for-mixxx-1-12/15056 /hardware/controllers/hercules_djcontrol_mp3_e2.html diff --git a/res/controllers/Hercules DJControl Compact.midi.xml b/res/controllers/Hercules DJControl Compact.midi.xml index f0676936f5e7..6bebc90cc6b4 100644 --- a/res/controllers/Hercules DJControl Compact.midi.xml +++ b/res/controllers/Hercules DJControl Compact.midi.xml @@ -7,7 +7,6 @@ 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 /hardware/controllers/hercules_djcontrol_compact.html diff --git a/res/controllers/Hercules DJControl Starlight.midi.xml b/res/controllers/Hercules DJControl Starlight.midi.xml index 13ac71da1eff..74f64a4b26a1 100644 --- a/res/controllers/Hercules DJControl Starlight.midi.xml +++ b/res/controllers/Hercules DJControl Starlight.midi.xml @@ -4,7 +4,6 @@ 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.discourse.group/t/hercules-djcontrol-starlight/17833 /hardware/controllers/hercules_djcontrol_starlight.html diff --git a/res/controllers/Hercules P32 DJ.midi.xml b/res/controllers/Hercules P32 DJ.midi.xml index 0c371d6be5b0..f978cfd09183 100644 --- a/res/controllers/Hercules P32 DJ.midi.xml +++ b/res/controllers/Hercules P32 DJ.midi.xml @@ -5,7 +5,6 @@ Be 4-deck mapping for Hercules P32 controller https://mixxx.discourse.group/t/hercules-p32-dj-controller-mapping/15804 - http://mixxx.org/wiki/doku.php/hercules_p32_dj /hardware/controllers/hercules_p32_dj.html diff --git a/res/controllers/KANE_QuNeo.midi.xml b/res/controllers/KANE_QuNeo.midi.xml index df604a0c1fca..70fba77a51fc 100644 --- a/res/controllers/KANE_QuNeo.midi.xml +++ b/res/controllers/KANE_QuNeo.midi.xml @@ -4,7 +4,6 @@ Daniel Leja This is a fully customized DJ mapping for the QuNeo, complete with beat-jumping and pulsing LED sequencers. https://mixxx.discourse.group/viewtopic.php?f=7&amp;t=4130&amp;sid=bc90140a4dc6e650e06dae0df8562604--> - https://github.com/wolfbiter/kane-quneo-mixxx /hardware/controllers/keith_mcmillen_quneo.html diff --git a/res/controllers/M-Audio_Xsession_pro.midi.xml b/res/controllers/M-Audio_Xsession_pro.midi.xml index 152ac137148f..08ed6c0588f0 100644 --- a/res/controllers/M-Audio_Xsession_pro.midi.xml +++ b/res/controllers/M-Audio_Xsession_pro.midi.xml @@ -4,7 +4,6 @@ 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 /hardware/controllers/m_audio_x_session_pro.html 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 af1191a35c4f..6da8bb8fcfc9 100644 --- a/res/controllers/MixVibes U-Mix Control Pro 2.midi.xml +++ b/res/controllers/MixVibes U-Mix Control Pro 2.midi.xml @@ -5,7 +5,6 @@ tomtom (thomas-8) V1.0.0 -> Please visit Forum and Wiki for more details. https://mixxx.discourse.group/t/v1-0-mixvibes-u-mix-control-pro-2-mapping/13322 - http://www.mixxx.org/wiki/doku.php/umix_control_pro_2 /hardware/controllers/mixvibes_u_mix_control_2.html diff --git a/res/controllers/Novation Dicer.midi.xml b/res/controllers/Novation Dicer.midi.xml index b882b4d83527..ff390989acf1 100644 --- a/res/controllers/Novation Dicer.midi.xml +++ b/res/controllers/Novation Dicer.midi.xml @@ -4,7 +4,6 @@ Shaun (DJPandemonium@gmail.com) Implements cuepoints, looping, loop rolls, basic effects, and navigation. https://mixxx.discourse.group/t/novation-dicer-mapping/12329 - http://mixxx.org/wiki/doku.php/novation_dicer /hardware/controllers/novation_dicer.html diff --git a/res/controllers/Numark Mixtrack 2.midi.xml b/res/controllers/Numark Mixtrack 2.midi.xml index 27bf7f4f1597..8278ff2899e1 100644 --- a/res/controllers/Numark Mixtrack 2.midi.xml +++ b/res/controllers/Numark Mixtrack 2.midi.xml @@ -4,7 +4,6 @@ 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 /hardware/controllers/numark_mixtrack_pro_ii.html diff --git a/res/controllers/Numark Mixtrack Platinum.midi.xml b/res/controllers/Numark Mixtrack Platinum.midi.xml index 39d9ff1f1053..1d960e4d31bb 100644 --- a/res/controllers/Numark Mixtrack Platinum.midi.xml +++ b/res/controllers/Numark Mixtrack Platinum.midi.xml @@ -5,7 +5,6 @@ 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 /hardware/controllers/numark_mixtrack_platinum.html diff --git a/res/controllers/Numark Mixtrack Pro.midi.xml b/res/controllers/Numark Mixtrack Pro.midi.xml index db56c4258201..98afcc93ea5c 100644 --- a/res/controllers/Numark Mixtrack Pro.midi.xml +++ b/res/controllers/Numark Mixtrack Pro.midi.xml @@ -6,7 +6,6 @@ Modify by Darío José Freije 06/27/2012--> Matteo (matteo@magm3.com), James Ralston, and D. J. Freije (dario2004@gmail.com) version v1.2 w/brake, backspin, blink beat Leds. https://mixxx.discourse.group/t/numark-mixtrack-pro-with-backspin-and-more/12557 - http://www.mixxx.org/wiki/doku.php/numark_mixtrack_pro /hardware/controllers/numark_mixtrack_pro.html diff --git a/res/controllers/Numark iDJ Live II.midi.xml b/res/controllers/Numark iDJ Live II.midi.xml index 6041e1d36d1f..a2e214263c34 100644 --- a/res/controllers/Numark iDJ Live II.midi.xml +++ b/res/controllers/Numark iDJ Live II.midi.xml @@ -4,7 +4,6 @@ Numark iDJ Live II Nathan Korth Complete mapping for iDJ Live II - https://mixxx.org/wiki/doku.php/numark_idj_live_ii /hardware/controllers/numark_idj_live_ii.html diff --git a/res/controllers/Pioneer DDJ-SX.midi.xml b/res/controllers/Pioneer DDJ-SX.midi.xml index dc94924d9f9f..271f5351970e 100644 --- a/res/controllers/Pioneer DDJ-SX.midi.xml +++ b/res/controllers/Pioneer DDJ-SX.midi.xml @@ -5,7 +5,6 @@ Maximilian Beiersdorfer, DJMaxergy Pioneer DDJ-SX controller mapping https://mixxx.discourse.group/t/pioneer-ddj-sx-controller-mapping/15954 - http://mixxx.org/wiki/doku.php/pioneer_ddj-sx /hardware/controllers/pioneer_ddj_sx.html diff --git a/res/controllers/Pioneer-DDJ-SB2.midi.xml b/res/controllers/Pioneer-DDJ-SB2.midi.xml index 3c9f633c9c36..ffbd512b639d 100644 --- a/res/controllers/Pioneer-DDJ-SB2.midi.xml +++ b/res/controllers/Pioneer-DDJ-SB2.midi.xml @@ -5,7 +5,6 @@ Be, Michael Stahl (DG3NEC) Pioneer DDJ-SB2 https://mixxx.discourse.group/t/pinoneer-ddj-sb2-midi-mapping/15373 - http://mixxx.org/wiki/doku.php/pioneer_ddj-sb2 /hardware/controllers/pioneer_ddj_sb2.html diff --git a/res/controllers/Reloop Beatmix 2-4.midi.xml b/res/controllers/Reloop Beatmix 2-4.midi.xml index dc6415e0f946..4e6d155bf844 100644 --- a/res/controllers/Reloop Beatmix 2-4.midi.xml +++ b/res/controllers/Reloop Beatmix 2-4.midi.xml @@ -5,7 +5,6 @@ Sébastien Blaisot <sebastien@blaisot.org> Controller mapping for the Reloop Beatmix 2/4. https://mixxx.discourse.group/t/reloop-beatmix-2-4-mapping/16049 - http://www.mixxx.org/wiki/doku.php/reloop_beatmix_4 /hardware/controllers/reloop_beatmix_2.html diff --git a/res/controllers/Reloop Beatpad.midi.xml b/res/controllers/Reloop Beatpad.midi.xml index 172d11aee9ea..2e0a10128208 100644 --- a/res/controllers/Reloop Beatpad.midi.xml +++ b/res/controllers/Reloop Beatpad.midi.xml @@ -5,7 +5,6 @@ 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 /hardware/controllers/reloop_beatpad.html diff --git a/res/controllers/Reloop Jockey 3 ME.midi.xml b/res/controllers/Reloop Jockey 3 ME.midi.xml index 0682cbc9c14c..8a55e26e8d80 100644 --- a/res/controllers/Reloop Jockey 3 ME.midi.xml +++ b/res/controllers/Reloop Jockey 3 ME.midi.xml @@ -4,7 +4,6 @@ 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.discourse.group/t/create-a-mapping-for-reloop-jockey-3-me/13703 /hardware/controllers/reloop_jockey_3_master_edition.html diff --git a/res/controllers/Reloop Terminal Mix 2-4.midi.xml b/res/controllers/Reloop Terminal Mix 2-4.midi.xml index adfc034ba064..2be995883baa 100644 --- a/res/controllers/Reloop Terminal Mix 2-4.midi.xml +++ b/res/controllers/Reloop Terminal Mix 2-4.midi.xml @@ -4,7 +4,6 @@ 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 /hardware/controllers/reloop_terminal_mix_series.html diff --git a/res/controllers/Roland_DJ-505.midi.xml b/res/controllers/Roland_DJ-505.midi.xml index 09cf3fac5887..100978ef1b11 100644 --- a/res/controllers/Roland_DJ-505.midi.xml +++ b/res/controllers/Roland_DJ-505.midi.xml @@ -4,7 +4,6 @@ Roland DJ-505 Jan Holthuis 4-deck mapping for Roland DJ-505 controller - https://mixxx.org/wiki/doku.php/roland_dj-505 https://mixxx.discourse.group/t/roland-dj-505/17916 /hardware/controllers/roland_dj_505.html diff --git a/res/controllers/Soundless_joyMIDI.midi.xml b/res/controllers/Soundless_joyMIDI.midi.xml index c955045af967..607856bc7574 100644 --- a/res/controllers/Soundless_joyMIDI.midi.xml +++ b/res/controllers/Soundless_joyMIDI.midi.xml @@ -5,7 +5,6 @@ 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 /hardware/controllers/soundless_studio_joymidi.html diff --git a/res/controllers/Stanton SCS.1d.midi.xml b/res/controllers/Stanton SCS.1d.midi.xml index 4ce49fb93cba..4e476c218f31 100644 --- a/res/controllers/Stanton SCS.1d.midi.xml +++ b/res/controllers/Stanton SCS.1d.midi.xml @@ -6,7 +6,6 @@ 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 /hardware/controllers/stanton_scs1d.html diff --git a/res/controllers/Stanton SCS.1m.midi.xml b/res/controllers/Stanton SCS.1m.midi.xml index 49712c640207..b148224b1b25 100644 --- a/res/controllers/Stanton SCS.1m.midi.xml +++ b/res/controllers/Stanton SCS.1m.midi.xml @@ -4,7 +4,6 @@ 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 /hardware/controllers/stanton_scs1m.html diff --git a/res/controllers/Stanton SCS.3m.midi.xml b/res/controllers/Stanton SCS.3m.midi.xml index 9f473171cb66..ce5f24e44b09 100644 --- a/res/controllers/Stanton SCS.3m.midi.xml +++ b/res/controllers/Stanton SCS.3m.midi.xml @@ -4,7 +4,6 @@ Stanton SCS.3m sbalmer Mapping for the Stanton SCS.3m controller. Supports four decks. - http://mixxx.org/wiki/doku.php/stanton_scs.3m /hardware/controllers/stanton_scs3m.html diff --git a/res/controllers/Stanton-DJC-4.midi.xml b/res/controllers/Stanton-DJC-4.midi.xml index 9c87f00589d5..525210238429 100644 --- a/res/controllers/Stanton-DJC-4.midi.xml +++ b/res/controllers/Stanton-DJC-4.midi.xml @@ -4,7 +4,6 @@ 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 /hardware/controllers/stanton_djc_4.html diff --git a/res/controllers/Traktor Kontrol S2 MK3.hid.xml b/res/controllers/Traktor Kontrol S2 MK3.hid.xml index c516ee501135..a1d3774c7c3c 100644 --- a/res/controllers/Traktor Kontrol S2 MK3.hid.xml +++ b/res/controllers/Traktor Kontrol S2 MK3.hid.xml @@ -4,7 +4,6 @@ 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 /hardware/controllers/native_instruments_traktor_kontrol_s2_mk3.html diff --git a/res/controllers/Traktor Kontrol S2 Mk2.hid.xml b/res/controllers/Traktor Kontrol S2 Mk2.hid.xml index 0bd6939478e2..08e371bf18a7 100644 --- a/res/controllers/Traktor Kontrol S2 Mk2.hid.xml +++ b/res/controllers/Traktor Kontrol S2 Mk2.hid.xml @@ -4,7 +4,6 @@ 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 /hardware/controllers/native_instruments_traktor_kontrol_s2_mk2.html Traktor Kontrol S4 MK2 Owen Williams, Fayaaz Ahmed HID Mapping for Traktor Kontrol S4 MK2 - http://mixxx.org/wiki/doku.php/traktor_s4_mk2 /hardware/controllers/native_instruments_traktor_kontrol_s4_mk2.html diff --git a/res/controllers/Vestax VCI-100MKII.midi.xml b/res/controllers/Vestax VCI-100MKII.midi.xml index 24a57e619581..66ae7f65b229 100644 --- a/res/controllers/Vestax VCI-100MKII.midi.xml +++ b/res/controllers/Vestax VCI-100MKII.midi.xml @@ -4,7 +4,6 @@ Vestax VCI-100MKII Takeshi Soejima 2018-4-15 - http://www.mixxx.org/wiki/doku.php/vestax_vci-100mkii /hardware/controllers/vestax_vci_100mkii.html diff --git a/res/controllers/Vestax VCI-300.midi.xml b/res/controllers/Vestax VCI-300.midi.xml index fa1f569cae6d..2c292d14b1d0 100644 --- a/res/controllers/Vestax VCI-300.midi.xml +++ b/res/controllers/Vestax VCI-300.midi.xml @@ -4,7 +4,6 @@ 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 /hardware/controllers/vestax_vci_300.html diff --git a/res/controllers/Vestax VCI-400.midi.xml b/res/controllers/Vestax VCI-400.midi.xml index 56d7c46fd4de..d433cc7d8c07 100644 --- a/res/controllers/Vestax VCI-400.midi.xml +++ b/res/controllers/Vestax VCI-400.midi.xml @@ -4,7 +4,6 @@ Vestax VCI-400 Owen Williams, Tobias Rafreider Controller mapping for Vestax VCI-400 - http://mixxx.org/wiki/doku.php/vestax_vci-400 /hardware/controllers/vestax_vci_400.html From 9f9b0740bc305634a63a717c5bbf06b1ceaac461 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Tue, 22 Sep 2020 13:25:00 +0200 Subject: [PATCH 7/8] controllers: Don't specify full path in tag --- res/controllers/Akai MPD24.midi.xml | 2 +- res/controllers/Akai-LPD8-RK.midi.xml | 2 +- res/controllers/Allen and Heath Xone K2.midi.xml | 2 +- res/controllers/American Audio RADIUS 2000 CH1.midi.xml | 2 +- res/controllers/American Audio RADIUS 2000 CH2.midi.xml | 2 +- res/controllers/American Audio VMS2.midi.xml | 2 +- res/controllers/American Audio VMS4.midi.xml | 2 +- res/controllers/Behringer BCD2000.midi.xml | 2 +- res/controllers/Behringer BCD3000 Advanced.midi.xml | 2 +- res/controllers/Behringer CMD MM1.midi.xml | 2 +- res/controllers/Behringer CMD Micro.midi.xml | 2 +- res/controllers/Behringer CMDStudio4a.midi.xml | 2 +- res/controllers/DJ TechTools MIDI Fighter Twister.midi.xml | 2 +- res/controllers/DJ-Tech CDJ-101.midi.xml | 2 +- res/controllers/DJ-Tech DJM-101.midi.xml | 2 +- res/controllers/DJ-Tech Kontrol One.midi.xml | 2 +- res/controllers/DJ-Tech Mix-101.midi.xml | 2 +- res/controllers/DJ-Tech Mixer One.midi.xml | 2 +- res/controllers/DJ-Tech i-Mix Reload.midi.xml | 2 +- res/controllers/DJTechTools MIDI Fighter.midi.xml | 2 +- res/controllers/Denon DN HS5500.midi.xml | 2 +- res/controllers/Denon DN SC2000.midi.xml | 2 +- res/controllers/Denon MC3000.midi.xml | 2 +- res/controllers/Denon MC4000.midi.xml | 2 +- res/controllers/Denon-MC6000MK2.midi.xml | 2 +- res/controllers/Denon-MC7000.midi.xml | 2 +- res/controllers/EKS Otus.hid.xml | 2 +- res/controllers/Electrix Tweaker.midi.xml | 2 +- res/controllers/Evolution_Xsession.midi.xml | 2 +- res/controllers/FaderFoxDJ2.midi.xml | 2 +- res/controllers/Gemini CDMP-7000 L audio.midi.xml | 2 +- res/controllers/Gemini CDMP-7000 R audio.midi.xml | 2 +- res/controllers/Gemini FirstMix.midi.xml | 2 +- res/controllers/Hercules DJ Console 4-Mx.midi.xml | 2 +- res/controllers/Hercules DJ Console Mac Edition.midi.xml | 2 +- res/controllers/Hercules DJ Console Mk1.hid.xml | 2 +- res/controllers/Hercules DJ Console Mk2.hid.xml | 2 +- res/controllers/Hercules DJ Console Mk2.midi.xml | 2 +- res/controllers/Hercules DJ Console Mk4.midi.xml | 2 +- res/controllers/Hercules DJ Console RMX 2.midi.xml | 2 +- res/controllers/Hercules DJ Console RMX Advanced.midi.xml | 2 +- res/controllers/Hercules DJ Console RMX.hid.xml | 2 +- res/controllers/Hercules DJ Console RMX.midi.xml | 2 +- res/controllers/Hercules DJ Control AIR.midi.xml | 2 +- res/controllers/Hercules DJ Control Instinct.midi.xml | 2 +- res/controllers/Hercules DJ Control MP3 e2.bulk.xml | 2 +- res/controllers/Hercules DJ Control MP3 e2.midi.xml | 2 +- res/controllers/Hercules DJ Control MP3.hid.xml | 2 +- res/controllers/Hercules DJ Control MP3.midi.xml | 2 +- res/controllers/Hercules DJControl Compact.midi.xml | 2 +- res/controllers/Hercules DJControl Starlight.midi.xml | 2 +- res/controllers/Hercules P32 DJ.midi.xml | 2 +- res/controllers/Ion Discover DJ.midi.xml | 2 +- res/controllers/KANE_QuNeo.midi.xml | 2 +- res/controllers/Kontrol Dj KDJ500.midi.xml | 2 +- res/controllers/Korg nanoKONTROL 2.midi.xml | 2 +- res/controllers/Korg nanoKONTROL.midi.xml | 2 +- res/controllers/Korg nanoPAD2.midi.xml | 2 +- res/controllers/Korg-KAOSS-DJ.midi.xml | 2 +- res/controllers/M-Audio_Xsession_pro.midi.xml | 2 +- res/controllers/MidiTech-MidiControl.midi.xml | 2 +- res/controllers/MixVibes U-Mix Control 2.midi.xml | 2 +- res/controllers/MixVibes U-Mix Control Pro 2.midi.xml | 2 +- res/controllers/Mixman DM2 (Linux).midi.xml | 2 +- res/controllers/Mixman DM2 (OS X).midi.xml | 2 +- res/controllers/Mixman DM2 (Windows).midi.xml | 2 +- res/controllers/Nintendo Wiimote.hid.xml | 2 +- res/controllers/Novation Dicer.midi.xml | 2 +- res/controllers/Novation Launchpad MK2.midi.xml | 2 +- res/controllers/Novation Launchpad.midi.xml | 2 +- res/controllers/Novation-Launchpad-Mini.midi.xml | 2 +- res/controllers/Numark DJ2Go.midi.xml | 2 +- res/controllers/Numark MIXTRACK.midi.xml | 2 +- res/controllers/Numark Mixtrack 2.midi.xml | 2 +- res/controllers/Numark Mixtrack Platinum.midi.xml | 2 +- res/controllers/Numark Mixtrack Pro.midi.xml | 2 +- res/controllers/Numark N4.midi.xml | 2 +- res/controllers/Numark NS7.midi.xml | 2 +- res/controllers/Numark Omni Control.midi.xml | 2 +- res/controllers/Numark Total Control.midi.xml | 2 +- res/controllers/Numark V7.midi.xml | 2 +- res/controllers/Numark iDJ Live II.midi.xml | 2 +- res/controllers/Pioneer CDJ-2000.midi.xml | 2 +- res/controllers/Pioneer CDJ-350 Ch1.midi.xml | 2 +- res/controllers/Pioneer CDJ-350 Ch2.midi.xml | 2 +- res/controllers/Pioneer CDJ-850.midi.xml | 2 +- res/controllers/Pioneer DDJ-SX.midi.xml | 2 +- res/controllers/Pioneer-DDJ-SB.midi.xml | 2 +- res/controllers/Pioneer-DDJ-SB2.midi.xml | 2 +- res/controllers/Reloop Beatmix 2-4.midi.xml | 2 +- res/controllers/Reloop Beatpad.midi.xml | 2 +- .../Reloop Digital Jockey 2 Controller Edition.midi.xml | 2 +- res/controllers/Reloop Jockey 3 ME.midi.xml | 2 +- res/controllers/Reloop Terminal Mix 2-4.midi.xml | 2 +- res/controllers/Roland_DJ-505.midi.xml | 2 +- res/controllers/Sony SixxAxis.hid.xml | 2 +- res/controllers/Soundless_joyMIDI.midi.xml | 2 +- res/controllers/Stanton SCS.1d.midi.xml | 2 +- res/controllers/Stanton SCS.1m.midi.xml | 2 +- res/controllers/Stanton SCS.3d Alternate.midi.xml | 2 +- res/controllers/Stanton SCS.3m.midi.xml | 2 +- res/controllers/Stanton-DJC-4.midi.xml | 2 +- res/controllers/TrakProDJ iPad.midi.xml | 2 +- res/controllers/Traktor Kontrol F1.hid.xml | 2 +- res/controllers/Traktor Kontrol S2 MK3.hid.xml | 2 +- res/controllers/Traktor Kontrol S2 Mk2.hid.xml | 2 +- res/controllers/Traktor Kontrol S4 MK2.hid.xml | 2 +- res/controllers/Traktor Kontrol X1.midi.xml | 2 +- res/controllers/Vestax Spin.midi.xml | 2 +- res/controllers/Vestax Typhoon Enhanced.midi.xml | 2 +- res/controllers/Vestax Typhoon.midi.xml | 2 +- res/controllers/Vestax VCI-100-3DEX.midi.xml | 2 +- res/controllers/Vestax VCI-100-hile.midi.xml | 2 +- res/controllers/Vestax VCI-100.midi.xml | 2 +- res/controllers/Vestax VCI-100MKII.midi.xml | 2 +- res/controllers/Vestax VCI-300.midi.xml | 2 +- res/controllers/Vestax VCI-400.midi.xml | 2 +- res/controllers/us428.midi.xml | 2 +- src/controllers/dlgprefcontroller.cpp | 3 ++- src/defs_urls.h | 4 ++++ 120 files changed, 124 insertions(+), 119 deletions(-) diff --git a/res/controllers/Akai MPD24.midi.xml b/res/controllers/Akai MPD24.midi.xml index dd076b75590b..167c91964b5c 100644 --- a/res/controllers/Akai MPD24.midi.xml +++ b/res/controllers/Akai MPD24.midi.xml @@ -5,7 +5,7 @@ klico MIDI mapping for Akai MPD24 https://mixxx.discourse.group/t/akai-mpd24-midi-setup/9020 - /hardware/controllers/akai_mpd24.html + akai_mpd24 diff --git a/res/controllers/Akai-LPD8-RK.midi.xml b/res/controllers/Akai-LPD8-RK.midi.xml index a8d80e586aec..34811f8babdd 100644 --- a/res/controllers/Akai-LPD8-RK.midi.xml +++ b/res/controllers/Akai-LPD8-RK.midi.xml @@ -5,7 +5,7 @@ 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 https://mixxx.discourse.group/t/akai-lpd8-mapping-4-decks-30-hotcues-loops-etc-v2/13064 - /hardware/controllers/akai_lpd8.html + 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 3757a1118717..38769d0ac30e 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 - /hardware/controllers/allen_heath_xone_k2_k1.html + 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 63a5896100b4..7c86ab6248e1 100644 --- a/res/controllers/American Audio RADIUS 2000 CH1.midi.xml +++ b/res/controllers/American Audio RADIUS 2000 CH1.midi.xml @@ -3,7 +3,7 @@ American Audio Radius 2000 CH1 Markus Steinbauer American Audio Radius 2000 mapping for Deck 1 - /hardware/controllers/american_audio_radius_2000.html + 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 41ffbddb70ee..a307b050c1ba 100644 --- a/res/controllers/American Audio RADIUS 2000 CH2.midi.xml +++ b/res/controllers/American Audio RADIUS 2000 CH2.midi.xml @@ -3,7 +3,7 @@ American Audio Radius 2000 CH2 Markus Steinbauer American Audio Radius 2000 mapping for Deck 2 - /hardware/controllers/american_audio_radius_2000.html + american_audio_radius_2000 diff --git a/res/controllers/American Audio VMS2.midi.xml b/res/controllers/American Audio VMS2.midi.xml index 80572405781b..58d22a26cef2 100644 --- a/res/controllers/American Audio VMS2.midi.xml +++ b/res/controllers/American Audio VMS2.midi.xml @@ -5,7 +5,7 @@ Stefan Nuernberger MIDI mapping for the American Audio VMS2 controller. http://www.mixxx.org/forums/viewtopic.php?f=7&t=3202 - /hardware/controllers/american_audio_vms2.html + american_audio_vms2 diff --git a/res/controllers/American Audio VMS4.midi.xml b/res/controllers/American Audio VMS4.midi.xml index a2a0d27387c9..c1593bdb4714 100644 --- a/res/controllers/American Audio VMS4.midi.xml +++ b/res/controllers/American Audio VMS4.midi.xml @@ -5,7 +5,7 @@ Anders Gunnarsson & Sean M. Pappalardo 2-deck control/4-deck mixer preset for Mixxx 2.1. Assumes "Post EQ" mode. (See Wiki for full setup instructions.) - /hardware/controllers/american_audio_vms4.html + american_audio_vms4 diff --git a/res/controllers/Behringer BCD2000.midi.xml b/res/controllers/Behringer BCD2000.midi.xml index 38e3f2d1ed36..7e06ce0171bb 100644 --- a/res/controllers/Behringer BCD2000.midi.xml +++ b/res/controllers/Behringer BCD2000.midi.xml @@ -4,7 +4,7 @@ Golzo MIDI mapping for Behringer BCD2000 mixer http://www.mixxx.org/forums/viewtopic.php?f=7&t=3563 - /hardware/controllers/behringer_b_control_deejay_bcd2000.html + behringer_b_control_deejay_bcd2000 diff --git a/res/controllers/Behringer BCD3000 Advanced.midi.xml b/res/controllers/Behringer BCD3000 Advanced.midi.xml index 4750b3faa908..32a224193461 100644 --- a/res/controllers/Behringer BCD3000 Advanced.midi.xml +++ b/res/controllers/Behringer BCD3000 Advanced.midi.xml @@ -4,7 +4,7 @@ Joachim Advanced preset for BCD3000. See forums for more information. http://www.mixxx.org/forums/viewtopic.php?f=7&t=4013 - /hardware/controllers/behringer_b_control_deejay_bcd3000.html + behringer_b_control_deejay_bcd3000 diff --git a/res/controllers/Behringer CMD MM1.midi.xml b/res/controllers/Behringer CMD MM1.midi.xml index aed4ea73bd25..7e35c02e7a56 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 - /hardware/controllers/behringer_cmd_mm_1.html + behringer_cmd_mm_1 diff --git a/res/controllers/Behringer CMD Micro.midi.xml b/res/controllers/Behringer CMD Micro.midi.xml index e858da12a688..d1cc0d23ad0b 100644 --- a/res/controllers/Behringer CMD Micro.midi.xml +++ b/res/controllers/Behringer CMD Micro.midi.xml @@ -3,7 +3,7 @@ Behringer CMD Micro tecywiz121 - /hardware/controllers/behringer_cmd_micro.html + behringer_cmd_micro diff --git a/res/controllers/Behringer CMDStudio4a.midi.xml b/res/controllers/Behringer CMDStudio4a.midi.xml index 74c88d189018..b94596f88092 100644 --- a/res/controllers/Behringer CMDStudio4a.midi.xml +++ b/res/controllers/Behringer CMDStudio4a.midi.xml @@ -5,7 +5,7 @@ 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/forums/viewtopic.php?f=7&t=7868 - /hardware/controllers/behringer_cmd_studio_4a.html + 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 4b547f83e801..273de7096ea5 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 - /hardware/controllers/dj_techtools_midi_figher_twister.html + 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 61146034cbf4..cc7cc6d1bca5 100644 --- a/res/controllers/DJ-Tech CDJ-101.midi.xml +++ b/res/controllers/DJ-Tech CDJ-101.midi.xml @@ -5,7 +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 - /hardware/controllers/dj_tech_cdj_101.html + 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 380c26a970e3..c1b09a43ee6e 100644 --- a/res/controllers/DJ-Tech DJM-101.midi.xml +++ b/res/controllers/DJ-Tech DJM-101.midi.xml @@ -5,7 +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 - /hardware/controllers/dj_tech_djm_101.html + 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 29f5083e6ea2..47d3c328d992 100644 --- a/res/controllers/DJ-Tech Kontrol One.midi.xml +++ b/res/controllers/DJ-Tech Kontrol One.midi.xml @@ -5,7 +5,7 @@ Rob K Mapping for the DJ Tech Kontrol One modular scratch controller. Provides controls for Channel1 through Channel4. March 2013. https://mixxx.discourse.group/t/dj-tech-kontrol-one-mapping-hotcue-loops-saves-loops-etc/13299 - /hardware/controllers/dj_tech_kontrol_one.html + 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 3b101aac027e..25d27b782279 100644 --- a/res/controllers/DJ-Tech Mix-101.midi.xml +++ b/res/controllers/DJ-Tech Mix-101.midi.xml @@ -4,7 +4,7 @@ rasda MIDI mapping for DJ-Tech MIX-101 https://mixxx.discourse.group/t/dj-tech-mix-101-mapping/12679 - /hardware/controllers/dj_tech_mix_101.html + 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 e8a4b1bddc6f..8e09da443cf7 100644 --- a/res/controllers/DJ-Tech Mixer One.midi.xml +++ b/res/controllers/DJ-Tech Mixer One.midi.xml @@ -5,7 +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 - /hardware/controllers/dj_tech_mixer_one.html + 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 4e849ef845b7..9096d9f3cc34 100644 --- a/res/controllers/DJ-Tech i-Mix Reload.midi.xml +++ b/res/controllers/DJ-Tech i-Mix Reload.midi.xml @@ -4,7 +4,7 @@ vininim MIDI mapping for DJ-Tech i-Mix Reload https://mixxx.discourse.group/t/dj-tech-i-mix-reload-mapping-for-trunk-as-of-date-of-post/10776 - /hardware/controllers/dj_tech_imix_reload.html + dj_tech_imix_reload diff --git a/res/controllers/DJTechTools MIDI Fighter.midi.xml b/res/controllers/DJTechTools MIDI Fighter.midi.xml index 530d9275fe52..e65e00006423 100644 --- a/res/controllers/DJTechTools MIDI Fighter.midi.xml +++ b/res/controllers/DJTechTools MIDI Fighter.midi.xml @@ -4,7 +4,7 @@ DJ TechTools MIDI Fighter RJ Ryan Mapping for DJ TechTools MIDI Fighter Classic Controller - /hardware/controllers/dj_techtools_midi_figher_classic.html + dj_techtools_midi_figher_classic diff --git a/res/controllers/Denon DN HS5500.midi.xml b/res/controllers/Denon DN HS5500.midi.xml index 32b3bf8a3ae3..b11e62891331 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 - /hardware/controllers/denon_dn_hs5500.html + denon_dn_hs5500 diff --git a/res/controllers/Denon DN SC2000.midi.xml b/res/controllers/Denon DN SC2000.midi.xml index dfcc5e08f464..b751863ffc33 100644 --- a/res/controllers/Denon DN SC2000.midi.xml +++ b/res/controllers/Denon DN SC2000.midi.xml @@ -3,7 +3,7 @@ Denon DN SC2000 Jan Riewe, Moba http://www.mixxx.org/forums/viewtopic.php?f=7&t=2048 - /hardware/controllers/denon_dn_sc2000.html + denon_dn_sc2000 diff --git a/res/controllers/Denon MC3000.midi.xml b/res/controllers/Denon MC3000.midi.xml index c1df5425abb4..c8ca92d7df1f 100644 --- a/res/controllers/Denon MC3000.midi.xml +++ b/res/controllers/Denon MC3000.midi.xml @@ -4,7 +4,7 @@ Denon MC3000 v0.995 BeMixxx Optimized for Denon MC3000 - Default Midi Channel - /hardware/controllers/denon_mc3000.html + denon_mc3000 diff --git a/res/controllers/Denon MC4000.midi.xml b/res/controllers/Denon MC4000.midi.xml index e0bd622be156..c0109240f2af 100644 --- a/res/controllers/Denon MC4000.midi.xml +++ b/res/controllers/Denon MC4000.midi.xml @@ -5,7 +5,7 @@ Tim Rae 2-deck mapping for Denon MC4000 controller https://mixxx.discourse.group/t/denon-mc4000-mapping/15311 - /hardware/controllers/denon_mc4000.html + denon_mc4000 diff --git a/res/controllers/Denon-MC6000MK2.midi.xml b/res/controllers/Denon-MC6000MK2.midi.xml index b4a4548a705e..eb913c35f917 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 - /hardware/controllers/denon_mc6000mk2.html + denon_mc6000mk2 diff --git a/res/controllers/Denon-MC7000.midi.xml b/res/controllers/Denon-MC7000.midi.xml index 2596bcfcfa38..42b470298e14 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/ - /hardware/controllers/denon_mc7000.html + denon_mc7000 diff --git a/res/controllers/EKS Otus.hid.xml b/res/controllers/EKS Otus.hid.xml index 3306e856dd54..674d5ad15e74 100644 --- a/res/controllers/EKS Otus.hid.xml +++ b/res/controllers/EKS Otus.hid.xml @@ -4,7 +4,7 @@ EKS Otus HID Ilkka Tuohela HID mapping for EKS Otus controllers - /hardware/controllers/eks_otus.html + eks_otus diff --git a/res/controllers/Electrix Tweaker.midi.xml b/res/controllers/Electrix Tweaker.midi.xml index 7530e6a879bb..d631e056555f 100644 --- a/res/controllers/Electrix Tweaker.midi.xml +++ b/res/controllers/Electrix Tweaker.midi.xml @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Be 4-deck mapping for Electrix Tweaker with EQ and loop modes https://mixxx.discourse.group/t/electrix-tweaker-mapping/15071 - /hardware/controllers/electrix_tweaker.html + electrix_tweaker diff --git a/res/controllers/Evolution_Xsession.midi.xml b/res/controllers/Evolution_Xsession.midi.xml index 436263df6870..7a7620fc1134 100644 --- a/res/controllers/Evolution_Xsession.midi.xml +++ b/res/controllers/Evolution_Xsession.midi.xml @@ -4,7 +4,7 @@ Evolution X-Session Amias Channer MIDI Mapping for Evolution X-Session - /hardware/controllers/evolution_x_session.html + evolution_x_session diff --git a/res/controllers/FaderFoxDJ2.midi.xml b/res/controllers/FaderFoxDJ2.midi.xml index e7e2d795c2dc..003872e9cb3d 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 - /hardware/controllers/faderfox_dj2.html + 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 f4ee60c85826..73de6cebf0fe 100644 --- a/res/controllers/Gemini CDMP-7000 L audio.midi.xml +++ b/res/controllers/Gemini CDMP-7000 L audio.midi.xml @@ -5,7 +5,7 @@ djtrinidad Gemini CDMP-7000 mapping for Deck 1 https://mixxx.discourse.group/t/gemini-cdmp-7000-mapping/14482 - /hardware/controllers/gemini_cdmp_7000.html + 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 ba62dc44f394..28e3abaf91c5 100644 --- a/res/controllers/Gemini CDMP-7000 R audio.midi.xml +++ b/res/controllers/Gemini CDMP-7000 R audio.midi.xml @@ -5,7 +5,7 @@ djtrinidad Gemini CDMP-7000 mapping for Deck 2 https://mixxx.discourse.group/t/gemini-cdmp-7000-mapping/14482 - /hardware/controllers/gemini_cdmp_7000.html + gemini_cdmp_7000 diff --git a/res/controllers/Gemini FirstMix.midi.xml b/res/controllers/Gemini FirstMix.midi.xml index 0a250d7be8dc..bafefdb95e1a 100644 --- a/res/controllers/Gemini FirstMix.midi.xml +++ b/res/controllers/Gemini FirstMix.midi.xml @@ -3,7 +3,7 @@ Gemini FirstMix mcsquared88 http://www.mixxx.org/forums/viewtopic.php?f=7&t=3884 - /hardware/controllers/gemini_firstmix.html + 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 9e2bd082cb43..683d2626cc21 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 - /hardware/controllers/hercules_dj_console_4_mx.html + 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 994b313d8c40..d9f3a072026f 100644 --- a/res/controllers/Hercules DJ Console Mac Edition.midi.xml +++ b/res/controllers/Hercules DJ Console Mac Edition.midi.xml @@ -4,7 +4,7 @@ Hercules DJ Console Mac Edition Daniel Svensson MIDI Mapping for Hercules DJ Console (Mac Edition) - /hardware/controllers/hercules_dj_console_mac_edition.html + 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 f36ee7c44f62..8237a2688422 100644 --- a/res/controllers/Hercules DJ Console Mk1.hid.xml +++ b/res/controllers/Hercules DJ Console Mk1.hid.xml @@ -5,7 +5,7 @@ zestoi changes for mk1 by ewanuno Native high-resolution HID script for the Hercules DJ Console MK1 controller. http://www.mixxx.org/forums/viewtopic.php?f=7&t=4081 - /hardware/controllers/hercules_dj_console_mk1.html + 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 4698a3424d0f..3e0e0e66c8dd 100644 --- a/res/controllers/Hercules DJ Console Mk2.hid.xml +++ b/res/controllers/Hercules DJ Console Mk2.hid.xml @@ -4,7 +4,7 @@ Hercules DJ Console MK2 HID zestoi Native high-resolution HID script for the Hercules DJ Console MK2 controller. - /hardware/controllers/hercules_dj_console_mk2.html + 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 4cb9b1e6cfe5..6f82444cca50 100644 --- a/res/controllers/Hercules DJ Console Mk2.midi.xml +++ b/res/controllers/Hercules DJ Console Mk2.midi.xml @@ -4,7 +4,7 @@ Hercules DJ Console Mk2 Garth Dahlstrom This is a complete mapping for a Hercules DJ Console Mk2. - /hardware/controllers/hercules_dj_console_mk2.html + 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 b435b362b584..ee70dd1e5518 100644 --- a/res/controllers/Hercules DJ Console Mk4.midi.xml +++ b/res/controllers/Hercules DJ Console Mk4.midi.xml @@ -5,7 +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 - /hardware/controllers/hercules_dj_console_mk4.html + 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 f3ddf34b8a88..803a972f0b35 100644 --- a/res/controllers/Hercules DJ Console RMX 2.midi.xml +++ b/res/controllers/Hercules DJ Console RMX 2.midi.xml @@ -6,7 +6,7 @@ Hercules DJ Console RMX2 Circuitfry This console's mapping comes with a script. - /hardware/controllers/hercules_dj_console_rmx2.html + 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 e33890fd91b2..fd93d91817f5 100644 --- a/res/controllers/Hercules DJ Console RMX Advanced.midi.xml +++ b/res/controllers/Hercules DJ Console RMX Advanced.midi.xml @@ -4,7 +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 - /hardware/controllers/hercules_dj_console_rmx.html + 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 ad8e5d16a2fc..b80cf92a9ad5 100644 --- a/res/controllers/Hercules DJ Console RMX.hid.xml +++ b/res/controllers/Hercules DJ Console RMX.hid.xml @@ -5,7 +5,7 @@ richterskala Native HID script for the Hercules DJ Console RMX controller. http://www.mixxx.org/forums/viewtopic.php?f=7&t=6134 - /hardware/controllers/hercules_dj_console_rmx.html + 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 e5a360e11872..3d34784ec8fa 100644 --- a/res/controllers/Hercules DJ Console RMX.midi.xml +++ b/res/controllers/Hercules DJ Console RMX.midi.xml @@ -4,7 +4,7 @@ Hercules DJ Console RMX Anders Gunnarsson Hercules DJ Console RMX controller mapping, v1.9.0. Requires script v1.9.0 - /hardware/controllers/hercules_dj_console_rmx.html + 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 7288b5317462..01436ebc624e 100644 --- a/res/controllers/Hercules DJ Control AIR.midi.xml +++ b/res/controllers/Hercules DJ Control AIR.midi.xml @@ -4,7 +4,7 @@ rojaro Mapping for Hercules DJ Control AIR http://www.mixxx.org/forums/viewtopic.php?f=7&t=3263 - /hardware/controllers/hercules_djcontrol_air.html + hercules_djcontrol_air diff --git a/res/controllers/Hercules DJ Control Instinct.midi.xml b/res/controllers/Hercules DJ Control Instinct.midi.xml index ba4d4a127762..2e007dbf87e0 100644 --- a/res/controllers/Hercules DJ Control Instinct.midi.xml +++ b/res/controllers/Hercules DJ Control Instinct.midi.xml @@ -4,7 +4,7 @@ Mich Wyser http://www.mixxx.org/forums/viewtopic.php?f=7&t=3907 - /hardware/controllers/hercules_djcontrol_instinct.html + 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 4c05ed946b23..f0ea42887dd8 100644 --- a/res/controllers/Hercules DJ Control MP3 e2.bulk.xml +++ b/res/controllers/Hercules DJ Control MP3 e2.bulk.xml @@ -4,7 +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. - /hardware/controllers/hercules_djcontrol_mp3_e2.html + 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 e273333c6eb7..5559cdd43e6e 100644 --- a/res/controllers/Hercules DJ Control MP3 e2.midi.xml +++ b/res/controllers/Hercules DJ Control MP3 e2.midi.xml @@ -5,7 +5,7 @@ Gianfe, Taucher and SBlaisot Hercules DJ Control MP3 e2 / MP3 LE / Glow mapping. These three controllers have identical controls and share the same mapping. https://mixxx.discourse.group/t/hercules-dj-control-mp3-e2-4-deck-mapping-for-mixxx-1-12/15056 - /hardware/controllers/hercules_djcontrol_mp3_e2.html + 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 ed000dfd533d..2eab09cf8d30 100644 --- a/res/controllers/Hercules DJ Control MP3.hid.xml +++ b/res/controllers/Hercules DJ Control MP3.hid.xml @@ -6,7 +6,7 @@ Adaptation for the MP3 reusing the work on the Mk1 by zestoy/ewanuno Native HID script for the Hercules DJ Control MP3 controller. https://mixxx.discourse.group/t/hid-output-not-working-with-hercules-dj-control-windows/13365 - /hardware/controllers/hercules_djcontrol_mp3.html + hercules_djcontrol_mp3 diff --git a/res/controllers/Hercules DJ Control MP3.midi.xml b/res/controllers/Hercules DJ Control MP3.midi.xml index 98281678824f..87dd5c119a0d 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. - /hardware/controllers/hercules_djcontrol_mp3.html + hercules_djcontrol_mp3 diff --git a/res/controllers/Hercules DJControl Compact.midi.xml b/res/controllers/Hercules DJControl Compact.midi.xml index 6bebc90cc6b4..75cb4f7b5081 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. - /hardware/controllers/hercules_djcontrol_compact.html + hercules_djcontrol_compact diff --git a/res/controllers/Hercules DJControl Starlight.midi.xml b/res/controllers/Hercules DJControl Starlight.midi.xml index 74f64a4b26a1..a33e8e83259d 100644 --- a/res/controllers/Hercules DJControl Starlight.midi.xml +++ b/res/controllers/Hercules DJControl Starlight.midi.xml @@ -5,7 +5,7 @@ DJ Phatso for Hercules Technical Support, contributions by Kerrick Staley MIDI Preset for Hercules DJControl Starlight https://mixxx.discourse.group/t/hercules-djcontrol-starlight/17833 - /hardware/controllers/hercules_djcontrol_starlight.html + hercules_djcontrol_starlight diff --git a/res/controllers/Hercules P32 DJ.midi.xml b/res/controllers/Hercules P32 DJ.midi.xml index f978cfd09183..bfda4b015ae3 100644 --- a/res/controllers/Hercules P32 DJ.midi.xml +++ b/res/controllers/Hercules P32 DJ.midi.xml @@ -5,7 +5,7 @@ Be 4-deck mapping for Hercules P32 controller https://mixxx.discourse.group/t/hercules-p32-dj-controller-mapping/15804 - /hardware/controllers/hercules_p32_dj.html + hercules_p32_dj diff --git a/res/controllers/Ion Discover DJ.midi.xml b/res/controllers/Ion Discover DJ.midi.xml index c9825f420a68..fac106648054 100644 --- a/res/controllers/Ion Discover DJ.midi.xml +++ b/res/controllers/Ion Discover DJ.midi.xml @@ -5,7 +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 - /hardware/controllers/ion_discover_dj.html + ion_discover_dj diff --git a/res/controllers/KANE_QuNeo.midi.xml b/res/controllers/KANE_QuNeo.midi.xml index 70fba77a51fc..46c8383fb781 100644 --- a/res/controllers/KANE_QuNeo.midi.xml +++ b/res/controllers/KANE_QuNeo.midi.xml @@ -4,7 +4,7 @@ Daniel Leja This is a fully customized DJ mapping for the QuNeo, complete with beat-jumping and pulsing LED sequencers. https://mixxx.discourse.group/viewtopic.php?f=7&amp;t=4130&amp;sid=bc90140a4dc6e650e06dae0df8562604--> - /hardware/controllers/keith_mcmillen_quneo.html + keith_mcmillen_quneo diff --git a/res/controllers/Kontrol Dj KDJ500.midi.xml b/res/controllers/Kontrol Dj KDJ500.midi.xml index b157278c6636..89e5139dd0df 100644 --- a/res/controllers/Kontrol Dj KDJ500.midi.xml +++ b/res/controllers/Kontrol Dj KDJ500.midi.xml @@ -3,7 +3,7 @@ Kontrol DJ KDJ500 bonkhead and dnine http://www.mixxx.org/forums/viewtopic.php?f=7&t=1609 - /hardware/controllers/kontrol_dj_kdj500.html + kontrol_dj_kdj500 diff --git a/res/controllers/Korg nanoKONTROL 2.midi.xml b/res/controllers/Korg nanoKONTROL 2.midi.xml index 73c5396bc6ef..2d0e517b82a8 100644 --- a/res/controllers/Korg nanoKONTROL 2.midi.xml +++ b/res/controllers/Korg nanoKONTROL 2.midi.xml @@ -7,7 +7,7 @@ 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 - /hardware/controllers/korg_nanokontrol2.html + korg_nanokontrol2 diff --git a/res/controllers/Korg nanoKONTROL.midi.xml b/res/controllers/Korg nanoKONTROL.midi.xml index 1237c6a376d4..63c406ec9927 100644 --- a/res/controllers/Korg nanoKONTROL.midi.xml +++ b/res/controllers/Korg nanoKONTROL.midi.xml @@ -4,7 +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 - /hardware/controllers/korg_nanokontrol.html + korg_nanokontrol diff --git a/res/controllers/Korg nanoPAD2.midi.xml b/res/controllers/Korg nanoPAD2.midi.xml index ad54ef7d6729..e2ec3a237e6f 100644 --- a/res/controllers/Korg nanoPAD2.midi.xml +++ b/res/controllers/Korg nanoPAD2.midi.xml @@ -5,7 +5,7 @@ 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. https://mixxx.discourse.group/t/akai-lpd8-mapping-4-decks-30-hotcues-loops-etc-v2/13064 - /hardware/controllers/korg_nanopad2.html + korg_nanopad2 diff --git a/res/controllers/Korg-KAOSS-DJ.midi.xml b/res/controllers/Korg-KAOSS-DJ.midi.xml index fac979d9699e..ad6f66a97a5f 100644 --- a/res/controllers/Korg-KAOSS-DJ.midi.xml +++ b/res/controllers/Korg-KAOSS-DJ.midi.xml @@ -5,7 +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 - /hardware/controllers/korg_kaoss_dj.html + korg_kaoss_dj diff --git a/res/controllers/M-Audio_Xsession_pro.midi.xml b/res/controllers/M-Audio_Xsession_pro.midi.xml index 08ed6c0588f0..2e49149efcdd 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 - /hardware/controllers/m_audio_x_session_pro.html + m_audio_x_session_pro diff --git a/res/controllers/MidiTech-MidiControl.midi.xml b/res/controllers/MidiTech-MidiControl.midi.xml index f673748446dd..813b47cee569 100644 --- a/res/controllers/MidiTech-MidiControl.midi.xml +++ b/res/controllers/MidiTech-MidiControl.midi.xml @@ -4,7 +4,7 @@ MidiTech MidiControl MIDI Mapping for MidiTech MidiControl - /hardware/controllers/miditech_midicontrol.html + miditech_midicontrol diff --git a/res/controllers/MixVibes U-Mix Control 2.midi.xml b/res/controllers/MixVibes U-Mix Control 2.midi.xml index 35c22d7c1075..291507b77735 100644 --- a/res/controllers/MixVibes U-Mix Control 2.midi.xml +++ b/res/controllers/MixVibes U-Mix Control 2.midi.xml @@ -4,7 +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 - /hardware/controllers/mixvibes_u_mix_control_2.html + 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 6da8bb8fcfc9..5da140ce37a0 100644 --- a/res/controllers/MixVibes U-Mix Control Pro 2.midi.xml +++ b/res/controllers/MixVibes U-Mix Control Pro 2.midi.xml @@ -5,7 +5,7 @@ tomtom (thomas-8) V1.0.0 -> Please visit Forum and Wiki for more details. https://mixxx.discourse.group/t/v1-0-mixvibes-u-mix-control-pro-2-mapping/13322 - /hardware/controllers/mixvibes_u_mix_control_2.html + mixvibes_u_mix_control_2 diff --git a/res/controllers/Mixman DM2 (Linux).midi.xml b/res/controllers/Mixman DM2 (Linux).midi.xml index e6d3a7a46620..32773dd3b43e 100644 --- a/res/controllers/Mixman DM2 (Linux).midi.xml +++ b/res/controllers/Mixman DM2 (Linux).midi.xml @@ -4,7 +4,7 @@ Mixman DM2 (Linux) Jan Jockusch This is the DM2 mapping for the Linux driver (dm2linux.sourceforge.net) - /hardware/controllers/mixman_dm2.html + mixman_dm2 diff --git a/res/controllers/Mixman DM2 (OS X).midi.xml b/res/controllers/Mixman DM2 (OS X).midi.xml index 562384459927..344a545361e0 100644 --- a/res/controllers/Mixman DM2 (OS X).midi.xml +++ b/res/controllers/Mixman DM2 (OS X).midi.xml @@ -3,7 +3,7 @@ Mixman DM2 (OS X) Joe M. MIDI Mapping for Mixman DM2 (OS/X Version) - /hardware/controllers/mixman_dm2.html + mixman_dm2 diff --git a/res/controllers/Mixman DM2 (Windows).midi.xml b/res/controllers/Mixman DM2 (Windows).midi.xml index 88f34e9c70ec..39f8082d45c6 100644 --- a/res/controllers/Mixman DM2 (Windows).midi.xml +++ b/res/controllers/Mixman DM2 (Windows).midi.xml @@ -4,7 +4,7 @@ Mixman DM2 (Windows) Joe M. MIDI Mapping for Mixman DM2 (Windows) - /hardware/controllers/mixman_dm2.html + mixman_dm2 diff --git a/res/controllers/Nintendo Wiimote.hid.xml b/res/controllers/Nintendo Wiimote.hid.xml index 047aec7578c5..d5db59c2138f 100644 --- a/res/controllers/Nintendo Wiimote.hid.xml +++ b/res/controllers/Nintendo Wiimote.hid.xml @@ -4,7 +4,7 @@ Ilkka Tuohela HID mapping for Nintendo Wii Remote Game Controller http://www.mixxx.org/forums/viewtopic.php?f=7&t=3939 - /hardware/controllers/nintendo_wiimote.html + nintendo_wiimote diff --git a/res/controllers/Novation Dicer.midi.xml b/res/controllers/Novation Dicer.midi.xml index ff390989acf1..d79c76bc45db 100644 --- a/res/controllers/Novation Dicer.midi.xml +++ b/res/controllers/Novation Dicer.midi.xml @@ -4,7 +4,7 @@ Shaun (DJPandemonium@gmail.com) Implements cuepoints, looping, loop rolls, basic effects, and navigation. https://mixxx.discourse.group/t/novation-dicer-mapping/12329 - /hardware/controllers/novation_dicer.html + novation_dicer diff --git a/res/controllers/Novation Launchpad MK2.midi.xml b/res/controllers/Novation Launchpad MK2.midi.xml index ab556e2b44df..f623db42c338 100644 --- a/res/controllers/Novation Launchpad MK2.midi.xml +++ b/res/controllers/Novation Launchpad MK2.midi.xml @@ -5,7 +5,7 @@ Midiparse Novation Launchpad mapping for Mixxx https://github.com/szdavid92/mixxx-launchpad - /hardware/controllers/novation_launchpad_mk2.html + novation_launchpad_mk2 diff --git a/res/controllers/Novation Launchpad.midi.xml b/res/controllers/Novation Launchpad.midi.xml index 53adf4489d9c..c3e740413fd4 100644 --- a/res/controllers/Novation Launchpad.midi.xml +++ b/res/controllers/Novation Launchpad.midi.xml @@ -5,7 +5,7 @@ Midiparse Novation Launchpad mapping for Mixxx https://github.com/szdavid92/mixxx-launchpad - /hardware/controllers/novation_launchpad_mk1.html + novation_launchpad_mk1 diff --git a/res/controllers/Novation-Launchpad-Mini.midi.xml b/res/controllers/Novation-Launchpad-Mini.midi.xml index df7ea3ec7a12..24e1fe74a931 100644 --- a/res/controllers/Novation-Launchpad-Mini.midi.xml +++ b/res/controllers/Novation-Launchpad-Mini.midi.xml @@ -5,7 +5,7 @@ marczis Multi page mapping for the Novation Launchpad Mini https://mixxx.discourse.group/t/novation-launchpad-mini-mapping-official-forum/14299 - /hardware/controllers/novation_launchpad_mini.html + novation_launchpad_mini diff --git a/res/controllers/Numark DJ2Go.midi.xml b/res/controllers/Numark DJ2Go.midi.xml index 8f9b7c5e6e01..651ad13dfabb 100644 --- a/res/controllers/Numark DJ2Go.midi.xml +++ b/res/controllers/Numark DJ2Go.midi.xml @@ -5,7 +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 - /hardware/controllers/numark_dj2go.html + numark_dj2go diff --git a/res/controllers/Numark MIXTRACK.midi.xml b/res/controllers/Numark MIXTRACK.midi.xml index 575abef84a48..e31a33341849 100644 --- a/res/controllers/Numark MIXTRACK.midi.xml +++ b/res/controllers/Numark MIXTRACK.midi.xml @@ -4,7 +4,7 @@ Numark MIXTRACK Matteo (matteo@magm3.com), RAWRR, and uncleeugene Numark MixTrack Mapping v1.0b - /hardware/controllers/numark_mixtrack.html + numark_mixtrack diff --git a/res/controllers/Numark Mixtrack 2.midi.xml b/res/controllers/Numark Mixtrack 2.midi.xml index 8278ff2899e1..6363a230e789 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 - /hardware/controllers/numark_mixtrack_pro_ii.html + numark_mixtrack_pro_ii diff --git a/res/controllers/Numark Mixtrack Platinum.midi.xml b/res/controllers/Numark Mixtrack Platinum.midi.xml index 1d960e4d31bb..9e8d721d8a73 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 - /hardware/controllers/numark_mixtrack_platinum.html + numark_mixtrack_platinum diff --git a/res/controllers/Numark Mixtrack Pro.midi.xml b/res/controllers/Numark Mixtrack Pro.midi.xml index 98afcc93ea5c..f2ddff9750eb 100644 --- a/res/controllers/Numark Mixtrack Pro.midi.xml +++ b/res/controllers/Numark Mixtrack Pro.midi.xml @@ -6,7 +6,7 @@ Modify by Darío José Freije 06/27/2012--> Matteo (matteo@magm3.com), James Ralston, and D. J. Freije (dario2004@gmail.com) version v1.2 w/brake, backspin, blink beat Leds. https://mixxx.discourse.group/t/numark-mixtrack-pro-with-backspin-and-more/12557 - /hardware/controllers/numark_mixtrack_pro.html + numark_mixtrack_pro diff --git a/res/controllers/Numark N4.midi.xml b/res/controllers/Numark N4.midi.xml index 94b1626853e2..68d1ba9a4cf4 100644 --- a/res/controllers/Numark N4.midi.xml +++ b/res/controllers/Numark N4.midi.xml @@ -4,7 +4,7 @@ Numark N4 Swiftb0y 4 channel MIDI Mapping for Numark N4 - /hardware/controllers/numark_n4.html + numark_n4 diff --git a/res/controllers/Numark NS7.midi.xml b/res/controllers/Numark NS7.midi.xml index 6d1bc1ed4d4e..4393016815cf 100644 --- a/res/controllers/Numark NS7.midi.xml +++ b/res/controllers/Numark NS7.midi.xml @@ -4,7 +4,7 @@ Numark NS7 Anders Gunnarsson Numark NS7 controller preliminary mapping, v1.9.0 Requires script v1.9.0 - /hardware/controllers/numark_ns7.html + numark_ns7 diff --git a/res/controllers/Numark Omni Control.midi.xml b/res/controllers/Numark Omni Control.midi.xml index 487dc166fdb7..f3c02411f730 100644 --- a/res/controllers/Numark Omni Control.midi.xml +++ b/res/controllers/Numark Omni Control.midi.xml @@ -3,7 +3,7 @@ Numark Omni Control Baxter Adaptation from the work of Smashuu and David Gnedt - /hardware/controllers/numark_omni_control.html + numark_omni_control diff --git a/res/controllers/Numark Total Control.midi.xml b/res/controllers/Numark Total Control.midi.xml index ca82e30cfff7..55e7c3e8c7c9 100644 --- a/res/controllers/Numark Total Control.midi.xml +++ b/res/controllers/Numark Total Control.midi.xml @@ -5,7 +5,7 @@ Smashuu / David Gnedt Optimized for Traktor label card http://www.mixxx.org/forums/viewtopic.php?f=7&t=1252 - /hardware/controllers/numark_total_control.html + numark_total_control diff --git a/res/controllers/Numark V7.midi.xml b/res/controllers/Numark V7.midi.xml index 8b9f97ef26fc..41e8a5c03b1c 100644 --- a/res/controllers/Numark V7.midi.xml +++ b/res/controllers/Numark V7.midi.xml @@ -4,7 +4,7 @@ Numark V7 Mike Bucceroni http://www.mixxx.org/forums/viewtopic.php?f=7&t=3974 - /hardware/controllers/numark_v7.html + numark_v7 diff --git a/res/controllers/Numark iDJ Live II.midi.xml b/res/controllers/Numark iDJ Live II.midi.xml index a2e214263c34..11bf6d84b96d 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 - /hardware/controllers/numark_idj_live_ii.html + numark_idj_live_ii diff --git a/res/controllers/Pioneer CDJ-2000.midi.xml b/res/controllers/Pioneer CDJ-2000.midi.xml index fc0af7b1e457..506da23a934e 100644 --- a/res/controllers/Pioneer CDJ-2000.midi.xml +++ b/res/controllers/Pioneer CDJ-2000.midi.xml @@ -4,7 +4,7 @@ Pioneer CDJ-2000 Ilkka Tuohela <hile@iki.fi> Pioneer CDJ-2000 configuration for 2 decks on midi channels 1 and 2 - /hardware/controllers/pioneer_cdj_2000.html + pioneer_cdj_2000 diff --git a/res/controllers/Pioneer CDJ-350 Ch1.midi.xml b/res/controllers/Pioneer CDJ-350 Ch1.midi.xml index c5983a8be3b4..641610873764 100644 --- a/res/controllers/Pioneer CDJ-350 Ch1.midi.xml +++ b/res/controllers/Pioneer CDJ-350 Ch1.midi.xml @@ -4,7 +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 - /hardware/controllers/pioneer_cdj_350.html + pioneer_cdj_350 diff --git a/res/controllers/Pioneer CDJ-350 Ch2.midi.xml b/res/controllers/Pioneer CDJ-350 Ch2.midi.xml index e3ef5dad0647..e28ac9d0a6b5 100644 --- a/res/controllers/Pioneer CDJ-350 Ch2.midi.xml +++ b/res/controllers/Pioneer CDJ-350 Ch2.midi.xml @@ -4,7 +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 - /hardware/controllers/pioneer_cdj_350.html + pioneer_cdj_350 diff --git a/res/controllers/Pioneer CDJ-850.midi.xml b/res/controllers/Pioneer CDJ-850.midi.xml index 9c63adc6328e..b3d91bc9fae5 100644 --- a/res/controllers/Pioneer CDJ-850.midi.xml +++ b/res/controllers/Pioneer CDJ-850.midi.xml @@ -4,7 +4,7 @@ Pioneer CDJ-850 Ilkka Tuohela <hile@iki.fi> Pioneer CDJ-850 configuration for 2 decks on midi channels 1 and 2 - /hardware/controllers/pioneer_cdj_850.html + pioneer_cdj_850 diff --git a/res/controllers/Pioneer DDJ-SX.midi.xml b/res/controllers/Pioneer DDJ-SX.midi.xml index 271f5351970e..6cf030f5b113 100644 --- a/res/controllers/Pioneer DDJ-SX.midi.xml +++ b/res/controllers/Pioneer DDJ-SX.midi.xml @@ -5,7 +5,7 @@ Maximilian Beiersdorfer, DJMaxergy Pioneer DDJ-SX controller mapping https://mixxx.discourse.group/t/pioneer-ddj-sx-controller-mapping/15954 - /hardware/controllers/pioneer_ddj_sx.html + pioneer_ddj_sx diff --git a/res/controllers/Pioneer-DDJ-SB.midi.xml b/res/controllers/Pioneer-DDJ-SB.midi.xml index 3bff8258e87a..3d5402a5c428 100644 --- a/res/controllers/Pioneer-DDJ-SB.midi.xml +++ b/res/controllers/Pioneer-DDJ-SB.midi.xml @@ -4,7 +4,7 @@ Pioneer DDJ-SB Joan Ardiaca Jové Pioneer DDJ-SB configuration for 4 decks. Use the tempo range buttons to switch decks. - /hardware/controllers/pioneer_ddj_sb.html + pioneer_ddj_sb diff --git a/res/controllers/Pioneer-DDJ-SB2.midi.xml b/res/controllers/Pioneer-DDJ-SB2.midi.xml index ffbd512b639d..34f9974fb0bf 100644 --- a/res/controllers/Pioneer-DDJ-SB2.midi.xml +++ b/res/controllers/Pioneer-DDJ-SB2.midi.xml @@ -5,7 +5,7 @@ Be, Michael Stahl (DG3NEC) Pioneer DDJ-SB2 https://mixxx.discourse.group/t/pinoneer-ddj-sb2-midi-mapping/15373 - /hardware/controllers/pioneer_ddj_sb2.html + pioneer_ddj_sb2 diff --git a/res/controllers/Reloop Beatmix 2-4.midi.xml b/res/controllers/Reloop Beatmix 2-4.midi.xml index 4e6d155bf844..31c55bfa635c 100644 --- a/res/controllers/Reloop Beatmix 2-4.midi.xml +++ b/res/controllers/Reloop Beatmix 2-4.midi.xml @@ -5,7 +5,7 @@ Sébastien Blaisot <sebastien@blaisot.org> Controller mapping for the Reloop Beatmix 2/4. https://mixxx.discourse.group/t/reloop-beatmix-2-4-mapping/16049 - /hardware/controllers/reloop_beatmix_2.html + reloop_beatmix_2 diff --git a/res/controllers/Reloop Beatpad.midi.xml b/res/controllers/Reloop Beatpad.midi.xml index 2e0a10128208..086f792fb93f 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 - /hardware/controllers/reloop_beatpad.html + 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 4cc9a880dc48..7bf5399342ae 100644 --- a/res/controllers/Reloop Digital Jockey 2 Controller Edition.midi.xml +++ b/res/controllers/Reloop Digital Jockey 2 Controller Edition.midi.xml @@ -4,7 +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 - /hardware/controllers/reloop_digital_jockey_2_controller_edition.html + 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 8a55e26e8d80..8685839a2831 100644 --- a/res/controllers/Reloop Jockey 3 ME.midi.xml +++ b/res/controllers/Reloop Jockey 3 ME.midi.xml @@ -5,7 +5,7 @@ Chris2000SP v1.0.3 Mapping for 2.0.x https://mixxx.discourse.group/t/create-a-mapping-for-reloop-jockey-3-me/13703 - /hardware/controllers/reloop_jockey_3_master_edition.html + 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 2be995883baa..3f49eddf271b 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. - /hardware/controllers/reloop_terminal_mix_series.html + reloop_terminal_mix_series diff --git a/res/controllers/Roland_DJ-505.midi.xml b/res/controllers/Roland_DJ-505.midi.xml index 100978ef1b11..c4eca0a1619d 100644 --- a/res/controllers/Roland_DJ-505.midi.xml +++ b/res/controllers/Roland_DJ-505.midi.xml @@ -5,7 +5,7 @@ Jan Holthuis 4-deck mapping for Roland DJ-505 controller https://mixxx.discourse.group/t/roland-dj-505/17916 - /hardware/controllers/roland_dj_505.html + roland_dj_505 diff --git a/res/controllers/Sony SixxAxis.hid.xml b/res/controllers/Sony SixxAxis.hid.xml index 26b7d13ab55b..004b8800678e 100644 --- a/res/controllers/Sony SixxAxis.hid.xml +++ b/res/controllers/Sony SixxAxis.hid.xml @@ -5,7 +5,7 @@ Ilkka Tuohela HID mapping for Sony SixxAxis Game Controller http://www.mixxx.org/forums/viewtopic.php?f=7&t=3940 - /hardware/controllers/sony_sixxaxis.html + sony_sixxaxis diff --git a/res/controllers/Soundless_joyMIDI.midi.xml b/res/controllers/Soundless_joyMIDI.midi.xml index 607856bc7574..b3e25cdd8cfb 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 - /hardware/controllers/soundless_studio_joymidi.html + soundless_studio_joymidi diff --git a/res/controllers/Stanton SCS.1d.midi.xml b/res/controllers/Stanton SCS.1d.midi.xml index 4e476c218f31..78f1f9e4d734 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.) - /hardware/controllers/stanton_scs1d.html + stanton_scs1d diff --git a/res/controllers/Stanton SCS.1m.midi.xml b/res/controllers/Stanton SCS.1m.midi.xml index b148224b1b25..96cffe9030e1 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. - /hardware/controllers/stanton_scs1m.html + stanton_scs1m diff --git a/res/controllers/Stanton SCS.3d Alternate.midi.xml b/res/controllers/Stanton SCS.3d Alternate.midi.xml index d8afb47d0103..93a868287689 100644 --- a/res/controllers/Stanton SCS.3d Alternate.midi.xml +++ b/res/controllers/Stanton SCS.3d Alternate.midi.xml @@ -4,7 +4,7 @@ Stanton SCS.3d (alternate) sbalmer Alternate mapping for the Stanton SCS.3d controller with somewhat different controls and additional lights. - /hardware/controllers/stanton_scs3d.html + stanton_scs3d diff --git a/res/controllers/Stanton SCS.3m.midi.xml b/res/controllers/Stanton SCS.3m.midi.xml index ce5f24e44b09..8cac9d45773c 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. - /hardware/controllers/stanton_scs3m.html + stanton_scs3m diff --git a/res/controllers/Stanton-DJC-4.midi.xml b/res/controllers/Stanton-DJC-4.midi.xml index 525210238429..7e8ea3a6f0de 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. - /hardware/controllers/stanton_djc_4.html + stanton_djc_4 diff --git a/res/controllers/TrakProDJ iPad.midi.xml b/res/controllers/TrakProDJ iPad.midi.xml index dd2cd4bbfdc3..a381378907e5 100644 --- a/res/controllers/TrakProDJ iPad.midi.xml +++ b/res/controllers/TrakProDJ iPad.midi.xml @@ -4,7 +4,7 @@ TrakProDJ iPad Ilkka Tuohela <hile@iki.fi> TrakProDJ iPad application midi mapping - /hardware/controllers/trakprodj.html + trakprodj diff --git a/res/controllers/Traktor Kontrol F1.hid.xml b/res/controllers/Traktor Kontrol F1.hid.xml index 898e3e980f95..617daa741c38 100644 --- a/res/controllers/Traktor Kontrol F1.hid.xml +++ b/res/controllers/Traktor Kontrol F1.hid.xml @@ -5,7 +5,7 @@ Ilkka Tuohela HID mapping for Native Instruments Traktor Kontrol F1 Controller http://www.mixxx.org/forums/viewtopic.php?f=7&t=3810 - /hardware/controllers/native_instruments_traktor_kontrol_f1.html + 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 a1d3774c7c3c..7ad2b4824221 100644 --- a/res/controllers/Traktor Kontrol S2 MK3.hid.xml +++ b/res/controllers/Traktor Kontrol S2 MK3.hid.xml @@ -5,7 +5,7 @@ Michael Schmidt HID Mapping for Traktor Kontrol S2 MK3 https://www.mixxx.org/forums/viewtopic.php?f=7&t=12999 - /hardware/controllers/native_instruments_traktor_kontrol_s2_mk3.html + 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 08e371bf18a7..07984438dc8b 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 - /hardware/controllers/native_instruments_traktor_kontrol_s2_mk2.html + 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 22cae9766cf2..77503797adc8 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 - /hardware/controllers/native_instruments_traktor_kontrol_s4_mk2.html + 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 ab740ed2f034..d338c9d32784 100644 --- a/res/controllers/Traktor Kontrol X1.midi.xml +++ b/res/controllers/Traktor Kontrol X1.midi.xml @@ -4,7 +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 - /hardware/controllers/native_instruments_traktor_kontrol_x1.html + native_instruments_traktor_kontrol_x1 diff --git a/res/controllers/Vestax Spin.midi.xml b/res/controllers/Vestax Spin.midi.xml index 930067d628f6..35aa0cac7341 100644 --- a/res/controllers/Vestax Spin.midi.xml +++ b/res/controllers/Vestax Spin.midi.xml @@ -4,7 +4,7 @@ Vestax Spin Bill Good, based on the work of Anders Gunnarsson Bill's controller mapping for Vestax Spin + script - /hardware/controllers/vestax_spin.html + vestax_spin diff --git a/res/controllers/Vestax Typhoon Enhanced.midi.xml b/res/controllers/Vestax Typhoon Enhanced.midi.xml index c1e61d196f3d..30f3094eb771 100644 --- a/res/controllers/Vestax Typhoon Enhanced.midi.xml +++ b/res/controllers/Vestax Typhoon Enhanced.midi.xml @@ -5,7 +5,7 @@ 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. https://mixxx.discourse.group/t/vestax-typhoon-mapping-for-mixxx-2-0/12551/1#p14494 - /hardware/controllers/vestax_typhoon.html + vestax_typhoon diff --git a/res/controllers/Vestax Typhoon.midi.xml b/res/controllers/Vestax Typhoon.midi.xml index 8c7ec99f0126..3eb724c338a4 100644 --- a/res/controllers/Vestax Typhoon.midi.xml +++ b/res/controllers/Vestax Typhoon.midi.xml @@ -5,7 +5,7 @@ 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. https://mixxx.discourse.group/t/vestax-typhoon-mapping-for-mixxx-2-0/12551/1#p14494 - /hardware/controllers/vestax_typhoon.html + vestax_typhoon diff --git a/res/controllers/Vestax VCI-100-3DEX.midi.xml b/res/controllers/Vestax VCI-100-3DEX.midi.xml index 8a2f4441044c..9bccba717f85 100644 --- a/res/controllers/Vestax VCI-100-3DEX.midi.xml +++ b/res/controllers/Vestax VCI-100-3DEX.midi.xml @@ -4,7 +4,7 @@ Vestax VCI-100 (MixVibes 3DEX Editon) Julius Alexander Kohout edler von Dolnobransky Preliminary controller mapping for Vestax VCI-100 with scripts - /hardware/controllers/vestax_vci_100_mixvibes_3dex_edition.html + 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 f78310784b61..f9937007d782 100644 --- a/res/controllers/Vestax VCI-100-hile.midi.xml +++ b/res/controllers/Vestax VCI-100-hile.midi.xml @@ -3,7 +3,7 @@ Vestax VCI-100 Hile Mod Ilkka Tuohela Modified Mapping for Vestax VCI-100 - /hardware/controllers/vestax_vci_100mki.html + vestax_vci_100mki diff --git a/res/controllers/Vestax VCI-100.midi.xml b/res/controllers/Vestax VCI-100.midi.xml index 9a0242cef156..b76bc265222f 100644 --- a/res/controllers/Vestax VCI-100.midi.xml +++ b/res/controllers/Vestax VCI-100.midi.xml @@ -4,7 +4,7 @@ Vestax VCI-100 Anders Gunnarsson Preliminary controller mapping for Vestax VCI-100 with scripts - /hardware/controllers/vestax_vci_100mki.html + vestax_vci_100mki diff --git a/res/controllers/Vestax VCI-100MKII.midi.xml b/res/controllers/Vestax VCI-100MKII.midi.xml index 66ae7f65b229..499c54e97061 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 - /hardware/controllers/vestax_vci_100mkii.html + vestax_vci_100mkii diff --git a/res/controllers/Vestax VCI-300.midi.xml b/res/controllers/Vestax VCI-300.midi.xml index 2c292d14b1d0..491e43f3edc5 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 - /hardware/controllers/vestax_vci_300.html + vestax_vci_300 diff --git a/res/controllers/Vestax VCI-400.midi.xml b/res/controllers/Vestax VCI-400.midi.xml index d433cc7d8c07..cebe07e28956 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 - /hardware/controllers/vestax_vci_400.html + vestax_vci_400 diff --git a/res/controllers/us428.midi.xml b/res/controllers/us428.midi.xml index c900f1c35214..d20fd7d5f1b5 100644 --- a/res/controllers/us428.midi.xml +++ b/res/controllers/us428.midi.xml @@ -4,7 +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 - /hardware/controllers/tascam_us_428.html + tascam_us_428 diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp index 81f95248b669..6d39acc4f33b 100644 --- a/src/controllers/dlgprefcontroller.cpp +++ b/src/controllers/dlgprefcontroller.cpp @@ -255,7 +255,8 @@ QString DlgPrefController::presetManualLink( if (pPreset) { QString manualPath = pPreset->manualPath(); if (manualPath.length() > 0) { - url = "Manual"; + url = "Manual"; } } return url; diff --git a/src/defs_urls.h b/src/defs_urls.h index 3bc0d42812f0..10ca25f26b85 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 \ From 0fd5f35903cdf1e30eb884f052ae8bbd7ca3d559 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Tue, 22 Sep 2020 13:35:57 +0200 Subject: [PATCH 8/8] ControllerPreset: Rename manualPath to manualPage and add manualLink --- src/controllers/controllerpreset.h | 21 ++++++++++++++----- .../controllerpresetfilehandler.cpp | 4 ++-- src/controllers/dlgprefcontroller.cpp | 7 +++---- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/controllers/controllerpreset.h b/src/controllers/controllerpreset.h index 4e97d5bed0ca..1b222b05fe9d 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,13 +125,22 @@ class ControllerPreset { return m_forumlink; } - void setManualPath(const QString& manualPath) { - m_manualPath = manualPath; + void setManualPage(const QString& manualPage) { + m_manualPage = manualPage; setDirty(true); } - QString manualPath() const { - return m_manualPath; + 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) { @@ -183,7 +194,7 @@ class ControllerPreset { QString m_author; QString m_description; QString m_forumlink; - QString m_manualPath; + 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 a9e9b4e16b19..7fe2f57392c6 100644 --- a/src/controllers/controllerpresetfilehandler.cpp +++ b/src/controllers/controllerpresetfilehandler.cpp @@ -99,8 +99,8 @@ void ControllerPresetFileHandler::parsePresetInfo( preset->setDescription(description.isNull() ? "" : description.text()); QDomElement forums = info.firstChildElement("forums"); preset->setForumLink(forums.isNull() ? "" : forums.text()); - QDomElement manualPath = info.firstChildElement("manual"); - preset->setManualPath(manualPath.isNull() ? "" : manualPath.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 6d39acc4f33b..99062359b9c3 100644 --- a/src/controllers/dlgprefcontroller.cpp +++ b/src/controllers/dlgprefcontroller.cpp @@ -253,10 +253,9 @@ QString DlgPrefController::presetManualLink( const ControllerPresetPointer pPreset) const { QString url; if (pPreset) { - QString manualPath = pPreset->manualPath(); - if (manualPath.length() > 0) { - url = "Manual"; + QString link = pPreset->manualLink(); + if (!link.isEmpty()) { + url = "Manual"; } } return url;