X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/371447724a1e150c37a777e58a4725a3d2561c01..007c9240c1be4f000d98b0193c65440b9e1fb0e5:/lib/service/servicemp3.h

diff --git a/lib/service/servicemp3.h b/lib/service/servicemp3.h
index 279c3cf1..08b712c3 100644
--- a/lib/service/servicemp3.h
+++ b/lib/service/servicemp3.h
@@ -10,7 +10,7 @@ class eStaticServiceMP3Info;
 
 class eServiceFactoryMP3: public iServiceHandler
 {
-DECLARE_REF(eServiceFactoryMP3);
+	DECLARE_REF(eServiceFactoryMP3);
 public:
 	eServiceFactoryMP3();
 	virtual ~eServiceFactoryMP3();
@@ -41,7 +41,7 @@ typedef struct _GstElement GstElement;
 class eServiceMP3: public iPlayableService, public iPauseableService, 
 	public iServiceInformation, public iSeekableService, public Object
 {
-DECLARE_REF(eServiceMP3);
+	DECLARE_REF(eServiceMP3);
 public:
 	virtual ~eServiceMP3();
 
@@ -49,6 +49,8 @@ public:
 	RESULT connectEvent(const Slot2<void,iPlayableService*,int> &event, ePtr<eConnection> &connection);
 	RESULT start();
 	RESULT stop();
+	RESULT setTarget(int target);
+	
 	RESULT pause(ePtr<iPauseableService> &ptr);
 	RESULT setSlowMotion(int ratio);
 	RESULT setFastForward(int ratio);
@@ -56,12 +58,18 @@ public:
 	RESULT seek(ePtr<iSeekableService> &ptr);
 
 		// not implemented (yet)
+	RESULT audioChannel(ePtr<iAudioChannelSelection> &ptr) { ptr = 0; return -1; }
 	RESULT audioTracks(ePtr<iAudioTrackSelection> &ptr) { ptr = 0; return -1; }
-	RESULT frontendStatusInfo(ePtr<iFrontendStatusInformation> &ptr) { ptr = 0; return -1; }
+	RESULT frontendInfo(ePtr<iFrontendInformation> &ptr) { ptr = 0; return -1; }
 	RESULT subServices(ePtr<iSubserviceList> &ptr) { ptr = 0; return -1; }
 	RESULT timeshift(ePtr<iTimeshiftService> &ptr) { ptr = 0; return -1; }
-	RESULT cueSheet(ePtr<iCueSheet>& ptr) { ptr = 0; return -1; }
-	
+	RESULT cueSheet(ePtr<iCueSheet> &ptr) { ptr = 0; return -1; }
+	RESULT subtitle(ePtr<iSubtitleOutput> &ptr) { ptr = 0; return -1; }
+	RESULT audioDelay(ePtr<iAudioDelay> &ptr) { ptr = 0; return -1; }
+	RESULT rdsDecoder(ePtr<iRdsDecoder> &ptr) { ptr = 0; return -1; }
+	RESULT stream(ePtr<iStreamableService> &ptr) { ptr = 0; return -1; }
+	RESULT keys(ePtr<iServiceKeys> &ptr) { ptr = 0; return -1; }
+
 		// iPausableService
 	RESULT pause();
 	RESULT unpause();
@@ -75,7 +83,7 @@ public:
 	RESULT getPlayPosition(pts_t &SWIG_OUTPUT);
 	RESULT setTrickmode(int trick);
 	RESULT isCurrentlySeekable();
-	
+
 		// iServiceInformation
 	RESULT getName(std::string &name);
 	int getInfo(int w);
@@ -90,13 +98,16 @@ private:
 		stIdle, stRunning, stStopped,
 	};
 	int m_state;
-	GstElement *m_gst_pipeline, *m_gst_audio;
+	GstElement *m_gst_pipeline, *m_gst_audio, *m_gst_videoqueue, *m_gst_audioqueue, *m_decoder;
 	GstTagList *m_stream_tags;
 	eFixedMessagePump<int> m_pump;
 	
 	void gstBusCall(GstBus *bus, GstMessage *msg);
 	static GstBusSyncReply gstBusSyncHandler(GstBus *bus, GstMessage *message, gpointer user_data);
-	static void gstCBnewPad(GstElement *decodebin, GstPad *pad, gboolean last, gpointer data);
+	static void gstCBpadAdded(GstElement *decodebin, GstPad *pad, gpointer data); /* for mpegdemux */
+	static void gstCBfilterPadAdded(GstElement *filter, GstPad *pad, gpointer user_data); /* for id3demux */
+	static void gstCBnewPad(GstElement *decodebin, GstPad *pad, gboolean last, gpointer data); /* for decodebin */
+	static void gstCBunknownType(GstElement *decodebin, GstPad *pad, GstCaps *l, gpointer data);
 	void gstPoll(const int&);
 };
 #endif