diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2012-01-31 10:08:49 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-01 08:10:20 +0100 |
| commit | a22a0195f146e83174ee4eacffe33c161ab39e50 (patch) | |
| tree | ecc72efc2790bce4238c8c1c9df223f54c0b3651 /src/plugins/audiocapture | |
| parent | 9d3102efe29e294971b30aa2ce00be5cb7db5e05 (diff) | |
Split QMediaRecorder::setEncodingSettings to separate setters.
It's easier to change only the necessary part of encoding settings.
The settings are applied during the next event loop or before recording
starts.
Change-Id: Ia2b5c93826a302212aa7f79a0c75e4cbaaf1dd7a
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'src/plugins/audiocapture')
4 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/audiocapture/audiocapturesession.cpp b/src/plugins/audiocapture/audiocapturesession.cpp index 29dd11dc9..62e475d15 100644 --- a/src/plugins/audiocapture/audiocapturesession.cpp +++ b/src/plugins/audiocapture/audiocapturesession.cpp @@ -146,7 +146,7 @@ QString AudioCaptureSession::containerDescription(const QString &formatMimeType) return QString(); } -void AudioCaptureSession::setContainerMimeType(const QString &formatMimeType) +void AudioCaptureSession::setContainerFormat(const QString &formatMimeType) { if (!formatMimeType.contains(QLatin1String("audio/x-wav")) && !formatMimeType.contains(QLatin1String("audio/pcm")) && @@ -167,7 +167,7 @@ void AudioCaptureSession::setContainerMimeType(const QString &formatMimeType) } } -QString AudioCaptureSession::containerMimeType() const +QString AudioCaptureSession::containerFormat() const { if(wavFile) return QString("audio/x-wav"); diff --git a/src/plugins/audiocapture/audiocapturesession.h b/src/plugins/audiocapture/audiocapturesession.h index 4151daaa4..bf68f6eef 100644 --- a/src/plugins/audiocapture/audiocapturesession.h +++ b/src/plugins/audiocapture/audiocapturesession.h @@ -69,8 +69,8 @@ public: bool isFormatSupported(const QAudioFormat &format) const; bool setFormat(const QAudioFormat &format); QStringList supportedContainers() const; - QString containerMimeType() const; - void setContainerMimeType(const QString &formatMimeType); + QString containerFormat() const; + void setContainerFormat(const QString &formatMimeType); QString containerDescription(const QString &formatMimeType) const; QUrl outputLocation() const; diff --git a/src/plugins/audiocapture/audiocontainercontrol.cpp b/src/plugins/audiocapture/audiocontainercontrol.cpp index 732df3e1e..462bfa731 100644 --- a/src/plugins/audiocapture/audiocontainercontrol.cpp +++ b/src/plugins/audiocapture/audiocontainercontrol.cpp @@ -57,14 +57,14 @@ QStringList AudioContainerControl::supportedContainers() const return m_session->supportedContainers(); } -QString AudioContainerControl::containerMimeType() const +QString AudioContainerControl::containerFormat() const { - return m_session->containerMimeType(); + return m_session->containerFormat(); } -void AudioContainerControl::setContainerMimeType(const QString &formatMimeType) +void AudioContainerControl::setContainerFormat(const QString &formatMimeType) { - m_session->setContainerMimeType(formatMimeType); + m_session->setContainerFormat(formatMimeType); } QString AudioContainerControl::containerDescription(const QString &formatMimeType) const diff --git a/src/plugins/audiocapture/audiocontainercontrol.h b/src/plugins/audiocapture/audiocontainercontrol.h index baf8a5a34..bc93834c3 100644 --- a/src/plugins/audiocapture/audiocontainercontrol.h +++ b/src/plugins/audiocapture/audiocontainercontrol.h @@ -59,8 +59,8 @@ public: virtual ~AudioContainerControl(); QStringList supportedContainers() const; - QString containerMimeType() const; - void setContainerMimeType(const QString &formatMimeType); + QString containerFormat() const; + void setContainerFormat(const QString &formatMimeType); QString containerDescription(const QString &formatMimeType) const; private: |