Remove unneeded Camera::geometryChanged()

[harmattan/cameraplus] / declarative / notificationscontainer.cpp

diff --git a/declarative/notificationscontainer.cpp b/declarative/notificationscontainer.cpp
index 309baff..691fb61 100644 (file)
--- a/declarative/notificationscontainer.cpp
+++ b/declarative/notificationscontainer.cpp
@@ -1,7 +1,7 @@
 /*!
  * This file is part of CameraPlus.
  *
- * Copyright (C) 2012 Mohammed Sameer <msameer@foolab.org>
+ * Copyright (C) 2012-2013 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
@@ -21,10 +21,10 @@
 #include "notificationscontainer.h"
 #include "qtcamdevice.h"
 #include "qtcamnotifications.h"
-#include "notifications.h"
+#include "sounds.h"
 
 NotificationsContainer::NotificationsContainer(QObject *parent) :
-  QObject(parent), m_dev(0), m_notifications(0) {
+  QObject(parent), m_dev(0), m_sounds(0) {
 
 }
 
@@ -32,7 +32,7 @@ NotificationsContainer::~NotificationsContainer() {
   setDevice(0);
 
   QMutexLocker locker(&m_mutex);
-  m_notifications = 0;
+  m_sounds = 0;
 }
 
 void NotificationsContainer::setDevice(QtCamDevice *dev) {
@@ -62,15 +62,15 @@ void NotificationsContainer::setDevice(QtCamDevice *dev) {
   }
 }
 
-Notifications *NotificationsContainer::notifications() const {
-  return m_notifications;
+Sounds *NotificationsContainer::sounds() const {
+  return m_sounds;
 }
 
-bool NotificationsContainer::setNotifications(Notifications *notifications) {
+bool NotificationsContainer::setSounds(Sounds *sounds) {
   QMutexLocker lock(&m_mutex);
 
-  if (m_notifications != notifications) {
-    m_notifications = notifications;
+  if (m_sounds != sounds) {
+    m_sounds = sounds;
     return true;
   }
 
@@ -80,39 +80,39 @@ bool NotificationsContainer::setNotifications(Notifications *notifications) {
 void NotificationsContainer::imageCaptureStarted() {
   QMutexLocker l(&m_mutex);
 
-  if (m_notifications) {
-    m_notifications->imageCaptureStarted();
+  if (m_sounds) {
+    m_sounds->playImageCaptureStartedSound();
   }
 }
 
 void NotificationsContainer::imageCaptureEnded() {
   QMutexLocker l(&m_mutex);
 
-  if (m_notifications) {
-    m_notifications->imageCaptureEnded();
+  if (m_sounds) {
+    m_sounds->playImageCaptureEndedSound();
   }
 }
 
 void NotificationsContainer::videoRecordingStarted() {
   QMutexLocker l(&m_mutex);
 
-  if (m_notifications) {
-    m_notifications->videoRecordingStarted();
+  if (m_sounds) {
+    m_sounds->playVideoRecordingStartedSound();
   }
 }
 
 void NotificationsContainer::videoRecordingEnded() {
   QMutexLocker l(&m_mutex);
 
-  if (m_notifications) {
-    m_notifications->videoRecordingEnded();
+  if (m_sounds) {
+    m_sounds->playVideoRecordingEndedSound();
   }
 }
 
 void NotificationsContainer::autoFocusAcquired() {
   QMutexLocker l(&m_mutex);
 
-  if (m_notifications) {
-    m_notifications->autoFocusAcquired();
+  if (m_sounds) {
+    m_sounds->playAutoFocusAcquiredSound();
   }
 }