X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/fd9ebe13e2e86c7fb3a80769e419538e1cfe9142..6f50f87ade33d60f05939a38de1ae0f4117b414b:/lib/dvb/pmt.cpp

diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp
index e2c55385..555ffa79 100644
--- a/lib/dvb/pmt.cpp
+++ b/lib/dvb/pmt.cpp
@@ -231,6 +231,7 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program)
 						}
 						//break; fall through !!!
 					case 0x06: // PES Private
+					case 0x81: // user private
 							/* PES private can contain AC-3, DTS or lots of other stuff.
 							   check descriptors to get the exact type. */
 						for (DescriptorConstIterator desc = (*es)->getDescriptors()->begin();
@@ -313,6 +314,25 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program)
 								program.caids.insert(descr->getCaSystemId());
 								break;
 							}
+							case REGISTRATION_DESCRIPTOR: /* some services don't have a separate AC3 descriptor */
+							{
+									/* libdvbsi++ doesn't yet support this descriptor type, so work around. */
+								if ((*desc)->getLength() != 4)
+									break;
+								unsigned char descr[6];
+								(*desc)->writeToBuffer(descr);
+								int format_identifier = (descr[2] << 24) | (descr[3] << 16) | (descr[4] << 8) | (descr[5]);
+								switch (format_identifier)
+								{
+								case 0x41432d33:
+									isaudio = 1;
+									audio.type = audioStream::atAC3;
+									break;
+								default:
+									break;
+								}
+								break;
+							}
 							}
 						}
 						break;
@@ -566,7 +586,10 @@ int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux,
 		}
 	} else
 	{
-		serviceEvent(eventNoResources);
+		if (res == eDVBResourceManager::errAllSourcesBusy)
+			serviceEvent(eventNoResources);
+		else /* errChidNotFound, errNoChannelList, errChannelNotInList, errNoSourceFound */
+			serviceEvent(eventMisconfiguration);
 		return res;
 	}
 
@@ -621,7 +644,7 @@ ChannelMap eDVBCAService::exist_channels;
 ePtr<eConnection> eDVBCAService::m_chanAddedConn;
 
 eDVBCAService::eDVBCAService()
-	:m_prev_build_hash(0), m_sendstate(0), m_retryTimer(eApp)
+	:m_sn(0), m_prev_build_hash(0), m_sendstate(0), m_retryTimer(eApp)
 {
 	memset(m_used_demux, 0xFF, sizeof(m_used_demux));
 	CONNECT(m_retryTimer.timeout, eDVBCAService::sendCAPMT);
@@ -632,6 +655,7 @@ eDVBCAService::~eDVBCAService()
 {
 	eDebug("[eDVBCAService] free service %s", m_service.toString().c_str());
 	::close(m_sock);
+	delete m_sn;
 }
 
 // begin static methods
@@ -808,17 +832,49 @@ channel_data *eDVBCAService::getChannelData(eDVBChannelID &chid)
 }
 // end static methods
 
+void eDVBCAService::socketCB(int what)
+{
+	if (what & eSocketNotifier::Read)
+		/*eDebug("[eDVBCAService] data to read\n")*/;
+	if (what & eSocketNotifier::Priority)
+		/*eDebug("[eDVBCAService] priority data to read\n")*/;
+	if (what & eSocketNotifier::Hungup) {
+		/*eDebug("[eDVBCAService] connection closed\n")*/;
+		m_sendstate=1;
+		sendCAPMT();
+	}
+	if (what & eSocketNotifier::Error)
+		/*eDebug("[eDVBCAService] connection error\n")*/;
+}
+
 void eDVBCAService::Connect()
 {
+	if (m_sn) {
+		delete m_sn;
+		m_sn=0;
+	}
 	memset(&m_servaddr, 0, sizeof(struct sockaddr_un));
 	m_servaddr.sun_family = AF_UNIX;
 	strcpy(m_servaddr.sun_path, "/tmp/camd.socket");
 	m_clilen = sizeof(m_servaddr.sun_family) + strlen(m_servaddr.sun_path);
 	m_sock = socket(PF_UNIX, SOCK_STREAM, 0);
-	connect(m_sock, (struct sockaddr *) &m_servaddr, m_clilen);
-	fcntl(m_sock, F_SETFL, O_NONBLOCK);
-	int val=1;
-	setsockopt(m_sock, SOL_SOCKET, SO_REUSEADDR, &val, 4);
+	if (m_sock != -1)
+	{
+		if (!connect(m_sock, (struct sockaddr *) &m_servaddr, m_clilen))
+		{
+			int val=1;
+			fcntl(m_sock, F_SETFL, O_NONBLOCK);
+			setsockopt(m_sock, SOL_SOCKET, SO_REUSEADDR, &val, 4);
+			m_sn = new eSocketNotifier(eApp, m_sock,
+				eSocketNotifier::Read|eSocketNotifier::Priority|eSocketNotifier::Error|eSocketNotifier::Hungup);
+			CONNECT(m_sn->activated, eDVBCAService::socketCB);
+			
+		}
+//		else
+//			eDebug("[eDVBCAService] connect failed %m");
+	}
+	else
+		eDebug("[eDVBCAService] create socket failed %m");
 }
 
 void eDVBCAService::buildCAPMT(eTable<ProgramMapSection> *ptr)