From 2c0eb450ab57f042b54f51c3bbc7edadd093c8d6 Mon Sep 17 00:00:00 2001
From: Cameron Ball <c.ball1729@gmail.com>
Date: Tue, 10 Dec 2013 01:48:30 +0800
Subject: [PATCH] New wip system to safely save away elements from a screen for
 reuse on another screen. Song length now updates with rate mod.

---
 .../ScreenPlayerOptions overlay/default.xml            | 18 ++++--------------
 Themes/GrooveNights/Scripts/Globals.lua                | 10 ++++++++++
 Themes/GrooveNights/Scripts/Other.lua                  | 14 ++++++++++++++
 Themes/GrooveNights/metrics.ini                        |  2 +-
 4 files changed, 29 insertions(+), 15 deletions(-)
 create mode 100644 Themes/GrooveNights/Scripts/Globals.lua

diff --git a/Themes/GrooveNights/BGAnimations/ScreenPlayerOptions overlay/default.xml b/Themes/GrooveNights/BGAnimations/ScreenPlayerOptions overlay/default.xml
index 9bdd1fd..35a6ada 100644
--- a/Themes/GrooveNights/BGAnimations/ScreenPlayerOptions overlay/default.xml	
+++ b/Themes/GrooveNights/BGAnimations/ScreenPlayerOptions overlay/default.xml	
@@ -568,13 +568,8 @@
 			Text=""
 			Condition="GAMESTATE:IsPlayerEnabled(PLAYER_1)"
 			File="_eurostile blue glow"
-			InitCommand="%function(self)  self:horizalign('left'); self:shadowlength(0); self:zoom(0.5); self:x(SCREEN_CENTER_X-200); self:y(SCREEN_CENTER_Y+166); self:queuecommand('loop'); end"
-			loopCommand="%function(self)
-			self:stoptweening();
-			if curRate ~= 1 then self:settext(gnSongLength..' (x'..curRate..' Music Rate)'); else self:settext(gnSongLength); end
-			self:sleep(0.03);
-			self:queuecommand('loop');
-			end"
+			InitCommand="%function(self)  self:horizalign('left'); self:shadowlength(0); self:zoom(0.5); self:x(SCREEN_CENTER_X-200); self:y(SCREEN_CENTER_Y+166); end"
+			RateModChangedMessageCommand="%function(self) self:settext(DisplaySongLength()) end"
 		/>
 	<!--Player 2's BPM & Speed Display-->
 		<BitmapText
@@ -685,13 +680,8 @@
 			Text=""
 			Condition="GAMESTATE:IsPlayerEnabled(PLAYER_2)"
 			File="_eurostile blue glow"
-			InitCommand="%function(self)  self:horizalign('left'); self:shadowlength(0); self:zoom(0.5); self:x(SCREEN_CENTER_X+119); self:y(SCREEN_CENTER_Y+166); self:queuecommand('loop'); end"
-			loopCommand="%function(self)
-			self:stoptweening();
-			if curRate ~= 1 then self:settext(gnSongLength..' (x'..curRate..' Music Rate)'); else self:settext(gnSongLength); end
-			self:sleep(0.03);
-			self:queuecommand('loop');
-			end"
+			InitCommand="%function(self)  self:horizalign('left'); self:shadowlength(0); self:zoom(0.5); self:x(SCREEN_CENTER_X+119); self:y(SCREEN_CENTER_Y+166); end"
+			RateModChangedMessageCommand="%function(self) self:settext(DisplaySongLength()) end"
 		/>
 		
 	<Layer
diff --git a/Themes/GrooveNights/Scripts/Globals.lua b/Themes/GrooveNights/Scripts/Globals.lua
new file mode 100644
index 0000000..ea44226
--- /dev/null
+++ b/Themes/GrooveNights/Scripts/Globals.lua
@@ -0,0 +1,10 @@
+local GlobalsTable = {}
+
+function RegisterGlobal(Actor, name)
+	-- Todo: check that this global isn't already registered	
+	GlobalsTable[name] = Actor:GetText()	
+end
+
+function GetGlobal(name)
+	return GlobalsTable[name]
+end
\ No newline at end of file
diff --git a/Themes/GrooveNights/Scripts/Other.lua b/Themes/GrooveNights/Scripts/Other.lua
index 0158902..7f761dd 100644
--- a/Themes/GrooveNights/Scripts/Other.lua
+++ b/Themes/GrooveNights/Scripts/Other.lua
@@ -489,4 +489,18 @@ function DisplayScrollSpeed(pn)
     if highBPM ~= "" then highScrollBPM = math.floor(highBPM *speedMod * rateMod) end
 
     if highBPM == "" then return tostring(lowScrollBPM) else return lowScrollBPM .. "-" .. highScrollBPM end
+end
+
+function DisplaySongLength()
+	local SongLength = GetGlobal("TotalTime")
+	local RateMod = string.gsub(GetRateMod(), "x" ,"");
+	local ratio = 1/RateMod
+	
+	local pos = string.find(SongLength, ':')
+	local minutes = string.sub(SongLength, 1, pos-1)
+	local seconds = string.sub(SongLength, pos+1)
+	
+	seconds = (seconds + (minutes*60))*ratio
+	
+	return string.format("%.2d:%.2d", math.mod(seconds/60,60), math.mod(seconds,60))
 end
\ No newline at end of file
diff --git a/Themes/GrooveNights/metrics.ini b/Themes/GrooveNights/metrics.ini
index 22b11ee..9e4a587 100644
--- a/Themes/GrooveNights/metrics.ini
+++ b/Themes/GrooveNights/metrics.ini
@@ -786,7 +786,7 @@ TipY=0
 [ScreenSelectMusic]
 TotalTimeX=SCREEN_CENTER_X 
 TotalTimeY=SCREEN_CENTER_Y+10000
-TotalTimeOnCommand=diffusealpha,0;
+TotalTimeOnCommand=%function(self) self:diffusealpha(0); RegisterGlobal(self, "TotalTime") end
 TotalTimeOffCommand=
 CDTitleX=SCREEN_CENTER_X+268 
 CDTitleY=SCREEN_CENTER_Y-50
-- 
2.11.0