mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-30 08:51:10 +02:00
- movieplayer: change usermenu call; use existing instance
This commit is contained in:
@@ -1181,12 +1181,10 @@ void CMoviePlayerGui::PlayFileLoop(void)
|
||||
} else if (msg == CRCInput::RC_sat) {
|
||||
//FIXME do nothing ?
|
||||
} 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();
|
||||
FileTime.kill();
|
||||
|
||||
CUserMenu u;
|
||||
u.showUserMenu(msg);
|
||||
|
||||
CNeutrinoApp::getInstance()->usermenu.showUserMenu(msg);
|
||||
if (restore)
|
||||
FileTime.show(position);
|
||||
update_lcd = true;
|
||||
|
@@ -77,7 +77,6 @@ private:
|
||||
CConfigFile configfile;
|
||||
CScanSettings scanSettings;
|
||||
CPersonalizeGui personalize;
|
||||
CUserMenu usermenu;
|
||||
int network_dhcp;
|
||||
int network_automatic_start;
|
||||
|
||||
@@ -156,6 +155,8 @@ public:
|
||||
norezap = 0x100
|
||||
};
|
||||
|
||||
CUserMenu usermenu;
|
||||
|
||||
void saveSetup(const char * fname);
|
||||
int loadSetup(const char * fname);
|
||||
void loadKeys(const char * fname = NULL);
|
||||
|
Reference in New Issue
Block a user