[Mplayer-cvslog] CVS: main mplayer.c,1.26,1.27 cfg-mplayer.h,1.7,1.8

[GEREOFFY]

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

Modified Files:
	mplayer.c cfg-mplayer.h 
Log Message:
new option: -font

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** mplayer.c	2001/03/24 21:36:15	1.26
--- mplayer.c	2001/03/25 04:27:39	1.27
***************
*** 414,417 ****
--- 414,418 ----
  char *conffile;
  int conffile_fd;
+ char *font_name=NULL;
  #include "cfg-mplayer.h"
  
***************
*** 459,462 ****
--- 460,469 ----
  }
  
+ // check font
+   if(font_name){
+        vo_font=read_font_desc(font_name);
+        if(!vo_font) printf("Can't load font: %s\n",font_name);
+   }
+ 
  // check video_out driver name:
    if(!video_driver)
***************
*** 1135,1138 ****
--- 1142,1146 ----
  double audio_time_usage=0;
  int grab_frames=0;
+ char osd_text_buffer[64];
  
  #ifdef HAVE_LIRC
***************
*** 1912,1915 ****
--- 1920,1928 ----
    } //  while(v_frame<a_frame || force_redraw)
  
+ 
+ //================= Update OSD ====================
+ 
+ sprintf(osd_text_buffer,"%02d:%02d:%02d",(int)v_pts/3600,((int)v_pts/60)%60,((int)v_pts)%60);
+ vo_osd_text=osd_text_buffer;
  
  //================= Keyboard events, SEEKing ====================

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** cfg-mplayer.h	2001/03/24 21:34:08	1.7
--- cfg-mplayer.h	2001/03/25 04:27:39	1.8
***************
*** 11,14 ****
--- 11,15 ----
  	{"dsp", &dsp, CONF_TYPE_STRING, 0, 0, 0},
  	{"encode", &encode_name, CONF_TYPE_STRING, 0, 0, 0},
+ 	{"font", &font_name, CONF_TYPE_STRING, 0, 0, 0},
  	{"bg", &play_in_bg, CONF_TYPE_FLAG, 0, 0, 1},
  	{"nobg", &play_in_bg, CONF_TYPE_FLAG, 0, 1, 0},


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