Merge branch 'master' of https://github.com/gabek/owncast
This commit is contained in:
3
main.go
3
main.go
@@ -37,8 +37,6 @@ func main() {
|
|||||||
usingExternalStorage = true
|
usingExternalStorage = true
|
||||||
}
|
}
|
||||||
|
|
||||||
resetDirectories(configuration)
|
|
||||||
|
|
||||||
if usingExternalStorage {
|
if usingExternalStorage {
|
||||||
storage.Setup(configuration)
|
storage.Setup(configuration)
|
||||||
go monitorVideoContent(configuration.PrivateHLSPath, configuration, storage)
|
go monitorVideoContent(configuration.PrivateHLSPath, configuration, storage)
|
||||||
@@ -46,6 +44,7 @@ func main() {
|
|||||||
|
|
||||||
go startRTMPService()
|
go startRTMPService()
|
||||||
|
|
||||||
|
resetDirectories(configuration)
|
||||||
startWebServer()
|
startWebServer()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -75,7 +75,7 @@ GW TODO:
|
|||||||
playsinline
|
playsinline
|
||||||
muted
|
muted
|
||||||
poster="/thumbnail.png"
|
poster="/thumbnail.png"
|
||||||
data-setup='{"vhs": { "enableLowInitialPlaylist": true, "smoothQualityChange": true, "handlePartialData": true }}'
|
data-setup='{}'
|
||||||
>
|
>
|
||||||
<source src="hls/stream.m3u8" type="application/x-mpegURL"/>
|
<source src="hls/stream.m3u8" type="application/x-mpegURL"/>
|
||||||
</video>
|
</video>
|
||||||
|
|||||||
@@ -1,4 +0,0 @@
|
|||||||
# Stream description and content can go here.
|
|
||||||
|
|
||||||
1. Edit `content.md` in markdown.
|
|
||||||
1. And it'll go here.
|
|
||||||
Reference in New Issue
Block a user