Qt: actions_manager: Change constructor and inline some functions.

[vlc] / src / misc / mtime.c

diff --git a/src/misc/mtime.c b/src/misc/mtime.c
index 0d1e06212d30a5da015a1323547d1c5b115ee186..2b27fbf40a05ecd74c17c0c90bb38a744dcbf3bf 100644 (file)
--- a/src/misc/mtime.c
+++ b/src/misc/mtime.c
@@ -52,10 +52,6 @@
 #   include <mmsystem.h>
 #endif
 
-#if defined( UNDER_CE )
-#   include <windows.h>
-#endif
-
 #if defined(HAVE_SYS_TIME_H)
 #   include <sys/time.h>
 #endif
@@ -314,6 +310,7 @@ mtime_t mdate( void )
     return res;
 }
 
+#undef mwait
 /**
  * Wait for a date
  *
@@ -342,15 +339,35 @@ void mwait( mtime_t date )
     }
 
 #elif defined (WIN32)
-    mtime_t total;
+    mtime_t i_total;
 
-    while ((total = (date - mdate ())) > 0)
+    while( (i_total = (date - mdate())) > 0 )
     {
-        DWORD delay = (total > 0x7fffffff) ? 0x7fffffff : total;
-        vlc_testcancel ();
-        SleepEx (delay, TRUE);
+        const mtime_t i_sleep = i_total / 1000;
+        DWORD i_delay = (i_sleep > 0x7fffffff) ? 0x7fffffff : i_sleep;
+        vlc_testcancel();
+        SleepEx( i_delay, TRUE );
     }
-    vlc_testcancel ();
+    vlc_testcancel();
+
+#elif defined( __APPLE__ )
+    /* Explicit hack: OSX does not cancel at nanosleep() */
+    vlc_mutex_t lock;
+    vlc_cond_t  wait;
+
+    vlc_mutex_init (&lock);
+    vlc_cond_init (&wait);
+    vlc_mutex_lock (&lock);
+
+    vlc_cleanup_push (vlc_mutex_destroy, &lock);
+    vlc_cleanup_push (vlc_cond_destroy, &wait);
+    vlc_cleanup_push (vlc_mutex_unlock, &lock);
+
+    vlc_cond_timedwait (&wait, &lock, date);
+
+    vlc_cleanup_run ();
+    vlc_cleanup_run ();
+    vlc_cleanup_run ();
 
 #else
     mtime_t delay = date - mdate();
@@ -360,6 +377,24 @@ void mwait( mtime_t date )
 #endif
 }
 
+
+#include "libvlc.h" /* vlc_backtrace() */
+#undef msleep
+
+#if defined(__APPLE__) && defined( HAVE_NANOSLEEP )
+/* Mac OS X 10.5's nanosleep is not a cancellation point */
+static inline int
+semi_testcancelable_nanosleep(const struct timespec *rqtp, struct timespec *rmtp)
+{
+    int ret;
+    pthread_testcancel();
+    ret = nanosleep(rqtp, rmtp);
+    pthread_testcancel();
+    return ret;
+}
+#define nanosleep semi_testcancelable_nanosleep
+#endif
+
 /**
  * Portable usleep(). Cancellation point.
  *
@@ -382,7 +417,7 @@ void msleep( mtime_t delay )
 #elif defined( HAVE_KERNEL_OS_H )
     snooze( delay );
 
-#elif defined( WIN32 ) || defined( UNDER_CE )
+#elif defined( WIN32 ) || defined( UNDER_CE ) || defined( __APPLE__ )
     mwait (mdate () + delay);
 
 #elif defined( HAVE_NANOSLEEP )