Skip to content

Commit 29dca89

Browse files
committed
consider playlist settings when determining fadeout at end of show
1 parent 399a753 commit 29dca89

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.3.0-20250704
1+
5.3.0-20250803

obplayer/scheduler/scheduler.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -354,11 +354,19 @@ def play_media(self, media, offset, present_time):
354354
)
355355

356356
else:
357+
fadeout_mode = self.show_data["last_track_fadeout"]
358+
fadeout = False
359+
360+
# fade out if media is the last track or media ends at/after the show end time
361+
if(fadeout_mode == "always" and self.end_time() and (self.playlist.is_last() or self.media_start_time + media["duration"] >= self.end_time())):
362+
fadeout = True
363+
364+
# fade out if media ends after the show end time
365+
if(fadeout_mode == "auto" and self.end_time() and self.media_start_time + media["duration"] > self.end_time()):
366+
fadeout = True
367+
357368
# if track does not end in time, use show end_time instead of track duration
358-
if (
359-
self.end_time()
360-
and self.media_start_time + media["duration"] > self.end_time()
361-
):
369+
if (fadeout):
362370
self.fadeout = True
363371
self.ctrl.add_request(
364372
start_time=self.media_start_time,

0 commit comments

Comments
 (0)