OrgGo/gomu
1
0
Fork 0
mirror of https://github.com/issadarkthing/gomu.git synced 2025-04-25 13:48:49 +08:00
Code Issues Projects Releases Wiki Activity

Minor Fix: remove unnecessary error returned.

Browse Source
This commit is contained in:
tramhao 2021-04-06 11:38:57 +08:00
parent 5435979dc9
commit e0ed6b3b17
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
playlist.go
View File

@ -812,17 +812,11 @@ func (p *Playlist) paste() error {
// keep queue references updated
p.refresh()
err = gomu.queue.updateQueuePath()
if err != nil {
return tracerr.Wrap(err)
}
gomu.queue.updateQueuePath()
newAudio := oldAudio
newAudio.path = newPathFull
err = gomu.queue.updateCurrentSong(oldAudio, newAudio)
if err != nil {
return tracerr.Wrap(err)
}
gomu.queue.updateCurrentSong(oldAudio, newAudio)
p.yankFile = nil
@ -860,10 +854,7 @@ func (p *Playlist) refreshByNode(node *AudioFile, newName string) error {
if err != nil {
return tracerr.Wrap(err)
}
err = gomu.queue.updateCurrentSong(node, newNode)
if err != nil {
return tracerr.Wrap(err)
}
gomu.queue.updateCurrentSong(node, newNode)
} else {
gomu.queue.saveQueue(false)
gomu.queue.clearQueue()

16
queue.go
View File

@ -484,11 +484,11 @@ func (q *Queue) insertItem(index int, audioFile *AudioFile) error {
}
//update the path information in queue
func (q *Queue) updateQueuePath() error {
func (q *Queue) updateQueuePath() {
var songs []string
if len(q.items) < 1 {
return nil
return
}
for _, v := range q.items {
song := sha1Hex(getName(v.name))
@ -507,24 +507,28 @@ func (q *Queue) updateQueuePath() error {
q.enqueue(audioFile)
}
return nil
}
func (q *Queue) updateCurrentSong(oldAudio *AudioFile, newAudio *AudioFile) (err error) {
func (q *Queue) updateCurrentSong(oldAudio *AudioFile, newAudio *AudioFile) {
if !gomu.player.IsRunning() && !gomu.player.IsPaused() {
return nil
return
}
currentSong := gomu.player.GetCurrentSong()
position := gomu.playingBar.getProgress()
paused := gomu.player.IsPaused()
if oldAudio.name == currentSong.Name() {
gomu.queue.pushFront(newAudio)
tmpLoop := q.isLoop
q.isLoop = false
gomu.player.Skip()
gomu.player.Seek(position)
if paused {
gomu.player.TogglePause()
}
q.isLoop = tmpLoop
}
return nil
}