update for new SMTC dll

backend/app.go

@@ -53,11 +53,12 @@ type App struct {
 	OnReactivate func()
 	OnExit       func()
 
-	appName       string
-	appVersionTag string
-	configDir     string
-	cacheDir      string
-	portableMode  bool
+	appName        string
+	displayAppName string
+	appVersionTag  string
+	configDir      string
+	cacheDir       string
+	portableMode   bool
 
 	isFirstLaunch bool // set by config file reader
 	bgrndCtx      context.Context
@@ -97,12 +98,13 @@ func StartupApp(appName, displayAppName, appVersion, appVersionTag, latestReleas
 	}
 
 	a := &App{
-		logFile:       logFile,
-		appName:       appName,
-		appVersionTag: appVersionTag,
-		configDir:     confDir,
-		cacheDir:      cacheDir,
-		portableMode:  portableMode,
+		logFile:        logFile,
+		appName:        appName,
+		displayAppName: displayAppName,
+		appVersionTag:  appVersionTag,
+		configDir:      confDir,
+		cacheDir:       cacheDir,
+		portableMode:   portableMode,
 	}
 	a.bgrndCtx, a.cancel = context.WithCancel(context.Background())
 	a.readConfig()
@@ -343,6 +345,7 @@ func (a *App) SetupWindowsSMTC(hwnd uintptr) {
 		return
 	}
 	a.WinSMTC = smtc
+	smtc.UpdateMetadata(a.displayAppName, "")
 
 	smtc.OnButtonPressed(func(btn SMTCButton) {
 		switch btn {
@@ -364,20 +367,35 @@ func (a *App) SetupWindowsSMTC(hwnd uintptr) {
 
 	a.PlaybackManager.OnSongChange(func(nowPlaying mediaprovider.MediaItem, _ *mediaprovider.Track) {
 		if nowPlaying == nil {
-			smtc.UpdateMetadata("", "")
+			smtc.UpdateMetadata("Supersonic", "")
 			return
 		}
-		artist := strings.Join(nowPlaying.Metadata().Artists, ", ")
-		smtc.UpdateMetadata(nowPlaying.Metadata().Name, artist)
-		smtc.UpdatePosition(0, nowPlaying.Metadata().Duration*1000)
+		meta := nowPlaying.Metadata()
+		smtc.UpdateMetadata(meta.Name, strings.Join(meta.Artists, ", "))
+		smtc.UpdatePosition(0, meta.Duration*1000)
+		go func() {
+			a.ImageManager.GetCoverThumbnail(meta.CoverArtID) // ensure image is cached locally
+			if path, err := a.ImageManager.GetCoverArtPath(meta.CoverArtID); err == nil {
+				smtc.SetThumbnail(path)
+			}
+		}()
 	})
 	a.PlaybackManager.OnSeek(func() {
 		dur := a.PlaybackManager.NowPlaying().Metadata().Duration
 		smtc.UpdatePosition(int(a.PlaybackManager.CurrentPlayer().GetStatus().TimePos*1000), dur*1000)
 	})
-	a.PlaybackManager.OnPlaying(func() { smtc.UpdatePlaybackState(SMTCPlaybackStatePlaying) })
-	a.PlaybackManager.OnPaused(func() { smtc.UpdatePlaybackState(SMTCPlaybackStatePaused) })
-	a.PlaybackManager.OnStopped(func() { smtc.UpdatePlaybackState(SMTCPlaybackStateStopped) })
+	a.PlaybackManager.OnPlaying(func() {
+		smtc.SetEnabled(true)
+		smtc.UpdatePlaybackState(SMTCPlaybackStatePlaying)
+	})
+	a.PlaybackManager.OnPaused(func() {
+		smtc.SetEnabled(true)
+		smtc.UpdatePlaybackState(SMTCPlaybackStatePaused)
+	})
+	a.PlaybackManager.OnStopped(func() {
+		smtc.SetEnabled(false)
+		smtc.UpdatePlaybackState(SMTCPlaybackStateStopped)
+	})
 }
 
 func (a *App) LoginToDefaultServer(string) error {

backend/imagemanager.go

@@ -160,6 +160,15 @@ func (i *ImageManager) GetCoverArtUrl(coverID string) (string, error) {
 	return "", errors.New("cover not found")
 }
 
+// GetCoverArtURL returns the file path for the locally cached cover thumbnail, if it exists.
+func (i *ImageManager) GetCoverArtPath(coverID string) (string, error) {
+	path := i.filePathForCover(coverID)
+	if _, err := os.Stat(path); err == nil {
+		return path, nil
+	}
+	return "", errors.New("cover not found")
+}
+
 // GetCachedArtistImage returns the artist image for the given artistID from the on-disc cache, if it exists.
 func (i *ImageManager) GetCachedArtistImage(artistID string) (image.Image, bool) {
 	return i.loadLocalImage(i.filePathForArtistImage(artistID))

backend/smtc.go

@@ -93,13 +93,13 @@ func (s *SMTC) UpdatePlaybackState(state SMTCPlaybackState) error {
 		return errors.New("SMTC DLL not available")
 	}
 
-	proc, err := s.dll.FindProc("UpdatePlaybackState")
+	proc, err := s.dll.FindProc("SetPlaybackState")
 	if err != nil {
 		return err
 	}
 
 	if hr, _, _ := proc.Call(uintptr(state)); hr < 0 {
-		return fmt.Errorf("UpdatePlaybackState failed with HRESULT=%d", hr)
+		return fmt.Errorf("SetPlaybackState failed with HRESULT=%d", hr)
 	}
 	return nil
 }
@@ -119,14 +119,14 @@ func (s *SMTC) UpdateMetadata(title, artist string) error {
 		return err
 	}
 
-	proc, err := s.dll.FindProc("UpdateMetadata")
+	proc, err := s.dll.FindProc("SetMetadata")
 	if err != nil {
 		return err
 	}
 
 	hr, _, _ := proc.Call(uintptr(unsafe.Pointer(utfTitle)), uintptr(unsafe.Pointer(utfArtist)))
 	if hr < 0 {
-		return fmt.Errorf("UpdateMetadata failed with HRESULT=%d", hr)
+		return fmt.Errorf("SetMetadata failed with HRESULT=%d", hr)
 	}
 	return nil
 }
@@ -136,14 +136,58 @@ func (s *SMTC) UpdatePosition(positionMillis, durationMillis int) error {
 		return errors.New("SMTC DLL not available")
 	}
 
-	proc, err := s.dll.FindProc("UpdatePosition")
+	proc, err := s.dll.FindProc("SetPosition")
 	if err != nil {
 		return err
 	}
 
 	hr, _, _ := proc.Call(uintptr(positionMillis), uintptr(durationMillis))
 	if hr < 0 {
-		return fmt.Errorf("UpdatePosition failed with HRESULT=%d", hr)
+		return fmt.Errorf("SetPosition failed with HRESULT=%d", hr)
+	}
+	return nil
+}
+
+func (s *SMTC) SetThumbnail(filepath string) error {
+	if s.dll == nil {
+		return errors.New("SMTC DLL not available")
+	}
+
+	proc, err := s.dll.FindProc("SetThumbnailPath")
+	if err != nil {
+		return err
+	}
+
+	utfPath, err := windows.UTF16PtrFromString(filepath)
+	if err != nil {
+		return err
+	}
+
+	hr, _, _ := proc.Call(uintptr(unsafe.Pointer(utfPath)))
+	if hr < 0 {
+		return fmt.Errorf("SetThumbnailPath failed with HRESULT=%d", hr)
+	}
+	return nil
+}
+
+func (s *SMTC) SetEnabled(enabled bool) error {
+	if s.dll == nil {
+		return errors.New("SMTC DLL not available")
+	}
+
+	proc, err := s.dll.FindProc("SetEnabled")
+	if err != nil {
+		return err
+	}
+
+	var arg uintptr = 0
+	if enabled {
+		arg = 1
+	}
+
+	hr, _, _ := proc.Call(arg)
+	if hr < 0 {
+		return fmt.Errorf("SetEnabled failed with HRESULT=%d", hr)
 	}
 	return nil
 }