Fixed broken merge

src/buffer.go

@@ -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
 
@@ -332,10 +332,10 @@ func bufferingStream(playlistID, streamingURL, channelName string, w http.Respon
 
 									if streaming == false {
 
-										contentType := http.DetectContentType(buffer) + "; name=stream.ts"
-										//_ = contentType
+										contentType := http.DetectContentType(buffer)
+										_ = contentType
 										//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("Connection", "close")
 
@@ -348,7 +348,6 @@ func bufferingStream(playlistID, streamingURL, channelName string, w http.Respon
 									   w.Header().Set("transferMode.dlna.org", "Streaming")
 									*/
 
-									w.WriteHeader(200)
 									_, err := w.Write(buffer)
 
 									if err != nil {

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.0111"
+const Version = "2.1.1.0112"
 
 // DBVersion : Datanbank Version
 const DBVersion = "2.1.0"