improve mixer code

3 files changed, 59 insertions, 84 deletions

diff --git a/libopie2/config.in b/libopie2/config.in
deleted file mode 100644
index 5f1bed3..0000000
--- a/libopie2/config.in
+++ b/dev/null
@@ -1,12 +0,0 @@
-#menu "libopie2"
-  comment ""
-  source libopie2/opiecore/config.in
-  source libopie2/opiedb/config.in
-  source libopie2/opienet/config.in
-  source libopie2/opiepim/config.in
-  source libopie2/opieui/config.in
-  source libopie2/opiemm/config.in
-  source libopie2/opiesecurity/config.in
-  comment ""
-#endmenu
-
diff --git a/libopie2/opiemm/osoundsystem.cpp b/libopie2/opiemm/osoundsystem.cpp
index 09fd28f..6c03203 100644
--- a/libopie2/opiemm/osoundsystem.cpp
+++ b/libopie2/opiemm/osoundsystem.cpp
@@ -1,91 +1,91 @@
 /*
                              This file is part of the Opie Project
-
-                             (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
+                             (C) 2003-2005 Michael 'Mickey' Lauer <mickey@Vanille.de>
               =.
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include <opie2/osoundsystem.h>
 #include <opie2/odebug.h>
 
 #include <errno.h>
 #include <fcntl.h>
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/soundcard.h>
 #include <sys/stat.h>
 
+static const char* device_label[] = SOUND_DEVICE_LABELS;
+static int max_device_nr = sizeof device_label / sizeof (const char*);
 
 using namespace Opie::Core;
 using namespace Opie::MM;
 /*======================================================================================
  * OSoundSystem
  *======================================================================================*/
 
 OSoundSystem* OSoundSystem::_instance = 0;
 
 OSoundSystem::OSoundSystem()
 {
     odebug << "OSoundSystem::OSoundSystem()" << oendl;
     synchronize();
 }
 
 void OSoundSystem::synchronize()
 {
     // gather available interfaces by inspecting /dev
     //FIXME: we could use SIOCGIFCONF here, but we aren't interested in virtual (e.g. eth0:0) devices
     //FIXME: Use SIOCGIFCONF anway, because we can disable listing of aliased devices
 
     _interfaces.clear();
     _interfaces.insert( "soundcard", new OSoundCard( this, "soundcard" ) );
-
-
+    
     /*
 
     QString str;
     QFile f( "/dev/sound" );
     bool hasFile = f.open( IO_ReadOnly );
     if ( !hasFile )
     {
         odebug << "OSoundSystem: /dev/sound not existing. No sound devices available" << oendl;
         return;
     }
     QTextStream s( &f );
     s.readLine();
     s.readLine();
     while ( !s.atEnd() )
     {
         s >> str;
         str.truncate( str.find( ':' ) );
         odebug << "OSoundSystem: found interface '" <<  str << "'" << oendl;
         OAudioInterface* iface;
         iface = new OAudioInterface( this, (const char*) str );
 
         _interfaces.insert( str, iface );
         s.readLine();
     }
@@ -155,171 +155,149 @@ OAudioInterface::OAudioInterface( QObject* parent, const char* name )
                  :QObject( parent, name ), _sfd(0)
 {
     odebug << "OAudioInterface::OAudioInterface()" << oendl;
     init();
 }
 
 
 OAudioInterface::~OAudioInterface()
 {
 }
 
 
 void OAudioInterface::init()
 {
 
 
 }
 
 
 /*======================================================================================
  * OMixerInterface
  *======================================================================================*/
 
 OMixerInterface::OMixerInterface( QObject* parent, const char* name )
-                 :QObject( parent, name )
+                 :QObject( parent, name ), _devmask( 0 ), _recmask( 0 ), _stmask( 0 )
 {
     odebug << "OMixerInterface::OMixerInterface()" << oendl;
     init();
 }
 
 
 OMixerInterface::~OMixerInterface()
 {
 }
 
 
 void OMixerInterface::init()
 {
     // open the device
     _fd = ::open( name(), O_RDWR );
     if ( _fd == -1 )
     {
         owarn << "OMixerInterface::init(): Can't open mixer " << name() << oendl;
         return;
     }
 
     // construct the device capabilities
-    int devmask = 0;
-    if ( ioctl( _fd, SOUND_MIXER_READ_DEVMASK, &devmask ) != -1 )
+    if ( ioctl( _fd, SOUND_MIXER_READ_CAPS, &_capmask ) != -1 )
     {
-        if ( devmask & ( 1 << SOUND_MIXER_VOLUME ) )    _channels.insert( "PlayVolume", SOUND_MIXER_VOLUME );
-        if ( devmask & ( 1 << SOUND_MIXER_BASS ) )      _channels.insert( "PlayBass", SOUND_MIXER_BASS );
-        if ( devmask & ( 1 << SOUND_MIXER_TREBLE ) )    _channels.insert( "PlayTreble", SOUND_MIXER_TREBLE );
-        if ( devmask & ( 1 << SOUND_MIXER_SYNTH ) )     _channels.insert( "PlaySynth", SOUND_MIXER_SYNTH );
-        if ( devmask & ( 1 << SOUND_MIXER_PCM ) )       _channels.insert( "PlayPCM", SOUND_MIXER_PCM );
-        if ( devmask & ( 1 << SOUND_MIXER_SPEAKER ) )   _channels.insert( "PlaySpeaker", SOUND_MIXER_SPEAKER );
-        if ( devmask & ( 1 << SOUND_MIXER_LINE ) )      _channels.insert( "PlayLine", SOUND_MIXER_LINE );
-        if ( devmask & ( 1 << SOUND_MIXER_MIC ) )       _channels.insert( "PlayMic", SOUND_MIXER_MIC );
-        if ( devmask & ( 1 << SOUND_MIXER_CD ) )        _channels.insert( "PlayCD", SOUND_MIXER_CD );
-        if ( devmask & ( 1 << SOUND_MIXER_IMIX ) )      _channels.insert( "PlayInputMix", SOUND_MIXER_IMIX );
-        if ( devmask & ( 1 << SOUND_MIXER_ALTPCM ) )    _channels.insert( "PlayAltPCM", SOUND_MIXER_ALTPCM );
-        if ( devmask & ( 1 << SOUND_MIXER_RECLEV ) )    _channels.insert( "PlayRecord", SOUND_MIXER_RECLEV );
-        if ( devmask & ( 1 << SOUND_MIXER_IGAIN ) )     _channels.insert( "PlayInputGain", SOUND_MIXER_IGAIN );
-        if ( devmask & ( 1 << SOUND_MIXER_OGAIN ) )     _channels.insert( "PlayOutputGain", SOUND_MIXER_OGAIN );
-        //odebug << "devmask available and constructed." << oendl;
+        odebug << "OMixerInterface::init() - capmask = " << _capmask << oendl;
     }
-
-    devmask = 0;
-    if ( ioctl( _fd, SOUND_MIXER_READ_RECMASK, &devmask ) != -1 )
+    if ( ioctl( _fd, SOUND_MIXER_READ_DEVMASK, &_devmask ) != -1 )
     {
-        if ( devmask & ( 1 << SOUND_MIXER_VOLUME ) )    _channels.insert( "RecVolume", SOUND_MIXER_VOLUME );
-        if ( devmask & ( 1 << SOUND_MIXER_BASS ) )      _channels.insert( "RecBass", SOUND_MIXER_BASS );
-        if ( devmask & ( 1 << SOUND_MIXER_TREBLE ) )    _channels.insert( "RecTreble", SOUND_MIXER_TREBLE );
-        if ( devmask & ( 1 << SOUND_MIXER_SYNTH ) )     _channels.insert( "RecSynth", SOUND_MIXER_SYNTH );
-        if ( devmask & ( 1 << SOUND_MIXER_PCM ) )       _channels.insert( "RecPCM", SOUND_MIXER_PCM );
-        if ( devmask & ( 1 << SOUND_MIXER_SPEAKER ) )   _channels.insert( "RecSpeaker", SOUND_MIXER_SPEAKER );
-        if ( devmask & ( 1 << SOUND_MIXER_LINE ) )      _channels.insert( "RecLine", SOUND_MIXER_LINE );
-        if ( devmask & ( 1 << SOUND_MIXER_MIC ) )       _channels.insert( "RecMic", SOUND_MIXER_MIC );
-        if ( devmask & ( 1 << SOUND_MIXER_CD ) )        _channels.insert( "RecCD", SOUND_MIXER_CD );
-        if ( devmask & ( 1 << SOUND_MIXER_IMIX ) )      _channels.insert( "RecInputMix", SOUND_MIXER_IMIX );
-        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;
+        odebug << "OMixerInterface::init() - devmask = " << _devmask << oendl;
     }
-
-    devmask = 0;
-    if ( ioctl( _fd, SOUND_MIXER_READ_STEREODEVS, &devmask ) != -1 )
+    if ( ioctl( _fd, SOUND_MIXER_READ_RECMASK, &_recmask ) != -1 )
     {
-        odebug << "stereomask = " << devmask << oendl;
+        odebug << "OMixerInterface::init() - recmask = " << _recmask << oendl;
     }
-
-/*    ChannelIterator it;
-    for ( it = _channels.begin(); it != _channels.end(); ++it )
+    if ( ioctl( _fd, SOUND_MIXER_READ_STEREODEVS, &_stmask ) != -1 )
     {
-        odebug << "Channel " <<  it.key() << " available (bit " << it.data() << ")" << oendl;
-        odebug << " +--- Volume: " << volume( it.key() ) & 0xff << " | " << volume( it.key() ) >> 8 << "" << oendl;
+        odebug << "OMixerInterface::init() - stereomask = " << _stmask << oendl;
     }
-*/
-}
+    for ( int i = 0; i < max_device_nr; ++i )
+    {
+        if ( _devmask & ( 1 << i ) ) 
+        {
+            _channels.insert( QString( device_label[i] ).stripWhiteSpace(), i );
+            odebug << "OMixerInterface::init() - channel '" << device_label[i] << "'" << oendl;
+        }
+    }
+}    
+    
 
 QStringList OMixerInterface::allChannels() const
 {
     ChannelIterator it = _channels.begin();
     QStringList channels;
     while ( it != _channels.end() )
     {
-        channels += it.key();
-        it++;
+        channels += it++.key();
     }
     return channels;
 }
 
 
 QStringList OMixerInterface::recChannels() const
 {
-    owarn << "NYI" << oendl;
-    return QStringList();
+    ChannelIterator it = _channels.begin();
+    QStringList channels;
+    while ( it != _channels.end() )
+    {
+        if ( _recmask & ( 1 << _channels[it.key()] ) ) channels += it++.key();
+    }
+    return channels;
 }
 
 
 QStringList OMixerInterface::playChannels() const
 {
-    owarn << "NYI" << oendl;
-    return QStringList();
+    return allChannels();
+}
+
+
+bool OMixerInterface::hasMultipleRecording() const
+{
+    return !( _capmask & SOUND_CAP_EXCL_INPUT );
 }
 
 
 bool OMixerInterface::hasChannel( const QString& channel ) const
 {
     return _channels.contains( channel );
 }
 
 
 bool OMixerInterface::isStereo( const QString& channel ) const
 {
-    bool result = false;
-    if ( _channels.contains( channel ) )
-    {
-        int devmask = 0;
-        if ( ioctl( _fd, SOUND_MIXER_READ_STEREODEVS, &devmask ) != -1 )
-        {
-            result = devmask & ( 1 << _channels[channel] );
-        }
-    }
-    return result;
+    return _channels.contains( channel ) && ( _stmask & ( 1 << _channels[channel] ) );
+}
+
+
+bool OMixerInterface::isRecordable( const QString& channel ) const
+{
+    return _channels.contains( channel ) && ( _recmask & ( 1 << _channels[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;
             }
         }
     }
 }
diff --git a/libopie2/opiemm/osoundsystem.h b/libopie2/opiemm/osoundsystem.h
index ac7a5a7..cce90c0 100644
--- a/libopie2/opiemm/osoundsystem.h
+++ b/libopie2/opiemm/osoundsystem.h
@@ -1,28 +1,27 @@
 /*
                              This file is part of the Opie Project
-
-                             (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
+                             (C) 2003-2005 Michael 'Mickey' Lauer <mickey@Vanille.de>
               =.
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
@@ -177,60 +176,70 @@ class OMixerInterface : public QObject
     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 the device features multiple recording sources.
+     */
+    bool hasMultipleRecording() const;
     /**
      * @returns true, if @a channel exists.
      */
     bool hasChannel( const QString& channel ) const;
     /**
      * @returns true, if @a channel is stereo.
      */
     bool isStereo( const QString& channel ) const;
-
+    /**
+     * @returns tru, if @a channel is a possible recording source.
+     */
+    bool isRecordable( const QString& channel ) const;
     /**
      * 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;
+    int _capmask;
+    int _devmask;
+    int _recmask;
+    int _stmask;
+    QMap<QString,int> _channels;
 
   private:
     void init();
   private:
     class Private;
     Private *d;
 };
 
 }
 }
 
 #endif // OSOUNDSYSTEM_H