-rw-r--r-- | libopie2/opiemm/osoundsystem.cpp | 112 | ||||
-rw-r--r-- | libopie2/opiemm/osoundsystem.h | 19 |
2 files changed, 59 insertions, 72 deletions
diff --git a/libopie2/opiemm/osoundsystem.cpp b/libopie2/opiemm/osoundsystem.cpp index 09fd28f..6c03203 100644 --- a/libopie2/opiemm/osoundsystem.cpp +++ b/libopie2/opiemm/osoundsystem.cpp | |||
@@ -1,6 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | 3 | (C) 2003-2005 Michael 'Mickey' Lauer <mickey@Vanille.de> | |
4 | (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> | ||
5 | =. | 4 | =. |
6 | .=l. | 5 | .=l. |
@@ -41,4 +40,6 @@ | |||
41 | #include <sys/stat.h> | 40 | #include <sys/stat.h> |
42 | 41 | ||
42 | static const char* device_label[] = SOUND_DEVICE_LABELS; | ||
43 | static int max_device_nr = sizeof device_label / sizeof (const char*); | ||
43 | 44 | ||
44 | using namespace Opie::Core; | 45 | using namespace Opie::Core; |
@@ -64,6 +65,5 @@ void OSoundSystem::synchronize() | |||
64 | _interfaces.clear(); | 65 | _interfaces.clear(); |
65 | _interfaces.insert( "soundcard", new OSoundCard( this, "soundcard" ) ); | 66 | _interfaces.insert( "soundcard", new OSoundCard( this, "soundcard" ) ); |
66 | 67 | ||
67 | |||
68 | /* | 68 | /* |
69 | 69 | ||
@@ -177,5 +177,5 @@ void OAudioInterface::init() | |||
177 | 177 | ||
178 | OMixerInterface::OMixerInterface( QObject* parent, const char* name ) | 178 | OMixerInterface::OMixerInterface( QObject* parent, const char* name ) |
179 | :QObject( parent, name ) | 179 | :QObject( parent, name ), _devmask( 0 ), _recmask( 0 ), _stmask( 0 ) |
180 | { | 180 | { |
181 | odebug << "OMixerInterface::OMixerInterface()" << oendl; | 181 | odebug << "OMixerInterface::OMixerInterface()" << oendl; |
@@ -200,58 +200,30 @@ void OMixerInterface::init() | |||
200 | 200 | ||
201 | // construct the device capabilities | 201 | // construct the device capabilities |
202 | int devmask = 0; | 202 | if ( ioctl( _fd, SOUND_MIXER_READ_CAPS, &_capmask ) != -1 ) |
203 | if ( ioctl( _fd, SOUND_MIXER_READ_DEVMASK, &devmask ) != -1 ) | ||
204 | { | 203 | { |
205 | if ( devmask & ( 1 << SOUND_MIXER_VOLUME ) ) _channels.insert( "PlayVolume", SOUND_MIXER_VOLUME ); | 204 | odebug << "OMixerInterface::init() - capmask = " << _capmask << oendl; |
206 | if ( devmask & ( 1 << SOUND_MIXER_BASS ) ) _channels.insert( "PlayBass", SOUND_MIXER_BASS ); | ||
207 | if ( devmask & ( 1 << SOUND_MIXER_TREBLE ) ) _channels.insert( "PlayTreble", SOUND_MIXER_TREBLE ); | ||
208 | if ( devmask & ( 1 << SOUND_MIXER_SYNTH ) ) _channels.insert( "PlaySynth", SOUND_MIXER_SYNTH ); | ||
209 | if ( devmask & ( 1 << SOUND_MIXER_PCM ) ) _channels.insert( "PlayPCM", SOUND_MIXER_PCM ); | ||
210 | if ( devmask & ( 1 << SOUND_MIXER_SPEAKER ) ) _channels.insert( "PlaySpeaker", SOUND_MIXER_SPEAKER ); | ||
211 | if ( devmask & ( 1 << SOUND_MIXER_LINE ) ) _channels.insert( "PlayLine", SOUND_MIXER_LINE ); | ||
212 | if ( devmask & ( 1 << SOUND_MIXER_MIC ) ) _channels.insert( "PlayMic", SOUND_MIXER_MIC ); | ||
213 | if ( devmask & ( 1 << SOUND_MIXER_CD ) ) _channels.insert( "PlayCD", SOUND_MIXER_CD ); | ||
214 | if ( devmask & ( 1 << SOUND_MIXER_IMIX ) ) _channels.insert( "PlayInputMix", SOUND_MIXER_IMIX ); | ||
215 | if ( devmask & ( 1 << SOUND_MIXER_ALTPCM ) ) _channels.insert( "PlayAltPCM", SOUND_MIXER_ALTPCM ); | ||
216 | if ( devmask & ( 1 << SOUND_MIXER_RECLEV ) ) _channels.insert( "PlayRecord", SOUND_MIXER_RECLEV ); | ||
217 | if ( devmask & ( 1 << SOUND_MIXER_IGAIN ) ) _channels.insert( "PlayInputGain", SOUND_MIXER_IGAIN ); | ||
218 | if ( devmask & ( 1 << SOUND_MIXER_OGAIN ) ) _channels.insert( "PlayOutputGain", SOUND_MIXER_OGAIN ); | ||
219 | //odebug << "devmask available and constructed." << oendl; | ||
220 | } | 205 | } |
221 | 206 | if ( ioctl( _fd, SOUND_MIXER_READ_DEVMASK, &_devmask ) != -1 ) | |
222 | devmask = 0; | ||
223 | if ( ioctl( _fd, SOUND_MIXER_READ_RECMASK, &devmask ) != -1 ) | ||
224 | { | 207 | { |
225 | if ( devmask & ( 1 << SOUND_MIXER_VOLUME ) ) _channels.insert( "RecVolume", SOUND_MIXER_VOLUME ); | 208 | odebug << "OMixerInterface::init() - devmask = " << _devmask << oendl; |
226 | if ( devmask & ( 1 << SOUND_MIXER_BASS ) ) _channels.insert( "RecBass", SOUND_MIXER_BASS ); | ||
227 | if ( devmask & ( 1 << SOUND_MIXER_TREBLE ) ) _channels.insert( "RecTreble", SOUND_MIXER_TREBLE ); | ||
228 | if ( devmask & ( 1 << SOUND_MIXER_SYNTH ) ) _channels.insert( "RecSynth", SOUND_MIXER_SYNTH ); | ||
229 | if ( devmask & ( 1 << SOUND_MIXER_PCM ) ) _channels.insert( "RecPCM", SOUND_MIXER_PCM ); | ||
230 | if ( devmask & ( 1 << SOUND_MIXER_SPEAKER ) ) _channels.insert( "RecSpeaker", SOUND_MIXER_SPEAKER ); | ||
231 | if ( devmask & ( 1 << SOUND_MIXER_LINE ) ) _channels.insert( "RecLine", SOUND_MIXER_LINE ); | ||
232 | if ( devmask & ( 1 << SOUND_MIXER_MIC ) ) _channels.insert( "RecMic", SOUND_MIXER_MIC ); | ||
233 | if ( devmask & ( 1 << SOUND_MIXER_CD ) ) _channels.insert( "RecCD", SOUND_MIXER_CD ); | ||
234 | if ( devmask & ( 1 << SOUND_MIXER_IMIX ) ) _channels.insert( "RecInputMix", SOUND_MIXER_IMIX ); | ||
235 | if ( devmask & ( 1 << SOUND_MIXER_ALTPCM ) ) _channels.insert( "RecAltPCM", SOUND_MIXER_ALTPCM ); | ||
236 | if ( devmask & ( 1 << SOUND_MIXER_RECLEV ) ) _channels.insert( "RecRecord", SOUND_MIXER_RECLEV ); | ||
237 | if ( devmask & ( 1 << SOUND_MIXER_IGAIN ) ) _channels.insert( "RecInputGain", SOUND_MIXER_IGAIN ); | ||
238 | if ( devmask & ( 1 << SOUND_MIXER_OGAIN ) ) _channels.insert( "RecOutputGain", SOUND_MIXER_OGAIN ); | ||
239 | //odebug << "recmask available and constructed." << oendl; | ||
240 | } | 209 | } |
241 | 210 | if ( ioctl( _fd, SOUND_MIXER_READ_RECMASK, &_recmask ) != -1 ) | |
242 | devmask = 0; | ||
243 | if ( ioctl( _fd, SOUND_MIXER_READ_STEREODEVS, &devmask ) != -1 ) | ||
244 | { | 211 | { |
245 | odebug << "stereomask = " << devmask << oendl; | 212 | odebug << "OMixerInterface::init() - recmask = " << _recmask << oendl; |
246 | } | 213 | } |
247 | 214 | if ( ioctl( _fd, SOUND_MIXER_READ_STEREODEVS, &_stmask ) != -1 ) | |
248 | /* ChannelIterator it; | ||
249 | for ( it = _channels.begin(); it != _channels.end(); ++it ) | ||
250 | { | 215 | { |
251 | odebug << "Channel " << it.key() << " available (bit " << it.data() << ")" << oendl; | 216 | odebug << "OMixerInterface::init() - stereomask = " << _stmask << oendl; |
252 | odebug << " +--- Volume: " << volume( it.key() ) & 0xff << " | " << volume( it.key() ) >> 8 << "" << oendl; | ||
253 | } | 217 | } |
254 | */ | 218 | for ( int i = 0; i < max_device_nr; ++i ) |
255 | } | 219 | { |
220 | if ( _devmask & ( 1 << i ) ) | ||
221 | { | ||
222 | _channels.insert( QString( device_label[i] ).stripWhiteSpace(), i ); | ||
223 | odebug << "OMixerInterface::init() - channel '" << device_label[i] << "'" << oendl; | ||
224 | } | ||
225 | } | ||
226 | } | ||
227 | |||
256 | 228 | ||
257 | QStringList OMixerInterface::allChannels() const | 229 | QStringList OMixerInterface::allChannels() const |
@@ -261,6 +233,5 @@ QStringList OMixerInterface::allChannels() const | |||
261 | while ( it != _channels.end() ) | 233 | while ( it != _channels.end() ) |
262 | { | 234 | { |
263 | channels += it.key(); | 235 | channels += it++.key(); |
264 | it++; | ||
265 | } | 236 | } |
266 | return channels; | 237 | return channels; |
@@ -270,6 +241,11 @@ QStringList OMixerInterface::allChannels() const | |||
270 | QStringList OMixerInterface::recChannels() const | 241 | QStringList OMixerInterface::recChannels() const |
271 | { | 242 | { |
272 | owarn << "NYI" << oendl; | 243 | ChannelIterator it = _channels.begin(); |
273 | return QStringList(); | 244 | QStringList channels; |
245 | while ( it != _channels.end() ) | ||
246 | { | ||
247 | if ( _recmask & ( 1 << _channels[it.key()] ) ) channels += it++.key(); | ||
248 | } | ||
249 | return channels; | ||
274 | } | 250 | } |
275 | 251 | ||
@@ -277,6 +253,11 @@ QStringList OMixerInterface::recChannels() const | |||
277 | QStringList OMixerInterface::playChannels() const | 253 | QStringList OMixerInterface::playChannels() const |
278 | { | 254 | { |
279 | owarn << "NYI" << oendl; | 255 | return allChannels(); |
280 | return QStringList(); | 256 | } |
257 | |||
258 | |||
259 | bool OMixerInterface::hasMultipleRecording() const | ||
260 | { | ||
261 | return !( _capmask & SOUND_CAP_EXCL_INPUT ); | ||
281 | } | 262 | } |
282 | 263 | ||
@@ -290,14 +271,11 @@ bool OMixerInterface::hasChannel( const QString& channel ) const | |||
290 | bool OMixerInterface::isStereo( const QString& channel ) const | 271 | bool OMixerInterface::isStereo( const QString& channel ) const |
291 | { | 272 | { |
292 | bool result = false; | 273 | return _channels.contains( channel ) && ( _stmask & ( 1 << _channels[channel] ) ); |
293 | if ( _channels.contains( channel ) ) | 274 | } |
294 | { | 275 | |
295 | int devmask = 0; | 276 | |
296 | if ( ioctl( _fd, SOUND_MIXER_READ_STEREODEVS, &devmask ) != -1 ) | 277 | bool OMixerInterface::isRecordable( const QString& channel ) const |
297 | { | 278 | { |
298 | result = devmask & ( 1 << _channels[channel] ); | 279 | return _channels.contains( channel ) && ( _recmask & ( 1 << _channels[channel] ) ); |
299 | } | ||
300 | } | ||
301 | return result; | ||
302 | } | 280 | } |
303 | 281 | ||
diff --git a/libopie2/opiemm/osoundsystem.h b/libopie2/opiemm/osoundsystem.h index ac7a5a7..cce90c0 100644 --- a/libopie2/opiemm/osoundsystem.h +++ b/libopie2/opiemm/osoundsystem.h | |||
@@ -1,6 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | 3 | (C) 2003-2005 Michael 'Mickey' Lauer <mickey@Vanille.de> | |
4 | (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> | ||
5 | =. | 4 | =. |
6 | .=l. | 5 | .=l. |
@@ -199,5 +198,8 @@ class OMixerInterface : public QObject | |||
199 | */ | 198 | */ |
200 | QStringList playChannels() const; | 199 | QStringList playChannels() const; |
201 | 200 | /** | |
201 | * @returns true, if the device features multiple recording sources. | ||
202 | */ | ||
203 | bool hasMultipleRecording() const; | ||
202 | /** | 204 | /** |
203 | * @returns true, if @a channel exists. | 205 | * @returns true, if @a channel exists. |
@@ -208,5 +210,8 @@ class OMixerInterface : public QObject | |||
208 | */ | 210 | */ |
209 | bool isStereo( const QString& channel ) const; | 211 | bool isStereo( const QString& channel ) const; |
210 | 212 | /** | |
213 | * @returns tru, if @a channel is a possible recording source. | ||
214 | */ | ||
215 | bool isRecordable( const QString& channel ) const; | ||
211 | /** | 216 | /** |
212 | * Set the @a left and @a right volumes for @a channel. | 217 | * Set the @a left and @a right volumes for @a channel. |
@@ -222,5 +227,9 @@ class OMixerInterface : public QObject | |||
222 | protected: | 227 | protected: |
223 | int _fd; | 228 | int _fd; |
224 | QMap<QString, int> _channels; | 229 | int _capmask; |
230 | int _devmask; | ||
231 | int _recmask; | ||
232 | int _stmask; | ||
233 | QMap<QString,int> _channels; | ||
225 | 234 | ||
226 | private: | 235 | private: |