| -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 @@ -9,8 +9,4 @@ VERSION = 1.8.2 INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -MOC_DIR = moc -OBJECTS_DIR = obj - !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 @@ -31,4 +31,5 @@ #include <opie2/osoundsystem.h> +#include <opie2/odebug.h> #include <errno.h> @@ -50,5 +51,5 @@ OSoundSystem* OSoundSystem::_instance = 0; OSoundSystem::OSoundSystem() { - qDebug( "OSoundSystem::OSoundSystem()" ); + odebug << "OSoundSystem::OSoundSystem()" << oendl; synchronize(); } @@ -66,7 +67,4 @@ void OSoundSystem::synchronize() /* - - - QString str; QFile f( "/dev/sound" ); @@ -74,5 +72,5 @@ void OSoundSystem::synchronize() if ( !hasFile ) { - qDebug( "OSoundSystem: /dev/sound not existing. No sound devices available" ); + odebug << "OSoundSystem: /dev/sound not existing. No sound devices available" << oendl; return; } @@ -127,5 +125,5 @@ OSoundCard::OSoundCard( QObject* parent, const char* name ) :QObject( parent, name ), _audio( 0 ), _mixer( 0 ) { - qDebug( "OSoundCard::OSoundCard()" ); + odebug << "OSoundCard::OSoundCard()" << oendl; init(); } @@ -151,5 +149,5 @@ OAudioInterface::OAudioInterface( QObject* parent, const char* name ) :QObject( parent, name ) { - qDebug( "OAudioInterface::OAudioInterface()" ); + odebug << "OAudioInterface::OAudioInterface()" << oendl; init(); } @@ -175,5 +173,5 @@ OMixerInterface::OMixerInterface( QObject* parent, const char* name ) :QObject( parent, name ) { - qDebug( "OMixerInterface::OMixerInterface()" ); + odebug << "OMixerInterface::OMixerInterface()" << oendl; init(); } @@ -191,5 +189,5 @@ void OMixerInterface::init() if ( _fd == -1 ) { - qWarning( "can't open mixer." ); + owarn << "OMixerInterface::init(): Can't open mixer." << oendl; return; } @@ -213,5 +211,5 @@ void OMixerInterface::init() 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; } @@ -233,5 +231,5 @@ void OMixerInterface::init() 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; } @@ -260,5 +258,5 @@ QStringList OMixerInterface::allChannels() const QStringList OMixerInterface::recChannels() const { - qWarning( "NYI" ); + owarn << "NYI" << oendl; } @@ -266,5 +264,5 @@ QStringList OMixerInterface::recChannels() const QStringList OMixerInterface::playChannels() const { - qWarning( "NYI" ); + owarn << "NYI" << oendl; } @@ -286,5 +284,5 @@ void OMixerInterface::setVolume( const QString& channel, int left, int right ) if ( result == -1 ) { - qWarning( "Can't set volume: %s", strerror( errno ) ); + owarn << "Can't set volume: " << strerror( errno ) << oendl; } else @@ -292,5 +290,5 @@ void OMixerInterface::setVolume( const QString& channel, int left, int right ) 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; } } @@ -307,5 +305,5 @@ int OMixerInterface::volume( const QString& channel ) const 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; |