ScreenEvaluation BPM Display Fix

diff --git a/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml b/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml
index d8cccd6..f21dbea 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml
@@ -319,15 +319,27 @@ end">
                                gnHighRoundBPM = math.floor(gnHighRoundBPM);
                                gnBPMDisplay = gnLowRoundBPM..'-'..gnHighRoundBPM;
                                end     
-                       if curRate ~= 1 then
-                       gnSongLengthDisplay = string.gsub(gnSongLength,'Patched','Length Patched');
-                       gnSongLengthDisplay = string.gsub(gnSongLength,'Length Length Patched','Length Patched');
-                       self:settext(gnBPMDisplay..' BPM ('..curRate..'x Music Rate) - '..gnSongLengthDisplay);
-                       else
-                       gnSongLengthDisplay = string.gsub(gnSongLength,'Patched','Length Patched');
-                       gnSongLengthDisplay = string.gsub(gnSongLength,'Length Length Patched','Length Patched');
-                       self:settext(gnBPMDisplay..' BPM - '..gnSongLengthDisplay);
-                       end
+                       if GAMESTATE:IsPlayerEnabled(PLAYER_2) and not GAMESTATE:IsPlayerEnabled(PLAYER_1) then
+                               if curRate ~= 1 then
+                                       gnSongLengthDisplay = string.gsub(gnSongLength,'Patched','Length Patched');
+                                       gnSongLengthDisplay = string.gsub(gnSongLength,'Length Length Patched','Length Patched');
+                                       self:settext(DisplayBPM(2, true, false)..' BPM ('..curRate..'x Music Rate) - '..gnSongLengthDisplay);
+                                       else
+                                       gnSongLengthDisplay = string.gsub(gnSongLength,'Patched','Length Patched');
+                                       gnSongLengthDisplay = string.gsub(gnSongLength,'Length Length Patched','Length Patched');
+                                       self:settext(DisplayBPM(2, true, false)..' BPM - '..gnSongLengthDisplay);
+                                       end
+                               else
+                               if curRate ~= 1 then
+                                       gnSongLengthDisplay = string.gsub(gnSongLength,'Patched','Length Patched');
+                                       gnSongLengthDisplay = string.gsub(gnSongLength,'Length Length Patched','Length Patched');
+                                       self:settext(DisplayBPM(1, true, false)..' BPM ('..curRate..'x Music Rate) - '..gnSongLengthDisplay);
+                                       else
+                                       gnSongLengthDisplay = string.gsub(gnSongLength,'Patched','Length Patched');
+                                       gnSongLengthDisplay = string.gsub(gnSongLength,'Length Length Patched','Length Patched');
+                                       self:settext(DisplayBPM(1, true, false)..' BPM - '..gnSongLengthDisplay);
+                                       end
+                               end
                        end"
                />
 

diff --git a/Themes/GrooveNights/BGAnimations/ScreenPlayerOptions overlay/default.xml b/Themes/GrooveNights/BGAnimations/ScreenPlayerOptions overlay/default.xml
index 2b1a8d0..239c6e9 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenPlayerOptions overlay/default.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenPlayerOptions overlay/default.xml
@@ -649,7 +649,7 @@
                        loopCommand="%function(self)
                        self:stoptweening();
                        if curRate ~= 1 then self:settext(gnSongLength..' (x'..curRate..' Music Rate)'); else self:settext(gnSongLength); end
-                       self:sleep(0.1);
+                       self:sleep(0.03);
                        self:queuecommand('loop');
                        end"
                />
@@ -780,7 +780,7 @@
                        loopCommand="%function(self)
                        self:stoptweening();
                        if curRate ~= 1 then self:settext(gnSongLength..' (x'..curRate..' Music Rate)'); else self:settext(gnSongLength); end
-                       self:sleep(0.1);
+                       self:sleep(0.03);
                        self:queuecommand('loop');
                        end"
                />