summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-09-12 19:51:04 +0200
committerwm4 <wm4@nowhere>2016-09-12 20:05:48 +0200
commit876ec446f3863ec2a92c516b1f6d35137b66c005 (patch)
tree74e099dd032585f4fd9df5d2e3e6b02110d3b836
parent8c39c6903b94636742c81922a2f26cfa07510fc6 (diff)
downloadmpv-876ec446f3863ec2a92c516b1f6d35137b66c005.tar.bz2
mpv-876ec446f3863ec2a92c516b1f6d35137b66c005.tar.xz
vo: change defines to an enum
(They're flags, so it still doesn't make sense to actually name the enum and use it as a type.)
-rw-r--r--video/out/vo.h32
1 files changed, 17 insertions, 15 deletions
diff --git a/video/out/vo.h b/video/out/vo.h
index 407255be12..c40367d406 100644
--- a/video/out/vo.h
+++ b/video/out/vo.h
@@ -30,21 +30,23 @@
#include "common/common.h"
#include "options/options.h"
-// VO needs to redraw
-#define VO_EVENT_EXPOSE 1
-// VO needs to update state to a new window size
-#define VO_EVENT_RESIZE 2
-// The ICC profile needs to be reloaded
-#define VO_EVENT_ICC_PROFILE_CHANGED 4
-// Some other window state changed (position, window state, fps)
-#define VO_EVENT_WIN_STATE 8
-// The ambient light conditions changed and need to be reloaded
-#define VO_EVENT_AMBIENT_LIGHTING_CHANGED 16
-// Special mechanism for making resizing with Cocoa react faster
-#define VO_EVENT_LIVE_RESIZING 32
-
-// Set of events the player core may be interested in.
-#define VO_EVENTS_USER (VO_EVENT_RESIZE | VO_EVENT_WIN_STATE)
+enum {
+ // VO needs to redraw
+ VO_EVENT_EXPOSE = 1 << 0,
+ // VO needs to update state to a new window size
+ VO_EVENT_RESIZE = 1 << 1,
+ // The ICC profile needs to be reloaded
+ VO_EVENT_ICC_PROFILE_CHANGED = 1 << 2,
+ // Some other window state changed (position, window state, fps)
+ VO_EVENT_WIN_STATE = 1 << 3,
+ // The ambient light conditions changed and need to be reloaded
+ VO_EVENT_AMBIENT_LIGHTING_CHANGED = 1 << 4,
+ // Special mechanism for making resizing with Cocoa react faster
+ VO_EVENT_LIVE_RESIZING = 1 << 5,
+
+ // Set of events the player core may be interested in.
+ VO_EVENTS_USER = (VO_EVENT_RESIZE | VO_EVENT_WIN_STATE),
+};
enum mp_voctrl {
/* signal a device reset seek */