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

Revert "- menu: add condition to enable/disable items in record mode"

Browse Source 
This reverts commit 76c6584341.
Doesn't work with current disableByCondition-code. This needs more care.


Origin commit data
------------------
Commit: 2154812c84
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-08-02 (Thu, 02 Aug 2018)
This commit is contained in:
vanhofen
2018-08-02 22:00:54 +02:00
parent 0199f5801d
commit 47eb835d7f
3 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/widget/menue.cpp
View File

@@ -42,7 +42,6 @@
#include <driver/fade.h> #include <driver/fade.h>
#include <driver/display.h> #include <driver/display.h>
#include <driver/record.h>
#include <system/helpers.h> #include <system/helpers.h>
#include <cctype> #include <cctype>
@@ -134,7 +133,6 @@ bool CMenuItem::initModeCondition(const int& stb_mode)
void CMenuItem::disableByCondition(const menu_item_disable_cond_t& condition) void CMenuItem::disableByCondition(const menu_item_disable_cond_t& condition)
{ {
int stb_mode = CNeutrinoApp::getInstance()->getMode(); int stb_mode = CNeutrinoApp::getInstance()->getMode();
int rec_mode = CRecordManager::getInstance()->GetRecordMode();
if (condition & DCOND_MODE_TS){ if (condition & DCOND_MODE_TS){
if (stb_mode == NeutrinoModes::mode_ts) if (stb_mode == NeutrinoModes::mode_ts)
@@ -151,11 +149,6 @@ void CMenuItem::disableByCondition(const menu_item_disable_cond_t& condition)
if (initModeCondition(stb_mode)) if (initModeCondition(stb_mode))
return; return;
} }
if (condition & DCOND_MODE_REC){
if (rec_mode & CRecordManager::RECMODE_REC)
if (initModeCondition(rec_mode))
return;
}
active = current_active; active = current_active;

3
src/gui/widget/menue.h
View File

@@ -78,8 +78,7 @@ enum
DCOND_MODE_TV = 2, DCOND_MODE_TV = 2,
DCOND_MODE_RADIO = 4, DCOND_MODE_RADIO = 4,
DCOND_MODE_TS = 8, DCOND_MODE_TS = 8
DCOND_MODE_REC = 16
}/*menu_item_disable_cond_t*/; }/*menu_item_disable_cond_t*/;
class CChangeObserver class CChangeObserver

2
src/neutrino_menue.cpp
View File

@@ -439,7 +439,7 @@ void CNeutrinoApp::InitMenuService()
mf = new CMenuForwarder(LOCALE_CAMD_CONTROL, true, NULL, new CCamdControlMenu(), NULL); mf = new CMenuForwarder(LOCALE_CAMD_CONTROL, true, NULL, new CCamdControlMenu(), NULL);
mf->setHint(NEUTRINO_ICON_HINT_IMAGELOGO, LOCALE_MENU_HINT_CAMD_CONTROL); mf->setHint(NEUTRINO_ICON_HINT_IMAGELOGO, LOCALE_MENU_HINT_CAMD_CONTROL);
personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_CAMD_CONTROL], false, CPersonalizeGui::PERSONALIZE_SHOW_AS_ITEM_OPTION, NULL, DCOND_MODE_REC); personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_CAMD_CONTROL]);
personalize.addSeparator(MENU_SERVICE); personalize.addSeparator(MENU_SERVICE);
//restart neutrino //restart neutrino