From 3ccd5cca68698af24768a82b0306004f9864da27 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Wed, 2 Oct 2013 15:29:38 +0400
Subject: [PATCH] driver/scanepg.cpp: add support to scan all favorites

---
 src/driver/scanepg.cpp | 47 ++++++++++++++++++++++++++++++------------
 src/driver/scanepg.h   |  1 +
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/src/driver/scanepg.cpp b/src/driver/scanepg.cpp
index b0e2075d5..e7a47f985 100644
--- a/src/driver/scanepg.cpp
+++ b/src/driver/scanepg.cpp
@@ -37,12 +37,14 @@
 
 #include <driver/scanepg.h>
 
-extern CBouquetList        * bouquetList;
-
+extern CBouquetList * bouquetList;
+extern CBouquetList * TVfavList;
+ 
 CEpgScan::CEpgScan()
 {
 	current_bnum = -1;
 	next_chid = 0;
+	current_mode = 0;
 }
 
 CEpgScan::~CEpgScan()
@@ -74,18 +76,37 @@ void CEpgScan::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data)
 		if(bouquetList->Bouquets.empty())
 			return;
 
-		if (current_bnum != bouquetList->getActiveBouquetNumber()) {
-			scanmap.clear();
-			current_bnum = bouquetList->getActiveBouquetNumber();
-			CChannelList * clist = bouquetList->Bouquets[current_bnum]->channelList;
-			int lsize = clist->Size();
-			for (int i = 0; i < lsize; i++) {
-				CZapitChannel * chan = clist->getChannelFromIndex(i);
-				/* TODO: add interval check to clear scanned ? */
-				if (scanned.find(chan->getTransponderId()) == scanned.end())
-					scanmap.insert(eit_scanmap_pair_t(chan->getTransponderId(), chan->getChannelID()));
+		if (current_mode != g_settings.epg_scan) {
+			current_mode = g_settings.epg_scan;
+			Clear();
+		}
+		if (g_settings.epg_scan == 1) {
+			/* current bouquet mode */
+			if (current_bnum != bouquetList->getActiveBouquetNumber()) {
+				scanmap.clear();
+				current_bnum = bouquetList->getActiveBouquetNumber();
+				CChannelList * clist = bouquetList->Bouquets[current_bnum]->channelList;
+				for (unsigned i = 0; i < clist->Size(); i++) {
+					CZapitChannel * chan = clist->getChannelFromIndex(i);
+					/* TODO: add interval check to clear scanned ? */
+					if (scanned.find(chan->getTransponderId()) == scanned.end())
+						scanmap.insert(eit_scanmap_pair_t(chan->getTransponderId(), chan->getChannelID()));
+				}
+				INFO("EVT_ZAP_COMPLETE, scan map size: %d\n", scanmap.size());
+			}
+		} else {
+			/* all favorites mode */
+			if (scanmap.empty()) {
+				for (unsigned j = 0; j < TVfavList->Bouquets.size(); ++j) {
+					CChannelList * clist = TVfavList->Bouquets[j]->channelList;
+					for (unsigned i = 0; i < clist->Size(); i++) {
+						CZapitChannel * chan = clist->getChannelFromIndex(i);
+						if (scanned.find(chan->getTransponderId()) == scanned.end())
+							scanmap.insert(eit_scanmap_pair_t(chan->getTransponderId(), chan->getChannelID()));
+					}
+				}
+				INFO("EVT_ZAP_COMPLETE, scan map size: %d\n", scanmap.size());
 			}
-			INFO("EVT_ZAP_COMPLETE, scan map size: %d\n", scanmap.size());
 		}
 	}
 	else if (msg == NeutrinoMessages::EVT_EIT_COMPLETE) {
diff --git a/src/driver/scanepg.h b/src/driver/scanepg.h
index bdd9f5c32..366b40a38 100644
--- a/src/driver/scanepg.h
+++ b/src/driver/scanepg.h
@@ -30,6 +30,7 @@ class CEpgScan
 {
 	private:
 		int current_bnum;
+		int current_mode;
 		eit_scanmap_t scanmap;
 		t_channel_id next_chid;
 		std::set<transponder_id_t> scanned;