[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[308] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[308] mplayerxp
|
From: <nic...@us...> - 2012-11-09 08:17:59
|
Revision: 308
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=308&view=rev
Author: nickols_k
Date: 2012-11-09 08:17:43 +0000 (Fri, 09 Nov 2012)
Log Message:
-----------
use universal return codes
Modified Paths:
--------------
mplayerxp/libao2/ao_alsa9.c
mplayerxp/libao2/ao_arts.c
mplayerxp/libao2/ao_esd.c
mplayerxp/libao2/ao_jack.c
mplayerxp/libao2/ao_nas.c
mplayerxp/libao2/ao_null.c
mplayerxp/libao2/ao_openal.c
mplayerxp/libao2/ao_oss.c
mplayerxp/libao2/ao_sdl.c
mplayerxp/libao2/ao_wav.c
mplayerxp/libao2/audio_out.c
mplayerxp/libao2/audio_out.h
mplayerxp/libao2/audio_out_internal.h
mplayerxp/libmpcodecs/ad.h
mplayerxp/libmpcodecs/ad_a52.c
mplayerxp/libmpcodecs/ad_acm.c
mplayerxp/libmpcodecs/ad_dca.c
mplayerxp/libmpcodecs/ad_dmo.c
mplayerxp/libmpcodecs/ad_dshow.c
mplayerxp/libmpcodecs/ad_dvdpcm.c
mplayerxp/libmpcodecs/ad_faad.c
mplayerxp/libmpcodecs/ad_ffmpeg.c
mplayerxp/libmpcodecs/ad_hwac3.c
mplayerxp/libmpcodecs/ad_internal.h
mplayerxp/libmpcodecs/ad_libdv.c
mplayerxp/libmpcodecs/ad_mp3.c
mplayerxp/libmpcodecs/ad_null.c
mplayerxp/libmpcodecs/ad_pcm.c
mplayerxp/libmpcodecs/ad_qtaudio.c
mplayerxp/libmpcodecs/ad_real.c
mplayerxp/libmpcodecs/ad_twin.c
mplayerxp/libmpcodecs/ad_vorbis.c
mplayerxp/libmpcodecs/dec_audio.c
mplayerxp/libmpcodecs/dec_video.c
mplayerxp/libmpcodecs/vd.c
mplayerxp/libmpcodecs/vd.h
mplayerxp/libmpcodecs/vd_divx4.c
mplayerxp/libmpcodecs/vd_dmo.c
mplayerxp/libmpcodecs/vd_dshow.c
mplayerxp/libmpcodecs/vd_ffmpeg.c
mplayerxp/libmpcodecs/vd_huffyuv.c
mplayerxp/libmpcodecs/vd_internal.h
mplayerxp/libmpcodecs/vd_libdv.c
mplayerxp/libmpcodecs/vd_libmpeg2.c
mplayerxp/libmpcodecs/vd_mpegpes.c
mplayerxp/libmpcodecs/vd_null.c
mplayerxp/libmpcodecs/vd_nuv.c
mplayerxp/libmpcodecs/vd_qtvideo.c
mplayerxp/libmpcodecs/vd_raw.c
mplayerxp/libmpcodecs/vd_real.c
mplayerxp/libmpcodecs/vd_theora.c
mplayerxp/libmpcodecs/vd_vfw.c
mplayerxp/libmpcodecs/vd_xanim.c
mplayerxp/libmpcodecs/vd_xvid.c
mplayerxp/libvo/video_out.c
mplayerxp/libvo/video_out.h
mplayerxp/libvo/video_out_internal.h
mplayerxp/libvo/vo_dga.c
mplayerxp/libvo/vo_fbdev.c
mplayerxp/libvo/vo_null.c
mplayerxp/libvo/vo_opengl.c
mplayerxp/libvo/vo_sdl.c
mplayerxp/libvo/vo_vesa.c
mplayerxp/libvo/vo_x11.c
mplayerxp/libvo/vo_xv.c
mplayerxp/libvo/vo_xvidix.c
mplayerxp/libvo/vosub_vidix.c
mplayerxp/mixer.c
mplayerxp/mplayerxp.c
mplayerxp/postproc/af.c
mplayerxp/postproc/af.h
mplayerxp/postproc/af_ao2.c
mplayerxp/postproc/af_center.c
mplayerxp/postproc/af_channels.c
mplayerxp/postproc/af_comp.c
mplayerxp/postproc/af_control.h
mplayerxp/postproc/af_crystality.c
mplayerxp/postproc/af_delay.c
mplayerxp/postproc/af_dummy.c
mplayerxp/postproc/af_dyn.c
mplayerxp/postproc/af_echo3d.c
mplayerxp/postproc/af_equalizer.c
mplayerxp/postproc/af_export.c
mplayerxp/postproc/af_extrastereo.c
mplayerxp/postproc/af_ffenc.c
mplayerxp/postproc/af_format.c
mplayerxp/postproc/af_format_alaw.c
mplayerxp/postproc/af_format_ulaw.c
mplayerxp/postproc/af_gate.c
mplayerxp/postproc/af_hrtf.c
mplayerxp/postproc/af_karaoke.c
mplayerxp/postproc/af_lp.c
mplayerxp/postproc/af_pan.c
mplayerxp/postproc/af_raw.c
mplayerxp/postproc/af_resample.c
mplayerxp/postproc/af_scaletempo.c
mplayerxp/postproc/af_sinesuppress.c
mplayerxp/postproc/af_sub.c
mplayerxp/postproc/af_surround.c
mplayerxp/postproc/af_tools.c
mplayerxp/postproc/af_volnorm.c
mplayerxp/postproc/af_volume.c
mplayerxp/postproc/vf.c
mplayerxp/postproc/vf.h
mplayerxp/postproc/vf_1bpp.c
mplayerxp/postproc/vf_2xsai.c
mplayerxp/postproc/vf_aspect.c
mplayerxp/postproc/vf_delogo.c
mplayerxp/postproc/vf_denoise3d.c
mplayerxp/postproc/vf_dint.c
mplayerxp/postproc/vf_down3dright.c
mplayerxp/postproc/vf_eq.c
mplayerxp/postproc/vf_expand.c
mplayerxp/postproc/vf_flip.c
mplayerxp/postproc/vf_format.c
mplayerxp/postproc/vf_framestep.c
mplayerxp/postproc/vf_il.c
mplayerxp/postproc/vf_menu.c
mplayerxp/postproc/vf_mirror.c
mplayerxp/postproc/vf_noise.c
mplayerxp/postproc/vf_ow.c
mplayerxp/postproc/vf_palette.c
mplayerxp/postproc/vf_panscan.c
mplayerxp/postproc/vf_perspective.c
mplayerxp/postproc/vf_pp.c
mplayerxp/postproc/vf_raw.c
mplayerxp/postproc/vf_rectangle.c
mplayerxp/postproc/vf_rgb2bgr.c
mplayerxp/postproc/vf_rotate.c
mplayerxp/postproc/vf_scale.c
mplayerxp/postproc/vf_smartblur.c
mplayerxp/postproc/vf_softpulldown.c
mplayerxp/postproc/vf_swapuv.c
mplayerxp/postproc/vf_test.c
mplayerxp/postproc/vf_unsharp.c
mplayerxp/postproc/vf_vo.c
mplayerxp/postproc/vf_yuvcsp.c
mplayerxp/postproc/vf_yuy2.c
mplayerxp/postproc/vf_yvu9.c
mplayerxp/xmpcore/xmp_enums.h
Modified: mplayerxp/libao2/ao_alsa9.c
===================================================================
--- mplayerxp/libao2/ao_alsa9.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libao2/ao_alsa9.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -131,7 +131,7 @@
}
/* to set/get/query special features/parameters */
-static ControlCodes __FASTCALL__ control(ao_data_t* ao,int cmd, long arg)
+static MPXP_Rc __FASTCALL__ control(ao_data_t* ao,int cmd, long arg)
{
priv_t*priv=ao->priv;
int rval;
@@ -139,15 +139,15 @@
case AOCONTROL_QUERY_FORMAT:
rval=fmt2alsa(arg);
return snd_pcm_hw_params_test_format(priv->handler, priv->hwparams,rval)==0?
- CONTROL_TRUE:CONTROL_FALSE;
+ MPXP_True:MPXP_False;
case AOCONTROL_QUERY_CHANNELS:
rval=arg;
return snd_pcm_hw_params_test_channels(priv->handler, priv->hwparams,rval)==0?
- CONTROL_TRUE:CONTROL_FALSE;
+ MPXP_True:MPXP_False;
case AOCONTROL_QUERY_RATE:
rval=arg;
return snd_pcm_hw_params_test_rate(priv->handler, priv->hwparams,rval,0)==0?
- CONTROL_TRUE:CONTROL_FALSE;
+ MPXP_True:MPXP_False;
case AOCONTROL_GET_VOLUME:
case AOCONTROL_SET_VOLUME:
#ifndef WORDS_BIGENDIAN
@@ -166,7 +166,7 @@
long get_vol, set_vol;
float calc_vol, diff, f_multi;
- if(ao->format == AFMT_AC3) return CONTROL_TRUE;
+ if(ao->format == AFMT_AC3) return MPXP_True;
//allocate simple id
snd_mixer_selem_id_alloca(&sid);
@@ -177,31 +177,31 @@
if ((err = snd_mixer_open(&handle, 0)) < 0) {
MSG_ERR("alsa-control: mixer open error: %s\n", snd_strerror(err));
- return CONTROL_ERROR;
+ return MPXP_Error;
}
if ((err = snd_mixer_attach(handle, card)) < 0) {
MSG_ERR("alsa-control: mixer attach %s error: %s", card, snd_strerror(err));
snd_mixer_close(handle);
- return CONTROL_ERROR;
+ return MPXP_Error;
}
if ((err = snd_mixer_selem_register(handle, NULL, NULL)) < 0) {
MSG_ERR("alsa-control: mixer register error: %s", snd_strerror(err));
snd_mixer_close(handle);
- return CONTROL_ERROR;
+ return MPXP_Error;
}
if ((err = snd_mixer_load(handle)) < 0) {
MSG_ERR("alsa-control: mixer load error: %s", snd_strerror(err));
snd_mixer_close(handle);
- return CONTROL_ERROR;
+ return MPXP_Error;
}
elem = snd_mixer_find_selem(handle, sid);
if (!elem) {
MSG_ERR("alsa-control: unable to find simple control '%s',%i\n", snd_mixer_selem_id_get_name(sid), snd_mixer_selem_id_get_index(sid));
snd_mixer_close(handle);
- return CONTROL_ERROR;
+ return MPXP_Error;
}
snd_mixer_selem_get_playback_volume_range(elem,&pmin,&pmax);
@@ -218,11 +218,11 @@
//setting channels
if ((err = snd_mixer_selem_set_playback_volume(elem, 0, set_vol)) < 0) {
MSG_ERR("alsa-control: error setting left channel, %s",snd_strerror(err));
- return CONTROL_ERROR;
+ return MPXP_Error;
}
if ((err = snd_mixer_selem_set_playback_volume(elem, 1, set_vol)) < 0) {
MSG_ERR("alsa-control: error setting right channel, %s",snd_strerror(err));
- return CONTROL_ERROR;
+ return MPXP_Error;
}
} else {
snd_mixer_selem_get_playback_volume(elem, 0, &get_vol);
@@ -234,13 +234,13 @@
//printf("get_vol = %i, calc=%i\n",get_vol, calc_vol);
}
snd_mixer_close(handle);
- return CONTROL_OK;
+ return MPXP_Ok;
}
#else // end big-endian
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
#endif
} //end witch
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
static void __FASTCALL__ show_caps(unsigned device)
Modified: mplayerxp/libao2/ao_arts.c
===================================================================
--- mplayerxp/libao2/ao_arts.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libao2/ao_arts.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -45,12 +45,12 @@
LIBAO_EXTERN(arts)
-static ControlCodes control(ao_data_t* ao,int cmd, long arg)
+static MPXP_Rc control(ao_data_t* ao,int cmd, long arg)
{
UNUSED(ao);
UNUSED(cmd);
UNUSED(arg);
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
static int init(ao_data_t* ao,unsigned flags)
Modified: mplayerxp/libao2/ao_esd.c
===================================================================
--- mplayerxp/libao2/ao_esd.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libao2/ao_esd.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -93,7 +93,7 @@
/*
* to set/get/query special features/parameters
*/
-static ControlCodes control(ao_data_t* ao,int cmd, long arg)
+static MPXP_Rc control(ao_data_t* ao,int cmd, long arg)
{
priv_t*priv=ao->priv;
esd_player_info_t *esd_pi;
@@ -107,12 +107,12 @@
time(&now);
if (now == vol_cache_time) {
*(ao_control_vol_t *)arg = vol_cache;
- return CONTROL_OK;
+ return MPXP_Ok;
}
dprintf("esd: get vol\n");
if ((esd_i = esd_get_all_info(priv->fd)) == NULL)
- return CONTROL_ERROR;
+ return MPXP_Error;
for (esd_pi = esd_i->player_list; esd_pi != NULL; esd_pi = esd_pi->next)
if (strcmp(esd_pi->name, ESD_CLIENT_NAME) == 0)
@@ -128,12 +128,12 @@
}
esd_free_all_info(esd_i);
- return CONTROL_OK;
+ return MPXP_Ok;
case AOCONTROL_SET_VOLUME:
dprintf("esd: set vol\n");
if ((esd_i = esd_get_all_info(priv->fd)) == NULL)
- return CONTROL_ERROR;
+ return MPXP_Error;
for (esd_pi = esd_i->player_list; esd_pi != NULL; esd_pi = esd_pi->next)
if (strcmp(esd_pi->name, ESD_CLIENT_NAME) == 0)
@@ -149,10 +149,10 @@
time(&vol_cache_time);
}
esd_free_all_info(esd_i);
- return CONTROL_OK;
+ return MPXP_Ok;
default:
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
}
Modified: mplayerxp/libao2/ao_jack.c
===================================================================
--- mplayerxp/libao2/ao_jack.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libao2/ao_jack.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -140,11 +140,11 @@
// end ring priv->buffer stuff
-static ControlCodes control(ao_data_t* ao,int cmd, long arg) {
+static MPXP_Rc control(ao_data_t* ao,int cmd, long arg) {
UNUSED(ao);
UNUSED(cmd);
UNUSED(arg);
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
/**
Modified: mplayerxp/libao2/ao_nas.c
===================================================================
--- mplayerxp/libao2/ao_nas.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libao2/ao_nas.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -368,12 +368,12 @@
}
// to set/get/query special features/parameters
-static ControlCodes control(ao_data_t* ao,int cmd, long arg)
+static MPXP_Rc control(ao_data_t* ao,int cmd, long arg)
{
priv_t*priv=ao->priv;
AuElementParameters aep;
AuStatus as;
- int retval = CONTROL_UNKNOWN;
+ int retval = MPXP_Unknown;
ao_control_vol_t *vol = (ao_control_vol_t *)arg;
@@ -384,7 +384,7 @@
vol->left = vol->right;
MSG_DBG2( "ao_nas: AOCONTROL_GET_VOLUME: %.2f\n", vol->right);
- retval = CONTROL_OK;
+ retval = MPXP_Ok;
break;
case AOCONTROL_SET_VOLUME:
@@ -405,8 +405,8 @@
if (as != AuSuccess) {
nas_print_error(priv->aud,
"control(): AuSetElementParameters", as);
- retval = CONTROL_ERROR;
- } else retval = CONTROL_OK;
+ retval = MPXP_Error;
+ } else retval = MPXP_Ok;
break;
};
Modified: mplayerxp/libao2/ao_null.c
===================================================================
--- mplayerxp/libao2/ao_null.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libao2/ao_null.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -97,11 +97,11 @@
}
// to set/get/query special features/parameters
-static ControlCodes __FASTCALL__ control(ao_data_t* ao,int cmd,long arg){
+static MPXP_Rc __FASTCALL__ control(ao_data_t* ao,int cmd,long arg){
UNUSED(ao);
UNUSED(cmd);
UNUSED(arg);
- return CONTROL_TRUE;
+ return MPXP_True;
}
// open & setup audio device
Modified: mplayerxp/libao2/ao_openal.c
===================================================================
--- mplayerxp/libao2/ao_openal.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libao2/ao_openal.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -60,7 +60,7 @@
int16_t* tmpbuf;
}priv_t;
-static ControlCodes control(ao_data_t* ao,int cmd, long arg) {
+static MPXP_Rc control(ao_data_t* ao,int cmd, long arg) {
UNUSED(ao);
switch (cmd) {
case AOCONTROL_GET_VOLUME:
@@ -73,10 +73,10 @@
}
alGetListenerf(AL_GAIN, &volume);
vol->left = vol->right = volume * 100;
- return CONTROL_TRUE;
+ return MPXP_True;
}
}
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
#if 0
Modified: mplayerxp/libao2/ao_oss.c
===================================================================
--- mplayerxp/libao2/ao_oss.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libao2/ao_oss.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -42,55 +42,55 @@
const char *oss_mixer_device = PATH_DEV_MIXER;
// to set/get/query special features/parameters
-static ControlCodes __FASTCALL__ control(ao_data_t* ao,int cmd,long arg){
+static MPXP_Rc __FASTCALL__ control(ao_data_t* ao,int cmd,long arg){
priv_t*priv=ao->priv;
int rval;
switch(cmd){
case AOCONTROL_SET_DEVICE:
priv->dsp=(char*)arg;
- return CONTROL_OK;
+ return MPXP_Ok;
case AOCONTROL_QUERY_FORMAT:
if (ioctl (priv->fd, SNDCTL_DSP_GETFMTS, &rval) != -1)
{
- if((rval & AFMT_MU_LAW) && arg==AFMT_MU_LAW) return CONTROL_OK;
- if((rval & AFMT_A_LAW) && arg==AFMT_A_LAW) return CONTROL_OK;
- if((rval & AFMT_IMA_ADPCM) && arg==AFMT_IMA_ADPCM) return CONTROL_OK;
- if((rval & AFMT_U8) && arg==AFMT_U8) return CONTROL_OK;
- if((rval & AFMT_S16_LE) && arg==AFMT_S16_LE) return CONTROL_OK;
- if((rval & AFMT_S16_BE) && arg==AFMT_S16_BE) return CONTROL_OK;
- if((rval & AFMT_S8) && arg==AFMT_S8) return CONTROL_OK;
- if((rval & AFMT_U16_LE) && arg==AFMT_U16_LE) return CONTROL_OK;
- if((rval & AFMT_U16_BE) && arg==AFMT_U16_BE) return CONTROL_OK;
- if((rval & AFMT_MPEG) && arg==AFMT_MPEG) return CONTROL_OK;
- if((rval & AFMT_AC3) && arg==AFMT_AC3) return CONTROL_OK;
- if((rval & AFMT_S24_LE) && arg==AFMT_S24_LE) return CONTROL_OK;
- if((rval & AFMT_S24_BE) && arg==AFMT_S24_BE) return CONTROL_OK;
- if((rval & AFMT_U24_LE) && arg==AFMT_U24_LE) return CONTROL_OK;
- if((rval & AFMT_U24_BE) && arg==AFMT_U24_BE) return CONTROL_OK;
- if((rval & AFMT_S32_LE) && arg==AFMT_S32_LE) return CONTROL_OK;
- if((rval & AFMT_S32_BE) && arg==AFMT_S32_BE) return CONTROL_OK;
- if((rval & AFMT_U32_LE) && arg==AFMT_U32_LE) return CONTROL_OK;
- if((rval & AFMT_U32_BE) && arg==AFMT_U32_BE) return CONTROL_OK;
+ if((rval & AFMT_MU_LAW) && arg==AFMT_MU_LAW) return MPXP_Ok;
+ if((rval & AFMT_A_LAW) && arg==AFMT_A_LAW) return MPXP_Ok;
+ if((rval & AFMT_IMA_ADPCM) && arg==AFMT_IMA_ADPCM) return MPXP_Ok;
+ if((rval & AFMT_U8) && arg==AFMT_U8) return MPXP_Ok;
+ if((rval & AFMT_S16_LE) && arg==AFMT_S16_LE) return MPXP_Ok;
+ if((rval & AFMT_S16_BE) && arg==AFMT_S16_BE) return MPXP_Ok;
+ if((rval & AFMT_S8) && arg==AFMT_S8) return MPXP_Ok;
+ if((rval & AFMT_U16_LE) && arg==AFMT_U16_LE) return MPXP_Ok;
+ if((rval & AFMT_U16_BE) && arg==AFMT_U16_BE) return MPXP_Ok;
+ if((rval & AFMT_MPEG) && arg==AFMT_MPEG) return MPXP_Ok;
+ if((rval & AFMT_AC3) && arg==AFMT_AC3) return MPXP_Ok;
+ if((rval & AFMT_S24_LE) && arg==AFMT_S24_LE) return MPXP_Ok;
+ if((rval & AFMT_S24_BE) && arg==AFMT_S24_BE) return MPXP_Ok;
+ if((rval & AFMT_U24_LE) && arg==AFMT_U24_LE) return MPXP_Ok;
+ if((rval & AFMT_U24_BE) && arg==AFMT_U24_BE) return MPXP_Ok;
+ if((rval & AFMT_S32_LE) && arg==AFMT_S32_LE) return MPXP_Ok;
+ if((rval & AFMT_S32_BE) && arg==AFMT_S32_BE) return MPXP_Ok;
+ if((rval & AFMT_U32_LE) && arg==AFMT_U32_LE) return MPXP_Ok;
+ if((rval & AFMT_U32_BE) && arg==AFMT_U32_BE) return MPXP_Ok;
}
- return CONTROL_FALSE;
+ return MPXP_False;
case AOCONTROL_QUERY_CHANNELS:
rval=arg;
if (rval > 2) {
if ( ioctl(priv->fd, SNDCTL_DSP_CHANNELS, &rval) == -1 ||
- rval != arg ) return CONTROL_FALSE;
+ rval != arg ) return MPXP_False;
}
else {
int c = rval-1;
- if (ioctl (priv->fd, SNDCTL_DSP_STEREO, &c) == -1) return CONTROL_FALSE;
+ if (ioctl (priv->fd, SNDCTL_DSP_STEREO, &c) == -1) return MPXP_False;
}
- return CONTROL_TRUE;
+ return MPXP_True;
case AOCONTROL_QUERY_RATE:
rval=arg;
if (ioctl(priv->fd, SNDCTL_DSP_SPEED, &rval) != -1)
{
- if(rval == arg) return CONTROL_OK;
+ if(rval == arg) return MPXP_Ok;
}
- return CONTROL_FALSE;
+ return MPXP_False;
case AOCONTROL_GET_VOLUME:
case AOCONTROL_SET_VOLUME:
{
@@ -98,7 +98,7 @@
int fd, v, devs;
if(ao->format == AFMT_AC3)
- return CONTROL_TRUE;
+ return MPXP_True;
if ((fd = open(oss_mixer_device, O_RDONLY)) > 0)
{
@@ -120,15 +120,15 @@
else
{
close(fd);
- return CONTROL_ERROR;
+ return MPXP_Error;
}
close(fd);
- return CONTROL_OK;
+ return MPXP_Ok;
}
}
- return CONTROL_ERROR;
+ return MPXP_Error;
}
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
static void show_fmts(ao_data_t* ao)
Modified: mplayerxp/libao2/ao_sdl.c
===================================================================
--- mplayerxp/libao2/ao_sdl.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libao2/ao_sdl.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -110,18 +110,18 @@
#endif
// to set/get/query special features/parameters
-static ControlCodes __FASTCALL__ control(ao_data_t* ao,int cmd,long arg){
+static MPXP_Rc __FASTCALL__ control(ao_data_t* ao,int cmd,long arg){
priv_t*priv=ao->priv;
switch (cmd) {
case AOCONTROL_QUERY_FORMAT:
case AOCONTROL_QUERY_CHANNELS:
case AOCONTROL_QUERY_RATE:
- return CONTROL_FALSE;
+ return MPXP_False;
case AOCONTROL_GET_VOLUME:
{
ao_control_vol_t* vol = (ao_control_vol_t*)arg;
vol->left = vol->right = (float)((priv->volume + 127)/2.55);
- return CONTROL_OK;
+ return MPXP_Ok;
}
case AOCONTROL_SET_VOLUME:
{
@@ -129,7 +129,7 @@
ao_control_vol_t* vol = (ao_control_vol_t*)arg;
diff = (vol->left+vol->right) / 2;
priv->volume = (int)(diff * 2.55) - 127;
- return CONTROL_OK;
+ return MPXP_Ok;
}
}
return -1;
Modified: mplayerxp/libao2/ao_wav.c
===================================================================
--- mplayerxp/libao2/ao_wav.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libao2/ao_wav.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -87,7 +87,7 @@
/* init with default values */
// to set/get/query special features/parameters
-static ControlCodes control(ao_data_t* ao,int cmd,long arg){
+static MPXP_Rc control(ao_data_t* ao,int cmd,long arg){
UNUSED(ao);
UNUSED(cmd);
UNUSED(arg);
Modified: mplayerxp/libao2/audio_out.c
===================================================================
--- mplayerxp/libao2/audio_out.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libao2/audio_out.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -262,7 +262,7 @@
if(ao) audio_out->resume(ao);
}
-ControlCodes __FASTCALL__ ao_control(ao_data_t*ao,int cmd,long arg)
+MPXP_Rc __FASTCALL__ ao_control(ao_data_t*ao,int cmd,long arg)
{
- return ao?audio_out->control(ao,cmd,arg):CONTROL_ERROR;
+ return ao?audio_out->control(ao,cmd,arg):MPXP_Error;
}
Modified: mplayerxp/libao2/audio_out.h
===================================================================
--- mplayerxp/libao2/audio_out.h 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libao2/audio_out.h 2012-11-09 08:17:43 UTC (rev 308)
@@ -33,9 +33,9 @@
/** Control interface
* @param cmd command. See AOCONTROL_** for detail
* @param arg argument associated with command
- * @return CONTROL_OK if success CONTROL_FALSE CONTROL_ERROR CONTROL_NA otherwise
+ * @return MPXP_Ok if success MPXP_False MPXP_Error MPXP_NA otherwise
**/
- ControlCodes (* __FASTCALL__ control)(ao_data_t*,int cmd,long arg);
+ MPXP_Rc (* __FASTCALL__ control)(ao_data_t*,int cmd,long arg);
/** Preinitializes driver
* @param flag currently unused
@@ -109,5 +109,5 @@
extern float __FASTCALL__ ao_get_delay(ao_data_t* priv);
extern void __FASTCALL__ ao_pause(ao_data_t* priv);
extern void __FASTCALL__ ao_resume(ao_data_t* priv);
-extern ControlCodes __FASTCALL__ ao_control(ao_data_t* priv,int cmd,long arg);
+extern MPXP_Rc __FASTCALL__ ao_control(ao_data_t* priv,int cmd,long arg);
#endif
Modified: mplayerxp/libao2/audio_out_internal.h
===================================================================
--- mplayerxp/libao2/audio_out_internal.h 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libao2/audio_out_internal.h 2012-11-09 08:17:43 UTC (rev 308)
@@ -1,7 +1,7 @@
#include "mp_config.h"
// prototypes:
//static ao_info_t info;
-static ControlCodes __FASTCALL__ control(ao_data_t*,int cmd,long arg);
+static MPXP_Rc __FASTCALL__ control(ao_data_t*,int cmd,long arg);
static int __FASTCALL__ init(ao_data_t*,unsigned flags);
static int __FASTCALL__ configure(ao_data_t*,unsigned rate,unsigned channels,unsigned format);
static void __FASTCALL__ uninit(ao_data_t*);
Modified: mplayerxp/libmpcodecs/ad.h
===================================================================
--- mplayerxp/libmpcodecs/ad.h 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/ad.h 2012-11-09 08:17:43 UTC (rev 308)
@@ -28,7 +28,7 @@
int (* __FASTCALL__ preinit)(sh_audio_t *);
int (* __FASTCALL__ init)(sh_audio_t *sh);
void (* __FASTCALL__ uninit)(sh_audio_t *sh);
- ControlCodes (* __FASTCALL__ control)(sh_audio_t *sh,int cmd,any_t* arg, ...);
+ MPXP_Rc (* __FASTCALL__ control)(sh_audio_t *sh,int cmd,any_t* arg, ...);
unsigned (* __FASTCALL__ decode)(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts);
} ad_functions_t;
Modified: mplayerxp/libmpcodecs/ad_a52.c
===================================================================
--- mplayerxp/libmpcodecs/ad_a52.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/ad_a52.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -121,9 +121,9 @@
#define A52_FMT24 AFMT_S24_LE
#endif
sh->afmt=bps2afmt(2);
- if(af_query_fmt(sh->afilter,AFMT_FLOAT32) == CONTROL_OK||
- af_query_fmt(sh->afilter,A52_FMT32) == CONTROL_OK ||
- af_query_fmt(sh->afilter,A52_FMT24) == CONTROL_OK)
+ if(af_query_fmt(sh->afilter,AFMT_FLOAT32) == MPXP_Ok||
+ af_query_fmt(sh->afilter,A52_FMT32) == MPXP_Ok ||
+ af_query_fmt(sh->afilter,A52_FMT24) == MPXP_Ok)
{
sh->afmt=AFMT_FLOAT32;
}
@@ -191,24 +191,24 @@
mp_free(sh->context);
}
-ControlCodes control(sh_audio_t *sh,int cmd,any_t* arg, ...)
+MPXP_Rc control(sh_audio_t *sh,int cmd,any_t* arg, ...)
{
UNUSED(arg);
switch(cmd)
{
case ADCTRL_RESYNC_STREAM:
sh->a_in_buffer_len=0; // reset ACM/DShow audio buffer
- return CONTROL_TRUE;
+ return MPXP_True;
case ADCTRL_SKIP_FRAME:
{
float pts;
a52_fillbuff(sh,&pts); // skip AC3 frame
- return CONTROL_TRUE;
+ return MPXP_True;
}
default:
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
unsigned decode(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
Modified: mplayerxp/libmpcodecs/ad_acm.c
===================================================================
--- mplayerxp/libmpcodecs/ad_acm.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/ad_acm.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -160,14 +160,14 @@
mp_free(sh->context);
}
-ControlCodes control(sh_audio_t *sh_audio,int cmd,any_t* arg, ...)
+MPXP_Rc control(sh_audio_t *sh_audio,int cmd,any_t* arg, ...)
{
int skip;
switch(cmd)
{
// case ADCTRL_RESYNC_STREAM:
// sh_audio->a_in_buffer_len=0;/* reset ACM/DShow audio buffer */
-// return CONTROL_TRUE;
+// return MPXP_True;
case ADCTRL_SKIP_FRAME:
{
float pts;
@@ -177,12 +177,12 @@
if(skip<16) skip=16;
}
demux_read_data_r(sh_audio->ds,NULL,skip,&pts);
- return CONTROL_TRUE;
+ return MPXP_True;
}
default:
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
unsigned decode(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
Modified: mplayerxp/libmpcodecs/ad_dca.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dca.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/ad_dca.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -119,9 +119,9 @@
#define DCA_FMT24 AFMT_S24_LE
#endif
sh->afmt=bps2afmt(2);
- if( af_query_fmt(sh->afilter,AFMT_FLOAT32) == CONTROL_OK||
- af_query_fmt(sh->afilter,DCA_FMT32) == CONTROL_OK ||
- af_query_fmt(sh->afilter,DCA_FMT24) == CONTROL_OK)
+ if( af_query_fmt(sh->afilter,AFMT_FLOAT32) == MPXP_Ok||
+ af_query_fmt(sh->afilter,DCA_FMT32) == MPXP_Ok ||
+ af_query_fmt(sh->afilter,DCA_FMT24) == MPXP_Ok)
{
sh->afmt=AFMT_FLOAT32;
}
@@ -188,24 +188,24 @@
mp_free(sh->context);
}
-ControlCodes control(sh_audio_t *sh,int cmd,any_t* arg, ...)
+MPXP_Rc control(sh_audio_t *sh,int cmd,any_t* arg, ...)
{
UNUSED(arg);
switch(cmd)
{
case ADCTRL_RESYNC_STREAM:
sh->a_in_buffer_len=0; // reset ACM/DShow audio buffer
- return CONTROL_TRUE;
+ return MPXP_True;
case ADCTRL_SKIP_FRAME:
{
float pts;
dca_fillbuff(sh,&pts); // skip AC3 frame
- return CONTROL_TRUE;
+ return MPXP_True;
}
default:
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
unsigned decode(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
Modified: mplayerxp/libmpcodecs/ad_dmo.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dmo.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/ad_dmo.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -71,7 +71,7 @@
mp_free(priv);
}
-static ControlCodes control(sh_audio_t *sh_audio,int cmd,any_t* arg, ...)
+static MPXP_Rc control(sh_audio_t *sh_audio,int cmd,any_t* arg, ...)
{
int skip;
UNUSED(arg);
@@ -86,10 +86,10 @@
if(skip<16) skip=16;
}
demux_read_data_r(sh_audio->ds,NULL,skip,&pts);
- return CONTROL_TRUE;
+ return MPXP_True;
}
}
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
static unsigned decode(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
Modified: mplayerxp/libmpcodecs/ad_dshow.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dshow.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/ad_dshow.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -63,7 +63,7 @@
mp_free(priv);
}
-ControlCodes control(sh_audio_t *sh_audio,int cmd,any_t* arg, ...)
+MPXP_Rc control(sh_audio_t *sh_audio,int cmd,any_t* arg, ...)
{
int skip;
UNUSED(arg);
@@ -71,7 +71,7 @@
{
case ADCTRL_RESYNC_STREAM:
sh_audio->a_in_buffer_len=0; // reset ACM/DShow audio buffer
- return CONTROL_TRUE;
+ return MPXP_True;
case ADCTRL_SKIP_FRAME:
{
float pts;
@@ -82,11 +82,11 @@
}
demux_read_data_r(sh_audio->ds,NULL,skip,&pts);
}
- return CONTROL_TRUE;
+ return MPXP_True;
default:
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
unsigned decode(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
Modified: mplayerxp/libmpcodecs/ad_dvdpcm.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dvdpcm.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/ad_dvdpcm.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -68,7 +68,7 @@
UNUSED(sh);
}
-ControlCodes control(sh_audio_t *sh,int cmd,any_t* arg, ...)
+MPXP_Rc control(sh_audio_t *sh,int cmd,any_t* arg, ...)
{
int skip;
UNUSED(arg);
@@ -80,12 +80,12 @@
skip=sh->i_bps/16;
skip=skip&(~3);
demux_read_data_r(sh->ds,NULL,skip,&pts);
- return CONTROL_TRUE;
+ return MPXP_True;
}
default:
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
unsigned decode(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
Modified: mplayerxp/libmpcodecs/ad_faad.c
===================================================================
--- mplayerxp/libmpcodecs/ad_faad.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/ad_faad.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -195,9 +195,9 @@
#endif
/* Set the maximal quality */
/* This is useful for expesive audio cards */
- if(af_query_fmt(sh->afilter,AFMT_FLOAT32) == CONTROL_OK ||
- af_query_fmt(sh->afilter,NeAAC_FMT32) == CONTROL_OK ||
- af_query_fmt(sh->afilter,NeAAC_FMT24) == CONTROL_OK)
+ if(af_query_fmt(sh->afilter,AFMT_FLOAT32) == MPXP_Ok ||
+ af_query_fmt(sh->afilter,NeAAC_FMT32) == MPXP_Ok ||
+ af_query_fmt(sh->afilter,NeAAC_FMT24) == MPXP_Ok)
{
sh->afmt=AFMT_FLOAT32;
NeAAC_conf->outputFormat=FAAD_FMT_FLOAT;
@@ -259,12 +259,12 @@
mp_free(sh->context);
}
-static ControlCodes control(sh_audio_t *sh,int cmd,any_t* arg, ...)
+static MPXP_Rc control(sh_audio_t *sh,int cmd,any_t* arg, ...)
{
UNUSED(sh);
UNUSED(cmd);
UNUSED(arg);
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
static unsigned decode(sh_audio_t *sh,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
Modified: mplayerxp/libmpcodecs/ad_ffmpeg.c
===================================================================
--- mplayerxp/libmpcodecs/ad_ffmpeg.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/ad_ffmpeg.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -163,17 +163,17 @@
acodec_inited=0;
}
-ControlCodes control(sh_audio_t *sh,int cmd,any_t* arg, ...)
+MPXP_Rc control(sh_audio_t *sh,int cmd,any_t* arg, ...)
{
UNUSED(arg);
AVCodecContext *lavc_context = sh->context;
switch(cmd){
case ADCTRL_RESYNC_STREAM:
avcodec_flush_buffers(lavc_context);
- return CONTROL_TRUE;
+ return MPXP_True;
default: break;
}
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
unsigned decode(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
Modified: mplayerxp/libmpcodecs/ad_hwac3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_hwac3.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/ad_hwac3.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -205,24 +205,24 @@
mpcodecs_ad_a52.uninit(sh);
}
-ControlCodes control(sh_audio_t *sh,int cmd,any_t* arg, ...)
+MPXP_Rc control(sh_audio_t *sh,int cmd,any_t* arg, ...)
{
UNUSED(arg);
switch(cmd)
{
case ADCTRL_RESYNC_STREAM:
sh->a_in_buffer_len=0; // reset ACM/DShow audio buffer
- return CONTROL_TRUE;
+ return MPXP_True;
case ADCTRL_SKIP_FRAME:
{
float pts;
a52_fillbuff(sh,&pts); // skip AC3 frame
- return CONTROL_TRUE;
+ return MPXP_True;
}
default:
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
unsigned decode(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
Modified: mplayerxp/libmpcodecs/ad_internal.h
===================================================================
--- mplayerxp/libmpcodecs/ad_internal.h 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/ad_internal.h 2012-11-09 08:17:43 UTC (rev 308)
@@ -16,7 +16,7 @@
static int __FASTCALL__ init(sh_audio_t *sh);
static int __FASTCALL__ preinit(sh_audio_t *sh);
static void __FASTCALL__ uninit(sh_audio_t *sh);
-static ControlCodes __FASTCALL__ control(sh_audio_t *sh,int cmd,any_t* arg, ...);
+static MPXP_Rc __FASTCALL__ control(sh_audio_t *sh,int cmd,any_t* arg, ...);
static unsigned __FASTCALL__ decode(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts);
#define LIBAD_EXTERN(x) const ad_functions_t mpcodecs_ad_##x = {\
Modified: mplayerxp/libmpcodecs/ad_libdv.c
===================================================================
--- mplayerxp/libmpcodecs/ad_libdv.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/ad_libdv.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -78,13 +78,13 @@
mp_free(priv->audioBuffers[i]);
}
-static ControlCodes control(sh_audio_t *sh,int cmd,any_t* arg, ...)
+static MPXP_Rc control(sh_audio_t *sh,int cmd,any_t* arg, ...)
{
// TODO!!!
UNUSED(sh);
UNUSED(cmd);
UNUSED(arg);
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
static unsigned decode(sh_audio_t *sh, unsigned char *buf, unsigned minlen, unsigned maxlen,float *pts)
Modified: mplayerxp/libmpcodecs/ad_mp3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_mp3.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/ad_mp3.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -343,12 +343,12 @@
dlclose(dll_handle);
}
-ControlCodes control(sh_audio_t *sh,int cmd,any_t* arg, ...)
+MPXP_Rc control(sh_audio_t *sh,int cmd,any_t* arg, ...)
{
UNUSED(sh);
UNUSED(cmd);
UNUSED(arg);
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
unsigned decode(sh_audio_t *sh,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
Modified: mplayerxp/libmpcodecs/ad_null.c
===================================================================
--- mplayerxp/libmpcodecs/ad_null.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/ad_null.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -34,12 +34,12 @@
UNUSED(sh);
}
-ControlCodes control(sh_audio_t *sh,int cmd,any_t* arg, ...)
+MPXP_Rc control(sh_audio_t *sh,int cmd,any_t* arg, ...)
{
UNUSED(sh);
UNUSED(cmd);
UNUSED(arg);
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
unsigned decode(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
Modified: mplayerxp/libmpcodecs/ad_pcm.c
===================================================================
--- mplayerxp/libmpcodecs/ad_pcm.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/ad_pcm.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -61,7 +61,7 @@
UNUSED(sh);
}
-ControlCodes control(sh_audio_t *sh,int cmd,any_t* arg, ...)
+MPXP_Rc control(sh_audio_t *sh,int cmd,any_t* arg, ...)
{
int skip;
UNUSED(arg);
@@ -73,12 +73,12 @@
skip=sh->i_bps/16;
skip=skip&(~3);
demux_read_data_r(sh->ds,NULL,skip,&pts);
- return CONTROL_TRUE;
+ return MPXP_True;
}
default:
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
unsigned decode(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
Modified: mplayerxp/libmpcodecs/ad_qtaudio.c
===================================================================
--- mplayerxp/libmpcodecs/ad_qtaudio.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/ad_qtaudio.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -314,10 +314,10 @@
return ConvertedBytes;
}
-static ControlCodes control(sh_audio_t *sh,int cmd,any_t* arg, ...){
+static MPXP_Rc control(sh_audio_t *sh,int cmd,any_t* arg, ...){
// various optional functions you MAY implement:
UNUSED(sh);
UNUSED(cmd);
UNUSED(arg);
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
Modified: mplayerxp/libmpcodecs/ad_real.c
===================================================================
--- mplayerxp/libmpcodecs/ad_real.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/ad_real.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -283,7 +283,7 @@
// or -1 for EOF (or uncorrectable error)
}
-static ControlCodes control(sh_audio_t *sh,int cmd,any_t* arg, ...){
+static MPXP_Rc control(sh_audio_t *sh,int cmd,any_t* arg, ...){
UNUSED(sh);
UNUSED(arg);
// various optional functions you MAY implement:
@@ -291,13 +291,13 @@
case ADCTRL_RESYNC_STREAM:
// it is called once after seeking, to resync.
// Note: sh_audio->a_in_buffer_len=0; is done _before_ this call!
- return CONTROL_TRUE;
+ return MPXP_True;
case ADCTRL_SKIP_FRAME:
// it is called to skip (jump over) small amount (1/10 sec or 1 frame)
// of audio data - used to sync audio to video after seeking
- // if you don't return CONTROL_TRUE, it will defaults to:
+ // if you don't return MPXP_True, it will defaults to:
// ds_fill_buffer(sh_audio->ds); // skip 1 demux packet
- return CONTROL_TRUE;
+ return MPXP_True;
}
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
Modified: mplayerxp/libmpcodecs/ad_twin.c
===================================================================
--- mplayerxp/libmpcodecs/ad_twin.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/ad_twin.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -350,7 +350,7 @@
FreeLibrary(vqf_dll);
}
-ControlCodes control(sh_audio_t *sh_audio,int cmd,any_t* arg, ...)
+MPXP_Rc control(sh_audio_t *sh_audio,int cmd,any_t* arg, ...)
{
int skip;
UNUSED(arg);
@@ -365,12 +365,12 @@
if(skip<16) skip=16;
}
demux_read_data_r(sh_audio->ds,NULL,skip,&pts);
- return CONTROL_TRUE;
+ return MPXP_True;
}
default:
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
static int bread(char *data, /* Output: Output data array */
Modified: mplayerxp/libmpcodecs/ad_vorbis.c
===================================================================
--- mplayerxp/libmpcodecs/ad_vorbis.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/ad_vorbis.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -101,7 +101,7 @@
#define OGG_FMT16 AFMT_S16_LE
#endif
sh->afmt=OGG_FMT16;
- if(ao_control(ao_data,AOCONTROL_QUERY_FORMAT,OGG_FMT32) == CONTROL_OK) {
+ if(ao_control(ao_data,AOCONTROL_QUERY_FORMAT,OGG_FMT32) == MPXP_Ok) {
sh->afmt=OGG_FMT32;
}
// assume 128kbit if bitrate not specified in the header
@@ -121,7 +121,7 @@
mp_free(sh->context);
}
-static ControlCodes control(sh_audio_t *sh,int cmd,any_t* arg, ...)
+static MPXP_Rc control(sh_audio_t *sh,int cmd,any_t* arg, ...)
{
UNUSED(sh);
UNUSED(cmd);
@@ -129,11 +129,11 @@
switch(cmd)
{
#if 0
- case ADCTRL_RESYNC_STREAM: return CONTROL_TRUE;
- case ADCTRL_SKIP_FRAME: return CONTROL_TRUE;
+ case ADCTRL_RESYNC_STREAM: return MPXP_True;
+ case ADCTRL_SKIP_FRAME: return MPXP_True;
#endif
}
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
static unsigned decode(sh_audio_t *sh,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
Modified: mplayerxp/libmpcodecs/dec_audio.c
===================================================================
--- mplayerxp/libmpcodecs/dec_audio.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/dec_audio.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -344,8 +344,8 @@
of audio data - used to sync audio to video after seeking */
void mpca_skip_frame(sh_audio_t *sh_audio)
{
- int rc=CONTROL_TRUE;
+ int rc=MPXP_True;
if(sh_audio)
if(sh_audio->inited && mpadec) rc=mpadec->control(sh_audio,ADCTRL_SKIP_FRAME,NULL);
- if(rc!=CONTROL_TRUE) ds_fill_buffer(sh_audio->ds);
+ if(rc!=MPXP_True) ds_fill_buffer(sh_audio->ds);
}
Modified: mplayerxp/libmpcodecs/dec_video.c
===================================================================
--- mplayerxp/libmpcodecs/dec_video.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/dec_video.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -67,9 +67,9 @@
vf_equalizer_t eq;
eq.item=item;
eq.value=value*10;
- if(vf->control(vf,VFCTRL_SET_EQUALIZER,&eq)!=CONTROL_TRUE)
+ if(vf->control(vf,VFCTRL_SET_EQUALIZER,&eq)!=MPXP_True)
{
- if(mpvdec) return mpvdec->control(sh_video,VDCTRL_SET_EQUALIZER,item,(int)value)==CONTROL_OK?1:0;
+ if(mpvdec) return mpvdec->control(sh_video,VDCTRL_SET_EQUALIZER,item,(int)value)==MPXP_Ok?1:0;
}
return 1;
}
Modified: mplayerxp/libmpcodecs/vd.c
===================================================================
--- mplayerxp/libmpcodecs/vd.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/vd.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -132,7 +132,7 @@
if((flags&VFCAP_CSP_SUPPORTED_BY_HW) || ((flags&VFCAP_CSP_SUPPORTED) && j<0)){
// check (query) if codec really support this outfmt...
sh->outfmtidx=j; // pass index to the control() function this way
- if(mpvdec->control(sh,VDCTRL_QUERY_FORMAT,&out_fmt)==CONTROL_FALSE) {
+ if(mpvdec->control(sh,VDCTRL_QUERY_FORMAT,&out_fmt)==MPXP_False) {
MSG_DBG2("vo_debug: codec[%s] query_format(%s) returned FALSE\n",mpvdec->info->driver_name,vo_format_name(out_fmt));
continue;
}
@@ -142,7 +142,7 @@
} else
if(!palette && !(vo_data->flags&3) && (out_fmt==IMGFMT_RGB8||out_fmt==IMGFMT_BGR8)){
sh->outfmtidx=j; // pass index to the control() function this way
- if(mpvdec->control(sh,VDCTRL_QUERY_FORMAT,&out_fmt)!=CONTROL_FALSE)
+ if(mpvdec->control(sh,VDCTRL_QUERY_FORMAT,&out_fmt)!=MPXP_False)
palette=1;
}
}
Modified: mplayerxp/libmpcodecs/vd.h
===================================================================
--- mplayerxp/libmpcodecs/vd.h 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/vd.h 2012-11-09 08:17:43 UTC (rev 308)
@@ -19,7 +19,7 @@
const config_t* options;/**< Optional: MPlayerXP's option related */
int (*__FASTCALL__ init)(sh_video_t *sh);
void (*__FASTCALL__ uninit)(sh_video_t *sh);
- ControlCodes (*__FASTCALL__ control)(sh_video_t *sh,int cmd,any_t* arg, ...);
+ MPXP_Rc (*__FASTCALL__ control)(sh_video_t *sh,int cmd,any_t* arg, ...);
mp_image_t* (*__FASTCALL__ decode)(sh_video_t *sh,any_t* data,int len,int flags);
} vd_functions_t;
Modified: mplayerxp/libmpcodecs/vd_divx4.c
===================================================================
--- mplayerxp/libmpcodecs/vd_divx4.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/vd_divx4.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -137,7 +137,7 @@
static any_t*dll_handle;
// to set/get/query special features/parameters
-static ControlCodes control(sh_video_t *sh,int cmd,any_t* arg,...){
+static MPXP_Rc control(sh_video_t *sh,int cmd,any_t* arg,...){
priv_t*p=sh->context;
switch(cmd){
case VDCTRL_QUERY_MAX_PP_LEVEL: return 100; // for divx4linux
@@ -145,7 +145,7 @@
int iOperation = DEC_PAR_POSTPROCESSING;
int iLevel = *((int*)arg);
if(iLevel<0 || iLevel>100) iLevel=100;
- return p->decoder(p->pHandle,DEC_OPT_SET,&iOperation,&iLevel)==DEC_OK?CONTROL_OK:CONTROL_FALSE;
+ return p->decoder(p->pHandle,DEC_OPT_SET,&iOperation,&iLevel)==DEC_OK?MPXP_Ok:MPXP_False;
}
case VDCTRL_SET_EQUALIZER: {
int value;
@@ -158,22 +158,22 @@
if(!strcmp(arg,VO_EC_BRIGHTNESS)) option=DEC_PAR_BRIGHTNESS;
else if(!strcmp(arg, VO_EC_CONTRAST)) option=DEC_PAR_CONTRAST;
else if(!strcmp(arg,VO_EC_SATURATION)) option=DEC_PAR_SATURATION;
- else return CONTROL_FALSE;
+ else return MPXP_False;
value = (value * 256) / 100;
- return p->decoder(p->pHandle,DEC_OPT_SET,&option,&value)==DEC_OK?CONTROL_OK:CONTROL_FALSE;
+ return p->decoder(p->pHandle,DEC_OPT_SET,&option,&value)==DEC_OK?MPXP_Ok:MPXP_False;
}
case VDCTRL_QUERY_FORMAT:
if (*((int*)arg) == IMGFMT_YV12 ||
*((int*)arg) == IMGFMT_I420 ||
*((int*)arg) == IMGFMT_IYUV)
- return CONTROL_TRUE;
- else return CONTROL_FALSE;
+ return MPXP_True;
+ else return MPXP_False;
case VDCTRL_RESYNC_STREAM:
p->resync=1;
- return CONTROL_TRUE;
+ return MPXP_True;
}
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
Modified: mplayerxp/libmpcodecs/vd_dmo.c
===================================================================
--- mplayerxp/libmpcodecs/vd_dmo.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/vd_dmo.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -28,7 +28,7 @@
LIBVD_EXTERN(dmo)
// to set/get/query special features/parameters
-static ControlCodes control(sh_video_t *sh,int cmd,any_t* arg,...){
+static MPXP_Rc control(sh_video_t *sh,int cmd,any_t* arg,...){
switch(cmd){
case VDCTRL_QUERY_FORMAT:
if (*((int*)arg) == IMGFMT_YV12 ||
@@ -37,11 +37,11 @@
*((int*)arg) == IMGFMT_YVU9 ||
*((int*)arg) == IMGFMT_YUY2 ||
*((int*)arg) == IMGFMT_UYVY)
- return CONTROL_TRUE;
- else return CONTROL_FALSE;
+ return MPXP_True;
+ else return MPXP_False;
default: break;
}
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
// init driver
Modified: mplayerxp/libmpcodecs/vd_dshow.c
===================================================================
--- mplayerxp/libmpcodecs/vd_dshow.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/vd_dshow.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -26,14 +26,14 @@
LIBVD_EXTERN(dshow)
// to set/get/query special features/parameters
-static ControlCodes control(sh_video_t *sh,int cmd,any_t* arg,...){
+static MPXP_Rc control(sh_video_t *sh,int cmd,any_t* arg,...){
switch(cmd){
case VDCTRL_QUERY_MAX_PP_LEVEL:
return 4;
case VDCTRL_SET_PP_LEVEL:
- if(!sh->context) return CONTROL_ERROR;
+ if(!sh->context) return MPXP_Error;
DS_VideoDecoder_SetValue(sh->context,"Quality",*((int*)arg));
- return CONTROL_OK;
+ return MPXP_Ok;
case VDCTRL_SET_EQUALIZER: {
va_list ap;
int value;
@@ -42,8 +42,8 @@
va_end(ap);
value=(value/2)+50;
if(DS_VideoDecoder_SetValue(sh->context,arg,value)==0)
- return CONTROL_OK;
- return CONTROL_FALSE;
+ return MPXP_Ok;
+ return MPXP_False;
}
case VDCTRL_QUERY_FORMAT:
if (*((int*)arg) == IMGFMT_YV12 ||
@@ -52,11 +52,11 @@
*((int*)arg) == IMGFMT_YVU9 ||
*((int*)arg) == IMGFMT_YUY2 ||
*((int*)arg) == IMGFMT_UYVY)
- return CONTROL_TRUE;
- else return CONTROL_FALSE;
+ return MPXP_True;
+ else return MPXP_False;
default: break;
}
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
// init driver
Modified: mplayerxp/libmpcodecs/vd_ffmpeg.c
===================================================================
--- mplayerxp/libmpcodecs/vd_ffmpeg.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/vd_ffmpeg.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -126,7 +126,7 @@
};
/* to set/get/query special features/parameters */
-static ControlCodes control(sh_video_t *sh,int cmd,any_t* arg,...){
+static MPXP_Rc control(sh_video_t *sh,int cmd,any_t* arg,...){
priv_t *ctx = sh->context;
uint32_t out_fourcc;
AVCodecContext *avctx = ctx->ctx;
@@ -137,7 +137,7 @@
int quality=*((int*)arg);
if(quality<0 || quality>PP_QUALITY_MAX) quality=PP_QUALITY_MAX;
divx_quality = quality;
- return CONTROL_OK;
+ return MPXP_Ok;
}
case VDCTRL_QUERY_FORMAT:
{
@@ -158,7 +158,7 @@
else
MSG_DBG2("[vd_ffmpeg]avctx->codec->pix_fmts doesn't exist\n");
out_fourcc = fourcc_from_pixfmt(avctx->pix_fmt);
- if(out_fourcc==format) return CONTROL_TRUE;
+ if(out_fourcc==format) return MPXP_True;
// possible conversions:
switch( format ){
case IMGFMT_YV12:
@@ -167,26 +167,26 @@
// "converted" using pointer/stride modification
if( avctx->pix_fmt==PIX_FMT_YUV420P || // u/v swap
avctx->pix_fmt==PIX_FMT_YUV422P ||
- avctx->pix_fmt==PIX_FMT_YUVJ420P) return CONTROL_TRUE;// half stride
+ avctx->pix_fmt==PIX_FMT_YUVJ420P) return MPXP_True;// half stride
/* these codecs may return only: PIX_FMT_YUV422P, PIX_FMT_YUV444P, PIX_FMT_YUV420P*/
/* TODO: we must test pix_fmt after decoding first frame at least */
if( avctx->codec_id == CODEC_ID_MPEG1VIDEO ||
- avctx->codec_id == CODEC_ID_MPEG2VIDEO) return CONTROL_TRUE;
+ avctx->codec_id == CODEC_ID_MPEG2VIDEO) return MPXP_True;
break;
#ifdef HAVE_XVMC
case IMGFMT_XVMC_IDCT_MPEG2:
case IMGFMT_XVMC_MOCO_MPEG2:
- if(avctx->pix_fmt==PIX_FMT_XVMC_MPEG2_IDCT) return CONTROL_TRUE;
+ if(avctx->pix_fmt==PIX_FMT_XVMC_MPEG2_IDCT) return MPXP_True;
#endif
}
- return CONTROL_FALSE;
+ return MPXP_False;
}
break;
case VDCTRL_RESYNC_STREAM:
avcodec_flush_buffers(avctx);
- return CONTROL_TRUE;
+ return MPXP_True;
}
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
static int ff_config_vo(sh_video_t *sh,uint32_t w,uint32_t h)
Modified: mplayerxp/libmpcodecs/vd_huffyuv.c
===================================================================
--- mplayerxp/libmpcodecs/vd_huffyuv.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/vd_huffyuv.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -161,23 +161,23 @@
// to set/get/query special features/parameters
-static ControlCodes control(sh_video_t *sh,int cmd,any_t* arg,...)
+static MPXP_Rc control(sh_video_t *sh,int cmd,any_t* arg,...)
{
switch(cmd) {
case VDCTRL_QUERY_FORMAT:
if (((priv_t *)(sh->context))->bitmaptype == BMPTYPE_YUV) {
if (*((int*)arg) == IMGFMT_YUY2)
- return CONTROL_TRUE;
+ return MPXP_True;
else
- return CONTROL_FALSE;
+ return MPXP_False;
} else {
if ((*((int*)arg) == IMGFMT_BGR32) || (*((int*)arg) == IMGFMT_BGR24))
- return CONTROL_TRUE;
+ return MPXP_True;
else
- return CONTROL_FALSE;
+ return MPXP_False;
}
}
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
Modified: mplayerxp/libmpcodecs/vd_internal.h
===================================================================
--- mplayerxp/libmpcodecs/vd_internal.h 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/vd_internal.h 2012-11-09 08:17:43 UTC (rev 308)
@@ -14,7 +14,7 @@
// prototypes:
//static vd_info_t info;
static const config_t options[];
-static ControlCodes __FASTCALL__ control(sh_video_t *sh,int cmd,any_t* arg,...);
+static MPXP_Rc __FASTCALL__ control(sh_video_t *sh,int cmd,any_t* arg,...);
static int __FASTCALL__ init(sh_video_t *sh);
static void __FASTCALL__ uninit(sh_video_t *sh);
static mp_image_t* __FASTCALL__ decode(sh_video_t *sh,any_t* data,int len,int flags);
Modified: mplayerxp/libmpcodecs/vd_libdv.c
===================================================================
--- mplayerxp/libmpcodecs/vd_libdv.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/vd_libdv.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -33,8 +33,8 @@
LIBVD_EXTERN(libdv)
// to set/get/query special features/parameters
-static ControlCodes control(sh_video_t *sh,int cmd,any_t* arg,...){
- return CONTROL_UNKNOWN;
+static MPXP_Rc control(sh_video_t *sh,int cmd,any_t* arg,...){
+ return MPXP_Unknown;
}
static dv_decoder_t* global_rawdv_decoder=NULL;
Modified: mplayerxp/libmpcodecs/vd_libmpeg2.c
===================================================================
--- mplayerxp/libmpcodecs/vd_libmpeg2.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/vd_libmpeg2.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -166,7 +166,7 @@
}
// to set/get/query special features/parameters
-static ControlCodes control(sh_video_t *sh,int cmd,any_t* arg,...){
+static MPXP_Rc control(sh_video_t *sh,int cmd,any_t* arg,...){
priv_t *priv;
priv=sh->context;
switch(cmd)
@@ -174,14 +174,14 @@
case VDCTRL_RESYNC_STREAM:
/*lib starts looking for the next sequence header.*/
mpeg2_reset(priv->mpeg2dec,1);
- return CONTROL_TRUE;
+ return MPXP_True;
case VDCTRL_QUERY_FORMAT:
if (*((int*)arg) == IMGFMT_YV12)
- return CONTROL_TRUE;
- else return CONTROL_FALSE;
+ return MPXP_True;
+ else return MPXP_False;
default: break;
}
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
static int init(sh_video_t *sh){
Modified: mplayerxp/libmpcodecs/vd_mpegpes.c
===================================================================
--- mplayerxp/libmpcodecs/vd_mpegpes.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/vd_mpegpes.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -20,8 +20,8 @@
LIBVD_EXTERN(mpegpes)
// to set/get/query special features/parameters
-static ControlCodes control(sh_video_t *sh,int cmd,any_t* arg,...){
- return CONTROL_UNKNOWN;
+static MPXP_Rc control(sh_video_t *sh,int cmd,any_t* arg,...){
+ return MPXP_Unknown;
}
// init driver
Modified: mplayerxp/libmpcodecs/vd_null.c
===================================================================
--- mplayerxp/libmpcodecs/vd_null.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/vd_null.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -20,8 +20,8 @@
LIBVD_EXTERN(null)
// to set/get/query special features/parameters
-static ControlCodes control(sh_video_t *sh,int cmd,any_t* arg,...){
- return CONTROL_UNKNOWN;
+static MPXP_Rc control(sh_video_t *sh,int cmd,any_t* arg,...){
+ return MPXP_Unknown;
}
// init driver
Modified: mplayerxp/libmpcodecs/vd_nuv.c
===================================================================
--- mplayerxp/libmpcodecs/vd_nuv.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/vd_nuv.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -19,16 +19,16 @@
LIBVD_EXTERN(nuv)
// to set/get/query special features/parameters
-static ControlCodes control(sh_video_t *sh,int cmd,any_t* arg,...){
+static MPXP_Rc control(sh_video_t *sh,int cmd,any_t* arg,...){
switch(cmd) {
case VDCTRL_QUERY_FORMAT:
if (*((int*)arg) == IMGFMT_I420 ||
*((int*)arg) == IMGFMT_IYUV)
- return CONTROL_TRUE;
- else return CONTROL_FALSE;
+ return MPXP_True;
+ else return MPXP_False;
default: break;
}
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
// init driver
Modified: mplayerxp/libmpcodecs/vd_qtvideo.c
===================================================================
--- mplayerxp/libmpcodecs/vd_qtvideo.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/vd_qtvideo.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -93,7 +93,7 @@
static OSErr (*NewHandleClear)(Size byteCount);
// to set/get/query special features/parameters
-static ControlCodes control(sh_video_t *sh,int cmd,any_t* arg,...){
+static MPXP_Rc control(sh_video_t *sh,int cmd,any_t* arg,...){
switch(cmd) {
case VDCTRL_QUERY_FORMAT:
if (*((int*)arg) == IMGFMT_YV12 ||
@@ -107,11 +107,11 @@
*((int*)arg) == IMGFMT_BGR24||
*((int*)arg) == IMGFMT_BGR32||
*((int*)arg) == IMGFMT_RGB32)
- return CONTROL_TRUE;
- else return CONTROL_FALSE;
+ return MPXP_True;
+ else return MPXP_False;
default: break;
}
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
static int codec_inited=0;
Modified: mplayerxp/libmpcodecs/vd_raw.c
===================================================================
--- mplayerxp/libmpcodecs/vd_raw.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/vd_raw.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -19,13 +19,13 @@
LIBVD_EXTERN(raw)
// to set/get/query special features/parameters
-static ControlCodes control(sh_video_t *sh,int cmd,any_t* arg,...){
+static MPXP_Rc control(sh_video_t *sh,int cmd,any_t* arg,...){
switch(cmd) {
case VDCTRL_QUERY_FORMAT:
- return CONTROL_TRUE;
+ return MPXP_True;
default: break;
}
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
// init driver
Modified: mplayerxp/libmpcodecs/vd_real.c
===================================================================
--- mplayerxp/libmpcodecs/vd_real.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/vd_real.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -79,20 +79,20 @@
// to set/get/query special features/parameters
-static ControlCodes control(sh_video_t *sh,int cmd,any_t* arg,...){
+static MPXP_Rc control(sh_video_t *sh,int cmd,any_t* arg,...){
switch(cmd){
// case VDCTRL_QUERY_MAX_PP_LEVEL:
// return 9;
// case VDCTRL_SET_PP_LEVEL:
// vfw_set_postproc(sh,10*(*((int*)arg)));
-// return CONTROL_OK;
+// return MPXP_Ok;
case VDCTRL_QUERY_FORMAT:
if (*((int*)arg) == IMGFMT_I420 ||
*((int*)arg) == IMGFMT_IYUV)
- return CONTROL_TRUE;
- else return CONTROL_FALSE;
+ return MPXP_True;
+ else return MPXP_False;
}
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
/* exits program when failure */
Modified: mplayerxp/libmpcodecs/vd_theora.c
===================================================================
--- mplayerxp/libmpcodecs/vd_theora.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/vd_theora.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -37,15 +37,15 @@
} priv_t;
// to set/get/query special features/parameters
-static ControlCodes control(sh_video_t *sh,int cmd,any_t* arg,...){
+static MPXP_Rc control(sh_video_t *sh,int cmd,any_t* arg,...){
switch(cmd) {
case VDCTRL_QUERY_FORMAT:
if (*((int*)arg) == IMGFMT_YV12)
- return CONTROL_TRUE;
- else return CONTROL_FALSE;
+ return MPXP_True;
+ else return MPXP_False;
default: break;
}
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
/*
Modified: mplayerxp/libmpcodecs/vd_vfw.c
===================================================================
--- mplayerxp/libmpcodecs/vd_vfw.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/vd_vfw.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -219,20 +219,20 @@
}
// to set/get/query special features/parameters
-static ControlCodes control(sh_video_t *sh,int cmd,any_t* arg,...){
+static MPXP_Rc control(sh_video_t *sh,int cmd,any_t* arg,...){
priv_t *priv = sh->context;
switch(cmd){
case VDCTRL_QUERY_MAX_PP_LEVEL:
return 9;
case VDCTRL_SET_PP_LEVEL:
vfw_set_postproc(sh,10*(*((int*)arg)));
- return CONTROL_OK;
+ return MPXP_Ok;
// FIXME: make this optional...
case VDCTRL_QUERY_FORMAT:
{
HRESULT ret;
// if(!(sh->codec->outflags[sh->outfmtidx]&CODECS_FLAG_QUERY))
-// return CONTROL_UNKNOWN; // do not query!
+// return MPXP_Unknown; // do not query!
set_csp(priv->o_bih,*((int*)arg));
if(priv->ex)
ret = ICDecompressQueryEx(priv->hic, sh->bih, priv->o_bih);
@@ -241,13 +241,13 @@
if (ret)
{
MSG_DBG2("ICDecompressQuery failed:: Error %d\n", (int)ret);
- return CONTROL_FALSE;
+ return MPXP_False;
}
- return CONTROL_TRUE;
+ return MPXP_True;
}
default: break;
}
- return CONTROL_UNKNOWN;
+ return MPXP_Unknown;
}
// init driver
Modified: mplayerxp/libmpcodecs/vd_xanim.c
===================================================================
--- mplayerxp/libmpcodecs/vd_xanim.c 2012-11-09 07:40:44 UTC (rev 307)
+++ mplayerxp/libmpcodecs/vd_xanim.c 2012-11-09 08:17:43 UTC (rev 308)
@@ -893,17 +893,17 @@
/*************************** END OF XA CODEC BINARY INTERFACE ******************/
// to set/get/query special features/parameters
-static ControlCodes control(sh_video_t *sh,int cmd,any_t* arg,...){
+static MPXP_Rc control(sh_video_t *sh,int cmd,any_t* arg,...){
switch(cmd) {
case VDCTRL_QUERY_FORMAT:
if (*((int*)arg) == IMGFMT_YV12 ||
*((int*)arg) == IMGFMT_I420 ||
*((int*)arg) == IMGFMT_IYUV)
- return CONTROL_TRUE;
- else return CONTROL_FALSE;
+ return MPXP_True;
+ else return MPXP_False;
default: break;
}
- return CONTROL_UNKNO...
[truncated message content] |
