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

getPlayQueueItemAt func

Browse Source
This commit is contained in:
Siiiiinth
2026-01-24 22:46:58 +01:00
parent 8f65e62fba
commit 42d3ee4973
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/playbackengine.go
+15 -11
View File
@@ -244,6 +244,10 @@ func (p *playbackEngine) setPlayQueue(items []mediaprovider.MediaItem) {
} }
} }
func (p *playbackEngine) getPlayQueueItemAt(idx int) mediaprovider.MediaItem {
return p.playQueue[idx]
}
// rename to GetPlayQueueExternal // rename to GetPlayQueueExternal
func (p *playbackEngine) GetPlayQueue() []mediaprovider.MediaItem { func (p *playbackEngine) GetPlayQueue() []mediaprovider.MediaItem {
return deepCopyMediaItemSlice(p.playQueue) return deepCopyMediaItemSlice(p.playQueue)
@@ -270,7 +274,7 @@ func (p *playbackEngine) NowPlaying() mediaprovider.MediaItem {
if p.nowPlayingIdx < 0 || p.getPlayQueueLength() == 0 || p.player.GetStatus().State == player.Stopped { if p.nowPlayingIdx < 0 || p.getPlayQueueLength() == 0 || p.player.GetStatus().State == player.Stopped {
return nil return nil
} }
return p.playQueue[p.nowPlayingIdx] return p.getPlayQueueItemAt(p.nowPlayingIdx)
} }
func (p *playbackEngine) NowPlayingIndex() int { func (p *playbackEngine) NowPlayingIndex() int {
@@ -497,7 +501,7 @@ func (p *playbackEngine) UpdatePlayQueue(items []mediaprovider.MediaItem) error
newQueue := deepCopyMediaItemSlice(items) newQueue := deepCopyMediaItemSlice(items)
newNowPlayingIdx := -1 newNowPlayingIdx := -1
if p.nowPlayingIdx >= 0 { if p.nowPlayingIdx >= 0 {
nowPlayingID := p.playQueue[p.nowPlayingIdx].Metadata().ID nowPlayingID := p.getPlayQueueItemAt(p.nowPlayingIdx).Metadata().ID
for i, tr := range newQueue { for i, tr := range newQueue {
if tr.Metadata().ID == nowPlayingID { if tr.Metadata().ID == nowPlayingID {
newNowPlayingIdx = i newNowPlayingIdx = i
@@ -616,10 +620,10 @@ func (p *playbackEngine) cacheNextTracks() {
npI := max(p.nowPlayingIdx, 0) npI := max(p.nowPlayingIdx, 0)
for _, idx := range [3]int{npI, npI + 1, npI + 2} { for _, idx := range [3]int{npI, npI + 1, npI + 2} {
if idx > 0 && idx < p.getPlayQueueLength() { if idx > 0 && idx < p.getPlayQueueLength() {
item := p.playQueue[idx] item := p.getPlayQueueItemAt(idx)
if item.Metadata().Type == mediaprovider.MediaItemTypeTrack { if item.Metadata().Type == mediaprovider.MediaItemTypeTrack {
fetch = append(fetch, AudioCacheRequest{ fetch = append(fetch, AudioCacheRequest{
ID: p.playQueue[idx].Metadata().ID, ID: p.getPlayQueueItemAt(idx).Metadata().ID,
DownloadURL: p.getMediaURLForIdx(idx), DownloadURL: p.getMediaURLForIdx(idx),
}) })
} }
@@ -651,7 +655,7 @@ func (p *playbackEngine) handleOnTrackChange() {
p.nowPlayingIdx = p.pendingTrackChangeNum p.nowPlayingIdx = p.pendingTrackChangeNum
p.pendingTrackChangeNum = -1 p.pendingTrackChangeNum = -1
} }
nowPlaying := p.playQueue[p.nowPlayingIdx] nowPlaying := p.getPlayQueueItemAt(p.nowPlayingIdx)
_, isRadio := nowPlaying.(*mediaprovider.RadioStation) _, isRadio := nowPlaying.(*mediaprovider.RadioStation)
p.isRadio = isRadio p.isRadio = isRadio
@@ -694,7 +698,7 @@ func (p *playbackEngine) handleNextTrackUpdated() {
for _, cb := range p.onBeforeSongChange { for _, cb := range p.onBeforeSongChange {
var item mediaprovider.MediaItem var item mediaprovider.MediaItem
if idx := p.nextPlayingIndex(); idx >= 0 { if idx := p.nextPlayingIndex(); idx >= 0 {
item = p.playQueue[idx] item = p.getPlayQueueItemAt(idx)
} }
cb(item) cb(item)
} }
@@ -722,7 +726,7 @@ func (p *playbackEngine) setTrack(idx int, next bool, startTime float64) error {
var item mediaprovider.MediaItem var item mediaprovider.MediaItem
var url string var url string
if idx >= 0 { if idx >= 0 {
item = p.playQueue[idx] item = p.getPlayQueueItemAt(idx)
url = p.getMediaURLForIdx(idx) url = p.getMediaURLForIdx(idx)
} }
track, isTrack := item.(*mediaprovider.Track) track, isTrack := item.(*mediaprovider.Track)
@@ -750,7 +754,7 @@ func (p *playbackEngine) setTrack(idx int, next bool, startTime float64) error {
} else if trP, ok := p.player.(player.TrackPlayer); ok { } else if trP, ok := p.player.(player.TrackPlayer); ok {
var track *mediaprovider.Track var track *mediaprovider.Track
if idx >= 0 { if idx >= 0 {
track, ok = p.playQueue[idx].(*mediaprovider.Track) track, ok = p.getPlayQueueItemAt(idx).(*mediaprovider.Track)
if !ok { if !ok {
return errors.New("cannot play non-Track media item with TrackPlayer") return errors.New("cannot play non-Track media item with TrackPlayer")
} }
@@ -765,7 +769,7 @@ func (p *playbackEngine) setTrack(idx int, next bool, startTime float64) error {
func (p *playbackEngine) getMediaURLForIdx(idx int) string { func (p *playbackEngine) getMediaURLForIdx(idx int) string {
var url string var url string
item := p.playQueue[idx] item := p.getPlayQueueItemAt(idx)
if tr, ok := item.(*mediaprovider.Track); ok { if tr, ok := item.(*mediaprovider.Track); ok {
var ts *mediaprovider.TranscodeSettings var ts *mediaprovider.TranscodeSettings
if p.transcodeCfg.RequestTranscode { if p.transcodeCfg.RequestTranscode {
@@ -790,7 +794,7 @@ func (p *playbackEngine) checkScrobble() {
if !p.scrobbleCfg.Enabled || p.getPlayQueueLength() == 0 || p.nowPlayingIdx < 0 { if !p.scrobbleCfg.Enabled || p.getPlayQueueLength() == 0 || p.nowPlayingIdx < 0 {
return return
} }
track, ok := p.playQueue[p.nowPlayingIdx].(*mediaprovider.Track) track, ok := p.getPlayQueueItemAt(p.nowPlayingIdx).(*mediaprovider.Track)
if !ok { if !ok {
return // radio stations are not scrobbled return // radio stations are not scrobbled
} }
@@ -819,7 +823,7 @@ func (p *playbackEngine) sendNowPlayingScrobble() {
if !p.scrobbleCfg.Enabled || p.getPlayQueueLength() == 0 || p.nowPlayingIdx < 0 { if !p.scrobbleCfg.Enabled || p.getPlayQueueLength() == 0 || p.nowPlayingIdx < 0 {
return return
} }
track, ok := p.playQueue[p.nowPlayingIdx].(*mediaprovider.Track) track, ok := p.getPlayQueueItemAt(p.nowPlayingIdx).(*mediaprovider.Track)
if !ok { if !ok {
return // radio stations are not scrobbled return // radio stations are not scrobbled
} }