replace some sUser with more readable code

[enigma2.git] / lib / python / Plugins / Extensions / DVDPlayer / src / servicedvd.cpp

diff --git a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
index 26a3ba39aa2fbf6f24b4a9e01f4e3b3790432e6e..30ebaecd154b6fff9d242ac54df2069d1126bccc 100644 (file)
--- 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);
@@ -593,10 +592,7 @@ RESULT eServiceDVD::getPlayPosition(pts_t &pos)
        pos += info.pos_minutes * 60;
        pos += info.pos_seconds;
 //     eDebug("getPlayPosition %lld", pos);
-       if ( pos > 0 && pos < 32768 )
-           pos *= 90000;
-       else
-           pos = 0;
+       pos *= 90000;
        return 0;
 }