summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-01-30 19:00:38 (UTC)
committer mickeyl <mickeyl>2005-01-30 19:00:38 (UTC)
commitc3b5d1ebb51848a679f96ac3bb1c8acb1b06138e (patch) (unidiff)
tree9ac1d1281b3bdd92d1975bdc7756e89ebe730f34
parent271dd6ba75ddfba5ac4345e9d74db4dbb2b7c971 (diff)
downloadopie-c3b5d1ebb51848a679f96ac3bb1c8acb1b06138e.zip
opie-c3b5d1ebb51848a679f96ac3bb1c8acb1b06138e.tar.gz
opie-c3b5d1ebb51848a679f96ac3bb1c8acb1b06138e.tar.bz2
improve mixer code
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--examples/opiemm/osoundsystemdemo/osoundsystemdemo.cpp14
-rw-r--r--libopie2/config.in12
-rw-r--r--libopie2/opiemm/osoundsystem.cpp112
-rw-r--r--libopie2/opiemm/osoundsystem.h19
4 files changed, 69 insertions, 88 deletions
diff --git a/examples/opiemm/osoundsystemdemo/osoundsystemdemo.cpp b/examples/opiemm/osoundsystemdemo/osoundsystemdemo.cpp
index f74a1b9..b18d719 100644
--- a/examples/opiemm/osoundsystemdemo/osoundsystemdemo.cpp
+++ b/examples/opiemm/osoundsystemdemo/osoundsystemdemo.cpp
@@ -47,19 +47,25 @@ int main( int argc, char** argv )
47 } 47 }
48 48
49*/ 49*/
50 OSoundCard* card = it.current(); 50 OSoundCard* card = it.current();
51
52 OMixerInterface* mixer = card->mixer(); 51 OMixerInterface* mixer = card->mixer();
52 odebug << "This device " << ( mixer->hasMultipleRecording() ? "does" : "does not" ) << " feature multiple recording sources." << oendl;
53 53
54 QStringList channels = mixer->allChannels(); 54 QStringList channels = mixer->allChannels();
55 55
56 for ( QStringList::Iterator it = channels.begin(); it != channels.end(); ++it ) 56 for ( QStringList::Iterator it = channels.begin(); it != channels.end(); ++it )
57 { 57 {
58 bool stereo = mixer->isStereo( *it ); 58 bool stereo = mixer->isStereo( *it );
59 odebug << "OSSDEMO: Mixer has channel " << *it << ( stereo ? "[stereo]" : "[mono]" ) << oendl; 59 bool recsrc = mixer->isRecordable( *it );
60 odebug << "OSSDEMO: +--- volume " << ( mixer->volume( *it ) & 0xff ) 60 QString line = "OSSDEMO: Mixer has channel " + *it + " ";
61 << " (left) | " << ( mixer->volume( *it ) >> 8 ) << " (right)" << oendl; 61 line = line.leftJustify( 50 ) + ( stereo ? "[stereo]" : "[mono]" );
62 line = line.leftJustify( 60 ) + ( recsrc ? "[recsrc]" : "[ ]" );
63 line = line.leftJustify( 70 );
64 line += " [ " + QString::number( mixer->volume( *it ) & 0xff ).rightJustify( 3 );
65 if ( stereo ) line += " | " + QString::number( mixer->volume( *it ) >> 8 ).rightJustify( 3 );
66 line += " ]";
67 odebug << line << oendl;
62 } 68 }
63 69
64 return 0; 70 return 0;
65 71
diff --git a/libopie2/config.in b/libopie2/config.in
deleted file mode 100644
index 5f1bed3..0000000
--- a/libopie2/config.in
+++ b/dev/null
@@ -1,12 +0,0 @@
1#menu "libopie2"
2 comment ""
3 source libopie2/opiecore/config.in
4 source libopie2/opiedb/config.in
5 source libopie2/opienet/config.in
6 source libopie2/opiepim/config.in
7 source libopie2/opieui/config.in
8 source libopie2/opiemm/config.in
9 source libopie2/opiesecurity/config.in
10 comment ""
11#endmenu
12
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,8 +1,7 @@
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.
7           .>+-= 6           .>+-=
8 _;:,     .>    :=|. This program is free software; you can 7 _;:,     .>    :=|. This program is free software; you can
@@ -39,8 +38,10 @@
39#include <sys/types.h> 38#include <sys/types.h>
40#include <sys/soundcard.h> 39#include <sys/soundcard.h>
41#include <sys/stat.h> 40#include <sys/stat.h>
42 41
42static const char* device_label[] = SOUND_DEVICE_LABELS;
43static int max_device_nr = sizeof device_label / sizeof (const char*);
43 44
44using namespace Opie::Core; 45using namespace Opie::Core;
45using namespace Opie::MM; 46using namespace Opie::MM;
46/*====================================================================================== 47/*======================================================================================
@@ -62,10 +63,9 @@ void OSoundSystem::synchronize()
62 //FIXME: Use SIOCGIFCONF anway, because we can disable listing of aliased devices 63 //FIXME: Use SIOCGIFCONF anway, because we can disable listing of aliased devices
63 64
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
70 QString str; 70 QString str;
71 QFile f( "/dev/sound" ); 71 QFile f( "/dev/sound" );
@@ -175,9 +175,9 @@ void OAudioInterface::init()
175 * OMixerInterface 175 * OMixerInterface
176 *======================================================================================*/ 176 *======================================================================================*/
177 177
178OMixerInterface::OMixerInterface( QObject* parent, const char* name ) 178OMixerInterface::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;
182 init(); 182 init();
183} 183}
@@ -198,87 +198,68 @@ void OMixerInterface::init()
198 return; 198 return;
199 } 199 }
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
257QStringList OMixerInterface::allChannels() const 229QStringList OMixerInterface::allChannels() const
258{ 230{
259 ChannelIterator it = _channels.begin(); 231 ChannelIterator it = _channels.begin();
260 QStringList channels; 232 QStringList channels;
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;
267} 238}
268 239
269 240
270QStringList OMixerInterface::recChannels() const 241QStringList 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
276 252
277QStringList OMixerInterface::playChannels() const 253QStringList OMixerInterface::playChannels() const
278{ 254{
279 owarn << "NYI" << oendl; 255 return allChannels();
280 return QStringList(); 256}
257
258
259bool OMixerInterface::hasMultipleRecording() const
260{
261 return !( _capmask & SOUND_CAP_EXCL_INPUT );
281} 262}
282 263
283 264
284bool OMixerInterface::hasChannel( const QString& channel ) const 265bool OMixerInterface::hasChannel( const QString& channel ) const
@@ -288,18 +269,15 @@ bool OMixerInterface::hasChannel( const QString& channel ) const
288 269
289 270
290bool OMixerInterface::isStereo( const QString& channel ) const 271bool 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 ) 277bool 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
304 282
305void OMixerInterface::setVolume( const QString& channel, int left, int right ) 283void OMixerInterface::setVolume( const QString& channel, int left, int right )
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,8 +1,7 @@
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.
7           .>+-= 6           .>+-=
8 _;:,     .>    :=|. This program is free software; you can 7 _;:,     .>    :=|. This program is free software; you can
@@ -197,18 +196,24 @@ class OMixerInterface : public QObject
197 /** 196 /**
198 * @returns playable channels. 197 * @returns playable channels.
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.
204 */ 206 */
205 bool hasChannel( const QString& channel ) const; 207 bool hasChannel( const QString& channel ) const;
206 /** 208 /**
207 * @returns true, if @a channel is stereo. 209 * @returns true, if @a channel is stereo.
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.
213 * If no value for right is given, the value for left is taken for that. 218 * If no value for right is given, the value for left is taken for that.
214 */ 219 */
@@ -220,9 +225,13 @@ class OMixerInterface : public QObject
220 int volume( const QString& channel ) const; 225 int volume( const QString& channel ) const;
221 226
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:
227 void init(); 236 void init();
228 private: 237 private: