From 3d6d5e233b147b9900074be9abfa81495ecf85d5 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Mon, 15 Jan 2018 22:34:16 +0100 Subject: [PATCH] - user_menu: add item to start timeshift immediately Conflicts: src/system/settings.h Signed-off-by: Thilo Graf --- src/gui/user_menue.cpp | 9 +++++++++ src/gui/user_menue_setup.cpp | 1 + src/system/settings.h | 1 + 3 files changed, 11 insertions(+) diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp index bc0201807..c271493aa 100644 --- a/src/gui/user_menue.cpp +++ b/src/gui/user_menue.cpp @@ -285,6 +285,15 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg) // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); break; } + case SNeutrinoSettings::ITEM_TIMESHIFT: + { + if (g_settings.recording_type == RECORDING_OFF) + break; + keyhelper.get(&key,&icon,CRCInput::RC_red); + menu_item = new CMenuForwarder(LOCALE_RECORDINGMENU_TIMESHIFT, true, NULL, CRecordManager::getInstance(), "Timeshift", key, icon); + // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); + break; + } case SNeutrinoSettings::ITEM_MOVIEPLAYER_MB: { if (g_settings.recording_type == RECORDING_OFF) diff --git a/src/gui/user_menue_setup.cpp b/src/gui/user_menue_setup.cpp index 6b47158a9..8125d67dd 100644 --- a/src/gui/user_menue_setup.cpp +++ b/src/gui/user_menue_setup.cpp @@ -102,6 +102,7 @@ static keyvals usermenu_items[] = { SNeutrinoSettings::ITEM_LIVESTREAM_RESOLUTION,LOCALE_LIVESTREAM_RESOLUTION, usermenu_show }, { SNeutrinoSettings::ITEM_ADZAP, LOCALE_USERMENU_ITEM_ADZAP, usermenu_show }, { SNeutrinoSettings::ITEM_FILEPLAY_AUDIO, LOCALE_MOVIEPLAYER_FILEPLAYBACK_AUDIO, usermenu_show }, + { SNeutrinoSettings::ITEM_TIMESHIFT, LOCALE_RECORDINGMENU_TIMESHIFT, usermenu_show }, { SNeutrinoSettings::ITEM_MAX, NONEXISTANT_LOCALE, usermenu_show } }; diff --git a/src/system/settings.h b/src/system/settings.h index 1fe6fe5bd..707d8984b 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -868,6 +868,7 @@ struct SNeutrinoSettings ITEM_LIVESTREAM_RESOLUTION = 32, ITEM_ADZAP = 33, ITEM_FILEPLAY_AUDIO = 34, + ITEM_TIMESHIFT = 35, ITEM_MAX // MUST be always the last in the list } USER_ITEM;