diff --git a/CONTROL/control b/CONTROL/control
index 4df105d..7a9efcc 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,9 +1,9 @@
Package: webif
Priority: optional
Section: web
-Version: 1.0.7-10
+Version: 1.0.7-11
Architecture: mipsel
Maintainer: af123@hummypkg.org.uk
-Depends: webif-channelicons(>=1.1.6),mongoose(>=3.0-9),jim(>=0.74-4),jim-oo,jim-sqlite3(>=0.74-1),jim-cgi(>=0.7),jim-binary,service-control(>=1.2),busybox(>=1.20.2-1),lsof,epg(>=1.0.13),hmt(>=1.1.14),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts(>=1.2.3),smartmontools,tmenu(>=1.05),ffmpeg,id3v2,multienv(>=1.6)
+Depends: webif-channelicons(>=1.1.7),mongoose(>=3.0-9),jim(>=0.74-4),jim-oo,jim-sqlite3(>=0.74-1),jim-cgi(>=0.7),jim-binary,service-control(>=1.2),busybox(>=1.20.2-1),lsof,epg(>=1.0.13),hmt(>=1.1.14),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts(>=1.2.3),smartmontools,tmenu(>=1.05),ffmpeg,id3v2,multienv(>=1.6)
Suggests:
Description: An evolving web interface for the Humax.
diff --git a/var/mongoose/cgi-bin/channel.jim b/var/mongoose/cgi-bin/channel.jim
index 91b4467..a6a2a23 100755
--- a/var/mongoose/cgi-bin/channel.jim
+++ b/var/mongoose/cgi-bin/channel.jim
@@ -29,20 +29,23 @@ puts "
Signal Quality |
Network |
Mux |
+ Type |
Channels |
>799 |
"
foreach tw [$db query {
- select tsIdx, szNetName, usTsID, ulFrequency, ucLevel, ucQuality
+ select tsIdx, szNetName, usTsID, ulFrequency, ucLevel,
+ ucQuality, eTransMode
from TBL_TS join TBL_NET using (netIdx)
order by ulFrequency
}] {
lassign $tw \
- x tsIdx x netName x usTsID x ulFrequency x ucLevel x ucQuality
+ x tsIdx x netName x usTsID x ulFrequency x ucLevel x ucQuality \
+ x eTransMode
- altrow
puts "
+
| [f2c $ulFrequency] |
[expr $ulFrequency / 1000.0] MHz |
"
@@ -64,18 +67,23 @@ foreach tw [$db query {
set name [string range $name 1 end]
if {$lcn >= 800} { incr ehs }
switch $name {
- "BBC ONE" { set mux "PSB1/BBC A" }
+ "BBC THREE" { set mux "PSB1/BBC A" }
"ITV1" { set mux "PSB2/D3&4" }
"ITV" { set mux "PSB2/D3&4" }
- "BBC ONE HD" { set mux "PSB3/BBC B (HD)" }
+ "BBC ONE HD" { set mux "PSB3/BBC B" }
"ITV3" { set mux "COM4/SDN" }
"Dave" { set mux "COM5/ARQ A" }
- "Film4" { set mux "COM6/ARQ B" }
- "BBC News HD" { set mux "COM7/ARQ C" }
+ "Film4+1" { set mux "COM6/ARQ B" }
+ "BBC NEWS HD" { set mux "COM7/ARQ C" }
"Movies4Men" { set mux "Local" }
}
}
puts "$mux | "
+ if {$eTransMode == 2} {
+ puts "DVB-T (SD) | "
+ } else {
+ puts "DVB-T2 (HD) | "
+ }
puts "[llength $channels]
@@ -93,6 +101,7 @@ foreach tw [$db query {
| Provider |
Authority |
"
+ altrow reset
foreach chan $channels {
lassign $chan x lcn x name x prv x auth
set name [string range $name 1 end]
diff --git a/var/mongoose/lib/altrow b/var/mongoose/lib/altrow
index b45dd81..8cc86a5 100644
--- a/var/mongoose/lib/altrow
+++ b/var/mongoose/lib/altrow
@@ -1,6 +1,10 @@
if {![exists -proc altrow]} {
proc altrow {{attrs ""}} {{i 0}} {
+ if {$attrs eq "reset"} {
+ set i 0
+ return
+ }
puts -nonewline "|