X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/371e23c22dcec461ee3fbc8c989859cd08717b3d..13b86c205e12d0237a8134e25b2d5e145ac01730:/lib/dvb/epgcache.cpp

diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp
index 222cba32..5069e8c3 100644
--- a/lib/dvb/epgcache.cpp
+++ b/lib/dvb/epgcache.cpp
@@ -303,6 +303,13 @@ void eEPGCache::DVBChannelRunning(iDVBChannel *chan)
 					eDebug("[eEPGCache] couldnt initialize schedule other reader!!");
 					return;
 				}
+
+				res = demux->createSectionReader( this, data.m_ViasatReader );
+				if ( res )
+				{
+					eDebug("[eEPGCache] couldnt initialize viasat reader!!");
+					return;
+				}
 #ifdef ENABLE_PRIVATE_EPG
 				res = demux->createSectionReader( this, data.m_PrivateReader );
 				if ( res )
@@ -1115,7 +1122,7 @@ bool eEPGCache::channel_data::finishEPG()
 		eDebug("[EPGC] stop caching events(%ld)", ::time(0));
 		zapTimer->start(UPDATE_INTERVAL, 1);
 		eDebug("[EPGC] next update in %i min", UPDATE_INTERVAL / 60000);
-		for (int i=0; i < 3; ++i)
+		for (unsigned int i=0; i < sizeof(seenSections)/sizeof(tidMap); ++i)
 		{
 			seenSections[i].clear();
 			calcedSections[i].clear();
@@ -1135,7 +1142,7 @@ void eEPGCache::channel_data::startEPG()
 	eDebug("[EPGC] start caching events(%ld)", ::time(0));
 	state=0;
 	haveData=0;
-	for (int i=0; i < 3; ++i)
+	for (unsigned int i=0; i < sizeof(seenSections)/sizeof(tidMap); ++i)
 	{
 		seenSections[i].clear();
 		calcedSections[i].clear();
@@ -1186,6 +1193,14 @@ void eEPGCache::channel_data::startEPG()
 	m_ScheduleOtherReader->start(mask);
 	isRunning |= SCHEDULE_OTHER;
 
+	mask.pid = 0x39;
+
+	mask.data[0] = 0x40;
+	mask.mask[0] = 0x40;
+	m_ViasatReader->connectRead(slot(*this, &eEPGCache::channel_data::readDataViasat), m_ViasatConn);
+	m_ViasatReader->start(mask);
+	isRunning |= VIASAT;
+
 	abortTimer->start(7000,true);
 }
 
@@ -1209,11 +1224,18 @@ void eEPGCache::channel_data::abortNonAvail()
 		}
 		if ( !(haveData&SCHEDULE_OTHER) && (isRunning&SCHEDULE_OTHER) )
 		{
-			eDebug("[EPGC] abort non avail schedule_other reading");
+			eDebug("[EPGC] abort non avail schedule other reading");
 			isRunning &= ~SCHEDULE_OTHER;
 			m_ScheduleOtherReader->stop();
 			m_ScheduleOtherConn=0;
 		}
+		if ( !(haveData&VIASAT) && (isRunning&VIASAT) )
+		{
+			eDebug("[EPGC] abort non avail viasat reading");
+			isRunning &= ~VIASAT;
+			m_ViasatReader->stop();
+			m_ViasatConn=0;
+		}
 #ifdef ENABLE_MHW_EPG
 		if ( !(haveData&MHW) && (isRunning&MHW) )
 		{
@@ -1225,12 +1247,14 @@ void eEPGCache::channel_data::abortNonAvail()
 			m_MHWConn2=0;
 		}
 #endif
-		if ( isRunning )
+		if ( isRunning & VIASAT )
+			abortTimer->start(300000, true);
+		else if ( isRunning )
 			abortTimer->start(90000, true);
 		else
 		{
 			++state;
-			for (int i=0; i < 3; ++i)
+			for (unsigned int i=0; i < sizeof(seenSections)/sizeof(tidMap); ++i)
 			{
 				seenSections[i].clear();
 				calcedSections[i].clear();
@@ -1259,7 +1283,7 @@ void eEPGCache::channel_data::startChannel()
 
 void eEPGCache::channel_data::abortEPG()
 {
-	for (int i=0; i < 3; ++i)
+	for (unsigned int i=0; i < sizeof(seenSections)/sizeof(tidMap); ++i)
 	{
 		seenSections[i].clear();
 		calcedSections[i].clear();
@@ -1287,6 +1311,12 @@ void eEPGCache::channel_data::abortEPG()
 			m_ScheduleOtherReader->stop();
 			m_ScheduleOtherConn=0;
 		}
+		if (isRunning & VIASAT)
+		{
+			isRunning &= ~VIASAT;
+			m_ViasatReader->stop();
+			m_ViasatConn=0;
+		}
 #ifdef ENABLE_MHW_EPG
 		if (isRunning & MHW)
 		{
@@ -1307,6 +1337,15 @@ void eEPGCache::channel_data::abortEPG()
 	pthread_mutex_unlock(&channel_active);
 }
 
+
+void eEPGCache::channel_data::readDataViasat( const __u8 *data)
+{
+	__u8 *d=0;
+	memcpy(&d, &data, sizeof(__u8*));
+	d[0] |= 0x80;
+	readData(data);
+}
+
 void eEPGCache::channel_data::readData( const __u8 *data)
 {
 	int source;
@@ -1329,6 +1368,12 @@ void eEPGCache::channel_data::readData( const __u8 *data)
 			source=SCHEDULE_OTHER;
 			map=2;
 			break;
+		case 0xD0 ... 0xDF:
+		case 0xE0 ... 0xEF:
+			reader=m_ViasatReader;
+			source=VIASAT;
+			map=3;
+			break;
 		default:
 			eDebug("[EPGC] unknown table_id !!!");
 			return;
@@ -1352,6 +1397,10 @@ void eEPGCache::channel_data::readData( const __u8 *data)
 				m_ScheduleOtherConn=0;
 				eDebugNoNewLine("schedule other");
 				break;
+			case VIASAT:
+				m_ViasatConn=0;
+				eDebugNoNewLine("viasat");
+				break;
 			default: eDebugNoNewLine("unknown");break;
 		}
 		eDebug(" finished(%ld)", ::time(0));
@@ -2047,6 +2096,8 @@ PyObject *eEPGCache::search(ePyObject arg)
 	int querytype=-1;
 	bool needServiceEvent=false;
 	int maxmatches=0;
+	int must_get_service_name = 0;
+	bool must_get_service_reference = false;
 
 	if (PyTuple_Check(arg))
 	{
@@ -2056,7 +2107,11 @@ PyObject *eEPGCache::search(ePyObject arg)
 			ePyObject obj = PyTuple_GET_ITEM(arg,0);
 			if (PyString_Check(obj))
 			{
+#if PY_VERSION_HEX < 0x02060000
 				argcount = PyString_GET_SIZE(obj);
+#else
+				argcount = PyString_Size(obj);
+#endif
 				argstring = PyString_AS_STRING(obj);
 				for (int i=0; i < argcount; ++i)
 					switch(argstring[i])
@@ -2065,6 +2120,16 @@ PyObject *eEPGCache::search(ePyObject arg)
 					case 'E':
 					case 'T':
 						needServiceEvent=true;
+						break;
+					case 'N':
+						must_get_service_name = 1;
+						break;
+					case 'n':
+						must_get_service_name = 2;
+						break;
+					case 'R':
+						must_get_service_reference = true;
+						break;
 					default:
 						break;
 					}
@@ -2144,7 +2209,11 @@ PyObject *eEPGCache::search(ePyObject arg)
 				{
 					int casetype = PyLong_AsLong(PyTuple_GET_ITEM(arg, 4));
 					const char *str = PyString_AS_STRING(obj);
+#if PY_VERSION_HEX < 0x02060000
 					int textlen = PyString_GET_SIZE(obj);
+#else
+					int textlen = PyString_Size(obj);
+#endif
 					if (querytype == 1)
 						eDebug("lookup for events with '%s' as title(%s)", str, casetype?"ignore case":"case sensitive");
 					else
@@ -2159,22 +2228,32 @@ PyObject *eEPGCache::search(ePyObject arg)
 							int title_len = data[5];
 							if ( querytype == 1 )
 							{
-								if (title_len > textlen)
-									continue;
-								else if (title_len < textlen)
+								int offs = 6;
+								// skip DVB-Text Encoding!
+								if (data[6] == 0x10)
+								{
+									offs+=3;
+									title_len-=3;
+								}
+								else if(data[6] > 0 && data[6] < 0x20)
+								{
+									offs+=1;
+									title_len-=1;
+								}
+								if (title_len != textlen)
 									continue;
 								if ( casetype )
 								{
-									if ( !strncasecmp((const char*)data+6, str, title_len) )
+									if ( !strncasecmp((const char*)data+offs, str, title_len) )
 									{
-//										std::string s((const char*)data+6, title_len);
+//										std::string s((const char*)data+offs, title_len);
 //										eDebug("match1 %s %s", str, s.c_str() );
 										descr[++descridx] = it->first;
 									}
 								}
-								else if ( !strncmp((const char*)data+6, str, title_len) )
+								else if ( !strncmp((const char*)data+offs, str, title_len) )
 								{
-//									std::string s((const char*)data+6, title_len);
+//									std::string s((const char*)data+offs, title_len);
 //									eDebug("match2 %s %s", str, s.c_str() );
 									descr[++descridx] = it->first;
 								}
@@ -2193,13 +2272,13 @@ PyObject *eEPGCache::search(ePyObject arg)
 //											eDebug("match 3 %s %s", str, s.c_str() );
 											break;
 										}
-										else if (!strncmp((const char*)data+6+idx, str, textlen) )
-										{
-											descr[++descridx] = it->first;
-//											std::string s((const char*)data+6, title_len);
-//											eDebug("match 4 %s %s", str, s.c_str() );
-											break;
-										}
+									}
+									else if (!strncmp((const char*)data+6+idx, str, textlen) )
+									{
+										descr[++descridx] = it->first;
+//										std::string s((const char*)data+6, title_len);
+//										eDebug("match 4 %s %s", str, s.c_str() );
+										break;
 									}
 									++idx;
 								}
@@ -2303,44 +2382,40 @@ PyObject *eEPGCache::search(ePyObject arg)
 							}
 						}
 					// create service name
-						if (!service_name)
+						if (must_get_service_name && !service_name)
 						{
-							int must_get_service_name = strchr(argstring, 'N') ? 1 : strchr(argstring, 'n') ? 2 : 0;
-							if (must_get_service_name)
+							ePtr<iStaticServiceInformation> sptr;
+							eServiceCenterPtr service_center;
+							eServiceCenter::getPrivInstance(service_center);
+							if (service_center)
 							{
-								ePtr<iStaticServiceInformation> sptr;
-								eServiceCenterPtr service_center;
-								eServiceCenter::getPrivInstance(service_center);
-								if (service_center)
+								service_center->info(ref, sptr);
+								if (sptr)
 								{
-									service_center->info(ref, sptr);
-									if (sptr)
-									{
-										std::string name;
-										sptr->getName(ref, name);
+									std::string name;
+									sptr->getName(ref, name);
 
-										if (must_get_service_name == 1)
-										{
-											size_t pos;
-											// filter short name brakets
-											while((pos = name.find("\xc2\x86")) != std::string::npos)
-												name.erase(pos,2);
-											while((pos = name.find("\xc2\x87")) != std::string::npos)
-												name.erase(pos,2);
-										}
-										else
-											name = buildShortName(name);
-
-										if (name.length())
-											service_name = PyString_FromString(name.c_str());
+									if (must_get_service_name == 1)
+									{
+										size_t pos;
+										// filter short name brakets
+										while((pos = name.find("\xc2\x86")) != std::string::npos)
+											name.erase(pos,2);
+										while((pos = name.find("\xc2\x87")) != std::string::npos)
+											name.erase(pos,2);
 									}
+									else
+										name = buildShortName(name);
+
+									if (name.length())
+										service_name = PyString_FromString(name.c_str());
 								}
-								if (!service_name)
-									service_name = PyString_FromString("<n/a>");
 							}
+							if (!service_name)
+								service_name = PyString_FromString("<n/a>");
 						}
 					// create servicereference string
-						if (!service_reference && strchr(argstring,'R'))
+						if (must_get_service_reference && !service_reference)
 							service_reference = PyString_FromString(ref.toString().c_str());
 					// create list
 						if (!ret)
@@ -2957,7 +3032,7 @@ void eEPGCache::channel_data::readMHWData(const __u8 *data)
 
 	if ( state > 1 || // aborted
 		// have si data.. so we dont read mhw data
-		(haveData & (SCHEDULE|SCHEDULE_OTHER)) )
+		(haveData & (SCHEDULE|SCHEDULE_OTHER|VIASAT)) )
 	{
 		eDebug("[EPGC] mhw aborted %d", state);
 	}
@@ -3123,7 +3198,7 @@ void eEPGCache::channel_data::readMHWData2(const __u8 *data)
 
 	if ( state > 1 || // aborted
 		// have si data.. so we dont read mhw data
-		(haveData & (eEPGCache::SCHEDULE|eEPGCache::SCHEDULE_OTHER)) )
+		(haveData & (SCHEDULE|SCHEDULE_OTHER|VIASAT)) )
 	{
 		eDebug("[EPGC] mhw2 aborted %d", state);
 	}