Merge pull request #78 from marcelGoerentz/add_wait_function_for_buffer

Now shows image before the real stream starts.

src/buffer.go

@@ -17,6 +17,7 @@ import (
 type StreamBuffer struct {
 	FileSystem         avfs.VFS
 	Stream             *Stream // Reference to the parents struct
+	RealData		   bool
 	StopChan           chan struct{}
 	Stopped			   bool
 	CloseChan		   chan struct{}
@@ -143,6 +144,7 @@ func (sb *StreamBuffer) HandleByteOutput(stdOut io.ReadCloser) {
 				tmpFile = fmt.Sprintf("%s%d.ts", tmpFolder, tmpSegment)
 				// Close the current file and create a new one
 				f.Close()
+				sb.RealData = true
 				sb.LatestSegment = tmpSegment
 				f, err = bufferVFS.Create(tmpFile)
 				if err != nil {
@@ -292,27 +294,41 @@ func (sb *StreamBuffer) GetBufferedSize() (size int) {
 }
 
 func (sb *StreamBuffer) addBufferedFilesToPipe() {
+	var waitContent []byte
+	var contentOk = false
+	if value, ok := webUI["web/public/video/stream-loading.ts"]; ok {
+		contentOk = true
+		waitContent = GetHTMLString(value.(string))
+	}
+
 	for {
 		select {
 		case <-sb.StopChan:
 			return
 		default:
-			if sb.GetBufferedSize() < Settings.BufferSize * 1024 {
-				time.Sleep(25 * time.Millisecond) // Wait for new files
-				continue
-			}
-			tmpFiles := sb.GetBufTmpFiles()
-			for _, f := range tmpFiles {
-				if ok, err := sb.CheckBufferFolder(); !ok {
-					sb.Stream.ReportError(err, BufferFolderError, "", true)
-					return
+			if !sb.RealData {
+				if contentOk {
+					sb.writeBytesToPipe(waitContent)
+					time.Sleep(800 * time.Millisecond)
 				}
-				ShowDebug(fmt.Sprintf("Streaming:Broadcasting file %s to clients", f), 1)
-				err := sb.writeToPipe(f) // Add file so it will be copied to the pipes
-				if err != nil {
-					sb.Stream.ReportError(err, 0, "", false)
+			} else {
+				if sb.GetBufferedSize() < Settings.BufferSize * 1024 {
+					time.Sleep(25 * time.Millisecond) // Wait for new files
+					continue
+				}
+				tmpFiles := sb.GetBufTmpFiles()
+				for _, f := range tmpFiles {
+					if ok, err := sb.CheckBufferFolder(); !ok {
+						sb.Stream.ReportError(err, BufferFolderError, "", true)
+						return
+					}
+					ShowDebug(fmt.Sprintf("Streaming:Broadcasting file %s to clients", f), 1)
+					err := sb.writeToPipe(f) // Add file so it will be copied to the pipes
+					if err != nil {
+						sb.Stream.ReportError(err, 0, "", false)
+					}
+					sb.DeleteOldestSegment()
 				}
-				sb.DeleteOldestSegment()
 			}
 		}
 	}
@@ -382,19 +398,10 @@ func (sb *StreamBuffer) writeToPipe(file string) error {
 	}
 }
 
-func (sb *StreamBuffer) writeBytesToPipe(data []byte) error {
-	for {
-		select {
-		case <- sb.StopChan:
-			// Pipe was closed quit writing to it
-			return nil
-		default:
-			_, err := sb.PipeWriter.Write(data)
-			if err != nil {
-				sb.Stream.ReportError(err, 0, "", true) // TODO: Add error code
-				return err
-			}
-			time.Sleep(800 * time.Millisecond)
-		}
+func (sb *StreamBuffer) writeBytesToPipe(data []byte) (err error) {
+	_, err = sb.PipeWriter.Write(data)
+	if err != nil {
+		sb.Stream.ReportError(err, 0, "", true) // TODO: Add error code
 	}
+	return
 }

src/streamManager.go

@@ -379,10 +379,19 @@ func HandleStreamLimit(stream *Stream) {
 	ShowInfo("Streaming Status:No new connections available. Tuner limit reached.")
 	ShowInfo("Streaming limit reached content instead")
 	content, contentOk := GetStreamLimitContent()
+	var stopChannel = stream.Buffer.GetStopChan()
 	if contentOk {
         // Write content to the pipe in a loop
         go func() {
-			stream.Buffer.writeBytesToPipe(content)
+			for {
+				select {
+				case <- stopChannel:
+					return
+				default:
+					stream.Buffer.writeBytesToPipe(content)
+					time.Sleep(750 * time.Millisecond)
+				}
+			}
         }()
 	}
 }