Skip to content

Commit

Permalink
Merge pull request #66 from alexballas/devel
Browse files Browse the repository at this point in the history 
v1.14.1
  • Loading branch information
@alexballas
alexballas authored Mar 26, 2023
2 parents 18f6a3d + dee66a3 commit 4bdb0f3
Show file tree
Hide file tree
Showing 232 changed files with 20,372 additions and 44,104 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-arm.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on: [push]

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3

Expand All @@ -19,7 +19,7 @@ jobs:
commands: |
cd /
sudo apt update
sudo apt install -y xorg-dev libgles-dev
sudo apt install -y xorg-dev
sudo apt clean
wget -nv https://go.dev/dl/go1.19.linux-armv6l.tar.gz
tar -xzf go1.19.linux-armv6l.tar.gz
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-linux.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on: [push]

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
strategy:
fail-fast: false

Expand All @@ -19,7 +19,7 @@ jobs:
go-version: "*"

- name: Get dependencies
run: sudo apt update && sudo apt install xorg-dev libgles-dev
run: sudo apt update && sudo apt install xorg-dev

- name: Package (Linux)
run: GOOS=linux GOARCH=amd64 go build -ldflags "-s -w" -o go2tv cmd/go2tv/go2tv.go
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/go.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ jobs:
with:
go-version: "*"

- name: Install xorg-dev libgles-dev
run: sudo apt update && sudo apt install xorg-dev libgles-dev
- name: Install xorg-dev
run: sudo apt update && sudo apt install xorg-dev

- name: Build
run: go build -v ./...
Expand Down
6 changes: 3 additions & 3 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ build: clean
windows: clean
env CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ GOOS=windows GOARCH=amd64 go build -ldflags $(WINLDFLAGS) -o build/go2tv.exe cmd/go2tv/go2tv.go

install:
install: build
mkdir -vp /usr/local/bin/
cp build/go2tv /usr/local/bin/

Expand All @@ -17,5 +17,5 @@ uninstall:
clean:
rm -rf ./build

run:
go run cmd/go2tv/go2tv.go
run: build
build/go2tv
2 changes: 1 addition & 1 deletion cmd/go2tv-lite/version.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.14.0
1.14.1
2 changes: 1 addition & 1 deletion cmd/go2tv/version.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.14.0
1.14.1
7 changes: 3 additions & 4 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/alexballas/go2tv
go 1.19

require (
fyne.io/fyne/v2 v2.3.2
fyne.io/fyne/v2 v2.3.3
github.com/gdamore/tcell/v2 v2.6.0
github.com/h2non/filetype v1.1.3
github.com/hashicorp/go-retryablehttp v0.7.2
Expand All @@ -17,7 +17,6 @@ require (

require (
fyne.io/systray v1.10.1-0.20230312215936-7f71b037e260 // indirect
github.com/benoitkugler/textlayout v0.3.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/fredbi/uri v1.0.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
Expand All @@ -27,7 +26,7 @@ require (
github.com/gdamore/encoding v1.0.0 // indirect
github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6 // indirect
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b // indirect
github.com/go-text/typesetting v0.0.0-20230212093906-959574cbf271 // indirect
github.com/go-text/typesetting v0.0.0-20230326170714-a90f4704aff7 // indirect
github.com/godbus/dbus/v5 v5.1.0 // indirect
github.com/goki/freetype v0.0.0-20220119013949-7a161fd3728c // indirect
github.com/gopherjs/gopherjs v1.17.2 // indirect
Expand All @@ -53,4 +52,4 @@ require (
honnef.co/go/js/dom v0.0.0-20221001195520-26252dedbe70 // indirect
)

replace fyne.io/fyne/v2 => github.com/alexballas/fyne/v2 v2.3.2-fixsliderwobble
replace fyne.io/fyne/v2 => github.com/alexballas/fyne/v2 v2.3.2-patches2
25 changes: 10 additions & 15 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,12 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/akavel/rsrc v0.10.2/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
github.com/alexballas/fyne/v2 v2.3.2-fixsliderwobble h1:ajxqqyRchTcDZ8tFrezBgWTo0Q+3SHfUlNC9vIHwJNg=
github.com/alexballas/fyne/v2 v2.3.2-fixsliderwobble/go.mod h1:KVTDLs6ce4a5vgg2Lj+dh2AHUL7gZYPzXf11y7gu6Qw=
github.com/alexballas/fyne/v2 v2.3.2-patches2 h1:qfTpeakNJWfvBZehtxHxH/0+iaklkLNcQ7mzyCxYSZ4=
github.com/alexballas/fyne/v2 v2.3.2-patches2/go.mod h1:/tYALbtUdRsxzN0NiPe6cBisUD/vGaboIhlQuJOH1Og=
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
github.com/benoitkugler/pstokenizer v1.0.0/go.mod h1:l1G2Voirz0q/jj0TQfabNxVsa8HZXh/VMxFSRALWTiE=
github.com/benoitkugler/textlayout v0.3.0 h1:2ehWXEkgb6RUokTjXh1LzdGwG4dRP6X3dqhYYDYhUVk=
github.com/benoitkugler/textlayout v0.3.0/go.mod h1:o+1hFV+JSHBC9qNLIuwVoLedERU7sBPgEFcuSgfvi/w=
github.com/benoitkugler/textlayout-testdata v0.1.1 h1:AvFxBxpfrQd8v55qH59mZOJOQjtD6K2SFe9/HvnIbJk=
github.com/benoitkugler/textlayout-testdata v0.1.1/go.mod h1:i/qZl09BbUOtd7Bu/W1CAubRwTWrEXWq6JwMkw8wYxo=
github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
Expand Down Expand Up @@ -110,9 +105,10 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20211213063430-748e38ca8aec/go.mod h1:tQ2
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b h1:GgabKamyOYguHqHjSkDACcgoPIz3w0Dis/zJ1wyHHHU=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
github.com/go-text/typesetting v0.0.0-20221212183139-1eb938670a1f/go.mod h1:/cmOXaoTiO+lbCwkTZBgCvevJpbFsZ5reXIpEJVh5MI=
github.com/go-text/typesetting v0.0.0-20230212093906-959574cbf271 h1:B6f6ifrI1CZvYE55awJQ2PFvLqbzhRXyRMYzbvgDMGo=
github.com/go-text/typesetting v0.0.0-20230212093906-959574cbf271/go.mod h1:pryFoxPu+RU9GDoqsk3qyLPZ/iDpwD0uSpgl2jaLABo=
github.com/go-text/typesetting v0.0.0-20230326170714-a90f4704aff7 h1:VR7KQZ7b2sBzEvRkvCsUY50uEqoUmZMMqtyDvlVI81o=
github.com/go-text/typesetting v0.0.0-20230326170714-a90f4704aff7/go.mod h1:4s76zhCHAW1c1T9LSL5WLJEwIQEE/jrjErTIsEJooZQ=
github.com/go-text/typesetting-utils v0.0.0-20230228131938-60acdc812ef7 h1:cZNSgu46A8qPopSeqtLmK32rVWyGnmdQ2BFPCwDLl2k=
github.com/go-text/typesetting-utils v0.0.0-20230228131938-60acdc812ef7/go.mod h1:65vpyePygXPLg0xg1EjUKtaAJb0KdFA5s3tT4Wt7FGU=
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
Expand Down Expand Up @@ -374,10 +370,7 @@ golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EH
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
golang.org/x/image v0.0.0-20210504121937-7319ad40d33e/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
golang.org/x/image v0.0.0-20220601225756-64ec528b34cd/go.mod h1:doUCurBvlfPMKfmIpRIywoHmhN3VyhnoFDbvIEWF4hY=
golang.org/x/image v0.5.0 h1:5JMiNunQeQw++mMOz48/ISeNu3Iweh/JaZU8ZLqHRrI=
golang.org/x/image v0.5.0/go.mod h1:FVC7BI/5Ym8R25iw5OLsgshdUBbT1h5jZTpA+mvAdZ4=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
Expand Down Expand Up @@ -407,6 +400,7 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
Expand Down Expand Up @@ -443,10 +437,10 @@ golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20211118161319-6a13c67c3ce4/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
Expand All @@ -473,6 +467,7 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
Expand Down Expand Up @@ -541,7 +536,6 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
Expand Down Expand Up @@ -603,6 +597,7 @@ golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/tools v0.1.8-0.20211022200916-316ba0b74098/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
Expand Down
18 changes: 9 additions & 9 deletions internal/gui/gui.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ type NewScreen struct {
mu sync.RWMutex
serverStopCTX context.Context
Current fyne.Window
cancelEnablePlay context.CancelFunc
tvdata *soapcalls.TVPayload
VolumeDown *widget.Button
SlideBar *tappedSlider
Debug *debugWriter
tabs *container.AppTabs
CheckVersion *widget.Button
Expand All @@ -42,23 +42,23 @@ type NewScreen struct {
MediaText *widget.Entry
ExternalMediaURL *widget.Check
GaplessMediaWatcher func(context.Context, *NewScreen, *soapcalls.TVPayload)
VolumeDown *widget.Button
cancelEnablePlay context.CancelFunc
MuteUnmute *widget.Button
VolumeUp *widget.Button
SlideBar *tappedSlider
tvdata *soapcalls.TVPayload
NextMediaCheck *widget.Check
selectedDevice devType
sliderActive bool
State string
version string
eventlURL string
subsfile string
controlURL string
renderingControlURL string
connectionManagerURL string
currentmfolder string
version string
eventlURL string
State string
mediafile string
currentmfolder string
mediaFormats []string
sliderActive bool
Transcode bool
ErrorVisible bool
Medialoop bool
Expand Down
2 changes: 2 additions & 0 deletions internal/gui/settings.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ type go2tvTheme struct {
Theme string
}

var _ fyne.Theme = go2tvTheme{}

func (m go2tvTheme) Color(name fyne.ThemeColorName, variant fyne.ThemeVariant) color.Color {
switch m.Theme {
case "Dark":
Expand Down
13 changes: 11 additions & 2 deletions vendor/fyne.io/fyne/v2/CHANGELOG.md
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions .../v2/internal/painter/gl/gl_const_other.go → ...v2/internal/painter/gl/gl_const_mobile.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 0 additions & 21 deletions vendor/github.com/benoitkugler/textlayout/LICENSE
View file

This file was deleted.

21 changes: 0 additions & 21 deletions vendor/github.com/benoitkugler/textlayout/fonts/LICENSE
View file

This file was deleted.

Loading

0 comments on commit 4bdb0f3

Please sign in to comment.