equal
deleted
inserted
replaced
281 CCameraUiConfigManager* dynamicSettings = iController.UiConfigManagerPtr(); |
281 CCameraUiConfigManager* dynamicSettings = iController.UiConfigManagerPtr(); |
282 RArray<TInt> supportedItems; |
282 RArray<TInt> supportedItems; |
283 CleanupClosePushL( supportedItems ); |
283 CleanupClosePushL( supportedItems ); |
284 supportedItems.Reset(); |
284 supportedItems.Reset(); |
285 |
285 |
286 // just for flash to start with |
286 // just for flash to start with |
287 if( aSettingItem == ECamSettingItemDynamicPhotoFlash ) |
287 if( aSettingItem == ECamSettingItemDynamicPhotoFlash ) |
288 { |
|
289 #ifndef CAMERAAPP_PLUGIN_BUILD |
|
290 if ( dynamicSettings ) |
|
291 { |
288 { |
292 dynamicSettings->SupportedFlashModeSettingsL( supportedItems ); |
289 #ifndef CAMERAAPP_PLUGIN_BUILD |
293 } |
290 if ( dynamicSettings ) |
|
291 { |
|
292 dynamicSettings->SupportedFlashModeSettingsL( supportedItems ); |
|
293 } |
294 #endif //CAMERAAPP_PLUGIN_BUILD |
294 #endif //CAMERAAPP_PLUGIN_BUILD |
295 } |
295 } |
296 else if( ECamSettingItemDynamicPhotoWhiteBalance == aSettingItem || |
296 else if( ECamSettingItemDynamicPhotoWhiteBalance == aSettingItem || |
297 ECamSettingItemDynamicVideoWhiteBalance == aSettingItem ) |
297 ECamSettingItemDynamicVideoWhiteBalance == aSettingItem ) |
298 { |
298 { |
302 dynamicSettings->SupportedWhiteBalanceSettingsL( supportedItems ); |
302 dynamicSettings->SupportedWhiteBalanceSettingsL( supportedItems ); |
303 } |
303 } |
304 #endif //CAMERAAPP_PLUGIN_BUILD |
304 #endif //CAMERAAPP_PLUGIN_BUILD |
305 } |
305 } |
306 else if ( ECamSettingItemDynamicPhotoColourFilter == aSettingItem || |
306 else if ( ECamSettingItemDynamicPhotoColourFilter == aSettingItem || |
307 ECamSettingItemDynamicVideoColourFilter == aSettingItem ) |
307 ECamSettingItemDynamicVideoColourFilter == aSettingItem || |
|
308 ECamSettingItemUserSceneColourFilter == aSettingItem ) |
308 { |
309 { |
309 #ifndef CAMERAAPP_PLUGIN_BUILD |
310 #ifndef CAMERAAPP_PLUGIN_BUILD |
310 if ( dynamicSettings ) |
311 if ( dynamicSettings ) |
311 { |
312 { |
312 dynamicSettings->SupportedColorToneSettingsL( supportedItems ); |
313 dynamicSettings->SupportedColorToneSettingsL( supportedItems ); |