[Mplayer-cvslog] CVS: main/libvo sub.c,1.50,1.51 sub.h,1.17,1.18 video_out.h,1.32,1.33

[Alban Bedel CVS]

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var/tmp.root/cvs-serv10859/libvo

Modified Files:
	sub.c sub.h video_out.h 
Log Message:
Improvment for spu subtitles.
Removed the integreted spudec in vobsub.
Various cleanup/bugfix in vobsub (no more auto palette when a true one is
here)
HW spu rendering moved in spudec because we first need to reassable the
packet before sending them to the hw.
Spudec is now created only if nedded.


Index: sub.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/sub.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sub.c	17 Apr 2002 20:46:12 -0000	1.50
+++ sub.c	17 May 2002 23:47:27 -0000	1.51
@@ -390,12 +390,6 @@
 	    else
 		obj->flags&=~OSDFLAG_VISIBLE;
 	    break;
-	case OSDTYPE_VOBSUB:
-	    if(vo_vobsub)
-		obj->flags|=OSDFLAG_VISIBLE|OSDFLAG_CHANGED;
-	    else
-		obj->flags&=~OSDFLAG_VISIBLE;
-	    break;
 	case OSDTYPE_OSD:
 	    if(vo_font && vo_osd_text && vo_osd_text[0]){
 		vo_update_text_osd(obj,dxs,dys); // update bbox
@@ -443,13 +437,12 @@
 	draw_alpha_init_flag=1;
 	vo_draw_alpha_init();
     }
-    if(vo_osd_list) free_osd_list;
+    if(vo_osd_list) free_osd_list();
     // temp hack, should be moved to mplayer/mencoder later
     new_osd_obj(OSDTYPE_OSD);
     new_osd_obj(OSDTYPE_SUBTITLE);
     new_osd_obj(OSDTYPE_PROGBAR);
     new_osd_obj(OSDTYPE_SPU);
-    new_osd_obj(OSDTYPE_VOBSUB);
 }
 
 int vo_osd_changed_flag=0;
@@ -481,9 +474,6 @@
 	switch(obj->type){
 	case OSDTYPE_SPU:
 	    spudec_draw_scaled(vo_spudec, dxs, dys, draw_alpha); // FIXME
-	    break;
-	case OSDTYPE_VOBSUB:
-	    vobsub_draw(vo_vobsub, dxs, dys, draw_alpha);  // FIXME
 	    break;
 	case OSDTYPE_OSD:
 	    vo_draw_text_osd(obj,draw_alpha);

Index: sub.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/sub.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sub.h	12 May 2002 02:18:52 -0000	1.17
+++ sub.h	17 May 2002 23:47:27 -0000	1.18
@@ -10,7 +10,6 @@
 #define OSDTYPE_SUBTITLE 2
 #define OSDTYPE_PROGBAR 3
 #define OSDTYPE_SPU 4
-#define OSDTYPE_VOBSUB 5
 
 #define OSDFLAG_VISIBLE 1
 #define OSDFLAG_CHANGED 2

Index: video_out.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/video_out.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- video_out.h	16 Apr 2002 17:41:29 -0000	1.32
+++ video_out.h	17 May 2002 23:47:27 -0000	1.33
@@ -39,6 +39,7 @@
 /* libmpcodecs direct rendering: */
 #define VOCTRL_GET_IMAGE 9
 #define VOCTRL_DRAW_IMAGE 13
+#define VOCTRL_SET_SPU_PALETTE 14
 /* decoding ahead: */
 #define VOCTRL_GET_NUM_FRAMES 10
 #define VOCTRL_GET_FRAME_NUM  11