mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 07:23:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

lcd4l: add actionkey moviebrowser_moviecut

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

Origin message was:
------------------
- lcd4l: add actionkey moviebrowser_moviecut
This commit is contained in:
vanhofen
2024-01-02 22:29:38 +01:00
committed by Thilo Graf
parent d66076e116
commit 0086ea581c
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

@@ -379,7 +379,8 @@ void *CLCD4l::LCD4lProc(void *arg)
{ {
usleep(5 * 100 * 1000); // 0.5 sec usleep(5 * 100 * 1000); // 0.5 sec
new_ParseID = PLCD4l->CompareParseID(p_ParseID); 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; break;
} }
} }
@@ -753,8 +754,8 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun)
if (m_ActionKey == "moviebrowser") if (m_ActionKey == "moviebrowser")
{ {
g_PicViewer->GetLogoName(0, "Moviebrowser", Logo, &dummy, &dummy, CPictureViewer::LCD4LINUX, true);
Service = g_Locale->getText(LOCALE_MOVIEBROWSER_HEAD); Service = g_Locale->getText(LOCALE_MOVIEBROWSER_HEAD);
g_PicViewer->GetLogoName(0, "Moviebrowser", Logo, &dummy, &dummy, CPictureViewer::LCD4LINUX, true);
} }
else if (m_ModeChannel) else if (m_ModeChannel)
{ {
@@ -763,6 +764,15 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun)
else else
Service = g_RemoteControl->getCurrentChannelName(); 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); g_PicViewer->GetLogoName(parseID, Service, Logo, &dummy, &dummy, CPictureViewer::LCD4LINUX, true);
ChannelNr = CNeutrinoApp::getInstance()->channelList->getActiveChannelNumber(); ChannelNr = CNeutrinoApp::getInstance()->channelList->getActiveChannelNumber();
@@ -801,9 +811,8 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun)
} }
else if (parseID == NeutrinoModes::mode_avinput) else if (parseID == NeutrinoModes::mode_avinput)
{ {
//FIXME
Logo = ICONSDIR "/" NEUTRINO_ICON_PLAY ICONSEXT;
Service = g_Locale->getText(LOCALE_MAINMENU_AVINPUTMODE); Service = g_Locale->getText(LOCALE_MAINMENU_AVINPUTMODE);
Logo = ICONSDIR "/" NEUTRINO_ICON_PLAY ICONSEXT;
} }
else if (parseID == NeutrinoModes::mode_ts) else if (parseID == NeutrinoModes::mode_ts)
{ {
@@ -981,9 +990,9 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun)
bool writeEvent = true; 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; writeEvent = false;
} }
else if (m_ModeChannel) else if (m_ModeChannel)

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

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