Mercurial > mplayer.hg
comparison gui/ui/actions.c @ 33978:81aaa1420337
Replace some btnModify() calls by btnSet().
Prefer btnSet() to btnModify() if the "pressed" state is to be set.
Additionally, put parentheses around ternary operator.
author | ib |
---|---|
date | Tue, 06 Sep 2011 09:29:04 +0000 |
parents | 1cd81338af07 |
children | 57d711d3dcca |
comparison
equal
deleted
inserted
replaced
33977:0e369065b585 | 33978:81aaa1420337 |
---|---|
94 } | 94 } |
95 | 95 |
96 void uiState(void) | 96 void uiState(void) |
97 { | 97 { |
98 if (guiInfo.Playing == GUI_STOP || guiInfo.Playing == GUI_PAUSE) { | 98 if (guiInfo.Playing == GUI_STOP || guiInfo.Playing == GUI_PAUSE) { |
99 btnModify(evPlaySwitchToPause, btnReleased); | 99 btnSet(evPlaySwitchToPause, btnReleased); |
100 btnModify(evPauseSwitchToPlay, btnDisabled); | 100 btnSet(evPauseSwitchToPlay, btnDisabled); |
101 } else { | 101 } else { |
102 btnModify(evPlaySwitchToPause, btnDisabled); | 102 btnSet(evPlaySwitchToPause, btnDisabled); |
103 btnModify(evPauseSwitchToPlay, btnReleased); | 103 btnSet(evPauseSwitchToPlay, btnReleased); |
104 } | 104 } |
105 } | 105 } |
106 | 106 |
107 void uiRelSeek(float sec) | 107 void uiRelSeek(float sec) |
108 { | 108 { |
211 mainVisible = 1; | 211 mainVisible = 1; |
212 | 212 |
213 btnModify(evSetVolume, guiInfo.Volume); | 213 btnModify(evSetVolume, guiInfo.Volume); |
214 btnModify(evSetBalance, guiInfo.Balance); | 214 btnModify(evSetBalance, guiInfo.Balance); |
215 btnModify(evSetMoviePosition, guiInfo.Position); | 215 btnModify(evSetMoviePosition, guiInfo.Position); |
216 btnModify(evFullScreen, guiApp.subWindow.isFullScreen ? btnPressed : btnReleased); | 216 btnSet(evFullScreen, (guiApp.subWindow.isFullScreen ? btnPressed : btnReleased)); |
217 | 217 |
218 wsSetLayer(wsDisplay, guiApp.mainWindow.WindowID, guiApp.subWindow.isFullScreen); | 218 wsSetLayer(wsDisplay, guiApp.mainWindow.WindowID, guiApp.subWindow.isFullScreen); |
219 wsSetLayer(wsDisplay, guiApp.menuWindow.WindowID, guiApp.subWindow.isFullScreen); | 219 wsSetLayer(wsDisplay, guiApp.menuWindow.WindowID, guiApp.subWindow.isFullScreen); |
220 } | 220 } |
221 | 221 |