glenn
/
asteroid
mirror of https://github.com/glenneth1/asteroid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix playlist repeat: loop playlist when tracks exhaust, scheduler takes priority 

- Enable loop-queue in play-list: repeats current playlist when tracks run out
- next-entry checks queue first so scheduler-queued playlists override repeat cycle
- Prevents silent stream / client reconnect loops between scheduled playlist changes
This commit is contained in:
Glenn Thompson 2026-03-04 10:20:57 +03:00
parent d66d4fe46c
commit 16da880822
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
asteroid.lisp
View File

@ -1579,7 +1579,8 @@
(resumed-list (when file-list (resume-from-saved-state file-list)))) (resumed-list (when file-list (resume-from-saved-state file-list))))
(when resumed-list (when resumed-list
(cl-streamer/harmony:play-list *harmony-pipeline* resumed-list (cl-streamer/harmony:play-list *harmony-pipeline* resumed-list
:crossfade-duration 3.0) :crossfade-duration 3.0
:loop-queue t)
(format t "~A tracks loaded from stream-queue.m3u (~A remaining after resume)~%" (format t "~A tracks loaded from stream-queue.m3u (~A remaining after resume)~%"
(length file-list) (length resumed-list)))))) (length file-list) (length resumed-list))))))
(format t "📡 Stream: ~a/asteroid.mp3~%" *stream-base-url*) (format t "📡 Stream: ~a/asteroid.mp3~%" *stream-base-url*)

19
cl-streamer/harmony-backend.lisp
View File

@ -310,11 +310,16 @@
(sleep step-time)))) (sleep step-time))))
(defun next-entry (pipeline file-list-ref) (defun next-entry (pipeline file-list-ref)
"Get the next entry to play: from file-list first, then from the queue. "Get the next entry to play: from queue first (scheduler priority), then file-list.
FILE-LIST-REF is a cons cell whose car is the remaining file list. FILE-LIST-REF is a cons cell whose car is the remaining file list.
When the scheduler queues a new playlist, it replaces the remaining file-list
so the new playlist takes effect immediately.
Returns an entry or NIL if nothing to play." Returns an entry or NIL if nothing to play."
(or (pop (car file-list-ref)) (let ((queued (pipeline-pop-queue pipeline)))
(pipeline-pop-queue pipeline))) (when queued
;; Scheduler queued new tracks — discard remaining file-list
(setf (car file-list-ref) nil))
(or queued (pop (car file-list-ref)))))
(defun play-list (pipeline file-list &key (crossfade-duration 3.0) (defun play-list (pipeline file-list &key (crossfade-duration 3.0)
(fade-in 2.0) (fade-in 2.0)
@ -325,7 +330,8 @@
CROSSFADE-DURATION is how early to start the next track (seconds). CROSSFADE-DURATION is how early to start the next track (seconds).
FADE-IN/FADE-OUT control the volume ramp durations. FADE-IN/FADE-OUT control the volume ramp durations.
Both voices play simultaneously through the mixer during crossfade. Both voices play simultaneously through the mixer during crossfade.
When LOOP-QUEUE is T, waits for new queue entries instead of stopping." When LOOP-QUEUE is T, repeats the playlist from the start when tracks run out.
Scheduler-queued tracks take priority over the repeat cycle."
(bt:make-thread (bt:make-thread
(lambda () (lambda ()
(let ((prev-voice nil) (let ((prev-voice nil)
@ -334,9 +340,10 @@
(loop while (pipeline-running-p pipeline) (loop while (pipeline-running-p pipeline)
for entry = (next-entry pipeline remaining-list) for entry = (next-entry pipeline remaining-list)
do (cond do (cond
;; No entry and loop mode: wait for queue ;; No entry and loop mode: re-queue original playlist
((and (null entry) loop-queue) ((and (null entry) loop-queue)
(sleep 1)) (log:info "Playlist ended, repeating from start")
(setf (car remaining-list) (copy-list file-list)))
;; No entry: done ;; No entry: done
((null entry) ((null entry)
(return)) (return))