From: Andreas Monzner Date: Mon, 21 Apr 2008 13:09:09 +0000 (+0000) Subject: add seekTitle to iSeekableService interface X-Git-Tag: 2.6.0~1310 X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/f3cc59418747658a3d8c6f3b75052567e32389d7?hp=679475dbb4c18821055c9b9d632f689aaa9f3516;ds=sidebyside add seekTitle to iSeekableService interface add default implementation for seekTitle and seekChapter --- diff --git a/lib/service/iservice.h b/lib/service/iservice.h index 054e2224..dac39849 100644 --- a/lib/service/iservice.h +++ b/lib/service/iservice.h @@ -420,7 +420,8 @@ public: audio will be switched off, sync will be disabled etc. */ virtual RESULT setTrickmode(int trick=0)=0; virtual RESULT isCurrentlySeekable()=0; - virtual RESULT seekChapter(int chapter)=0; + virtual RESULT seekChapter(int chapter) { return -1; } + virtual RESULT seekTitle(int chapter) { return -1; } }; SWIG_TEMPLATE_TYPEDEF(ePtr, iSeekableServicePtr); diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp index fb67787a..cd4d3394 100644 --- a/lib/service/servicedvb.cpp +++ b/lib/service/servicedvb.cpp @@ -1446,12 +1446,6 @@ RESULT eDVBServicePlay::isCurrentlySeekable() return m_is_pvr || m_timeshift_active; } -RESULT eDVBServicePlay::seekChapter(int chapter) -{ - /* seekChapter N/I. */ - return -1; -} - RESULT eDVBServicePlay::frontendInfo(ePtr &ptr) { ptr = this; diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h index d7d05c78..0c5710d8 100644 --- a/lib/service/servicedvb.h +++ b/lib/service/servicedvb.h @@ -128,7 +128,6 @@ public: RESULT getPlayPosition(pts_t &pos); RESULT setTrickmode(int trick=0); RESULT isCurrentlySeekable(); - RESULT seekChapter(int chapter); // iServiceInformation RESULT getName(std::string &name); diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp index 4de77070..f74cc8d0 100644 --- a/lib/service/servicemp3.cpp +++ b/lib/service/servicemp3.cpp @@ -491,12 +491,6 @@ RESULT eServiceMP3::setTrickmode(int trick) return -1; } -RESULT eServiceMP3::seekChapter(int chapter) -{ - /* seekChapter N/I. */ - return -1; -} - RESULT eServiceMP3::isCurrentlySeekable() { return 1; diff --git a/lib/service/servicemp3.h b/lib/service/servicemp3.h index be07cfc7..71291af9 100644 --- a/lib/service/servicemp3.h +++ b/lib/service/servicemp3.h @@ -83,7 +83,7 @@ public: RESULT getPlayPosition(pts_t &SWIG_OUTPUT); RESULT setTrickmode(int trick); RESULT isCurrentlySeekable(); - RESULT seekChapter(int chapter); + // iServiceInformation RESULT getName(std::string &name); int getInfo(int w);