diff options
author | Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com> | 2018-08-02 07:24:38 +0000 |
---|---|---|
committer | Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com> | 2018-08-02 07:25:22 +0000 |
commit | 6bc7a273350721be300423b1509527f336dce50e (patch) | |
tree | cf48715616b36b76b38a07e1df9e74e2dd30c2d0 /src/wm_config.cpp | |
parent | 3d1703f9a5c9d6a356b561ea7528c70a1dc4fe2d (diff) |
Revert "Enable scaling to fit various screen resolutions"
Abandon scaling support by AGL window manager 2017
Bug-AGL: SPEC-1611
This reverts commit 8ab10aaafc6fb3dc7bbad755dce9b4bdaa41f287.
Change-Id: Id6afb263a6dc30929b922e469d906e2e5190f7b0
Diffstat (limited to 'src/wm_config.cpp')
-rw-r--r-- | src/wm_config.cpp | 91 |
1 files changed, 0 insertions, 91 deletions
diff --git a/src/wm_config.cpp b/src/wm_config.cpp deleted file mode 100644 index f91fedd..0000000 --- a/src/wm_config.cpp +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright (c) 2017 TOYOTA MOTOR CORPORATION - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "../include/hmi-debug.h" -#include "json_helper.hpp" -#include "wm_config.hpp" - -using std::string; - -namespace wm -{ - -WMConfig::WMConfig(){} - -WMConfig::~WMConfig() -{ - json_object_put(j_setting_conf); -} - -WMError WMConfig::loadConfigs() -{ - WMError ret; - char const *pRoot = getenv("AFM_APP_INSTALL_DIR"); - string root_path = pRoot; - if (root_path.length() == 0) - { - HMI_ERROR("wm", "AFM_APP_INSTALL_DIR is not defined"); - } - ret = this->loadSetting(root_path); - - return ret; -} - -const string WMConfig::getConfigAspect() -{ - json_object *j; - string ret; - if (!json_object_object_get_ex(this->j_setting_conf, "settings", &j)) - { - ret = "aspect_fit"; - } - else - { - const char* scaling = jh::getStringFromJson(j, "scaling"); - if(scaling == nullptr) - { - ret = "aspect_fit"; - } - else - { - ret = scaling; - } - } - return ret; -} - -/* - ***** Private Functions ***** - */ - -WMError WMConfig::loadSetting(const string &path) -{ - string setting_path = path; - int iret = -1; - WMError ret = SUCCESS; - - if (setting_path.length() != 0) - { - setting_path = path + string("/etc/setting.json"); - iret = jh::inputJsonFilie(setting_path.c_str(), &this->j_setting_conf); - if (iret < 0) - ret = FAIL; - } - - return ret; -} - -} // namespace wm |