# HG changeset patch
# User nenolod
# Date 1161848592 25200
# Node ID 96fc1ef32c99872d75c8b90c63532d84eef58ad0
# Parent  b59bca84e3cdb140135e406b3f9760ee0b905471
[svn] - push fixes from p4://depot/svn-audacious-plugins-devel/virt-branches/audalarm/src

diff -r b59bca84e3cd -r 96fc1ef32c99 ChangeLog
--- a/ChangeLog	Thu Oct 26 00:10:28 2006 -0700
+++ b/ChangeLog	Thu Oct 26 00:43:12 2006 -0700
@@ -1,3 +1,18 @@
+2006-10-26 07:10:28 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [242]
+  - add xmms-alarm port
+  
+  trunk/configure.ac          |    3 
+  trunk/src/alarm/Makefile    |   18 
+  trunk/src/alarm/alarm.c     | 1031 ++++++++++++++++++++++++++++++
+  trunk/src/alarm/alarm.h     |   58 +
+  trunk/src/alarm/callbacks.h |   49 +
+  trunk/src/alarm/interface.c | 1506 ++++++++++++++++++++++++++++++++++++++++++++
+  trunk/src/alarm/interface.h |   12 
+  trunk/src/alarm/support.h   |    7 
+  8 files changed, 2683 insertions(+), 1 deletion(-)
+
+
 2006-10-25 20:41:36 +0000  Tony Vroon <chainsaw@gentoo.org>
   revision [240]
   669 is 2-byte, not 4-byte. Thanks to a report from Kevin Korb on #audacious.
diff -r b59bca84e3cd -r 96fc1ef32c99 src/alarm/alarm.c
--- a/src/alarm/alarm.c	Thu Oct 26 00:10:28 2006 -0700
+++ b/src/alarm/alarm.c	Thu Oct 26 00:43:12 2006 -0700
@@ -662,14 +662,9 @@
  */
 static void threadsleep(float x)
 {
-   struct timespec rqtp, rmtp;
-
    DEBUG("threadsleep: waiting %f seconds\n", x);
 
-   rqtp.tv_sec = x;
-   rqtp.tv_nsec = (int)((float)(x - (int)x) * 1000000000.0);
-
-   nanosleep(&rqtp, &rmtp);
+   g_usleep((int) ((float) x * (float) 1000000.0));
 
    return;
 }