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

streaminfo2: allow fade in/out

Browse Source 
Origin commit data
------------------
Commit: 6cff0d23ce
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-30 (Fri, 30 Sep 2016)

Origin message was:
------------------
- streaminfo2: allow fade in/out
This commit is contained in:
vanhofen
2016-09-30 00:02:01 +02:00
parent 1734d4e3ef
commit 51e872dab9
2 changed files with 39 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/gui/streaminfo2.cpp
View File

@@ -33,6 +33,7 @@
#include <global.h> #include <global.h>
#include <neutrino.h> #include <neutrino.h>
#include <driver/fade.h>
#include <driver/display.h> #include <driver/display.h>
#include <driver/fontrenderer.h> #include <driver/fontrenderer.h>
#include <driver/rcinput.h> #include <driver/rcinput.h>
@@ -55,7 +56,7 @@ extern cAudio * audioDecoder;
extern CRemoteControl *g_RemoteControl; /* neutrino.cpp */ extern CRemoteControl *g_RemoteControl; /* neutrino.cpp */
CStreamInfo2::CStreamInfo2 () CStreamInfo2::CStreamInfo2() : fader(g_settings.theme.menu_Content_alpha)
{ {
frameBuffer = CFrameBuffer::getInstance (); frameBuffer = CFrameBuffer::getInstance ();
pip = NULL; pip = NULL;
@@ -121,9 +122,11 @@ int CStreamInfo2::exec (CMenuTarget * parent, const std::string &)
frontend = CFEManager::getInstance()->getLiveFE(); frontend = CFEManager::getInstance()->getLiveFE();
fader.StartFadeIn();
paint (paint_mode); paint (paint_mode);
int res = doSignalStrengthLoop (); int res = doSignalStrengthLoop ();
hide (); hide ();
fader.StopFade();
return res; return res;
} }
@@ -133,7 +136,9 @@ int CStreamInfo2::doSignalStrengthLoop ()
#define BAR_HEIGHT 12 #define BAR_HEIGHT 12
int res = menu_return::RETURN_REPAINT; int res = menu_return::RETURN_REPAINT;
bool fadeout = false;
neutrino_msg_t msg; neutrino_msg_t msg;
neutrino_msg_t postmsg = 0;
uint64_t maxb, minb, lastb, tmp_rate; uint64_t maxb, minb, lastb, tmp_rate;
unsigned int current_pmt_version= pmt_version; unsigned int current_pmt_version= pmt_version;
int cnt = 0; int cnt = 0;
@@ -150,6 +155,27 @@ int CStreamInfo2::doSignalStrengthLoop ()
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd_MS (100); uint64_t timeoutEnd = CRCInput::calcTimeoutEnd_MS (100);
g_RCInput->getMsgAbsoluteTimeout (&msg, &data, &timeoutEnd); g_RCInput->getMsgAbsoluteTimeout (&msg, &data, &timeoutEnd);
if ((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer()))
{
if (fader.FadeDone())
{
break;
}
continue;
}
if (fadeout && msg == CRCInput::RC_timeout)
{
if (fader.StartFadeOut())
{
msg = 0;
continue;
}
else
{
break;
}
}
if (!mp) { if (!mp) {
signal.sig = frontend->getSignalStrength() & 0xFFFF; signal.sig = frontend->getSignalStrength() & 0xFFFF;
signal.snr = frontend->getSignalNoiseRatio() & 0xFFFF; signal.snr = frontend->getSignalNoiseRatio() & 0xFFFF;
@@ -236,12 +262,12 @@ int CStreamInfo2::doSignalStrengthLoop ()
} }
else if(msg == CRCInput::RC_setup) { else if(msg == CRCInput::RC_setup) {
res = menu_return::RETURN_EXIT_ALL; res = menu_return::RETURN_EXIT_ALL;
break; fadeout = true;
} }
else if(CNeutrinoApp::getInstance()->listModeKey(msg)) { else if(CNeutrinoApp::getInstance()->listModeKey(msg)) {
g_RCInput->postMsg (msg, 0); postmsg = msg;
res = menu_return::RETURN_EXIT_ALL; res = menu_return::RETURN_EXIT_ALL;
break; fadeout = true;
} }
else if (msg == (neutrino_msg_t) g_settings.key_screenshot) { else if (msg == (neutrino_msg_t) g_settings.key_screenshot) {
CNeutrinoApp::getInstance ()->handleMsg (msg, data); CNeutrinoApp::getInstance ()->handleMsg (msg, data);
@@ -250,7 +276,7 @@ int CStreamInfo2::doSignalStrengthLoop ()
// -- any key --> abort // -- any key --> abort
if (msg <= CRCInput::RC_MaxRC) if (msg <= CRCInput::RC_MaxRC)
break; fadeout = true;
// -- push other events // -- push other events
if (msg > CRCInput::RC_MaxRC && msg != CRCInput::RC_timeout) if (msg > CRCInput::RC_MaxRC && msg != CRCInput::RC_timeout)
@@ -259,6 +285,12 @@ int CStreamInfo2::doSignalStrengthLoop ()
delete signalbox; delete signalbox;
signalbox = NULL; signalbox = NULL;
ts_close (); ts_close ();
if (postmsg)
{
g_RCInput->postMsg(postmsg, 0);
}
return res; return res;
} }

2
src/gui/streaminfo2.h
View File

@@ -31,6 +31,7 @@
#include <zapit/femanager.h> #include <zapit/femanager.h>
class COSDFader;
class CStreamInfo2 : public CMenuTarget class CStreamInfo2 : public CMenuTarget
{ {
private: private:
@@ -39,6 +40,7 @@ class CStreamInfo2 : public CMenuTarget
CFrontend *frontend; CFrontend *frontend;
CComponentsPIP * pip; CComponentsPIP * pip;
CMoviePlayerGui *mp; CMoviePlayerGui *mp;
COSDFader fader;
int x; int x;
int y; int y;
int width; int width;