Skin layout revamp dev

.travis.yml

@@ -10,7 +10,10 @@ sudo: false
   # install dependencies
 addons:
   apt:
+    sources:
+      - ubuntu-toolchain-r-test
     packages:
+      - g++-4.8
       - scons
       - libqt4-dev
       - libqt4-sql-sqlite
@@ -35,6 +38,8 @@ before_install:
   # Virtual X, needed for analyser waveform tests
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
+  - export CXX=g++-4.8
+  - export CC=gcc-4.8
 install:
   - scons test=1 mad=1 localecompare=1
 script:

LICENSE

@@ -1,4 +1,4 @@
-Mixxx version 1.12.0, Digital DJ'ing software.
+Mixxx version 2.1, Digital DJ'ing software.
 Copyright (C) 2001-2014 Mixxx Development Team
 
 Promotional tracks are copyright their respective owners and

build/depends.py

@@ -126,7 +126,7 @@ def configure(self, build, conf):
                     'Did not find libvorbisenc.a, libvorbisenc.lib, or the libvorbisenc development headers.')
 
     def sources(self, build):
-        return ['soundsourceoggvorbis.cpp']
+        return ['sources/soundsourceoggvorbis.cpp']
 
 class SndFile(Dependence):
 
@@ -139,7 +139,7 @@ def configure(self, build, conf):
         build.env.Append(CPPDEFINES='__SNDFILE__')
 
     def sources(self, build):
-        return ['soundsourcesndfile.cpp']
+        return ['sources/soundsourcesndfile.cpp']
 
 
 class FLAC(Dependence):
@@ -154,7 +154,7 @@ def configure(self, build, conf):
             build.env.Append(CPPDEFINES='FLAC__NO_DLL')
 
     def sources(self, build):
-        return ['soundsourceflac.cpp', ]
+        return ['sources/soundsourceflac.cpp',]
 
 
 class Qt(Dependence):
@@ -350,6 +350,11 @@ def configure(self, build, conf):
                 build.env.Append(LINKFLAGS="-Wl,-rpath," + framework_path)
                 build.env.Append(LINKFLAGS="-L" + framework_path)
 
+        # Mixxx requires C++11 support. Windows enables C++11 features by
+        # default but Clang/GCC require a flag.
+        if not build.platform_is_windows:
+            build.env.Append(CXXFLAGS='-std=c++11')
+
 
 class TestHeaders(Dependence):
     def configure(self, build, conf):
@@ -481,6 +486,23 @@ def configure(self, build, conf):
                 "Could not find libprotobuf or its development headers.")
 
 
+class QtScriptByteArray(Dependence):
+    def configure(self, build, conf):
+        build.env.Append(CPPPATH='#lib/qtscript-bytearray')
+
+    def sources(self, build):
+        return ['#lib/qtscript-bytearray/bytearrayclass.cpp',
+                '#lib/qtscript-bytearray/bytearrayprototype.cpp']
+
+
+class Reverb(Dependence):
+    def configure(self, build, conf):
+        build.env.Append(CPPPATH='#lib/reverb')
+
+    def sources(self, build):
+        return ['#lib/reverb/Reverb.cc']
+
+
 class MixxxCore(Feature):
 
     def description(self):
@@ -564,7 +586,8 @@ def sources(self, build):
                    "effects/native/moogladder4filtereffect.cpp",
                    "effects/native/reverbeffect.cpp",
                    "effects/native/echoeffect.cpp",
-                   "effects/native/reverb/Reverb.cc",
+                   "effects/native/autopaneffect.cpp",
+                   "effects/native/phasereffect.cpp",
 
                    "engine/effects/engineeffectsmanager.cpp",
                    "engine/effects/engineeffectrack.cpp",
@@ -646,8 +669,6 @@ def sources(self, build):
                    "controllers/midi/midicontrollerpresetfilehandler.cpp",
                    "controllers/midi/midienumerator.cpp",
                    "controllers/midi/midioutputhandler.cpp",
-                   "controllers/qtscript-bytearray/bytearrayclass.cpp",
-                   "controllers/qtscript-bytearray/bytearrayprototype.cpp",
                    "controllers/softtakeover.cpp",
 
                    "main.cpp",
@@ -656,8 +677,15 @@ def sources(self, build):
                    "errordialoghandler.cpp",
                    "upgrade.cpp",
 
-                   "soundsource.cpp",
-                   "soundsourcetaglib.cpp",
+                   "sources/soundsourceproviderregistry.cpp",
+                   "sources/soundsourceplugin.cpp",
+                   "sources/soundsourcepluginlibrary.cpp",
+                   "sources/soundsource.cpp",
+                   "sources/audiosource.cpp",
+
+                   "metadata/trackmetadata.cpp",
+                   "metadata/trackmetadatataglib.cpp",
+                   "metadata/audiotagger.cpp",
 
                    "sharedglcontext.cpp",
                    "widget/controlwidgetconnection.cpp",
@@ -800,7 +828,6 @@ def sources(self, build):
                    "library/bpmdelegate.cpp",
                    "library/previewbuttondelegate.cpp",
                    "library/coverartdelegate.cpp",
-                   "audiotagger.cpp",
 
                    "library/treeitemmodel.cpp",
                    "library/treeitem.cpp",
@@ -873,6 +900,10 @@ def sources(self, build):
                    "skin/pixmapsource.cpp",
 
                    "sampleutil.cpp",
+                   "samplebuffer.cpp",
+                   "singularsamplebuffer.cpp",
+                   "circularsamplebuffer.cpp",
+
                    "trackinfoobject.cpp",
                    "track/beatgrid.cpp",
                    "track/beatmap.cpp",
@@ -1176,7 +1207,8 @@ def configure(self, build, conf):
     def depends(self, build):
         return [SoundTouch, ReplayGain, PortAudio, PortMIDI, Qt, TestHeaders,
                 FidLib, SndFile, FLAC, OggVorbis, OpenGL, TagLib, ProtoBuf,
-                Chromaprint, RubberBand, SecurityFramework, CoreServices]
+                Chromaprint, RubberBand, SecurityFramework, CoreServices,
+                QtScriptByteArray, Reverb]
 
     def post_dependency_check_configure(self, build, conf):
         """Sets up additional things in the Environment that must happen

build/features.py

@@ -179,7 +179,7 @@ def configure(self, build, conf):
         build.env.Append(CPPDEFINES='__MAD__')
 
     def sources(self, build):
-        return ['soundsourcemp3.cpp']
+        return ['sources/soundsourcemp3.cpp']
 
 
 class CoreAudio(Feature):
@@ -214,7 +214,7 @@ def configure(self, build, conf):
         build.env.Append(CPPDEFINES='__COREAUDIO__')
 
     def sources(self, build):
-        return ['soundsourcecoreaudio.cpp',
+        return ['sources/soundsourcecoreaudio.cpp',
                 '#lib/apple/CAStreamBasicDescription.cpp']
 
 
@@ -429,7 +429,7 @@ def configure(self, build, conf):
 
     def sources(self, build):
         depends.Qt.uic(build)('dlgprefmodplugdlg.ui')
-        return ['soundsourcemodplug.cpp', 'dlgprefmodplug.cpp']
+        return ['sources/soundsourcemodplug.cpp', 'dlgprefmodplug.cpp']
 
 
 class FAAD(Feature):
@@ -820,7 +820,7 @@ def configure(self, build, conf):
             build.env.ParseConfig('pkg-config opusfile opus --silence-errors --cflags --libs')
 
     def sources(self, build):
-        return ['soundsourceopus.cpp']
+        return ['sources/soundsourceopus.cpp']
 
 
 class FFMPEG(Feature):
@@ -948,7 +948,7 @@ def configure(self, build, conf):
                                                   'include', 'ffmpeg'))
 
     def sources(self, build):
-        return ['soundsourceffmpeg.cpp',
+        return ['sources/soundsourceffmpeg.cpp',
                 'encoder/encoderffmpegresample.cpp',
                 'encoder/encoderffmpegcore.cpp',
                 'encoder/encoderffmpegmp3.cpp',

src/effects/native/reverb/Reverb.h → lib/reverb/Reverb.h

@@ -49,11 +49,11 @@
 
 #include <stdio.h>
 
-#include "effects/native/reverb/basics.h"
-#include "effects/native/reverb/dsp/Delay.h"
-#include "effects/native/reverb/dsp/OnePole.h"
-#include "effects/native/reverb/dsp/Sine.h"
-#include "effects/native/reverb/dsp/util.h"
+#include "basics.h"
+#include "dsp/Delay.h"
+#include "dsp/OnePole.h"
+#include "dsp/Sine.h"
+#include "dsp/util.h"
 
 /* both reverbs use this */
 class Lattice

src/effects/native/reverb/dsp/Delay.h → lib/reverb/dsp/Delay.h

@@ -32,8 +32,8 @@
 #ifndef _DSP_DELAY_H_
 #define _DSP_DELAY_H_
 
-#include "effects/native/reverb/dsp/util.h"
-#include "effects/native/reverb/dsp/FPTruncateMode.h"
+#include "util.h"
+#include "FPTruncateMode.h"
 
 namespace DSP {
 

plugins/soundsourcem4a/SConscript

@@ -11,10 +11,15 @@ Import('build')
 # On Posix default SCons.LIBPREFIX = 'lib', on Windows default SCons.LIBPREFIX = ''
 
 m4a_sources = [
-    "soundsourcem4a.cpp",  # MP4/M4A Support through FAAD/libmp4v2
-    "soundsourcetaglib.cpp", # TagLib dependencies
-    "soundsource.cpp", # required to subclass SoundSource
-    "sampleutil.cpp", # utility functions
+    "soundsourcem4a.cpp",
+    "sources/soundsource.cpp",
+    "sources/soundsourceplugin.cpp",
+    "sources/audiosource.cpp",
+    "samplebuffer.cpp",
+    "singularsamplebuffer.cpp",
+    "sampleutil.cpp",
+    "metadata/trackmetadata.cpp",
+    "metadata/trackmetadatataglib.cpp"
 ]
 
 #Tell SCons to build the SoundSourceM4A plugin