From 7a21279fafa781e06e5ae86385ea68ec4bc5b8b3 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 20 Jan 2019 23:33:59 +0100 Subject: [PATCH] lcd4l: rename new variable wait4lcd => wait4daemon Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/2fad3396d1dd92576d3c887a7f939f2207077d2a Author: vanhofen Date: 2019-01-20 (Sun, 20 Jan 2019) Origin message was: ------------------ - lcd4l: rename new variable wait4lcd => wait4daemon ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/driver/lcd4l.cpp | 5 +++-- src/driver/lcd4l.h | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/driver/lcd4l.cpp b/src/driver/lcd4l.cpp index e4bd1db8b..7a0833399 100644 --- a/src/driver/lcd4l.cpp +++ b/src/driver/lcd4l.cpp @@ -252,7 +252,7 @@ void CLCD4l::Init() if (!access(LCD_DATADIR, F_OK) == 0) mkdir(LCD_DATADIR, 0755); - wait4lcd = true; + wait4daemon = true; } void* CLCD4l::LCD4lProc(void* arg) @@ -277,7 +277,8 @@ void* CLCD4l::LCD4lProc(void* arg) { if (g_settings.lcd4l_support == 1) // automatic { - if (PLCD4l->GetWaitStatus()) { + if (PLCD4l->GetWaitStatus()) + { //printf("[CLCD4l] %s: waiting for lcd4linux\n", __FUNCTION__); sleep(10); continue; diff --git a/src/driver/lcd4l.h b/src/driver/lcd4l.h index bdf2ff372..0e6ba9d36 100644 --- a/src/driver/lcd4l.h +++ b/src/driver/lcd4l.h @@ -52,7 +52,7 @@ class CLCD4l void StartLCD4l(); void StopLCD4l(); void SwitchLCD4l(); - void ForceRun() { wait4lcd = false; } + void ForceRun() { wait4daemon = false; } int CreateFile(const char *file, std::string content = "", bool convert = false); int RemoveFile(const char *file); @@ -66,7 +66,7 @@ class CLCD4l static void* LCD4lProc(void *arg); struct tm *tm_struct; - bool wait4lcd; + bool wait4daemon; // Functions void Init(); @@ -80,8 +80,8 @@ class CLCD4l void strReplace(std::string &orig, const std::string &fstr, const std::string &rstr); bool WriteFile(const char *file, std::string content = "", bool convert = false); - void SetWaitStatus(bool wait) { wait4lcd = wait; } - bool GetWaitStatus() { return wait4lcd; } + void SetWaitStatus(bool wait) { wait4daemon = wait; } + bool GetWaitStatus() { return wait4daemon; } // Variables uint64_t m_ParseID;