[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[599] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[599] mplayerxp
|
From: <nic...@us...> - 2012-12-22 14:33:08
|
Revision: 599
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=599&view=rev
Author: nickols_k
Date: 2012-12-22 14:32:53 +0000 (Sat, 22 Dec 2012)
Log Message:
-----------
cleanups
Modified Paths:
--------------
mplayerxp/input2/joystick.cpp
mplayerxp/libao3/audio_out.cpp
mplayerxp/libmpcodecs/ad_acm.cpp
mplayerxp/libmpcodecs/ad_twin.cpp
mplayerxp/libmpcodecs/vd_xanim.cpp
mplayerxp/libmpcodecs/vd_xvid.cpp
mplayerxp/libmpstream2/rtp_cache.cpp
mplayerxp/libmpstream2/s_tv.cpp
mplayerxp/libmpstream2/tvi/tvi_dummy.cpp
mplayerxp/libmpstream2/tvi/tvi_v4l.cpp
mplayerxp/libvo2/img_format.cpp
mplayerxp/osdep/getch2.cpp
mplayerxp/osdep/mp_malloc.cpp
mplayerxp/osdep/mplib.cpp
mplayerxp/osdep/shmem.cpp
mplayerxp/osdep/timer-lx.cpp
mplayerxp/osdep/timer.cpp
mplayerxp/postproc/aflib.cpp
Modified: mplayerxp/input2/joystick.cpp
===================================================================
--- mplayerxp/input2/joystick.cpp 2012-12-22 13:51:04 UTC (rev 598)
+++ mplayerxp/input2/joystick.cpp 2012-12-22 14:32:53 UTC (rev 599)
@@ -125,15 +125,15 @@
if(ev.type & JS_EVENT_BUTTON) {
priv.btns &= ~(1 << ev.number);
priv.btns |= (ev.value << ev.number);
- if(ev.value == 1) return ((JOY_BTN0+ev.number) | MP_KEY_DOWN);
- else return (JOY_BTN0+ev.number);
+ if(ev.value == 1) return (JOY_BTN0+ev.number)|MP_KEY_DOWN;
+ else return JOY_BTN0+ev.number;
} else if(ev.type & JS_EVENT_AXIS) {
if(ev.value < -JOY_AXIS_DELTA && priv.axis[ev.number] != -1) {
priv.axis[ev.number] = -1;
- return (JOY_AXIS0_MINUS+(2*ev.number)) | MP_KEY_DOWN;
+ return (JOY_AXIS0_MINUS+(2*ev.number))|MP_KEY_DOWN;
} else if(ev.value > JOY_AXIS_DELTA && priv.axis[ev.number] != 1) {
priv.axis[ev.number] = 1;
- return (JOY_AXIS0_PLUS+(2*ev.number)) | MP_KEY_DOWN;
+ return (JOY_AXIS0_PLUS+(2*ev.number))|MP_KEY_DOWN;
} else if(ev.value <= JOY_AXIS_DELTA && ev.value >= -JOY_AXIS_DELTA && priv.axis[ev.number] != 0) {
int r = priv.axis[ev.number] == 1 ? JOY_AXIS0_PLUS+(2*ev.number) : JOY_AXIS0_MINUS+(2*ev.number);
priv.axis[ev.number] = 0;
Modified: mplayerxp/libao3/audio_out.cpp
===================================================================
--- mplayerxp/libao3/audio_out.cpp 2012-12-22 13:51:04 UTC (rev 598)
+++ mplayerxp/libao3/audio_out.cpp 2012-12-22 14:32:53 UTC (rev 599)
@@ -86,51 +86,51 @@
switch (format)
{
case AFMT_MU_LAW:
- return("Mu-Law");
+ return "Mu-Law";
case AFMT_A_LAW:
- return("A-Law");
+ return "A-Law";
case AFMT_IMA_ADPCM:
- return("Ima-ADPCM");
+ return "Ima-ADPCM";
case AFMT_S8:
- return("Signed 8-bit");
+ return "Signed 8-bit";
case AFMT_U8:
- return("Unsigned 8-bit");
+ return "Unsigned 8-bit";
case AFMT_U16_LE:
- return("Unsigned 16-bit (Little-Endian)");
+ return "Unsigned 16-bit (Little-Endian)";
case AFMT_U16_BE:
- return("Unsigned 16-bit (Big-Endian)");
+ return "Unsigned 16-bit (Big-Endian)";
case AFMT_S16_LE:
- return("Signed 16-bit (Little-Endian)");
+ return "Signed 16-bit (Little-Endian)";
case AFMT_S16_BE:
- return("Signed 16-bit (Big-Endian)");
+ return "Signed 16-bit (Big-Endian)";
case AFMT_U24_LE:
- return("Unsigned 24-bit (Little-Endian)");
+ return "Unsigned 24-bit (Little-Endian)";
case AFMT_U24_BE:
- return("Unsigned 24-bit (Big-Endian)");
+ return "Unsigned 24-bit (Big-Endian)";
case AFMT_S24_LE:
- return("Signed 24-bit (Little-Endian)");
+ return "Signed 24-bit (Little-Endian)";
case AFMT_S24_BE:
- return("Signed 24-bit (Big-Endian)");
+ return "Signed 24-bit (Big-Endian)";
case AFMT_U32_LE:
- return("Unsigned 32-bit (Little-Endian)");
+ return "Unsigned 32-bit (Little-Endian)";
case AFMT_U32_BE:
- return("Unsigned 32-bit (Big-Endian)");
+ return "Unsigned 32-bit (Big-Endian)";
case AFMT_S32_LE:
- return("Signed 32-bit (Little-Endian)");
+ return "Signed 32-bit (Little-Endian)";
case AFMT_S32_BE:
- return("Signed 32-bit (Big-Endian)");
+ return "Signed 32-bit (Big-Endian)";
case AFMT_MPEG:
- return("MPEG (2) audio");
+ return "MPEG (2) audio";
case AFMT_AC3:
- return("AC3");
+ return "AC3";
case AFMT_FLOAT32:
- return("Float32");
+ return "Float32";
/*
the following two formats are not available with old linux kernel
headers (e.g. in 2.2.16)
*/
}
- return("Unknown");
+ return "Unknown";
}
// return number of bits for 1 sample in one channel, or 8 bits for compressed
Modified: mplayerxp/libmpcodecs/ad_acm.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_acm.cpp 2012-12-22 13:51:04 UTC (rev 598)
+++ mplayerxp/libmpcodecs/ad_acm.cpp 2012-12-22 14:32:53 UTC (rev 599)
@@ -116,16 +116,16 @@
case ACMERR_CANCELED:
MSG_DBG2( "ACM_Decoder: stream busy, waiting..\n");
sleep(100);
- return(close_acm_audio_codec(priv));
+ return close_acm_audio_codec(priv);
case ACMERR_UNPREPARED:
case ACMERR_NOTPOSSIBLE:
- return(0);
+ return 0;
default:
MSG_WARN( "ACM_Decoder: unknown error occured: %d\n", ret);
- return(0);
+ return 0;
}
/* MSACM_UnregisterAllDrivers();*/
- return(1);
+ return 1;
}
MPXP_Rc init(ad_private_t *priv)
Modified: mplayerxp/libmpcodecs/ad_twin.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_twin.cpp 2012-12-22 13:51:04 UTC (rev 598)
+++ mplayerxp/libmpcodecs/ad_twin.cpp 2012-12-22 14:32:53 UTC (rev 599)
@@ -386,7 +386,7 @@
*pts=FIX_APTS(sh,priv->pts,priv->ptr);
iptr = priv->ptr; /* current file data buffer pointer */
if ( iptr >= priv->nbuf ) /* If data file is empty then return */
- return(retval);
+ return retval;
ibufadr = iptr/BYTE_BIT; /* current file data buffer address */
ibufbit = iptr%BYTE_BIT; /* current file data buffer bit */
/* tmpdat = stream->buf[ibufadr] >> (BYTE_BIT-ibufbit-1); */
@@ -405,7 +405,7 @@
}
++retval;
}
- return(retval);
+ return retval;
}
#define BITS_INT (sizeof(int)*8)
@@ -437,7 +437,7 @@
mask >>= 1;
}
*data = work;
- return(retval);
+ return retval;
}
static int GetVqInfo( tvqConfInfoSubBlock *cfg,
Modified: mplayerxp/libmpcodecs/vd_xanim.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_xanim.cpp 2012-12-22 13:51:04 UTC (rev 598)
+++ mplayerxp/libmpcodecs/vd_xanim.cpp 2012-12-22 14:32:53 UTC (rev 599)
@@ -269,21 +269,21 @@
MSG_FATAL( "xacodec: failed to dlopen %s while %s\n", filename, error);
else
MSG_FATAL( "xacodec: failed to dlopen %s\n", filename);
- return(0);
+ return 0;
}
what_the = (any_t* (*)())ld_sym(codec_driver->file_handler, "What_The");
if ((error = dlerror()) != NULL) {
MSG_FATAL( "xacodec: failed to init %s while %s\n", filename, error);
dlclose(codec_driver->file_handler);
- return(0);
+ return 0;
}
mod_hdr = reinterpret_cast<XAVID_MOD_HDR *>(what_the());
if (!mod_hdr) {
MSG_FATAL( "xacodec: initializer function failed in %s\n", filename);
dlclose(codec_driver->file_handler);
- return(0);
+ return 0;
}
MSG_INFO( "=== XAnim Codec ===\n");
@@ -300,14 +300,14 @@
MSG_FATAL( "xacodec: not supported api revision (%d) in %s\n",
mod_hdr->api_rev, filename);
dlclose(codec_driver->file_handler);
- return(0);
+ return 0;
}
func = mod_hdr->funcs;
if (!func) {
MSG_FATAL( "xacodec: function table error in %s\n", filename);
dlclose(codec_driver->file_handler);
- return(0);
+ return 0;
}
MSG_DBG2( "Exported functions by codec: [functable: 0x%08x entries: %d]\n",
@@ -331,7 +331,7 @@
codec_driver->dec_func = (unsigned (*)(unsigned char*,unsigned char *,unsigned int, XA_DEC_INFO *))func[i].dec_func;
}
}
- return(1);
+ return 1;
}
int xacodec_query(xacodec_driver_t *codec_driver, XA_CODEC_HDR *codec_hdr)
@@ -343,7 +343,7 @@
if (codec_driver->dec_func) {
codec_hdr->decoder = codec_driver->dec_func;
MSG_DBG2( "We got decoder's address at init! %p\n", codec_hdr->decoder);
- return(1);
+ return 1;
}
#endif
codec_ret = codec_driver->iq_func(codec_hdr);
@@ -352,16 +352,16 @@
codec_driver->dec_func = (unsigned (*)(unsigned char*,unsigned char *,unsigned int, XA_DEC_INFO *))codec_hdr->decoder;
MSG_DBG2( "Codec is supported: found decoder for %s at 0x%08x\n",
codec_hdr->description, codec_hdr->decoder);
- return(1);
+ return 1;
case CODEC_UNSUPPORTED:
MSG_FATAL( "Codec (%s) is unsupported by driver\n",
codec_hdr->description);
- return(0);
+ return 0;
case CODEC_UNKNOWN:
default:
MSG_FATAL( "Codec (%s) is unknown by driver\n",
codec_hdr->description);
- return(0);
+ return 0;
}
}
@@ -377,7 +377,7 @@
if (xacodec_driver == NULL) {
MSG_FATAL( "xacodec: memory allocation error: %s\n",
strerror(errno));
- return(0);
+ return 0;
}
xacodec_driver->iq_func = NULL;
@@ -391,7 +391,7 @@
snprintf(dll, 1024, "%s/%s", xacodec_def_path, vidinfo->codec->dll_name);
if (xacodec_init(dll, xacodec_driver) == 0)
- return(0);
+ return 0;
codec_hdr.xapi_rev = XAVID_API_REV;
codec_hdr.anim_hdr = mp_malloc(4096);
@@ -444,13 +444,13 @@
default:
MSG_FATAL( "xacodec: not supported image out format (%s)\n",
vo_format_name(out_format));
- return(0);
+ return 0;
}
MSG_INFO( "xacodec: querying for input %dx%d %dbit [fourcc: %4x] (%s)...\n",
codec_hdr.x, codec_hdr.y, codec_hdr.depth, codec_hdr.compression, codec_hdr.description);
if (xacodec_query(xacodec_driver, &codec_hdr) == 0)
- return(0);
+ return 0;
// delete codec_hdr.anim_hdr;
@@ -458,7 +458,7 @@
if (xacodec_driver->decinfo == NULL) {
MSG_FATAL( "xacodec: memory allocation error: %s\n",
strerror(errno));
- return(0);
+ return 0;
}
xacodec_driver->decinfo->cmd = 0;
xacodec_driver->decinfo->skip_flag = 0;
@@ -483,10 +483,10 @@
if (xacodec_driver->image.mem == NULL) {
MSG_FATAL( "xacodec: memory allocation error: %s\n",
strerror(errno));
- return(0);
+ return 0;
}
- return(1);
+ return 1;
}
#define ACT_DLTA_NORM 0x00000000
@@ -720,7 +720,7 @@
{
MSG_DBG3( "YUV2x2_Map_Func('image_type: %d', 'dith_type: %d')",
image_type, dith_type);
- return((any_t*)XA_YUV_2x2_clr);
+ return (any_t*)XA_YUV_2x2_clr;
}
/* -------------------- whole YUV frame converters ------------------------- */
@@ -812,7 +812,7 @@
any_t*XA_YUV1611_Func(unsigned int image_type)
{
MSG_DBG3( "XA_YUV1611_Func('image_type: %d')", image_type);
- return((any_t*)XA_YUV1611_Convert);
+ return (any_t*)XA_YUV1611_Convert;
}
/* -------------- YUV 4x1 1x1 1x1 (4:1:1 ?) [CYUV] ------------------ */
@@ -829,7 +829,7 @@
any_t*XA_YUV411111_Func(unsigned int image_type)
{
MSG_DBG3( "XA_YUV411111_Func('image_type: %d')", image_type);
- return((any_t*)XA_YUV411111_Convert);
+ return (any_t*)XA_YUV411111_Convert;
}
/* --------------- YUV 2x2 1x1 1x1 (4:2:0 aka YV12) [3ivX,H263] ------------ */
@@ -877,7 +877,7 @@
any_t*XA_YUV221111_Func(unsigned int image_type)
{
MSG_DBG3( "XA_YUV221111_Func('image_type: %d')\n",image_type);
- return((any_t*)XA_YUV221111_Convert);
+ return (any_t*)XA_YUV221111_Convert;
}
/* *** EOF XANIM *** */
Modified: mplayerxp/libmpcodecs/vd_xvid.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_xvid.cpp 2012-12-22 13:51:04 UTC (rev 598)
+++ mplayerxp/libmpcodecs/vd_xvid.cpp 2012-12-22 14:32:53 UTC (rev 599)
@@ -310,10 +310,10 @@
dar = ((float)stats->data.vol.width*wpar);
dar /= ((float)stats->data.vol.height*hpar);
- return(dar);
+ return dar;
}
- return(0.0f);
+ return 0.0f;
}
#endif
Modified: mplayerxp/libmpstream2/rtp_cache.cpp
===================================================================
--- mplayerxp/libmpstream2/rtp_cache.cpp 2012-12-22 13:51:04 UTC (rev 598)
+++ mplayerxp/libmpstream2/rtp_cache.cpp 2012-12-22 14:32:53 UTC (rev 599)
@@ -193,7 +193,7 @@
while ((length = get_next(buffer, length)) == 0) {
mpxp_err<<"Got empty packet from RTP cache!?"<<std::endl;
}
- return(length);
+ return length;
}
int Rtp_Cache::getrtp2(struct rtpheader *rh, char** data, int* lengthData) const {
Modified: mplayerxp/libmpstream2/s_tv.cpp
===================================================================
--- mplayerxp/libmpstream2/s_tv.cpp 2012-12-22 13:51:04 UTC (rev 598)
+++ mplayerxp/libmpstream2/s_tv.cpp 2012-12-22 14:32:53 UTC (rev 599)
@@ -411,7 +411,7 @@
#endif
mpxp_err<< "No such driver: "<<tv_param.driver<<std::endl;
- return(NULL);
+ return NULL;
}
int __FASTCALL__ tv_init(tvi_handle_t *tvh)
@@ -509,7 +509,7 @@
mpxp_warn<<"Unknown color option ("<<opt<<") specified!"<<std::endl;
}
- return(1);
+ return 1;
}
int __FASTCALL__ tv_set_freq(tvi_handle_t *tvh, unsigned long freq)
Modified: mplayerxp/libmpstream2/tvi/tvi_dummy.cpp
===================================================================
--- mplayerxp/libmpstream2/tvi/tvi_dummy.cpp 2012-12-22 13:51:04 UTC (rev 598)
+++ mplayerxp/libmpstream2/tvi/tvi_dummy.cpp 2012-12-22 14:32:53 UTC (rev 599)
@@ -32,7 +32,7 @@
tvi_handle_t *tvi_init_dummy(const char *device)
{
UNUSED(device);
- return(new_handle());
+ return new_handle();
}
/* initialisation */
@@ -40,7 +40,7 @@
{
priv->width = 320;
priv->height = 200;
- return(1);
+ return 1;
}
/* that's the real start, we'got the format parameters (checked with control) */
@@ -61,34 +61,34 @@
switch(cmd)
{
case TVI_CONTROL_IS_VIDEO:
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_TRUE;
case TVI_CONTROL_VID_GET_FORMAT:
*(int *)arg = IMGFMT_YV12;
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_TRUE;
case TVI_CONTROL_VID_SET_FORMAT:
{
int req_fmt = (long)*(any_t**)arg;
if (req_fmt != IMGFMT_YV12)
- return(TVI_CONTROL_FALSE);
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_FALSE;
+ return TVI_CONTROL_TRUE;
}
case TVI_CONTROL_VID_SET_WIDTH:
priv->width = (long)*(any_t**)arg;
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_TRUE;
case TVI_CONTROL_VID_GET_WIDTH:
*(int *)arg = priv->width;
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_TRUE;
case TVI_CONTROL_VID_SET_HEIGHT:
priv->height = (long)*(any_t**)arg;
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_TRUE;
case TVI_CONTROL_VID_GET_HEIGHT:
*(int *)arg = priv->height;
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_TRUE;
case TVI_CONTROL_VID_CHK_WIDTH:
case TVI_CONTROL_VID_CHK_HEIGHT:
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_TRUE;
}
- return(TVI_CONTROL_UNKNOWN);
+ return TVI_CONTROL_UNKNOWN;
}
#ifdef HAVE_TV_BSDBT848
@@ -110,7 +110,7 @@
static int get_video_framesize(priv_t *priv)
{
/* YV12 */
- return(priv->width*priv->height*12/8);
+ return priv->width*priv->height*12/8;
}
static double grab_audio_frame(priv_t *priv,unsigned char *buffer, int len)
@@ -133,12 +133,12 @@
tvi_handle_t *h = (tvi_handle_t *)mp_malloc(sizeof(tvi_handle_t));
if (!h)
- return(NULL);
+ return NULL;
h->priv = (priv_t *)mp_mallocz(sizeof(priv_t));
if (!h->priv)
{
delete h;
- return(NULL);
+ return NULL;
}
h->info = &info;
h->functions = &functions;
@@ -147,7 +147,7 @@
h->chanlist_s = NULL;
h->norm = -1;
h->channel = -1;
- return(h);
+ return h;
}
void free_handle(tvi_handle_t *h)
Modified: mplayerxp/libmpstream2/tvi/tvi_v4l.cpp
===================================================================
--- mplayerxp/libmpstream2/tvi/tvi_v4l.cpp 2012-12-22 13:51:04 UTC (rev 598)
+++ mplayerxp/libmpstream2/tvi/tvi_v4l.cpp 2012-12-22 14:32:53 UTC (rev 599)
@@ -108,18 +108,18 @@
{
/* component */
case VIDEO_PALETTE_RGB555:
- return(15);
+ return 15;
case VIDEO_PALETTE_RGB565:
- return(16);
+ return 16;
case VIDEO_PALETTE_RGB24:
- return(24);
+ return 24;
case VIDEO_PALETTE_RGB32:
- return(32);
+ return 32;
/* planar */
case VIDEO_PALETTE_YUV411P:
case VIDEO_PALETTE_YUV420P:
case VIDEO_PALETTE_YUV410P:
- return(12);
+ return 12;
/* packed */
case VIDEO_PALETTE_YUV422P:
case VIDEO_PALETTE_YUV422:
@@ -127,9 +127,9 @@
case VIDEO_PALETTE_UYVY:
case VIDEO_PALETTE_YUV420:
case VIDEO_PALETTE_YUV411:
- return(16);
+ return 16;
}
- return(-1);
+ return -1;
}
static int format2palette(int format)
@@ -137,22 +137,22 @@
switch(format)
{
case IMGFMT_RGB15:
- return(VIDEO_PALETTE_RGB555);
+ return VIDEO_PALETTE_RGB555;
case IMGFMT_RGB16:
- return(VIDEO_PALETTE_RGB565);
+ return VIDEO_PALETTE_RGB565;
case IMGFMT_RGB24:
- return(VIDEO_PALETTE_RGB24);
+ return VIDEO_PALETTE_RGB24;
case IMGFMT_RGB32:
- return(VIDEO_PALETTE_RGB32);
+ return VIDEO_PALETTE_RGB32;
case IMGFMT_YV12:
case IMGFMT_I420:
- return(VIDEO_PALETTE_YUV420P);
+ return VIDEO_PALETTE_YUV420P;
case IMGFMT_UYVY:
- return(VIDEO_PALETTE_YUV422);
+ return VIDEO_PALETTE_YUV422;
case IMGFMT_YUY2:
- return(VIDEO_PALETTE_YUYV);
+ return VIDEO_PALETTE_YUYV;
}
- return(-1);
+ return -1;
}
tvi_handle_t *tvi_init_v4l(const char *device)
@@ -162,7 +162,7 @@
h = new_handle();
if (!h)
- return(NULL);
+ return NULL;
priv = h->priv;
@@ -175,13 +175,13 @@
/* allocation failed */
if (!priv->video_device) {
free_handle(h);
- return(NULL);
+ return NULL;
}
/* set audio device name */
priv->audio_device = mp_strdup("/dev/dsp");
- return(h);
+ return h;
}
static int init(struct priv_s *priv)
@@ -425,21 +425,21 @@
/* ========== GENERIC controls =========== */
case TVI_CONTROL_IS_VIDEO: {
if (priv->capability.type & VID_TYPE_CAPTURE)
- return(TVI_CONTROL_TRUE);
- return(TVI_CONTROL_FALSE);
+ return TVI_CONTROL_TRUE;
+ return TVI_CONTROL_FALSE;
}
case TVI_CONTROL_IS_AUDIO:
if (priv->channels[priv->act_channel].flags & VIDEO_VC_AUDIO)
{
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_TRUE;
}
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_TRUE;
case TVI_CONTROL_IS_TUNER:
{
// if (priv->capability.type & VID_TYPE_TUNER)
if (priv->channels[priv->act_channel].flags & VIDEO_VC_TUNER)
- return(TVI_CONTROL_TRUE);
- return(TVI_CONTROL_FALSE);
+ return TVI_CONTROL_TRUE;
+ return TVI_CONTROL_FALSE;
}
/* ========== VIDEO controls =========== */
@@ -450,20 +450,20 @@
output_fmt = priv->wtag;
*(int *)arg = output_fmt;
mpxp_v<<"Output format: "<<vo_format_name(output_fmt)<<std::endl;
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_TRUE;
}
case TVI_CONTROL_VID_SET_FORMAT:
priv->wtag = (int)*(any_t**)arg;
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_TRUE;
case TVI_CONTROL_VID_GET_PLANES:
*(int *)arg = 1; /* FIXME, also not needed at this time */
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_TRUE;
case TVI_CONTROL_VID_GET_BITS:
*(int *)arg = palette2depth(format2palette(priv->wtag));
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_TRUE;
case TVI_CONTROL_VID_GET_WIDTH:
*(int *)arg = priv->width;
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_TRUE;
case TVI_CONTROL_VID_CHK_WIDTH:
{
int req_width = *(int *)arg;
@@ -471,15 +471,15 @@
mpxp_v<<"Requested width: "<<req_width<<std::endl;
if ((req_width >= priv->capability.minwidth) &&
(req_width <= priv->capability.maxwidth))
- return(TVI_CONTROL_TRUE);
- return(TVI_CONTROL_FALSE);
+ return TVI_CONTROL_TRUE;
+ return TVI_CONTROL_FALSE;
}
case TVI_CONTROL_VID_SET_WIDTH:
priv->width = *(int *)arg;
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_TRUE;
case TVI_CONTROL_VID_GET_HEIGHT:
*(int *)arg = priv->height;
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_TRUE;
case TVI_CONTROL_VID_CHK_HEIGHT:
{
int req_height = *(int *)arg;
@@ -487,45 +487,45 @@
mpxp_v<<"Requested height: "<<req_height<<std::endl;
if ((req_height >= priv->capability.minheight) &&
(req_height <= priv->capability.maxheight))
- return(TVI_CONTROL_TRUE);
- return(TVI_CONTROL_FALSE);
+ return TVI_CONTROL_TRUE;
+ return TVI_CONTROL_FALSE;
}
case TVI_CONTROL_VID_SET_HEIGHT:
priv->height = *(int *)arg;
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_TRUE;
case TVI_CONTROL_VID_GET_PICTURE:
if (ioctl(priv->video_fd, VIDIOCGPICT, &priv->picture) == -1)
{
mpxp_err<<"ioctl get picture failed: "<<strerror(errno)<<std::endl;
- return(TVI_CONTROL_FALSE);
+ return TVI_CONTROL_FALSE;
}
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_TRUE;
case TVI_CONTROL_VID_SET_PICTURE:
if (ioctl(priv->video_fd, VIDIOCSPICT, &priv->picture) == -1)
{
mpxp_err<<"ioctl get picture failed: "<<strerror(errno)<<std::endl;
- return(TVI_CONTROL_FALSE);
+ return TVI_CONTROL_FALSE;
}
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_TRUE;
case TVI_CONTROL_VID_SET_BRIGHTNESS:
priv->picture.brightness = *(int *)arg;
control(priv, TVI_CONTROL_VID_SET_PICTURE, 0);
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_TRUE;
case TVI_CONTROL_VID_SET_HUE:
priv->picture.hue = *(int *)arg;
control(priv, TVI_CONTROL_VID_SET_PICTURE, 0);
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_TRUE;
case TVI_CONTROL_VID_SET_SATURATION:
priv->picture.colour = *(int *)arg;
control(priv, TVI_CONTROL_VID_SET_PICTURE, 0);
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_TRUE;
case TVI_CONTROL_VID_SET_CONTRAST:
priv->picture.contrast = *(int *)arg;
control(priv, TVI_CONTROL_VID_SET_PICTURE, 0);
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_TRUE;
case TVI_CONTROL_VID_GET_FPS:
*(int *)arg=priv->fps;
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_TRUE;
/* ========== TUNER controls =========== */
case TVI_CONTROL_TUN_GET_FREQ:
@@ -535,14 +535,14 @@
if (ioctl(priv->video_fd, VIDIOCGFREQ, &freq) == -1)
{
mpxp_err<<"ioctl get freq failed: "<<strerror(errno)<<std::endl;
- return(TVI_CONTROL_FALSE);
+ return TVI_CONTROL_FALSE;
}
/* tuner uses khz not mhz ! */
// if (priv->tuner.flags & VIDEO_TUNER_LOW)
// freq /= 1000;
*(unsigned long *)arg = freq;
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_TRUE;
}
case TVI_CONTROL_TUN_SET_FREQ:
{
@@ -557,29 +557,29 @@
if (ioctl(priv->video_fd, VIDIOCSFREQ, &freq) == -1)
{
mpxp_err<<"ioctl set freq failed: "<<strerror(errno)<<std::endl;
- return(TVI_CONTROL_FALSE);
+ return TVI_CONTROL_FALSE;
}
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_TRUE;
}
case TVI_CONTROL_TUN_GET_TUNER:
{
if (ioctl(priv->video_fd, VIDIOCGTUNER, &priv->tuner) == -1)
{
mpxp_err<<"ioctl get tuner failed: "<<strerror(errno)<<std::endl;
- return(TVI_CONTROL_FALSE);
+ return TVI_CONTROL_FALSE;
}
mpxp_v<<"Tuner ("<<priv->tuner.name<<") range: "<<priv->tuner.rangelow<<" ->"<<priv->tuner.rangehigh<<std::endl;
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_TRUE;
}
case TVI_CONTROL_TUN_SET_TUNER:
{
if (ioctl(priv->video_fd, VIDIOCSTUNER, &priv->tuner) == -1)
{
mpxp_err<<"ioctl get tuner failed: "<<strerror(errno)<<std::endl;
- return(TVI_CONTROL_FALSE);
+ return TVI_CONTROL_FALSE;
}
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_TRUE;
}
case TVI_CONTROL_TUN_SET_NORM:
{
@@ -591,53 +591,53 @@
((req_mode == VIDEO_MODE_SECAM) && !(priv->tuner.flags & VIDEO_TUNER_SECAM)))
{
mpxp_err<<"Tuner isn't capable to set norm!"<<std::endl;
- return(TVI_CONTROL_FALSE);
+ return TVI_CONTROL_FALSE;
}
priv->tuner.mode = req_mode;
if (control(priv, TVI_CONTROL_TUN_SET_TUNER, &priv->tuner) != TVI_CONTROL_TRUE)
- return(TVI_CONTROL_FALSE);
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_FALSE;
+ return TVI_CONTROL_TRUE;
}
case TVI_CONTROL_TUN_GET_NORM:
{
*(int *)arg = priv->tuner.mode;
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_TRUE;
}
/* ========== AUDIO controls =========== */
case TVI_CONTROL_AUD_GET_FORMAT:
{
*(int *)arg = priv->audio_format[priv->audio_id];
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_TRUE;
}
case TVI_CONTROL_AUD_GET_CHANNELS:
{
*(int *)arg = priv->audio_channels[priv->audio_id];
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_TRUE;
}
case TVI_CONTROL_AUD_GET_SAMPLERATE:
{
*(int *)arg = priv->audio_samplerate[priv->audio_id];
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_TRUE;
}
case TVI_CONTROL_AUD_GET_SAMPLESIZE:
{
*(int *)arg = priv->audio_samplesize[priv->audio_id]/8;
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_TRUE;
}
case TVI_CONTROL_AUD_SET_SAMPLERATE:
{
int tmp = priv->audio_samplerate[priv->audio_id] = *(int *)arg;
if (ioctl(priv->audio_fd, SNDCTL_DSP_SPEED, &tmp) == -1)
- return(TVI_CONTROL_FALSE);
+ return TVI_CONTROL_FALSE;
priv->audio_samplesize[priv->audio_id] =
priv->audio_samplerate[priv->audio_id]/8/priv->fps*
priv->audio_channels[priv->audio_id];
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_TRUE;
}
/* ========== SPECIFIC controls =========== */
case TVI_CONTROL_SPC_GET_INPUT:
@@ -656,9 +656,9 @@
if (ioctl(priv->video_fd, VIDIOCGCHAN, &priv->channels[i]) == -1)
{
mpxp_err<<"ioctl get channel failed: "<<strerror(errno)<<std::endl;
- return(TVI_CONTROL_FALSE);
+ return TVI_CONTROL_FALSE;
}
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_TRUE;
}
case TVI_CONTROL_SPC_SET_INPUT:
@@ -670,7 +670,7 @@
if (req_chan >= priv->capability.channels)
{
mpxp_err<<"Invalid input requested: "<<req_chan<<", valid: 0-"<<priv->capability.channels<<std::endl;
- return(TVI_CONTROL_FALSE);
+ return TVI_CONTROL_FALSE;
}
for (i = 0; i < priv->capability.channels; i++)
@@ -682,7 +682,7 @@
if (ioctl(priv->video_fd, VIDIOCSCHAN, &chan) == -1)
{
mpxp_err<<"ioctl set chan failed: "<<strerror(errno)<<std::endl;
- return(TVI_CONTROL_FALSE);
+ return TVI_CONTROL_FALSE;
}
mpxp_v<<"Using input: "<<chan.name<<std::endl;
@@ -695,11 +695,11 @@
/* update local channel list */
control(priv, TVI_CONTROL_SPC_GET_INPUT, &req_chan);
- return(TVI_CONTROL_TRUE);
+ return TVI_CONTROL_TRUE;
}
}
- return(TVI_CONTROL_UNKNOWN);
+ return TVI_CONTROL_UNKNOWN;
}
static double grab_video_frame(struct priv_s *priv,unsigned char *buffer, int len)
@@ -712,7 +712,7 @@
if (ioctl(priv->video_fd, VIDIOCMCAPTURE, &priv->buf[nextframe]) == -1)
{
mpxp_err<<"ioctl mcapture failed: "<<strerror(errno)<<std::endl;
- return(0);
+ return 0;
}
while (ioctl(priv->video_fd, VIDIOCSYNC, &priv->buf[frame].frame) < 0 &&
@@ -729,12 +729,12 @@
/* copy the actual frame */
memcpy(buffer, priv->mmap+priv->mbuf.offsets[frame], len);
- return(timestamp-priv->starttime);
+ return timestamp-priv->starttime;
}
static int get_video_framesize(struct priv_s *priv)
{
- return(priv->bytesperline * priv->height);
+ return priv->bytesperline * priv->height;
}
static double grab_audio_frame(struct priv_s *priv,unsigned char *buffer, int len)
@@ -759,8 +759,8 @@
static int get_audio_framesize(struct priv_s *priv)
{
- return(priv->audio_blocksize);
-// return(priv->audio_samplesize[priv->audio_id]);
+ return priv->audio_blocksize;
+// return priv->audio_samplesize[priv->audio_id];
}
#endif /* USE_TV */
Modified: mplayerxp/libvo2/img_format.cpp
===================================================================
--- mplayerxp/libvo2/img_format.cpp 2012-12-22 13:51:04 UTC (rev 598)
+++ mplayerxp/libvo2/img_format.cpp 2012-12-22 14:32:53 UTC (rev 599)
@@ -11,62 +11,62 @@
static char unknow_format[20];
switch(format)
{
- case IMGFMT_RGB1: return("RGB 1-bit");
- case IMGFMT_RGB4: return("RGB 4-bit");
- case IMGFMT_RG4B: return("RGB 4-bit per byte");
- case IMGFMT_RGB8: return("RGB 8-bit");
- case IMGFMT_RGB15: return("RGB 15-bit");
- case IMGFMT_RGB16: return("RGB 16-bit");
- case IMGFMT_RGB24: return("RGB 24-bit");
- case IMGFMT_RGB48NE: return("RGB 48-bit");
-// case IMGFMT_RGB32: return("RGB 32-bit");
- case IMGFMT_BGR1: return("BGR 1-bit");
- case IMGFMT_BGR4: return("BGR 4-bit");
- case IMGFMT_BG4B: return("BGR 4-bit per byte");
- case IMGFMT_BGR8: return("BGR 8-bit");
- case IMGFMT_BGR15: return("BGR 15-bit");
- case IMGFMT_BGR16: return("BGR 16-bit");
- case IMGFMT_BGR24: return("BGR 24-bit");
- case IMGFMT_BGR48NE: return("BGR 48-bit");
-// case IMGFMT_BGR32: return("BGR 32-bit");
- case IMGFMT_ABGR: return("ABGR");
- case IMGFMT_BGRA: return("BGRA");
- case IMGFMT_ARGB: return("ARGB");
- case IMGFMT_RGBA: return("RGBA");
- case IMGFMT_YVU9: return("Planar YVU9");
- case IMGFMT_IF09: return("Planar IF09");
- case IMGFMT_YV12: return("Planar YV12");
- case IMGFMT_I420: return("Planar I420");
- case IMGFMT_IYUV: return("Planar IYUV");
- case IMGFMT_CLPL: return("Planar CLPL");
- case IMGFMT_Y800: return("Planar Y800");
- case IMGFMT_Y8: return("Planar Y8");
- case IMGFMT_444P: return("Planar 444P");
- case IMGFMT_422P: return("Planar 422P");
- case IMGFMT_411P: return("Planar 411P");
- case IMGFMT_NV12: return("Planar NV12");
- case IMGFMT_NV21: return("Planar NV21");
- case IMGFMT_HM12: return("Planar NV12 Macroblock");
- case IMGFMT_IUYV: return("Packed IUYV");
- case IMGFMT_IY41: return("Packed IY41");
- case IMGFMT_IYU1: return("Packed IYU1");
- case IMGFMT_IYU2: return("Packed IYU2");
- case IMGFMT_UYVY: return("Packed UYVY");
- case IMGFMT_UYNV: return("Packed UYNV");
- case IMGFMT_cyuv: return("Packed CYUV");
- case IMGFMT_Y422: return("Packed Y422");
- case IMGFMT_YUY2: return("Packed YUY2");
- case IMGFMT_YUNV: return("Packed YUNV");
- case IMGFMT_YVYU: return("Packed YVYU");
- case IMGFMT_Y41P: return("Packed Y41P");
- case IMGFMT_Y211: return("Packed Y211");
- case IMGFMT_Y41T: return("Packed Y41T");
- case IMGFMT_Y42T: return("Packed Y42T");
- case IMGFMT_V422: return("Packed V422");
- case IMGFMT_V655: return("Packed V655");
- case IMGFMT_CLJR: return("Packed CLJR");
- case IMGFMT_YUVP: return("Packed YUVP");
- case IMGFMT_UYVP: return("Packed UYVP");
+ case IMGFMT_RGB1: return "RGB 1-bit";
+ case IMGFMT_RGB4: return "RGB 4-bit";
+ case IMGFMT_RG4B: return "RGB 4-bit per byte";
+ case IMGFMT_RGB8: return "RGB 8-bit";
+ case IMGFMT_RGB15: return "RGB 15-bit";
+ case IMGFMT_RGB16: return "RGB 16-bit";
+ case IMGFMT_RGB24: return "RGB 24-bit";
+ case IMGFMT_RGB48NE: return "RGB 48-bit";
+// case IMGFMT_RGB32: return "RGB 32-bit";
+ case IMGFMT_BGR1: return "BGR 1-bit";
+ case IMGFMT_BGR4: return "BGR 4-bit";
+ case IMGFMT_BG4B: return "BGR 4-bit per byte";
+ case IMGFMT_BGR8: return "BGR 8-bit";
+ case IMGFMT_BGR15: return "BGR 15-bit";
+ case IMGFMT_BGR16: return "BGR 16-bit";
+ case IMGFMT_BGR24: return "BGR 24-bit";
+ case IMGFMT_BGR48NE: return "BGR 48-bit";
+// case IMGFMT_BGR32: return "BGR 32-bit";
+ case IMGFMT_ABGR: return "ABGR";
+ case IMGFMT_BGRA: return "BGRA";
+ case IMGFMT_ARGB: return "ARGB";
+ case IMGFMT_RGBA: return "RGBA";
+ case IMGFMT_YVU9: return "Planar YVU9";
+ case IMGFMT_IF09: return "Planar IF09";
+ case IMGFMT_YV12: return "Planar YV12";
+ case IMGFMT_I420: return "Planar I420";
+ case IMGFMT_IYUV: return "Planar IYUV";
+ case IMGFMT_CLPL: return "Planar CLPL";
+ case IMGFMT_Y800: return "Planar Y800";
+ case IMGFMT_Y8: return "Planar Y8";
+ case IMGFMT_444P: return "Planar 444P";
+ case IMGFMT_422P: return "Planar 422P";
+ case IMGFMT_411P: return "Planar 411P";
+ case IMGFMT_NV12: return "Planar NV12";
+ case IMGFMT_NV21: return "Planar NV21";
+ case IMGFMT_HM12: return "Planar NV12 Macroblock";
+ case IMGFMT_IUYV: return "Packed IUYV";
+ case IMGFMT_IY41: return "Packed IY41";
+ case IMGFMT_IYU1: return "Packed IYU1";
+ case IMGFMT_IYU2: return "Packed IYU2";
+ case IMGFMT_UYVY: return "Packed UYVY";
+ case IMGFMT_UYNV: return "Packed UYNV";
+ case IMGFMT_cyuv: return "Packed CYUV";
+ case IMGFMT_Y422: return "Packed Y422";
+ case IMGFMT_YUY2: return "Packed YUY2";
+ case IMGFMT_YUNV: return "Packed YUNV";
+ case IMGFMT_YVYU: return "Packed YVYU";
+ case IMGFMT_Y41P: return "Packed Y41P";
+ case IMGFMT_Y211: return "Packed Y211";
+ case IMGFMT_Y41T: return "Packed Y41T";
+ case IMGFMT_Y42T: return "Packed Y42T";
+ case IMGFMT_V422: return "Packed V422";
+ case IMGFMT_V655: return "Packed V655";
+ case IMGFMT_CLJR: return "Packed CLJR";
+ case IMGFMT_YUVP: return "Packed YUVP";
+ case IMGFMT_UYVP: return "Packed UYVP";
case IMGFMT_420A: return "Planar YV12 with alpha";
case IMGFMT_420P16_LE: return "Planar 420P 16-bit little-endian";
case IMGFMT_420P16_BE: return "Planar 420P 16-bit big-endian";
@@ -74,12 +74,12 @@
case IMGFMT_422P16_BE: return "Planar 422P 16-bit big-endian";
case IMGFMT_444P16_LE: return "Planar 444P 16-bit little-endian";
case IMGFMT_444P16_BE: return "Planar 444P 16-bit big-endian";
- case IMGFMT_MPEGPES: return("Mpeg PES");
- case IMGFMT_ZRMJPEGNI: return("Zoran MJPEG non-interlaced");
- case IMGFMT_ZRMJPEGIT: return("Zoran MJPEG top field first");
- case IMGFMT_ZRMJPEGIB: return("Zoran MJPEG bottom field first");
- case IMGFMT_XVMC_MOCO_MPEG2: return("MPEG1/2 Motion Compensation");
- case IMGFMT_XVMC_IDCT_MPEG2: return("MPEG1/2 Motion Compensation and IDCT");
+ case IMGFMT_MPEGPES: return "Mpeg PES";
+ case IMGFMT_ZRMJPEGNI: return "Zoran MJPEG non-interlaced";
+ case IMGFMT_ZRMJPEGIT: return "Zoran MJPEG top field first";
+ case IMGFMT_ZRMJPEGIB: return "Zoran MJPEG bottom field first";
+ case IMGFMT_XVMC_MOCO_MPEG2: return "MPEG1/2 Motion Compensation";
+ case IMGFMT_XVMC_IDCT_MPEG2: return "MPEG1/2 Motion Compensation and IDCT";
}
char *p=reinterpret_cast<char *>(&format);
if(isprint(p[0])&&isprint(p[1])&&isprint(p[2])&&isprint(p[4]))
Modified: mplayerxp/osdep/getch2.cpp
===================================================================
--- mplayerxp/osdep/getch2.cpp 2012-12-22 13:51:04 UTC (rev 598)
+++ mplayerxp/osdep/getch2.cpp 2012-12-22 14:32:53 UTC (rev 599)
@@ -121,7 +121,7 @@
static void get_screen_size(){
#ifdef USE_IOCTL
struct winsize ws;
- if (ioctl(0, TIOCGWINSZ, &ws) < 0 || !ws.ws_row || !ws.ws_col) return;
+ if (::ioctl(0, TIOCGWINSZ, &ws) < 0 || !ws.ws_row || !ws.ws_col) return;
screen_width=ws.ws_col;
screen_height=ws.ws_row;
#endif
@@ -141,10 +141,10 @@
FD_ZERO(&rfds); FD_SET(0,&rfds);
/* Wait up to 'time' microseconds. */
tv.tv_sec=_time/1000; tv.tv_usec = (_time%1000)*1000;
- retval=select(1, &rfds, NULL, NULL, &tv);
+ retval=::select(1, &rfds, NULL, NULL, &tv);
if(retval<=0) return -1;
/* Data is available now. */
- retval=read(0,&getch2_buf[getch2_len],BUF_LEN-getch2_len);
+ retval=::read(0,&getch2_buf[getch2_len],BUF_LEN-getch2_len);
if(retval<1) return -1;
getch2_len+=retval;
}
@@ -220,22 +220,22 @@
#ifdef HAVE_TERMIOS
struct termios tio_new;
#if defined(__NetBSD__) || defined(__svr4__) || defined(__CYGWIN__)
- tcgetattr(0,&tio_orig);
+ ::tcgetattr(0,&tio_orig);
#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__)
- ioctl(0,TIOCGETA,&tio_orig);
+ ::ioctl(0,TIOCGETA,&tio_orig);
#else
- ioctl(0,TCGETS,&tio_orig);
+ ::ioctl(0,TCGETS,&tio_orig);
#endif
tio_new=tio_orig;
tio_new.c_lflag &= ~(ICANON|ECHO); /* Clear ICANON and ECHO. */
tio_new.c_cc[VMIN] = 1;
tio_new.c_cc[VTIME] = 0;
#if defined(__NetBSD__) || defined(__svr4__) || defined(__CYGWIN__) || defined(__OS2__)
- tcsetattr(0,TCSANOW,&tio_new);
+ ::tcsetattr(0,TCSANOW,&tio_new);
#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__)
- ioctl(0,TIOCSETA,&tio_new);
+ ::ioctl(0,TIOCSETA,&tio_new);
#else
- ioctl(0,TCSETS,&tio_new);
+ ::ioctl(0,TCSETS,&tio_new);
#endif
#endif
getch2_status=1;
@@ -245,11 +245,11 @@
if(!getch2_status) return; // already disabled / never enabled
#ifdef HAVE_TERMIOS
#if defined(__NetBSD__) || defined(__svr4__) || defined(__CYGWIN__) || defined(__OS2__)
- tcsetattr(0,TCSANOW,&tio_orig);
+ ::tcsetattr(0,TCSANOW,&tio_orig);
#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__)
- ioctl(0,TIOCSETA,&tio_orig);
+ ::ioctl(0,TIOCSETA,&tio_orig);
#else
- ioctl(0,TCSETS,&tio_orig);
+ ::ioctl(0,TCSETS,&tio_orig);
#endif
#endif
getch2_status=0;
Modified: mplayerxp/osdep/mp_malloc.cpp
===================================================================
--- mplayerxp/osdep/mp_malloc.cpp 2012-12-22 13:51:04 UTC (rev 598)
+++ mplayerxp/osdep/mp_malloc.cpp 2012-12-22 14:32:53 UTC (rev 599)
@@ -91,7 +91,7 @@
}
}
c->slots=s;
- memset(&c->slots[c->nslots],0,sizeof(mp_slot_t));
+ ::memset(&c->slots[c->nslots],0,sizeof(mp_slot_t));
c->slots[c->nslots].page_ptr=ptr;
c->slots[c->nslots].size=size;
c->nslots++;
@@ -101,7 +101,7 @@
static void prot_free_slot(mp_slot_container_t* c,any_t* ptr) {
size_t idx=prot_find_slot_idx(c,ptr);
if(idx!=UINT_MAX) {
- memmove(&c->slots[idx],&c->slots[idx+1],sizeof(mp_slot_t)*(c->nslots-(idx+1)));
+ ::memmove(&c->slots[idx],&c->slots[idx+1],sizeof(mp_slot_t)*(c->nslots-(idx+1)));
c->nslots--;
if(c->nslots<c->size-16) {
c->size-=16;
@@ -115,11 +115,11 @@
static any_t* __prot_malloc_append(size_t size) {
any_t* rp;
size_t fullsize=app_fullsize(size);
- rp=memalign(__VM_PAGE_SIZE__,fullsize);
+ rp=::memalign(__VM_PAGE_SIZE__,fullsize);
if(rp) {
prot_append_slot(&priv->mallocs,rp,size);
// protect last page here
- mprotect(prot_last_page(rp,fullsize),__VM_PAGE_SIZE__,MP_DENY_ALL);
+ ::mprotect(prot_last_page(rp,fullsize),__VM_PAGE_SIZE__,MP_DENY_ALL);
rp=reinterpret_cast<any_t*>(reinterpret_cast<long>(rp)+fullsize-__VM_PAGE_SIZE__-size);
}
return rp;
@@ -143,8 +143,8 @@
static void uninit_bt_cache(bt_cache_t* cache) {
unsigned i;
for(i=0;i<cache->num_entries;i++) free(cache->entry[i].str);
- free(cache->entry);
- free(cache);
+ ::free(cache->entry);
+ ::free(cache);
}
static char* bt_find_cache(bt_cache_t* cache,any_t* ptr) {
@@ -165,19 +165,19 @@
static char* exec_addr2line(any_t*ptr, char* result,unsigned len) {
unsigned i;
char ch,cmd[4096];
- sprintf(cmd,"addr2line -s -e %s %p\n",priv->argv0,ptr);
- FILE* in=popen(cmd,"r");
+ ::sprintf(cmd,"addr2line -s -e %s %p\n",priv->argv0,ptr);
+ FILE* in=::popen(cmd,"r");
if(!in) return NULL;
i=0;
while(1) {
- ch=fgetc(in);
- if(feof(in)) break;
+ ch=::fgetc(in);
+ if(::feof(in)) break;
if(ch=='\n') break;
result[i++]=ch;
if(i>=len-1) break;
}
result[i]='\0';
- pclose(in);
+ ::pclose(in);
return result;
}
@@ -199,7 +199,7 @@
bt_cache_t* cache=init_bt_cache();
any_t* calls[num];
unsigned i,ncalls;
- ncalls=backtrace(calls,num);
+ ncalls=::backtrace(calls,num);
mpxp_info<<"*** Backtrace for suspect call ***"<<std::endl;
for(i=0;i<ncalls;i++) {
mpxp_info<<" "<<calls[i]<<" -> "<<addr2line(cache,calls[i])<<std::endl;
@@ -220,14 +220,14 @@
any_t *page_ptr=prot_page_align(ptr);
mp_slot_t* slot=prot_find_slot(&priv->mallocs,page_ptr);
if(!slot) {
- printf("[__prot_free_append] suspect call found! Can't find slot for address: %p [aligned: %p]\n",ptr,page_ptr);
+ ::printf("[__prot_free_append] suspect call found! Can't find slot for address: %p [aligned: %p]\n",ptr,page_ptr);
__prot_print_slots(&priv->mallocs);
__print_backtrace(Max_BackTraces);
- kill(getpid(), SIGILL);
+ ::kill(::getpid(), SIGILL);
}
size_t fullsize=app_fullsize(slot->size);
- mprotect(prot_last_page(page_ptr,fullsize),__VM_PAGE_SIZE__,MP_PROT_READ|MP_PROT_WRITE);
- free(page_ptr);
+ ::mprotect(prot_last_page(page_ptr,fullsize),__VM_PAGE_SIZE__,MP_PROT_READ|MP_PROT_WRITE);
+ ::free(page_ptr);
prot_free_slot(&priv->mallocs,page_ptr);
}
@@ -236,12 +236,12 @@
if((rp=__prot_malloc_append(size))!=NULL && ptr) {
mp_slot_t* slot=prot_find_slot(&priv->mallocs,prot_page_align(ptr));
if(!slot) {
- printf("[__prot_realloc_append] suspect call found! Can't find slot for address: %p [aligned: %p]\n",ptr,prot_page_align(ptr));
+ ::printf("[__prot_realloc_append] suspect call found! Can't find slot for address: %p [aligned: %p]\n",ptr,prot_page_align(ptr));
__prot_print_slots(&priv->mallocs);
__print_backtrace(Max_BackTraces);
- kill(getpid(), SIGILL);
+ ::kill(::getpid(), SIGILL);
}
- memcpy(rp,ptr,std::min(slot->size,size));
+ ::memcpy(rp,ptr,std::min(slot->size,size));
__prot_free_append(ptr);
}
return rp;
@@ -254,11 +254,11 @@
static any_t* __prot_malloc_prepend(size_t size) {
any_t* rp;
size_t fullsize=pre_fullsize(size);
- rp=memalign(__VM_PAGE_SIZE__,fullsize);
+ rp=::memalign(__VM_PAGE_SIZE__,fullsize);
if(rp) {
prot_append_slot(&priv->mallocs,rp,size);
// protect last page here
- mprotect(rp,__VM_PAGE_SIZE__,MP_DENY_ALL);
+ ::mprotect(rp,__VM_PAGE_SIZE__,MP_DENY_ALL);
rp=reinterpret_cast<any_t*>(reinterpret_cast<long>(rp)+__VM_PAGE_SIZE__);
}
return rp;
@@ -270,13 +270,13 @@
any_t *page_ptr=pre_page_align(ptr);
mp_slot_t* slot=prot_find_slot(&priv->mallocs,page_ptr);
if(!slot) {
- printf("[__prot_free_prepend] suspect call found! Can't find slot for address: %p [aligned: %p]\n",ptr,page_ptr);
+ ::printf("[__prot_free_prepend] suspect call found! Can't find slot for address: %p [aligned: %p]\n",ptr,page_ptr);
__prot_print_slots(&priv->mallocs);
__print_backtrace(Max_BackTraces);
- kill(getpid(), SIGILL);
+ ::kill(::getpid(), SIGILL);
}
- mprotect(page_ptr,__VM_PAGE_SIZE__,MP_PROT_READ|MP_PROT_WRITE);
- free(page_ptr);
+ ::mprotect(page_ptr,__VM_PAGE_SIZE__,MP_PROT_READ|MP_PROT_WRITE);
+ ::free(page_ptr);
prot_free_slot(&priv->mallocs,page_ptr);
}
@@ -285,12 +285,12 @@
if((rp=__prot_malloc_prepend(size))!=NULL && ptr) {
mp_slot_t* slot=prot_find_slot(&priv->mallocs,pre_page_align(ptr));
if(!slot) {
- printf("[__prot_realloc_prepend] suspect call found! Can't find slot for address: %p [aligned: %p]\n",ptr,pre_page_align(ptr));
+ ::printf("[__prot_realloc_prepend] suspect call found! Can't find slot for address: %p [aligned: %p]\n",ptr,pre_page_align(ptr));
__prot_print_slots(&priv->mallocs);
__print_backtrace(Max_BackTraces);
- kill(getpid(), SIGILL);
+ ::kill(getpid(), SIGILL);
}
- memcpy(rp,ptr,std::min(slot->size,size));
+ ::memcpy(rp,ptr,std::min(slot->size,size));
__prot_free_prepend(ptr);
}
return rp;
@@ -325,21 +325,21 @@
static __always_inline any_t* bt_malloc(size_t size) {
any_t*rp;
mp_slot_t* slot;
- rp=malloc(size);
+ rp=::malloc(size);
if(rp) {
slot=prot_append_slot(&priv->mallocs,rp,size);
- slot->ncalls=backtrace(slot->calls,Max_BackTraces);
+ slot->ncalls=::backtrace(slot->calls,Max_BackTraces);
}
return rp;
}
static __always_inline any_t* bt_memalign(size_t boundary,size_t size) {
any_t*rp;
- rp=memalign(boundary,size);
+ rp=::memalign(boundary,size);
if(rp) {
mp_slot_t* slot;
slot=prot_append_slot(&priv->mallocs,rp,size);
- slot->ncalls=backtrace(slot->calls,Max_BackTraces);
+ slot->ncalls=::backtrace(slot->calls,Max_BackTraces);
}
return rp;
}
@@ -348,14 +348,14 @@
any_t* rp;
mp_slot_t* slot;
if(!ptr) return bt_malloc(size);
- rp=realloc(ptr,size);
+ rp=::realloc(ptr,size);
if(rp) {
slot=prot_find_slot(&priv->mallocs,ptr);
if(!slot) {
mpxp_warn<<"[bt_realloc] suspect call found! Can't find slot for address: "<<ptr<<std::endl;
mp_slot_t* _slot;
_slot=prot_append_slot(&priv->reallocs,ptr,size);
- _slot->ncalls=backtrace(_slot->calls,Max_BackTraces);
+ _slot->ncalls=::backtrace(_slot->calls,Max_BackTraces);
} else {
slot->page_ptr=rp; // update address after realloc
slot->size=size;
@@ -370,11 +370,11 @@
mpxp_warn<<"[bt_free] suspect call found! Can't find slot for address: "<<ptr<<std::endl;
mp_slot_t* _slot;
_slot=prot_append_slot(&priv->frees,ptr,0);
- _slot->ncalls=backtrace(_slot->calls,Max_BackTraces);
+ _slot->ncalls=::backtrace(_slot->calls,Max_BackTraces);
return;
}
prot_free_slot(&priv->mallocs,ptr);
- free(ptr);
+ ::free(ptr);
}
/*======== STATISTICS =======*/
@@ -387,7 +387,7 @@
mpxp_info<<"address: "<<c->slots[i].page_ptr<<" size: "<<c->slots[i].size<<" dump: ";
s=reinterpret_cast<char *>(c->slots[i].page_ptr);
for(j=0;j<std::min(c->slots[i].size,size_t(20));j++) {
- if(!isprint(s[j])) {
+ if(!::isprint(s[j])) {
printable=0;
break;
}
@@ -405,9 +405,9 @@
/* ================== HEAD FUNCTIONS ======================= */
void mp_init_malloc(const char *argv0,unsigned rnd_limit,unsigned every_nth_call,enum mp_malloc_e flags)
{
- srand(time(0));
- if(!priv) priv=(priv_t*)malloc(sizeof(priv_t));
- memset(priv,0,sizeof(priv_t));
+ ::srand(::time(0));
+ if(!priv) priv=(priv_t*)::malloc(sizeof(priv_t));
+ ::memset(priv,0,sizeof(priv_t));
priv->argv0=argv0;
priv->rnd_limit=rnd_limit;
priv->every_nth_call=every_nth_call;
@@ -450,7 +450,7 @@
}
if(done) mpxp_hint<<std::endl<<"For source lines you may also print in (gdb): list *0xADDRESS"<<std::endl;
uninit_bt_cache(cache);
- free(priv);
+ ::free(priv);
priv=NULL;
}
@@ -460,13 +460,13 @@
if(!priv) mp_init_malloc(NULL,1000,10,MPA_FLG_RANDOMIZER);
if(priv->every_nth_call && priv->rnd_limit && !priv->flags) {
if(priv->total_calls%priv->every_nth_call==0) {
- rnd_buff=malloc(rand()%priv->rnd_limit);
+ rnd_buff=::malloc(::rand()%priv->rnd_limit);
}
}
if(priv->flags&(MPA_FLG_BOUNDS_CHECK|MPA_FLG_BEFORE_CHECK)) rb=prot_malloc(__size);
else if(priv->flags&MPA_FLG_BACKTRACE) rb=bt_malloc(__size);
else rb=malloc(__size);
- if(rnd_buff) free(rnd_buff);
+ if(rnd_buff) ::free(rnd_buff);
priv->total_calls++;
return rb;
}
@@ -499,7 +499,7 @@
else if(priv->flags&MPA_FLG_BACKTRACE)
bt_free(__ptr);
else
- free(__ptr);
+ ::free(__ptr);
}
}
@@ -508,7 +508,7 @@
any_t* mp_mallocz (size_t __size) {
any_t* rp;
rp=mp_malloc(__size);
- if(rp) memset(rp,0,__size);
+ if(rp) ::memset(rp,0,__size);
return rp;
}
@@ -524,7 +524,7 @@
int __FASTCALL__ mp_mprotect(any_t* addr,size_t len,enum mp_prot_e flags)
{
- return mprotect(addr,len,flags);
+ return ::mprotect(addr,len,flags);
}
} // namespace mpxp
Modified: mplayerxp/osdep/mplib.cpp
===================================================================
--- mplayerxp/osdep/mplib.cpp 2012-12-22 13:51:04 UTC (rev 598)
+++ mplayerxp/osdep/mplib.cpp 2012-12-22 14:32:53 UTC (rev 599)
@@ -21,7 +21,7 @@
unsigned i;
char ch;
for(i=0;i<size;i++) {
- ch=rand()%255;
+ ch=::rand()%255;
((char *)buffer)[i]=ch;
}
return buffer;
@@ -34,17 +34,17 @@
long hi_mask=~lo_mask;
long filler;
for(i=0;i<psize/sizeof(long);i++) {
- filler=rand()&lo_mask;
+ filler=::rand()&lo_mask;
filler=(reinterpret_cast<long>(buffer)&hi_mask)|lo_mask;
- ((long *)buffer)[i]=rand()%2?filler:0;
+ ((long *)buffer)[i]=::rand()%2?filler:0;
}
- memset(&((char *)buffer)[psize],0,size-psize);
+ ::memset(&((char *)buffer)[psize],0,size-psize);
return buffer;
}
any_t* get_caller_address(unsigned num_caller) {
any_t* stack[3+num_caller];
- backtrace(stack,3+num_caller);
+ ::backtrace(stack,3+num_caller);
return stack[2+num_caller];
}
Modified: mplayerxp/osdep/shmem.cpp
===================================================================
--- mplayerxp/osdep/shmem.cpp 2012-12-22 13:51:04 UTC (rev 598)
+++ mplayerxp/osdep/shmem.cpp 2012-12-22 14:32:53 UTC (rev 599)
@@ -45,7 +45,7 @@
switch(shmem_type){
case 0: // ========= MAP_ANON|MAP_SHARED ==========
#ifdef MAP_ANON
- p=mmap(0,size,PROT_READ|PROT_WRITE,MAP_ANON|MAP_SHARED,-1,0);
+ p=::mmap(0,size,PROT_READ|PROT_WRITE,MAP_ANON|MAP_SHARED,-1,0);
if(p==MAP_FAILED) break; // failed
mpxp_dbg2<<"shmem: "<<size<<" bytes allocated using mmap anon"<<std::endl;
return p;
@@ -55,8 +55,8 @@
#endif
break;
case 1: // ========= MAP_SHARED + /dev/zero ==========
- if (devzero == -1 && (devzero = open("/dev/zero", O_RDWR, 0)) == -1) break;
- p=mmap(0,size,PROT_READ|PROT_WRITE,MAP_SHARED,devzero,0);
+ if (devzero == -1 && (devzero = ::open("/dev/zero", O_RDWR, 0)) == -1) break;
+ p=::mmap(0,size,PROT_READ|PROT_WRITE,MAP_SHARED,devzero,0);
if(p==MAP_FAILED) break; // failed
mpxp_dbg2<<"shmem: "<<size<<" bytes allocated using mmap /dev/zero"<<std::endl;
return p;
@@ -64,22 +64,22 @@
#ifdef HAVE_SHM
struct shmid_ds shmemds;
int shmemid;
- if ((shmemid = shmget(IPC_PRIVATE, size, IPC_CREAT | 0600)) == -1) break;
- if ((p = shmat(shmemid, 0, 0)) == (any_t*)-1){
+ if ((shmemid = ::shmget(IPC_PRIVATE, size, IPC_CREAT | 0600)) == -1) break;
+ if ((p = ::shmat(shmemid, 0, 0)) == (any_t*)-1){
mpxp_err<<"shmem: shmat() failed: "<<strerror(errno)<<std::endl;
- shmctl (shmemid, IPC_RMID, &shmemds);
+ ::shmctl (shmemid, IPC_RMID, &shmemds);
break;
}
- if (shmctl(shmemid, IPC_RMID, &shmemds) == -1) {
+ if (::shmctl(shmemid, IPC_RMID, &shmemds) == -1) {
mpxp_err<<"shmem: shmctl() failed: "<<strerror(errno)<<std::endl;
- if (shmdt(p) == -1) perror ("shmdt()");
+ if (::shmdt(p) == -1) perror ("shmdt()");
break;
}
mpxp_dbg2<<"shmem: "<<size<<" bytes allocated using SHM"<<std::endl;
return p;
#else
mpxp_fatal<<"shmem: no SHM support was compiled in!"<<std::endl;
- return(NULL);
+ return NULL;
#endif
}
default:
@@ -94,7 +94,7 @@
switch(shmem_type){
case 2:
#ifdef HAVE_SHM
- if (shmdt(p) == -1)
+ if (::shmdt(p) == -1)
mpxp_err<<"shmfree: shmdt() failed: "<<strerror(errno)<<std::endl;
#else
mpxp_err<<"shmfree: no SHM support was compiled in!"<<std::endl;
Modified: mplayerxp/osdep/timer-lx.cpp
===================================================================
--- mplayerxp/osdep/timer-lx.cpp 2012-12-22 13:51:04 UTC (rev 598)
+++ mplayerxp/osdep/timer-lx.cpp 2012-12-22 14:32:53 UTC (rev 599)
@@ -38,7 +38,7 @@
// float s;
::gettimeofday(&tv,NULL);
// s=tv.tv_usec;s*=0.000001;s+=tv.tv_sec;
- return (tv.tv_sec*1000000ULL+tv.tv_usec);
+ return tv.tv_sec*1000000ULL+tv.tv_usec;
}
// Returns current time in milliseconds
@@ -48,7 +48,7 @@
// float s;
::gettimeofday(&tv,NULL);
// s=tv.tv_usec;s*=0.000001;s+=tv.tv_sec;
- return (tv.tv_sec*1000+tv.tv_usec/1000);
+ return tv.tv_sec*1000+tv.tv_usec/1000;
}
static unsigned int RelativeTime=0;
@@ -67,7 +67,7 @@
int rtc_fd=-1;
GetRelativeTime();
#ifdef HAVE_RTC
- if ((rtc_fd = ::open("/dev/rtc", O_RDONLY)) < 0) perror ("Linux RTC init: open");
+ if ((rtc_fd = ::open("/dev/rtc", O_RDONLY)) < 0) ::perror ("Linux RTC init: open");
else {
unsigned long irqp;
Modified: mplayerxp/osdep/timer.cpp
===================================================================
--- mplayerxp/osdep/timer.cpp 2012-12-22 13:51:04 UTC (rev 598)
+++ mplayerxp/osdep/timer.cpp 2012-12-22 14:32:53 UTC (rev 599)
@@ -21,15 +21,15 @@
unsigned ret;
struct itimerval itimer;
user_func = func;
- getitimer(ITIMER_REAL,&otimer);
- old_alrm = signal(SIGALRM,my_alarm_handler);
- signal(SIGALRM,my_alarm_handler);
+ ::getitimer(ITIMER_REAL,&otimer);
+ old_alrm = ::signal(SIGALRM,my_alarm_handler);
+ ::signal(SIGALRM,my_alarm_handler);
itimer.it_interval.tv_sec = 0;
itimer.it_interval.tv_usec = ms*1000;
itimer.it_value.tv_sec = 0;
itimer.it_value.tv_usec = ms*1000;
- setitimer(ITIMER_REAL,&itimer,NULL);
- getitimer(ITIMER_REAL,&itimer);
+ ::setitimer(ITIMER_REAL,&itimer,NULL);
+ ::getitimer(ITIMER_REAL,&itimer);
ret = itimer.it_interval.tv_sec*1000 + itimer.it_interval.tv_usec/1000;
if(!ret) restore_timer();
return ret;
Modified: mplayerxp/postproc/aflib.cpp
===================================================================
--- mplayerxp/postproc/aflib.cpp 2012-12-22 13:51:04 UTC (rev 598)
+++ mplayerxp/postproc/aflib.cpp 2012-12-22 14:32:53 UTC (rev 599)
@@ -596,7 +596,7 @@
sum += u;
n++;
} while (u >= BIZ_EPSILON * sum);
- return(sum);
+ return sum;
}
/*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
