Browse Source

Make setting the offline content optional

pull/68/head
Gabe Kangas 5 years ago
parent
commit
fe102e7164
  1. 1
      config-example.yaml
  2. 9
      config/config.go
  3. 2
      core/ffmpeg/ffmpeg.go

1
config-example.yaml

@ -25,7 +25,6 @@ instanceDetails: @@ -25,7 +25,6 @@ instanceDetails:
videoSettings:
# Change this value and keep it secure. Treat it like a password to your live stream.
streamingKey: abc123
offlineContent: static/offline.m4v # Is displayed when a stream ends
// Determine the bitrate of your stream variants.
// See https://github.com/gabek/owncast/blob/master/doc/configuration.md#video-quality for details.

9
config/config.go

@ -197,6 +197,15 @@ func (c *config) GetMaxNumberOfReferencedSegmentsInPlaylist() int { @@ -197,6 +197,15 @@ func (c *config) GetMaxNumberOfReferencedSegmentsInPlaylist() int {
return 20
}
func (c *config) GetOfflineContentPath() string {
if c.VideoSettings.OfflineContent != "" {
return c.VideoSettings.OfflineContent
}
// This is relative to the webroot, not the project root.
return "static/offline.m4"
}
//Load tries to load the configuration file
func Load(filePath string, versionInfo string) error {
Config = new(config)

2
core/ffmpeg/ffmpeg.go

@ -9,6 +9,6 @@ func ShowStreamOfflineState() { @@ -9,6 +9,6 @@ func ShowStreamOfflineState() {
transcoder := NewTranscoder()
transcoder.SetSegmentLength(10)
transcoder.SetAppendToStream(true)
transcoder.SetInput(config.Config.VideoSettings.OfflineContent)
transcoder.SetInput(config.Config.GetOfflineContentPath())
transcoder.Start()
}

Loading…
Cancel
Save