mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 12:02:23 +02:00
Code

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

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9634 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
alex 2003-03-21 16:42:50 +00:00
parent 214d90e431
commit d65c8518de
30 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libao2/ao_alsa1x.c
View File

@ -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:

2
libao2/ao_alsa5.c
View File

@ -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);
}

2
libao2/ao_alsa9.c
View File

@ -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:

2
libao2/ao_arts.c
View File

@ -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);
}

2
libao2/ao_dxr2.c
View File

@ -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) {

2
libao2/ao_esd.c
View File

@ -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;

2
libao2/ao_mpegpes.c
View File

@ -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:

2
libao2/ao_nas.c
View File

@ -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;

2
libao2/ao_null.c
View File

@ -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;
}

2
libao2/ao_oss.c
View File

@ -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;

2
libao2/ao_pcm.c
View File

@ -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;
}

4
libao2/ao_plugin.c
View File

@ -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:

2
libao2/ao_sdl.c
View File

@ -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:
{

2
libao2/ao_sgi.c
View File

@ -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");

2
libao2/ao_sun.c
View File

@ -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;

2
libao2/ao_win32.c
View File

@ -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)

4
libao2/audio_out.c
View File

@ -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))

2
libao2/audio_out.h
View File

@ -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)();

2
libao2/audio_out_internal.h
View File

@ -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();

2
libao2/audio_plugin.h
View File

@ -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)();

2
libao2/audio_plugin_internal.h
View File

@ -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();

2
libao2/pl_delay.c
View File

@ -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)

2
libao2/pl_eq.c
View File

@ -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;

2
libao2/pl_extrastereo.c
View File

@ -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;

2
libao2/pl_format.c
View File

@ -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)

2
libao2/pl_resample.c
View File

@ -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)

2
libao2/pl_surround.c
View File

@ -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;

2
libao2/pl_volnorm.c
View File

@ -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;

2
libao2/pl_volume.c
View File

@ -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;

4
mixer.c
View File

@ -22,7 +22,7 @@ void mixer_getvolume( float *l,float *r )
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 @@ void mixer_setvolume( float l,float r )
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;