[MPlayer-cvslog] r35825 - in trunk/gui/wm: ws.c ws.h

[ib]

Author: ib
Date: Tue Jan 22 18:51:06 2013
New Revision: 35825

Log:
Relocate #defines and make them enums.

They are only used inside ws.c.

Modified:
   trunk/gui/wm/ws.c
   trunk/gui/wm/ws.h

Modified: trunk/gui/wm/ws.c
==============================================================================
--- trunk/gui/wm/ws.c	Tue Jan 22 18:34:52 2013	(r35824)
+++ trunk/gui/wm/ws.c	Tue Jan 22 18:51:06 2013	(r35825)
@@ -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;

Modified: trunk/gui/wm/ws.h
==============================================================================
--- trunk/gui/wm/ws.h	Tue Jan 22 18:34:52 2013	(r35824)
+++ trunk/gui/wm/ws.h	Tue Jan 22 18:51:06 2013	(r35825)
@@ -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