FCL/sf/app/camera: comparison camerauis/cameraxui/cxengine/src/cxesettingscenrepstore.cpp

equal deleted inserted replaced

-:64817133cd1d
+:42ba2d16bf40
 #include <QMultiMap>
 #include <QMetaType>
 #include <QString>
 #include <QStringList>
 #include <QVariant>
+#ifdef Q_OS_SYMBIAN
+#include <ProfileEngineSDKCRKeys.h>
+#endif
 #include "xqsettingsmanager.h" // Settings Manager API
 #include "xqsettingskey.h"
 #include "cxesettingscenrepstore.h"
 #include "cxenamespace.h"
 #include "cxutils.h"
 #include "cxenamespace.h"
 #include "cxeerror.h"
 #include "cxecenrepkeys.h"
+#include "OstTraceDefinitions.h"
-#ifdef Q_OS_SYMBIAN
+#ifdef OST_TRACE_COMPILER_IN_USE
-#include <ProfileEngineSDKCRKeys.h>
+#include "cxesettingscenrepstoreTraces.h"
 #endif
 using namespace CxeSettingIds;
 /*!
 * CxeSettingsCenRepStore::CxeSettingsCenRepStore
 */
 CxeSettingsCenRepStore::CxeSettingsCenRepStore()
 {
 CX_DEBUG_ENTER_FUNCTION();
+OstTrace0(camerax_performance, CXESETTINGSCENREPSTORE_1, "msg: e_CX_SETTINGSSTORE_CREATE 1");
 // map keys of type "string" to cenrep ids
 mapKeys();
 	// we create settings handle, scope user::scope
 mSettingsManager = new XQSettingsManager(this);
-bool ok = false;
+bool ok = connect(mSettingsManager, SIGNAL(valueChanged(XQSettingsKey, QVariant)),
-ok = connect(mSettingsManager, SIGNAL(valueChanged(XQSettingsKey, QVariant)),
+this, SLOT(handleValueChanged(XQSettingsKey, QVariant)));
-this, SLOT(handleValueChanged(XQSettingsKey, QVariant)));
+CX_ASSERT_ALWAYS(ok);
-CX_DEBUG_ASSERT(ok);
 CX_DEBUG(("CxeSettingsCenRepStore - mSettingsManager ptr = %d", mSettingsManager));
+OstTrace0(camerax_performance, CXESETTINGSCENREPSTORE_2, "msg: e_CX_SETTINGSSTORE_CREATE 0");
 	CX_DEBUG_EXIT_FUNCTION();
 }
 }
 /*!
 * Generates XQSettingsKey from given setting/runtime key
 * \param key Name of the setting from which to generate the XQSettingsKey
 * \param[out] error Error code. CxeError::None if everything went fine.
 */
 XQSettingsKey
 CxeSettingsCenRepStore::generateXQSettingsKey(const QString& key, CxeError::Id& error)
 {
 }
 /*!
-* Reads/loads all run-time settings values from cenrep
+* Reads/loads all run-time variation settings values from cenrep
-* @param QList<QString> contains list of all runtime key ids which we use to load values from cenrep.
+* @param QList<QString> contains list of all variation key ids which we use to load values from cenrep.
 * returns: QHash container, "contains" values associated with each key that are read from cenrep
-* NOTE: loading runtime settings should be done only ONCE at start-up.
+* NOTE: loading variation settings should be done only ONCE at start-up.
 */
-QHash<QString, QVariantList> CxeSettingsCenRepStore::loadRuntimeSettings(QList<QString>& runtimeKeys)
+QHash<QString, QVariantList> CxeSettingsCenRepStore::loadVariationSettings(QList<QString>& variationKeys)
 {
 CX_DEBUG_ENTER_FUNCTION();
+OstTrace0(camerax_performance, CXESETTINGSCENREPSTORE_LOADRUNTIME_1, "msg: e_CX_SETTINGSSTORE_LOAD_RUNTIME 1");
 QHash<QString, QVariantList> settings;
 	CxeError::Id err = CxeError::None;
 	QVariantList list;
 	QVariant data;
-// parsing through the list of run-time keys and reading values from cenrep.
+// parsing through the list of run-time variation keys and reading values from cenrep.
-foreach (QString key, runtimeKeys) {
+foreach (QString key, variationKeys) {
 // read the data from cenrep
 err = get(key, data);
 // clear the list
 } // end for
 CX_DEBUG_EXIT_FUNCTION();
+OstTrace0(camerax_performance, CXESETTINGSCENREPSTORE_LOADRUNTIME_2, "msg: e_CX_SETTINGSSTORE_LOAD_RUNTIME 0");
 return settings;
 }
 } else {
 keyType = XQSettingsKey::TargetCentralRepository;
 }
 	XQSettingsKey settingsKey(keyType, uid, key);
-CX_DEBUG(("reading values from XQSettingsManager.."));
+CX_DEBUG(("reading value from XQSettingsManager.."));
 value = mSettingsManager->readItemValue(settingsKey);
 // start monitoring changes for the key
 // both P&S and Repository keys are monitored
-bool ok = false;
+bool ok = mSettingsManager->startMonitoring(settingsKey);
-ok = mSettingsManager->startMonitoring(settingsKey);
+if (!ok) {
-CX_DEBUG_ASSERT(ok);
+XQSettingsManager::Error error = mSettingsManager->error();
+CX_DEBUG(("CxeSettingsCenRepStore - got error %d trying to start listening", error));
+// If we try to start listening one key more than once,
+// we get this error. We can safely ignore it.
+ok = (XQSettingsManager::AlreadyExistsError == error);
+}
+CX_ASSERT_ALWAYS(ok);
 CX_DEBUG_EXIT_FUNCTION();
 }
 * Maps CxeSettingIds to cenrep key ids that XQSettingsManager understands
 */
 void CxeSettingsCenRepStore::mapKeys()
 {
 CX_DEBUG_ENTER_FUNCTION();
+OstTrace0(camerax_performance, CXESETTINGSCENREPSTORE_MAPKEYS_1, "msg: e_CX_SETTINGSSTORE_INIT_MAPPING 1");
 mKeyMapping.clear();
 // mapping setting keys
 addKeyMapping(CxeSettingIds::FNAME_FOLDER_SUFFIX,
 FileNameSuffixCr,
 XQSettingsManager::TypeInt);
 addKeyMapping(CxeSettingIds::VIDEO_MUTE_SETTING,
 AudioMuteCr,
 XQSettingsManager::TypeInt);
 addKeyMapping(CxeSettingIds::GEOTAGGING,
 GeoTaggingCr,
 XQSettingsManager::TypeInt);
 addKeyMapping(CxeSettingIds::FACE_TRACKING,
 XQSettingsManager::TypeInt);
 addKeyMapping(CxeSettingIds::CAPTURE_SOUND_ALWAYS_ON,
 CaptureSoundAlwaysOnCr,
 XQSettingsManager::TypeInt);
 addKeyMapping(CxeSettingIds::CAMERA_MODE,
 CameraModeCr,
 XQSettingsManager::TypeInt);
 addKeyMapping(CxeSettingIds::GEOTAGGING_DISCLAIMER,
 GeoTaggingDisclaimerCr,
 XQSettingsManager::TypeInt);
-// mapping run-time keys
+// mapping run-time variation keys
-addKeyMapping(CxeRuntimeKeys::PRIMARY_CAMERA_CAPTURE_KEYS,
+addKeyMapping(CxeVariationKeys::FREE_MEMORY_LEVELS,
-PrimaryCameraCaptureKeysCr,
-XQSettingsManager::TypeString,
-true);
-addKeyMapping(CxeRuntimeKeys::PRIMARY_CAMERA_AUTOFOCUS_KEYS,
-PrimaryCameraAutofocusKeysCr,
-XQSettingsManager::TypeString,
-true);
-addKeyMapping(CxeRuntimeKeys::SECONDARY_CAMERA_CAPTURE_KEYS,
-SecondaryCameraCaptureKeysCr,
-XQSettingsManager::TypeString,
-true);
-addKeyMapping(CxeRuntimeKeys::FREE_MEMORY_LEVELS,
 FreeMemoryLevelsCr,
 XQSettingsManager::TypeString,
 true);
-addKeyMapping(CxeRuntimeKeys::STILL_MAX_ZOOM_LIMITS,
+addKeyMapping(CxeVariationKeys::STILL_MAX_ZOOM_LIMITS,
 StillMaxZoomLimitsCr,
 XQSettingsManager::TypeString,
 true);
-addKeyMapping(CxeRuntimeKeys::VIDEO_MAX_ZOOM_LIMITS,
+addKeyMapping(CxeVariationKeys::VIDEO_MAX_ZOOM_LIMITS,
 VideoMaxZoomLimitsCr,
 XQSettingsManager::TypeString,
 true);
+OstTrace0(camerax_performance, CXESETTINGSCENREPSTORE_MAPKEYS_2, "msg: e_CX_SETTINGSSTORE_INIT_MAPPING 0");
 	CX_DEBUG_EXIT_FUNCTION();
 }
 /*!
 * helper method to construct key mappings for each setting key

changeset 48	42ba2d16bf40
parent 37	64817133cd1d