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

equal deleted inserted replaced

-:d9aefe59d544
+:3075d9b614e6
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #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"
 #include "cxecameradevicecontrol.h"
 #include "cxenamespace.h"
 #include "cxesettings.h"
 #include "cxuienums.h"
 #include "cxutils.h"
+#include "cxuizoomslider.h"
 #include "cxuicapturekeyhandler.h"
 #include "cxuidocumentloader.h"
 #include "OstTraceDefinitions.h"
 #ifdef OST_TRACE_COMPILER_IN_USE
 #include "cxuivideoprecaptureviewTraces.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";
 }
 mRecordingIcon(NULL),
 mGoToStillAction(NULL),
 mToolBarIdle(NULL),
 mToolBarRec(NULL),
 mToolBarPaused(NULL),
-mToggleLightAction(NULL),
 mVideoScenePopup(NULL),
 mVideoCaptureControl(NULL),
 mMenu(NULL),
 mCapturePending(false)
 {
 connect(&mElapsedTimer, SIGNAL(timeout()), this, SLOT(updateTimeLabels()));
 connect(mVideoCaptureControl, SIGNAL(snapshotReady(CxeError::Id, const QPixmap&, const QString&)),
 this, SLOT(handleSnapshot(CxeError::Id)));
 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()));
 widget = mDocumentLoader->findWidget(VIDEO_PRE_CAPTURE_QUALITY_ICON);
 mQualityIcon = qobject_cast<HbLabel *> (widget);
 CX_DEBUG_ASSERT(mQualityIcon);
-// Create background graphics for indicator containers
-HbWidget *indicatorContainer;
 widget = mDocumentLoader->findWidget(VIDEO_PRE_CAPTURE_INDICATOR_CONTAINER_TOP);
-indicatorContainer = qobject_cast<HbWidget *>(widget);
+mIndicators = qobject_cast<HbWidget *>(widget);
-CX_DEBUG_ASSERT(indicatorContainer);
+CX_DEBUG_ASSERT(mIndicators);
-createWidgetBackgroundGraphic(indicatorContainer, TRANSPARENT_BACKGROUND_GRAPHIC);
+// Create background graphics for indicator container
-indicatorContainer->show();
+createWidgetBackgroundGraphic(mIndicators, TRANSPARENT_BACKGROUND_GRAPHIC);
 CX_DEBUG_EXIT_FUNCTION();
 }
 void CxuiVideoPrecaptureView::loadWidgets()
 mDocumentLoader->load(VIDEO_1ST_XML, VIDEO_PRE_CAPTURE_STANDALONE_SECTION, &ok);
 }
 Q_ASSERT_X(ok, "camerax ui", "error in xml file parsing");
 // get needed pointers to some of the widgets
 widget = mDocumentLoader->findWidget(VIDEO_PRE_CAPTURE_ZOOM_SLIDER);
-mSlider = qobject_cast<HbSlider *> (widget);
+mSlider = qobject_cast<CxuiZoomSlider *> (widget);
 CX_DEBUG_ASSERT(mSlider);
 //Let's add a plus and minus buttons to the slider
 addIncreaseDecreaseButtons(mSlider);
 createWidgetBackgroundGraphic(mSlider, TRANSPARENT_BACKGROUND_GRAPHIC);
 CX_DEBUG_ASSERT(mToolBarIdle);
 CX_DEBUG_ASSERT(mToolBarRec);
 CX_DEBUG_ASSERT(mToolBarPaused);
-QObject* object = mDocumentLoader->findObject(VIDEO_PRE_CAPTURE_TOGGLE_LIGHT_ACTION);
-mToggleLightAction = qobject_cast<HbAction *>(object);
-CX_DEBUG_ASSERT(mToggleLightAction);
 hideControls();
 if (CxuiServiceProvider::isCameraEmbedded()) {
 CX_DEBUG(("EMBEDDED: camera in embedded mode"));
 }
 }
 if (!CxuiServiceProvider::instance()->allowCameraSwitching()) {
 CX_DEBUG(("EMBEDDED: don't allow camera switching"));
-HbAction *goto_2nd_cam = qobject_cast<HbAction*> (mDocumentLoader->findObject(VIDEO_PRE_CAPTURE_GOTO_2ND_CAMERA_ACTION));
+}
-if (goto_2nd_cam) {
-CX_DEBUG(("EMBEDDED: setting camera switch to disabled"));
+}
-goto_2nd_cam->setEnabled(false);
-}
+// Create background graphic for indicator container
-}
-}
-// Create background graphics for indicator containers
 HbWidget *indicatorContainer;
 widget = mDocumentLoader->findWidget(VIDEO_PRE_CAPTURE_INDICATOR_CONTAINER_BOTTOM);
 indicatorContainer = qobject_cast<HbWidget *>(widget);
 CX_DEBUG_ASSERT(indicatorContainer);
 createWidgetBackgroundGraphic(indicatorContainer, TRANSPARENT_BACKGROUND_GRAPHIC);
 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();
 void CxuiVideoPrecaptureView::record()
 {
 CX_DEBUG_ENTER_FUNCTION();
-mMenu = takeMenu();
+int time(0);
-hideControls();
+mVideoCaptureControl->remainingTime(time);
-mVideoCaptureControl->record();
-//mRecordingAnimation->start();
+if (time) {
+mMenu = takeMenu();
+mVideoCaptureControl->record();
+} else {
+launchDiskFullNotification();
+}
 CX_DEBUG_EXIT_FUNCTION();
 }
 void CxuiVideoPrecaptureView::pause()
 {
 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();
 }
 }
 CxeVideoCaptureControl::State state = mVideoCaptureControl->state();
 switch (state) {
 case CxeVideoCaptureControl::Ready:
-// Update remaining time label
 getRemainingTime();
-setVideoTime(mRemainingTimeText, mTimeRemaining);
-// Update elapsed time label
 // Not recording => elapsed time is zero
 mTimeElapsed = 0;
-setVideoTime(mElapsedTimeText, mTimeElapsed);
-// Adjust labels' visibility
-mRemainingTimeText->show();
-mElapsedTimeText->show();
 break;
 case CxeVideoCaptureControl::Recording:
 case CxeVideoCaptureControl::Paused:
-// Update remaining time label
 getRemainingTime();
-setVideoTime(mRemainingTimeText, mTimeRemaining);
-// Update elapsed time label
 getElapsedTime();
-setVideoTime(mElapsedTimeText, mTimeElapsed);
-// Adjust labels' visibility
-mRemainingTimeText->show();
-mElapsedTimeText->show();
 break;
 case CxeVideoCaptureControl::Idle:
 case CxeVideoCaptureControl::Initialized:
 case CxeVideoCaptureControl::Preparing:
 default:
 // Minimize processing during initialization phase.
-// Calculating remaining time involves checking disk space,
+// Calculating remaining time involves checking disk space, avoiding that.
 // which
 mTimeRemaining = 0;
-setVideoTime(mRemainingTimeText, mTimeRemaining);
 mTimeElapsed = 0;
-setVideoTime(mElapsedTimeText, mTimeElapsed);
-// Adjust labels' visibility
-mRemainingTimeText->hide();
-mElapsedTimeText->hide();
 break;
 }
-CX_DEBUG_EXIT_FUNCTION();
+setVideoTime(mRemainingTimeText, mTimeRemaining);
+setVideoTime(mElapsedTimeText, mTimeElapsed);
+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.
 if (event->type() == QEvent::Show) {
 event->accept();
 }
 }
+/*!
+* Slot to handle video capture control state change.
+* Update visible items and stop / start timers.
+*/
 void CxuiVideoPrecaptureView::handleVideoStateChanged(CxeVideoCaptureControl::State newState,
 CxeError::Id error)
 {
 CX_DEBUG_ENTER_FUNCTION();
 Q_UNUSED(error);
 updateTimeLabels();
+mPauseTimer.stop();
 switch (newState) {
 case CxeVideoCaptureControl::Ready:
-setRecordingItemsVisibility(false);
+if (mDocumentLoader){
+mDocumentLoader->load(VIDEO_1ST_XML, VIDEO_PRE_CAPTURE_IDLE);
+}
 if (mCapturePending) {
 mCapturePending = false;
 record();
 }
 break;
 case CxeVideoCaptureControl::Recording:
-setRecordingItemsVisibility(true);
+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 (mRecordingIcon) {
-mRecordingIcon->hide();
+if (mDocumentLoader){
-}
+mDocumentLoader->load(VIDEO_1ST_XML, VIDEO_PRE_CAPTURE_PAUSED);
-if (mElapsedTimeText) {
+}
-mElapsedTimeText->show();
-}
+if (mRecordingAnimation && mRecordingIcon) {
+mRecordingAnimation->stop();
+}
+showControls();
 enableFeedback();
+mPauseTimer.start();
 break;
 case CxeVideoCaptureControl::Stopping:
-setRecordingItemsVisibility(false);
+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();
 }
 void CxuiVideoPrecaptureView::handleFocusLost()
 {
 CX_DEBUG_IN_FUNCTION();
+// Release camera. Stopping possibly ongoing recording is handled by engine.
+releaseCamera();
+}
+void CxuiVideoPrecaptureView::handleBatteryEmpty()
+{
+CX_DEBUG_ENTER_FUNCTION();
 CxeVideoCaptureControl::State state = mVideoCaptureControl->state();
 if (state == CxeVideoCaptureControl::Recording){
 stop(); // delete recording icon
-} else {
-releaseCamera();
-}
-}
-void CxuiVideoPrecaptureView::handleBatteryEmpty()
-{
-CX_DEBUG_ENTER_FUNCTION();
-CxeVideoCaptureControl::State state = mVideoCaptureControl->state();
-if (state == CxeVideoCaptureControl::Recording){
-stop(); // delete recording icon
 }
 CX_DEBUG_EXIT_FUNCTION();
 }
 void CxuiVideoPrecaptureView::launchVideoScenePopup()
 {
 CX_DEBUG_ENTER_FUNCTION();
+hideControls();
-if (mVideoScenePopup) {
+emit showScenesView();
-CX_DEBUG(("mVideoScenePopup already exists, showing..."));
-mVideoScenePopup->show();
-} else {
-CX_DEBUG(("Loading popup DocML"));
-CxuiDocumentLoader* documentLoader = new CxuiDocumentLoader(mEngine);
-bool ok = false;
-// Use document loader to create popup
-documentLoader->load(SCENEMODE_VIDEO_SETTING_XML, &ok);
-CX_DEBUG(("load ok=%d", ok));
-mVideoScenePopup = qobject_cast<HbDialog*>(documentLoader->findWidget("video_scenemode_popup"));
-CX_DEBUG_ASSERT(mVideoScenePopup);
-mVideoScenePopup->setTimeout(HbDialog::NoTimeout);
-mVideoScenePopup->setBackgroundFaded(false);
-delete documentLoader;
-documentLoader = NULL;
-}
-connect(mKeyHandler, SIGNAL(autofocusKeyPressed()), mVideoScenePopup, SLOT(close()));
 CX_DEBUG_EXIT_FUNCTION();
 }
 /*!
 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 28	3075d9b614e6
parent 19	d9aefe59d544
child 38	0f0b4c1d7744
child 43	0e652f8f1fbd