diff options
author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2012-06-06 14:06:04 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-07 08:28:08 +0200 |
commit | 62749d654d6bbd50d84089e038529fda815cf96f (patch) | |
tree | 88c307cbf36ac739b1e5b0b21e322a3c2dcfa1c5 /src/plugins/audiocapture | |
parent | f53788ae42175bd3b7cda1a18366086b285f6f1d (diff) | |
download | qtmultimedia-62749d654d6bbd50d84089e038529fda815cf96f.tar.gz |
Removed encoding options from Audio/Video encoding controls
They are replaced with encoding options from
QAudio/Video/ImageEncoderSettings.
This also allows to specify options without
requesting controls.
Change-Id: I507e68cdb8cb46325689804d27c6d0561cada50b
Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'src/plugins/audiocapture')
-rw-r--r-- | src/plugins/audiocapture/audioencodercontrol.cpp | 24 | ||||
-rw-r--r-- | src/plugins/audiocapture/audioencodercontrol.h | 4 |
2 files changed, 0 insertions, 28 deletions
diff --git a/src/plugins/audiocapture/audioencodercontrol.cpp b/src/plugins/audiocapture/audioencodercontrol.cpp index 1d51961e6..67d685a9b 100644 --- a/src/plugins/audiocapture/audioencodercontrol.cpp +++ b/src/plugins/audiocapture/audioencodercontrol.cpp @@ -89,30 +89,6 @@ QString AudioEncoderControl::codecDescription(const QString &codecName) const return QString(); } -QStringList AudioEncoderControl::supportedEncodingOptions(const QString &codec) const -{ - Q_UNUSED(codec) - - QStringList list; - return list; -} - -QVariant AudioEncoderControl::encodingOption(const QString &codec, const QString &name) const -{ - Q_UNUSED(codec) - Q_UNUSED(name) - - return QVariant(); -} - -void AudioEncoderControl::setEncodingOption( - const QString &codec, const QString &name, const QVariant &value) -{ - Q_UNUSED(value) - Q_UNUSED(codec) - Q_UNUSED(name) -} - QList<int> AudioEncoderControl::supportedSampleRates(const QAudioEncoderSettings &, bool *continuous) const { if (continuous) diff --git a/src/plugins/audiocapture/audioencodercontrol.h b/src/plugins/audiocapture/audioencodercontrol.h index dfdff3bda..bf7e7b327 100644 --- a/src/plugins/audiocapture/audioencodercontrol.h +++ b/src/plugins/audiocapture/audioencodercontrol.h @@ -67,10 +67,6 @@ public: QAudioEncoderSettings audioSettings() const; void setAudioSettings(const QAudioEncoderSettings&); - QStringList supportedEncodingOptions(const QString &codec) const; - QVariant encodingOption(const QString &codec, const QString &name) const; - void setEncodingOption(const QString &codec, const QString &name, const QVariant &value); - private: AudioCaptureSession* m_session; QAudioEncoderSettings m_settings; |