summaryrefslogtreecommitdiff
path: root/src/plugins/gstreamer/camerabin/camerabincontrol.cpp
diff options
context:
space:
mode:
authorDmytro Poplavskiy <dmytro.poplavskiy@nokia.com>2011-08-12 11:52:47 +1000
committerQt by Nokia <qt-info@nokia.com>2011-08-24 07:07:45 +0200
commitda9b436cd1be60da495f55fc4f4236136e7851f8 (patch)
tree6bf9a91437dc5fb4e016a8f7bb86d09693ae4091 /src/plugins/gstreamer/camerabin/camerabincontrol.cpp
parentabee3a6548e84a1df91590c26718d43bb846dc0b (diff)
downloadqtmultimedia-da9b436cd1be60da495f55fc4f4236136e7851f8.tar.gz
Ported gstreamer camera backend from camerabin to camerabin2.
Change-Id: Ieb08df492e7b9cbfe35e93a056685cfdac6e704e Reviewed-on: http://codereview.qt.nokia.com/2994 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'src/plugins/gstreamer/camerabin/camerabincontrol.cpp')
-rw-r--r--src/plugins/gstreamer/camerabin/camerabincontrol.cpp9
1 files changed, 0 insertions, 9 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabincontrol.cpp b/src/plugins/gstreamer/camerabin/camerabincontrol.cpp
index 78cd2eec9..f40133d56 100644
--- a/src/plugins/gstreamer/camerabin/camerabincontrol.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabincontrol.cpp
@@ -75,14 +75,6 @@ CameraBinControl::CameraBinControl(CameraBinSession *session)
connect(m_session, SIGNAL(stateChanged(QCamera::State)),
this, SLOT(updateStatus()));
- connect(m_session->audioEncodeControl(), SIGNAL(settingsChanged()),
- SLOT(reloadLater()));
- connect(m_session->videoEncodeControl(), SIGNAL(settingsChanged()),
- SLOT(reloadLater()));
- connect(m_session->mediaContainerControl(), SIGNAL(settingsChanged()),
- SLOT(reloadLater()));
- connect(m_session->imageEncodeControl(), SIGNAL(settingsChanged()),
- SLOT(reloadLater()));
connect(m_session, SIGNAL(viewfinderChanged()),
SLOT(reloadLater()));
connect(m_session, SIGNAL(readyChanged(bool)),
@@ -115,7 +107,6 @@ void CameraBinControl::setCaptureMode(QCamera::CaptureMode mode)
{
if (m_session->captureMode() != mode) {
m_session->setCaptureMode(mode);
- reloadLater();
if (m_state == QCamera::ActiveState) {
m_resourcePolicy->setResourceSet(