From ac9f00f0d360a82879c843466545c24010b1c489 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 2 Aug 2018 21:39:17 +0200 Subject: [PATCH] menu: add condition to enable/disable items in record mode Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/5bc33322c87f26193a0194d36801935e0d392f10 Author: vanhofen Date: 2018-08-02 (Thu, 02 Aug 2018) Origin message was: ------------------ - menu: add condition to enable/disable items in record mode ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/widget/menue.cpp | 7 +++++++ src/gui/widget/menue.h | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index c56a60521..a404ed10c 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -42,6 +42,7 @@ #include #include +#include #include #include @@ -133,6 +134,7 @@ bool CMenuItem::initModeCondition(const int& stb_mode) void CMenuItem::disableByCondition(const menu_item_disable_cond_t& condition) { int stb_mode = CNeutrinoApp::getInstance()->getMode(); + int rec_mode = CRecordManager::getInstance()->GetRecordMode(); if (condition & DCOND_MODE_TS){ if (stb_mode == NeutrinoModes::mode_ts) @@ -149,6 +151,11 @@ void CMenuItem::disableByCondition(const menu_item_disable_cond_t& condition) if (initModeCondition(stb_mode)) return; } + if (condition & DCOND_MODE_REC){ + if (rec_mode & CRecordManager::RECMODE_REC) + if (initModeCondition(rec_mode)) + return; + } active = current_active; diff --git a/src/gui/widget/menue.h b/src/gui/widget/menue.h index 154f949f4..3ffde1b93 100644 --- a/src/gui/widget/menue.h +++ b/src/gui/widget/menue.h @@ -78,7 +78,8 @@ enum DCOND_MODE_TV = 2, DCOND_MODE_RADIO = 4, - DCOND_MODE_TS = 8 + DCOND_MODE_TS = 8, + DCOND_MODE_REC = 16 }/*menu_item_disable_cond_t*/; class CChangeObserver