X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Fradiotext.cpp;h=9f8cf5f0dee2aa2b343097c71daadbf7846f300e;hp=d4cc23580d8c0b8447f33a4f05a218cfab9737ee;hb=6ae5d719b93de2e8897a660ac61b0e9c5a190dde;hpb=d4a222aff5af90a8bdd9b20a60c89f4b9761e736

diff --git a/lib/dvb/radiotext.cpp b/lib/dvb/radiotext.cpp
index d4cc235..9f8cf5f 100644
--- a/lib/dvb/radiotext.cpp
+++ b/lib/dvb/radiotext.cpp
@@ -7,7 +7,7 @@ DEFINE_REF(eDVBRdsDecoder);
 
 eDVBRdsDecoder::eDVBRdsDecoder(iDVBDemux *demux)
 	:msgPtr(0), bsflag(0), qdar_pos(0), t_ptr(0), qdarmvi_show(0), state(0)
-	,m_abortTimer(eApp)
+	,m_abortTimer(eTimer::create(eApp))
 {
 	setStreamID(0xC0, 0xC0);
 
@@ -18,7 +18,7 @@ eDVBRdsDecoder::eDVBRdsDecoder(iDVBDemux *demux)
 		eDebug("failed to create PES reader!");
 	else
 		m_pes_reader->connectRead(slot(*this, &eDVBRdsDecoder::processData), m_read_connection);
-	CONNECT(m_abortTimer.timeout, eDVBRdsDecoder::abortNonAvail);
+	CONNECT(m_abortTimer->timeout, eDVBRdsDecoder::abortNonAvail);
 }
 
 eDVBRdsDecoder::~eDVBRdsDecoder()
@@ -139,7 +139,6 @@ void eDVBRdsDecoder::removeFromPictureMask(int id)
 void eDVBRdsDecoder::processPESPacket(__u8 *data, int len)
 {
 	int pos=9+data[8];// skip pes header
-	int cnt=0;
 
 	while (pos < len)
 	{
@@ -151,7 +150,7 @@ void eDVBRdsDecoder::processPESPacket(__u8 *data, int len)
 		int channel = mode == 3 ? 1 : 2;
 		int id = (data[pos + 1] >> 3) & 1;
 		int emphasis_bit = data[pos + 3] & 3;
-		int protection_bit = data[pos + 1] & 1;
+		//int protection_bit = data[pos + 1] & 1;
 		int rate = -1;
 		int sample_freq = -1;
 		int layer = -1;
@@ -194,7 +193,7 @@ void eDVBRdsDecoder::processPESPacket(__u8 *data, int len)
 
 		if (data[offs] == 0xFD)
 		{
-			m_abortTimer.stop();
+			m_abortTimer->stop();
 			int ancillary_len = 1 + data[offs - 1];
 			offs -= ancillary_len;
 			gotAncillaryData(data+offs, ancillary_len);
@@ -640,7 +639,7 @@ int eDVBRdsDecoder::start(int pid)
 {
 	int ret = -1;
 	if (m_pes_reader && !(ret = m_pes_reader->start(pid)))
-		m_abortTimer.startLongTimer(20);
+		m_abortTimer->startLongTimer(20);
 	return ret;
 }