X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fservice%2Fservicemp3.h;h=d54997a604f5f12f9da50fafdd7b7440944d764f;hp=985179f65642143902bb0a9a5ef7df6bef8fd762;hb=484b456dc42d819bb58401cc06abd8cf2be933bf;hpb=a95987bbd88eb84db03a431826d4b21cb7725a0f

diff --git a/lib/service/servicemp3.h b/lib/service/servicemp3.h
index 985179f..d54997a 100644
--- 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>
@@ -41,6 +40,7 @@ class eStaticServiceMP3Info: public iStaticServiceInformation
 public:
 	RESULT getName(const eServiceReference &ref, std::string &name);
 	int getLength(const eServiceReference &ref);
+	int getInfo(const eServiceReference &ref, int w);
 };
 
 typedef struct _GstElement GstElement;
@@ -167,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)
 		{
@@ -207,20 +207,25 @@ private:
 	static void gstCBsubtitleAvail(GstElement *element, gpointer user_data);
 	GstPad* gstCreateSubtitleSink(eServiceMP3* _this, subtype_t type);
 	void gstPoll(const int&);
+	static void gstHTTPSourceSetAgent(GObject *source, GParamSpec *unused, gpointer user_data);
 
 	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;
 
 	RESULT seekToImpl(pts_t to);
 
 	gint m_aspect, m_width, m_height, m_framerate, m_progressive;
+	std::string m_useragent;
 	RESULT trickSeek(gdouble ratio);
 };
-#endif
 
 #endif