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

moviebrowser: fix lcd4l handling

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: bddbd9fe97
Author: vanhofen <vanhofen@gmx.de>
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
This commit is contained in:
vanhofen
2024-01-02 21:16:56 +01:00
parent b0321a7384
commit 2a21fb005e
1 changed files with 45 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/gui/moviebrowser/mb.cpp
View File

@@ -934,9 +934,20 @@ int CMovieBrowser::exec(CMenuTarget* parent, const std::string & actionKey)
framebuffer->paintBackground(); // clear screen framebuffer->paintBackground(); // clear screen
#ifdef ENABLE_LCD4LINUX
if (g_settings.lcd4l_support)
CLCD4l::getInstance()->clearActionKey();
#endif
// TODO: signalize running action
CMovieCut mc; CMovieCut mc;
bool res = mc.copyMovie(m_movieSelectionHandler, onefile); bool res = mc.copyMovie(m_movieSelectionHandler, onefile);
#ifdef ENABLE_LCD4LINUX
if (g_settings.lcd4l_support)
CLCD4l::getInstance()->setActionKey("moviebrowser");
#endif
//g_RCInput->clearRCMsg(); //g_RCInput->clearRCMsg();
if (res == 0) if (res == 0)
ShowMsg(LOCALE_MESSAGEBOX_ERROR, LOCALE_MOVIEBROWSER_COPY_FAILED, CMsgBox::mbrCancel, CMsgBox::mbCancel, NEUTRINO_ICON_ERROR); 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 framebuffer->paintBackground(); // clear screen
#ifdef ENABLE_LCD4LINUX
if (g_settings.lcd4l_support)
CLCD4l::getInstance()->clearActionKey();
#endif
// TODO: signalize running action
CMovieCut mc; CMovieCut mc;
bool res = mc.cutMovie(m_movieSelectionHandler); bool res = mc.cutMovie(m_movieSelectionHandler);
#ifdef ENABLE_LCD4LINUX
if (g_settings.lcd4l_support)
CLCD4l::getInstance()->setActionKey("moviebrowser");
#endif
//g_RCInput->clearRCMsg(); //g_RCInput->clearRCMsg();
if (!res) if (!res)
ShowMsg(LOCALE_MESSAGEBOX_ERROR, LOCALE_MOVIEBROWSER_CUT_FAILED, CMsgBox::mbrCancel, CMsgBox::mbCancel, NEUTRINO_ICON_ERROR); 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 framebuffer->paintBackground(); // clear screen
#ifdef ENABLE_LCD4LINUX
if (g_settings.lcd4l_support)
CLCD4l::getInstance()->clearActionKey();
#endif
// TODO: signalize running action
CMovieCut mc; CMovieCut mc;
bool res = mc.truncateMovie(m_movieSelectionHandler); bool res = mc.truncateMovie(m_movieSelectionHandler);
#ifdef ENABLE_LCD4LINUX
if (g_settings.lcd4l_support)
CLCD4l::getInstance()->setActionKey("moviebrowser");
#endif
//g_RCInput->clearRCMsg(); //g_RCInput->clearRCMsg();
if (!res) if (!res)
ShowMsg(LOCALE_MESSAGEBOX_ERROR, LOCALE_MOVIEBROWSER_TRUNCATE_FAILED, CMsgBox::mbrCancel, CMsgBox::mbCancel, NEUTRINO_ICON_ERROR); 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) if (g_settings.lcd4l_support)
CLCD4l::getInstance()->setActionKey("moviebrowser"); CLCD4l::getInstance()->setActionKey("moviebrowser");
#endif #endif
bool loop = true; bool loop = true;
bool result; bool result;
int timeout = g_settings.timing[SNeutrinoSettings::TIMING_FILEBROWSER]; 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"); TRACE("[mb] force reload next time\n");
fileInfoStale(); fileInfoStale();
} }
#ifdef ENABLE_LCD4LINUX #ifdef ENABLE_LCD4LINUX
if (g_settings.lcd4l_support) if (g_settings.lcd4l_support)
CLCD4l::getInstance()->clearActionKey(); CLCD4l::getInstance()->clearActionKey();
@@ -1613,14 +1647,21 @@ void CMovieBrowser::refreshHDDLevel(bool show)
void CMovieBrowser::refreshLCD(void) void CMovieBrowser::refreshLCD(void)
{ {
if (m_vMovieInfo.empty() || m_movieSelectionHandler == NULL) 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 #ifdef ENABLE_LCD4LINUX
if (g_settings.lcd4l_support) if (g_settings.lcd4l_support)
CLCD4l::getInstance()->CreateEventFile(m_movieSelectionHandler->epgTitle.c_str(), g_settings.lcd4l_convert); CLCD4l::getInstance()->CreateEventFile(m_movieSelectionHandler->epgTitle.c_str(), g_settings.lcd4l_convert);
#endif #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) void CMovieBrowser::refreshFilterList(void)