[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[590] mplayerxp/libvo2
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[590] mplayerxp/libvo2
|
From: <nic...@us...> - 2012-12-21 11:05:26
|
Revision: 590
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=590&view=rev
Author: nickols_k
Date: 2012-12-21 11:05:14 +0000 (Fri, 21 Dec 2012)
Log Message:
-----------
remove #defines
Modified Paths:
--------------
mplayerxp/libvo2/screenshot.cpp
mplayerxp/libvo2/sub.cpp
mplayerxp/libvo2/vo_opengl.cpp
mplayerxp/libvo2/vo_sdl.cpp
mplayerxp/libvo2/vo_vesa.cpp
mplayerxp/libvo2/vo_xv.cpp
mplayerxp/libvo2/x11_system.cpp
Modified: mplayerxp/libvo2/screenshot.cpp
===================================================================
--- mplayerxp/libvo2/screenshot.cpp 2012-12-21 10:48:09 UTC (rev 589)
+++ mplayerxp/libvo2/screenshot.cpp 2012-12-21 11:05:14 UTC (rev 590)
@@ -31,8 +31,8 @@
#include "postproc/vf_scale.h"
#include "vo_msg.h"
-#define RGB 0
-#define BGR 1
+static const int RGB=0;
+static const int BGR=1;
typedef struct sshot_priv_s {
int cspace;
unsigned image_width,image_height;
Modified: mplayerxp/libvo2/sub.cpp
===================================================================
--- mplayerxp/libvo2/sub.cpp 2012-12-21 10:48:09 UTC (rev 589)
+++ mplayerxp/libvo2/sub.cpp 2012-12-21 11:05:14 UTC (rev 590)
@@ -14,7 +14,6 @@
#include "sub.h"
#include "libmpsub/spudec.h"
#include "libmpsub/vobsub.h"
-#define MSGT_CLASS MSGT_OSD
#include "vo_msg.h"
namespace mpxp {
@@ -79,7 +78,7 @@
}
}
-#define OSD_NAV_BOX_ALPHA 0x7f
+static const int OSD_NAV_BOX_ALPHA=0x7f;
static void vo_update_nav (mp_osd_obj_t *obj, int dxs, int dys) {
int len;
Modified: mplayerxp/libvo2/vo_opengl.cpp
===================================================================
--- mplayerxp/libvo2/vo_opengl.cpp 2012-12-21 10:48:09 UTC (rev 589)
+++ mplayerxp/libvo2/vo_opengl.cpp 2012-12-21 11:05:14 UTC (rev 590)
@@ -113,6 +113,12 @@
#endif
}
+static const float FOVY=60.0f;
+static const float ASPECT=1.0f;
+static const float Z_NEAR=0.1f;
+static const float Z_FAR=100.0f;
+static const float Z_CAMERA=0.869f;
+
void OpenGL_VO_Interface::gl_init_fb(unsigned x,unsigned y,unsigned d_width,unsigned d_height) const
{
float sx = (GLfloat) (d_width-x) / (GLfloat)image_width;
@@ -124,12 +130,6 @@
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-#define FOVY 60.0f
-#define ASPECT 1.0f
-#define Z_NEAR 0.1f
-#define Z_FAR 100.0f
-#define Z_CAMERA 0.869f
-
glViewport(x, y, d_width, d_height);
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
Modified: mplayerxp/libvo2/vo_sdl.cpp
===================================================================
--- mplayerxp/libvo2/vo_sdl.cpp 2012-12-21 10:48:09 UTC (rev 589)
+++ mplayerxp/libvo2/vo_sdl.cpp 2012-12-21 11:05:14 UTC (rev 590)
@@ -102,7 +102,7 @@
//#define BUGGY_SDL //defined by configure
/* MONITOR_ASPECT MUST BE FLOAT */
-#define MONITOR_ASPECT 4.0/3.0
+static const float MONITOR_ASPECT=4.0f/3.0f;
#include <stdio.h>
#include <stdlib.h>
@@ -819,7 +819,7 @@
* returns : doesn't return
**/
-#define shift_key (event.key.keysym.mod==(KMOD_LSHIFT||KMOD_RSHIFT))
+static int shift_key(const SDL_Event& event) { return event.key.keysym.mod==(KMOD_LSHIFT||KMOD_RSHIFT); }
uint32_t SDL_VO_Interface::check_events (const vo_resize_t* vrest){
SDL_Event event;
SDLKey keypressed = SDLKey(0);
@@ -863,7 +863,7 @@
case SDLK_DOWN: mplayer_put_key(KEY_DOWN); break;
case SDLK_LEFT: mplayer_put_key(KEY_LEFT); break;
case SDLK_RIGHT: mplayer_put_key(KEY_RIGHT); break;
- case SDLK_LESS: mplayer_put_key(shift_key?'>':'<'); break;
+ case SDLK_LESS: mplayer_put_key(shift_key(event)?'>':'<'); break;
case SDLK_GREATER: mplayer_put_key('>'); break;
case SDLK_ASTERISK:
case SDLK_KP_MULTIPLY:
@@ -915,8 +915,8 @@
/*case SDLK_o: mplayer_put_key('o');break;
case SDLK_SPACE: mplayer_put_key(' ');break;
case SDLK_p: mplayer_put_key('p');break;*/
- case SDLK_7: mplayer_put_key(shift_key?'/':'7');
- case SDLK_PLUS: mplayer_put_key(shift_key?'*':'+');
+ case SDLK_7: mplayer_put_key(shift_key(event)?'/':'7');
+ case SDLK_PLUS: mplayer_put_key(shift_key(event)?'*':'+');
case SDLK_KP_PLUS: mplayer_put_key('+');break;
case SDLK_MINUS:
case SDLK_KP_MINUS: mplayer_put_key('-');break;
@@ -938,7 +938,7 @@
case SDLK_DOWN: mplayer_put_key(KEY_DOWN);break;
case SDLK_LEFT: mplayer_put_key(KEY_LEFT);break;
case SDLK_RIGHT: mplayer_put_key(KEY_RIGHT);break;
- case SDLK_LESS: mplayer_put_key(shift_key?'>':'<'); break;
+ case SDLK_LESS: mplayer_put_key(shift_key(event)?'>':'<'); break;
case SDLK_GREATER: mplayer_put_key('>'); break;
case SDLK_ASTERISK:
case SDLK_KP_MULTIPLY: mplayer_put_key('*'); break;
@@ -957,7 +957,6 @@
}
return retval;
}
-#undef shift_key
/* Erase (paint it black) the rectangle specified by x, y, w and h in the surface
or overlay which is used for OSD
Modified: mplayerxp/libvo2/vo_vesa.cpp
===================================================================
--- mplayerxp/libvo2/vo_vesa.cpp 2012-12-21 10:48:09 UTC (rev 589)
+++ mplayerxp/libvo2/vo_vesa.cpp 2012-12-21 11:05:14 UTC (rev 590)
@@ -188,8 +188,8 @@
}
}
-#define MOVIE_MODE (MODE_ATTR_COLOR | MODE_ATTR_GRAPHICS)
-#define FRAME_MODE (MODE_WIN_RELOCATABLE | MODE_WIN_WRITEABLE)
+static const int MOVIE_MODE=(MODE_ATTR_COLOR | MODE_ATTR_GRAPHICS);
+static const int FRAME_MODE=(MODE_WIN_RELOCATABLE | MODE_WIN_WRITEABLE);
void VESA_VO_Interface::vesa_term()
{
@@ -308,8 +308,8 @@
return MPXP_Ok;
}
-#define SUBDEV_NODGA 0x00000001UL
-#define SUBDEV_FORCEDGA 0x00000002UL
+static const int SUBDEV_NODGA=0x00000001UL;
+static const int SUBDEV_FORCEDGA=0x00000002UL;
std::string VESA_VO_Interface::parse_sub_device(const std::string& sd)
{
subdev_flags = 0;
Modified: mplayerxp/libvo2/vo_xv.cpp
===================================================================
--- mplayerxp/libvo2/vo_xv.cpp 2012-12-21 10:48:09 UTC (rev 589)
+++ mplayerxp/libvo2/vo_xv.cpp 2012-12-21 11:05:14 UTC (rev 590)
@@ -134,10 +134,10 @@
}
/* unofficial gatos extensions */
-#define FOURCC_RGBA32 0x41424752
-#define FOURCC_RGB24 0x00000000
-#define FOURCC_RGBT16 0x54424752
-#define FOURCC_RGB16 0x32424752
+static const uint32_t FOURCC_RGBA32 =0x41424752;
+static const uint32_t FOURCC_RGB24 =0x00000000;
+static const uint32_t FOURCC_RGBT16 =0x54424752;
+static const uint32_t FOURCC_RGB16 =0x32424752;
/*
* connect to server, create and map window,
Modified: mplayerxp/libvo2/x11_system.cpp
===================================================================
--- mplayerxp/libvo2/x11_system.cpp 2012-12-21 10:48:09 UTC (rev 589)
+++ mplayerxp/libvo2/x11_system.cpp 2012-12-21 11:05:14 UTC (rev 590)
@@ -563,33 +563,35 @@
}
// ----- Motif header: -------
-#define MWM_HINTS_FUNCTIONS (1L << 0)
-#define MWM_HINTS_DECORATIONS (1L << 1)
-#define MWM_HINTS_INPUT_MODE (1L << 2)
-#define MWM_HINTS_STATUS (1L << 3)
+enum {
+ MWM_HINTS_FUNCTIONS =(1L << 0),
+ MWM_HINTS_DECORATIONS =(1L << 1),
+ MWM_HINTS_INPUT_MODE =(1L << 2),
+ MWM_HINTS_STATUS =(1L << 3),
-#define MWM_FUNC_ALL (1L << 0)
-#define MWM_FUNC_RESIZE (1L << 1)
-#define MWM_FUNC_MOVE (1L << 2)
-#define MWM_FUNC_MINIMIZE (1L << 3)
-#define MWM_FUNC_MAXIMIZE (1L << 4)
-#define MWM_FUNC_CLOSE (1L << 5)
+ MWM_FUNC_ALL =(1L << 0),
+ MWM_FUNC_RESIZE =(1L << 1),
+ MWM_FUNC_MOVE =(1L << 2),
+ MWM_FUNC_MINIMIZE =(1L << 3),
+ MWM_FUNC_MAXIMIZE =(1L << 4),
+ MWM_FUNC_CLOSE =(1L << 5),
-#define MWM_DECOR_ALL (1L << 0)
-#define MWM_DECOR_BORDER (1L << 1)
-#define MWM_DECOR_RESIZEH (1L << 2)
-#define MWM_DECOR_TITLE (1L << 3)
-#define MWM_DECOR_MENU (1L << 4)
-#define MWM_DECOR_MINIMIZE (1L << 5)
-#define MWM_DECOR_MAXIMIZE (1L << 6)
+ MWM_DECOR_ALL =(1L << 0),
+ MWM_DECOR_BORDER =(1L << 1),
+ MWM_DECOR_RESIZEH =(1L << 2),
+ MWM_DECOR_TITLE =(1L << 3),
+ MWM_DECOR_MENU =(1L << 4),
+ MWM_DECOR_MINIMIZE =(1L << 5),
+ MWM_DECOR_MAXIMIZE =(1L << 6),
-#define MWM_INPUT_MODELESS 0
-#define MWM_INPUT_PRIMARY_APPLICATION_MODAL 1
-#define MWM_INPUT_SYSTEM_MODAL 2
-#define MWM_INPUT_FULL_APPLICATION_MODAL 3
-#define MWM_INPUT_APPLICATION_MODAL MWM_INPUT_PRIMARY_APPLICATION_MODAL
+ MWM_INPUT_MODELESS =0,
+ MWM_INPUT_PRIMARY_APPLICATION_MODAL =1,
+ MWM_INPUT_SYSTEM_MODAL =2,
+ MWM_INPUT_FULL_APPLICATION_MODAL =3,
+ MWM_INPUT_APPLICATION_MODAL=MWM_INPUT_PRIMARY_APPLICATION_MODAL,
-#define MWM_TEAROFF_WINDOW (1L<<0)
+ MWM_TEAROFF_WINDOW =(1L<<0)
+};
// Note: always d==0 !
void X11_System::decoration(int d)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
