mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 09:51:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

- upnpbrowser: formatting code using astyle; some manual code nicenings

Browse Source 
Conflicts:
	src/gui/upnpbrowser.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2021-12-06 05:18:19 +01:00
committed by Thilo Graf
parent 2381afcff2
commit 7665fcec9f
2 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
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/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>
@@ -261,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
@@ -602,7 +603,6 @@ void CUpnpBrowserGui::selectDevice()
{ {
CNeutrinoApp::getInstance()->handleMsg(msg, data); CNeutrinoApp::getInstance()->handleMsg(msg, data);
} }
else if (msg > CRCInput::RC_MaxRC)
#endif #endif
else else
{ {
@@ -612,6 +612,7 @@ void CUpnpBrowserGui::selectDevice()
} }
} }
CAudioMute::getInstance()->enableMuteIcon(true); CAudioMute::getInstance()->enableMuteIcon(true);
} }
void CUpnpBrowserGui::playnext(void) void CUpnpBrowserGui::playnext(void)
@@ -1377,7 +1378,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);