6 files changed, 16 insertions, 12 deletions
diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c
index 1984ae826..e887b277d 100644
--- a/src/audio_out/audio_alsa_out.c
+++ b/src/audio_out/audio_alsa_out.c
@@ -26,7 +26,7 @@
  * (c) 2001 James Courtier-Dutton <James@superbug.demon.co.uk>
  *
  * 
- * $Id: audio_alsa_out.c,v 1.27 2001/09/12 15:42:28 jcdutton Exp $
+ * $Id: audio_alsa_out.c,v 1.28 2001/09/14 20:44:01 jcdutton Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -531,7 +531,7 @@ ao_driver_t *init_audio_out_plugin (config_values_t *config) {
 }
 
 static ao_info_t ao_info_alsa9 = {
-  AUDIO_OUT_IFACE_VERSION,
+  AO_OUT_ALSA_IFACE_VERSION,
   "alsa09",
   "xine audio output plugin using alsa-compliant audio devices/drivers",
   10
diff --git a/src/audio_out/audio_arts_out.c b/src/audio_out/audio_arts_out.c
index 0bf7c5f90..d4d84ab9d 100644
--- a/src/audio_out/audio_arts_out.c
+++ b/src/audio_out/audio_arts_out.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: audio_arts_out.c,v 1.4 2001/08/24 01:05:30 guenter Exp $
+ * $Id: audio_arts_out.c,v 1.5 2001/09/14 20:44:01 jcdutton Exp $
  */
 
 /* required for swab() */
@@ -274,7 +274,7 @@ ao_driver_t *init_audio_out_plugin (config_values_t *config) {
 }
 
 static ao_info_t ao_info_arts = {
-  AUDIO_OUT_IFACE_VERSION,
+  AO_OUT_ARTS_IFACE_VERSION,
   "arts",
   "xine audio output plugin using arts-compliant audio devices/drivers",
   5
diff --git a/src/audio_out/audio_esd_out.c b/src/audio_out/audio_esd_out.c
index 9fce03ec1..568293ddb 100644
--- a/src/audio_out/audio_esd_out.c
+++ b/src/audio_out/audio_esd_out.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: audio_esd_out.c,v 1.9 2001/09/04 20:30:55 guenter Exp $
+ * $Id: audio_esd_out.c,v 1.10 2001/09/14 20:44:01 jcdutton Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -39,7 +39,7 @@
 #include "metronom.h"
 #include "utils.h"
 
-#define AO_OUT_ESD_IFACE_VERSION 1
+#define AO_OUT_ESD_IFACE_VERSION 2
 
 
 typedef struct esd_driver_s {
diff --git a/src/audio_out/audio_irixal_out.c b/src/audio_out/audio_irixal_out.c
index e74c0cd37..063b917fa 100644
--- a/src/audio_out/audio_irixal_out.c
+++ b/src/audio_out/audio_irixal_out.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: audio_irixal_out.c,v 1.1 2001/09/06 17:12:38 mshopf Exp $
+ * $Id: audio_irixal_out.c,v 1.2 2001/09/14 20:44:01 jcdutton Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -65,6 +65,8 @@
 //# endif
 //#endif
 
+#define AO_IRIXAL_IFACE_VERSION 2
+
 #define DEFAULT_GAP_TOLERANCE         5000
 
 typedef struct irixal_driver_s {
@@ -387,7 +389,7 @@ ao_driver_t *init_audio_out_plugin (config_values_t *config)
 
 static ao_info_t ao_info_irixal =
 {
-  AUDIO_OUT_IFACE_VERSION,
+  AO_IRIXAL_IFACE_VERSION,
   "irixal",
   "xine audio output plugin using IRIX libaudio",
   10
diff --git a/src/audio_out/audio_sun_out.c b/src/audio_out/audio_sun_out.c
index cca48f228..37a7d68a4 100644
--- a/src/audio_out/audio_sun_out.c
+++ b/src/audio_out/audio_sun_out.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: audio_sun_out.c,v 1.9 2001/09/06 12:17:12 jkeil Exp $
+ * $Id: audio_sun_out.c,v 1.10 2001/09/14 20:44:01 jcdutton Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -53,6 +53,8 @@
 #define	AUDIO_PRECISION_16	16
 #endif
 
+#define AO_SUN_IFACE_VERSION 2
+
 #define GAP_TOLERANCE         5000
 #define MAX_GAP              90000
 
@@ -540,7 +542,7 @@ ao_driver_t *init_audio_out_plugin (config_values_t *config) {
 }
 
 static ao_info_t ao_info_sun = {
-  AUDIO_OUT_IFACE_VERSION,
+  AO_SUN_IFACE_VERSION,
   "sun",
   "xine audio output plugin using sun-compliant audio devices/drivers",
   10
diff --git a/src/xine-engine/audio_out.h b/src/xine-engine/audio_out.h
index 2b5d7bd52..d23db13f5 100644
--- a/src/xine-engine/audio_out.h
+++ b/src/xine-engine/audio_out.h
@@ -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: audio_out.h,v 1.16 2001/09/11 14:17:20 jcdutton Exp $
+ * $Id: audio_out.h,v 1.17 2001/09/14 20:44:01 jcdutton Exp $
  */
 #ifndef HAVE_AUDIO_OUT_H
 #define HAVE_AUDIO_OUT_H
@@ -34,7 +34,7 @@ extern "C" {
 #endif
 
 
-#define AUDIO_OUT_IFACE_VERSION  1
+#define AUDIO_OUT_IFACE_VERSION  2
 
 /*
  * ao_driver_s contains the driver every audio output