CVS: 0_90/libao2 ao_alsa5.c,1.13,1.14 ao_alsa9.c,1.31,1.32 ao_arts.c,1.4,1.5 ao_dxr2.c,1.3,1.4 ao_esd.c,1.2,1.3 ao_mpegpes.c,1.17,1.18 ao_nas.c,1.12,1.13 ao_null.c,1.9,1.10 ao_oss.c,1.38,1.39 ao_pcm.c,1.16,1.17 ao_plugin.c,1.22,1.23 ao_sdl.c,1.21,1.22 ao_sgi.c,1.2,1.3 ao_sun.c,1.23,1.24 ao_win32.c,1.3,1.4 audio_out.c,1.32,1.33 audio_out.h,1.11,1.12 audio_out_internal.h,1.3,1.4 audio_plugin.h,1.12,1.13 audio_plugin_internal.h,1.3,1.4 pl_delay.c,1.6,1.7 pl_eq.c,1.7,1.8 pl_extrastereo.c,1.4,1.
Update of /cvsroot/mplayer/0_90/libao2 In directory mail:/var/tmp.root/cvs-serv30384/libao2 Modified Files: ao_alsa5.c ao_alsa9.c ao_arts.c ao_dxr2.c ao_esd.c ao_mpegpes.c ao_nas.c ao_null.c ao_oss.c ao_pcm.c ao_plugin.c ao_sdl.c ao_sgi.c ao_sun.c ao_win32.c audio_out.c audio_out.h audio_out_internal.h audio_plugin.h audio_plugin_internal.h pl_delay.c pl_eq.c pl_extrastereo.c pl_format.c pl_resample.c pl_surround.c pl_volnorm.c pl_volume.c Log Message: backport: int->void* (64-bit systems support) Index: ao_alsa5.c =================================================================== RCS file: /cvsroot/mplayer/0_90/libao2/ao_alsa5.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ao_alsa5.c 1 Nov 2002 17:46:42 -0000 1.13 +++ ao_alsa5.c 22 Mar 2003 16:33:00 -0000 1.14 @@ -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); } Index: ao_alsa9.c =================================================================== RCS file: /cvsroot/mplayer/0_90/libao2/ao_alsa9.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- ao_alsa9.c 17 Mar 2003 00:50:47 -0000 1.31 +++ ao_alsa9.c 22 Mar 2003 16:33:00 -0000 1.32 @@ -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: Index: ao_arts.c =================================================================== RCS file: /cvsroot/mplayer/0_90/libao2/ao_arts.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ao_arts.c 27 Dec 2002 16:35:29 -0000 1.4 +++ ao_arts.c 22 Mar 2003 16:33:00 -0000 1.5 @@ -34,7 +34,7 @@ LIBAO_EXTERN(arts) -static int control(int cmd, int arg) +static int control(int cmd, void *arg) { return(CONTROL_UNKNOWN); } Index: ao_dxr2.c =================================================================== RCS file: /cvsroot/mplayer/0_90/libao2/ao_dxr2.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ao_dxr2.c 17 May 2002 23:51:36 -0000 1.3 +++ ao_dxr2.c 22 Mar 2003 16:33:00 -0000 1.4 @@ -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) { Index: ao_esd.c =================================================================== RCS file: /cvsroot/mplayer/0_90/libao2/ao_esd.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ao_esd.c 28 Dec 2002 18:51:08 -0000 1.2 +++ ao_esd.c 22 Mar 2003 16:33:00 -0000 1.3 @@ -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; Index: ao_mpegpes.c =================================================================== RCS file: /cvsroot/mplayer/0_90/libao2/ao_mpegpes.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ao_mpegpes.c 12 Feb 2003 23:27:56 -0000 1.17 +++ ao_mpegpes.c 22 Mar 2003 16:33:00 -0000 1.18 @@ -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: Index: ao_nas.c =================================================================== RCS file: /cvsroot/mplayer/0_90/libao2/ao_nas.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ao_nas.c 17 Mar 2003 00:51:32 -0000 1.12 +++ ao_nas.c 22 Mar 2003 16:33:00 -0000 1.13 @@ -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; Index: ao_null.c =================================================================== RCS file: /cvsroot/mplayer/0_90/libao2/ao_null.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ao_null.c 22 Sep 2002 02:33:24 -0000 1.9 +++ ao_null.c 22 Mar 2003 16:33:00 -0000 1.10 @@ -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; } Index: ao_oss.c =================================================================== RCS file: /cvsroot/mplayer/0_90/libao2/ao_oss.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- ao_oss.c 28 Jan 2003 17:25:53 -0000 1.38 +++ ao_oss.c 22 Mar 2003 16:33:00 -0000 1.39 @@ -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; Index: ao_pcm.c =================================================================== RCS file: /cvsroot/mplayer/0_90/libao2/ao_pcm.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ao_pcm.c 4 Feb 2003 18:22:43 -0000 1.16 +++ ao_pcm.c 22 Mar 2003 16:33:00 -0000 1.17 @@ -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; } Index: ao_plugin.c =================================================================== RCS file: /cvsroot/mplayer/0_90/libao2/ao_plugin.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- ao_plugin.c 18 Jan 2003 01:06:05 -0000 1.22 +++ ao_plugin.c 22 Mar 2003 16:33:00 -0000 1.23 @@ -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: Index: ao_sdl.c =================================================================== RCS file: /cvsroot/mplayer/0_90/libao2/ao_sdl.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- ao_sdl.c 1 Nov 2002 17:46:42 -0000 1.21 +++ ao_sdl.c 22 Mar 2003 16:33:00 -0000 1.22 @@ -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: { Index: ao_sgi.c =================================================================== RCS file: /cvsroot/mplayer/0_90/libao2/ao_sgi.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ao_sgi.c 24 Nov 2001 05:21:22 -0000 1.2 +++ ao_sgi.c 22 Mar 2003 16:33:00 -0000 1.3 @@ -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"); Index: ao_sun.c =================================================================== RCS file: /cvsroot/mplayer/0_90/libao2/ao_sun.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- ao_sun.c 1 Nov 2002 17:46:42 -0000 1.23 +++ ao_sun.c 22 Mar 2003 16:33:00 -0000 1.24 @@ -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; Index: ao_win32.c =================================================================== RCS file: /cvsroot/mplayer/0_90/libao2/ao_win32.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ao_win32.c 17 Mar 2003 00:52:13 -0000 1.3 +++ ao_win32.c 22 Mar 2003 16:33:00 -0000 1.4 @@ -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) Index: audio_out.c =================================================================== RCS file: /cvsroot/mplayer/0_90/libao2/audio_out.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- audio_out.c 3 Jan 2003 05:10:29 -0000 1.32 +++ audio_out.c 22 Mar 2003 16:33:00 -0000 1.33 @@ -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)) Index: audio_out.h =================================================================== RCS file: /cvsroot/mplayer/0_90/libao2/audio_out.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- audio_out.h 29 Sep 2002 22:57:54 -0000 1.11 +++ audio_out.h 22 Mar 2003 16:33:00 -0000 1.12 @@ -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)(); Index: audio_out_internal.h =================================================================== RCS file: /cvsroot/mplayer/0_90/libao2/audio_out_internal.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- audio_out_internal.h 24 Nov 2001 05:21:22 -0000 1.3 +++ audio_out_internal.h 22 Mar 2003 16:33:00 -0000 1.4 @@ -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(); Index: audio_plugin.h =================================================================== RCS file: /cvsroot/mplayer/0_90/libao2/audio_plugin.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- audio_plugin.h 25 Jul 2002 20:28:47 -0000 1.12 +++ audio_plugin.h 22 Mar 2003 16:33:00 -0000 1.13 @@ -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)(); Index: audio_plugin_internal.h =================================================================== RCS file: /cvsroot/mplayer/0_90/libao2/audio_plugin_internal.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- audio_plugin_internal.h 4 Dec 2001 15:45:21 -0000 1.3 +++ audio_plugin_internal.h 22 Mar 2003 16:33:00 -0000 1.4 @@ -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(); Index: pl_delay.c =================================================================== RCS file: /cvsroot/mplayer/0_90/libao2/pl_delay.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pl_delay.c 22 Sep 2002 02:33:24 -0000 1.6 +++ pl_delay.c 22 Mar 2003 16:33:00 -0000 1.7 @@ -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) Index: pl_eq.c =================================================================== RCS file: /cvsroot/mplayer/0_90/libao2/pl_eq.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- pl_eq.c 3 Jan 2003 15:12:18 -0000 1.7 +++ pl_eq.c 22 Mar 2003 16:33:00 -0000 1.8 @@ -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; Index: pl_extrastereo.c =================================================================== RCS file: /cvsroot/mplayer/0_90/libao2/pl_extrastereo.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pl_extrastereo.c 3 Jan 2003 15:12:18 -0000 1.4 +++ pl_extrastereo.c 22 Mar 2003 16:33:00 -0000 1.5 @@ -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; Index: pl_format.c =================================================================== RCS file: /cvsroot/mplayer/0_90/libao2/pl_format.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- pl_format.c 2 Feb 2003 02:42:57 -0000 1.7 +++ pl_format.c 22 Mar 2003 16:33:00 -0000 1.8 @@ -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) Index: pl_resample.c =================================================================== RCS file: /cvsroot/mplayer/0_90/libao2/pl_resample.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- pl_resample.c 3 Jan 2003 15:12:18 -0000 1.12 +++ pl_resample.c 22 Mar 2003 16:33:00 -0000 1.13 @@ -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) Index: pl_surround.c =================================================================== RCS file: /cvsroot/mplayer/0_90/libao2/pl_surround.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- pl_surround.c 3 Jan 2003 15:12:18 -0000 1.13 +++ pl_surround.c 22 Mar 2003 16:33:00 -0000 1.14 @@ -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; Index: pl_volnorm.c =================================================================== RCS file: /cvsroot/mplayer/0_90/libao2/pl_volnorm.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pl_volnorm.c 3 Jan 2003 15:12:18 -0000 1.6 +++ pl_volnorm.c 22 Mar 2003 16:33:00 -0000 1.7 @@ -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; Index: pl_volume.c =================================================================== RCS file: /cvsroot/mplayer/0_90/libao2/pl_volume.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pl_volume.c 3 Jan 2003 15:12:18 -0000 1.3 +++ pl_volume.c 22 Mar 2003 16:33:00 -0000 1.4 @@ -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;
participants (1)
-
Arpi of Ize