nortc patch by Attila Kinali

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5056 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
atmos4 2002-03-12 18:02:02 +00:00
parent df367a7e2c
commit b7180c614a
2 changed files with 15 additions and 0 deletions

View File

@ -94,6 +94,10 @@ extern int use_old_pp;
extern int xinerama_screen;
#endif
#ifdef HAVE_RTC
extern int nortc;
#endif
/* from libvo/aspect.c */
extern float monitor_aspect;
@ -307,6 +311,10 @@ static config_t mplayer_opts[]={
{"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

View File

@ -291,6 +291,10 @@ static stream_t* stream=NULL;
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 @@ if(!parse_codec_cfg(get_path("codecs.conf"))){
#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 @@ if(!parse_codec_cfg(get_path("codecs.conf"))){
} 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