Merge pull request #18 from AynaLivePlayer/dev

fyne update. able to choose to display cover or not

go.mod

@@ -10,14 +10,14 @@ replace (
 )
 
 require (
-	fyne.io/fyne/v2 v2.4.5
+	fyne.io/fyne/v2 v2.5.0
 	fyne.io/x/fyne v0.0.0-20240326131024-3ba9170cc3be
 	github.com/AynaLivePlayer/liveroom-sdk v0.1.0
 	github.com/AynaLivePlayer/miaosic v0.1.5
 	github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b
 	github.com/antonfisher/nested-logrus-formatter v1.3.1
 	github.com/aynakeya/go-mpv v0.0.6
-	github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240306074159-ea2d69986ecb
+	github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a
 	github.com/go-ole/go-ole v1.3.0
 	github.com/go-resty/resty/v2 v2.7.0
 	github.com/gorilla/websocket v1.5.0
@@ -31,13 +31,14 @@ require (
 	github.com/virtuald/go-paniclog v0.0.0-20190812204905-43a7fa316459
 	go.uber.org/zap v1.26.0
 	golang.org/x/exp v0.0.0-20230905200255-921286631fa9
-	golang.org/x/sys v0.19.0
+	golang.org/x/sys v0.20.0
 	gopkg.in/ini.v1 v1.67.0
 )
 
 require (
-	fyne.io/systray v1.10.1-0.20231115130155-104f5ef7839e // indirect
+	fyne.io/systray v1.11.0 // indirect
 	github.com/AynaLivePlayer/blivedm-go v0.0.0-20240427041017-949a66917a81 // indirect
+	github.com/BurntSushi/toml v1.4.0 // indirect
 	github.com/PuerkitoBio/goquery v1.7.1 // indirect
 	github.com/XiaoMengXinX/Music163Api-Go v0.1.30 // indirect
 	github.com/andybalholm/brotli v1.0.5 // indirect
@@ -46,10 +47,10 @@ require (
 	github.com/aynakeya/open-bilibili-live v0.0.7 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dhowden/tag v0.0.0-20230630033851-978a0926ee25 // indirect
-	github.com/fredbi/uri v1.0.0 // indirect
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/fredbi/uri v1.1.0 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/fyne-io/gl-js v0.0.0-20220119005834-d2da28d9ccfe // indirect
-	github.com/fyne-io/glfw-js v0.0.0-20220120001248-ee7290d23504 // indirect
+	github.com/fyne-io/glfw-js v0.0.0-20240101223322-6e1efdc71b7a // indirect
 	github.com/fyne-io/image v0.0.0-20220602074514-4956b0afb3d2 // indirect
 	github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6 // indirect
 	github.com/go-text/render v0.1.0 // indirect
@@ -57,27 +58,28 @@ require (
 	github.com/godbus/dbus/v5 v5.1.0 // indirect
 	github.com/google/uuid v1.5.0 // indirect
 	github.com/gopherjs/gopherjs v1.17.2 // indirect
+	github.com/jeandeaual/go-locale v0.0.0-20240223122105-ce5225dcaa49 // indirect
 	github.com/jinzhu/copier v0.4.0 // indirect
 	github.com/jsummers/gobmp v0.0.0-20151104160322-e2ba15ffa76e // indirect
 	github.com/mattn/go-isatty v0.0.19 // indirect
+	github.com/nicksnyder/go-i18n/v2 v2.4.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/rymdport/portal v0.2.2 // indirect
 	github.com/sahilm/fuzzy v0.1.0 // indirect
 	github.com/saintfish/chardet v0.0.0-20230101081208-5e3ef4b5456d // indirect
 	github.com/spf13/cast v1.5.1 // indirect
 	github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c // indirect
 	github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef // indirect
-	github.com/tevino/abool v1.2.0 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
-	github.com/yuin/goldmark v1.5.5 // indirect
+	github.com/yuin/goldmark v1.7.1 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/image v0.11.0 // indirect
-	golang.org/x/mobile v0.0.0-20230531173138-3c911d8e3eda // indirect
-	golang.org/x/net v0.17.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/image v0.18.0 // indirect
+	golang.org/x/mobile v0.0.0-20231127183840-76ac6878050a // indirect
+	golang.org/x/net v0.25.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	honnef.co/go/js/dom v0.0.0-20210725211120-f030747120f2 // indirect
 )
 
 //replace (

internal/player/mpv/config.go

@@ -7,8 +7,9 @@ import (
 )
 
 type playerConfig struct {
-	Volume      float64
-	AudioDevice string
+	Volume            float64
+	AudioDevice       string
+	DisplayMusicCover bool
 }
 
 func (p *playerConfig) Name() string {
@@ -24,7 +25,8 @@ func (p *playerConfig) OnSave() {
 }
 
 var cfg = &playerConfig{
-	Volume: 100,
+	Volume:            100,
+	DisplayMusicCover: true,
 }
 
 func restoreConfig() {

internal/player/mpv/mpv.go

@@ -212,7 +212,7 @@ func registerCmdHandler() {
 		})
 		log.Debugf("mpv command loadfile %s %s", mediaInfo.Title, mediaUrl.Url)
 		cmd := []string{"loadfile", mediaUrl.Url}
-		if media.Info.Cover.Url != "" {
+		if cfg.DisplayMusicCover && media.Info.Cover.Url != "" {
 			// add media cover to video channel.
 			// https://mpv.io/manual/master/#command-interface-[<options>]]]
 			// api changes after client version 2.3 (0.38.0

todo.txt

@@ -11,11 +11,11 @@
 - web弹幕协议的断线handler (web 重连)
 - 歌词event发送全部歌词，前端处理不同版本
 - 网页输出重写，使用网页版本，不绑定在点歌机内（点歌机不需要启动网页服务)
-- mpv cover display in config
 - optimize local music
 ----
 
 Finished
+- 2024.07.20       : fyne升级，字体修改为自动加载系统字体, 设置中课设置mpv是否现实歌曲封面
 - 2024.06.23@1.0.8 : 歌词字符集自动检测解码，单个点歌数上线
 - 2024.06.22       : 支持多个点歌命令, kugou源
 - 2024.06.21       : bilibili歌单，包括收藏夹和视频合集