Skip to content

Commit

Permalink
move Windows version check to smtc.go conditionally compiled for Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
dweymouth committed Jan 16, 2025
1 parent 7f38959 commit c48eae5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
4 changes: 4 additions & 0 deletions backend/smtc.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ type SMTC struct {
var smtcInstance *SMTC

func InitSMTCForWindow(hwnd uintptr) (*SMTC, error) {
if maj, _, _ := windows.RtlGetNtVersionNumbers(); maj < 10 {
return nil, errors.New("SMTC is not supported on Windows versions < 10")
}

dll, err := windows.LoadDLL("smtc.dll")
if err != nil {
return nil, err
Expand Down
9 changes: 2 additions & 7 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ import (
"sync"
"time"

"golang.org/x/sys/windows"

"github.com/dweymouth/supersonic/backend"
"github.com/dweymouth/supersonic/res"
"github.com/dweymouth/supersonic/ui"
Expand Down Expand Up @@ -93,11 +91,8 @@ func main() {
mainWindow.Window.(driver.NativeWindow).RunNative(func(ctx any) {
// intialize Windows SMTC
if runtime.GOOS == "windows" {
if maj, _, _ := windows.RtlGetNtVersionNumbers(); maj >= 10 {
// SMTC is only available from Windows 10 (10.0.10240) onward
hwnd := ctx.(driver.WindowsWindowContext).HWND
myApp.SetupWindowsSMTC(hwnd)
}
hwnd := ctx.(driver.WindowsWindowContext).HWND
myApp.SetupWindowsSMTC(hwnd)
}

// slightly hacky workaround for https://github.com/fyne-io/fyne/issues/4964
Expand Down

0 comments on commit c48eae5

Please sign in to comment.