diff options
author | Michael Goddard <michael.goddard@nokia.com> | 2012-07-09 16:51:16 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-03 07:05:40 +0200 |
commit | d67f9dba560c4248b3ae7c5ca374a88873fd228d (patch) | |
tree | 33ec42d62b4f933a927e2c23e40d41b4a8de817e /src/multimedia/audio/qaudioinput_mac_p.h | |
parent | 42cdb92543ebba4d4cadff76f51712219245f347 (diff) |
Fix some failing QAudioInput integration tests on OSX.
This also meant implementing software volume support, and since
this is the last backend to do so, make that interface pure
virtual again.
In some cases the test needed tweaks.
Change-Id: Ie429863f187b43802cdd4f16d841929e0cb0e729
Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Diffstat (limited to 'src/multimedia/audio/qaudioinput_mac_p.h')
-rw-r--r-- | src/multimedia/audio/qaudioinput_mac_p.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/multimedia/audio/qaudioinput_mac_p.h b/src/multimedia/audio/qaudioinput_mac_p.h index 2f9eb5803..f41b5cb0e 100644 --- a/src/multimedia/audio/qaudioinput_mac_p.h +++ b/src/multimedia/audio/qaudioinput_mac_p.h @@ -109,6 +109,7 @@ public: AudioStreamBasicDescription streamFormat; AudioStreamBasicDescription deviceFormat; QAbstractAudioDeviceInfo *audioDeviceInfo; + qreal m_volume; QAudioInputPrivate(const QByteArray& device); ~QAudioInputPrivate(); @@ -142,10 +143,14 @@ public: QAudio::Error error() const; QAudio::State state() const; + qreal volume() const; + void setVolume(qreal volume); + void audioThreadStart(); void audioThreadStop(); void audioDeviceStop(); + void audioDeviceActive(); void audioDeviceFull(); void audioDeviceError(); |