clockworkpi/LauncherGoDev
1
0
Fork 0
mirror of https://github.com/clockworkpi/LauncherGoDev.git synced 2026-03-19 02:12:46 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

big update, add goroutine sdl render

Browse Source 
replace a lot of self.Screen.Draw() to self.Screen.Refresh()
This commit is contained in:
cuu
2023-01-23 14:04:11 +00:00
parent 057bcc86f1
commit 7814f9ca6f
40 changed files with 358 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Menu/GameShell/97_MusicPlayer/list_page_selector.go
View File

@@ -1,7 +1,7 @@
package MusicPlayer
import (
"fmt"
//"fmt"
// "path/filepath"
// "github.com/cuu/gogame/event"
@@ -37,7 +37,6 @@ func (self *ListPageSelector) Draw() {
idx := self.Parent.GetPsIndex()
mylist := self.Parent.GetMyList()
fmt.Println(idx)
if idx < len(mylist) {
x, y := mylist[idx].Coord()
_, h := mylist[idx].Size()

12
Menu/GameShell/97_MusicPlayer/music_lib_list_page.go
View File

@@ -234,8 +234,7 @@ func (self *MusicLibListPage) Click() {
}
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
@@ -243,22 +242,19 @@ func (self *MusicLibListPage) KeyDown(ev *event.Event) {
if UI.IsKeyMenuOrA(ev.Data["Key"]) || ev.Data["Key"] == UI.CurKeys["Left"] {
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["Up"] {
self.ScrollUp()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["Down"] {
self.ScrollDown()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["B"] {

8
Menu/GameShell/97_MusicPlayer/music_lib_list_page_list_item.go
View File

@@ -41,6 +41,14 @@ func NewMusicLibListPageListItem() *MusicLibListPageListItem {
return p
}
func (self *MusicLibListPageListItem) Init(text string) {
l := UI.NewLabel()
l.PosX = 10
l.SetCanvasHWND(self.Parent.GetCanvasHWND())
l.Init(text, self.Fonts["normal"], nil)
self.Labels["Text"] = l
}
func (self *MusicLibListPageListItem) Draw() {
x, _ := self.Labels["Text"].Coord()

137
Menu/GameShell/97_MusicPlayer/music_player_page.go
View File

@@ -9,8 +9,11 @@ import (
"github.com/cuu/gogame/event"
"github.com/cuu/gogame/rect"
"github.com/cuu/gogame/surface"
// "github.com/cuu/gogame/time"
gotime "time"
//"github.com/veandco/go-sdl2/sdl"
"github.com/veandco/go-sdl2/ttf"
"github.com/cuu/gogame/color"
"github.com/clockworkpi/LauncherGoDev/sysgo"
"github.com/clockworkpi/LauncherGoDev/sysgo/UI"
@@ -41,6 +44,10 @@ type MusicPlayerPage struct {
CurSongTime string
CurSongName string
playing_ch chan bool
PlayerOn bool
}
func NewMusicPlayerPage() *MusicPlayerPage {
@@ -56,7 +63,7 @@ func NewMusicPlayerPage() *MusicPlayerPage {
p.URLColor = UI.MySkinManager.GiveColor("URL")
p.TextColor = UI.MySkinManager.GiveColor("Text")
p.ListFontObj = UI.MyLangManager.TrFont("notosanscjk15")
p.ListFontObj = UI.MyLangManager.TrFont("notosanscjk14")
p.Labels = make(map[string]UI.LabelInterface)
@@ -67,12 +74,16 @@ func NewMusicPlayerPage() *MusicPlayerPage {
p.CurSongTime = "0:0"
p.playing_ch = make(chan bool,1)
p.PlayerOn = false
return p
}
func (self *MusicPlayerPage) OnLoadCb() {
self.PosY = 0
self.PlayerOn = true
if self.MpdClient == nil {
conn, err := mpd.Dial("unix", sysgo.MPD_socket)
@@ -83,8 +94,11 @@ func (self *MusicPlayerPage) OnLoadCb() {
fmt.Println("Start mpd client")
}
self.SyncList()
self.SetPlaying(true)
go self.UpdatePlayingStatus(250)
}
func (self *MusicPlayerPage) OnPopUpCb() {
@@ -99,14 +113,6 @@ func (self *MusicPlayerPage) OnReturnBackCb() {
self.SyncList()
}
func (self *MusicPlayerPage) SetCoords() {
}
func (self *MusicPlayerPage) SetLabels() {
}
func (self *MusicPlayerPage) SyncList() {
conn := self.MpdClient
start_x := 0
@@ -150,24 +156,55 @@ func (self *MusicPlayerPage) SyncList() {
self.SyncPlaying()
}
func (self *MusicPlayerPage) SyncPlaying() {
func (self *MusicPlayerPage) UpdatePlayingStatus(ms int) {
RefreshTicker := gotime.NewTicker(gotime.Duration(ms)*gotime.Millisecond)
defer RefreshTicker.Stop()
L:
for {
select {
case <- RefreshTicker.C:
cur_pos_id := self.SyncPlaying()
if self.Screen.CurPage() == self && cur_pos_id >= 0 {
self.Screen.Refresh()
}
case v:= <- self.playing_ch:
if v== false {
break L
}
}
}
fmt.Println("Quiting UpdatePlayingStatus")
}
func (self *MusicPlayerPage) SyncPlaying() int {
conn := self.MpdClient
cur_pos_id := -1
if self.PlayerOn == false {
return cur_pos_id
}
for i,_ := range self.MyList {
self.MyList[i].(*MusicPlayPageListItem).Active = false
self.MyList[i].(*MusicPlayPageListItem).PlayingProcess = 0
self.MyList[i].(*MusicPlayPageListItem).State = ""
}
current_song,_ := conn.CurrentSong()
current_song,_ := conn.Status()
if len(current_song) > 0 {
if val,ok := current_song["song"]; ok{
posid, _ := strconv.Atoi(val)
if posid < len(self.MyList) {
cur_pos_id = posid
if state,ok2 := current_song["state"]; ok2 {
if state == "stop" {
self.MyList[posid].(*MusicPlayPageListItem).Active = false
}else{
if state == "play" {
self.MyList[posid].(*MusicPlayPageListItem).Active = true
}else{
self.MyList[posid].(*MusicPlayPageListItem).Active = false
}
self.MyList[posid].(*MusicPlayPageListItem).State = state
}
if song_time,ok3 := current_song["time"]; ok3 {
@@ -183,6 +220,8 @@ func (self *MusicPlayerPage) SyncPlaying() {
}
}
}
return cur_pos_id
}
func (self *MusicPlayerPage) InPlayList(path string) bool {
@@ -201,6 +240,52 @@ func (self *MusicPlayerPage) InPlayList(path string) bool {
return false
}
func (self *MusicPlayerPage) SetPlaying( v bool) {
for len(self.playing_ch) > 0 {
<- self.playing_ch
}
self.playing_ch <- v
}
func (self *MusicPlayerPage) StopPlayer() {
self.SetPlaying(false)
conn := self.MpdClient
conn.Stop()
self.CurSongName = ""
self.CurSongTime = "0:0"
}
func (self *MusicPlayerPage) PlayOrPause() {
self.RefreshPsIndex()
if self.MyList == nil || len(self.MyList) == 0 {
return
}
conn := self.MpdClient
cur_song_posid := self.SyncPlaying()
if cur_song_posid == self.PsIndex {
cur_li := self.MyList[self.PsIndex].(*MusicPlayPageListItem)
//fmt.Println(cur_li.State)
if cur_li.State == "pause" {
conn.Pause(false)
}else if cur_li.State == "play" {
conn.Pause(true)
}else {
conn.Play(self.PsIndex)
}
}else{
conn.Play(self.PsIndex)
}
self.SyncPlaying()
self.Screen.Refresh()
}
func (self *MusicPlayerPage) Init() {
if self.Screen == nil {
panic("No Screen")
@@ -261,34 +346,36 @@ func (self *MusicPlayerPage) Init() {
func (self *MusicPlayerPage) KeyDown(ev *event.Event) {
if ev.Data["Key"] == UI.CurKeys["Right"] {
self.Screen.PushPage(self.MyMusicLibListPage)
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["A"] || ev.Data["Key"] == UI.CurKeys["Menu"] {
self.PlayerOn = false
self.StopPlayer()
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["Up"] {
self.ScrollUp()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["Down"] {
self.ScrollDown()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["X"] {
self.MpdClient.Delete(self.PsIndex,-1)
self.SyncList()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["B"] {
self.PlayOrPause()
}
return
}

10
Menu/GameShell/97_MusicPlayer/music_player_page_list_item.go
View File

@@ -27,7 +27,7 @@ type MusicPlayPageListItem struct {
Value string
MyType int
Path string
State string
PlayingProcess int
}
@@ -43,6 +43,14 @@ func NewMusicPlayPageListItem() *MusicPlayPageListItem {
return p
}
func (self *MusicPlayPageListItem) Init(text string) {
l := UI.NewLabel()
l.PosX = 10
l.SetCanvasHWND(self.Parent.GetCanvasHWND())
l.Init(text, self.Fonts["normal"], nil)
self.Labels["Text"] = l
}
func (self *MusicPlayPageListItem) Draw() {
x, _ := self.Labels["Text"].Coord()