Pioneer DDJ-400

.travis.yml

@@ -1,13 +1,65 @@
 language: c++
 
-matrix:
+
+# Build flags common to OS X and Linux.
+# Parallel builds are important for avoiding OSX build timeouts.
+# We turn off verbose output to avoid going over the 4MB output limit.
+# TODO(2019-07-21): Add "ffmpeg=1" if FFmpeg 4.x becomes available in Ubuntu
+env:
+  global:
+    - COMMON_FLAGS="-j4 test=1 mad=1 faad=1 opus=1 modplug=1 wv=1 hss1394=0 virtualize=0 debug_assertions_fatal=1 verbose=0"
+
+jobs:
   include:
-    - os: linux
+    - name: qsscheck
+      os: linux
+      dist: xenial
+      before_install:
+        - pip3 install tinycss
+      script:
+        - ./scripts/qsscheck.py .
+      addons:
+        apt:
+          packages:
+            - python3
+            - python3-pip
+            - python3-pyqt5
+            - python3-setuptools
+            - python3-wheel
+
+    - name: Ubuntu/gcc build
+      os: linux
       dist: xenial
-      sudo: required
       compiler: gcc
-    - os: osx
+      # Ubuntu Xenial build prerequisites
+      env: EXTRA_FLAGS="localecompare=1"
+      install:
+        - scons $COMMON_FLAGS $EXTRA_FLAGS
+      script:
+        # NOTE(sblaisot): 2018-01-02 removing gdb wrapper on linux due to a bug in
+        # return code in order to avoid having a successful build when a test fail.
+        # https://bugs.launchpad.net/mixxx/+bug/1699689
+        - ./mixxx-test
+
+    - name: OSX/clang build
+      os: osx
       compiler: clang
+      # Workaround for bug in libopus's opus.h including <opus_multistream.h>
+      # instead of <opus/opus_multistream.h>.
+      # Virtual X (Xvfb) is needed for analyzer waveform tests
+      env: >-
+        CFLAGS="-isystem /usr/local/include/opus"
+        CXXFLAGS="-isystem /usr/local/include/opus"
+        DISPLAY=:99.0
+      before_install:
+      - export QTDIR="$(find /usr/local/Cellar/qt -d 1 | tail -n 1)"
+      - echo "QTDIR=$QTDIR"
+      install:
+        - scons $COMMON_FLAGS $EXTRA_FLAGS
+      script:
+        # lldb doesn't provide an easy way to exit 1 on error:
+        # https://bugs.llvm.org/show_bug.cgi?id=27326
+        - lldb ./mixxx-test --batch -o run -o quit -k 'thread backtrace all' -k "script import os; os._exit(1)"
 
 git:
   depth: 1
@@ -82,44 +134,6 @@ addons:
       - taglib
       - wavpack
 
-install:
-  # Build flags common to OS X and Linux.
-  # Parallel builds are important for avoiding OSX build timeouts.
-  # We turn off verbose output to avoid going over the 4MB output limit.
-  # TODO(2019-07-21): Add "ffmpeg=1" if FFmpeg 4.x becomes available in Ubuntu
-  - export COMMON_FLAGS="-j4 test=1 mad=1 faad=1 opus=1 modplug=1 wv=1 hss1394=0 virtualize=0 debug_assertions_fatal=1 verbose=0"
-
-  # Ubuntu Xenial build prerequisites
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then export EXTRA_FLAGS="localecompare=1"; fi
-
-  # Define QTDIR.
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export QTDIR=$(find /usr/local/Cellar/qt -d 1 | tail -n 1); fi
-
-  # Workaround for bug in libopus's opus.h including <opus_multistream.h>
-  # instead of <opus/opus_multistream.h>.
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CXXFLAGS="-isystem /usr/local/include/opus"; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS="-isystem /usr/local/include/opus"; fi
-
-  # NOTE(rryan): 2016-11-15 we are experiencing Travis timeouts for the OSX
-  # build.  Turning off optimizations to see if that speeds up compile times.
-  # TODO(rryan): localecompare doesn't work on Travis with qt5 for some reason.
-  # TODO(2019-07-21): Move "ffmpeg=1" into COMMON_FLAGS if FFmpeg 4.x becomes available in Ubuntu
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export EXTRA_FLAGS="ffmpeg=1 optimize=none asan=0 localecompare=0"; fi
-
-  - scons $COMMON_FLAGS $EXTRA_FLAGS
-
-before_script:
-  # Virtual X (Xvfb) is needed for analyzer waveform tests
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then export DISPLAY=:99.0; fi
-
-script:
-  # NOTE(sblaisot): 2018-01-02 removing gdb wrapper on linux due to a bug in
-  # return code in order to avoid having a successful build when a test fail.
-  # https://bugs.launchpad.net/mixxx/+bug/1699689
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then ./mixxx-test; fi
-  # lldb doesn't provide an easy way to exit 1 on error:
-  # https://bugs.llvm.org/show_bug.cgi?id=27326
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then lldb ./mixxx-test --batch -o run -o quit -k 'thread backtrace all' -k "script import os; os._exit(1)"; fi
 
 notifications:
   webhooks:

CMakeLists.txt

@@ -309,6 +309,7 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/errordialoghandler.cpp
   src/library/analysisfeature.cpp
   src/library/analysislibrarytablemodel.cpp
+  src/library/trackloader.cpp
   src/library/autodj/autodjfeature.cpp
   src/library/autodj/autodjprocessor.cpp
   src/library/autodj/dlgautodj.cpp
@@ -401,6 +402,7 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/library/starrating.cpp
   src/library/tableitemdelegate.cpp
   src/library/trackcollection.cpp
+  src/library/trackcollectionmanager.cpp
   src/library/traktor/traktorfeature.cpp
   src/library/treeitem.cpp
   src/library/treeitemmodel.cpp

build/depends.py

@@ -1006,6 +1006,7 @@ def sources(self, build):
                    "src/database/schemamanager.cpp",
 
                    "src/library/trackcollection.cpp",
+                   "src/library/trackcollectionmanager.cpp",
                    "src/library/externaltrackcollection.cpp",
                    "src/library/basesqltablemodel.cpp",
                    "src/library/basetrackcache.cpp",
@@ -1112,6 +1113,8 @@ def sources(self, build):
                    "src/library/parserm3u.cpp",
                    "src/library/parsercsv.cpp",
 
+                   "src/library/trackloader.cpp",
+
                    "src/widget/wwaveformviewer.cpp",
 
                    "src/waveform/sharedglcontext.cpp",

cmake/modules/FindChromaprint.cmake

@@ -29,7 +29,7 @@ This will define the following variables:
 ``Chromaprint_LIBRARIES``
   Libraries needed to link to Chromaprint.
 ``Chromaprint_DEFINITIONS``
-  Compile defitions needed to use Chromaprint.
+  Compile definitions needed to use Chromaprint.
 
 Cache Variables
 ^^^^^^^^^^^^^^^

cmake/modules/FindEbur128.cmake

@@ -29,7 +29,7 @@ This will define the following variables:
 ``Ebur128_LIBRARIES``
   Libraries needed to link to Ebur128.
 ``Ebur128_DEFINITIONS``
-  Compile defitions needed to use Ebur128.
+  Compile definitions needed to use Ebur128.
 
 Cache Variables
 ^^^^^^^^^^^^^^^

cmake/modules/FindFLAC.cmake

@@ -29,7 +29,7 @@ This will define the following variables:
 ``FLAC_LIBRARIES``
   Libraries needed to link to FLAC.
 ``FLAC_DEFINITIONS``
-  Compile defitions needed to use FLAC.
+  Compile definitions needed to use FLAC.
 
 Cache Variables
 ^^^^^^^^^^^^^^^

cmake/modules/FindGPerfTools.cmake

@@ -31,7 +31,7 @@ This will define the following variables:
 ``GPerfTools_LIBRARIES``
   Libraries needed to link to GPerfTools.
 ``GPerfTools_DEFINITIONS``
-  Compile defitions needed to use GPerfTools.
+  Compile definitions needed to use GPerfTools.
 
 Cache Variables
 ^^^^^^^^^^^^^^^

cmake/modules/FindHIDAPI.cmake

@@ -29,7 +29,7 @@ This will define the following variables:
 ``HIDAPI_LIBRARIES``
   Libraries needed to link to HIDAPI.
 ``HIDAPI_DEFINITIONS``
-  Compile defitions needed to use HIDAPI.
+  Compile definitions needed to use HIDAPI.
 
 Cache Variables
 ^^^^^^^^^^^^^^^

cmake/modules/FindID3Tag.cmake

@@ -29,7 +29,7 @@ This will define the following variables:
 ``ID3Tag_LIBRARIES``
   Libraries needed to link to ID3Tag.
 ``ID3Tag_DEFINITIONS``
-  Compile defitions needed to use ID3Tag.
+  Compile definitions needed to use ID3Tag.
 
 Cache Variables
 ^^^^^^^^^^^^^^^

cmake/modules/FindLibUSB.cmake

@@ -29,7 +29,7 @@ This will define the following variables:
 ``LibUSB_LIBRARIES``
   Libraries needed to link to LibUSB.
 ``LibUSB_DEFINITIONS``
-  Compile defitions needed to use LibUSB.
+  Compile definitions needed to use LibUSB.
 
 Cache Variables
 ^^^^^^^^^^^^^^^

cmake/modules/FindLilv.cmake

@@ -29,7 +29,7 @@ This will define the following variables:
 ``Lilv_LIBRARIES``
   Libraries needed to link to Lilv.
 ``Lilv_DEFINITIONS``
-  Compile defitions needed to use Lilv.
+  Compile definitions needed to use Lilv.
 
 Cache Variables
 ^^^^^^^^^^^^^^^

cmake/modules/FindMAD.cmake

@@ -29,7 +29,7 @@ This will define the following variables:
 ``MAD_LIBRARIES``
   Libraries needed to link to MAD.
 ``MAD_DEFINITIONS``
-  Compile defitions needed to use MAD.
+  Compile definitions needed to use MAD.
 
 Cache Variables
 ^^^^^^^^^^^^^^^

cmake/modules/FindMP4.cmake

@@ -29,7 +29,7 @@ This will define the following variables:
 ``MP4_LIBRARIES``
   Libraries needed to link to MP4.
 ``MP4_DEFINITIONS``
-  Compile defitions needed to use MP4.
+  Compile definitions needed to use MP4.
 
 Cache Variables
 ^^^^^^^^^^^^^^^

cmake/modules/FindMP4v2.cmake

@@ -29,7 +29,7 @@ This will define the following variables:
 ``MP4v2_LIBRARIES``
   Libraries needed to link to MP4v2.
 ``MP4v2_DEFINITIONS``
-  Compile defitions needed to use MP4v2.
+  Compile definitions needed to use MP4v2.
 
 Cache Variables
 ^^^^^^^^^^^^^^^

cmake/modules/FindModplug.cmake

@@ -29,7 +29,7 @@ This will define the following variables:
 ``Modplug_LIBRARIES``
   Libraries needed to link to Modplug.
 ``Modplug_DEFINITIONS``
-  Compile defitions needed to use Modplug.
+  Compile definitions needed to use Modplug.
 
 Cache Variables
 ^^^^^^^^^^^^^^^

cmake/modules/FindOpus.cmake

@@ -21,7 +21,7 @@ This will define the following variables:
 ``Opus_LIBRARIES``
   Libraries needed to link to Opus.
 ``Opus_DEFINITIONS``
-  Compile defitions needed to use Opus.
+  Compile definitions needed to use Opus.
 
 Cache Variables
 ^^^^^^^^^^^^^^^

cmake/modules/FindRubberband.cmake

@@ -29,7 +29,7 @@ This will define the following variables:
 ``Rubberband_LIBRARIES``
   Libraries needed to link to Rubberband.
 ``Rubberband_DEFINITIONS``
-  Compile defitions needed to use Rubberband.
+  Compile definitions needed to use Rubberband.
 
 Cache Variables
 ^^^^^^^^^^^^^^^

cmake/modules/FindSQLite3.cmake

@@ -29,7 +29,7 @@ This will define the following variables:
 ``SQLite3_LIBRARIES``
   Libraries needed to link to SQLite3.
 ``SQLite3_DEFINITIONS``
-  Compile defitions needed to use SQLite3.
+  Compile definitions needed to use SQLite3.
 
 Cache Variables
 ^^^^^^^^^^^^^^^

cmake/modules/FindShout.cmake

@@ -29,7 +29,7 @@ This will define the following variables:
 ``Shout_LIBRARIES``
   Libraries needed to link to Shout.
 ``Shout_DEFINITIONS``
-  Compile defitions needed to use Shout.
+  Compile definitions needed to use Shout.
 
 Cache Variables
 ^^^^^^^^^^^^^^^

cmake/modules/FindSndFile.cmake

@@ -29,7 +29,7 @@ This will define the following variables:
 ``SndFile_LIBRARIES``
   Libraries needed to link to SndFile.
 ``SndFile_DEFINITIONS``
-  Compile defitions needed to use SndFile.
+  Compile definitions needed to use SndFile.
 
 Cache Variables
 ^^^^^^^^^^^^^^^

cmake/modules/FindUpower.cmake

@@ -29,7 +29,7 @@ This will define the following variables:
 ``Upower_LIBRARIES``
   Libraries needed to link to Upower.
 ``Upower_DEFINITIONS``
-  Compile defitions needed to use Upower.
+  Compile definitions needed to use Upower.
 
 Cache Variables
 ^^^^^^^^^^^^^^^

cmake/modules/FindWavPack.cmake

@@ -29,7 +29,7 @@ This will define the following variables:
 ``WavPack_LIBRARIES``
   Libraries needed to link to WavPack.
 ``WavPack_DEFINITIONS``
-  Compile defitions needed to use WavPack.
+  Compile definitions needed to use WavPack.
 
 Cache Variables
 ^^^^^^^^^^^^^^^

res/controllers/DJ-Tech-Kontrol-One-scripts.js

@@ -1221,7 +1221,7 @@ KONTROL1.getNoShiftNoModBankCode = function getNoShiftNoModBankCode() {//return
     return outstr;
     };
 
-KONTROL1.getGroup = function getGroup(groupstr) {//return Mixx group
+KONTROL1.getGroup = function getGroup(groupstr) {//return Mixxx group
     if (KONTROL1.debug>2){print("##function: "+KONTROL1.getFunctionName())};
 
     var outstr;

res/controllers/Denon-MC3000-scripts.js

@@ -5,7 +5,7 @@
  *
  * 2012/05/11 V0.995 : first "good" version approuved and tested by me
  *
- * Special Thanks to the Programmers of Mixx and all the contributors
+ * Special Thanks to the Programmers of Mixxx and all the contributors
  *
  * Inspired primarily from Numark Total Control script file 
  *

res/controllers/Gemini-FirstMix-scripts.js

@@ -12,7 +12,7 @@
  * This works great except it marks the track as played. I don't see a Mixxx function to toggle the played state for tracks, so there's nothing I can do about that.
  * To see the sampler, click on the word "Sampler" above the main VU meters in the center of the Mixxx window.
  * 
- * EFX/fader knobs: Since the EFX function in Mixx is kinda useless (only a flanger effect that doesn't sound that different), the EFX knobs adjust the gain, 
+ * EFX/fader knobs: Since the EFX function in Mixxx is kinda useless (only a flanger effect that doesn't sound that different), the EFX knobs adjust the gain, 
  * the gain knobs to adjust the high fader and the treble knobs to adjust the mid fader. This way, you get high/mid/low faders.
  * 
  * EFX buttons & Master volume: The EFX buttons are mapped to send that deck to the headphones (a.k.a PFL function). The buttons light up to indicate PFL state.

res/controllers/Numark-DJ2Go-scripts.js

@@ -90,7 +90,7 @@ NumarkDJ2Go.deck = function(deckNum) {
 		var yesno = (engine.getValue(this.group, "track_samples") > 0)?true:false;
 		return yesno;
 	};
-	//Brake effect introduced in Mixx 1.11 	
+	//Brake effect introduced in Mixxx 1.11 	
 	this.brakeOn = function(factor) {
         	engine.brake(this.deckNum, true, factor);
 		this.braked= true;
@@ -616,7 +616,7 @@ NumarkDJ2Go.playLights = function(value, group, key) {
 		};
 };
 
-//Mixx's sync feature is not the same as VDJ, where syncing appears to
+//Mixxx's sync feature is not the same as VDJ, where syncing appears to
 //be continuously going on. Therefore less relevance with Mixxx to having a sync button
 //that illuminates. Have set it so that it flashes twice when pressed.
 NumarkDJ2Go.syncLights = function(value, group, key) {