favourite order

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

var/mongoose/include/epg.jim

@@ -15,15 +15,20 @@ require epg_popup
 set start [clock milliseconds]
 set now [clock seconds]
 set then $($now + 14400)
+set favgroup [[settings] channel_group]
 if {$::qepg} {
-	set records [epg dbfetch dump -trange "$now:$then"]
+	if {$favgroup} {
+		set records [epg dbfetch dump \
+		    -trange "$now:$then" -fav $favgroup]
+	} else {
+		set records [epg dbfetch dump -trange "$now:$then"]
+	}
 } else {
 	require channelsort
 	set records [channelsort [epg fetch dump -trange "$now:$then"]]
 }
 set got [clock milliseconds]
 
-set favlist [epg favlist]
 
 puts {
 	<small><button id=switch>Switch to grid-style Now/Next</button></small>
@@ -43,9 +48,6 @@ puts {
 set lcn 0
 set num 0
 foreach record $records {
-	if {$favlist != "" && [$record get service_id] ni $favlist} {
-		continue
-	}
 	set chnum [$record get channel_num]
 	if {$chnum == 0} { continue }