summaryrefslogtreecommitdiffstats
path: root/tests/auto/unit/qmultimedia_common/mockmediacontainercontrol.h
diff options
context:
space:
mode:
authorDmytro Poplavskiy <dmytro.poplavskiy@nokia.com>2012-01-31 10:08:49 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-01 08:10:20 +0100
commita22a0195f146e83174ee4eacffe33c161ab39e50 (patch)
treeecc72efc2790bce4238c8c1c9df223f54c0b3651 /tests/auto/unit/qmultimedia_common/mockmediacontainercontrol.h
parent9d3102efe29e294971b30aa2ce00be5cb7db5e05 (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 'tests/auto/unit/qmultimedia_common/mockmediacontainercontrol.h')
-rw-r--r--tests/auto/unit/qmultimedia_common/mockmediacontainercontrol.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/unit/qmultimedia_common/mockmediacontainercontrol.h b/tests/auto/unit/qmultimedia_common/mockmediacontainercontrol.h
index 0864310bf..9c0167177 100644
--- a/tests/auto/unit/qmultimedia_common/mockmediacontainercontrol.h
+++ b/tests/auto/unit/qmultimedia_common/mockmediacontainercontrol.h
@@ -72,12 +72,12 @@ public:
return m_supportedContainers;
}
- QString containerMimeType() const
+ QString containerFormat() const
{
return m_format;
}
- void setContainerMimeType(const QString &formatMimeType)
+ void setContainerFormat(const QString &formatMimeType)
{
if (m_supportedContainers.contains(formatMimeType))
m_format = formatMimeType;