Skin layout revamp resolved conflicts

.gitignore

@@ -4,6 +4,7 @@
 *.orig
 *.os
 *.patch
+!build/appveyor/NSIS.patch
 *.pyc
 *.rej
 *_build
@@ -39,12 +40,16 @@ src/test/golden_buffers/*.actual
 res/qrc_mixxx.cc
 res/developer_skins
 
-build/wix/*.wixobj
-build/wix/*.wixpdb
-build/wix/*.msi
-build/wix/*.mst
-build/wix/subdirs/*.wixobj
+*.wixobj
+*.wixpdb
+*.msi
+*.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

.travis.yml

@@ -7,14 +7,16 @@ matrix:
       compiler: gcc
 
     - os: osx
-      osx_image: xcode7.2
+      osx_image: xcode7.3
       compiler: clang
 # install dependencies
 addons:
   apt:
     sources:
       - ubuntu-toolchain-r-test
     packages:
+      - gdb
+      - libavformat-dev
       - libchromaprint-dev
       - libfaad-dev
       - libfftw3-dev
@@ -27,6 +29,7 @@ addons:
       - libportmidi-dev
       - libprotobuf-dev
       - libqt4-dev
+      - libqt4-opengl-dev
       - libqt4-sql-sqlite
       - librubberband-dev
       - libshout3-dev
@@ -46,36 +49,41 @@ before_install:
   - 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 libjpeg qt chromaprint rubberband fftw libmodplug libid3tag libmad mp4v2 faad2 wavpack opusfile; 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 localecompare=1 mad=1 faad=1 opus=1 modplug=1 wv=1 hss1394=0 virtualize=0"
+  - export COMMON="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
 
-  # TODO(rryan): libupower-glib-dev is currently not whitelisted by travis so we cannot
-  # test building with battery support.
-  # https://github.com/travis-ci/apt-package-whitelist/issues/2806
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then scons $COMMON battery=0 ; fi
-
   ####
   # OS X Build
 
-  # Define QTDIR.
+  # 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
 
-  # We support OS X 10.7 with libc++ by default.
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then scons $COMMON stdlib=libc++ osx_sdk_version_min=10.7 ; fi
+  # NOTE(rryan): 11/15/2016 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.
+  # 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
+
+  ####
+  # Common Build
+  - scons $COMMON $EXTRA_FLAGS
 
 script:
-  - ./mixxx-test
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then gdb --batch -ex run -ex "thread apply all bt full" -ex quit ./mixxx-test ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then lldb ./mixxx-test --batch -o run -o quit -k 'thread backtrace all' -k quit ; fi

CODE_OF_CONDUCT.md

@@ -0,0 +1,84 @@
+# Mixxx Code of Conduct
+
+The Mixxx team is committed to preserving and fostering a
+diverse, welcoming community. Below is our community code of conduct, which
+applies to our repos and organizations, mailing lists, forums, IRC channels,
+blog content, and any
+other Mixxx-supported communication group, as well as any private
+communication initiated in the context of these spaces.
+
+Simply put, community discussions should be
+
+ * respectful and kind;
+ * about Mixxx;
+ * about features and code, not the individuals involved.
+
+## Be respectful and constructive.
+
+Treat everyone with respect. Build on each other's ideas. Each of us has the
+right to enjoy our experience and participate without fear of harassment,
+discrimination, or condescension, whether blatant or subtle. Remember that
+Mixxx is a geographically distributed team and that you may not be
+communicating with someone in their primary language. We all get frustrated
+when working on hard problems, but we cannot allow that frustration to turn
+into personal attacks.
+
+## Speak up if you see or hear something.
+
+You are empowered to politely engage when you feel that you or others are
+disrespected. The person making you feel uncomfortable may not be aware of what
+they are doing - politely bringing their behavior to their attention is
+encouraged.
+
+If you are uncomfortable speaking up, or feel that your concerns are not being
+duly considered, you can email community@mixxx.org to request involvement
+from a community manager. You may also email any of the community managers
+directly. All concerns shared with community managers will be kept
+confidential. In cases where a public response is deemed necessary, the
+identities of victims and reporters will remain confidential unless those
+individuals instruct us otherwise.
+
+While all reports will be taken seriously, the Mixxx community managers may
+not act on complaints that they feel are not violations of this code of
+conduct.
+
+## We will not tolerate harassment of any kind, including but not limited to:
+
+ * Harassing comments
+ * Intimidation
+ * Encouraging a person to engage in self-harm.
+ * Sustained disruption or derailing of threads, channels, lists, etc.
+ * Offensive or violent comments, jokes or otherwise
+ * Inappropriate sexual content
+ * Unwelcome sexual or otherwise aggressive attention
+ * Continued one-on-one communication after requests to cease
+ * Distribution or threat of distribution of people's personally identifying
+   information, AKA “doxing”
+
+## Consequences for failing to comply with this policy
+
+Consequences for failing to comply with this policy may include, at the sole
+discretion of the Mixxx community managers:
+
+ * a request for an apology;
+ * a private or public warning or reprimand;
+ * a temporary ban from the mailing list, blog, Mixxx repository or
+   organization, or other Mixxx-supported communication group, including
+   loss of committer status;
+ * a permanent ban from any of the above, or from all current and future
+   Mixxx-supported communities, including loss of
+   committer status.
+
+Participants warned to stop any harassing behavior are expected to comply
+immediately; failure to do so will result in an escalation of consequences.
+
+## Acknowledgements
+
+This Code of Conduct is based on the Chromium Code of Conduct, which credits
+the Geek Feminism Code of Conduct, the Django Code of Conduct and the Geek
+Feminism Wiki "Effective codes of conduct" guide.
+
+## License
+
+This Code of Conduct is available for reuse under the Creative Commons Zero
+(CC0) license.

COPYING

@@ -1,3 +1,3 @@
-Mixxx is Copyright (C) 2000-2016 by its respective authors. This version
+Mixxx is Copyright (C) 2000-2017 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.

LICENSE

@@ -1,5 +1,5 @@
 Mixxx version 2.1, Digital DJ'ing software.
-Copyright (C) 2001-2016 Mixxx Development Team
+Copyright (C) 2001-2017 Mixxx Development Team
 
 Promotional tracks are copyright their respective owners and
 distributed with permission.

README.md

@@ -13,8 +13,8 @@ To get started with Mixxx:
 
 ## Roadmap
 
-The Mixxx team is hard at work on Mixxx 2.0. The best place to keep track of
-2.0 development is the [2.0.0 milestone page on Launchpad][launchpad 2.0.0].
+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].
 
 A more general roadmap can be found on [the wiki][wiki roadmap].
 
@@ -29,7 +29,8 @@ bug list][easybugs] and get started!
 
 ## Compiling
 
-[![Build Status](https://travis-ci.org/mixxxdj/mixxx.svg)](https://travis-ci.org/mixxxdj/mixxx)
+* Linux / MacOS [![Build Status](https://travis-ci.org/mixxxdj/mixxx.svg)](https://travis-ci.org/mixxxdj/mixxx)
+* Windows [![Build status](https://ci.appveyor.com/api/projects/status/j460rficblcaopwx?svg=true)](https://ci.appveyor.com/project/mixxxdj/mixxx)
 
 First, you must install all of Mixxx's dependencies. To compile Mixxx using
 [SCons], run:
@@ -95,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.0.0]: https://launchpad.net/mixxx/+milestone/2.0.0
+[launchpad 2.1.0]: https://launchpad.net/mixxx/+milestone/2.1.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

SConstruct

@@ -40,7 +40,7 @@ available_features = [features.Mad,
                       features.Bulk,
                       features.MacAppStoreException,
                       features.VinylControl,
-                      features.Shoutcast,
+                      features.LiveBroadcasting,
                       features.Opus,
                       features.Profiling,
                       features.BuildTime,
@@ -52,9 +52,8 @@ available_features = [features.Mad,
                       features.ModPlug,
                       features.TestSuite,
                       features.Vamp,
-                      features.AutoDjCrates,
                       features.ColorDiagnostics,
-                      features.AddressSanitizer,
+                      features.Sanitizers,
                       features.LocaleCompare,
                       features.Battery,
 

appveyor.yml

@@ -0,0 +1,76 @@
+---
+version: '{branch}-{build}'
+skip_tags: true
+max_jobs: 1
+image: Visual Studio 2015
+init:
+  - git config --global core.autocrlf input
+# Uncomment the following line to show RDP info at beginning of job
+#  - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+clone_folder: c:\projects\mixxx
+skip_commits:
+  files:
+    - doc/
+    - LICENCE
+    - README
+    - README.md
+    - COPYING
+    - CODE_OF_CONDUCT.md
+
+configuration:
+  - release-fastbuild
+#  - release
+#  - debug
+environment:
+  ENVIRONMENTS_URL: https://downloads.mixxx.org/builds/buildserver/2.1.x-windows/
+  ENVIRONMENTS_PATH: C:\mixxx-buildserver
+  matrix:
+    - platform: x64
+      distdir: dist64
+    - platform: x86
+      distdir: dist32
+matrix:
+  fast_finish: false     # set this flag to true to immediately finish build once one of the jobs fails.
+cache:
+  - C:\mixxx-buildserver
+install:
+  - set /P ENVIRONMENT_NAME=<build/windows/golden_environment
+  - 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%
+before_build:
+  - cd %APPVEYOR_BUILD_FOLDER%
+build_script:
+  - build\appveyor\build_mixxx.bat %platform% %configuration% %ENVIRONMENTS_PATH%\%ENVIRONMENT_NAME%
+test_script:
+  - echo *** Testing
+  # Calling mixxx-test under bash to have standard output
+  # and use stdbuf to unbuffer standard & error output
+  - bash -c "stdbuf -oL -eL %distdir%/mixxx-test.exe --gtest_output=xml:test_results.xml 2>&1"
+  - timeout 5 > NUL
+  - bash -c "stdbuf -oL -eL %distdir%/mixxx-test.exe --benchmark 2>&1"
+  - timeout 5 > NUL
+after_test:
+  - ps: (new-object net.webclient).UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\test_results.xml))
+artifacts:
+  - path: '*.exe'
+  - path: '*.msi'
+on_success:
+  - echo "*** SUCCESS ***"
+on_failure:
+  - echo "*** FAILURE ***"
+on_finish:
+  # Uncomment the following line if you don't want the build VM to be destroyed
+  # and be able to RDP on it until a special “lock” file on VM desktop is deleted
+  # The RDP session is limited by overall build time (60 min).
+#  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+  - echo "*** DONE ***"
+deploy:
+  - provider: Environment
+    name: downloads.mixxx.org

build/appveyor/NSIS.patch

@@ -0,0 +1,15 @@
+--- MultiUser.nsh.orig  2017-09-16 20:03:48.000000000 +0000
++++ MultiUser.nsh       2017-09-16 20:14:24.236880542 +0000
+@@ -133,7 +133,11 @@
+         ${if} ${AtLeastWin2000}
+           StrCpy $INSTDIR "$LOCALAPPDATA\${MULTIUSER_INSTALLMODE_INSTDIR}"
+         ${else}
+-          StrCpy $INSTDIR "$PROGRAMFILES\${MULTIUSER_INSTALLMODE_INSTDIR}"
++         !ifdef MULTIUSER_USE_PROGRAMFILES64
++            StrCpy $INSTDIR "$PROGRAMFILES64\${MULTIUSER_INSTALLMODE_INSTDIR}"
++          !else
++            StrCpy $INSTDIR "$PROGRAMFILES\${MULTIUSER_INSTALLMODE_INSTDIR}"
++         !endif
+         ${endif}
+       !endif
+     !endif