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

- mediaplayer: formatting code using astyle

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2021-10-20 19:31:13 +02:00
committed by Thilo Graf
parent 45cf7e0698
commit 24897213a0
2 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/mediaplayer.cpp
View File

@@ -67,7 +67,8 @@ CMediaPlayerMenu* CMediaPlayerMenu::getInstance()
{ {
static CMediaPlayerMenu *mpm = NULL; static CMediaPlayerMenu *mpm = NULL;
if(!mpm) { if (!mpm)
{
mpm = new CMediaPlayerMenu(); mpm = new CMediaPlayerMenu();
printf("[neutrino] mediaplayer menu instance created\n"); printf("[neutrino] mediaplayer menu instance created\n");
} }
@@ -91,14 +92,14 @@ int CMediaPlayerMenu::exec(CMenuTarget* parent, const std::string &actionKey)
if (audioPlayer == NULL) if (audioPlayer == NULL)
audioPlayer = new CAudioPlayerGui(); audioPlayer = new CAudioPlayerGui();
int res = audioPlayer->exec(NULL, "init"); int res = audioPlayer->exec(NULL, "init");
return res /*menu_return::RETURN_REPAINT*/; return res;
} }
else if (actionKey == "inetplayer") else if (actionKey == "inetplayer")
{ {
if (inetPlayer == NULL) if (inetPlayer == NULL)
inetPlayer = new CAudioPlayerGui(true); inetPlayer = new CAudioPlayerGui(true);
int res = inetPlayer->exec(NULL, "init"); int res = inetPlayer->exec(NULL, "init");
return res; //menu_return::RETURN_REPAINT; return res;
} }
else if (actionKey == "moviebrowser") else if (actionKey == "moviebrowser")
{ {

1
src/gui/mediaplayer.h
View File

@@ -54,5 +54,4 @@ class CMediaPlayerMenu : public CMenuTarget
CAudioPlayerGui *getPlayerInstance() { if (audioPlayer != NULL) return audioPlayer; else if (inetPlayer != NULL) return inetPlayer; else return NULL; } CAudioPlayerGui *getPlayerInstance() { if (audioPlayer != NULL) return audioPlayer; else if (inetPlayer != NULL) return inetPlayer; else return NULL; }
}; };
#endif #endif