X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fservice%2Fservicemp3.h;h=01f7cf7f2efd6fa63aa15da1383089ad51f24b97;hp=d2a8fb0bf0de79ef0032b917cc02c4711e48ecaa;hb=675f9d0eeb82577252a68ee263049acc1ff80bcc;hpb=a9d34a0da90559741b525756944ced38bbf4538a

diff --git a/lib/service/servicemp3.h b/lib/service/servicemp3.h
index d2a8fb0..01f7cf7 100644
--- a/lib/service/servicemp3.h
+++ b/lib/service/servicemp3.h
@@ -41,6 +41,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;
@@ -49,8 +50,9 @@ typedef enum { atUnknown, atMPEG, atMP3, atAC3, atDTS, atAAC, atPCM, atOGG, atFL
 typedef enum { stPlainText, stSSA, stSRT } subtype_t;
 typedef enum { ctNone, ctMPEGTS, ctMPEGPS, ctMKV, ctAVI, ctMP4, ctVCD, ctCDA } containertype_t;
 
-class eServiceMP3: public iPlayableService, public iPauseableService, 
-	public iServiceInformation, public iSeekableService, public iAudioTrackSelection, public iAudioChannelSelection, public iSubtitleOutput, public iStreamedService, public Object
+class eServiceMP3: public iPlayableService, public iPauseableService,
+	public iServiceInformation, public iSeekableService, public iAudioTrackSelection, public iAudioChannelSelection, 
+	public iSubtitleOutput, public iStreamedService, public iAudioDelay, public Object
 {
 	DECLARE_REF(eServiceMP3);
 public:
@@ -70,13 +72,14 @@ public:
 	RESULT audioTracks(ePtr<iAudioTrackSelection> &ptr);
 	RESULT audioChannel(ePtr<iAudioChannelSelection> &ptr);
 	RESULT subtitle(ePtr<iSubtitleOutput> &ptr);
+	RESULT audioDelay(ePtr<iAudioDelay> &ptr);
 
 		// not implemented (yet)
 	RESULT frontendInfo(ePtr<iFrontendInformation> &ptr) { ptr = 0; return -1; }
 	RESULT subServices(ePtr<iSubserviceList> &ptr) { ptr = 0; return -1; }
 	RESULT timeshift(ePtr<iTimeshiftService> &ptr) { ptr = 0; return -1; }
 	RESULT cueSheet(ePtr<iCueSheet> &ptr) { ptr = 0; return -1; }
-	RESULT audioDelay(ePtr<iAudioDelay> &ptr) { ptr = 0; return -1; }
+
 	RESULT rdsDecoder(ePtr<iRdsDecoder> &ptr) { ptr = 0; return -1; }
 	RESULT keys(ePtr<iServiceKeys> &ptr) { ptr = 0; return -1; }
 	RESULT stream(ePtr<iStreamableService> &ptr) { ptr = 0; return -1; }
@@ -122,6 +125,12 @@ public:
 	PyObject *getBufferCharge();
 	int setBufferSize(int size);
 
+		// iAudioDelay
+	int getAC3Delay();
+	int getPCMDelay();
+	void setAC3Delay(int);
+	void setPCMDelay(int);
+
 	struct audioStream
 	{
 		GstPad* pad;
@@ -166,6 +175,8 @@ public:
 		}
 	};
 private:
+	static int pcm_delay;
+	static int ac3_delay;
 	int m_currentAudioStream;
 	int m_currentSubtitleStream;
 	int selectAudioStream(int i);
@@ -197,17 +208,24 @@ 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