From 054f693ae352e011c1cebafaf2ed45170767034c Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 30 Nov 2017 12:38:40 +0100 Subject: [PATCH] Revert "- media-menu: disable currently broken audioplayer for ARM_HARDWARE" This reverts commit c40c72d2f6f8eb16c25fa03b80ee3f6c1bfe0a7b because it's fixed in 334ce41 Signed-off-by: Thilo Graf Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/090120f704dd4f8c569211ca3453e6bbd823d0f2 Author: vanhofen Date: 2017-11-30 (Thu, 30 Nov 2017) ------------------ This commit was generated by Migit --- src/gui/mediaplayer.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/gui/mediaplayer.cpp b/src/gui/mediaplayer.cpp index 548b1a1a3..49252e8df 100644 --- a/src/gui/mediaplayer.cpp +++ b/src/gui/mediaplayer.cpp @@ -139,7 +139,6 @@ int CMediaPlayerMenu::initMenuMedia(CMenuWidget *m, CPersonalizeGui *p) bool enabled = !CMoviePlayerGui::getInstance().Playing(); -#if !HAVE_ARM_HARDWARE //audio player CMenuForwarder *fw_audio = new CMenuForwarder(LOCALE_MAINMENU_AUDIOPLAYER, enabled, NULL, this, "audioplayer", CRCInput::RC_red); fw_audio->setHint(NEUTRINO_ICON_HINT_APLAY, LOCALE_MENU_HINT_APLAY); @@ -149,7 +148,6 @@ int CMediaPlayerMenu::initMenuMedia(CMenuWidget *m, CPersonalizeGui *p) CMenuForwarder *fw_inet = new CMenuForwarder(LOCALE_INETRADIO_NAME, enabled, NULL, this, "inetplayer", CRCInput::RC_green); fw_inet->setHint(NEUTRINO_ICON_HINT_INET_RADIO, LOCALE_MENU_HINT_INET_RADIO); personalize->addItem(multimedia_menu, fw_inet, &g_settings.personalize[SNeutrinoSettings::P_MEDIA_INETPLAY]); -#endif //init movieplayer submenu CMenuWidget *movieplayer_menu = new CMenuWidget(LOCALE_MAINMENU_MOVIEPLAYER, NEUTRINO_ICON_MULTIMEDIA, width, MN_WIDGET_ID_MEDIA_MOVIEPLAYER);