# HG changeset patch # User atmos4 # Date 1015956122 0 # Node ID 534167719e91e276fca62a55a235f74e7e080d8e # Parent 93c65f130dd69d88a7de2b9ae3843927eb705469 nortc patch by Attila Kinali diff -r 93c65f130dd6 -r 534167719e91 cfg-mplayer.h --- a/cfg-mplayer.h Tue Mar 12 12:36:00 2002 +0000 +++ b/cfg-mplayer.h Tue Mar 12 18:02:02 2002 +0000 @@ -94,6 +94,10 @@ extern int xinerama_screen; #endif +#ifdef HAVE_RTC +extern int nortc; +#endif + /* from libvo/aspect.c */ extern float monitor_aspect; @@ -307,6 +311,10 @@ {"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 #include "cfg-common.h" #undef MAIN_CONF diff -r 93c65f130dd6 -r 534167719e91 mplayer.c --- a/mplayer.c Tue Mar 12 12:36:00 2002 +0000 +++ b/mplayer.c Tue Mar 12 18:02:02 2002 +0000 @@ -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