feat: event hook tweaks

Author: devgianlu

cmd/daemon/controls.go

@@ -236,7 +236,7 @@ func (p *AppPlayer) loadContext(ctx context.Context, spotCtx *connectpb.Context,
 
 func (p *AppPlayer) loadCurrentTrack(ctx context.Context, paused, drop bool) error {
 	if p.primaryStream != nil {
-		p.sess.Events().OnPrimaryStreamUnload(p.primaryStream)
+		p.sess.Events().OnPrimaryStreamUnload(p.primaryStream, p.player.PositionMs())
 
 		p.primaryStream = nil
 	}
@@ -508,7 +508,7 @@ func (p *AppPlayer) skipPrev(ctx context.Context, allowSeeking bool) error {
 }
 
 func (p *AppPlayer) skipNext(ctx context.Context, track *connectpb.ContextTrack) error {
-	p.sess.Events().OnPlayerSkipForward(p.primaryStream, p.player.PositionMs())
+	p.sess.Events().OnPlayerSkipForward(p.primaryStream, p.player.PositionMs(), track != nil)
 
 	if track != nil {
 		contextSpotType := librespot.InferSpotifyIdTypeFromContextUri(p.state.player.ContextUri)

events/dummy.go

@@ -40,7 +40,7 @@ func (d dummyEventManager) PostStreamResolveStorage([]byte) {
 func (d dummyEventManager) PostStreamInitHttpChunkReader([]byte, *audio.HttpChunkedReader) {
 }
 
-func (d dummyEventManager) OnPrimaryStreamUnload(*player.Stream) {
+func (d dummyEventManager) OnPrimaryStreamUnload(*player.Stream, int64) {
 }
 
 func (d dummyEventManager) PostPrimaryStreamLoad(*player.Stream, bool) {
@@ -58,7 +58,7 @@ func (d dummyEventManager) OnPlayerPause(*player.Stream, int64) {
 func (d dummyEventManager) OnPlayerSeek(*player.Stream, int64, int64) {
 }
 
-func (d dummyEventManager) OnPlayerSkipForward(*player.Stream, int64) {
+func (d dummyEventManager) OnPlayerSkipForward(*player.Stream, int64, bool) {
 }
 
 func (d dummyEventManager) OnPlayerSkipBackward(*player.Stream, int64) {

player/events.go

@@ -28,14 +28,14 @@ type EventManager interface {
 	PostStreamResolveStorage(playbackId []byte)
 	PostStreamInitHttpChunkReader(playbackId []byte, reader *audio.HttpChunkedReader)
 
-	OnPrimaryStreamUnload(stream *Stream)
+	OnPrimaryStreamUnload(stream *Stream, pos int64)
 	PostPrimaryStreamLoad(stream *Stream, paused bool)
 
 	OnPlayerPlay(stream *Stream, ctxUri string, shuffle bool, playOrigin *connectpb.PlayOrigin, track *connectpb.ProvidedTrack, pos int64)
 	OnPlayerResume(stream *Stream, pos int64)
 	OnPlayerPause(stream *Stream, pos int64)
 	OnPlayerSeek(stream *Stream, oldPos, newPos int64)
-	OnPlayerSkipForward(stream *Stream, pos int64)
+	OnPlayerSkipForward(stream *Stream, pos int64, skipTo bool)
 	OnPlayerSkipBackward(stream *Stream, pos int64)
 	OnPlayerEnd(stream *Stream, pos int64)
 }