dguglielmi/sunny-overlay
1
0
Fork 0
mirror of https://github.com/dguglielmi/sunny-overlay.git synced 2025-12-06 09:32:37 +01:00
Code Issues Releases Wiki Activity

media-sound/mixxx: update pre-2.1.1 patches #5

Browse Source
This commit is contained in:
David GUGLIELMI
2018-05-17 13:44:40 +02:00
parent 38450d3ce3
commit f4e0c2134a
4 changed files with 392 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media-sound/mixxx/Manifest
View File

@@ -2,8 +2,10 @@ AUX mixxx-2.0.0-docs.patch 435 BLAKE2B c2e9b09abb293e59b2af49527eccf07c9488ae5e3
AUX mixxx-2.1.0-components-js-fixes.patch 3370 BLAKE2B ff9295a8c938e9c3a526e206792cd27cd4025ea07ede79da844cbd80565f10020b8856bdfbb2cf7557dba0bc8b3d775eb10c45f689d975aad13c35a22705a4a0 SHA512 ff27ad09b119bbf51e678a84c5eb60f9c6822a55160ea9d175f043caa33005d311d10366c91a1b7f402e6d7039cabac675aa35f893f02efe0015e831f2751bc8
AUX mixxx-2.1.0-debug-assert-and-fix-false-poisitiv-restart-request.patch 5694 BLAKE2B 7732252cf6438df9d52e6de8ceaaf6b2e1c30e35d8154eb7af5d94641346117d4ab0b5501686909d35c81a5fd5aa9442831f11b66faaec782c11a55e14a11363 SHA512 ee35ea84db8bf91cd2f14dd779faa91857df7bcc376525d533e65c778e241a5e66c829ab208e2da5d4afb3a48571042c13e5092c4974a07a9ea11146df68d326
AUX mixxx-2.1.0-deere-add-gain-knob-to-expanded-sampler-view.patch 1116 BLAKE2B a32d877d6877a2dfc3b12b1dc6e6b40342120a735aa35814d203a7c9e5581f40ec9950c5732f6698e4facbe0e3b98d278e1c2ca39c880e141d863e3042407863 SHA512 8b7093ded2c79ab7f7adc7b578f3b349a364fe5c3d01a4617184a64f30799f336d5911221f79478bf8e61159b99144584efef1add0df835fa84d309ba68ea0cb
AUX mixxx-2.1.0-denon-mc6000mk2-fix-looping.patch 13668 BLAKE2B e6c214029df1534912a3edce3bac2cd59f75fdef41af21e225871e80921c1b4325b6faa5f284970c03606af3ea4044670fa224ec58cc16fb10c9693e69b62e0f SHA512 0aace301b836c6940c094b0a951e1fd16ee3b3a80ac5defc2f4e5f903ff3ed71d7578d0b5ce2e9f400220c6bd17b3aae546a6738b84475f68553743c8495980b
AUX mixxx-2.1.0-denon-mc6000mk2-use-ramping-for-back-spins.patch 64070 BLAKE2B fd6941c4c995559e12900db68a92c32e79ee94841cb0c7f536296ef079db39fdcde6014c697f94d2f2d92d17c8e41f72c02343cdadc8054816ca2d6ca98b4dc4 SHA512 7d481cec81e88f7fefeff92969a49881ffaca9bd7fb17c215c45363d3078e9e31350829299479eb111000a04924634ff1b25579f951d6da9dc52ac4d3ac38a96
AUX mixxx-2.1.0-detect-m4a-decoding-errors-on-windows.patch 6352 BLAKE2B 6d7e83f037089729c085c7458fba7580063cff2a01bbc9b2260688cb350ebc3924da0190dab5d353b1e6db4766b6ef1ca63d5e7776728eddfd7032bfb355738b SHA512 18fbbf80fa72aaf50b1f716b220ea741d9deb3c003f56bdb34e10f9c4421b1b0c8ad19775927be93e3ca6b0aea35c10c3927dcb8f1ffcf95a5b60203fce452b5
AUX mixxx-2.1.0-dlgtrackinfo-mismatching-signal-slot-connection.patch 2196 BLAKE2B fa238d47fcab50770b63061ae9c2c72035b2f608a8d237c5af0693c2baf91447aa5db8fc53bf384cc3d1166228c50091ba7f6a5cd375247e8e7a58086b76eca0 SHA512 87fe610f586117a709010be3424aece865a31430ae4e65c369e84f5c86cbde2cf9d6454eb036e3406784f82faed264009b5eca49e65cc91e062c2a0baeadc943
AUX mixxx-2.1.0-fidlib-thread-safe-and-reentrant-generation-of-filters.patch 35122 BLAKE2B 976c623afc6f62fb5ee5082bcc503b7ca4bf5af160e102257024874e750a681347d6e4b70328a6596c88b261ed02f66ccb7c5897d1cf8174a92e4bb50d1e55c9 SHA512 377e2cd176264849f7de28d48107dca1c41b18a02c610d4f8c1ac824dc6e4c3d8b18363a7a3ae0d585157fed33592ad6cf578148508416b0783bd6b4084aaeb1
AUX mixxx-2.1.0-fix-cachingreader-compiler-warnings-about-non-trivial-types.patch 7055 BLAKE2B 669038949243674c8b7aaccd0cea4cc6c21644dd4bc2de463800bed71677d4e77cc5b3f5da89d0be3bdc44c847247afbf7b6248a29840aec676916bc8b9bc96f SHA512 45ec03e0d37b72d969fa730348a068df61200bae0a613045d9711637b6abc04608f2b3e7c2d99551dfa24c86846b3426c9f3600518258012e6e4d118f7beb947
AUX mixxx-2.1.0-fix-clearing-of-replaygain-gain-ratio-in-file-tags.patch 6898 BLAKE2B 7e20e44b0d6646cf410473b3d4c1ca310aa1b9ec8fafb06ee4480a90be7cb6fd3b67ac1a425d98beed03eef22016ad76f127ddcb46c6a7a22237ca93b59826ab SHA512 ecffb8bab5ad1d1f55acc2c3187a4dd10edda22e6708754e76184181808afc3fb014d43544b0a1006c9a439673bb56ab54549a0d95c0a05e709dcaba3600f8cc
@@ -23,4 +25,4 @@ AUX mixxx-2.1.0-pioneer-ddj-sx-mapping-bugfixes.patch 11255 BLAKE2B 9e15935f3fcf
AUX mixxx-2.1.0-swap-default-values-for-temp-perm-ratechanges.patch 1534 BLAKE2B 30e2c7fe396919fcdfba7102f360e307e2104bfa6480ec5615bc1482f2e496f99435d745468621f6ff7ae15e0e4857fd6db692061cf5d7b19b0bc7672b889aea SHA512 e0c6365f26313935b503de36edb9ed247333e892352645d5379659bc7a53761b7b24d1a162dee38cb776e17f5e8741d5235713d47f5812975169395bb4d00f05
AUX mixxx-2.1.0-use-an-in-memory-database-to-speed-up-library-tests.patch 3086 BLAKE2B d2cb0b7992cdb07b1ba2accde1d272cd3f75adf8bd3bb2450ad9203db5d7978c9b29dbf6e278a2a1f1fb8fb84f28b23f276f0f999b3e5d77c272b91716dcc9f1 SHA512 a6fefbc80f8facc8cd0bf501858b4dadb6ebe4bf476dc97273ad7e97ae2c0840ca9bd6b0b3aaa34caa837b967ee7fa12635c7c2957241ca6aff5a26531b6e25f
DIST mixxx-2.1.0-src.tar.gz 34835250 BLAKE2B 7a90c3794a146001fd0df6bb7c9c6231c0d26814eafc5c83da666d511d7af0e193b75da9b8728ad399dbef208cf2437881df2c87818e503945b02591bc300567 SHA512 d9f4fab92c2896ec455e2041aa6033f9a9091d2915a185a99427b9c35afe7c99565350ce477bf0487c6276c9585875f0be61f310779ae90195917d2e995bbf90
EBUILD mixxx-2.1.0.ebuild 4267 BLAKE2B 5ecf6a8a9f36e1ad563f4caa909a49239a6eec3ebe1d3f1b2ff5bcc295dfaeadb0dc357f3a98f5961f47e9b2e5d00eb7473bc92eae095af8650f9a4cee35c9bd SHA512 af9ddc98cf0bc19efc6418bfbbd4e2af68661daa18834e605955f3238e8f4b0488aba9d5ed27fef1028be1920b8fd8b66f5e6327c1af9065b6b99ea9f84a92b1
EBUILD mixxx-2.1.0.ebuild 4395 BLAKE2B 9ded5c79df127761bfb24d9f75912bf55f07953b3900ee59bde02206ef37db52cf8da61e21fee2624280d00d7e2efd709d38e5a5ad1620b4465246c94084ab96 SHA512 ed9935f7c705163ca5650d277a346eff29ecd84a1cc31c39ad448e269f933ca6374c7759b6f7ba75e23512498ecdab73c25b79fd189f9a7e0c1ff4da40c6e086

330
media-sound/mixxx/files/mixxx-2.1.0-denon-mc6000mk2-fix-looping.patch Normal file
View File

@@ -0,0 +1,330 @@
From ffd86c7fa83b0b64814eb488af4807bcfae4c51f Mon Sep 17 00:00:00 2001
From: Uwe Klotz <uklotz@mixxx.org>
Date: Tue, 15 May 2018 14:34:01 +0200
Subject: [PATCH 1/2] Denon MC6000MK2: Delete unused script code for hotcues
---
res/controllers/Denon-MC6000MK2-scripts.js | 30 ------------------------------
1 file changed, 30 deletions(-)
diff --git a/res/controllers/Denon-MC6000MK2-scripts.js b/res/controllers/Denon-MC6000MK2-scripts.js
index 7f1189ce9c..0ee05e4cd2 100644
--- a/res/controllers/Denon-MC6000MK2-scripts.js
+++ b/res/controllers/Denon-MC6000MK2-scripts.js
@@ -333,27 +333,6 @@ DenonMC6000MK2.disconnectControls = function () {
};
-////////////////////////////////////////////////////////////////////////
-// Hotcues //
-////////////////////////////////////////////////////////////////////////
-
-DenonMC6000MK2.Hotcue = function (deck, number, midiLedValue, midiDimmerLedValue) {
- this.deck = deck;
- this.number = number;
- this.ctrlPrefix = "hotcue_" + number;
- this.midiLedValue = midiLedValue;
- this.midiDimmerLedValue = midiDimmerLedValue;
-};
-
-DenonMC6000MK2.Hotcue.prototype.connectControls = function (callbackFunc) {
- this.deck.connectControl(this.ctrlPrefix + "_enabled", callbackFunc);
-};
-
-DenonMC6000MK2.Hotcue.prototype.isEnabled = function () {
- return this.deck.getValue(this.ctrlPrefix + "_enabled");
-};
-
-
////////////////////////////////////////////////////////////////////////
// Samplers //
////////////////////////////////////////////////////////////////////////
@@ -484,11 +463,6 @@ DenonMC6000MK2.OldDeck = function (number, midiChannel) {
this.setValue("rate_dir", -1);
this.vinylMode = undefined;
this.syncMode = undefined;
- this.hotcues = [];
- this.hotcues[1] = new DenonMC6000MK2.Hotcue(this, 1, 0x11, 0x12);
- this.hotcues[2] = new DenonMC6000MK2.Hotcue(this, 2, 0x13, 0x14);
- this.hotcues[3] = new DenonMC6000MK2.Hotcue(this, 3, 0x15, 0x16);
- this.hotcues[4] = new DenonMC6000MK2.Hotcue(this, 4, 0x17, 0x18);
};
/* Shift */
@@ -934,10 +908,6 @@ DenonMC6000MK2.OldDeck.prototype.connectControls = function () {
this.connectControl("loop_end_position", DenonMC6000MK2.ctrlLoopEndPosition);
DenonMC6000MK2.leftSide.efxUnit.connectDeckControls(this, DenonMC6000MK2.leftSide.efxUnit.ctrlDeck);
DenonMC6000MK2.rightSide.efxUnit.connectDeckControls(this, DenonMC6000MK2.rightSide.efxUnit.ctrlDeck);
- this.hotcues[1].connectControls(DenonMC6000MK2.ctrlHotcue1);
- this.hotcues[2].connectControls(DenonMC6000MK2.ctrlHotcue2);
- this.hotcues[3].connectControls(DenonMC6000MK2.ctrlHotcue3);
- this.hotcues[4].connectControls(DenonMC6000MK2.ctrlHotcue4);
// default settings
this.enableKeyLock();
this.enableVinylMode();
From 14626e909bc98b97bd1d24a09fbcc99b557f5547 Mon Sep 17 00:00:00 2001
From: Uwe Klotz <uklotz@mixxx.org>
Date: Tue, 15 May 2018 15:23:14 +0200
Subject: [PATCH 2/2] Denon MC6000MK2: Fix looping by capturing button release
events
---
res/controllers/Denon-MC6000MK2-scripts.js | 33 +++++----
res/controllers/Denon-MC6000MK2.midi.xml | 108 ++++++++++++++++++++++++-----
2 files changed, 108 insertions(+), 33 deletions(-)
diff --git a/res/controllers/Denon-MC6000MK2-scripts.js b/res/controllers/Denon-MC6000MK2-scripts.js
index 0ee05e4cd2..fccb95cae2 100644
--- a/res/controllers/Denon-MC6000MK2-scripts.js
+++ b/res/controllers/Denon-MC6000MK2-scripts.js
@@ -767,14 +767,16 @@ DenonMC6000MK2.OldDeck.prototype.hasLoopEnd = function () {
};
DenonMC6000MK2.OldDeck.prototype.hasLoop = function () {
- return this.hasLoopStart() && this.hasLoopEnd();
+ return this.hasLoopStart() && this.hasLoopEnd() && this.getValue("loop_start_position") < this.getValue("loop_end_position");
};
DenonMC6000MK2.OldDeck.prototype.deleteLoopStart = function () {
+ this.setValue("loop_in", false);
this.setValue("loop_start_position", DenonMC6000MK2.MIXXX_LOOP_POSITION_UNDEFINED);
};
DenonMC6000MK2.OldDeck.prototype.deleteLoopEnd = function () {
+ this.setValue("loop_out", false);
this.setValue("loop_end_position", DenonMC6000MK2.MIXXX_LOOP_POSITION_UNDEFINED);
};
@@ -861,11 +863,13 @@ DenonMC6000MK2.OldDeck.prototype.onLoopCutPlusButton = function (isButtonPressed
};
DenonMC6000MK2.OldDeck.prototype.updateLoopLeds = function (value) {
- this.loopInLed.setStateBoolean(this.hasLoopStart());
- this.loopOutLed.setStateBoolean(this.hasLoopEnd());
if (this.getValue("loop_enabled")) {
+ this.loopInLed.setTriState(DenonMC6000MK2.TRI_LED_BLINK);
+ this.loopOutLed.setTriState(DenonMC6000MK2.TRI_LED_BLINK);
this.autoLoopLed.setTriState(DenonMC6000MK2.TRI_LED_BLINK);
} else {
+ this.loopInLed.setStateBoolean(this.hasLoopStart());
+ this.loopOutLed.setStateBoolean(this.hasLoopEnd());
this.autoLoopDimmerLed.setStateBoolean(this.hasLoop());
}
};
@@ -1418,18 +1422,6 @@ DenonMC6000MK2.recvAutoLoopButton = function (channel, control, value, status, g
deck.onAutoLoopButton(isButtonPressed);
};
-DenonMC6000MK2.recvLoopInButton = function (channel, control, value, status, group) {
- var isButtonPressed = DenonMC6000MK2.isButtonPressed(value);
- var deck = DenonMC6000MK2.getDeckByGroup(group);
- deck.onLoopInButton(isButtonPressed);
-};
-
-DenonMC6000MK2.recvLoopOutButton = function (channel, control, value, status, group) {
- var isButtonPressed = DenonMC6000MK2.isButtonPressed(value);
- var deck = DenonMC6000MK2.getDeckByGroup(group);
- deck.onLoopOutButton(isButtonPressed);
-};
-
DenonMC6000MK2.recvLoopCutMinusButton = function (channel, control, value, status, group) {
var isButtonPressed = DenonMC6000MK2.isButtonPressed(value);
var deck = DenonMC6000MK2.getDeckByGroup(group);
@@ -1708,6 +1700,17 @@ DenonMC6000MK2.Deck.prototype.shiftButtonInput = function (channel, control, val
this.side.shiftButtonInput(channel, control, value, status);
};
+DenonMC6000MK2.Deck.prototype.loopInButtonInput = function (channel, control, value, status, group) {
+ var isButtonPressed = DenonMC6000MK2.isButtonPressed(value);
+ var deck = DenonMC6000MK2.getDeckByGroup(group);
+ deck.onLoopInButton(isButtonPressed);
+};
+
+DenonMC6000MK2.Deck.prototype.loopOutButtonInput = function (channel, control, value, status, group) {
+ var isButtonPressed = DenonMC6000MK2.isButtonPressed(value);
+ var deck = DenonMC6000MK2.getDeckByGroup(group);
+ deck.onLoopOutButton(isButtonPressed);
+};
////////////////////////////////////////////////////////////////////////
// Mixxx Callback Functions //
diff --git a/res/controllers/Denon-MC6000MK2.midi.xml b/res/controllers/Denon-MC6000MK2.midi.xml
index 7f175f0aee..7295201670 100644
--- a/res/controllers/Denon-MC6000MK2.midi.xml
+++ b/res/controllers/Denon-MC6000MK2.midi.xml
@@ -769,9 +769,27 @@
<normal/>
</options>
</control>
+ <control>
+ <group>[Channel2]</group>
+ <key>DenonMC6000MK2.rightDeck2.loopOutButtonInput</key>
+ <status>0x92</status>
+ <midino>0x39</midino>
+ <options>
+ <script-binding/>
+ </options>
+ </control>
+ <control>
+ <group>[Channel4]</group>
+ <key>DenonMC6000MK2.rightDeck4.loopOutButtonInput</key>
+ <status>0x93</status>
+ <midino>0x39</midino>
+ <options>
+ <script-binding/>
+ </options>
+ </control>
<control>
<group>[Channel1]</group>
- <key>DenonMC6000MK2.recvLoopOutButton</key>
+ <key>DenonMC6000MK2.leftDeck1.loopOutButtonInput</key>
<status>0x90</status>
<midino>0x39</midino>
<options>
@@ -780,7 +798,7 @@
</control>
<control>
<group>[Channel3]</group>
- <key>DenonMC6000MK2.recvLoopOutButton</key>
+ <key>DenonMC6000MK2.leftDeck3.loopOutButtonInput</key>
<status>0x91</status>
<midino>0x39</midino>
<options>
@@ -789,8 +807,8 @@
</control>
<control>
<group>[Channel2]</group>
- <key>DenonMC6000MK2.recvLoopOutButton</key>
- <status>0x92</status>
+ <key>DenonMC6000MK2.rightDeck2.loopOutButtonInput</key>
+ <status>0x82</status>
<midino>0x39</midino>
<options>
<script-binding/>
@@ -798,8 +816,8 @@
</control>
<control>
<group>[Channel4]</group>
- <key>DenonMC6000MK2.recvLoopOutButton</key>
- <status>0x93</status>
+ <key>DenonMC6000MK2.rightDeck4.loopOutButtonInput</key>
+ <status>0x83</status>
<midino>0x39</midino>
<options>
<script-binding/>
@@ -807,34 +825,61 @@
</control>
<control>
<group>[Channel1]</group>
- <key>DenonMC6000MK2.recvLoopInButton</key>
- <status>0x90</status>
- <midino>0x37</midino>
+ <key>DenonMC6000MK2.leftDeck1.loopOutButtonInput</key>
+ <status>0x80</status>
+ <midino>0x39</midino>
<options>
<script-binding/>
</options>
</control>
<control>
<group>[Channel3]</group>
- <key>DenonMC6000MK2.recvLoopInButton</key>
- <status>0x91</status>
+ <key>DenonMC6000MK2.leftDeck3.loopOutButtonInput</key>
+ <status>0x81</status>
+ <midino>0x39</midino>
+ <options>
+ <script-binding/>
+ </options>
+ </control>
+ <control>
+ <group>[Channel2]</group>
+ <key>DenonMC6000MK2.rightDeck2.loopInButtonInput</key>
+ <status>0x82</status>
<midino>0x37</midino>
<options>
<script-binding/>
</options>
</control>
<control>
- <group>[EqualizerRack1_[Channel1]_Effect1]</group>
- <key>parameter1</key>
- <status>0xB0</status>
- <midino>0x04</midino>
+ <group>[Channel4]</group>
+ <key>DenonMC6000MK2.rightDeck4.loopInButtonInput</key>
+ <status>0x83</status>
+ <midino>0x37</midino>
<options>
- <normal/>
+ <script-binding/>
+ </options>
+ </control>
+ <control>
+ <group>[Channel1]</group>
+ <key>DenonMC6000MK2.leftDeck1.loopInButtonInput</key>
+ <status>0x80</status>
+ <midino>0x37</midino>
+ <options>
+ <script-binding/>
+ </options>
+ </control>
+ <control>
+ <group>[Channel3]</group>
+ <key>DenonMC6000MK2.leftDeck3.loopInButtonInput</key>
+ <status>0x81</status>
+ <midino>0x37</midino>
+ <options>
+ <script-binding/>
</options>
</control>
<control>
<group>[Channel2]</group>
- <key>DenonMC6000MK2.recvLoopInButton</key>
+ <key>DenonMC6000MK2.rightDeck2.loopInButtonInput</key>
<status>0x92</status>
<midino>0x37</midino>
<options>
@@ -843,13 +888,40 @@
</control>
<control>
<group>[Channel4]</group>
- <key>DenonMC6000MK2.recvLoopInButton</key>
+ <key>DenonMC6000MK2.rightDeck4.loopInButtonInput</key>
<status>0x93</status>
<midino>0x37</midino>
<options>
<script-binding/>
</options>
</control>
+ <control>
+ <group>[Channel1]</group>
+ <key>DenonMC6000MK2.leftDeck1.loopInButtonInput</key>
+ <status>0x90</status>
+ <midino>0x37</midino>
+ <options>
+ <script-binding/>
+ </options>
+ </control>
+ <control>
+ <group>[Channel3]</group>
+ <key>DenonMC6000MK2.leftDeck3.loopInButtonInput</key>
+ <status>0x91</status>
+ <midino>0x37</midino>
+ <options>
+ <script-binding/>
+ </options>
+ </control>
+ <control>
+ <group>[EqualizerRack1_[Channel1]_Effect1]</group>
+ <key>parameter1</key>
+ <status>0xB0</status>
+ <midino>0x04</midino>
+ <options>
+ <normal/>
+ </options>
+ </control>
<control>
<group>[Channel2]</group>
<key>DenonMC6000MK2.recvXfaderAssignThruButton</key>

57
media-sound/mixxx/files/mixxx-2.1.0-dlgtrackinfo-mismatching-signal-slot-connection.patch Normal file
View File

@@ -0,0 +1,57 @@
From 41840857fefb4f359e3fe5e16b9899ffceffd86b Mon Sep 17 00:00:00 2001
From: Uwe Klotz <uklotz@mixxx.org>
Date: Wed, 16 May 2018 12:45:56 +0200
Subject: [PATCH] Fix mismatching signal/slot connection arg type
---
src/library/dlgtrackinfo.cpp | 18 +++++++++++-------
src/library/dlgtrackinfo.h | 2 +-
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/library/dlgtrackinfo.cpp b/src/library/dlgtrackinfo.cpp
index b619bfd59b..c0db2d815f 100644
--- a/src/library/dlgtrackinfo.cpp
+++ b/src/library/dlgtrackinfo.cpp
@@ -237,18 +237,22 @@ void DlgTrackInfo::slotCoverFound(const QObject* pRequestor,
}
void DlgTrackInfo::slotReloadCoverArt() {
- if (m_pLoadedTrack) {
- CoverInfo coverInfo =
- CoverArtUtils::guessCoverInfo(*m_pLoadedTrack);
- slotCoverInfoSelected(coverInfo);
+ VERIFY_OR_DEBUG_ASSERT(m_pLoadedTrack) {
+ return;
}
+ CoverInfo coverInfo =
+ CoverArtUtils::guessCoverInfo(*m_pLoadedTrack);
+ slotCoverInfoSelected(coverInfo);
}
-void DlgTrackInfo::slotCoverInfoSelected(const CoverInfo& coverInfo) {
+void DlgTrackInfo::slotCoverInfoSelected(const CoverInfoRelative& coverInfo) {
qDebug() << "DlgTrackInfo::slotCoverInfoSelected" << coverInfo;
- m_loadedCoverInfo = coverInfo;
+ VERIFY_OR_DEBUG_ASSERT(m_pLoadedTrack) {
+ return;
+ }
+ m_loadedCoverInfo = CoverInfo(coverInfo, m_pLoadedTrack->getLocation());
CoverArtCache* pCache = CoverArtCache::instance();
- if (pCache != NULL) {
+ if (pCache) {
pCache->requestCover(m_loadedCoverInfo, this, 0, false, true);
}
}
diff --git a/src/library/dlgtrackinfo.h b/src/library/dlgtrackinfo.h
index ab6717f6d5..0ca2a44a29 100644
--- a/src/library/dlgtrackinfo.h
+++ b/src/library/dlgtrackinfo.h
@@ -63,7 +63,7 @@ class DlgTrackInfo : public QDialog, public Ui::DlgTrackInfo {
void slotCoverFound(const QObject* pRequestor,
const CoverInfoRelative& info, QPixmap pixmap, bool fromCache);
- void slotCoverInfoSelected(const CoverInfo& coverInfo);
+ void slotCoverInfoSelected(const CoverInfoRelative& coverInfo);
void slotReloadCoverArt();
private:

2
media-sound/mixxx/mixxx-2.1.0.ebuild
View File

@@ -86,6 +86,8 @@ PATCHES=(
"${FILESDIR}"/${P}-detect-m4a-decoding-errors-on-windows.patch
"${FILESDIR}"/${P}-fix-cachingreader-compiler-warnings-about-non-trivial-types.patch
"${FILESDIR}"/${P}-components-js-fixes.patch
"${FILESDIR}"/${P}-denon-mc6000mk2-fix-looping.patch
"${FILESDIR}"/${P}-dlgtrackinfo-mismatching-signal-slot-connection.patch
)
S="${WORKDIR}/${PN}-release-${PV}"