Merge branch 'master' into 0614gw-updates

5 years ago · 1b2b7248fc
3 changed files with 9 additions and 4 deletions
--- a/stats.go
+++ b/stats.go
@ -30,7 +30,7 @@ type Stats struct {
				@@ -30,7 +30,7 @@ type Stats struct {
 func (s *Stats) Setup() {
 	s.clients = make(map[string]time.Time)

-	statsSaveTimer := time.NewTicker(2 * time.Minute)
+	statsSaveTimer := time.NewTicker(1 * time.Minute)
 	go func() {
 		for {
 			select {
@ -40,7 +40,7 @@ func (s *Stats) Setup() {
				@@ -40,7 +40,7 @@ func (s *Stats) Setup() {
 		}
 	}()

-	staleViewerPurgeTimer := time.NewTicker(5 * time.Second)
+	staleViewerPurgeTimer := time.NewTicker(3 * time.Second)
 	go func() {
 		for {
 			select {
--- a/webroot/index.html
+++ b/webroot/index.html
@ -15,6 +15,10 @@
				@@ -15,6 +15,10 @@
  <script src="vendor/autolink.js"></script>
  <link href="./styles/layout.css" rel="stylesheet" />

+  <link
+  href="https://unpkg.com/@videojs/themes@1/dist/sea/index.css"
+  rel="stylesheet"
+/>
 </head>

 <body>
@ -53,11 +57,12 @@
				@@ -53,11 +57,12 @@

        <div id="video-container" class="flex shadow-md owncast-video-container">
          <video
-            class="video-js"
+            class="video-js vjs-theme-sea"
            id="video"
            preload="auto"
            controls
            autoplay
+            playsinline
            muted
            poster="https://goth.land/thumbnail.png"
            data-setup='{}'
--- a/webroot/js/app.js
+++ b/webroot/js/app.js
@ -100,5 +100,5 @@ function setupWebsocket() {
				@@ -100,5 +100,5 @@ function setupWebsocket() {
 setupApp()
 getStatus()
 setupWebsocket()
-// setInterval(getStatus, 5000)
+setInterval(getStatus, 5000)