From 2a21fb005e3388c719db7fc224732bccfe41c934 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 2 Jan 2024 21:16:56 +0100 Subject: [PATCH] moviebrowser: fix lcd4l handling Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/bddbd9fe9736b8a073ae5c9353e1c3985f8cb23b Author: vanhofen Date: 2024-01-02 (Tue, 02 Jan 2024) Origin message was: ------------------ - moviebrowser: fix lcd4l handling ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/moviebrowser/mb.cpp | 49 ++++++++++++++++++++++++++++++++++--- 1 file changed, 45 insertions(+), 4 deletions(-) diff --git a/src/gui/moviebrowser/mb.cpp b/src/gui/moviebrowser/mb.cpp index a6df12416..8d8757217 100644 --- a/src/gui/moviebrowser/mb.cpp +++ b/src/gui/moviebrowser/mb.cpp @@ -934,9 +934,20 @@ int CMovieBrowser::exec(CMenuTarget* parent, const std::string & actionKey) framebuffer->paintBackground(); // clear screen +#ifdef ENABLE_LCD4LINUX + if (g_settings.lcd4l_support) + CLCD4l::getInstance()->clearActionKey(); +#endif + + // TODO: signalize running action CMovieCut mc; bool res = mc.copyMovie(m_movieSelectionHandler, onefile); +#ifdef ENABLE_LCD4LINUX + if (g_settings.lcd4l_support) + CLCD4l::getInstance()->setActionKey("moviebrowser"); +#endif + //g_RCInput->clearRCMsg(); if (res == 0) ShowMsg(LOCALE_MESSAGEBOX_ERROR, LOCALE_MOVIEBROWSER_COPY_FAILED, CMsgBox::mbrCancel, CMsgBox::mbCancel, NEUTRINO_ICON_ERROR); @@ -961,9 +972,19 @@ int CMovieBrowser::exec(CMenuTarget* parent, const std::string & actionKey) framebuffer->paintBackground(); // clear screen +#ifdef ENABLE_LCD4LINUX + if (g_settings.lcd4l_support) + CLCD4l::getInstance()->clearActionKey(); +#endif + + // TODO: signalize running action CMovieCut mc; bool res = mc.cutMovie(m_movieSelectionHandler); +#ifdef ENABLE_LCD4LINUX + if (g_settings.lcd4l_support) + CLCD4l::getInstance()->setActionKey("moviebrowser"); +#endif //g_RCInput->clearRCMsg(); if (!res) ShowMsg(LOCALE_MESSAGEBOX_ERROR, LOCALE_MOVIEBROWSER_CUT_FAILED, CMsgBox::mbrCancel, CMsgBox::mbCancel, NEUTRINO_ICON_ERROR); @@ -991,9 +1012,20 @@ int CMovieBrowser::exec(CMenuTarget* parent, const std::string & actionKey) framebuffer->paintBackground(); // clear screen +#ifdef ENABLE_LCD4LINUX + if (g_settings.lcd4l_support) + CLCD4l::getInstance()->clearActionKey(); +#endif + + // TODO: signalize running action CMovieCut mc; bool res = mc.truncateMovie(m_movieSelectionHandler); +#ifdef ENABLE_LCD4LINUX + if (g_settings.lcd4l_support) + CLCD4l::getInstance()->setActionKey("moviebrowser"); +#endif + //g_RCInput->clearRCMsg(); if (!res) ShowMsg(LOCALE_MESSAGEBOX_ERROR, LOCALE_MOVIEBROWSER_TRUNCATE_FAILED, CMsgBox::mbrCancel, CMsgBox::mbCancel, NEUTRINO_ICON_ERROR); @@ -1065,6 +1097,7 @@ int CMovieBrowser::exec(const char* path) if (g_settings.lcd4l_support) CLCD4l::getInstance()->setActionKey("moviebrowser"); #endif + bool loop = true; bool result; int timeout = g_settings.timing[SNeutrinoSettings::TIMING_FILEBROWSER]; @@ -1161,6 +1194,7 @@ int CMovieBrowser::exec(const char* path) TRACE("[mb] force reload next time\n"); fileInfoStale(); } + #ifdef ENABLE_LCD4LINUX if (g_settings.lcd4l_support) CLCD4l::getInstance()->clearActionKey(); @@ -1613,14 +1647,21 @@ void CMovieBrowser::refreshHDDLevel(bool show) void CMovieBrowser::refreshLCD(void) { if (m_vMovieInfo.empty() || m_movieSelectionHandler == NULL) - return; - + { +#ifdef ENABLE_LCD4LINUX + if (g_settings.lcd4l_support) + CLCD4l::getInstance()->CreateEventFile("", g_settings.lcd4l_convert); +#endif + CVFD::getInstance()->showMenuText(0, "", -1, true); // UTF-8 + } + else + { #ifdef ENABLE_LCD4LINUX if (g_settings.lcd4l_support) CLCD4l::getInstance()->CreateEventFile(m_movieSelectionHandler->epgTitle.c_str(), g_settings.lcd4l_convert); #endif - - CVFD::getInstance()->showMenuText(0, m_movieSelectionHandler->epgTitle.c_str(), -1, true); // UTF-8 + CVFD::getInstance()->showMenuText(0, m_movieSelectionHandler->epgTitle.c_str(), -1, true); // UTF-8 + } } void CMovieBrowser::refreshFilterList(void)