mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-15 09:23:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

upnpbrowser: formatting code using astyle; some manual code nicenings

Browse Source 
Origin commit data
------------------
Commit: b5bc4c68b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-12-04 (Sat, 04 Dec 2021)

Origin message was:
------------------
- upnpbrowser: formatting code using astyle; some manual code nicenings
This commit is contained in:
vanhofen
2021-12-04 23:22:35 +01:00
parent d8f44f1bee
commit db9a15f583
2 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui/upnpbrowser.cpp
View File

@@ -44,6 +44,7 @@
#include <gui/audiomute.h> #include <gui/audiomute.h>
#include <gui/color.h> #include <gui/color.h>
#include <gui/infoicons.h>
#include <gui/movieplayer.h> #include <gui/movieplayer.h>
#include <gui/components/cc.h> #include <gui/components/cc.h>
#include <gui/widget/msgbox.h> #include <gui/widget/msgbox.h>
@@ -58,9 +59,6 @@
extern cVideo *videoDecoder; extern cVideo *videoDecoder;
extern CPictureViewer *g_PicViewer; extern CPictureViewer *g_PicViewer;
//NI InfoIcons
#include <gui/infoicons.h>
const struct button_label RescanButton = {NEUTRINO_ICON_BUTTON_BLUE, LOCALE_UPNPBROWSER_RESCAN}; const struct button_label RescanButton = {NEUTRINO_ICON_BUTTON_BLUE, LOCALE_UPNPBROWSER_RESCAN};
const struct button_label BrowseButtons[] = const struct button_label BrowseButtons[] =
{ {
@@ -91,14 +89,14 @@ void CUpnpBrowserGui::Init()
{ {
font_item = SNeutrinoSettings::FONT_TYPE_MENU; font_item = SNeutrinoSettings::FONT_TYPE_MENU;
topbox.enableFrame(true, 1); //NI topbox.enableFrame(true, 1);
topbox.setCorner(RADIUS_LARGE); topbox.setCorner(RADIUS_LARGE);
topbox.setColorAll(COL_FRAME_PLUS_0, COL_MENUHEAD_PLUS_0, COL_SHADOW_PLUS_0, COL_MENUHEAD_TEXT); topbox.setColorAll(COL_FRAME_PLUS_0, COL_MENUHEAD_PLUS_0, COL_SHADOW_PLUS_0, COL_MENUHEAD_TEXT);
topbox.setTextFont(g_Font[SNeutrinoSettings::FONT_TYPE_MENU_INFO]); topbox.setTextFont(g_Font[SNeutrinoSettings::FONT_TYPE_MENU_INFO]);
topbox.enableColBodyGradient(g_settings.theme.menu_Head_gradient, COL_SHADOW_PLUS_0, g_settings.theme.menu_Head_gradient_direction); topbox.enableColBodyGradient(g_settings.theme.menu_Head_gradient, COL_SHADOW_PLUS_0, g_settings.theme.menu_Head_gradient_direction);
topbox.enableShadow(CC_SHADOW_ON); topbox.enableShadow(CC_SHADOW_ON);
infobox.enableFrame(true, 1); //NI infobox.enableFrame(true, 1);
infobox.setCorner(RADIUS_LARGE); infobox.setCorner(RADIUS_LARGE);
infobox.setColorAll(topbox.getColorFrame(), COL_MENUCONTENTDARK_PLUS_0); infobox.setColorAll(topbox.getColorFrame(), COL_MENUCONTENTDARK_PLUS_0);
infobox.setTextColor(COL_MENUCONTENTDARK_TEXT); infobox.setTextColor(COL_MENUCONTENTDARK_TEXT);
@@ -106,7 +104,7 @@ void CUpnpBrowserGui::Init()
infobox.enableColBodyGradient(g_settings.theme.menu_Hint_gradient, COL_SHADOW_PLUS_0, g_settings.theme.menu_Hint_gradient_direction); infobox.enableColBodyGradient(g_settings.theme.menu_Hint_gradient, COL_SHADOW_PLUS_0, g_settings.theme.menu_Hint_gradient_direction);
infobox.enableShadow(CC_SHADOW_ON); infobox.enableShadow(CC_SHADOW_ON);
timebox.enableFrame(true, 1); //NI timebox.enableFrame(true, 1);
timebox.setCorner(RADIUS_LARGE); timebox.setCorner(RADIUS_LARGE);
timebox.setColorAll(infobox.getColorFrame(), infobox.getColorBody()); timebox.setColorAll(infobox.getColorFrame(), infobox.getColorBody());
timebox.setTextColor(infobox.getTextColor()); timebox.setTextColor(infobox.getTextColor());
@@ -264,7 +262,7 @@ bool CUpnpBrowserGui::discoverDevices()
if (!m_devices.empty()) if (!m_devices.empty())
return true; return true;
CHintBox hintbox(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_UPNPBROWSER_SCANNING)); // UTF-8 CHintBox hintbox(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_UPNPBROWSER_SCANNING));
hintbox.paint(); hintbox.paint();
try try
@@ -542,7 +540,7 @@ void CUpnpBrowserGui::selectDevice()
return; return;
CAudioMute::getInstance()->enableMuteIcon(false); CAudioMute::getInstance()->enableMuteIcon(false);
CInfoIcons::getInstance()->enableInfoIcons(false); //NI InfoIcons CInfoIcons::getInstance()->enableInfoIcons(false);
while (loop) while (loop)
{ {
@@ -606,7 +604,6 @@ void CUpnpBrowserGui::selectDevice()
{ {
CNeutrinoApp::getInstance()->handleMsg(msg, data); CNeutrinoApp::getInstance()->handleMsg(msg, data);
} }
else if (msg > CRCInput::RC_MaxRC)
#endif #endif
else else
{ {
@@ -616,7 +613,7 @@ void CUpnpBrowserGui::selectDevice()
} }
} }
CAudioMute::getInstance()->enableMuteIcon(true); CAudioMute::getInstance()->enableMuteIcon(true);
CInfoIcons::getInstance()->enableInfoIcons(true); //NI InfoIcons CInfoIcons::getInstance()->enableInfoIcons(true);
} }
void CUpnpBrowserGui::playnext(void) void CUpnpBrowserGui::playnext(void)
@@ -1382,7 +1379,7 @@ void CUpnpBrowserGui::updateTimes(const bool force)
void CUpnpBrowserGui::updateMode() void CUpnpBrowserGui::updateMode()
{ {
/* switch back to mode_upnp if audio has stopped automatically */ // switch back to mode_upnp if audio has stopped automatically
if ((CAudioPlayer::getInstance()->getState() == CBaseDec::STOP) && (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_audio)) if ((CAudioPlayer::getInstance()->getState() == CBaseDec::STOP) && (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_audio))
{ {
CNeutrinoApp::getInstance()->handleMsg(NeutrinoMessages::CHANGEMODE, NeutrinoModes::mode_upnp | NeutrinoModes::norezap); CNeutrinoApp::getInstance()->handleMsg(NeutrinoMessages::CHANGEMODE, NeutrinoModes::mode_upnp | NeutrinoModes::norezap);