update channel icons, support padding

git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@407 2a923420-c742-0410-a762-8d5b09965624

CONTROL/control

@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 0.7.0-2
+Version: 0.7.0-3
 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

var/mongoose/html/img/channels/1-2-1 Dating.png

@@ -0,0 +1 @@
+blank.png

var/mongoose/html/img/channels/CONNECT.png

@@ -0,0 +1 @@
+blank.png

var/mongoose/html/img/channels/STREAM.png

@@ -0,0 +1 @@
+blank.png

var/mongoose/html/img/channels/VISION.png

@@ -0,0 +1 @@
+blank.png

var/mongoose/lib/epg.class

@@ -208,7 +208,7 @@ epg method icon_set {{height 0}} {
 epg method cell {} {
 	set percent [$self percent]
 
-	puts "<td nowrap valign=top title=\"$text\">"
+	puts "<td nowrap valign=top>"
 
 	puts [join [$self icon_set 14] ""]
 

var/mongoose/lib/rsv.class

@@ -2,7 +2,7 @@ source /mod/var/mongoose/lib/setup
 
 if {![exists -proc class ]} { package require oo }
 if {![exists -proc sqlite3.open ]} { package require sqlite3 }
-if {![exists -proc settings ]} { require settings.class }
+require settings.class system.class
 
 set rsvdb [sqlite3.open /var/lib/humaxtv/rsv.db]
 $rsvdb query {attach database '/var/lib/humaxtv/channel.db' as channel}
@@ -323,6 +323,7 @@ proc {rsv construct} {event type} {
 	set args(usevtid)		[$event get event_id]
 	set args(szevtname)		"\025[$event get name]"
 	set args(eReady)		30
+	lassign [system padding] args(ulPreOffset) args(ulPostOffset)
 
 	set ccrid [$event get channel_crid]
 

var/mongoose/lib/system.class

@@ -1,5 +1,6 @@
 
 if {![exists -proc class ]} { package require oo }
+if {![exists -proc sqlite3.open ]} { package require sqlite3 }
 
 class system {}
 
@@ -73,3 +74,22 @@ proc {system restartpending} {} {
 	close [open /tmp/.restartpending w]
 }
 
+proc {system padding} {} {
+	set start 0
+	set stop 0
+	set db [sqlite3.open /var/lib/humaxtv/setup.db]
+	foreach l [$db query "
+		select itemName, itemValue
+		from TBL_MENUCONFIG
+		where itemName in ('START_PADDING_TIME', 'STOP_PADDING_TIME')
+	"] {
+		lassign $l x name x val
+		switch $name {
+		    "START_PADDING_TIME" { set start $val }
+		    "STOP_PADDING_TIME" { set stop $val }
+		}
+	}
+	$db close
+	return [list $start $stop]
+}
+