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/multimedia/controls/qmediacontainercontrol.cpp | |
| parent | 9d3102efe29e294971b30aa2ce00be5cb7db5e05 (diff) | |
| download | qtmultimedia-a22a0195f146e83174ee4eacffe33c161ab39e50.tar.gz | |
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/multimedia/controls/qmediacontainercontrol.cpp')
| -rw-r--r-- | src/multimedia/controls/qmediacontainercontrol.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/multimedia/controls/qmediacontainercontrol.cpp b/src/multimedia/controls/qmediacontainercontrol.cpp index a391a3bd1..647ba0ce1 100644 --- a/src/multimedia/controls/qmediacontainercontrol.cpp +++ b/src/multimedia/controls/qmediacontainercontrol.cpp @@ -101,21 +101,21 @@ QMediaContainerControl::~QMediaContainerControl() */ /*! - \fn QMediaContainerControl::containerMimeType() const + \fn QMediaContainerControl::containerFormat() const - Returns the MIME type of the selected container format. + Returns the selected container format. */ /*! - \fn QMediaContainerControl::setContainerMimeType(const QString &mimeType) + \fn QMediaContainerControl::setContainerFormat(const QString &format) - Sets the current container format to the format identified by the given \a mimeType. + Sets the current container \a format. */ /*! - \fn QMediaContainerControl::containerDescription(const QString &mimeType) const + \fn QMediaContainerControl::containerDescription(const QString &format) const - Returns a description of the container format identified by the given \a mimeType. + Returns a description of the container \a format. */ #include "moc_qmediacontainercontrol.cpp" |