64bit libao2 fix by Jens Axboe <mplayer-dev@kernel.dk>

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9634 b3059339-0415-0410-9bf9-f77b7e298cf2

29 files changed, 31 insertions, 31 deletions

diff --git a/libao2/ao_alsa1x.c b/libao2/ao_alsa1x.c
index 0534e77db2..b2e54b48f5 100644
--- a/libao2/ao_alsa1x.c
+++ b/libao2/ao_alsa1x.c
@@ -79,7 +79,7 @@ static int set_block_mode;
 
 
 /* to set/get/query special features/parameters */
-static int control(int cmd, int arg)
+static int control(int cmd, void *arg)
 {
   switch(cmd) {
   case AOCONTROL_QUERY_FORMAT:
diff --git a/libao2/ao_alsa5.c b/libao2/ao_alsa5.c
index 8560091a15..fed09a8bef 100644
--- a/libao2/ao_alsa5.c
+++ b/libao2/ao_alsa5.c
@@ -32,7 +32,7 @@ static snd_pcm_format_t alsa_format;
 static int alsa_rate = SND_PCM_RATE_CONTINUOUS;
 
 /* to set/get/query special features/parameters */
-static int control(int cmd, int arg)
+static int control(int cmd, void *arg)
 {
     return(CONTROL_UNKNOWN);
 }
diff --git a/libao2/ao_alsa9.c b/libao2/ao_alsa9.c
index 0534e77db2..b2e54b48f5 100644
--- a/libao2/ao_alsa9.c
+++ b/libao2/ao_alsa9.c
@@ -79,7 +79,7 @@ static int set_block_mode;
 
 
 /* to set/get/query special features/parameters */
-static int control(int cmd, int arg)
+static int control(int cmd, void *arg)
 {
   switch(cmd) {
   case AOCONTROL_QUERY_FORMAT:
diff --git a/libao2/ao_arts.c b/libao2/ao_arts.c
index a6dca2f075..38fedef72c 100644
--- a/libao2/ao_arts.c
+++ b/libao2/ao_arts.c
@@ -34,7 +34,7 @@ static ao_info_t info =
 
 LIBAO_EXTERN(arts)
 
-static int control(int cmd, int arg)
+static int control(int cmd, void *arg)
 {
 	return(CONTROL_UNKNOWN);
 }
diff --git a/libao2/ao_dxr2.c b/libao2/ao_dxr2.c
index 8f0d28d50f..aec87f0a68 100644
--- a/libao2/ao_dxr2.c
+++ b/libao2/ao_dxr2.c
@@ -28,7 +28,7 @@ static int volume=19;
 extern int dxr2_fd;
 
 // to set/get/query special features/parameters
-static int control(int cmd,int arg){
+static int control(int cmd,void *arg){
   switch(cmd){
   case AOCONTROL_GET_VOLUME:
     if(dxr2_fd > 0) {
diff --git a/libao2/ao_esd.c b/libao2/ao_esd.c
index 6f36662577..c7217088b9 100644
--- a/libao2/ao_esd.c
+++ b/libao2/ao_esd.c
@@ -74,7 +74,7 @@ static struct timeval esd_play_start;
 /*
  * to set/get/query special features/parameters
  */
-static int control(int cmd, int arg)
+static int control(int cmd, void *arg)
 {
     esd_player_info_t *esd_pi;
     esd_info_t        *esd_i;
diff --git a/libao2/ao_mpegpes.c b/libao2/ao_mpegpes.c
index 9ecda9c141..3fdf67855c 100644
--- a/libao2/ao_mpegpes.c
+++ b/libao2/ao_mpegpes.c
@@ -49,7 +49,7 @@ LIBAO_EXTERN(mpegpes)
 
 
 // to set/get/query special features/parameters
-static int control(int cmd,int arg){
+static int control(int cmd,void *arg){
 #ifdef HAVE_DVB
     switch(cmd){
 	case AOCONTROL_GET_VOLUME:
diff --git a/libao2/ao_nas.c b/libao2/ao_nas.c
index 8ef716ea44..42dacdc748 100644
--- a/libao2/ao_nas.c
+++ b/libao2/ao_nas.c
@@ -333,7 +333,7 @@ static unsigned int nas_aformat_to_auformat(unsigned int *format)
 }
 
 // to set/get/query special features/parameters
-static int control(int cmd, int arg)
+static int control(int cmd, void *arg)
 {
 	AuDeviceAttributes *dattr;
 	AuFixedPoint fpgain;
diff --git a/libao2/ao_null.c b/libao2/ao_null.c
index 3add323ad8..d35f9f42bc 100644
--- a/libao2/ao_null.c
+++ b/libao2/ao_null.c
@@ -41,7 +41,7 @@ static void drain(){
 }
 
 // to set/get/query special features/parameters
-static int control(int cmd,int arg){
+static int control(int cmd,void *arg){
     return -1;
 }
 
diff --git a/libao2/ao_oss.c b/libao2/ao_oss.c
index 707b9acd68..28211df0de 100644
--- a/libao2/ao_oss.c
+++ b/libao2/ao_oss.c
@@ -39,7 +39,7 @@ static int audio_fd=-1;
 char *oss_mixer_device = PATH_DEV_MIXER;
 
 // to set/get/query special features/parameters
-static int control(int cmd,int arg){
+static int control(int cmd,void *arg){
     switch(cmd){
 	case AOCONTROL_SET_DEVICE:
 	    dsp=(char*)arg;
diff --git a/libao2/ao_pcm.c b/libao2/ao_pcm.c
index d8d234152e..9b1f05b1dd 100644
--- a/libao2/ao_pcm.c
+++ b/libao2/ao_pcm.c
@@ -68,7 +68,7 @@ static struct WaveHeader wavhdr = {
 static FILE *fp = NULL;
 
 // to set/get/query special features/parameters
-static int control(int cmd,int arg){
+static int control(int cmd,void *arg){
     return -1;
 }
 
diff --git a/libao2/ao_plugin.c b/libao2/ao_plugin.c
index 435328d6a6..f420a25e2b 100644
--- a/libao2/ao_plugin.c
+++ b/libao2/ao_plugin.c
@@ -44,10 +44,10 @@ volatile ao_plugin_data_t ao_plugin_data;             // Data used by the plugin
 ao_plugin_cfg_t  ao_plugin_cfg=CFG_DEFAULTS; // Set in cfg-mplayer.h
 
 // to set/get/query special features/parameters
-static int control(int cmd,int arg){
+static int control(int cmd,void *arg){
   switch(cmd){
   case AOCONTROL_SET_PLUGIN_DRIVER:
-    ao_plugin_local_data.driver=(ao_functions_t*)arg;
+    ao_plugin_local_data.driver=arg;
     return CONTROL_OK;
   case AOCONTROL_GET_VOLUME:
   case AOCONTROL_SET_VOLUME:
diff --git a/libao2/ao_sdl.c b/libao2/ao_sdl.c
index 2c7a699b61..8d70af73b2 100644
--- a/libao2/ao_sdl.c
+++ b/libao2/ao_sdl.c
@@ -113,7 +113,7 @@ static void setenv(const char *name, const char *val, int _xx)
 
 
 // to set/get/query special features/parameters
-static int control(int cmd,int arg){
+static int control(int cmd,void *arg){
 	switch (cmd) {
 		case AOCONTROL_GET_VOLUME:
 		{
diff --git a/libao2/ao_sgi.c b/libao2/ao_sgi.c
index 5dfc6124ed..506f9f3190 100644
--- a/libao2/ao_sgi.c
+++ b/libao2/ao_sgi.c
@@ -27,7 +27,7 @@ static ALconfig	ao_config;
 static ALport	ao_port;
 
 // to set/get/query special features/parameters
-static int control(int cmd, int arg){
+static int control(int cmd, void *arg){
   
   printf("ao_sgi, control\n");
   
diff --git a/libao2/ao_sun.c b/libao2/ao_sun.c
index ef437394da..90f6b6209b 100644
--- a/libao2/ao_sun.c
+++ b/libao2/ao_sun.c
@@ -376,7 +376,7 @@ static void setup_device_paths()
 }
 
 // to set/get/query special features/parameters
-static int control(int cmd,int arg){
+static int control(int cmd,void *arg){
     switch(cmd){
     case AOCONTROL_SET_DEVICE:
 	audio_dev=(char*)arg;
diff --git a/libao2/ao_win32.c b/libao2/ao_win32.c
index 44e5f6dec3..1339496d5d 100644
--- a/libao2/ao_win32.c
+++ b/libao2/ao_win32.c
@@ -64,7 +64,7 @@ static void CALLBACK waveOutProc(HWAVEOUT hWaveOut,UINT uMsg,DWORD dwInstance,
 }
 
 // to set/get/query special features/parameters
-static int control(int cmd,int arg)
+static int control(int cmd,void *arg)
 {
 	DWORD volume;
 	switch (cmd)
diff --git a/libao2/audio_out.c b/libao2/audio_out.c
index 24f17a76db..9698eed88f 100644
--- a/libao2/audio_out.c
+++ b/libao2/audio_out.c
@@ -124,7 +124,7 @@ ao_functions_t* init_best_audio_out(char** ao_list,int use_plugin,int rate,int c
 	    if(!strcmp(audio_out->info->short_name,ao)){
 		// name matches, try it
 		if(use_plugin){
-		    audio_out_plugin.control(AOCONTROL_SET_PLUGIN_DRIVER,(int)audio_out);
+		    audio_out_plugin.control(AOCONTROL_SET_PLUGIN_DRIVER,audio_out);
 		    audio_out=&audio_out_plugin;
 		}
 		if(audio_out->init(rate,channels,format,flags))
@@ -140,7 +140,7 @@ ao_functions_t* init_best_audio_out(char** ao_list,int use_plugin,int rate,int c
     for(i=0;audio_out_drivers[i];i++){
 	ao_functions_t* audio_out=audio_out_drivers[i];
 	if(use_plugin){
-	    audio_out_plugin.control(AOCONTROL_SET_PLUGIN_DRIVER,(int)audio_out);
+	    audio_out_plugin.control(AOCONTROL_SET_PLUGIN_DRIVER,audio_out);
 	    audio_out=&audio_out_plugin;
 	}
 	if(audio_out->init(rate,channels,format,flags))
diff --git a/libao2/audio_out.h b/libao2/audio_out.h
index 6269645d51..9930b79403 100644
--- a/libao2/audio_out.h
+++ b/libao2/audio_out.h
@@ -18,7 +18,7 @@ typedef struct ao_info_s
 typedef struct ao_functions_s
 {
 	ao_info_t *info;
-        int (*control)(int cmd,int arg);
+        int (*control)(int cmd,void *arg);
         int (*init)(int rate,int channels,int format,int flags);
         void (*uninit)();
         void (*reset)();
diff --git a/libao2/audio_out_internal.h b/libao2/audio_out_internal.h
index 87b743e53f..8433ccf495 100644
--- a/libao2/audio_out_internal.h
+++ b/libao2/audio_out_internal.h
@@ -1,7 +1,7 @@
 
 // prototypes:
 //static ao_info_t info;
-static int control(int cmd,int arg);
+static int control(int cmd, void *arg);
 static int init(int rate,int channels,int format,int flags);
 static void uninit();
 static void reset();
diff --git a/libao2/audio_plugin.h b/libao2/audio_plugin.h
index cc3e5dfbfc..170efea901 100644
--- a/libao2/audio_plugin.h
+++ b/libao2/audio_plugin.h
@@ -5,7 +5,7 @@
 typedef struct ao_plugin_functions_s
 {
 	ao_info_t *info;
-        int (*control)(int cmd,int arg);
+        int (*control)(int cmd, void *arg);
         int (*init)(); 
         void (*uninit)();
         void (*reset)();
diff --git a/libao2/audio_plugin_internal.h b/libao2/audio_plugin_internal.h
index 9c777726e4..cedbe6ee9e 100644
--- a/libao2/audio_plugin_internal.h
+++ b/libao2/audio_plugin_internal.h
@@ -1,5 +1,5 @@
 // prototypes:
-static int control(int cmd,int arg);
+static int control(int cmd, void *arg);
 static int init();
 static void uninit();
 static void reset();
diff --git a/libao2/pl_delay.c b/libao2/pl_delay.c
index d194a5a3e1..55df925439 100644
--- a/libao2/pl_delay.c
+++ b/libao2/pl_delay.c
@@ -38,7 +38,7 @@ typedef struct pl_delay_s
 static pl_delay_t pl_delay={NULL,NULL,0,0,0,0};
 
 // to set/get/query special features/parameters
-static int control(int cmd,int arg){
+static int control(int cmd,void *arg){
   switch(cmd){
   case AOCONTROL_PLUGIN_SET_LEN:
     if(pl_delay.data) 
diff --git a/libao2/pl_eq.c b/libao2/pl_eq.c
index 8fdc2ae35c..bb30470d91 100644
--- a/libao2/pl_eq.c
+++ b/libao2/pl_eq.c
@@ -62,7 +62,7 @@ typedef struct pl_eq_s
 static pl_eq_t pl_eq;
 
 // to set/get/query special features/parameters
-static int control(int cmd,int arg){
+static int control(int cmd,void *arg){
   switch(cmd){
   case AOCONTROL_PLUGIN_SET_LEN:
     return CONTROL_OK;
diff --git a/libao2/pl_extrastereo.c b/libao2/pl_extrastereo.c
index 12b1cc2853..845a984a15 100644
--- a/libao2/pl_extrastereo.c
+++ b/libao2/pl_extrastereo.c
@@ -39,7 +39,7 @@ static struct {
 
 
 // to set/get/query special features/parameters
-static int control(int cmd,int arg){
+static int control(int cmd,void *arg){
   switch(cmd){
   case AOCONTROL_PLUGIN_SET_LEN:
     return CONTROL_OK;
diff --git a/libao2/pl_format.c b/libao2/pl_format.c
index 1b31ff92b3..87b5bc8720 100644
--- a/libao2/pl_format.c
+++ b/libao2/pl_format.c
@@ -57,7 +57,7 @@ static pl_format_t pl_format={NULL,0,0,0,1};
 #define SIGN_MASK	(1<<3)
 
 // to set/get/query special features/parameters
-static int control(int cmd,int arg){
+static int control(int cmd,void *arg){
   switch(cmd){
   case AOCONTROL_PLUGIN_SET_LEN:
     if(pl_format.data) 
diff --git a/libao2/pl_resample.c b/libao2/pl_resample.c
index 8698bb8d68..505eb0aa1d 100644
--- a/libao2/pl_resample.c
+++ b/libao2/pl_resample.c
@@ -93,7 +93,7 @@ typedef struct pl_resample_s
 static pl_resample_t 	pl_resample	= {NULL,NULL,1,1,1,0,W};
 
 // to set/get/query special features/parameters
-static int control(int cmd,int arg){
+static int control(int cmd,void *arg){
   switch(cmd){
   case AOCONTROL_PLUGIN_SET_LEN:
     if(pl_resample.data) 
diff --git a/libao2/pl_surround.c b/libao2/pl_surround.c
index d351342bb8..e0e6e52570 100644
--- a/libao2/pl_surround.c
+++ b/libao2/pl_surround.c
@@ -79,7 +79,7 @@ typedef struct pl_surround_s
 static pl_surround_t pl_surround={0,20,NULL,NULL,NULL,0,0,NULL,0,0,0};
 
 // to set/get/query special features/parameters
-static int control(int cmd,int arg){
+static int control(int cmd,void *arg){
   switch(cmd){
   case AOCONTROL_PLUGIN_SET_LEN:
     if (pl_surround.passthrough) return CONTROL_OK;
diff --git a/libao2/pl_volnorm.c b/libao2/pl_volnorm.c
index 4a3c82f516..dd5d0a4e9b 100644
--- a/libao2/pl_volnorm.c
+++ b/libao2/pl_volnorm.c
@@ -103,7 +103,7 @@ static struct {
 
 
 // minimal interface
-static int control(int cmd,int arg){
+static int control(int cmd,void *arg){
   switch(cmd){
   case AOCONTROL_PLUGIN_SET_LEN:
     return CONTROL_OK;
diff --git a/libao2/pl_volume.c b/libao2/pl_volume.c
index e0fb5e0e1b..bce069a8c4 100644
--- a/libao2/pl_volume.c
+++ b/libao2/pl_volume.c
@@ -43,7 +43,7 @@ typedef struct pl_volume_s
 static pl_volume_t pl_volume={0,0,0};
 
 // to set/get/query special features/parameters
-static int control(int cmd,int arg){
+static int control(int cmd,void *arg){
   switch(cmd){
   case AOCONTROL_PLUGIN_SET_LEN:
     return CONTROL_OK;