fix compiler warnings

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

diff --git a/lib/service/servicemp3.h b/lib/service/servicemp3.h
index 5b2a3be5c597e54549fcc71cef6551da0cae82f7..fc3c85ff49d25b6c4cd188865ba42ad17e5a1a88 100644 (file)
--- a/lib/service/servicemp3.h
+++ b/lib/service/servicemp3.h
@@ -43,6 +43,8 @@ public:
 
 typedef struct _GstElement GstElement;
 
+typedef enum { atUnknown, atMPEG, atMP3, atAC3, atDTS, atAAC, atPCM, atOGG } audiotype_t;
+
 class eServiceMP3: public iPlayableService, public iPauseableService, 
        public iServiceInformation, public iSeekableService, public iAudioTrackSelection, public iAudioChannelSelection, public iSubtitleOutput, public Object
 {
@@ -113,7 +115,7 @@ public:
        struct audioStream
        {
                GstPad* pad;
-               enum { atUnknown, atMP2, atMP3, atAC3, atDTS, atAAC, atPCM, atOGG } type;
+               audiotype_t type;
                std::string language_code; /* iso-639, if available. */
                audioStream()
                        :pad(0), type(atUnknown)
@@ -122,8 +124,12 @@ public:
        };
        struct subtitleStream
        {
-               GstElement* element;
+               GstPad* pad;
                std::string language_code; /* iso-639, if available. */
+               subtitleStream()
+                       :pad(0)
+               {
+               }
        };
 private:
        int m_currentAudioStream;
@@ -134,7 +140,7 @@ private:
        eSubtitleWidget *m_subtitle_widget;
        int m_currentTrickRatio;
        eTimer m_seekTimeout;
-       void eServiceMP3::seekTimeoutCB();
+       void seekTimeoutCB();
        friend class eServiceFactoryMP3;
        std::string m_filename;
        eServiceMP3(const char *filename);
@@ -148,6 +154,7 @@ private:
        GstTagList *m_stream_tags;
        eFixedMessagePump<int> m_pump;
 
+       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 */
@@ -155,6 +162,7 @@ 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);
        void gstPoll(const int&);
 };
 #endif