summaryrefslogtreecommitdiff
authorzecke <zecke>2004-09-10 11:05:37 (UTC)
committer zecke <zecke>2004-09-10 11:05:37 (UTC)
commitd416ff23ea50303173d07ea243498a163f5995b5 (patch) (side-by-side diff)
tree8ab861514fd1dc87c509e6ac988ed683f82370ec
parent224c96feb94acd6a87e1a2463aca9726afe925ef (diff)
downloadopie-d416ff23ea50303173d07ea243498a163f5995b5.zip
opie-d416ff23ea50303173d07ea243498a163f5995b5.tar.gz
opie-d416ff23ea50303173d07ea243498a163f5995b5.tar.bz2
The usual... fix warnings about unused parameters
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie2/opiemm/oimagezoomer.cpp2
-rw-r--r--libopie2/opiemm/osoundsystem.cpp2
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
@@ -169,65 +169,65 @@ void OImageZoomer::drawContents( QPainter* p ) {
/*
* paint a red rect which represents the visible size
*
* We need to recalculate x,y and width and height of the
* rect. So image size relates to contentRect
*
*/
QRect c( contentsRect() );
p->setPen( Qt::red );
/*
* the contentRect is set equal to the size of the image
* Rect/Original = NewRectORWidth/OriginalVisibleStuff and then simply we
* need to add the c.y/x due usage of QFrame
* For x and y we use the visiblePoint
* For height and width we use the size of the viewport
* if width/height would be bigger than our widget we use this width/height
*
*/
int len = m_imgSize.width();
int x = (c.width()*m_visPt.x())/len + c.x();
int w = (c.width()*m_visSize.width() )/len + c.x();
if ( w > c.width() ) w = c.width();
len = m_imgSize.height();
int y = (c.height()*m_visPt.y() )/len + c.y();
int h = (c.height()*m_visSize.height() )/len + c.y();
if ( h > c.height() ) h = c.height();
p->drawRect( x, y, w, h );
}
-void OImageZoomer::mousePressEvent( QMouseEvent*ev) {
+void OImageZoomer::mousePressEvent( QMouseEvent*) {
m_mouseX = m_mouseY = -1;
m_mevent = true;
}
void OImageZoomer::mouseReleaseEvent( QMouseEvent*ev) {
if (!m_mevent) return;
int mx, my;
mx = ev->x();
my = ev->y();
int diffx = (mx) * m_imgSize.width() / width();
int diffy = (my) * m_imgSize.height() / height();
emit zoomArea(diffx,diffy);
}
void OImageZoomer::mouseMoveEvent( QMouseEvent* ev ) {
int mx, my;
mx = ev->x();
my = ev->y();
if ( m_mouseX != -1 && m_mouseY != -1 ) {
m_mevent = false;
int diffx = ( mx - m_mouseX ) * m_imgSize.width() / width();
int diffy = ( my - m_mouseY ) * m_imgSize.height() / height();
emit zoomAreaRel( diffx, diffy );
}
m_mouseX = mx;
m_mouseY = my;
}
}
}
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
@@ -230,70 +230,72 @@ void OMixerInterface::init()
if ( devmask & ( 1 << SOUND_MIXER_ALTPCM ) ) _channels.insert( "RecAltPCM", SOUND_MIXER_ALTPCM );
if ( devmask & ( 1 << SOUND_MIXER_RECLEV ) ) _channels.insert( "RecRecord", SOUND_MIXER_RECLEV );
if ( devmask & ( 1 << SOUND_MIXER_IGAIN ) ) _channels.insert( "RecInputGain", SOUND_MIXER_IGAIN );
if ( devmask & ( 1 << SOUND_MIXER_OGAIN ) ) _channels.insert( "RecOutputGain", SOUND_MIXER_OGAIN );
//odebug << "recmask available and constructed." << oendl;
}
/* ChannelIterator it;
for ( it = _channels.begin(); it != _channels.end(); ++it )
{
odebug << "Channel " << it.key() << " available (bit " << it.data() << ")" << oendl;
odebug << " +--- Volume: " << volume( it.key() ) & 0xff << " | " << volume( it.key() ) >> 8 << "" << oendl;
}
*/
}
QStringList OMixerInterface::allChannels() const
{
ChannelIterator it = _channels.begin();
QStringList channels;
while ( it != _channels.end() )
{
channels += it.key();
it++;
}
return channels;
}
QStringList OMixerInterface::recChannels() const
{
owarn << "NYI" << oendl;
+ return QStringList();
}
QStringList OMixerInterface::playChannels() const
{
owarn << "NYI" << oendl;
+ return QStringList();
}
bool OMixerInterface::hasChannel( const QString& channel )
{
return _channels.contains( channel );
}
void OMixerInterface::setVolume( const QString& channel, int left, int right )
{
int volume = left;
volume |= ( right == -1 ) ? left << 8 : right << 8;
if ( _channels.contains( channel ) )
{
int result = ioctl( _fd, MIXER_WRITE( _channels[channel] ), &volume );
if ( result == -1 )
{
owarn << "Can't set volume: " << strerror( errno ) << oendl;
}
else
{
if ( result & 0xff != left )
{
owarn << "Device adjusted volume from " << left << " to " << (result & 0xff) << oendl;
}
}
}
}