summaryrefslogtreecommitdiffstats
path: root/Gui
diff options
context:
space:
mode:
authorpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-09-02 21:49:21 +0000
committerpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-09-02 21:49:21 +0000
commit9b5e280ea49fa5ec98627a8dc30691fd429d6a3b (patch)
tree1430c0143aee6cf55b1f35dc8a2bbe053c0b7695 /Gui
parentfaa08119a60fd9bdb8a1ac898af366ba88321bf8 (diff)
downloadmpv-9b5e280ea49fa5ec98627a8dc30691fd429d6a3b.tar.bz2
mpv-9b5e280ea49fa5ec98627a8dc30691fd429d6a3b.tar.xz
fix osd volume bar handling in gui
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1849 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
-rw-r--r--Gui/mplayer/mw.h13
1 files changed, 10 insertions, 3 deletions
diff --git a/Gui/mplayer/mw.h b/Gui/mplayer/mw.h
index d24b8bd443..10d686ca52 100644
--- a/Gui/mplayer/mw.h
+++ b/Gui/mplayer/mw.h
@@ -435,7 +435,6 @@ void mplMainMouseHandle( int Button,int X,int Y,int RX,int RY )
mplMainRender=1;
SelectedButton=i;
boxMoved=0;
- if ( ( item->msg == evSetVolume )||( item->msg == evSetBalance ) ) mplShMem->VolumeChanged=1;
msButton=itPotmeter;
itemtype=itPotmeter;
}
@@ -450,7 +449,6 @@ void mplMainMouseHandle( int Button,int X,int Y,int RX,int RY )
mplMainRender=1;
SelectedButton=i;
boxMoved=0;
- if ( ( item->msg == evSetVolume )||( item->msg == evSetBalance ) ) mplShMem->VolumeChanged=1;
msButton=itHPotmeter;
itemtype=itHPotmeter;
}
@@ -478,7 +476,11 @@ void mplMainMouseHandle( int Button,int X,int Y,int RX,int RY )
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 @@ potihandled:
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;
}