X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Fpmt.cpp;h=2ca226aec11ccd0cd5bf9235cd729afeb7c30482;hp=ee89a3a43a93a55133f838c2d1aa34e27fdc2798;hb=5ef54ea03e020f76be1aabeeff46453ca123a0f5;hpb=b209ca0ac28a2e1ddc1f27642b0dec0f376b0ad2

diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp
index ee89a3a..2ca226a 100644
--- a/lib/dvb/pmt.cpp
+++ b/lib/dvb/pmt.cpp
@@ -133,11 +133,11 @@ void eDVBServicePMTHandler::PATready(int)
 	{
 		int pmtpid = -1;
 		std::vector<ProgramAssociationSection*>::const_iterator i;
-		for (i = ptr->getSections().begin(); i != ptr->getSections().end(); ++i)
+		for (i = ptr->getSections().begin(); pmtpid == -1 && i != ptr->getSections().end(); ++i)
 		{
 			const ProgramAssociationSection &pat = **i;
 			ProgramAssociationConstIterator program;
-			for (program = pat.getPrograms()->begin(); program != pat.getPrograms()->end(); ++program)
+			for (program = pat.getPrograms()->begin(); pmtpid == -1 && program != pat.getPrograms()->end(); ++program)
 				if (eServiceID((*program)->getProgramNumber()) == m_reference.getServiceID())
 					pmtpid = (*program)->getProgramMapPid();
 		}
@@ -675,6 +675,12 @@ void eDVBServicePMTHandler::SDTScanEvent(int event)
 
 int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux, eCueSheet *cue, bool simulate, eDVBService *service)
 {
+	ePtr<iDataSource> s;
+	return tuneExt(ref, use_decode_demux, s, NULL, cue, simulate, service);
+}
+
+int eDVBServicePMTHandler::tuneExt(eServiceReferenceDVB &ref, int use_decode_demux, ePtr<iDataSource> &source, const char *streaminfo_file, eCueSheet *cue, bool simulate, eDVBService *service)
+{
 	RESULT res=0;
 	m_reference = ref;
 	
@@ -757,7 +763,10 @@ int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux,
 		if (m_pvr_channel)
 		{
 			m_pvr_channel->setCueSheet(cue);
-			m_pvr_channel->playFile(ref.path.c_str());
+			if (source)
+				m_pvr_channel->playSource(source, streaminfo_file);
+			else
+				m_pvr_channel->playFile(ref.path.c_str());
 		}
 	}