diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-06-03 16:14:32 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-06-04 11:08:42 +0200 |
| commit | cd7ce2ac58aabd3cbca3aed87bbedd2118834a4e (patch) | |
| tree | 3fbd6a8d9486aec76720198c946d0a7579880e0d /examples/multimediawidgets/camera | |
| parent | da0d0950ac072f4d1e7ffe6dd83e4725849e42df (diff) | |
Remove the inheritance between QMediaEncoderSettings and QMediaFormat
Inheriting from value classes is not a good principle for our APIs,
and it doesn't work for the QML side neither.
Instead, simply give QMediaEncoderSettings a QMediaFormat member.
Change-Id: Ib2cd8b04c09e89f8f57a91898ce987c199d66c75
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'examples/multimediawidgets/camera')
| -rw-r--r-- | examples/multimediawidgets/camera/videosettings.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/multimediawidgets/camera/videosettings.cpp b/examples/multimediawidgets/camera/videosettings.cpp index b19bd2799..c6c0182ab 100644 --- a/examples/multimediawidgets/camera/videosettings.cpp +++ b/examples/multimediawidgets/camera/videosettings.cpp @@ -135,7 +135,7 @@ QMediaEncoderSettings VideoSettings::encoderSettings() const { QMediaEncoderSettings settings = mediaRecorder->encoderSettings(); settings.setQuality(QMediaEncoderSettings::Quality(ui->qualitySlider->value())); - settings.setFormat(boxValue(ui->containerFormatBox).value<QMediaFormat::FileFormat>()); + settings.setFileFormat(boxValue(ui->containerFormatBox).value<QMediaFormat::FileFormat>()); settings.setAudioCodec(boxValue(ui->audioCodecBox).value<QMediaFormat::AudioCodec>()); settings.setAudioSampleRate(ui->audioSampleRateBox->value()); @@ -148,7 +148,7 @@ QMediaEncoderSettings VideoSettings::encoderSettings() const void VideoSettings::setEncoderSettings(const QMediaEncoderSettings &encoderSettings) { - selectComboBoxItem(ui->containerFormatBox, QVariant::fromValue(encoderSettings.format())); + selectComboBoxItem(ui->containerFormatBox, QVariant::fromValue(encoderSettings.fileFormat())); ui->qualitySlider->setValue(encoderSettings.quality()); selectComboBoxItem(ui->audioCodecBox, QVariant::fromValue(encoderSettings.audioCodec())); |