[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[269] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[269] mplayerxp
|
From: <nic...@us...> - 2012-10-31 16:28:33
|
Revision: 269
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=269&view=rev
Author: nickols_k
Date: 2012-10-31 16:28:22 +0000 (Wed, 31 Oct 2012)
Log Message:
-----------
use common ControlCodes
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_ffmp3.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.h
mplayerxp/libmpcodecs/dec_video.h
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/mplayer.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/xmp_enums.h
Modified: mplayerxp/libao2/ao_alsa9.c
===================================================================
--- mplayerxp/libao2/ao_alsa9.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libao2/ao_alsa9.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -131,7 +131,7 @@
}
/* to set/get/query special features/parameters */
-static int __FASTCALL__ control(ao_data_t* ao,int cmd, long arg)
+static ControlCodes __FASTCALL__ control(ao_data_t* ao,int cmd, long arg)
{
priv_t*priv=ao->priv;
int rval;
Modified: mplayerxp/libao2/ao_arts.c
===================================================================
--- mplayerxp/libao2/ao_arts.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libao2/ao_arts.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -45,7 +45,7 @@
LIBAO_EXTERN(arts)
-static int control(ao_data_t* ao,int cmd, long arg)
+static ControlCodes control(ao_data_t* ao,int cmd, long arg)
{
UNUSED(ao);
UNUSED(cmd);
Modified: mplayerxp/libao2/ao_esd.c
===================================================================
--- mplayerxp/libao2/ao_esd.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libao2/ao_esd.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -93,7 +93,7 @@
/*
* to set/get/query special features/parameters
*/
-static int control(ao_data_t* ao,int cmd, long arg)
+static ControlCodes control(ao_data_t* ao,int cmd, long arg)
{
priv_t*priv=ao->priv;
esd_player_info_t *esd_pi;
Modified: mplayerxp/libao2/ao_jack.c
===================================================================
--- mplayerxp/libao2/ao_jack.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libao2/ao_jack.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -34,10 +34,10 @@
#include "afmt.h"
#include "osdep/timer.h"
#include "osdep/mplib.h"
+#include "ao_msg.h"
#include "fifo.h"
#include <jack/jack.h>
-#include "ao_msg.h"
static const ao_info_t info =
{
@@ -140,7 +140,7 @@
// end ring priv->buffer stuff
-static int control(ao_data_t* ao,int cmd, long arg) {
+static ControlCodes control(ao_data_t* ao,int cmd, long arg) {
UNUSED(ao);
UNUSED(cmd);
UNUSED(arg);
Modified: mplayerxp/libao2/ao_nas.c
===================================================================
--- mplayerxp/libao2/ao_nas.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libao2/ao_nas.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -368,7 +368,7 @@
}
// to set/get/query special features/parameters
-static int control(ao_data_t* ao,int cmd, long arg)
+static ControlCodes control(ao_data_t* ao,int cmd, long arg)
{
priv_t*priv=ao->priv;
AuElementParameters aep;
Modified: mplayerxp/libao2/ao_null.c
===================================================================
--- mplayerxp/libao2/ao_null.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libao2/ao_null.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -97,7 +97,7 @@
}
// to set/get/query special features/parameters
-static int __FASTCALL__ control(ao_data_t* ao,int cmd,long arg){
+static ControlCodes __FASTCALL__ control(ao_data_t* ao,int cmd,long arg){
UNUSED(ao);
UNUSED(cmd);
UNUSED(arg);
Modified: mplayerxp/libao2/ao_openal.c
===================================================================
--- mplayerxp/libao2/ao_openal.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libao2/ao_openal.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -60,7 +60,7 @@
int16_t* tmpbuf;
}priv_t;
-static int control(ao_data_t* ao,int cmd, long arg) {
+static ControlCodes control(ao_data_t* ao,int cmd, long arg) {
UNUSED(ao);
switch (cmd) {
case AOCONTROL_GET_VOLUME:
Modified: mplayerxp/libao2/ao_oss.c
===================================================================
--- mplayerxp/libao2/ao_oss.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libao2/ao_oss.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -42,7 +42,7 @@
const char *oss_mixer_device = PATH_DEV_MIXER;
// to set/get/query special features/parameters
-static int __FASTCALL__ control(ao_data_t* ao,int cmd,long arg){
+static ControlCodes __FASTCALL__ control(ao_data_t* ao,int cmd,long arg){
priv_t*priv=ao->priv;
int rval;
switch(cmd){
Modified: mplayerxp/libao2/ao_sdl.c
===================================================================
--- mplayerxp/libao2/ao_sdl.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libao2/ao_sdl.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -21,12 +21,11 @@
#include "osdep/mplib.h"
#include "ao_msg.h"
-static ao_info_t info =
-{
- "SDLlib audio output",
- "sdl",
- "Felix Buenemann <atm...@us...>",
- ""
+static ao_info_t info = {
+ "SDLlib audio output",
+ "sdl",
+ "Felix Buenemann <atm...@us...>",
+ ""
};
LIBAO_EXTERN(sdl)
@@ -110,9 +109,8 @@
}
#endif
-
// to set/get/query special features/parameters
-static int __FASTCALL__ control(ao_data_t* ao,int cmd,long arg){
+static ControlCodes __FASTCALL__ control(ao_data_t* ao,int cmd,long arg){
priv_t*priv=ao->priv;
switch (cmd) {
case AOCONTROL_QUERY_FORMAT:
Modified: mplayerxp/libao2/ao_wav.c
===================================================================
--- mplayerxp/libao2/ao_wav.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libao2/ao_wav.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -87,7 +87,7 @@
/* init with default values */
// to set/get/query special features/parameters
-static int control(ao_data_t* ao,int cmd,long arg){
+static ControlCodes 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-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libao2/audio_out.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -262,7 +262,7 @@
if(ao) audio_out->resume(ao);
}
-int __FASTCALL__ ao_control(ao_data_t*ao,int cmd,long arg)
+ControlCodes __FASTCALL__ ao_control(ao_data_t*ao,int cmd,long arg)
{
return ao?audio_out->control(ao,cmd,arg):CONTROL_ERROR;
}
Modified: mplayerxp/libao2/audio_out.h
===================================================================
--- mplayerxp/libao2/audio_out.h 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libao2/audio_out.h 2012-10-31 16:28:22 UTC (rev 269)
@@ -5,82 +5,80 @@
/** Text description of AO-driver */
typedef struct ao_info_s
{
- const char *name; /**< driver name ("alsa driver") */
- const char *short_name; /**< short name (for config strings) ("alsa") */
- const char *author; /**< author ("Aaron Holtzman <aho...@es...>") */
- const char *comment; /**< any additional comments */
+ const char *name; /**< driver name ("alsa driver") */
+ const char *short_name; /**< short name (for config strings) ("alsa") */
+ const char *author; /**< author ("Aaron Holtzman <aho...@es...>") */
+ const char *comment;/**< any additional comments */
} ao_info_t;
/** Global data used by mplayerxp and plugins */
typedef struct ao_data_s
{
- char* subdevice;
- unsigned samplerate; /**< rate of samples in Hz */
- unsigned channels; /**< number of audio channels */
- unsigned format; /**< format of audio samples */
- unsigned bps; /**< bytes per second */
- unsigned outburst; /**< outburst */
- unsigned buffersize; /**< size of audio buffer */
- float pts; /**< PTS of audio buffer */
- any_t* priv;
+ char* subdevice;
+ unsigned samplerate; /**< rate of samples in Hz */
+ unsigned channels; /**< number of audio channels */
+ unsigned format; /**< format of audio samples */
+ unsigned bps; /**< bytes per second */
+ unsigned outburst; /**< outburst */
+ unsigned buffersize; /**< size of audio buffer */
+ float pts; /**< PTS of audio buffer */
+ any_t* priv;
} ao_data_t;
/** AO-driver interface */
typedef struct ao_functions_s
{
- const ao_info_t *info; /**< text-info about this driver */
+ const ao_info_t *info; /**< text-info about this driver */
- /** 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
- **/
- ControlCodes (* __FASTCALL__ control)(ao_data_t*,int cmd,long arg);
+ /** 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
+ **/
+ ControlCodes (* __FASTCALL__ control)(ao_data_t*,int cmd,long arg);
- /** Preinitializes driver
- * @param flag currently unused
- * @return 1 on successful initialization, 0 on error.
- **/
- int (* __FASTCALL__ init)(ao_data_t*,unsigned flags);
+ /** Preinitializes driver
+ * @param flag currently unused
+ * @return 1 on successful initialization, 0 on error.
+ **/
+ int (* __FASTCALL__ init)(ao_data_t*,unsigned flags);
- /** Configures the audio driver.
- * @param rate specifies samplerate in Hz
- * @param channels specifies number of channels (1 - mono, 2 - stereo, 6 - surround)
- * @param format specifies format of audio samples (see AFMT_* for detail)
- * @return 1 on successful configuration, 0 on error.
- **/
- int (* __FASTCALL__ configure)(ao_data_t*,unsigned rate,unsigned channels,unsigned format);
+ /** Configures the audio driver.
+ * @param rate specifies samplerate in Hz
+ * @param channels specifies number of channels (1 - mono, 2 - stereo, 6 - surround)
+ * @param format specifies format of audio samples (see AFMT_* for detail)
+ * @return 1 on successful configuration, 0 on error.
+ **/
+ int (* __FASTCALL__ configure)(ao_data_t*,unsigned rate,unsigned channels,unsigned format);
- /** Closes driver. Should restore the original state of the system.
- **/
- void (*uninit)(ao_data_t*);
+ /** Closes driver. Should restore the original state of the system.
+ **/
+ void (* __FASTCALL__ uninit)(ao_data_t*);
- /** Stops playing and empties buffers (for seeking/pause) **/
- void (*reset)(ao_data_t*);
+ /** Stops playing and empties buffers (for seeking/pause) **/
+ void (* __FASTCALL__ reset)(ao_data_t*);
- /** Returns how many bytes can be played without blocking **/
- unsigned (*get_space)(ao_data_t*);
+ /** Returns how many bytes can be played without blocking **/
+ unsigned (* __FASTCALL__ get_space)(ao_data_t*);
- /** Plays decoded (PCM) audio buffer
- * @param data buffer with PCM data
- * @param len length of byffer in bytes
- * @param flags currently unused
- * return number of bytes which were copied into audio card
- **/
- unsigned (* __FASTCALL__ play)(ao_data_t*,any_t* data,unsigned len,unsigned flags);
+ /** Plays decoded (PCM) audio buffer
+ * @param data buffer with PCM data
+ * @param len length of byffer in bytes
+ * @param flags currently unused
+ * return number of bytes which were copied into audio card
+ **/
+ unsigned (* __FASTCALL__ play)(ao_data_t*,any_t* data,unsigned len,unsigned flags);
- /** Returns delay in seconds between first and last sample in buffer **/
- float (*get_delay)(ao_data_t*);
+ /** Returns delay in seconds between first and last sample in buffer **/
+ float (* __FASTCALL__ get_delay)(ao_data_t*);
- /** Stops playing, keep buffers (for pause) */
- void (*pause)(ao_data_t*);
+ /** Stops playing, keep buffers (for pause) */
+ void (* __FASTCALL__ pause)(ao_data_t*);
- /** Resumes playing, after audio_pause() */
- void (*resume)(ao_data_t*);
+ /** Resumes playing, after audio_pause() */
+ void (* __FASTCALL__ resume)(ao_data_t*);
} ao_functions_t;
-extern const ao_functions_t* audio_out_drivers[]; /**< NULL terminated array of all drivers */
-
enum {
AOCONTROL_SET_DEVICE =1, /**< Sets new audio device (example: /dev/dsp2) */
AOCONTROL_GET_DEVICE =2, /**< Query current audio device (example: /dev/dsp) */
@@ -91,8 +89,8 @@
AOCONTROL_SET_VOLUME =7 /**< Sets new volume level */
};
typedef struct ao_control_vol_s {
- float left;
- float right;
+ float left;
+ float right;
} ao_control_vol_t;
/* prototypes */
@@ -102,14 +100,14 @@
extern void ao_print_help( void );
extern const ao_functions_t* __FASTCALL__ ao_register(const char *driver_name);
extern const ao_info_t* ao_get_info( void );
-extern ao_data_t* __FASTCALL__ ao_init(unsigned flags,const char *subdevice);
-extern int __FASTCALL__ ao_configure(ao_data_t* priv,unsigned rate,unsigned channels,unsigned format);
-extern void ao_uninit(ao_data_t* priv);
-extern void ao_reset(ao_data_t* priv);
-extern unsigned ao_get_space(ao_data_t* priv);
-extern unsigned __FASTCALL__ ao_play(ao_data_t* priv,any_t* data,unsigned len,unsigned flags);
-extern float ao_get_delay(ao_data_t* priv);
-extern void ao_pause(ao_data_t* priv);
-extern void ao_resume(ao_data_t* priv);
-extern int __FASTCALL__ ao_control(ao_data_t* priv,int cmd,long arg);
+extern ao_data_t* __FASTCALL__ ao_init(unsigned flags,const char *subdevice);
+extern int __FASTCALL__ ao_configure(ao_data_t* priv,unsigned rate,unsigned channels,unsigned format);
+extern void __FASTCALL__ ao_uninit(ao_data_t* priv);
+extern void __FASTCALL__ ao_reset(ao_data_t* priv);
+extern unsigned __FASTCALL__ ao_get_space(ao_data_t* priv);
+extern unsigned __FASTCALL__ ao_play(ao_data_t* priv,any_t* data,unsigned len,unsigned flags);
+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);
#endif
Modified: mplayerxp/libao2/audio_out_internal.h
===================================================================
--- mplayerxp/libao2/audio_out_internal.h 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libao2/audio_out_internal.h 2012-10-31 16:28:22 UTC (rev 269)
@@ -1,16 +1,16 @@
-#include "../mp_config.h"
+#include "mp_config.h"
// prototypes:
//static ao_info_t info;
-static int __FASTCALL__ control(ao_data_t*,int cmd,long arg);
+static ControlCodes __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 uninit(ao_data_t*);
-static void reset(ao_data_t*);
-static unsigned get_space(ao_data_t*);
+static void __FASTCALL__ uninit(ao_data_t*);
+static void __FASTCALL__ reset(ao_data_t*);
+static unsigned __FASTCALL__ get_space(ao_data_t*);
static unsigned __FASTCALL__ play(ao_data_t*,any_t* data,unsigned len,unsigned flags);
-static float get_delay(ao_data_t*);
-static void audio_pause(ao_data_t*);
-static void audio_resume(ao_data_t*);
+static float __FASTCALL__ get_delay(ao_data_t*);
+static void __FASTCALL__ audio_pause(ao_data_t*);
+static void __FASTCALL__ audio_resume(ao_data_t*);
#define LIBAO_EXTERN(x) const ao_functions_t audio_out_##x =\
{\
Modified: mplayerxp/libmpcodecs/ad.h
===================================================================
--- mplayerxp/libmpcodecs/ad.h 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/ad.h 2012-10-31 16:28:22 UTC (rev 269)
@@ -25,14 +25,13 @@
{
const ad_info_t *info;
const config_t* options;/**< Optional: MPlayerXP's option related */
- int (*preinit)(sh_audio_t *);
- int (*init)(sh_audio_t *sh);
- void (*uninit)(sh_audio_t *sh);
- ControlCodes (*control)(sh_audio_t *sh,int cmd,any_t* arg, ...);
- unsigned (*decode)(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts);
+ 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, ...);
+ unsigned (* __FASTCALL__ decode)(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts);
} ad_functions_t;
-// NULL terminated array of all drivers
extern const ad_functions_t* mpcodecs_ad_drivers[];
#define FIX_APTS(sh_audio,pts,in_size) (sh_audio->i_bps?((float)(pts)+(float)(in_size)/(float)sh_audio->i_bps):((float)(pts)))
Modified: mplayerxp/libmpcodecs/ad_a52.c
===================================================================
--- mplayerxp/libmpcodecs/ad_a52.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/ad_a52.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -192,7 +192,7 @@
mp_free(sh->context);
}
-int control(sh_audio_t *sh,int cmd,any_t* arg, ...)
+ControlCodes control(sh_audio_t *sh,int cmd,any_t* arg, ...)
{
UNUSED(arg);
switch(cmd)
Modified: mplayerxp/libmpcodecs/ad_acm.c
===================================================================
--- mplayerxp/libmpcodecs/ad_acm.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/ad_acm.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -159,7 +159,7 @@
mp_free(sh->context);
}
-int control(sh_audio_t *sh_audio,int cmd,any_t* arg, ...)
+ControlCodes control(sh_audio_t *sh_audio,int cmd,any_t* arg, ...)
{
int skip;
switch(cmd)
Modified: mplayerxp/libmpcodecs/ad_dca.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dca.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/ad_dca.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -192,7 +192,7 @@
mp_free(sh->context);
}
-int control(sh_audio_t *sh,int cmd,any_t* arg, ...)
+ControlCodes control(sh_audio_t *sh,int cmd,any_t* arg, ...)
{
UNUSED(arg);
switch(cmd)
Modified: mplayerxp/libmpcodecs/ad_dmo.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dmo.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/ad_dmo.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -71,7 +71,7 @@
mp_free(priv);
}
-static int control(sh_audio_t *sh_audio,int cmd,any_t* arg, ...)
+static ControlCodes control(sh_audio_t *sh_audio,int cmd,any_t* arg, ...)
{
int skip;
UNUSED(arg);
Modified: mplayerxp/libmpcodecs/ad_dshow.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dshow.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/ad_dshow.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -63,7 +63,7 @@
mp_free(priv);
}
-int control(sh_audio_t *sh_audio,int cmd,any_t* arg, ...)
+ControlCodes control(sh_audio_t *sh_audio,int cmd,any_t* arg, ...)
{
int skip;
UNUSED(arg);
Modified: mplayerxp/libmpcodecs/ad_dvdpcm.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dvdpcm.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/ad_dvdpcm.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -72,7 +72,7 @@
UNUSED(sh);
}
-int control(sh_audio_t *sh,int cmd,any_t* arg, ...)
+ControlCodes control(sh_audio_t *sh,int cmd,any_t* arg, ...)
{
int skip;
UNUSED(arg);
Modified: mplayerxp/libmpcodecs/ad_faad.c
===================================================================
--- mplayerxp/libmpcodecs/ad_faad.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/ad_faad.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -268,7 +268,7 @@
mp_free(sh->context);
}
-static int control(sh_audio_t *sh,int cmd,any_t* arg, ...)
+static ControlCodes control(sh_audio_t *sh,int cmd,any_t* arg, ...)
{
UNUSED(sh);
UNUSED(cmd);
Modified: mplayerxp/libmpcodecs/ad_ffmp3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_ffmp3.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/ad_ffmp3.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -137,7 +137,7 @@
acodec_inited=0;
}
-int control(sh_audio_t *sh,int cmd,any_t* arg, ...)
+ControlCodes control(sh_audio_t *sh,int cmd,any_t* arg, ...)
{
UNUSED(arg);
AVCodecContext *lavc_context = sh->context;
Modified: mplayerxp/libmpcodecs/ad_hwac3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_hwac3.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/ad_hwac3.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -202,7 +202,7 @@
mpcodecs_ad_a52.uninit(sh);
}
-int control(sh_audio_t *sh,int cmd,any_t* arg, ...)
+ControlCodes control(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-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/ad_internal.h 2012-10-31 16:28:22 UTC (rev 269)
@@ -13,11 +13,11 @@
#include "ad_msg.h"
static const config_t options[];
-static int init(sh_audio_t *sh);
-static int preinit(sh_audio_t *sh);
-static void uninit(sh_audio_t *sh);
-static int control(sh_audio_t *sh,int cmd,any_t* arg, ...);
-static unsigned decode(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts);
+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 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 = {\
&info,\
Modified: mplayerxp/libmpcodecs/ad_libdv.c
===================================================================
--- mplayerxp/libmpcodecs/ad_libdv.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/ad_libdv.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -77,7 +77,7 @@
mp_free(priv->audioBuffers[i]);
}
-static int control(sh_audio_t *sh,int cmd,any_t* arg, ...)
+static ControlCodes control(sh_audio_t *sh,int cmd,any_t* arg, ...)
{
// TODO!!!
UNUSED(sh);
Modified: mplayerxp/libmpcodecs/ad_mp3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_mp3.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/ad_mp3.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -344,7 +344,7 @@
dlclose(dll_handle);
}
-int control(sh_audio_t *sh,int cmd,any_t* arg, ...)
+ControlCodes control(sh_audio_t *sh,int cmd,any_t* arg, ...)
{
UNUSED(sh);
UNUSED(cmd);
Modified: mplayerxp/libmpcodecs/ad_null.c
===================================================================
--- mplayerxp/libmpcodecs/ad_null.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/ad_null.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -34,7 +34,7 @@
UNUSED(sh);
}
-int control(sh_audio_t *sh,int cmd,any_t* arg, ...)
+ControlCodes control(sh_audio_t *sh,int cmd,any_t* arg, ...)
{
UNUSED(sh);
UNUSED(cmd);
Modified: mplayerxp/libmpcodecs/ad_pcm.c
===================================================================
--- mplayerxp/libmpcodecs/ad_pcm.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/ad_pcm.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -67,7 +67,7 @@
UNUSED(sh);
}
-int control(sh_audio_t *sh,int cmd,any_t* arg, ...)
+ControlCodes control(sh_audio_t *sh,int cmd,any_t* arg, ...)
{
int skip;
UNUSED(arg);
Modified: mplayerxp/libmpcodecs/ad_qtaudio.c
===================================================================
--- mplayerxp/libmpcodecs/ad_qtaudio.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/ad_qtaudio.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -313,7 +313,7 @@
return ConvertedBytes;
}
-static int control(sh_audio_t *sh,int cmd,any_t* arg, ...){
+static ControlCodes control(sh_audio_t *sh,int cmd,any_t* arg, ...){
// various optional functions you MAY implement:
UNUSED(sh);
UNUSED(cmd);
Modified: mplayerxp/libmpcodecs/ad_real.c
===================================================================
--- mplayerxp/libmpcodecs/ad_real.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/ad_real.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -282,7 +282,7 @@
// or -1 for EOF (or uncorrectable error)
}
-static int control(sh_audio_t *sh,int cmd,any_t* arg, ...){
+static ControlCodes control(sh_audio_t *sh,int cmd,any_t* arg, ...){
UNUSED(sh);
UNUSED(arg);
// various optional functions you MAY implement:
Modified: mplayerxp/libmpcodecs/ad_twin.c
===================================================================
--- mplayerxp/libmpcodecs/ad_twin.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/ad_twin.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -351,7 +351,7 @@
FreeLibrary(vqf_dll);
}
-int control(sh_audio_t *sh_audio,int cmd,any_t* arg, ...)
+ControlCodes control(sh_audio_t *sh_audio,int cmd,any_t* arg, ...)
{
int skip;
UNUSED(arg);
Modified: mplayerxp/libmpcodecs/ad_vorbis.c
===================================================================
--- mplayerxp/libmpcodecs/ad_vorbis.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/ad_vorbis.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -124,7 +124,7 @@
mp_free(sh->context);
}
-static int control(sh_audio_t *sh,int cmd,any_t* arg, ...)
+static ControlCodes control(sh_audio_t *sh,int cmd,any_t* arg, ...)
{
UNUSED(sh);
UNUSED(cmd);
Modified: mplayerxp/libmpcodecs/dec_audio.h
===================================================================
--- mplayerxp/libmpcodecs/dec_audio.h 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/dec_audio.h 2012-10-31 16:28:22 UTC (rev 269)
@@ -1,11 +1,11 @@
#ifndef DEC_AUDIO_H_INCLUDED
#define DEC_AUDIO_H_INCLUDED 1
// dec_audio.c:
-extern int mpca_init(sh_audio_t *sh_audio);
-extern void mpca_uninit(sh_audio_t *sh_audio);
-extern unsigned mpca_decode(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,unsigned buflen,float *pts);
-extern void mpca_resync_stream(sh_audio_t *sh_audio);
-extern void mpca_skip_frame(sh_audio_t *sh_audio);
+extern int __FASTCALL__ mpca_init(sh_audio_t *sh_audio);
+extern void __FASTCALL__ mpca_uninit(sh_audio_t *sh_audio);
+extern unsigned __FASTCALL__ mpca_decode(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,unsigned buflen,float *pts);
+extern void __FASTCALL__ mpca_resync_stream(sh_audio_t *sh_audio);
+extern void __FASTCALL__ mpca_skip_frame(sh_audio_t *sh_audio);
extern int mpca_init_filters(sh_audio_t *sh_audio,
int in_samplerate, int in_channels, int in_format, int in_bps,
Modified: mplayerxp/libmpcodecs/dec_video.h
===================================================================
--- mplayerxp/libmpcodecs/dec_video.h 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/dec_video.h 2012-10-31 16:28:22 UTC (rev 269)
@@ -2,16 +2,16 @@
#define DEC_VIDEO_H_INCLUDED 1
// dec_video.c:
-extern int mpcv_init(sh_video_t *sh_video, const char *codec_name,const char *family,int status);
-extern void mpcv_uninit(sh_video_t *sh_video);
+extern int __FASTCALL__ mpcv_init(sh_video_t *sh_video, const char *codec_name,const char *family,int status);
+extern void __FASTCALL__ mpcv_uninit(sh_video_t *sh_video);
-extern int mpcv_decode(sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame,float pts);
+extern int __FASTCALL__ mpcv_decode(sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame,float pts);
-extern int mpcv_get_quality_max(sh_video_t *sh_video);
-extern void mpcv_set_quality(sh_video_t *sh_video,int quality);
+extern int __FASTCALL__ mpcv_get_quality_max(sh_video_t *sh_video);
+extern void __FASTCALL__ mpcv_set_quality(sh_video_t *sh_video,int quality);
-extern int mpcv_set_colors(sh_video_t *sh_video,char *item,int value);
-extern void mpcv_resync_stream(sh_video_t *sh_video);
+extern int __FASTCALL__ mpcv_set_colors(sh_video_t *sh_video,char *item,int value);
+extern void __FASTCALL__ mpcv_resync_stream(sh_video_t *sh_video);
extern int divx_quality;
Modified: mplayerxp/libmpcodecs/vd.h
===================================================================
--- mplayerxp/libmpcodecs/vd.h 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/vd.h 2012-10-31 16:28:22 UTC (rev 269)
@@ -17,10 +17,10 @@
{
const vd_info_t *info;
const config_t* options;/**< Optional: MPlayerXP's option related */
- int (*init)(sh_video_t *sh);
- void (*uninit)(sh_video_t *sh);
- ControlCodes (*control)(sh_video_t *sh,int cmd,any_t* arg, ...);
- mp_image_t* (*decode)(sh_video_t *sh,any_t* data,int len,int flags);
+ 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, ...);
+ mp_image_t* (*__FASTCALL__ decode)(sh_video_t *sh,any_t* data,int len,int flags);
} vd_functions_t;
// NULL terminated array of all drivers
@@ -34,9 +34,9 @@
VDCTRL_RESYNC_STREAM =7 /* resync video stream if needed */
};
// callbacks:
-int mpcodecs_config_vo(sh_video_t *sh, int w, int h, any_t*tune);
-mp_image_t* mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int mp_imgflag,int w, int h);
-void mpcodecs_draw_slice(sh_video_t* sh, mp_image_t*);
-void mpcodecs_draw_image(sh_video_t* sh, mp_image_t *mpi);
+int __FASTCALL__ mpcodecs_config_vo(sh_video_t *sh, int w, int h, any_t*tune);
+mp_image_t* __FASTCALL__ mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int mp_imgflag,int w, int h);
+void __FASTCALL__ mpcodecs_draw_slice(sh_video_t* sh, mp_image_t*);
+void __FASTCALL__ mpcodecs_draw_image(sh_video_t* sh, mp_image_t *mpi);
#endif
Modified: mplayerxp/libmpcodecs/vd_divx4.c
===================================================================
--- mplayerxp/libmpcodecs/vd_divx4.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/vd_divx4.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -138,7 +138,7 @@
static any_t*dll_handle;
// to set/get/query special features/parameters
-static int control(sh_video_t *sh,int cmd,any_t* arg,...){
+static ControlCodes 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
Modified: mplayerxp/libmpcodecs/vd_dmo.c
===================================================================
--- mplayerxp/libmpcodecs/vd_dmo.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/vd_dmo.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -28,7 +28,7 @@
LIBVD_EXTERN(dmo)
// to set/get/query special features/parameters
-static int control(sh_video_t *sh,int cmd,any_t* arg,...){
+static ControlCodes control(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.c
===================================================================
--- mplayerxp/libmpcodecs/vd_dshow.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/vd_dshow.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -26,7 +26,7 @@
LIBVD_EXTERN(dshow)
// to set/get/query special features/parameters
-static int control(sh_video_t *sh,int cmd,any_t* arg,...){
+static ControlCodes control(sh_video_t *sh,int cmd,any_t* arg,...){
switch(cmd){
case VDCTRL_QUERY_MAX_PP_LEVEL:
return 4;
Modified: mplayerxp/libmpcodecs/vd_ffmpeg.c
===================================================================
--- mplayerxp/libmpcodecs/vd_ffmpeg.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/vd_ffmpeg.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -125,7 +125,7 @@
};
/* to set/get/query special features/parameters */
-static int control(sh_video_t *sh,int cmd,any_t* arg,...){
+static ControlCodes control(sh_video_t *sh,int cmd,any_t* arg,...){
priv_t *ctx = sh->context;
uint32_t out_fourcc;
AVCodecContext *avctx = ctx->ctx;
Modified: mplayerxp/libmpcodecs/vd_huffyuv.c
===================================================================
--- mplayerxp/libmpcodecs/vd_huffyuv.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/vd_huffyuv.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -160,10 +160,8 @@
DecodeTable *decode_table, unsigned char *decode_shift);
-
-
// to set/get/query special features/parameters
-static int control(sh_video_t *sh,int cmd,any_t* arg,...)
+static ControlCodes control(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-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/vd_internal.h 2012-10-31 16:28:22 UTC (rev 269)
@@ -14,10 +14,10 @@
// prototypes:
//static vd_info_t info;
static const config_t options[];
-static int control(sh_video_t *sh,int cmd,any_t* arg,...);
-static int init(sh_video_t *sh);
-static void uninit(sh_video_t *sh);
-static mp_image_t* decode(sh_video_t *sh,any_t* data,int len,int flags);
+static ControlCodes __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);
#define LIBVD_EXTERN(x) const vd_functions_t mpcodecs_vd_##x = {\
&info,\
Modified: mplayerxp/libmpcodecs/vd_libdv.c
===================================================================
--- mplayerxp/libmpcodecs/vd_libdv.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/vd_libdv.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -33,7 +33,7 @@
LIBVD_EXTERN(libdv)
// to set/get/query special features/parameters
-static int control(sh_video_t *sh,int cmd,any_t* arg,...){
+static ControlCodes control(sh_video_t *sh,int cmd,any_t* arg,...){
return CONTROL_UNKNOWN;
}
Modified: mplayerxp/libmpcodecs/vd_libmpeg2.c
===================================================================
--- mplayerxp/libmpcodecs/vd_libmpeg2.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/vd_libmpeg2.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -166,7 +166,7 @@
}
// to set/get/query special features/parameters
-static int control(sh_video_t *sh,int cmd,any_t* arg,...){
+static ControlCodes control(sh_video_t *sh,int cmd,any_t* arg,...){
priv_t *priv;
priv=sh->context;
switch(cmd)
Modified: mplayerxp/libmpcodecs/vd_mpegpes.c
===================================================================
--- mplayerxp/libmpcodecs/vd_mpegpes.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/vd_mpegpes.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -20,7 +20,7 @@
LIBVD_EXTERN(mpegpes)
// to set/get/query special features/parameters
-static int control(sh_video_t *sh,int cmd,any_t* arg,...){
+static ControlCodes control(sh_video_t *sh,int cmd,any_t* arg,...){
return CONTROL_UNKNOWN;
}
Modified: mplayerxp/libmpcodecs/vd_null.c
===================================================================
--- mplayerxp/libmpcodecs/vd_null.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/vd_null.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -20,7 +20,7 @@
LIBVD_EXTERN(null)
// to set/get/query special features/parameters
-static int control(sh_video_t *sh,int cmd,any_t* arg,...){
+static ControlCodes control(sh_video_t *sh,int cmd,any_t* arg,...){
return CONTROL_UNKNOWN;
}
Modified: mplayerxp/libmpcodecs/vd_nuv.c
===================================================================
--- mplayerxp/libmpcodecs/vd_nuv.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/vd_nuv.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -19,7 +19,7 @@
LIBVD_EXTERN(nuv)
// to set/get/query special features/parameters
-static int control(sh_video_t *sh,int cmd,any_t* arg,...){
+static ControlCodes control(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.c
===================================================================
--- mplayerxp/libmpcodecs/vd_qtvideo.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/vd_qtvideo.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -93,7 +93,7 @@
static OSErr (*NewHandleClear)(Size byteCount);
// to set/get/query special features/parameters
-static int control(sh_video_t *sh,int cmd,any_t* arg,...){
+static ControlCodes control(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.c
===================================================================
--- mplayerxp/libmpcodecs/vd_raw.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/vd_raw.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -19,7 +19,7 @@
LIBVD_EXTERN(raw)
// to set/get/query special features/parameters
-static int control(sh_video_t *sh,int cmd,any_t* arg,...){
+static ControlCodes control(sh_video_t *sh,int cmd,any_t* arg,...){
switch(cmd) {
case VDCTRL_QUERY_FORMAT:
return CONTROL_TRUE;
Modified: mplayerxp/libmpcodecs/vd_real.c
===================================================================
--- mplayerxp/libmpcodecs/vd_real.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/vd_real.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -79,7 +79,7 @@
// to set/get/query special features/parameters
-static int control(sh_video_t *sh,int cmd,any_t* arg,...){
+static ControlCodes control(sh_video_t *sh,int cmd,any_t* arg,...){
switch(cmd){
// case VDCTRL_QUERY_MAX_PP_LEVEL:
// return 9;
Modified: mplayerxp/libmpcodecs/vd_theora.c
===================================================================
--- mplayerxp/libmpcodecs/vd_theora.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/vd_theora.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -37,7 +37,7 @@
} theora_struct_t;
// to set/get/query special features/parameters
-static int control(sh_video_t *sh,int cmd,any_t* arg,...){
+static ControlCodes control(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.c
===================================================================
--- mplayerxp/libmpcodecs/vd_vfw.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/vd_vfw.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -219,7 +219,7 @@
}
// to set/get/query special features/parameters
-static int control(sh_video_t *sh,int cmd,any_t* arg,...){
+static ControlCodes control(sh_video_t *sh,int cmd,any_t* arg,...){
vfw_priv_t *priv = sh->context;
switch(cmd){
case VDCTRL_QUERY_MAX_PP_LEVEL:
Modified: mplayerxp/libmpcodecs/vd_xanim.c
===================================================================
--- mplayerxp/libmpcodecs/vd_xanim.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/vd_xanim.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -893,7 +893,7 @@
/*************************** END OF XA CODEC BINARY INTERFACE ******************/
// to set/get/query special features/parameters
-static int control(sh_video_t *sh,int cmd,any_t* arg,...){
+static ControlCodes control(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.c
===================================================================
--- mplayerxp/libmpcodecs/vd_xvid.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libmpcodecs/vd_xvid.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -459,7 +459,7 @@
}
// to set/get/query special features/parameters
-static int control(sh_video_t *sh,int cmd,any_t* arg,...){
+static ControlCodes control(sh_video_t *sh,int cmd,any_t* arg,...){
priv_t* p = sh->context;
switch(cmd){
case VDCTRL_QUERY_MAX_PP_LEVEL:
Modified: mplayerxp/libvo/video_out.c
===================================================================
--- mplayerxp/libvo/video_out.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libvo/video_out.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -435,7 +435,7 @@
priv->image_width = w;
priv->image_height = h;
ps_tune(vo,priv->image_width,priv->org_height);
- if(dri_retv == VO_TRUE) dri_reconfig(vo,0);
+ if(dri_retv == CONTROL_TRUE) dri_reconfig(vo,0);
MSG_V("dri_vo_caps: driver does %s support DRI\n",priv->dri.has_dri?"":"not");
MSG_V("dri_vo_caps: caps=%08X fourcc=%08X(%s) x,y,w,h(%u %u %u %u)\n"
"dri_vo_caps: width_height(%u %u) strides(%u %u %u %u) priv->dri.bpp=%u\n"
@@ -531,25 +531,25 @@
if(mpi->type==MP_IMGTYPE_STATIC && priv->dri.num_xp_frames>1)
{
MSG_DBG2("dri_vo_dbg: vo_get_surface FAIL mpi->type==MP_IMGTYPE_STATIC && priv->dri.num_xp_frames>1\n");
- return VO_FALSE;
+ return CONTROL_FALSE;
}
/*I+P requires 2+ static buffers for R/W */
if(mpi->type==MP_IMGTYPE_IP && (priv->dri.num_xp_frames < 2 || (priv->dri.cap.caps&DRI_CAP_VIDEO_MMAPED)==DRI_CAP_VIDEO_MMAPED))
{
MSG_DBG2("dri_vo_dbg: vo_get_surface FAIL (mpi->type==MP_IMGTYPE_IP && priv->dri.num_xp_frames < 2) || (priv->dri.cap.caps&DRI_CAP_VIDEO_MMAPED)==DRI_CAP_VIDEO_MMAPED\n");
- return VO_FALSE;
+ return CONTROL_FALSE;
}
/*I+P+B requires 3+ static buffers for R/W */
if(mpi->type==MP_IMGTYPE_IPB && (priv->dri.num_xp_frames != 3 || (priv->dri.cap.caps&DRI_CAP_VIDEO_MMAPED)==DRI_CAP_VIDEO_MMAPED))
{
MSG_DBG2("dri_vo_dbg: vo_get_surface FAIL (mpi->type==MP_IMGTYPE_IPB && priv->dri.num_xp_frames != 3) || (priv->dri.cap.caps&DRI_CAP_VIDEO_MMAPED)==DRI_CAP_VIDEO_MMAPED\n");
- return VO_FALSE;
+ return CONTROL_FALSE;
}
/* video surface is bad thing for reading */
if(((mpi->flags&MP_IMGFLAG_READABLE)||(mpi->type==MP_IMGTYPE_TEMP)) && (priv->dri.cap.caps&DRI_CAP_VIDEO_MMAPED)==DRI_CAP_VIDEO_MMAPED)
{
MSG_DBG2("dri_vo_dbg: vo_get_surface FAIL mpi->flags&MP_IMGFLAG_READABLE && (priv->dri.cap.caps&DRI_CAP_VIDEO_MMAPED)==DRI_CAP_VIDEO_MMAPED\n");
- return VO_FALSE;
+ return CONTROL_FALSE;
}
/* it seems that surfaces are equal */
if((((mpi->flags&MP_IMGFLAG_ACCEPT_STRIDE) && width_less_stride) || priv->dri.planes_eq) && priv->dri.dr)
@@ -564,12 +564,12 @@
mpi->flags|=MP_IMGFLAG_DIRECT;
vo_unlock_surfaces(vo);
MSG_DBG2("dri_vo_dbg: vo_get_surface OK\n");
- return VO_TRUE;
+ return CONTROL_TRUE;
}
MSG_DBG2("dri_vo_dbg: vo_get_surface FAIL (mpi->flags&MP_IMGFLAG_ACCEPT_STRIDE && width_less_stride) || priv->dri.planes_eq) && priv->dri.dr\n");
- return VO_FALSE;
+ return CONTROL_FALSE;
}
- else return VO_FALSE;
+ else return CONTROL_FALSE;
}
static int __FASTCALL__ adjust_size(any_t*vo,unsigned cw,unsigned ch,unsigned *nw,unsigned *nh)
@@ -612,7 +612,7 @@
but there is only one driver (vo_x11) which changes surfaces
on 'fullscreen' key */
need_repaint=0;
- if(priv->dri.has_dri && retval == VO_TRUE && (vrest.event_type & VO_EVENT_RESIZE) == VO_EVENT_RESIZE)
+ if(priv->dri.has_dri && retval == CONTROL_TRUE && (vrest.event_type & VO_EVENT_RESIZE) == VO_EVENT_RESIZE)
{
need_repaint=1;
dri_reconfig(vo,vrest.event_type);
@@ -627,9 +627,9 @@
MSG_DBG3("dri_vo_dbg: vo_fullscreen\n");
etype = 0;
retval = video_out->control(vo,VOCTRL_FULLSCREEN,&etype);
- if(priv->dri.has_dri && retval == VO_TRUE && (etype & VO_EVENT_RESIZE) == VO_EVENT_RESIZE)
+ if(priv->dri.has_dri && retval == CONTROL_TRUE && (etype & VO_EVENT_RESIZE) == VO_EVENT_RESIZE)
dri_reconfig(vo,etype);
- if(retval == VO_TRUE) priv->dri.flags ^= VOFLG_FS;
+ if(retval == CONTROL_TRUE) priv->dri.flags ^= VOFLG_FS;
return retval;
}
@@ -895,7 +895,7 @@
mp_free(vo->vo_priv);
}
-uint32_t __FASTCALL__ vo_control(vo_data_t*vo,uint32_t request, any_t*data)
+ControlCodes __FASTCALL__ vo_control(vo_data_t*vo,uint32_t request, any_t*data)
{
uint32_t rval;
rval=video_out->control(vo,request,data);
Modified: mplayerxp/libvo/video_out.h
===================================================================
--- mplayerxp/libvo/video_out.h 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libvo/video_out.h 2012-10-31 16:28:22 UTC (rev 269)
@@ -5,7 +5,7 @@
* Strongly modified, most parts rewritten: A'rpi/ESP-team - 2000-2001
*
*/
-
+
#ifndef __VIDEO_OUT_H
#define __VIDEO_OUT_H 1
@@ -21,6 +21,7 @@
#include "libmpsub/subreader.h"
#include "img_format.h"
#include "mp_image.h"
+#include "xmp_enums.h"
enum {
VO_EVENT_EXPOSE=1,
@@ -48,14 +49,6 @@
};
enum {
- VO_TRUE=1,
- VO_FALSE=0,
- VO_ERROR=-1,
- VO_NOTAVAIL=-2,
- VO_NOTIMPL=-3
-};
-
-enum {
VOFLAG_FULLSCREEN=0x01, /**< User wants to have fullscreen playback */
VOFLAG_MODESWITCHING=0x02, /**< User enables to find the best video mode */
VOFLAG_SWSCALE=0x04, /**< Obsolete. User enables slow Software scaler */
@@ -115,13 +108,13 @@
}vo_videq_t;
typedef struct vo_gamma_s{
- int brightness;
- int saturation;
- int contrast;
- int hue;
- int red_intensity;
- int green_intensity;
- int blue_intensity;
+ int brightness;
+ int saturation;
+ int contrast;
+ int hue;
+ int red_intensity;
+ int green_intensity;
+ int blue_intensity;
}vo_gamma_t;
typedef struct vo_rect_s {
@@ -229,14 +222,14 @@
/** Control interface
* @param request command. See VOCTRL_** for detail
* @param data data associated with command
- * @return VO_TRUE if success VO_FALSE VO_ERROR VO_NOTIMPL otherwise
+ * @return CONTROL_TRUE if success CONTROL_FALSE VO_ERROR CONTROL_NA otherwise
**/
- uint32_t (* __FASTCALL__ control)(vo_data_t* vo,uint32_t request, any_t*data);
+ ControlCodes (* __FASTCALL__ control)(vo_data_t* vo,uint32_t request, any_t*data);
/** Returns driver information.
* @return read-only pointer to a vo_info_t structure.
**/
- const vo_info_t* (*get_info)(vo_data_t* vo);
+ const vo_info_t* (* __FASTCALL__ get_info)(vo_data_t* vo);
/** Blit/Flip buffer to the screen. Must be called after each frame!
* @param idex index of frame to be selected as active frame
@@ -245,7 +238,7 @@
/** Closes driver. Should restore the original state of the system.
**/
- void (*uninit)(vo_data_t* vo);
+ void (* __FASTCALL__ uninit)(vo_data_t* vo);
} vo_functions_t;
@@ -280,7 +273,7 @@
extern void vo_draw_osd(vo_data_t* vo,unsigned idx);
extern void vo_draw_spudec_direct(vo_data_t* vo,unsigned idx);
extern void vo_uninit(vo_data_t* vo);
-extern uint32_t __FASTCALL__ vo_control(vo_data_t* vo,uint32_t request, any_t*data);
+extern ControlCodes __FASTCALL__ vo_control(vo_data_t* vo,uint32_t request, any_t*data);
extern int __FASTCALL__ vo_is_final(vo_data_t* vo);
/** Contains geometry of fourcc */
Modified: mplayerxp/libvo/video_out_internal.h
===================================================================
--- mplayerxp/libvo/video_out_internal.h 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libvo/video_out_internal.h 2012-10-31 16:28:22 UTC (rev 269)
@@ -22,13 +22,13 @@
*/
#ifndef __VIDEO_OUT_INTERNAL_H
#define __VIDEO_OUT_INTERNAL_H 1
-static uint32_t __FASTCALL__ control(vo_data_t*vo,uint32_t request, any_t*data);
+static ControlCodes __FASTCALL__ control(vo_data_t*vo,uint32_t request, any_t*data);
static uint32_t __FASTCALL__ config(vo_data_t*vo,uint32_t width, uint32_t height, uint32_t d_width,
uint32_t d_height, uint32_t fullscreen, char *title,
uint32_t format,const vo_tune_info_t *);
-static const vo_info_t* get_info(vo_data_t*vo);
+static const vo_info_t* __FASTCALL__ get_info(vo_data_t*vo);
static void __FASTCALL__ select_frame(vo_data_t*vo,unsigned idx);
-static void uninit(vo_data_t*vo);
+static void __FASTCALL__ uninit(vo_data_t*vo);
static uint32_t __FASTCALL__ preinit(vo_data_t*vo,const char *);
#define LIBVO_EXTERN(x) vo_functions_t video_out_##x =\
Modified: mplayerxp/libvo/vo_dga.c
===================================================================
--- mplayerxp/libvo/vo_dga.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libvo/vo_dga.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -781,7 +781,7 @@
surf->planes[3] = 0;
}
-static uint32_t __FASTCALL__ control(vo_data_t*vo,uint32_t request, any_t*data)
+static ControlCodes __FASTCALL__ control(vo_data_t*vo,uint32_t request, any_t*data)
{
priv_t*priv=(priv_t*)vo->priv;
switch (request) {
@@ -790,16 +790,16 @@
case VOCTRL_CHECK_EVENTS:
check_events(vo);
(*(vo_resize_t *)data).event_type = 0; /* VO_EVENT_RESIZE is meaningless here */
- return VO_TRUE;
+ return CONTROL_TRUE;
case VOCTRL_GET_NUM_FRAMES:
*(uint32_t *)data = priv->num_buffers;
- return VO_TRUE;
+ return CONTROL_TRUE;
case DRI_GET_SURFACE_CAPS:
dga_dri_get_surface_caps(vo,data);
- return VO_TRUE;
+ return CONTROL_TRUE;
case DRI_GET_SURFACE:
dga_dri_get_surface(vo,data);
- return VO_TRUE;
+ return CONTROL_TRUE;
}
- return VO_NOTIMPL;
+ return CONTROL_NA;
}
Modified: mplayerxp/libvo/vo_fbdev.c
===================================================================
--- mplayerxp/libvo/vo_fbdev.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libvo/vo_fbdev.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -1152,7 +1152,7 @@
surf->planes[3] = 0;
}
-static uint32_t __FASTCALL__ control(vo_data_t*vo,uint32_t request, any_t*data)
+static ControlCodes __FASTCALL__ control(vo_data_t*vo,uint32_t request, any_t*data)
{
priv_t*priv=(priv_t*)vo->priv;
switch (request) {
@@ -1160,13 +1160,13 @@
return query_format(vo,(vo_query_fourcc_t*)data);
case VOCTRL_GET_NUM_FRAMES:
*(uint32_t *)data = priv->total_fr;
- return VO_TRUE;
+ return CONTROL_TRUE;
case DRI_GET_SURFACE_CAPS:
fbdev_dri_get_surface_caps(vo,data);
- return VO_TRUE;
+ return CONTROL_TRUE;
case DRI_GET_SURFACE:
fbdev_dri_get_surface(vo,data);
- return VO_TRUE;
+ return CONTROL_TRUE;
}
- return VO_NOTIMPL;
+ return CONTROL_NA;
}
Modified: mplayerxp/libvo/vo_null.c
===================================================================
--- mplayerxp/libvo/vo_null.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libvo/vo_null.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -256,12 +256,12 @@
case IMGFMT_BG4B:
case IMGFMT_RG4B:
case IMGFMT_BGR1:
- case IMGFMT_RGB1: return VO_TRUE;
+ case IMGFMT_RGB1: return CONTROL_TRUE;
}
- return VO_FALSE;
+ return CONTROL_FALSE;
}
-static uint32_t __FASTCALL__ control(vo_data_t*vo,uint32_t request, any_t*data)
+static ControlCodes __FASTCALL__ control(vo_data_t*vo,uint32_t request, any_t*data)
{
priv_t*priv=(priv_t*)vo->priv;
switch (request) {
@@ -269,15 +269,15 @@
return null_query_format(data);
case VOCTRL_GET_NUM_FRAMES:
*(uint32_t *)data = priv->num_frames;
- return VO_TRUE;
+ return CONTROL_TRUE;
case DRI_GET_SURFACE_CAPS:
null_dri_get_surface_caps(vo,data);
- return VO_TRUE;
+ return CONTROL_TRUE;
case DRI_GET_SURFACE:
null_dri_get_surface(vo,data);
- return VO_TRUE;
+ return CONTROL_TRUE;
case VOCTRL_FLUSH_PAGES:
- return VO_TRUE;
+ return CONTROL_TRUE;
}
- return VO_NOTIMPL;
+ return CONTROL_NA;
}
Modified: mplayerxp/libvo/vo_opengl.c
===================================================================
--- mplayerxp/libvo/vo_opengl.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libvo/vo_opengl.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -369,7 +369,7 @@
surf->planes[3] = 0;
}
-static uint32_t control(vo_data_t*vo,uint32_t request, any_t*data)
+static ControlCodes control(vo_data_t*vo,uint32_t request, any_t*data)
{
priv_t*priv=(priv_t*)vo->priv;
switch (request) {
@@ -378,21 +378,21 @@
case VOCTRL_FULLSCREEN:
vo_fullscreen(vo);
resize(vo,vo->dest.w, vo->dest.h);
- return VO_TRUE;
+ return CONTROL_TRUE;
case VOCTRL_GET_NUM_FRAMES:
*(uint32_t *)data = priv->num_buffers;
- return VO_TRUE;
+ return CONTROL_TRUE;
case DRI_GET_SURFACE_CAPS:
gl_dri_get_surface_caps(vo,data);
- return VO_TRUE;
+ return CONTROL_TRUE;
case DRI_GET_SURFACE:
gl_dri_get_surface(vo,data);
- return VO_TRUE;
+ return CONTROL_TRUE;
case VOCTRL_CHECK_EVENTS: {
vo_resize_t * vrest = (vo_resize_t *)data;
vrest->event_type = check_events(vo,vrest->adjust_size);
- return VO_TRUE;
+ return CONTROL_TRUE;
}
}
- return VO_NOTIMPL;
+ return CONTROL_NA;
}
Modified: mplayerxp/libvo/vo_sdl.c
===================================================================
--- mplayerxp/libvo/vo_sdl.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libvo/vo_sdl.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -1285,7 +1285,7 @@
}
}
-static uint32_t __FASTCALL__ control(vo_data_t*vo,uint32_t request, any_t*data)
+static ControlCodes __FASTCALL__ control(vo_data_t*vo,uint32_t request, any_t*data)
{
priv_t *priv = vo->priv;
switch (request) {
@@ -1293,17 +1293,17 @@
return query_format(vo,(vo_query_fourcc_t*)data);
case VOCTRL_GET_NUM_FRAMES:
*(uint32_t *)data = priv->num_buffs;
- return VO_TRUE;
+ return CONTROL_TRUE;
case DRI_GET_SURFACE_CAPS:
sdl_dri_get_surface_caps(vo,data);
- return VO_TRUE;
+ return CONTROL_TRUE;
case DRI_GET_SURFACE:
sdl_dri_get_surface(vo,data);
- return VO_TRUE;
+ return CONTROL_TRUE;
case VOCTRL_CHECK_EVENTS: {
vo_resize_t * vrest = (vo_resize_t *)data;
vrest->event_type = check_events(vo,vrest->adjust_size);
- return VO_TRUE;
+ return CONTROL_TRUE;
}
case VOCTRL_FULLSCREEN:
if (priv->surface->flags & SDL_FULLSCREEN) {
@@ -1315,7 +1315,7 @@
MSG_V("SDL: Set fullscreen mode\n");
}
*(uint32_t *)data = VO_EVENT_RESIZE;
- return VO_TRUE;
+ return CONTROL_TRUE;
}
- return VO_NOTIMPL;
+ return CONTROL_NA;
}
Modified: mplayerxp/libvo/vo_vesa.c
===================================================================
--- mplayerxp/libvo/vo_vesa.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libvo/vo_vesa.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -758,7 +758,7 @@
surf->planes[3] = 0;
}
-static uint32_t __FASTCALL__ control(vo_data_t*vo,uint32_t request, any_t*data)
+static ControlCodes __FASTCALL__ control(vo_data_t*vo,uint32_t request, any_t*data)
{
priv_t*priv=(priv_t*)vo->priv;
switch (request) {
@@ -766,13 +766,13 @@
return query_format((vo_query_fourcc_t*)data);
case VOCTRL_GET_NUM_FRAMES:
*(uint32_t *)data = priv->multi_size;
- return VO_TRUE;
+ return CONTROL_TRUE;
case DRI_GET_SURFACE_CAPS:
vesa_dri_get_surface_caps(vo,data);
- return VO_TRUE;
+ return CONTROL_TRUE;
case DRI_GET_SURFACE:
vesa_dri_get_surface(vo,data);
- return VO_TRUE;
+ return CONTROL_TRUE;
}
- return VO_NOTIMPL;
+ return CONTROL_NA;
}
Modified: mplayerxp/libvo/vo_x11.c
===================================================================
--- mplayerxp/libvo/vo_x11.c 2012-10-31 14:58:47 UTC (rev 268)
+++ mplayerxp/libvo/vo_x11.c 2012-10-31 16:28:22 UTC (rev 269)
@@ -363,7 +363,7 @@
surf->planes[3] = 0;
}
-static uint32_t __FASTCALL__ control(vo_data_t*vo,uint32_t request, any_t*data)
+static ControlCodes __FASTCALL__ control(vo_data_t*vo,uint32_t request, any_t*data)
{
priv_t* priv=(priv_t*)vo->priv;
switch (request) {
@@ -373,20 +373,20 @@
{
vo_resize_t * vrest = (vo_resize_t *)data;
vrest->event_type = check_events(vo,vrest->adjust_size);
- return VO_TRUE;
+ return CONTROL_TRUE;
}
case VOCTRL_FULLSCREEN:
vo_x11_fullscreen(vo);
- return VO_TRUE;
+ retu...
[truncated message content] |
