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

- movieplayer: change usermenu call; use existing instance

Browse Source
This commit is contained in:
svenhoefer
2015-12-14 23:07:53 +01:00
parent a50bd5bb97
commit 6fc8fb2bee
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/movieplayer.cpp
View File

@@ -1181,12 +1181,10 @@ void CMoviePlayerGui::PlayFileLoop(void)
} else if (msg == CRCInput::RC_sat) { } else if (msg == CRCInput::RC_sat) {
//FIXME do nothing ? //FIXME do nothing ?
} else if (msg == CRCInput::RC_red || msg == CRCInput::RC_green || msg == CRCInput::RC_yellow || msg == CRCInput::RC_blue ) { } else if (msg == CRCInput::RC_red || msg == CRCInput::RC_green || msg == CRCInput::RC_yellow || msg == CRCInput::RC_blue ) {
//maybe move FileTime.kill to Usermenu to simplify this call
bool restore = FileTime.IsVisible(); bool restore = FileTime.IsVisible();
FileTime.kill(); FileTime.kill();
CNeutrinoApp::getInstance()->usermenu.showUserMenu(msg);
CUserMenu u;
u.showUserMenu(msg);
if (restore) if (restore)
FileTime.show(position); FileTime.show(position);
update_lcd = true; update_lcd = true;

3
src/neutrino.h
View File

@@ -77,7 +77,6 @@ private:
CConfigFile configfile; CConfigFile configfile;
CScanSettings scanSettings; CScanSettings scanSettings;
CPersonalizeGui personalize; CPersonalizeGui personalize;
CUserMenu usermenu;
int network_dhcp; int network_dhcp;
int network_automatic_start; int network_automatic_start;
@@ -156,6 +155,8 @@ public:
norezap = 0x100 norezap = 0x100
}; };
CUserMenu usermenu;
void saveSetup(const char * fname); void saveSetup(const char * fname);
int loadSetup(const char * fname); int loadSetup(const char * fname);
void loadKeys(const char * fname = NULL); void loadKeys(const char * fname = NULL);