diff -r 53c8aa5d97a3 -r 8f559c47d7fd camerauis/cameraapp/generic/src/CamVideoPostCaptureView.cpp --- a/camerauis/cameraapp/generic/src/CamVideoPostCaptureView.cpp Tue May 25 12:22:04 2010 +0300 +++ b/camerauis/cameraapp/generic/src/CamVideoPostCaptureView.cpp Wed Jun 09 09:21:41 2010 +0300 @@ -45,10 +45,11 @@ #include "camactivepalettehandler.h" #include "camoneclickuploadutility.h" #include "CameraUiConfigManager.h" - +#include "CamTimer.h" //CONSTANTS +const TInt KHdmiTimeout = 1000000; //1 sec // ========================= MEMBER FUNCTIONS ================================ @@ -75,7 +76,12 @@ // --------------------------------------------------------------------------- // CCamVideoPostCaptureView::~CCamVideoPostCaptureView() - { + { + if( iHdmiTimer ) + { + delete iHdmiTimer; + iHdmiTimer = NULL; + } } // --------------------------------------------------------------------------- @@ -318,6 +324,9 @@ iAiwServiceHandler->AttachMenuL( ROID( R_CAM_VIDEO_POST_CAPTURE_MENU_ID ), R_CAM_SET_AS_RING_TONE_INTEREST ); } + if( iHdmiTimer->IsActive() ) + iHdmiTimer->Cancel(); + iHdmiTimer->StartTimer(); } // --------------------------------------------------------------------------- @@ -340,7 +349,7 @@ PRINT( _L("Camera => CCamVideoPostCaptureView::ConstructL")) BaseConstructL( ROID(R_CAM_VIDEO_POST_CAPTURE_VIEW_ID)); CCamPostCaptureViewBase::ConstructL(); - + iHdmiTimer = CCamTimer::NewL( KHdmiTimeout, TCallBack(HdmiTimerCallback, this)); PRINT( _L("Camera <= CCamVideoPostCaptureView::ConstructL")) } @@ -619,6 +628,31 @@ PRINT2( _L("Camera <= CCamVideoPostCaptureView::DynInitToolbarL(%d, 0x%X)" ), aResourceId, aToolbar ); } + +// --------------------------------------------------------------------------- +// CCamVideoPostCaptureView::HdmiTimerCallback +// --------------------------------------------------------------------------- +// +TInt CCamVideoPostCaptureView::HdmiTimerCallback( TAny* aSelf ) + { + CCamVideoPostCaptureView* self = static_cast(aSelf); + TInt err(0); + if( self ) + { + TRAP(err, self->DoHdmiTimerCallbackL() ); + } + PRINT1( _L("Camera <> CCamVideoPostCaptureView::HdmiTimerCallback err=%d"), err); + return err; + } + +// --------------------------------------------------------------------------- +// CCamVideoPostCaptureView::DoHdmlTimerCallbackL +// --------------------------------------------------------------------------- +// +void CCamVideoPostCaptureView::DoHdmiTimerCallbackL() + { + iController.HandlePostHdmiConnectDuringRecordingEventL(); + } // End of File