also use refcounting for eTimers

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

diff --git a/lib/service/servicemp3.h b/lib/service/servicemp3.h
index fc3c85ff49d25b6c4cd188865ba42ad17e5a1a88..a43c8ad95897d96c1d147d6293260233cc46dc56 100644 (file)
--- a/lib/service/servicemp3.h
+++ b/lib/service/servicemp3.h
@@ -43,7 +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
@@ -125,12 +127,24 @@ public:
        struct subtitleStream
        {
                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;
        int m_currentSubtitleStream;
@@ -139,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;
@@ -153,6 +167,7 @@ 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);
@@ -163,6 +178,7 @@ private:
        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