148 DoReleaseScreen(); |
148 DoReleaseScreen(); |
149 } |
149 } |
150 |
150 |
151 iViewFinderSettings = aSetting; |
151 iViewFinderSettings = aSetting; |
152 |
152 |
|
153 if ( !iViewFinderSettings.iEnabled ){ |
|
154 __CONTROLLER( "CMccCameraHandler::EnableViewFinderL, param update, exit" ) |
|
155 return; |
|
156 } |
153 __CONTROLLER( "CMccCameraHandler::EnableViewFinderL, starting vf" ) |
157 __CONTROLLER( "CMccCameraHandler::EnableViewFinderL, starting vf" ) |
154 |
158 |
155 CCamera* cam = IsCameraReady() ? iCamera : NULL; |
159 CCamera* cam = IsCameraReady() ? iCamera : NULL; |
156 if ( !iScreen ) |
160 if ( !iScreen ) |
157 { |
161 { |
215 __CONTROLLER_INT2( "CMccCameraHandler::GetViewFinderSettingsL, size", |
219 __CONTROLLER_INT2( "CMccCameraHandler::GetViewFinderSettingsL, size", |
216 iViewFinderSettings.iSize.iHeight, |
220 iViewFinderSettings.iSize.iHeight, |
217 iViewFinderSettings.iSize.iWidth) |
221 iViewFinderSettings.iSize.iWidth) |
218 __CONTROLLER_INT2( "CMccCameraHandler::GetViewFinderSettingsL, location", |
222 __CONTROLLER_INT2( "CMccCameraHandler::GetViewFinderSettingsL, location", |
219 iViewFinderSettings.iLocation.iX, |
223 iViewFinderSettings.iLocation.iX, |
220 iViewFinderSettings.iLocation.iY) |
224 iViewFinderSettings.iLocation.iY) |
221 aSetting = iViewFinderSettings; |
225 aSetting = iViewFinderSettings; |
|
226 aSetting.iEnabled = iViewFinderEnabled; |
222 __CONTROLLER( "CMccCameraHandler::GetViewFinderSettingsL,exit" ) |
227 __CONTROLLER( "CMccCameraHandler::GetViewFinderSettingsL,exit" ) |
223 } |
228 } |
224 |
229 |
225 // ----------------------------------------------------------------------------- |
230 // ----------------------------------------------------------------------------- |
226 // CMccCameraHandler::GetCamInfoL |
231 // CMccCameraHandler::GetCamInfoL |