mixxxdj · Be-ing · May 19, 2018 · Mar 30, 2018 · Mar 30, 2018 · Mar 30, 2018
diff --git a/.gitignore b/.gitignore
@@ -46,6 +46,10 @@ res/developer_skins
 *.mst
 *.cab
 build/wix/subdirs/*.wxs
+# The following 2 files are autogenerated by scons at release time
+# based on .tmpl template file for the second one.
+build/wix/bundle/bundleloc.wxs
+build/wix/ProductID.wxi
 
 *.obj
 *.pdb

diff --git a/.travis.yml b/.travis.yml
@@ -44,39 +44,44 @@ addons:
       - protobuf-compiler
       - scons
       - vamp-plugin-sdk
+      - 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 update ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install scons portaudio libsndfile libogg libvorbis portmidi taglib libshout protobuf flac ffmpeg libjpeg qt chromaprint rubberband fftw libmodplug libid3tag libmad mp4v2 faad2 wavpack opusfile; fi
+  # Homebrew uses Python 3 now, and portmidi depends on Python 2 which triggers this bug:
+  # https://github.com/Homebrew/homebrew-core/issues/26358
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade python ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install scons portaudio libsndfile libogg libvorbis portmidi taglib libshout protobuf flac ffmpeg qt chromaprint rubberband fftw libmodplug libid3tag libmad mp4v2 faad2 wavpack opusfile; fi
 
 install:
   ####
   # Common
 
   # Build flags common to OS X and Linux.
-  - export COMMON="test=1 mad=1 faad=1 ffmpeg=1 opus=1 modplug=1 wv=1 hss1394=0 virtualize=0 debug_assertions_fatal=1"
+  # Parallel builds are important for avoiding OSX build timeouts.
+  - export COMMON="-j4 test=1 mad=1 faad=1 ffmpeg=1 opus=1 modplug=1 wv=1 hss1394=0 virtualize=0 debug_assertions_fatal=1"
 
   #####
   # Ubuntu Trusty Build
 
   ####
   # OS X Build
 
-  # Define QTDIR.
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export QTDIR=$(find /usr/local/Cellar/qt5 -d 1 | tail -n 1) ; fi
+  # Define QTDIR. Homebrew does not support Qt4 anymore, so /usr/local/Cellar/qt stores Qt5 installs.
+  - 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): 11/15/2016 we are experiencing Travis timeouts for the OSX
+  # 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. We
   # also need to avoid going over 4MB of output so we turn off verbose mode.
-  # NOTE(rryan): 12/31/2016 Homebrew has dropped qt4 support. Build with qt5.
+  # NOTE(rryan): 2016-12-31 Homebrew has dropped qt4 support. Build with qt5.
   # 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 verbose=0 qt5=1 localecompare=0" ; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export EXTRA_FLAGS="localecompare=1" ; fi
@@ -86,5 +91,12 @@ install:
   - scons $COMMON $EXTRA_FLAGS
 
 script:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then gdb --batch -ex run -ex "thread apply all bt full" -ex quit ./mixxx-test ; fi
+  # NOTE(sblaisot): 2018-01-02 removing gdb wrapper on linux due to a bug in
+  # return code in order to avoid having a sucessful 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" == "osx" ]]; then lldb ./mixxx-test --batch -o run -o quit -k 'thread backtrace all' -k quit ; fi
+
+notifications:
+  webhooks:
+    - https://mixxx.zulipchat.com/api/v1/external/travis?stream=travis&topic=build-status&api_key=$ZULIP_API_KEY
diff --git a/CHANGELOG b/CHANGELOG
@@ -0,0 +1,122 @@
+==== 2.1 2018-04-15 ====
+After two years of hard work, we are pleased to announce Mixxx 2.1. We
+have overhauled the effects system, redesigned the skins, added and improved
+lots of controller mappings, rewrote the audio file decoders twice, and of
+course fixed a bunch of bugs. Download it!
+
+Here is a quick summary of what is new in Mixxx 2.1:
+  * Graphical interface scales for high resolution screens
+  * Overhauled Deere and LateNight skins
+  * New Tango skin
+  * Effects are synchronized to the tempo
+  * Effects are processed post-fader and post-crossfader and can be previewed
+in headphones
+  * One metaknob per effect with customizable parameter control for intuitive
+use of effect chains
+  * Nine new effects: Autopan, Biquad Equalizer, Biquad Full Kill Equalizer,
+Loudness Contour, Metronome, Parametric Equalizer, Phaser, Stereo Balance,
+Tremolo
+  * Loaded effects and their parameters are saved and restored when Mixxx
+restarts
+  * More transparent sounding equalizers (Biquad Equalizer and Biquad Full Kill
+Equalizer)
+  * Improved scratching sounds with jog wheels, vinyl control, and dragging
+waveforms with the mouse
+  * Simplified looping and beatjump controls
+  * Configurable rows of 8 samplers with up to 8 rows available for a total of
+64 samplers
+  * Files loaded to samplers are reloaded when Mixxx restarts
+  * Improved volume normalization algorithm (EBU-R 128)
+  * Filter library table by crates
+  * Sort musical keys in library table by circle of fifths
+  * Write metadata tags back to audio files
+  * New JavaScript library for controller mapping
+  * Configure multiple Internet broadcasting stations and use multiple stations
+at the same time
+  * Broadcast and record microphones with direct monitoring and latency
+compensation
+  * Broadcast and record from an external mixer
+  * Booth output with independent gain knob for using sound cards with 6
+output channels without an external mixer
+  * Prevent screensaver from starting while Mixxx is running
+  * CUP (Cue And Play) cue button mode
+  * Time remaining and time elapsed now take into account the tempo fader
+  * Clicking cover art now shows it full size in a separate window
+  * and of course, lots and lots of bug fixes.
+
+Here are controllers with mappings that have been added or updated since the 2.0
+release. Mappings marked with an asterisk (*) have been updated for the new
+effects interface:
+  * American Audio VMS2
+  * American Audio VMS4
+  * Allen & Heath Xone K2/K1*
+  * Behringer CMD Micro
+  * Behringer CMD MM1*
+  * Behringer CMD Studio 4a
+  * Denon MC4000*
+  * Denon MC6000 Mk2*
+  * FaderFox DJ2
+  * Hercules DJ Console 4-Mx*
+  * Hercules DJ Control MP3 LE / Glow
+  * Hercules DJ Control Compact
+  * Hercules P32*
+  * Ion Discover DJ
+  * Korg Nanokontrol 2
+  * Korg KAOSS DJ
+  * M-Audio Xponent
+  * Native Instruments Traktor Kontrol S4 Mk2*
+  * Novation Launchpad Mk1 & Mk2
+  * Novation Twitch
+  * Numark Mixtrack Pro 3 & Numark Mixtrack 3*
+  * Pioneer DDJ-SB2*
+  * Pioneer DDJ-SX*
+  * Reloop Beatmix 2
+  * Reloop Beatmix 4
+  * Reloop Digital Jockey 3 ME
+  * Reloop Terminal Mix 2
+  * Reloop Terminal Mix 4
+  * Vestax VCI-100 Mk2
+  * Vestax Typhoon
+
+For users upgrading from older versions of Mixxx, we have a few important
+announcements. First, if you are using Windows, you will have to uninstall any
+old versions of Mixxx before you can install 2.1. How to uninstall Mixxx
+varies on different versions of Windows:
+  * Windows Vista, 7, and 8: Start > Control Panel > Programs > Uninstall a
+Program https://support.microsoft.com/en-us/help/2601726
+  * Windows 10: Start > Control Panel > Programs > Programs And Features > look
+for Mixxx > Uninstall
+https://support.microsoft.com/en-gb/help/4028054/windows-repair-or-remove-
+programs-in-windows-10
+
+If you are upgrading from an older version of Mixxx and have MP3 files in
+your library, we have another important announcement. The good news is that we
+fixed a bug where the waveforms and audio playback of MP3 files were
+misaligned. The bad news is that we have no way of knowing which MP3 files were
+affected or how much the offset was. That means that waveforms, beatgrids,
+cues, and loops from older versions of Mixxx may be offset by an unknown amount
+for any MP3 file. Only MP3 files were affected by this bug; other audio file
+types are unaffected. You can either correct your beatgrids and cue points
+manually for each track, or you can clear this information for all MP3s and
+start fresh. Regardless, we recommend clearing the waveforms for all MP3
+files. To clear these, type "location:mp3" into the library search bar, press
+Control + A to select all tracks, right click, and select the information you
+want to clear from the menu.
+
+In the works for Mixxx 2.2, we have a big redesign of the library GUI. Along
+with that will come saving & restoring search queries plus nested crates.
+We are also planning on adding support for saving and loading custom effect
+chain presets with the ability to import and export them to share online.
+
+Want to help make Mixxx even more awesome? The biggest thing we need is more
+people. You do not need to be a programmer to help out. Giving feedback on the
+design of new features as they are being made is very valuable. Refer to the
+Testing page on the wiki for more information on how to get involved with that.
+Reporting bugs and telling us your ideas on the Launchpad bug tracker is a big
+help too! We cannot fix problems we do not know about, so please let us know if
+you find any issues with Mixxx. If you would like to help translate Mixxx into
+another language, refer to the Internationalization wiki page.  Of course, more
+programmers could always help. Read the Developer Documentation on the wiki for
+tips on getting started contributing code to Mixxx.
+
+We hope you have as much fun with Mixxx as we do!
diff --git a/COPYING b/COPYING
@@ -1,3 +1,3 @@
-Mixxx is Copyright (C) 2000-2017 by its respective authors. This version
+Mixxx is Copyright (C) 2000-2018 by its respective authors. This version
 of the program is distributed under the General Public License version 2,
 as described in the file LICENSE distributed with the program.
diff --git a/LICENSE b/LICENSE
@@ -1,8 +1,21 @@
-Mixxx version 2.1, Digital DJ'ing software.
-Copyright (C) 2001-2017 Mixxx Development Team
+Mixxx version 2.2, Digital DJ'ing software.
+Copyright (C) 2001-2018 Mixxx Development Team
 
-Promotional tracks are copyright their respective owners and
-distributed with permission.
+Mixxx is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version. The full text of the GNU
+General Public License, version 2 can be found below. The licenses
+of software libraries distributed together with Mixxx can be found
+below as well.
+
+Mixxx is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+This distribution of Mixxx may include skins that are licensed under a
+Creative Commons license. Full licensing information is available
+individually for each skin, located in their "skin.xml" file.
 
 Depending on your platform, you may receive a copy of PortAudio
 (http://www.portaudio.com/) which is distributed under the
@@ -16,32 +29,9 @@ available at http://www.steinberg.net/en/company/developer.html .
 
 On Windows you may receive a copy of the Microsoft Visual Studio runtime
 libraries. These are distributed only for the purpose of allowing
-Mixxx to run as per the license agreement for Visual Studio 2005/2008 and
+Mixxx to run as per the license agreement for Visual Studio and
 are copyright of Microsoft.
 
-This distribution of Mixxx may include skins that are licensed under a
-Creative Commons license. Full licensing information is available
-individually for each skin, located in their "skin.xml" file.
-
-The source code for Mixxx itself is licensed under the GPL v2 and
-the GPL v2 with an App Store exception as follows:
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-Mixxx comes with ABSOLUTELY NO WARRANTY;
-
 
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991

diff --git a/Mixxx-Manual.pdf b/Mixxx-Manual.pdf
diff --git a/README b/README
@@ -1,4 +1,4 @@
-Mixxx 2.1
+Mixxx 2.2
 
 * HOMEPAGE *************************************************
 

diff --git a/README.md b/README.md
@@ -13,8 +13,8 @@ To get started with Mixxx:
 
 ## Roadmap
 
-The Mixxx team is hard at work on Mixxx 2.1. The best place to keep track of
-2.1 development is the [2.1.0 milestone page on Launchpad][launchpad 2.1.0].
+The Mixxx team is hard at work on Mixxx 2.2. The best place to keep track of
+2.2 development is the [2.2.0 milestone page on Launchpad][launchpad 2.2.0].
 
 A more general roadmap can be found on [the wiki][wiki roadmap].
 
@@ -66,11 +66,11 @@ Help to spread Mixxx with translations into more languages, as well as to update
 Mixxx is a vibrant community of hackers, DJs and artists. To keep track of
 development and community news:
 
+- Chat with us on [Zulip][zulip].
 - Follow us on [Twitter], [Facebook], and [G+].
 - Subscribe to the [Mixxx Development Blog][blog].
 - Join the developer [mailing list].
 - Post on the [Mixxx forums][forums].
-- Join our [#mixxx on Freenode IRC][irc channel] to chat with us.
 
 ## License
 
@@ -96,7 +96,7 @@ license.
 [mailing list]: https://lists.sourceforge.net/lists/listinfo/mixxx-devel
 [irc channel]: http://mixxx.org/irc.php
 [SCons]: http://www.scons.org/
-[launchpad 2.1.0]: https://launchpad.net/mixxx/+milestone/2.1.0
+[launchpad 2.2.0]: https://launchpad.net/mixxx/+milestone/2.2.0
 [wiki roadmap]: http://mixxx.org/wiki/doku.php/development_roadmap
 [easybugs]: https://bugs.launchpad.net/mixxx/+bugs?field.searchtext=&orderby=-importance&search=Search&field.status%3Alist=NEW&field.status%3Alist=CONFIRMED&field.status%3Alist=TRIAGED&field.status%3Alist=INPROGRESS&field.status%3Alist=INCOMPLETE_WITH_RESPONSE&field.status%3Alist=INCOMPLETE_WITHOUT_RESPONSE&assignee_option=any&field.assignee=&field.bug_reporter=&field.bug_commenter=&field.subscriber=&field.structural_subscriber=&field.tag=easy&field.tags_combinator=ANY&field.has_cve.used=&field.omit_dupes.used=&field.omit_dupes=on&field.affects_me.used=&field.has_patch.used=&field.has_branches.used=&field.has_branches=on&field.has_no_branches.used=&field.has_no_branches=on&field.has_blueprints.used=&field.has_blueprints=on&field.has_no_blueprints.used=&field.has_no_blueprints=on
 [creating skins]: http://mixxx.org/wiki/doku.php/creating_skins
@@ -105,3 +105,4 @@ license.
 [Mixxx localization forum]: http://mixxx.org/forums/viewforum.php?f=10
 [Mixxx glossary]: https://www.transifex.com/projects/p/mixxxdj/glossary/l/en/
 [hardware compatibility]: http://mixxx.org/wiki/doku.php/hardware_compatibility
+[zulip]: https://mixxx.zulipchat.com/
diff --git a/SConstruct b/SConstruct
@@ -64,8 +64,9 @@ available_features = [features.Mad,
                       features.IPod,
                       features.FFMPEG,
 
-		     # Experimental features
-		     features.OpenGLES
+                      # Experimental features
+                      features.OpenGLES,
+                      features.QtKeychain
                       ]
 
 build = mixxx.MixxxBuild(target, machine, build_type,

diff --git a/appveyor.yml b/appveyor.yml
@@ -38,9 +38,6 @@ install:
   - call set ENVIRONMENT_NAME=%%ENVIRONMENT_NAME:PLATFORM=%platform%%%
   - call set ENVIRONMENT_NAME=%%ENVIRONMENT_NAME:CONFIGURATION=%configuration%%%
   - cd %TEMP%
-  - echo *** Patching NSIS
-  - cd %APPVEYOR_BUILD_FOLDER%
-  - patch "C:\Program Files (x86)\NSIS\Include\MultiUser.nsh" < build\appveyor\NSIS.patch
   - echo *** Downloading precompiled build environment if not in build-cache
   - cd %APPVEYOR_BUILD_FOLDER%
   - build\windows\install_buildenv.bat %ENVIRONMENTS_URL% %ENVIRONMENT_NAME% %ENVIRONMENTS_PATH%
@@ -74,3 +71,16 @@ on_finish:
 deploy:
   - provider: Environment
     name: downloads.mixxx.org
+
+notifications:
+  - provider: Webhook
+    url: https://mixxx.zulipchat.com/api/v1/messages
+    method: POST
+    content_type: application/x-www-form-urlencoded
+    headers:
+      Authorization:
+        secure: 95cbVBcC4rogjE5VNdhuYm8cnjPF8+7SeQXySqcxAqrFZxK+/Kcn3Q2hRb2iZfUEKZ+EdCYwx7EbpZdSiZc5goAuJT+/QXXT/Ls+fzc+eSy4Sz1Ic5t2BjLhmYZLdnBL3uIVceNSb8GzYPQx0+xy7g==
+    on_build_success: true
+    on_build_failure: true
+    on_build_status_changed: true
+    body: "type=stream&to=appveyor&subject={{projectName}} Build {{buildVersion}} {{status}}&content=Build {{buildVersion}} {{status}}{{#isPullRequest}} (PR #{{pullRequestId}}) {{/isPullRequest}}{{#failed}} :cross_mark:{{/failed}}{{#passed}} :heavy_check_mark:{{/passed}} {{buildUrl}}"
diff --git a/build/appveyor/NSIS.patch b/build/appveyor/NSIS.patch
diff --git a/build/appveyor/build_mixxx.bat b/build/appveyor/build_mixxx.bat
@@ -148,8 +148,8 @@ echo.
 echo Building Mixxx failed.
 echo.
 REM For debugging, print the configuration log.
-echo Printing config.log:
-type config.log
+REM echo Printing config.log:
+REM type config.log
 ENDLOCAL
 exit /b 1
 ) else (

diff --git a/build/debian/changelog b/build/debian/changelog
@@ -1,3 +1,9 @@
+mixxx (2.1.0-0ubuntu1) artful; urgency=medium
+
+  * New upstream release.
+
+ -- RJ Ryan <rryan@mixxx.org>  Sun, 15 Apr 2018 15:06:39 -0700
+
 mixxx (2.0.0-0ubuntu1) precise; urgency=medium
 
   * New upstream release.