From aa763726a360a4d95998f5ccab3cb9a311c68d98 Mon Sep 17 00:00:00 2001
From: marmei <43099631+mar-mei@users.noreply.github.com>
Date: Sat, 14 Dec 2019 10:17:42 +0100
Subject: [PATCH] Fixed broken merge

---
 src/buffer.go | 21 ++++++++++-----------
 xteve.go      |  2 +-
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/buffer.go b/src/buffer.go
index 84c4762..55e18c5 100644
--- a/src/buffer.go
+++ b/src/buffer.go
@@ -1,8 +1,8 @@
 package src
 
 /*
-	Tuner-Limit Bild als Video rendern [ffmpeg]
-	-loop 1 -i stream-limit.jpg -c:v libx264 -t 1 -pix_fmt yuv420p -vf scale=1920:1080  stream-limit.ts
+  Tuner-Limit Bild als Video rendern [ffmpeg]
+  -loop 1 -i stream-limit.jpg -c:v libx264 -t 1 -pix_fmt yuv420p -vf scale=1920:1080  stream-limit.ts
 */
 
 import (
@@ -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,23 +332,22 @@ 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")
 
 									}
 
 									/*
-										// HDHR Header
-										w.Header().Set("Cache-Control", "no-cache")
-										w.Header().Set("Pragma", "no-cache")
-										w.Header().Set("transferMode.dlna.org", "Streaming")
+									   // HDHR Header
+									   w.Header().Set("Cache-Control", "no-cache")
+									   w.Header().Set("Pragma", "no-cache")
+									   w.Header().Set("transferMode.dlna.org", "Streaming")
 									*/
 
-									w.WriteHeader(200)
 									_, err := w.Write(buffer)
 
 									if err != nil {
diff --git a/xteve.go b/xteve.go
index 5b4f9d5..1780edd 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.0111"
+const Version = "2.1.1.0112"
 
 // DBVersion : Datanbank Version
 const DBVersion = "2.1.0"