Take advantage of some capabilities of the NetBSD audio driver

layer that are evidently not available with the Sun audio interface
it resembles, to better sync audio with video. The native "sun"
driver (the current default) should now work at least as well as
the "oss" driver (once the default, but now disabled) used to.

5 files changed, 42 insertions, 4 deletions

diff --git a/graphics/gmplayer/distinfo b/graphics/gmplayer/distinfo
index 84b786b8b02..396df2e357b 100644
--- a/graphics/gmplayer/distinfo
+++ b/graphics/gmplayer/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2002/06/08 23:41:55 veego Exp $
+$NetBSD: distinfo,v 1.12 2002/06/11 23:22:42 fredb Exp $
 
 SHA1 (mplayer/MPlayer-0.90pre5.tar.bz2) = 1a78063dd055ce99985001072fb2057156f8cd2a
 Size (mplayer/MPlayer-0.90pre5.tar.bz2) = 2438747 bytes
@@ -43,3 +43,4 @@ Size (mplayer/CornerMP-aqua.tar.bz2) = 247987 bytes
 SHA1 (mplayer/hwswskin.tar.bz2) = 2b5b59d2e91bfa5c01011773c71db0ab2b48edec
 Size (mplayer/hwswskin.tar.bz2) = 20275 bytes
 SHA1 (patch-aa) = 2c1c6f35caf047f188871ac223d672ce453c26ec
+SHA1 (patch-ab) = ba4990ac8df3b79dfd452530fe4aea66e26f4e7e
diff --git a/graphics/mencoder/distinfo b/graphics/mencoder/distinfo
index b683ff0635e..9652e31a030 100644
--- a/graphics/mencoder/distinfo
+++ b/graphics/mencoder/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2002/06/08 23:41:56 veego Exp $
+$NetBSD: distinfo,v 1.3 2002/06/11 23:22:44 fredb Exp $
 
 SHA1 (mplayer/MPlayer-0.90pre5.tar.bz2) = 1a78063dd055ce99985001072fb2057156f8cd2a
 Size (mplayer/MPlayer-0.90pre5.tar.bz2) = 2438747 bytes
 SHA1 (patch-aa) = 2c1c6f35caf047f188871ac223d672ce453c26ec
+SHA1 (patch-ab) = ba4990ac8df3b79dfd452530fe4aea66e26f4e7e
diff --git a/graphics/mplayer-share/distinfo b/graphics/mplayer-share/distinfo
index 50a663ddede..cb70bc0aa65 100644
--- a/graphics/mplayer-share/distinfo
+++ b/graphics/mplayer-share/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2002/06/08 23:41:56 veego Exp $
+$NetBSD: distinfo,v 1.3 2002/06/11 23:22:43 fredb Exp $
 
 SHA1 (mplayer/MPlayer-0.90pre5.tar.bz2) = 1a78063dd055ce99985001072fb2057156f8cd2a
 Size (mplayer/MPlayer-0.90pre5.tar.bz2) = 2438747 bytes
@@ -9,3 +9,4 @@ Size (mplayer/mp-arial-iso-8859-2.zip) = 255907 bytes
 SHA1 (mplayer/koi8r-font.tar.bz2) = d8f44c101aaae32b5674c16da3549f5e520c077e
 Size (mplayer/koi8r-font.tar.bz2) = 68817 bytes
 SHA1 (patch-aa) = 2c1c6f35caf047f188871ac223d672ce453c26ec
+SHA1 (patch-ab) = ba4990ac8df3b79dfd452530fe4aea66e26f4e7e
diff --git a/graphics/mplayer-share/patches/patch-ab b/graphics/mplayer-share/patches/patch-ab
new file mode 100644
index 00000000000..9b26eec9fe0
--- /dev/null
+++ b/graphics/mplayer-share/patches/patch-ab
@@ -0,0 +1,34 @@
+$NetBSD: patch-ab,v 1.1 2002/06/11 23:22:43 fredb Exp $
+
+--- libao2/ao_sun.c.orig	Mon Apr 29 03:47:30 2002
++++ libao2/ao_sun.c
+@@ -445,13 +445,19 @@
+     }
+ #endif
+ 
+-#ifndef __OpenBSD__
++#if !defined(__OpenBSD__) && !defined(__NetBSD__)
+     ioctl(audio_fd, AUDIO_GETINFO, &info);
+     if (queued_bursts - info.play.eof > 2)
+ 	return 0;
+ #endif
+ 
++#if defined(__NetBSD__)
++    ioctl(audio_fd, AUDIO_GETINFO, &info);
++    return info.hiwat * info.blocksize - info.play.seek;
++#else
+     return ao_data.outburst;
++#endif
++
+ }
+ 
+ // plays 'len' bytes of 'data'
+@@ -507,7 +513,7 @@
+ static float get_delay(){
+     audio_info_t info;
+     ioctl(audio_fd, AUDIO_GETINFO, &info);
+-#ifdef __OpenBSD__
++#if defined(__OpenBSD__) || defined(__NetBSD__)
+     return (float) info.play.seek/ (float)byte_per_sec ;
+ #else
+     if (info.play.samples && enable_sample_timing == RTSC_ENABLED)
diff --git a/graphics/mplayer/distinfo b/graphics/mplayer/distinfo
index ccac3f933d3..f5a51a32292 100644
--- a/graphics/mplayer/distinfo
+++ b/graphics/mplayer/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.14 2002/06/08 23:41:56 veego Exp $
+$NetBSD: distinfo,v 1.15 2002/06/11 23:22:43 fredb Exp $
 
 SHA1 (mplayer/MPlayer-0.90pre5.tar.bz2) = 1a78063dd055ce99985001072fb2057156f8cd2a
 Size (mplayer/MPlayer-0.90pre5.tar.bz2) = 2438747 bytes
 SHA1 (patch-aa) = 2c1c6f35caf047f188871ac223d672ce453c26ec
+SHA1 (patch-ab) = ba4990ac8df3b79dfd452530fe4aea66e26f4e7e