don't use devfs names: /dev/mtdblock/6 -> /dev/mtdblock6

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

diff --git a/lib/service/servicemp3.h b/lib/service/servicemp3.h
index a8139573edba727a0d0a95204a130ba09a215417..d54997a604f5f12f9da50fafdd7b7440944d764f 100644 (file)
--- a/lib/service/servicemp3.h
+++ b/lib/service/servicemp3.h
@@ -1,7 +1,6 @@
 #ifndef __servicemp3_h
 #define __servicemp3_h
 
-#ifdef HAVE_GSTREAMER
 #include <lib/base/message.h>
 #include <lib/service/iservice.h>
 #include <lib/dvb/pmt.h>
@@ -168,7 +167,7 @@ public:
                int bufferPercent;
                int avgInRate;
                int avgOutRate;
-               long long bufferingLeft;
+               int64_t bufferingLeft;
                bufferInfo()
                        :bufferPercent(0), avgInRate(0), avgOutRate(0), bufferingLeft(-1)
                {
@@ -212,9 +211,13 @@ private:
 
        std::list<ePangoSubtitlePage> m_subtitle_pages;
        ePtr<eTimer> m_subtitle_sync_timer;
+       
+       ePtr<eTimer> m_streamingsrc_timeout;
        void pushSubtitles();
        void pullSubtitle();
+       void sourceTimeout();
        int m_subs_to_pull;
+       sourceStream m_sourceinfo;
        eSingleLock m_subs_to_pull_lock;
        gulong m_subs_to_pull_handler_id;
 
@@ -224,6 +227,5 @@ private:
        std::string m_useragent;
        RESULT trickSeek(gdouble ratio);
 };
-#endif
 
 #endif