Fix depends.py conflict

.clang-format

@@ -8,6 +8,9 @@ UseTab:       Never
 # may later be changed to 80-100 characters per line if desired.
 ColumnLimit:  0
 ---
+# Customize only those options that differ from the base style!
+# Dumping the options of the base style for comparison:
+# clang-format -style=google -dump-config > .clang-format_google
 Language:     Cpp
 AccessModifierOffset: -2
 AlignAfterOpenBracket: DontAlign
@@ -20,6 +23,7 @@ BinPackParameters: false
 ConstructorInitializerIndentWidth: 8
 ContinuationIndentWidth: 8
 IndentCaseLabels: false
+DerivePointerAlignment: false
 ReflowComments: false
 SpaceAfterTemplateKeyword: false
 SpacesBeforeTrailingComments: 1

.gitignore

@@ -1,3 +1,8 @@
+# Don't add any custom patterns for platform-specific files like .DS_Store
+# or generated by custom development tools like .vscode or .idea that don't
+# affect other developers. Instead add those custom patterns to your global
+# .gitignore file.
+
 *.diff
 *.log
 *.o
@@ -38,7 +43,6 @@ src/test/test_data
 src/test/golden_buffers/*.actual
 
 res/qrc_mixxx.cc
-res/developer_skins
 
 *.wixobj
 *.wixpdb
@@ -58,6 +62,4 @@ lib/*/lib/*.lib
 
 lib/qtscript-bytearray/*.cc
 
-.idea
-*.vscode
 compile_commands.json

.travis.yml

@@ -1,35 +1,44 @@
 language: c++
+
 matrix:
   include:
-    # - os: linux
-    #   dist: trusty
-    #   sudo: required
-    #   compiler: gcc
-
+    - os: linux
+      dist: xenial
+      sudo: required
+      compiler: gcc
     - os: osx
       compiler: clang
-# install dependencies
+
+git:
+  depth: 1
+
+services:
+  # Virtual X is needed for analyzer waveform tests
+  - xvfb
+
 addons:
   apt:
     sources:
       - ubuntu-toolchain-r-test
     packages:
-      - gdb
       - libavformat-dev
       - libchromaprint-dev
       - libfaad-dev
       - libflac-dev
       - libid3tag0-dev
+      - liblilv-dev
       - libmad0-dev
       - libmodplug-dev
       - libmp3lame-dev
       - libmp4v2-dev
+      - libopus-dev
       - libopusfile-dev
       - libportmidi-dev
       - libprotobuf-dev
       - libqt5opengl5-dev
       - libqt5sql5-sqlite
       - libqt5svg5-dev
+      - libqt5x11extras5-dev
       - librubberband-dev
       - libshout3-dev
       - libsndfile1-dev
@@ -43,57 +52,74 @@ addons:
       - protobuf-compiler
       - qt5-default
       - qtscript5-dev
-      - libqt5x11extras5-dev
+      - qt5keychain-dev
       - scons
-      - qtkeychain-dev
-      - liblilv-dev
-before_install:
-  # Virtual X, needed for analyzer waveform tests
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export DISPLAY=:99.0         ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sh -e /etc/init.d/xvfb start ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install scons portaudio libsndfile libogg libvorbis portmidi taglib libshout protobuf flac ffmpeg qt chromaprint rubberband libmodplug libid3tag libmad mp4v2 faad2 wavpack opusfile lilv lame sound-touch; fi
+  homebrew:
+    update: true
+    packages:
+      - chromaprint
+      - faad2
+      - ffmpeg
+      - flac
+      - lame
+      - libsndfile
+      - libogg
+      - libvorbis
+      - libshout
+      - libmodplug
+      - libid3tag
+      - libmad
+      - lilv
+      - mp4v2
+      - opusfile
+      - portaudio
+      - portmidi
+      - protobuf
+      - qt5
+      - rubberband
+      - scons
+      - sound-touch
+      - taglib
+      - wavpack
 
 install:
-  ####
-  # Common
-
   # 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.
-  - export COMMON="-j4 qt5=1 test=1 mad=1 faad=1 ffmpeg=1 opus=1 modplug=1 wv=1 hss1394=0 virtualize=0 debug_assertions_fatal=1 verbose=0"
-
-  #####
-  # Ubuntu Trusty Build
+  # 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"
 
-  ####
-  # OS X Build
+  # 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
+  - 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
+  - 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.
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export EXTRA_FLAGS="optimize=none asan=0 localecompare=0" ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export EXTRA_FLAGS="localecompare=1" ; fi
+  # 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
 
-  ####
-  # Common Build
-  - scons $COMMON $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
+  - 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
+  - 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:

CHANGELOG.md

@@ -9,6 +9,27 @@
 * Remove VAMP plugin support. vamp-plugin-sdk and vamp-hostsdk are no longer required dependencies.
 * Remove SoundSource plugin support. [lp:1792747](https://bugs.launchpad.net/mixxx/+bug/1792747)
 * Add Opus streaming and recording support. [lp:1338413](https://bugs.launchpad.net/mixxx/+bug/1338413)
+* Add mapping for Roland DJ-505
+
+## [2.2.2](https://launchpad.net/mixxx/+milestone/2.2.2) (2019-08-10)
+
+* Fix battery widget with upower <= 0.99.7. #2221
+* Fix BPM adjust in BpmControl. lp:1836480
+* Disable track metadata export for .ogg files and TagLib 1.11.1. lp:1833190
+* Fix interaction of hot cue buttons and looping. lp:1778246
+* Fix detection of moved tracks. #2197
+* Fix playlist import. lp:16878282
+* Fix updating playlist labels. lp:1837315
+* Fix potential segfault on exit. lp:1828360
+* Fix parsing of invalid bpm values in MP3 files. lp:1832325
+* Fix crash when removing rows from empty model. #2128
+* Fix high DPI scaling of RGB overview waveforms. #2090
+* Fix for OpenGL SL detection on macOS. lp:1828019
+* Fix OpenGL ES detection. lp:1825461
+* Fix FX1/2 buttons missing Mic unit in Deere (64 samplers). lp:1837716
+* Tango64: Re-enable 64 samplers. #2223
+* Numark DJ2Go re-enable note-off for deck A cue button. #2087
+* Replace Flanger with QuickEffect in keyboard mapping. #2233
 
 ## [2.2.1](https://launchpad.net/mixxx/+milestone/2.2.1) (2019-04-22)
 

README

@@ -39,6 +39,7 @@ Mixxx has the following dependencies:
 - libvorbis
 - libvorbisfile
 - libsndfile
+- libmodplug
 - libflac
 - libopus
 - libshout

SConstruct

@@ -48,6 +48,7 @@ available_features = [features.Mad,
                       features.Verbose,
                       features.Optimize,
                       features.FAAD,
+                      features.FFmpeg,
                       features.WavPack,
                       features.ModPlug,
                       features.TestSuite,
@@ -61,7 +62,6 @@ available_features = [features.Mad,
                       # "Features" of dubious quality
                       features.PerfTools,
                       features.AsmLib,
-                      features.FFMPEG
                       ]
 
 build = mixxx.MixxxBuild(target, machine, build_type,

appveyor.yml

@@ -50,10 +50,11 @@ for:
 
   install:
     - sudo apt-get update
-    - sudo apt-get -y install gdb libavformat-dev libchromaprint-dev libfaad-dev libflac-dev libid3tag0-dev libmad0-dev libmodplug-dev libmp3lame-dev libmp4v2-dev libopus-dev libopusfile-dev libportmidi-dev libprotobuf-dev libqt5opengl5-dev libqt5sql5-sqlite libqt5svg5-dev librubberband-dev libshout3-dev libsndfile1-dev libsqlite3-dev libtag1-dev libupower-glib-dev libusb-1.0-0-dev libwavpack-dev portaudio19-dev protobuf-compiler qt5-default qtscript5-dev libqt5x11extras5-dev scons qtkeychain-dev liblilv-dev libsoundtouch-dev
+    - sudo apt-get -y install gdb libavformat-dev libchromaprint-dev libfaad-dev libflac-dev libid3tag0-dev libmad0-dev libmodplug-dev libmp3lame-dev libmp4v2-dev libopus-dev libopusfile-dev libportmidi-dev libprotobuf-dev libqt5opengl5-dev libqt5sql5-sqlite libqt5svg5-dev librubberband-dev libshout3-dev libsndfile1-dev libsqlite3-dev libtag1-dev libupower-glib-dev libusb-1.0-0-dev libwavpack-dev portaudio19-dev protobuf-compiler qt5-default qtscript5-dev libqt5x11extras5-dev scons qt5keychain-dev liblilv-dev libsoundtouch-dev
 
   build_script:
-    - scons -j4 test=1 mad=1 faad=1 ffmpeg=1 opus=1 modplug=1 wv=1 hss1394=0 virtualize=0 debug_assertions_fatal=1 verbose=0 localecompare=1
+    # ffmpeg=1 requires FFmpeg 4.0, but Ubuntu 18.04 still provides only FFmpeg 3.4.x
+    - scons -j4 test=1 mad=1 faad=1 opus=1 modplug=1 wv=1 hss1394=0 virtualize=0 debug_assertions_fatal=1 verbose=0 localecompare=1
 
   test_script:
     - xvfb-run -- ./mixxx-test --gtest_output=xml:test_results.xml

build/compile_commands.py

@@ -48,7 +48,7 @@ def __init__(self, value):
         self.Decider(changed_since_last_build_node)
 
 
-def changed_since_last_build_node(node, target, prev_ni):
+def changed_since_last_build_node(node, target, prev_ni, repo_node=None):
     """ Dummy decider to force always building"""
     return True
 

build/debian/changelog

@@ -1,3 +1,9 @@
+mixxx (2.2.2-0ubuntu1) bionic; urgency=medium
+
+  * Bugfix release
+
+ -- Uwe Klotz <[email protected]>  Thu, 10 Aug 2019 08:50:58 +0200
+
 mixxx (2.2.1-0ubuntu1) bionic; urgency=medium
 
   * Bugfix release 

build/debian/control

@@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 9),
 # QtSql
 # QtWidgets
 # QtXml
-               qt5-default (>= 5.2.0),
+               qt5-default (>= 5.4.0),
 # We additionally need headers for QtOpenGL, QtScript, and QtSvg.
                qtscript5-dev,
                libqt5opengl5-dev,
@@ -49,6 +49,7 @@ Build-Depends: debhelper (>= 9),
                libhidapi-dev,
                libupower-glib-dev,
                liblilv-dev,
+               libmodplug-dev,
                libmp3lame-dev,
 # for running mixxx-test
                xvfb