diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2009-09-24 01:55:52 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2009-09-24 02:40:13 (GMT) |
| commit | fb50411e4c0c132631f8237933fbb0972fa4c9aa (patch) | |
| tree | 89aa19161710ccf0d2c0e11c0494ddef893eb19c /src/multimedia/audio/qaudiodevicefactory_p.h | |
| parent | 609dd32580b1e07213a2b2efdd4d854c34e8f6d7 (diff) | |
| download | Qt-fb50411e4c0c132631f8237933fbb0972fa4c9aa.zip Qt-fb50411e4c0c132631f8237933fbb0972fa4c9aa.tar.gz Qt-fb50411e4c0c132631f8237933fbb0972fa4c9aa.tar.bz2 | |
AudioService API changes; QString->const QString&, remove QAudioDeviceId use QAudioDeviceInfo.
Reviewed-by: Bill King
Diffstat (limited to 'src/multimedia/audio/qaudiodevicefactory_p.h')
| -rw-r--r-- | src/multimedia/audio/qaudiodevicefactory_p.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/multimedia/audio/qaudiodevicefactory_p.h b/src/multimedia/audio/qaudiodevicefactory_p.h index 8e4cf5a..008e4a8 100644 --- a/src/multimedia/audio/qaudiodevicefactory_p.h +++ b/src/multimedia/audio/qaudiodevicefactory_p.h @@ -57,7 +57,6 @@ #include <QtCore/qbytearray.h> #include <QtCore/qlist.h> -#include <QtMultimedia/qaudiodeviceid.h> #include <QtMultimedia/qaudiodeviceinfo.h> QT_BEGIN_HEADER @@ -68,28 +67,26 @@ QT_MODULE(Multimedia) class QAbstractAudioInput; class QAbstractAudioOutput; - +class QAbstractAudioDeviceInfo; class QAudioDeviceFactory { public: - static QList<QAudioDeviceId> deviceList(QAudio::Mode mode); + static QList<QAudioDeviceInfo> deviceList(QAudio::Mode mode); - static QAudioDeviceId defaultInputDevice(); - static QAudioDeviceId defaultOutputDevice(); + static QAudioDeviceInfo defaultInputDevice(); + static QAudioDeviceInfo defaultOutputDevice(); - static QAbstractAudioDeviceInfo* audioDeviceInfo(QAudioDeviceId const &device); + static QAbstractAudioDeviceInfo* audioDeviceInfo(const QString &realm, const QByteArray &handle, QAudio::Mode mode); static QAbstractAudioInput* createDefaultInputDevice(QAudioFormat const &format); static QAbstractAudioOutput* createDefaultOutputDevice(QAudioFormat const &format); - static QAbstractAudioInput* createInputDevice(QAudioDeviceId const &device, QAudioFormat const &format); - static QAbstractAudioOutput* createOutputDevice(QAudioDeviceId const &device, QAudioFormat const &format); + static QAbstractAudioInput* createInputDevice(QAudioDeviceInfo const &device, QAudioFormat const &format); + static QAbstractAudioOutput* createOutputDevice(QAudioDeviceInfo const &device, QAudioFormat const &format); static QAbstractAudioInput* createNullInput(); static QAbstractAudioOutput* createNullOutput(); - - static QAudioDeviceId createDeviceId(QString const& key, int mode, QByteArray const& handle); }; QT_END_NAMESPACE |