Mercurial > mplayer.hg

changeset 9633:12b1790038b0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
64bit libao2 fix by Jens Axboe <mplayer-dev@kernel.dk>
author alex
date Fri, 21 Mar 2003 16:42:50 +0000
parents cf92beb331ab
children 8bb1a24ed0a8
files libao2/ao_alsa1x.c libao2/ao_alsa5.c libao2/ao_alsa9.c libao2/ao_arts.c libao2/ao_dxr2.c libao2/ao_esd.c libao2/ao_mpegpes.c libao2/ao_nas.c libao2/ao_null.c libao2/ao_oss.c libao2/ao_pcm.c libao2/ao_plugin.c libao2/ao_sdl.c libao2/ao_sgi.c libao2/ao_sun.c libao2/ao_win32.c libao2/audio_out.c libao2/audio_out.h libao2/audio_out_internal.h libao2/audio_plugin.h libao2/audio_plugin_internal.h libao2/pl_delay.c libao2/pl_eq.c libao2/pl_extrastereo.c libao2/pl_format.c libao2/pl_resample.c libao2/pl_surround.c libao2/pl_volnorm.c libao2/pl_volume.c mixer.c
diffstat 30 files changed, 33 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/libao2/ao_alsa1x.c	Fri Mar 21 16:32:53 2003 +0000
+++ b/libao2/ao_alsa1x.c	Fri Mar 21 16:42:50 2003 +0000
@@ -79,7 +79,7 @@
 
 
 /* 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:
--- a/libao2/ao_alsa5.c	Fri Mar 21 16:32:53 2003 +0000
+++ b/libao2/ao_alsa5.c	Fri Mar 21 16:42:50 2003 +0000
@@ -32,7 +32,7 @@
 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);
 }
--- a/libao2/ao_alsa9.c	Fri Mar 21 16:32:53 2003 +0000
+++ b/libao2/ao_alsa9.c	Fri Mar 21 16:42:50 2003 +0000
@@ -79,7 +79,7 @@
 
 
 /* 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:
--- a/libao2/ao_arts.c	Fri Mar 21 16:32:53 2003 +0000
+++ b/libao2/ao_arts.c	Fri Mar 21 16:42:50 2003 +0000
@@ -34,7 +34,7 @@
 
 LIBAO_EXTERN(arts)
 
-static int control(int cmd, int arg)
+static int control(int cmd, void *arg)
 {
 	return(CONTROL_UNKNOWN);
 }
--- a/libao2/ao_dxr2.c	Fri Mar 21 16:32:53 2003 +0000
+++ b/libao2/ao_dxr2.c	Fri Mar 21 16:42:50 2003 +0000
@@ -28,7 +28,7 @@
 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) {
--- a/libao2/ao_esd.c	Fri Mar 21 16:32:53 2003 +0000
+++ b/libao2/ao_esd.c	Fri Mar 21 16:42:50 2003 +0000
@@ -74,7 +74,7 @@
 /*
  * 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;
--- a/libao2/ao_mpegpes.c	Fri Mar 21 16:32:53 2003 +0000
+++ b/libao2/ao_mpegpes.c	Fri Mar 21 16:42:50 2003 +0000
@@ -49,7 +49,7 @@
 
 
 // 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:
--- a/libao2/ao_nas.c	Fri Mar 21 16:32:53 2003 +0000
+++ b/libao2/ao_nas.c	Fri Mar 21 16:42:50 2003 +0000
@@ -333,7 +333,7 @@
 }
 
 // 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;
--- a/libao2/ao_null.c	Fri Mar 21 16:32:53 2003 +0000
+++ b/libao2/ao_null.c	Fri Mar 21 16:42:50 2003 +0000
@@ -41,7 +41,7 @@
 }
 
 // to set/get/query special features/parameters
-static int control(int cmd,int arg){
+static int control(int cmd,void *arg){
     return -1;
 }
 
--- a/libao2/ao_oss.c	Fri Mar 21 16:32:53 2003 +0000
+++ b/libao2/ao_oss.c	Fri Mar 21 16:42:50 2003 +0000
@@ -39,7 +39,7 @@
 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;
--- a/libao2/ao_pcm.c	Fri Mar 21 16:32:53 2003 +0000
+++ b/libao2/ao_pcm.c	Fri Mar 21 16:42:50 2003 +0000
@@ -68,7 +68,7 @@
 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;
 }
 
--- a/libao2/ao_plugin.c	Fri Mar 21 16:32:53 2003 +0000
+++ b/libao2/ao_plugin.c	Fri Mar 21 16:42:50 2003 +0000
@@ -44,10 +44,10 @@
 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:
--- a/libao2/ao_sdl.c	Fri Mar 21 16:32:53 2003 +0000
+++ b/libao2/ao_sdl.c	Fri Mar 21 16:42:50 2003 +0000
@@ -113,7 +113,7 @@
 
 
 // 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:
 		{
--- a/libao2/ao_sgi.c	Fri Mar 21 16:32:53 2003 +0000
+++ b/libao2/ao_sgi.c	Fri Mar 21 16:42:50 2003 +0000
@@ -27,7 +27,7 @@
 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");
   
--- a/libao2/ao_sun.c	Fri Mar 21 16:32:53 2003 +0000
+++ b/libao2/ao_sun.c	Fri Mar 21 16:42:50 2003 +0000
@@ -376,7 +376,7 @@
 }
 
 // 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;
--- a/libao2/ao_win32.c	Fri Mar 21 16:32:53 2003 +0000
+++ b/libao2/ao_win32.c	Fri Mar 21 16:42:50 2003 +0000
@@ -64,7 +64,7 @@
 }
 
 // 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)
--- a/libao2/audio_out.c	Fri Mar 21 16:32:53 2003 +0000
+++ b/libao2/audio_out.c	Fri Mar 21 16:42:50 2003 +0000
@@ -124,7 +124,7 @@
 	    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 @@
     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))
--- a/libao2/audio_out.h	Fri Mar 21 16:32:53 2003 +0000
+++ b/libao2/audio_out.h	Fri Mar 21 16:42:50 2003 +0000
@@ -18,7 +18,7 @@
 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)();
--- a/libao2/audio_out_internal.h	Fri Mar 21 16:32:53 2003 +0000
+++ b/libao2/audio_out_internal.h	Fri Mar 21 16:42:50 2003 +0000
@@ -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();
--- a/libao2/audio_plugin.h	Fri Mar 21 16:32:53 2003 +0000
+++ b/libao2/audio_plugin.h	Fri Mar 21 16:42:50 2003 +0000
@@ -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)();
--- a/libao2/audio_plugin_internal.h	Fri Mar 21 16:32:53 2003 +0000
+++ b/libao2/audio_plugin_internal.h	Fri Mar 21 16:42:50 2003 +0000
@@ -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();
--- a/libao2/pl_delay.c	Fri Mar 21 16:32:53 2003 +0000
+++ b/libao2/pl_delay.c	Fri Mar 21 16:42:50 2003 +0000
@@ -38,7 +38,7 @@
 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) 
--- a/libao2/pl_eq.c	Fri Mar 21 16:32:53 2003 +0000
+++ b/libao2/pl_eq.c	Fri Mar 21 16:42:50 2003 +0000
@@ -62,7 +62,7 @@
 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;
--- a/libao2/pl_extrastereo.c	Fri Mar 21 16:32:53 2003 +0000
+++ b/libao2/pl_extrastereo.c	Fri Mar 21 16:42:50 2003 +0000
@@ -39,7 +39,7 @@
 
 
 // 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;
--- a/libao2/pl_format.c	Fri Mar 21 16:32:53 2003 +0000
+++ b/libao2/pl_format.c	Fri Mar 21 16:42:50 2003 +0000
@@ -57,7 +57,7 @@
 #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) 
--- a/libao2/pl_resample.c	Fri Mar 21 16:32:53 2003 +0000
+++ b/libao2/pl_resample.c	Fri Mar 21 16:42:50 2003 +0000
@@ -93,7 +93,7 @@
 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) 
--- a/libao2/pl_surround.c	Fri Mar 21 16:32:53 2003 +0000
+++ b/libao2/pl_surround.c	Fri Mar 21 16:42:50 2003 +0000
@@ -79,7 +79,7 @@
 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;
--- a/libao2/pl_volnorm.c	Fri Mar 21 16:32:53 2003 +0000
+++ b/libao2/pl_volnorm.c	Fri Mar 21 16:42:50 2003 +0000
@@ -103,7 +103,7 @@
 
 
 // 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;
--- a/libao2/pl_volume.c	Fri Mar 21 16:32:53 2003 +0000
+++ b/libao2/pl_volume.c	Fri Mar 21 16:42:50 2003 +0000
@@ -43,7 +43,7 @@
 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;
--- a/mixer.c	Fri Mar 21 16:32:53 2003 +0000
+++ b/mixer.c	Fri Mar 21 16:42:50 2003 +0000
@@ -22,7 +22,7 @@
   ao_control_vol_t vol;
   *l=0; *r=0;
   if(audio_out){
-    if(CONTROL_OK != audio_out->control(AOCONTROL_GET_VOLUME,(int)&vol))
+    if(CONTROL_OK != audio_out->control(AOCONTROL_GET_VOLUME,&vol))
       return;
     *r=vol.right;
     *l=vol.left;
@@ -34,7 +34,7 @@
   ao_control_vol_t vol;
   vol.right=r; vol.left=l;
   if(audio_out){
-    if(CONTROL_OK != audio_out->control(AOCONTROL_SET_VOLUME,(int)&vol))
+    if(CONTROL_OK != audio_out->control(AOCONTROL_SET_VOLUME,&vol))
       return;
   }
  muted=0;