Merge remote-tracking branch 'upstream/2.5'

res/controllers/midi-controller-api.d.ts

@@ -1,7 +1,11 @@
+type MidiInputHandler = (channel: number, control: number, value:number, status:number, group:string) => void;
+
 declare interface MidiInputHandlerController {
     disconnect(): boolean;
 }
 
+/** MidiControllerJSProxy */
+
 declare namespace midi {
 
     /**

res/skins/Deere (64 Samplers)/skin.xml

@@ -212,7 +212,7 @@
 
                 <WidgetGroup><!-- Main section -->
                   <Layout>vertical</Layout>
-                  <SizePolicy>min,max</SizePolicy>
+                  <SizePolicy>min,min</SizePolicy>
                   <Children>
                     <Template src="skins:Deere/main_decks.xml"/>
                     <Template src="skins:Deere/effect_rack.xml"/>

res/translations/mixxx_es.ts

@@ -934,7 +934,7 @@ rastrear    - Arriba + Perfilar mensajes</translation>
         <location filename="../../src/controllers/controlpickermenu.cpp" line="146"/>
         <location filename="../../src/controllers/controlpickermenu.cpp" line="155"/>
         <source>Deck %1</source>
-        <translation>Deck %1</translation>
+        <translation>Plato %1</translation>
     </message>
     <message>
         <location filename="../../src/controllers/controlpickermenu.cpp" line="25"/>
@@ -944,7 +944,7 @@ rastrear    - Arriba + Perfilar mensajes</translation>
     <message>
         <location filename="../../src/controllers/controlpickermenu.cpp" line="26"/>
         <source>Preview Deck %1</source>
-        <translation>Deck de preescucha %1</translation>
+        <translation>Plato de preescucha %1</translation>
     </message>
     <message>
         <location filename="../../src/controllers/controlpickermenu.cpp" line="27"/>
@@ -10033,7 +10033,7 @@ Do you want to scan your library for cover files now?</source>
     <message>
         <location filename="../../src/controllers/midi/midiutils.cpp" line="45"/>
         <source>Switch</source>
-        <translation>Switch</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../../src/controllers/midi/midiutils.cpp" line="47"/>
@@ -12995,7 +12995,7 @@ may introduce a &apos;pumping&apos; effect and/or distortion.</source>
     <message>
         <location filename="../../src/skin/legacy/tooltips.cpp" line="171"/>
         <source>Main Channel L Volume Meter</source>
-        <translation type="unfinished"/>
+        <translation>Medidor de volumen del canal principal L</translation>
     </message>
     <message>
         <location filename="../../src/skin/legacy/tooltips.cpp" line="172"/>
@@ -13499,12 +13499,12 @@ may introduce a &apos;pumping&apos; effect and/or distortion.</source>
     <message>
         <location filename="../../src/skin/legacy/tooltips.cpp" line="973"/>
         <source>Intro End Marker</source>
-        <translation type="unfinished"/>
+        <translation>Marcador Final de Entrada</translation>
     </message>
     <message>
         <location filename="../../src/skin/legacy/tooltips.cpp" line="980"/>
         <source>Outro Start Marker</source>
-        <translation type="unfinished"/>
+        <translation>Marcador Inicial de Salida</translation>
     </message>
     <message>
         <location filename="../../src/skin/legacy/tooltips.cpp" line="987"/>

res/translations/mixxx_fr.ts

@@ -3893,7 +3893,7 @@ trace : ci-dessus + messages de profilage</translation>
     <message>
         <location filename="../../src/dialog/dlgaboutdlg.ui" line="130"/>
         <source>Date:</source>
-        <translation>Date:</translation>
+        <translation>Date :</translation>
     </message>
     <message>
         <location filename="../../src/dialog/dlgaboutdlg.ui" line="90"/>
@@ -4893,7 +4893,7 @@ Deux de source de connexions vers le même serveur, ayant le même point de mont
     <message>
         <location filename="../../src/preferences/dialog/dlgprefbroadcastdlg.ui" line="629"/>
         <source>Live mix</source>
-        <translation>Live mix</translation>
+        <translation>Mixage en direct</translation>
     </message>
     <message>
         <location filename="../../src/preferences/dialog/dlgprefbroadcastdlg.ui" line="643"/>
@@ -10116,12 +10116,12 @@ Désirez-vous rechercher maintenant les pochettes dans votre bibliothèque?</tra
     <message>
         <location filename="../../src/controllers/midi/midiutils.cpp" line="43"/>
         <source>Button</source>
-        <translation>Button</translation>
+        <translation>Bouton</translation>
     </message>
     <message>
         <location filename="../../src/controllers/midi/midiutils.cpp" line="45"/>
         <source>Switch</source>
-        <translation>Switch</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../../src/controllers/midi/midiutils.cpp" line="47"/>

res/translations/mixxx_nl.ts

@@ -3841,7 +3841,7 @@ traceren - Boven + Profileringsberichten</translation>
     <message>
         <location filename="../../src/dialog/dlgabout.cpp" line="38"/>
         <source>Mixxx %1.%2 Development Team</source>
-        <translation>Mixxx %1.%2 Development Team</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../../src/dialog/dlgabout.cpp" line="43"/>
@@ -7191,7 +7191,7 @@ and allows you to pitch adjust them for harmonic mixing.</source>
     <message>
         <location filename="../../src/preferences/dialog/dlgprefrecorddlg.ui" line="151"/>
         <source>Lossy</source>
-        <translation>Lossy</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../../src/preferences/dialog/dlgprefrecorddlg.ui" line="21"/>
@@ -7211,7 +7211,7 @@ and allows you to pitch adjust them for harmonic mixing.</source>
     <message>
         <location filename="../../src/preferences/dialog/dlgprefrecorddlg.ui" line="136"/>
         <source>Lossless</source>
-        <translation>Lossless</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../../src/preferences/dialog/dlgprefrecorddlg.ui" line="117"/>
@@ -7792,7 +7792,7 @@ Het DoelVolume is bij benadering en veronderstelt dat Track PreGain en Hoofd Out
     <message>
         <location filename="../../src/preferences/dialog/dlgprefwaveform.cpp" line="80"/>
         <source>Top</source>
-        <translation>Top</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../../src/preferences/dialog/dlgprefwaveform.cpp" line="81"/>
@@ -8844,12 +8844,12 @@ Dit resulteert vaak in Beat-Grids van hogere kwaliteit, maar zal het niet goed d
     <message>
         <location filename="../../src/library/dlgtrackinfomulti.ui" line="20"/>
         <source>Track Editor</source>
-        <translation>Track Editor</translation>
+        <translation>Track Verwerker</translation>
     </message>
     <message>
         <location filename="../../src/library/dlgtrackinfomulti.ui" line="54"/>
         <source>Title</source>
-        <translation>Title</translation>
+        <translation>Titel</translation>
     </message>
     <message>
         <location filename="../../src/library/dlgtrackinfomulti.ui" line="106"/>
@@ -9256,7 +9256,7 @@ Dit resulteert vaak in Beat-Grids van hogere kwaliteit, maar zal het niet goed d
     <message>
         <location filename="../../src/widget/findonwebmenuservices/findonwebmenudiscogs.cpp" line="53"/>
         <source>Artist + Title</source>
-        <translation>Artist + Title</translation>
+        <translation>Artiest + Titel</translation>
     </message>
     <message>
         <location filename="../../src/widget/findonwebmenuservices/findonwebmenudiscogs.cpp" line="59"/>
@@ -9266,7 +9266,7 @@ Dit resulteert vaak in Beat-Grids van hogere kwaliteit, maar zal het niet goed d
     <message>
         <location filename="../../src/widget/findonwebmenuservices/findonwebmenudiscogs.cpp" line="68"/>
         <source>Artist + Album</source>
-        <translation>Artist + Album</translation>
+        <translation>Artiest + Album</translation>
     </message>
     <message>
         <location filename="../../src/widget/findonwebmenuservices/findonwebmenudiscogs.cpp" line="73"/>
@@ -9284,7 +9284,7 @@ Dit resulteert vaak in Beat-Grids van hogere kwaliteit, maar zal het niet goed d
     <message>
         <location filename="../../src/widget/findonwebmenuservices/findonwebmenulastfm.cpp" line="51"/>
         <source>Artist + Title</source>
-        <translation>Artist + Title</translation>
+        <translation>Artiest + Titel</translation>
     </message>
     <message>
         <location filename="../../src/widget/findonwebmenuservices/findonwebmenulastfm.cpp" line="56"/>
@@ -9294,7 +9294,7 @@ Dit resulteert vaak in Beat-Grids van hogere kwaliteit, maar zal het niet goed d
     <message>
         <location filename="../../src/widget/findonwebmenuservices/findonwebmenulastfm.cpp" line="65"/>
         <source>Artist + Album</source>
-        <translation>Artist + Album</translation>
+        <translation>Artiest + Album</translation>
     </message>
     <message>
         <location filename="../../src/widget/findonwebmenuservices/findonwebmenulastfm.cpp" line="70"/>
@@ -9312,7 +9312,7 @@ Dit resulteert vaak in Beat-Grids van hogere kwaliteit, maar zal het niet goed d
     <message>
         <location filename="../../src/widget/findonwebmenuservices/findonwebmenusoundcloud.cpp" line="51"/>
         <source>Artist + Title</source>
-        <translation>Artist + Title</translation>
+        <translation>Artiest + Titel</translation>
     </message>
     <message>
         <location filename="../../src/widget/findonwebmenuservices/findonwebmenusoundcloud.cpp" line="56"/>
@@ -9322,7 +9322,7 @@ Dit resulteert vaak in Beat-Grids van hogere kwaliteit, maar zal het niet goed d
     <message>
         <location filename="../../src/widget/findonwebmenuservices/findonwebmenusoundcloud.cpp" line="65"/>
         <source>Artist + Album</source>
-        <translation>Artist + Album</translation>
+        <translation>Artiest + Album</translation>
     </message>
     <message>
         <location filename="../../src/widget/findonwebmenuservices/findonwebmenusoundcloud.cpp" line="70"/>
@@ -11622,12 +11622,12 @@ en het verwerkt uitgangssignaal auditief zo dicht mogelijk bij elkaar te houden<
     <message>
         <location filename="../../src/effects/backends/builtin/compressoreffect.cpp" line="68"/>
         <source>Ratio (:1)</source>
-        <translation>Ratio (:1)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../../src/effects/backends/builtin/compressoreffect.cpp" line="69"/>
         <source>Ratio</source>
-        <translation>Ratio</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../../src/effects/backends/builtin/compressoreffect.cpp" line="71"/>
@@ -12870,7 +12870,7 @@ release tijd zorgen voor een pompend effect en/of een vervorming.</translation>
     <message>
         <location filename="../../src/skin/legacy/tooltips.cpp" line="462"/>
         <source>Tempo and BPM Tap</source>
-        <translation>Tempo en BPM Tap</translation>
+        <translation>Tempo en Rate Tikken</translation>
     </message>
     <message>
         <location filename="../../src/skin/legacy/tooltips.cpp" line="489"/>
@@ -13258,7 +13258,7 @@ release tijd zorgen voor een pompend effect en/of een vervorming.</translation>
     <message>
         <location filename="../../src/skin/legacy/tooltips.cpp" line="418"/>
         <source>Tempo Tap</source>
-        <translation>Tempo Tap</translation>
+        <translation>Tempo Tikken</translation>
     </message>
     <message>
         <location filename="../../src/skin/legacy/tooltips.cpp" line="421"/>
@@ -16437,7 +16437,7 @@ Dit kan niet ongedaan gemaakt worden!</translation>
     <message>
         <location filename="../../src/widget/wtrackproperty.cpp" line="167"/>
         <source>title</source>
-        <translation>title</translation>
+        <translation>Titel</translation>
     </message>
 </context>
 <context>

res/translations/source_copy_allow_list.tsv

@@ -259,8 +259,6 @@ nl,sv	Center 1
 nl	Label...
 sn	Super Knob
 ca,es*,gl,ro	Control
-it	Jog Wheel / Select Knob
-ca,it	Jog Wheel / Select Knob
 nl	Volume Fader
 nl	Mid EQ
 nl	Loop %1 Beats
@@ -288,7 +286,7 @@ lb,nl	Crossfader Curve
 nb,nn,ro,sv	Artist
 nl	Cover Art
 nl	Scan
-nl,pt_BR,pt_PT	Item
+nl,pt*	Item
 ca	Controls
 ca,de,fr,nb,oc,pl,ro,sl,sv	Format
 ca,fr,nl,ro,sv	Permanent
@@ -363,10 +361,10 @@ es*,fr,it,nl,pt*	&Ok
 es*,pt_BR	Switch
 es*,pt*	Manual
 et,hr,it,tr,vi	BPM Tap
-fr	 pt
+fr,it,nl	 pt
 it	Password
 nl,sv,vi	Equalizers
-nl	Controllers
+nl,it	Controllers
 nl	Audio Buffer
 nl,sv	OpenGL Direct Rendering
 nl	Hard Clip
@@ -414,7 +412,7 @@ de,et,it,nl,pl,pt_BR,tr	Host
 de	Controller Name
 de	Name:
 de	Mappings
-de,it	Multi-Sampling
+de,it,nl	Multi-Sampling
 de,sv	Version:
 de,lb,oc,pt_BR,pt_PT	Linear
 de,nl,vi	Tags
@@ -429,6 +427,14 @@ de,nl	Track
 de,nl	Tracks
 it	legacy
 nl	Waveform type
-es*	Knee (dBFS)
-es*	Knee
-es*	Release
+es*,it,nl	Knee (dBFS)
+es*,it,nl	Knee
+es*,nl	Release
+it,nl	Auto Makeup Gain
+it,nl	Makeup
+it	controllers
+nl	&Reset
+nl	Compressor
+nl	Release (ms)
+it	Tempo Tap
+

src/engine/bufferscalers/enginebufferscalerubberband.cpp

@@ -14,7 +14,8 @@
 
 using RubberBand::RubberBandStretcher;
 
-#define RUBBERBANDV3 (RUBBERBAND_API_MAJOR_VERSION >= 2 && RUBBERBAND_API_MINOR_VERSION >= 7)
+#define RUBBERBANDV3 (RUBBERBAND_API_MAJOR_VERSION >= 3 || \
+        (RUBBERBAND_API_MAJOR_VERSION == 2 && RUBBERBAND_API_MINOR_VERSION >= 7))
 
 EngineBufferScaleRubberBand::EngineBufferScaleRubberBand(
         ReadAheadManager* pReadAheadManager)

src/mixer/playermanager.cpp

@@ -106,6 +106,7 @@ PlayerManager::PlayerManager(UserSettingsPointer pConfig,
         EngineMixer* pEngine)
         : m_mutex(QT_RECURSIVE_MUTEX_INIT),
           m_pConfig(pConfig),
+          m_pLibrary(nullptr),
           m_pSoundManager(pSoundManager),
           m_pEffectsManager(pEffectsManager),
           m_pEngine(pEngine),

src/mixer/samplerbank.cpp

@@ -102,24 +102,24 @@ bool SamplerBank::saveSamplerBankToPath(const QString& samplerBankPath) {
         return false;
     }
 
-    QDomDocument doc("SamplerBank");
+    QDomDocument doc(QStringLiteral("SamplerBank"));
 
-    QDomElement root = doc.createElement("samplerbank");
+    QDomElement root = doc.createElement(QStringLiteral("samplerbank"));
     doc.appendChild(root);
 
     for (unsigned int i = 0; i < m_pPlayerManager->numSamplers(); ++i) {
         Sampler* pSampler = m_pPlayerManager->getSampler(i + 1);
         if (!pSampler) {
             continue;
         }
-        QDomElement samplerNode = doc.createElement(QString("sampler"));
+        QDomElement samplerNode = doc.createElement(QStringLiteral("sampler"));
 
-        samplerNode.setAttribute("group", pSampler->getGroup());
+        samplerNode.setAttribute(QStringLiteral("group"), pSampler->getGroup());
 
         TrackPointer pTrack = pSampler->getLoadedTrack();
         if (pTrack) {
             QString samplerLocation = pTrack->getLocation();
-            samplerNode.setAttribute("location", samplerLocation);
+            samplerNode.setAttribute(QStringLiteral("location"), samplerLocation);
         }
         root.appendChild(samplerNode);
     }

src/test/autodjprocessor_test.cpp

@@ -280,7 +280,9 @@ TEST_F(AutoDJProcessorTest, FullIntroOutro_LongerIntro) {
     pAutoDJTableModel->appendTrack(testId);
 
     EXPECT_EQ(AutoDJProcessor::ADJ_DISABLED, pProcessor->getState());
+
     EXPECT_CALL(*pProcessor, emitLoadTrackToPlayer(_, QString("[Channel2]"), false));
+    EXPECT_CALL(*pProcessor, emitAutoDJStateChanged(AutoDJProcessor::ADJ_IDLE));
 
     // Enable AutoDJ, we immediately transition into IDLE and request a track
     // load on deck2.
@@ -314,6 +316,8 @@ TEST_F(AutoDJProcessorTest, FullIntroOutro_LongerIntro) {
     EXPECT_DOUBLE_EQ(1.0, deck1.play.get());
     EXPECT_DOUBLE_EQ(0.0, deck2.play.get());
 
+    EXPECT_CALL(*pProcessor, emitAutoDJStateChanged(AutoDJProcessor::ADJ_LEFT_FADING));
+
     // Seek the outgoing track to where outro start cue is placed. It should
     // start fading.
     deck1.playposition.set(0.6);