[Mplayer-cvslog] CVS: main/Gui/mplayer mw.h,1.23,1.24

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main/Gui/mplayer
In directory mplayer:/var/tmp.root/cvs-serv5018/Gui/mplayer

Modified Files:
	mw.h 
Log Message:
fix osd volume bar handling in gui

Index: mw.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mw.h	2 Sep 2001 21:26:51 -0000	1.23
+++ mw.h	2 Sep 2001 21:49:21 -0000	1.24
@@ -435,7 +435,6 @@
                        mplMainRender=1;
                        SelectedButton=i;
                        boxMoved=0;
-                       if ( ( item->msg == evSetVolume )||( item->msg == evSetBalance ) ) mplShMem->VolumeChanged=1;
                        msButton=itPotmeter;
                        itemtype=itPotmeter;
                       }
@@ -450,7 +449,6 @@
                        mplMainRender=1;
                        SelectedButton=i;
                        boxMoved=0;
-                       if ( ( item->msg == evSetVolume )||( item->msg == evSetBalance ) ) mplShMem->VolumeChanged=1;
                        msButton=itHPotmeter;
                        itemtype=itHPotmeter;
                       }
@@ -478,7 +476,11 @@
 potihandled:
 		 if ( item->value > 100.0f ) item->value=100.0f;
 		 if ( item->value < 0.0f ) item->value=0.0f;
-//                 if ( ( item->msg == evSetVolume )||( item->msg == evSetBalance ) ) 
+                 if ( ( item->msg == evSetVolume )||( item->msg == evSetBalance ) ) 
+		  {
+		   mplShMem->VolumeChanged=1;
+		   mplShMem->Volume=item->value;
+		  }
 		 mplMsgHandle( item->msg,item->value );
                  mplMainRender=1; wsPostRedisplay( &appMPlayer.mainWindow );
                  break;
@@ -500,6 +502,11 @@
             case itHPotmeter:
 		 item->used=0;
                  btnModify( item->msg,(float)( X - item->x ) / item->width * 100.0f );
+                 if ( ( item->msg == evSetVolume )||( item->msg == evSetBalance ) ) 
+		  {
+		   mplShMem->VolumeChanged=1;
+		   mplShMem->Volume=item->value;
+		  }
 		 value=item->value;
                  break;
            }