libeplayer3: subtitles will now be displayed by neutrino

libeplayer3/include/container.h

@@ -37,10 +37,6 @@ extern Container_t FFMPEGContainer;
 typedef struct ContainerHandler_s {
     char *Name;
     Container_t *selectedContainer;
-    Container_t *textSrtContainer;
-    Container_t *textSsaContainer;
-    Container_t *assContainer;
-
     int (*Command) ( /*Context_t */ void *, ContainerCmd_t, void *);
 } ContainerHandler_t;
 

libeplayer3/include/subtitle.h

@@ -23,6 +23,7 @@
 
 #include <sys/types.h>
 
+#if 0
 #define DEFAULT_ASS_HEAD "[Script Info]\n\
 Original Script: (c) 2008\n\
 ScriptType: v4.00\n\
@@ -76,7 +77,6 @@ typedef enum {
     eSub_Txt
 } SubType_t;
 
-
 typedef struct {
     unsigned char *data;
     int len;
@@ -102,6 +102,7 @@ typedef struct {
 	SubGfx_t gfx;
     } u;
 } SubtitleOut_t;
+#endif
 
 typedef struct {
     unsigned char *data;
@@ -115,13 +116,9 @@ typedef struct {
 } SubtitleData_t;
 
 typedef struct {
-    uint32_t *destination;
-    unsigned int screen_width;
-    unsigned int screen_height;
-    unsigned int destStride;
-
-    void (*framebufferBlit) (void);
     void (*dvbsubWrite) (void *, int64_t);
+    void (*dvbsubAssWrite)(void /*AVCodecContext*/ *c, void /*AVSubtitle*/ *sub, int pid);
+    void (*dvbsubAssClear) (void);
 } SubtitleOutputDef_t;
 
 #endif

libeplayer3/include/writer.h

@@ -20,24 +20,6 @@ typedef struct {
     unsigned char Version;
 } WriterAVCallData_t;
 
-typedef struct {
-    unsigned char *data;
-    unsigned int Width;
-    unsigned int Height;
-    unsigned int Stride;
-    unsigned int color;
-
-    unsigned int x;		/* dst x ->given by ass */
-    unsigned int y;		/* dst y ->given by ass */
-
-    /* destination values if we use a shared framebuffer */
-    int fd;
-    unsigned int Screen_Width;
-    unsigned int Screen_Height;
-    uint32_t *destination;
-    unsigned int destStride;
-} WriterFBCallData_t;
-
 typedef struct WriterCaps_s {
     char *name;
     eWriterType_t type;
@@ -75,7 +57,6 @@ extern Writer_t WriterVideoMSCOMP;
 extern Writer_t WriterVideoH263;
 extern Writer_t WriterVideoFLV;
 extern Writer_t WriterVideoVC1;
-extern Writer_t WriterFramebuffer;
 extern Writer_t WriterPipe;
 extern Writer_t WriterDVBSubtitle;