From: ghost <andreas.monzner@multimedia-labs.de>
Date: Wed, 16 Feb 2011 13:36:53 +0000 (+0100)
Subject: Merge branch 'bug_672_removed_pvr_device'
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=0c417aee83bac3ab0a70d5e0b3360d18b3663a23

Merge branch 'bug_672_removed_pvr_device'

Conflicts:
	lib/dvb/dvb.cpp
---

0c417aee83bac3ab0a70d5e0b3360d18b3663a23
diff --cc lib/dvb/dvb.cpp
index c2ddb40,399e9f5..6f9a67f
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@@ -522,7 -520,7 +522,7 @@@ RESULT eDVBResourceManager::allocateDem
  			}
  		}
  	}
- 	else if (m_boxtype == DM8000 || m_boxtype == DM7020HD)
 -	else if (m_boxtype == DM8000 || m_boxtype == DM500HD || m_boxtype == DM800SE)
++	else if (m_boxtype == DM8000 || m_boxtype == DM500HD || m_boxtype == DM800SE || m_boxtype == DM7020HD)
  	{
  		cap |= capHoldDecodeReference; // this is checked in eDVBChannel::getDemux
  		for (; i != m_demux.end(); ++i, ++n)