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

CSignalBox: add missing member to set frontend

Browse Source 
Remove double init of sig items; Will be done already by paintScale().
Ensure reset of last sig value on fe change.
Prevent possible segfault if fe is not defined.
This commit is contained in:
Thilo Graf
2016-09-28 21:12:32 +02:00
committed by svenhoefer
parent 59ac9e57e1
commit f68fd5ac19
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/components/cc_frm_signalbars.cpp
View File

@@ -192,7 +192,9 @@ void CSignalBar::initSBarName()
void CSignalBar::Refresh() void CSignalBar::Refresh()
{ {
//get current value from frontend //get current value from frontend
sb_signal = sb_frontend->getSignalStrength(); sb_signal = 0;
if (sb_frontend)
sb_signal = sb_frontend->getSignalStrength();
//reinit items with current values //reinit items with current values
initSBItems(); initSBItems();
@@ -242,7 +244,9 @@ void CSignalBar::paint(bool do_save_bg)
void CSignalNoiseRatioBar::Refresh() void CSignalNoiseRatioBar::Refresh()
{ {
//get current value from frontend //get current value from frontend
sb_signal = sb_frontend->getSignalNoiseRatio(); sb_signal = 0;
if (sb_frontend)
sb_signal = sb_frontend->getSignalNoiseRatio();
//reinit items with current values //reinit items with current values
initSBItems(); initSBItems();
@@ -338,10 +342,8 @@ void CSignalBox::paintScale()
void CSignalBox::paint(bool do_save_bg) void CSignalBox::paint(bool do_save_bg)
{ {
//paint frame and body //paint frame and body
if (!is_painted){ if (!is_painted)
initSignalItems();
paintForm(do_save_bg); paintForm(do_save_bg);
}
//paint current signal value //paint current signal value
paintScale(); paintScale();

5
src/gui/components/cc_frm_signalbars.h
View File

@@ -116,7 +116,7 @@ class CSignalBar : public CComponentsForm, public CCTextScreen
CSignalBar(const int& xpos, const int& ypos, const int& w, const int& h, CFrontend *frontend_ref, const std::string& sb_name = "SIG", CComponentsForm *parent = NULL); CSignalBar(const int& xpos, const int& ypos, const int& w, const int& h, CFrontend *frontend_ref, const std::string& sb_name = "SIG", CComponentsForm *parent = NULL);
///assigns the current used frontend, simplified a tuner object, see frontend_c.h ///assigns the current used frontend, simplified a tuner object, see frontend_c.h
virtual void setFrontEnd(CFrontend *frontend_ref){sb_frontend = frontend_ref;}; virtual void setFrontEnd(CFrontend *frontend_ref){if (sb_frontend != frontend_ref) {sb_lastsig = 0; sb_frontend = frontend_ref;}}
///assigns font for caption ///assigns font for caption
virtual void setTextFont(Font* font_text){sb_font = font_text;}; virtual void setTextFont(Font* font_text){sb_font = font_text;};
///sets the caption color, see also property 'sb_caption_color' ///sets the caption color, see also property 'sb_caption_color'
@@ -298,6 +298,9 @@ class CSignalBox : public CComponentsForm, public CCTextScreen
///returns the signal noise ratio object, type = CSignalNoiseRatioBar* ///returns the signal noise ratio object, type = CSignalNoiseRatioBar*
CSignalNoiseRatioBar* getLabelObject(){return snrbar;}; CSignalNoiseRatioBar* getLabelObject(){return snrbar;};
///assigns the current used frontend, simplified a tuner object, see frontend_c.h
void setFrontEnd(CFrontend *frontend_ref){sbx_frontend = frontend_ref;}
///sets the caption color of signalbars, see also property 'sbx_caption_color' ///sets the caption color of signalbars, see also property 'sbx_caption_color'
void setTextColor(const fb_pixel_t& caption_color){ sbx_caption_color = caption_color;}; void setTextColor(const fb_pixel_t& caption_color){ sbx_caption_color = caption_color;};
///get caption color of signalbars, see also property 'sbx_caption_color' ///get caption color of signalbars, see also property 'sbx_caption_color'