Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolve merge conflicts from 1.12 to master #628

Merged
merged 115 commits into from
Jun 17, 2015
Merged

Resolve merge conflicts from 1.12 to master #628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
115 commits
Select commit Hold shift + click to select a range
88b1a66
Get Filepath by absoluteFilePath to preserve symlinks
May 19, 2015
8082fdd
modplugSet channel count and other track info on open
snue May 20, 2015
3e5eeb4
Merge pull request #589 from snue/patch-1
daschuer May 20, 2015
87bc69b
Merge pull request #587 from MK-42/dropFilePath2
daschuer May 20, 2015
75e5639
Added Markus Klösges to contributor list. Thank you very much.
daschuer May 20, 2015
8a14890
Add debug messages to narrow font issues on windows
daschuer May 21, 2015
a445808
Fix preroll at wrong speed if waveform does not match to the track
daschuer May 21, 2015
2f35ffb
Fix playlist keyboard navigation broken
ywwg May 22, 2015
25b0e96
LateNight: Fix maximized library not appearing if library was turned …
ywwg May 22, 2015
812d00c
Fix master sync double-activating on long press causing spurious seeks
ywwg May 22, 2015
fdbd780
Update Hercules DJ Control MP3 e2 mapping to 1.12, 4-decks and lots o…
sblaisot May 22, 2015
e9fefe6
remove old TODO
sblaisot May 22, 2015
3d5238f
Add tooltip for ``Clear`` image in the search bar
esbrandt May 23, 2015
704911f
Add tooltip for the search bar
esbrandt May 23, 2015
ac2488b
Add link to the online version of the manual's keyboard shortcuts cha…
esbrandt May 23, 2015
fbd3ee5
Use less words for tooltip
esbrandt May 23, 2015
ff839e3
Fix typo
esbrandt May 23, 2015
86689e3
Mark external links in the help menu with an icon suffix. Same as in …
esbrandt May 23, 2015
bc6b770
swich to native softtakeover and add soft takeover for low/mid/high eq
sblaisot May 25, 2015
d2b1cb8
Correct a Most Vexing Parse and move Console initialization to the be…
default-kramer May 25, 2015
6b679b3
SoundTouch force pitch positive, fixes Bug #1458263
daschuer May 25, 2015
776282f
Merge branch '1.12' of https://github.com/mixxxdj/mixxx into 1.12-Her…
sblaisot May 25, 2015
472befc
Rubberband: Allow pitch change when plaing revers. Fixes Bug #1458652
daschuer May 25, 2015
a970277
Correct cover art test to properly load test cover
sblaisot May 25, 2015
4439a36
Added Test for pitch changes in reverse
daschuer May 25, 2015
3216f23
SoundTouch: guard against pitch == 0
daschuer May 25, 2015
ee624b0
use absolute path for loadCover
sblaisot May 25, 2015
116a885
correct typo in test cover filename
sblaisot May 25, 2015
eabed6b
Merge pull request #593 from default-kramer/1.12
daschuer May 25, 2015
561b1f1
Shade: replace text on previous and nex button by bitmaps
daschuer May 25, 2015
edfef1a
Shade: Added headlines for the effect sections
daschuer May 25, 2015
7fc146b
Shade: Fixed name for headphone gain
daschuer May 25, 2015
99ba023
refactor cover art tests, adding absolute and relative cover art test…
sblaisot May 26, 2015
cd44ac1
add test for JPEG embedded cover art in addition to existing PNG embe…
sblaisot May 26, 2015
84cd9b2
correct soundproxy test broken by cover-test.mp3 renamed to cover-tes…
sblaisot May 26, 2015
6d5d0d2
Removed unused CO EngineRate
daschuer May 26, 2015
2ec3da3
Fix calculation of visual play position, fixes: Bug #1459019
daschuer May 26, 2015
962939b
compare result from CoverArtUtil::extractEmbeddedCover with reference…
sblaisot May 26, 2015
42e8204
update aiff and wav test files to embed correct reference image
sblaisot May 26, 2015
ca879f8
Vestax VCI400: fix incorrect bindings for pfl
ywwg May 27, 2015
4e47808
Merge pull request #594 from sblaisot/coverart-test
kain88-de May 27, 2015
acbeada
add opus to soundsourceproxy:canOpen test
kain88-de May 28, 2015
9f26bec
Add imageformats QT plugins to workout JPEG cover art bug on windows …
sblaisot May 28, 2015
52359f3
added missing @staticmethod in depends.py
sblaisot May 28, 2015
34ce8b5
fix indentation error
sblaisot May 28, 2015
3e615cd
add image file formats for Qt4 and Qt5 and correct gif typo
sblaisot May 28, 2015
8969ae6
Merge pull request #596 from sblaisot/jpg_cover_art
rryan May 28, 2015
e086896
Merge branch '1.12' of https://github.com/mixxxdj/mixxx into 1.12-Her…
sblaisot May 28, 2015
c40e9b1
LateNight: Fix 4deck status getting unset sometimes when mixer is shown.
ywwg May 30, 2015
6fcc0d1
Update controller mapping files cleanup on uninstallation (windows)
sblaisot Jun 3, 2015
8282192
Merge pull request #603 from sblaisot/win-uninstall-cleanup
rryan Jun 3, 2015
b4879c7
Merge pull request #591 from esbrandt/lp1457656
rryan Jun 4, 2015
b6e0b97
Update translation template. Found 1931 source text(s) (12 new and 19…
esbrandt Jun 4, 2015
a2f405c
Pull latest translations from https://www.transifex.com/projects/p/mi…
esbrandt Jun 4, 2015
7daaaf4
update credits ;)
sblaisot Jun 4, 2015
a3ca4ee
add forum and wiki URL to Hercules MP3 e2 midi mapping file
sblaisot Jun 4, 2015
a70629c
Merge pull request #590 from sblaisot/1.12-HerculesDJControlMP3e2
rryan Jun 4, 2015
dcb2457
Update support URL.
rryan Jun 5, 2015
94cb542
Update settings path to %LOCALUSERPROFILE% on windows
sblaisot Jun 5, 2015
7c79d10
Add upgrade path for settings path change on windows
sblaisot Jun 5, 2015
c108705
correct pre-1.7 library import
sblaisot Jun 5, 2015
e0b1789
make .desktop launcher work when pulseaudio is not running
Be-ing Jun 5, 2015
87634ed
add missing include
sblaisot Jun 5, 2015
d3b91b6
reduce code duplication
sblaisot Jun 5, 2015
e89e815
add missing #include "upgrade.h"
sblaisot Jun 5, 2015
281df45
correct QFile leakage
sblaisot Jun 5, 2015
3acc597
Another missing #include :(
sblaisot Jun 5, 2015
29dddae
LateNight: Start adding aux mixer
ywwg Jun 5, 2015
1d8a2b0
LateNight: Finish AUX section
ywwg Jun 5, 2015
960b3df
LateNight: Make waveformsize and EQs individually selectable.
ywwg Jun 6, 2015
497de74
coding style cleanup
sblaisot Jun 6, 2015
32d57cd
more coding style cleanup
sblaisot Jun 6, 2015
81df843
LateNight: return small wave size to where it was before
ywwg Jun 6, 2015
5990313
LateNight: Use different sizeaware stack if library is hidden
ywwg Jun 7, 2015
b50c39b
Fix memory leak in NotNode
uklotzde Jun 7, 2015
3643656
Add (redundant) keyword 'virtual' to declaration of destructor
uklotzde Jun 7, 2015
2cc47c5
correctly destroy ValueTransformer
kain88-de Jun 6, 2015
8096f15
correct missing directory part of settings path
sblaisot Jun 8, 2015
08d8f43
Revert "correct missing directory part of settings path"
sblaisot Jun 8, 2015
2a3b614
Oops: Add missing / at the end of settingsPath
sblaisot Jun 8, 2015
9762f4f
Merge pull request #610 from uklotzde/FixMemoryLeakInNotNode
rryan Jun 8, 2015
2725646
Merge pull request #609 from mixxxdj/memory-leak
rryan Jun 8, 2015
e802ba0
Merge pull request #607 from Be-ing/1.12
rryan Jun 8, 2015
57f8da2
Add missing "/" between settingsPath and SETTINGS_FILE
sblaisot Jun 8, 2015
06f3aea
Add missing "/" between settingsPath and SOUNDMANAGERCONFIG_FILENAME
sblaisot Jun 8, 2015
cc0ceba
Revert changes for Linux and MACOS as it appears that QDesktopService…
sblaisot Jun 9, 2015
c3c970d
update SettingsPath to have mixxx.log and soundconfig in the same loc…
sblaisot Jun 9, 2015
991aaa8
revert "update SettingsPath to have mixxx.log and soundconfig in the …
sblaisot Jun 9, 2015
8e0c6dc
correct wrong include removal
sblaisot Jun 9, 2015
9c3e304
correct missing / between settingsPath and SETTINGS_FILE
sblaisot Jun 9, 2015
4fe823e
trying to make dual lower_half layout work... not working
ywwg Jun 9, 2015
40e53ed
LateNight: revert attempts at using more space when library is off. …
ywwg Jun 9, 2015
cfa0013
Merge pull request #608 from ywwg/aux-mixer
ywwg Jun 9, 2015
efc31d1
switch MacOSX preference folder to QDesktopServices::storageLocation(…
sblaisot Jun 9, 2015
6213ec4
Update cmdlineArgs settingsPath to have log & soundconfig in same dir…
sblaisot Jun 9, 2015
fccea5a
Some code clean up in analyserwaveform
daschuer Jun 9, 2015
92d1035
settle filters for silence in preroll to avoids ramping (Bug #1406389)
daschuer Jun 9, 2015
ccbd857
Honor --settingsPath command line argument by disabling preference fo…
sblaisot Jun 9, 2015
ec2b68d
Correct stupid mistake
sblaisot Jun 10, 2015
dc293c6
Introduce a new function asumeSettled()
daschuer Jun 10, 2015
03a1393
Add me to contributor list.
sblaisot Jun 11, 2015
3bcd383
fix typo
daschuer Jun 11, 2015
aed6383
bump waveform and overview version to 5.0
daschuer Jun 11, 2015
c626ea2
Wrap some translatable strings in effects tooltip in tr(), and make t…
esbrandt Jun 13, 2015
e0accd1
Fix aux.xml filename forbidden under Windows
sblaisot Jun 13, 2015
bf2ec11
Merge pull request #620 from sblaisot/aux-filename-branch
rryan Jun 13, 2015
de870b2
Merge pull request #619 from esbrandt/tooltips
rryan Jun 13, 2015
6f71b1c
Merge pull request #615 from daschuer/waveform_ramp
rryan Jun 13, 2015
4d0b2ea
Merge pull request #606 from sblaisot/windows-settings-path
rryan Jun 13, 2015
a164286
Fix tr invocation.
rryan Jun 13, 2015
4ea0cc6
Fix Mixxx 1.12 running on top of a pre 1.9 install on Mac OS
daschuer Jun 13, 2015
809b933
Remove double "/" in SoundManagerConfig::SoundManagerConfig()
daschuer Jun 13, 2015
c39e8f8
Use hard coded mixxx.cfg to build legacy path on windows
daschuer Jun 13, 2015
c9d7f80
Update translation template. Found 1937 source text(s) (6 new and 193…
esbrandt Jun 14, 2015
dd0fec9
Merge branch '1.12' of https://github.com/mixxxdj/mixxx.git into Merg…
uklotzde Jun 16, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions build/depends.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,16 @@ def enabled_modules(build):
qt_modules.extend(['QtWidgets', 'QtConcurrent'])
return qt_modules

@staticmethod
def enabled_imageformats(build):
qt5 = Qt.qt5_enabled(build)
qt_imageformats = [
'qgif', 'qico', 'qjpeg', 'qmng', 'qtga', 'qtiff', 'qsvg'
]
if qt5:
qt_imageformats.extend(['qdds', 'qicns', 'qjp2', 'qwbmp', 'qwebp'])
return qt_imageformats

def satisfy(self):
pass

Expand Down Expand Up @@ -1161,18 +1171,17 @@ def configure(self, build, conf):
build.env.Append(CPPPATH=['.'])

# Set up flags for config/track listing files
# SETTINGS_PATH not needed for windows and MacOSX because we now use QDesktopServices::storageLocation(QDesktopServices::DataLocation)
if build.platform_is_linux or \
build.platform_is_bsd:
mixxx_files = [
('SETTINGS_PATH', '.mixxx/'),
('SETTINGS_FILE', 'mixxx.cfg')]
elif build.platform_is_osx:
mixxx_files = [
('SETTINGS_PATH', 'Library/Application Support/Mixxx/'),
('SETTINGS_FILE', 'mixxx.cfg')]
elif build.platform_is_windows:
mixxx_files = [
('SETTINGS_PATH', 'Local Settings/Application Data/Mixxx/'),
('SETTINGS_FILE', 'mixxx.cfg')]

# Escape the filenames so they don't end up getting screwed up in the
Expand Down
143 changes: 123 additions & 20 deletions build/nsis/Mixxx.nsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,9 @@ Section "Mixxx (required)" SecMixxx
SetOutPath $INSTDIR\sqldrivers
File /nonfatal /r "${BASE_BUILD_DIR}\dist${BITWIDTH}\sqldrivers\*"

SetOutPath $INSTDIR\imageformats
File /nonfatal /r "${BASE_BUILD_DIR}\dist${BITWIDTH}\imageformats\*"

SetOutPath $INSTDIR\fonts
File /nonfatal /r "${BASE_BUILD_DIR}\dist${BITWIDTH}\fonts\*"

Expand Down Expand Up @@ -315,6 +318,8 @@ Section "Uninstall"
Delete $INSTDIR\COPYING
Delete $INSTDIR\sqldrivers\*.dll
RMDir "$INSTDIR\sqldrivers"
Delete $INSTDIR\imageformats\*.dll
RMDir "$INSTDIR\imageformats"
Delete $INSTDIR\fonts\*
RMDir "$INSTDIR\fonts"
Delete $INSTDIR\plugins\soundsource\*
Expand All @@ -336,84 +341,182 @@ Section "Uninstall"
; TODO: Only delete files that were not changed since install
; Get this list with dir /b /s <build_dir>\res\controllers >> filestodelete.txt and creative search & replace
Delete "$INSTDIR\controllers\Akai MPD24.midi.xml"
Delete "$INSTDIR\controllers\Akai-LPD8-RK-scripts.js"
Delete "$INSTDIR\controllers\Akai-LPD8-RK.midi.xml"
Delete "$INSTDIR\controllers\American Audio RADIUS 2000 CH1.midi.xml"
Delete "$INSTDIR\controllers\American Audio RADIUS 2000 CH2.midi.xml"
Delete "$INSTDIR\controllers\American-Audio-RADIUS-2000-scripts.js"
Delete "$INSTDIR\controllers\American Audio VMS2 Alternative.midi.xml"
Delete "$INSTDIR\controllers\American Audio VMS2.midi.xml"
Delete "$INSTDIR\controllers\American Audio VMS4.midi.xml"
Delete "$INSTDIR\controllers\American-Audio-RADIUS-2000-scripts.js"
Delete "$INSTDIR\controllers\American-Audio-VMS2-scripts.js"
Delete "$INSTDIR\controllers\American-Audio-VMS4-scripts.js"
Delete "$INSTDIR\controllers\Behringer BCD2000.midi.xml"
Delete "$INSTDIR\controllers\Behringer BCD3000 Advanced.midi.xml"
Delete "$INSTDIR\controllers\Behringer BCD3000.midi.xml"
Delete "$INSTDIR\controllers\Behringer-BCD2000-scripts.js"
Delete "$INSTDIR\controllers\Behringer-BCD3000-Advanced-scripts.js"
Delete "$INSTDIR\controllers\Behringer-BCD3000-scripts.js"
Delete "$INSTDIR\controllers\convertToXMLSchemaV1.php"
Delete "$INSTDIR\controllers\common-bulk-midi.js"
Delete "$INSTDIR\controllers\common-controller-scripts.js"
Delete "$INSTDIR\controllers\common-hid-devices.js"
Delete "$INSTDIR\controllers\common-hid-packet-parser.js"
Delete "$INSTDIR\controllers\Denon DN SC2000.midi.xml"
Delete "$INSTDIR\controllers\Denon MC3000.midi.xml"
Delete "$INSTDIR\controllers\Denon-DN-HS5500-scripts.js"
Delete "$INSTDIR\controllers\Denon-DN-SC2000.midi.js"
Delete "$INSTDIR\controllers\Denon-MC3000-scripts.js"
Delete "$INSTDIR\controllers\Denon-MC6000MK2-scripts.js"
Delete "$INSTDIR\controllers\Denon-MC6000MK2.midi.xml"
Delete "$INSTDIR\controllers\DJ-Tech CDJ-101.midi.xml"
Delete "$INSTDIR\controllers\DJ-Tech DJM-101.midi.xml"
Delete "$INSTDIR\controllers\DJ-Tech i-Mix Reload.midi.xml"
Delete "$INSTDIR\controllers\DJ-Tech Kontrol One.midi.xml"
Delete "$INSTDIR\controllers\DJ-Tech Mix-101.midi.xml"
Delete "$INSTDIR\controllers\DJ-Tech Mixer One.midi.xml"
Delete "$INSTDIR\controllers\DJ-Tech-CDJ-101-scripts.js"
Delete "$INSTDIR\controllers\DJ-Tech-DJM-101-scripts.js"
Delete "$INSTDIR\controllers\DJ-Tech-i-Mix-Reload-scripts.js"
Delete "$INSTDIR\controllers\DJ-Tech-Kontrol-One-scripts.js"
Delete "$INSTDIR\controllers\DJ-Tech-Mixer-One-scripts.js"
Delete "$INSTDIR\controllers\DJTechTools MIDI Fighter.midi.xml"
Delete "$INSTDIR\controllers\DJTechTools-MIDIFighter-scripts.js"
Delete "$INSTDIR\controllers\DN-HS5500_MIDI_1.midi.xml"
Delete "$INSTDIR\controllers\EKS Otus.hid.xml"
Delete "$INSTDIR\controllers\EKS-Otus.js"
Delete "$INSTDIR\controllers\Evolution_Xsession.midi.xml"
Delete "$INSTDIR\controllers\FaderFoxDJ2.midi.xml"
Delete "$INSTDIR\controllers\Gemini FirstMix.midi.xml"
Delete "$INSTDIR\controllers\Gemini-FirstMix-scripts.js"
Delete "$INSTDIR\controllers\Hercules DJ Console 4-Mx.midi.xml"
Delete "$INSTDIR\controllers\Hercules DJ Console Mac Edition.midi.xml"
Delete "$INSTDIR\controllers\Hercules DJ Console Mk1.hid.xml"
Delete "$INSTDIR\controllers\Hercules DJ Console Mk2.hid.xml"
Delete "$INSTDIR\controllers\Hercules DJ Console Mk2.midi.xml"
Delete "$INSTDIR\controllers\Hercules-DJ-Console-Mk2-scripts.js"
Delete "$INSTDIR\controllers\Hercules DJ Console Mk4.midi.xml"
Delete "$INSTDIR\controllers\Hercules-DJ-Console-Mk4-scripts.js"
Delete "$INSTDIR\controllers\Hercules DJ Console RMX 2.midi.xml"
Delete "$INSTDIR\controllers\Hercules DJ Console RMX Advanced.midi.xml"
Delete "$INSTDIR\controllers\Hercules DJ Console RMX.hid.xml"
Delete "$INSTDIR\controllers\Hercules DJ Console RMX.midi.xml"
Delete "$INSTDIR\controllers\Hercules-DJ-Console-RMX-scripts.js"
Delete "$INSTDIR\controllers\Hercules DJ Control MP3 e2.midi.xml"
Delete "$INSTDIR\controllers\Hercules DJ Control AIR.midi.xml"
Delete "$INSTDIR\controllers\Hercules DJ Control Instinct.midi.xml"
Delete "$INSTDIR\controllers\Hercules DJ Control MP3 e2-scripts.js"
Delete "$INSTDIR\controllers\Hercules DJ Control MP3 e2.bulk.xml"
Delete "$INSTDIR\controllers\Hercules DJ Control MP3 e2.midi.xml"
Delete "$INSTDIR\controllers\Hercules DJ Control MP3.hid.xml"
Delete "$INSTDIR\controllers\Hercules DJ Control MP3.midi.xml"
Delete "$INSTDIR\controllers\Hercules-DJ-Control-MP3-scripts.js"
Delete "$INSTDIR\controllers\Hercules DJ Control Steel.midi.xml"
Delete "$INSTDIR\controllers\Hercules-DJ-Console-Mk1-hid-scripts.js"
Delete "$INSTDIR\controllers\Hercules-DJ-Console-Mk2-hid-scripts.js"
Delete "$INSTDIR\controllers\Hercules-DJ-Console-Mk2-scripts.js"
Delete "$INSTDIR\controllers\Hercules-DJ-Console-Mk4-scripts.js"
Delete "$INSTDIR\controllers\Hercules-DJ-Console-RMX-2-scripts.js"
Delete "$INSTDIR\controllers\Hercules-DJ-Console-RMX-hid-scripts.js"
Delete "$INSTDIR\controllers\Hercules-DJ-Console-RMX-scripts.js"
Delete "$INSTDIR\controllers\Hercules-DJ-Control-AIR-scripts.js"
Delete "$INSTDIR\controllers\Hercules-DJ-Control-Instinct-scripts.js"
Delete "$INSTDIR\controllers\Hercules-DJ-Control-MP3-hid-scripts.js"
Delete "$INSTDIR\controllers\Hercules-DJ-Control-MP3-scripts.js"
Delete "$INSTDIR\controllers\Hercules-DJ-Control-Steel-scripts.js"
Delete "$INSTDIR\controllers\Hercules-mp3e2-compat.js"
Delete "$INSTDIR\controllers\HID-Keyboard.js"
Delete "$INSTDIR\controllers\HID-Trackpad.js"
Delete "$INSTDIR\controllers\Ion Discover DJ.midi.xml"
Delete "$INSTDIR\controllers\Ion-Discover-DJ-scripts.js"
Delete "$INSTDIR\controllers\M-Audio_Xponent.midi.xml"
Delete "$INSTDIR\controllers\KANE_QuNeo.midi.xml"
Delete "$INSTDIR\controllers\KANE_QuNeo_scripts.js"
Delete "$INSTDIR\controllers\Kontrol Dj KDJ500.midi.xml"
Delete "$INSTDIR\controllers\Kontrol-Dj-KDJ500-scripts.js"
Delete "$INSTDIR\controllers\Korg nanoKONTROL 2.midi.xml"
Delete "$INSTDIR\controllers\Korg nanoKONTROL.midi.xml"
Delete "$INSTDIR\controllers\Korg nanoPAD2.midi.xml"
Delete "$INSTDIR\controllers\Korg-nanoKONTROL-2-scripts.js"
Delete "$INSTDIR\controllers\Korg-nanoPAD2-scripts.js"
Delete "$INSTDIR\controllers\M-Audio-Xponent-scripts.js"
Delete "$INSTDIR\controllers\M-Audio_Xponent.midi.xml"
Delete "$INSTDIR\controllers\M-Audio_Xsession_pro.midi.xml"
Delete "$INSTDIR\controllers\Midi-Keyboard.midi.xml"
Delete "$INSTDIR\controllers\common-controller-scripts.js"
Delete "$INSTDIR\controllers\MidiTech-MidiControl.midi.xml"
Delete "$INSTDIR\controllers\Mixman DM2 (Linux).js"
Delete "$INSTDIR\controllers\Mixman DM2 (Linux).midi.xml"
Delete "$INSTDIR\controllers\Mixman DM2 (OS X).js"
Delete "$INSTDIR\controllers\Mixman DM2 (OS X).midi.xml"
Delete "$INSTDIR\controllers\Mixman DM2 (Windows).midi.xml"
Delete "$INSTDIR\controllers\MixVibes U-Mix Control 2.midi.xml"
Delete "$INSTDIR\controllers\MixVibes U-Mix Control Pro 2.midi.xml"
Delete "$INSTDIR\controllers\MixVibes-U-Mix-Control-Pro-2-scripts.js"
Delete "$INSTDIR\controllers\Nintendo Wiimote.hid.xml"
Delete "$INSTDIR\controllers\Nintendo-Wiimote.js"
Delete "$INSTDIR\controllers\Novation Dicer.midi.xml"
Delete "$INSTDIR\controllers\Novation Launchpad.midi.xml"
Delete "$INSTDIR\controllers\Novation-Dicer-scripts.js"
Delete "$INSTDIR\controllers\Novation-Launchpad-Mini-scripts.js"
Delete "$INSTDIR\controllers\Novation-Launchpad-Mini.midi.xml"
Delete "$INSTDIR\controllers\Novation-Launchpad-scripts.js"
Delete "$INSTDIR\controllers\Numark DJ2Go.midi.xml"
Delete "$INSTDIR\controllers\Numark Mixtrack Pro.midi.xml"
Delete "$INSTDIR\controllers\Numark MIXTRACK.midi.xml"
Delete "$INSTDIR\controllers\Numark-MixTrack-scripts.js"
Delete "$INSTDIR\controllers\Numark N4.midi.xml"
Delete "$INSTDIR\controllers\Numark NS7.midi.xml"
Delete "$INSTDIR\controllers\Numark-NS7-scripts.js"
Delete "$INSTDIR\controllers\Numark Omni Control.midi.xml"
Delete "$INSTDIR\controllers\Numark Total Control.midi.xml"
Delete "$INSTDIR\controllers\Numark V7.midi.xml"
Delete "$INSTDIR\controllers\Numark-DJ2Go-scripts.js"
Delete "$INSTDIR\controllers\Numark-Mixtrack-Pro-scripts.js"
Delete "$INSTDIR\controllers\Numark-MixTrack-scripts.js"
Delete "$INSTDIR\controllers\Numark-N4-scripts.js"
Delete "$INSTDIR\controllers\Numark-NS7-scripts.js"
Delete "$INSTDIR\controllers\Numark-Omni-Control-scripts.js"
Delete "$INSTDIR\controllers\Numark-Total-Control-scripts.js"
Delete "$INSTDIR\controllers\Numark-V7-scripts.js"
Delete "$INSTDIR\controllers\Pioneer CDJ HID.hid.xml"
Delete "$INSTDIR\controllers\Pioneer CDJ-2000.midi.xml"
Delete "$INSTDIR\controllers\Pioneer-CDJ-2000-scripts.js"
Delete "$INSTDIR\controllers\Pioneer CDJ-350 Ch1.midi.xml"
Delete "$INSTDIR\controllers\Pioneer CDJ-350 Ch2.midi.xml"
Delete "$INSTDIR\controllers\Pioneer-CDJ-350-scripts.js"
Delete "$INSTDIR\controllers\Pioneer CDJ-850.midi.xml"
Delete "$INSTDIR\controllers\Pioneer-CDJ-2000-scripts.js"
Delete "$INSTDIR\controllers\Pioneer-CDJ-350-scripts.js"
Delete "$INSTDIR\controllers\Pioneer-CDJ-850-scripts.js"
Delete "$INSTDIR\controllers\README.txt"
Delete "$INSTDIR\controllers\Pioneer-CDJ-HID.js"
Delete "$INSTDIR\controllers\Reloop Digital Jockey 2 Controller Edition.midi.xml"
Delete "$INSTDIR\controllers\Reloop Terminal Mix 2-4.js"
Delete "$INSTDIR\controllers\Reloop Terminal Mix 2-4.midi.xml"
Delete "$INSTDIR\controllers\Reloop-Digital-Jockey2-Controller-scripts.js"
Delete "$INSTDIR\controllers\Sony SixxAxis.hid.xml"
Delete "$INSTDIR\controllers\Sony-SixxAxis.js"
Delete "$INSTDIR\controllers\Stanton SCS.1d.midi.xml"
Delete "$INSTDIR\controllers\Stanton-SCS1d-scripts.js"
Delete "$INSTDIR\controllers\Stanton SCS.1m.midi.xml"
Delete "$INSTDIR\controllers\Stanton-SCS1m-scripts.js"
Delete "$INSTDIR\controllers\Stanton SCS.3d.midi.xml"
Delete "$INSTDIR\controllers\Stanton-SCS3d-scripts.js"
Delete "$INSTDIR\controllers\Stanton SCS.3m.midi.xml"
Delete "$INSTDIR\controllers\Stanton-SCS1d-scripts.js"
Delete "$INSTDIR\controllers\Stanton-SCS1m-scripts.js"
Delete "$INSTDIR\controllers\Stanton-SCS3d-scripts.js"
Delete "$INSTDIR\controllers\Stanton-SCS3m-scripts.js"
Delete "$INSTDIR\controllers\TrakProDJ iPad.midi.xml"
Delete "$INSTDIR\controllers\TrakProDJ-iPad-scripts.js"
Delete "$INSTDIR\controllers\Traktor Kontrol F1.hid.xml"
Delete "$INSTDIR\controllers\Traktor Kontrol X1.midi.xml"
Delete "$INSTDIR\controllers\Traktor-Kontrol-F1-scripts.js"
Delete "$INSTDIR\controllers\Traktor-Kontrol-X1.js"
Delete "$INSTDIR\controllers\us428.midi.xml"
Delete "$INSTDIR\controllers\Vestax Spin.midi.xml"
Delete "$INSTDIR\controllers\Vestax-Spin-scripts.js"
Delete "$INSTDIR\controllers\Vestax Typhoon.midi.xml"
Delete "$INSTDIR\controllers\Vestax-Typhoon-scripts.js"
Delete "$INSTDIR\controllers\Vestax VCI-100-3DEX.midi.xml"
Delete "$INSTDIR\controllers\Vestax VCI-100-hile.midi.xml"
Delete "$INSTDIR\controllers\Vestax VCI-100.midi.xml"
Delete "$INSTDIR\controllers\Vestax-VCI-100-scripts.js"
Delete "$INSTDIR\controllers\Vestax VCI-300.midi.xml"
Delete "$INSTDIR\controllers\Vestax VCI-400.midi.xml"
Delete "$INSTDIR\controllers\Vestax-Spin-scripts.js"
Delete "$INSTDIR\controllers\Vestax-Typhoon-scripts.js"
Delete "$INSTDIR\controllers\Vestax-VCI-100-3DEX-scripts.js"
Delete "$INSTDIR\controllers\Vestax-VCI-100-hile.js"
Delete "$INSTDIR\controllers\Vestax-VCI-100-scripts.js"
Delete "$INSTDIR\controllers\Vestax-VCI-300-scripts.js"
Delete "$INSTDIR\controllers\Vestax-VCI-400-scripts.js"
Delete "$INSTDIR\controllers\Wireless DJ App.midi.xml"
Delete "$INSTDIR\controllers\Wireless-DJ-scripts.js"
Delete "$INSTDIR\controllers\Xone K2.midi.xml"
Delete "$INSTDIR\controllers\Xone-K2-scripts.js"
;Delete $INSTDIR\controllers\*.* ; Avoid this since it will delete customized files too
RMDir "$INSTDIR\controllers"

Expand Down
Loading