summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cfg-mplayer.h8
-rw-r--r--mplayer.c7
2 files changed, 15 insertions, 0 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index 55d028dd77..172b49ff53 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -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
diff --git a/mplayer.c b/mplayer.c
index 9ddfd70126..abfd35184c 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -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