equal
deleted
inserted
replaced
2916 |
2916 |
2917 CEikonEnv* env = CEikonEnv::Static(); |
2917 CEikonEnv* env = CEikonEnv::Static(); |
2918 |
2918 |
2919 OstTrace0( CAMERAAPP_PERFORMANCE, CCAMCAMERACONTROLLER_PROCESSVFSTARTREQUESTL, "e_CAM_APP_VF_INIT 0" ); //CCORAPP_APP_VF_INIT_END |
2919 OstTrace0( CAMERAAPP_PERFORMANCE, CCAMCAMERACONTROLLER_PROCESSVFSTARTREQUESTL, "e_CAM_APP_VF_INIT 0" ); //CCORAPP_APP_VF_INIT_END |
2920 |
2920 |
2921 TInt orgPos = SetVfWindowOrdinal(); // Set visible |
|
2922 iCamera->StartViewFinderDirectL( |
2921 iCamera->StartViewFinderDirectL( |
2923 env->WsSession(), |
2922 env->WsSession(), |
2924 *env->ScreenDevice(), |
2923 *env->ScreenDevice(), |
2925 *iViewfinderWindow, |
2924 *iViewfinderWindow, |
2926 params().iRect ); |
2925 params().iRect ); |
2927 (void) SetVfWindowOrdinal( orgPos ); // back to original |
2926 |
2928 |
|
2929 if ( appUi && ECamActiveCameraSecondary == appUi->ActiveCamera() ) |
2927 if ( appUi && ECamActiveCameraSecondary == appUi->ActiveCamera() ) |
2930 { |
2928 { |
2931 iCamera->SetViewFinderMirrorL(ETrue); |
2929 iCamera->SetViewFinderMirrorL(ETrue); |
2932 } |
2930 } |
2933 // VF started succesfully, reset recovery counter |
2931 // VF started succesfully, reset recovery counter |
6500 TPckgBuf<TCamParamsVfBitmap> params; |
6498 TPckgBuf<TCamParamsVfBitmap> params; |
6501 iSettingProvider.ProvideCameraParamL( ECameraParamVfBitmap, ¶ms ); |
6499 iSettingProvider.ProvideCameraParamL( ECameraParamVfBitmap, ¶ms ); |
6502 |
6500 |
6503 CEikonEnv* env = CEikonEnv::Static(); |
6501 CEikonEnv* env = CEikonEnv::Static(); |
6504 |
6502 |
6505 TInt orgPos = SetVfWindowOrdinal(); // Set visible |
6503 iCamera->StartViewFinderDirectL( |
6506 iCamera->StartViewFinderDirectL( |
|
6507 env->WsSession(), |
6504 env->WsSession(), |
6508 *env->ScreenDevice(), |
6505 *env->ScreenDevice(), |
6509 *iViewfinderWindow, |
6506 *iViewfinderWindow, |
6510 params().iRect ); |
6507 params().iRect ); |
6511 (void) SetVfWindowOrdinal( orgPos ); // back to original |
6508 |
6512 } |
6509 } |
6513 else |
6510 else |
6514 { |
6511 { |
6515 iCamera->StopViewFinder(); |
6512 iCamera->StopViewFinder(); |
6516 iInfo.iVfState = ECamTriInactive; |
6513 iInfo.iVfState = ECamTriInactive; |