extract out track change timer from DLNA player, some more work on jukebox

Author: dweymouth

backend/player/common/remoteplayerutils.go

@@ -0,0 +1,66 @@
+package common
+
+import (
+	"sync/atomic"
+	"time"
+)
+
+type TrackChangeTimer struct {
+	timerActive atomic.Bool
+	timer       *time.Timer
+	resetChan   chan (time.Duration)
+
+	onHandleTrackChange func()
+}
+
+func NewTrackChangeTimer(onHandleTrackChange func()) TrackChangeTimer {
+	return TrackChangeTimer{
+		resetChan:           make(chan time.Duration),
+		onHandleTrackChange: onHandleTrackChange,
+	}
+}
+
+func (d *TrackChangeTimer) Reset(dur time.Duration) {
+	if d.timerActive.Swap(true) {
+		// was active
+		d.resetChan <- dur
+		return
+	}
+	if dur == 0 {
+		d.timerActive.Store(false)
+		return
+	}
+
+	d.timer = time.NewTimer(dur)
+	go func() {
+		for {
+			select {
+			case dur := <-d.resetChan:
+				if dur == 0 {
+					d.timerActive.Store(false)
+					if !d.timer.Stop() {
+						select {
+						case <-d.timer.C:
+						default:
+						}
+					}
+					d.timer = nil
+					return
+				}
+				// reset the timer
+				if !d.timer.Stop() {
+					select {
+					case <-d.timer.C:
+					default:
+					}
+				}
+				d.timer.Reset(dur)
+			case <-d.timer.C:
+				d.timerActive.Store(false)
+				d.timer = nil
+				d.onHandleTrackChange()
+				return
+			}
+		}
+	}()
+}

backend/player/dlna/dlnaplayer.go

@@ -18,6 +18,7 @@ import (
 
 	"github.com/dweymouth/supersonic/backend/mediaprovider"
 	"github.com/dweymouth/supersonic/backend/player"
+	"github.com/dweymouth/supersonic/backend/player/common"
 	"github.com/dweymouth/supersonic/backend/util"
 	"github.com/hashicorp/go-retryablehttp"
 	"github.com/supersonic-app/go-upnpcast/device"
@@ -83,9 +84,7 @@ type DLNAPlayer struct {
 	failedToSetNext    bool
 	unsetNextMediaItem *avtransport.MediaItem
 
-	timerActive atomic.Bool
-	timer       *time.Timer
-	resetChan   chan (time.Duration)
+	trackChangeTimer common.TrackChangeTimer
 }
 
 func NewDLNAPlayer(device *device.MediaRenderer) (*DLNAPlayer, error) {
@@ -113,11 +112,13 @@ func NewDLNAPlayer(device *device.MediaRenderer) (*DLNAPlayer, error) {
 		return nil, fmt.Errorf("failed to connect to %s", device.FriendlyName)
 	}
 
-	return &DLNAPlayer{
+	d := &DLNAPlayer{
 		avTransport:   avt,
 		renderControl: rc,
-		resetChan:     make(chan time.Duration),
-	}, nil
+	}
+	d.trackChangeTimer = common.NewTrackChangeTimer(d.handleOnTrackChange)
+
+	return d, nil
 }
 
 func (d *DLNAPlayer) SetVolume(vol int) error {
@@ -182,7 +183,7 @@ func (d *DLNAPlayer) PlayFile(urlstr string, meta mediaprovider.MediaItemMetadat
 	}
 	d.state = playing
 	remainingDur := meta.Duration - time.Duration(startTime)*time.Second
-	d.setTrackChangeTimer(remainingDur)
+	d.trackChangeTimer.Reset(remainingDur)
 	d.stopwatch.Reset()
 	d.stopwatch.Start()
 	d.lastStartTime = int(startTime)
@@ -271,7 +272,7 @@ func (d *DLNAPlayer) Continue() error {
 	nextTrackChange := d.curTrackMeta.Duration - d.curPlayPos()
 	d.metaLock.Unlock()
 	d.state = playing
-	d.setTrackChangeTimer(nextTrackChange)
+	d.trackChangeTimer.Reset(nextTrackChange)
 	d.stopwatch.Start()
 	d.InvokeOnPlaying()
 	return nil
@@ -288,7 +289,7 @@ func (d *DLNAPlayer) Pause() error {
 	if err := d.avTransport.Pause(ctx); err != nil {
 		return err
 	}
-	d.setTrackChangeTimer(0)
+	d.trackChangeTimer.Reset(0)
 	d.stopwatch.Stop()
 	d.state = paused
 	d.InvokeOnPaused()
@@ -322,7 +323,7 @@ func (d *DLNAPlayer) Stop(force bool) error {
 		}
 		fallthrough
 	case paused:
-		d.setTrackChangeTimer(0)
+		d.trackChangeTimer.Reset(0)
 		d.stopwatch.Reset()
 		d.lastStartTime = 0
 		d.state = stopped
@@ -354,7 +355,7 @@ func (d *DLNAPlayer) SeekSeconds(secs float64) error {
 		d.metaLock.Lock()
 		nextTrackChange := d.curTrackMeta.Duration - time.Duration(secs)*time.Second
 		d.metaLock.Unlock()
-		d.setTrackChangeTimer(nextTrackChange)
+		d.trackChangeTimer.Reset(nextTrackChange)
 		d.stopwatch.Start()
 	}
 
@@ -410,7 +411,7 @@ func (d *DLNAPlayer) curPlayPos() time.Duration {
 
 func (d *DLNAPlayer) Destroy() {
 	d.destroyed = true
-	d.setTrackChangeTimer(0)
+	d.trackChangeTimer.Reset(0)
 	if d.cancelRequest != nil {
 		d.cancelRequest()
 	}
@@ -431,7 +432,7 @@ func (d *DLNAPlayer) syncPlaybackTime() {
 		if d.state == playing {
 			d.stopwatch.Start()
 		}
-		d.setTrackChangeTimer(d.curTrackMeta.Duration - time.Duration(d.lastStartTime)*time.Second)
+		d.trackChangeTimer.Reset(d.curTrackMeta.Duration - time.Duration(d.lastStartTime)*time.Second)
 		d.InvokeOnSeek()
 	}
 }
@@ -461,51 +462,6 @@ func (d *DLNAPlayer) ensureSetupProxy() error {
 	return nil
 }
 
-func (d *DLNAPlayer) setTrackChangeTimer(dur time.Duration) {
-	if d.timerActive.Swap(true) {
-		// was active
-		d.resetChan <- dur
-		return
-	}
-	if dur == 0 {
-		d.timerActive.Store(false)
-		return
-	}
-
-	d.timer = time.NewTimer(dur)
-	go func() {
-		for {
-			select {
-			case dur := <-d.resetChan:
-				if dur == 0 {
-					d.timerActive.Store(false)
-					if !d.timer.Stop() {
-						select {
-						case <-d.timer.C:
-						default:
-						}
-					}
-					d.timer = nil
-					return
-				}
-				// reset the timer
-				if !d.timer.Stop() {
-					select {
-					case <-d.timer.C:
-					default:
-					}
-				}
-				d.timer.Reset(dur)
-			case <-d.timer.C:
-				d.timerActive.Store(false)
-				d.timer = nil
-				d.handleOnTrackChange()
-				return
-			}
-		}
-	}()
-}
-
 func (d *DLNAPlayer) handleOnTrackChange() {
 	stopping := false
 	d.metaLock.Lock()
@@ -536,7 +492,7 @@ func (d *DLNAPlayer) handleOnTrackChange() {
 		d.lastStartTime = 0
 		d.stopwatch.Reset()
 		d.stopwatch.Start()
-		d.setTrackChangeTimer(nextTrackChange)
+		d.trackChangeTimer.Reset(nextTrackChange)
 		d.InvokeOnTrackChange()
 
 		go func() {

backend/player/jukebox/jukeboxplayer.go

@@ -5,6 +5,8 @@ import (
 
 	"github.com/dweymouth/supersonic/backend/mediaprovider"
 	"github.com/dweymouth/supersonic/backend/player"
+	"github.com/dweymouth/supersonic/backend/player/common"
+	"github.com/dweymouth/supersonic/backend/util"
 )
 
 const (
@@ -22,13 +24,26 @@ type JukeboxPlayer struct {
 	volume  int
 	seeking bool
 
+	// start playback position in seconds of the last seek/time sync
+	lastStartTime int
+	// how long the track has been playing since last time sync
+	stopwatch util.Stopwatch
+
+	trackChangeTimer common.TrackChangeTimer
+
 	curTrack           int
 	queueLength        int
 	curTrackDuration   float64
 	startTrackTime     float64
 	startedAtUnixMilli int64
 }
 
+func NewJukeboxPlayer(provider mediaprovider.JukeboxProvider) (*JukeboxPlayer, error) {
+	j := &JukeboxPlayer{provider: provider}
+	j.trackChangeTimer = common.NewTrackChangeTimer(j.handleOnTrackChange)
+	return j, nil
+}
+
 func (j *JukeboxPlayer) SetVolume(vol int) error {
 	if err := j.provider.JukeboxSetVolume(vol); err != nil {
 		return err
@@ -125,21 +140,42 @@ func (j *JukeboxPlayer) IsSeeking() bool {
 
 func (j *JukeboxPlayer) GetStatus() player.Status {
 	state := player.Stopped
-	if j.state == playing {
+	switch j.state {
+	case playing:
 		state = player.Playing
-	} else if j.state == paused {
+	case paused:
 		state = player.Paused
 	}
 
-	// TODO - the rest
-
 	return player.Status{
-		State: state,
+		State:   state,
+		TimePos: j.curPlayPos().Seconds(),
+		//Duration: TODO
 	}
 }
 
+func (j *JukeboxPlayer) curPlayPos() time.Duration {
+	return time.Duration(j.lastStartTime)*time.Second + j.stopwatch.Elapsed()
+}
+
 func (j *JukeboxPlayer) Destroy() {}
 
+func (j *JukeboxPlayer) handleOnTrackChange() {
+	stopping := false
+	// TODO: is playing next track?
+
+	if stopping {
+		j.lastStartTime = 0
+		j.stopwatch.Reset()
+	} else {
+		j.lastStartTime = 0
+		j.stopwatch.Reset()
+		j.stopwatch.Start()
+		j.trackChangeTimer.Reset(0 /*TODO: next track time*/)
+		j.InvokeOnTrackChange()
+	}
+}
+
 func (j *JukeboxPlayer) startAndUpdateTime() error {
 	beforeStart := time.Now()
 	if err := j.provider.JukeboxStart(); err != nil {