X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c331ea7ffd96ac9f9f60985179507dc81287c487..337572d8d61c37c2121a96ec7ab79e191eaa2e29:/lib/service/servicemp3.h

diff --git a/lib/service/servicemp3.h b/lib/service/servicemp3.h
index ea064299..5e706e9b 100644
--- a/lib/service/servicemp3.h
+++ b/lib/service/servicemp3.h
@@ -43,8 +43,9 @@ public:
 
 typedef struct _GstElement GstElement;
 
-typedef enum { atUnknown, atMPEG, atMP3, atAC3, atDTS, atAAC, atPCM, atOGG } audiotype_t;
+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
@@ -133,6 +134,17 @@ public:
 		{
 		}
 	};
+	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;
 	int m_currentSubtitleStream;
@@ -141,7 +153,7 @@ private:
 	std::vector<subtitleStream> m_subtitleStreams;
 	eSubtitleWidget *m_subtitle_widget;
 	int m_currentTrickRatio;
-	eTimer m_seekTimeout;
+	ePtr<eTimer> m_seekTimeout;
 	void seekTimeoutCB();
 	friend class eServiceFactoryMP3;
 	std::string m_filename;
@@ -168,6 +180,7 @@ private:
 	static void gstCBsubtitlePadEvent(GstPad *pad, GstEvent *event, gpointer user_data);
 	GstPad* gstCreateSubtitleSink(eServiceMP3* _this, subtype_t type);
 	void gstPoll(const int&);
+	gint m_aspect, m_width, m_height, m_framerate, m_progressive;
 };
 #endif