Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs

[enigma2.git] / lib / service / servicemp3.h

diff --git a/lib/service/servicemp3.h b/lib/service/servicemp3.h
index ea06429917e2681856fea5b6a73806c0a4d4ff70..5e706e9be09f7ca1097a3f59ef61c91bd3eaa3c4 100644 (file)
--- 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