Blob Blame History Raw
--- inadyn-mt.v.02.24.43/src/waveout.c.orig	2014-05-26 08:37:48.000000000 -0500
+++ inadyn-mt.v.02.24.43/src/waveout.c	2015-01-19 19:54:51.194407139 -0600
@@ -62,6 +62,8 @@
 
 #include <dlfcn.h>
 
+#define LIBAO_SONAME "libao.so.4"
+
 static int	is_no_aolib=0;
 
 #endif
@@ -435,7 +437,7 @@
 
 	if (!(is_init)) {
 
-		((FUNC_1) (get_func_addr(&aolib_handle,"libao.so","ao_initialize",ao_initialize_ptr)))();
+		((FUNC_1) (get_func_addr(&aolib_handle,LIBAO_SONAME,"ao_initialize",ao_initialize_ptr)))();
 
 #ifndef NO_DYN_LOAD
 
@@ -466,7 +468,7 @@
 
 	else 
 
-		((FUNC_1) (get_func_addr(&aolib_handle,"libao.so","ao_shutdown",ao_shutdown_ptr)))();
+		((FUNC_1) (get_func_addr(&aolib_handle,LIBAO_SONAME,"ao_shutdown",ao_shutdown_ptr)))();
 
 
 	return 0;
@@ -519,7 +521,7 @@
 
 	/* -- Setup for default driver -- */
 
-	if ((driver=((FUNC_2) (get_func_addr(&aolib_handle,"libao.so","ao_default_driver_id",ao_default_driver_id_ptr)))())==-1) {
+	if ((driver=((FUNC_2) (get_func_addr(&aolib_handle,LIBAO_SONAME,"ao_default_driver_id",ao_default_driver_id_ptr)))())==-1) {
 
 		DBG_PRINTF((LOG_CRIT, "C:" MODULE_TAG "ao_default_driver_id() returned NO DRIVER (%s) in play_wave_open_os...\n",libao_err_name(errno)));
 	} 
@@ -527,7 +529,7 @@
 
 		ao_info	*driver_info=NULL;
 
-		if (!(driver_info=((FUNC_8) (get_func_addr(&aolib_handle,"libao.so","ao_driver_info",ao_driver_info_ptr)))(driver)))
+		if (!(driver_info=((FUNC_8) (get_func_addr(&aolib_handle,LIBAO_SONAME,"ao_driver_info",ao_driver_info_ptr)))(driver)))
 
 			DBG_PRINTF((LOG_CRIT, "C:" MODULE_TAG "ao_driver_info returned NULL (%s) in play_wave_open_os...\n",libao_err_name(errno)));
 		else
@@ -540,7 +542,7 @@
 		format.byte_format=AO_FMT_LITTLE;
 		format.matrix="L,R";
 
-		device=((FUNC_3) (get_func_addr(&aolib_handle,"libao.so","ao_open_live",ao_open_live_ptr)))(driver,(ao_sample_format *) &format,NULL);
+		device=((FUNC_3) (get_func_addr(&aolib_handle,LIBAO_SONAME,"ao_open_live",ao_open_live_ptr)))(driver,(ao_sample_format *) &format,NULL);
 
 		if (device==NULL) {
 
@@ -563,7 +565,7 @@
 			}
 			else {		
 
-				if (!(((FUNC_4) (get_func_addr(&aolib_handle,"libao.so","ao_play",ao_play_ptr)))(device,p_wave_play->wave_buff[p_wave_play->cur_buffer],bytes_read))) {
+				if (!(((FUNC_4) (get_func_addr(&aolib_handle,LIBAO_SONAME,"ao_play",ao_play_ptr)))(device,p_wave_play->wave_buff[p_wave_play->cur_buffer],bytes_read))) {
 
 					DBG_PRINTF((LOG_CRIT, "C:" MODULE_TAG "ao_play failed (%s) in play_wave_open_os...\n",libao_err_name(errno)));
 				}
@@ -582,7 +584,7 @@
 
 		wait_done_playing(p_wave_play);		
 
-		if (!(((FUNC_5) (get_func_addr(&aolib_handle,"libao.so","ao_close",ao_close_ptr)))(device))) {
+		if (!(((FUNC_5) (get_func_addr(&aolib_handle,LIBAO_SONAME,"ao_close",ao_close_ptr)))(device))) {
 
 			DBG_PRINTF((LOG_CRIT, "C:" MODULE_TAG "ao_close failed (%s) in play_wave_open_os...\n",libao_err_name(errno)));
 		}