From: ghost <andreas.monzner@multimedia-labs.de>
Date: Thu, 29 Apr 2010 16:29:07 +0000 (+0200)
Subject: dm800se support
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=56f2ffeb0301567710eb8f08a92a73ce67a40ef5

dm800se support
---

diff --git a/data/defaults/Dream/Makefile.am b/data/defaults/Dream/Makefile.am
index 31ba1c6..cda5583 100644
--- a/data/defaults/Dream/Makefile.am
+++ b/data/defaults/Dream/Makefile.am
@@ -4,10 +4,12 @@ installdir = $(pkgdatadir)/defaults/Dream
 
 dist_install_DATA = \
 	bouquets.tv \
+	dm800se.info \
 	dm500hd.info \
 	dm7025.info \
 	dm8000.info \
 	dm800.info \
+	settings.800se \
 	settings.500hd \
 	settings.7025 \
 	settings.800 \
diff --git a/data/defaults/Dream/dm800se.info b/data/defaults/Dream/dm800se.info
new file mode 100644
index 0000000..6974b12
--- /dev/null
+++ b/data/defaults/Dream/dm800se.info
@@ -0,0 +1,26 @@
+<default>
+	<prerequisites>
+		<!-- hardware can occur more than once -->
+		<hardware type="dm800se" />
+	</prerequisites>
+	
+	<info>
+		<author>Dream Multimedia GmbH</author>
+		<name>Dream Multimedia Default</name>
+	</info>
+
+		<!-- available types: "directories" -->
+	<files type="directories">
+		<!--file type="skin" directory="test_skin/" flag="default" name="Default Skin" /-->
+		<file type="config" name="settings.800se" />
+		<!--file type="services" name="lamedb.192">
+			<prerequisites>
+				<bcastsystem type="DVB-S" />
+				<satellite type="192" />
+			</prerequisites>
+		</file-->
+		<file type="favourites" directory="" name="bouquets.tv" />		
+		<file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv" />
+		<!--file type="package" directory="packages/" name="small-test_1.0_mipsel.ipk" /-->
+	</files>
+</default>
diff --git a/data/defaults/Dream/settings.800se b/data/defaults/Dream/settings.800se
new file mode 100644
index 0000000..ae2963b
--- /dev/null
+++ b/data/defaults/Dream/settings.800se
@@ -0,0 +1 @@
+config.misc.rcused=1
\ No newline at end of file
diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index 836851c..40d4418 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 405bd55..fb92580 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;
 
diff --git a/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py b/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
index e3b902f..59c5047 100644
--- a/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
@@ -239,9 +239,9 @@ class VideoHardware:
 		portlist = self.getPortList()
 		for port in portlist:
 			descr = port
-			if descr == 'DVI' and hw_type == 'dm500hd':
+			if descr == 'DVI' and hw_type in ('dm500hd', 'dm800se'):
 				descr = 'HDMI'
-			elif descr == 'DVI-PC' and hw_type == 'dm500hd':
+			elif descr == 'DVI-PC' and hw_type in ('dm500hd', 'dm800se'):
 				descr = 'HDMI-PC'
 			lst.append((port, descr))
 
diff --git a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
index 15f4d51..3c76685 100644
--- a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
@@ -82,7 +82,7 @@ class VideoWizard(WizardLanguage, Rc):
 		for port in self.hw.getPortList():
 			if self.hw.isPortUsed(port):
 				descr = port
-				if descr == 'DVI' and hw_type == 'dm500hd':
+				if descr == 'DVI' and hw_type in ('dm500hd', 'dm800se'):
 					descr = 'HDMI'
 				if port != "DVI-PC":
 					list.append((descr,port))
@@ -100,7 +100,7 @@ class VideoWizard(WizardLanguage, Rc):
 		self.inputSelect(self.selection)
 		if self["portpic"].instance is not None:
 			picname = self.selection
-			if picname == "DVI" and HardwareInfo().get_device_name() == "dm500hd":
+			if picname == "DVI" and HardwareInfo().get_device_name() in ("dm500hd", "dm800se"):
 				picname = "HDMI"
 			self["portpic"].instance.setPixmapFromFile(resolveFilename(SCOPE_PLUGINS, "SystemPlugins/Videomode/" + picname + ".png"))