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

gui/audioplayer.cpp: return menu_return::RETURN_EXIT_ALL on standby/shutdown,

Browse Source 
thanks satbaby for patch
This commit is contained in:
[CST] Focus
2012-11-16 15:45:39 +04:00
parent ff47810841
commit 6d7f1efd06
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/audioplayer.cpp
View File

@@ -325,7 +325,7 @@ int CAudioPlayerGui::exec(CMenuTarget* parent, const std::string &actionKey)
if (my_system(AUDIOPLAYER_START_SCRIPT) != 0) if (my_system(AUDIOPLAYER_START_SCRIPT) != 0)
perror("Datei " AUDIOPLAYER_START_SCRIPT " fehlt.Bitte erstellen, wenn gebraucht.\nFile " AUDIOPLAYER_START_SCRIPT " not found. Please create if needed.\n"); perror("Datei " AUDIOPLAYER_START_SCRIPT " fehlt.Bitte erstellen, wenn gebraucht.\nFile " AUDIOPLAYER_START_SCRIPT " not found. Please create if needed.\n");
show(); int res = show();
// Restore previous background // Restore previous background
if (usedBackground) if (usedBackground)
@@ -346,8 +346,7 @@ int CAudioPlayerGui::exec(CMenuTarget* parent, const std::string &actionKey)
CNeutrinoApp::getInstance()->StartSubtitles(); CNeutrinoApp::getInstance()->StartSubtitles();
// always exit all return res;
return menu_return::RETURN_EXIT_ALL;
} }
//------------------------------------------------------------------------ //------------------------------------------------------------------------
@@ -359,7 +358,7 @@ int CAudioPlayerGui::show()
int pic_index = 0; int pic_index = 0;
int ret = -1; int ret = menu_return::RETURN_REPAINT;
CVFD::getInstance()->setMode(CVFD::MODE_AUDIO); CVFD::getInstance()->setMode(CVFD::MODE_AUDIO);
paintLCD(); paintLCD();
@@ -878,8 +877,11 @@ int CAudioPlayerGui::show()
msg == NeutrinoMessages::SHUTDOWN || msg == NeutrinoMessages::SHUTDOWN ||
msg == NeutrinoMessages::SLEEPTIMER) msg == NeutrinoMessages::SLEEPTIMER)
{ {
if(msg != NeutrinoMessages::RECORD_START )
ret = menu_return::RETURN_EXIT_ALL;
// Exit for Record/Zapto Timers // Exit for Record/Zapto Timers
loop = false; loop = false;
g_RCInput->postMsg(msg, data); g_RCInput->postMsg(msg, data);
} }
else if (msg == NeutrinoMessages::EVT_TIMER) else if (msg == NeutrinoMessages::EVT_TIMER)
@@ -890,6 +892,7 @@ int CAudioPlayerGui::show()
{ {
if ( CNeutrinoApp::getInstance()->handleMsg( msg, data ) & messages_return::cancel_all ) if ( CNeutrinoApp::getInstance()->handleMsg( msg, data ) & messages_return::cancel_all )
{ {
ret = menu_return::RETURN_EXIT_ALL;
loop = false; loop = false;
} }
// update mute icon // update mute icon