nathan/xTeVe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed broken merge

Browse Source
This commit is contained in:
marmei
2019-12-14 10:17:42 +01:00
parent 66c01dd1fb
commit aa763726a3
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/buffer.go
View File

@@ -228,7 +228,7 @@ func bufferingStream(playlistID, streamingURL, channelName string, w http.Respon
} }
//w.WriteHeader(200) w.WriteHeader(200)
for { // Loop 1: Warten bis das erste Segment durch den Buffer heruntergeladen wurde for { // Loop 1: Warten bis das erste Segment durch den Buffer heruntergeladen wurde
@@ -332,10 +332,10 @@ func bufferingStream(playlistID, streamingURL, channelName string, w http.Respon
if streaming == false { if streaming == false {
contentType := http.DetectContentType(buffer) + "; name=stream.ts" contentType := http.DetectContentType(buffer)
//_ = contentType _ = contentType
//w.Header().Set("Content-type", "video/mpeg") //w.Header().Set("Content-type", "video/mpeg")
w.Header().Add("Content-type", contentType) w.Header().Set("Content-type", contentType)
w.Header().Set("Content-Length", "0") w.Header().Set("Content-Length", "0")
w.Header().Set("Connection", "close") w.Header().Set("Connection", "close")
@@ -348,7 +348,6 @@ func bufferingStream(playlistID, streamingURL, channelName string, w http.Respon
w.Header().Set("transferMode.dlna.org", "Streaming") w.Header().Set("transferMode.dlna.org", "Streaming")
*/ */
w.WriteHeader(200)
_, err := w.Write(buffer) _, err := w.Write(buffer)
if err != nil { if err != nil {

2
xteve.go
View File

@@ -39,7 +39,7 @@ var GitHub = GitHubStruct{Branch: "master", User: "xteve-project", Repo: "xTeVe-
const Name = "xTeVe" const Name = "xTeVe"
// Version : Version, die Build Nummer wird in der main func geparst. // Version : Version, die Build Nummer wird in der main func geparst.
const Version = "2.1.1.0111" const Version = "2.1.1.0112"
// DBVersion : Datanbank Version // DBVersion : Datanbank Version
const DBVersion = "2.1.0" const DBVersion = "2.1.0"