Merge branch '2_5_to_2_6_bug_107'

[vuplus_dvbapp] / lib / service / servicemp3.h

diff --git a/lib/service/servicemp3.h b/lib/service/servicemp3.h
index 1d77483..15ed0b0 100644 (file)
--- a/lib/service/servicemp3.h
+++ b/lib/service/servicemp3.h
@@ -176,11 +176,10 @@ private:
        ePtr<eTimer> m_seekTimeout;
        void seekTimeoutCB();
        friend class eServiceFactoryMP3;
-       std::string m_filename;
-       std::string m_title;
+       eServiceReference m_ref;
        int m_buffer_size;
        bufferInfo m_bufferInfo;
-       eServiceMP3(const char *filename, const char *title);
+       eServiceMP3(eServiceReference ref);
        Signal2<void,iPlayableService*,int> m_event;
        enum
        {
@@ -202,6 +201,12 @@ private:
        std::list<ePangoSubtitlePage> m_subtitle_pages;
        ePtr<eTimer> m_subtitle_sync_timer;
        void pushSubtitles();
+       void pullSubtitle();
+       int m_subs_to_pull;
+       eSingleLock m_subs_to_pull_lock;
+       gulong m_subs_to_pull_handler_id;
+
+       RESULT seekToImpl(pts_t to);
 
        gint m_aspect, m_width, m_height, m_framerate, m_progressive;
        RESULT trickSeek(gdouble ratio);