diff --git a/CONTROL/control b/CONTROL/control
index 6a9eea2..57d7aa5 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -4,7 +4,7 @@ Section: web
Version: 1.3.2-1
Architecture: mipsel
Maintainer: af123@hpkg.tv
-Depends: tcpfix,webif-channelicons(>=1.1.24),lighttpd(>=1.4.39-1),jim(>=0.76-2),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7-1),jim-binary(>=0.76),service-control(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.3),hmt(>=2.0.10),ssmtp,cron-daemon(>=1.18.3-3),at(>=3.1.18),anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.1.5),webif-charts(>=1.2-1),stripts(>=1.2.5-3),tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7),hwctl,nugget(>=0.91)
+Depends: tcpfix,webif-channelicons(>=1.1.24),lighttpd(>=1.4.39-1),jim(>=0.76-2),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7-1),jim-binary(>=0.76),service-control(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.3),hmt(>=2.0.10),ssmtp,cron-daemon(>=1.18.3-3),at(>=3.1.18),anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.1.6),webif-charts(>=1.2-1),stripts(>=1.2.5-3),tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7),hwctl,nugget(>=0.92)
Suggests:
Description: An evolving web interface for the Humax.
Tags: http://hummy.tv/forum/threads/7116/
diff --git a/webif/html/css/style.css b/webif/html/css/style.css
index 639e717..5ffb316 100644
--- a/webif/html/css/style.css
+++ b/webif/html/css/style.css
@@ -525,6 +525,13 @@ img.doublebmp
position: relative;
}
+.stackimg
+{
+ position: absolute;
+ height: 20px;
+ width: 29px;
+}
+
span.foldernum
{
display: none;
diff --git a/webif/html/img/ripple.gif b/webif/html/img/ripple.gif
new file mode 100644
index 0000000..ce09167
Binary files /dev/null and b/webif/html/img/ripple.gif differ
diff --git a/webif/html/sched/list/index.jim b/webif/html/sched/list/index.jim
index c0d14dc..5ed8ec6 100755
--- a/webif/html/sched/list/index.jim
+++ b/webif/html/sched/list/index.jim
@@ -98,6 +98,15 @@ proc eventrow {event {table TBL_RESERVATION}} {
set showing 0
}
+ switch -- [$event status] {
+ "idle" -
+ "ready" { set showing 0 }
+ "arwatch" { set showing 2; set ended 0 }
+ "recording" { set showing 1; set ended 0 }
+ }
+
+ if {$table eq "pending"} { set showing 0 }
+
set attrs "table=$table sid=[$event get ulslot] \
reckind=[$event get ucRecKind] rsvtype=[$event get ersvtype] \
ar=[expr ! [$event padded]] ended=$ended"
@@ -198,9 +207,17 @@ proc eventrow {event {table TBL_RESERVATION}} {
puts "$ds"
}
- if {$table ne "pending" && $showing} {
- set perc [expr [expr $n - ($s - $sp)] * 100 / \
- ($d + $sp + $ep)]
+ if {$showing == 2} {
+ # AR watch
+ puts "
+
+
+
+
+ "
+ } elseif {$showing} {
+ set perc $(($n - ($s - $sp)) * 100 / \
+ ($d + $sp + $ep))
puts "
"
puts "
"
@@ -268,6 +285,9 @@ proc eventrow {event {table TBL_RESERVATION}} {
} else {
puts "--:--:--"
}
+ if {$showing == 1} {
+ puts "
"
+ }
if {$c > 1} {
set i 0
foreach e $elist {
diff --git a/webif/lib/rsv.class b/webif/lib/rsv.class
index 15ce3c6..de93ed3 100755
--- a/webif/lib/rsv.class
+++ b/webif/lib/rsv.class
@@ -60,6 +60,18 @@ class rsv {
require findhsvc
if {![exists -proc binary]} { package require binary }
+rsv method status {} {
+ set stat -1
+ catch {set stat [exec /mod/bin/nugget schedule.timers.status $ulslot]}
+ switch -- $stat {
+ "0,0" { return "idle" }
+ "1,1" { return "ready" }
+ "2,1" { return "arwatch" }
+ "2,2" { return "recording" }
+ default { return "unknown" }
+ }
+}
+
rsv method aul {} {
set aul {}
for {set i 0} {$i < [string length $aulEventToRecordInfo]} {
@@ -624,7 +636,7 @@ proc {rsv construct} {event type} {
set args(eReady) 30
lassign [system padding] args(ulPreOffset) args(ulPostOffset)
- set ccrid [$event get channel_crid]
+ set ccrid [string toupper [$event get channel_crid]]
# Fallback from series to event if there is no series CRID.
if {$type == 2 && [$event get series_crid] eq ""} {