mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 23:42:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

- lcd4linux: code formatation using astyle

Browse Source 
Conflicts:
	src/driver/lcd4l.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2021-06-11 21:16:22 +02:00
committed by Thilo Graf
parent 0999fa72f8
commit a78da47df4
2 changed files with 65 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/driver/lcd4l.cpp
View File

@@ -152,7 +152,7 @@ void CLCD4l::StartLCD4l()
thrLCD4l = new std::thread(LCD4lProc, this); thrLCD4l = new std::thread(LCD4lProc, this);
dprintf(DEBUG_NORMAL, "\033[32m[CLCD4l] [%s - %d] thread [%p] is running\033[0m\n", __func__, __LINE__, thrLCD4l); dprintf(DEBUG_NORMAL, "\033[32m[CLCD4l] [%s - %d] thread [%p] is running\033[0m\n", __func__, __LINE__, thrLCD4l);
} }
lcd4linux(true); if (g_settings.lcd4l_support)
exec_initscript("lcd4linux", "start"); exec_initscript("lcd4linux", "start");
} }
@@ -162,12 +162,12 @@ void CLCD4l::StopLCD4l()
{ {
dprintf(DEBUG_NORMAL, "\033[32m[CLCD4l] [%s - %d] stopping thread [%p]\033[0m\n", __func__, __LINE__, thrLCD4l); dprintf(DEBUG_NORMAL, "\033[32m[CLCD4l] [%s - %d] stopping thread [%p]\033[0m\n", __func__, __LINE__, thrLCD4l);
lcd4linux(false);
exit_proc = true; exit_proc = true;
thrLCD4l->join(); thrLCD4l->join();
dprintf(DEBUG_NORMAL, "\033[32m[CLCD4l] [%s - %d] thread [%p] joined\033[0m\n", __func__, __LINE__, thrLCD4l); dprintf(DEBUG_NORMAL, "\033[32m[CLCD4l] [%s - %d] thread [%p] joined\033[0m\n", __func__, __LINE__, thrLCD4l);
delete thrLCD4l; thrLCD4l = NULL; delete thrLCD4l;
thrLCD4l = NULL;
dprintf(DEBUG_NORMAL, "\033[32m[CLCD4l] [%s - %d] thread [%p] terminated\033[0m\n", __func__, __LINE__, thrLCD4l); dprintf(DEBUG_NORMAL, "\033[32m[CLCD4l] [%s - %d] thread [%p] terminated\033[0m\n", __func__, __LINE__, thrLCD4l);
} }
exec_initscript("lcd4linux", "stop"); exec_initscript("lcd4linux", "stop");
@@ -863,8 +863,11 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun)
m_Layout = Layout; m_Layout = Layout;
if (!firstRun) if (!firstRun)
{ {
lcd4linux(false); const char *buf = "service lcd4linux reload";
lcd4linux(true); // reload
//printf("[CLCD4l] %s: executing '%s'\n", __FUNCTION__, buf);
if (my_system(3, "service", "lcd4linux", "reload") != 0)
printf("[CLCD4l] %s: executing '%s' failed\n", __FUNCTION__, buf);
} }
} }
} }
@@ -975,6 +978,12 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun)
snprintf(Start, sizeof(Start), "%02d:%02d", tm_struct->tm_hour, tm_struct->tm_min); snprintf(Start, sizeof(Start), "%02d:%02d", tm_struct->tm_hour, tm_struct->tm_min);
} }
#if 0
else if (parseID == NeutrinoModes::mode_pic)
{
// TODO: Event = Bildname
}
#endif
else if (parseID == NeutrinoModes::mode_ts) else if (parseID == NeutrinoModes::mode_ts)
{ {
if (CMoviePlayerGui::getInstance().p_movie_info) if (CMoviePlayerGui::getInstance().p_movie_info)
@@ -1014,7 +1023,12 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun)
snprintf(End, sizeof(End), "%02d:%02d", tm_struct->tm_hour, tm_struct->tm_min); snprintf(End, sizeof(End), "%02d:%02d", tm_struct->tm_hour, tm_struct->tm_min);
} }
#if 0
else if (parseID == NeutrinoModes::mode_upnp)
{
// TODO?
}
#endif
/* ----------------------------------------------------------------- */ /* ----------------------------------------------------------------- */
Event += "\n"; // make sure we have at least two lines in event-file Event += "\n"; // make sure we have at least two lines in event-file