Remove stdio while we're at it.

[vlc] / modules / gui / beos / AudioOutput.cpp

diff --git a/modules/gui/beos/AudioOutput.cpp b/modules/gui/beos/AudioOutput.cpp
index 0a47d2018b4ebd654f48551dd102314f452df128..71ebfb99950d8d4f1363b342f11d7241c056e43e 100644 (file)
--- a/modules/gui/beos/AudioOutput.cpp
+++ b/modules/gui/beos/AudioOutput.cpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * AudioOutput.cpp: BeOS audio output
  *****************************************************************************
- * Copyright (C) 1999, 2000, 2001 VideoLAN
+ * Copyright (C) 1999, 2000, 2001 the VideoLAN team
  * $Id$
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
@@ -20,23 +20,20 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdio.h>
-#include <stdlib.h>                                      /* malloc(), free() */
 #include <malloc.h>
-#include <string.h>
 
 #include <SoundPlayer.h>
 #include <media/MediaDefs.h>
 
 
 #include <vlc/vlc.h>
-#include <vlc/aout.h>
+#include <vlc_aout.h>
 extern "C"
 {
     #include <aout_internal.h>
@@ -151,18 +148,18 @@ static void Play( void * _p_aout, void * _p_buffer, size_t i_size,
 
     if( p_aout_buffer != NULL )
     {
-        p_aout->p_vlc->pf_memcpy( p_buffer, p_aout_buffer->p_buffer,
+        p_aout->p_libvlc->pf_memcpy( p_buffer, p_aout_buffer->p_buffer,
                                   MIN( i_size, p_aout_buffer->i_nb_bytes ) );
         if( p_aout_buffer->i_nb_bytes < i_size )
         {
-            p_aout->p_vlc->pf_memset( p_buffer + p_aout_buffer->i_nb_bytes,
+            p_aout->p_libvlc->pf_memset( p_buffer + p_aout_buffer->i_nb_bytes,
                                       0, i_size - p_aout_buffer->i_nb_bytes );
         }
         aout_BufferFree( p_aout_buffer );
     }
     else
     {
-        p_aout->p_vlc->pf_memset( p_buffer, 0, i_size );
+        p_aout->p_libvlc->pf_memset( p_buffer, 0, i_size );
     }
 }