From d78388ea4dd01bb37a058e7f41581f134cb990b7 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 2 Jan 2014 21:10:34 +0100 Subject: [PATCH] usermenu: add youtube player Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/47a2cf0e54b794688f1e59788d8c9ec8ec5c4a37 Author: vanhofen Date: 2014-01-02 (Thu, 02 Jan 2014) Origin message was: ------------------ - usermenu: add youtube player ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/user_menue.cpp | 10 ++++++++++ src/gui/user_menue_setup.cpp | 3 ++- src/system/settings.h | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp index 123066d18..749effe2a 100644 --- a/src/gui/user_menue.cpp +++ b/src/gui/user_menue.cpp @@ -372,6 +372,16 @@ bool CUserMenu::showUserMenu(int button) menu->addItem(menu_item, false); } break; + case SNeutrinoSettings::ITEM_YOUTUBE: + { + menu_items++; + menu_prev = SNeutrinoSettings::ITEM_YOUTUBE; + keyhelper.get(&key,&icon); + menu_item = new CMenuForwarder(LOCALE_MOVIEPLAYER_YTPLAYBACK, true, NULL, &CMoviePlayerGui::getInstance(), "ytplayback", key, icon); + menu_item->setHint(NEUTRINO_ICON_HINT_YTPLAY, LOCALE_MENU_HINT_YTPLAY); + menu->addItem(menu_item, 0); + } + break; #if 0 // FIXME not supported yet case SNeutrinoSettings::ITEM_MOVIEPLAYER_TS: diff --git a/src/gui/user_menue_setup.cpp b/src/gui/user_menue_setup.cpp index 5b07acb5f..aa1c3db92 100644 --- a/src/gui/user_menue_setup.cpp +++ b/src/gui/user_menue_setup.cpp @@ -88,7 +88,8 @@ const CMenuOptionChooser::keyval USERMENU_ITEM_OPTIONS[USERMENU_ITEM_OPTION_COUN { SNeutrinoSettings::ITEM_CLOCK, LOCALE_CLOCK_SWITCH_ON }, { SNeutrinoSettings::ITEM_GAMES, LOCALE_MAINMENU_GAMES }, { SNeutrinoSettings::ITEM_SCRIPTS, LOCALE_MAINMENU_SCRIPTS }, - { SNeutrinoSettings::ITEM_RECORD, LOCALE_TIMERLIST_TYPE_RECORD } + { SNeutrinoSettings::ITEM_RECORD, LOCALE_TIMERLIST_TYPE_RECORD }, + { SNeutrinoSettings::ITEM_YOUTUBE, LOCALE_MOVIEPLAYER_YTPLAYBACK } }; int CUserMenuSetup::exec(CMenuTarget* parent, const std::string &) diff --git a/src/system/settings.h b/src/system/settings.h index 2ccdd41f6..3e515a3bd 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -654,6 +654,7 @@ struct SNeutrinoSettings ITEM_CLOCK = 19, ITEM_GAMES = 20, ITEM_SCRIPTS = 21, + ITEM_YOUTUBE = 22, #if 0 ITEM_MOVIEPLAYER_TS, #endif