fix race condition affecting return to normal levels after show fade

brookgagnon · brookgagnon · commit c10c0cf18ed9 · 2025-07-04T15:47:32.000-07:00
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-5.3.0-20250629
+5.3.0-20250704
diff --git a/obplayer/scheduler/scheduler.py b/obplayer/scheduler/scheduler.py
@@ -618,12 +618,13 @@ def do_showfade_update(self, ctrl, present_time):
             ending_in = self.present_show.end_time() - present_time
             fade_duration = self.showfade_duration
 
-            if ending_in <= fade_duration:
+            # fade when needed, as long as we have at least 0.5s left to fade
+            if ending_in <= fade_duration and ending_in > 0.5:
                 obplayer.Player.outputs["mixer"].fade(
                     {
                         "element": "mixer-primary-volume",
                         "volume": 0.0,
-                        "time": self.showfade_duration - 0.1,
+                        "time": ending_in - 0.1,
                     }
                 )
 

Original file line number	Diff line number	Diff line change
`@@ -618,12 +618,13 @@ def do_showfade_update(self, ctrl, present_time):`
`618`	`618`	`ending_in = self.present_show.end_time() - present_time`
`619`	`619`	`fade_duration = self.showfade_duration`
`620`	`620`
`621`		`- if ending_in <= fade_duration:`
	`621`	`+ # fade when needed, as long as we have at least 0.5s left to fade`
	`622`	`+ if ending_in <= fade_duration and ending_in > 0.5:`
`622`	`623`	`obplayer.Player.outputs["mixer"].fade(`
`623`	`624`	`{`
`624`	`625`	`"element": "mixer-primary-volume",`
`625`	`626`	`"volume": 0.0,`
`626`		`- "time": self.showfade_duration - 0.1,`
	`627`	`+ "time": ending_in - 0.1,`
`627`	`628`	`}`
`628`	`629`	`)`
`629`	`630`