diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2011-08-30 14:42:21 +1000 |
|---|---|---|
| committer | Michael Goddard <michael.goddard@nokia.com> | 2011-08-30 15:34:30 +1000 |
| commit | 3bf236cc23c2e67e1b5cbc01e05e61263528fc10 (patch) | |
| tree | b6b547e7863a929a2638528cddfd52c0fff6f8d9 /src/plugins/gstreamer/camerabin/camerabincontrol.cpp | |
| parent | 4ddffcdae313bf494ac12d098743af341add77e3 (diff) | |
| parent | 47a5dd4371bfc6774790cc900e287f5def12406a (diff) | |
Merge branch 'camera' of git://scm.dev.nokia.troll.no/qt/qtmultimediakit
Change-Id: Iec6f96e3713257d25f7b1e06c6da9c153b23800b
Diffstat (limited to 'src/plugins/gstreamer/camerabin/camerabincontrol.cpp')
| -rw-r--r-- | src/plugins/gstreamer/camerabin/camerabincontrol.cpp | 9 |
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( |