Diffstat (limited to 'noncore/multimedia/opieplayer2') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp index 43e3133..13cc4ed 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp | |||
@@ -134,26 +134,28 @@ void MediaPlayer::stopChangingVolume() { | |||
134 | audioUI->repaint( (w - 200) / 2, h - yoff, 200 + 9, 70, FALSE ); | 134 | audioUI->repaint( (w - 200) / 2, h - yoff, 200 + 9, 70, FALSE ); |
135 | } | 135 | } |
136 | 136 | ||
137 | 137 | ||
138 | void MediaPlayer::timerEvent( QTimerEvent * ) { | 138 | void MediaPlayer::timerEvent( QTimerEvent * ) { |
139 | // if ( volumeDirection == +1 ) | 139 | // if ( volumeDirection == +1 ) |
140 | // AudioDevice::increaseVolume(); | 140 | // AudioDevice::increaseVolume(); |
141 | // else if ( volumeDirection == -1 ) | 141 | // else if ( volumeDirection == -1 ) |
142 | // AudioDevice::decreaseVolume(); | 142 | // AudioDevice::decreaseVolume(); |
143 | 143 | ||
144 | // Display an on-screen display volume | 144 | // Display an on-screen display volume |
145 | unsigned int l, r, v; bool m; | 145 | unsigned int l, r, v; bool m; |
146 | AudioDevice::getVolume( l, r, m ); | 146 | |
147 | v = ((l + r) * 11) / (2*0xFFFF); | 147 | // TODO FIXME |
148 | // AudioDevice::getVolume( l, r, m ); | ||
149 | // v = ((l + r) * 11) / (2*0xFFFF); | ||
148 | 150 | ||
149 | if ( drawnOnScreenDisplay && onScreenDisplayVolume == v ) | 151 | if ( drawnOnScreenDisplay && onScreenDisplayVolume == v ) |
150 | return; | 152 | return; |
151 | 153 | ||
152 | int w = audioUI->width(); | 154 | int w = audioUI->width(); |
153 | int h = audioUI->height(); | 155 | int h = audioUI->height(); |
154 | 156 | ||
155 | if ( drawnOnScreenDisplay ) { | 157 | if ( drawnOnScreenDisplay ) { |
156 | if ( onScreenDisplayVolume > v ) | 158 | if ( onScreenDisplayVolume > v ) |
157 | audioUI->repaint( (w - 200) / 2 + v * 20 + 0, h - yoff + 40, (onScreenDisplayVolume - v) * 20 + 9, 30, FALSE ); | 159 | audioUI->repaint( (w - 200) / 2 + v * 20 + 0, h - yoff + 40, (onScreenDisplayVolume - v) * 20 + 9, 30, FALSE ); |
158 | } | 160 | } |
159 | 161 | ||