[MPlayer-cvslog] r33006 - in trunk/gui: app.h mplayer/mw.c mplayer/pb.c

[ib]

Author: ib
Date: Thu Mar  3 10:34:27 2011
New Revision: 33006

Log:
Cosmetic: Adjust item definitions.

itNone is a more suitable name for 'no skin item' than itNULL,
and two item definitions have been moved into the header file
where they belong.

Modified:
   trunk/gui/app.h
   trunk/gui/mplayer/mw.c
   trunk/gui/mplayer/pb.c

Modified: trunk/gui/app.h
==============================================================================
--- trunk/gui/app.h	Wed Mar  2 19:16:15 2011	(r33005)
+++ trunk/gui/app.h	Thu Mar  3 10:34:27 2011	(r33006)
@@ -111,7 +111,7 @@ typedef struct {
 
 // Skin items
 
-#define itNULL      0
+#define itNone      0
 #define itButton    101
 #define itHPotmeter 102
 #define itVPotmeter 103
@@ -121,6 +121,9 @@ typedef struct {
 #define itPotmeter  107
 #define itFont      108
 
+#define itPLMButton (itNone - 1)
+#define itPRMButton (itNone - 2)
+
 // Button states
 
 #define btnPressed  0

Modified: trunk/gui/mplayer/mw.c
==============================================================================
--- trunk/gui/mplayer/mw.c	Wed Mar  2 19:16:15 2011	(r33005)
+++ trunk/gui/mplayer/mw.c	Thu Mar  3 10:34:27 2011	(r33006)
@@ -393,9 +393,6 @@ set_volume:
   }
 }
 
-#define itPLMButton (itNULL - 1)
-#define itPRMButton (itNULL - 2)
-
 void mplMainMouseHandle( int Button,int X,int Y,int RX,int RY )
 {
  static int     itemtype = 0;

Modified: trunk/gui/mplayer/pb.c
==============================================================================
--- trunk/gui/mplayer/pb.c	Wed Mar  2 19:16:15 2011	(r33005)
+++ trunk/gui/mplayer/pb.c	Thu Mar  3 10:34:27 2011	(r33006)
@@ -112,9 +112,6 @@ static void mplPBDraw( void )
  wsPutImage( &appMPlayer.barWindow );
 }
 
-#define itPLMButton (itNULL - 1)
-#define itPRMButton (itNULL - 2)
-
 static void mplPBMouseHandle( int Button, int X, int Y, int RX, int RY )
 {
  static int     itemtype = 0;