diff gui/mplayer/pb.c @ 32911:e06fbdd8eb46

Clean up the wItem structure. Rearrange and group members, remove unused members and rename some members to be more informative and precise.

--- a/gui/mplayer/pb.c	Wed Mar 02 13:30:44 2011 +0000
+++ b/gui/mplayer/pb.c	Wed Mar 02 15:37:50 2011 +0000
@@ -155,8 +155,8 @@
 	 {
 	  case itButton:
 	       if ( ( SelectedItem > -1 ) &&
-	         ( ( ( item->msg == evPlaySwitchToPause && item->msg == evPauseSwitchToPlay ) ) ||
-		 ( ( item->msg == evPauseSwitchToPlay && item->msg == evPlaySwitchToPause ) ) ) )
+	         ( ( ( item->message == evPlaySwitchToPause && item->message == evPauseSwitchToPlay ) ) ||
+		 ( ( item->message == evPauseSwitchToPlay && item->message == evPlaySwitchToPause ) ) ) )
 		 { item->pressed=btnDisabled; }
 	       break;
 	 }
@@ -173,17 +173,17 @@
 	 {
 	  case itPotmeter:
 	  case itHPotmeter:
-	       btnModify( item->msg,(float)( X - item->x ) / item->width * 100.0f );
-	       mplEventHandling( item->msg,item->value );
+	       btnModify( item->message,(float)( X - item->x ) / item->width * 100.0f );
+	       mplEventHandling( item->message,item->value );
 	       value=item->value;
 	       break;
 	  case itVPotmeter:
-	       btnModify( item->msg, ( 1. - (float)( Y - item->y ) / item->height) * 100.0f );
-	       mplEventHandling( item->msg,item->value );
+	       btnModify( item->message, ( 1. - (float)( Y - item->y ) / item->height) * 100.0f );
+	       mplEventHandling( item->message,item->value );
 	       value=item->value;
 	       break;
 	 }
-	mplEventHandling( item->msg,value );
+	mplEventHandling( item->message,value );
 
 	itemtype=0;
 	break;
@@ -195,8 +195,8 @@
         if ( ( item->type == itHPotmeter )||( item->type == itVPotmeter )||( item->type == itPotmeter ) )
 	 {
 	  item->value+=value;
-	  btnModify( item->msg,item->value );
-	  mplEventHandling( item->msg,item->value );
+	  btnModify( item->message,item->value );
+	  mplEventHandling( item->message,item->value );
 	 }
 	break;
 // ---
@@ -218,7 +218,7 @@
 potihandled:
 	       if ( item->value > 100.0f ) item->value=100.0f;
 	       if ( item->value < 0.0f ) item->value=0.0f;
-	       mplEventHandling( item->msg,item->value );
+	       mplEventHandling( item->message,item->value );
 	       break;
 	 }
         break;