Merge from 1.1.

Some fixups were required for the kfreebsd patch; needs testing.

--HG--
rename : src/video_out/libdha/ports.c => contrib/libdha/ports.c
rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
rename : src/libxineadec/xine_vorbis_decoder.c => src/combined/xine_vorbis_decoder.c

1 files changed, 10 insertions, 0 deletions

diff --git a/src/xine-utils/utils.c b/src/xine-utils/utils.c
index 980a2a520..d9eb7fb3f 100644
--- a/src/xine-utils/utils.c
+++ b/src/xine-utils/utils.c
@@ -452,6 +452,7 @@ char *xine_chomp(char *str) {
  * a thread-safe usecond sleep
  */
 void xine_usec_sleep(unsigned usec) {
+#if 0
 #if HAVE_NANOSLEEP
   /* nanosleep is prefered on solaris, because it's mt-safe */
   struct timespec ts, remaining;
@@ -467,6 +468,15 @@ void xine_usec_sleep(unsigned usec) {
   usleep(usec);
 #  endif
 #endif
+#else
+  if (usec < 10000) {
+      usec = 10000;
+  }
+  struct timeval tm;
+  tm.tv_sec  = usec / 1000000;
+  tm.tv_usec = usec % 1000000;
+  select(0, 0, 0, 0, &tm);
+#endif
 }