FCL/sf/app/camera: comparison camerauis/cameraxui/cxui/src/cxuivideoprecaptureview.cpp

equal deleted inserted replaced

-:fa6d9f75d6a6
+:2094593137f5
 #include <hblabel.h>
 #include <hbslider.h>
 #include <hbmenu.h>
 #include <hbdialog.h>
 #include <hbnotificationdialog.h>
-#include <hbfeedbackplayer.h>
 #include <hbfeedbacksettings.h>
 #include <hbfeedbacknamespace.h>
 #include "cxuivideoprecaptureview.h"
 #include "cxeengine.h"
 namespace
 {
 static const int CXUI_ELAPSED_TIME_TIMEOUT = 1000; // 1 second
 static const int CXUI_RECORD_ANIMATION_DURATION = 3000; // milliseconds
+static const int CXUI_PAUSE_TIMEOUT = 60*1000;   // 60 seconds
 //!@todo Localization?
 static const char* VIDEO_TIME_FORMAT = "%02d:%02d";
 }
 connect(mVideoCaptureControl, SIGNAL(stateChanged(CxeVideoCaptureControl::State, CxeError::Id)),
 this, SLOT(handleVideoStateChanged(CxeVideoCaptureControl::State,CxeError::Id)));
 connect(mVideoCaptureControl, SIGNAL(remainingTimeChanged()),
 this, SLOT(updateTimeLabels()));
+mPauseTimer.setSingleShot(true);
+connect(&mPauseTimer, SIGNAL(timeout()), this, SLOT(stop()));
+mPauseTimer.setInterval(CXUI_PAUSE_TIMEOUT);
 HbAction *quitAction = new HbAction(Hb::QuitNaviAction, this);
 setNavigationAction(quitAction);
 connect(quitAction, SIGNAL(triggered()), this, SLOT(handleQuitClicked()));
 loadDefaultWidgets();
 mWidgetsLoaded = true;
 // Initializing recording indicator animation
 mRecordingAnimation = new QPropertyAnimation(mRecordingIcon, "opacity");
-mRecordingAnimation->setStartValue(0.0);
+mRecordingAnimation->setStartValue(0.2);
 mRecordingAnimation->setKeyValueAt(0.5, 1.0);
-mRecordingAnimation->setEndValue(0.0);
+mRecordingAnimation->setEndValue(0.2);
 mRecordingAnimation->setDuration(CXUI_RECORD_ANIMATION_DURATION);
 mRecordingAnimation->setLoopCount(-1);
-mRecordingAnimation->setEasingCurve(QEasingCurve::InCubic);
+mRecordingAnimation->setEasingCurve(QEasingCurve::OutInQuad);
 // Initialize the video time counters.
 updateTimeLabels();
 CX_DEBUG_EXIT_FUNCTION();
 int time(0);
 mVideoCaptureControl->remainingTime(time);
 if (time) {
 mMenu = takeMenu();
-hideControls();
 mVideoCaptureControl->record();
 } else {
 launchDiskFullNotification();
 }
 {
 CX_DEBUG_ENTER_FUNCTION();
 CxeVideoCaptureControl::State state = mVideoCaptureControl->state();
 if (state == CxeVideoCaptureControl::Recording) {
-if (mRecordingAnimation && mRecordingIcon) {
+mVideoCaptureControl->pause();
-mVideoCaptureControl->pause();
-mRecordingAnimation->stop();
-}
-// force update of toolbar
-showToolbar();
 } else if (state == CxeVideoCaptureControl::Paused) {
 mVideoCaptureControl->record();
-//mRecordingAnimation->start();
 }
 CX_DEBUG_EXIT_FUNCTION();
 }
 void CxuiVideoPrecaptureView::disableFeedback()
 {
 CX_DEBUG_ENTER_FUNCTION();
-HbFeedbackPlayer* feedback = HbFeedbackPlayer::instance();
+HbFeedbackSettings settings;
-if (feedback) {
+settings.disableFeedback();
-feedback->settings().disableFeedback();
-}
 CX_DEBUG_EXIT_FUNCTION();
 }
 void CxuiVideoPrecaptureView::enableFeedback()
 {
 CX_DEBUG_ENTER_FUNCTION();
-HbFeedbackPlayer* feedback = HbFeedbackPlayer::instance();
+HbFeedbackSettings settings;
-if (feedback) {
+settings.enableFeedback();
-feedback->settings().disableFeedback();
-}
 CX_DEBUG_EXIT_FUNCTION();
 }
 CX_DEBUG_EXIT_FUNCTION();
 }
 /*!
+Overridded version of hideControls() that doesn't hide the controls when video recording
+is paused.
+*/
+void CxuiVideoPrecaptureView::hideControls()
+{
+if (mVideoCaptureControl && mVideoCaptureControl->state() == CxeVideoCaptureControl::Paused) {
+// never hide controls in paused state
+return;
+}
+CxuiPrecaptureView::hideControls();
+}
+/*!
 * Helper method for formatting video time to requested label.
 * @param label Text label to show the time.
 * @param time Time in seconds to be formatted to the label text.
 */
 void CxuiVideoPrecaptureView::setVideoTime(HbLabel* label, int time)
 CX_DEBUG_ENTER_FUNCTION();
 Q_UNUSED(error);
 updateTimeLabels();
+mPauseTimer.stop();
 switch (newState) {
 case CxeVideoCaptureControl::Ready:
 if (mDocumentLoader){
 mDocumentLoader->load(VIDEO_1ST_XML, VIDEO_PRE_CAPTURE_IDLE);
 }
 mCapturePending = false;
 record();
 }
 break;
 case CxeVideoCaptureControl::Recording:
+hideControls();
 if (mDocumentLoader){
 mDocumentLoader->load(VIDEO_1ST_XML, VIDEO_PRE_CAPTURE_RECORDING);
 }
 mElapsedTimer.start(CXUI_ELAPSED_TIME_TIMEOUT);
 disableFeedback();
+if (mRecordingAnimation && mRecordingIcon) {
+mRecordingAnimation->start();
+}
 break;
 case CxeVideoCaptureControl::Paused:
 mElapsedTimer.stop();
 if (mDocumentLoader){
 mDocumentLoader->load(VIDEO_1ST_XML, VIDEO_PRE_CAPTURE_PAUSED);
 }
+if (mRecordingAnimation && mRecordingIcon) {
+mRecordingAnimation->stop();
+}
+showControls();
 enableFeedback();
+mPauseTimer.start();
 break;
 case CxeVideoCaptureControl::Stopping:
 if (mDocumentLoader){
 mDocumentLoader->load(VIDEO_1ST_XML, VIDEO_PRE_CAPTURE_PAUSED);
 }
+if (mRecordingAnimation && mRecordingIcon) {
+mRecordingAnimation->stop();
+}
 enableFeedback();
 if (isPostcaptureOn()) {
 mElapsedTimer.stop();
 hideControls();
 CX_DEBUG_ENTER_FUNCTION();
 CxeVideoCaptureControl::State state = mVideoCaptureControl->state();
 switch (state) {
 case CxeVideoCaptureControl::Ready:
-case CxeVideoCaptureControl::Paused:
 record();
 break;
 case CxeVideoCaptureControl::Recording:
+case CxeVideoCaptureControl::Paused:
 stop();
 break;
 case CxeVideoCaptureControl::Idle:
 case CxeVideoCaptureControl::Initialized:
 case CxeVideoCaptureControl::Preparing:
 void CxuiVideoPrecaptureView::handleQuitClicked()
 {
 CX_DEBUG_ENTER_FUNCTION();
 CxeVideoCaptureControl::State state = mVideoCaptureControl->state();
-if (state == CxeVideoCaptureControl::Recording){
+if (state == CxeVideoCaptureControl::Recording ||
+state == CxeVideoCaptureControl::Paused) {
 // Disable going to post-capture when video capture control goes to stopping state.
 disconnect(mVideoCaptureControl, SIGNAL(stateChanged(CxeVideoCaptureControl::State, CxeError::Id)),
 this, SLOT(handleVideoStateChanged(CxeVideoCaptureControl::State,CxeError::Id)));
 mVideoCaptureControl->stop();
 mElapsedTimer.stop();
 if (mElapsedTimeText) {
 mElapsedTimeText->setVisible(visible);
 }
 }
+/*!
+* Overridden eventFilter() to restart the pause timer.
+*/
+bool CxuiVideoPrecaptureView::eventFilter(QObject *object, QEvent *event)
+{
+if (mVideoCaptureControl && mVideoCaptureControl->state() == CxeVideoCaptureControl::Paused) {
+// restart the timer if the screen is touched and we are in paused state
+switch (event->type())
+{
+case QEvent::GraphicsSceneMouseRelease:
+mPauseTimer.start();
+break;
+case QEvent::GraphicsSceneMousePress:
+mPauseTimer.stop();
+break;
+default:
+break;
+}
+}
+return CxuiPrecaptureView::eventFilter(object, event);
+}
 //end of file

changeset 24	2094593137f5
parent 21	fa6d9f75d6a6
child 29	699651f2666f