From 7661e966be2d36aaa7b44b3ac32b1edc21956573 Mon Sep 17 00:00:00 2001 From: aynakeya Date: Wed, 2 Jul 2025 23:54:34 +0800 Subject: [PATCH 1/6] update go-mpv version --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index eab1971..4eb5eb3 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/adrg/libvlc-go/v3 v3.1.6 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.7 + github.com/aynakeya/go-mpv v0.0.8 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20250301202403-da16c1255728 github.com/go-ole/go-ole v1.3.0 github.com/go-resty/resty/v2 v2.16.5 From eafb0743983c42b094afc6ef2c520b8dafd8556e Mon Sep 17 00:00:00 2001 From: aynakeya Date: Mon, 7 Jul 2025 00:14:28 +0800 Subject: [PATCH 2/6] 1.2.0 feature: qqmusic --- .github/workflows/build.yml | 4 ++-- internal/player/vlc/vlc.go | 1 + pkg/miaosic | 2 +- todo.txt | 2 ++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 62ba657..090de6d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ name: Build on: push: branches: - - master + - disabled jobs: build-windows: @@ -47,7 +47,7 @@ jobs: - name: Bundle assets run: | - go install fyne.io/fyne/v2/cmd/fyne@latest + go install fyne.io/tools/cmd/fyne@latest fyne bundle --name resImageIcon --package resource ./assets/icon2.png > ./resource/bundle.go - name: Build application diff --git a/internal/player/vlc/vlc.go b/internal/player/vlc/vlc.go index 0201c0e..59b28ef 100644 --- a/internal/player/vlc/vlc.go +++ b/internal/player/vlc/vlc.go @@ -233,6 +233,7 @@ func registerCmdHandler() { // 创建媒体对象 var media *vlc.Media + log.Debugf("[VLC PlayControl] get player media %s", mediaUrls[0].Url) if strings.HasPrefix(mediaUrls[0].Url, "http") { media, err = vlc.NewMediaFromURL(mediaUrls[0].Url) } else { diff --git a/pkg/miaosic b/pkg/miaosic index 5f59bad..60e0074 160000 --- a/pkg/miaosic +++ b/pkg/miaosic @@ -1 +1 @@ -Subproject commit 5f59badfe1a151dfd2748a57cb73b1f7e0b03ffd +Subproject commit 60e0074221ea0b95efed59c633818264c11a40e2 diff --git a/todo.txt b/todo.txt index 6ea4fb3..1af3ce9 100644 --- a/todo.txt +++ b/todo.txt @@ -11,10 +11,12 @@ - 下一首为非版权歌时自动切歌不生效 - 网易云电台节目 - 自定义弹幕服务器 +- vlc flac支持 ---- Finished +- 2024.07.07 : QQ音乐 - 2024.06.30 : 添加vlc核心，修复若干bug，gui框架更新，修复点歌限制为1时可能出现的无法点歌的问题 - 2024.05.27 : 修复web弹幕获取到0个host的时候闪退的问题 - 2024.03.27 : 添加b站合集新链接的格式 From 0bbb9f378f640e83287b281da173d92c25d9301e Mon Sep 17 00:00:00 2001 From: aynakeya Date: Mon, 7 Jul 2025 00:18:01 +0800 Subject: [PATCH 3/6] add qq music --- go.mod | 6 ++++-- internal/source/source.go | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 4eb5eb3..dfcb66b 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ toolchain go1.24.4 replace ( github.com/AynaLivePlayer/liveroom-sdk v0.1.0 => ./pkg/liveroom-sdk // submodule - github.com/AynaLivePlayer/miaosic v0.1.7 => ./pkg/miaosic // submodule + github.com/AynaLivePlayer/miaosic v0.2.1 => ./pkg/miaosic // submodule github.com/saltosystems/winrt-go => github.com/go-musicfox/winrt-go v0.1.4 // winrt with media foundation ) @@ -14,7 +14,7 @@ replace ( require ( fyne.io/fyne/v2 v2.6.1 github.com/AynaLivePlayer/liveroom-sdk v0.1.0 - github.com/AynaLivePlayer/miaosic v0.1.7 + github.com/AynaLivePlayer/miaosic v0.2.1 github.com/adrg/libvlc-go/v3 v3.1.6 github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b github.com/antonfisher/nested-logrus-formatter v1.3.1 @@ -65,6 +65,7 @@ require ( github.com/jeandeaual/go-locale v0.0.0-20241217141322-fcc2cadd6f08 // indirect github.com/jinzhu/copier v0.4.0 // indirect github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 // indirect + github.com/makiuchi-d/gozxing v0.1.1 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/nicksnyder/go-i18n/v2 v2.5.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect @@ -81,6 +82,7 @@ require ( golang.org/x/image v0.24.0 // indirect golang.org/x/net v0.41.0 // indirect golang.org/x/text v0.26.0 // indirect + golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/internal/source/source.go b/internal/source/source.go index ecd05bf..14c3183 100644 --- a/internal/source/source.go +++ b/internal/source/source.go @@ -11,6 +11,7 @@ import ( _ "github.com/AynaLivePlayer/miaosic/providers/kuwo" "github.com/AynaLivePlayer/miaosic/providers/local" _ "github.com/AynaLivePlayer/miaosic/providers/netease" + _ "github.com/AynaLivePlayer/miaosic/providers/qq" ) type _sourceConfig struct { From 8244380a6a45ff78acabfa78b628b769f0b367a1 Mon Sep 17 00:00:00 2001 From: aynakeya Date: Mon, 7 Jul 2025 00:24:58 +0800 Subject: [PATCH 4/6] revert change --- gui/player_controller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/player_controller.go b/gui/player_controller.go index 40f5971..1931785 100644 --- a/gui/player_controller.go +++ b/gui/player_controller.go @@ -59,7 +59,7 @@ func registerPlayControllerHandler() { PlayController.ButtonLrc.OnTapped = func() { if !PlayController.LrcWindowOpen { PlayController.LrcWindowOpen = true - createLyricWindow().Close() + createLyricWindow().Show() } } From c554f1effc0c28a33dcfee3ca195da16c34c0cbb Mon Sep 17 00:00:00 2001 From: aynakeya Date: Mon, 7 Jul 2025 00:27:39 +0800 Subject: [PATCH 5/6] update miaosic --- pkg/miaosic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/miaosic b/pkg/miaosic index 60e0074..cc77388 160000 --- a/pkg/miaosic +++ b/pkg/miaosic @@ -1 +1 @@ -Subproject commit 60e0074221ea0b95efed59c633818264c11a40e2 +Subproject commit cc77388d4cf9f935101b377dcda40c1c5f594cd7 From 0934bd2d4599717149239379363b88ae7ecf5ce4 Mon Sep 17 00:00:00 2001 From: aynakeya Date: Mon, 7 Jul 2025 23:29:36 +0800 Subject: [PATCH 6/6] update miaosic dependency --- go.mod | 4 ++-- pkg/miaosic | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index dfcb66b..14ce493 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ toolchain go1.24.4 replace ( github.com/AynaLivePlayer/liveroom-sdk v0.1.0 => ./pkg/liveroom-sdk // submodule - github.com/AynaLivePlayer/miaosic v0.2.1 => ./pkg/miaosic // submodule + github.com/AynaLivePlayer/miaosic v0.2.3 => ./pkg/miaosic // submodule github.com/saltosystems/winrt-go => github.com/go-musicfox/winrt-go v0.1.4 // winrt with media foundation ) @@ -14,7 +14,7 @@ replace ( require ( fyne.io/fyne/v2 v2.6.1 github.com/AynaLivePlayer/liveroom-sdk v0.1.0 - github.com/AynaLivePlayer/miaosic v0.2.1 + github.com/AynaLivePlayer/miaosic v0.2.3 github.com/adrg/libvlc-go/v3 v3.1.6 github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b github.com/antonfisher/nested-logrus-formatter v1.3.1 diff --git a/pkg/miaosic b/pkg/miaosic index cc77388..971f5fc 160000 --- a/pkg/miaosic +++ b/pkg/miaosic @@ -1 +1 @@ -Subproject commit cc77388d4cf9f935101b377dcda40c1c5f594cd7 +Subproject commit 971f5fc4e5e09fe1e9db0fb90e7d0c2c6fb541d7