[MPlayer-cvslog] CVS: main configure, 1.948, 1.949 mplayer.c, 1.826, 1.827

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv19374

Modified Files:
	configure mplayer.c 
Log Message:
RTC support on FreeBSD, inspired by a patch from Michael Johnson
<ahze at FreeBSD dot org> and Reimar Döffinger.


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.948
retrieving revision 1.949
diff -u -r1.948 -r1.949
--- configure	30 Dec 2004 12:11:32 -0000	1.948
+++ configure	6 Jan 2005 00:06:55 -0000	1.949
@@ -5024,8 +5024,13 @@
   if test "$_rtc" = auto ; then
     cat > $TMPC << EOF
 #include <sys/ioctl.h>
+#ifdef __linux__
 #include <linux/rtc.h>
-int main(void) { return RTC_IRQP_READ; }
+#else
+#include <rtc.h>
+#define RTC_PIE_ON RTCIO_PIE_ON
+#endif
+int main(void) { return RTC_PIE_ON; }
 EOF
     _rtc=no
     cc_check && _rtc=yes
@@ -5033,7 +5038,7 @@
   echores "$_rtc"
 else
   _rtc=no
-  echores "no (Linux specific feature)"
+  echores "no"
 fi
 if test "$_rtc" = yes ; then
   _def_rtc='#define HAVE_RTC 1'
@@ -6959,7 +6964,7 @@
 /* define this to use nl_langinfo function */
 $_def_langinfo
 
-/* define this to use RTC (/dev/rtc) for video timers (LINUX only) */
+/* define this to use RTC (/dev/rtc) for video timers */
 $_def_rtc
 
 /* set up max. outburst. use 65536 for ALSA 0.5, for others 16384 is enough */

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.826
retrieving revision 1.827
diff -u -r1.826 -r1.827
--- mplayer.c	2 Jan 2005 14:10:13 -0000	1.826
+++ mplayer.c	6 Jan 2005 00:06:56 -0000	1.827
@@ -92,7 +92,13 @@
 #define ROUND(x) ((int)((x)<0 ? (x)-0.5 : (x)+0.5))
 
 #ifdef HAVE_RTC
+#ifdef __linux__
 #include <linux/rtc.h>
+#else
+#include <rtc.h>
+#define RTC_IRQP_SET RTCIO_IRQP_SET
+#define RTC_PIE_ON   RTCIO_PIE_ON
+#endif
 #endif
 
 #ifdef USE_TV