From c9ccb31b45f2e3dc7c03846e319824cad17f466f Mon Sep 17 00:00:00 2001 From: Johannes Wendel Date: Thu, 15 Aug 2019 20:18:16 +0200 Subject: [PATCH] changed runtime dir --- FlippR-Driver/contrib/json_example/output/Sound_Config.json | 2 +- FlippR-Driver/networking/FlippRServer.cpp | 2 +- FlippR-Driver/networking/FlippRServer.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/FlippR-Driver/contrib/json_example/output/Sound_Config.json b/FlippR-Driver/contrib/json_example/output/Sound_Config.json index 95a75b6..14765f7 100644 --- a/FlippR-Driver/contrib/json_example/output/Sound_Config.json +++ b/FlippR-Driver/contrib/json_example/output/Sound_Config.json @@ -335,7 +335,7 @@ }, { "id" : 53, - "address" : 75, + "address" : 75, "name" : "speech 1: \"you're good! but i'm still the champ!\"", "extender" : "extender_0" }, diff --git a/FlippR-Driver/networking/FlippRServer.cpp b/FlippR-Driver/networking/FlippRServer.cpp index 7e22a50..89e8043 100644 --- a/FlippR-Driver/networking/FlippRServer.cpp +++ b/FlippR-Driver/networking/FlippRServer.cpp @@ -257,7 +257,7 @@ void FlippRServer::handle_help(const std::string& name, const std::string& value std::string FlippRServer::get_runtime_dir() { - std::string runtime_dir = std::getenv("XDG_RUNTIME_DIR"); + const char* runtime_dir = std::getenv("XDG_RUNTIME_DIR"); if(&runtime_dir == nullptr) { runtime_dir = DEFAULT_RUNTIME_DIR; diff --git a/FlippR-Driver/networking/FlippRServer.h b/FlippR-Driver/networking/FlippRServer.h index a34706f..fbc3641 100644 --- a/FlippR-Driver/networking/FlippRServer.h +++ b/FlippR-Driver/networking/FlippRServer.h @@ -41,8 +41,8 @@ private: Poco::Net::TCPServer* build_input_server(); private: - const std::string DEFAULT_RUNTIME_DIR = "/tmp/flippR_driver-runtime/"; - const std::string SOCKET_NAME = "S.flippR_driver"; + const char * DEFAULT_RUNTIME_DIR = "/tmp/flippR_driver-runtime/"; + const char * SOCKET_NAME = "S.flippR_driver"; const std::vector REQUIRED_CONFIG_KEYS = {"display-config", "input-config", "lamp-config", "matrix-config", "solenoid-config", "sound-config"}; int input_port;