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

lcd4l: add actionkey moviebrowser_moviecut

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 97cebad4ef
Author: vanhofen <vanhofen@gmx.de>
Date: 2024-01-02 (Tue, 02 Jan 2024)

Origin message was:
------------------
- lcd4l: add actionkey moviebrowser_moviecut

------------------
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 22:29:38 +01:00
parent 2a21fb005e
commit ca90c81128
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/driver/lcd4l.cpp
View File

@@ -376,7 +376,8 @@ void *CLCD4l::LCD4lProc(void *arg)
{
usleep(5 * 100 * 1000); // 0.5 sec
new_ParseID = PLCD4l->CompareParseID(p_ParseID);
if (new_ParseID || p_ParseID == NeutrinoModes::mode_audio || !PLCD4l->m_ActionKey.empty()) {
if (new_ParseID || p_ParseID == NeutrinoModes::mode_audio || !PLCD4l->m_ActionKey.empty())
{
break;
}
}
@@ -749,8 +750,8 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun)
if (m_ActionKey == "moviebrowser")
{
g_PicViewer->GetLogoName(0, "Moviebrowser", Logo, &dummy, &dummy, CPictureViewer::LCD4LINUX, true);
Service = g_Locale->getText(LOCALE_MOVIEBROWSER_HEAD);
g_PicViewer->GetLogoName(0, "Moviebrowser", Logo, &dummy, &dummy, CPictureViewer::LCD4LINUX, true);
}
else if (m_ModeChannel)
{
@@ -759,6 +760,15 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun)
else
Service = g_RemoteControl->getCurrentChannelName();
/*
"moviebrowser_moviecut" is special.
It signals the active moviebrowser with the moviebrowser logo,
but handles the rest of the lcd as in tv/radio mode.
*/
if (m_ActionKey == "moviebrowser_moviecut")
g_PicViewer->GetLogoName(0, "Moviebrowser", Logo, &dummy, &dummy, CPictureViewer::LCD4LINUX, true);
else
g_PicViewer->GetLogoName(parseID, Service, Logo, &dummy, &dummy, CPictureViewer::LCD4LINUX, true);
ChannelNr = CNeutrinoApp::getInstance()->channelList->getActiveChannelNumber();
@@ -797,9 +807,8 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun)
}
else if (parseID == NeutrinoModes::mode_avinput)
{
//FIXME
Logo = ICONSDIR "/" NEUTRINO_ICON_PLAY ICONSEXT;
Service = g_Locale->getText(LOCALE_MAINMENU_AVINPUTMODE);
Logo = ICONSDIR "/" NEUTRINO_ICON_PLAY ICONSEXT;
}
else if (parseID == NeutrinoModes::mode_ts)
{
@@ -973,9 +982,9 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun)
bool writeEvent = true;
if (!m_ActionKey.empty())
if (m_ActionKey == "moviebrowser")
{
// do nothing; Event is processed in moviebrowser or other windows
// do nothing; Event is processed in moviebrowser
writeEvent = false;
}
else if (m_ModeChannel)

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

@@ -936,10 +936,9 @@ int CMovieBrowser::exec(CMenuTarget* parent, const std::string & actionKey)
#ifdef ENABLE_LCD4LINUX
if (g_settings.lcd4l_support)
CLCD4l::getInstance()->clearActionKey();
CLCD4l::getInstance()->setActionKey("moviebrowser_moviecut");
#endif
// TODO: signalize running action
CMovieCut mc;
bool res = mc.copyMovie(m_movieSelectionHandler, onefile);
@@ -974,10 +973,9 @@ int CMovieBrowser::exec(CMenuTarget* parent, const std::string & actionKey)
#ifdef ENABLE_LCD4LINUX
if (g_settings.lcd4l_support)
CLCD4l::getInstance()->clearActionKey();
CLCD4l::getInstance()->setActionKey("moviebrowser_moviecut");
#endif
// TODO: signalize running action
CMovieCut mc;
bool res = mc.cutMovie(m_movieSelectionHandler);
@@ -1014,10 +1012,9 @@ int CMovieBrowser::exec(CMenuTarget* parent, const std::string & actionKey)
#ifdef ENABLE_LCD4LINUX
if (g_settings.lcd4l_support)
CLCD4l::getInstance()->clearActionKey();
CLCD4l::getInstance()->setActionKey("moviebrowser_moviecut");
#endif
// TODO: signalize running action
CMovieCut mc;
bool res = mc.truncateMovie(m_movieSelectionHandler);