From fec2742ee52289b16b9c52d8fcf268bbfeca8b1a Mon Sep 17 00:00:00 2001 From: Jon Ashburn Date: Tue, 3 Mar 2015 15:07:15 -0700 Subject: layers: if no settings file or call overrides make callback override loging Default debugAction in layers is to log based on variable init. Make the overrides work as follows: 1) app calls xglRegisterMsgCallback() 2) settings file 3) Glave (or app) calls to setlayerOption() --- layers/layers_config.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'layers/layers_config.cpp') diff --git a/layers/layers_config.cpp b/layers/layers_config.cpp index 14e8053d..6992f06f 100644 --- a/layers/layers_config.cpp +++ b/layers/layers_config.cpp @@ -81,16 +81,17 @@ const char *getLayerOption(const char *_option) return g_configFileObj.getOption(_option); } -uint32_t getLayerOptionEnum(const char *_option, uint32_t optionDefault) +bool getLayerOptionEnum(const char *_option, uint32_t *optionDefault) { - uint32_t val = 0; + bool res; const char *option = (g_configFileObj.getOption(_option)); if (option != NULL) { - val = convertStringEnumVal(option); + *optionDefault = convertStringEnumVal(option); + res = false; } else { - val = optionDefault; + res = true; } - return val; + return res; } void setLayerOptionEnum(const char *_option, const char *_valEnum) -- cgit v1.2.3