libeplayer3: implement Output class

libeplayer3/include/manager.h

@@ -31,7 +31,7 @@ typedef enum {
 
 typedef struct Track_s {
     std::string Name;
-    int Id;
+    int pid;
 
     /* new field for ffmpeg - add at the end so no problem
      * can occur with not changed srt saa container
@@ -53,7 +53,7 @@ typedef struct Track_s {
 
     int ac3flags;
 
-    Track_s() : Id(-1), language(NULL), duration(-1), avfc(NULL), stream(NULL), pending(0), is_static(0), chapter_start(0), chapter_end(0), ac3flags(-1) {}
+    Track_s() : pid(-1), language(NULL), duration(-1), avfc(NULL), stream(NULL), pending(0), is_static(0), chapter_start(0), chapter_end(0), ac3flags(-1) {}
 } Track_t;
 
 struct Player;

libeplayer3/include/output.h

@@ -4,6 +4,11 @@
 #include <stdio.h>
 #include <stdint.h>
 
+
+#include <OpenThreads/ScopedLock>
+#include <OpenThreads/Thread>
+#include <OpenThreads/Condition>
+
 extern "C" {
 #include <libavutil/avutil.h>
 #include <libavutil/time.h>
@@ -12,39 +17,38 @@ extern "C" {
 #include <libavutil/opt.h>
 }
 
-typedef enum {
-    OUTPUT_INIT,
-    OUTPUT_ADD,
-    OUTPUT_DEL,
-    OUTPUT_PLAY,
-    OUTPUT_STOP,
-    OUTPUT_PAUSE,
-    OUTPUT_OPEN,
-    OUTPUT_CLOSE,
-    OUTPUT_FLUSH,
-    OUTPUT_CONTINUE,
-    OUTPUT_FASTFORWARD,
-    OUTPUT_AVSYNC,
-    OUTPUT_CLEAR,
-    OUTPUT_PTS,
-    OUTPUT_SLOWMOTION,
-    OUTPUT_AUDIOMUTE,
-    OUTPUT_REVERSE,
-    OUTPUT_DISCONTINUITY_REVERSE,
-    OUTPUT_GET_FRAME_COUNT,
-} OutputCmd_t;
+#include "writer.h"
 
-struct Player;
-
-typedef struct Output_s {
-    const char *Name;
-    int (*Command) (Player *, OutputCmd_t, const char *);
-    bool (*Write) (AVFormatContext *avfc, AVStream *stream, AVPacket *packet, int64_t &Pts);
-    const char **Capabilities;
-
-} Output_t;
-
-extern Output_t LinuxDvbOutput;
-extern Output_t SubtitleOutput;
+class Output
+{
+	private:
+		int videofd;
+		int audiofd;
+		Writer *videoWriter, *audioWriter;
+		OpenThreads::Mutex audioMutex, videoMutex;
+		AVStream *audioStream, *videoStream;
+	public:
+		Output();
+		~Output();
+		bool Open();
+		bool Close();
+		bool Play();
+		bool Stop();
+		bool Pause();
+		bool Continue();
+		bool Mute(bool);
+		bool Flush();
+		bool FastForward(int speed);
+		bool SlowMotion(int speed);
+		bool AVSync(bool);
+		bool Clear();
+		bool ClearAudio();
+		bool ClearVideo();
+		bool GetPts(int64_t &pts);
+		bool GetFrameCount(int64_t &framecount);
+		bool SwitchAudio(AVStream *stream);
+		bool SwitchVideo(AVStream *stream);
+		bool Write(AVFormatContext *avfc, AVStream *stream, AVPacket *packet, int64_t &Pts);
+};
 
 #endif

libeplayer3/include/player.h

@@ -12,12 +12,13 @@ class Player {
 	public: //FIXME
 	    PlaybackHandler_t *playback;
 	    ContainerHandler_t *container;
-	    Output_t *output;
 	    ManagerHandler_t *manager;
 	    int64_t *currentAudioPtsP;
 	public:
 	    Player();
 	    ~Player();
+
+	    Output output;
 };
 
 int container_ffmpeg_update_tracks(Player * context, const char *filename);