From fab480147ef3e1f1d42fa020dd823cbb3c5076e6 Mon Sep 17 00:00:00 2001 From: Uwe Klotz Date: Sat, 24 Jul 2021 15:06:52 +0200 Subject: [PATCH 1/2] SoundSourceFLAC: Add missing retry counter increment --- src/sources/soundsourceflac.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/sources/soundsourceflac.cpp b/src/sources/soundsourceflac.cpp index 4e97e15f0a2..9c4f1d0a92b 100644 --- a/src/sources/soundsourceflac.cpp +++ b/src/sources/soundsourceflac.cpp @@ -224,6 +224,7 @@ ReadableSampleFrames SoundSourceFLAC::readSampleFramesClamped( } } } + ++retryCount; } // Decoding starts before the actual target position From 593fe6dd1386f710ab26c787c29648b1497b80a7 Mon Sep 17 00:00:00 2001 From: Uwe Klotz Date: Sat, 24 Jul 2021 15:12:43 +0200 Subject: [PATCH 2/2] Fix obvious issues in controller scripts --- res/controllers/Hercules-DJ-Console-4-Mx-scripts.js | 2 +- res/controllers/Korg-nanoKONTROL-2-scripts.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/res/controllers/Hercules-DJ-Console-4-Mx-scripts.js b/res/controllers/Hercules-DJ-Console-4-Mx-scripts.js index 1fcdc59ec77..24841f173f0 100644 --- a/res/controllers/Hercules-DJ-Console-4-Mx-scripts.js +++ b/res/controllers/Hercules-DJ-Console-4-Mx-scripts.js @@ -433,7 +433,7 @@ Hercules4Mx.allLedsOff = function() { // The jog wheel sensitivity setting has changed. This is reported in two scenarios: // when the setting is changed in the tray icon, and when the crossfader curve is changed to beatmix. -Hercules4Mx.sensitivityChanged = function(value, group, control, status, group) { +Hercules4Mx.sensitivityChanged = function(value, group, control, status) { Hercules4Mx.userSettings.sensitivity = 1 / value; }; diff --git a/res/controllers/Korg-nanoKONTROL-2-scripts.js b/res/controllers/Korg-nanoKONTROL-2-scripts.js index 0826345041a..a14aca0e664 100644 --- a/res/controllers/Korg-nanoKONTROL-2-scripts.js +++ b/res/controllers/Korg-nanoKONTROL-2-scripts.js @@ -41,7 +41,7 @@ if (NK2.numDecks==8){ }else if (NK2.numDecks==4){ NK2.Deck={1:"[Channel1]",2:"[Channel2]",3:"[Channel3]",4:"[Channel4]",5:"[Sampler1]",6:"[Sampler2]",7:"[Sampler3]",8:"[Sampler4]"};//list of decks, applied to each strip - 8 strips, 8 decks. (4 decks, 4 samplers) }else if (NK2.numDecks==2){ - NK2.Deck={1:"[Channel1]",2:"[Channel2]",3:"[Sampler1]",4:"[Sampler2]",5:"[Sampler3]",6:"[Sampler4]",5:"[Sampler5]",6:"[Sampler6]"};//list of decks, applied to each strip - 8 strips, 8 decks. (2 decks, 6 samplers) + NK2.Deck={1:"[Channel1]",2:"[Channel2]",3:"[Sampler1]",4:"[Sampler2]",5:"[Sampler3]",6:"[Sampler4]",7:"[Sampler5]",8:"[Sampler6]"};//list of decks, applied to each strip - 8 strips, 8 decks. (2 decks, 6 samplers) }