From 88f663520b7af78e6b73a89117334da07319853c Mon Sep 17 00:00:00 2001 From: max_10 Date: Fri, 3 Dec 2021 22:39:21 +0100 Subject: [PATCH] - remove old sh4 blit --- src/gui/dboxinfo.cpp | 3 --- src/gui/filebrowser.cpp | 2 -- src/gui/moviebrowser/mb.cpp | 2 -- src/gui/quadpip_setup.cpp | 1 - src/gui/streaminfo2.cpp | 3 --- src/gui/timeosd.cpp | 1 - src/gui/widget/keyboard_input.cpp | 1 - src/gui/widget/keychooser.cpp | 2 -- src/gui/widget/menue.cpp | 3 --- src/gui/widget/progresswindow.cpp | 1 - src/gui/widget/stringinput.cpp | 4 ---- src/gui/widget/stringinput_ext.cpp | 3 --- 12 files changed, 26 deletions(-) diff --git a/src/gui/dboxinfo.cpp b/src/gui/dboxinfo.cpp index 4eacbeb7b..3be090a43 100644 --- a/src/gui/dboxinfo.cpp +++ b/src/gui/dboxinfo.cpp @@ -98,7 +98,6 @@ int CDBoxInfoWidget::exec(CMenuTarget* parent, const std::string &) fader.StartFadeIn(); paint(); - frameBuffer->blit(); //int res = g_RCInput->messageLoop(); neutrino_msg_t msg; @@ -193,7 +192,6 @@ int CDBoxInfoWidget::exec(CMenuTarget* parent, const std::string &) } } } - frameBuffer->blit(); } hide(); @@ -206,7 +204,6 @@ void CDBoxInfoWidget::hide() { header->kill(); frameBuffer->paintBackgroundBoxRel(x,y, width,height); - frameBuffer->blit(); } static std::string bytes2string(uint64_t bytes, bool binary = true); diff --git a/src/gui/filebrowser.cpp b/src/gui/filebrowser.cpp index 9a2c98963..2441836ed 100644 --- a/src/gui/filebrowser.cpp +++ b/src/gui/filebrowser.cpp @@ -958,7 +958,6 @@ bool CFileBrowser::playlist_manager(CFileList &playlist, unsigned int playing, b bool loop=true; while (loop) { - frameBuffer->blit(); g_RCInput->getMsgAbsoluteTimeout( &msg, &data, &timeoutEnd ); neutrino_msg_t msg_repeatok = msg & ~CRCInput::RC_Repeat; @@ -1108,7 +1107,6 @@ bool CFileBrowser::playlist_manager(CFileList &playlist, unsigned int playing, b } hide(); - frameBuffer->blit(); playlist = filelist; diff --git a/src/gui/moviebrowser/mb.cpp b/src/gui/moviebrowser/mb.cpp index 165e5e707..1b32021b6 100644 --- a/src/gui/moviebrowser/mb.cpp +++ b/src/gui/moviebrowser/mb.cpp @@ -1102,7 +1102,6 @@ int CMovieBrowser::exec(const char* path) uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout); while (loop) { - framebuffer->blit(); g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd); result = onButtonPress(msg); @@ -1190,7 +1189,6 @@ int CMovieBrowser::exec(const char* path) timeoutEnd = CRCInput::calcTimeoutEnd(timeout); // calcualate next timeout } hide(); - framebuffer->blit(); //TRACE(" return %d\n",res); m_prevBrowserSelection = m_currentBrowserSelection; diff --git a/src/gui/quadpip_setup.cpp b/src/gui/quadpip_setup.cpp index 307601f7b..ba51ecbbf 100644 --- a/src/gui/quadpip_setup.cpp +++ b/src/gui/quadpip_setup.cpp @@ -382,7 +382,6 @@ int CQuadPiPSetupSelectChannelWidget::exec(CMenuTarget *parent, const std::strin bool loop = true; while (loop) { - frameBuffer->blit(); g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd, true); if (msg <= CRCInput::RC_MaxRC) diff --git a/src/gui/streaminfo2.cpp b/src/gui/streaminfo2.cpp index dd65cd294..a7bfe77c1 100644 --- a/src/gui/streaminfo2.cpp +++ b/src/gui/streaminfo2.cpp @@ -434,7 +434,6 @@ int CStreamInfo2::doSignalStrengthLoop() maxb = minb = lastb = tmp_rate = 0; bool repaint_bitrate = true; ts_setup(); - frameBuffer->blit(); neutrino_msg_data_t data = 0; uint64_t timeoutEnd = CRCInput::calcTimeoutEnd_MS(10); @@ -588,7 +587,6 @@ int CStreamInfo2::doSignalStrengthLoop() // -- push other events if (msg > CRCInput::RC_MaxRC && msg != CRCInput::RC_timeout) CNeutrinoApp::getInstance()->handleMsg(msg, data); - frameBuffer->blit(); } delete signalbox; signalbox = NULL; @@ -606,7 +604,6 @@ void CStreamInfo2::hide() { pip->hide(); frameBuffer->paintBackgroundBoxRel(0, 0, max_width, max_height); - frameBuffer->blit(); } void CStreamInfo2::paint_signal_fe_box(int _x, int _y, int w, int h) diff --git a/src/gui/timeosd.cpp b/src/gui/timeosd.cpp index 376916315..531b872b6 100644 --- a/src/gui/timeosd.cpp +++ b/src/gui/timeosd.cpp @@ -175,7 +175,6 @@ void CTimeOSD::kill() if (m_mode != MODE_HIDE) { KillAndResetTimescale(); CComponents::kill(); - frameBuffer->blit(); } } diff --git a/src/gui/widget/keyboard_input.cpp b/src/gui/widget/keyboard_input.cpp index 4f36e3c2a..40d8c3b01 100644 --- a/src/gui/widget/keyboard_input.cpp +++ b/src/gui/widget/keyboard_input.cpp @@ -574,7 +574,6 @@ int CKeyboardInput::exec(CMenuTarget* parent, const std::string &) frameBuffer->RestoreScreen(x, y, width + OFFSET_SHADOW, height + OFFSET_SHADOW, pixBuf); delete[] pixBuf; pixBuf = NULL; - frameBuffer->blit(); } else hide(); diff --git a/src/gui/widget/keychooser.cpp b/src/gui/widget/keychooser.cpp index 84f07fdba..3547e2566 100644 --- a/src/gui/widget/keychooser.cpp +++ b/src/gui/widget/keychooser.cpp @@ -76,8 +76,6 @@ int CKeyChooserItem::exec(CMenuTarget* parent, const std::string &) hintbox.setTimeOut(timeout, true); hintbox.paint(); - CFrameBuffer::getInstance()->blit(); - g_RCInput->clearRCMsg(); g_RCInput->setLongPressAny(true); diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index a2e28e9e1..8c7fb35d1 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -880,7 +880,6 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &) initSelectable(); paint(); - frameBuffer->blit(); int pos = selected; @@ -1135,7 +1134,6 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &) // recalculate timeout for RC-keys timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]); } - frameBuffer->blit(); } while ( msg!=CRCInput::RC_timeout ); hide(); @@ -1213,7 +1211,6 @@ void CMenuWidget::hide() //paintHint(-1); } paintHint(-1); - frameBuffer->blit(); /* setActive() paints item for hidden parent menu, if called from child menu */ for (unsigned int count = 0; count < items.size(); count++) diff --git a/src/gui/widget/progresswindow.cpp b/src/gui/widget/progresswindow.cpp index cdd34195e..4765e24ff 100644 --- a/src/gui/widget/progresswindow.cpp +++ b/src/gui/widget/progresswindow.cpp @@ -144,7 +144,6 @@ void CProgressWindow::initStatus(const unsigned int prog, const unsigned int max cur_statusText = statusText; } pBar->paint(false); - frameBuffer->blit(); } void CProgressWindow::showStatus(const unsigned int prog, const unsigned int max, const string &statusText) diff --git a/src/gui/widget/stringinput.cpp b/src/gui/widget/stringinput.cpp index fed248c07..4fe90683e 100644 --- a/src/gui/widget/stringinput.cpp +++ b/src/gui/widget/stringinput.cpp @@ -408,7 +408,6 @@ int CStringInput::exec( CMenuTarget* parent, const std::string & ) bool loop=true; while (loop) { - frameBuffer->blit(); if (*valueString != dispval) { CVFD::getInstance()->showMenuText(1,valueString->c_str() , selected+1); @@ -528,7 +527,6 @@ int CStringInput::exec( CMenuTarget* parent, const std::string & ) frameBuffer->RestoreScreen(x, y, width + OFFSET_SHADOW, height + OFFSET_SHADOW, pixBuf); delete[] pixBuf; pixBuf = NULL; - frameBuffer->blit(); } else hide(); @@ -552,7 +550,6 @@ int CStringInput::handleOthers(const neutrino_msg_t /*msg*/, const neutrino_msg_ void CStringInput::hide() { frameBuffer->paintBackgroundBoxRel(x, y, width + OFFSET_SHADOW, height + OFFSET_SHADOW); - frameBuffer->blit(); } void CStringInput::paint(bool sms) @@ -804,7 +801,6 @@ int CPINInput::exec( CMenuTarget* parent, const std::string & ) while(loop) { - frameBuffer->blit(); g_RCInput->getMsg( &msg, &data, 300 ); if (msg==CRCInput::RC_left) diff --git a/src/gui/widget/stringinput_ext.cpp b/src/gui/widget/stringinput_ext.cpp index a9a665e65..6bc82b47d 100644 --- a/src/gui/widget/stringinput_ext.cpp +++ b/src/gui/widget/stringinput_ext.cpp @@ -186,7 +186,6 @@ int CExtendedInput::exec( CMenuTarget* parent, const std::string & ) if (savescreen) saveScreen(); paint(); - frameBuffer->blit(); uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]); @@ -311,7 +310,6 @@ int CExtendedInput::exec( CMenuTarget* parent, const std::string & ) *cancel = true; res = menu_return::RETURN_EXIT_ALL; } - frameBuffer->blit(); } hide(); @@ -336,7 +334,6 @@ void CExtendedInput::hide() restoreScreen(); else frameBuffer->paintBackgroundBoxRel(x, y, width, height); - frameBuffer->blit(); } void CExtendedInput::paint()