Mercurial > mplayer.hg
comparison mplayer.c @ 5055:534167719e91
nortc patch by Attila Kinali
author | atmos4 |
---|---|
date | Tue, 12 Mar 2002 18:02:02 +0000 |
parents | b3bd4b29a03b |
children | a760c9f074df |
comparison
equal
deleted
inserted
replaced
5054:93c65f130dd6 | 5055:534167719e91 |
---|---|
288 extern char *ao_subdevice; | 288 extern char *ao_subdevice; |
289 | 289 |
290 static stream_t* stream=NULL; | 290 static stream_t* stream=NULL; |
291 | 291 |
292 char* current_module=NULL; // for debugging | 292 char* current_module=NULL; // for debugging |
293 | |
294 #ifdef HAVE_RTC | |
295 int nortc; | |
296 #endif | |
293 | 297 |
294 static unsigned int inited_flags=0; | 298 static unsigned int inited_flags=0; |
295 #define INITED_VO 1 | 299 #define INITED_VO 1 |
296 #define INITED_AO 2 | 300 #define INITED_AO 2 |
297 #define INITED_GUI 4 | 301 #define INITED_GUI 4 |
677 lirc_mp_setup(); | 681 lirc_mp_setup(); |
678 inited_flags|=INITED_LIRC; | 682 inited_flags|=INITED_LIRC; |
679 #endif | 683 #endif |
680 | 684 |
681 #ifdef HAVE_RTC | 685 #ifdef HAVE_RTC |
686 if(!nortc) | |
687 { | |
682 if ((rtc_fd = open("/dev/rtc", O_RDONLY)) < 0) | 688 if ((rtc_fd = open("/dev/rtc", O_RDONLY)) < 0) |
683 perror ("Linux RTC init: open"); | 689 perror ("Linux RTC init: open"); |
684 else { | 690 else { |
685 unsigned long irqp; | 691 unsigned long irqp; |
686 | 692 |
695 close (rtc_fd); | 701 close (rtc_fd); |
696 rtc_fd = -1; | 702 rtc_fd = -1; |
697 } else | 703 } else |
698 printf("Using Linux's hardware RTC timing (%ldHz)\n", irqp); | 704 printf("Using Linux's hardware RTC timing (%ldHz)\n", irqp); |
699 } | 705 } |
706 } | |
700 #ifdef HAVE_NEW_GUI | 707 #ifdef HAVE_NEW_GUI |
701 // breaks DGA and SVGAlib and VESA drivers: --A'rpi | 708 // breaks DGA and SVGAlib and VESA drivers: --A'rpi |
702 // and now ? -- Pontscho | 709 // and now ? -- Pontscho |
703 if(use_gui) setuid( getuid() ); // strongly test, please check this. | 710 if(use_gui) setuid( getuid() ); // strongly test, please check this. |
704 #endif | 711 #endif |