dont use iPlayableService.evUser for iServiceInfomation.getInfo*

2 files changed, 14 insertions, 16 deletions

diff --git a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
index 2169cc8c..c5bad9e0 100644
--- a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
@@ -389,28 +389,28 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
 		print "StringAvail"
 
 	def __osdAudioInfoAvail(self):
-		audioString = self.service.info().getInfoString(iPlayableService.evUser+6)
+		audioString = self.service.info().getInfoString(iServiceInformation.sUser+6)
 		print "AudioInfoAvail "+audioString
 		self["audioLabel"].setText(audioString)
 		if not self.in_menu:
 			self.doShow()
 
 	def __osdSubtitleInfoAvail(self):
-		subtitleString = self.service.info().getInfoString(iPlayableService.evUser+7)
+		subtitleString = self.service.info().getInfoString(iServiceInformation.sUser+7)
 		print "SubtitleInfoAvail "+subtitleString
 		self["subtitleLabel"].setText(subtitleString)
 		if not self.in_menu:
 			self.doShow()
 
 	def __chapterUpdated(self):
-		self.currentChapter = self.service.info().getInfo(iPlayableService.evUser+8)
-		self.totalChapters = self.service.info().getInfo(iPlayableService.evUser+80)
+		self.currentChapter = self.service.info().getInfo(iServiceInformation.sUser+8)
+		self.totalChapters = self.service.info().getInfo(iServiceInformation.sUser+80)
 		self.setChapterLabel()
 		print "__chapterUpdated: %d/%d" % (self.currentChapter, self.totalChapters)
 
 	def __titleUpdated(self):
-		self.currentTitle = self.service.info().getInfo(iPlayableService.evUser+9)
-		self.totalTitles = self.service.info().getInfo(iPlayableService.evUser+90)
+		self.currentTitle = self.service.info().getInfo(iServiceInformation.sUser+9)
+		self.totalTitles = self.service.info().getInfo(iServiceInformation.sUser+90)
 		self.setChapterLabel()
 		print "__titleUpdated: %d/%d" % (self.currentTitle, self.totalTitles)
 		if not self.in_menu:
@@ -454,13 +454,13 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
 	def enterDVDMenu(self):
 		if self.service:
 			self.service.keys().keyPressed(iServiceKeys.keyUser+7)
-			
+
 	def seekBeginning(self):
 		if self.service:
 			seekable = self.getSeek()
 			if seekable is not None:
 				seekable.seekTo(0)
-				
+
 	def zapToNumber(self, number):
 		if self.service:
 			seekable = self.getSeek()
diff --git a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
index 91b940a2..d54531ee 100644
--- a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
+++ b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
@@ -411,32 +411,30 @@ int eServiceDVD::getInfo(int w)
 		case sTracknumber:
 		case sGenre:
 			return resIsString;  // then getInfoString should be called
-		case evUser+8:
+		case sUser+8:
 		{
 			struct ddvd_time info;
 			ddvd_get_last_time(m_ddvdconfig, &info);
 			return info.pos_chapter;
 		}
-		case evUser+80:
+		case sUser+80:
 		{
 			struct ddvd_time info;
 			ddvd_get_last_time(m_ddvdconfig, &info);
 			return info.end_chapter;
 		}
-
-		case evUser+9:
+		case sUser+9:
 		{
 			struct ddvd_time info;
 			ddvd_get_last_time(m_ddvdconfig, &info);
 			return info.pos_title;
 		}
-		case evUser+90:
+		case sUser+90:
 		{
 			struct ddvd_time info;
 			ddvd_get_last_time(m_ddvdconfig, &info);
 			return info.end_title;
 		}
-
 		case sTXTPID:	// we abuse HAS_TELEXT icon in InfoBar to signalize subtitles status
 		{
 			int spu_id;
@@ -453,7 +451,7 @@ std::string eServiceDVD::getInfoString(int w)
 {
 	switch(w)
 	{
-		case evUser+7: {
+		case sUser+7: {
 			int spu_id;
 			uint16_t spu_lang;
 			ddvd_get_last_spu(m_ddvdconfig, &spu_id, &spu_lang);
@@ -466,7 +464,7 @@ std::string eServiceDVD::getInfoString(int w)
 // 			lbo_changed=1;
 			return osd;
 			}
-		case evUser+6:
+		case sUser+6:
 			{
 			int audio_id,audio_type;
 			uint16_t audio_lang;