[Mplayer-cvslog] CVS: main/libvo sub.c,1.14,1.15 video_out_internal.h,1.5,1.6 vo_odivx.c,1.6,1.7 vo_pgm.c,1.6,1.7

[Adam Tla/lka]

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

Modified Files:
	sub.c video_out_internal.h vo_odivx.c vo_pgm.c 
Log Message:

atlka at pg.gda.pl:
utf8 opion corrected
added draw_osd() funcion to libvo/vo_*.c files
corrected indicators (brightness, sound etc.) to be in 0..100 range
if we have Name.utf file it automatically switches to utf8 mode


Index: sub.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/sub.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sub.c	13 Aug 2001 11:08:18 -0000	1.14
+++ sub.c	13 Aug 2001 11:33:34 -0000	1.15
@@ -187,35 +187,6 @@
 	      memy-=vo_font->height;
 	      xsize=lastxsize=-vo_font->charspace;
 	  }
-          xsize+=w+vo_font->charspace;
-	  if ((dxs<xsize && lastStripPosition>0) || j==len-1)
-	  {
-	    if (j==len-1) lastStripPosition=len;
-	      else xsize=lastxsize;
-	    j=lastStripPosition;
-
-            x=dxs/2-xsize/2;
-
-            for(k=previousStrip;k<lastStripPosition;k++){
-              int c=text[k];
-	      int font;
-              if (sub_unicode && (c>=0x80)) c=(c<<8)+text[++k];
-              font=vo_font->font[c];
-              if(x>=0 && x+vo_font->width[c]<dxs)
-                if(font>=0)
-                  draw_alpha(x,y,
-                    vo_font->width[c],
-                    vo_font->pic_a[font]->h,
-                    vo_font->pic_b[font]->bmp+vo_font->start[c],
-                    vo_font->pic_a[font]->bmp+vo_font->start[c],
-                    vo_font->pic_a[font]->w);
-              x+=vo_font->width[c]+vo_font->charspace;
-            }
-            x=0;
-            y+=vo_font->height;
-	    previousStrip=lastStripPosition;
-            xsize=lastxsize=-vo_font->charspace;
-	  }
         }
    }
    

Index: video_out_internal.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/video_out_internal.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- video_out_internal.h	13 Aug 2001 11:08:18 -0000	1.5
+++ video_out_internal.h	13 Aug 2001 11:33:34 -0000	1.6
@@ -25,6 +25,7 @@
 static const vo_info_t* get_info(void);
 static uint32_t draw_frame(uint8_t *src[]);
 static uint32_t draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y);
+static void draw_osd(void);
 static void flip_page(void);
 static void check_events(void);
 static void uninit(void);

Index: vo_odivx.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_odivx.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vo_odivx.c	24 Apr 2001 10:21:12 -0000	1.6
+++ vo_odivx.c	13 Aug 2001 11:33:34 -0000	1.7
@@ -137,6 +137,10 @@
     DWORD               dwChunkLength;          // Length of chunk
 } AVIINDEXENTRY;
 
+static void draw_osd(void)
+{
+}
+
 static void
 flip_page(void)
 {

Index: vo_pgm.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_pgm.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vo_pgm.c	12 Jun 2001 14:03:18 -0000	1.6
+++ vo_pgm.c	13 Aug 2001 11:33:34 -0000	1.7
@@ -58,6 +58,10 @@
     return &vo_info;
 }
 
+static void draw_osd(void)
+{
+}
+
 static void flip_page (void)
 {
     FILE * f;