[Mplayer-cvslog] CVS: main cfg-mplayer.h,1.137,1.138 mplayer.c,1.426,1.427

[Atmosfear]

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

Modified Files:
	cfg-mplayer.h mplayer.c 
Log Message:
nortc patch by Attila Kinali

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- cfg-mplayer.h	3 Mar 2002 14:17:53 -0000	1.137
+++ cfg-mplayer.h	12 Mar 2002 18:02:02 -0000	1.138
@@ -94,6 +94,10 @@
 extern int xinerama_screen;
 #endif
 
+#ifdef HAVE_RTC
+extern int nortc;
+#endif
+
 /* from libvo/aspect.c */
 extern float monitor_aspect;
 
@@ -305,6 +309,10 @@
 
 #ifdef HAVE_XINERAMA
 	{"xineramascreen", &xinerama_screen, CONF_TYPE_INT, CONF_RANGE, 0, 32, NULL},
+#endif
+
+#ifdef HAVE_RTC
+	{"nortc", &nortc, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 #endif
 
 #define MAIN_CONF

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.426
retrieving revision 1.427
diff -u -r1.426 -r1.427
--- mplayer.c	11 Mar 2002 09:19:13 -0000	1.426
+++ mplayer.c	12 Mar 2002 18:02:02 -0000	1.427
@@ -291,6 +291,10 @@
 
 char* current_module=NULL; // for debugging
 
+#ifdef HAVE_RTC
+int nortc;
+#endif
+
 static unsigned int inited_flags=0;
 #define INITED_VO 1
 #define INITED_AO 2
@@ -679,6 +683,8 @@
 #endif
 
 #ifdef HAVE_RTC
+  if(!nortc)
+  {
     if ((rtc_fd = open("/dev/rtc", O_RDONLY)) < 0)
 	perror ("Linux RTC init: open");
     else {
@@ -697,6 +703,7 @@
 	} else
 	    printf("Using Linux's hardware RTC timing (%ldHz)\n", irqp);
     }
+  }
 #ifdef HAVE_NEW_GUI
 // breaks DGA and SVGAlib and VESA drivers:  --A'rpi
 // and now ? -- Pontscho