[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[454] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[454] mplayerxp
|
From: <nic...@us...> - 2012-11-25 15:56:24
|
Revision: 454
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=454&view=rev
Author: nickols_k
Date: 2012-11-25 15:56:14 +0000 (Sun, 25 Nov 2012)
Log Message:
-----------
temporal solution: rename. But would be better to convert these structures into classes
Modified Paths:
--------------
mplayerxp/libao2/ao_alsa9.cpp
mplayerxp/libao2/ao_arts.cpp
mplayerxp/libao2/ao_esd.cpp
mplayerxp/libao2/ao_jack.cpp
mplayerxp/libao2/ao_nas.cpp
mplayerxp/libao2/ao_null.cpp
mplayerxp/libao2/ao_openal.cpp
mplayerxp/libao2/ao_oss.cpp
mplayerxp/libao2/ao_sdl.cpp
mplayerxp/libao2/ao_wav.cpp
mplayerxp/libao2/audio_out.cpp
mplayerxp/libao2/audio_out.h
mplayerxp/libao2/audio_out_internal.h
mplayerxp/libmpcodecs/ad.h
mplayerxp/libmpcodecs/ad_a52.cpp
mplayerxp/libmpcodecs/ad_acm.cpp
mplayerxp/libmpcodecs/ad_dca.cpp
mplayerxp/libmpcodecs/ad_dmo.cpp
mplayerxp/libmpcodecs/ad_dshow.cpp
mplayerxp/libmpcodecs/ad_dvdpcm.cpp
mplayerxp/libmpcodecs/ad_faad.cpp
mplayerxp/libmpcodecs/ad_hwac3.cpp
mplayerxp/libmpcodecs/ad_internal.h
mplayerxp/libmpcodecs/ad_lavc.cpp
mplayerxp/libmpcodecs/ad_libdv.cpp
mplayerxp/libmpcodecs/ad_mp3.cpp
mplayerxp/libmpcodecs/ad_null.cpp
mplayerxp/libmpcodecs/ad_pcm.cpp
mplayerxp/libmpcodecs/ad_qtaudio.cpp
mplayerxp/libmpcodecs/ad_real.cpp
mplayerxp/libmpcodecs/ad_twin.cpp
mplayerxp/libmpcodecs/ad_vorbis.cpp
mplayerxp/libmpcodecs/dec_audio.cpp
mplayerxp/libmpcodecs/dec_video.cpp
mplayerxp/libmpcodecs/vd.h
mplayerxp/libmpcodecs/vd_divx4.cpp
mplayerxp/libmpcodecs/vd_dmo.cpp
mplayerxp/libmpcodecs/vd_dshow.cpp
mplayerxp/libmpcodecs/vd_huffyuv.cpp
mplayerxp/libmpcodecs/vd_internal.h
mplayerxp/libmpcodecs/vd_lavc.cpp
mplayerxp/libmpcodecs/vd_libdv.cpp
mplayerxp/libmpcodecs/vd_libmpeg2.cpp
mplayerxp/libmpcodecs/vd_mpegpes.cpp
mplayerxp/libmpcodecs/vd_null.cpp
mplayerxp/libmpcodecs/vd_nuv.cpp
mplayerxp/libmpcodecs/vd_qtvideo.cpp
mplayerxp/libmpcodecs/vd_raw.cpp
mplayerxp/libmpcodecs/vd_real.cpp
mplayerxp/libmpcodecs/vd_theora.cpp
mplayerxp/libmpcodecs/vd_vfw.cpp
mplayerxp/libmpcodecs/vd_xanim.cpp
mplayerxp/libmpcodecs/vd_xvid.cpp
mplayerxp/postproc/af.cpp
mplayerxp/postproc/af.h
mplayerxp/postproc/af_ao2.cpp
mplayerxp/postproc/af_channels.cpp
mplayerxp/postproc/af_control.h
mplayerxp/postproc/af_crystality.cpp
mplayerxp/postproc/af_delay.cpp
mplayerxp/postproc/af_dyn.cpp
mplayerxp/postproc/af_echo3d.cpp
mplayerxp/postproc/af_equalizer.cpp
mplayerxp/postproc/af_export.cpp
mplayerxp/postproc/af_extrastereo.cpp
mplayerxp/postproc/af_ffenc.cpp
mplayerxp/postproc/af_format.cpp
mplayerxp/postproc/af_hrtf.cpp
mplayerxp/postproc/af_karaoke.cpp
mplayerxp/postproc/af_lp.cpp
mplayerxp/postproc/af_pan.cpp
mplayerxp/postproc/af_raw.cpp
mplayerxp/postproc/af_resample.cpp
mplayerxp/postproc/af_scaletempo.cpp
mplayerxp/postproc/af_sinesuppress.cpp
mplayerxp/postproc/af_sub.cpp
mplayerxp/postproc/af_surround.cpp
mplayerxp/postproc/af_volnorm.cpp
mplayerxp/postproc/af_volume.cpp
mplayerxp/postproc/vf.cpp
mplayerxp/postproc/vf.h
mplayerxp/postproc/vf_1bpp.cpp
mplayerxp/postproc/vf_2xsai.cpp
mplayerxp/postproc/vf_aspect.cpp
mplayerxp/postproc/vf_delogo.cpp
mplayerxp/postproc/vf_denoise3d.cpp
mplayerxp/postproc/vf_dint.cpp
mplayerxp/postproc/vf_down3dright.cpp
mplayerxp/postproc/vf_eq.cpp
mplayerxp/postproc/vf_expand.cpp
mplayerxp/postproc/vf_flip.cpp
mplayerxp/postproc/vf_format.cpp
mplayerxp/postproc/vf_menu.cpp
mplayerxp/postproc/vf_mirror.cpp
mplayerxp/postproc/vf_noise.cpp
mplayerxp/postproc/vf_ow.cpp
mplayerxp/postproc/vf_palette.cpp
mplayerxp/postproc/vf_panscan.cpp
mplayerxp/postproc/vf_perspective.cpp
mplayerxp/postproc/vf_pp.cpp
mplayerxp/postproc/vf_raw.cpp
mplayerxp/postproc/vf_rectangle.cpp
mplayerxp/postproc/vf_rgb2bgr.cpp
mplayerxp/postproc/vf_rotate.cpp
mplayerxp/postproc/vf_scale.cpp
mplayerxp/postproc/vf_smartblur.cpp
mplayerxp/postproc/vf_softpulldown.cpp
mplayerxp/postproc/vf_test.cpp
mplayerxp/postproc/vf_unsharp.cpp
mplayerxp/postproc/vf_vo.cpp
mplayerxp/postproc/vf_yuvcsp.cpp
mplayerxp/postproc/vf_yuy2.cpp
mplayerxp/postproc/vf_yvu9.cpp
Modified: mplayerxp/libao2/ao_alsa9.cpp
===================================================================
--- mplayerxp/libao2/ao_alsa9.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libao2/ao_alsa9.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -132,7 +132,7 @@
}
/* to set/get/query special features/parameters */
-static MPXP_Rc __FASTCALL__ control(const ao_data_t* ao,int cmd, long arg)
+static MPXP_Rc __FASTCALL__ control_ao(const ao_data_t* ao,int cmd, long arg)
{
priv_t*priv=reinterpret_cast<priv_t*>(ao->priv);
int rval;
@@ -177,30 +177,30 @@
snd_mixer_selem_id_set_name(sid, mix_name);
if ((err = snd_mixer_open(&handle, 0)) < 0) {
- MSG_ERR("alsa-control: mixer open error: %s\n", snd_strerror(err));
+ MSG_ERR("alsa-control_ao: mixer open error: %s\n", snd_strerror(err));
return MPXP_Error;
}
if ((err = snd_mixer_attach(handle, card)) < 0) {
- MSG_ERR("alsa-control: mixer attach %s error: %s", card, snd_strerror(err));
+ MSG_ERR("alsa-control_ao: mixer attach %s error: %s", card, snd_strerror(err));
snd_mixer_close(handle);
return MPXP_Error;
}
if ((err = snd_mixer_selem_register(handle, NULL, NULL)) < 0) {
- MSG_ERR("alsa-control: mixer register error: %s", snd_strerror(err));
+ MSG_ERR("alsa-control_ao: mixer register error: %s", snd_strerror(err));
snd_mixer_close(handle);
return MPXP_Error;
}
if ((err = snd_mixer_load(handle)) < 0) {
- MSG_ERR("alsa-control: mixer load error: %s", snd_strerror(err));
+ MSG_ERR("alsa-control_ao: mixer load error: %s", snd_strerror(err));
snd_mixer_close(handle);
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));
+ MSG_ERR("alsa-control_ao: unable to find simple control_ao '%s',%i\n", snd_mixer_selem_id_get_name(sid), snd_mixer_selem_id_get_index(sid));
snd_mixer_close(handle);
return MPXP_Error;
}
@@ -218,11 +218,11 @@
//setting channels
if ((err = snd_mixer_selem_set_playback_volume(elem, snd_mixer_selem_channel_id_t(0), set_vol)) < 0) {
- MSG_ERR("alsa-control: error setting left channel, %s",snd_strerror(err));
+ MSG_ERR("alsa-control_ao: error setting left channel, %s",snd_strerror(err));
return MPXP_Error;
}
if ((err = snd_mixer_selem_set_playback_volume(elem, snd_mixer_selem_channel_id_t(1), set_vol)) < 0) {
- MSG_ERR("alsa-control: error setting right channel, %s",snd_strerror(err));
+ MSG_ERR("alsa-control_ao: error setting right channel, %s",snd_strerror(err));
return MPXP_Error;
}
} else {
@@ -451,7 +451,7 @@
return MPXP_Ok;
} // end init
-static MPXP_Rc __FASTCALL__ configure(ao_data_t* ao,unsigned rate_hz,unsigned channels,unsigned format)
+static MPXP_Rc __FASTCALL__ config_ao(ao_data_t* ao,unsigned rate_hz,unsigned channels,unsigned format)
{
priv_t*priv=reinterpret_cast<priv_t*>(ao->priv);
int err,i;
@@ -572,7 +572,7 @@
chunk_size=size;
}
#endif
- // gets buffersize for control
+ // gets buffersize for control_ao
if ((err = snd_pcm_hw_params_get_buffer_size(priv->hwparams,&dummy)) < 0) {
MSG_ERR("alsa-conf: unable to get buffersize: %s\n", snd_strerror(err));
return MPXP_False;
@@ -625,7 +625,7 @@
ao->samplerate, ao->channels, priv->bytes_per_sample, ao->buffersize,
snd_pcm_format_description(priv->format));
return MPXP_Ok;
-} // end configure
+} // end config_ao
/* close audio device */
static void uninit(ao_data_t* ao)
Modified: mplayerxp/libao2/ao_arts.cpp
===================================================================
--- mplayerxp/libao2/ao_arts.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libao2/ao_arts.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -47,7 +47,7 @@
LIBAO_EXTERN(arts)
-static MPXP_Rc control(const ao_data_t* ao,int cmd, long arg)
+static MPXP_Rc control_ao(const ao_data_t* ao,int cmd, long arg)
{
UNUSED(ao);
UNUSED(cmd);
@@ -70,7 +70,7 @@
return MPXP_Ok;
}
-static MPXP_Rc __FASTCALL__ configure(ao_data_t* ao,unsigned rate,unsigned channels,unsigned format)
+static MPXP_Rc __FASTCALL__ config_ao(ao_data_t* ao,unsigned rate,unsigned channels,unsigned format)
{
arts_stream_t stream;
unsigned frag_spec,samplesize;
Modified: mplayerxp/libao2/ao_esd.cpp
===================================================================
--- mplayerxp/libao2/ao_esd.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libao2/ao_esd.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -93,7 +93,7 @@
/*
* to set/get/query special features/parameters
*/
-static MPXP_Rc control(const ao_data_t* ao,int cmd, long arg)
+static MPXP_Rc control_ao(const ao_data_t* ao,int cmd, long arg)
{
priv_t*priv=reinterpret_cast<priv_t*>(ao->priv);
esd_player_info_t *esd_pi;
@@ -179,7 +179,7 @@
return MPXP_Ok;
}
-static MPXP_Rc configure(ao_data_t* ao,unsigned rate_hz,unsigned channels,unsigned format)
+static MPXP_Rc config_ao(ao_data_t* ao,unsigned rate_hz,unsigned channels,unsigned format)
{
priv_t*priv=reinterpret_cast<priv_t*>(ao->priv);
char *server = ao->subdevice; /* NULL for localhost */
Modified: mplayerxp/libao2/ao_jack.cpp
===================================================================
--- mplayerxp/libao2/ao_jack.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libao2/ao_jack.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -140,7 +140,7 @@
// end ring priv->buffer stuff
-static MPXP_Rc control(const ao_data_t* ao,int cmd, long arg) {
+static MPXP_Rc control_ao(const ao_data_t* ao,int cmd, long arg) {
UNUSED(ao);
UNUSED(cmd);
UNUSED(arg);
@@ -221,7 +221,7 @@
return MPXP_Ok;
}
-static MPXP_Rc configure(ao_data_t* ao,unsigned rate,unsigned channels,unsigned format) {
+static MPXP_Rc config_ao(ao_data_t* ao,unsigned rate,unsigned channels,unsigned format) {
priv_t*priv=reinterpret_cast<priv_t*>(ao->priv);
const char **matching_ports = NULL;
char *port_name = NULL;
Modified: mplayerxp/libao2/ao_nas.cpp
===================================================================
--- mplayerxp/libao2/ao_nas.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libao2/ao_nas.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -366,7 +366,7 @@
}
// to set/get/query special features/parameters
-static MPXP_Rc control(const ao_data_t* ao,int cmd, long arg)
+static MPXP_Rc control_ao(const ao_data_t* ao,int cmd, long arg)
{
priv_t*priv=reinterpret_cast<priv_t*>(ao->priv);
AuElementParameters aep;
@@ -402,7 +402,7 @@
AuSetElementParameters(priv->aud, 1, &aep, &as);
if (as != AuSuccess) {
nas_print_error(priv->aud,
- "control(): AuSetElementParameters", as);
+ "control_ao(): AuSetElementParameters", as);
retval = MPXP_Error;
} else retval = MPXP_Ok;
break;
@@ -422,7 +422,7 @@
}
// open & setup audio device
// return: 1=success 0=fail
-static MPXP_Rc configure(ao_data_t* ao,unsigned rate,unsigned channels,unsigned format)
+static MPXP_Rc config_ao(ao_data_t* ao,unsigned rate,unsigned channels,unsigned format)
{
priv_t* priv=reinterpret_cast<priv_t*>(ao->priv);
AuElement elms[3];
Modified: mplayerxp/libao2/ao_null.cpp
===================================================================
--- mplayerxp/libao2/ao_null.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libao2/ao_null.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -97,7 +97,7 @@
}
// to set/get/query special features/parameters
-static MPXP_Rc __FASTCALL__ control(const ao_data_t* ao,int cmd,long arg){
+static MPXP_Rc __FASTCALL__ control_ao(const ao_data_t* ao,int cmd,long arg){
UNUSED(ao);
UNUSED(cmd);
UNUSED(arg);
@@ -121,7 +121,7 @@
return MPXP_Ok;
}
-static MPXP_Rc __FASTCALL__ configure(ao_data_t* ao,unsigned rate,unsigned channels,unsigned format){
+static MPXP_Rc __FASTCALL__ config_ao(ao_data_t* ao,unsigned rate,unsigned channels,unsigned format){
priv_t*priv = (priv_t*)ao->priv;
unsigned bits;
ao->buffersize= 0xFFFFF;
Modified: mplayerxp/libao2/ao_openal.cpp
===================================================================
--- mplayerxp/libao2/ao_openal.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libao2/ao_openal.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -59,7 +59,7 @@
int16_t* tmpbuf;
}priv_t;
-static MPXP_Rc control(const ao_data_t* ao,int cmd, long arg) {
+static MPXP_Rc control_ao(const ao_data_t* ao,int cmd, long arg) {
UNUSED(ao);
switch (cmd) {
case AOCONTROL_GET_VOLUME:
@@ -104,7 +104,7 @@
return MPXP_Ok;
}
-static MPXP_Rc configure(ao_data_t* ao,unsigned rate, unsigned channels, unsigned format)
+static MPXP_Rc config_ao(ao_data_t* ao,unsigned rate, unsigned channels, unsigned format)
{
priv_t*priv=reinterpret_cast<priv_t*>(ao->priv);
ALCcontext *ctx = NULL;
Modified: mplayerxp/libao2/ao_oss.cpp
===================================================================
--- mplayerxp/libao2/ao_oss.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libao2/ao_oss.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -43,7 +43,7 @@
const char *oss_mixer_device = PATH_DEV_MIXER;
// to set/get/query special features/parameters
-static MPXP_Rc __FASTCALL__ control(const ao_data_t* ao,int cmd,long arg){
+static MPXP_Rc __FASTCALL__ control_ao(const ao_data_t* ao,int cmd,long arg){
priv_t*priv=reinterpret_cast<priv_t*>(ao->priv);
int rval;
switch(cmd){
@@ -242,7 +242,7 @@
return MPXP_Ok;
}
-static MPXP_Rc __FASTCALL__ configure(ao_data_t* ao,unsigned rate,unsigned channels,unsigned format)
+static MPXP_Rc __FASTCALL__ config_ao(ao_data_t* ao,unsigned rate,unsigned channels,unsigned format)
{
priv_t*priv=reinterpret_cast<priv_t*>(ao->priv);
MSG_V("ao2: %d Hz %d chans %s\n",rate,channels,
@@ -265,7 +265,7 @@
#endif
goto ac3_retry;
} else {
- MSG_ERR("OSS-CONF: Can't configure for: %s\n",ao_format_name(format));
+ MSG_ERR("OSS-CONF: Can't config_ao for: %s\n",ao_format_name(format));
show_fmts(ao);
ao->format=format;
return MPXP_False;
Modified: mplayerxp/libao2/ao_sdl.cpp
===================================================================
--- mplayerxp/libao2/ao_sdl.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libao2/ao_sdl.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -111,7 +111,7 @@
#endif
// to set/get/query special features/parameters
-static MPXP_Rc __FASTCALL__ control(const ao_data_t* ao,int cmd,long arg){
+static MPXP_Rc __FASTCALL__ control_ao(const ao_data_t* ao,int cmd,long arg){
priv_t*priv=reinterpret_cast<priv_t*>(ao->priv);
switch (cmd) {
case AOCONTROL_QUERY_FORMAT:
@@ -160,7 +160,7 @@
return MPXP_Ok;
}
-static MPXP_Rc __FASTCALL__ configure(ao_data_t* ao,unsigned rate,unsigned channels,unsigned format)
+static MPXP_Rc __FASTCALL__ config_ao(ao_data_t* ao,unsigned rate,unsigned channels,unsigned format)
{
/* SDL Audio Specifications */
SDL_AudioSpec aspec, obtained;
Modified: mplayerxp/libao2/ao_wav.cpp
===================================================================
--- mplayerxp/libao2/ao_wav.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libao2/ao_wav.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -86,7 +86,7 @@
/* init with default values */
// to set/get/query special features/parameters
-static MPXP_Rc control(const ao_data_t* ao,int cmd,long arg){
+static MPXP_Rc control_ao(const ao_data_t* ao,int cmd,long arg){
UNUSED(ao);
UNUSED(cmd);
UNUSED(arg);
@@ -105,7 +105,7 @@
return MPXP_Ok;
}
-static MPXP_Rc configure(ao_data_t* ao,unsigned rate,unsigned channels,unsigned format){
+static MPXP_Rc config_ao(ao_data_t* ao,unsigned rate,unsigned channels,unsigned format){
priv_t* priv=reinterpret_cast<priv_t*>(ao->priv);
unsigned bits;
Modified: mplayerxp/libao2/audio_out.cpp
===================================================================
--- mplayerxp/libao2/audio_out.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libao2/audio_out.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -227,7 +227,7 @@
MPXP_Rc __FASTCALL__ ao_configure(ao_data_t*ao,unsigned rate,unsigned channels,unsigned format)
{
priv_t* priv=reinterpret_cast<priv_t*>(ao->opaque);
- return priv->audio_out->configure(ao,rate,channels,format);
+ return priv->audio_out->config_ao(ao,rate,channels,format);
}
void ao_uninit(ao_data_t*ao)
@@ -294,7 +294,7 @@
{
if(ao) {
priv_t* priv=reinterpret_cast<priv_t*>(ao->opaque);
- return priv->audio_out->control(ao,cmd,arg);
+ return priv->audio_out->control_ao(ao,cmd,arg);
}
return MPXP_Error;
}
Modified: mplayerxp/libao2/audio_out.h
===================================================================
--- mplayerxp/libao2/audio_out.h 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libao2/audio_out.h 2012-11-25 15:56:14 UTC (rev 454)
@@ -38,7 +38,7 @@
* @param arg argument associated with command
* @return MPXP_Ok if success MPXP_False MPXP_Error MPXP_NA otherwise
**/
- MPXP_Rc (* __FASTCALL__ control)(const ao_data_t*,int cmd,long arg);
+ MPXP_Rc (* __FASTCALL__ control_ao)(const ao_data_t*,int cmd,long arg);
/** Preinitializes driver
* @param flag currently unused
@@ -52,7 +52,7 @@
* @param format specifies format of audio samples (see AFMT_* for detail)
* @return 1 on successful configuration, 0 on error.
**/
- MPXP_Rc (* __FASTCALL__ configure)(ao_data_t*,unsigned rate,unsigned channels,unsigned format);
+ MPXP_Rc (* __FASTCALL__ config_ao)(ao_data_t*,unsigned rate,unsigned channels,unsigned format);
/** Closes driver. Should restore the original state of the system.
**/
Modified: mplayerxp/libao2/audio_out_internal.h
===================================================================
--- mplayerxp/libao2/audio_out_internal.h 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libao2/audio_out_internal.h 2012-11-25 15:56:14 UTC (rev 454)
@@ -1,9 +1,9 @@
#include "mp_config.h"
// prototypes:
//static ao_info_t info;
-static MPXP_Rc __FASTCALL__ control(const ao_data_t*,int cmd,long arg);
+static MPXP_Rc __FASTCALL__ control_ao(const ao_data_t*,int cmd,long arg);
static MPXP_Rc __FASTCALL__ init(ao_data_t*,unsigned flags);
-static MPXP_Rc __FASTCALL__ configure(ao_data_t*,unsigned rate,unsigned channels,unsigned format);
+static MPXP_Rc __FASTCALL__ config_ao(ao_data_t*,unsigned rate,unsigned channels,unsigned format);
static void __FASTCALL__ uninit(ao_data_t*);
static void __FASTCALL__ reset(ao_data_t*);
static unsigned __FASTCALL__ get_space(const ao_data_t*);
@@ -15,9 +15,9 @@
#define LIBAO_EXTERN(x) extern const ao_functions_t audio_out_##x =\
{\
&info,\
- control,\
+ control_ao,\
init,\
- configure,\
+ config_ao,\
uninit,\
reset,\
get_space,\
Modified: mplayerxp/libmpcodecs/ad.h
===================================================================
--- mplayerxp/libmpcodecs/ad.h 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/ad.h 2012-11-25 15:56:14 UTC (rev 454)
@@ -49,7 +49,7 @@
MPXP_Rc (* __FASTCALL__ preinit)(sh_audio_t *);
MPXP_Rc (* __FASTCALL__ init)(sh_audio_t *sh);
void (* __FASTCALL__ uninit)(sh_audio_t *sh);
- MPXP_Rc (* control)(sh_audio_t *sh,int cmd,any_t* arg, ...);
+ MPXP_Rc (*control_ad)(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.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_a52.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/ad_a52.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -207,7 +207,7 @@
delete sh->context;
}
-MPXP_Rc control(sh_audio_t *sh,int cmd,any_t* arg, ...)
+MPXP_Rc control_ad(sh_audio_t *sh,int cmd,any_t* arg, ...)
{
UNUSED(arg);
switch(cmd) {
Modified: mplayerxp/libmpcodecs/ad_acm.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_acm.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/ad_acm.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -159,7 +159,7 @@
delete sh->context;
}
-MPXP_Rc control(sh_audio_t *sh_audio,int cmd,any_t* arg, ...)
+MPXP_Rc control_ad(sh_audio_t *sh_audio,int cmd,any_t* arg, ...)
{
int skip;
switch(cmd) {
Modified: mplayerxp/libmpcodecs/ad_dca.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_dca.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/ad_dca.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -207,7 +207,7 @@
delete sh->context;
}
-MPXP_Rc control(sh_audio_t *sh,int cmd,any_t* arg, ...)
+MPXP_Rc control_ad(sh_audio_t *sh,int cmd,any_t* arg, ...)
{
UNUSED(arg);
switch(cmd) {
Modified: mplayerxp/libmpcodecs/ad_dmo.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_dmo.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/ad_dmo.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -70,7 +70,7 @@
delete priv;
}
-static MPXP_Rc control(sh_audio_t *sh_audio,int cmd,any_t* arg, ...)
+static MPXP_Rc control_ad(sh_audio_t *sh_audio,int cmd,any_t* arg, ...)
{
int skip;
UNUSED(arg);
Modified: mplayerxp/libmpcodecs/ad_dshow.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_dshow.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/ad_dshow.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -63,7 +63,7 @@
delete priv;
}
-MPXP_Rc control(sh_audio_t *sh_audio,int cmd,any_t* arg, ...)
+MPXP_Rc control_ad(sh_audio_t *sh_audio,int cmd,any_t* arg, ...)
{
int skip;
UNUSED(arg);
Modified: mplayerxp/libmpcodecs/ad_dvdpcm.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_dvdpcm.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/ad_dvdpcm.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -83,7 +83,7 @@
UNUSED(sh);
}
-MPXP_Rc control(sh_audio_t *sh,int cmd,any_t* arg, ...)
+MPXP_Rc control_ad(sh_audio_t *sh,int cmd,any_t* arg, ...)
{
int skip;
UNUSED(arg);
Modified: mplayerxp/libmpcodecs/ad_faad.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_faad.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/ad_faad.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -275,7 +275,7 @@
delete sh->context;
}
-static MPXP_Rc control(sh_audio_t *sh,int cmd,any_t* arg, ...)
+static MPXP_Rc control_ad(sh_audio_t *sh,int cmd,any_t* arg, ...)
{
UNUSED(sh);
UNUSED(cmd);
Modified: mplayerxp/libmpcodecs/ad_hwac3.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_hwac3.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/ad_hwac3.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -222,7 +222,7 @@
mpcodecs_ad_a52.uninit(sh);
}
-MPXP_Rc control(sh_audio_t *sh,int cmd,any_t* arg, ...)
+MPXP_Rc control_ad(sh_audio_t *sh,int cmd,any_t* arg, ...)
{
UNUSED(arg);
switch(cmd) {
Modified: mplayerxp/libmpcodecs/ad_internal.h
===================================================================
--- mplayerxp/libmpcodecs/ad_internal.h 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/ad_internal.h 2012-11-25 15:56:14 UTC (rev 454)
@@ -15,7 +15,7 @@
static MPXP_Rc __FASTCALL__ init(sh_audio_t *sh);
static MPXP_Rc __FASTCALL__ preinit(sh_audio_t *sh);
static void __FASTCALL__ uninit(sh_audio_t *sh);
-static MPXP_Rc control(sh_audio_t *sh,int cmd,any_t* arg, ...);
+static MPXP_Rc control_ad(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) extern const ad_functions_t mpcodecs_ad_##x = {\
@@ -25,7 +25,7 @@
preinit,\
init,\
uninit,\
- control,\
+ control_ad,\
decode\
};
Modified: mplayerxp/libmpcodecs/ad_lavc.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_lavc.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/ad_lavc.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -180,7 +180,7 @@
sh->context=NULL;
}
-MPXP_Rc control(sh_audio_t *sh,int cmd,any_t* arg, ...)
+MPXP_Rc control_ad(sh_audio_t *sh,int cmd,any_t* arg, ...)
{
UNUSED(arg);
priv_t* priv = reinterpret_cast<priv_t*>(sh->context);
Modified: mplayerxp/libmpcodecs/ad_libdv.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_libdv.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/ad_libdv.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -90,7 +90,7 @@
delete priv->audioBuffers[i];
}
-static MPXP_Rc control(sh_audio_t *sh,int cmd,any_t* arg, ...)
+static MPXP_Rc control_ad(sh_audio_t *sh,int cmd,any_t* arg, ...)
{
// TODO!!!
UNUSED(sh);
Modified: mplayerxp/libmpcodecs/ad_mp3.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_mp3.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/ad_mp3.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -354,7 +354,7 @@
dlclose(dll_handle);
}
-MPXP_Rc control(sh_audio_t *sh,int cmd,any_t* arg, ...)
+MPXP_Rc control_ad(sh_audio_t *sh,int cmd,any_t* arg, ...)
{
UNUSED(sh);
UNUSED(cmd);
@@ -375,7 +375,7 @@
int retval=-1;
while(retval<0) {
retval = MP3_DecodeFrame(buf,-1,pts);
- if(retval<0) control(sh_audio,ADCTRL_RESYNC_STREAM,NULL);
+ if(retval<0) control_ad(sh_audio,ADCTRL_RESYNC_STREAM,NULL);
}
return retval;
***************************
Modified: mplayerxp/libmpcodecs/ad_null.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_null.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/ad_null.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -38,7 +38,7 @@
UNUSED(sh);
}
-MPXP_Rc control(sh_audio_t *sh,int cmd,any_t* arg, ...)
+MPXP_Rc control_ad(sh_audio_t *sh,int cmd,any_t* arg, ...)
{
UNUSED(sh);
UNUSED(cmd);
Modified: mplayerxp/libmpcodecs/ad_pcm.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_pcm.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/ad_pcm.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -92,7 +92,7 @@
UNUSED(sh);
}
-MPXP_Rc control(sh_audio_t *sh,int cmd,any_t* arg, ...)
+MPXP_Rc control_ad(sh_audio_t *sh,int cmd,any_t* arg, ...)
{
int skip;
UNUSED(arg);
Modified: mplayerxp/libmpcodecs/ad_qtaudio.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_qtaudio.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/ad_qtaudio.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -307,7 +307,7 @@
return ConvertedBytes;
}
-static MPXP_Rc control(sh_audio_t *sh,int cmd,any_t* arg, ...){
+static MPXP_Rc control_ad(sh_audio_t *sh,int cmd,any_t* arg, ...){
// various optional functions you MAY implement:
UNUSED(sh);
UNUSED(cmd);
Modified: mplayerxp/libmpcodecs/ad_real.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_real.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/ad_real.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -296,7 +296,7 @@
// or -1 for EOF (or uncorrectable error)
}
-static MPXP_Rc control(sh_audio_t *sh,int cmd,any_t* arg, ...){
+static MPXP_Rc control_ad(sh_audio_t *sh,int cmd,any_t* arg, ...){
UNUSED(sh);
UNUSED(arg);
// various optional functions you MAY implement:
Modified: mplayerxp/libmpcodecs/ad_twin.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_twin.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/ad_twin.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -336,7 +336,7 @@
FreeLibrary(vqf_dll);
}
-MPXP_Rc control(sh_audio_t *sh_audio,int cmd,any_t* arg, ...)
+MPXP_Rc control_ad(sh_audio_t *sh_audio,int cmd,any_t* arg, ...)
{
int skip;
UNUSED(arg);
Modified: mplayerxp/libmpcodecs/ad_vorbis.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_vorbis.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/ad_vorbis.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -136,7 +136,7 @@
delete sh->context;
}
-static MPXP_Rc control(sh_audio_t *sh,int cmd,any_t* arg, ...)
+static MPXP_Rc control_ad(sh_audio_t *sh,int cmd,any_t* arg, ...)
{
UNUSED(sh);
UNUSED(cmd);
Modified: mplayerxp/libmpcodecs/dec_audio.cpp
===================================================================
--- mplayerxp/libmpcodecs/dec_audio.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/dec_audio.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -369,7 +369,7 @@
sh_audio_t* sh_audio = priv->parent;
if(sh_audio) {
sh_audio->a_in_buffer_len=0; /* workaround */
- if(sh_audio->inited && priv->mpadec) priv->mpadec->control(sh_audio,ADCTRL_RESYNC_STREAM,NULL);
+ if(sh_audio->inited && priv->mpadec) priv->mpadec->control_ad(sh_audio,ADCTRL_RESYNC_STREAM,NULL);
}
}
@@ -381,6 +381,6 @@
sh_audio_t* sh_audio = priv->parent;
MPXP_Rc rc=MPXP_True;
if(sh_audio)
- if(sh_audio->inited && priv->mpadec) rc=priv->mpadec->control(sh_audio,ADCTRL_SKIP_FRAME,NULL);
+ if(sh_audio->inited && priv->mpadec) rc=priv->mpadec->control_ad(sh_audio,ADCTRL_SKIP_FRAME,NULL);
if(rc!=MPXP_True) ds_fill_buffer(sh_audio->ds);
}
Modified: mplayerxp/libmpcodecs/dec_video.cpp
===================================================================
--- mplayerxp/libmpcodecs/dec_video.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/dec_video.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -54,7 +54,7 @@
priv_t* priv=(priv_t*)opaque;
sh_video_t* sh_video = priv->parent;
if(priv->mpvdec){
- MPXP_Rc ret=priv->mpvdec->control(sh_video,VDCTRL_QUERY_MAX_PP_LEVEL,quality);
+ MPXP_Rc ret=priv->mpvdec->control_vd(sh_video,VDCTRL_QUERY_MAX_PP_LEVEL,quality);
if(ret>=MPXP_Ok) return ret;
}
return MPXP_False;
@@ -64,7 +64,7 @@
priv_t* priv=(priv_t*)opaque;
sh_video_t* sh_video = priv->parent;
if(priv->mpvdec)
- return priv->mpvdec->control(sh_video,VDCTRL_SET_PP_LEVEL, (any_t*)(&quality));
+ return priv->mpvdec->control_vd(sh_video,VDCTRL_SET_PP_LEVEL, (any_t*)(&quality));
return MPXP_False;
}
@@ -76,8 +76,8 @@
vf_equalizer_t eq;
eq.item=item;
eq.value=value*10;
- if(vf->control(vf,VFCTRL_SET_EQUALIZER,&eq)!=MPXP_True) {
- if(priv->mpvdec) return priv->mpvdec->control(sh_video,VDCTRL_SET_EQUALIZER,(any_t*)item,(int)value);
+ if(vf->control_vf(vf,VFCTRL_SET_EQUALIZER,&eq)!=MPXP_True) {
+ if(priv->mpvdec) return priv->mpvdec->control_vd(sh_video,VDCTRL_SET_EQUALIZER,(any_t*)item,(int)value);
}
return MPXP_False;
}
@@ -291,7 +291,7 @@
vf=sh_video->vfilter;
t=GetTimer();
- vf->control(vf,VFCTRL_START_FRAME,NULL);
+ vf->control_vf(vf,VFCTRL_START_FRAME,NULL);
sh_video->active_slices=0;
mpi=priv->mpvdec->decode(sh_video, frame);
@@ -333,7 +333,7 @@
priv_t* priv=(priv_t*)opaque;
sh_video_t* sh_video = priv->parent;
if(sh_video)
- if(sh_video->inited && priv->mpvdec) priv->mpvdec->control(sh_video,VDCTRL_RESYNC_STREAM,NULL);
+ if(sh_video->inited && priv->mpvdec) priv->mpvdec->control_vd(sh_video,VDCTRL_RESYNC_STREAM,NULL);
}
#ifdef USE_SUB
@@ -436,7 +436,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(priv->mpvdec->control(sh,VDCTRL_QUERY_FORMAT,&out_fmt)==MPXP_False) {
+ if(priv->mpvdec->control_vd(sh,VDCTRL_QUERY_FORMAT,&out_fmt)==MPXP_False) {
MSG_DBG2("vo_debug: codec[%s] query_format(%s) returned FALSE\n",priv->mpvdec->info->driver_name,vo_format_name(out_fmt));
continue;
}
@@ -446,7 +446,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(priv->mpvdec->control(sh,VDCTRL_QUERY_FORMAT,&out_fmt)!=MPXP_False)
+ if(priv->mpvdec->control_vd(sh,VDCTRL_QUERY_FORMAT,&out_fmt)!=MPXP_False)
palette=1;
}
}
@@ -554,7 +554,7 @@
"MPlayerXP",vo_format_name(out_fmt));
MSG_DBG2("vf configuring: %s\n",vf->info->name);
- if(vf->config(vf,sh->src_w,sh->src_h,
+ if(vf->config_vf(vf,sh->src_w,sh->src_h,
screen_size_x,screen_size_y,
vo_data->flags,
out_fmt)==0){
Modified: mplayerxp/libmpcodecs/vd.h
===================================================================
--- mplayerxp/libmpcodecs/vd.h 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/vd.h 2012-11-25 15:56:14 UTC (rev 454)
@@ -55,7 +55,7 @@
const video_probe_t*(*__FASTCALL__ probe)(sh_video_t *sh,uint32_t fourcc);
MPXP_Rc (*__FASTCALL__ init)(sh_video_t *sh,any_t* libinput);
void (*__FASTCALL__ uninit)(sh_video_t *sh);
- MPXP_Rc (* control)(sh_video_t *sh,int cmd,any_t* arg, ...);
+ MPXP_Rc (*control_vd)(sh_video_t *sh,int cmd,any_t* arg, ...);
mp_image_t* (*__FASTCALL__ decode)(sh_video_t *sh,const enc_frame_t* frame);
} vd_functions_t;
Modified: mplayerxp/libmpcodecs/vd_divx4.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_divx4.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/vd_divx4.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -159,7 +159,7 @@
static any_t*dll_handle;
// to set/get/query special features/parameters
-static MPXP_Rc control(sh_video_t *sh,int cmd,any_t* arg,...){
+static MPXP_Rc control_vd(sh_video_t *sh,int cmd,any_t* arg,...){
priv_t*p=reinterpret_cast<priv_t*>(sh->context);
switch(cmd){
case VDCTRL_QUERY_MAX_PP_LEVEL:
Modified: mplayerxp/libmpcodecs/vd_dmo.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_dmo.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/vd_dmo.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -30,7 +30,7 @@
static const video_probe_t* __FASTCALL__ probe(sh_video_t *sh,uint32_t fourcc) { return NULL; }
// to set/get/query special features/parameters
-static MPXP_Rc control(sh_video_t *sh,int cmd,any_t* arg,...){
+static MPXP_Rc control_vd(sh_video_t *sh,int cmd,any_t* arg,...){
switch(cmd){
case VDCTRL_QUERY_FORMAT:
if (*((int*)arg) == IMGFMT_YV12 ||
Modified: mplayerxp/libmpcodecs/vd_dshow.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_dshow.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/vd_dshow.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -32,7 +32,7 @@
static const video_probe_t* __FASTCALL__ probe(sh_video_t *sh,uint32_t fourcc) { return NULL; }
// to set/get/query special features/parameters
-static MPXP_Rc control(sh_video_t *sh,int cmd,any_t* arg,...){
+static MPXP_Rc control_vd(sh_video_t *sh,int cmd,any_t* arg,...){
switch(cmd){
case VDCTRL_QUERY_MAX_PP_LEVEL:
*((unsigned*)arg)=4;
Modified: mplayerxp/libmpcodecs/vd_huffyuv.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_huffyuv.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/vd_huffyuv.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -174,7 +174,7 @@
// to set/get/query special features/parameters
-static MPXP_Rc control(sh_video_t *sh,int cmd,any_t* arg,...)
+static MPXP_Rc control_vd(sh_video_t *sh,int cmd,any_t* arg,...)
{
switch(cmd) {
case VDCTRL_QUERY_FORMAT:
Modified: mplayerxp/libmpcodecs/vd_internal.h
===================================================================
--- mplayerxp/libmpcodecs/vd_internal.h 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/vd_internal.h 2012-11-25 15:56:14 UTC (rev 454)
@@ -13,7 +13,7 @@
//static const config_t options[];
static const video_probe_t* __FASTCALL__ probe(sh_video_t *sh,uint32_t fourcc);
-static MPXP_Rc control(sh_video_t *sh,int cmd,any_t* arg,...);
+static MPXP_Rc control_vd(sh_video_t *sh,int cmd,any_t* arg,...);
static MPXP_Rc __FASTCALL__ init(sh_video_t *sh,any_t* libinput);
static void __FASTCALL__ uninit(sh_video_t *sh);
static mp_image_t* __FASTCALL__ decode(sh_video_t *sh,const enc_frame_t* frame);
@@ -24,7 +24,7 @@
probe, \
init,\
uninit,\
- control,\
+ control_vd,\
decode\
};
Modified: mplayerxp/libmpcodecs/vd_lavc.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_lavc.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/vd_lavc.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -128,7 +128,7 @@
};
/* to set/get/query special features/parameters */
-static MPXP_Rc control(sh_video_t *sh,int cmd,any_t* arg,...){
+static MPXP_Rc control_vd(sh_video_t *sh,int cmd,any_t* arg,...){
priv_t *ctx = reinterpret_cast<priv_t*>(sh->context);
uint32_t out_fourcc;
AVCodecContext *avctx = ctx->ctx;
Modified: mplayerxp/libmpcodecs/vd_libdv.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_libdv.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/vd_libdv.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -61,7 +61,7 @@
}
// to set/get/query special features/parameters
-static MPXP_Rc control(sh_video_t *sh,int cmd,any_t* arg,...){
+static MPXP_Rc control_vd(sh_video_t *sh,int cmd,any_t* arg,...){
return MPXP_Unknown;
}
Modified: mplayerxp/libmpcodecs/vd_libmpeg2.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_libmpeg2.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/vd_libmpeg2.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -241,7 +241,7 @@
}
// to set/get/query special features/parameters
-static MPXP_Rc control(sh_video_t *sh,int cmd,any_t* arg,...){
+static MPXP_Rc control_vd(sh_video_t *sh,int cmd,any_t* arg,...){
priv_t *priv=reinterpret_cast<priv_t*>(sh->context);
switch(cmd) {
case VDCTRL_RESYNC_STREAM:
Modified: mplayerxp/libmpcodecs/vd_mpegpes.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_mpegpes.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/vd_mpegpes.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -96,7 +96,7 @@
}
// to set/get/query special features/parameters
-static MPXP_Rc control(sh_video_t *sh,int cmd,any_t* arg,...){
+static MPXP_Rc control_vd(sh_video_t *sh,int cmd,any_t* arg,...){
return MPXP_Unknown;
}
Modified: mplayerxp/libmpcodecs/vd_null.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_null.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/vd_null.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -22,7 +22,7 @@
static const video_probe_t* __FASTCALL__ probe(sh_video_t *sh,uint32_t fourcc) { return NULL; }
// to set/get/query special features/parameters
-static MPXP_Rc control(sh_video_t *sh,int cmd,any_t* arg,...){
+static MPXP_Rc control_vd(sh_video_t *sh,int cmd,any_t* arg,...){
return MPXP_Unknown;
}
Modified: mplayerxp/libmpcodecs/vd_nuv.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_nuv.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/vd_nuv.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -36,7 +36,7 @@
}
// to set/get/query special features/parameters
-static MPXP_Rc control(sh_video_t *sh,int cmd,any_t* arg,...){
+static MPXP_Rc control_vd(sh_video_t *sh,int cmd,any_t* arg,...){
switch(cmd) {
case VDCTRL_QUERY_FORMAT:
if (*((int*)arg) == IMGFMT_I420 ||
Modified: mplayerxp/libmpcodecs/vd_qtvideo.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_qtvideo.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/vd_qtvideo.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -98,7 +98,7 @@
static OSErr (*NewHandleClear)(Size byteCount);
// to set/get/query special features/parameters
-static MPXP_Rc control(sh_video_t *sh,int cmd,any_t* arg,...){
+static MPXP_Rc control_vd(sh_video_t *sh,int cmd,any_t* arg,...){
switch(cmd) {
case VDCTRL_QUERY_FORMAT:
if (*((int*)arg) == IMGFMT_YV12 ||
Modified: mplayerxp/libmpcodecs/vd_raw.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_raw.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/vd_raw.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -78,7 +78,7 @@
}
// to set/get/query special features/parameters
-static MPXP_Rc control(sh_video_t *sh,int cmd,any_t* arg,...){
+static MPXP_Rc control_vd(sh_video_t *sh,int cmd,any_t* arg,...){
switch(cmd) {
case VDCTRL_QUERY_FORMAT:
return MPXP_True;
Modified: mplayerxp/libmpcodecs/vd_real.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_real.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/vd_real.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -96,7 +96,7 @@
// to set/get/query special features/parameters
-static MPXP_Rc control(sh_video_t *sh,int cmd,any_t* arg,...){
+static MPXP_Rc control_vd(sh_video_t *sh,int cmd,any_t* arg,...){
switch(cmd){
// case VDCTRL_QUERY_MAX_PP_LEVEL:
// *((unsigned*)arg)=9;
Modified: mplayerxp/libmpcodecs/vd_theora.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_theora.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/vd_theora.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -53,7 +53,7 @@
} priv_t;
// to set/get/query special features/parameters
-static MPXP_Rc control(sh_video_t *sh,int cmd,any_t* arg,...){
+static MPXP_Rc control_vd(sh_video_t *sh,int cmd,any_t* arg,...){
switch(cmd) {
case VDCTRL_QUERY_FORMAT:
if (*((int*)arg) == IMGFMT_YV12)
Modified: mplayerxp/libmpcodecs/vd_vfw.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_vfw.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/vd_vfw.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -215,7 +215,7 @@
}
// to set/get/query special features/parameters
-static MPXP_Rc control(sh_video_t *sh,int cmd,any_t* arg,...){
+static MPXP_Rc control_vd(sh_video_t *sh,int cmd,any_t* arg,...){
priv_t *priv = reinterpret_cast<priv_t*>(sh->context);
switch(cmd){
case VDCTRL_QUERY_MAX_PP_LEVEL:
Modified: mplayerxp/libmpcodecs/vd_xanim.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_xanim.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/vd_xanim.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -881,7 +881,7 @@
/*************************** END OF XA CODEC BINARY INTERFACE ******************/
// to set/get/query special features/parameters
-static MPXP_Rc control(sh_video_t *sh,int cmd,any_t* arg,...){
+static MPXP_Rc control_vd(sh_video_t *sh,int cmd,any_t* arg,...){
switch(cmd) {
case VDCTRL_QUERY_FORMAT:
if (*((int*)arg) == IMGFMT_YV12 ||
Modified: mplayerxp/libmpcodecs/vd_xvid.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_xvid.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/libmpcodecs/vd_xvid.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -511,7 +511,7 @@
}
// to set/get/query special features/parameters
-static MPXP_Rc control(sh_video_t *sh,int cmd,any_t* arg,...){
+static MPXP_Rc control_vd(sh_video_t *sh,int cmd,any_t* arg,...){
priv_t* priv = reinterpret_cast<priv_t*>(sh->context);
switch(cmd){
case VDCTRL_QUERY_MAX_PP_LEVEL:
Modified: mplayerxp/postproc/af.cpp
===================================================================
--- mplayerxp/postproc/af.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/postproc/af.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -139,9 +139,9 @@
// Initialize the new filter
if(MPXP_Ok == _new->info->open(_new) &&
- MPXP_Error < _new->control(_new,AF_CONTROL_POST_CREATE,&s->cfg)){
+ MPXP_Error < _new->control_af(_new,AF_CONTROL_POST_CREATE,&s->cfg)){
if(cmdline){
- if(MPXP_Error<_new->control(_new,AF_CONTROL_COMMAND_LINE,cmdline)) {
+ if(MPXP_Error<_new->control_af(_new,AF_CONTROL_COMMAND_LINE,cmdline)) {
delete cmdline;
return _new;
}
@@ -217,7 +217,7 @@
MSG_V("[libaf] Removing filter %s \n",af->info->name);
// Notify filter before changing anything
- af->control(af,AF_CONTROL_PRE_DESTROY,0);
+ af->control_af(af,AF_CONTROL_PRE_DESTROY,0);
// Detach pointers
if(af->prev)
@@ -250,7 +250,7 @@
if(!af->prev) memcpy(&in,&(s->input),sizeof(af_conf_t));
else memcpy(&in,&af->prev->conf,sizeof(af_conf_t));
- rv = af->config(af,&in);
+ rv = af->config_af(af,&in);
memcpy(&in,&af->conf,sizeof(af_conf_t));
switch(rv){
case MPXP_Ok: break;
@@ -261,26 +261,26 @@
// Insert channels filter
if((af->prev?af->prev->conf.nch:s->input.nch) != in.nch){
if(NULL == (_new = af_prepend(s,af,"channels"))) return MPXP_Error;
- if(MPXP_Ok != (rv = _new->control(_new,AF_CONTROL_CHANNELS,&in.nch))) return rv;
+ if(MPXP_Ok != (rv = _new->control_af(_new,AF_CONTROL_CHANNELS,&in.nch))) return rv;
// Initialize channels filter
if(!_new->prev) memcpy(&in,&(s->input),sizeof(af_conf_t));
else memcpy(&in,&_new->prev->conf,sizeof(af_conf_t));
- if(MPXP_Ok != (rv = _new->config(_new,&in))) return rv;
+ if(MPXP_Ok != (rv = _new->config_af(_new,&in))) return rv;
}
// Insert rate filter
if((af->prev?af->prev->conf.rate:s->input.rate) != in.rate){
if(NULL == (_new = af_prepend(s,af,"resample"))) return MPXP_Error;
- if(MPXP_Ok != (rv = _new->control(_new,AF_CONTROL_RESAMPLE_RATE,&in.rate))) return rv;
+ if(MPXP_Ok != (rv = _new->control_af(_new,AF_CONTROL_RESAMPLE_RATE,&in.rate))) return rv;
// Initialize channels filter
if(!_new->prev) memcpy(&in,&(s->input),sizeof(af_conf_t));
else memcpy(&in,&_new->prev->conf,sizeof(af_conf_t));
- if(MPXP_Ok != (rv = _new->config(_new,&in))) {
+ if(MPXP_Ok != (rv = _new->config_af(_new,&in))) {
af_instance_t* af2 = af_prepend(s,af,"format");
// Init the _new filter
if(af2) {
- if((MPXP_Ok != af2->control(af2,AF_CONTROL_FORMAT,&in.format))) return -1;
+ if((MPXP_Ok != af2->control_af(af2,AF_CONTROL_FORMAT,&in.format))) return -1;
if(MPXP_Ok != af_reinit(s,af2)) return MPXP_Error;
- rv = _new->config(_new,&in);
+ rv = _new->config_af(_new,&in);
}
return rv;
}
@@ -288,11 +288,11 @@
// Insert format filter
if(((af->prev?af->prev->conf.format:s->input.format) != in.format)) {
if(NULL == (_new = af_prepend(s,af,"format"))) return MPXP_Error;
- if(MPXP_Ok != (rv = _new->control(_new,AF_CONTROL_FORMAT,&in.format))) return rv;
+ if(MPXP_Ok != (rv = _new->control_af(_new,AF_CONTROL_FORMAT,&in.format))) return rv;
// Initialize format filter
if(!_new->prev) memcpy(&in,&(s->input),sizeof(af_conf_t));
else memcpy(&in,&_new->prev->conf,sizeof(af_conf_t));
- if(MPXP_Ok != (rv = _new->config(_new,&in))) return rv;
+ if(MPXP_Ok != (rv = _new->config_af(_new,&in))) return rv;
}
if(!_new){ // Should _never_ happen
MSG_ERR("[libaf] Unable to correct audio format. "
@@ -404,14 +404,14 @@
}
}
// Init the _new filter
- if(!af || (MPXP_Ok != af->control(af,AF_CONTROL_RESAMPLE_RATE,
+ if(!af || (MPXP_Ok != af->control_af(af,AF_CONTROL_RESAMPLE_RATE,
&(s->output.rate))))
return MPXP_False;
// Use lin int if the user wants fast
if ((AF_INIT_TYPE_MASK & s->cfg.force) == AF_INIT_FAST) {
char args[32];
sprintf(args, "%d:0:0", s->output.rate);
- af->control(af, AF_CONTROL_COMMAND_LINE, args);
+ af->control_af(af, AF_CONTROL_COMMAND_LINE, args);
}
if(MPXP_Ok != af_reinit(s,af))
return MPXP_False;
@@ -425,7 +425,7 @@
else
af = af_append(s,s->last,"channels");
// Init the _new filter
- if(!af || (MPXP_Ok != af->control(af,AF_CONTROL_CHANNELS,&(s->output.nch))))
+ if(!af || (MPXP_Ok != af->control_af(af,AF_CONTROL_CHANNELS,&(s->output.nch))))
return MPXP_False;
if(MPXP_Ok != af_reinit(s,af))
return MPXP_False;
@@ -438,7 +438,7 @@
else
af = s->last;
// Init the _new filter
- if(!af ||(MPXP_Ok != af->control(af,AF_CONTROL_FORMAT,&s->output.format)))
+ if(!af ||(MPXP_Ok != af->control_af(af,AF_CONTROL_FORMAT,&s->output.format)))
return MPXP_False;
if(MPXP_Ok != af_reinit(s,af))
return MPXP_False;
@@ -559,13 +559,13 @@
return delay;
}
-// send control to all filters, starting with the last until
+// send control_af to all filters, starting with the last until
// one responds with MPXP_Ok
MPXP_Rc __FASTCALL__ af_control_any_rev (af_stream_t* s, int cmd, any_t* arg) {
MPXP_Rc res = MPXP_Unknown;
af_instance_t* filt = s->last;
while (filt && res != MPXP_Ok) {
- res = filt->control(filt, cmd, arg);
+ res = filt->control_af(filt, cmd, arg);
filt = filt->prev;
}
return res;
@@ -629,7 +629,7 @@
check_pin("afilter",af->pin,AF_PIN);
do{
MSG_INFO(" ");
- if(af->control(af,AF_CONTROL_SHOWCONF,NULL)!=MPXP_Ok)
+ if(af->control_af(af,AF_CONTROL_SHOWCONF,NULL)!=MPXP_Ok)
MSG_INFO("[af_%s %s]\n",af->info->name,af->info->info);
af=af->next;
}while(af);
Modified: mplayerxp/postproc/af.h
===================================================================
--- mplayerxp/postproc/af.h 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/postproc/af.h 2012-11-25 15:56:14 UTC (rev 454)
@@ -50,8 +50,8 @@
const af_info_t* info;
char antiviral_hole[RND_CHAR6];
unsigned pin; // personal identification number
- MPXP_Rc (* __FASTCALL__ config)(struct af_instance_s* af, const af_conf_t* arg);
- MPXP_Rc (* __FASTCALL__ control)(struct af_instance_s* af, int cmd, any_t* arg);
+ MPXP_Rc (* __FASTCALL__ config_af)(struct af_instance_s* af, const af_conf_t* arg);
+ MPXP_Rc (* __FASTCALL__ control_af)(struct af_instance_s* af, int cmd, any_t* arg);
void (* __FASTCALL__ uninit)(struct af_instance_s* af);
mp_aframe_t* (* __FASTCALL__ play)(struct af_instance_s* af,const mp_aframe_t* data);
any_t* setup; // setup data for this specific instance and filter
Modified: mplayerxp/postproc/af_ao2.cpp
===================================================================
--- mplayerxp/postproc/af_ao2.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/postproc/af_ao2.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -109,8 +109,8 @@
mpaf_format_e format;
}af_ao2_t;
-// Initialization and runtime control
-static MPXP_Rc __FASTCALL__ config(struct af_instance_s* af, const af_conf_t* arg)
+// Initialization and runtime control_af
+static MPXP_Rc __FASTCALL__ config_af(struct af_instance_s* af, const af_conf_t* arg)
{
af_ao2_t* s = reinterpret_cast<af_ao2_t*>(af->setup);
/* Sanity check */
@@ -121,7 +121,7 @@
return af_test_output(af,arg);
}
-static MPXP_Rc __FASTCALL__ control(struct af_instance_s* af, int cmd, any_t* arg)
+static MPXP_Rc __FASTCALL__ control_af(struct af_instance_s* af, int cmd, any_t* arg)
{
af_ao2_t* s = reinterpret_cast<af_ao2_t*>(af->setup);
UNUSED(arg);
@@ -155,8 +155,8 @@
// Allocate memory and set function pointers
static MPXP_Rc __FASTCALL__ af_open(af_instance_t* af){
- af->config=config;
- af->control=control;
+ af->config_af=config_af;
+ af->control_af=control_af;
af->uninit=uninit;
af->play=play;
af->mul.d=1;
Modified: mplayerxp/postproc/af_channels.cpp
===================================================================
--- mplayerxp/postproc/af_channels.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/postproc/af_channels.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -122,7 +122,7 @@
return MPXP_Ok;
}
-static MPXP_Rc __FASTCALL__ config(struct af_instance_s* af,const af_conf_t* arg)
+static MPXP_Rc __FASTCALL__ config_af(struct af_instance_s* af,const af_conf_t* arg)
{
af_channels_t* s = reinterpret_cast<af_channels_t*>(af->setup);
// Set default channel assignment
@@ -155,8 +155,8 @@
af->mul.d = arg->nch;
return check_routes(s,arg->nch,af->conf.nch);
}
-// Initialization and runtime control
-static MPXP_Rc __FASTCALL__ control(struct af_instance_s* af, int cmd, any_t* arg)
+// Initialization and runtime control_af
+static MPXP_Rc __FASTCALL__ control_af(struct af_instance_s* af, int cmd, any_t* arg)
{
af_channels_t* s = reinterpret_cast<af_channels_t*>(af->setup);
switch(cmd){
@@ -189,7 +189,7 @@
}
}
- if(MPXP_Ok != af->control(af,AF_CONTROL_CHANNELS | AF_CONTROL_SET ,&nch))
+ if(MPXP_Ok != af->control_af(af,AF_CONTROL_CHANNELS | AF_CONTROL_SET ,&nch))
return MPXP_Error;
return MPXP_Ok;
}
@@ -277,8 +277,8 @@
// Allocate memory and set function pointers
static MPXP_Rc __FASTCALL__ af_open(af_instance_t* af){
- af->config=config;
- af->control=control;
+ af->config_af=config_af;
+ af->control_af=control_af;
af->uninit=uninit;
af->play=play;
af->mul.n=1;
Modified: mplayerxp/postproc/af_control.h
===================================================================
--- mplayerxp/postproc/af_control.h 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/postproc/af_control.h 2012-11-25 15:56:14 UTC (rev 454)
@@ -48,7 +48,7 @@
/*********************************************
-// Extended control used with arguments that operates on only one
+// Extended control_af used with arguments that operates on only one
// channel at the time
*/
typedef struct af_control_ext_s{
@@ -60,7 +60,7 @@
// Control parameters
*/
-/* The control system is divided into 3 levels
+/* The control_af system is divided into 3 levels
mandatory calls - all filters must answer to all of these
optional calls - are optional
filter specific calls - applies only to some filters
@@ -98,7 +98,7 @@
enum {
AF_CONTROL_SET =0x00000000, // Set argument
AF_CONTROL_GET =0x00000001, // Get argument
- AF_CONTROL_INFO =0x00000002, // Get info about the control, i.e fill in everything except argument
+ AF_CONTROL_INFO =0x00000002, // Get info about the control_af, i.e fill in everything except argument
// Resample
AF_CONTROL_RESAMPLE_RATE =0x00000100|AF_CONTROL_FILTER_SPECIFIC, // Set output rate in resample
AF_CONTROL_RESAMPLE_SLOPPY =0x00000200|AF_CONTROL_FILTER_SPECIFIC, // Enable sloppy resampling
@@ -112,7 +112,7 @@
AF_CONTROL_CHANNELS_NR =0x00000800|AF_CONTROL_FILTER_SPECIFIC, // Set nuber of channel routing pairs, arg is int*
AF_CONTROL_CHANNELS_ROUTER =0x00000900|AF_CONTROL_FILTER_SPECIFIC, // Set make af_channels into a router
// Volume
- AF_CONTROL_VOLUME_ON_OFF =0x00000A00|AF_CONTROL_FILTER_SPECIFIC, // Turn volume control on and off, arg is int*
+ AF_CONTROL_VOLUME_ON_OFF =0x00000A00|AF_CONTROL_FILTER_SPECIFIC, // Turn volume control_af on and off, arg is int*
AF_CONTROL_VOLUME_SOFTCLIP =0x00000B00|AF_CONTROL_FILTER_SPECIFIC, // Turn soft clipping of the volume on and off, arg is binary
AF_CONTROL_VOLUME_LEVEL =0x00000C00|AF_CONTROL_FILTER_SPECIFIC, // Set volume level, arg is a float* with the volume for all the channels
AF_CONTROL_VOLUME_PROBE =0x00000D00|AF_CONTROL_FILTER_SPECIFIC, // Probed power level for all channels, arg is a float*
Modified: mplayerxp/postproc/af_crystality.cpp
===================================================================
--- mplayerxp/postproc/af_crystality.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/postproc/af_crystality.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -500,8 +500,8 @@
return af_test_output(af,arg);
}
-// Initialization and runtime control
-static MPXP_Rc __FASTCALL__ control(struct af_instance_s* af, int cmd, any_t* arg)
+// Initialization and runtime control_af
+static MPXP_Rc __FASTCALL__ control_af(struct af_instance_s* af, int cmd, any_t* arg)
{
af_crystality_t* s = (af_crystality_t*)af->setup;
@@ -544,8 +544,8 @@
// Allocate memory and set function pointers
static MPXP_Rc __FASTCALL__ af_open(af_instance_t* af){
- af->config =af_config;
- af->control=control;
+ af->config_af =af_config;
+ af->control_af=control_af;
af->uninit=uninit;
af->play=play;
af->mul.n=1;
Modified: mplayerxp/postproc/af_delay.cpp
===================================================================
--- mplayerxp/postproc/af_delay.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/postproc/af_delay.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -27,8 +27,8 @@
float d[AF_NCH]; // Delay [ms]
}af_delay_t;
-// Initialization and runtime control
-static MPXP_Rc __FASTCALL__ control(struct af_instance_s* af, int cmd, any_t* arg)
+// Initialization and runtime control_af
+static MPXP_Rc __FASTCALL__ control_af(struct af_instance_s* af, int cmd, any_t* arg)
{
af_delay_t* s = reinterpret_cast<af_delay_t*>(af->setup);
@@ -91,7 +91,7 @@
s->q[i] = mp_calloc(L,af->conf.format&MPAF_BPS_MASK);
if(NULL == s->q[i]) MSG_FATAL(MSGTR_OutOfMemory);
}
- return control(af,AF_CONTROL_DELAY_LEN | AF_CONTROL_SET,s->d);
+ return control_af(af,AF_CONTROL_DELAY_LEN | AF_CONTROL_SET,s->d);
}
// Deallocate memory
@@ -171,8 +171,8 @@
// Allocate memory and set function pointers
static MPXP_Rc __FASTCALL__ af_open(af_instance_t* af){
- af->config=af_config;
- af->control=control;
+ af->config_af=af_config;
+ af->control_af=control_af;
af->uninit=uninit;
af->play=play;
af->mul.n=1;
Modified: mplayerxp/postproc/af_dyn.cpp
===================================================================
--- mplayerxp/postproc/af_dyn.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/postproc/af_dyn.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -28,7 +28,7 @@
float gain;
}af_dyn_t;
-static MPXP_Rc __FASTCALL__ config(struct af_instance_s* af,const af_conf_t* arg)
+static MPXP_Rc __FASTCALL__ config_af(struct af_instance_s* af,const af_conf_t* arg)
{
// Sanity check
if(!arg) return MPXP_Error;
@@ -41,8 +41,8 @@
}
// Data for specific instances of this filter
-// Initialization and runtime control
-static MPXP_Rc __FASTCALL__ control(struct af_instance_s* af, int cmd, any_t* arg)
+// Initialization and runtime control_af
+static MPXP_Rc __FASTCALL__ control_af(struct af_instance_s* af, int cmd, any_t* arg)
{
af_dyn_t* s = (af_dyn_t*)af->setup;
switch(cmd){
@@ -94,8 +94,8 @@
// Allocate memory and set function pointers
static MPXP_Rc __FASTCALL__ af_open(af_instance_t* af){
- af->config=config;
- af->control=control;
+ af->config_af=config_af;
+ af->control_af=control_af;
af->uninit=uninit;
af->play=play;
af->mul.n=1;
Modified: mplayerxp/postproc/af_echo3d.cpp
===================================================================
--- mplayerxp/postproc/af_echo3d.cpp 2012-11-25 15:25:05 UTC (rev 453)
+++ mplayerxp/postproc/af_echo3d.cpp 2012-11-25 15:56:14 UTC (rev 454)
@@ -164,8 +164,8 @@
return af_test_output(af,arg);
}
-// Initialization and runtime control
-static MPXP_Rc __FASTCALL__ control(struct af_instance_s* af, int cmd, any_t* arg)
+// Initialization and runtime control_af
+static MPXP_Rc __FASTCALL__ control_af(struct af_instance_s* af, int cmd, any_t* arg)
{
af_crystality_t* s = (af_crystality_t*)af->setup;
@@ -198,8 +198,8 @@
// Allocate memory and set function pointers
static MPXP_Rc __FASTCALL__ af_open(af_instance_t* af){
- af->config=af_config;
- af->control=control;
+ af->config_af=af_conf...
[truncated message content] |
