From 7665fcec9fe8a3ba80c6f23cd601af9a988c8540 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Mon, 6 Dec 2021 05:18:19 +0100 Subject: [PATCH] - upnpbrowser: formatting code using astyle; some manual code nicenings Conflicts: src/gui/upnpbrowser.cpp Signed-off-by: Thilo Graf --- src/gui/upnpbrowser.cpp | 37 +++++++++++++++++++------------------ src/gui/upnpbrowser.h | 4 ++-- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/src/gui/upnpbrowser.cpp b/src/gui/upnpbrowser.cpp index a986efca9..a00782642 100644 --- a/src/gui/upnpbrowser.cpp +++ b/src/gui/upnpbrowser.cpp @@ -44,6 +44,7 @@ #include #include + #include #include #include @@ -65,7 +66,7 @@ const struct button_label BrowseButtons[] = { NEUTRINO_ICON_BUTTON_GREEN, LOCALE_FILEBROWSER_PREVPAGE }, { NEUTRINO_ICON_BUTTON_YELLOW, LOCALE_AUDIOPLAYER_STOP }, { NEUTRINO_ICON_BUTTON_OKAY, LOCALE_AUDIOPLAYER_PLAY }, - { NEUTRINO_ICON_BUTTON_HOME, LOCALE_MENU_BACK, } + { NEUTRINO_ICON_BUTTON_HOME, LOCALE_MENU_BACK, } }; CUpnpBrowserGui::CUpnpBrowserGui() @@ -253,7 +254,7 @@ void CUpnpBrowserGui::splitProtocol(std::string &protocol, std::string &prot, st } } } -//printf("%s -> %s - %s - %s - %s\n", protocol.c_str(), prot.c_str(), network.c_str(), mime.c_str(), additional.c_str()); + //printf("%s -> %s - %s - %s - %s\n", protocol.c_str(), prot.c_str(), network.c_str(), mime.c_str(), additional.c_str()); } bool CUpnpBrowserGui::discoverDevices() @@ -261,7 +262,7 @@ bool CUpnpBrowserGui::discoverDevices() if (!m_devices.empty()) 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(); try @@ -313,7 +314,7 @@ bool CUpnpBrowserGui::getResults(std::string id, unsigned int start, unsigned in std::vector *CUpnpBrowserGui::decodeResult(std::string result) { - xmlNodePtr root, node, snode; + xmlNodePtr root, node, snode; xmlDocPtr parser = parseXml(result.c_str(), "UTF-8"); root = xmlDocGetRootElement(parser); if (!root) @@ -532,7 +533,7 @@ void CUpnpBrowserGui::selectDevice() { bool loop = true; bool refresh = true; - neutrino_msg_t msg; + neutrino_msg_t msg; neutrino_msg_data_t data; if (!discoverDevices()) @@ -602,7 +603,6 @@ void CUpnpBrowserGui::selectDevice() { CNeutrinoApp::getInstance()->handleMsg(msg, data); } - else if (msg > CRCInput::RC_MaxRC) #endif else { @@ -612,6 +612,7 @@ void CUpnpBrowserGui::selectDevice() } } CAudioMute::getInstance()->enableMuteIcon(true); + } void CUpnpBrowserGui::playnext(void) @@ -687,7 +688,7 @@ void CUpnpBrowserGui::playnext(void) delete entries; entries = NULL; } - neutrino_msg_t msg; + neutrino_msg_t msg; neutrino_msg_data_t data; g_RCInput->getMsg(&msg, &data, 10); // 1 sec timeout to update play/stop state display @@ -706,7 +707,7 @@ void CUpnpBrowserGui::playnext(void) m_frameBuffer->Clear(); } -bool CUpnpBrowserGui::getItems(std::string id, unsigned int index, std::vector*&entries, unsigned int &total) +bool CUpnpBrowserGui::getItems(std::string id, unsigned int index, std::vector *&entries, unsigned int &total) { bool tfound = false; bool rfound = false; @@ -752,7 +753,7 @@ bool CUpnpBrowserGui::getItems(std::string id, unsigned int index, std::vector*&entries, int newpos, unsigned int &selected, unsigned int &liststart) +bool CUpnpBrowserGui::updateItemSelection(std::string id, std::vector *&entries, int newpos, unsigned int &selected, unsigned int &liststart) { if ((int) selected != newpos) { @@ -783,7 +784,7 @@ bool CUpnpBrowserGui::selectItem(std::string id) bool loop = true; bool endall = false; bool refresh = true; - neutrino_msg_t msg; + neutrino_msg_t msg; neutrino_msg_data_t data; std::vector *entries = NULL; @@ -835,7 +836,7 @@ bool CUpnpBrowserGui::selectItem(std::string id) } else if (!timeout && (msg_repeatok == CRCInput::RC_up || (int) msg == g_settings.key_pageup)) { - int step = ((int) msg == g_settings.key_pageup) ? m_listmaxshow : 1; // browse or step 1 + int step = ((int) msg == g_settings.key_pageup) ? m_listmaxshow : 1; // browse or step 1 int new_selected = selected - step; if (new_selected < 0) { @@ -848,7 +849,7 @@ bool CUpnpBrowserGui::selectItem(std::string id) } else if (!timeout && (msg_repeatok == CRCInput::RC_down || (int) msg == g_settings.key_pagedown)) { - int step = ((int) msg == g_settings.key_pagedown) ? m_listmaxshow : 1; // browse or step 1 + int step = ((int) msg == g_settings.key_pagedown) ? m_listmaxshow : 1; // browse or step 1 int new_selected = selected + step; if (new_selected >= (int) total) { @@ -1080,7 +1081,7 @@ void CUpnpBrowserGui::paintDevices() // Head CComponentsHeader header(m_x, m_header_y, m_width, m_header_height, LOCALE_UPNPBROWSER_HEAD, NEUTRINO_ICON_UPNP); header.enableShadow(CC_SHADOW_RIGHT | CC_SHADOW_CORNER_TOP_RIGHT | CC_SHADOW_CORNER_BOTTOM_RIGHT, -1, true); - if (CNeutrinoApp::getInstance()->isMuted()) //TODO: consider mute mode on runtime + if (CNeutrinoApp::getInstance()->isMuted()) // TODO: consider mute mode on runtime header.addContextButton(NEUTRINO_ICON_BUTTON_MUTE_SMALL); else header.removeContextButtons(); @@ -1208,7 +1209,7 @@ void CUpnpBrowserGui::paintItemInfo(UPnPEntry *entry) } tmp += "\n"; - //third line + // third line if (!entry->isdir && preferred != -1) tmp += "URL: " + entry->resources[preferred].url; @@ -1247,7 +1248,7 @@ void CUpnpBrowserGui::paintItems(std::vector *entry, unsigned int sel { printf("CUpnpBrowserGui::paintItem:s selected %d max %d offset %d\n", selected, max, offset); - //block infoclock + // block infoclock CInfoClock::getInstance()->block(); // LCD @@ -1266,7 +1267,7 @@ void CUpnpBrowserGui::paintItems(std::vector *entry, unsigned int sel for (unsigned int count = 0; count < m_listmaxshow; count++) paintItem(entry, count, selected); - //scrollbar + // scrollbar int total_pages; int current_page; getScrollBarData(&total_pages, ¤t_page, max + offset, m_listmaxshow, selected + offset); @@ -1339,7 +1340,7 @@ void CUpnpBrowserGui::paintItem2DetailsLine(int pos) return; } - int xpos = m_x - DETAILSLINE_WIDTH; + int xpos = m_x - DETAILSLINE_WIDTH; int ypos1 = m_item_y + pos * m_item_height; int ypos2 = infobox.getYPos() + infobox.getHeight() - infobox.getHeight() / 2; @@ -1377,7 +1378,7 @@ void CUpnpBrowserGui::updateTimes(const bool force) 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)) { CNeutrinoApp::getInstance()->handleMsg(NeutrinoMessages::CHANGEMODE, NeutrinoModes::mode_upnp | NeutrinoModes::norezap); diff --git a/src/gui/upnpbrowser.h b/src/gui/upnpbrowser.h index 19d4f1b3c..fb2047140 100644 --- a/src/gui/upnpbrowser.h +++ b/src/gui/upnpbrowser.h @@ -116,8 +116,8 @@ class CUpnpBrowserGui : public CMenuTarget, public CListHelpers void paintDeviceInfo(); void playnext(); - bool getItems(std::string id, unsigned int index, std::vector*&entries, unsigned int &total); - bool updateItemSelection(std::string id, std::vector*&entries, int newpos, unsigned int &selected, unsigned int &liststart); + bool getItems(std::string id, unsigned int index, std::vector *&entries, unsigned int &total); + bool updateItemSelection(std::string id, std::vector *&entries, int newpos, unsigned int &selected, unsigned int &liststart); bool selectItem(std::string); void paintItems(std::vector *entry, unsigned int selected, unsigned int max, unsigned int offset); void paintItem(std::vector *entry, unsigned int pos, unsigned int selected);