From 2326ef6955231ba21c5dc85b5873f1f262ce622f Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Tue, 7 May 2024 19:41:40 +0800
Subject: [PATCH 01/61] add qiege logging. update dependency

---
 pkg/miaosic           | 2 +-
 plugin/qiege/qiege.go | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkg/miaosic b/pkg/miaosic
index 4b54a30..4e77cdf 160000
--- a/pkg/miaosic
+++ b/pkg/miaosic
@@ -1 +1 @@
-Subproject commit 4b54a301c9b881489ba931e901aa7000f65f5566
+Subproject commit 4e77cdfd0e82c6536fe0e91ccacb2dae47e95a31
diff --git a/plugin/qiege/qiege.go b/plugin/qiege/qiege.go
index 9b26112..fc4e067 100644
--- a/plugin/qiege/qiege.go
+++ b/plugin/qiege/qiege.go
@@ -8,6 +8,7 @@ import (
 	"AynaLivePlayer/pkg/config"
 	"AynaLivePlayer/pkg/event"
 	"AynaLivePlayer/pkg/i18n"
+	"AynaLivePlayer/pkg/logger"
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/container"
 	"fyne.io/fyne/v2/data/binding"
@@ -23,6 +24,7 @@ type Qiege struct {
 	CustomCMD           string
 	currentUid          string
 	panel               fyne.CanvasObject
+	log                 logger.ILogger
 }
 
 func NewQiege() *Qiege {
@@ -31,6 +33,7 @@ func NewQiege() *Qiege {
 		PrivilegePermission: true,
 		AdminPermission:     true,
 		CustomCMD:           "切歌",
+		log:                 global.Logger.WithPrefix("plugin.qiege"),
 	}
 }
 
@@ -71,6 +74,7 @@ func (d *Qiege) handleMessage(event *event.Event) {
 	if len(msgs) < 1 || msgs[0] != d.CustomCMD {
 		return
 	}
+	d.log.Infof("recieve diange command")
 	if d.UserPermission {
 		if d.currentUid == message.User.Uid {
 			global.EventManager.CallA(

From 399f09ba9fa26833717c554b18007aa80bf4b35c Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Fri, 10 May 2024 10:21:41 +0800
Subject: [PATCH 02/61] update dependency: fix bilivideo issue

---
 pkg/miaosic | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/miaosic b/pkg/miaosic
index 4e77cdf..b36d0b6 160000
--- a/pkg/miaosic
+++ b/pkg/miaosic
@@ -1 +1 @@
-Subproject commit 4e77cdfd0e82c6536fe0e91ccacb2dae47e95a31
+Subproject commit b36d0b6189149e4c7bd3cd376ff9d507a5fcc9a4

From da96f711ae3d2ffc17407a83bff5e7e3c282e34e Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Fri, 10 May 2024 10:26:58 +0800
Subject: [PATCH 03/61] update dependency: fix bilivideo search issue

---
 pkg/miaosic | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/miaosic b/pkg/miaosic
index b36d0b6..a701c72 160000
--- a/pkg/miaosic
+++ b/pkg/miaosic
@@ -1 +1 @@
-Subproject commit b36d0b6189149e4c7bd3cd376ff9d507a5fcc9a4
+Subproject commit a701c72d61f70270b0bbaaf6b0b4ce8902300b13

From 46ea45580c07ef7e314e4fd5e5c692eeaface372 Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Sat, 11 May 2024 11:02:47 +0800
Subject: [PATCH 04/61] update lyric

---
 template/current_full.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/current_full.txt b/template/current_full.txt
index 67ecf11..fa5bf5e 100644
--- a/template/current_full.txt
+++ b/template/current_full.txt
@@ -4,4 +4,4 @@ Album: {{ .Current.Album}}
 Username: {{ .Current.Username }}
 Progress(in seconds):  {{.CurrentTime.TotalSeconds}} / {{.TotalTime.TotalSeconds}}
 Progress(in minutes:seconds):  {{ .CurrentTime.Minutes}}:{{ .CurrentTime.Seconds}} / {{ .TotalTime.Minutes}}:{{ .TotalTime.Seconds}}
-Lyric: {{.Lyric}}
\ No newline at end of file
+Lyric: {{ .Lyric}}
\ No newline at end of file

From 9b6f681d4a7cf7fe068be049a9e3f4df4a06149e Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Tue, 14 May 2024 22:28:15 +0800
Subject: [PATCH 05/61] add event cache. sending all cached event when new
 websocket connection establish

---
 plugin/wshub/events.go |  6 ++++++
 plugin/wshub/server.go | 14 ++++++++++++++
 plugin/wshub/wshub.go  | 10 ++++++++--
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/plugin/wshub/events.go b/plugin/wshub/events.go
index 02552bc..1f3b813 100644
--- a/plugin/wshub/events.go
+++ b/plugin/wshub/events.go
@@ -14,3 +14,9 @@ type EventDataReceived struct {
 	EventID event.EventId
 	Data    json.RawMessage
 }
+
+var eventCache []*EventData
+
+func init() {
+	eventCache = make([]*EventData, 0)
+}
diff --git a/plugin/wshub/server.go b/plugin/wshub/server.go
index 2976601..3697acd 100644
--- a/plugin/wshub/server.go
+++ b/plugin/wshub/server.go
@@ -112,6 +112,20 @@ func (s *wsServer) handleWsInfo(w http.ResponseWriter, r *http.Request) {
 	s.register(client)
 	defer s.unregister(client)
 	go client.start()
+	// send initial data
+	for _, data := range eventCache {
+		// ignore empty
+		if data.EventID == "" {
+			continue
+		}
+		eventCacheData, _ := json.Marshal(data)
+		err := client.conn.WriteMessage(websocket.TextMessage, eventCacheData)
+		if err != nil {
+			s.log.Warn("write message failed", err)
+			return
+		}
+	}
+	// start message loop
 	for {
 		select {
 		case data := <-client.Data:
diff --git a/plugin/wshub/wshub.go b/plugin/wshub/wshub.go
index 7037b48..a0cb482 100644
--- a/plugin/wshub/wshub.go
+++ b/plugin/wshub/wshub.go
@@ -162,19 +162,25 @@ func (w *WsHub) CreatePanel() fyne.CanvasObject {
 }
 
 func (w *WsHub) registerEvents() {
+	i := 0
 	for eid, _ := range events.EventsMapping {
+		eventCache = append(eventCache, &EventData{})
+		currentIdx := i
 		global.EventManager.RegisterA(eid,
 			"plugin.wshub.event."+string(eid),
 			func(e *event.Event) {
-				val, err := json.Marshal(EventData{
+				ed := EventData{
 					EventID: e.Id,
 					Data:    e.Data,
-				})
+				}
+				val, err := json.Marshal(ed)
 				if err != nil {
 					w.log.Errorf("failed to marshal event data %v", err)
 					return
 				}
+				eventCache[currentIdx] = &ed
 				w.server.broadcast(val)
 			})
+		i++
 	}
 }

From aeca816774cc03e0eddcf698ddee8cd27f1a0c2d Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Thu, 16 May 2024 11:34:20 +0800
Subject: [PATCH 06/61] fix comment

---
 internal/player/mpv/mpv.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/internal/player/mpv/mpv.go b/internal/player/mpv/mpv.go
index b1eb2d0..8547b99 100644
--- a/internal/player/mpv/mpv.go
+++ b/internal/player/mpv/mpv.go
@@ -209,7 +209,7 @@ func registerCmdHandler() {
 		})
 		log.Debugf("mpv command load file %s %s", mediaInfo.Title, mediaUrl.Url)
 		if err := libmpv.Command([]string{"loadfile", mediaUrl.Url}); err != nil {
-			log.Error("[MPV PlayControl] mpv load media failed", mediaInfo)
+			log.Error("[MPV PlayControl] mpv load media failed", mediaInfo, err)
 			global.EventManager.CallA(
 				events.PlayerPlayErrorUpdate,
 				events.PlayerPlayErrorUpdateEvent{

From b031bdd3df4f3962323f3d1cd472366f2d381071 Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Thu, 16 May 2024 22:32:02 +0800
Subject: [PATCH 07/61] update dependency

---
 pkg/miaosic | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/miaosic b/pkg/miaosic
index a701c72..652e959 160000
--- a/pkg/miaosic
+++ b/pkg/miaosic
@@ -1 +1 @@
-Subproject commit a701c72d61f70270b0bbaaf6b0b4ce8902300b13
+Subproject commit 652e959c5a3aff368da4bc02d461402e0e91ae6d

From 963dedbe650bd5e7f0c9f53d40f01f86348cba13 Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Sun, 19 May 2024 22:53:41 +0800
Subject: [PATCH 08/61] add cover to video channel

---
 internal/player/mpv/mpv.go | 9 +++++++--
 pkg/config/config.go       | 2 +-
 todo.txt                   | 1 +
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/internal/player/mpv/mpv.go b/internal/player/mpv/mpv.go
index 8547b99..b79c5a1 100644
--- a/internal/player/mpv/mpv.go
+++ b/internal/player/mpv/mpv.go
@@ -208,7 +208,12 @@ func registerCmdHandler() {
 			Removed: false,
 		})
 		log.Debugf("mpv command load file %s %s", mediaInfo.Title, mediaUrl.Url)
-		if err := libmpv.Command([]string{"loadfile", mediaUrl.Url}); err != nil {
+		cmd := []string{"loadfile", mediaUrl.Url}
+		if media.Info.Cover.Url != "" {
+			// add media cover to video channel.
+			cmd = append(cmd, "replace", "external-files-append=\""+media.Info.Cover.Url+"\",vid=1")
+		}
+		if err := libmpv.Command(cmd); err != nil {
 			log.Error("[MPV PlayControl] mpv load media failed", mediaInfo, err)
 			global.EventManager.CallA(
 				events.PlayerPlayErrorUpdate,
@@ -263,7 +268,7 @@ func registerCmdHandler() {
 		}
 	})
 
-	global.EventManager.RegisterA(events.PlayerVideoPlayerSetWindowHandleCmd, "player.next", func(evnt *event.Event) {
+	global.EventManager.RegisterA(events.PlayerVideoPlayerSetWindowHandleCmd, "player.set_window_handle", func(evnt *event.Event) {
 		handle := evnt.Data.(events.PlayerVideoPlayerSetWindowHandleCmdEvent).Handle
 		err := SetWindowHandle(handle)
 		if err != nil {
diff --git a/pkg/config/config.go b/pkg/config/config.go
index af319ce..0b7c17e 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -10,7 +10,7 @@ import (
 
 const (
 	ProgramName        = "卡西米尔唱片机"
-	Version     uint32 = 0x010006
+	Version     uint32 = 0x010007
 )
 
 const (
diff --git a/todo.txt b/todo.txt
index 432e7d2..f4e68ba 100644
--- a/todo.txt
+++ b/todo.txt
@@ -15,6 +15,7 @@
 ----
 
 Finished
+- 2024.05.16       : 修复b站歌源搜索, 修复id匹配导致数字开头的的歌曲无法搜索到
 - 2024.05.06@1.0.6 : 修复若干bug
 - 2024.04.30       : 完成websocket hub
 - 2024.04.28       : 修复id点歌匹配失败的问题, 修复黑名单会被id绕过的bug

From 9b55e42811205d37dce5b15b9bf7b36a004f5562 Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Tue, 21 May 2024 11:14:15 +0800
Subject: [PATCH 09/61] update mpv

---
 todo.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/todo.txt b/todo.txt
index f4e68ba..91bcfde 100644
--- a/todo.txt
+++ b/todo.txt
@@ -15,8 +15,10 @@
 ----
 
 Finished
+- 2024.05.19       : 封面添加到mpv video channel
+- 2024.05.17       : 更换libmpv，兼容不支持avx的cpu
 - 2024.05.16       : 修复b站歌源搜索, 修复id匹配导致数字开头的的歌曲无法搜索到
-- 2024.05.06@1.0.6 : 修复若干bug
+- 2024.05.06@1.0.6 : 修复若干bug, 图片加载不出导致的闪退bug
 - 2024.04.30       : 完成websocket hub
 - 2024.04.28       : 修复id点歌匹配失败的问题, 修复黑名单会被id绕过的bug
 - 2024.04.26@1.0.5: 修复直播间长连接重复连接导致点歌重复点的问题,修复直播间添加失败时候会触发闪退的问题,更新依赖导致的闪退问题,修复webdm断开再连接之后无法获取到弹幕的问题

From f19babe30ac97e5733d4d141d3f0d55c9d7bd346 Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Tue, 21 May 2024 11:23:56 +0800
Subject: [PATCH 10/61] add gui video player window close event

---
 core/events/gui.go     |  7 +++++++
 core/events/mapping.go |  1 +
 gui/handler.go         | 18 ++++++++++++++++++
 3 files changed, 26 insertions(+)
 create mode 100644 core/events/gui.go
 create mode 100644 gui/handler.go

diff --git a/core/events/gui.go b/core/events/gui.go
new file mode 100644
index 0000000..e4282e7
--- /dev/null
+++ b/core/events/gui.go
@@ -0,0 +1,7 @@
+package events
+
+const GUISetPlayerWindowOpenCmd = "cmd.gui.player_window.op"
+
+type GUISetPlayerWindowOpenCmdEvent struct {
+	SetOpen bool
+}
diff --git a/core/events/mapping.go b/core/events/mapping.go
index 8585caa..9903e12 100644
--- a/core/events/mapping.go
+++ b/core/events/mapping.go
@@ -47,6 +47,7 @@ var EventsMapping = map[event.EventId]any{
 	MediaProviderUpdate:                 MediaProviderUpdateEvent{},
 	SearchCmd:                           SearchCmdEvent{},
 	SearchResultUpdate:                  SearchResultUpdateEvent{},
+	GUISetPlayerWindowOpenCmd:           GUISetPlayerWindowOpenCmdEvent{},
 }
 
 func init() {
diff --git a/gui/handler.go b/gui/handler.go
new file mode 100644
index 0000000..5b847c0
--- /dev/null
+++ b/gui/handler.go
@@ -0,0 +1,18 @@
+package gui
+
+import (
+	"AynaLivePlayer/core/events"
+	"AynaLivePlayer/global"
+	"AynaLivePlayer/pkg/event"
+)
+
+func registerHandlers() {
+	global.EventManager.RegisterA(events.GUISetPlayerWindowOpenCmd, "gui.player.videoplayer.handleopen", func(event *event.Event) {
+		data := event.Data.(events.GUISetPlayerWindowOpenCmdEvent)
+		if data.SetOpen {
+			playerWindow.Close()
+		} else {
+			showPlayerWindow()
+		}
+	})
+}

From 8d24ac8cba90dc07f20eda9134e6bded1842ea8d Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Wed, 22 May 2024 00:26:36 +0800
Subject: [PATCH 11/61] update error info

---
 internal/player/mpv/mpv.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/internal/player/mpv/mpv.go b/internal/player/mpv/mpv.go
index b79c5a1..7d432db 100644
--- a/internal/player/mpv/mpv.go
+++ b/internal/player/mpv/mpv.go
@@ -214,7 +214,7 @@ func registerCmdHandler() {
 			cmd = append(cmd, "replace", "external-files-append=\""+media.Info.Cover.Url+"\",vid=1")
 		}
 		if err := libmpv.Command(cmd); err != nil {
-			log.Error("[MPV PlayControl] mpv load media failed", mediaInfo, err)
+			log.Error("[MPV PlayControl] mpv load media failed", cmd, mediaInfo, err)
 			global.EventManager.CallA(
 				events.PlayerPlayErrorUpdate,
 				events.PlayerPlayErrorUpdateEvent{

From f97c460c46930dc87c6695949e44b4857d65b82d Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Wed, 22 May 2024 01:01:36 +0800
Subject: [PATCH 12/61] update

---
 internal/player/mpv/mpv.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/internal/player/mpv/mpv.go b/internal/player/mpv/mpv.go
index 7d432db..f2e7a22 100644
--- a/internal/player/mpv/mpv.go
+++ b/internal/player/mpv/mpv.go
@@ -207,12 +207,13 @@ func registerCmdHandler() {
 			Media:   media,
 			Removed: false,
 		})
-		log.Debugf("mpv command load file %s %s", mediaInfo.Title, mediaUrl.Url)
+		log.Debugf("mpv command loadfile %s %s", mediaInfo.Title, mediaUrl.Url)
 		cmd := []string{"loadfile", mediaUrl.Url}
 		if media.Info.Cover.Url != "" {
 			// add media cover to video channel.
 			cmd = append(cmd, "replace", "external-files-append=\""+media.Info.Cover.Url+"\",vid=1")
 		}
+		log.Debug("[MPV PlayControl] mpv command", cmd)
 		if err := libmpv.Command(cmd); err != nil {
 			log.Error("[MPV PlayControl] mpv load media failed", cmd, mediaInfo, err)
 			global.EventManager.CallA(

From 05322ab0b3fd2a60c372f853a217d0f61b359f0c Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Wed, 22 May 2024 01:30:12 +0800
Subject: [PATCH 13/61] add backward compatibility for mpv client version 1.109

---
 internal/player/mpv/mpv.go | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/internal/player/mpv/mpv.go b/internal/player/mpv/mpv.go
index f2e7a22..f665bc1 100644
--- a/internal/player/mpv/mpv.go
+++ b/internal/player/mpv/mpv.go
@@ -18,6 +18,7 @@ import (
 var running bool = false
 var libmpv *mpv.Mpv = nil
 var log logger.ILogger = nil
+var mpvClientVersion uint32 = 0
 
 func SetupPlayer() {
 	running = true
@@ -29,6 +30,8 @@ func SetupPlayer() {
 		log.Error("initialize libmpv failed")
 		return
 	}
+	mpvClientVersion = mpv.ClientApiVersion()
+	log.Infof("libmpv version %d", mpv.ClientApiVersion())
 	_ = libmpv.SetOptionString("vo", "null")
 	log.Info("initialize libmpv success")
 	registerHandler()
@@ -211,7 +214,13 @@ func registerCmdHandler() {
 		cmd := []string{"loadfile", mediaUrl.Url}
 		if media.Info.Cover.Url != "" {
 			// add media cover to video channel.
-			cmd = append(cmd, "replace", "external-files-append=\""+media.Info.Cover.Url+"\",vid=1")
+			// https://mpv.io/manual/master/#command-interface-[<options>]]]
+			// api changes after client version 2.3 (0.38.0
+			if mpvClientVersion >= ((2 << 16) | 3) {
+				cmd = append(cmd, "replace", "0", "external-files-append=\""+media.Info.Cover.Url+"\",vid=1")
+			} else {
+				cmd = append(cmd, "replace", "external-files-append=\""+media.Info.Cover.Url+"\",vid=1")
+			}
 		}
 		log.Debug("[MPV PlayControl] mpv command", cmd)
 		if err := libmpv.Command(cmd); err != nil {

From 03862237b423f48c19c13cd835e215741b6a657f Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Wed, 22 May 2024 19:21:15 +0800
Subject: [PATCH 14/61] upload workflow

---
 .github/workflow/build.yml | 61 ++++++++++++++++++++++++++++++++++++++
 todo.txt                   |  1 +
 2 files changed, 62 insertions(+)
 create mode 100644 .github/workflow/build.yml

diff --git a/.github/workflow/build.yml b/.github/workflow/build.yml
new file mode 100644
index 0000000..36b82b3
--- /dev/null
+++ b/.github/workflow/build.yml
@@ -0,0 +1,61 @@
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+
+    env:
+      EXECUTABLE_NAME: AynaLivePlayer
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.20'
+
+      - name: Install Fyne CLI
+        run: go install fyne.io/fyne/v2/cmd/fyne@latest
+
+      - name: Set up environment variables
+        if: matrix.os == 'windows-latest'
+        run: |
+          echo "GOOS=windows" >> $GITHUB_ENV
+          echo "GOARCH=amd64" >> $GITHUB_ENV
+          echo "EXECUTABLE=$EXECUTABLE_NAME.exe" >> $GITHUB_ENV
+
+      - name: Set up environment variables
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          echo "GOOS=linux" >> $GITHUB_ENV
+          echo "GOARCH=amd64" >> $GITHUB_ENV
+          echo "EXECUTABLE=$EXECUTABLE_NAME" >> $GITHUB_ENV
+
+      - name: Set up environment variables
+        if: matrix.os == 'macos-latest'
+        run: |
+          echo "GOOS=darwin" >> $GITHUB_ENV
+          echo "GOARCH=amd64" >> $GITHUB_ENV
+          echo "EXECUTABLE=$EXECUTABLE_NAME" >> $GITHUB_ENV
+
+      - name: Tidy go.mod
+        run: go mod tidy
+
+      - name: Bundle assets
+        run: |
+          fyne bundle --name resImageIcon --package resource ./assets/icon.png > ./resource/bundle.go
+          fyne bundle --append --name resFontMSYaHei --package resource ./assets/msyh0.ttf >> ./resource/bundle.go
+          fyne bundle --append --name resFontMSYaHeiBold --package resource ./assets/msyhbd0.ttf >> ./resource/bundle.go
+
+      - name: Build application
+        run: go build -o ./$EXECUTABLE app/main.go
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ matrix.os }}-build
+          path: ./$EXECUTABLE
diff --git a/todo.txt b/todo.txt
index 91bcfde..abfeefb 100644
--- a/todo.txt
+++ b/todo.txt
@@ -15,6 +15,7 @@
 ----
 
 Finished
+- 2024.05.22@1.0.7 : 修复bug
 - 2024.05.19       : 封面添加到mpv video channel
 - 2024.05.17       : 更换libmpv，兼容不支持avx的cpu
 - 2024.05.16       : 修复b站歌源搜索, 修复id匹配导致数字开头的的歌曲无法搜索到

From 16f0aa34a2428e5a4256b0c9fe8771191fce6abe Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Wed, 22 May 2024 19:22:47 +0800
Subject: [PATCH 15/61] fix typo

---
 .github/{workflow => workflows}/build.yml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .github/{workflow => workflows}/build.yml (100%)

diff --git a/.github/workflow/build.yml b/.github/workflows/build.yml
similarity index 100%
rename from .github/workflow/build.yml
rename to .github/workflows/build.yml

From 812dee0145b68e2048bbaa87a8e5df57658924a9 Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Wed, 22 May 2024 19:23:45 +0800
Subject: [PATCH 16/61] fix workflow

---
 .github/workflows/build.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 36b82b3..6eca904 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,3 +1,7 @@
+name: Build and Bundle
+
+on: [push]
+
 jobs:
   build:
     runs-on: ubuntu-latest

From 6ec3987b50d40119cec64d4e1619c0eeec775daa Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Wed, 22 May 2024 19:29:36 +0800
Subject: [PATCH 17/61] update workflow

---
 .github/workflows/build.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6eca904..a6f6554 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,6 +16,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
 
       - name: Set up Go
         uses: actions/setup-go@v5
@@ -38,6 +40,7 @@ jobs:
           echo "GOOS=linux" >> $GITHUB_ENV
           echo "GOARCH=amd64" >> $GITHUB_ENV
           echo "EXECUTABLE=$EXECUTABLE_NAME" >> $GITHUB_ENV
+          sudo apt-get update && sudo apt-get install -y libmpv-dev
 
       - name: Set up environment variables
         if: matrix.os == 'macos-latest'
@@ -45,6 +48,7 @@ jobs:
           echo "GOOS=darwin" >> $GITHUB_ENV
           echo "GOARCH=amd64" >> $GITHUB_ENV
           echo "EXECUTABLE=$EXECUTABLE_NAME" >> $GITHUB_ENV
+          brew install mpv
 
       - name: Tidy go.mod
         run: go mod tidy

From f6fd6d362bb561e66481e0369fe95ec632e9866f Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Wed, 22 May 2024 19:33:00 +0800
Subject: [PATCH 18/61] update workflow

---
 .github/workflows/build.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a6f6554..86ce1d6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,6 +6,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
 
+    timeout-minutes: 10
+
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]

From ec110cca9c96a076268068155c10fd4b6b9f441d Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Wed, 22 May 2024 19:36:47 +0800
Subject: [PATCH 19/61] update workflow

---
 .github/workflows/build.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 86ce1d6..d0affa4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -42,7 +42,9 @@ jobs:
           echo "GOOS=linux" >> $GITHUB_ENV
           echo "GOARCH=amd64" >> $GITHUB_ENV
           echo "EXECUTABLE=$EXECUTABLE_NAME" >> $GITHUB_ENV
-          sudo apt-get update && sudo apt-get install -y libmpv-dev
+          sudo apt-get update -y
+          sudo apt-get install -y libmpv-dev
+        continue-on-error: true
 
       - name: Set up environment variables
         if: matrix.os == 'macos-latest'

From eabd9fcea385fbbef797c6bab880fa09b348029d Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Wed, 22 May 2024 19:41:14 +0800
Subject: [PATCH 20/61] update workflow

---
 .github/workflows/build.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d0affa4..a7ec1ac 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -42,7 +42,6 @@ jobs:
           echo "GOOS=linux" >> $GITHUB_ENV
           echo "GOARCH=amd64" >> $GITHUB_ENV
           echo "EXECUTABLE=$EXECUTABLE_NAME" >> $GITHUB_ENV
-          sudo apt-get update -y
           sudo apt-get install -y libmpv-dev
         continue-on-error: true
 

From 0dbb9976d7bacb398bbef33e878951d488ed9900 Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Wed, 22 May 2024 19:46:46 +0800
Subject: [PATCH 21/61] update workflow

---
 .github/workflows/build.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a7ec1ac..7c17ec4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,6 +9,7 @@ jobs:
     timeout-minutes: 10
 
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
 
@@ -17,7 +18,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: 'recursive'
 

From 891f3d2879f58af0421aab1074a94474cc3cf1bd Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Wed, 22 May 2024 19:56:49 +0800
Subject: [PATCH 22/61] update workflow

---
 .github/workflows/build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7c17ec4..362c349 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,9 +18,9 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
-          submodules: 'recursive'
+          submodules: recursive
 
       - name: Set up Go
         uses: actions/setup-go@v5
@@ -43,7 +43,7 @@ jobs:
           echo "GOOS=linux" >> $GITHUB_ENV
           echo "GOARCH=amd64" >> $GITHUB_ENV
           echo "EXECUTABLE=$EXECUTABLE_NAME" >> $GITHUB_ENV
-          sudo apt-get install -y libmpv-dev
+          sudo apt-get install -y libmpv-dev libgl-dev
         continue-on-error: true
 
       - name: Set up environment variables

From 1df1f3a60953aaf54af0783d588f94f48c22f714 Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Wed, 22 May 2024 19:59:10 +0800
Subject: [PATCH 23/61] uw

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 362c349..489b94c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -43,7 +43,7 @@ jobs:
           echo "GOOS=linux" >> $GITHUB_ENV
           echo "GOARCH=amd64" >> $GITHUB_ENV
           echo "EXECUTABLE=$EXECUTABLE_NAME" >> $GITHUB_ENV
-          sudo apt-get install -y libmpv-dev libgl-dev
+          sudo apt-get install -y libmpv-dev libgl-dev libxcursor-dev
         continue-on-error: true
 
       - name: Set up environment variables

From 61342ebfa2a547d72b6ebbc0798659be24710c45 Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Wed, 22 May 2024 20:01:29 +0800
Subject: [PATCH 24/61] uw

---
 .github/workflows/build.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 489b94c..3ac99d8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -43,8 +43,7 @@ jobs:
           echo "GOOS=linux" >> $GITHUB_ENV
           echo "GOARCH=amd64" >> $GITHUB_ENV
           echo "EXECUTABLE=$EXECUTABLE_NAME" >> $GITHUB_ENV
-          sudo apt-get install -y libmpv-dev libgl-dev libxcursor-dev
-        continue-on-error: true
+          sudo apt-get install -y libmpv-dev libgl-dev libxcursor-dev libxrandr-dev
 
       - name: Set up environment variables
         if: matrix.os == 'macos-latest'

From c6a8a2b272f387b61bfaa32af0769357dccdfcb7 Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Wed, 22 May 2024 20:03:18 +0800
Subject: [PATCH 25/61] uw

---
 .github/workflows/build.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3ac99d8..716b26f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,9 +27,6 @@ jobs:
         with:
           go-version: '1.20'
 
-      - name: Install Fyne CLI
-        run: go install fyne.io/fyne/v2/cmd/fyne@latest
-
       - name: Set up environment variables
         if: matrix.os == 'windows-latest'
         run: |
@@ -43,7 +40,7 @@ jobs:
           echo "GOOS=linux" >> $GITHUB_ENV
           echo "GOARCH=amd64" >> $GITHUB_ENV
           echo "EXECUTABLE=$EXECUTABLE_NAME" >> $GITHUB_ENV
-          sudo apt-get install -y libmpv-dev libgl-dev libxcursor-dev libxrandr-dev
+          sudo apt-get install -y libmpv-dev libgl-dev libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev
 
       - name: Set up environment variables
         if: matrix.os == 'macos-latest'
@@ -53,6 +50,9 @@ jobs:
           echo "EXECUTABLE=$EXECUTABLE_NAME" >> $GITHUB_ENV
           brew install mpv
 
+      - name: Install Fyne CLI
+        run: go install fyne.io/fyne/v2/cmd/fyne@latest
+
       - name: Tidy go.mod
         run: go mod tidy
 

From 23d59417d5e436e04ed81695e2d9876108cb0417 Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Wed, 22 May 2024 20:09:41 +0800
Subject: [PATCH 26/61] uw

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 716b26f..9b5a5a7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -40,7 +40,7 @@ jobs:
           echo "GOOS=linux" >> $GITHUB_ENV
           echo "GOARCH=amd64" >> $GITHUB_ENV
           echo "EXECUTABLE=$EXECUTABLE_NAME" >> $GITHUB_ENV
-          sudo apt-get install -y libmpv-dev libgl-dev libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev
+          sudo apt-get install -y libmpv-dev libgl-dev libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev libgl1-mesa-dev xorg-dev
 
       - name: Set up environment variables
         if: matrix.os == 'macos-latest'

From 16c9d1c10efb36530403f22f9f5fd73c6a106c30 Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Wed, 22 May 2024 20:18:14 +0800
Subject: [PATCH 27/61] uw

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9b5a5a7..87df433 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -66,7 +66,7 @@ jobs:
         run: go build -o ./$EXECUTABLE app/main.go
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ matrix.os }}-build
-          path: ./$EXECUTABLE
+          path: ./${{ env.EXECUTABLE }}

From 318e0621981b15f31e9b2d7ba77e1c7ab04b5e88 Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Wed, 22 May 2024 20:26:32 +0800
Subject: [PATCH 28/61] uw

---
 .github/workflows/build.yml | 48 ++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 87df433..047b26f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,14 +4,28 @@ on: [push]
 
 jobs:
   build:
-    runs-on: ubuntu-latest
-
-    timeout-minutes: 10
-
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        include:
+          - os: ubuntu-latest
+            goos: linux
+            goarch: amd64
+            executable_ext: ""
+            install_deps: sudo apt-get install -y libmpv-dev libgl-dev libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev libgl1-mesa-dev xorg-dev
+          - os: windows-latest
+            goos: windows
+            goarch: amd64
+            executable_ext: ".exe"
+            install_deps: choco install mpv
+          - os: macos-latest
+            goos: darwin
+            goarch: amd64
+            executable_ext: ""
+            install_deps: brew install mpv
+
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 10
 
     env:
       EXECUTABLE_NAME: AynaLivePlayer
@@ -28,27 +42,13 @@ jobs:
           go-version: '1.20'
 
       - name: Set up environment variables
-        if: matrix.os == 'windows-latest'
         run: |
-          echo "GOOS=windows" >> $GITHUB_ENV
-          echo "GOARCH=amd64" >> $GITHUB_ENV
-          echo "EXECUTABLE=$EXECUTABLE_NAME.exe" >> $GITHUB_ENV
+          echo "GOOS=${{ matrix.goos }}" >> $GITHUB_ENV
+          echo "GOARCH=${{ matrix.goarch }}" >> $GITHUB_ENV
+          echo "EXECUTABLE=${EXECUTABLE_NAME}${{ matrix.executable_ext }}" >> $GITHUB_ENV
 
-      - name: Set up environment variables
-        if: matrix.os == 'ubuntu-latest'
-        run: |
-          echo "GOOS=linux" >> $GITHUB_ENV
-          echo "GOARCH=amd64" >> $GITHUB_ENV
-          echo "EXECUTABLE=$EXECUTABLE_NAME" >> $GITHUB_ENV
-          sudo apt-get install -y libmpv-dev libgl-dev libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev libgl1-mesa-dev xorg-dev
-
-      - name: Set up environment variables
-        if: matrix.os == 'macos-latest'
-        run: |
-          echo "GOOS=darwin" >> $GITHUB_ENV
-          echo "GOARCH=amd64" >> $GITHUB_ENV
-          echo "EXECUTABLE=$EXECUTABLE_NAME" >> $GITHUB_ENV
-          brew install mpv
+      - name: Install dependencies
+        run: ${{ matrix.install_deps }}
 
       - name: Install Fyne CLI
         run: go install fyne.io/fyne/v2/cmd/fyne@latest

From 4aa50716998212e3dca96e278469b7983ad52527 Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Wed, 22 May 2024 20:53:16 +0800
Subject: [PATCH 29/61] uw

---
 .github/workflows/build.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 047b26f..39429e6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -50,6 +50,16 @@ jobs:
       - name: Install dependencies
         run: ${{ matrix.install_deps }}
 
+      - name: Install dependencies (Windows)
+        if: matrix.goos == 'windows'
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: MINGW64
+          install: >-
+            mingw-w64-x86_64-toolchain
+            mingw-w64-x86_64-go
+            mingw-w64-x86_64-mpv
+
       - name: Install Fyne CLI
         run: go install fyne.io/fyne/v2/cmd/fyne@latest
 
@@ -58,6 +68,8 @@ jobs:
 
       - name: Bundle assets
         run: |
+          echo "::set-env name=GOPATH::$(go env GOPATH)"
+          echo "::add-path::$(go env GOPATH)/bin"
           fyne bundle --name resImageIcon --package resource ./assets/icon.png > ./resource/bundle.go
           fyne bundle --append --name resFontMSYaHei --package resource ./assets/msyh0.ttf >> ./resource/bundle.go
           fyne bundle --append --name resFontMSYaHeiBold --package resource ./assets/msyhbd0.ttf >> ./resource/bundle.go

From b175efa6e333ec978b572cdc2749bf6ea00a5767 Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Wed, 22 May 2024 20:58:28 +0800
Subject: [PATCH 30/61] uw

---
 .github/workflows/build.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 39429e6..5b3b1e1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,4 +1,4 @@
-name: Build and Bundle
+name: Build
 
 on: [push]
 
@@ -17,7 +17,7 @@ jobs:
             goos: windows
             goarch: amd64
             executable_ext: ".exe"
-            install_deps: choco install mpv
+            install_deps: ""
           - os: macos-latest
             goos: darwin
             goarch: amd64
@@ -68,8 +68,7 @@ jobs:
 
       - name: Bundle assets
         run: |
-          echo "::set-env name=GOPATH::$(go env GOPATH)"
-          echo "::add-path::$(go env GOPATH)/bin"
+          export PATH=${PATH}:`go env GOPATH`/bin
           fyne bundle --name resImageIcon --package resource ./assets/icon.png > ./resource/bundle.go
           fyne bundle --append --name resFontMSYaHei --package resource ./assets/msyh0.ttf >> ./resource/bundle.go
           fyne bundle --append --name resFontMSYaHeiBold --package resource ./assets/msyhbd0.ttf >> ./resource/bundle.go

From 92f36057a4003233d9d7f297226db9b153903555 Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Wed, 22 May 2024 21:09:55 +0800
Subject: [PATCH 31/61] uw

---
 .github/workflows/build.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5b3b1e1..d77bcf3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,11 +18,11 @@ jobs:
             goarch: amd64
             executable_ext: ".exe"
             install_deps: ""
-          - os: macos-latest
-            goos: darwin
-            goarch: amd64
-            executable_ext: ""
-            install_deps: brew install mpv
+#          - os: macos-latest
+#            goos: darwin
+#            goarch: amd64
+#            executable_ext: ""
+#            install_deps: brew install mpv
 
     runs-on: ${{ matrix.os }}
     timeout-minutes: 10
@@ -68,7 +68,6 @@ jobs:
 
       - name: Bundle assets
         run: |
-          export PATH=${PATH}:`go env GOPATH`/bin
           fyne bundle --name resImageIcon --package resource ./assets/icon.png > ./resource/bundle.go
           fyne bundle --append --name resFontMSYaHei --package resource ./assets/msyh0.ttf >> ./resource/bundle.go
           fyne bundle --append --name resFontMSYaHeiBold --package resource ./assets/msyhbd0.ttf >> ./resource/bundle.go

From 36df238ac176d3d6b5e768106a486565558ea318 Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Wed, 22 May 2024 21:32:57 +0800
Subject: [PATCH 32/61] uw

---
 .github/workflows/build.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d77bcf3..8210d7e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,7 +17,10 @@ jobs:
             goos: windows
             goarch: amd64
             executable_ext: ".exe"
-            install_deps: ""
+            install_deps: |
+              echo "CGO_CFLAGS=-I$(cygpath -w /mingw64/include)" >> $GITHUB_ENV
+              echo "CGO_LDFLAGS=-L$(cygpath -w /mingw64/lib) -lmpv" >> $GITHUB_ENV
+              echo "PATH=/mingw64/bin:$PATH" >> $GITHUB_ENV
 #          - os: macos-latest
 #            goos: darwin
 #            goarch: amd64
@@ -47,9 +50,6 @@ jobs:
           echo "GOARCH=${{ matrix.goarch }}" >> $GITHUB_ENV
           echo "EXECUTABLE=${EXECUTABLE_NAME}${{ matrix.executable_ext }}" >> $GITHUB_ENV
 
-      - name: Install dependencies
-        run: ${{ matrix.install_deps }}
-
       - name: Install dependencies (Windows)
         if: matrix.goos == 'windows'
         uses: msys2/setup-msys2@v2
@@ -57,8 +57,10 @@ jobs:
           msystem: MINGW64
           install: >-
             mingw-w64-x86_64-toolchain
-            mingw-w64-x86_64-go
             mingw-w64-x86_64-mpv
+      
+      - name: Install dependencies
+        run: ${{ matrix.install_deps }}
 
       - name: Install Fyne CLI
         run: go install fyne.io/fyne/v2/cmd/fyne@latest

From 6b595e453b2c69d3b8057ed40fe0d2e9f454bce4 Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Wed, 22 May 2024 21:50:17 +0800
Subject: [PATCH 33/61] uw

---
 .github/workflows/build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8210d7e..63ad35d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,8 +18,8 @@ jobs:
             goarch: amd64
             executable_ext: ".exe"
             install_deps: |
-              echo "CGO_CFLAGS=-I$(cygpath -w /mingw64/include)" >> $GITHUB_ENV
-              echo "CGO_LDFLAGS=-L$(cygpath -w /mingw64/lib) -lmpv" >> $GITHUB_ENV
+              echo "CGO_CFLAGS=-IC:/msys64/mingw64/include" >> $GITHUB_ENV
+              echo "CGO_LDFLAGS=-LC:/msys64/mingw64/lib" >> $GITHUB_ENV
               echo "PATH=/mingw64/bin:$PATH" >> $GITHUB_ENV
 #          - os: macos-latest
 #            goos: darwin
@@ -58,7 +58,7 @@ jobs:
           install: >-
             mingw-w64-x86_64-toolchain
             mingw-w64-x86_64-mpv
-      
+
       - name: Install dependencies
         run: ${{ matrix.install_deps }}
 

From 161920686f60770173d82d68c19824a3a7b02e6f Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Thu, 23 May 2024 12:43:04 +0800
Subject: [PATCH 34/61] uw

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 63ad35d..2b524e9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,6 +18,7 @@ jobs:
             goarch: amd64
             executable_ext: ".exe"
             install_deps: |
+              ls "C:/msys64/mingw64/include"
               echo "CGO_CFLAGS=-IC:/msys64/mingw64/include" >> $GITHUB_ENV
               echo "CGO_LDFLAGS=-LC:/msys64/mingw64/lib" >> $GITHUB_ENV
               echo "PATH=/mingw64/bin:$PATH" >> $GITHUB_ENV

From 8db6f49c7b26d98a6439fb0eae61ef05a902c052 Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Thu, 23 May 2024 12:55:37 +0800
Subject: [PATCH 35/61] uw

---
 .github/workflows/build.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2b524e9..fdea1ae 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,9 +18,8 @@ jobs:
             goarch: amd64
             executable_ext: ".exe"
             install_deps: |
-              ls "C:/msys64/mingw64/include"
-              echo "CGO_CFLAGS=-IC:/msys64/mingw64/include" >> $GITHUB_ENV
-              echo "CGO_LDFLAGS=-LC:/msys64/mingw64/lib" >> $GITHUB_ENV
+              echo "CGO_CFLAGS=-Imsys64/mingw64/include" >> $GITHUB_ENV
+              echo "CGO_LDFLAGS=-Lmsys64/mingw64/lib" >> $GITHUB_ENV
               echo "PATH=/mingw64/bin:$PATH" >> $GITHUB_ENV
 #          - os: macos-latest
 #            goos: darwin

From ce1322fbdeaa344875d62075a1e849a308c1ab0a Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Thu, 23 May 2024 13:37:21 +0800
Subject: [PATCH 36/61] uw

---
 .github/workflows/build.yml | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fdea1ae..7b9b658 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,14 +18,10 @@ jobs:
             goarch: amd64
             executable_ext: ".exe"
             install_deps: |
-              echo "CGO_CFLAGS=-Imsys64/mingw64/include" >> $GITHUB_ENV
-              echo "CGO_LDFLAGS=-Lmsys64/mingw64/lib" >> $GITHUB_ENV
-              echo "PATH=/mingw64/bin:$PATH" >> $GITHUB_ENV
-#          - os: macos-latest
-#            goos: darwin
-#            goarch: amd64
-#            executable_ext: ""
-#            install_deps: brew install mpv
+              curl -LO https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-mpv-0.38.0-1-any.pkg.tar.zst
+              7z x mingw-w64-x86_64-mpv-0.38.0-1-any.pkg.tar.zst -so | 7z x -si -ttar -oC:/msys64/mingw64
+              echo "CGO_CFLAGS=-IC:/msys64/mingw64/include" >> $GITHUB_ENV
+              echo "CGO_LDFLAGS=-LC:/msys64/mingw64/lib" >> $GITHUB_ENV
 
     runs-on: ${{ matrix.os }}
     timeout-minutes: 10
@@ -50,14 +46,14 @@ jobs:
           echo "GOARCH=${{ matrix.goarch }}" >> $GITHUB_ENV
           echo "EXECUTABLE=${EXECUTABLE_NAME}${{ matrix.executable_ext }}" >> $GITHUB_ENV
 
-      - name: Install dependencies (Windows)
-        if: matrix.goos == 'windows'
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: MINGW64
-          install: >-
-            mingw-w64-x86_64-toolchain
-            mingw-w64-x86_64-mpv
+#      - name: Install dependencies (Windows)
+#        if: matrix.goos == 'windows'
+#        uses: msys2/setup-msys2@v2
+#        with:
+#          msystem: MINGW64
+#          install: >-
+#            mingw-w64-x86_64-toolchain
+#            mingw-w64-x86_64-mpv
 
       - name: Install dependencies
         run: ${{ matrix.install_deps }}

From 627e5ff9bc208a7e82c37b05534a754a4ce52879 Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Thu, 23 May 2024 18:14:47 +0800
Subject: [PATCH 37/61] uw

---
 .github/workflows/build.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7b9b658..445864b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,9 +19,12 @@ jobs:
             executable_ext: ".exe"
             install_deps: |
               curl -LO https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-mpv-0.38.0-1-any.pkg.tar.zst
-              7z x mingw-w64-x86_64-mpv-0.38.0-1-any.pkg.tar.zst -so | 7z x -si -ttar -oC:/msys64/mingw64
+              curl -LO https://github.com/facebook/zstd/releases/download/v1.5.2/zstd-v1.5.2-win64.zip
+              7z x zstd-v1.5.2-win64.zip -ozstd
+              zstd/zstd.exe -d mingw-w64-x86_64-mpv-0.38.0-1-any.pkg.tar.zst -o mingw-w64-x86_64-mpv-0.38.0-1-any.pkg.tar
+              7z x mingw-w64-x86_64-mpv-0.38.0-1-any.pkg.tar -oC:/msys64/mingw64
               echo "CGO_CFLAGS=-IC:/msys64/mingw64/include" >> $GITHUB_ENV
-              echo "CGO_LDFLAGS=-LC:/msys64/mingw64/lib" >> $GITHUB_ENV
+              echo "CGO_LDFLAGS=-LC:/msys64/mingw64/lib -lmpv" >> $GITHUB_ENV
 
     runs-on: ${{ matrix.os }}
     timeout-minutes: 10

From 7a57a1dcc0f6a301f582c9493d8808256a0c5031 Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Thu, 23 May 2024 18:20:27 +0800
Subject: [PATCH 38/61] uw

---
 .github/workflows/build.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 445864b..0cb094c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,13 +18,10 @@ jobs:
             goarch: amd64
             executable_ext: ".exe"
             install_deps: |
-              curl -LO https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-mpv-0.38.0-1-any.pkg.tar.zst
-              curl -LO https://github.com/facebook/zstd/releases/download/v1.5.2/zstd-v1.5.2-win64.zip
-              7z x zstd-v1.5.2-win64.zip -ozstd
-              zstd/zstd.exe -d mingw-w64-x86_64-mpv-0.38.0-1-any.pkg.tar.zst -o mingw-w64-x86_64-mpv-0.38.0-1-any.pkg.tar
-              7z x mingw-w64-x86_64-mpv-0.38.0-1-any.pkg.tar -oC:/msys64/mingw64
+              curl -LO https://sourceforge.net/projects/mpv-player-windows/files/libmpv/mpv-dev-x86_64-20240519-git-875378f.7z/download
+              7z x mpv-dev-x86_64-20210620.7z -oC:/msys64/mingw64
               echo "CGO_CFLAGS=-IC:/msys64/mingw64/include" >> $GITHUB_ENV
-              echo "CGO_LDFLAGS=-LC:/msys64/mingw64/lib -lmpv" >> $GITHUB_ENV
+              echo "CGO_LDFLAGS=-LC:/msys64/mingw64/lib" >> $GITHUB_ENV
 
     runs-on: ${{ matrix.os }}
     timeout-minutes: 10

From e466e21bc8e468379feb92a541a1944b9877fb7c Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Thu, 23 May 2024 18:27:04 +0800
Subject: [PATCH 39/61] fk

---
 .github/workflows/build.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0cb094c..5c1bc10 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,10 +18,14 @@ jobs:
             goarch: amd64
             executable_ext: ".exe"
             install_deps: |
-              curl -LO https://sourceforge.net/projects/mpv-player-windows/files/libmpv/mpv-dev-x86_64-20240519-git-875378f.7z/download
-              7z x mpv-dev-x86_64-20210620.7z -oC:/msys64/mingw64
+              curl -LO https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-mpv-0.38.0-1-any.pkg.tar.zst
+              curl -LO https://github.com/facebook/zstd/releases/download/v1.5.2/zstd-v1.5.2-win64.zip
+              7z x zstd-v1.5.2-win64.zip -ozstd
+              .\zstd\zstd.exe -d mingw-w64-x86_64-mpv-0.38.0-1-any.pkg.tar.zst -o mingw-w64-x86_64-mpv-0.38.0-1-any.pkg.tar
+              7z x mingw-w64-x86_64-mpv-0.38.0-1-any.pkg.tar -oC:/msys64/mingw64
               echo "CGO_CFLAGS=-IC:/msys64/mingw64/include" >> $GITHUB_ENV
-              echo "CGO_LDFLAGS=-LC:/msys64/mingw64/lib" >> $GITHUB_ENV
+              echo "CGO_LDFLAGS=-LC:/msys64/mingw64/lib -lmpv" >> $GITHUB_ENV
+
 
     runs-on: ${{ matrix.os }}
     timeout-minutes: 10

From 50d3172816e78e03d67206deed65b3156f5e42ba Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Thu, 23 May 2024 18:29:49 +0800
Subject: [PATCH 40/61] fu

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5c1bc10..b12b6a8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,10 +21,10 @@ jobs:
               curl -LO https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-mpv-0.38.0-1-any.pkg.tar.zst
               curl -LO https://github.com/facebook/zstd/releases/download/v1.5.2/zstd-v1.5.2-win64.zip
               7z x zstd-v1.5.2-win64.zip -ozstd
-              .\zstd\zstd.exe -d mingw-w64-x86_64-mpv-0.38.0-1-any.pkg.tar.zst -o mingw-w64-x86_64-mpv-0.38.0-1-any.pkg.tar
+              ./zstd/zstd.exe -d mingw-w64-x86_64-mpv-0.38.0-1-any.pkg.tar.zst -o mingw-w64-x86_64-mpv-0.38.0-1-any.pkg.tar
               7z x mingw-w64-x86_64-mpv-0.38.0-1-any.pkg.tar -oC:/msys64/mingw64
               echo "CGO_CFLAGS=-IC:/msys64/mingw64/include" >> $GITHUB_ENV
-              echo "CGO_LDFLAGS=-LC:/msys64/mingw64/lib -lmpv" >> $GITHUB_ENV
+              echo "CGO_LDFLAGS=-LC:/msys64/mingw64/lib" >> $GITHUB_ENV
 
 
     runs-on: ${{ matrix.os }}

From 7634bd5864f86db603912d9f48b4417d88342f1f Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Thu, 23 May 2024 18:31:52 +0800
Subject: [PATCH 41/61] fi

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b12b6a8..afe881a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,7 +21,7 @@ jobs:
               curl -LO https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-mpv-0.38.0-1-any.pkg.tar.zst
               curl -LO https://github.com/facebook/zstd/releases/download/v1.5.2/zstd-v1.5.2-win64.zip
               7z x zstd-v1.5.2-win64.zip -ozstd
-              ./zstd/zstd.exe -d mingw-w64-x86_64-mpv-0.38.0-1-any.pkg.tar.zst -o mingw-w64-x86_64-mpv-0.38.0-1-any.pkg.tar
+              .\\zstd\\zstd.exe -d mingw-w64-x86_64-mpv-0.38.0-1-any.pkg.tar.zst -o mingw-w64-x86_64-mpv-0.38.0-1-any.pkg.tar
               7z x mingw-w64-x86_64-mpv-0.38.0-1-any.pkg.tar -oC:/msys64/mingw64
               echo "CGO_CFLAGS=-IC:/msys64/mingw64/include" >> $GITHUB_ENV
               echo "CGO_LDFLAGS=-LC:/msys64/mingw64/lib" >> $GITHUB_ENV

From deec6157b924b58ff7df484f647aa2a8fa400ae0 Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Thu, 23 May 2024 18:37:44 +0800
Subject: [PATCH 42/61] adsf

---
 .github/workflows/build.yml | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index afe881a..ab056fd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -50,14 +50,21 @@ jobs:
           echo "GOARCH=${{ matrix.goarch }}" >> $GITHUB_ENV
           echo "EXECUTABLE=${EXECUTABLE_NAME}${{ matrix.executable_ext }}" >> $GITHUB_ENV
 
-#      - name: Install dependencies (Windows)
-#        if: matrix.goos == 'windows'
-#        uses: msys2/setup-msys2@v2
-#        with:
-#          msystem: MINGW64
-#          install: >-
-#            mingw-w64-x86_64-toolchain
-#            mingw-w64-x86_64-mpv
+      - name: Install dependencies (Windows)
+        if: matrix.goos == 'windows'
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: MINGW64
+          install: >-
+            mingw-w64-x86_64-toolchain
+            mingw-w64-x86_64-mpv
+
+      - name: Set up MSYS2 environment for Go build
+        if: matrix.goos == 'windows'
+        run: |
+          echo "CGO_CFLAGS=$(pkgconf --cflags mpv)" >> $GITHUB_ENV
+          echo "CGO_LDFLAGS=$(pkgconf --libs mpv)" >> $GITHUB_ENV
+          echo "PATH=/mingw64/bin:$PATH" >> $GITHUB_ENV
 
       - name: Install dependencies
         run: ${{ matrix.install_deps }}

From e47b48bb428e4714ea3411aed57d0409f4e21eed Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Thu, 23 May 2024 18:45:47 +0800
Subject: [PATCH 43/61] ad

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ab056fd..f3229ba 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -61,6 +61,7 @@ jobs:
 
       - name: Set up MSYS2 environment for Go build
         if: matrix.goos == 'windows'
+        shell: msys2 {0}
         run: |
           echo "CGO_CFLAGS=$(pkgconf --cflags mpv)" >> $GITHUB_ENV
           echo "CGO_LDFLAGS=$(pkgconf --libs mpv)" >> $GITHUB_ENV

From c57b7c992f0bed30ab248e9e3a45352f82c9ee3c Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Thu, 23 May 2024 18:48:44 +0800
Subject: [PATCH 44/61] asdf

---
 .github/workflows/build.yml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f3229ba..295c879 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,14 +17,7 @@ jobs:
             goos: windows
             goarch: amd64
             executable_ext: ".exe"
-            install_deps: |
-              curl -LO https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-mpv-0.38.0-1-any.pkg.tar.zst
-              curl -LO https://github.com/facebook/zstd/releases/download/v1.5.2/zstd-v1.5.2-win64.zip
-              7z x zstd-v1.5.2-win64.zip -ozstd
-              .\\zstd\\zstd.exe -d mingw-w64-x86_64-mpv-0.38.0-1-any.pkg.tar.zst -o mingw-w64-x86_64-mpv-0.38.0-1-any.pkg.tar
-              7z x mingw-w64-x86_64-mpv-0.38.0-1-any.pkg.tar -oC:/msys64/mingw64
-              echo "CGO_CFLAGS=-IC:/msys64/mingw64/include" >> $GITHUB_ENV
-              echo "CGO_LDFLAGS=-LC:/msys64/mingw64/lib" >> $GITHUB_ENV
+            install_deps: ""
 
 
     runs-on: ${{ matrix.os }}

From 37f0dadd8b6f22334c2e11a9af3dc4e594c5af9e Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Thu, 23 May 2024 19:16:42 +0800
Subject: [PATCH 45/61] asdf

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 295c879..267cab1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -58,6 +58,7 @@ jobs:
         run: |
           echo "CGO_CFLAGS=$(pkgconf --cflags mpv)" >> $GITHUB_ENV
           echo "CGO_LDFLAGS=$(pkgconf --libs mpv)" >> $GITHUB_ENV
+          echo "CGO_ENABLED=1" >> $GITHUB_ENV
           echo "PATH=/mingw64/bin:$PATH" >> $GITHUB_ENV
 
       - name: Install dependencies

From 65aba16f4461320ac3024e52f9ecddd1145679b1 Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Thu, 23 May 2024 19:23:26 +0800
Subject: [PATCH 46/61] update

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 267cab1..fc2494c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -59,7 +59,7 @@ jobs:
           echo "CGO_CFLAGS=$(pkgconf --cflags mpv)" >> $GITHUB_ENV
           echo "CGO_LDFLAGS=$(pkgconf --libs mpv)" >> $GITHUB_ENV
           echo "CGO_ENABLED=1" >> $GITHUB_ENV
-          echo "PATH=/mingw64/bin:$PATH" >> $GITHUB_ENV
+          echo "/mingw64/bin" >> $GITHUB_PATH
 
       - name: Install dependencies
         run: ${{ matrix.install_deps }}

From 9142d74f199bd3eeedef68bb20c941ca595fc9e6 Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Thu, 23 May 2024 19:29:47 +0800
Subject: [PATCH 47/61] asdf

---
 .github/workflows/build.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fc2494c..68812de 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -59,7 +59,8 @@ jobs:
           echo "CGO_CFLAGS=$(pkgconf --cflags mpv)" >> $GITHUB_ENV
           echo "CGO_LDFLAGS=$(pkgconf --libs mpv)" >> $GITHUB_ENV
           echo "CGO_ENABLED=1" >> $GITHUB_ENV
-          echo "/mingw64/bin" >> $GITHUB_PATH
+          echo "export CC=/mingw64/bin/gcc" >> $GITHUB_ENV
+          echo "export CXX=/mingw64/bin/g++" >> $GITHUB_ENV
 
       - name: Install dependencies
         run: ${{ matrix.install_deps }}

From 92376bdd12b5c33256afc86ea54bdd8dba2fb1bd Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Thu, 23 May 2024 19:57:02 +0800
Subject: [PATCH 48/61] sb

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 68812de..960ab4a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -59,8 +59,8 @@ jobs:
           echo "CGO_CFLAGS=$(pkgconf --cflags mpv)" >> $GITHUB_ENV
           echo "CGO_LDFLAGS=$(pkgconf --libs mpv)" >> $GITHUB_ENV
           echo "CGO_ENABLED=1" >> $GITHUB_ENV
-          echo "export CC=/mingw64/bin/gcc" >> $GITHUB_ENV
-          echo "export CXX=/mingw64/bin/g++" >> $GITHUB_ENV
+          echo "CC=/mingw64/bin/gcc" >> $GITHUB_ENV
+          echo "CXX=/mingw64/bin/g++" >> $GITHUB_ENV
 
       - name: Install dependencies
         run: ${{ matrix.install_deps }}

From 552f115a33fc985470c3a4a1c25d9c8c8929e5d5 Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Thu, 23 May 2024 20:03:59 +0800
Subject: [PATCH 49/61] aaa

---
 .github/workflows/build.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 960ab4a..76e1ee7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -58,9 +58,11 @@ jobs:
         run: |
           echo "CGO_CFLAGS=$(pkgconf --cflags mpv)" >> $GITHUB_ENV
           echo "CGO_LDFLAGS=$(pkgconf --libs mpv)" >> $GITHUB_ENV
-          echo "CGO_ENABLED=1" >> $GITHUB_ENV
-          echo "CC=/mingw64/bin/gcc" >> $GITHUB_ENV
-          echo "CXX=/mingw64/bin/g++" >> $GITHUB_ENV
+
+      - name: check
+        if: matrix.goos == 'windows'
+        run: ls D:/a/_temp/msys64/mingw64/include
+
 
       - name: Install dependencies
         run: ${{ matrix.install_deps }}

From 2bc19e2e0c07c085b56ac04ffe940828accbf8e9 Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Thu, 23 May 2024 20:10:38 +0800
Subject: [PATCH 50/61] asdf

---
 .github/workflows/build.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 76e1ee7..8daf31d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -61,7 +61,8 @@ jobs:
 
       - name: check
         if: matrix.goos == 'windows'
-        run: ls D:/a/_temp/msys64/mingw64/include
+        run: |
+          ls /mingw64/include
 
 
       - name: Install dependencies

From a892ec3043b049764e058379aac02fd73ec2d81c Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Thu, 23 May 2024 20:16:17 +0800
Subject: [PATCH 51/61] cnm

---
 .github/workflows/build.yml | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8daf31d..0d85c7c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -56,14 +56,8 @@ jobs:
         if: matrix.goos == 'windows'
         shell: msys2 {0}
         run: |
-          echo "CGO_CFLAGS=$(pkgconf --cflags mpv)" >> $GITHUB_ENV
-          echo "CGO_LDFLAGS=$(pkgconf --libs mpv)" >> $GITHUB_ENV
-
-      - name: check
-        if: matrix.goos == 'windows'
-        run: |
-          ls /mingw64/include
-
+          echo "CGO_CFLAGS=D:/a/_temp/msys64/mingw64/include" >> $GITHUB_ENV
+          echo "CGO_LDFLAGS=D:/a/_temp/msys64/mingw64/lib" >> $GITHUB_ENV
 
       - name: Install dependencies
         run: ${{ matrix.install_deps }}

From a6cdf3c903f582945616f47b4800693cf576e76f Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Thu, 23 May 2024 20:23:57 +0800
Subject: [PATCH 52/61] hello

---
 .github/workflows/build.yml | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0d85c7c..13d0a0d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,7 +17,9 @@ jobs:
             goos: windows
             goarch: amd64
             executable_ext: ".exe"
-            install_deps: ""
+            install_deps: |
+              echo "CGO_CFLAGS=-ID:/a/_temp/msys64/mingw64/include" >> $GITHUB_ENV
+              echo "CGO_LDFLAGS=-LD:/a/_temp/msys64/mingw64/lib" >> $GITHUB_ENV
 
 
     runs-on: ${{ matrix.os }}
@@ -52,13 +54,6 @@ jobs:
             mingw-w64-x86_64-toolchain
             mingw-w64-x86_64-mpv
 
-      - name: Set up MSYS2 environment for Go build
-        if: matrix.goos == 'windows'
-        shell: msys2 {0}
-        run: |
-          echo "CGO_CFLAGS=D:/a/_temp/msys64/mingw64/include" >> $GITHUB_ENV
-          echo "CGO_LDFLAGS=D:/a/_temp/msys64/mingw64/lib" >> $GITHUB_ENV
-
       - name: Install dependencies
         run: ${{ matrix.install_deps }}
 

From a2d674666a5324a4ee1909b67e993e7e3449a73c Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Thu, 23 May 2024 20:32:13 +0800
Subject: [PATCH 53/61] asdf

---
 .github/workflows/build.yml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 13d0a0d..7bf7648 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,9 +17,7 @@ jobs:
             goos: windows
             goarch: amd64
             executable_ext: ".exe"
-            install_deps: |
-              echo "CGO_CFLAGS=-ID:/a/_temp/msys64/mingw64/include" >> $GITHUB_ENV
-              echo "CGO_LDFLAGS=-LD:/a/_temp/msys64/mingw64/lib" >> $GITHUB_ENV
+            install_deps: ""
 
 
     runs-on: ${{ matrix.os }}
@@ -54,6 +52,14 @@ jobs:
             mingw-w64-x86_64-toolchain
             mingw-w64-x86_64-mpv
 
+      - name: Set up MSYS2 environment for Go build
+        if: matrix.goos == 'windows'
+        shell: msys2 {0}
+        run: |
+          echo "CGO_CFLAGS=-ID:/a/_temp/msys64/mingw64/include" >> $GITHUB_ENV
+          echo "CGO_LDFLAGS=-LD:/a/_temp/msys64/mingw64/lib" >> $GITHUB_ENV
+
+
       - name: Install dependencies
         run: ${{ matrix.install_deps }}
 

From 5d002becc4893c753d982f581acb60ff581fef8b Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Thu, 23 May 2024 20:46:02 +0800
Subject: [PATCH 54/61] fff

---
 .github/workflows/build.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7bf7648..35cc19a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -56,7 +56,9 @@ jobs:
         if: matrix.goos == 'windows'
         shell: msys2 {0}
         run: |
-          echo "CGO_CFLAGS=-ID:/a/_temp/msys64/mingw64/include" >> $GITHUB_ENV
+          mkdir -p D:/libmpv/include/mpv
+          cp -r /mingw64/include/mpv/* D:/libmpv/include/mpv/
+          echo "CGO_CFLAGS=-ID:/libmpv/include" >> $GITHUB_ENV
           echo "CGO_LDFLAGS=-LD:/a/_temp/msys64/mingw64/lib" >> $GITHUB_ENV
 
 

From fa7448e2c52facf3467764793eae3907ed72a6a7 Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Thu, 23 May 2024 21:00:17 +0800
Subject: [PATCH 55/61] test

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 35cc19a..4294218 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,7 +21,7 @@ jobs:
 
 
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 10
+    timeout-minutes: 20
 
     env:
       EXECUTABLE_NAME: AynaLivePlayer

From fb43dcab5d32bccfeeee44bc6fa4a079cd1d116a Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Thu, 23 May 2024 21:05:12 +0800
Subject: [PATCH 56/61] separate jobs

---
 .github/workflows/build.yml | 96 +++++++++++++++++++++----------------
 1 file changed, 55 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4294218..eeec86e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,28 +3,14 @@ name: Build
 on: [push]
 
 jobs:
-  build:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-latest
-            goos: linux
-            goarch: amd64
-            executable_ext: ""
-            install_deps: sudo apt-get install -y libmpv-dev libgl-dev libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev libgl1-mesa-dev xorg-dev
-          - os: windows-latest
-            goos: windows
-            goarch: amd64
-            executable_ext: ".exe"
-            install_deps: ""
-
-
-    runs-on: ${{ matrix.os }}
+  build-windows:
+    runs-on: windows-latest
     timeout-minutes: 20
 
     env:
-      EXECUTABLE_NAME: AynaLivePlayer
+      GOOS: windows
+      GOARCH: amd64
+      EXECUTABLE: AynaLivePlayer.exe
 
     steps:
       - name: Checkout code
@@ -32,28 +18,15 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: '1.20'
-
-      - name: Set up environment variables
-        run: |
-          echo "GOOS=${{ matrix.goos }}" >> $GITHUB_ENV
-          echo "GOARCH=${{ matrix.goarch }}" >> $GITHUB_ENV
-          echo "EXECUTABLE=${EXECUTABLE_NAME}${{ matrix.executable_ext }}" >> $GITHUB_ENV
-
       - name: Install dependencies (Windows)
-        if: matrix.goos == 'windows'
         uses: msys2/setup-msys2@v2
         with:
           msystem: MINGW64
-          install: >-
+          nstall: >-
             mingw-w64-x86_64-toolchain
             mingw-w64-x86_64-mpv
 
       - name: Set up MSYS2 environment for Go build
-        if: matrix.goos == 'windows'
         shell: msys2 {0}
         run: |
           mkdir -p D:/libmpv/include/mpv
@@ -61,18 +34,59 @@ jobs:
           echo "CGO_CFLAGS=-ID:/libmpv/include" >> $GITHUB_ENV
           echo "CGO_LDFLAGS=-LD:/a/_temp/msys64/mingw64/lib" >> $GITHUB_ENV
 
-
-      - name: Install dependencies
-        run: ${{ matrix.install_deps }}
-
-      - name: Install Fyne CLI
-        run: go install fyne.io/fyne/v2/cmd/fyne@latest
+      - name: Install Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.20'
 
       - name: Tidy go.mod
         run: go mod tidy
 
       - name: Bundle assets
         run: |
+          go install fyne.io/fyne/v2/cmd/fyne@latest
+          fyne bundle --name resImageIcon --package resource ./assets/icon.png > ./resource/bundle.go
+          fyne bundle --append --name resFontMSYaHei --package resource ./assets/msyh0.ttf >> ./resource/bundle.go
+          fyne bundle --append --name resFontMSYaHeiBold --package resource ./assets/msyhbd0.ttf >> ./resource/bundle.go
+
+      - name: Build application
+        run: go build -o ./$EXECUTABLE -ldflags -H=windowsgui app/main.go
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: windows-build
+          path: ./$EXECUTABLE
+
+  build-ubuntu:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+
+    env:
+      GOOS: linux
+      GOARCH: amd64
+      EXECUTABLE: AynaLivePlayer
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install dependencies
+        run: sudo apt-get install -y libmpv-dev libgl-dev libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev libgl1-mesa-dev xorg-dev
+
+      - name: Install Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.20'
+
+      - name: Tidy go.mod
+        run: go mod tidy
+
+      - name: Bundle assets
+        run: |
+          go install fyne.io/fyne/v2/cmd/fyne@latest
           fyne bundle --name resImageIcon --package resource ./assets/icon.png > ./resource/bundle.go
           fyne bundle --append --name resFontMSYaHei --package resource ./assets/msyh0.ttf >> ./resource/bundle.go
           fyne bundle --append --name resFontMSYaHeiBold --package resource ./assets/msyhbd0.ttf >> ./resource/bundle.go
@@ -83,5 +97,5 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
-          name: ${{ matrix.os }}-build
-          path: ./${{ env.EXECUTABLE }}
+          name: ubuntu-build
+          path: ./$EXECUTABLE

From 731681809304aaf2941c0773f2a25d47c55c0dfa Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Thu, 23 May 2024 21:08:24 +0800
Subject: [PATCH 57/61] uw

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index eeec86e..a091638 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Install dependencies (Windows)
+      - name: Install dependencies
         uses: msys2/setup-msys2@v2
         with:
           msystem: MINGW64
@@ -30,7 +30,7 @@ jobs:
         shell: msys2 {0}
         run: |
           mkdir -p D:/libmpv/include/mpv
-          cp -r /mingw64/include/mpv/* D:/libmpv/include/mpv/
+          cp -r D:/a/_temp/mingw64/include/mpv/* D:/libmpv/include/mpv/
           echo "CGO_CFLAGS=-ID:/libmpv/include" >> $GITHUB_ENV
           echo "CGO_LDFLAGS=-LD:/a/_temp/msys64/mingw64/lib" >> $GITHUB_ENV
 

From 2ab27b1b57ef3b4f47b18053a7a949c7dde12409 Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Thu, 23 May 2024 21:12:18 +0800
Subject: [PATCH 58/61] uw

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a091638..cc01e0a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,7 +22,7 @@ jobs:
         uses: msys2/setup-msys2@v2
         with:
           msystem: MINGW64
-          nstall: >-
+          install: >-
             mingw-w64-x86_64-toolchain
             mingw-w64-x86_64-mpv
 
@@ -30,7 +30,7 @@ jobs:
         shell: msys2 {0}
         run: |
           mkdir -p D:/libmpv/include/mpv
-          cp -r D:/a/_temp/mingw64/include/mpv/* D:/libmpv/include/mpv/
+          cp -r /mingw64/include/mpv/* D:/libmpv/include/mpv/
           echo "CGO_CFLAGS=-ID:/libmpv/include" >> $GITHUB_ENV
           echo "CGO_LDFLAGS=-LD:/a/_temp/msys64/mingw64/lib" >> $GITHUB_ENV
 

From 3959eac396e96808e79e6d5034d05672a0c1b9f0 Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Thu, 23 May 2024 21:24:59 +0800
Subject: [PATCH 59/61] fix upload executable

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cc01e0a..ba7eee0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -56,7 +56,7 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: windows-build
-          path: ./$EXECUTABLE
+          path: ./${{ env.EXECUTABLE }}
 
   build-ubuntu:
     runs-on: ubuntu-latest
@@ -98,4 +98,4 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: ubuntu-build
-          path: ./$EXECUTABLE
+          path: ./${{ env.EXECUTABLE }}

From ce042bad0a8c0ed8ba3f8b9a3b73df5137185073 Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Thu, 23 May 2024 21:54:04 +0800
Subject: [PATCH 60/61] fix build

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ba7eee0..e85d437 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -50,7 +50,7 @@ jobs:
           fyne bundle --append --name resFontMSYaHeiBold --package resource ./assets/msyhbd0.ttf >> ./resource/bundle.go
 
       - name: Build application
-        run: go build -o ./$EXECUTABLE -ldflags -H=windowsgui app/main.go
+        run: go build -o ./${{ env.EXECUTABLE }} -ldflags -H=windowsgui app/main.go
 
       - name: Upload artifact
         uses: actions/upload-artifact@v3
@@ -92,7 +92,7 @@ jobs:
           fyne bundle --append --name resFontMSYaHeiBold --package resource ./assets/msyhbd0.ttf >> ./resource/bundle.go
 
       - name: Build application
-        run: go build -o ./$EXECUTABLE app/main.go
+        run: go build -o ./${{ env.EXECUTABLE }} app/main.go
 
       - name: Upload artifact
         uses: actions/upload-artifact@v3

From 36cdfd08244545e56b8c62f67800280132a86a43 Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Thu, 23 May 2024 22:01:39 +0800
Subject: [PATCH 61/61] only on master

---
 .github/workflows/build.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e85d437..9fd00f1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,6 +1,9 @@
 name: Build
 
-on: [push]
+on:
+  push:
+    branches:
+      - master
 
 jobs:
   build-windows: