Mercurial > mplayer.hg

changeset 35731:e6ee0c8ef341

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Relocate #defines and make them enums. They are only used inside ws.c.
author ib
date Tue, 22 Jan 2013 17:51:06 +0000
parents 330325df88ed
children 6d1a5bf0cda0
files gui/wm/ws.c gui/wm/ws.h
diffstat 2 files changed, 12 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/gui/wm/ws.c	Tue Jan 22 17:34:52 2013 +0000
+++ b/gui/wm/ws.c	Tue Jan 22 17:51:06 2013 +0000
@@ -51,6 +51,18 @@
 #include <X11/extensions/xf86vmode.h>
 #endif
 
+/// Color byte orders and depths
+enum {
+    wsRGB32 = 1,
+    wsBGR32,
+    wsRGB24,
+    wsBGR24,
+    wsRGB16,
+    wsBGR16,
+    wsRGB15,
+    wsBGR15
+};
+
 #define MOUSEHIDE_DELAY 1000   // in milliseconds
 
 static wsWindow *mouse_win;
--- a/gui/wm/ws.h	Tue Jan 22 17:34:52 2013 +0000
+++ b/gui/wm/ws.h	Tue Jan 22 17:51:06 2013 +0000
@@ -65,15 +65,6 @@
 #define  wsWaitMap      64
 #define  wsAspect       128
 
-#define wsRGB32 1
-#define wsBGR32 2
-#define wsRGB24 3
-#define wsBGR24 4
-#define wsRGB16 5
-#define wsBGR16 6
-#define wsRGB15 7
-#define wsBGR15 8
-
 #define wsNone                   0
 #define wsWindowVisible          1
 #define wsWindowPartialVisible   2