From kde-commits  Sun Nov 30 14:12:27 2003
From: Ewald Snel <ewald () rambo ! its ! tudelft ! nl>
Date: Sun, 30 Nov 2003 14:12:27 +0000
To: kde-commits
Subject: KDE_3_1_BRANCH: kdemultimedia/xine_artsplugin
X-MARC-Message: https://marc.info/?l=kde-commits&m=107020158117435

CVS commit by snel: 

xine compatibility bugfix from HEAD branch


  M +1 -1      audio_fifo_out.c   1.5.2.2
  M +7 -0      configure.in.in   1.5.2.2


--- kdemultimedia/xine_artsplugin/audio_fifo_out.c  #1.5.2.1:1.5.2.2
@@ -322,5 +322,5 @@ ao_driver_t *init_audio_out_plugin( xine
 
 #ifdef HAVE_XINE_1
-    return ao_new_port( xine, (ao_driver_t *)ao, 0 );
+    return _x_ao_new_port( xine, (ao_driver_t *)ao, 0 );
 #else
     return (ao_driver_t *)ao;

--- kdemultimedia/xine_artsplugin/configure.in.in  #1.5.2.1:1.5.2.2
@@ -228,4 +228,11 @@
 AC_LANG_RESTORE()
 
+dnl Check for new internal xine symbol names
+AC_CHECK_LIB(xine, _x_ao_new_port, , 
+[
+  AC_DEFINE(_x_ao_new_port, ao_new_port, [Compatibility with older version of xine])
+])
+AC_CHECK_FUNC([ao_new_port])
+
 dnl Check for xine libs (1.0.0 or higher)
 AC_PATH_XINE(1.0.0,