X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2aa2925cf52add4b737c17a7e75c88a4fcc7057c..94b346a792a343858948de8c6db1301592af5986:/lib/service/servicemp3.h

diff --git a/lib/service/servicemp3.h b/lib/service/servicemp3.h
index 5e706e9b..15ed0b07 100644
--- a/lib/service/servicemp3.h
+++ b/lib/service/servicemp3.h
@@ -8,6 +8,8 @@
 #include <lib/dvb/subtitle.h>
 #include <lib/dvb/teletext.h>
 #include <gst/gst.h>
+/* for subtitles */
+#include <lib/gui/esubtitle.h>
 
 class eStaticServiceMP3Info;
 
@@ -48,7 +50,7 @@ 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 Object
+	public iServiceInformation, public iSeekableService, public iAudioTrackSelection, public iAudioChannelSelection, public iSubtitleOutput, public iStreamedService, public Object
 {
 	DECLARE_REF(eServiceMP3);
 public:
@@ -76,8 +78,8 @@ public:
 	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 stream(ePtr<iStreamableService> &ptr) { ptr = 0; return -1; }
 	RESULT keys(ePtr<iServiceKeys> &ptr) { ptr = 0; return -1; }
+	RESULT stream(ePtr<iStreamableService> &ptr) { ptr = 0; return -1; }
 
 		// iPausableService
 	RESULT pause();
@@ -97,6 +99,7 @@ public:
 	RESULT getName(std::string &name);
 	int getInfo(int w);
 	std::string getInfoString(int w);
+	PyObject *getInfoObject(int w);
 
 		// iAudioTrackSelection	
 	int getNumberOfTracks();
@@ -114,11 +117,17 @@ public:
 	PyObject *getSubtitleList();
 	PyObject *getCachedSubtitle();
 
+		// iStreamedService
+	RESULT streamed(ePtr<iStreamedService> &ptr);
+	PyObject *getBufferCharge();
+	int setBufferSize(int size);
+
 	struct audioStream
 	{
 		GstPad* pad;
 		audiotype_t type;
 		std::string language_code; /* iso-639, if available. */
+		std::string codec; /* clear text codec description */
 		audioStream()
 			:pad(0), type(atUnknown)
 		{
@@ -145,6 +154,17 @@ public:
 		{
 		}
 	};
+	struct bufferInfo
+	{
+		int bufferPercent;
+		int avgInRate;
+		int avgOutRate;
+		long long bufferingLeft;
+		bufferInfo()
+			:bufferPercent(0), avgInRate(0), avgOutRate(0), bufferingLeft(-1)
+		{
+		}
+	};
 private:
 	int m_currentAudioStream;
 	int m_currentSubtitleStream;
@@ -156,15 +176,17 @@ private:
 	ePtr<eTimer> m_seekTimeout;
 	void seekTimeoutCB();
 	friend class eServiceFactoryMP3;
-	std::string m_filename;
-	eServiceMP3(const char *filename);
+	eServiceReference m_ref;
+	int m_buffer_size;
+	bufferInfo m_bufferInfo;
+	eServiceMP3(eServiceReference ref);
 	Signal2<void,iPlayableService*,int> m_event;
 	enum
 	{
 		stIdle, stRunning, stStopped,
 	};
 	int m_state;
-	GstElement *m_gst_pipeline;
+	GstElement *m_gst_playbin;
 	GstTagList *m_stream_tags;
 	eFixedMessagePump<int> m_pump;
 	std::string m_error_message;
@@ -172,15 +194,22 @@ private:
 	audiotype_t gstCheckAudioPad(GstStructure* structure);
 	void gstBusCall(GstBus *bus, GstMessage *msg);
 	static GstBusSyncReply gstBusSyncHandler(GstBus *bus, GstMessage *message, gpointer user_data);
-	static void gstCBpadAdded(GstElement *decodebin, GstPad *pad, gpointer data); /* for mpegdemux */
-	static void gstCBfilterPadAdded(GstElement *filter, GstPad *pad, gpointer user_data); /* for id3demux */
-	static void gstCBnewPad(GstElement *decodebin, GstPad *pad, gboolean last, gpointer data); /* for decodebin */
-	static void gstCBunknownType(GstElement *decodebin, GstPad *pad, GstCaps *l, gpointer data);
-	static void gstCBsubtitleAvail(GstElement *element, GstBuffer *buffer, GstPad *pad, gpointer user_data);
-	static void gstCBsubtitlePadEvent(GstPad *pad, GstEvent *event, gpointer user_data);
+	static void gstCBsubtitleAvail(GstElement *element, gpointer user_data);
 	GstPad* gstCreateSubtitleSink(eServiceMP3* _this, subtype_t type);
 	void gstPoll(const int&);
+
+	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);
 };
 #endif