-rw-r--r-- | libopie2/opiemm/oimagezoomer.cpp | 2 | ||||
-rw-r--r-- | libopie2/opiemm/osoundsystem.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libopie2/opiemm/oimagezoomer.cpp b/libopie2/opiemm/oimagezoomer.cpp index d1eec67..b7ef238 100644 --- a/libopie2/opiemm/oimagezoomer.cpp +++ b/libopie2/opiemm/oimagezoomer.cpp | |||
@@ -189,25 +189,25 @@ void OImageZoomer::drawContents( QPainter* p ) { | |||
189 | int x = (c.width()*m_visPt.x())/len + c.x(); | 189 | int x = (c.width()*m_visPt.x())/len + c.x(); |
190 | int w = (c.width()*m_visSize.width() )/len + c.x(); | 190 | int w = (c.width()*m_visSize.width() )/len + c.x(); |
191 | if ( w > c.width() ) w = c.width(); | 191 | if ( w > c.width() ) w = c.width(); |
192 | 192 | ||
193 | len = m_imgSize.height(); | 193 | len = m_imgSize.height(); |
194 | int y = (c.height()*m_visPt.y() )/len + c.y(); | 194 | int y = (c.height()*m_visPt.y() )/len + c.y(); |
195 | int h = (c.height()*m_visSize.height() )/len + c.y(); | 195 | int h = (c.height()*m_visSize.height() )/len + c.y(); |
196 | if ( h > c.height() ) h = c.height(); | 196 | if ( h > c.height() ) h = c.height(); |
197 | 197 | ||
198 | p->drawRect( x, y, w, h ); | 198 | p->drawRect( x, y, w, h ); |
199 | } | 199 | } |
200 | 200 | ||
201 | void OImageZoomer::mousePressEvent( QMouseEvent*ev) { | 201 | void OImageZoomer::mousePressEvent( QMouseEvent*) { |
202 | m_mouseX = m_mouseY = -1; | 202 | m_mouseX = m_mouseY = -1; |
203 | m_mevent = true; | 203 | m_mevent = true; |
204 | } | 204 | } |
205 | 205 | ||
206 | void OImageZoomer::mouseReleaseEvent( QMouseEvent*ev) { | 206 | void OImageZoomer::mouseReleaseEvent( QMouseEvent*ev) { |
207 | if (!m_mevent) return; | 207 | if (!m_mevent) return; |
208 | int mx, my; | 208 | int mx, my; |
209 | mx = ev->x(); | 209 | mx = ev->x(); |
210 | my = ev->y(); | 210 | my = ev->y(); |
211 | int diffx = (mx) * m_imgSize.width() / width(); | 211 | int diffx = (mx) * m_imgSize.width() / width(); |
212 | int diffy = (my) * m_imgSize.height() / height(); | 212 | int diffy = (my) * m_imgSize.height() / height(); |
213 | emit zoomArea(diffx,diffy); | 213 | emit zoomArea(diffx,diffy); |
diff --git a/libopie2/opiemm/osoundsystem.cpp b/libopie2/opiemm/osoundsystem.cpp index 2b17230..763ff65 100644 --- a/libopie2/opiemm/osoundsystem.cpp +++ b/libopie2/opiemm/osoundsystem.cpp | |||
@@ -250,30 +250,32 @@ QStringList OMixerInterface::allChannels() const | |||
250 | while ( it != _channels.end() ) | 250 | while ( it != _channels.end() ) |
251 | { | 251 | { |
252 | channels += it.key(); | 252 | channels += it.key(); |
253 | it++; | 253 | it++; |
254 | } | 254 | } |
255 | return channels; | 255 | return channels; |
256 | } | 256 | } |
257 | 257 | ||
258 | 258 | ||
259 | QStringList OMixerInterface::recChannels() const | 259 | QStringList OMixerInterface::recChannels() const |
260 | { | 260 | { |
261 | owarn << "NYI" << oendl; | 261 | owarn << "NYI" << oendl; |
262 | return QStringList(); | ||
262 | } | 263 | } |
263 | 264 | ||
264 | 265 | ||
265 | QStringList OMixerInterface::playChannels() const | 266 | QStringList OMixerInterface::playChannels() const |
266 | { | 267 | { |
267 | owarn << "NYI" << oendl; | 268 | owarn << "NYI" << oendl; |
269 | return QStringList(); | ||
268 | } | 270 | } |
269 | 271 | ||
270 | 272 | ||
271 | bool OMixerInterface::hasChannel( const QString& channel ) | 273 | bool OMixerInterface::hasChannel( const QString& channel ) |
272 | { | 274 | { |
273 | return _channels.contains( channel ); | 275 | return _channels.contains( channel ); |
274 | } | 276 | } |
275 | 277 | ||
276 | 278 | ||
277 | void OMixerInterface::setVolume( const QString& channel, int left, int right ) | 279 | void OMixerInterface::setVolume( const QString& channel, int left, int right ) |
278 | { | 280 | { |
279 | int volume = left; | 281 | int volume = left; |