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>

2 files changed, 8 insertions, 8 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"
diff --git a/src/multimedia/controls/qmediacontainercontrol.h b/src/multimedia/controls/qmediacontainercontrol.h
index e0284660c..85582d521 100644
--- a/src/multimedia/controls/qmediacontainercontrol.h
+++ b/src/multimedia/controls/qmediacontainercontrol.h
@@ -60,8 +60,8 @@ public:
     virtual ~QMediaContainerControl();
 
     virtual QStringList supportedContainers() const = 0;
-    virtual QString containerMimeType() const = 0;
-    virtual void setContainerMimeType(const QString &formatMimeType) = 0;
+    virtual QString containerFormat() const = 0;
+    virtual void setContainerFormat(const QString &format) = 0;
 
     virtual QString containerDescription(const QString &formatMimeType) const = 0;