[Mplayer-cvslog] CVS: main/libvo sub.c,1.48,1.49 sub.h,1.14,1.15

[Arpi of Ize]

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

Modified Files:
	sub.c sub.h 
Log Message:
vo_osd_check_range_update() added + 10l fix

Index: sub.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/sub.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sub.c	15 Apr 2002 22:08:50 -0000	1.48
+++ sub.c	16 Apr 2002 00:35:01 -0000	1.49
@@ -443,6 +443,7 @@
 	  }
 //	  obj->flags&=~OSDFLAG_OLD_BBOX;
       }
+      obj=obj->next;
     }
 }
 
@@ -493,3 +494,19 @@
     return ret;
 }
 
+//      BBBBBBBBBBBB   AAAAAAAAAAAAA  BBBBBBBBBBB
+//              BBBBBBBBBBBB  BBBBBBBBBBBBB
+//                        BBBBBBB
+
+// return TRUE if we have osd in the specified rectangular area:
+int vo_osd_check_range_update(int x1,int y1,int x2,int y2){
+    mp_osd_obj_t* obj=vo_osd_list;
+    while(obj){
+	if(obj->flags&OSDFLAG_VISIBLE){
+	    if(	(obj->bbox.x1<=x2 && obj->bbox.x2>=x1) &&
+		(obj->bbox.y1<=y2 && obj->bbox.y2>=y1) ) return 1;
+	}
+	obj=obj->next;
+    }
+    return 0;
+}

Index: sub.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/sub.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sub.h	15 Apr 2002 22:08:50 -0000	1.14
+++ sub.h	16 Apr 2002 00:35:01 -0000	1.15
@@ -89,6 +89,7 @@
 //extern void vo_draw_text_progbar(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride));
 //extern void vo_draw_text_sub(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride));
 extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride));
+extern void vo_remove_text(int dxs,int dys,void (*remove)(int x0,int y0, int w,int h));
 
 void vo_init_osd();
 int vo_update_osd(int dxs,int dys);