Merge branch 'master' of git.opendreambox.org:/git/enigma2

[enigma2.git] / lib / service / servicedvb.h

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index bae0c6e5d18cf05da6b5ae3a8a95c6e54d8a6d30..d19b92d694203fd0d81ebd2567521a848395761e 100644 (file)
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -272,7 +272,7 @@ private:
        ePtr<eConnection> m_new_dvb_subtitle_page_connection;
        std::list<eDVBSubtitlePage> m_dvb_subtitle_pages;
 
-       eTimer m_subtitle_sync_timer;
+       ePtr<eTimer> m_subtitle_sync_timer;
        void checkSubtitleTiming();
 
                /* radiotext */
@@ -293,7 +293,7 @@ public:
        eServiceReference &getPlayableService() { return m_playable_service; }
        RESULT getName(const eServiceReference &ref, std::string &name);
        int getLength(const eServiceReference &ref);
-       int isPlayable(const eServiceReference &ref, const eServiceReference &ignore);
+       int isPlayable(const eServiceReference &ref, const eServiceReference &ignore, bool simulate=false);
        RESULT getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &ptr, time_t start_time);
 };