owen/supersonic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

insertItemsIntoPlayQueueAt func

Browse Source
This commit is contained in:
Siiiiinth
2026-01-25 10:21:57 +01:00
parent 902e6e3dc8
commit e7199b3e97
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/playbackengine.go
+14 -8
View File
@@ -61,8 +61,8 @@ type playbackEngine struct {
latestTrackPosition float64 // cleared by checkScrobble latestTrackPosition float64 // cleared by checkScrobble
callbacksDisabled bool callbacksDisabled bool
playQueue []mediaprovider.MediaItem playQueue []mediaprovider.MediaItem
playQueueShuffle []mediaprovider.MediaItem shuffledPlayQueue []mediaprovider.MediaItem
nowPlayingIdx int nowPlayingIdx int
isRadio bool isRadio bool
@@ -222,23 +222,23 @@ func (p *playbackEngine) SetPlayer(pl player.BasePlayer) error {
return nil return nil
} }
// Interface functions for interacting with the play queue // ======================= START PLAY QUEUE FUNCS ===========================
func (p *playbackEngine) getPlayQueueLength() int { func (p *playbackEngine) getPlayQueueLength() int {
if p.shuffle { if p.shuffle {
return len(p.playQueueShuffle) return len(p.shuffledPlayQueue)
} }
return len(p.playQueue) return len(p.playQueue)
} }
func (p *playbackEngine) clearPlayQueue() { func (p *playbackEngine) clearPlayQueue() {
p.playQueue = nil p.playQueue = nil
p.playQueueShuffle = nil p.shuffledPlayQueue = nil
} }
func (p *playbackEngine) setPlayQueue(items []mediaprovider.MediaItem) { func (p *playbackEngine) setPlayQueue(items []mediaprovider.MediaItem) {
if p.shuffle { if p.shuffle {
p.playQueueShuffle = items p.shuffledPlayQueue = items
} else { } else {
p.playQueue = items p.playQueue = items
} }
@@ -248,6 +248,10 @@ func (p *playbackEngine) getPlayQueueItemAt(idx int) mediaprovider.MediaItem {
return p.playQueue[idx] return p.playQueue[idx]
} }
func (p *playbackEngine) insertItemsIntoPlayQueueAt(items []mediaprovider.MediaItem, idx int) {
p.setPlayQueue(append(p.playQueue[:idx], append(items, p.playQueue[idx:]...)...))
}
func (p *playbackEngine) getPlayQueue() []mediaprovider.MediaItem { func (p *playbackEngine) getPlayQueue() []mediaprovider.MediaItem {
return p.playQueue return p.playQueue
} }
@@ -256,6 +260,8 @@ func (p *playbackEngine) GetPlayQueueDeepCopy() []mediaprovider.MediaItem {
return deepCopyMediaItemSlice(p.playQueue) return deepCopyMediaItemSlice(p.playQueue)
} }
// ======================== END PLAY QUEUE FUNCS =============================
func (p *playbackEngine) PlayTrackAt(idx int) error { func (p *playbackEngine) PlayTrackAt(idx int) error {
return p.playTrackAt(idx, 0) return p.playTrackAt(idx, 0)
} }
@@ -437,8 +443,8 @@ func (p *playbackEngine) doLoaditems(items []mediaprovider.MediaItem, insertQueu
if insertQueueMode == InsertNext { if insertQueueMode == InsertNext {
insertIdx = p.nowPlayingIdx + 1 insertIdx = p.nowPlayingIdx + 1
} }
p.setPlayQueue(append(p.playQueue[:insertIdx], append(items, p.playQueue[insertIdx:]...)...))
p.insertItemsIntoPlayQueueAt(items, insertIdx)
p.invokeNoArgCallbacks(p.onQueueChange) p.invokeNoArgCallbacks(p.onQueueChange)
return nil return nil
} }
@@ -460,7 +466,7 @@ func (p *playbackEngine) LoadRadioStation(radio *mediaprovider.RadioStation, ins
firstHalf := p.playQueue[:insertIdx] firstHalf := p.playQueue[:insertIdx]
copy(new, firstHalf) copy(new, firstHalf)
new[len(firstHalf)] = radio new[len(firstHalf)] = radio
copy(new[len(firstHalf)+1:], p.playQueue[insertIdx:]) copy(new[len(firstHalf)+1:], p.playQueue[insertIdx:]) //TODO_SHUFFLE: Test shuffle with radio stations
p.setPlayQueue(new) p.setPlayQueue(new)
p.invokeNoArgCallbacks(p.onQueueChange) p.invokeNoArgCallbacks(p.onQueueChange)