[Mplayer-cvslog] CVS: main/libvo sub.h,1.1,1.2 sub.c,1.3,1.4

[GEREOFFY]

Update of /cvsroot/mplayer/main/libvo
In directory usw-pr-cvs1:/tmp/cvs-serv4288

Modified Files:
	sub.h sub.c 
Log Message:
use subreader's sub struct

Index: sub.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/sub.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** sub.h	2001/03/27 00:32:24	1.1
--- sub.h	2001/03/30 03:01:50	1.2
***************
*** 7,12 ****
  extern int vo_osd_progbar_value;   // 0..255
  
! extern int vo_sub_lines;
! extern unsigned char* vo_sub_text[8];
  
  #define OSD_PLAY 0x01
--- 7,11 ----
  extern int vo_osd_progbar_value;   // 0..255
  
! extern subtitle* vo_sub;
  
  #define OSD_PLAY 0x01

Index: sub.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/sub.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** sub.c	2001/03/27 00:32:24	1.3
--- sub.c	2001/03/30 03:01:50	1.4
***************
*** 1,3 ****
--- 1,4 ----
  
+ #include "subreader.h"
  #include "sub.h"
  
***************
*** 90,95 ****
  
  
! int vo_sub_lines=2;
! unsigned char* vo_sub_text[8];
  
  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)){
--- 91,95 ----
  
  
! subtitle* vo_sub=NULL;
  
  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)){
***************
*** 97,104 ****
      int y;
  
!     y=dys-(1+vo_sub_lines)*vo_font->height;
      
!     for(i=0;i<vo_sub_lines;i++){
!         unsigned char* text="Hello World! HÛDEJÓ!"; //vo_sub_text[i];
          int len=strlen(text);
          int j;
--- 97,104 ----
      int y;
  
!     y=dys-(1+vo_sub->lines)*vo_font->height;
      
!     for(i=0;i<vo_sub->lines;i++){
!         unsigned char* text=vo_sub->text[i];//  "Hello World! HÛDEJÓ!";
          int len=strlen(text);
          int j;
***************
*** 145,149 ****
      }
  
!     if(vo_sub_lines>0){
          vo_draw_text_sub(dxs,dys,draw_alpha);
      }
--- 145,149 ----
      }
  
!     if(vo_sub){
          vo_draw_text_sub(dxs,dys,draw_alpha);
      }


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog