Merge remote-tracking branch 'upstream/master' into effects_refactoring

mixxxdj · Apr 9, 2020 · f7d1327 · f7d1327
2 parents 9a78a9b + 8037ae7
commit f7d1327
Show file tree

Hide file tree

Showing 259 changed files with 19,049 additions and 5,780 deletions.
diff --git a/.clang-format b/.clang-format
@@ -3,9 +3,9 @@ BasedOnStyle: Google
 IndentWidth:  4
 TabWidth:     8
 UseTab:       Never
-# NOTE(2019-02-23, uklotzde) The column limit has been set to 0
-# to avoid eagerly reformatting of the existing code base. This
-# may later be changed to 80-100 characters per line if desired.
+# A ColumnLimit > 0 causes clang-format to unbreaks all short lines,
+# which is undesired here.
+# If the line length exceeds 100, "ColumnLimit:  80" is used in scripts/line-length.py
 ColumnLimit:  0
 ---
 # Customize only those options that differ from the base style!

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -111,3 +111,14 @@ repos:
     - commit
     - push
     - manual
+- repo: local
+  hooks:
+  - id: line_length
+    name: line_length
+    description: Check for lines longer 100 and brakes them before 80.
+    entry: ./scripts/line_length.py
+    stages:
+    - commit
+    - push
+    language: python
+    files: \.(c|cpp|h)$
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,12 @@
-language: cpp
+# Enable build config validation (opt-in)
+version: ~> 1.0
+
+# Default build environment
 os: linux
+dist: bionic
 
+# Default programming language
+language: cpp
 
 # Build flags common to OS X and Linux.
 # Parallel builds are important for avoiding OSX build timeouts.
@@ -19,8 +25,6 @@ jobs:
   include:
     - name: pre-commit
       if: type != pull_request
-      os: linux
-      dist: xenial
       language: python
       python: 3.7
       # There are too many files in the repo that have formatting issues. We'll
@@ -38,8 +42,6 @@ jobs:
 
     - name: pre-commit-pr
       if: type == pull_request
-      os: linux
-      dist: xenial
       language: python
       python: 3.7
       cache:
@@ -52,10 +54,8 @@ jobs:
       addons: []
 
     - name: Ubuntu/gcc/SCons build
-      os: linux
-      dist: xenial
       compiler: gcc
-      # Ubuntu Xenial build prerequisites
+      # Ubuntu Bionic build prerequisites
       before_install:
         - sudo apt-get install -y scons
       install:
@@ -67,11 +67,9 @@ jobs:
         - ./mixxx-test
 
     - name: Ubuntu/gcc/CMake build
-      os: linux
-      dist: xenial
       compiler: gcc
       cache: ccache
-      # Ubuntu Xenial build prerequisites
+      # Ubuntu Bionic build prerequisites
       env: CMAKEFLAGS_EXTRA="-DLOCALECOMPARE=ON"
       before_install:
         - export CMAKE_BUILD_PARALLEL_LEVEL="$(nproc)"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -38,6 +38,8 @@
 * Add controller mapping for Native Instruments Traktor Kontrol S2 MK3 #2348
 * Add controller mapping for Soundless joyMIDI #2425
 * Add controller mapping for Hercules DJControl Inpulse 300 #2465
+* Add controller mapping for Denon MC7000 #2546
+* Add controller mapping for Stanton DJC.4 #2607
 
 ## [2.2.3](https://launchpad.net/mixxx/+milestone/2.2.3) (2019-11-24)
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -173,6 +173,9 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/analyzer/plugins/analyzersoundtouchbeats.cpp
   src/analyzer/plugins/buffering_utils.cpp
   src/analyzer/trackanalysisscheduler.cpp
+  src/audio/types.cpp
+  src/audio/signalinfo.cpp
+  src/audio/streaminfo.cpp
   src/control/control.cpp
   src/control/controlaudiotaperpot.cpp
   src/control/controlbehavior.cpp
@@ -217,6 +220,7 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/controllers/keyboard/keyboardeventfilter.cpp
   src/controllers/learningutils.cpp
   src/controllers/midi/midicontroller.cpp
+  src/controllers/midi/midicontrollerpreset.cpp
   src/controllers/midi/midicontrollerpresetfilehandler.cpp
   src/controllers/midi/midienumerator.cpp
   src/controllers/midi/midimessage.cpp
@@ -340,12 +344,14 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/library/banshee/bansheedbconnection.cpp
   src/library/banshee/bansheefeature.cpp
   src/library/banshee/bansheeplaylistmodel.cpp
+  src/library/basecoverartdelegate.cpp
   src/library/baseexternallibraryfeature.cpp
   src/library/baseexternalplaylistmodel.cpp
   src/library/baseexternaltrackmodel.cpp
   src/library/baseplaylistfeature.cpp
   src/library/basesqltablemodel.cpp
   src/library/basetrackcache.cpp
+  src/library/basetracktablemodel.cpp
   src/library/bpmdelegate.cpp
   src/library/browse/browsefeature.cpp
   src/library/browse/browsetablemodel.cpp
@@ -556,7 +562,6 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/track/tracknumbers.cpp
   src/track/trackrecord.cpp
   src/track/trackref.cpp
-  src/util/audiosignal.cpp
   src/util/autohidpi.cpp
   src/util/battery/battery.cpp
   src/util/cache.cpp
@@ -1975,22 +1980,23 @@ if(HID)
   target_sources(mixxx-lib PRIVATE
     src/controllers/hid/hidcontroller.cpp
     src/controllers/hid/hidenumerator.cpp
+    src/controllers/hid/hidcontrollerpreset.cpp
     src/controllers/hid/hidcontrollerpresetfilehandler.cpp
   )
   target_compile_definitions(mixxx-lib PUBLIC __HID__)
   if(HIDAPI_STATIC)
     message(STATUS "Linking internal libhidapi statically")
     add_library(mixxx-hidapi STATIC EXCLUDE_FROM_ALL)
-    target_include_directories(mixxx-hidapi SYSTEM PUBLIC lib/hidapi-0.8.0-rc1/hidapi)
+    target_include_directories(mixxx-hidapi SYSTEM PUBLIC lib/hidapi/hidapi)
     if(WIN32)
-        target_sources(mixxx-hidapi PRIVATE lib/hidapi-0.8.0-rc1/windows/hid.c)
+        target_sources(mixxx-hidapi PRIVATE lib/hidapi/windows/hid.c)
     elseif(APPLE)
-        target_sources(mixxx-hidapi PRIVATE lib/hidapi-0.8.0-rc1/mac/hid.c)
+        target_sources(mixxx-hidapi PRIVATE lib/hidapi/mac/hid.c)
     elseif(UNIX)
       if(NOT LibUSB_FOUND)
         message(FATAL_ERROR "USB HID controller support on Unix with statically linked libhidapi-libusb requires libusb 1.0 and its development headers.")
       endif()
-      target_sources(mixxx-hidapi PRIVATE lib/hidapi-0.8.0-rc1/libusb/hid.c)
+      target_sources(mixxx-hidapi PRIVATE lib/hidapi/libusb/hid.c)
       target_link_libraries(mixxx-hidapi PRIVATE LibUSB::LibUSB)
     else()
       message(FATAL_ERROR "USB HID controller support only possible on Windows/Mac OS/Linux/BSD.")

diff --git a/appveyor.yml b/appveyor.yml
@@ -86,12 +86,12 @@ for:
       libwavpack-dev
       portaudio19-dev
       protobuf-compiler
-      python-pip
+      python3-pip
       qt5-default
       qt5keychain-dev
       qtscript5-dev
       xsltproc
-    - sudo pip install cmake
+    - sudo pip3 install cmake
 
   before_build:
      # Limit cache size to 100 MB

diff --git a/build/depends.py b/build/depends.py
@@ -900,6 +900,10 @@ def sources(self, build):
                    "src/analyzer/plugins/analyzerqueenmarykey.cpp",
                    "src/analyzer/plugins/buffering_utils.cpp",
 
+                   "src/audio/types.cpp",
+                   "src/audio/signalinfo.cpp",
+                   "src/audio/streaminfo.cpp",
+
                    "src/controllers/controller.cpp",
                    "src/controllers/controllerdebug.cpp",
                    "src/controllers/controllerengine.cpp",
@@ -922,6 +926,7 @@ def sources(self, build):
                    "src/controllers/midi/midimessage.cpp",
                    "src/controllers/midi/midiutils.cpp",
                    "src/controllers/midi/midicontroller.cpp",
+                   "src/controllers/midi/midicontrollerpreset.cpp",
                    "src/controllers/midi/midicontrollerpresetfilehandler.cpp",
                    "src/controllers/midi/midienumerator.cpp",
                    "src/controllers/midi/midioutputhandler.cpp",
@@ -1026,6 +1031,7 @@ def sources(self, build):
                    "src/library/externaltrackcollection.cpp",
                    "src/library/basesqltablemodel.cpp",
                    "src/library/basetrackcache.cpp",
+                   "src/library/basetracktablemodel.cpp",
                    "src/library/columncache.cpp",
                    "src/library/librarytablemodel.cpp",
                    "src/library/searchquery.cpp",
@@ -1120,6 +1126,7 @@ def sources(self, build):
                    "src/library/bpmdelegate.cpp",
                    "src/library/previewbuttondelegate.cpp",
                    "src/library/colordelegate.cpp",
+                   "src/library/basecoverartdelegate.cpp",
                    "src/library/coverartdelegate.cpp",
                    "src/library/locationdelegate.cpp",
                    "src/library/tableitemdelegate.cpp",
@@ -1308,7 +1315,6 @@ def sources(self, build):
                    "src/util/logger.cpp",
                    "src/util/logging.cpp",
                    "src/util/cmdlineargs.cpp",
-                   "src/util/audiosignal.cpp",
                    "src/util/widgethider.cpp",
                    "src/util/autohidpi.cpp",
                    "src/util/screensaver.cpp",

diff --git a/build/features.py b/build/features.py
@@ -45,7 +45,7 @@ def sources(self, build):
 
 class HID(Feature):
     INTERNAL_LINK = False
-    HIDAPI_INTERNAL_PATH = 'lib/hidapi-0.8.0-rc1'
+    HIDAPI_INTERNAL_PATH = 'lib/hidapi'
 
     def description(self):
         return "HID controller support"
@@ -100,6 +100,7 @@ def configure(self, build, conf):
 
     def sources(self, build):
         sources = ['src/controllers/hid/hidcontroller.cpp',
+                   'src/controllers/hid/hidcontrollerpreset.cpp',
                    'src/controllers/hid/hidenumerator.cpp',
                    'src/controllers/hid/hidcontrollerpresetfilehandler.cpp']
 

diff --git a/build/osx/golden_environment b/build/osx/golden_environment
@@ -1 +1 @@
-2.3-j00004-497fe02e-osx10.11-x86_64-release
+2.3-j00008-c18d8fda-osx10.11-x86_64-release
diff --git a/build/windows/golden_environment b/build/windows/golden_environment
@@ -1 +1 @@
-2.3-j00013-PLATFORM-CONFIGURATION-static-36f44bd2-minimal
+2.3-j00019-PLATFORM-CONFIGURATION-static-55e94982-minimal