From 838365136744b334b2e4093450d756d6ec4285cc Mon Sep 17 00:00:00 2001
From: hummypkg <af123@hpkg.tv>
Date: Tue, 19 Jul 2011 23:10:32 +0000
Subject: [PATCH] minor bugfixes, support ffmpeg 0.8

git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@282 2a923420-c742-0410-a762-8d5b09965624
---
 CONTROL/control                    |  4 ++--
 var/mongoose/include/diskspace.jim |  2 +-
 var/mongoose/lib/epg.class         |  6 ++++--
 var/mongoose/lib/epg_search        |  2 ++
 var/mongoose/lib/ffmpeg            | 14 ++++++++++----
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/CONTROL/control b/CONTROL/control
index e65ea9a..325234a 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,10 +1,10 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 0.6.3
+Version: 0.6.3-3
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
-Depends: mongoose(>=3.0),jim(>=0.71-1),jim-sqlite3(>=0.71-1),jim-cgi(>=0.4),jim-oo,jim-pack,service-control,busybox(>=1.18.3-1),lsof,epg(>=1.0.2),hmt(>=1.0.6),ssmtp
+Depends: mongoose(>=3.0-2),jim(>=0.71-1),jim-sqlite3(>=0.71-1),jim-cgi(>=0.4),jim-oo,jim-pack,service-control,busybox(>=1.18.3-1),lsof,epg(>=1.0.2),hmt(>=1.0.6),ssmtp
 Replaces: af123-webif
 Conflicts: af123-webif
 Suggests: ffmpeg
diff --git a/var/mongoose/include/diskspace.jim b/var/mongoose/include/diskspace.jim
index 040a1a3..c511943 100755
--- a/var/mongoose/include/diskspace.jim
+++ b/var/mongoose/include/diskspace.jim
@@ -17,7 +17,7 @@ foreach df [split [exec df -h 2>>/dev/null] "\n\r"] {
 		extract $df
 		break;
 	}
-	if {[string match *media/drive* $df]} {
+	if {[string match *media/drive? $df]} {
 		extract $df
 	}
 }
diff --git a/var/mongoose/lib/epg.class b/var/mongoose/lib/epg.class
index af10809..a9b16b1 100644
--- a/var/mongoose/lib/epg.class
+++ b/var/mongoose/lib/epg.class
@@ -163,8 +163,6 @@ epg method process_sched {} {
 	set sched_type 0
 	if {$event_crid ne "" && "$channel_hsvc$event_crid" in $::rsvlookup} {
 		set sched_type 1
-		lappend set \
-		    "<img src=/images/175_1_11_Reservation_Record.png $height>"
 	} elseif {$series_crid ne "" &&
 	    "$channel_hsvc$series_crid" in $::rsvlookup} {
 		set sched_type 2
@@ -181,6 +179,10 @@ epg method icon_set {{height 0}} {
 	}
 
 	$self process_sched
+	if {$sched_type == 1} {
+		lappend set \
+		    "<img src=/images/175_1_11_Reservation_Record.png $height>"
+	}
 
 	if {$sched_type == 2} {
 		lappend set \
diff --git a/var/mongoose/lib/epg_search b/var/mongoose/lib/epg_search
index 521e280..6d17aa8 100755
--- a/var/mongoose/lib/epg_search
+++ b/var/mongoose/lib/epg_search
@@ -55,6 +55,8 @@ cts 9 "Education" "Education/Science/Factual"
 puts "</td><td>"
 cts 10 "Leisure" "Leisure"
 
+puts "</td><td><a href=/epg.shtml>Now/Next</a>"
+
 puts "</td></tr><tr><td>"
 
 cts 7 "Art" "Arts/Culture"
diff --git a/var/mongoose/lib/ffmpeg b/var/mongoose/lib/ffmpeg
index c39180b..934cbe3 100755
--- a/var/mongoose/lib/ffmpeg
+++ b/var/mongoose/lib/ffmpeg
@@ -1,8 +1,14 @@
 #!/bin/sh
 
-/mod/bin/ffmpeg "$@" 2>&1 | sed '
-	1,8d
-	$d
-'
+if [ -x /mod/bin/ffprobe ]; then
+	/mod/bin/ffprobe "$@" 2>&1 | sed '
+		1,10d
+	'
+else
+	/mod/bin/ffmpeg "$@" 2>&1 | sed '
+		1,8d
+		$d
+	'
+fi
 exit 0