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
@@ -10,6 +10,2 @@ INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
-LIBS        +=
-MOC_DIR     = moc
-OBJECTS_DIR = obj
-
 
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
@@ -32,2 +32,3 @@
 #include <opie2/osoundsystem.h>
+#include <opie2/odebug.h>
 
@@ -51,3 +52,3 @@ OSoundSystem::OSoundSystem()
 {
-    qDebug( "OSoundSystem::OSoundSystem()" );
+    odebug << "OSoundSystem::OSoundSystem()" << oendl;
     synchronize();
@@ -67,5 +68,2 @@ void OSoundSystem::synchronize()
 
-
-
-
     QString str;
@@ -75,3 +73,3 @@ void OSoundSystem::synchronize()
     {
-        qDebug( "OSoundSystem: /dev/sound not existing. No sound devices available" );
+        odebug << "OSoundSystem: /dev/sound not existing. No sound devices available" << oendl;
         return;
@@ -128,3 +126,3 @@ OSoundCard::OSoundCard( QObject* parent, const char* name )
 {
-    qDebug( "OSoundCard::OSoundCard()" );
+    odebug << "OSoundCard::OSoundCard()" << oendl;
     init();
@@ -152,3 +150,3 @@ OAudioInterface::OAudioInterface( QObject* parent, const char* name )
 {
-    qDebug( "OAudioInterface::OAudioInterface()" );
+    odebug << "OAudioInterface::OAudioInterface()" << oendl;
     init();
@@ -176,3 +174,3 @@ OMixerInterface::OMixerInterface( QObject* parent, const char* name )
 {
-    qDebug( "OMixerInterface::OMixerInterface()" );
+    odebug << "OMixerInterface::OMixerInterface()" << oendl;
     init();
@@ -192,3 +190,3 @@ void OMixerInterface::init()
     {
-        qWarning( "can't open mixer." );
+        owarn << "OMixerInterface::init(): Can't open mixer." << oendl;
         return;
@@ -214,3 +212,3 @@ void OMixerInterface::init()
         if ( devmask & ( 1 << SOUND_MIXER_OGAIN ) )     _channels.insert( "PlayOutputGain", SOUND_MIXER_OGAIN );
-        //qDebug( "devmask available and constructed." );
+        //odebug << "devmask available and constructed." << oendl;
     }
@@ -234,3 +232,3 @@ void OMixerInterface::init()
         if ( devmask & ( 1 << SOUND_MIXER_OGAIN ) )     _channels.insert( "RecOutputGain", SOUND_MIXER_OGAIN );
-        //qDebug( "recmask available and constructed." );
+        //odebug << "recmask available and constructed." << oendl;
     }
@@ -261,3 +259,3 @@ QStringList OMixerInterface::recChannels() const
 {
-    qWarning( "NYI" );
+    owarn << "NYI" << oendl;
 }
@@ -267,3 +265,3 @@ QStringList OMixerInterface::playChannels() const
 {
-    qWarning( "NYI" );
+    owarn << "NYI" << oendl;
 }
@@ -287,3 +285,3 @@ void OMixerInterface::setVolume( const QString& channel, int left, int right )
         {
-            qWarning( "Can't set volume: %s", strerror( errno ) );
+            owarn << "Can't set volume: " << strerror( errno ) << oendl;
         }
@@ -293,3 +291,3 @@ void OMixerInterface::setVolume( const QString& channel, int left, int right )
             {
-                qWarning( "Device adjusted volume from %d to %d", left, result & 0xff );
+                owarn << "Device adjusted volume from " << left << " to " << (result & 0xff) << oendl;
             }
@@ -308,3 +306,3 @@ int OMixerInterface::volume( const QString& channel ) const
         {
-            qWarning( "Can't get volume: %s", strerror( errno ) );
+            owarn << "Can't get volume: " << strerror( errno ) << oendl;
         }