bye bye qDebug, hello odebug

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
@@ -7,12 +7,8 @@ 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 )
 }
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
@@ -29,8 +29,9 @@
 
 */
 
 #include <opie2/osoundsystem.h>
+#include <opie2/odebug.h>
 
 #include <errno.h>
 #include <fcntl.h>
 #include <string.h>
@@ -48,9 +49,9 @@
 OSoundSystem* OSoundSystem::_instance = 0;
 
 OSoundSystem::OSoundSystem()
 {
-    qDebug( "OSoundSystem::OSoundSystem()" );
+    odebug << "OSoundSystem::OSoundSystem()" << oendl;
     synchronize();
 }
 
 void OSoundSystem::synchronize()
@@ -64,17 +65,14 @@ void OSoundSystem::synchronize()
 
 
     /*
 
-
-
-
     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();
@@ -125,9 +123,9 @@ OSoundSystem::CardIterator OSoundSystem::iterator() const
 
 OSoundCard::OSoundCard( QObject* parent, const char* name )
                  :QObject( parent, name ), _audio( 0 ), _mixer( 0 )
 {
-    qDebug( "OSoundCard::OSoundCard()" );
+    odebug << "OSoundCard::OSoundCard()" << oendl;
     init();
 }
 
 
@@ -149,9 +147,9 @@ void OSoundCard::init()
 
 OAudioInterface::OAudioInterface( QObject* parent, const char* name )
                  :QObject( parent, name )
 {
-    qDebug( "OAudioInterface::OAudioInterface()" );
+    odebug << "OAudioInterface::OAudioInterface()" << oendl;
     init();
 }
 
 
@@ -173,9 +171,9 @@ void OAudioInterface::init()
 
 OMixerInterface::OMixerInterface( QObject* parent, const char* name )
                  :QObject( parent, name )
 {
-    qDebug( "OMixerInterface::OMixerInterface()" );
+    odebug << "OMixerInterface::OMixerInterface()" << oendl;
     init();
 }
 
 
@@ -189,9 +187,9 @@ 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
@@ -211,9 +209,9 @@ void OMixerInterface::init()
         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 )
@@ -231,9 +229,9 @@ void OMixerInterface::init()
         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 )
@@ -258,15 +256,15 @@ QStringList OMixerInterface::allChannels() const
 
 
 QStringList OMixerInterface::recChannels() const
 {
-    qWarning( "NYI" );
+    owarn << "NYI" << oendl;
 }
 
 
 QStringList OMixerInterface::playChannels() const
 {
-    qWarning( "NYI" );
+    owarn << "NYI" << oendl;
 }
 
 
 bool OMixerInterface::hasChannel( const QString& channel )
@@ -284,15 +282,15 @@ void OMixerInterface::setVolume( const QString& channel, int left, int right )
     {
         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;
             }
         }
     }
 }
@@ -305,9 +303,9 @@ int OMixerInterface::volume( const QString& channel ) const
     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;