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

checkpoint 3: base shuffle works, but very bad code

Browse Source
This commit is contained in:
Siiiiinth
2026-01-25 18:47:35 +01:00
parent 3da08f78de
commit e210e7e9c3
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/playbackengine.go
+8 -10
View File
@@ -258,7 +258,7 @@ func (p *playbackEngine) insertItemsIntoPlayQueueAt(items []mediaprovider.MediaI
} }
func (p *playbackEngine) GetPlayQueueDeepCopy() []mediaprovider.MediaItem { func (p *playbackEngine) GetPlayQueueDeepCopy() []mediaprovider.MediaItem {
return deepCopyMediaItemSlice(p.playQueue) // TODO_SHUFFLE: does this also need the shuffled play queue? return deepCopyMediaItemSlice(p.getPlayQueue())
} }
// ======================== END PLAY QUEUE FUNCS ============================= // ======================== END PLAY QUEUE FUNCS =============================
@@ -309,20 +309,20 @@ func (p *playbackEngine) GetLoopMode() LoopMode {
} }
func (p *playbackEngine) SetShuffle(shuffle bool) { func (p *playbackEngine) SetShuffle(shuffle bool) {
//TODO_SHUFFLE: fix very bad code
if p.shuffle == shuffle { if p.shuffle == shuffle {
return return
} }
if shuffle { if shuffle {
fmt.Println("shuffling") fmt.Println("shuffling")
newQueue := deepCopyMediaItemSlice(p.playQueue) shuffledQueue := deepCopyMediaItemSlice(p.playQueue)
rand.Shuffle(len(newQueue), func(i, j int) { rand.Shuffle(len(shuffledQueue), func(i, j int) {
newQueue[i], newQueue[j] = newQueue[j], newQueue[i] shuffledQueue[i], shuffledQueue[j] = shuffledQueue[j], shuffledQueue[i]
}) })
fmt.Println(p.playQueue[0].Metadata().ID)
newNowPlayingIdx := -1 newNowPlayingIdx := -1
if p.nowPlayingIdx >= 0 { if p.nowPlayingIdx >= 0 {
nowPlayingID := p.getPlayQueueItemAt(p.nowPlayingIdx).Metadata().ID nowPlayingID := p.getPlayQueueItemAt(p.nowPlayingIdx).Metadata().ID
for i, tr := range newQueue { for i, tr := range shuffledQueue {
if tr.Metadata().ID == nowPlayingID { if tr.Metadata().ID == nowPlayingID {
newNowPlayingIdx = i newNowPlayingIdx = i
break break
@@ -330,7 +330,7 @@ func (p *playbackEngine) SetShuffle(shuffle bool) {
} }
} }
p.shuffle = shuffle p.shuffle = shuffle
p.setPlayQueue(newQueue) p.shuffledPlayQueue = shuffledQueue
if p.nowPlayingIdx >= 0 && newNowPlayingIdx == -1 { if p.nowPlayingIdx >= 0 && newNowPlayingIdx == -1 {
return return
} }
@@ -342,7 +342,6 @@ func (p *playbackEngine) SetShuffle(shuffle bool) {
p.invokeNoArgCallbacks(p.onQueueChange) p.invokeNoArgCallbacks(p.onQueueChange)
} else { } else {
fmt.Println("deshuffling") fmt.Println("deshuffling")
fmt.Println(p.playQueue[0].Metadata().ID)
newQueue := deepCopyMediaItemSlice(p.playQueue) newQueue := deepCopyMediaItemSlice(p.playQueue)
newNowPlayingIdx := -1 newNowPlayingIdx := -1
if p.nowPlayingIdx >= 0 { if p.nowPlayingIdx >= 0 {
@@ -355,7 +354,7 @@ func (p *playbackEngine) SetShuffle(shuffle bool) {
} }
} }
p.shuffle = shuffle p.shuffle = shuffle
p.setPlayQueue(newQueue) p.playQueue = newQueue
if p.nowPlayingIdx >= 0 && newNowPlayingIdx == -1 { if p.nowPlayingIdx >= 0 && newNowPlayingIdx == -1 {
return return
} }
@@ -366,7 +365,6 @@ func (p *playbackEngine) SetShuffle(shuffle bool) {
p.invokeNoArgCallbacks(p.onQueueChange) p.invokeNoArgCallbacks(p.onQueueChange)
} }
} }
func (p *playbackEngine) GetShuffle() bool { func (p *playbackEngine) GetShuffle() bool {