Skip to content

Commit 1c563c6

Browse files
alexballasalexballas
committed
Fix mobile build
1 parent a4cd63f commit 1c563c6

File tree

4 files changed

+27
-27
lines changed

4 files changed

+27
-27
lines changed

‎internal/gui/about_mobile.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"fyne.io/fyne/v2/widget"
2020
)
2121

22-
func aboutWindow(s *NewScreen) fyne.CanvasObject {
22+
func aboutWindow(s *FyneScreen) fyne.CanvasObject {
2323
richhead := widget.NewRichTextFromMarkdown(`
2424
# Go2TV
2525
@@ -62,7 +62,7 @@ MIT
6262
return container.NewVBox(richhead, container.NewCenter(container.NewHBox(githubbutton, checkversion)))
6363
}
6464

65-
func checkVersion(s *NewScreen) {
65+
func checkVersion(s *FyneScreen) {
6666
s.CheckVersion.Disable()
6767
defer s.CheckVersion.Enable()
6868
errRedirectChecker := errors.New("redirect")

‎internal/gui/actions_mobile.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/pkg/errors"
2525
)
2626

27-
func muteAction(screen *NewScreen) {
27+
func muteAction(screen *FyneScreen) {
2828
w := screen.Current
2929
if screen.renderingControlURL == "" {
3030
check(w, errors.New(lang.L("please select a device")))
@@ -51,7 +51,7 @@ func muteAction(screen *NewScreen) {
5151
setMuteUnmuteView("Unmute", screen)
5252
}
5353

54-
func unmuteAction(screen *NewScreen) {
54+
func unmuteAction(screen *FyneScreen) {
5555
w := screen.Current
5656

5757
if screen.renderingControlURL == "" {
@@ -75,7 +75,7 @@ func unmuteAction(screen *NewScreen) {
7575
setMuteUnmuteView("Mute", screen)
7676
}
7777

78-
func mediaAction(screen *NewScreen) {
78+
func mediaAction(screen *FyneScreen) {
7979
w := screen.Current
8080
fd := dialog.NewFileOpen(func(reader fyne.URIReadCloser, err error) {
8181
check(w, err)
@@ -97,7 +97,7 @@ func mediaAction(screen *NewScreen) {
9797
fd.Show()
9898
}
9999

100-
func subsAction(screen *NewScreen) {
100+
func subsAction(screen *FyneScreen) {
101101
w := screen.Current
102102
fd := dialog.NewFileOpen(func(reader fyne.URIReadCloser, err error) {
103103
check(w, err)
@@ -123,7 +123,7 @@ func subsAction(screen *NewScreen) {
123123
fd.Show()
124124
}
125125

126-
func playAction(screen *NewScreen) {
126+
func playAction(screen *FyneScreen) {
127127
var mediaFile, subsFile interface{}
128128
w := screen.Current
129129

@@ -332,26 +332,26 @@ func playAction(screen *NewScreen) {
332332
}
333333
}
334334

335-
func pauseAction(screen *NewScreen) {
335+
func pauseAction(screen *FyneScreen) {
336336
w := screen.Current
337337

338338
err := screen.tvdata.SendtoTV("Pause")
339339
check(w, err)
340340
}
341341

342-
func clearmediaAction(screen *NewScreen) {
342+
func clearmediaAction(screen *FyneScreen) {
343343
screen.MediaText.Text = ""
344344
screen.mediafile = nil
345345
screen.MediaText.Refresh()
346346
}
347347

348-
func clearsubsAction(screen *NewScreen) {
348+
func clearsubsAction(screen *FyneScreen) {
349349
screen.SubsText.Text = ""
350350
screen.subsfile = nil
351351
screen.SubsText.Refresh()
352352
}
353353

354-
func stopAction(screen *NewScreen) {
354+
func stopAction(screen *FyneScreen) {
355355
screen.PlayPause.Enable()
356356

357357
if screen.tvdata == nil || screen.tvdata.ControlURL == "" {
@@ -390,7 +390,7 @@ func getDevices(delay int) ([]devType, error) {
390390
return guiDeviceList, nil
391391
}
392392

393-
func volumeAction(screen *NewScreen, up bool) {
393+
func volumeAction(screen *FyneScreen, up bool) {
394394
w := screen.Current
395395
if screen.renderingControlURL == "" {
396396
check(w, errors.New(lang.L("please select a device")))
@@ -427,7 +427,7 @@ func volumeAction(screen *NewScreen, up bool) {
427427
}
428428
}
429429

430-
func startAfreshPlayButton(screen *NewScreen) {
430+
func startAfreshPlayButton(screen *FyneScreen) {
431431
if screen.cancelEnablePlay != nil {
432432
screen.cancelEnablePlay()
433433
}

‎internal/gui/gui_mobile.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
"github.com/pkg/errors"
2323
)
2424

25-
// NewScreen .
26-
type NewScreen struct {
25+
// FyneScreen .
26+
type FyneScreen struct {
2727
mu sync.RWMutex
2828
Debug *debugWriter
2929
Current fyne.Window
@@ -74,7 +74,7 @@ func (f *debugWriter) Write(b []byte) (int, error) {
7474
}
7575

7676
// Start .
77-
func Start(ctx context.Context, s *NewScreen) {
77+
func Start(ctx context.Context, s *FyneScreen) {
7878
w := s.Current
7979

8080
tabs := container.NewAppTabs(
@@ -94,7 +94,7 @@ func Start(ctx context.Context, s *NewScreen) {
9494
}
9595

9696
// EmitMsg Method to implement the screen interface
97-
func (p *NewScreen) EmitMsg(a string) {
97+
func (p *FyneScreen) EmitMsg(a string) {
9898
switch a {
9999
case "Playing":
100100
setPlayPauseView("Pause", p)
@@ -114,21 +114,21 @@ func (p *NewScreen) EmitMsg(a string) {
114114
// Fini Method to implement the screen interface.
115115
// Will only be executed when we receive a callback message,
116116
// not when we explicitly click the Stop button.
117-
func (p *NewScreen) Fini() {
117+
func (p *FyneScreen) Fini() {
118118
// Main media loop logic
119119
if p.Medialoop {
120120
playAction(p)
121121
}
122122
}
123123

124124
// InitFyneNewScreen .
125-
func InitFyneNewScreen(v string) *NewScreen {
125+
func InitFyneNewScreen(v string) *FyneScreen {
126126
go2tv := app.NewWithID("app.go2tv.go2tv")
127127
go2tv.Settings().SetTheme(go2tvTheme{"Dark"})
128128

129129
w := go2tv.NewWindow("Go2TV")
130130

131-
return &NewScreen{
131+
return &FyneScreen{
132132
Current: w,
133133
mediaFormats: []string{".mp4", ".avi", ".mkv", ".mpeg", ".mov", ".webm", ".m4v", ".mpv", ".dv", ".mp3", ".flac", ".wav", ".m4a", ".jpg", ".jpeg", ".png"},
134134
version: v,
@@ -145,20 +145,20 @@ func check(win fyne.Window, err error) {
145145
// updateScreenState updates the screen state based on
146146
// the emitted messages. The State variable is used across
147147
// the GUI interface to control certain flows.
148-
func (p *NewScreen) updateScreenState(a string) {
148+
func (p *FyneScreen) updateScreenState(a string) {
149149
p.mu.Lock()
150150
p.State = a
151151
p.mu.Unlock()
152152
}
153153

154154
// getScreenState returns the current screen state
155-
func (p *NewScreen) getScreenState() string {
155+
func (p *FyneScreen) getScreenState() string {
156156
p.mu.RLock()
157157
defer p.mu.RUnlock()
158158
return p.State
159159
}
160160

161-
func setPlayPauseView(s string, screen *NewScreen) {
161+
func setPlayPauseView(s string, screen *FyneScreen) {
162162
if screen.cancelEnablePlay != nil {
163163
screen.cancelEnablePlay()
164164
}
@@ -176,7 +176,7 @@ func setPlayPauseView(s string, screen *NewScreen) {
176176
}
177177
}
178178

179-
func setMuteUnmuteView(s string, screen *NewScreen) {
179+
func setMuteUnmuteView(s string, screen *FyneScreen) {
180180
switch s {
181181
case "Mute":
182182
screen.MuteUnmute.Icon = theme.VolumeUpIcon()

‎internal/gui/main_mobile.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func newDeviceList(dd *[]devType) *deviceList {
4848
return list
4949
}
5050

51-
func mainWindow(s *NewScreen) fyne.CanvasObject {
51+
func mainWindow(s *FyneScreen) fyne.CanvasObject {
5252
w := s.Current
5353
var data []devType
5454
list := newDeviceList(&data)
@@ -205,7 +205,7 @@ func mainWindow(s *NewScreen) fyne.CanvasObject {
205205
return content
206206
}
207207

208-
func refreshDevList(s *NewScreen, data *[]devType) {
208+
func refreshDevList(s *FyneScreen, data *[]devType) {
209209
refreshDevices := time.NewTicker(5 * time.Second)
210210

211211
w := s.Current
@@ -271,7 +271,7 @@ func refreshDevList(s *NewScreen, data *[]devType) {
271271
}
272272
}
273273

274-
func checkMutefunc(s *NewScreen) {
274+
func checkMutefunc(s *FyneScreen) {
275275
checkMute := time.NewTicker(1 * time.Second)
276276

277277
var checkMuteCounter int

0 commit comments

Comments
 (0)