diff libvo/sub.c @ 6110:7bea806b9c5f

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.

--- a/libvo/sub.c	Fri May 17 20:55:16 2002 +0000
+++ b/libvo/sub.c	Fri May 17 23:47:27 2002 +0000
@@ -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;
@@ -482,9 +475,6 @@
 	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);
 	    break;