From 4b9f5826cfbe3552735deecaabe2b636f7bc3e5c Mon Sep 17 00:00:00 2001 From: marmei <43099631+mar-mei@users.noreply.github.com> Date: Fri, 24 Jan 2020 19:48:29 +0100 Subject: [PATCH] If no user agent is specified, the default FFmpeg or VLC user agent is used. --- src/buffer.go | 9 +++++++-- xteve.go | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/buffer.go b/src/buffer.go index 55e18c5..2fdffe3 100644 --- a/src/buffer.go +++ b/src/buffer.go @@ -1429,7 +1429,9 @@ func thirdPartyBuffer(streamID int, playlistID string) { case "FFMPEG": a = strings.Replace(a, "[URL]", url, -1) if i == 0 { - args = []string{"-user-agent", Settings.UserAgent} + if len(Settings.UserAgent) != 0 { + args = []string{"-user-agent", Settings.UserAgent} + } } args = append(args, a) @@ -1438,7 +1440,10 @@ func thirdPartyBuffer(streamID int, playlistID string) { if a == "[URL]" { a = strings.Replace(a, "[URL]", url, -1) args = append(args, a) - args = append(args, fmt.Sprintf(":http-user-agent=%s", Settings.UserAgent)) + + if len(Settings.UserAgent) != 0 { + args = append(args, fmt.Sprintf(":http-user-agent=%s", Settings.UserAgent)) + } } else { args = append(args, a) diff --git a/xteve.go b/xteve.go index f7fe2c2..5d219f6 100644 --- a/xteve.go +++ b/xteve.go @@ -39,7 +39,7 @@ var GitHub = GitHubStruct{Branch: "master", User: "xteve-project", Repo: "xTeVe- const Name = "xTeVe" // Version : Version, die Build Nummer wird in der main func geparst. -const Version = "2.1.1.0115" +const Version = "2.1.1.0116" // DBVersion : Datanbank Version const DBVersion = "2.1.0"