diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-06-16 09:21:35 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-06-16 09:21:35 +0200 |
| commit | da35e256f5da8d93cef0ab1bed8ca3e8ccfe5a43 (patch) | |
| tree | 6eafa4110806eb354f899cbd4fea2b826c9fdf2c /src/multimedia/platform/android/audio/qopenslesengine.cpp | |
| parent | 3287ad8656b700f245834f09458bc1613beb9757 (diff) | |
| parent | fde5d6f7cce6118cac4ce7b92cd056225737917f (diff) | |
Merge remote-tracking branch 'origin/dev' into 6.2
Change-Id: I0f29cdfa94948a39a895a7678bcfe3a631d2d4ed
Diffstat (limited to 'src/multimedia/platform/android/audio/qopenslesengine.cpp')
| -rw-r--r-- | src/multimedia/platform/android/audio/qopenslesengine.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/multimedia/platform/android/audio/qopenslesengine.cpp b/src/multimedia/platform/android/audio/qopenslesengine.cpp index 3bddea920..1ec3306dd 100644 --- a/src/multimedia/platform/android/audio/qopenslesengine.cpp +++ b/src/multimedia/platform/android/audio/qopenslesengine.cpp @@ -103,16 +103,16 @@ SLDataFormat_PCM QOpenSLESEngine::audioFormatToSLFormatPCM(const QAudioFormat &f } -QList<QAudioDevice> QOpenSLESEngine::availableDevices(QAudio::Mode mode) +QList<QAudioDevice> QOpenSLESEngine::availableDevices(QAudioDevice::Mode mode) { QList<QAudioDevice> devices; QJniObject devs; - if (mode == QAudio::AudioInput) { + if (mode == QAudioDevice::Input) { devs = QJniObject::callStaticObjectMethod( "org/qtproject/qt/android/multimedia/QtAudioDeviceManager", "getAudioInputDevices", "()[Ljava/lang/String;"); - } else if (mode == QAudio::AudioOutput) { + } else if (mode == QAudioDevice::Output) { devs = QJniObject::callStaticObjectMethod( "org/qtproject/qt/android/multimedia/QtAudioDeviceManager", "getAudioOutputDevices", @@ -132,9 +132,9 @@ QList<QAudioDevice> QOpenSLESEngine::availableDevices(QAudio::Mode mode) return devices; } -QList<int> QOpenSLESEngine::supportedChannelCounts(QAudio::Mode mode) const +QList<int> QOpenSLESEngine::supportedChannelCounts(QAudioDevice::Mode mode) const { - if (mode == QAudio::AudioInput) { + if (mode == QAudioDevice::Input) { if (!m_checkedInputFormats) const_cast<QOpenSLESEngine *>(this)->checkSupportedInputFormats(); return m_supportedInputChannelCounts; @@ -143,9 +143,9 @@ QList<int> QOpenSLESEngine::supportedChannelCounts(QAudio::Mode mode) const } } -QList<int> QOpenSLESEngine::supportedSampleRates(QAudio::Mode mode) const +QList<int> QOpenSLESEngine::supportedSampleRates(QAudioDevice::Mode mode) const { - if (mode == QAudio::AudioInput) { + if (mode == QAudioDevice::Input) { if (!m_checkedInputFormats) const_cast<QOpenSLESEngine *>(this)->checkSupportedInputFormats(); return m_supportedInputSampleRates; |