equal
deleted
inserted
replaced
151 aNewZoomFactor >= MinZoomL(), |
151 aNewZoomFactor >= MinZoomL(), |
152 User::Leave( KErrArgument ) ); |
152 User::Leave( KErrArgument ) ); |
153 |
153 |
154 CMceCameraSource* camera = MusEngMceUtils::GetCameraL( *iSession ); |
154 CMceCameraSource* camera = MusEngMceUtils::GetCameraL( *iSession ); |
155 |
155 |
156 if ( aNewZoomFactor <= iCameraInfo.iMaxZoom ) |
156 if ( aNewZoomFactor < iCameraInfo.iMaxZoom ) |
157 { |
157 { |
158 MUS_LOG( "mus: [ENGINE] Optical zoom factor increased" ) |
158 MUS_LOG( "mus: [ENGINE] Optical zoom factor increased" ) |
159 camera->SetZoomFactorL( aNewZoomFactor ); |
159 camera->SetZoomFactorL( aNewZoomFactor ); |
160 } |
160 } |
161 |
161 |
162 if ( aNewZoomFactor - iCameraInfo.iMaxZoom > 0 ) |
162 if ( aNewZoomFactor - iCameraInfo.iMaxZoom >= 0 ) |
163 { |
163 { |
164 camera->SetDigitalZoomFactorL( aNewZoomFactor - iCameraInfo.iMaxZoom ); |
164 camera->SetDigitalZoomFactorL( aNewZoomFactor - iCameraInfo.iMaxZoom ); |
165 MUS_LOG1( "mus: [ENGINE] Digital zoom factor increased to %d", |
165 MUS_LOG1( "mus: [ENGINE] Digital zoom factor increased to %d", |
166 aNewZoomFactor - iCameraInfo.iMaxZoom ) |
166 aNewZoomFactor - iCameraInfo.iMaxZoom ) |
167 } |
167 } |