diff --git a/CONTROL/control b/CONTROL/control index 666d67b..ab2c2e6 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,7 +1,7 @@ Package: webif Priority: optional Section: web -Version: 1.2.9-4 +Version: 1.2.9-5 Architecture: mipsel Maintainer: af123@hpkg.tv Depends: tcpfix,webif-channelicons(>=1.1.20),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.1-1),hmt(>=2.0.9),ssmtp,cron-daemon(>=1.18.3-3),at(>=3.1.18),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) diff --git a/webif/html/sched/visual/index.jim b/webif/html/sched/visual/index.jim index 65a2b80..3f2db80 100755 --- a/webif/html/sched/visual/index.jim +++ b/webif/html/sched/visual/index.jim @@ -9,7 +9,7 @@ set debug 0 noheader set renderstart [clock milliseconds] -set events [rsv allevents] +set events [rsv allevents [[settings] hidevisualota]] set pending [rsv list pending] # hSvc -> usSvcId map @@ -109,8 +109,6 @@ set padadj 0 # Returns an absolute number of pixels from the left corresponding # to a number of seconds into the day. proc secstopx {daysecs hourpx usedhours} { - # No floor() in Humax jim - #set max [expr floor($daysecs / 3600)] set max [expr int($daysecs / 3600)] # Subtract any unused hours from $daysecs. for {set i 0} {$i < $max} {incr i} { @@ -119,7 +117,6 @@ proc secstopx {daysecs hourpx usedhours} { incr daysecs -3600 } } - #return [expr floor($daysecs / 3600 * $hourpx)] return [expr int($daysecs * $hourpx / 3600)] } @@ -274,7 +271,6 @@ proc render_timeline {usedhours} { } # calculate pixels per hour - #set hourpx [expr floor($width / $tothours)] set hourpx [expr int($width / $tothours)] if {$debug} { diff --git a/webif/html/settings/modules/general/settings.hook b/webif/html/settings/modules/general/settings.hook index 4373290..44749ea 100755 --- a/webif/html/settings/modules/general/settings.hook +++ b/webif/html/settings/modules/general/settings.hook @@ -32,6 +32,7 @@ setting_toggle "Mobile link on main page?" "nomobile" $(!$nomobile) 1 setting_toggle "Help links on main page?" "nohelplinks" $(!$nohelplinks) 1 setting_toggle "Twitter feed ticker on main page?" "notwitfeed" $(!$notwitfeed) 1 setting_toggle "Unwatched count on folders?" "nounwatchedcount" $(!$nounwatchedcount) 1 +setting_toggle "Hide OTA from Visual View?" "hidevisualota" $hidevisualota if {[system pkginst ir]} { setting_toggle "Disable channel change confirmation?" \ "chanchangenc" $chanchangenc 0 diff --git a/webif/html/settings/settings.jim b/webif/html/settings/settings.jim index fd1d755..0156213 100755 --- a/webif/html/settings/settings.jim +++ b/webif/html/settings/settings.jim @@ -44,6 +44,7 @@ set nomobile [$settings nomobile] set nohelplinks [$settings nohelplinks] set notwitfeed [$settings notwitfeed] set nounwatchedcount [$settings nounwatchedcount] +set hidevisualota [$settings hidevisualota] set chanchangenc [$settings chanchangenc] set xepghours [$settings xepghours] if {$xepghours == 0} { set xepghours 4 } @@ -106,6 +107,7 @@ handle_int_update notwitfeed $notwitfeed "Disable twitter feed ticker" handle_int_update chanchangenc $chanchangenc \ "Disable channel change confirmation" handle_int_update nounwatchedcount $nounwatchedcount "Disable unwatched count" +handle_int_update hidevisualota $hidevisualota "Hide OTA from visual view" handle_int_update genrededup $genrededup "Genre search dedup" handle_int_update autolog $autolog "Auto-processing log level" handle_int_update audiomp3 $audiomp3 "MP3 type" diff --git a/webif/html/xepg/index.jim b/webif/html/xepg/index.jim index 2f227c3..98aee2a 100755 --- a/webif/html/xepg/index.jim +++ b/webif/html/xepg/index.jim @@ -125,8 +125,8 @@ for {set i 0} {$i < 24} {incr i} { } set tt [expr $starthour + $stt + 3600 * ($i - $starthour)] - # Back to start of hour (no floor() in Humax Jim) - set tt $(3600 * round(1 + $tt / 3600)) + # Back to start of hour + set tt $(3600 * int($tt / 3600)) if {$xclass ne "" || $i == 0 || $i == 12} { append disp "
[clock format $tt -format %p]" diff --git a/webif/lib/settings.class b/webif/lib/settings.class index c56719f..c51cff0 100644 --- a/webif/lib/settings.class +++ b/webif/lib/settings.class @@ -30,6 +30,7 @@ class settings { nohelplinks 0 notwitfeed 0 nounwatchedcount 0 + hidevisualota 0 xepghours 4 genrededup 0 autolog 0 @@ -198,6 +199,10 @@ settings method nounwatchedcount {{val -1}} { return [$self _nval_setting nounwatchedcount $val] } +settings method hidevisualota {{val -1}} { + return [$self _nval_setting hidevisualota $val] +} + settings method chanchangenc {{val -1}} { return [$self _nval_setting chanchangenc $val] }