-rw-r--r-- | examples/opiemm/osoundsystemdemo/osoundsystemdemo.cpp | 14 | ||||
-rw-r--r-- | libopie2/config.in | 12 | ||||
-rw-r--r-- | libopie2/opiemm/osoundsystem.cpp | 120 | ||||
-rw-r--r-- | libopie2/opiemm/osoundsystem.h | 17 |
4 files changed, 72 insertions, 91 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 | |||
@@ -27,40 +27,46 @@ | |||
27 | */ | 27 | */ |
28 | 28 | ||
29 | /* OPIE */ | 29 | /* OPIE */ |
30 | #include <opie2/osoundsystem.h> | 30 | #include <opie2/osoundsystem.h> |
31 | #include <opie2/odebug.h> | 31 | #include <opie2/odebug.h> |
32 | 32 | ||
33 | using namespace Opie::MM; | 33 | using namespace Opie::MM; |
34 | 34 | ||
35 | int main( int argc, char** argv ) | 35 | int main( int argc, char** argv ) |
36 | { | 36 | { |
37 | odebug << "OPIE Sound System Demo" << oendl; | 37 | odebug << "OPIE Sound System Demo" << oendl; |
38 | 38 | ||
39 | OSoundSystem* sound = OSoundSystem::instance(); | 39 | OSoundSystem* sound = OSoundSystem::instance(); |
40 | 40 | ||
41 | OSoundSystem::CardIterator it = sound->iterator(); | 41 | OSoundSystem::CardIterator it = sound->iterator(); |
42 | /* | 42 | /* |
43 | while ( it.current() ) | 43 | while ( it.current() ) |
44 | { | 44 | { |
45 | odebug << "DEMO: OSoundSystem contains Interface '" << it.current()->name() << "'" << oendl; | 45 | odebug << "DEMO: OSoundSystem contains Interface '" << it.current()->name() << "'" << oendl; |
46 | ++it; | 46 | ++it; |
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 | ||
66 | } | 72 | } |
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,91 +1,91 @@ | |||
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 |
9 | .> <`_, > . <= redistribute it and/or modify it under | 8 | .> <`_, > . <= redistribute it and/or modify it under |
10 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
11 | .="- .-=="i, .._ License as published by the Free Software | 10 | .="- .-=="i, .._ License as published by the Free Software |
12 | - . .-<_> .<> Foundation; either version 2 of the License, | 11 | - . .-<_> .<> Foundation; either version 2 of the License, |
13 | ._= =} : or (at your option) any later version. | 12 | ._= =} : or (at your option) any later version. |
14 | .%`+i> _;_. | 13 | .%`+i> _;_. |
15 | .i_,=:_. -<s. This program is distributed in the hope that | 14 | .i_,=:_. -<s. This program is distributed in the hope that |
16 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
17 | : .. .:, . . . without even the implied warranty of | 16 | : .. .:, . . . without even the implied warranty of |
18 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
19 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
20 | ..}^=.= = ; Library General Public License for more | 19 | ..}^=.= = ; Library General Public License for more |
21 | ++= -. .` .: details. | 20 | ++= -. .` .: details. |
22 | : = ...= . :.=- | 21 | : = ...= . :.=- |
23 | -. .:....=;==+<; You should have received a copy of the GNU | 22 | -. .:....=;==+<; You should have received a copy of the GNU |
24 | -_. . . )=. = Library General Public License along with | 23 | -_. . . )=. = Library General Public License along with |
25 | -- :-=` this library; see the file COPYING.LIB. | 24 | -- :-=` this library; see the file COPYING.LIB. |
26 | If not, write to the Free Software Foundation, | 25 | If not, write to the Free Software Foundation, |
27 | Inc., 59 Temple Place - Suite 330, | 26 | Inc., 59 Temple Place - Suite 330, |
28 | Boston, MA 02111-1307, USA. | 27 | Boston, MA 02111-1307, USA. |
29 | 28 | ||
30 | */ | 29 | */ |
31 | 30 | ||
32 | #include <opie2/osoundsystem.h> | 31 | #include <opie2/osoundsystem.h> |
33 | #include <opie2/odebug.h> | 32 | #include <opie2/odebug.h> |
34 | 33 | ||
35 | #include <errno.h> | 34 | #include <errno.h> |
36 | #include <fcntl.h> | 35 | #include <fcntl.h> |
37 | #include <string.h> | 36 | #include <string.h> |
38 | #include <sys/ioctl.h> | 37 | #include <sys/ioctl.h> |
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 | ||
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; |
45 | using namespace Opie::MM; | 46 | using namespace Opie::MM; |
46 | /*====================================================================================== | 47 | /*====================================================================================== |
47 | * OSoundSystem | 48 | * OSoundSystem |
48 | *======================================================================================*/ | 49 | *======================================================================================*/ |
49 | 50 | ||
50 | OSoundSystem* OSoundSystem::_instance = 0; | 51 | OSoundSystem* OSoundSystem::_instance = 0; |
51 | 52 | ||
52 | OSoundSystem::OSoundSystem() | 53 | OSoundSystem::OSoundSystem() |
53 | { | 54 | { |
54 | odebug << "OSoundSystem::OSoundSystem()" << oendl; | 55 | odebug << "OSoundSystem::OSoundSystem()" << oendl; |
55 | synchronize(); | 56 | synchronize(); |
56 | } | 57 | } |
57 | 58 | ||
58 | void OSoundSystem::synchronize() | 59 | void OSoundSystem::synchronize() |
59 | { | 60 | { |
60 | // gather available interfaces by inspecting /dev | 61 | // gather available interfaces by inspecting /dev |
61 | //FIXME: we could use SIOCGIFCONF here, but we aren't interested in virtual (e.g. eth0:0) devices | 62 | //FIXME: we could use SIOCGIFCONF here, but we aren't interested in virtual (e.g. eth0:0) devices |
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" ); |
72 | bool hasFile = f.open( IO_ReadOnly ); | 72 | bool hasFile = f.open( IO_ReadOnly ); |
73 | if ( !hasFile ) | 73 | if ( !hasFile ) |
74 | { | 74 | { |
75 | odebug << "OSoundSystem: /dev/sound not existing. No sound devices available" << oendl; | 75 | odebug << "OSoundSystem: /dev/sound not existing. No sound devices available" << oendl; |
76 | return; | 76 | return; |
77 | } | 77 | } |
78 | QTextStream s( &f ); | 78 | QTextStream s( &f ); |
79 | s.readLine(); | 79 | s.readLine(); |
80 | s.readLine(); | 80 | s.readLine(); |
81 | while ( !s.atEnd() ) | 81 | while ( !s.atEnd() ) |
82 | { | 82 | { |
83 | s >> str; | 83 | s >> str; |
84 | str.truncate( str.find( ':' ) ); | 84 | str.truncate( str.find( ':' ) ); |
85 | odebug << "OSoundSystem: found interface '" << str << "'" << oendl; | 85 | odebug << "OSoundSystem: found interface '" << str << "'" << oendl; |
86 | OAudioInterface* iface; | 86 | OAudioInterface* iface; |
87 | iface = new OAudioInterface( this, (const char*) str ); | 87 | iface = new OAudioInterface( this, (const char*) str ); |
88 | 88 | ||
89 | _interfaces.insert( str, iface ); | 89 | _interfaces.insert( str, iface ); |
90 | s.readLine(); | 90 | s.readLine(); |
91 | } | 91 | } |
@@ -155,171 +155,149 @@ OAudioInterface::OAudioInterface( QObject* parent, const char* name ) | |||
155 | :QObject( parent, name ), _sfd(0) | 155 | :QObject( parent, name ), _sfd(0) |
156 | { | 156 | { |
157 | odebug << "OAudioInterface::OAudioInterface()" << oendl; | 157 | odebug << "OAudioInterface::OAudioInterface()" << oendl; |
158 | init(); | 158 | init(); |
159 | } | 159 | } |
160 | 160 | ||
161 | 161 | ||
162 | OAudioInterface::~OAudioInterface() | 162 | OAudioInterface::~OAudioInterface() |
163 | { | 163 | { |
164 | } | 164 | } |
165 | 165 | ||
166 | 166 | ||
167 | void OAudioInterface::init() | 167 | void OAudioInterface::init() |
168 | { | 168 | { |
169 | 169 | ||
170 | 170 | ||
171 | } | 171 | } |
172 | 172 | ||
173 | 173 | ||
174 | /*====================================================================================== | 174 | /*====================================================================================== |
175 | * OMixerInterface | 175 | * OMixerInterface |
176 | *======================================================================================*/ | 176 | *======================================================================================*/ |
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; |
182 | init(); | 182 | init(); |
183 | } | 183 | } |
184 | 184 | ||
185 | 185 | ||
186 | OMixerInterface::~OMixerInterface() | 186 | OMixerInterface::~OMixerInterface() |
187 | { | 187 | { |
188 | } | 188 | } |
189 | 189 | ||
190 | 190 | ||
191 | void OMixerInterface::init() | 191 | void OMixerInterface::init() |
192 | { | 192 | { |
193 | // open the device | 193 | // open the device |
194 | _fd = ::open( name(), O_RDWR ); | 194 | _fd = ::open( name(), O_RDWR ); |
195 | if ( _fd == -1 ) | 195 | if ( _fd == -1 ) |
196 | { | 196 | { |
197 | owarn << "OMixerInterface::init(): Can't open mixer " << name() << oendl; | 197 | owarn << "OMixerInterface::init(): Can't open mixer " << name() << oendl; |
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 ) | 203 | { |
204 | { | 204 | odebug << "OMixerInterface::init() - capmask = " << _capmask << oendl; |
205 | if ( devmask & ( 1 << SOUND_MIXER_VOLUME ) ) _channels.insert( "PlayVolume", SOUND_MIXER_VOLUME ); | 205 | } |
206 | if ( devmask & ( 1 << SOUND_MIXER_BASS ) ) _channels.insert( "PlayBass", SOUND_MIXER_BASS ); | 206 | if ( ioctl( _fd, SOUND_MIXER_READ_DEVMASK, &_devmask ) != -1 ) |
207 | if ( devmask & ( 1 << SOUND_MIXER_TREBLE ) ) _channels.insert( "PlayTreble", SOUND_MIXER_TREBLE ); | 207 | { |
208 | if ( devmask & ( 1 << SOUND_MIXER_SYNTH ) ) _channels.insert( "PlaySynth", SOUND_MIXER_SYNTH ); | 208 | odebug << "OMixerInterface::init() - devmask = " << _devmask << oendl; |
209 | if ( devmask & ( 1 << SOUND_MIXER_PCM ) ) _channels.insert( "PlayPCM", SOUND_MIXER_PCM ); | 209 | } |
210 | if ( devmask & ( 1 << SOUND_MIXER_SPEAKER ) ) _channels.insert( "PlaySpeaker", SOUND_MIXER_SPEAKER ); | 210 | if ( ioctl( _fd, SOUND_MIXER_READ_RECMASK, &_recmask ) != -1 ) |
211 | if ( devmask & ( 1 << SOUND_MIXER_LINE ) ) _channels.insert( "PlayLine", SOUND_MIXER_LINE ); | 211 | { |
212 | if ( devmask & ( 1 << SOUND_MIXER_MIC ) ) _channels.insert( "PlayMic", SOUND_MIXER_MIC ); | 212 | odebug << "OMixerInterface::init() - recmask = " << _recmask << oendl; |
213 | if ( devmask & ( 1 << SOUND_MIXER_CD ) ) _channels.insert( "PlayCD", SOUND_MIXER_CD ); | 213 | } |
214 | if ( devmask & ( 1 << SOUND_MIXER_IMIX ) ) _channels.insert( "PlayInputMix", SOUND_MIXER_IMIX ); | 214 | if ( ioctl( _fd, SOUND_MIXER_READ_STEREODEVS, &_stmask ) != -1 ) |
215 | if ( devmask & ( 1 << SOUND_MIXER_ALTPCM ) ) _channels.insert( "PlayAltPCM", SOUND_MIXER_ALTPCM ); | 215 | { |
216 | if ( devmask & ( 1 << SOUND_MIXER_RECLEV ) ) _channels.insert( "PlayRecord", SOUND_MIXER_RECLEV ); | 216 | odebug << "OMixerInterface::init() - stereomask = " << _stmask << oendl; |
217 | if ( devmask & ( 1 << SOUND_MIXER_IGAIN ) ) _channels.insert( "PlayInputGain", SOUND_MIXER_IGAIN ); | 217 | } |
218 | if ( devmask & ( 1 << SOUND_MIXER_OGAIN ) ) _channels.insert( "PlayOutputGain", SOUND_MIXER_OGAIN ); | 218 | for ( int i = 0; i < max_device_nr; ++i ) |
219 | //odebug << "devmask available and constructed." << oendl; | 219 | { |
220 | } | 220 | if ( _devmask & ( 1 << i ) ) |
221 | 221 | { | |
222 | devmask = 0; | 222 | _channels.insert( QString( device_label[i] ).stripWhiteSpace(), i ); |
223 | if ( ioctl( _fd, SOUND_MIXER_READ_RECMASK, &devmask ) != -1 ) | 223 | odebug << "OMixerInterface::init() - channel '" << device_label[i] << "'" << oendl; |
224 | { | 224 | } |
225 | if ( devmask & ( 1 << SOUND_MIXER_VOLUME ) ) _channels.insert( "RecVolume", SOUND_MIXER_VOLUME ); | ||
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 | } | ||
241 | |||
242 | devmask = 0; | ||
243 | if ( ioctl( _fd, SOUND_MIXER_READ_STEREODEVS, &devmask ) != -1 ) | ||
244 | { | ||
245 | odebug << "stereomask = " << devmask << oendl; | ||
246 | } | ||
247 | |||
248 | /* ChannelIterator it; | ||
249 | for ( it = _channels.begin(); it != _channels.end(); ++it ) | ||
250 | { | ||
251 | odebug << "Channel " << it.key() << " available (bit " << it.data() << ")" << oendl; | ||
252 | odebug << " +--- Volume: " << volume( it.key() ) & 0xff << " | " << volume( it.key() ) >> 8 << "" << oendl; | ||
253 | } | 225 | } |
254 | */ | ||
255 | } | 226 | } |
256 | 227 | ||
228 | |||
257 | QStringList OMixerInterface::allChannels() const | 229 | QStringList 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 | ||
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 | ||
276 | 252 | ||
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 | ||
283 | 264 | ||
284 | bool OMixerInterface::hasChannel( const QString& channel ) const | 265 | bool OMixerInterface::hasChannel( const QString& channel ) const |
285 | { | 266 | { |
286 | return _channels.contains( channel ); | 267 | return _channels.contains( channel ); |
287 | } | 268 | } |
288 | 269 | ||
289 | 270 | ||
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 ) ) | ||
294 | { | ||
295 | int devmask = 0; | ||
296 | if ( ioctl( _fd, SOUND_MIXER_READ_STEREODEVS, &devmask ) != -1 ) | ||
297 | { | ||
298 | result = devmask & ( 1 << _channels[channel] ); | ||
299 | } | 274 | } |
300 | } | 275 | |
301 | return result; | 276 | |
277 | bool OMixerInterface::isRecordable( const QString& channel ) const | ||
278 | { | ||
279 | return _channels.contains( channel ) && ( _recmask & ( 1 << _channels[channel] ) ); | ||
302 | } | 280 | } |
303 | 281 | ||
304 | 282 | ||
305 | void OMixerInterface::setVolume( const QString& channel, int left, int right ) | 283 | void OMixerInterface::setVolume( const QString& channel, int left, int right ) |
306 | { | 284 | { |
307 | int volume = left; | 285 | int volume = left; |
308 | volume |= ( right == -1 ) ? left << 8 : right << 8; | 286 | volume |= ( right == -1 ) ? left << 8 : right << 8; |
309 | 287 | ||
310 | if ( _channels.contains( channel ) ) | 288 | if ( _channels.contains( channel ) ) |
311 | { | 289 | { |
312 | int result = ioctl( _fd, MIXER_WRITE( _channels[channel] ), &volume ); | 290 | int result = ioctl( _fd, MIXER_WRITE( _channels[channel] ), &volume ); |
313 | if ( result == -1 ) | 291 | if ( result == -1 ) |
314 | { | 292 | { |
315 | owarn << "Can't set volume: " << strerror( errno ) << oendl; | 293 | owarn << "Can't set volume: " << strerror( errno ) << oendl; |
316 | } | 294 | } |
317 | else | 295 | else |
318 | { | 296 | { |
319 | if ( result & 0xff != left ) | 297 | if ( result & 0xff != left ) |
320 | { | 298 | { |
321 | owarn << "Device adjusted volume from " << left << " to " << (result & 0xff) << oendl; | 299 | owarn << "Device adjusted volume from " << left << " to " << (result & 0xff) << oendl; |
322 | } | 300 | } |
323 | } | 301 | } |
324 | } | 302 | } |
325 | } | 303 | } |
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,28 +1,27 @@ | |||
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 |
9 | .> <`_, > . <= redistribute it and/or modify it under | 8 | .> <`_, > . <= redistribute it and/or modify it under |
10 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
11 | .="- .-=="i, .._ License as published by the Free Software | 10 | .="- .-=="i, .._ License as published by the Free Software |
12 | - . .-<_> .<> Foundation; either version 2 of the License, | 11 | - . .-<_> .<> Foundation; either version 2 of the License, |
13 | ._= =} : or (at your option) any later version. | 12 | ._= =} : or (at your option) any later version. |
14 | .%`+i> _;_. | 13 | .%`+i> _;_. |
15 | .i_,=:_. -<s. This program is distributed in the hope that | 14 | .i_,=:_. -<s. This program is distributed in the hope that |
16 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
17 | : .. .:, . . . without even the implied warranty of | 16 | : .. .:, . . . without even the implied warranty of |
18 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
19 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
20 | ..}^=.= = ; Library General Public License for more | 19 | ..}^=.= = ; Library General Public License for more |
21 | ++= -. .` .: details. | 20 | ++= -. .` .: details. |
22 | : = ...= . :.=- | 21 | : = ...= . :.=- |
23 | -. .:....=;==+<; You should have received a copy of the GNU | 22 | -. .:....=;==+<; You should have received a copy of the GNU |
24 | -_. . . )=. = Library General Public License along with | 23 | -_. . . )=. = Library General Public License along with |
25 | -- :-=` this library; see the file COPYING.LIB. | 24 | -- :-=` this library; see the file COPYING.LIB. |
26 | If not, write to the Free Software Foundation, | 25 | If not, write to the Free Software Foundation, |
27 | Inc., 59 Temple Place - Suite 330, | 26 | Inc., 59 Temple Place - Suite 330, |
28 | Boston, MA 02111-1307, USA. | 27 | Boston, MA 02111-1307, USA. |
@@ -177,60 +176,70 @@ class OMixerInterface : public QObject | |||
177 | typedef QMap<QString,int>::ConstIterator ChannelIterator; | 176 | typedef QMap<QString,int>::ConstIterator ChannelIterator; |
178 | 177 | ||
179 | /** | 178 | /** |
180 | * Constructor. Normally you don't create @ref OMixerInterface objects yourself, | 179 | * Constructor. Normally you don't create @ref OMixerInterface objects yourself, |
181 | * but access them via the @ref OSoundCard interface. | 180 | * but access them via the @ref OSoundCard interface. |
182 | */ | 181 | */ |
183 | OMixerInterface( QObject* parent, const char* name ); | 182 | OMixerInterface( QObject* parent, const char* name ); |
184 | /** | 183 | /** |
185 | * Destructor. | 184 | * Destructor. |
186 | */ | 185 | */ |
187 | virtual ~OMixerInterface(); | 186 | virtual ~OMixerInterface(); |
188 | 187 | ||
189 | /** | 188 | /** |
190 | * @returns all available channels. | 189 | * @returns all available channels. |
191 | */ | 190 | */ |
192 | QStringList allChannels() const; | 191 | QStringList allChannels() const; |
193 | /** | 192 | /** |
194 | * @returns recordable channels. | 193 | * @returns recordable channels. |
195 | */ | 194 | */ |
196 | QStringList recChannels() const; | 195 | QStringList recChannels() const; |
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 | */ |
215 | void setVolume( const QString& channel, int left, int right = -1 ); | 220 | void setVolume( const QString& channel, int left, int right = -1 ); |
216 | /** | 221 | /** |
217 | * @returns the volume of @a channel or -1, if the channel doesn't exist. | 222 | * @returns the volume of @a channel or -1, if the channel doesn't exist. |
218 | * @note You might want to use @ref hasChannel() to check if a channel exists. | 223 | * @note You might want to use @ref hasChannel() to check if a channel exists. |
219 | */ | 224 | */ |
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; |
229 | int _capmask; | ||
230 | int _devmask; | ||
231 | int _recmask; | ||
232 | int _stmask; | ||
224 | QMap<QString, int> _channels; | 233 | QMap<QString, int> _channels; |
225 | 234 | ||
226 | private: | 235 | private: |
227 | void init(); | 236 | void init(); |
228 | private: | 237 | private: |
229 | class Private; | 238 | class Private; |
230 | Private *d; | 239 | Private *d; |
231 | }; | 240 | }; |
232 | 241 | ||
233 | } | 242 | } |
234 | } | 243 | } |
235 | 244 | ||
236 | #endif // OSOUNDSYSTEM_H | 245 | #endif // OSOUNDSYSTEM_H |