Browse Source

Merge branch 'master' of https://github.com/gabek/owncast

pull/5/head
Ginger Wong 5 years ago
parent
commit
51b79287c5
  1. 3
      main.go
  2. 2
      webroot/index.html
  3. 4
      webroot/static/content.md

3
main.go

@ -37,8 +37,6 @@ func main() { @@ -37,8 +37,6 @@ func main() {
usingExternalStorage = true
}
resetDirectories(configuration)
if usingExternalStorage {
storage.Setup(configuration)
go monitorVideoContent(configuration.PrivateHLSPath, configuration, storage)
@ -46,6 +44,7 @@ func main() { @@ -46,6 +44,7 @@ func main() {
go startRTMPService()
resetDirectories(configuration)
startWebServer()
}

2
webroot/index.html

@ -75,7 +75,7 @@ GW TODO: @@ -75,7 +75,7 @@ GW TODO:
playsinline
muted
poster="/thumbnail.png"
data-setup='{"vhs": { "enableLowInitialPlaylist": true, "smoothQualityChange": true, "handlePartialData": true }}'
data-setup='{}'
>
<source src="hls/stream.m3u8" type="application/x-mpegURL"/>
</video>

4
webroot/static/content.md

@ -1,4 +0,0 @@ @@ -1,4 +0,0 @@
# Stream description and content can go here.
1. Edit `content.md` in markdown.
1. And it'll go here.
Loading…
Cancel
Save