- add linux pcmcia subsystem wrapper: OPcmciaSystem and OPcmciaCard

- move linux-only subsystems in subdirectory linux
- minor header cleanups

2 files changed, 13 insertions, 12 deletions

diff --git a/libopie2/opiemm/osoundsystem.cpp b/libopie2/opiemm/osoundsystem.cpp
index 2956682..6f849cd 100644
--- a/libopie2/opiemm/osoundsystem.cpp
+++ b/libopie2/opiemm/osoundsystem.cpp
@@ -1,315 +1,317 @@
 /*
                              This file is part of the Opie Project
-                             (C) 2003-2005 Michael 'Mickey' Lauer <mickey@Vanille.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 "osoundsystem.h"
+using namespace Opie::MM;
+
+/* OPIE */
 #include <opie2/odebug.h>
+using namespace Opie::Core;
 
+/* STD */
 #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()
 {
     _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();
     }
 */
 }
 
 
 int OSoundSystem::count() const
 {
     return _interfaces.count();
 }
 
 
 OSoundCard* OSoundSystem::card( const QString& iface ) const
 {
     return _interfaces[iface];
 }
 
 
 OSoundSystem* OSoundSystem::instance()
 {
     if ( !_instance ) _instance = new OSoundSystem();
     return _instance;
 }
 
 
 OSoundSystem::CardIterator OSoundSystem::iterator() const
 {
     return OSoundSystem::CardIterator( _interfaces );
 }
 
 
 /*======================================================================================
  * OSoundCard
  *======================================================================================*/
 
 OSoundCard::OSoundCard( QObject* parent, const char* name )
                  :QObject( parent, name ), _audio( 0 ), _mixer( 0 )
 {
     odebug << "OSoundCard::OSoundCard()" << oendl;
     init();
 }
 
 
 OSoundCard::~OSoundCard()
 {
 }
 
 
 void OSoundCard::init()
 {
 #ifdef QT_QWS_DEVFS
     _audio = new OAudioInterface( this, "/dev/sound/dsp" );
     _mixer = new OMixerInterface( this, "/dev/sound/mixer" );
 #else
     _audio = new OAudioInterface( this, "/dev/dsp" );
     _mixer = new OMixerInterface( this, "/dev/mixer" );
 #endif
 }
 
 
 /*======================================================================================
  * OAudioInterface
  *======================================================================================*/
 
 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 ), _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
     if ( ioctl( _fd, SOUND_MIXER_READ_CAPS, &_capmask ) != -1 )
     {
         odebug << "OMixerInterface::init() - capmask = " << _capmask << oendl;
     }
     if ( ioctl( _fd, SOUND_MIXER_READ_DEVMASK, &_devmask ) != -1 )
     {
         odebug << "OMixerInterface::init() - devmask = " << _devmask << oendl;
     }
     if ( ioctl( _fd, SOUND_MIXER_READ_RECMASK, &_recmask ) != -1 )
     {
         odebug << "OMixerInterface::init() - recmask = " << _recmask << oendl;
     }
     if ( ioctl( _fd, SOUND_MIXER_READ_STEREODEVS, &_stmask ) != -1 )
     {
         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();
     }
     return channels;
 }
 
 
 QStringList OMixerInterface::recChannels() const
 {
     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
 {
     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
 {
     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;
             }
         }
     }
 }
 
 
 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 5f6fb7a..1e48f5c 100644
--- a/libopie2/opiemm/osoundsystem.h
+++ b/libopie2/opiemm/osoundsystem.h
@@ -1,245 +1,244 @@
 /*
                              This file is part of the Opie Project
-                             (C) 2003-2005 Michael 'Mickey' Lauer <mickey@Vanille.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.
+ - .   .-<_>     .<>         Foundation; version 2 of the License.
+     ._= =}       :
     .%`+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.
 
 */
 
 #ifndef OSOUNDSYSTEM_H
 #define OSOUNDSYSTEM_H
 
 #include <qobject.h>
 #include <qdict.h>
 #include <qmap.h>
 
 namespace Opie {
 namespace MM {
 
 class OAudioInterface;
 class OMixerInterface;
 class OSoundCard;
 
 /*======================================================================================
  * OSoundSystem
  *======================================================================================*/
 
 /**
- * @brief A container class for all audio interfaces
+ * @brief A container class for the Linux OSS/ALSA audio subsystem
  *
- * This class provides access to all available audio/midi/sequencer interfaces of your computer.
+ * This class provides access to all available audio/midi/sequencer interfaces of your device.
  *
- * @author Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
+ * @author Michael 'Mickey' Lauer <mickey@Vanille.de>
  */
 class OSoundSystem : public QObject
 {
   Q_OBJECT
 
   public:
     typedef QDict<OSoundCard> CardMap;
     typedef QDictIterator<OSoundCard> CardIterator;
 
   public:
     /**
      * @returns the number of available interfaces
      */
     int count() const;
     /**
      * @returns a pointer to the (one and only) @ref OSystem instance.
      */
     static OSoundSystem* instance();
     /**
      * @returns an iterator usable for iterating through all sound cards.
      */
     CardIterator iterator() const;
     /**
      * @returns a pointer to the @ref OAudioInterface object for the specified @a interface or 0, if not found
      * @see OAudioInterface
      */
     OSoundCard* card( const QString& interface ) const;
     /**
      * @internal Rebuild the internal interface database
      * @note Sometimes it might be useful to call this from client code,
      * e.g. after issuing a cardctl insert
      */
     void synchronize();
 
   protected:
     OSoundSystem();
 
   private:
     static OSoundSystem* _instance;
     CardMap _interfaces;
     class Private;
     Private *d;
 };
 
 
 /*======================================================================================
  * OSoundCard
  *======================================================================================*/
 
 class OSoundCard : public QObject
 {
   Q_OBJECT
 
   public:
     /**
      * Constructor. Normally you don't create @ref OSoundCard objects yourself,
      * but access them via @ref OSoundSystem::card().
      */
     OSoundCard( QObject* parent, const char* name );
     /**
      * Destructor.
      */
     virtual ~OSoundCard();
 
     bool hasMixer() const { return _audio; };
     bool hasAudio() const { return _mixer; };
 
     OAudioInterface* audio() const { return _audio; };
     OMixerInterface* mixer() const { return _mixer; };
 
   protected:
     OAudioInterface* _audio;
     OMixerInterface* _mixer;
 
   private:
     void init();
   private:
     class Private;
     Private *d;
 };
 
 /*======================================================================================
  * OAudioInterface
  *======================================================================================*/
 
 class OAudioInterface : public QObject
 {
   Q_OBJECT
 
   public:
     /**
      * Constructor. Normally you don't create @ref OAudioInterface objects yourself,
      * but access them via the @ref OSoundCard interface.
      */
     OAudioInterface( QObject* parent, const char* name );
     /**
      * Destructor.
      */
     virtual ~OAudioInterface();
 
   protected:
     const int _sfd;
 
   private:
     void init();
   private:
     class Private;
     Private *d;
 };
 
 
 /*======================================================================================
  * OMixerInterface
  *======================================================================================*/
 
 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 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;
     int _capmask;
     int _devmask;
     int _recmask;
     int _stmask;
     QMap<QString,int> _channels;
 
   private:
     void init();
   private:
     class Private;
     Private *d;
 };
 
 }
 }
 
 #endif // OSOUNDSYSTEM_H