mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-31 17:31:20 +02:00
- user_menu: add item to start timeshift immediately
Conflicts: src/system/settings.h Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
@@ -285,6 +285,15 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
|
|||||||
// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
|
// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
|
||||||
break;
|
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:
|
case SNeutrinoSettings::ITEM_MOVIEPLAYER_MB:
|
||||||
{
|
{
|
||||||
if (g_settings.recording_type == RECORDING_OFF)
|
if (g_settings.recording_type == RECORDING_OFF)
|
||||||
|
@@ -102,6 +102,7 @@ static keyvals usermenu_items[] =
|
|||||||
{ SNeutrinoSettings::ITEM_LIVESTREAM_RESOLUTION,LOCALE_LIVESTREAM_RESOLUTION, usermenu_show },
|
{ SNeutrinoSettings::ITEM_LIVESTREAM_RESOLUTION,LOCALE_LIVESTREAM_RESOLUTION, usermenu_show },
|
||||||
{ SNeutrinoSettings::ITEM_ADZAP, LOCALE_USERMENU_ITEM_ADZAP, usermenu_show },
|
{ SNeutrinoSettings::ITEM_ADZAP, LOCALE_USERMENU_ITEM_ADZAP, usermenu_show },
|
||||||
{ SNeutrinoSettings::ITEM_FILEPLAY_AUDIO, LOCALE_MOVIEPLAYER_FILEPLAYBACK_AUDIO, 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 }
|
{ SNeutrinoSettings::ITEM_MAX, NONEXISTANT_LOCALE, usermenu_show }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -868,6 +868,7 @@ struct SNeutrinoSettings
|
|||||||
ITEM_LIVESTREAM_RESOLUTION = 32,
|
ITEM_LIVESTREAM_RESOLUTION = 32,
|
||||||
ITEM_ADZAP = 33,
|
ITEM_ADZAP = 33,
|
||||||
ITEM_FILEPLAY_AUDIO = 34,
|
ITEM_FILEPLAY_AUDIO = 34,
|
||||||
|
ITEM_TIMESHIFT = 35,
|
||||||
ITEM_MAX // MUST be always the last in the list
|
ITEM_MAX // MUST be always the last in the list
|
||||||
} USER_ITEM;
|
} USER_ITEM;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user