mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

-add internetradio menu , patch by bazi98. THX :)

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@598 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
satbaby
2010-05-20 19:51:58 +00:00
parent 6ad54303db
commit 8ec83692de
2 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/gui/audioplayer.cpp
View File

@@ -185,11 +185,11 @@ WriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void *data)
// we borrow this from filebrowser // we borrow this from filebrowser
extern size_t CurlWriteToString(void *ptr, size_t size, size_t nmemb, void *data); extern size_t CurlWriteToString(void *ptr, size_t size, size_t nmemb, void *data);
CAudioPlayerGui::CAudioPlayerGui(bool /*inetmode*/) CAudioPlayerGui::CAudioPlayerGui(bool inetmode)
{ {
m_frameBuffer = CFrameBuffer::getInstance(); m_frameBuffer = CFrameBuffer::getInstance();
m_visible = false; m_visible = false;
m_inetmode = false; //inetmode;//FIXME m_inetmode = inetmode;
Init(); Init();
} }
@@ -428,22 +428,7 @@ int CAudioPlayerGui::show()
} }
} }
if ( msg == CRCInput::RC_tv) if (msg == CRCInput::RC_home || msg == CRCInput::RC_stop)
{
if (m_inetmode) {
m_inetmode = false;
m_radiolist = m_playlist;
m_playlist = m_filelist;
} else {
m_inetmode = true;
m_filelist = m_playlist;
m_playlist = m_radiolist;
}
Init();
clear_before_update = true;
update = true;
}
else if (msg == CRCInput::RC_home || msg == CRCInput::RC_stop)
{ {
if (m_state != CAudioPlayerGui::STOP) if (m_state != CAudioPlayerGui::STOP)
stop(); stop();

6
src/neutrino_menue.cpp
View File

@@ -713,11 +713,13 @@ void CNeutrinoApp::InitMainMenu(CMenuWidget &mainMenu, CMenuWidget &mainSettings
#if 1 #if 1
CMenuWidget *media = new CMenuWidget(LOCALE_MAINMENU_MEDIA); CMenuWidget *media = new CMenuWidget(LOCALE_MAINMENU_MEDIA);
addMenueIntroItems(*media); addMenueIntroItems(*media);
audioPlayer = new CAudioPlayerGui();
media->addItem(new CMenuForwarder(LOCALE_MAINMENU_AUDIOPLAYER, true, NULL, audioPlayer, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED)); media->addItem(new CMenuForwarder(LOCALE_MAINMENU_AUDIOPLAYER, true, NULL, audioPlayer, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED));
audioPlayer = new CAudioPlayerGui(true);
media->addItem(new CMenuForwarder(LOCALE_INETRADIO_NAME, true, NULL, audioPlayer, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE));
media->addItem(new CMenuForwarder(LOCALE_MAINMENU_MOVIEPLAYER, true, NULL, &moviePlayer, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN)); media->addItem(new CMenuForwarder(LOCALE_MAINMENU_MOVIEPLAYER, true, NULL, &moviePlayer, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN));
media->addItem(new CMenuForwarder(LOCALE_MAINMENU_PICTUREVIEWER, true, NULL, new CPictureViewerGui(), NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW)); media->addItem(new CMenuForwarder(LOCALE_MAINMENU_PICTUREVIEWER, true, NULL, new CPictureViewerGui(), NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW));
media->addItem(new CMenuForwarder(LOCALE_UPNPBROWSER_HEAD, true, NULL, new CUpnpBrowserGui(), NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE)); media->addItem(new CMenuForwarder(LOCALE_UPNPBROWSER_HEAD, true, NULL, new CUpnpBrowserGui(), NULL, CRCInput::convertDigitToKey(0)));
mainMenu.addItem(new CMenuForwarder(LOCALE_MAINMENU_MEDIA, true, NULL, media, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE)); mainMenu.addItem(new CMenuForwarder(LOCALE_MAINMENU_MEDIA, true, NULL, media, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE));
#else #else
mainMenu.addItem(GenericMenuSeparatorLine); mainMenu.addItem(GenericMenuSeparatorLine);