6 files changed, 11 insertions, 11 deletions
diff --git a/src/libmpg123/interface.c b/src/libmpg123/interface.c
index 199c89479..45c78c604 100644
--- a/src/libmpg123/interface.c
+++ b/src/libmpg123/interface.c
@@ -18,7 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: interface.c,v 1.4 2001/05/27 23:48:12 guenter Exp $
+ * $Id: interface.c,v 1.5 2001/08/21 19:39:50 jcdutton Exp $
  */
 
 #include <stdlib.h>
@@ -40,7 +40,7 @@ void mpg_audio_reset (mpgaudio_t *mp) {
   mp->header                =  0;
 }
 
-mpgaudio_t *mpg_audio_init (ao_functions_t *ao_output) 
+mpgaudio_t *mpg_audio_init (ao_instance_t *ao_output) 
 {
   mpgaudio_t *mp;
 
diff --git a/src/libmpg123/layer1.c b/src/libmpg123/layer1.c
index 4db905947..50a333a0e 100644
--- a/src/libmpg123/layer1.c
+++ b/src/libmpg123/layer1.c
@@ -157,7 +157,7 @@ void do_layer1(mpgaudio_t *mp)
     printf ("layer1\n");
   }
 
-  mp->ao_output->write_audio_data (mp->ao_output, (int16_t*)mp->osspace, num_bytes/(stereo-1 ? 4:2), 
+  mp->ao_output->write (mp->ao_output, (int16_t*)mp->osspace, num_bytes/(stereo-1 ? 4:2), 
 				   mp->pts);
   mp->pts = 0;
 				   
diff --git a/src/libmpg123/layer2.c b/src/libmpg123/layer2.c
index c4230ad5d..b5a3c27b6 100644
--- a/src/libmpg123/layer2.c
+++ b/src/libmpg123/layer2.c
@@ -295,7 +295,7 @@ void do_layer2(mpgaudio_t *mp)
     mp->sample_rate_device = fr->sample_rate;
   }
 
-  mp->ao_output->write_audio_data (mp->ao_output, (int16_t*)mp->osspace, num_bytes/(stereo-1 ? 4:2), 
+  mp->ao_output->write (mp->ao_output, (int16_t*)mp->osspace, num_bytes/(stereo-1 ? 4:2), 
 				   mp->pts);
   mp->pts = 0;
 				   
diff --git a/src/libmpg123/layer3.c b/src/libmpg123/layer3.c
index 08e444d69..db99e8fa6 100644
--- a/src/libmpg123/layer3.c
+++ b/src/libmpg123/layer3.c
@@ -1629,7 +1629,7 @@ void do_layer3(mpgaudio_t *mp)
       mp->sample_rate_device = fr->sample_rate;
     }
 
-    mp->ao_output->write_audio_data (mp->ao_output, (int16_t*)mp->osspace, num_bytes/(stereo-1 ? 4:2), 
+    mp->ao_output->write (mp->ao_output, (int16_t*)mp->osspace, num_bytes/(stereo-1 ? 4:2), 
 				     mp->pts);
   }
   mp->pts = 0;
diff --git a/src/libmpg123/mpglib.h b/src/libmpg123/mpglib.h
index 0b06eee60..60014828f 100644
--- a/src/libmpg123/mpglib.h
+++ b/src/libmpg123/mpglib.h
@@ -18,7 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: mpglib.h,v 1.5 2001/08/07 14:15:04 guenter Exp $
+ * $Id: mpglib.h,v 1.6 2001/08/21 19:39:50 jcdutton Exp $
  */
 
 #ifndef HAVE_MPGLIB_H
@@ -48,7 +48,7 @@ typedef struct mpstr {
 
   int             is_output_initialized;
   int             sample_rate_device;
-  ao_functions_t *ao_output;
+  ao_instance_t *ao_output;
   unsigned char   osspace[8192];
 
   uint32_t        pts;
@@ -62,7 +62,7 @@ typedef struct mpstr {
 extern "C" {
 #endif
   
-mpgaudio_t  *mpg_audio_init (ao_functions_t *ao_output);
+mpgaudio_t  *mpg_audio_init (ao_instance_t *ao_output);
 
 void mpg_audio_reset (mpgaudio_t *mp);
 
diff --git a/src/libmpg123/xine_decoder.c b/src/libmpg123/xine_decoder.c
index 61c5c7d0d..649c51526 100644
--- a/src/libmpg123/xine_decoder.c
+++ b/src/libmpg123/xine_decoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_decoder.c,v 1.4 2001/08/07 14:15:04 guenter Exp $
+ * $Id: xine_decoder.c,v 1.5 2001/08/21 19:39:50 jcdutton Exp $
  *
  * stuff needed to turn libmpg123 into a xine decoder plugin
  */
@@ -44,7 +44,7 @@ typedef struct mpgdec_decoder_s {
 
   mpgaudio_t      *mpg;
 
-  ao_functions_t  *audio_out;
+  ao_instance_t  *audio_out;
   int              output_sampling_rate;
   int              output_open;
 
@@ -55,7 +55,7 @@ int mpgdec_can_handle (audio_decoder_t *this_gen, int buf_type) {
 }
 
 
-void mpgdec_init (audio_decoder_t *this_gen, ao_functions_t *audio_out) {
+void mpgdec_init (audio_decoder_t *this_gen, ao_instance_t *audio_out) {
 
   mpgdec_decoder_t *this = (mpgdec_decoder_t *) this_gen;