Merge branch '2.2' of git@github.com:mixxxdj/mixxx.git into 2.3

# Conflicts:
#	CHANGELOG
#	build/debian/rules

6 files changed, 81 insertions, 57 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fddae7eab6..e1eae15966 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -89,6 +89,7 @@
 * Add controller mapping for Stanton DJC.4 #2607
 * Fix broadcasting via broadcast/recording input lp:1876222 #2743
 * Only apply ducking gain in manual ducking mode when talkover is enabed lp:1394968 lp:1737113 lp:1662536 #2759
+* Ignore MIDI Clock Messages (0xF8) because they are not usable in Mixxx and inhibited the screensaver #2786
 
 ## [2.2.3](https://launchpad.net/mixxx/+milestone/2.2.3) (2019-11-24)
 
diff --git a/build/debian/rules b/build/debian/rules
index 343d719415..7191d81a7b 100755..100644
--- a/build/debian/rules
+++ b/build/debian/rules
@@ -6,15 +6,18 @@
 # Build flags are passed in from the SConscript. The following line is replaced
 # via exact-string matching so do not change it!
 MIXXX_SCONS_FLAGS = ""
+MIXXX_BUILD_FOLDER = "linux_build"
 
 # If ARCH is set to a different architecture when running pbuilder, pbuilder
 # will be set to create an environment to build packages for the architecture
 # specified in ARCH.
 ifneq (,$(findstring i386,$(ARCH)))
-  MIXXX_SCONS_FLAGS += machine=x86
+    MIXXX_SCONS_FLAGS += machine=x86
+    MIXXX_BUILD_FOLDER = "lin32_build"
 endif
 ifneq (,$(findstring amd64,$(ARCH)))
-  MIXXX_SCONS_FLAGS += machine=x86_64
+    MIXXX_SCONS_FLAGS += machine=x86_64
+    MIXXX_BUILD_FOLDER = "lin64_build"
 endif
 
 # parallel builds for scons
@@ -49,9 +52,9 @@ endif
 
 override_dh_auto_clean:
 	scons $(MIXXX_SCONS_FLAGS) -c || true
-	rm -rf .sconf_temp/ cache/ linux_build/
+	rm -rf .sconf_temp/ cache/ $(MIXXX_BUILD_FOLDER)/
 	dh_clean .sconsign.dblite cachecustom.py \
-		config.log src/build.h build/*.pyc mixxx.1
+		config.log src/build.h build/*.pyc mixxx.1 lib/*/lib/*.a
 	dh_auto_clean
 
 override_dh_auto_install:
diff --git a/build/features.py b/build/features.py
index 8946de8b79..33b9e13d20 100644
--- a/build/features.py
+++ b/build/features.py
@@ -728,6 +728,7 @@ class LiveBroadcasting(Feature):
             # Clone our main environment so we don't change any settings in the
             # Mixxx environment
             libshout_env = build.env.Clone()
+            libshout_env['LIB_OUTPUT'] = '#lib/libshout/lib'
 
             if build.toolchain_is_gnu:
                 libshout_env.Append(CCFLAGS='-pthread')
@@ -739,10 +740,14 @@ class LiveBroadcasting(Feature):
             env = libshout_env
             SCons.Export('env')
             SCons.Export('build')
-            env.SConscript(env.File('SConscript', libshout_dir))
+            env.SConscript(
+                env.File('SConscript', libshout_dir),
+                variant_dir="lib/libshout2",
+                duplicate=0,
+                exports=['build'])
 
             build.env.Append(CPPPATH="#lib/libshout/include")
-            build.env.Append(LIBPATH=libshout_dir)
+            build.env.Append(LIBPATH='#lib/libshout/lib')
             build.env.Append(LIBS=['shout_mixxx', 'ogg', 'vorbis', 'theora', 'speex', 'ssl', 'crypto'])
 
         depends.Qt.uic(build)('src/preferences/dialog/dlgprefbroadcastdlg.ui')
diff --git a/build/wix/Localization/po/nl-NL.po b/build/wix/Localization/po/nl-NL.po
index e61ba58b0d..87b267a701 100644
--- a/build/wix/Localization/po/nl-NL.po
+++ b/build/wix/Localization/po/nl-NL.po
@@ -1,6 +1,7 @@
 # 
 # Translators:
 # Henk Gordebeke <scheidsinfo@ziggo.nl>, 2017
+# Mario Moens <marimo.it4u@gmail.com>, 2020
 # Raf Van De Meirssche <raf@rafke.be>, 2016
 # Raf Van De Meirssche <raf@rafke.be>, 2016
 # S.Brandt <s.brandt@mixxx.org>, 2018
@@ -9,8 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mixxx DJ Windows installer\n"
-"PO-Revision-Date: 2019-04-17 21:53+0000\n"
-"Last-Translator: S.Brandt <s.brandt@mixxx.org>\n"
+"PO-Revision-Date: 2020-05-05 13:41+0000\n"
+"Last-Translator: Mario Moens <marimo.it4u@gmail.com>\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/mixxx-dj-software/mixxxdj-windows-installer/language/nl_NL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -166,23 +167,23 @@ msgstr "Hulpbestanden die Mixxx toelaten om te werken met andere talen dan Ameri
 #.  Bootstrapper
 msgctxt "Caption"
 msgid "[WixBundleName] Setup"
-msgstr ""
+msgstr "[WixBundleName] Setup"
 
 msgctxt "Title"
 msgid "[WixBundleName]"
-msgstr ""
+msgstr "[WixBundleName]"
 
 msgctxt "ConfirmCancelMessage"
 msgid "Are you sure you want to cancel?"
-msgstr ""
+msgstr "Weet je zeker dat je dit wilt annuleren?"
 
 msgctxt "ExecuteUpgradeRelatedBundleMessage"
 msgid "Previous version"
-msgstr ""
+msgstr "Vorige versie"
 
 msgctxt "HelpHeader"
 msgid "Setup Help"
-msgstr ""
+msgstr "Setup Help"
 
 msgctxt "HelpText"
 msgid ""
@@ -196,178 +197,178 @@ msgid ""
 " /norestart - suppress any attempts to restart. By default user interface will prompt before restart.\n"
 "\n"
 " /log log.txt - logs to a specific file. By default a log file is created in %TEMP%."
-msgstr ""
+msgstr "/installeren | /herstellen | /verwijderen | /layout [directory] - installeert, repareert, verwijdert of\n   maakt een complete lokale kopie van de bundel in de directory.\n    Installeren is de standaard.\n\n  /passief | /stil - geeft een minimale gebruikersinterface weer zonder prompts of geeft geen gebruikersinterface weer\n    en geen prompts. Standaard worden de gebruikersinterface en alle prompts weergegeven.\n\n /norestart - onderdruk pogingen om opnieuw op te starten. Standaard vraagt de gebruikersinterface om opnieuw op te starten.\n\n /log log.txt - logt in op een specifiek bestand. Standaard wordt een logbestand gemaakt in% TEMP%."
 
 msgctxt "HelpCloseButton"
 msgid "&Close"
-msgstr ""
+msgstr "&Sluiten"
 
 msgctxt "InstallHeader"
 msgid "Welcome"
-msgstr ""
+msgstr "Welkom"
 
 msgctxt "InstallMessage"
 msgid ""
 "Setup will install Mixxx on your computer.\n"
 "It will first install required third party libraries, then Mixxx itself.\n"
 "Click Install to continue or Close to exit."
-msgstr ""
+msgstr "Setup installeert Mixxx op uw computer.\nHet zal eerst de vereiste bibliotheken van derden installeren en vervolgens Mixxx zelf.\nKlik op Installeren om door te gaan of op Sluiten om af te sluiten."
 
 msgctxt "InstallVersion"
 msgid "Version [WixBundleVersion]"
-msgstr ""
+msgstr "[WixBundleVersion] Versie"
 
 msgctxt "InstallOptionsButton"
 msgid "&Options"
-msgstr ""
+msgstr "&Opties"
 
 msgctxt "InstallInstallButton"
 msgid "&Install"
-msgstr ""
+msgstr "&Installeer"
 
 msgctxt "InstallCloseButton"
 msgid "&Close"
-msgstr ""
+msgstr "&Sluiten"
 
 msgctxt "OptionsHeader"
 msgid "Setup Options"
-msgstr ""
+msgstr "Setup Opties"
 
 msgctxt "OptionsLocationLabel"
 msgid "Install location:"
-msgstr ""
+msgstr "Installatielocatie:"
 
 msgctxt "OptionsBrowseButton"
 msgid "&Browse"
-msgstr ""
+msgstr "&Bladeren"
 
 msgctxt "OptionsOkButton"
 msgid "&OK"
-msgstr ""
+msgstr "&OK"
 
 msgctxt "OptionsCancelButton"
 msgid "&Cancel"
-msgstr ""
+msgstr "&Anulleren"
 
 msgctxt "FilesInUseHeader"
 msgid "Files In Use"
-msgstr ""
+msgstr "Bestanden in gebruik"
 
 msgctxt "FilesInUseLabel"
 msgid "The following applications are using files that need to be updated:"
-msgstr ""
+msgstr "De volgende toepassingen maken gebruik van bestanden die moeten worden bijgewerkt:"
 
 msgctxt "FilesInUseCloseRadioButton"
 msgid "Close the &applications and attempt to restart them."
-msgstr ""
+msgstr "Sluit de &applicaties en probeer ze opnieuw op te starten."
 
 msgctxt "FilesInUseDontCloseRadioButton"
 msgid "&Do not close applications. A reboot will be required."
-msgstr ""
+msgstr "&Sluit applicaties niet. Opnieuw opstarten is vereist."
 
 msgctxt "FilesInUseOkButton"
 msgid "&OK"
-msgstr ""
+msgstr "&OK"
 
 msgctxt "FilesInUseCancelButton"
 msgid "&Cancel"
-msgstr ""
+msgstr "&Anulleren"
 
 msgctxt "ProgressHeader"
 msgid "Setup Progress"
-msgstr ""
+msgstr "Setup Voortgang"
 
 msgctxt "ProgressLabel"
 msgid "Processing:"
-msgstr ""
+msgstr "Verwerken:"
 
 msgctxt "OverallProgressPackageText"
 msgid "Initializing..."
-msgstr ""
+msgstr "Initialiseren..."
 
 msgctxt "ProgressCancelButton"
 msgid "&Cancel"
-msgstr ""
+msgstr "&Anulleren"
 
 msgctxt "ModifyHeader"
 msgid "Modify Setup"
-msgstr ""
+msgstr "Setup wijzigen"
 
 msgctxt "ModifyRepairButton"
 msgid "&Repair"
-msgstr ""
+msgstr "&Herstellen"
 
 msgctxt "ModifyUninstallButton"
 msgid "&Uninstall"
-msgstr ""
+msgstr "&Verwijderen"
 
 msgctxt "ModifyCloseButton"
 msgid "&Close"
-msgstr ""
+msgstr "&Sluten"
 
 msgctxt "SuccessHeader"
 msgid "Setup Successful"
-msgstr ""
+msgstr "Setup succesvol"
 
 msgctxt "SuccessInstallHeader"
 msgid "Mixxx installation has been successful"
-msgstr ""
+msgstr "Mixxx-installatie is geslaagd"
 
 msgctxt "SuccessRepairHeader"
 msgid "Mixxx repair has been successful"
-msgstr ""
+msgstr "Mixxx-herstel is geslaagd"
 
 msgctxt "SuccessUninstallHeader"
 msgid "Mixxx uninstall has been successful"
-msgstr ""
+msgstr "Mixxx verwijderen is geslaagd"
 
 msgctxt "SuccessLaunchButton"
 msgid "&Launch"
-msgstr ""
+msgstr "&Opstarten"
 
 msgctxt "SuccessRestartText"
 msgid "You must restart your computer before you can use the software."
-msgstr ""
+msgstr "U moet uw computer opnieuw opstarten voordat u de software kunt gebruiken."
 
 msgctxt "SuccessRestartButton"
 msgid "&Restart"
-msgstr ""
+msgstr "&Herstarten"
 
 msgctxt "SuccessCloseButton"
 msgid "&Close"
-msgstr ""
+msgstr "&Sluten"
 
 msgctxt "FailureHeader"
 msgid "Setup Failed"
-msgstr ""
+msgstr "Installatie mislukt"
 
 msgctxt "FailureInstallHeader"
 msgid "Mixxx installation failed"
-msgstr ""
+msgstr "Mixxx-installatie mislukt"
 
 msgctxt "FailureRepairHeader"
 msgid "Mixxx repair failed"
-msgstr ""
+msgstr "Mixxx-herstel mislukt"
 
 msgctxt "FailureUninstallHeader"
 msgid "Mixxx uninstall failed"
-msgstr ""
+msgstr "Mixxx verwijderen is mislukt"
 
 msgctxt "FailureHyperlinkLogText"
 msgid ""
 "One or more issues caused the setup to fail. Please fix the issues and then "
 "retry setup. For more information see the <a href=\"#\">log file</a>."
-msgstr ""
+msgstr "Door een of meer problemen is de installatie mislukt. Los de problemen op en probeer het opnieuw. Zie het <a href=\"#\">logbestand</a> voor meer informatie."
 
 msgctxt "FailureRestartText"
 msgid ""
 "You must restart your computer to complete the rollback of the software."
-msgstr ""
+msgstr "U moet uw computer opnieuw opstarten om het terugdraaien van de software te voltooien."
 
 msgctxt "FailureRestartButton"
 msgid "&Restart"
-msgstr ""
+msgstr "&Herstarten"
 
 msgctxt "FailureCloseButton"
 msgid "&Close"
-msgstr ""
+msgstr "&Sluten"
diff --git a/lib/libshout/SConscript b/lib/libshout/SConscript
index 7502884e09..9d415a2d39 100644
--- a/lib/libshout/SConscript
+++ b/lib/libshout/SConscript
@@ -32,4 +32,8 @@ env.Append(CPPDEFINES='HAVE_CONFIG_H')
 env.Append(CPPPATH='src/common')
 env.Append(CPPPATH='include')
 
-env.StaticLibrary(target='libshout_mixxx', source=libshout_sources)
+libshout_mixxx = env.StaticLibrary(target='libshout_mixxx', source=libshout_sources)
+
+# Install the libraries if needed.
+if 'LIB_OUTPUT' in env.Dictionary():
+    env.Install('$LIB_OUTPUT', source=[libshout_mixxx])
diff --git a/src/controllers/midi/midicontroller.cpp b/src/controllers/midi/midicontroller.cpp
index 7f6c8ea5d6..6fc17d82a9 100644
--- a/src/controllers/midi/midicontroller.cpp
+++ b/src/controllers/midi/midicontroller.cpp
@@ -201,6 +201,16 @@ void MidiController::receive(unsigned char status, unsigned char control,
     unsigned char channel = MidiUtils::channelFromStatus(status);
     unsigned char opCode = MidiUtils::opCodeFromStatus(status);
 
+    // Ignore MIDI beat clock messages (0xF8) until we have proper MIDI sync in
+    // Mixxx. These messages are not suitable to use in JS anyway, as they are
+    // sent at 24 ppqn (i.e. one message every 20.83 ms for a 120 BPM track)
+    // and require real-time code. Currently, they are only spam on the
+    // console, inhibit the screen saver unintentionally, could potentially
+    // slow down Mixxx or interfere with the learning wizard.
+    if (status == 0xF8) {
+        return;
+    }
+
     controllerDebug(MidiUtils::formatMidiMessage(getName(), status, control, value,
                                                  channel, opCode, timestamp));
     MidiKey mappingKey(status, control);