X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/07c8a0395bd3df78c2c885b848f500c99b1c4407..0c59a4279f93f08fe95fca5f2e55f3e025f0cceb:/lib/service/servicemp3.h

diff --git a/lib/service/servicemp3.h b/lib/service/servicemp3.h
index 1ab4669c..a43c8ad9 100644
--- a/lib/service/servicemp3.h
+++ b/lib/service/servicemp3.h
@@ -43,6 +43,10 @@ public:
 
 typedef struct _GstElement GstElement;
 
+typedef enum { atUnknown, atMPEG, atMP3, atAC3, atDTS, atAAC, atPCM, atOGG, atFLAC } audiotype_t;
+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
 {
@@ -113,14 +117,33 @@ public:
 	struct audioStream
 	{
 		GstPad* pad;
-		enum { atMP2, atMP3, atAC3, atDTS, atAAC, atPCM, atOGG };
-		int type; // mpeg2, ac3, dts, ...
+		audiotype_t type;
 		std::string language_code; /* iso-639, if available. */
+		audioStream()
+			:pad(0), type(atUnknown)
+		{
+		}
 	};
 	struct subtitleStream
 	{
-		GstElement* element;
+		GstPad* pad;
+		subtype_t type;
 		std::string language_code; /* iso-639, if available. */
+		subtitleStream()
+			:pad(0)
+		{
+		}
+	};
+	struct sourceStream
+	{
+		audiotype_t audiotype;
+		containertype_t containertype;
+		bool is_video;
+		bool is_streaming;
+		sourceStream()
+			:audiotype(atUnknown), containertype(ctNone), is_video(FALSE), is_streaming(FALSE)
+		{
+		}
 	};
 private:
 	int m_currentAudioStream;
@@ -130,8 +153,8 @@ private:
 	std::vector<subtitleStream> m_subtitleStreams;
 	eSubtitleWidget *m_subtitle_widget;
 	int m_currentTrickRatio;
-	eTimer m_seekTimeout;
-	void eServiceMP3::seekTimeoutCB();
+	ePtr<eTimer> m_seekTimeout;
+	void seekTimeoutCB();
 	friend class eServiceFactoryMP3;
 	std::string m_filename;
 	eServiceMP3(const char *filename);
@@ -144,7 +167,9 @@ private:
 	GstElement *m_gst_pipeline;
 	GstTagList *m_stream_tags;
 	eFixedMessagePump<int> m_pump;
+	std::string m_error_message;
 
+	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 */
@@ -152,6 +177,8 @@ private:
 	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);
+	GstPad* gstCreateSubtitleSink(eServiceMP3* _this, subtype_t type);
 	void gstPoll(const int&);
 };
 #endif