- fixed img position for thumbs

- added segmenter binary to be configurable

5 files changed, 10 insertions, 9 deletions

diff --git a/README b/README
index 01f7969..7f142d4 100755
--- a/README
+++ b/README
@@ -94,7 +94,7 @@
  Check everything is ok with ffmpeg by launching the above 
  command logued as your http server user ( www-data ) :
 
- ./istream.sh http://localhost:3000/TS/1 512k 64k 1 480x320 ./ 3 /usr/bin/ffmpeg
+ ./istream.sh http://localhost:3000/TS/1 512k 64k 1 480x320 ./ 3 /usr/bin/ffmpeg /usr/bin/segmenter
 
 
  You should see ffmpeg access streamdev http://localhost:3000/TS/1 and 
diff --git a/config_default.php b/config_default.php
index b5f65fa..c78103e 100755
--- a/config_default.php
+++ b/config_default.php
@@ -28,6 +28,7 @@
 
 	// Misc
 	$ffmpegpath = '/usr/bin/ffmpeg';	//path to ffmpeg binary
+	$segmenterpath = '/usr/bin/segmenter';	//path to segmenter binary
 
 	// Version
 	$isdversion = "0.3.7-dev";
diff --git a/css/style.css b/css/style.css
index a8a84b1..c5c5f79 100755
--- a/css/style.css
+++ b/css/style.css
@@ -14,6 +14,7 @@ body {
 }
 img {
 	border: 0;
+	margin-top: 5px
 }
 a:hover span.arrow {
 	background-position: 0 -13px!important;
diff --git a/includes/include.php b/includes/include.php
index e7d46ab..4810227 100755
--- a/includes/include.php
+++ b/includes/include.php
@@ -124,18 +124,18 @@ function gen_edit_timer()
 
 function start_stream($type, $name, $title, $desc, $qname, $qparams, $category, $url)
 {
-	global $httppath, $ffmpegpath;
+	global $httppath, $ffmpegpath, $segmenterpath;
 
 	switch ($type)
 	{
 		case 1:
-			$cmd = "export SHELL=\"/bin/sh\";printf \"./istream.sh '" .$url ."' " .$qparams ." " .$httppath ." 2 " .$ffmpegpath ." \" | at now";
+			$cmd = "export SHELL=\"/bin/sh\";printf \"./istream.sh '" .$url ."' " .$qparams ." " .$httppath ." 2 " .$ffmpegpath ." " .$segmenterpath ." \" | at now";
 			break;
 		case 2:
-			$cmd = "export SHELL=\"/bin/sh\";printf \"cat \\\"" .$url ."\\\"/0* | ./istream.sh - " .$qparams ." " .$httppath ." 1260 " .$ffmpegpath ." \" | at now";
+			$cmd = "export SHELL=\"/bin/sh\";printf \"cat \\\"" .$url ."\\\"/0* | ./istream.sh - " .$qparams ." " .$httppath ." 1260 " .$ffmpegpath ." " .$segmenterpath ." \" | at now";
 			break;
 		case 3:
-			$cmd = "export SHELL=\"/bin/sh\";printf \"./istream.sh '" .$url ."' " .$qparams ." " .$httppath ." 1260 " .$ffmpegpath ." \" | at now";
+			$cmd = "export SHELL=\"/bin/sh\";printf \"./istream.sh '" .$url ."' " .$qparams ." " .$httppath ." 1260 " .$ffmpegpath ." " .$segmenterpath ." \" | at now";
                         break;
 		default:
 			$cmd = "";
diff --git a/istream.sh b/istream.sh
index 224bb11..ceabf37 100755
--- a/istream.sh
+++ b/istream.sh
@@ -10,6 +10,7 @@ HTTP_PATH="$6ram/"
 SEGDUR=10		# Length of Segments produced (between 10 and 30)
 SEGWIN=$7		# Amount of Segments to produce 
 FFPATH=$8
+SEGMENTERPATH=$9
 
 PREFIX=stream
 
@@ -25,9 +26,7 @@ fi
 # sending it to the segmenter via a PIPE
 ##############################################################
 
-res=`ps ax|grep "segmenter" | grep -v grep` 
-
-if test -z "$res"
+if (! ps ax | awk '{print $5}' | grep -q "$SEGMENTERPATH")
 then
 
 cd ram
@@ -37,6 +36,6 @@ cd ram
  -cmp \+chroma -partitions +parti4x4+partp8x8+partb8x8 -subq 5 -trellis 1 -refs 1 -coder 0 -me_range 16  -keyint_min 25 \
  -sc_threshold 40 -i_qfactor 0.71 -bt $VRATE -maxrate $VRATE -bufsize $VRATE -rc_eq 'blurCplx^(1-qComp)' -qcomp 0.6 \
  -qmin 10 -qmax 51 -qdiff 4 -level 30  -g 30 -async 2 -threads 4 - | \
-segmenter - $SEGDUR $PREFIX $PREFIX.m3u8 $HTTP_PATH $SEGWIN &
+$SEGMENTERPATH - $SEGDUR $PREFIX $PREFIX.m3u8 $HTTP_PATH $SEGWIN &
 
 fi