diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2010-10-06 11:55:09 +0200 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2010-10-06 11:55:09 +0200 |
| commit | 37152843c915fd0a9352256d804ced4ff54c23c4 (patch) | |
| tree | fbc7a5b7e428997e9feed5eac23b9960273545dd /lib/dvb | |
| parent | 03dba41f691f1ae6a315d0a13c5af66fdf93fbfd (diff) | |
| parent | 27305d845d1bb4ca86a7e3e03b4c08cf3f3433fc (diff) | |
| download | enigma2-37152843c915fd0a9352256d804ced4ff54c23c4.tar.gz enigma2-37152843c915fd0a9352256d804ced4ff54c23c4.zip | |
Merge remote branch 'origin/bug_530_add_dm800se_support'
Diffstat (limited to 'lib/dvb')
| -rw-r--r-- | lib/dvb/dvb.cpp | 4 | ||||
| -rw-r--r-- | lib/dvb/dvb.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp index 836851c5..40d44186 100644 --- a/lib/dvb/dvb.cpp +++ b/lib/dvb/dvb.cpp @@ -96,6 +96,8 @@ eDVBResourceManager::eDVBResourceManager() m_boxtype = DM800; else if (!strncmp(tmp, "dm500hd\n", rd)) m_boxtype = DM500HD; + else if (!strncmp(tmp, "dm800se\n", rd)) + m_boxtype = DM800SE; else { eDebug("boxtype detection via /proc/stb/info not possible... use fallback via demux count!\n"); if (m_demux.size() == 3) @@ -455,7 +457,7 @@ RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBA ePtr<eDVBRegisteredDemux> unused; - if (m_boxtype == DM800 || m_boxtype == DM500HD) // dm800 / 500hd + if (m_boxtype == DM800 || m_boxtype == DM500HD || m_boxtype == DM800SE) // dm800 / 500hd { cap |= capHoldDecodeReference; // this is checked in eDVBChannel::getDemux for (; i != m_demux.end(); ++i, ++n) diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h index 405bd557..fb925807 100644 --- a/lib/dvb/dvb.h +++ b/lib/dvb/dvb.h @@ -135,7 +135,7 @@ class eDVBResourceManager: public iObject, public Object DECLARE_REF(eDVBResourceManager); int avail, busy; - enum { DM7025, DM800, DM500HD, DM8000 }; + enum { DM7025, DM800, DM500HD, DM800SE, DM8000 }; int m_boxtype; |