diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-03-03 12:59:45 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-03-16 07:46:37 +0000 |
| commit | 8fab55b9bc73d84ff70945fb21de27abbf045617 (patch) | |
| tree | 035e1a1cdcffb92a1529fb7adc8e8479fc4e3831 /src/imports | |
| parent | 9abb25ab02905b0ed6ec34648e6fa603e59f2218 (diff) | |
Get rid of the global enums in qmultimedia.h
Move the ones that are still used into the correct place.
Change-Id: I3ddc05aad35a163c88a45a1f192c49a65239c536
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/multimedia/qdeclarativecamerarecorder.cpp | 8 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativecamerarecorder_p.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/imports/multimedia/qdeclarativecamerarecorder.cpp b/src/imports/multimedia/qdeclarativecamerarecorder.cpp index f1b79d3c6..39d218373 100644 --- a/src/imports/multimedia/qdeclarativecamerarecorder.cpp +++ b/src/imports/multimedia/qdeclarativecamerarecorder.cpp @@ -334,8 +334,8 @@ void QDeclarativeCameraRecorder::setAudioSampleRate(int rate) void QDeclarativeCameraRecorder::setAudioEncodingMode(QDeclarativeCameraRecorder::EncodingMode encodingMode) { m_encoderSettings = m_recorder->encoderSettings(); - if (m_encoderSettings.encodingMode() != QMultimedia::EncodingMode(encodingMode)) { - m_encoderSettings.setEncodingMode(QMultimedia::EncodingMode(encodingMode)); + if (m_encoderSettings.encodingMode() != QMediaEncoderSettings::EncodingMode(encodingMode)) { + m_encoderSettings.setEncodingMode(QMediaEncoderSettings::EncodingMode(encodingMode)); m_recorder->setEncoderSettings(m_encoderSettings); emit audioEncodingModeChanged(encodingMode); } @@ -344,8 +344,8 @@ void QDeclarativeCameraRecorder::setAudioEncodingMode(QDeclarativeCameraRecorder void QDeclarativeCameraRecorder::setVideoEncodingMode(QDeclarativeCameraRecorder::EncodingMode encodingMode) { m_encoderSettings = m_recorder->encoderSettings(); - if (m_encoderSettings.encodingMode() != QMultimedia::EncodingMode(encodingMode)) { - m_encoderSettings.setEncodingMode(QMultimedia::EncodingMode(encodingMode)); + if (m_encoderSettings.encodingMode() != QMediaEncoderSettings::EncodingMode(encodingMode)) { + m_encoderSettings.setEncodingMode(QMediaEncoderSettings::EncodingMode(encodingMode)); m_recorder->setEncoderSettings(m_encoderSettings); emit videoEncodingModeChanged(encodingMode); } diff --git a/src/imports/multimedia/qdeclarativecamerarecorder_p.h b/src/imports/multimedia/qdeclarativecamerarecorder_p.h index 5c62c2639..613d00cb6 100644 --- a/src/imports/multimedia/qdeclarativecamerarecorder_p.h +++ b/src/imports/multimedia/qdeclarativecamerarecorder_p.h @@ -112,9 +112,9 @@ public: enum EncodingMode { - ConstantQualityEncoding = QMultimedia::ConstantQualityEncoding, - ConstantBitRateEncoding = QMultimedia::ConstantBitRateEncoding, - AverageBitRateEncoding = QMultimedia::AverageBitRateEncoding + ConstantQualityEncoding = QMediaEncoderSettings::ConstantQualityEncoding, + ConstantBitRateEncoding = QMediaEncoderSettings::ConstantBitRateEncoding, + AverageBitRateEncoding = QMediaEncoderSettings::AverageBitRateEncoding }; enum Error { |