From 926a49737a8780b9fa699e5e56b417551c7601c6 Mon Sep 17 00:00:00 2001
From: hummypkg <af123@hpkg.tv>
Date: Wed, 21 Sep 2011 20:21:13 +0000
Subject: [PATCH] add new channel icons, detect MUX

git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@413 2a923420-c742-0410-a762-8d5b09965624
---
 CONTROL/control                               |  2 +-
 var/mongoose/cgi-bin/channel.jim              | 21 +++++++++++++++++++
 var/mongoose/html/img/channels/Sky Text.png   |  1 +
 .../img/channels/The Jewellery Channel.png    |  1 +
 4 files changed, 24 insertions(+), 1 deletion(-)
 create mode 120000 var/mongoose/html/img/channels/Sky Text.png
 create mode 120000 var/mongoose/html/img/channels/The Jewellery Channel.png

diff --git a/CONTROL/control b/CONTROL/control
index a6688466..ba3cf1ce 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 0.7.1
+Version: 0.7.1-1
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
 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.3),hmt(>=1.0.6),ssmtp
diff --git a/var/mongoose/cgi-bin/channel.jim b/var/mongoose/cgi-bin/channel.jim
index cf54933c..cf034a0b 100755
--- a/var/mongoose/cgi-bin/channel.jim
+++ b/var/mongoose/cgi-bin/channel.jim
@@ -32,7 +32,9 @@ puts "
 		<th>Frequency</th>
 		<th>Signal Strength</th>
 		<th>Signal Quality</th>
+		<th>Mux</th>
 		<th>Channels</th>
+		<th>&gt;799</th>
 	</tr>
 "
 foreach tw [$db query {
@@ -56,12 +58,31 @@ foreach tw [$db query {
 		where tsIdx = %s
 		order by usLcn
 		} $tsIdx]
+
+	set mux "???"
+	set ehs 0
+	foreach chan $channels {
+		lassign $chan x lcn x name
+		set name [string range $name 1 end]
+		if {$lcn >= 800} { incr ehs }
+		switch $name {
+			"BBC ONE" { set mux "PSB1/BBC A" }
+			"ITV1" { set mux "PSB2/DL&amp;4" }
+			"BBC One HD" { set mux "PSB3/BBC B (HD)" }
+			"ITV3" { set mux "COM4/SDN" }
+			"Dave" { set mux "COM5/ARQ A" }
+			"Film4" { set mux "COM6/ARQ B" }
+		}
+	}
+	puts "<td>$mux</td>"
+
 	puts "<td>[llength $channels]
 		<a class=mchan ts=$tsIdx href=#>
 			<img border=0 height=14
 			    src=/images/421_1_00_CH_Title_2R_Arrow.png>
 			    view
 		</a></td>"
+	puts "<td>$ehs</th>"
 	puts "</tr>"
 	puts "<tr id=mchan_$tsIdx class=mchan style=\"display: none\">
 		<td colspan=5>"
diff --git a/var/mongoose/html/img/channels/Sky Text.png b/var/mongoose/html/img/channels/Sky Text.png
new file mode 120000
index 00000000..96837bd7
--- /dev/null
+++ b/var/mongoose/html/img/channels/Sky Text.png	
@@ -0,0 +1 @@
+blank.png
\ No newline at end of file
diff --git a/var/mongoose/html/img/channels/The Jewellery Channel.png b/var/mongoose/html/img/channels/The Jewellery Channel.png
new file mode 120000
index 00000000..96837bd7
--- /dev/null
+++ b/var/mongoose/html/img/channels/The Jewellery Channel.png	
@@ -0,0 +1 @@
+blank.png
\ No newline at end of file