mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-15 01:13:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

- moviebrowser: restore last mode to allow tv/radio while copying, cutting and truncating

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2022-09-17 22:33:29 +02:00
committed by Thilo Graf
parent edea36b9b4
commit 4440ec9f97
1 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -978,8 +978,18 @@ int CMovieBrowser::exec(CMenuTarget* parent, const std::string & actionKey)
hintBox.hide(); hintBox.hide();
framebuffer->paintBackground(); // clear screen framebuffer->paintBackground(); // clear screen
// restore last mode to allow tv/radio while copying
CNeutrinoApp::getInstance()->handleMsg(NeutrinoMessages::CHANGEMODE, m_LastMode);
// TODO: signalize running action
CMovieCut mc; CMovieCut mc;
bool res = mc.copyMovie(m_movieSelectionHandler, onefile); bool res = mc.copyMovie(m_movieSelectionHandler, onefile);
// tell neutrino we're in moviebrowser mode again
m_LastMode = CNeutrinoApp::getInstance()->getMode();
CNeutrinoApp::getInstance()->handleMsg(NeutrinoMessages::CHANGEMODE, NeutrinoModes::mode_moviebrowser | NeutrinoModes::norezap);
//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);
@@ -1003,8 +1013,18 @@ int CMovieBrowser::exec(CMenuTarget* parent, const std::string & actionKey)
hintBox.hide(); hintBox.hide();
framebuffer->paintBackground(); // clear screen framebuffer->paintBackground(); // clear screen
// restore last mode to allow tv/radio while cutting
CNeutrinoApp::getInstance()->handleMsg(NeutrinoMessages::CHANGEMODE, m_LastMode);
// TODO: signalize running action
CMovieCut mc; CMovieCut mc;
bool res = mc.cutMovie(m_movieSelectionHandler); bool res = mc.cutMovie(m_movieSelectionHandler);
// tell neutrino we're in moviebrowser mode again
m_LastMode = CNeutrinoApp::getInstance()->getMode();
CNeutrinoApp::getInstance()->handleMsg(NeutrinoMessages::CHANGEMODE, NeutrinoModes::mode_moviebrowser | NeutrinoModes::norezap);
//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);
@@ -1027,11 +1047,23 @@ int CMovieBrowser::exec(CMenuTarget* parent, const std::string & actionKey)
{ {
CHintBox hintBox(LOCALE_MESSAGEBOX_INFO, LOCALE_MOVIEBROWSER_TRUNCATING); CHintBox hintBox(LOCALE_MESSAGEBOX_INFO, LOCALE_MOVIEBROWSER_TRUNCATING);
hintBox.paint(); hintBox.paint();
CMovieCut mc; sleep(1); //???
bool res = mc.truncateMovie(m_movieSelectionHandler);
hintBox.hide(); hintBox.hide();
g_RCInput->clearRCMsg(); framebuffer->paintBackground(); // clear screen
// restore last mode to allow tv/radio while truncating
CNeutrinoApp::getInstance()->handleMsg(NeutrinoMessages::CHANGEMODE, m_LastMode);
// TODO: signalize running action
CMovieCut mc;
bool res = mc.truncateMovie(m_movieSelectionHandler);
// tell neutrino we're in moviebrowser mode again
m_LastMode = CNeutrinoApp::getInstance()->getMode();
CNeutrinoApp::getInstance()->handleMsg(NeutrinoMessages::CHANGEMODE, NeutrinoModes::mode_moviebrowser | NeutrinoModes::norezap);
//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);
else else