[Mplayer-cvslog] CVS: main cfg-mplayer.h,1.9,1.10 configure,1.11,1.12 mplayer.c,1.29,1.30

[Szabolcs Berecz]

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

Modified Files:
	cfg-mplayer.h configure mplayer.c 
Log Message:
vo_fbdev added

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** cfg-mplayer.h	2001/03/25 20:38:14	1.9
--- cfg-mplayer.h	2001/03/28 12:08:44	1.10
***************
*** 10,13 ****
--- 10,16 ----
  	{"vo", &video_driver, CONF_TYPE_STRING, 0, 0, 0},
  	{"dsp", &dsp, CONF_TYPE_STRING, 0, 0, 0},
+ #ifdef HAVE_FBDEV
+ 	{"fb", &fb_dev_name, CONF_TYPE_STRING, 0, 0, 0},
+ #endif
  	{"encode", &encode_name, CONF_TYPE_STRING, 0, 0, 0},
  	{"font", &font_name, CONF_TYPE_STRING, 0, 0, 0},

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** configure	2001/03/24 21:37:25	1.11
--- configure	2001/03/28 12:08:44	1.12
***************
*** 83,86 ****
--- 83,87 ----
  	--enable-vm		build with XF86VidMode support for x11 driver
          --enable-x11            build with X11 render support [autodetect]
+ 	--enable-fbdev		build with FBDev render support [_not_ autodetected]
  	--enable-mlib		build with MLIB support ( only Solaris )
  
***************
*** 167,170 ****
--- 168,172 ----
  _xmga=no
  _dga=no
+ _fbdev=no
  _lirc=no
  
***************
*** 458,461 ****
--- 460,466 ----
          _syncfb=yes
          ;;
+   --enable-fbdev)
+   	_fbdev=yes
+ 	;;
    --enable-mlib)
  	_mlib=yes
***************
*** 509,512 ****
--- 514,520 ----
  	_dga=no
  	;;
+   --disable-fbdev)
+   	_fbdev=no
+ 	;;
    --disable-termcap)
  	_termcap=no
***************
*** 549,552 ****
--- 557,561 ----
  echo "Checking for DGA ... $_dga"
  echo "Checking for Xf86VM ... $_vm"
+ echo "Checking for FBDev ... $_fbdev"
  # write conf files.
  
***************
*** 719,722 ****
--- 728,738 ----
  fi
  
+ if [ $_fbdev = yes ]; then
+  _fbdev='#define HAVE_FBDEV'
+  _vosrc=$_vosrc' vo_fbdev.c'
+ else
+  _fbdev='#undef HAVE_FBDEV'
+ fi
+ 
  if [ $_mpg123 = yes ]; then
   _mpg123='#define DEFAULT_MPG123'
***************
*** 796,799 ****
--- 812,816 ----
  $_mga
  $_syncfb
+ $_fbdev
  
  #if defined(HAVE_GL)||defined(HAVE_X11)||defined(HAVE_XV)

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** mplayer.c	2001/03/27 00:39:24	1.29
--- mplayer.c	2001/03/28 12:08:44	1.30
***************
*** 73,76 ****
--- 73,78 ----
  #endif
  
+ extern char *fb_dev_name;
+ 
  extern int vo_screenwidth;
  
***************
*** 1932,1936 ****
      if(!osd_visible) vo_osd_progbar_type=-1; // disable
    }
- 
    } //  while(v_frame<a_frame || force_redraw)
  
--- 1934,1937 ----


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