Ignore camera errors while stopping the pipeline.

[harmattan/cameraplus] / lib / qtcamgraphicsviewfinder.cpp

diff --git a/lib/qtcamgraphicsviewfinder.cpp b/lib/qtcamgraphicsviewfinder.cpp
index 76ccad1..4e02b7c 100644 (file)
--- a/lib/qtcamgraphicsviewfinder.cpp
+++ b/lib/qtcamgraphicsviewfinder.cpp
@@ -1,3 +1,23 @@
+/*!
+ * This file is part of CameraPlus.
+ *
+ * Copyright (C) 2012 Mohammed Sameer <msameer@foolab.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
 #include "qtcamgraphicsviewfinder.h"
 #include "qtcamconfig.h"
 #include "qtcamdevice.h"
@@ -11,6 +31,11 @@ public:
   void ensureBackend() {
     if (!renderer) {
       renderer = QtCamViewfinderRenderer::create(conf, q_ptr);
+      if (!renderer) {
+       qCritical() << "Failed to create a viewfinder renderer";
+       return;
+      }
+
       renderer->resize(q_ptr->size());
       QObject::connect(renderer, SIGNAL(updateRequested()), q_ptr, SLOT(updateRequested()));
     }
@@ -43,6 +68,10 @@ QtCamGraphicsViewfinder::~QtCamGraphicsViewfinder() {
 GstElement *QtCamGraphicsViewfinder::sinkElement() {
   d_ptr->ensureBackend();
 
+  if (!d_ptr->renderer) {
+    return 0;
+  }
+
   return d_ptr->renderer->sinkElement();
 }
 
@@ -100,3 +129,7 @@ void QtCamGraphicsViewfinder::resizeEvent(QGraphicsSceneResizeEvent *event) {
 void QtCamGraphicsViewfinder::updateRequested() {
   update();
 }
+
+void QtCamGraphicsViewfinder::stop() {
+  d_ptr->resetBackend();
+}