screensaver: formatting code using astyle

Origin commit data
------------------
Commit: 8b5ebf8a74
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-10-24 (Sun, 24 Oct 2021)

Origin message was:
------------------
- screensaver: formatting code using astyle

src/gui/screensaver.cpp

@@ -43,6 +43,7 @@
 #include <system/debug.h>
 #include <gui/color_custom.h>
 #include <gui/infoclock.h>
+#include <gui/infoicons.h>
 #include <gui/infoviewer.h>
 #include <zapit/zapit.h>
 #include <driver/pictureviewer/pictureviewer.h>
@@ -51,9 +52,6 @@
 #include <hardware/video.h>
 extern cVideo *videoDecoder;
 
-//NI InfoIcons
-#include <gui/infoicons.h>
-
 static CComponentsFrmClock *scr_clock = NULL;
 
 
@@ -66,7 +64,7 @@ CScreenSaver::CScreenSaver()
 	m_viewer	= new CPictureViewer();
 	index 		= 0;
 	status_mute	= CAudioMute::getInstance()->getStatus();
-	status_icons	= CInfoIcons::getInstance()->getStatus(); //NI
+	status_icons	= CInfoIcons::getInstance()->getStatus();
 
 	clr.i_color	= COL_DARK_GRAY;
 	for (unsigned int i = 0; i < 3; i++)
@@ -86,7 +84,8 @@ CScreenSaver::~CScreenSaver()
 
 	delete m_viewer;
 
-	if (scr_clock){
+	if (scr_clock)
+	{
 		delete scr_clock;
 		scr_clock = NULL;
 	}
@@ -127,7 +126,6 @@ void CScreenSaver::Start()
 	if (!CInfoClock::getInstance()->isBlocked())
 		CInfoClock::getInstance()->block();
 
-	//NI
 	status_icons = CInfoIcons::getInstance()->getStatus();
 	CInfoIcons::getInstance()->enableInfoIcons(false);
 
@@ -179,7 +177,8 @@ void CScreenSaver::Stop()
 
 	resetIdleTime();
 
-	if (scr_clock){
+	if (scr_clock)
+	{
 		std::lock_guard<std::mutex> g(scr_mutex);
 		scr_clock->Stop();
 		delete scr_clock;
@@ -187,7 +186,8 @@ void CScreenSaver::Stop()
 	}
 
 #if ENABLE_PIP
-	if(pip_channel_id[0]) {
+	if (pip_channel_id[0])
+	{
 		CNeutrinoApp::getInstance()->StartPip(pip_channel_id[0]);
 		pip_channel_id[0] = 0;
 	}
@@ -200,7 +200,7 @@ void CScreenSaver::Stop()
 	CInfoClock::getInstance()->ClearDisplay(); // provokes reinit
 	CInfoClock::getInstance()->enableInfoClock();
 
-	CInfoIcons::getInstance()->enableInfoIcons(status_icons); //NI
+	CInfoIcons::getInstance()->enableInfoIcons(status_icons);
 
 	if (g_RadiotextWin)
 		g_Radiotext->OnAfterDecodeLine.unblock();
@@ -223,7 +223,8 @@ void CScreenSaver::ScreenSaverPrg(CScreenSaver *scr)
 			scr->paint();
 
 			int corr = 1;
-#if HAVE_CST_HARDWARE //time offset
+#if HAVE_CST_HARDWARE
+			// time offset
 			corr = 10;
 #endif
 			int t = 1000 / corr * g_settings.screensaver_timeout; // sleep and exit handle
@@ -255,7 +256,8 @@ bool CScreenSaver::ReadDir()
 		{
 			struct dirent **coverlist;
 			int n = scandir(COVERDIR_TMP, &coverlist, 0, alphasort);
-			if (n > 2){ // we always have the "." and ".." entrys
+			if (n > 2) // we always have the "." and ".." entrys
+			{
 				show_audiocover = true;
 			}
 			if (n > -1)
@@ -290,13 +292,14 @@ bool CScreenSaver::ReadDir()
 
 	v_bg_files.clear();
 
-	/* open dir */
+	// open dir
-	if((dir=opendir(dir_name)) == NULL) {
+	if ((dir = opendir(dir_name)) == NULL)
+	{
 		fprintf(stderr, "[CScreenSaver] %s - %d : error open dir...\n", __func__, __LINE__);
 		return ret;
 	}
 
-	/* read complete dir */
+	// read complete dir
 	while ((dirpointer = readdir(dir)) != NULL) // TODO: use threadsave readdir_r instead readdir
 	{
 		int curr_lenght = strlen((*dirpointer).d_name);
@@ -330,7 +333,7 @@ bool CScreenSaver::ReadDir()
 
 	sort(v_bg_files.begin(), v_bg_files.end());
 
-	/* close pointer */
+	// close pointer
 	if (closedir(dir) == -1)
 		dprintf(DEBUG_NORMAL, "[CScreenSaver] %s - %d : Error no closed %s\n", __func__, __LINE__, dir_name);
 
@@ -405,7 +408,8 @@ void CScreenSaver::paint()
 #endif
 		}
 #if !HAVE_CST_HARDWARE
-#if 0 //example for callback
+#if 0
+		// example for callback
 		m_frameBuffer->OnFallbackShowFrame.connect(sigc::bind(sigc::mem_fun(CFrameBuffer::getInstance(),
 								&CFrameBuffer::paintBoxRel),
 								scr_clock->getXPos(), scr_clock->getYPos(),
@@ -457,7 +461,8 @@ void CScreenSaver::paint()
 			uint32_t brightness;
 
 			// sorcery, no darkness
-			do {
+			do
+			{
 				clr.i_color = rand_r(&seed[3]);
 				brightness = (unsigned int)clr.uc_color.r * 19595 + (unsigned int)clr.uc_color.g * 38469 + (unsigned int)clr.uc_color.b * 7471;
 				//printf("[%s] %s: brightness: %d\n", __file__, __FUNCTION__, brightness>> 16);
@@ -540,7 +545,7 @@ bool CScreenSaver::isActive()
 
 bool CScreenSaver::ignoredMsg(neutrino_msg_t msg)
 {
-	/* screensaver will ignore these msgs */
+	// screensaver will ignore these msgs
 	if (
 		   msg == NeutrinoMessages::EVT_CURRENTEPG
 		|| msg == NeutrinoMessages::EVT_NEXTEPG

src/gui/screensaver.h

@@ -61,8 +61,10 @@ class CScreenSaver : public sigc::trackable
 
 		time_t idletime;
 
-		union u_color {
+		union u_color
-			struct s_color {
+		{
+			struct s_color
+			{
 				uint8_t b, g, r, a;
 			} uc_color;
 			unsigned int i_color;