camerauis/cameraapp/generic/src/CamVideoPreCaptureView.cpp
branchRCL_3
changeset 19 e32fcfe0045f
parent 17 8f559c47d7fd
equal deleted inserted replaced
17:8f559c47d7fd 19:e32fcfe0045f
   636 // ---------------------------------------------------------------------------
   636 // ---------------------------------------------------------------------------
   637 //
   637 //
   638 void CCamVideoPreCaptureView::ConstructL()
   638 void CCamVideoPreCaptureView::ConstructL()
   639     {
   639     {
   640     BaseConstructL( ROID(R_CAM_VIDEO_PRE_CAPTURE_VIEW_ID) );
   640     BaseConstructL( ROID(R_CAM_VIDEO_PRE_CAPTURE_VIEW_ID) );
   641     if(iController.UiConfigManagerPtr()->IsXenonFlashSupported())
       
   642         {
       
   643         CreateAndSetToolbarL(R_CAM_VIDEO_PRECAPTURE_TOOLBAR);
       
   644         }
       
   645     else
       
   646         {
       
   647         CreateAndSetToolbarL(R_CAM_VIDEO_PRECAPTURE_TOOLBAR_VIDEOLIGHT);
       
   648         }
       
   649     CCamPreCaptureViewBase::ConstructL();
   641     CCamPreCaptureViewBase::ConstructL();
   650     iHdmiTimer = CCamTimer::NewL( KHdmiTimeout, TCallBack(HdmiTimerCallback, this));
   642     iHdmiTimer = CCamTimer::NewL( KHdmiTimeout, TCallBack(HdmiTimerCallback, this));
   651     }
   643     }
   652 
   644 
   653 // ---------------------------------------------------------------------------
   645 // ---------------------------------------------------------------------------
  1066     OstTrace0( CAMERAAPP_PERFORMANCE_DETAIL, CCAMVIDEOPRECAPTUREVIEW_DOACTIVATEL, "e_CCamVideoPreCaptureView_DoActivateL 1" );
  1058     OstTrace0( CAMERAAPP_PERFORMANCE_DETAIL, CCAMVIDEOPRECAPTUREVIEW_DOACTIVATEL, "e_CCamVideoPreCaptureView_DoActivateL 1" );
  1067     PRINT( _L("Camera => CCamVideoPreCaptureView::DoActivateL") );
  1059     PRINT( _L("Camera => CCamVideoPreCaptureView::DoActivateL") );
  1068     PERF_EVENT_START_L2( EPerfEventVideoPreCaptureViewActivation );        
  1060     PERF_EVENT_START_L2( EPerfEventVideoPreCaptureViewActivation );        
  1069     // Ensure the correct menu is used for the current mode.
  1061     // Ensure the correct menu is used for the current mode.
  1070     CCamAppUi* appUi =  static_cast<CCamAppUi*>( AppUi() );
  1062     CCamAppUi* appUi =  static_cast<CCamAppUi*>( AppUi() );
       
  1063     // Toolbar is created here.
       
  1064     // fixed toolbar is used only with touch devices
       
  1065   if ( iController.IsTouchScreenSupported() )
       
  1066       {
       
  1067       CAknToolbar* toolbar = Toolbar();
       
  1068       if( !toolbar )
       
  1069         {
       
  1070         PRINT( _L("Camera <> CCamVideoPreCaptureView::DoActivateL - Not toolbar -> Create one" ) );
       
  1071         if(iController.UiConfigManagerPtr()->IsXenonFlashSupported())
       
  1072             {
       
  1073             CreateAndSetToolbarL(R_CAM_VIDEO_PRECAPTURE_TOOLBAR);
       
  1074             }
       
  1075         else
       
  1076             {
       
  1077             CreateAndSetToolbarL(R_CAM_VIDEO_PRECAPTURE_TOOLBAR_VIDEOLIGHT);
       
  1078             }
       
  1079         }
       
  1080       }
       
  1081 
  1071     
  1082     
  1072     // fixed toolbar is used only with touch devices
  1083     // fixed toolbar is used only with touch devices
  1073     if ( iController.IsTouchScreenSupported() )
  1084     if ( iController.IsTouchScreenSupported() )
  1074         {
  1085         {
  1075         if ( appUi->IsEmbedded() )
  1086         if ( appUi->IsEmbedded() )