diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2018-12-06 10:05:47 -0500 |
|---|---|---|
| committer | Scott Murray <scott.murray@konsulko.com> | 2018-12-07 09:15:24 -0500 |
| commit | 24794d197e6d27fbfba9790be1da190fe573a058 (patch) | |
| tree | 7d506a9a319fdf3823fab40c5e37825c60e69430 /src/util.hpp | |
| parent | 6a20800629fca350b00ce71a09ba4d71e2f2ee1d (diff) | |
Add configuration file over-ride mechanism
Reusing the windowmanager on the cluster demo platform requires
modifications to the layers.json, areas.db, etc. configuration files.
To allow this without breaking potential shared package feeds by
building two versions, add a mechanism to allow over-riding the
configuration files present in the widget with files in the directory
/etc/xdg/windowmanager. Affected code has been refactored to use a new
common configuration file path determination helper function to reduce
duplication.
Bug-AGL: SPEC-1805
Change-Id: Ia3e1af0703794079f9537b934b124788129c045c
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Diffstat (limited to 'src/util.hpp')
| -rw-r--r-- | src/util.hpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/util.hpp b/src/util.hpp index 2f17845..8782353 100644 --- a/src/util.hpp +++ b/src/util.hpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2017 TOYOTA MOTOR CORPORATION + * Copyright (c) 2018 Konsulko Group * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,16 +21,10 @@ #include <functional> #include <thread> #include <vector> +#include <string> #include <sys/poll.h> -#ifndef DO_NOT_USE_AFB -extern "C" -{ -#include <afb/afb-binding.h> -}; -#endif - #define CONCAT_(X, Y) X##Y #define CONCAT(X, Y) CONCAT_(X, Y) @@ -163,4 +158,7 @@ class rectangle long _bottom; }; +// Configuration file path helper +std::string get_file_path(const char *file_name, const char *log_category = "wm"); + #endif // !WM_UTIL_HPP |