hummypkg/webif
5
3
Fork 4
Code Issues Pull Requests Releases 1 Activity

minor bugfixes, support ffmpeg 0.8

Browse Source 
git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@282 2a923420-c742-0410-a762-8d5b09965624
This commit is contained in:
hummypkg 2011-07-19 23:10:32 +00:00
parent d764969b8f
commit 8383651367
5 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CONTROL/control
View File

@ -1,10 +1,10 @@
Package: webif Package: webif
Priority: optional Priority: optional
Section: web Section: web
Version: 0.6.3 Version: 0.6.3-3
Architecture: mipsel Architecture: mipsel
Maintainer: af123@hummypkg.org.uk 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 Replaces: af123-webif
Conflicts: af123-webif Conflicts: af123-webif
Suggests: ffmpeg Suggests: ffmpeg

2
var/mongoose/include/diskspace.jim
View File

@ -17,7 +17,7 @@ foreach df [split [exec df -h 2>>/dev/null] "\n\r"] {
extract $df extract $df
break; break;
} }
if {[string match *media/drive* $df]} { if {[string match *media/drive? $df]} {
extract $df extract $df
} }
} }

6
var/mongoose/lib/epg.class
View File

@ -163,8 +163,6 @@ epg method process_sched {} {
set sched_type 0 set sched_type 0
if {$event_crid ne "" && "$channel_hsvc$event_crid" in $::rsvlookup} { if {$event_crid ne "" && "$channel_hsvc$event_crid" in $::rsvlookup} {
set sched_type 1 set sched_type 1
lappend set \
"<img src=/images/175_1_11_Reservation_Record.png $height>"
} elseif {$series_crid ne "" && } elseif {$series_crid ne "" &&
"$channel_hsvc$series_crid" in $::rsvlookup} { "$channel_hsvc$series_crid" in $::rsvlookup} {
set sched_type 2 set sched_type 2
@ -181,6 +179,10 @@ epg method icon_set {{height 0}} {
} }
$self process_sched $self process_sched
if {$sched_type == 1} {
lappend set \
"<img src=/images/175_1_11_Reservation_Record.png $height>"
}
if {$sched_type == 2} { if {$sched_type == 2} {
lappend set \ lappend set \

2
var/mongoose/lib/epg_search
View File

@ -55,6 +55,8 @@ cts 9 "Education" "Education/Science/Factual"
puts "</td><td>" puts "</td><td>"
cts 10 "Leisure" "Leisure" cts 10 "Leisure" "Leisure"
puts "</td><td><a href=/epg.shtml>Now/Next</a>"
puts "</td></tr><tr><td>" puts "</td></tr><tr><td>"
cts 7 "Art" "Arts/Culture" cts 7 "Art" "Arts/Culture"

14
var/mongoose/lib/ffmpeg
View File

@ -1,8 +1,14 @@
#!/bin/sh #!/bin/sh
/mod/bin/ffmpeg "$@" 2>&1 | sed ' if [ -x /mod/bin/ffprobe ]; then
1,8d /mod/bin/ffprobe "$@" 2>&1 | sed '
$d 1,10d
' '
else
/mod/bin/ffmpeg "$@" 2>&1 | sed '
1,8d
$d
'
fi
exit 0 exit 0