summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiemm/opiemm.pro4
-rw-r--r--libopie2/opiemm/osoundsystem.cpp30
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
@@ -8,10 +8,6 @@ TARGET = opiemm2
8VERSION = 1.8.2 8VERSION = 1.8.2
9INCLUDEPATH += $(OPIEDIR)/include 9INCLUDEPATH += $(OPIEDIR)/include
10DEPENDPATH += $(OPIEDIR)/include 10DEPENDPATH += $(OPIEDIR)/include
11LIBS +=
12MOC_DIR = moc
13OBJECTS_DIR = obj
14
15 11
16!contains( platform, x11 ) { 12!contains( platform, x11 ) {
17 include ( $(OPIEDIR)/include.pro ) 13 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
@@ -30,6 +30,7 @@
30*/ 30*/
31 31
32#include <opie2/osoundsystem.h> 32#include <opie2/osoundsystem.h>
33#include <opie2/odebug.h>
33 34
34#include <errno.h> 35#include <errno.h>
35#include <fcntl.h> 36#include <fcntl.h>
@@ -49,7 +50,7 @@ OSoundSystem* OSoundSystem::_instance = 0;
49 50
50OSoundSystem::OSoundSystem() 51OSoundSystem::OSoundSystem()
51{ 52{
52 qDebug( "OSoundSystem::OSoundSystem()" ); 53 odebug << "OSoundSystem::OSoundSystem()" << oendl;
53 synchronize(); 54 synchronize();
54} 55}
55 56
@@ -65,15 +66,12 @@ void OSoundSystem::synchronize()
65 66
66 /* 67 /*
67 68
68
69
70
71 QString str; 69 QString str;
72 QFile f( "/dev/sound" ); 70 QFile f( "/dev/sound" );
73 bool hasFile = f.open( IO_ReadOnly ); 71 bool hasFile = f.open( IO_ReadOnly );
74 if ( !hasFile ) 72 if ( !hasFile )
75 { 73 {
76 qDebug( "OSoundSystem: /dev/sound not existing. No sound devices available" ); 74 odebug << "OSoundSystem: /dev/sound not existing. No sound devices available" << oendl;
77 return; 75 return;
78 } 76 }
79 QTextStream s( &f ); 77 QTextStream s( &f );
@@ -126,7 +124,7 @@ OSoundSystem::CardIterator OSoundSystem::iterator() const
126OSoundCard::OSoundCard( QObject* parent, const char* name ) 124OSoundCard::OSoundCard( QObject* parent, const char* name )
127 :QObject( parent, name ), _audio( 0 ), _mixer( 0 ) 125 :QObject( parent, name ), _audio( 0 ), _mixer( 0 )
128{ 126{
129 qDebug( "OSoundCard::OSoundCard()" ); 127 odebug << "OSoundCard::OSoundCard()" << oendl;
130 init(); 128 init();
131} 129}
132 130
@@ -150,7 +148,7 @@ void OSoundCard::init()
150OAudioInterface::OAudioInterface( QObject* parent, const char* name ) 148OAudioInterface::OAudioInterface( QObject* parent, const char* name )
151 :QObject( parent, name ) 149 :QObject( parent, name )
152{ 150{
153 qDebug( "OAudioInterface::OAudioInterface()" ); 151 odebug << "OAudioInterface::OAudioInterface()" << oendl;
154 init(); 152 init();
155} 153}
156 154
@@ -174,7 +172,7 @@ void OAudioInterface::init()
174OMixerInterface::OMixerInterface( QObject* parent, const char* name ) 172OMixerInterface::OMixerInterface( QObject* parent, const char* name )
175 :QObject( parent, name ) 173 :QObject( parent, name )
176{ 174{
177 qDebug( "OMixerInterface::OMixerInterface()" ); 175 odebug << "OMixerInterface::OMixerInterface()" << oendl;
178 init(); 176 init();
179} 177}
180 178
@@ -190,7 +188,7 @@ void OMixerInterface::init()
190 _fd = ::open( name(), O_RDWR ); 188 _fd = ::open( name(), O_RDWR );
191 if ( _fd == -1 ) 189 if ( _fd == -1 )
192 { 190 {
193 qWarning( "can't open mixer." ); 191 owarn << "OMixerInterface::init(): Can't open mixer." << oendl;
194 return; 192 return;
195 } 193 }
196 194
@@ -212,7 +210,7 @@ void OMixerInterface::init()
212 if ( devmask & ( 1 << SOUND_MIXER_RECLEV ) ) _channels.insert( "PlayRecord", SOUND_MIXER_RECLEV ); 210 if ( devmask & ( 1 << SOUND_MIXER_RECLEV ) ) _channels.insert( "PlayRecord", SOUND_MIXER_RECLEV );
213 if ( devmask & ( 1 << SOUND_MIXER_IGAIN ) ) _channels.insert( "PlayInputGain", SOUND_MIXER_IGAIN ); 211 if ( devmask & ( 1 << SOUND_MIXER_IGAIN ) ) _channels.insert( "PlayInputGain", SOUND_MIXER_IGAIN );
214 if ( devmask & ( 1 << SOUND_MIXER_OGAIN ) ) _channels.insert( "PlayOutputGain", SOUND_MIXER_OGAIN ); 212 if ( devmask & ( 1 << SOUND_MIXER_OGAIN ) ) _channels.insert( "PlayOutputGain", SOUND_MIXER_OGAIN );
215 //qDebug( "devmask available and constructed." ); 213 //odebug << "devmask available and constructed." << oendl;
216 } 214 }
217 215
218 devmask = 0; 216 devmask = 0;
@@ -232,7 +230,7 @@ void OMixerInterface::init()
232 if ( devmask & ( 1 << SOUND_MIXER_RECLEV ) ) _channels.insert( "RecRecord", SOUND_MIXER_RECLEV ); 230 if ( devmask & ( 1 << SOUND_MIXER_RECLEV ) ) _channels.insert( "RecRecord", SOUND_MIXER_RECLEV );
233 if ( devmask & ( 1 << SOUND_MIXER_IGAIN ) ) _channels.insert( "RecInputGain", SOUND_MIXER_IGAIN ); 231 if ( devmask & ( 1 << SOUND_MIXER_IGAIN ) ) _channels.insert( "RecInputGain", SOUND_MIXER_IGAIN );
234 if ( devmask & ( 1 << SOUND_MIXER_OGAIN ) ) _channels.insert( "RecOutputGain", SOUND_MIXER_OGAIN ); 232 if ( devmask & ( 1 << SOUND_MIXER_OGAIN ) ) _channels.insert( "RecOutputGain", SOUND_MIXER_OGAIN );
235 //qDebug( "recmask available and constructed." ); 233 //odebug << "recmask available and constructed." << oendl;
236 } 234 }
237 235
238/* ChannelIterator it; 236/* ChannelIterator it;
@@ -259,13 +257,13 @@ QStringList OMixerInterface::allChannels() const
259 257
260QStringList OMixerInterface::recChannels() const 258QStringList OMixerInterface::recChannels() const
261{ 259{
262 qWarning( "NYI" ); 260 owarn << "NYI" << oendl;
263} 261}
264 262
265 263
266QStringList OMixerInterface::playChannels() const 264QStringList OMixerInterface::playChannels() const
267{ 265{
268 qWarning( "NYI" ); 266 owarn << "NYI" << oendl;
269} 267}
270 268
271 269
@@ -285,13 +283,13 @@ void OMixerInterface::setVolume( const QString& channel, int left, int right )
285 int result = ioctl( _fd, MIXER_WRITE( _channels[channel] ), &volume ); 283 int result = ioctl( _fd, MIXER_WRITE( _channels[channel] ), &volume );
286 if ( result == -1 ) 284 if ( result == -1 )
287 { 285 {
288 qWarning( "Can't set volume: %s", strerror( errno ) ); 286 owarn << "Can't set volume: " << strerror( errno ) << oendl;
289 } 287 }
290 else 288 else
291 { 289 {
292 if ( result & 0xff != left ) 290 if ( result & 0xff != left )
293 { 291 {
294 qWarning( "Device adjusted volume from %d to %d", left, result & 0xff ); 292 owarn << "Device adjusted volume from " << left << " to " << (result & 0xff) << oendl;
295 } 293 }
296 } 294 }
297 } 295 }
@@ -306,7 +304,7 @@ int OMixerInterface::volume( const QString& channel ) const
306 { 304 {
307 if ( ioctl( _fd, MIXER_READ( _channels[channel] ), &volume ) == -1 ) 305 if ( ioctl( _fd, MIXER_READ( _channels[channel] ), &volume ) == -1 )
308 { 306 {
309 qWarning( "Can't get volume: %s", strerror( errno ) ); 307 owarn << "Can't get volume: " << strerror( errno ) << oendl;
310 } 308 }
311 else return volume; 309 else return volume;
312 } 310 }