From 0a97ffcb515605aea8ced414b65dbaed4ce0cfae Mon Sep 17 00:00:00 2001 From: Andreas Monzner Date: Tue, 22 Jul 2008 18:26:34 +0000 Subject: [PATCH] replace some sUser with more readable code --- lib/python/Plugins/Extensions/DVDPlayer/plugin.py | 8 ++++---- .../Plugins/Extensions/DVDPlayer/src/servicedvd.cpp | 9 ++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py index 8e9031d7..f433ce6b 100644 --- a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py +++ b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py @@ -424,14 +424,14 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP self.doShow() def __chapterUpdated(self): - self.currentChapter = self.service.info().getInfo(iServiceInformation.sUser+8) - self.totalChapters = self.service.info().getInfo(iServiceInformation.sUser+80) + self.currentChapter = self.service.info().getInfo(iServiceInformation.sCurrentChapter) + self.totalChapters = self.service.info().getInfo(iServiceInformation.sTotalChapters) self.setChapterLabel() print "__chapterUpdated: %d/%d" % (self.currentChapter, self.totalChapters) def __titleUpdated(self): - self.currentTitle = self.service.info().getInfo(iServiceInformation.sUser+9) - self.totalTitles = self.service.info().getInfo(iServiceInformation.sUser+90) + self.currentTitle = self.service.info().getInfo(iServiceInformation.sCurrentTitle) + self.totalTitles = self.service.info().getInfo(iServiceInformation.sTotalTitles) self.setChapterLabel() print "__titleUpdated: %d/%d" % (self.currentTitle, self.totalTitles) if not self.in_menu: diff --git a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp index bbcb1f2b..30ebaecd 100644 --- a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp +++ b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp @@ -419,28 +419,27 @@ int eServiceDVD::getInfo(int w) case sAlbum: return resIsPyObject; // then getInfoObject should be called case sComment: - case sTracknumber: case sGenre: return resIsString; // then getInfoString should be called - case sUser+8: + case sCurrentChapter: { struct ddvd_time info; ddvd_get_last_time(m_ddvdconfig, &info); return info.pos_chapter; } - case sUser+80: + case sTotalChapters: { struct ddvd_time info; ddvd_get_last_time(m_ddvdconfig, &info); return info.end_chapter; } - case sUser+9: + case sCurrentTitle: { struct ddvd_time info; ddvd_get_last_time(m_ddvdconfig, &info); return info.pos_title; } - case sUser+90: + case sTotalTitles: { struct ddvd_time info; ddvd_get_last_time(m_ddvdconfig, &info); -- 2.30.2