* Misc sound fixes [Mac OS X port]

* Fixed VCD double detection

diff --git a/configure b/configure
index 2ad8d452aa2f85b9dacf25157140bad2e8427557..ef762c5caf64bd0f04c8f1931ac7b4bc94bbecf1 100755 (executable)
--- a/configure
+++ b/configure
@@ -6098,7 +6098,7 @@ rm -f conftest*
 
   if test "x${SYS}" = "xdarwin"
   then
-    PLUGINS="${PLUGINS} vcd"
+    # No need to add vcd to PLUGINS, Darwin is already based on FreeBSD
     vcd_LDFLAGS="${vcd_LDFLAGS} -framework IOKit -framework CoreFoundation" 
   fi
 fi

diff --git a/configure.in b/configure.in
index 8939972a7de9cfc9d56fb54328c7b50dd9420718..155b4e4a9b36452b37572f73d5184df21fae93ad 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -735,7 +735,7 @@ then
 
   if test "x${SYS}" = "xdarwin"
   then
-    PLUGINS="${PLUGINS} vcd"
+    # No need to add vcd to PLUGINS, Darwin is already based on FreeBSD
     vcd_LDFLAGS="${vcd_LDFLAGS} -framework IOKit -framework CoreFoundation" 
   fi
 fi

diff --git a/plugins/macosx/aout_macosx.c b/plugins/macosx/aout_macosx.c
index 0a8c179b601c4f477d698d19373b4120f09c0072..ae5bb468e0d50675413f7265bb095d852899d691 100644 (file)
--- a/plugins/macosx/aout_macosx.c
+++ b/plugins/macosx/aout_macosx.c
@@ -2,7 +2,7 @@
  * aout_macosx.c : CoreAudio output plugin
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: aout_macosx.c,v 1.18 2002/04/25 23:07:23 massiot Exp $
+ * $Id: aout_macosx.c,v 1.19 2002/05/01 22:32:27 massiot Exp $
  *
  * Authors: Colin Delacroix <colin@zoy.org>
  *          Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -147,7 +147,6 @@ static int aout_Open( aout_thread_t *p_aout )
         intf_ErrMsg( "aout error: failed to get device buffer size: %d", err );
         return( -1 );
     }
-    p_aout->i_latency = p_aout->p_sys->ui_buffer_size;
 
     /* get a description of the data format used by the device */
     ui_param_size = sizeof( p_aout->p_sys->s_dst_stream_format ); 
@@ -348,6 +347,11 @@ static OSStatus CAIOCallback( AudioDeviceID inDevice,
 
         p_sys->b_buffer_data = 0;
     }
+    else
+    {
+        memset(outOutputData->mBuffers[ 0 ].mData, 0, p_sys->ui_buffer_size);
+        intf_WarnMsg(1, "aout warning: audio output is starving, expect glitches");
+    }
 
     vlc_mutex_unlock( &p_sys->mutex_lock );
 
@@ -425,6 +429,7 @@ static int CABeginFormat( aout_thread_t *p_aout )
                                   kAudioDevicePropertyBufferSize, 
                                   ui_param_size,
                                   &p_aout->p_sys->ui_buffer_size );
+    p_aout->i_latency = p_aout->p_sys->ui_buffer_size;
 
     if( err != noErr )
     {