[Mplayer-cvslog] CVS: main lirc_mp.c,1.6,1.7 cfg-mplayer.h,1.60,1.61

[Andreas Ackermann]

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

Modified Files:
	lirc_mp.c cfg-mplayer.h 
Log Message:
- new config option -lircconfig (config file for lirc)
- new config option -(no)double (disable/enable doublebuffering in libvo) 


Index: lirc_mp.c
===================================================================
RCS file: /cvsroot/mplayer/main/lirc_mp.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** lirc_mp.c	2001/04/23 17:17:04	1.6
--- lirc_mp.c	2001/06/17 20:38:01	1.7
***************
*** 29,32 ****
--- 29,33 ----
  static struct lirc_config *lirc_config;
  static int    lirc_is_setup = 0;
+ char *lirc_configfile = NULL;
  
  // setup routine ---------------------------------------------------
***************
*** 58,63 ****
  
  
!   if(lirc_readconfig( NULL,&lirc_config,NULL )!=0 ){
!     printf("Failed to read standard config (~/.lircrc)!\n" );
      printf("You won't be able to use your remote control\n");
      lirc_deinit();
--- 59,65 ----
  
  
!   if(lirc_readconfig( lirc_configfile,&lirc_config,NULL )!=0 ){
!     printf("Failed to read config file %s !\n", 
! 		    lirc_configfile == NULL ? "~/.lircrc" : lirc_configfile);
      printf("You won't be able to use your remote control\n");
      lirc_deinit();

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -r1.60 -r1.61
*** cfg-mplayer.h	2001/06/13 21:55:24	1.60
--- cfg-mplayer.h	2001/06/17 20:38:01	1.61
***************
*** 24,27 ****
--- 24,32 ----
  #endif
  
+ #ifdef HAVE_LIRC
+ extern char *lirc_configfile;
+ #endif
+ 
+ extern int vo_doublebuffering;
  extern int vo_dbpp;
  extern int osd_level;
***************
*** 151,154 ****
--- 156,164 ----
         
          {"bpp", &vo_dbpp, CONF_TYPE_INT, CONF_RANGE, 0, 32},
+ 	{"double", &vo_doublebuffering, CONF_TYPE_FLAG, 0, 0, 1},
+ 	{"nodouble", &vo_doublebuffering, CONF_TYPE_FLAG, 0, 1, 0},
+ #ifdef HAVE_LIRC
+ 	{"lircconf", &lirc_configfile, CONF_TYPE_STRING, 0, 0, 0}, 
+ #endif
  	
  	{"noidx", &index_mode, CONF_TYPE_FLAG, 0, -1, 0},


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