From 06bac9f1e1e3d6dd9da332822f7f08357dd6a316 Mon Sep 17 00:00:00 2001
From: TheTroll <trolldev@gmail.com>
Date: Thu, 1 Apr 2010 19:35:55 +0200
Subject: Improved encoding start Recordings are still failing

---
 bin/session.php | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'bin/session.php')

diff --git a/bin/session.php b/bin/session.php
index 37aade9..81582ee 100644
--- a/bin/session.php
+++ b/bin/session.php
@@ -82,13 +82,13 @@ function sessioncreate($type, $url, $mode)
 	switch ($type)
 	{
 		case 'tv':
-			$cmd = "./istream.sh \"" .$url ."\" " .$qparams ." " .$httppath ." 2 " .$ffmpegpath ." " .$segmenterpath ." " .$session ." \"" .$ffdbg ."\" >/dev/null &";
+			$cmd = "./istream.sh \"" .$url ."\" " .$qparams ." " .$httppath ." 2 " .$ffmpegpath ." " .$segmenterpath ." " .$session ." \"" .$ffdbg ."\" \"\" >/dev/null &";
 			break;
 		case 'rec':
-			$cmd = "cat \"" .$url ."\"/0* | ./istream.sh - " .$qparams ." " .$httppath ." 1260 " .$ffmpegpath ." " .$segmenterpath ." " .$session ." \"" .$ffdbg ."\" >/dev/null &";
+			$cmd = "./istream.sh - " .$qparams ." " .$httppath ." 1260 " .$ffmpegpath ." " .$segmenterpath ." " .$session ." \"" .$ffdbg ."\" \"cat \\\"" .$url ."/\\\"/0* |\" >/dev/null &";
 			break;
 		case 'vid':
-			$cmd = "./istream.sh \"" .$url ."\" " .$qparams ." " .$httppath ." 1260 " .$ffmpegpath ." " .$segmenterpath ." " .$session ." \"" .$ffdbg ."\" >/dev/null &";
+			$cmd = "./istream.sh \"" .$url ."\" " .$qparams ." " .$httppath ." 1260 " .$ffmpegpath ." " .$segmenterpath ." " .$session ." \"" .$ffdbg ."\" \"\" >/dev/null &";
                         break;
 		default:
 			$cmd = "";
@@ -259,13 +259,20 @@ function getstreamingstatus($session)
 
 				$status['message'] .= "<br>";
 
+                               
+				$status['message'] .= "<br>  * FFmpeg: ";
+				if (file_exists($path .'/ffmpeg.pid'))
+					$status['message'] .= "<i>running</i>";
+				else
+					$status['message'] .= "<i>stopped</i>";
 				$status['message'] .= "<br>  * Segmenter: ";
 				if (file_exists($path .'/segmenter.pid'))
-					$status['message'] .= "<i>running</i>";
+				{
+					$status['message'] .= "<i>running</i> (";
+					$status['message'] .= count(glob($path . '/*.ts')) ."/2)</i>";
+				}
 				else
 					$status['message'] .= "<i>stopped</i>";
-				$status['message'] .= "<br>  * Segments: <i>";
-				$status['message'] .= count(glob($path . '/*.ts')) ."/2</i>";
 				
 			}
 		}
-- 
cgit v1.2.3