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

- framebuffer: revival of showFrame() function to allow ...

Browse Source 
... pictures like start.jpg, mp3.jpg etc. from /var/tuxbox/icons
This commit is contained in:
svenhoefer
2015-05-05 12:01:04 +02:00
parent ca5d85986e
commit edc8527379
10 changed files with 43 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/neutrino.cpp
View File

@@ -2214,8 +2214,8 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
printf("[neutrino] CSreenSaver stop; msg: %X\n", msg);
screensaver(false);
videoDecoder->StopPicture();
videoDecoder->ShowPicture(DATADIR "/neutrino/icons/radiomode.jpg");
frameBuffer->stopFrame();
frameBuffer->showFrame("radiomode.jpg");
if (msg <= CRCInput::RC_MaxRC) {
// ignore first keypress - just quit the screensaver
@@ -3220,7 +3220,7 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
}
if((data & mode_mask)== mode_ts && CMoviePlayerGui::getInstance().Playing()) {
if(mode == mode_radio)
videoDecoder->StopPicture();
frameBuffer->stopFrame();
lastMode=mode;
mode=mode_ts;
}
@@ -3322,7 +3322,7 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode)
stopPlayBack();
frameBuffer->paintBackground();
videoDecoder->ShowPicture(DATADIR "/neutrino/icons/shutdown.jpg");
frameBuffer->showFrame("shutdown.jpg");
delete cHddStat::getInstance();
delete CRecordManager::getInstance();
@@ -3476,7 +3476,7 @@ void CNeutrinoApp::tvMode( bool rezap )
g_Radiotext = NULL;
}
videoDecoder->StopPicture();
frameBuffer->stopFrame();
CVFD::getInstance()->ShowIcon(FP_ICON_RADIO, false);
StartSubtitles(!rezap);
}
@@ -3686,7 +3686,7 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
radioMode( false );
} else {
/* for standby -> tv mode from radio mode in case of record */
videoDecoder->StopPicture();
frameBuffer->stopFrame();
tvMode( false );
}
t_channel_id live_channel_id = CZapit::getInstance()->GetCurrentChannelID();
@@ -3748,7 +3748,7 @@ void CNeutrinoApp::radioMode( bool rezap)
else
channelList->zapTo(0, true); /* force re-zap */
}
videoDecoder->ShowPicture(DATADIR "/neutrino/icons/radiomode.jpg");
frameBuffer->showFrame("radiomode.jpg");
}
//switching from current mode to tv or radio mode or to optional parameter prev_mode
@@ -3858,12 +3858,12 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey)
else if(actionKey=="nkplayback" || actionKey=="ytplayback" || actionKey=="tsmoviebrowser" || actionKey=="fileplayback") {
frameBuffer->Clear();
if(mode == NeutrinoMessages::mode_radio )
videoDecoder->StopPicture();
frameBuffer->stopFrame();
int _mode = mode;
// FIXME CMediaPlayerMenu::getInstance()->exec(NULL, actionKey); ??
CMoviePlayerGui::getInstance().exec(NULL, actionKey);
if(_mode == NeutrinoMessages::mode_radio )
videoDecoder->ShowPicture(DATADIR "/neutrino/icons/radiomode.jpg");
frameBuffer->showFrame("radiomode.jpg");
#if 0
else if (_mode == mode_webtv)
tvMode(true);