From fb2d6f95e83f1ed808759d5a434f80be63a1755b Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Tue, 19 Dec 2017 12:46:04 +0100 Subject: [PATCH] - user-menu: add audio fileplay item Conflicts: src/gui/user_menue_setup.cpp src/system/settings.h Signed-off-by: Thilo Graf --- src/gui/user_menue.cpp | 7 +++++++ src/gui/user_menue_setup.cpp | 1 + src/system/settings.h | 1 + 3 files changed, 9 insertions(+) diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp index 3d0b1b1e8..7a6af6697 100644 --- a/src/gui/user_menue.cpp +++ b/src/gui/user_menue.cpp @@ -419,6 +419,13 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg) menu_item->setHint(NEUTRINO_ICON_HINT_FILEPLAY, LOCALE_MENU_HINT_FILEPLAY); break; } + case SNeutrinoSettings::ITEM_FILEPLAY_AUDIO: + { + keyhelper.get(&key,&icon); + menu_item = new CMenuForwarder(LOCALE_MOVIEPLAYER_FILEPLAYBACK_AUDIO, !_mode_ts, NULL, neutrino, "fileplayback_audio", key, icon); + menu_item->setHint(NEUTRINO_ICON_HINT_FILEPLAY, LOCALE_MENU_HINT_FILEPLAY); + break; + } case SNeutrinoSettings::ITEM_TOOLS: { keyhelper.get(&key,&icon); diff --git a/src/gui/user_menue_setup.cpp b/src/gui/user_menue_setup.cpp index 01e87ae32..5150028ea 100644 --- a/src/gui/user_menue_setup.cpp +++ b/src/gui/user_menue_setup.cpp @@ -100,6 +100,7 @@ static keyvals usermenu_items[] = { SNeutrinoSettings::ITEM_SWUPDATE, LOCALE_SERVICEMENU_UPDATE, usermenu_show }, { 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_MAX, NONEXISTANT_LOCALE, usermenu_show } }; diff --git a/src/system/settings.h b/src/system/settings.h index e813dd0f0..5b8d98a6a 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -864,6 +864,7 @@ struct SNeutrinoSettings ITEM_SWUPDATE = 30, ITEM_LIVESTREAM_RESOLUTION = 31, ITEM_ADZAP = 32, + ITEM_FILEPLAY_AUDIO = 33, ITEM_MAX // MUST be always the last in the list } USER_ITEM;