Merge branch 'experimental' of git.opendreambox.org:/git/enigma2 into experimental

3 files changed, 46 insertions, 12 deletions

diff --git a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
index 0372c497..2ba53927 100644
--- a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
+++ b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
@@ -85,12 +85,9 @@ RESULT eServiceFactoryDVD::offlineOperations(const eServiceReference &, ePtr<iSe
 DEFINE_REF(eServiceDVD);
 
 eServiceDVD::eServiceDVD(eServiceReference ref):
-	m_ref(ref),
-	m_ddvdconfig(ddvd_create()),
-	m_subtitle_widget(0),
-	m_state(stIdle),
-	m_current_trick(0),
-	m_pump(eApp, 1)
+	m_ref(ref), m_ddvdconfig(ddvd_create()), m_subtitle_widget(0), m_state(stIdle),
+	m_current_trick(0), m_pump(eApp, 1), m_width(-1), m_height(-1),
+	m_aspect(-1), m_framerate(-1), m_progressive(-1)
 {
 	int aspect = DDVD_16_9;
 	int policy = DDVD_PAN_SCAN;
@@ -309,6 +306,32 @@ void eServiceDVD::gotMessage(int /*what*/)
 			m_event(this, evSeekableStatusChanged);
 			m_event(this, evUser+12);
 			break;
+#ifdef DDVD_SUPPORTS_PICTURE_INFO
+		case DDVD_SIZE_CHANGED:
+		{
+			int changed = m_width != -1 && m_height != -1 && m_aspect != -1;
+			ddvd_get_last_size(m_ddvdconfig, &m_width, &m_height, &m_aspect);
+			if (changed)
+				m_event((iPlayableService*)this, evVideoSizeChanged);
+			break;
+		}
+		case DDVD_PROGRESSIVE_CHANGED:
+		{
+			int changed = m_progressive != -1;
+			ddvd_get_last_progressive(m_ddvdconfig, &m_progressive);
+			if (changed)
+				m_event((iPlayableService*)this, evVideoProgressiveChanged);
+			break;
+		}
+		case DDVD_FRAMERATE_CHANGED:
+		{
+			int changed = m_framerate != -1;
+			ddvd_get_last_framerate(m_ddvdconfig, &m_framerate);
+			if (changed)
+				m_event((iPlayableService*)this, evVideoFramerateChanged);
+			break;
+		}
+#endif
 		default:
 			break;
 	}
@@ -500,6 +523,18 @@ int eServiceDVD::getInfo(int w)
 		case sUser+7:
 		case sUser+8:
 			return resIsPyObject;
+#ifdef DDVD_SUPPORTS_PICTURE_INFO
+		case sVideoWidth:
+			return m_width;
+		case sVideoHeight:
+			return m_height;
+		case sAspect:
+			return m_aspect;
+		case sProgressive:
+			return m_progressive;
+		case sFrameRate:
+			return m_framerate;
+#endif
 		default:
 			return resNA;
 	}
diff --git a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.h b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.h
index c730d501..c751a394 100644
--- a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.h
+++ b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.h
@@ -127,6 +127,8 @@ private:
 
 	void loadCuesheet();
 	void saveCuesheet();
+
+	int m_width, m_height, m_aspect, m_framerate, m_progressive;
 };
 
 #endif
diff --git a/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py b/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
index 4dbe7f70..4917855f 100755
--- a/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
@@ -420,7 +420,7 @@ class PluginManager(Screen, DreamInfoHandler):
 
 	def getUpdateInfos(self):
 		self.setState('update')
-		iSoftwareTools.getUpdates(self.getUpdateInfosCB)
+		iSoftwareTools.startSoftwareTools(self.getUpdateInfosCB)
 
 	def getUpdateInfosCB(self, retval = None):
 		if retval is not None:
@@ -429,9 +429,10 @@ class PluginManager(Screen, DreamInfoHandler):
 					self["status"].setText(_("There are at least ") + str(iSoftwareTools.available_updates) + _(" updates available."))
 				else:
 					self["status"].setText(_("There are no updates available."))
+				self.rebuildList()
 			elif retval is False:
+				self.setState('error')
 				self["status"].setText(_("No network connection available."))
-			self.rebuildList()
 
 	def rebuildList(self, retval = None):
 		if self.currentSelectedTag is None:
@@ -1701,15 +1702,11 @@ def startSetup(menuid):
 		return [ ]
 	return [(_("Software management"), UpgradeMain, "software_manager", 50)]
 
-def autostart(reason, **kwargs):
-	if reason is True:
-		iSoftwareTools.startSoftwareTools()
 
 def Plugins(path, **kwargs):
 	global plugin_path
 	plugin_path = path
 	list = [
-		PluginDescriptor(where = [PluginDescriptor.WHERE_NETWORKCONFIG_READ], fnc = autostart),
 		PluginDescriptor(name=_("Software management"), description=_("Manage your receiver's software"), where = PluginDescriptor.WHERE_MENU, fnc=startSetup),
 		PluginDescriptor(name=_("Ipkg"), where = PluginDescriptor.WHERE_FILESCAN, fnc = filescan)
 	]