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
@@ -257,66 +257,64 @@ QStringList OMixerInterface::allChannels() const
         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;
             }
         }
     }
 }
 
 
 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
@@ -169,65 +169,64 @@ class OAudioInterface : public QObject
  *======================================================================================*/
 
 class OMixerInterface : public QObject
 {
   Q_OBJECT
 
   public:
 
     typedef QMap<QString,int>::ConstIterator ChannelIterator;
 
     /**
      * Constructor. Normally you don't create @ref OMixerInterface objects yourself,
      * but access them via the @ref OSoundCard interface.
      */
     OMixerInterface( QObject* parent, const char* name );
     /**
      * Destructor.
      */
     virtual ~OMixerInterface();
 
     /**
      * @returns all available channels.
      */
     QStringList allChannels() const;
     /**
      * @returns recordable channels.
      */
     QStringList recChannels() const;
     /**
      * @returns playable channels.
      */
     QStringList playChannels() const;
 
     /**
      * @returns true, if @a channel exists.
      */
     bool hasChannel( const QString& channel );
 
     /**
      * Set the @a left and @a right volumes for @a channel.
      * If no value for right is given, the value for left is taken for that.
      */
     void setVolume( const QString& channel, int left, int right = -1 );
     /**
      * @returns the volume of @a channel or -1, if the channel doesn't exist.
      * @note You might want to use @ref hasChannel() to check if a channel exists.
      */
     int volume( const QString& channel ) const;
 
   protected:
     int _fd;
     QMap<QString, int> _channels;
 
   private:
     void init();
   private:
     class Private;
     Private *d;
 };
 
 }
 }
 
 #endif // OSOUNDSYSTEM_H
-