properly time the clean up of the audio visualizer

this should allow visualizer to persist as long as it is needed
etternagame · Feb 19, 2023 · 5a71afe · 5a71afe
1 parent 64d23ef
commit 5a71afe
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/Themes/Rebirth/Scripts/10 AudioVisualizer.lua b/Themes/Rebirth/Scripts/10 AudioVisualizer.lua
@@ -199,11 +199,6 @@ function audioVisualizer:new(params)
     local screen
     local values = frame.values
     frame.playbackFunction = function(fft, ss)
-        -- cleanup
-        if screen ~= SCREENMAN:GetTopScreen() then
-            SOUND:ClearPlayBackCallback()
-            return
-        end
         local samplingRate = ss:GetSampleRate()
         local count = #fft
 
@@ -245,6 +240,15 @@ function audioVisualizer:new(params)
         screen = SCREENMAN:GetTopScreen()
         SOUND:SetPlayBackCallback(frame.playbackFunction, frame.sampleCount)
     end
+    frame.EndCommand = function(self)
+        -- triggers if the screen the visualizer is loaded on gets deleted (a transition or exit)
+        SOUND:ClearPlayBackCallback()
+    end
+    frame.ResetVisualizerMessageCommand = function(self)
+        screen = SCREENMAN:GetTopScreen()
+        SOUND:SetPlayBackCallback(frame.playbackFunction, frame.sampleCount)
+    end
+
     frame[#frame + 1] = frame.sound
     return frame
 end
diff --git a/Themes/_fallback/Scripts/10 AudioVisualizer.lua b/Themes/_fallback/Scripts/10 AudioVisualizer.lua
@@ -177,11 +177,6 @@ function audioVisualizer:new(params)
     local screen
     local values = frame.values
     frame.playbackFunction = function(fft, ss)
-        -- cleanup
-        if screen ~= SCREENMAN:GetTopScreen() then
-            SOUND:ClearPlayBackCallback()
-            return
-        end
         local samplingRate = ss:GetSampleRate()
         local count = #fft
 
@@ -222,6 +217,15 @@ function audioVisualizer:new(params)
         screen = SCREENMAN:GetTopScreen()
         SOUND:SetPlayBackCallback(frame.playbackFunction, frame.sampleCount)
     end
+    frame.EndCommand = function(self)
+        -- triggers if the screen the visualizer is loaded on gets deleted (a transition or exit)
+        SOUND:ClearPlayBackCallback()
+    end
+    frame.ResetVisualizerMessageCommand = function(self)
+        screen = SCREENMAN:GetTopScreen()
+        SOUND:SetPlayBackCallback(frame.playbackFunction, frame.sampleCount)
+    end
+
     frame[#frame + 1] = frame.sound
     return frame
 end