summaryrefslogtreecommitdiff
path: root/libopie2
authorwimpie <wimpie>2005-01-04 01:31:53 (UTC)
committer wimpie <wimpie>2005-01-04 01:31:53 (UTC)
commit42638ffd708a5236ad9a1f06a40b9d8b7919277c (patch) (side-by-side diff)
tree687d61c6e2d5ddd20dff42cf6e1b18afbe81633f /libopie2
parent0f3d74b472817e6b4f9d80adc122281b84629c1f (diff)
downloadopie-42638ffd708a5236ad9a1f06a40b9d8b7919277c.zip
opie-42638ffd708a5236ad9a1f06a40b9d8b7919277c.tar.gz
opie-42638ffd708a5236ad9a1f06a40b9d8b7919277c.tar.bz2
CONTROL file :changed VERSION string
Diffstat (limited to 'libopie2') (more/less context) (show whitespace changes)
-rw-r--r--libopie2/opiemm/libopiemm2.control2
-rw-r--r--libopie2/opiemm/osoundsystem.cpp2
-rw-r--r--libopie2/opiemm/osoundsystem.h1
3 files changed, 1 insertions, 4 deletions
diff --git a/libopie2/opiemm/libopiemm2.control b/libopie2/opiemm/libopiemm2.control
index d0f34a8..0dd2df2 100644
--- a/libopie2/opiemm/libopiemm2.control
+++ b/libopie2/opiemm/libopiemm2.control
@@ -1,10 +1,10 @@
Package: libopiemm2
Files: lib/libopiemm2.so.*
Priority: optional
Section: opie/system
Maintainer: Opie Team <opie@handhelds.org>
Architecture: arm
-Version: 1.8.2-$SUB_VERSION.2
+Version: $QPE_VERSION$EXTRAVERSION
Depends: libqpe1, libopiecore2 (1.8.2)
Provides: libopiemm2
Description: Opie library 2.0 MM
diff --git a/libopie2/opiemm/osoundsystem.cpp b/libopie2/opiemm/osoundsystem.cpp
index 17e5cb0..13b26e6 100644
--- a/libopie2/opiemm/osoundsystem.cpp
+++ b/libopie2/opiemm/osoundsystem.cpp
@@ -305,18 +305,16 @@ void OMixerInterface::setVolume( const QString& channel, int left, int right )
int OMixerInterface::volume( const QString& channel ) const
{
int volume;
if ( _channels.contains( channel ) )
{
if ( ioctl( _fd, MIXER_READ( _channels[channel] ), &volume ) == -1 )
{
owarn << "Can't get volume: " << strerror( errno ) << oendl;
}
else return volume;
}
return -1;
}
-
-
diff --git a/libopie2/opiemm/osoundsystem.h b/libopie2/opiemm/osoundsystem.h
index 3c3b622..bd69114 100644
--- a/libopie2/opiemm/osoundsystem.h
+++ b/libopie2/opiemm/osoundsystem.h
@@ -217,17 +217,16 @@ class OMixerInterface : public QObject
protected:
int _fd;
QMap<QString, int> _channels;
private:
void init();
private:
class Private;
Private *d;
};
}
}
#endif // OSOUNDSYSTEM_H
-