| -rw-r--r-- | libopie2/opiemm/opiemm.pro | 4 | ||||
| -rw-r--r-- | libopie2/opiemm/osoundsystem.cpp | 30 |
2 files changed, 14 insertions, 20 deletions
diff --git a/libopie2/opiemm/opiemm.pro b/libopie2/opiemm/opiemm.pro index d5c8238..d6f54ee 100644 --- a/libopie2/opiemm/opiemm.pro +++ b/libopie2/opiemm/opiemm.pro @@ -5,16 +5,12 @@ HEADERS = osoundsystem.h SOURCES = osoundsystem.cpp INTERFACES = TARGET = opiemm2 VERSION = 1.8.2 INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -MOC_DIR = moc -OBJECTS_DIR = obj - !contains( platform, x11 ) { include ( $(OPIEDIR)/include.pro ) } contains( platform, x11 ) { diff --git a/libopie2/opiemm/osoundsystem.cpp b/libopie2/opiemm/osoundsystem.cpp index d857659..ca63389 100644 --- a/libopie2/opiemm/osoundsystem.cpp +++ b/libopie2/opiemm/osoundsystem.cpp @@ -27,12 +27,13 @@ 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> @@ -46,13 +47,13 @@ *======================================================================================*/ OSoundSystem* OSoundSystem::_instance = 0; OSoundSystem::OSoundSystem() { - qDebug( "OSoundSystem::OSoundSystem()" ); + odebug << "OSoundSystem::OSoundSystem()" << oendl; synchronize(); } void OSoundSystem::synchronize() { // gather available interfaces by inspecting /dev @@ -62,21 +63,18 @@ 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 ) { - qDebug( "OSoundSystem: /dev/sound not existing. No sound devices available" ); + odebug << "OSoundSystem: /dev/sound not existing. No sound devices available" << oendl; return; } QTextStream s( &f ); s.readLine(); s.readLine(); while ( !s.atEnd() ) @@ -123,13 +121,13 @@ OSoundSystem::CardIterator OSoundSystem::iterator() const * OSoundCard *======================================================================================*/ OSoundCard::OSoundCard( QObject* parent, const char* name ) :QObject( parent, name ), _audio( 0 ), _mixer( 0 ) { - qDebug( "OSoundCard::OSoundCard()" ); + odebug << "OSoundCard::OSoundCard()" << oendl; init(); } OSoundCard::~OSoundCard() { @@ -147,13 +145,13 @@ void OSoundCard::init() * OAudioInterface *======================================================================================*/ OAudioInterface::OAudioInterface( QObject* parent, const char* name ) :QObject( parent, name ) { - qDebug( "OAudioInterface::OAudioInterface()" ); + odebug << "OAudioInterface::OAudioInterface()" << oendl; init(); } OAudioInterface::~OAudioInterface() { @@ -171,13 +169,13 @@ void OAudioInterface::init() * OMixerInterface *======================================================================================*/ OMixerInterface::OMixerInterface( QObject* parent, const char* name ) :QObject( parent, name ) { - qDebug( "OMixerInterface::OMixerInterface()" ); + odebug << "OMixerInterface::OMixerInterface()" << oendl; init(); } OMixerInterface::~OMixerInterface() { @@ -187,13 +185,13 @@ OMixerInterface::~OMixerInterface() void OMixerInterface::init() { // open the device _fd = ::open( name(), O_RDWR ); if ( _fd == -1 ) { - qWarning( "can't open mixer." ); + owarn << "OMixerInterface::init(): Can't open mixer." << oendl; return; } // construct the device capabilities int devmask = 0; if ( ioctl( _fd, SOUND_MIXER_READ_DEVMASK, &devmask ) != -1 ) @@ -209,13 +207,13 @@ void OMixerInterface::init() 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 ); - //qDebug( "devmask available and constructed." ); + //odebug << "devmask available and constructed." << oendl; } devmask = 0; if ( ioctl( _fd, SOUND_MIXER_READ_RECMASK, &devmask ) != -1 ) { if ( devmask & ( 1 << SOUND_MIXER_VOLUME ) ) _channels.insert( "RecVolume", SOUND_MIXER_VOLUME ); @@ -229,13 +227,13 @@ void OMixerInterface::init() 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 ); - //qDebug( "recmask available and constructed." ); + //odebug << "recmask available and constructed." << oendl; } /* ChannelIterator it; for ( it = _channels.begin(); it != _channels.end(); ++it ) { qDebug( "Channel %s available (bit %d)", (const char*) it.key(), it.data() ); @@ -256,19 +254,19 @@ QStringList OMixerInterface::allChannels() const return channels; } QStringList OMixerInterface::recChannels() const { - qWarning( "NYI" ); + owarn << "NYI" << oendl; } QStringList OMixerInterface::playChannels() const { - qWarning( "NYI" ); + owarn << "NYI" << oendl; } bool OMixerInterface::hasChannel( const QString& channel ) { return _channels.contains( channel ); @@ -282,19 +280,19 @@ void OMixerInterface::setVolume( const QString& channel, int left, int right ) if ( _channels.contains( channel ) ) { int result = ioctl( _fd, MIXER_WRITE( _channels[channel] ), &volume ); if ( result == -1 ) { - qWarning( "Can't set volume: %s", strerror( errno ) ); + owarn << "Can't set volume: " << strerror( errno ) << oendl; } else { if ( result & 0xff != left ) { - qWarning( "Device adjusted volume from %d to %d", left, result & 0xff ); + owarn << "Device adjusted volume from " << left << " to " << (result & 0xff) << oendl; } } } } @@ -303,13 +301,13 @@ int OMixerInterface::volume( const QString& channel ) const int volume; if ( _channels.contains( channel ) ) { if ( ioctl( _fd, MIXER_READ( _channels[channel] ), &volume ) == -1 ) { - qWarning( "Can't get volume: %s", strerror( errno ) ); + owarn << "Can't get volume: " << strerror( errno ) << oendl; } else return volume; } return -1; } |