Merge branch 'master' of git.opendreambox.org:/git/enigma2

8 files changed, 103 insertions, 59 deletions

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index e5e83b42..cfb881ab 100644
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -652,12 +652,6 @@ void eDVBFrontend::feEvent(int w)
 		if (res && (errno == EAGAIN))
 			break;
 
-		if (res)
-		{
-			eWarning("FE_GET_EVENT failed! %m");
-			return;
-		}
-
 		if (w < 0)
 			continue;
 
@@ -1432,14 +1426,18 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
 				sec_fe->sendToneburst(m_sec_sequence.current()++->toneburst);
 				break;
 			case eSecCommand::SET_FRONTEND:
-				eDebugNoSimulate("[SEC] setFrontend");
-				setFrontend();
-				++m_sec_sequence.current();
+			{
+				int enableEvents = (m_sec_sequence.current()++)->val;
+				eDebugNoSimulate("[SEC] setFrontend %d", enableEvents);
+				setFrontend(enableEvents);
 				break;
+			}
 			case eSecCommand::START_TUNE_TIMEOUT:
 			{
+				int tuneTimeout = m_sec_sequence.current()->timeout;
+				eDebugNoSimulate("[SEC] startTuneTimeout %d", tuneTimeout);
 				if (!m_simulate)
-					m_timeout->start(m_sec_sequence.current()->timeout, 1);
+					m_timeout->start(tuneTimeout, 1);
 				++m_sec_sequence.current();
 				break;
 			}
@@ -1497,23 +1495,27 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
 				int signal = 0;
 				int isLocked = readFrontendData(locked);
 				m_idleInputpower[0] = m_idleInputpower[1] = 0;
-				if (isLocked && ((abs((signal = readFrontendData(signalQualitydB)) - cmd.lastSignal) < 50) || !cmd.lastSignal))
+				--m_timeoutCount;
+				if (!m_timeoutCount && m_retryCount > 0)
+					--m_retryCount;
+				if (isLocked && ((abs((signal = readFrontendData(signalQualitydB)) - cmd.lastSignal) < 40) || !cmd.lastSignal))
 				{
 					if (cmd.lastSignal)
 						eDebugNoSimulate("[SEC] locked step %d ok (%d %d)", cmd.okcount, signal, cmd.lastSignal);
 					else
 					{
 						eDebugNoSimulate("[SEC] locked step %d ok", cmd.okcount);
-						cmd.lastSignal = signal;
+						if (!cmd.okcount)
+							cmd.lastSignal = signal;
 					}
 					++cmd.okcount;
 					if (cmd.okcount > 4)
 					{
-						eDebugNoSimulate("ok > 4 .. goto %d\n",cmd.steps);
+						eDebugNoSimulate("ok > 4 .. goto %d\n", cmd.steps);
 						setSecSequencePos(cmd.steps);
 						m_state = stateLock;
 						m_stateChanged(this);
-						feEvent(-1);
+						feEvent(-1); // flush events
 						m_sn->start();
 						break;
 					}
@@ -1524,9 +1526,6 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
 						eDebugNoSimulate("[SEC] rotor locked step %d failed (oldSignal %d, curSignal %d)", cmd.okcount, signal, cmd.lastSignal);
 					else
 						eDebugNoSimulate("[SEC] rotor locked step %d failed (not locked)", cmd.okcount);
-					--m_timeoutCount;
-					if (!m_timeoutCount && m_retryCount > 0)
-						--m_retryCount;
 					cmd.okcount=0;
 					cmd.lastSignal=0;
 				}
@@ -1558,6 +1557,9 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
 				}
 				int idleInputpower = m_idleInputpower[ (sec_fe_data[CUR_VOLTAGE]&1) ? 0 : 1];
 				const char *txt = cmd.direction ? "running" : "stopped";
+				--m_timeoutCount;
+				if (!m_timeoutCount && m_retryCount > 0)
+					--m_retryCount;
 				eDebugNoSimulate("[SEC] waiting for rotor %s %d, idle %d, delta %d",
 					txt,
 					m_runningInputpower,
@@ -1578,9 +1580,6 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
 				else
 				{
 					eDebugNoSimulate("[SEC] rotor not %s... reset counter.. increase timeout", txt);
-					--m_timeoutCount;
-					if (!m_timeoutCount && m_retryCount > 0)
-						--m_retryCount;
 					cmd.okcount=0;
 				}
 				++m_sec_sequence.current();
@@ -1696,13 +1695,14 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
 		tuneLoop();
 }
 
-void eDVBFrontend::setFrontend()
+void eDVBFrontend::setFrontend(bool recvEvents)
 {
 	if (!m_simulate)
 	{
 		eDebug("setting frontend %d", m_dvbid);
-		m_sn->start();
-		feEvent(-1);
+		if (recvEvents)
+			m_sn->start();
+		feEvent(-1); // flush events
 		if (ioctl(m_fd, FE_SET_FRONTEND, &parm) == -1)
 		{
 			perror("FE_SET_FRONTEND failed");
@@ -2141,7 +2141,7 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
 			goto tune_error;
 
 		m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT, timeout) );
-		m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
+		m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND, 1) );
 		break;
 	}
 	case feTerrestrial:
@@ -2166,7 +2166,7 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
 			m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage13) );
 		else
 			m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltageOff) );
-		m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
+		m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND, 1) );
 
 		break;
 	}
diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index b6e3b6a4..e1556bd9 100644
--- a/lib/dvb/frontend.h
+++ b/lib/dvb/frontend.h
@@ -105,7 +105,7 @@ private:
 	void feEvent(int);
 	void timeout();
 	void tuneLoop();  // called by m_tuneTimer
-	void setFrontend();
+	void setFrontend(bool recvEvents=true);
 	bool setSecSequencePos(int steps);
 	static int PriorityOrder;
 public:
diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp
index fb81fa4c..a4fa212d 100644
--- a/lib/dvb/pmt.cpp
+++ b/lib/dvb/pmt.cpp
@@ -184,6 +184,8 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program)
 
 	int first_ac3 = -1;
 	program.defaultAudioStream = 0;
+	int rdsPid = -1;
+	audioStream *prev_audio = 0;
 
 	if ( m_service && !m_service->cacheEmpty() )
 	{
@@ -215,13 +217,15 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program)
 				for (es = pmt.getEsInfo()->begin(); es != pmt.getEsInfo()->end(); ++es)
 				{
 					int isaudio = 0, isvideo = 0, issubtitle = 0, forced_video = 0, forced_audio = 0, isteletext = 0;
+					int streamtype = (*es)->getType();
 					videoStream video;
 					audioStream audio;
 					audio.component_tag=video.component_tag=-1;
 					video.type = videoStream::vtMPEG2;
 					audio.type = audioStream::atMPEG;
+					audio.rdsPid = -1;
 
-					switch ((*es)->getType())
+					switch (streamtype)
 					{
 					case 0x1b: // AVC Video Stream (MPEG4 H264)
 						video.type = videoStream::vtMPEG4_H264;
@@ -285,11 +289,14 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program)
 						}
 					case 0x06: // PES Private
 					case 0xEA: // TS_PSI_ST_SMPTE_VC1
+					{
+						int num_descriptors = 0;
 						for (DescriptorConstIterator desc = (*es)->getDescriptors()->begin();
 							desc != (*es)->getDescriptors()->end(); ++desc)
 						{
 							uint8_t tag = (*desc)->getTag();
 							/* check descriptors to get the exakt stream type. */
+							++num_descriptors;
 							if (!forced_video && !forced_audio)
 							{
 								switch (tag)
@@ -458,6 +465,13 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program)
 								break;
 							}
 						}
+						if (!num_descriptors && streamtype == 0x06 && prev_audio)
+						{
+							prev_audio->rdsPid = (*es)->getPid();
+							eDebug("Rds PID %04x detected ? ! ?", prev_audio->rdsPid);
+						}
+						prev_audio = 0;
+					}
 					default:
 						break;
 					}
@@ -496,6 +510,7 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program)
 							first_ac3 = program.audioStreams.size();
 
 						program.audioStreams.push_back(audio);
+						prev_audio = &program.audioStreams.back();
 					}
 					else
 						continue;
@@ -548,6 +563,7 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program)
 			audioStream s;
 			s.type = audioStream::atAC3;
 			s.pid = cached_apid_ac3;
+			s.rdsPid = -1;
 			program.audioStreams.push_back(s);
 			++cnt;
 		}
@@ -556,6 +572,7 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program)
 			audioStream s;
 			s.type = audioStream::atMPEG;
 			s.pid = cached_apid_mpeg;
+			s.rdsPid = -1;
 			program.audioStreams.push_back(s);
 			++cnt;
 		}
diff --git a/lib/dvb/pmt.h b/lib/dvb/pmt.h
index e27135e3..a9ca23f2 100644
--- a/lib/dvb/pmt.h
+++ b/lib/dvb/pmt.h
@@ -141,7 +141,8 @@ public:
 	
 	struct audioStream
 	{
-		int pid;
+		int pid,
+		    rdsPid; // hack for some radio services which transmit radiotext on different pid (i.e. harmony fm, HIT RADIO FFH, ...)
 		enum { atMPEG, atAC3, atDTS, atAAC, atAACHE, atLPCM };
 		int type; // mpeg2, ac3, dts, ...
 		
@@ -188,7 +189,6 @@ public:
 		int pmtPid;
 		int textPid;
 		bool isCrypted() { return !caids.empty(); }
-		
 		PyObject *createPythonObject();
 	};
 
diff --git a/lib/dvb/radiotext.cpp b/lib/dvb/radiotext.cpp
index 9f8cf5f0..e9bdd63a 100644
--- a/lib/dvb/radiotext.cpp
+++ b/lib/dvb/radiotext.cpp
@@ -5,9 +5,9 @@
 
 DEFINE_REF(eDVBRdsDecoder);
 
-eDVBRdsDecoder::eDVBRdsDecoder(iDVBDemux *demux)
+eDVBRdsDecoder::eDVBRdsDecoder(iDVBDemux *demux, int type)
 	:msgPtr(0), bsflag(0), qdar_pos(0), t_ptr(0), qdarmvi_show(0), state(0)
-	,m_abortTimer(eTimer::create(eApp))
+	,m_type(type), m_pid(-1), m_abortTimer(eTimer::create(eApp))
 {
 	setStreamID(0xC0, 0xC0);
 
@@ -16,8 +16,10 @@ eDVBRdsDecoder::eDVBRdsDecoder(iDVBDemux *demux)
 
 	if (demux->createPESReader(eApp, m_pes_reader))
 		eDebug("failed to create PES reader!");
-	else
+	else if (type == 0)
 		m_pes_reader->connectRead(slot(*this, &eDVBRdsDecoder::processData), m_read_connection);
+	else
+		m_pes_reader->connectRead(slot(*this, &eDVBRdsDecoder::gotAncillaryData), m_read_connection);
 	CONNECT(m_abortTimer->timeout, eDVBRdsDecoder::abortNonAvail);
 }
 
@@ -196,7 +198,7 @@ void eDVBRdsDecoder::processPESPacket(__u8 *data, int len)
 			m_abortTimer->stop();
 			int ancillary_len = 1 + data[offs - 1];
 			offs -= ancillary_len;
-			gotAncillaryData(data+offs, ancillary_len);
+			gotAncillaryData(data+offs, ancillary_len-1);
 		}
 	}
 }
@@ -310,13 +312,19 @@ void eDVBRdsDecoder::process_qdar(unsigned char *buf)
 	}
 }
 
-inline void eDVBRdsDecoder::gotAncillaryData(__u8 *buf, int len)
+void eDVBRdsDecoder::gotAncillaryData(const __u8 *buf, int len)
 {
-	int cnt=buf[--len];
-	while ( cnt-- > 0 )
+	if (len <= 0)
+		return;
+	int pos = m_type ? 0 : len-1;
+	while ( len )
 	{
-		unsigned char c = buf[--len];
-	
+		unsigned char c = buf[pos];
+
+		pos += m_type ? 1 : -1;
+
+		--len;
+
 		if (bsflag == 1) // byte stuffing
 		{
 			bsflag=2;
@@ -638,8 +646,9 @@ std::string eDVBRdsDecoder::getRassPicture(int page, int subpage)
 int eDVBRdsDecoder::start(int pid)
 {
 	int ret = -1;
-	if (m_pes_reader && !(ret = m_pes_reader->start(pid)))
+	if (m_pes_reader && !(ret = m_pes_reader->start(pid)) && m_type == 0)
 		m_abortTimer->startLongTimer(20);
+	m_pid = pid;
 	return ret;
 }
 
diff --git a/lib/dvb/radiotext.h b/lib/dvb/radiotext.h
index ace7b6ec..7a73eea3 100644
--- a/lib/dvb/radiotext.h
+++ b/lib/dvb/radiotext.h
@@ -18,9 +18,11 @@ class eDVBRdsDecoder: public iObject, public ePESParser, public Object
 	unsigned char rass_picture_mask[5];  // 40 bits... (10 * 4 pictures)
 	void addToPictureMask(int id);
 	void removeFromPictureMask(int id);
+	int m_type;
+	int m_pid;
 public:
 	enum { RadioTextChanged, RtpTextChanged, RassInteractivePicMaskChanged, RecvRassSlidePic };
-	eDVBRdsDecoder(iDVBDemux *demux);
+	eDVBRdsDecoder(iDVBDemux *demux, int type);
 	~eDVBRdsDecoder();
 	int start(int pid);
 	void connectEvent(const Slot1<void, int> &slot, ePtr<eConnection> &connection);
@@ -29,10 +31,11 @@ public:
 	ePyObject getRassPictureMask();
 	std::string getRassPicture(int page, int subpage);
 	std::string getRassSlideshowPicture() { return "/tmp/RassLast.mvi"; }
+	int getPid() { return m_pid; }
 private:
 	void abortNonAvail();
 	void processPESPacket(__u8 *pkt, int len);
-	inline void gotAncillaryData(__u8 *data, int len);
+	void gotAncillaryData(const __u8 *data, int len);
 	void process_qdar(unsigned char*);
 	ePtr<iDVBPESReader> m_pes_reader;
 	ePtr<eConnection> m_read_connection;
diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp
index 83092d8e..71c8a19c 100644
--- a/lib/dvb/sec.cpp
+++ b/lib/dvb/sec.cpp
@@ -754,6 +754,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 						}
 						if(lnb_param.SatCR_idx == -1)
 						{
+							int mrt = m_params[MOTOR_RUNNING_TIMEOUT]; // in seconds!
 							if ( rotor_param.m_inputpower_parameters.m_use )
 							{ // use measure rotor input power to detect rotor state
 								bool turn_fast = need_turn_fast(rotor_param.m_inputpower_parameters.m_turning_speed);
@@ -800,7 +801,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 								sec_sequence.push_back( eSecCommand(eSecCommand::SET_ROTOR_MOVING) );
 								if (turn_fast)
 									sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(18)) );
-								sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, m_params[MOTOR_RUNNING_TIMEOUT]*20) );  // 2 minutes running timeout
+								sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, mrt*20) );  // mrt is in seconds... our SLEEP time is 50ms.. so * 20
 	// rotor running loop
 								sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );  // wait 50msec
 								sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_RUNNING_INPUTPOWER) );
@@ -815,6 +816,17 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 							}
 							else
 							{  // use normal turning mode
+								if (curRotorPos != -1)
+								{		
+									mrt = abs(curRotorPos - sat.orbital_position);
+									if (mrt > 1800)
+										mrt = 3600 - mrt;
+									if (mrt % 10)
+										mrt += 10; // round a little bit
+									mrt *= 2000;  // (we assume a very slow rotor with just 0.5 degree per second here)
+									mrt /= 10000;
+									mrt += 3; // a little bit overhead
+								}
 								doSetVoltageToneFrontend=false;
 								doSetFrontend=false;
 								eSecCommand::rotor cmd;
@@ -828,37 +840,40 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 								sec_sequence.push_back( eSecCommand(eSecCommand::INVALIDATE_CURRENT_ROTORPARMS) );
 								sec_sequence.push_back( eSecCommand(eSecCommand::SET_ROTOR_MOVING) );
 								sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
-	
+								sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 1000) ); // sleep one second before change voltage or tone
+
 								compare.voltage = voltage;
 								compare.steps = +3;
 								sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) ); // correct final voltage?
 								sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 2000) );  // wait 2 second before set high voltage
 								sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, voltage) );
-	
+
 								compare.tone = tone;
 								sec_sequence.push_back( eSecCommand(eSecCommand::IF_TONE_GOTO, compare) );
 								sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, tone) );
 								sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_FINAL_CONT_TONE_CHANGE]) );
-								sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
+								sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND, 0) );
 	
 								cmd.direction=1;  // check for running rotor
 								cmd.deltaA=0;
-								cmd.steps=+3;
+								cmd.steps = +3;
 								cmd.okcount=0;
-								sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, m_params[MOTOR_RUNNING_TIMEOUT]*4) );  // 2 minutes running timeout
+								sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, mrt*4) );  // mrt is in seconds... our SLEEP time is 250ms.. so * 4
 								sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 250) );  // 250msec delay
 								sec_sequence.push_back( eSecCommand(eSecCommand::IF_TUNER_LOCKED_GOTO, cmd ) );
-								sec_sequence.push_back( eSecCommand(eSecCommand::IF_TIMEOUT_GOTO, +3 ) ); 
+								sec_sequence.push_back( eSecCommand(eSecCommand::IF_TIMEOUT_GOTO, +5 ) );
 								sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -3) );  // goto loop start
 								sec_sequence.push_back( eSecCommand(eSecCommand::UPDATE_CURRENT_ROTORPARAMS) );
 								sec_sequence.push_back( eSecCommand(eSecCommand::SET_ROTOR_STOPPED) );
-								sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, +3) );
-								sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
-								sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -4) );
+								sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, +4) );
+								sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT, tunetimeout) );
+								sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND, 1) );
+								sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -5) );
 							}
+							eDebug("set rotor timeout to %d seconds", mrt);
+							sec_fe->setData(eDVBFrontend::NEW_ROTOR_CMD, RotorCmd);
+							sec_fe->setData(eDVBFrontend::NEW_ROTOR_POS, sat.orbital_position);
 						}
-						sec_fe->setData(eDVBFrontend::NEW_ROTOR_CMD, RotorCmd);
-						sec_fe->setData(eDVBFrontend::NEW_ROTOR_POS, sat.orbital_position);
 					}
 				}
 			}
@@ -919,7 +934,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 			if (doSetFrontend)
 			{
 				sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT, tunetimeout) );
-				sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
+				sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND, 1) );
 			}
 
 			sec_sequence.push_front( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeStatic) );
diff --git a/lib/dvb/subtitle.cpp b/lib/dvb/subtitle.cpp
index 82cf0023..06bb266e 100644
--- a/lib/dvb/subtitle.cpp
+++ b/lib/dvb/subtitle.cpp
@@ -82,7 +82,7 @@ static int map_4_to_8_bit_table[16];
 int eDVBSubtitleParser::subtitle_process_pixel_data(subtitle_region *region, subtitle_region_object *object, int *linenr, int *linep, __u8 *data)
 {
 	int data_type = *data++;
-	static __u8 line[720];
+	static __u8 line[1920];
 
 	bitstream bit;
 	bit.size=0;
@@ -142,7 +142,7 @@ int eDVBSubtitleParser::subtitle_process_pixel_data(subtitle_region *region, sub
 				map_2_to_4_bit_table[col] :
 				region->depth == subtitle_region::bpp8 ?
 				map_2_to_8_bit_table[col] : col;
-			while (len && ((*linep) < 720))
+			while (len && ((*linep) < m_display_size.width()))
 			{
 				line[(*linep)++] = c;
 				len--;
@@ -197,7 +197,7 @@ int eDVBSubtitleParser::subtitle_process_pixel_data(subtitle_region *region, sub
 			}
 			uint8_t c = region->depth == subtitle_region::bpp8 ?
 				map_4_to_8_bit_table[col] : col;
-			while (len && ((*linep) < 720))
+			while (len && ((*linep) < m_display_size.width()))
 			{
 				line[(*linep)++] = c;
 				len--;
@@ -231,7 +231,7 @@ int eDVBSubtitleParser::subtitle_process_pixel_data(subtitle_region *region, sub
 				} else
 					break;
 			}
-			while (len && ((*linep) < 720))
+			while (len && ((*linep) < m_display_size.width()))
 			{
 				line[(*linep)++] = col;
 				len--;
@@ -270,7 +270,7 @@ int eDVBSubtitleParser::subtitle_process_pixel_data(subtitle_region *region, sub
 		subtitle_process_line(region, object, *linenr, line, *linep);
 /*		{
 			int i;
-			for (i=0; i<720; ++i)
+			for (i=0; i<m_display_size.width(); ++i)
 				eDebugNoNewLine("%d ", line[i]);
 			eDebug("");
 		} */