Merge lp:~ulatekh/mixxx/mingw into lp:~mixxxdevelopers/mixxx/trunk

[Steven Boswell]

These changes, plus the contents of https://github.com/ulatekh/fedora-mingw-ardour , allow one to build the MS Windows version of Mixxx, using scons, from Fedora Core. That includes making an installer! Finally, the lament on http://mixxx.org/wiki/doku.php/build_windows_installer , i.e. "Now, doesn't this make you long for a MinGW build?", has been answered!

[lp:~ulatekh/mixxx/mingw]

3383. By Steven Boswell on 2013-06-03

Now the MinGW build supports vamp, vinylcontrol, and hid, i.e. mingw{32,64}-phonon.

3384. By Steven Boswell on 2013-06-04

Now the MinGW build supports shoutcast.

3385. By Steven Boswell on 2013-06-13

Now copies the libid3tag DLL.

Unmerged revisions

3385. By Steven Boswell on 2013-06-13

Now copies the libid3tag DLL.

3384. By Steven Boswell on 2013-06-04

Now the MinGW build supports shoutcast.

3383. By Steven Boswell on 2013-06-03

Now the MinGW build supports vamp, vinylcontrol, and hid, i.e. mingw{32,64}-phonon.

3382. By Steven Boswell on 2013-06-03

Compared this branch to trunk, cleaned up some oversights.
Also made sure this branch still compiles and runs on Linux.

3381. By Steven Boswell on 2013-06-02

Updated the MinGW build for new dependencies libchromaprint and fftw.
Fixed non-VAMP compilation in WSpinny.

3380. By Steven Boswell on 2013-06-01

Merged with lp:mixxx

3379. By Steven Boswell on 2013-06-01

Fixed the MinGW 64-bit build and the MinGW NSIS installer generation!

3378. By Steven Boswell on 2013-05-22

The scons-driven MinGW build of Mixxx now links, runs, and creates a proper dist32 directory!

My command line thus far:
scons ladspa=0 shoutcast=0 hifieq=1 script=0 optimize=0 ffmpeg=0 target=windows crosscompile_root=/usr/i686-w64-mingw32/sys-root/mingw hss1394=0 vamp=0 vinylcontrol=0 hid=0 sqlitedll=1

This is working under Fedora Core 18.

I've made a repository for all the files needed to build Mixxx's dependencies under Fedora Core with MinGW:
https://github.com/ulatekh/fedora-mingw-ardour.git

3377. By Steven Boswell on 2013-05-18

Now a MinGW build can be made under Linux, with SCons!

3376. By Steven Boswell on 2013-05-17

Fixed the display of tracks in the track view!
Now the MinGW build of Mixxx appears to be functional! Further testing will have to reveal problems, because it looks fine!

Also removed references to Qt libraries that aren't used any more (Qt3Support, QtSvg, and QtXmlPatterns).

=== modified file 'mixxx/build/crossmingw.py'
--- mixxx/build/crossmingw.py	2010-10-05 02:00:00 +0000
+++ mixxx/build/crossmingw.py	2013-06-13 22:06:31 +0000
@@ -17,6 +17,8 @@
 """)
 
 def find(env):
+  if 'CROSSMINGW_PREFIX' in env:
+      prefixes.insert(0, env['CROSSMINGW_PREFIX'])
   for prefix in prefixes:
     # First search in the SCons path and then the OS path:
     if env.WhereIs(prefix + 'gcc') or SCons.Util.WhereIs(prefix + 'gcc'):
 
=== modified file 'mixxx/build/depends.py'
--- mixxx/build/depends.py	2013-05-22 07:25:25 +0000
+++ mixxx/build/depends.py	2013-06-13 22:06:31 +0000
@@ -11,6 +11,8 @@
         libs = ['portaudio']
         if build.msvcdebug:
             libs = ['portaudiod','portaudio-debug']
+        if build.crosscompile and build.platform_is_windows and build.toolchain_is_gnu:
+            libs = ['portaudio', 'portaudio.dll', 'portaudio-2']
         if not conf.CheckLib(libs):
             raise Exception('Did not find libportaudio.a, portaudio.lib, or the PortAudio-v19 development header files.')
 
@@ -187,8 +189,8 @@
         # times.
 
         qt_modules = [
-            'QtCore', 'QtGui', 'QtOpenGL', 'QtXml', 'QtSvg',
-            'QtSql', 'QtScript', 'QtXmlPatterns', 'QtNetwork'
+            'QtCore', 'QtGui', 'QtOpenGL', 'QtXml', 'QtSql', 'QtScript',
+            'QtNetwork'
             #'QtUiTools', #'QtDesigner',
         ]
 
@@ -238,7 +240,6 @@
                        'QtOpenGL4',
                        'QtXml4',
                        'QtNetwork4',
-                       'QtXmlPatterns4',
                        'QtSql4',
                        'QtScript4',]
             if use_qtwebkit:
@@ -378,10 +379,13 @@
         env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH])
 
         # Check if the compiler has SSE extention enabled
-        # Allways the case on x64 (core instructions)
+        # Always the case on x64 (core instructions)
         optimize = int(util.get_flags(env, 'optimize', 1))
         if self.sse_enabled(build):
             env.Append(CPPDEFINES='SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS')
+            build.env.Append(CCFLAGS = '-mmmx -msse')
+            env.Append(CPPDEFINES='__MMX__')
+            env.Append(CPPDEFINES='__SSE__')
 
 class TagLib(Dependence):
     def configure(self, build, conf):
@@ -830,6 +834,9 @@
             build.env.Append(CPPPATH=mixxx_lib_path)
             build.env.Append(LIBPATH=mixxx_lib_path)
 
+            # Find executables (e.g. protoc) in the winlib path
+            build.env.AppendENVPath('PATH', mixxx_lib_path)
+
             #Ugh, MSVC-only hack :( see
             #http://www.qtforum.org/article/17883/problem-using-qstring-fromstdwstring.html
             build.env.Append(CXXFLAGS = '/Zc:wchar_t-')
@@ -949,5 +956,12 @@
                 build.env.Append(LINKFLAGS = '/manifest') #Force MSVS to generate a manifest (MSVC2010)
             elif build.toolchain_is_gnu:
                 # Makes the program not launch a shell first
-                build.env.Append(LINKFLAGS = '--subsystem,windows')
-                build.env.Append(LINKFLAGS = '-mwindows')
+                build.env.Append(LINKFLAGS = '-Wl,-subsystem,windows')
+                build.env.Append(CCFLAGS = '-mwindows')
+                # Enable the use of threads
+                build.env.Append(CCFLAGS = '-mthreads')
+                # Linking won't succeed without this
+                build.env.Append(CCFLAGS = '-fno-keep-inline-dllexport')
+                # Link in libz at the end, so dependent libraries find it
+                build.env.Append(LIBS = 'z');
+
 
=== modified file 'mixxx/build/features.py'
--- mixxx/build/features.py	2013-05-19 09:50:56 +0000
+++ mixxx/build/features.py	2013-06-13 22:06:31 +0000
@@ -446,6 +446,8 @@
         if not self.enabled(build):
             return
 
+        build.env.Append(CPPDEFINES = '__VAMP__')
+
         # If there is no system vamp-hostdk installed, then we'll directly link
         # the vamp-hostsdk.
         if not conf.CheckLib(['vamp-hostsdk']):
 
=== modified file 'mixxx/build/mixxx.py'
--- mixxx/build/mixxx.py	2013-06-13 02:52:49 +0000
+++ mixxx/build/mixxx.py	2013-06-13 22:06:31 +0000
@@ -128,6 +128,15 @@
         default_qtdir = depends.Qt.DEFAULT_QTDIRS.get(self.platform, '')
         qtdir = Script.ARGUMENTS.get('qtdir',
                                     os.environ.get('QTDIR', default_qtdir))
+        if self.crosscompile:
+            crosscompile_root = Script.ARGUMENTS.get('crosscompile_root', '')
+
+            if crosscompile_root == '':
+                print "Your build setup indicates this is a cross-compile, but you did not specify 'crosscompile_root', which is required."
+                Script.Exit(1)
+
+            self.crosscompile_root = os.path.abspath(crosscompile_root)
+            qtdir = self.crosscompile_root
 
         # Validate the specified qtdir exists
         if not os.path.exists(qtdir):
@@ -156,6 +165,15 @@
         if self.crosscompile:
             if self.platform_is_windows:
                 tools.append('crossmingw')
+
+                # Find the toolchain when building under Fedora.
+                if self.toolchain_is_gnu:
+                    if self.machine_is_64bit:
+                        extra_arguments['CROSSMINGW_PREFIX'] \
+                            = 'x86_64-w64-mingw32-'
+                    else:
+                        extra_arguments['CROSSMINGW_PREFIX'] \
+                            = 'i686-w64-mingw32-'
             if self.platform == 'osx':
                 tools.append('crossosx')
 
@@ -183,16 +201,9 @@
                     self.env.Append(LINKFLAGS = '-arch x86_64')
 
         if self.crosscompile:
-            crosscompile_root = Script.ARGUMENTS.get('crosscompile_root', '')
-
-            if crosscompile_root == '':
-                print "Your build setup indicates this is a cross-compile, but you did not specify 'crosscompile_root', which is required."
-                Script.Exit(1)
-
-            crosscompile_root = os.path.abspath(crosscompile_root)
-            self.env.Append(CPPPATH=os.path.join(crosscompile_root, 'include'))
-            self.env.Append(LIBPATH=os.path.join(crosscompile_root, 'lib'))
-            self.env.Append(LIBPATH=os.path.join(crosscompile_root, 'bin'))
+            self.env.Append(CPPPATH=os.path.join(self.crosscompile_root, 'include'))
+            self.env.Append(LIBPATH=os.path.join(self.crosscompile_root, 'lib'))
+            self.env.Append(LIBPATH=os.path.join(self.crosscompile_root, 'bin'))
 
         self.install_options()
         self.virtualize_build_dir()
 
=== modified file 'mixxx/build/nsis/Mixxx.nsi'
--- mixxx/build/nsis/Mixxx.nsi	2013-06-13 03:13:53 +0000
+++ mixxx/build/nsis/Mixxx.nsi	2013-06-13 22:06:31 +0000
@@ -109,6 +109,8 @@
 
 FunctionEnd
 
+!ifdef WINLIB_PATH
+
 ;-------------------------------
 ; Install the VC 2010 redistributable DLLs if they're not already.
 Function InstallVCRedist
@@ -187,6 +189,8 @@
 
 FunctionEnd
 
+!endif ; WINLIB_PATH
+
 ;--------------------------------
 ; The stuff to install
 
@@ -194,7 +198,9 @@
 
   SectionIn RO
 
+!ifdef WINLIB_PATH
   Call InstallVCRedist
+!endif ; WINLIB_PATH
 
   ; Set output path to the installation directory.
   SetOutPath $INSTDIR
 
=== modified file 'mixxx/build/qtcreator/mixxx.pro'
--- mixxx/build/qtcreator/mixxx.pro	2013-06-13 03:13:53 +0000
+++ mixxx/build/qtcreator/mixxx.pro	2013-06-13 22:06:31 +0000
@@ -1,5 +1,5 @@
-CONFIG += debug link_pkgconfig portmidi script vinylcontrol m4a
-# ladspa
+CONFIG += debug link_pkgconfig portmidi script vinylcontrol mad
+#CONFIG += m4a hss1394 ladspa
 DEFINES += QMAKE \ # define QMAKE for not-SCons specific ifdefs like ui_scriptstudio.h
     __PORTAUDIO__ \
     __SNDFILE__ \
@@ -61,7 +61,7 @@
 OBJECTS_DIR = $$BUILDDIR/obj
 
 win32-g++ { # Bit ugly, but you can thank MS-DOS shell for f-ing up the normal way of parsing.
-    QMAKE_CXXFLAGS += "\"-DSETTINGS_PATH=\\\"Local\\ Settings/Application\\ Data/Mixxx/\\\"\""
+    QMAKE_CXXFLAGS += "\"-DSETTINGS_PATH=\\\"Local Settings/Application Data/Mixxx/\\\"\""
     DEFINES += __WINDOWS__
 } else {
   win32 { # i586-mingw32msvc-g++ -- cross compiling
@@ -76,14 +76,11 @@
 TARGET = mixxx
 QT += core \
     gui \
-    sql \
-    xmlpatterns \
-    xml \
     network \
-    svg \
     opengl \
     script \
-    qt3support
+    sql \
+    xml
 
 CONFIG(debug) { # gdbmacros is required for inspecting Qt datatypes using gdb within QtC
     exists($$(QTDIR)/../share/qtcreator/gdbmacros/gdbmacros.cpp) {
@@ -97,9 +94,15 @@
     }
 }
 
-HEADERS += $$UI_DIR/ui_dlgaboutdlg.h \
-    $$UI_DIR/ui_dlgmidilearning.h \
+HEADERS += $$UI_DIR/ui_dlgpreferencesdlg.h \
+    $$UI_DIR/ui_dlgprefsounddlg.h \
+    $$UI_DIR/controllers/ui_dlgprefcontrollerdlg.h \
+    $$UI_DIR/controllers/ui_dlgprefmappablecontrollerdlg.h \
+    $$UI_DIR/controllers/ui_dlgcontrollerlearning.h \
+    $$UI_DIR/controllers/ui_dlgprefnocontrollersdlg.h \
+    $$UI_DIR/ui_dlgprefplaylistdlg.h \
     $$UI_DIR/ui_dlgprefcontrolsdlg.h \
+    $$UI_DIR/ui_dlgprefeqdlg.h \
     $$UI_DIR/ui_dlgprefcrossfaderdlg.h \
     $$UI_DIR/ui_dlgprefeqdlg.h \
     $$UI_DIR/ui_dlgpreferencesdlg.h \
@@ -110,7 +113,15 @@
     $$UI_DIR/ui_dlgprefsounddlg.h \
     $$UI_DIR/ui_dlgprefvinyldlg.h \
     $$UI_DIR/ui_dlgprefnovinyldlg.h \
-    $$UI_DIR/ui_dlgprefnomididlg.h
+    $$UI_DIR/ui_dlgprefrecorddlg.h \
+    $$UI_DIR/ui_dlgaboutdlg.h \
+    $$UI_DIR/ui_dlgtrackinfo.h \
+    $$UI_DIR/ui_dlgprepare.h \
+    $$UI_DIR/ui_dlgautodj.h \
+    $$UI_DIR/ui_dlgprefsounditem.h \
+    $$UI_DIR/ui_dlgrecording.h \
+    $$UI_DIR/ui_dlghidden.h \
+    $$UI_DIR/ui_dlgmissing.h
 
 INCLUDEPATH += src \
     lib/replaygain \
@@ -131,18 +142,47 @@
 
 HEADERS += \
 $$BASE_DIR/src/analyser.h \
+$$BASE_DIR/src/analyserbeats.h \
 $$BASE_DIR/src/analyserqueue.h \
+$$BASE_DIR/src/analyserrg.h \
 $$BASE_DIR/src/analyserwaveform.h \
-$$BASE_DIR/src/analyserwavesummary.h \
-$$BASE_DIR/src/bpm/bpmreceiver.h \
+$$BASE_DIR/src/audiotagger.h \
+$$BASE_DIR/src/baseplayer.h \
+$$BASE_DIR/src/basetrackplayer.h \
 $$BASE_DIR/src/bpm/bpmscheme.h \
 $$BASE_DIR/src/bpm/wavesegmentation.h \
 $$BASE_DIR/src/build.h \
 $$BASE_DIR/src/cachingreader.h \
+$$BASE_DIR/src/circularbuffer.h \
 $$BASE_DIR/src/configobject.h \
 $$BASE_DIR/src/controlbeat.h \
 $$BASE_DIR/src/controlevent.h \
-$$BASE_DIR/src/controlgroupdelegate.h \
+$$BASE_DIR/src/controllers/controller.h \
+$$BASE_DIR/src/controllers/controllerengine.h \
+$$BASE_DIR/src/controllers/controllerenumerator.h \
+$$BASE_DIR/src/controllers/controllerlearningeventfilter.h \
+$$BASE_DIR/src/controllers/controllermanager.h \
+$$BASE_DIR/src/controllers/controllerpreset.h \
+$$BASE_DIR/src/controllers/controllerpresetfilehandler.h \
+$$BASE_DIR/src/controllers/controllerpresetinfo.h \
+$$BASE_DIR/src/controllers/controllerpresetvisitor.h \
+$$BASE_DIR/src/controllers/defs_controllers.h \
+$$BASE_DIR/src/controllers/dlgcontrollerlearning.h \
+$$BASE_DIR/src/controllers/dlgprefcontroller.h \
+$$BASE_DIR/src/controllers/dlgprefmappablecontroller.h \
+$$BASE_DIR/src/controllers/dlgprefnocontrollers.h \
+$$BASE_DIR/src/controllers/midi/midicontroller.h \
+$$BASE_DIR/src/controllers/midi/midicontrollerpreset.h \
+$$BASE_DIR/src/controllers/midi/midicontrollerpresetfilehandler.h \
+$$BASE_DIR/src/controllers/midi/midienumerator.h \
+$$BASE_DIR/src/controllers/midi/midimessage.h \
+$$BASE_DIR/src/controllers/midi/midioutputhandler.h \
+$$BASE_DIR/src/controllers/mixxxcontrol.h \
+$$BASE_DIR/src/controllers/pitchfilter.h \
+$$BASE_DIR/src/controllers/qtscript-bytearray/bytearrayclass.h \
+$$BASE_DIR/src/controllers/qtscript-bytearray/bytearrayprototype.h \
+$$BASE_DIR/src/controllers/softtakeover.h \
+$$BASE_DIR/src/controllinpotmeter.h \
 $$BASE_DIR/src/controllogpotmeter.h \
 $$BASE_DIR/src/controlnull.h \
 $$BASE_DIR/src/controlobject.h \
@@ -152,199 +192,236 @@
 $$BASE_DIR/src/controlpotmeter.h \
 $$BASE_DIR/src/controlpushbutton.h \
 $$BASE_DIR/src/controlttrotary.h \
-$$BASE_DIR/src/controlvaluedelegate.h \
-$$BASE_DIR/src/defs_audiofiles.h \
+$$BASE_DIR/src/deck.h \
 $$BASE_DIR/src/defs.h \
 $$BASE_DIR/src/defs_promo.h \
 $$BASE_DIR/src/defs_urls.h \
 $$BASE_DIR/src/defs_version.h \
 $$BASE_DIR/src/dlgabout.h \
 $$BASE_DIR/src/dlgautodj.h \
-$$BASE_DIR/src/dlgladspa.h \
-$$BASE_DIR/src/dlgmidilearning.h \
+$$BASE_DIR/src/dlghidden.h \
+$$BASE_DIR/src/dlgmissing.h \
+$$BASE_DIR/src/dlgprefbeats.h \
 $$BASE_DIR/src/dlgprefcontrols.h \
 $$BASE_DIR/src/dlgprefcrossfader.h \
 $$BASE_DIR/src/dlgprefeq.h \
 $$BASE_DIR/src/dlgpreferences.h \
-$$BASE_DIR/src/dlgprefmidibindings.h \
-$$BASE_DIR/src/dlgprefnomidi.h \
 $$BASE_DIR/src/dlgprefplaylist.h \
 $$BASE_DIR/src/dlgprefrecord.h \
+$$BASE_DIR/src/dlgprefreplaygain.h \
 $$BASE_DIR/src/dlgprefsound.h \
-$$BASE_DIR/src/dlgprefvinyl.h \
+$$BASE_DIR/src/dlgprefsounditem.h \
 $$BASE_DIR/src/dlgprepare.h \
+$$BASE_DIR/src/dlgrecording.h \
 $$BASE_DIR/src/dlgtrackinfo.h \
-$$BASE_DIR/src/encoder.h \
 $$BASE_DIR/src/engine/bpmcontrol.h \
+$$BASE_DIR/src/engine/clockcontrol.h \
 $$BASE_DIR/src/engine/cuecontrol.h \
-$$BASE_DIR/src/engine/engineabstractrecord.h \
 $$BASE_DIR/src/engine/enginebuffer.h \
+$$BASE_DIR/src/engine/enginebufferscale.h \
 $$BASE_DIR/src/engine/enginebufferscaledummy.h \
-$$BASE_DIR/src/engine/enginebufferscale.h \
 $$BASE_DIR/src/engine/enginebufferscalelinear.h \
-$$BASE_DIR/src/engine/enginebufferscalereal.h \
 $$BASE_DIR/src/engine/enginebufferscalest.h \
 $$BASE_DIR/src/engine/enginechannel.h \
 $$BASE_DIR/src/engine/engineclipping.h \
 $$BASE_DIR/src/engine/enginecontrol.h \
+$$BASE_DIR/src/engine/enginedeck.h \
 $$BASE_DIR/src/engine/enginedelay.h \
+$$BASE_DIR/src/engine/enginefilter.h \
 $$BASE_DIR/src/engine/enginefilterblock.h \
 $$BASE_DIR/src/engine/enginefilterbutterworth8.h \
-$$BASE_DIR/src/engine/enginefilter.h \
 $$BASE_DIR/src/engine/enginefilteriir.h \
 $$BASE_DIR/src/engine/engineflanger.h \
-$$BASE_DIR/src/engine/engineladspa.h \
 $$BASE_DIR/src/engine/enginemaster.h \
+$$BASE_DIR/src/engine/enginemicrophone.h \
 $$BASE_DIR/src/engine/engineobject.h \
+$$BASE_DIR/src/engine/enginepassthrough.h \
 $$BASE_DIR/src/engine/enginepregain.h \
-$$BASE_DIR/src/engine/enginesidechain.h \
-$$BASE_DIR/src/engine/enginespectralfwd.h \
-$$BASE_DIR/src/engine/enginevinylcontrol.h \
+$$BASE_DIR/src/engine/sidechain/enginesidechain.h \
+$$BASE_DIR/src/engine/sidechain/enginerecord.h \
 $$BASE_DIR/src/engine/enginevinylsoundemu.h \
-$$BASE_DIR/src/engine/enginevolume.h \
 $$BASE_DIR/src/engine/enginevumeter.h \
+$$BASE_DIR/src/engine/engineworker.h \
+$$BASE_DIR/src/engine/engineworkerscheduler.h \
 $$BASE_DIR/src/engine/enginexfader.h \
 $$BASE_DIR/src/engine/loopingcontrol.h \
+$$BASE_DIR/src/engine/positionscratchcontroller.h \
+$$BASE_DIR/src/engine/quantizecontrol.h \
 $$BASE_DIR/src/engine/ratecontrol.h \
 $$BASE_DIR/src/engine/readaheadmanager.h \
-$$BASE_DIR/src/errordialog.h \
-$$BASE_DIR/src/imgcolor.h \
-$$BASE_DIR/src/imginvert.h \
-$$BASE_DIR/src/imgloader.h \
-$$BASE_DIR/src/imgsource.h \
-$$BASE_DIR/src/input.h \
-$$BASE_DIR/src/ladspa/ladspacontrol.h \
-$$BASE_DIR/src/ladspa/ladspainstance.h \
-$$BASE_DIR/src/ladspa/ladspainstancemono.h \
-$$BASE_DIR/src/ladspa/ladspainstancestereo.h \
-$$BASE_DIR/src/ladspa/ladspalibrary.h \
-$$BASE_DIR/src/ladspa/ladspaloader.h \
-$$BASE_DIR/src/ladspa/ladspaplugin.h \
-$$BASE_DIR/src/ladspa/ladspapreset.h \
-$$BASE_DIR/src/ladspa/ladspapresetinstance.h \
-$$BASE_DIR/src/ladspa/ladspapresetknob.h \
-$$BASE_DIR/src/ladspa/ladspapresetmanager.h \
-$$BASE_DIR/src/ladspa/ladspapresetslot.h \
-$$BASE_DIR/src/ladspaview.h \
-$$BASE_DIR/src/library/abstractxmltrackmodel.h \
+$$BASE_DIR/src/engine/syncworker.h \
+$$BASE_DIR/src/errordialoghandler.h \
 $$BASE_DIR/src/library/autodjfeature.h \
-$$BASE_DIR/src/library/browsefeature.h \
-$$BASE_DIR/src/library/browsefilter.h \
-$$BASE_DIR/src/library/browsetablemodel.h \
+$$BASE_DIR/src/library/baseexternallibraryfeature.h \
+$$BASE_DIR/src/library/baseexternalplaylistmodel.h \
+$$BASE_DIR/src/library/baseexternaltrackmodel.h \
+$$BASE_DIR/src/library/baseplaylistfeature.h \
+$$BASE_DIR/src/library/basesqltablemodel.h \
+$$BASE_DIR/src/library/basetrackcache.h \
+$$BASE_DIR/src/library/browse/browsefeature.h \
+$$BASE_DIR/src/library/browse/browsetablemodel.h \
+$$BASE_DIR/src/library/browse/browsethread.h \
+$$BASE_DIR/src/library/browse/foldertreemodel.h \
 $$BASE_DIR/src/library/cratefeature.h \
 $$BASE_DIR/src/library/cratetablemodel.h \
+$$BASE_DIR/src/library/dao/analysisdao.h \
 $$BASE_DIR/src/library/dao/cratedao.h \
+$$BASE_DIR/src/library/dao/cue.h \
 $$BASE_DIR/src/library/dao/cuedao.h \
-$$BASE_DIR/src/library/dao/cue.h \
 $$BASE_DIR/src/library/dao/dao.h \
 $$BASE_DIR/src/library/dao/libraryhashdao.h \
 $$BASE_DIR/src/library/dao/playlistdao.h \
 $$BASE_DIR/src/library/dao/settingsdao.h \
 $$BASE_DIR/src/library/dao/trackdao.h \
-$$BASE_DIR/src/library/itunesfeature.h \
-$$BASE_DIR/src/library/itunesplaylistmodel.h \
-$$BASE_DIR/src/library/itunestrackmodel.h \
+$$BASE_DIR/src/library/hiddentablemodel.h \
+$$BASE_DIR/src/library/itunes/itunesfeature.h \
 $$BASE_DIR/src/library/legacylibraryimporter.h \
+$$BASE_DIR/src/library/library.h \
+$$BASE_DIR/src/library/librarycontrol.h \
 $$BASE_DIR/src/library/libraryfeature.h \
-$$BASE_DIR/src/library/library.h \
-$$BASE_DIR/src/library/librarymidicontrol.h \
+$$BASE_DIR/src/library/libraryscanner.h \
 $$BASE_DIR/src/library/libraryscannerdlg.h \
-$$BASE_DIR/src/library/libraryscanner.h \
 $$BASE_DIR/src/library/librarytablemodel.h \
 $$BASE_DIR/src/library/libraryview.h \
 $$BASE_DIR/src/library/missingtablemodel.h \
 $$BASE_DIR/src/library/mixxxlibraryfeature.h \
+$$BASE_DIR/src/library/parser.h \
+$$BASE_DIR/src/library/parsercsv.h \
+$$BASE_DIR/src/library/parserm3u.h \
+$$BASE_DIR/src/library/parserpls.h \
 $$BASE_DIR/src/library/playlistfeature.h \
 $$BASE_DIR/src/library/playlisttablemodel.h \
 $$BASE_DIR/src/library/preparecratedelegate.h \
 $$BASE_DIR/src/library/preparefeature.h \
 $$BASE_DIR/src/library/preparelibrarytablemodel.h \
+$$BASE_DIR/src/library/previewbuttondelegate.h \
 $$BASE_DIR/src/library/proxytrackmodel.h \
-$$BASE_DIR/src/library/rhythmboxfeature.h \
-$$BASE_DIR/src/library/rhythmboxplaylistmodel.h \
-$$BASE_DIR/src/library/rhythmboxtrackmodel.h \
+$$BASE_DIR/src/library/queryutil.h \
+$$BASE_DIR/src/library/recording/recordingfeature.h \
+$$BASE_DIR/src/library/rhythmbox/rhythmboxfeature.h \
 $$BASE_DIR/src/library/schemamanager.h \
+$$BASE_DIR/src/library/searchqueryparser.h \
 $$BASE_DIR/src/library/searchthread.h \
+$$BASE_DIR/src/library/setlogfeature.h \
 $$BASE_DIR/src/library/sidebarmodel.h \
+$$BASE_DIR/src/library/songdownloader.h \
+$$BASE_DIR/src/library/stardelegate.h \
+$$BASE_DIR/src/library/stareditor.h \
+$$BASE_DIR/src/library/bpmdelegate.h \
+$$BASE_DIR/src/library/bpmeditor.h \
+$$BASE_DIR/src/library/starrating.h \
 $$BASE_DIR/src/library/trackcollection.h \
 $$BASE_DIR/src/library/trackmodel.h \
-$$BASE_DIR/src/m4a/comment.h \
-$$BASE_DIR/src/m4a/ip.h \
-$$BASE_DIR/src/m4a/sf.h \
+$$BASE_DIR/src/library/traktor/traktorfeature.h \
+$$BASE_DIR/src/library/treeitem.h \
+$$BASE_DIR/src/library/treeitemmodel.h \
 $$BASE_DIR/src/mathstuff.h \
-$$BASE_DIR/src/midi/midichanneldelegate.h \
-$$BASE_DIR/src/midi/mididevicedummy.h \
-$$BASE_DIR/src/midi/mididevice.h \
-$$BASE_DIR/src/midi/mididevicemanager.h \
-$$BASE_DIR/src/midi/midideviceportmidi.h \
-$$BASE_DIR/src/midi/midiinputmapping.h \
-$$BASE_DIR/src/midi/midiinputmappingtablemodel.h \
-$$BASE_DIR/src/midi/midiledhandler.h \
-$$BASE_DIR/src/midi/midimapping.h \
-$$BASE_DIR/src/midi/midimessage.h \
-$$BASE_DIR/src/midi/midinodelegate.h \
-$$BASE_DIR/src/midi/midioptiondelegate.h \
-$$BASE_DIR/src/midi/midioutputmapping.h \
-$$BASE_DIR/src/midi/midioutputmappingtablemodel.h \
-$$BASE_DIR/src/midi/midiscriptengine.h \
-$$BASE_DIR/src/midi/midistatusdelegate.h \
-$$BASE_DIR/src/mixxxcontrol.h \
+$$BASE_DIR/src/mixxx.h \
 $$BASE_DIR/src/mixxxevent.h \
-$$BASE_DIR/src/mixxx.h \
 $$BASE_DIR/src/mixxxkeyboard.h \
-$$BASE_DIR/src/mixxxview.h \
-$$BASE_DIR/src/parser.h \
-$$BASE_DIR/src/parserm3u.h \
-$$BASE_DIR/src/parserpls.h \
-$$BASE_DIR/src/peaklist.h \
-$$BASE_DIR/src/player.h \
 $$BASE_DIR/src/playerinfo.h \
-$$BASE_DIR/src/probabilityvector.h \
+$$BASE_DIR/src/playermanager.h \
+$$BASE_DIR/src/previewdeck.h \
 $$BASE_DIR/src/recording/defs_recording.h \
-$$BASE_DIR/src/recording/enginerecord.h \
-$$BASE_DIR/src/recording/writeaudiofile.h \
+$$BASE_DIR/src/recording/recordingmanager.h \
 $$BASE_DIR/src/rotary.h \
-$$BASE_DIR/src/rtthread.h \
+$$BASE_DIR/src/sampler.h \
+$$BASE_DIR/src/samplerbank.h \
+$$BASE_DIR/src/sampleutil.h \
 $$BASE_DIR/src/segmentation.h \
+$$BASE_DIR/src/sharedglcontext.h \
+$$BASE_DIR/src/singleton.h \
+$$BASE_DIR/src/skin/colorschemeparser.h \
+$$BASE_DIR/src/skin/imgcolor.h \
+$$BASE_DIR/src/skin/imginvert.h \
+$$BASE_DIR/src/skin/imgloader.h \
+$$BASE_DIR/src/skin/imgsource.h \
+$$BASE_DIR/src/skin/legacyskinparser.h \
+$$BASE_DIR/src/skin/propertybinder.h \
+$$BASE_DIR/src/skin/skinloader.h \
+$$BASE_DIR/src/skin/skinparser.h \
+$$BASE_DIR/src/skin/tooltips.h \
 $$BASE_DIR/src/sounddevice.h \
 $$BASE_DIR/src/sounddeviceportaudio.h \
 $$BASE_DIR/src/soundmanager.h \
+$$BASE_DIR/src/soundmanagerconfig.h \
+$$BASE_DIR/src/soundmanagerutil.h \
 $$BASE_DIR/src/soundsource.h \
-$$BASE_DIR/src/soundsourcem4a.h \
-$$BASE_DIR/src/soundsourcemp3.h \
+$$BASE_DIR/src/soundsourcecoreaudio.h \
+$$BASE_DIR/src/soundsourceffmpeg.h \
+$$BASE_DIR/src/soundsourceflac.h \
 $$BASE_DIR/src/soundsourceoggvorbis.h \
 $$BASE_DIR/src/soundsourceproxy.h \
 $$BASE_DIR/src/soundsourcesndfile.h \
+$$BASE_DIR/src/tapfilter.h \
+$$BASE_DIR/src/test/mixxxtest.h \
+$$BASE_DIR/src/tonal/tonalanalyser.h \
+$$BASE_DIR/src/track/beat_preferences.h \
+$$BASE_DIR/src/track/beatfactory.h \
+$$BASE_DIR/src/track/beatgrid.h \
+$$BASE_DIR/src/track/beatmap.h \
+$$BASE_DIR/src/track/beats.h \
+$$BASE_DIR/src/track/beatutils.h \
 $$BASE_DIR/src/trackinfoobject.h \
 $$BASE_DIR/src/transposeproxymodel.h \
 $$BASE_DIR/src/upgrade.h \
-$$BASE_DIR/src/vinylcontrol.h \
-$$BASE_DIR/src/vinylcontrolproxy.h \
-$$BASE_DIR/src/vinylcontrolscratchlib.h \
-$$BASE_DIR/src/vinylcontrolsignalwidget.h \
-$$BASE_DIR/src/vinylcontrolxwax.h \
-$$BASE_DIR/src/waveform/glwaveformrenderer.h \
-$$BASE_DIR/src/waveform/renderobject.h \
-$$BASE_DIR/src/waveformviewerfactory.h \
-$$BASE_DIR/src/waveform/waveformrenderbackground.h \
-$$BASE_DIR/src/waveform/waveformrenderbeat.h \
-$$BASE_DIR/src/waveform/waveformrenderer.h \
-$$BASE_DIR/src/waveform/waveformrendermark.h \
-$$BASE_DIR/src/waveform/waveformrendermarkrange.h \
-$$BASE_DIR/src/waveform/waveformrendersignal.h \
-$$BASE_DIR/src/waveform/waveformrendersignalpixmap.h \
+$$BASE_DIR/src/util.h \
+$$BASE_DIR/src/util/cmdlineargs.h \
+$$BASE_DIR/src/util/counter.h \
+$$BASE_DIR/src/util/debug.h \
+$$BASE_DIR/src/util/fifo.h \
+$$BASE_DIR/src/util/lcs.h \
+$$BASE_DIR/src/util/pa_memorybarrier.h \
+$$BASE_DIR/src/util/pa_ringbuffer.h \
+$$BASE_DIR/src/util/performancetimer.h \
+$$BASE_DIR/src/util/sleepableqthread.h \
+$$BASE_DIR/src/util/stat.h \
+$$BASE_DIR/src/util/statsmanager.h \
+$$BASE_DIR/src/util/timer.h \
+$$BASE_DIR/src/util/trace.h \
+$$BASE_DIR/src/waveform/renderers/glslwaveformrenderersignal.h \
+$$BASE_DIR/src/waveform/renderers/glwaveformrendererfilteredsignal.h \
+$$BASE_DIR/src/waveform/renderers/glwaveformrenderersimplesignal.h \
+$$BASE_DIR/src/waveform/renderers/qtwaveformrendererfilteredsignal.h \
+$$BASE_DIR/src/waveform/renderers/qtwaveformrenderersimplesignal.h \
+$$BASE_DIR/src/waveform/renderers/waveformmark.h \
+$$BASE_DIR/src/waveform/renderers/waveformmarkrange.h \
+$$BASE_DIR/src/waveform/renderers/waveformmarkset.h \
+$$BASE_DIR/src/waveform/renderers/waveformrenderbackground.h \
+$$BASE_DIR/src/waveform/renderers/waveformrenderbeat.h \
+$$BASE_DIR/src/waveform/renderers/waveformrendererabstract.h \
+$$BASE_DIR/src/waveform/renderers/waveformrendererendoftrack.h \
+$$BASE_DIR/src/waveform/renderers/waveformrendererfilteredsignal.h \
+$$BASE_DIR/src/waveform/renderers/waveformrendererhsv.h \
+$$BASE_DIR/src/waveform/renderers/waveformrendererpreroll.h \
+$$BASE_DIR/src/waveform/renderers/waveformrenderersignalbase.h \
+$$BASE_DIR/src/waveform/renderers/waveformrendermark.h \
+$$BASE_DIR/src/waveform/renderers/waveformrendermarkrange.h \
+$$BASE_DIR/src/waveform/renderers/waveformsignalcolors.h \
+$$BASE_DIR/src/waveform/renderers/waveformwidgetrenderer.h \
+$$BASE_DIR/src/waveform/waveform.h \
+$$BASE_DIR/src/waveform/waveformfactory.h \
+$$BASE_DIR/src/waveform/waveformwidgetfactory.h \
+$$BASE_DIR/src/waveform/widgets/emptywaveformwidget.h \
+$$BASE_DIR/src/waveform/widgets/glsimplewaveformwidget.h \
+$$BASE_DIR/src/waveform/widgets/glslwaveformwidget.h \
+$$BASE_DIR/src/waveform/widgets/glwaveformwidget.h \
+$$BASE_DIR/src/waveform/widgets/hsvwaveformwidget.h \
+$$BASE_DIR/src/waveform/widgets/qtsimplewaveformwidget.h \
+$$BASE_DIR/src/waveform/widgets/qtwaveformwidget.h \
+$$BASE_DIR/src/waveform/widgets/softwarewaveformwidget.h \
+$$BASE_DIR/src/waveform/widgets/waveformwidgetabstract.h \
+$$BASE_DIR/src/waveform/widgets/waveformwidgettype.h \
 $$BASE_DIR/src/widget/hexspinbox.h \
 $$BASE_DIR/src/widget/wabstractcontrol.h \
-$$BASE_DIR/src/widget/wbrowsetableview.h \
 $$BASE_DIR/src/widget/wdisplay.h \
-$$BASE_DIR/src/widget/wglwaveformviewer.h \
+$$BASE_DIR/src/widget/wimagestore.h \
 $$BASE_DIR/src/widget/wknob.h \
 $$BASE_DIR/src/widget/wlabel.h \
 $$BASE_DIR/src/widget/wlibrary.h \
 $$BASE_DIR/src/widget/wlibrarysidebar.h \
 $$BASE_DIR/src/widget/wlibrarytableview.h \
 $$BASE_DIR/src/widget/wlibrarytextbrowser.h \
-$$BASE_DIR/src/widget/wnumberbpm.h \
 $$BASE_DIR/src/widget/wnumber.h \
 $$BASE_DIR/src/widget/wnumberpos.h \
 $$BASE_DIR/src/widget/wnumberrate.h \
@@ -355,249 +432,308 @@
 $$BASE_DIR/src/widget/wpushbutton.h \
 $$BASE_DIR/src/widget/wsearchlineedit.h \
 $$BASE_DIR/src/widget/wskincolor.h \
+$$BASE_DIR/src/widget/wslider.h \
 $$BASE_DIR/src/widget/wslidercomposed.h \
-$$BASE_DIR/src/widget/wslider.h \
+$$BASE_DIR/src/widget/wspinny.h \
 $$BASE_DIR/src/widget/wstatuslight.h \
+$$BASE_DIR/src/widget/wtime.h \
+$$BASE_DIR/src/widget/wtrackproperty.h \
+$$BASE_DIR/src/widget/wtracktableview.h \
 $$BASE_DIR/src/widget/wtracktableviewheader.h \
-$$BASE_DIR/src/widget/wvisualsimple.h \
+$$BASE_DIR/src/widget/wtracktext.h \
 $$BASE_DIR/src/widget/wvumeter.h \
 $$BASE_DIR/src/widget/wwaveformviewer.h \
 $$BASE_DIR/src/widget/wwidget.h \
-$$BASE_DIR/src/windowkaiser.h \
-$$BASE_DIR/src/wtracktableview.h \
+$$BASE_DIR/src/widget/wwidgetgroup.h \
+$$BASE_DIR/src/widget/wwidgetstack.h \
 $$BASE_DIR/src/xmlparse.h
 
-
 SOURCES += \
-$$BASE_DIR/src/analyserqueue.cpp \
-$$BASE_DIR/src/analyserwaveform.cpp \
-$$BASE_DIR/src/analyserwavesummary.cpp \
-$$BASE_DIR/src/bpm/bpmscheme.cpp \
-$$BASE_DIR/src/bpm/wavesegmentation.cpp \
-$$BASE_DIR/src/cachingreader.cpp \
+$$BASE_DIR/src/mixxxkeyboard.cpp \
 $$BASE_DIR/src/configobject.cpp \
-$$BASE_DIR/src/controlbeat.cpp \
+$$BASE_DIR/src/controlobjectthread.cpp \
+$$BASE_DIR/src/controlobjectthreadwidget.cpp \
+$$BASE_DIR/src/controlobjectthreadmain.cpp \
 $$BASE_DIR/src/controlevent.cpp \
-$$BASE_DIR/src/controlgroupdelegate.cpp \
 $$BASE_DIR/src/controllogpotmeter.cpp \
+$$BASE_DIR/src/controlobject.cpp \
 $$BASE_DIR/src/controlnull.cpp \
-$$BASE_DIR/src/controlobject.cpp \
-$$BASE_DIR/src/controlobjectthread.cpp \
-$$BASE_DIR/src/controlobjectthreadmain.cpp \
-$$BASE_DIR/src/controlobjectthreadwidget.cpp \
 $$BASE_DIR/src/controlpotmeter.cpp \
+$$BASE_DIR/src/controllinpotmeter.cpp \
 $$BASE_DIR/src/controlpushbutton.cpp \
 $$BASE_DIR/src/controlttrotary.cpp \
-$$BASE_DIR/src/controlvaluedelegate.cpp \
+$$BASE_DIR/src/controlbeat.cpp \
+$$BASE_DIR/src/dlgpreferences.cpp \
+$$BASE_DIR/src/dlgprefsound.cpp \
+$$BASE_DIR/src/dlgprefsounditem.cpp \
+$$BASE_DIR/src/controllers/dlgprefcontroller.cpp \
+$$BASE_DIR/src/controllers/dlgprefmappablecontroller.cpp \
+$$BASE_DIR/src/controllers/dlgcontrollerlearning.cpp \
+$$BASE_DIR/src/controllers/dlgprefnocontrollers.cpp \
+$$BASE_DIR/src/dlgprefbeats.cpp \
+$$BASE_DIR/src/dlgprefplaylist.cpp \
+$$BASE_DIR/src/dlgprefcontrols.cpp \
+$$BASE_DIR/src/dlgprefreplaygain.cpp \
+$$BASE_DIR/src/dlgprefnovinyl.cpp \
 $$BASE_DIR/src/dlgabout.cpp \
-$$BASE_DIR/src/dlgautodj.cpp \
-$$BASE_DIR/src/dlgladspa.cpp \
-$$BASE_DIR/src/dlgmidilearning.cpp \
-$$BASE_DIR/src/dlgprefcontrols.cpp \
+$$BASE_DIR/src/dlgprefeq.cpp \
 $$BASE_DIR/src/dlgprefcrossfader.cpp \
-$$BASE_DIR/src/dlgprefeq.cpp \
-$$BASE_DIR/src/dlgpreferences.cpp \
-$$BASE_DIR/src/dlgprefmidibindings.cpp \
-$$BASE_DIR/src/dlgprefnomidi.cpp \
-$$BASE_DIR/src/dlgprefplaylist.cpp \
-$$BASE_DIR/src/dlgprefrecord.cpp \
-$$BASE_DIR/src/dlgprefsound.cpp \
-$$BASE_DIR/src/dlgprefvinyl.cpp \
+$$BASE_DIR/src/dlgtrackinfo.cpp \
 $$BASE_DIR/src/dlgprepare.cpp \
-$$BASE_DIR/src/dlgtrackinfo.cpp \
-$$BASE_DIR/src/encoder.cpp \
-$$BASE_DIR/src/engine/bpmcontrol.cpp \
-$$BASE_DIR/src/engine/cuecontrol.cpp \
+$$BASE_DIR/src/dlgautodj.cpp \
+$$BASE_DIR/src/dlghidden.cpp \
+$$BASE_DIR/src/dlgmissing.cpp \
+$$BASE_DIR/src/engine/engineworker.cpp \
+$$BASE_DIR/src/engine/engineworkerscheduler.cpp \
+$$BASE_DIR/src/engine/syncworker.cpp \
 $$BASE_DIR/src/engine/enginebuffer.cpp \
 $$BASE_DIR/src/engine/enginebufferscale.cpp \
 $$BASE_DIR/src/engine/enginebufferscaledummy.cpp \
 $$BASE_DIR/src/engine/enginebufferscalelinear.cpp \
-$$BASE_DIR/src/engine/enginebufferscalereal.cpp \
-$$BASE_DIR/src/engine/enginebufferscalest.cpp \
-$$BASE_DIR/src/engine/enginechannel.cpp \
 $$BASE_DIR/src/engine/engineclipping.cpp \
-$$BASE_DIR/src/engine/enginecontrol.cpp \
-$$BASE_DIR/src/engine/enginedelay.cpp \
 $$BASE_DIR/src/engine/enginefilterblock.cpp \
-$$BASE_DIR/src/engine/enginefilterbutterworth8.cpp \
+$$BASE_DIR/src/engine/enginefilteriir.cpp \
 $$BASE_DIR/src/engine/enginefilter.cpp \
-$$BASE_DIR/src/engine/enginefilteriir.cpp \
-$$BASE_DIR/src/engine/engineflanger.cpp \
-$$BASE_DIR/src/engine/engineladspa.cpp \
-$$BASE_DIR/src/engine/enginemaster.cpp \
 $$BASE_DIR/src/engine/engineobject.cpp \
 $$BASE_DIR/src/engine/enginepregain.cpp \
-$$BASE_DIR/src/engine/enginesidechain.cpp \
-$$BASE_DIR/src/engine/enginespectralfwd.cpp \
-$$BASE_DIR/src/engine/enginevinylcontrol.cpp \
+$$BASE_DIR/src/engine/enginechannel.cpp \
+$$BASE_DIR/src/engine/enginemaster.cpp \
+$$BASE_DIR/src/engine/enginedelay.cpp \
+$$BASE_DIR/src/engine/engineflanger.cpp \
+$$BASE_DIR/src/engine/enginevumeter.cpp \
 $$BASE_DIR/src/engine/enginevinylsoundemu.cpp \
-$$BASE_DIR/src/engine/enginevolume.cpp \
-$$BASE_DIR/src/engine/enginevumeter.cpp \
+$$BASE_DIR/src/engine/sidechain/enginesidechain.cpp \
+$$BASE_DIR/src/engine/enginefilterbutterworth8.cpp \
 $$BASE_DIR/src/engine/enginexfader.cpp \
+$$BASE_DIR/src/engine/enginemicrophone.cpp \
+$$BASE_DIR/src/engine/enginedeck.cpp \
+$$BASE_DIR/src/engine/enginepassthrough.cpp \
+$$BASE_DIR/src/engine/enginecontrol.cpp \
+$$BASE_DIR/src/engine/ratecontrol.cpp \
+$$BASE_DIR/src/engine/positionscratchcontroller.cpp \
 $$BASE_DIR/src/engine/loopingcontrol.cpp \
-$$BASE_DIR/src/engine/ratecontrol.cpp \
+$$BASE_DIR/src/engine/bpmcontrol.cpp \
+$$BASE_DIR/src/engine/cuecontrol.cpp \
+$$BASE_DIR/src/engine/quantizecontrol.cpp \
+$$BASE_DIR/src/engine/clockcontrol.cpp \
 $$BASE_DIR/src/engine/readaheadmanager.cpp \
-$$BASE_DIR/src/errordialog.cpp \
-$$BASE_DIR/src/imgcolor.cpp \
-$$BASE_DIR/src/imginvert.cpp \
-$$BASE_DIR/src/imgloader.cpp \
-$$BASE_DIR/src/input.cpp \
-$$BASE_DIR/src/ladspa/ladspacontrol.cpp \
-$$BASE_DIR/src/ladspa/ladspainstance.cpp \
-$$BASE_DIR/src/ladspa/ladspainstancemono.cpp \
-$$BASE_DIR/src/ladspa/ladspainstancestereo.cpp \
-$$BASE_DIR/src/ladspa/ladspalibrary.cpp \
-$$BASE_DIR/src/ladspa/ladspaloader.cpp \
-$$BASE_DIR/src/ladspa/ladspaplugin.cpp \
-$$BASE_DIR/src/ladspa/ladspapreset.cpp \
-$$BASE_DIR/src/ladspa/ladspapresetinstance.cpp \
-$$BASE_DIR/src/ladspa/ladspapresetknob.cpp \
-$$BASE_DIR/src/ladspa/ladspapresetmanager.cpp \
-$$BASE_DIR/src/ladspa/ladspapresetslot.cpp \
-$$BASE_DIR/src/ladspaview.cpp \
-$$BASE_DIR/src/library/abstractxmltrackmodel.cpp \
-$$BASE_DIR/src/library/autodjfeature.cpp \
-$$BASE_DIR/src/library/browsefeature.cpp \
-$$BASE_DIR/src/library/browsefilter.cpp \
-$$BASE_DIR/src/library/browsetablemodel.cpp \
-$$BASE_DIR/src/library/cratefeature.cpp \
-$$BASE_DIR/src/library/cratetablemodel.cpp \
-$$BASE_DIR/src/library/dao/cratedao.cpp \
-$$BASE_DIR/src/library/dao/cue.cpp \
-$$BASE_DIR/src/library/dao/cuedao.cpp \
-$$BASE_DIR/src/library/dao/libraryhashdao.cpp \
-$$BASE_DIR/src/library/dao/playlistdao.cpp \
-$$BASE_DIR/src/library/dao/settingsdao.cpp \
-$$BASE_DIR/src/library/dao/trackdao.cpp \
-$$BASE_DIR/src/library/itunesfeature.cpp \
-$$BASE_DIR/src/library/itunesplaylistmodel.cpp \
-$$BASE_DIR/src/library/itunestrackmodel.cpp \
-$$BASE_DIR/src/library/legacylibraryimporter.cpp \
-$$BASE_DIR/src/library/library.cpp \
-$$BASE_DIR/src/library/libraryfeature.cpp \
-$$BASE_DIR/src/library/librarymidicontrol.cpp \
-$$BASE_DIR/src/library/libraryscanner.cpp \
-$$BASE_DIR/src/library/libraryscannerdlg.cpp \
-$$BASE_DIR/src/library/librarytablemodel.cpp \
-$$BASE_DIR/src/library/missingtablemodel.cpp \
-$$BASE_DIR/src/library/mixxxlibraryfeature.cpp \
-$$BASE_DIR/src/library/playlistfeature.cpp \
-$$BASE_DIR/src/library/playlisttablemodel.cpp \
-$$BASE_DIR/src/library/preparecratedelegate.cpp \
-$$BASE_DIR/src/library/preparefeature.cpp \
-$$BASE_DIR/src/library/preparelibrarytablemodel.cpp \
-$$BASE_DIR/src/library/proxytrackmodel.cpp \
-$$BASE_DIR/src/library/rhythmboxfeature.cpp \
-$$BASE_DIR/src/library/rhythmboxplaylistmodel.cpp \
-$$BASE_DIR/src/library/rhythmboxtrackmodel.cpp \
-$$BASE_DIR/src/library/schemamanager.cpp \
-$$BASE_DIR/src/library/searchthread.cpp \
-$$BASE_DIR/src/library/sidebarmodel.cpp \
-$$BASE_DIR/src/library/trackcollection.cpp \
-$$BASE_DIR/src/m4a/mp4-mixxx.cpp \
+$$BASE_DIR/src/cachingreader.cpp \
+$$BASE_DIR/src/analyserrg.cpp \
+$$BASE_DIR/src/analyserbeats.cpp \
+$$BASE_DIR/src/analyserqueue.cpp \
+$$BASE_DIR/src/analyserwaveform.cpp \
+$$BASE_DIR/src/controllers/controller.cpp \
+$$BASE_DIR/src/controllers/controllerengine.cpp \
+$$BASE_DIR/src/controllers/controllerenumerator.cpp \
+$$BASE_DIR/src/controllers/controllerlearningeventfilter.cpp \
+$$BASE_DIR/src/controllers/controllermanager.cpp \
+$$BASE_DIR/src/controllers/controllerpresetfilehandler.cpp \
+$$BASE_DIR/src/controllers/controllerpresetinfo.cpp \
+$$BASE_DIR/src/controllers/midi/midicontroller.cpp \
+$$BASE_DIR/src/controllers/midi/midicontrollerpresetfilehandler.cpp \
+$$BASE_DIR/src/controllers/midi/midienumerator.cpp \
+$$BASE_DIR/src/controllers/midi/midioutputhandler.cpp \
+$$BASE_DIR/src/controllers/mixxxcontrol.cpp \
+$$BASE_DIR/src/controllers/qtscript-bytearray/bytearrayclass.cpp \
+$$BASE_DIR/src/controllers/qtscript-bytearray/bytearrayprototype.cpp \
+$$BASE_DIR/src/controllers/softtakeover.cpp \
 $$BASE_DIR/src/main.cpp \
-$$BASE_DIR/src/mathstuff.cpp \
-$$BASE_DIR/src/midi/midichanneldelegate.cpp \
-$$BASE_DIR/src/midi/mididevice.cpp \
-$$BASE_DIR/src/midi/mididevicemanager.cpp \
-$$BASE_DIR/src/midi/midideviceportmidi.cpp \
-$$BASE_DIR/src/midi/midiinputmappingtablemodel.cpp \
-$$BASE_DIR/src/midi/midiledhandler.cpp \
-$$BASE_DIR/src/midi/midimapping.cpp \
-$$BASE_DIR/src/midi/midimessage.cpp \
-$$BASE_DIR/src/midi/midinodelegate.cpp \
-$$BASE_DIR/src/midi/midioptiondelegate.cpp \
-$$BASE_DIR/src/midi/midioutputmappingtablemodel.cpp \
-$$BASE_DIR/src/midi/midiscriptengine.cpp \
-$$BASE_DIR/src/midi/midistatusdelegate.cpp \
-$$BASE_DIR/src/mixxxcontrol.cpp \
 $$BASE_DIR/src/mixxx.cpp \
-$$BASE_DIR/src/mixxxkeyboard.cpp \
-$$BASE_DIR/src/mixxxview.cpp \
-$$BASE_DIR/src/parser.cpp \
-$$BASE_DIR/src/parserm3u.cpp \
-$$BASE_DIR/src/parserpls.cpp \
-$$BASE_DIR/src/peaklist.cpp \
-$$BASE_DIR/src/player.cpp \
-$$BASE_DIR/src/playerinfo.cpp \
-$$BASE_DIR/src/probabilityvector.cpp \
-$$BASE_DIR/src/recording/enginerecord.cpp \
-$$BASE_DIR/src/recording/writeaudiofile.cpp \
-$$BASE_DIR/src/rotary.cpp \
-$$BASE_DIR/src/rtthread.cpp \
-$$BASE_DIR/src/segmentation.cpp \
-$$BASE_DIR/src/sounddevice.cpp \
-$$BASE_DIR/src/sounddeviceportaudio.cpp \
-$$BASE_DIR/src/soundmanager.cpp \
+$$BASE_DIR/src/errordialoghandler.cpp \
+$$BASE_DIR/src/upgrade.cpp \
 $$BASE_DIR/src/soundsource.cpp \
-$$BASE_DIR/src/soundsourcem4a.cpp \
-$$BASE_DIR/src/soundsourcemp3.cpp \
 $$BASE_DIR/src/soundsourceoggvorbis.cpp \
-$$BASE_DIR/src/soundsourceproxy.cpp \
+$$BASE_DIR/src/soundsourceflac.cpp \
 $$BASE_DIR/src/soundsourcesndfile.cpp \
-$$BASE_DIR/src/trackinfoobject.cpp \
-$$BASE_DIR/src/upgrade.cpp \
-$$BASE_DIR/src/vinylcontrol.cpp \
-$$BASE_DIR/src/vinylcontrolproxy.cpp \
-$$BASE_DIR/src/vinylcontrolscratchlib.cpp \
-$$BASE_DIR/src/vinylcontrolsignalwidget.cpp \
-$$BASE_DIR/src/vinylcontrolxwax.cpp \
-$$BASE_DIR/src/waveform/glwaveformrenderer.cpp \
-$$BASE_DIR/src/waveform/renderobject.cpp \
-$$BASE_DIR/src/waveformviewerfactory.cpp \
-$$BASE_DIR/src/waveform/waveformrenderbackground.cpp \
-$$BASE_DIR/src/waveform/waveformrenderbeat.cpp \
-$$BASE_DIR/src/waveform/waveformrenderer.cpp \
-$$BASE_DIR/src/waveform/waveformrendermark.cpp \
-$$BASE_DIR/src/waveform/waveformrendermarkrange.cpp \
-$$BASE_DIR/src/waveform/waveformrendersignal.cpp \
-$$BASE_DIR/src/waveform/waveformrendersignalpixmap.cpp \
-$$BASE_DIR/src/widget/hexspinbox.cpp \
-$$BASE_DIR/src/widget/wabstractcontrol.cpp \
-$$BASE_DIR/src/widget/wbrowsetableview.cpp \
-$$BASE_DIR/src/widget/wdisplay.cpp \
-$$BASE_DIR/src/widget/wglwaveformviewer.cpp \
-$$BASE_DIR/src/widget/wknob.cpp \
+$$BASE_DIR/src/sharedglcontext.cpp \
+$$BASE_DIR/src/widget/wwidget.cpp \
+$$BASE_DIR/src/widget/wwidgetgroup.cpp \
+$$BASE_DIR/src/widget/wwidgetstack.cpp \
 $$BASE_DIR/src/widget/wlabel.cpp \
-$$BASE_DIR/src/widget/wlibrary.cpp \
-$$BASE_DIR/src/widget/wlibrarysidebar.cpp \
-$$BASE_DIR/src/widget/wlibrarytableview.cpp \
-$$BASE_DIR/src/widget/wlibrarytextbrowser.cpp \
-$$BASE_DIR/src/widget/wnumberbpm.cpp \
+$$BASE_DIR/src/widget/wtracktext.cpp \
 $$BASE_DIR/src/widget/wnumber.cpp \
 $$BASE_DIR/src/widget/wnumberpos.cpp \
 $$BASE_DIR/src/widget/wnumberrate.cpp \
-$$BASE_DIR/src/widget/woverview.cpp \
-$$BASE_DIR/src/widget/wpixmapstore.cpp \
-$$BASE_DIR/src/widget/wpreparecratestableview.cpp \
-$$BASE_DIR/src/widget/wpreparelibrarytableview.cpp \
+$$BASE_DIR/src/widget/wknob.cpp \
+$$BASE_DIR/src/widget/wdisplay.cpp \
+$$BASE_DIR/src/widget/wvumeter.cpp \
 $$BASE_DIR/src/widget/wpushbutton.cpp \
-$$BASE_DIR/src/widget/wsearchlineedit.cpp \
-$$BASE_DIR/src/widget/wskincolor.cpp \
 $$BASE_DIR/src/widget/wslidercomposed.cpp \
 $$BASE_DIR/src/widget/wslider.cpp \
 $$BASE_DIR/src/widget/wstatuslight.cpp \
+$$BASE_DIR/src/widget/woverview.cpp \
+$$BASE_DIR/src/widget/wspinny.cpp \
+$$BASE_DIR/src/widget/wskincolor.cpp \
+$$BASE_DIR/src/widget/wabstractcontrol.cpp \
+$$BASE_DIR/src/widget/wsearchlineedit.cpp \
+$$BASE_DIR/src/widget/wpixmapstore.cpp \
+$$BASE_DIR/src/widget/wimagestore.cpp \
+$$BASE_DIR/src/widget/hexspinbox.cpp \
+$$BASE_DIR/src/widget/wtrackproperty.cpp \
+$$BASE_DIR/src/widget/wtime.cpp \
+$$BASE_DIR/src/mathstuff.cpp \
+$$BASE_DIR/src/rotary.cpp \
+$$BASE_DIR/src/widget/wtracktableview.cpp \
 $$BASE_DIR/src/widget/wtracktableviewheader.cpp \
-$$BASE_DIR/src/widget/wvisualsimple.cpp \
-$$BASE_DIR/src/widget/wvumeter.cpp \
+$$BASE_DIR/src/widget/wlibrarysidebar.cpp \
+$$BASE_DIR/src/widget/wlibrary.cpp \
+$$BASE_DIR/src/widget/wlibrarytableview.cpp \
+$$BASE_DIR/src/widget/wpreparelibrarytableview.cpp \
+$$BASE_DIR/src/widget/wpreparecratestableview.cpp \
+$$BASE_DIR/src/widget/wlibrarytextbrowser.cpp \
+$$BASE_DIR/src/library/preparecratedelegate.cpp \
+$$BASE_DIR/src/library/trackcollection.cpp \
+$$BASE_DIR/src/library/basesqltablemodel.cpp \
+$$BASE_DIR/src/library/basetrackcache.cpp \
+$$BASE_DIR/src/library/librarytablemodel.cpp \
+$$BASE_DIR/src/library/searchqueryparser.cpp \
+$$BASE_DIR/src/library/preparelibrarytablemodel.cpp \
+$$BASE_DIR/src/library/missingtablemodel.cpp \
+$$BASE_DIR/src/library/hiddentablemodel.cpp \
+$$BASE_DIR/src/library/proxytrackmodel.cpp \
+$$BASE_DIR/src/library/playlisttablemodel.cpp \
+$$BASE_DIR/src/library/libraryfeature.cpp \
+$$BASE_DIR/src/library/preparefeature.cpp \
+$$BASE_DIR/src/library/autodjfeature.cpp \
+$$BASE_DIR/src/library/mixxxlibraryfeature.cpp \
+$$BASE_DIR/src/library/baseplaylistfeature.cpp \
+$$BASE_DIR/src/library/playlistfeature.cpp \
+$$BASE_DIR/src/library/setlogfeature.cpp \
+$$BASE_DIR/src/library/browse/browsetablemodel.cpp \
+$$BASE_DIR/src/library/browse/browsethread.cpp \
+$$BASE_DIR/src/library/browse/browsefeature.cpp \
+$$BASE_DIR/src/library/browse/foldertreemodel.cpp \
+$$BASE_DIR/src/library/recording/recordingfeature.cpp \
+$$BASE_DIR/src/dlgrecording.cpp \
+$$BASE_DIR/src/recording/recordingmanager.cpp \
+$$BASE_DIR/src/engine/sidechain/enginerecord.cpp \
+$$BASE_DIR/src/library/baseexternallibraryfeature.cpp \
+$$BASE_DIR/src/library/baseexternaltrackmodel.cpp \
+$$BASE_DIR/src/library/baseexternalplaylistmodel.cpp \
+$$BASE_DIR/src/library/rhythmbox/rhythmboxfeature.cpp \
+$$BASE_DIR/src/library/itunes/itunesfeature.cpp \
+$$BASE_DIR/src/library/traktor/traktorfeature.cpp \
+$$BASE_DIR/src/library/cratefeature.cpp \
+$$BASE_DIR/src/library/sidebarmodel.cpp \
+$$BASE_DIR/src/library/libraryscanner.cpp \
+$$BASE_DIR/src/library/libraryscannerdlg.cpp \
+$$BASE_DIR/src/library/legacylibraryimporter.cpp \
+$$BASE_DIR/src/library/library.cpp \
+$$BASE_DIR/src/library/searchthread.cpp \
+$$BASE_DIR/src/library/dao/cratedao.cpp \
+$$BASE_DIR/src/library/cratetablemodel.cpp \
+$$BASE_DIR/src/library/dao/cuedao.cpp \
+$$BASE_DIR/src/library/dao/cue.cpp \
+$$BASE_DIR/src/library/dao/trackdao.cpp \
+$$BASE_DIR/src/library/dao/playlistdao.cpp \
+$$BASE_DIR/src/library/dao/libraryhashdao.cpp \
+$$BASE_DIR/src/library/dao/settingsdao.cpp \
+$$BASE_DIR/src/library/dao/analysisdao.cpp \
+$$BASE_DIR/src/library/librarycontrol.cpp \
+$$BASE_DIR/src/library/schemamanager.cpp \
+$$BASE_DIR/src/library/songdownloader.cpp \
+$$BASE_DIR/src/library/starrating.cpp \
+$$BASE_DIR/src/library/stardelegate.cpp \
+$$BASE_DIR/src/library/stareditor.cpp \
+$$BASE_DIR/src/library/bpmdelegate.cpp \
+$$BASE_DIR/src/library/bpmeditor.cpp \
+$$BASE_DIR/src/library/previewbuttondelegate.cpp \
+$$BASE_DIR/src/audiotagger.cpp \
+$$BASE_DIR/src/library/treeitemmodel.cpp \
+$$BASE_DIR/src/library/treeitem.cpp \
+$$BASE_DIR/src/xmlparse.cpp \
+$$BASE_DIR/src/library/parser.cpp \
+$$BASE_DIR/src/library/parserpls.cpp \
+$$BASE_DIR/src/library/parserm3u.cpp \
+$$BASE_DIR/src/library/parsercsv.cpp \
+$$BASE_DIR/src/bpm/bpmscheme.cpp \
+$$BASE_DIR/src/soundsourceproxy.cpp \
 $$BASE_DIR/src/widget/wwaveformviewer.cpp \
-$$BASE_DIR/src/widget/wwidget.cpp \
-$$BASE_DIR/src/windowkaiser.cpp \
-$$BASE_DIR/src/wtracktableview.cpp \
-$$BASE_DIR/src/xmlparse.cpp
+$$BASE_DIR/src/waveform/waveform.cpp \
+$$BASE_DIR/src/waveform/waveformfactory.cpp \
+$$BASE_DIR/src/waveform/waveformwidgetfactory.cpp \
+$$BASE_DIR/src/waveform/renderers/waveformwidgetrenderer.cpp \
+$$BASE_DIR/src/waveform/renderers/waveformrendererabstract.cpp \
+$$BASE_DIR/src/waveform/renderers/waveformrenderbackground.cpp \
+$$BASE_DIR/src/waveform/renderers/waveformrendermark.cpp \
+$$BASE_DIR/src/waveform/renderers/waveformrendermarkrange.cpp \
+$$BASE_DIR/src/waveform/renderers/waveformrenderbeat.cpp \
+$$BASE_DIR/src/waveform/renderers/waveformrendererendoftrack.cpp \
+$$BASE_DIR/src/waveform/renderers/waveformrendererpreroll.cpp \
+$$BASE_DIR/src/waveform/renderers/waveformrendererfilteredsignal.cpp \
+$$BASE_DIR/src/waveform/renderers/waveformrendererhsv.cpp \
+$$BASE_DIR/src/waveform/renderers/qtwaveformrendererfilteredsignal.cpp \
+$$BASE_DIR/src/waveform/renderers/qtwaveformrenderersimplesignal.cpp \
+$$BASE_DIR/src/waveform/renderers/glwaveformrendererfilteredsignal.cpp \
+$$BASE_DIR/src/waveform/renderers/glwaveformrenderersimplesignal.cpp \
+$$BASE_DIR/src/waveform/renderers/glslwaveformrenderersignal.cpp \
+$$BASE_DIR/src/waveform/renderers/waveformsignalcolors.cpp \
+$$BASE_DIR/src/waveform/renderers/waveformrenderersignalbase.cpp \
+$$BASE_DIR/src/waveform/renderers/waveformmark.cpp \
+$$BASE_DIR/src/waveform/renderers/waveformmarkset.cpp \
+$$BASE_DIR/src/waveform/renderers/waveformmarkrange.cpp \
+$$BASE_DIR/src/waveform/widgets/waveformwidgetabstract.cpp \
+$$BASE_DIR/src/waveform/widgets/emptywaveformwidget.cpp \
+$$BASE_DIR/src/waveform/widgets/softwarewaveformwidget.cpp \
+$$BASE_DIR/src/waveform/widgets/hsvwaveformwidget.cpp \
+$$BASE_DIR/src/waveform/widgets/qtwaveformwidget.cpp \
+$$BASE_DIR/src/waveform/widgets/qtsimplewaveformwidget.cpp \
+$$BASE_DIR/src/waveform/widgets/glwaveformwidget.cpp \
+$$BASE_DIR/src/waveform/widgets/glsimplewaveformwidget.cpp \
+$$BASE_DIR/src/waveform/widgets/glslwaveformwidget.cpp \
+$$BASE_DIR/src/skin/imginvert.cpp \
+$$BASE_DIR/src/skin/imgloader.cpp \
+$$BASE_DIR/src/skin/imgcolor.cpp \
+$$BASE_DIR/src/skin/skinloader.cpp \
+$$BASE_DIR/src/skin/legacyskinparser.cpp \
+$$BASE_DIR/src/skin/colorschemeparser.cpp \
+$$BASE_DIR/src/skin/propertybinder.cpp \
+$$BASE_DIR/src/skin/tooltips.cpp \
+$$BASE_DIR/src/sampleutil.cpp \
+$$BASE_DIR/src/trackinfoobject.cpp \
+$$BASE_DIR/src/track/beatgrid.cpp \
+$$BASE_DIR/src/track/beatmap.cpp \
+$$BASE_DIR/src/track/beatfactory.cpp \
+$$BASE_DIR/src/track/beatutils.cpp \
+$$BASE_DIR/src/baseplayer.cpp \
+$$BASE_DIR/src/basetrackplayer.cpp \
+$$BASE_DIR/src/deck.cpp \
+$$BASE_DIR/src/sampler.cpp \
+$$BASE_DIR/src/previewdeck.cpp \
+$$BASE_DIR/src/playermanager.cpp \
+$$BASE_DIR/src/samplerbank.cpp \
+$$BASE_DIR/src/sounddevice.cpp \
+$$BASE_DIR/src/sounddeviceportaudio.cpp \
+$$BASE_DIR/src/soundmanager.cpp \
+$$BASE_DIR/src/soundmanagerconfig.cpp \
+$$BASE_DIR/src/soundmanagerutil.cpp \
+$$BASE_DIR/src/dlgprefrecord.cpp \
+$$BASE_DIR/src/playerinfo.cpp \
+$$BASE_DIR/src/encoder/encoder.cpp \
+$$BASE_DIR/src/encoder/encodermp3.cpp \
+$$BASE_DIR/src/encoder/encodervorbis.cpp \
+$$BASE_DIR/src/segmentation.cpp \
+$$BASE_DIR/src/tapfilter.cpp \
+$$BASE_DIR/src/util/pa_ringbuffer.c \
+$$BASE_DIR/src/util/sleepableqthread.cpp \
+$$BASE_DIR/src/util/statsmanager.cpp \
+$$BASE_DIR/src/util/stat.cpp \
+$$BASE_DIR/src/util/timer.cpp \
+$$BASE_DIR/src/util/performancetimer.cpp
 
 
 # Soundtouch
-INCLUDEPATH += $$BASE_DIR/lib/soundtouch-1.4.1
-SOURCES += $$BASE_DIR/lib/soundtouch-1.4.1/SoundTouch.cpp \
-    $$BASE_DIR/lib/soundtouch-1.4.1/TDStretch.cpp \
-    $$BASE_DIR/lib/soundtouch-1.4.1/RateTransposer.cpp \
-    $$BASE_DIR/lib/soundtouch-1.4.1/AAFilter.cpp \
-    $$BASE_DIR/lib/soundtouch-1.4.1/FIFOSampleBuffer.cpp \
-    $$BASE_DIR/lib/soundtouch-1.4.1/FIRFilter.cpp \
-    $$BASE_DIR/lib/soundtouch-1.4.1/PeakFinder.cpp \
-    $$BASE_DIR/lib/soundtouch-1.4.1/BPMDetect.cpp \
-    $$BASE_DIR/lib/soundtouch-1.4.1/cpu_detect_x86_gcc.cpp
+INCLUDEPATH += $$BASE_DIR/lib/soundtouch-1.6.0
+SOURCES += $$BASE_DIR/src/engine/enginebufferscalest.cpp \
+    $$BASE_DIR/lib/soundtouch-1.6.0/SoundTouch.cpp \
+    $$BASE_DIR/lib/soundtouch-1.6.0/TDStretch.cpp \
+    $$BASE_DIR/lib/soundtouch-1.6.0/RateTransposer.cpp \
+    $$BASE_DIR/lib/soundtouch-1.6.0/AAFilter.cpp \
+    $$BASE_DIR/lib/soundtouch-1.6.0/FIFOSampleBuffer.cpp \
+    $$BASE_DIR/lib/soundtouch-1.6.0/FIRFilter.cpp \
+    $$BASE_DIR/lib/soundtouch-1.6.0/PeakFinder.cpp \
+    $$BASE_DIR/lib/soundtouch-1.6.0/BPMDetect.cpp \
+    $$BASE_DIR/lib/soundtouch-1.6.0/cpu_detect_x86_gcc.cpp
 
 # Fidlib
 SOURCES += $$BASE_DIR/lib/fidlib-0.9.10/fidlib.c
@@ -610,25 +746,32 @@
 
 # ReplayGain
 
-SOURCES += $$BASE_DIR/lib/replaygain/replaygain_analysis.c
+SOURCES += $$BASE_DIR/lib/replaygain/replaygain.cpp
 
 FORMS += \
+$$BASE_DIR/src/controllers/dlgcontrollerlearning.ui \
+$$BASE_DIR/src/controllers/dlgprefcontrollerdlg.ui \
+$$BASE_DIR/src/controllers/dlgprefmappablecontrollerdlg.ui \
+$$BASE_DIR/src/controllers/dlgprefnocontrollersdlg.ui \
 $$BASE_DIR/src/dlgaboutdlg.ui \
 $$BASE_DIR/src/dlgautodj.ui \
-$$BASE_DIR/src/dlgmidilearning.ui \
+$$BASE_DIR/src/dlghidden.ui \
+$$BASE_DIR/src/dlgmissing.ui \
+$$BASE_DIR/src/dlgplugindownloader.ui \
+$$BASE_DIR/src/dlgprefbeatsdlg.ui \
 $$BASE_DIR/src/dlgprefcontrolsdlg.ui \
 $$BASE_DIR/src/dlgprefcrossfaderdlg.ui \
 $$BASE_DIR/src/dlgprefeqdlg.ui \
 $$BASE_DIR/src/dlgpreferencesdlg.ui \
-$$BASE_DIR/src/dlgprefmidibindingsdlg.ui \
-$$BASE_DIR/src/dlgprefnomididlg.ui \
+$$BASE_DIR/src/dlgprefnovinyldlg.ui \
 $$BASE_DIR/src/dlgprefplaylistdlg.ui \
-$$BASE_DIR/src/dlgprefrecorddlg.ui \
+$$BASE_DIR/src/dlgprefreplaygaindlg.ui \
 $$BASE_DIR/src/dlgprefsounddlg.ui \
+$$BASE_DIR/src/dlgprefsounditem.ui \
 $$BASE_DIR/src/dlgprefvinyldlg.ui \
 $$BASE_DIR/src/dlgprepare.ui \
-$$BASE_DIR/src/dlgtrackinfo.ui \
-$$BASE_DIR/src/script/scriptstudio.ui
+$$BASE_DIR/src/dlgrecording.ui \
+$$BASE_DIR/src/dlgtrackinfo.ui
 
 
 RESOURCES += $$BASE_DIR/src/../res/mixxx.qrc
@@ -677,24 +820,35 @@
 }
 win32 {
     DEFINES += __WINMIDI__
-    HEADERS += $$BASE_DIR/src/midiobjectwin.h
-    SOURCES += $$BASE_DIR/src/midiobjectwin.cpp
-    LIBS += $$BASE_DIR/../mixxx-winlib/libsndfile-1.dll \
-        $$BASE_DIR/../mixxx-winlib/portaudio_x86.dll \
-        $$BASE_DIR/../mixxx-winlib/libmad.a \ # libmad-0.15.1b
-        $$BASE_DIR/../mixxx-winlib/libid3tag.a \ # libid3tag-0.15.1b
-        $$BASE_DIR/../mixxx-winlib/libvorbisfile.dll \
-        $$BASE_DIR/../mixxx-winlib/libvorbis.dll \
-#        $$BASE_DIR/../mixxx-winlib/libfftw3-3.dll \
-        $$BASE_DIR/../mixxx-winlib/libogg.dll \
-        -lwinmm
-    INCLUDEPATH += $$BASE_DIR/../mixxx-winlib
-}
+    CONFIG(portmidi) {
+        LIBS += -lportmidi_s
+    }
+    LIBS += \
+        -L$$BASE_DIR/../mixxx-mingw/lib -lFLAC -logg -lvorbis \
+        -lvorbisenc -lvorbisfile
+    CONFIG(mad) {
+        LIBS += -lmad -lid3tag
+    }
+    LIBS += \
+        -lz -lprotobuf-lite -lsndfile \
+        -lportaudio.dll -ltag.dll -lwinmm -lws2_32 -lmingw32
+    INCLUDEPATH += $$BASE_DIR/../mixxx-mingw/include
+}
+
+CONFIG(portmidi) {
+    DEFINES += __PORTMIDI__
+    HEADERS += \
+        $$BASE_DIR/src/controllers/midi/portmidicontroller.h \
+        $$BASE_DIR/src/controllers/midi/portmidienumerator.h
+    SOURCES += \
+        $$BASE_DIR/src/controllers/midi/portmidienumerator.cpp \
+        $$BASE_DIR/src/controllers/midi/portmidicontroller.cpp
+}
+
 CONFIG(ladspa) {
     DEFINES += __LADSPA__
     HEADERS += $$BASE_DIR/src/engine/engineladspa.h \
         $$BASE_DIR/src/dlgladspa.h \
-        $$BASE_DIR/src/ladspaview.h \
         $$BASE_DIR/src/ladspa/ladspacontrol.h \
         $$BASE_DIR/src/ladspa/ladspainstance.h \
         $$BASE_DIR/src/ladspa/ladspainstancemono.h \
@@ -706,7 +860,8 @@
         $$BASE_DIR/src/ladspa/ladspapresetinstance.h \
         $$BASE_DIR/src/ladspa/ladspapresetknob.h \
         $$BASE_DIR/src/ladspa/ladspapresetmanager.h \
-        $$BASE_DIR/src/ladspa/ladspapresetslot.h
+        $$BASE_DIR/src/ladspa/ladspapresetslot.h \
+        $$BASE_DIR/src/ladspaview.h
     SOURCES += $$BASE_DIR/src/engine/engineladspa.cpp \
         $$BASE_DIR/src/dlgladspa.cpp \
         $$BASE_DIR/src/ladspaview.cpp \
@@ -732,25 +887,31 @@
 
 CONFIG(Vamp) {
 DEFINES += __VAMP__
-INCLUDEPATH += $$BASE_DIR/lib/vamp
-HEADERS += $$BASE_DIR/src/vamp/vampanalyser.h \
+INCLUDEPATH += $$BASE_DIR/lib/vamp-2.3
+HEADERS +=
+    $$BASE_DIR/src/vamp/vamppluginloader.h \
+    $$BASE_DIR/src/dlgprefbeats.h \
+    $$BASE_DIR/src/vamp/vampanalyser.h \
+    $$UI_DIR/ui_dlgprefbeatsdlg.h \
     $$BASE_DIR/src/analyservamptest.h \
     $$BASE_DIR/src/analyservampkeytest.h \
     $$BASE_DIR/lib/vamp/vamp/vamp.h \
-    $$BASE_DIR/lib/vamp/vamp-hostsdk/hostguard.h \
+    $$BASE_DIR/lib/vamp/vamp-hostsdk/hostguard.h
 SOURCES += $$BASE_DIR/src/vamp/vampanalyser.cpp \
     $$BASE_DIR/src/analyservamptest.cpp \
     $$BASE_DIR/src/analyservampkeytest.cpp \
     $$BASE_DIR/lib/vamp/src/vamp-hostsdk/PluginBufferingAdapter.cpp \
-	$$BASE_DIR/lib/vamp/src/vamp-hostsdk/PluginChannelAdapter.cpp \
-	$$BASE_DIR/lib/vamp/src/vamp-hostsdk/PluginHostAdapter.cpp \
-	$$BASE_DIR/lib/vamp/src/vamp-hostsdk/PluginInputDomainAdapter.cpp \
-	$$BASE_DIR/lib/vamp/src/vamp-hostsdk/PluginLoader.cpp \
-	$$BASE_DIR/lib/vamp/src/vamp-hostsdk/PluginSummarisingAdapter.cpp \
-	$$BASE_DIR/lib/vamp/src/vamp-hostsdk/PluginWrapper.cpp \
-	$$BASE_DIR/lib/vamp/src/vamp-hostsdk/RealTime.cpp \
-	$$BASE_DIR/lib/vamp/src/vamp-sdk/PluginAdapter.cpp \
-	$$BASE_DIR/lib/vamp/src/vamp-sdk/RealTime.cpp
+    $$BASE_DIR/lib/vamp/src/vamp-hostsdk/PluginChannelAdapter.cpp \
+    $$BASE_DIR/lib/vamp/src/vamp-hostsdk/PluginHostAdapter.cpp \
+    $$BASE_DIR/lib/vamp/src/vamp-hostsdk/PluginInputDomainAdapter.cpp \
+    $$BASE_DIR/lib/vamp/src/vamp-hostsdk/PluginLoader.cpp \
+    $$BASE_DIR/lib/vamp/src/vamp-hostsdk/PluginSummarisingAdapter.cpp \
+    $$BASE_DIR/lib/vamp/src/vamp-hostsdk/PluginWrapper.cpp \
+    $$BASE_DIR/lib/vamp/src/vamp-hostsdk/RealTime.cpp \
+    $$BASE_DIR/lib/vamp/src/vamp-sdk/PluginAdapter.cpp \
+    $$BASE_DIR/lib/vamp/src/vamp-sdk/RealTime.cpp
+FORMS += \
+    $$BASE_DIR/src/dlgprefbeatsdlg.ui
 }
 
 CONFIG(tonal) {
@@ -795,28 +956,55 @@
             -lfaad
     }
 }
+
+CONFIG(mad) {
+    DEFINES += __MAD__
+    HEADERS += \
+        $$BASE_DIR/src/soundsourcemp3.h
+    SOURCES += \
+        $$BASE_DIR/src/soundsourcemp3.cpp
+}
 CONFIG(vinylcontrol) {
     DEFINES += __VINYLCONTROL__
     HEADERS += \
-        $$BASE_DIR/lib/scratchlib/DAnalyse.h \
-        $$BASE_DIR/lib/xwax/timecoder.h
+        $$BASE_DIR/lib/xwax/timecoder.h \
+        $$BASE_DIR/src/dlgprefnovinyl.h \
+        $$BASE_DIR/src/dlgprefvinyl.h \
+        $$BASE_DIR/src/engine/enginevinylsoundemu.h \
+        $$BASE_DIR/src/engine/vinylcontrolcontrol.h \
+        $$BASE_DIR/src/vinylcontrol/steadypitch.h \
+        $$BASE_DIR/src/vinylcontrol/vinylcontrol.h \
+        $$BASE_DIR/src/vinylcontrol/vinylcontrolmanager.h \
+        $$BASE_DIR/src/vinylcontrol/vinylcontrolproxy.h \
+        $$BASE_DIR/src/vinylcontrol/vinylcontrolsignalwidget.h \
+        $$BASE_DIR/src/vinylcontrol/vinylcontrolxwax.h
     SOURCES += \
-        $$BASE_DIR/lib/scratchlib/DAnalyse.cpp
+        $$BASE_DIR/src/vinylcontrol/vinylcontrol.cpp \
+        $$BASE_DIR/src/vinylcontrol/vinylcontrolproxy.cpp \
+        $$BASE_DIR/src/vinylcontrol/vinylcontrolxwax.cpp \
+        $$BASE_DIR/src/dlgprefvinyl.cpp \
+        $$BASE_DIR/src/vinylcontrol/vinylcontrolsignalwidget.cpp \
+        $$BASE_DIR/src/vinylcontrol/vinylcontrolmanager.cpp \
+        $$BASE_DIR/src/vinylcontrol/steadypitch.cpp \
+        $$BASE_DIR/src/engine/vinylcontrolcontrol.cpp
 
-    INCLUDEPATH += $$BASE_DIR/lib/scratchlib \
-        $$BASE_DIR/lib/xwax
-    win32:SOURCES += $$BASE_DIR/lib/xwax/timecoder_win32.c
+    INCLUDEPATH += $$BASE_DIR/lib/xwax
+    win32:SOURCES += $$BASE_DIR/lib/xwax/timecoder_win32.cpp
+    win32:SOURCES += $$BASE_DIR/lib/xwax/lut.cpp
     !win32:SOURCES += $$BASE_DIR/lib/xwax/timecoder.c
+    !win32:SOURCES += $$BASE_DIR/lib/xwax/lut.c
 }
 !CONFIG(hifieq):CXXFLAGS += -D__LOFI__ \
     -D__NO_INTTYPES__
 CONFIG(shoutcast) {
     DEFINES += __SHOUTCAST__
     HEADERS += $$BASE_DIR/src/dlgprefshoutcast.h \
-        $$BASE_DIR/src/encodervorbis.h \
-        $$BASE_DIR/src/engine/engineshoutcast.h
+        $$BASE_DIR/src/recording/encodermp3.h \
+        $$BASE_DIR/src/recording/encodervorbis.h \
+        $$BASE_DIR/src/engine/engineshoutcast.h \
+        $$BASE_DIR/src/shoutcast/defs_shoutcast.h
     SOURCES += $$BASE_DIR/src/dlgprefshoutcast.cpp \
-        $$BASE_DIR/src/encodervorbis.cpp \
+        $$BASE_DIR/src/recording/encodervorbis.cpp \
         $$BASE_DIR/src/engine/engineshoutcast.cpp
     LIBS += shout \
         vorbisenc
@@ -826,7 +1014,6 @@
 # CONFIG(record) {
 #    DEFINES += __RECORD__
 #    HEADERS += $$BASE_DIR/src/recording/defs_recording.h \
-#        $$BASE_DIR/src/recording/enginerecord.h \
 #        $$BASE_DIR/src/recording/writeaudiofile.h \
 #        $$BASE_DIR/src/dlgprefrecord.h
 #    SOURCES += $$BASE_DIR/src/recording/enginerecord.cpp \
@@ -856,17 +1043,73 @@
         -logg
 }
 
+CONFIG(hid) {
+    HIDAPI_INTERNAL_PATH = $$BASE_DIR/../mixxx-winlib/lib/hidapi-0.8.0-pre
+    DEFINES += __HID__
+    SOURCES += \
+        $$BASE_DIR/src/controllers/hid/hidcontroller.cpp \
+        $$BASE_DIR/src/controllers/hid/hidenumerator.cpp \
+        $$BASE_DIR/src/controllers/hid/hidcontrollerpresetfilehandler.cpp
+    HEADERS += \
+        $$BASE_DIR/src/controllers/hid/hidblacklist.h \
+        $$BASE_DIR/src/controllers/hid/hidcontroller.h \
+        $$BASE_DIR/src/controllers/hid/hidcontrollerpreset.h \
+        $$BASE_DIR/src/controllers/hid/hidcontrollerpresetfilehandler.h \
+        $$BASE_DIR/src/controllers/hid/hidenumerator.h
+    win32 {
+        SOURCES += $$HIDAPI_INTERNAL_PATH/windows/hid.c
+    } macx {
+        SOURCES += $$HIDAPI_INTERNAL_PATH/mac/hid.c
+    } else {
+        SOURCES += $$HIDAPI_INTERNAL_PATH/linux/hid-libusb.c
+    }
+}
+
+CONFIG(bulk) {
+    DEFINES += __BULK__
+    SOURCES += \
+        $$BASE_DIR/src/controllers/bulk/bulkcontroller.cpp \
+        $$BASE_DIR/src/controllers/bulk/bulkenumerator.cpp
+    HEADERS += \
+        $$BASE_DIR/src/controllers/bulk/bulkcontroller.h \
+        $$BASE_DIR/src/controllers/bulk/bulkenumerator.h \
+        $$BASE_DIR/src/controllers/bulk/bulksupported.h
+    !CONFIG(hid) {
+        SOURCES += \
+        $$BASE_DIR/src/controllers/hid/hidcontrollerpresetfilehandler.cpp
+    }
+}
+
+CONFIG(PromoTracks) {
+    DEFINES += __PROMO__
+    HEADERS += \
+        $$BASE_DIR/src/library/promotracksfeature.h \
+        $$BASE_DIR/src/library/bundledsongswebview.h \
+        $$BASE_DIR/src/library/featuredartistswebview.h
+    SOURCES += \
+        $$BASE_DIR/src/library/promotracksfeature.cpp \
+        $$BASE_DIR/src/library/bundledsongswebview.cpp \
+        $$BASE_DIR/src/library/featuredartistswebview.cpp
+}
+
+CONFIG(hss1394) {
+    HEADERS += \
+        $$BASE_DIR/src/controllers/midi/hss1394controller.h \
+        $$BASE_DIR/src/controllers/midi/hss1394enumerator.h
+}
+
 # Copy Windows dependencies to DESTDIR.
 win32 {
     !exists($$DESTDIR):system( mkdir \"$$replace(DESTDIR, /,$$DIR_SEPARATOR)\" )
     # MinGW run-time
-    DLLs += $$(QTDIR)/../mingw/bin/mingwm10.dll $$(QTDIR)/../mingw/bin/libexpat-1.dll
+    DLLs += $$(QTDIR)/../mingw/bin/mingwm10.dll \
+        $$(QTDIR)/../mingw/bin/libstdc++-6.dll \
+        $$(QTDIR)/../mingw/bin/libexpat-1.dll
     CONFIG(m4a): DLLs += $$BASE_DIR/../mixxx-winlib/mp4v2/mingw-bin/libmp4v2-0.dll \
         $$BASE_DIR/../mixxx-winlib/libfaad2.dll
     # Qt4 libraries
     debug {
-        DLLs += $$(QTDIR)/bin/Qt3Supportd4.dll \
-            $$(QTDIR)/bin/QtCored4.dll \
+        DLLs += $$(QTDIR)/bin/QtCored4.dll \
             $$(QTDIR)/bin/QtGuid4.dll \
             $$(QTDIR)/bin/QtNetworkd4.dll \
             $$(QTDIR)/bin/QtSqld4.dll \
@@ -876,8 +1119,7 @@
         # include GNU Debugger in debug distros
         DLLs += $$(QTDIR)/../mingw/bin/gdb.exe
     } else {
-        DLLs += $$(QTDIR)/bin/Qt3Support4.dll \
-            $$(QTDIR)/bin/QtCore4.dll \
+        DLLs += $$(QTDIR)/bin/QtCore4.dll \
             $$(QTDIR)/bin/QtGui4.dll \
             $$(QTDIR)/bin/QtNetwork4.dll \
             $$(QTDIR)/bin/QtSql4.dll \
@@ -885,14 +1127,15 @@
             $$(QTDIR)/bin/QtOpenGL4.dll \
             $$(QTDIR)/bin/QtScript4.dll
     }
-    # mixxx-winlibs DLLs
-    DLLs += $$BASE_DIR/../mixxx-winlib/libogg.dll \
-        $$BASE_DIR/../mixxx-winlib/portaudio_x86.dll \
-#        $$BASE_DIR/../mixxx-winlib/portaudio.dll \
-        $$BASE_DIR/../mixxx-winlib/libsndfile-1.dll \
-#        $$BASE_DIR/../mixxx-winlib/sndfile.dll \
-        $$BASE_DIR/../mixxx-winlib/libvorbis.dll \
-        $$BASE_DIR/../mixxx-winlib/libvorbisfile.dll
+    # mixxx-mingw DLLs
+    DLLs += \
+        $$BASE_DIR/../mixxx-mingw/lib/libogg-0.dll \
+        $$BASE_DIR/../mixxx-mingw/lib/libportaudio-2.dll \
+        $$BASE_DIR/../mixxx-mingw/lib/libprotobuf-lite-8.dll \
+        $$BASE_DIR/../mixxx-mingw/lib/libsndfile-1.dll \
+        $$BASE_DIR/../mixxx-mingw/lib/libtag.dll \
+        $$BASE_DIR/../mixxx-mingw/lib/libvorbis-0.dll \
+        $$BASE_DIR/../mixxx-mingw/lib/libvorbisfile-3.dll
 
     # check if DLL exists at target, if not copy it there
     for(DLL, DLLs):!exists( $$DESTDIR/$$basename(DLL) ) {
@@ -937,9 +1180,9 @@
     # SH Usage: make -f Makefile.Debug nsis
     nsis.target = nsis
     exists($$BUILDDIR/gdb.exe):INCLUDE_GDB = -DINCLUDE_GDB
-    nsis.commands = \"$$(PROGRAMFILES)\NSIS\makensis.exe\" -NOCD -DGCC -DBINDIR=\"$$BUILDDIR\" -DBUILD_REV=\"$$VCS_BRANCH_NAME-$$VCS_REVNO\" $$INCLUDE_GDB build\\\\nsis\\\\Mixxx.nsi
+    nsis.commands = \"$$(PROGRAMFILES)\\\\NSIS\\\\makensis.exe\" -NOCD -DGCC -DBINDIR=\"$$BUILDDIR\" -DBUILD_REV=\"$$VCS_BRANCH_NAME-$$VCS_REVNO\" $$INCLUDE_GDB build\\\\nsis\\\\Mixxx.nsi
     # nsis.depends =
-    QMAKE_EXTRA_UNIX_TARGETS += nsis
+    QMAKE_EXTRA_TARGETS += nsis
 }
 
 # build.h
@@ -949,3 +1192,9 @@
 message( Generating src$${DIR_SEPARATOR}build.h with contents: $${LITERAL_HASH}define BUILD_REV '"'$$BUILD_REV'"' )
 system( echo $${LITERAL_HASH}define BUILD_REV '"'$$BUILD_REV'"'>src$${DIR_SEPARATOR}build.h )
 system( echo $${LITERAL_HASH}define BUILD_FLAGS '"'$$replace(DEFINES,__,)'"'>>src$${DIR_SEPARATOR}build.h )
+
+PROTOS += \
+    src/proto/waveform.proto \
+    src/proto/skin.proto \
+    src/proto/beats.proto
+include(protobuf.pri)
 
=== added file 'mixxx/build/qtcreator/protobuf.pri'
--- mixxx/build/qtcreator/protobuf.pri	1970-01-01 00:00:00 +0000
+++ mixxx/build/qtcreator/protobuf.pri	2013-06-13 22:06:31 +0000
@@ -0,0 +1,39 @@
+#
+# Qt qmake integration with Google Protocol Buffers compiler protoc
+#
+# To compile protocol buffers with qt qmake, specify PROTOS variable and
+# include this file
+#
+# Example:
+# LIBS += /usr/local/lib/libprotobuf.so
+# PROTOS = a.proto b.proto
+# include(protobuf.pri)
+#
+# By default protoc looks for .proto files (including the imported ones) in
+# the current directory where protoc is run. If you need to include additional
+# paths specify the PROTOPATH variable
+#
+# Found at http://www.kieltech.de/uweswiki/Google%20Protocol%20Buffers
+#
+
+PROTOPATH += .
+#PROTOPATH += $$BASE_DIR/src/proto
+PROTOPATH += ./src/proto
+PROTOPATHS =
+for(p, PROTOPATH):PROTOPATHS += --proto_path=$${p}
+
+protobuf_decl.name = protobuf header
+protobuf_decl.input = PROTOS
+protobuf_decl.output = ${QMAKE_FILE_BASE}.pb.h
+protobuf_decl.commands = protoc --cpp_out="." $${PROTOPATHS} ${QMAKE_FILE_NAME}
+protobuf_decl.variable_out = GENERATED_FILES
+QMAKE_EXTRA_COMPILERS += protobuf_decl
+
+protobuf_impl.name = protobuf implementation
+protobuf_impl.input = PROTOS
+protobuf_impl.output = ${QMAKE_FILE_BASE}.pb.cc
+protobuf_impl.depends = ${QMAKE_FILE_BASE}.pb.h
+protobuf_impl.commands = $$escape_expand(\n)
+protobuf_impl.variable_out = GENERATED_SOURCES
+QMAKE_EXTRA_COMPILERS += protobuf_impl
+
 
=== modified file 'mixxx/build/unused/create_mixxx_dmg.sh'
--- mixxx/build/unused/create_mixxx_dmg.sh	2009-02-18 18:46:42 +0000
+++ mixxx/build/unused/create_mixxx_dmg.sh	2013-06-13 22:06:31 +0000
@@ -24,7 +24,6 @@
 cp $QT4_PATH/lib/libQtCore.4.dylib .
 cp $QT4_PATH/lib/libQtOpenGL.4.dylib .
 cp $QT4_PATH/lib/libQtXml.4.dylib .
-cp $QT4_PATH/lib/libQt3Support.4.dylib .
 cp $QT4_PATH/lib/libQtNetwork.4.dylib .
 cp $QT4_PATH/lib/libQtSql.4.dylib .
 cp /usr/local/lib/libportaudio.2.dylib .
@@ -40,7 +39,6 @@
 install_name_tool -id @executable_path/../Frameworks/libQtGui.4.dylib libQtGui.4.dylib
 install_name_tool -id @executable_path/../Frameworks/libQtCore.4.dylib libQtCore.4.dylib
 install_name_tool -id @executable_path/../Frameworks/libQtOpenGL.4.dylib libQtOpenGL.4.dylib
-install_name_tool -id @executable_path/../Frameworks/libQt3Support.4.dylib libQt3Support.4.dylib
 install_name_tool -id @executable_path/../Frameworks/libQtXml.4.dylib libQtXml.4.dylib
 install_name_tool -id @executable_path/../Frameworks/libQtNetwork.4.dylib libQtNetwork.4.dylib
 install_name_tool -id @executable_path/../Frameworks/libQtSql.4.dylib libQtSql.4.dylib
@@ -60,7 +58,6 @@
 install_name_tool -change $QT4_PATH/lib/libQtGui.4.dylib @executable_path/../Frameworks/libQtGui.4.dylib $MIXXX_PATH
 install_name_tool -change $QT4_PATH/lib/libQtCore.4.dylib @executable_path/../Frameworks/libQtCore.4.dylib $MIXXX_PATH
 install_name_tool -change $QT4_PATH/lib/libQtOpenGL.4.dylib @executable_path/../Frameworks/libQtOpenGL.4.dylib $MIXXX_PATH
-install_name_tool -change $QT4_PATH/lib/libQt3Support.4.dylib @executable_path/../Frameworks/libQt3Support.4.dylib $MIXXX_PATH
 install_name_tool -change $QT4_PATH/lib/libQtXml.4.dylib @executable_path/../Frameworks/libQtXml.4.dylib $MIXXX_PATH
 install_name_tool -change $QT4_PATH/lib/libQtNetwork.4.dylib @executable_path/../Frameworks/libQtNetwork.4.dylib $MIXXX_PATH
 install_name_tool -change $QT4_PATH/lib/libQtSql.4.dylib @executable_path/../Frameworks/libQtSql.4.dylib $MIXXX_PATH
@@ -81,11 +78,6 @@
 install_name_tool -change $QT4_PATH/lib/libQtCore.4.dylib @executable_path/../Frameworks/libQtCore.4.dylib libQtSql.4.dylib
 install_name_tool -change $QT4_PATH/lib/libQtCore.4.dylib @executable_path/../Frameworks/libQtCore.4.dylib libQtNetwork.4.dylib
 install_name_tool -change $QT4_PATH/lib/libQtCore.4.dylib @executable_path/../Frameworks/libQtCore.4.dylib libQtXml.4.dylib
-install_name_tool -change $QT4_PATH/lib/libQtGui.4.dylib @executable_path/../Frameworks/libQtGui.4.dylib libQt3Support.4.dylib
-install_name_tool -change $QT4_PATH/lib/libQtCore.4.dylib @executable_path/../Frameworks/libQtCore.4.dylib libQt3Support.4.dylib
-install_name_tool -change $QT4_PATH/lib/libQtSql.4.dylib @executable_path/../Frameworks/libQtSql.4.dylib libQt3Support.4.dylib
-install_name_tool -change $QT4_PATH/lib/libQtXml.4.dylib @executable_path/../Frameworks/libQtXml.4.dylib libQt3Support.4.dylib
-install_name_tool -change $QT4_PATH/lib/libQtNetwork.4.dylib @executable_path/../Frameworks/libQtNetwork.4.dylib libQt3Support.4.dylib
 
 
 echo "Changing library ids within Vorbis lib"
@@ -123,7 +115,6 @@
     install_name_tool -change $QT4_PATH/lib/libQtGui.4.dylib @executable_path/../Frameworks/libQtGui.4.dylib $lib
     install_name_tool -change $QT4_PATH/lib/libQtSql.4.dylib @executable_path/../Frameworks/libQtSql.4.dylib $lib
     install_name_tool -change $QT4_PATH/lib/libQtXml.4.dylib @executable_path/../Frameworks/libQtXml.4.dylib $lib
-    install_name_tool -change $QT4_PATH/lib/libQtSvg.4.dylib @executable_path/../Frameworks/libQtSvg.4.dylib $lib
     install_name_tool -change $QT4_PATH/lib/libQtNetwork.4.dylib @executable_path/../Frameworks/libQtNetwork.4.dylib $lib
 done
 echo "Stripping debugging symbols from QT4 imageformat plugins"
@@ -143,7 +134,6 @@
     install_name_tool -change $QT4_PATH/lib/libQtGui.4.dylib @executable_path/../Frameworks/libQtGui.4.dylib $lib
     install_name_tool -change $QT4_PATH/lib/libQtSql.4.dylib @executable_path/../Frameworks/libQtSql.4.dylib $lib
     install_name_tool -change $QT4_PATH/lib/libQtXml.4.dylib @executable_path/../Frameworks/libQtXml.4.dylib $lib
-    install_name_tool -change $QT4_PATH/lib/libQtSvg.4.dylib @executable_path/../Frameworks/libQtSvg.4.dylib $lib
     install_name_tool -change $QT4_PATH/lib/libQtNetwork.4.dylib @executable_path/../Frameworks/libQtNetwork.4.dylib $lib
 done
 echo "Stripping debugging symbols from QT4 iconengine plugins"
 
=== modified file 'mixxx/build/unused/mixxx_dmg.sh'
--- mixxx/build/unused/mixxx_dmg.sh	2009-02-18 18:46:42 +0000
+++ mixxx/build/unused/mixxx_dmg.sh	2013-06-13 22:06:31 +0000
@@ -29,7 +29,7 @@
 #XXX we should really do this by like, declaring the frameworks and dylibs we're using at the top and then being smart about all this
 #FRAMEWORKS are shared libraries with an Apple-esque naming convention. DYLIBS are classical .so object files.
 #(ASSUMPTION: every dylibg is under /usr/local/lib. Anything under /usr/lib should be already on any systems we package for. The one exception to this might be things in /opt or /sw which darwinports and fink use :/... bah when we rewrite this for SCons we can make it smarter
-FRAMEWORKS="QtCore QtGui QtOpenGL QtXml Qt3Support QtNetwork QtSvg QtSql QtScript" #XXX should only do this if mixxx was built with scripting... oh well, a TODO
+FRAMEWORKS="QtCore QtGui QtOpenGL QtXml QtNetwork QtSql QtScript" #XXX should only do this if mixxx was built with scripting... oh well, a TODO
 DYLIBS="portaudio mad id3tag vorbis vorbisfile ogg sndfile FLAC"
 
 
@@ -67,11 +67,11 @@
     TAB=`printf "\t"` #because I can't write \t to get a tab in shell :(
     path=`otool -L $1 | tail +2 | cut -f 2 -d "$TAB" | cut -f 1 -d "(" | grep "$2\..*"` #SHELL_FUUUUUUU!!!!! (the last bit is important, it makes sure we only get the libs ending in the given name)
     if [ x"$path" = x ]; then
-	#echo "$1 does not reference $2, skipping";
-	echo -n;
+    #echo "$1 does not reference $2, skipping";
+    echo -n;
     else
-	#echo "DEBUG: " install_name_tool -change $path @executable_path/../Frameworks/$3 $1
-	install_name_tool -change $path @executable_path/../Frameworks/$3 $1
+    #echo "DEBUG: " install_name_tool -change $path @executable_path/../Frameworks/$3 $1
+    install_name_tool -change $path @executable_path/../Frameworks/$3 $1
     fi
 }
 
@@ -199,13 +199,6 @@
 reref_framework QtSql QtCore
 reref_framework QtNetwork QtCore
 reref_framework QtXml QtCore
-reref_framework QtSvg QtCore
-reref_framework QtSvg QtGui
-reref_framework Qt3Support QtGui
-reref_framework Qt3Support QtCore
-reref_framework Qt3Support QtSql
-reref_framework Qt3Support QtXml
-reref_framework Qt3Support QtNetwork
 reref_framework QtScript QtCore
 
 
@@ -238,17 +231,16 @@
     mkdir $plugin
     cd $plugin
     for lib in $libs; do
-	lib=lib$lib.dylib #yay
-	cp $QT4_PLUGINS/imageformats/$lib $lib
+    lib=lib$lib.dylib #yay
+    cp $QT4_PLUGINS/imageformats/$lib $lib
 
-	echo "Changing library ids within QT4 $plugin plugin: $lib"
-	relink_lib $lib
-	#XXX this list really needs to be generated on the fly from otool ....
-	reref $lib QtCore QtCore #not using reref_framework because I don't think it means the same thing. in reref $2 is a search string, $3 is a filename. reref_frameworks assumes both are identical.
-	reref $lib QtGui QtGui
-	reref $lib QtXml QtXml
-	reref $lib QtSvg QtSvg
-	reref $lib QtNetwork QtNetwork
+    echo "Changing library ids within QT4 $plugin plugin: $lib"
+    relink_lib $lib
+    #XXX this list really needs to be generated on the fly from otool ....
+    reref $lib QtCore QtCore #not using reref_framework because I don't think it means the same thing. in reref $2 is a search string, $3 is a filename. reref_frameworks assumes both are identical.
+    reref $lib QtGui QtGui
+    reref $lib QtXml QtXml
+    reref $lib QtNetwork QtNetwork
     done
     echo "Stripping debugging symbols from QT4 $plugin plugins"
     strip *.dylib
 
=== modified file 'mixxx/lib/fidlib-0.9.10/fidlib.c'
--- mixxx/lib/fidlib-0.9.10/fidlib.c	2011-07-25 01:49:54 +0000
+++ mixxx/lib/fidlib-0.9.10/fidlib.c	2013-06-13 22:06:31 +0000
@@ -259,10 +259,10 @@
 //
 
 // Macro for local inline routines that shouldn't be visible externally
-#ifdef T_MSVC
+#if defined(T_MINGW) || defined(T_MSVC)
  #define STATIC_INLINE static __inline
 #else
- #define STATIC_INLINE static inline 
+ #define STATIC_INLINE static inline
 #endif
 
 // MinGW and MSVC fixes
 
=== modified file 'mixxx/lib/soundtouch-1.6.0/FIFOSampleBuffer.cpp'
--- mixxx/lib/soundtouch-1.6.0/FIFOSampleBuffer.cpp	2011-07-24 21:06:29 +0000
+++ mixxx/lib/soundtouch-1.6.0/FIFOSampleBuffer.cpp	2013-06-13 22:06:31 +0000
@@ -44,6 +44,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <stdlib.h>
+#include <stdint.h>
 #include <memory.h>
 #include <string.h>
 #include <assert.h>
@@ -178,7 +179,7 @@
             throw std::runtime_error("Couldn't allocate memory!\n");
         }
         // Align the buffer to begin at 16byte cache line boundary for optimal performance
-        temp = (SAMPLETYPE *)(((ulong)tempUnaligned + 15) & (ulong)-16);
+        temp = (SAMPLETYPE *)(((uintptr_t)tempUnaligned + 15) & (uintptr_t)-16);
         if (samplesInBuffer)
         {
             memcpy(temp, ptrBegin(), samplesInBuffer * channels * sizeof(SAMPLETYPE));
 
=== modified file 'mixxx/lib/soundtouch-1.6.0/TDStretch.cpp'
--- mixxx/lib/soundtouch-1.6.0/TDStretch.cpp	2011-07-24 21:06:29 +0000
+++ mixxx/lib/soundtouch-1.6.0/TDStretch.cpp	2013-06-13 22:06:31 +0000
@@ -43,6 +43,7 @@
 
 #include <string.h>
 #include <limits.h>
+#include <stdint.h>
 #include <assert.h>
 #include <math.h>
 #include <float.h>
@@ -721,7 +722,7 @@
 
         pRefMidBufferUnaligned = new SAMPLETYPE[2 * overlapLength + 16 / sizeof(SAMPLETYPE)];
         // ensure that 'pRefMidBuffer' is aligned to 16 byte boundary for efficiency
-        pRefMidBuffer = (SAMPLETYPE *)((((ulong)pRefMidBufferUnaligned) + 15) & (ulong)-16);
+        pRefMidBuffer = (SAMPLETYPE *)((((uintptr_t)pRefMidBufferUnaligned) + 15) & (uintptr_t)-16);
     }
 }
 
 
=== modified file 'mixxx/lib/soundtouch-1.6.0/sse_optimized.cpp'
--- mixxx/lib/soundtouch-1.6.0/sse_optimized.cpp	2011-07-24 21:06:29 +0000
+++ mixxx/lib/soundtouch-1.6.0/sse_optimized.cpp	2013-06-13 22:06:31 +0000
@@ -53,6 +53,7 @@
 
 #include "cpu_detect.h"
 #include "STTypes.h"
+#include <stdint.h>
 
 using namespace soundtouch;
 
@@ -93,7 +94,7 @@
 
     #define _MM_LOAD    _mm_load_ps
 
-    if (((ulong)pV1) & 15) return -1e50;    // skip unaligned locations
+    if (((uintptr_t)pV1) & 15) return -1e50;    // skip unaligned locations
 
 #else
     // No cheating allowed, use unaligned load & take the resulting
@@ -285,7 +286,7 @@
     // Ensure that filter coeffs array is aligned to 16-byte boundary
     delete[] filterCoeffsUnalign;
     filterCoeffsUnalign = new float[2 * newLength + 4];
-    filterCoeffsAlign = (float *)(((unsigned long)filterCoeffsUnalign + 15) & (ulong)-16);
+    filterCoeffsAlign = (float *)(((uintptr_t)filterCoeffsUnalign + 15) & (uintptr_t)-16);
 
     fDivider = (float)resultDivider;
 
@@ -313,7 +314,7 @@
     assert(dest != NULL);
     assert((length % 8) == 0);
     assert(filterCoeffsAlign != NULL);
-    assert(((ulong)filterCoeffsAlign) % 16 == 0);
+    assert(((uintptr_t)filterCoeffsAlign) % 16 == 0);
 
     // filter is evaluated for two stereo samples with each iteration, thus use of 'j += 2'
     for (j = 0; j < count; j += 2)
 
=== modified file 'mixxx/lib/xwax/lut.cpp'
--- mixxx/lib/xwax/lut.cpp	2012-09-26 17:15:11 +0000
+++ mixxx/lib/xwax/lut.cpp	2013-06-13 22:06:31 +0000
@@ -17,6 +17,8 @@
  *
  */
 
+extern "C" {
+
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -43,7 +45,7 @@
     bytes = sizeof(struct slot) * nslots + sizeof(slot_no_t) * hashes;
 
     fprintf(stderr, "Lookup table has %d hashes to %d slots"
-            " (%d slots per hash, %zuKb)\n",
+            " (%d slots per hash, %u Kb)\n",
             hashes, nslots, nslots / hashes, bytes / 1024);
 
     lut->slot = (struct slot*)malloc(sizeof(struct slot) * nslots);
@@ -109,3 +111,5 @@
 
     return (unsigned)-1;
 }
+
+}; // extern "C"
 
=== modified file 'mixxx/lib/xwax/timecoder.h'
--- mixxx/lib/xwax/timecoder.h	2012-09-26 16:41:26 +0000
+++ mixxx/lib/xwax/timecoder.h	2013-06-13 22:06:31 +0000
@@ -29,6 +29,10 @@
 
 #define TIMECODER_CHANNELS 2
 
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
 typedef unsigned int bits_t;
 
 struct timecode_def {
@@ -142,4 +146,8 @@
     return (33.0 + 1.0 / 3) * tc->speed / 60;
 }
 
+#ifdef __cplusplus
+};
+#endif // __cplusplus
+
 #endif
 
=== modified file 'mixxx/lib/xwax/timecoder_win32.cpp'
--- mixxx/lib/xwax/timecoder_win32.cpp	2012-11-03 13:45:25 +0000
+++ mixxx/lib/xwax/timecoder_win32.cpp	2013-06-13 22:06:31 +0000
@@ -17,6 +17,8 @@
  *
  */
 
+extern "C" {
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -613,3 +615,5 @@
 
     return -1;
 }
+
+}; // extern "C"
 
=== modified file 'mixxx/src/SConscript'
--- mixxx/src/SConscript	2013-06-13 03:13:53 +0000
+++ mixxx/src/SConscript	2013-06-13 22:06:31 +0000
@@ -40,11 +40,15 @@
         str_list.append('#define VER_FILEVERSION             ')
         # Remove anything after ~ or - in the version number and replace the dots with commas
         str_list.append(mixxx_version.partition('~')[0].partition('-')[0].replace('.',','))
-        str_list.append(','+str(vcs_revision)+'\n')
+        if vcs_revision:
+            str_list.append(','+str(vcs_revision))
+        str_list.append('\n')
 
         str_list.append('#define VER_PRODUCTVERSION          ')
         str_list.append(mixxx_version.partition('~')[0].partition('-')[0].replace('.',','))
-        str_list.append(','+str(vcs_revision)+'\n')
+        if vcs_revision:
+            str_list.append(','+str(vcs_revision))
+        str_list.append('\n')
 
         import datetime
         now = datetime.datetime.now()
@@ -58,9 +62,37 @@
         fo.write(''.join(str_list))
         fo.close()
 
-        mixxx_bin = env.Program('mixxx',
-                            [sources, env.RES('#src/mixxx.rc')],
-                            LINKCOM = [env['LINKCOM'], 'mt.exe -nologo -manifest ${TARGET}.manifest -outputresource:$TARGET;1'])
+        if build.crosscompile:
+            # Taken from http://scons.org/wiki/EmbedManifestIntoTarget
+            manifest_template = '''\
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level='asInvoker' uiAccess='false' />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
+'''
+            manifest_path = "mixxx.manifest"
+            fout = open (manifest_path, "w");
+            fout.write (manifest_template)
+            fout.close()
+            fout = open ("manifest.rc", "w");
+            fout.write ("""
+#include "winuser.h"
+1 RT_MANIFEST  %s
+""" % manifest_path)
+            fout.close()
+            mixxx_bin = env.Program('mixxx',
+                [sources, env.RES('#src/mixxx.rc'),
+                env.RES("manifest.rc")]);
+        else:
+            mixxx_bin = env.Program('mixxx',
+                               [sources, env.RES('#src/mixxx.rc')],
+                               LINKCOM = [env['LINKCOM'], 'mt.exe -nologo -manifest ${TARGET}.manifest -outputresource:$TARGET;1'])
 else:
         mixxx_bin = env.Program('mixxx', sources)
 
@@ -192,9 +224,36 @@
         # skip the MSVC DLLs incase they're in there too
         dll_files = Glob('%s/[!"msvc"]*.dll' % mixxx_winlib_path)
 elif build.crosscompile and build.platform_is_windows and build.toolchain_is_gnu:
-        # We're cross-compiling, grab these from the crosscompile bin
-        # folder. How should we be doing this?
-        dll_files = Glob('#/../../mixxx-win%slib-crossmingw' % build.bitwidth)
+        # We're cross-compiling; grab these from the crosscompile bin
+        # folder.
+        # TODO(XXX): Rebuild the dependent libraries as static, and
+        # figure out how to tell scons to prefer static libraries.
+        crosscompile_bin_path = os.path.join (build.crosscompile_root, \
+            'bin')
+        dll_files = [ os.path.join (crosscompile_bin_path, \
+            s) for s in [ 'libchromaprint.dll', 'libfftw3-3.dll',
+                'libFLAC-8.dll', 'libid3tag-0.dll', 'libogg-0.dll',
+                'libportaudio-2.dll', 'libportmidi_s.dll',
+                'libprotobuf-lite-7.dll', 'libsndfile-1.dll',
+                'libsqlite3-0.dll', 'libstdc++-6.dll', 'libtag.dll',
+                'libvorbis-0.dll', 'libvorbisenc-2.dll',
+                'libvorbisfile-3.dll', 'pthreadGC2.dll' ] ];
+
+        # The shoutcast build requires a few more DLLs.
+        if int(build.flags['shoutcast']):
+            dll_files += [ os.path.join (crosscompile_bin_path, \
+                s) for s in [ 'libshout-3.dll', 'libspeex-1.dll',
+                'libtheora-0.dll' ] ];
+
+        # The ffmpeg build requires a few more DLLs.
+        if int(build.flags['ffmpeg']):
+            dll_files += [ os.path.join (crosscompile_bin_path, \
+                s) for s in [ 'avcodec-54.dll', 'avformat-54.dll',
+                'avutil-51.dll', 'swresample-0.dll', 'libbz2-1.dll',
+                'libgcrypt-11.dll', 'libgpg-error-0.dll',
+                'libgnutls-26.dll', 'libp11-kit-0.dll',
+                'libtasn1-3.dll' ] ];
+
 elif build.crosscompile and build.platform_is_osx:
         # Glob appropriate dylib files. We have 4 different library types,
         # x86_64, x86, powerpc, powerpc64
@@ -202,40 +261,63 @@
 else:
         dll_files = list() # dll_files += on the next line required dll_files to exist
 
-if build.msvcdebug:
-    dll_files += Split("""$QTDIR/lib/QtWebKitd4.dll""")
-else:
-    dll_files += Split("""$QTDIR/lib/QtWebKit4.dll""")
+if int(build.flags['vinylcontrol']) or int(build.flags['hid']):
+    if build.crosscompile and build.platform_is_windows and build.toolchain_is_gnu:
+        # mingw{32,64}-phonon only has one DLL.
+        dll_files += Split("""$QTDIR/bin/libphonon.dll""")
+    else:
+        if build.msvcdebug:
+            dll_files += Split("""$QTDIR/lib/phonond4.dll""")
+        else:
+            dll_files += Split("""$QTDIR/lib/phonon4.dll""")
 
 if build.msvcdebug:
-    dll_files += Split("""$QTDIR/lib/QtCored4.dll
-                          $QTDIR/lib/QtGuid4.dll
-                          $QTDIR/lib/QtNetworkd4.dll
-                          $QTDIR/lib/QtOpenGLd4.dll
-                          $QTDIR/lib/QtSqld4.dll
-                          $QTDIR/lib/QtXmld4.dll
-                          $QTDIR/lib/QtXmlPatternsd4.dll
-                          $QTDIR/lib/QtSvgd4.dll
-                          $QTDIR/lib/phonond4.dll
-                          $QTDIR/lib/QtScriptd4.dll""")
+    if build.crosscompile and build.platform_is_windows and build.toolchain_is_gnu:
+        dll_files += Split("""$QTDIR/bin/QtCored4.dll
+                              $QTDIR/bin/QtGuid4.dll
+                              $QTDIR/bin/QtNetworkd4.dll
+                              $QTDIR/bin/QtOpenGLd4.dll
+                              $QTDIR/bin/QtSqld4.dll
+                              $QTDIR/bin/QtXmld4.dll
+                              $QTDIR/bin/QtScriptd4.dll""")
+    else:
+        dll_files += Split("""$QTDIR/lib/QtCored4.dll
+                              $QTDIR/lib/QtGuid4.dll
+                              $QTDIR/lib/QtNetworkd4.dll
+                              $QTDIR/lib/QtOpenGLd4.dll
+                              $QTDIR/lib/QtSqld4.dll
+                              $QTDIR/lib/QtXmld4.dll
+                              $QTDIR/lib/QtScriptd4.dll""")
 else:
     # if not int(build.flags['staticlibs']):
-    dll_files += Split("""$QTDIR/lib/QtCore4.dll
-                          $QTDIR/lib/QtGui4.dll
-                          $QTDIR/lib/QtNetwork4.dll
-                          $QTDIR/lib/QtOpenGL4.dll
-                          $QTDIR/lib/QtSql4.dll
-                          $QTDIR/lib/QtXml4.dll
-                          $QTDIR/lib/QtXmlPatterns4.dll
-                          $QTDIR/lib/QtSvg4.dll
-                          $QTDIR/lib/phonon4.dll
-                          $QTDIR/lib/QtScript4.dll""")
+    if build.crosscompile and build.platform_is_windows and build.toolchain_is_gnu:
+        dll_files += Split("""$QTDIR/bin/QtCore4.dll
+                              $QTDIR/bin/QtGui4.dll
+                              $QTDIR/bin/QtNetwork4.dll
+                              $QTDIR/bin/QtOpenGL4.dll
+                              $QTDIR/bin/QtSql4.dll
+                              $QTDIR/bin/QtXml4.dll
+                              $QTDIR/bin/QtScript4.dll""")
+    else:
+        dll_files += Split("""$QTDIR/lib/QtCore4.dll
+                              $QTDIR/lib/QtGui4.dll
+                              $QTDIR/lib/QtNetwork4.dll
+                              $QTDIR/lib/QtOpenGL4.dll
+                              $QTDIR/lib/QtSql4.dll
+                              $QTDIR/lib/QtXml4.dll
+                              $QTDIR/lib/QtScript4.dll""")
 
 if int(flags.get('sqlitedll', 0)):
-    if build.msvcdebug:
-        sqldll_files = Split("""$QTDIR/plugins/sqldrivers/qsqlited4.dll""") #Qt SQLite plugin
+    if build.crosscompile and build.platform_is_windows and build.toolchain_is_gnu:
+        if build.msvcdebug:
+            sqldll_files = Split("""$QTDIR/lib/qt4/plugins/sqldrivers/qsqlited4.dll""") #Qt SQLite plugin
+        else:
+            sqldll_files = Split("""$QTDIR/lib/qt4/plugins/sqldrivers/qsqlite4.dll""") #Qt SQLite plugin
     else:
-        sqldll_files = Split("""$QTDIR/plugins/sqldrivers/qsqlite4.dll""") #Qt SQLite plugin
+        if build.msvcdebug:
+            sqldll_files = Split("""$QTDIR/plugins/sqldrivers/qsqlited4.dll""") #Qt SQLite plugin
+        else:
+            sqldll_files = Split("""$QTDIR/plugins/sqldrivers/qsqlite4.dll""") #Qt SQLite plugin
 
 if build.platform_is_linux or build.platform_is_bsd:
         flags['prefix'] = ARGUMENTS.get('prefix', '/usr/local')
@@ -256,7 +338,7 @@
                 binary = env.Install(unix_bin_path, binary_files)
                 resource = env.Install(os.path.join(unix_share_path, 'mixxx'), resource_files)
                 skins = env.Install(os.path.join(unix_share_path, 'mixxx', 'skins'), skin_files)
-		vamp_plugin =  env.Install(
+                vamp_plugin =  env.Install(
                         os.path.join(unix_lib_path, 'mixxx', 'plugins', 'vamp'),
                         libmixxxminimal_vamp_plugin)
 
@@ -288,7 +370,7 @@
                 env.Alias('install', dotdesktop)
                 env.Alias('install', icon)
                 env.Alias('install', promotracks)
-		env.Alias('install', vamp_plugin)
+                env.Alias('install', vamp_plugin)
 
                 #Delete the old Mixxx installation (because SCONS won't overwrite it)
                 #if 'install' in COMMAND_LINE_TARGETS:
@@ -325,7 +407,7 @@
         for x in soundsource_plugins:
                 plugins.append(x.get_abspath())
 
-	for x in mixxxminimal_plugins:
+        for x in mixxxminimal_plugins:
                 plugins.append(x.get_abspath())
 
         resource_map = {}
@@ -450,7 +532,7 @@
         env.Alias('mixxx', docs)
         env.Alias('mixxx', dlls)
         env.Alias('mixxx', soundsource_plugins)
-	env.Alias('mixxx', vamp_plugins)
+        env.Alias('mixxx', vamp_plugins)
         #env.Alias('mixxx', icon)
         env.Alias('mixxx', binary)
 
@@ -496,7 +578,7 @@
         print "YOU ARE ABOUT TO PACKAGE A DEBUG BUILD!!"
         print
     print "Binary has size ",
-    if build.platform_is_windows:
+    if build.platform_is_windows and not build.crosscompile:
         os.system('for %I in ('+dist_dir+'\mixxx.exe) do @echo %~zI')
     else:
         os.system('ls -lh '+dist_dir+'/mixxx.exe | cut -d \' \' -f 5')
@@ -511,13 +593,13 @@
     print exe_name
     print
     print "Top line of README, check version:"
-    if build.platform_is_windows:
+    if build.platform_is_windows and not build.crosscompile:
         os.system('for /l %l in (1,1,1) do @for /f "tokens=1,2* delims=:" %a in (\'findstr /n /r "^" README ^| findstr /r "^%l:"\') do @echo %b')
     else:
         os.system('head -n 1 README')
     print
     print "Top 2 lines of LICENSE, check version and copyright dates:"
-    if build.platform_is_windows:
+    if build.platform_is_windows and not build.crosscompile:
         os.system('for /l %l in (1,1,2) do @for /f "tokens=1,2* delims=:" %a in (\'findstr /n /r "^" LICENSE ^| findstr /r "^%l:"\') do @echo %b')
     else:
         os.system('head -n 2 LICENSE')
@@ -576,14 +658,23 @@
             print "Cannot find NSIS. Do you have it installed?"
         else:
             # Call the NSIS build
-            buildwin64 = "/Dx64=1" if build.machine_is_64bit else ''
-            command = '%(path)s /DPACKAGE_NAME=%(package_name)s /DPRODUCT_VERSION=%(version)s /DQTDIR=%(qtpath)s /DWINLIB_PATH=%(winlibpath)s %(64bit)s build\\nsis\\Mixxx.nsi' % \
-                {'path': nsis_path,
-                 'package_name': exe_name,
-                 'version': mixxx_version,
-                 'qtpath': os.environ['QTDIR'],
-                 'winlibpath': mixxx_winlib_path,
-                 '64bit': buildwin64}
+            if build.crosscompile:
+                buildwin64 = "-Dx64=1" if build.machine_is_64bit else ''
+                command = '%(path)s -DPACKAGE_NAME=%(package_name)s -DPRODUCT_VERSION=%(version)s -DQTDIR=%(qtpath)s %(64bit)s build/nsis/Mixxx.nsi' % \
+                    {'path': nsis_path,
+                     'package_name': exe_name,
+                     'version': mixxx_version,
+                     'qtpath': os.environ['QTDIR'],
+                     '64bit': buildwin64}
+            else:
+                buildwin64 = "/Dx64=1" if build.machine_is_64bit else ''
+                command = '%(path)s /DPACKAGE_NAME=%(package_name)s /DPRODUCT_VERSION=%(version)s /DQTDIR=%(qtpath)s /DWINLIB_PATH=%(winlibpath)s %(64bit)s build\\nsis\\Mixxx.nsi' % \
+                    {'path': nsis_path,
+                     'package_name': exe_name,
+                     'version': mixxx_version,
+                     'qtpath': os.environ['QTDIR'],
+                     'winlibpath': mixxx_winlib_path,
+                     '64bit': buildwin64}
             print "Using command: " + command
             subprocess.check_call(command)
     else:
 
=== modified file 'mixxx/src/analyserbeats.cpp'
--- mixxx/src/analyserbeats.cpp	2012-12-22 08:17:20 +0000
+++ mixxx/src/analyserbeats.cpp	2013-06-13 22:06:31 +0000
@@ -139,6 +139,7 @@
     }
     qDebug() << "Beat calculation started with plugin" << pluginID;
 
+	#ifdef __VAMP__
     m_pVamp = new VampAnalyser(m_pConfig);
     m_bShouldAnalyze = m_pVamp->Init(library, pluginID, m_iSampleRate, totalSamples,
                                      m_bPreferencesFastAnalysis);
@@ -146,6 +147,7 @@
         delete m_pVamp;
         m_pVamp = NULL;
     }
+	#endif // __VAMP__
     return m_bShouldAnalyze;
 }
 
@@ -239,6 +241,7 @@
 
 
 void AnalyserBeats::process(const CSAMPLE *pIn, const int iLen) {
+	#ifdef __VAMP__
     if (!m_bShouldAnalyze || m_pVamp == NULL)
         return;
     m_bShouldAnalyze = m_pVamp->Process(pIn, iLen);
@@ -246,6 +249,7 @@
         delete m_pVamp;
         m_pVamp = NULL;
     }
+	#endif // __VAMP__
 }
 
 void AnalyserBeats::cleanup(TrackPointer tio)
@@ -265,10 +269,12 @@
 
     // Call End() here, because the number of total samples may have been
     // estimated incorrectly.
+    QVector<double> beats;
+	#ifdef __VAMP__
     bool success = m_pVamp->End();
     qDebug() << "Beat Calculation" << (success ? "complete" : "failed");
 
-    QVector<double> beats = m_pVamp->GetInitFramesVector();
+    beats = m_pVamp->GetInitFramesVector();
     delete m_pVamp;
     m_pVamp = NULL;
 
@@ -276,6 +282,7 @@
         qDebug() << "Could not detect beat positions from Vamp.";
         return;
     }
+	#endif // __VAMP__
 
     QHash<QString, QString> extraVersionInfo;
     extraVersionInfo["vamp_plugin_id"] = m_pluginId;
 
=== modified file 'mixxx/src/analyserqueue.cpp'
--- mixxx/src/analyserqueue.cpp	2013-05-18 16:23:08 +0000
+++ mixxx/src/analyserqueue.cpp	2013-06-13 22:06:31 +0000
@@ -404,8 +404,10 @@
 
     ret->addAnalyser(new AnalyserWaveform(_config));
     ret->addAnalyser(new AnalyserGain(_config));
+	#ifdef __VAMP__
     VampAnalyser::initializePluginPaths();
     ret->addAnalyser(new AnalyserBeats(_config));
+	#endif // __VAMP__
     //ret->addAnalyser(new AnalyserVampKeyTest(_config));
 
     ret->start(QThread::IdlePriority);
@@ -419,8 +421,10 @@
 
     ret->addAnalyser(new AnalyserWaveform(_config));
     ret->addAnalyser(new AnalyserGain(_config));
+	#ifdef __VAMP__
     VampAnalyser::initializePluginPaths();
     ret->addAnalyser(new AnalyserBeats(_config));
+	#endif // __VAMP__
     //ret->addAnalyser(new AnalyserVampKeyTest(_config));
 
     ret->start(QThread::IdlePriority);
 
=== modified file 'mixxx/src/controllers/controllermanager.cpp'
--- mixxx/src/controllers/controllermanager.cpp	2013-03-16 21:58:40 +0000
+++ mixxx/src/controllers/controllermanager.cpp	2013-06-13 22:06:31 +0000
@@ -78,7 +78,9 @@
     m_pPresetInfoManager = new PresetInfoEnumerator(m_pConfig);
 
     // Instantiate all enumerators
+#ifdef __PORTMIDI__
     m_enumerators.append(new PortMidiEnumerator());
+#endif // __PORTMIDI__
 #ifdef __HSS1394__
     m_enumerators.append(new Hss1394Enumerator());
 #endif
 
=== modified file 'mixxx/src/dlgprefbeats.cpp'
--- mixxx/src/dlgprefbeats.cpp	2012-12-22 08:17:20 +0000
+++ mixxx/src/dlgprefbeats.cpp	2013-06-13 22:06:31 +0000
@@ -14,18 +14,24 @@
 #include <QVector>
 #include <QList>
 #include <QtCore>
+#ifdef __VAMP__
 #include <vamp-hostsdk/vamp-hostsdk.h>
+#endif // __VAMP__
 
 #include "track/beat_preferences.h"
 #include "controlobject.h"
 #include "dlgprefbeats.h"
+#ifdef __VAMP__
 #include "vamp/vampanalyser.h"
+#endif // __VAMP__
 
+#ifdef __VAMP__
 using Vamp::Plugin;
 using Vamp::PluginHostAdapter;
 using Vamp::HostExt::PluginLoader;
 using Vamp::HostExt::PluginWrapper;
 using Vamp::HostExt::PluginInputDomainAdapter;
+#endif // __VAMP__
 
 DlgPrefBeats::DlgPrefBeats(QWidget *parent, ConfigObject<ConfigValue> *_config)
         : QWidget(parent),
@@ -225,6 +231,7 @@
 }
 
 void DlgPrefBeats::populate() {
+#ifdef __VAMP__
     VampAnalyser::initializePluginPaths();
     m_listIdentifier.clear();
     m_listName.clear();
@@ -269,5 +276,6 @@
         }
     }
     // m_selectedAnalyser = selectedAnalyser;
+#endif // __VAMP__
 }
 
 
=== modified file 'mixxx/src/dlgprefbeats.h'
--- mixxx/src/dlgprefbeats.h	2012-12-22 08:17:20 +0000
+++ mixxx/src/dlgprefbeats.h	2013-06-13 22:06:31 +0000
@@ -10,7 +10,9 @@
 #include <QList>
 
 #include "ui_dlgprefbeatsdlg.h"
+#ifdef __VAMP__
 #include "vamp/vamppluginloader.h"
+#endif // __VAMP__
 #include "configobject.h"
 
 class DlgPrefBeats : public QWidget, public Ui::DlgBeatsDlg {
 
=== modified file 'mixxx/src/dlgpreferences.cpp'
--- mixxx/src/dlgpreferences.cpp	2013-05-12 10:15:29 +0000
+++ mixxx/src/dlgpreferences.cpp	2013-06-13 22:06:31 +0000
@@ -87,8 +87,10 @@
     m_wcrossfader = new DlgPrefCrossfader(this, config);
     addPageWidget(m_wcrossfader);
 
+	#ifdef __VAMP__
     m_wbeats = new DlgPrefBeats(this, config);
     addPageWidget (m_wbeats);
+	#endif // __VAMP__
     m_wreplaygain = new DlgPrefReplayGain(this, config);
     addPageWidget(m_wreplaygain);
     m_wrecord = new DlgPrefRecord(this, config);
 
=== modified file 'mixxx/src/library/basesqltablemodel.cpp'
--- mixxx/src/library/basesqltablemodel.cpp	2013-05-22 19:42:09 +0000
+++ mixxx/src/library/basesqltablemodel.cpp	2013-06-13 22:06:31 +0000
@@ -201,10 +201,10 @@
     // table query has succeeded. See Bug #1090888.
     // TODO(rryan) we could edit the table in place instead of clearing it?
     if (m_rowInfo.size() > 0) {
-        beginRemoveRows(QModelIndex(), 0, m_rowInfo.size()-1);
+        beginResetModel();
         m_rowInfo.clear();
         m_trackIdToRows.clear();
-        endRemoveRows();
+        endResetModel();
     }
 
     QSqlRecord record = query.record();
 
=== modified file 'mixxx/src/library/browse/foldertreemodel.cpp'
--- mixxx/src/library/browse/foldertreemodel.cpp	2012-07-18 21:22:53 +0000
+++ mixxx/src/library/browse/foldertreemodel.cpp	2013-06-13 22:06:31 +0000
@@ -1,7 +1,7 @@
 #if defined (__WINDOWS__)
 #include <windows.h>
-#include <Shellapi.h>
-#include <Shobjidl.h>
+#include <shellapi.h>
+#include <shlobj.h>
 #else
 #include <sys/types.h>
 #include <sys/stat.h>
 
=== modified file 'mixxx/src/library/treeitemmodel.cpp'
--- mixxx/src/library/treeitemmodel.cpp	2013-05-22 19:14:25 +0000
+++ mixxx/src/library/treeitemmodel.cpp	2013-06-13 22:06:31 +0000
@@ -138,6 +138,9 @@
  * make sure you have initialized
  */
 bool TreeItemModel::insertRows(QList<TreeItem*> &data, int position, int rows, const QModelIndex &parent) {
+    if (rows == 0)
+        return true;
+
     TreeItem *parentItem = getItem(parent);
     bool success;
 
@@ -149,6 +152,9 @@
 }
 
 bool TreeItemModel::removeRows(int position, int rows, const QModelIndex &parent) {
+    if (rows == 0)
+        return true;
+
     TreeItem *parentItem = getItem(parent);
     bool success = true;
 
 
=== modified file 'mixxx/src/sampleutil.cpp'
--- mixxx/src/sampleutil.cpp	2011-12-08 11:47:54 +0000
+++ mixxx/src/sampleutil.cpp	2013-06-13 22:06:31 +0000
@@ -7,8 +7,9 @@
 
 #ifdef __WINDOWS__
 #pragma intrinsic(fabs)sc
-typedef __int64 int64_t;
-typedef __int32 int32_t;
+#include <QtGlobal>
+typedef qint64 int64_t;
+typedef qint32 int32_t;
 #endif
 
 #include <QtDebug>
 
=== modified file 'mixxx/src/util/stat.h'
--- mixxx/src/util/stat.h	2012-12-24 09:54:25 +0000
+++ mixxx/src/util/stat.h	2013-06-13 22:06:31 +0000
@@ -5,7 +5,7 @@
 #include <QVector>
 #include <QString>
 
-class StatReport;
+struct StatReport;
 
 class Stat {
   public:
 
=== modified file 'mixxx/src/vamp/vampanalyser.h'
--- mixxx/src/vamp/vampanalyser.h	2012-04-12 05:48:40 +0000
+++ mixxx/src/vamp/vampanalyser.h	2013-06-13 22:06:31 +0000
@@ -11,9 +11,10 @@
 #include <QString>
 #include <QList>
 #include <QVector>
+#ifdef __VAMP__
 #include <vamp-hostsdk/vamp-hostsdk.h>
-
 #include "vamp/vamppluginloader.h"
+#endif // __VAMP__
 #include "sampleutil.h"
 #include "configobject.h"
 
@@ -43,6 +44,7 @@
   private:
     void SelectOutput(const int outputnumber);
 
+	#ifdef __VAMP__
     Vamp::HostExt::PluginLoader::PluginKey m_key;
     int m_iSampleCount, m_iOUT, m_iRemainingSamples,
         m_iBlockSize, m_iStepSize, m_rate, m_iOutput;
@@ -50,6 +52,7 @@
     Vamp::Plugin *m_plugin;
     Vamp::Plugin::ParameterList mParameters;
     Vamp::Plugin::FeatureList m_Results;
+	#endif // __VAMP__
 
     bool m_bDoNotAnalyseMoreSamples;
     bool m_FastAnalysisEnabled;
 
=== modified file 'mixxx/src/widget/wspinny.cpp'
--- mixxx/src/widget/wspinny.cpp	2013-05-19 09:50:56 +0000
+++ mixxx/src/widget/wspinny.cpp	2013-06-13 22:06:31 +0000
@@ -349,6 +349,7 @@
 void WSpinny::updateVinylControlSignalEnabled(double enabled) {
     m_bSignalActive = enabled;
 
+#ifdef __VINYLCONTROL__
     if (enabled && m_iVinylInput != -1) {
         m_pVCManager->addSignalQualityListener(this);
     } else {
@@ -356,6 +357,10 @@
         // fill with transparent black
         m_qImage.fill(qRgba(0,0,0,0));
     }
+#else // __VINYLCONTROL__
+    // fill with transparent black
+    m_qImage.fill(qRgba(0,0,0,0));
+#endif // __VINYLCONTROL__
 }
 
 void WSpinny::updateVinylControlEnabled(double enabled) {
@@ -470,16 +475,21 @@
 void WSpinny::showEvent(QShowEvent* event) {
     // If we want to draw the VC signal on this widget then register for
     // updates.
+    #ifdef __VINYLCONTROL__
     if (m_bSignalActive && m_iVinylInput != -1 && m_pVCManager) {
         m_pVCManager->addSignalQualityListener(this);
     }
+    #endif // __VINYLCONTROL__
 }
 
 void WSpinny::hideEvent(QHideEvent* event) {
     // When we are hidden we do not want signal quality updates.
+    #ifdef __VINYLCONTROL__
     if (m_pVCManager) {
         m_pVCManager->removeSignalQualityListener(this);
     }
+    #endif // __VINYLCONTROL__
+
     // fill with transparent black
     m_qImage.fill(qRgba(0,0,0,0));
 }
 
=== modified file 'mixxx/vamp-plugins/SConscript'
--- mixxx/vamp-plugins/SConscript	2013-06-13 02:53:33 +0000
+++ mixxx/vamp-plugins/SConscript	2013-06-13 22:06:31 +0000
@@ -67,7 +67,7 @@
     env = conf.Finish()
     if build.platform_is_linux:
         env["LINKFLAGS"].append("-Wl,--version-script=vamp-plugins/vamp-plugin.map")
-    if build.platform_is_windows:
+    if build.platform_is_windows and not build.crosscompile:
         env["LINKFLAGS"].remove("/entry:mainCRTStartup")
         env["LINKFLAGS"].append("/EXPORT:vampGetPluginDescriptor")
         #this will reduce DLL dependencies; no need to depend on MSVCRT.dll, etc
 
=== modified file 'mixxx/vamp-plugins/dsp/DownBeat.h'
--- mixxx/vamp-plugins/dsp/DownBeat.h	2011-10-30 19:57:22 +0000
+++ mixxx/vamp-plugins/dsp/DownBeat.h	2013-06-13 22:06:31 +0000
@@ -18,7 +18,7 @@
 
 #include <vector>
 
-#ifdef __LINUX__
+#ifdef __GNUC__
 #include <stddef.h>  //resolves size_t compile error on Ubuntu 11.10
 #endif
 
 
=== modified file 'mixxx/vamp-plugins/dsp/GetKeyMode.h'
--- mixxx/vamp-plugins/dsp/GetKeyMode.h	2012-07-07 23:09:24 +0000
+++ mixxx/vamp-plugins/dsp/GetKeyMode.h	2013-06-13 22:06:31 +0000
@@ -39,7 +39,7 @@
     #ifdef WIN64
         #define	lrint(dbl)		((int)(dbl))
         #define	lrintf(flt)		((int)(flt))
-    #else
+    #elif !defined (__GNUC__)
 
         /*	Win32 doesn't seem to have these functions. 
         **	Therefore implement inline versions of them here.
 
=== modified file 'mixxx/vamp-plugins/dsp/TempoTrackV2.h'
--- mixxx/vamp-plugins/dsp/TempoTrackV2.h	2011-10-30 19:57:22 +0000
+++ mixxx/vamp-plugins/dsp/TempoTrackV2.h	2013-06-13 22:06:31 +0000
@@ -18,7 +18,7 @@
 #define TEMPOTRACKV2_H
 
 #include <vector>
-#ifdef __LINUX__
+#ifdef __GNUC__
 #include <stddef.h>  //resolves size_t compile error on Ubuntu 11.10
 #endif