diff --git a/CONTROL/control b/CONTROL/control index 8d9b83db..46bb4780 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,10 +1,10 @@ Package: webif Priority: optional Section: web -Version: 1.2.8-10 +Version: 1.2.8-11 Architecture: mipsel Maintainer: af123@hummypkg.org.uk -Depends: tcpfix,webif-channelicons(>=1.1.20),lighttpd(>=1.4.39-1),jim(>=0.76),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7),jim-binary(>=0.76),service-control(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.1),hmt(>=2.0.9),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),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) +Depends: tcpfix,webif-channelicons(>=1.1.20),lighttpd(>=1.4.39-1),jim(>=0.76),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.1),hmt(>=2.0.9),ssmtp,cron-daemon(>=1.18.3-2),anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),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) Suggests: Description: An evolving web interface for the Humax. Tags: http://hummy.tv/forum/threads/6484/ diff --git a/webif/html/img/pause.png b/webif/html/img/pause.png new file mode 100644 index 00000000..d396c6df Binary files /dev/null and b/webif/html/img/pause.png differ diff --git a/webif/html/img/skip.png b/webif/html/img/skip.png new file mode 100644 index 00000000..a2f8b4bd Binary files /dev/null and b/webif/html/img/skip.png differ diff --git a/webif/html/sched/index.jim b/webif/html/sched/index.jim index 2416e60b..79d7ce89 100755 --- a/webif/html/sched/index.jim +++ b/webif/html/sched/index.jim @@ -249,7 +249,7 @@ set pmap {} set events [rsv list pending] set num_ended 0 if {[llength $events] > 0} { - eventheader pending "Pending Scheduled Events" + eventheader pending "Pending Actions" foreach event $events { eventrow $event pending lappend pmap [ekey $event] diff --git a/webif/lib/rsv.class b/webif/lib/rsv.class index 081d56b0..a7a28f2a 100755 --- a/webif/lib/rsv.class +++ b/webif/lib/rsv.class @@ -175,6 +175,7 @@ rsv method pendingicon {{width 30}} { 2 { set icon "ar" } 3 { set icon "pad" } 4 { set icon "folder" } + 5 { set icon "skip" } } return "" } @@ -222,6 +223,19 @@ rsv method set_pad {{pre 60} {post 60}} { set ulPostOffset $post } +rsv method set_skip {event} { + set action 5 + + $event get_channel_info + + set crid "[$event get channel_crid][$event get event_crid]" + set szRecordedProgCrid "1$crid|$szRecordedProgCrid" + set szEventToRecord [string map "1$crid| {}" $szEventToRecord] + set aulEventToRecordInfo "" + set nsttime [$event get start] + set nduration [$event get duration] +} + rsv method remove_pending {} { $::rsvdb query "delete from pending where ulslot = $ulslot" } @@ -315,7 +329,10 @@ rsv method insert {{table pending} {force 0}} { #puts $query #puts $bvals + $rsvdb query "begin transaction;" + $rsvdb query "delete from ${table} where ulslot = $ulslot;" $rsvdb query $query {*}$bvals + $rsvdb query "commit transaction;" } proc {rsv list} {{table tbl_reservation} {extra ""}} { @@ -429,8 +446,7 @@ proc {rsv fetch} {{table TBL_RESERVATION} ersvtype hsvc nsttime usevtid events} and $table.hsvc = '%s' and $table.nsttime = '%s' and $table.usevtid = '%s' - and $table.szEventToRecord = '%s' - " $ersvtype $hsvc $nsttime $usevtid $events] + " $ersvtype $hsvc $nsttime $usevtid] if {[llength $res] > 0} { return [rsv new [lindex $res 0]]