Merge pull request #204 from adamantike/feat/repeat-current-track

Add functionality to repeat current track

player/player.go

@@ -58,12 +58,13 @@ type ReplayGainOptions struct {
 	// Fallback gain intentionally omitted
 }
 
-// The playback loop mode (LoopNone, LoopAll).
+// The playback loop mode (LoopNone, LoopAll, LoopOne).
 type LoopMode int
 
 const (
 	LoopNone LoopMode = iota
 	LoopAll
+	LoopOne
 )
 
 // Information about a specific audio device.
@@ -420,10 +421,23 @@ func (p *Player) SetLoopMode(mode LoopMode) error {
 		if err := p.mpv.SetOptionString("loop-playlist", "no"); err != nil {
 			return err
 		}
+		if err := p.mpv.SetOptionString("loop-file", "no"); err != nil {
+			return err
+		}
 	case LoopAll:
 		if err := p.mpv.SetOptionString("loop-playlist", "inf"); err != nil {
 			return err
 		}
+		if err := p.mpv.SetOptionString("loop-file", "no"); err != nil {
+			return err
+		}
+	case LoopOne:
+		if err := p.mpv.SetOptionString("loop-playlist", "no"); err != nil {
+			return err
+		}
+		if err := p.mpv.SetOptionString("loop-file", "inf"); err != nil {
+			return err
+		}
 	}
 	p.loopMode = mode
 
@@ -437,6 +451,8 @@ func (p *Player) SetNextLoopMode() error {
 	case LoopNone:
 		return p.SetLoopMode(LoopAll)
 	case LoopAll:
+		return p.SetLoopMode(LoopOne)
+	case LoopOne:
 		return p.SetLoopMode(LoopNone)
 	default:
 		return nil
@@ -650,6 +666,8 @@ func (l LoopMode) String() string {
 		return "no"
 	case LoopAll:
 		return "all"
+	case LoopOne:
+		return "one"
 	}
 	return "UNKNOWN_LOOP_MODE"
 }

ui/theme/theme.go

@@ -193,6 +193,8 @@ var (
 	ShuffleIcon     fyne.Resource
 	TracksIcon      fyne.Resource
 	FilterIcon      fyne.Resource = theme.NewThemedResource(res.ResFilterSvg)
+	RepeatIcon      fyne.Resource = theme.NewThemedResource(res.ResRepeatSvg)
+	RepeatOneIcon   fyne.Resource = theme.NewThemedResource(res.ResRepeatoneSvg)
 )
 
 // MUST be called at startup!

ui/widgets/auxcontrols.go

@@ -6,6 +6,8 @@ import (
 	"fyne.io/fyne/v2/layout"
 	"fyne.io/fyne/v2/theme"
 	"fyne.io/fyne/v2/widget"
+
+	myTheme "github.com/dweymouth/supersonic/ui/theme"
 	"github.com/dweymouth/supersonic/ui/util"
 )
 
@@ -41,7 +43,7 @@ func (b *miniButton) MinSize() fyne.Size {
 func NewAuxControls(initialVolume int) *AuxControls {
 	a := &AuxControls{
 		VolumeControl: NewVolumeControl(initialVolume),
-		loop:          newMiniButton(theme.MediaReplayIcon()),
+		loop:          newMiniButton(myTheme.RepeatIcon),
 	}
 	a.container = container.NewHBox(
 		layout.NewSpacer(),
@@ -68,8 +70,13 @@ func (a *AuxControls) OnChangeLoopMode(f func()) {
 func (a *AuxControls) SetLoopMode(mode string) {
 	if mode == "all" {
 		a.loop.Importance = widget.HighImportance
+		a.loop.Icon = myTheme.RepeatIcon
+	} else if mode == "one" {
+		a.loop.Importance = widget.HighImportance
+		a.loop.Icon = myTheme.RepeatOneIcon
 	} else {
 		a.loop.Importance = widget.MediumImportance
+		a.loop.Icon = myTheme.RepeatIcon
 	}
 	a.loop.Refresh()
 }