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

infoviewer: Updated naming convention to consistently indicate return values

Browse Source 
'getter' methods do convey a return value,
but getLiveStreamInfo() returns nothing, therefore we should use
a more appropriate name, such as 'initialize'
or 'modify', improving code clarity and adherence
to best practices.
This commit is contained in:
Thilo Graf
2023-04-12 21:07:12 +02:00
parent 0cd00137c5
commit 14dcdc36e3
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/infoviewer.cpp
View File

@@ -862,7 +862,7 @@ void CInfoViewer::setInfobarTimeout(int timeout_ext)
timeoutEnd = CRCInput::calcTimeoutEnd(timeout + timeout_ext); timeoutEnd = CRCInput::calcTimeoutEnd(timeout + timeout_ext);
} }
void CInfoViewer::getLivestreamInfo() void CInfoViewer::initLiveStreamInfo()
{ {
CZapitChannel *cc = CZapit::getInstance()->GetCurrentChannel(); CZapitChannel *cc = CZapit::getInstance()->GetCurrentChannel();
bool web_mode = (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webtv || CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webradio); bool web_mode = (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webtv || CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webradio);
@@ -1013,7 +1013,7 @@ bool CInfoViewer::showLivestreamInfo()
bool web_mode = (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webtv || CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webradio); bool web_mode = (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webtv || CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webradio);
if (web_mode && (info_CurrentNext.current_uniqueKey == 0 && info_CurrentNext.next_uniqueKey == 0)) if (web_mode && (info_CurrentNext.current_uniqueKey == 0 && info_CurrentNext.next_uniqueKey == 0))
{ {
getLivestreamInfo(); initLiveStreamInfo();
display_Info(_livestreamInfo1.c_str(), _livestreamInfo2.c_str(), false); display_Info(_livestreamInfo1.c_str(), _livestreamInfo2.c_str(), false);
infoViewerBB->showBBButtons(true); infoViewerBB->showBBButtons(true);

4
src/gui/infoviewer.h
View File

@@ -147,7 +147,7 @@ class CInfoViewer : public sigc::trackable
void reset_allScala(); void reset_allScala();
void check_channellogo_ca_SettingsChange(); void check_channellogo_ca_SettingsChange();
void sendNoEpg(const t_channel_id channel_id); void sendNoEpg(const t_channel_id channel_id);
void getLivestreamInfo(); void initLiveStreamInfo();
bool showLivestreamInfo(); bool showLivestreamInfo();
public: public:
@@ -206,7 +206,7 @@ class CInfoViewer : public sigc::trackable
int getSwitchMode() {return zap_mode;} int getSwitchMode() {return zap_mode;}
void resetSwitchMode() {setSwitchMode(IV_MODE_DEFAULT);} void resetSwitchMode() {setSwitchMode(IV_MODE_DEFAULT);}
void get_livestreamInfo() { getLivestreamInfo(); } void get_livestreamInfo() { initLiveStreamInfo(); }
std::string get_livestreamInfo1() { return _livestreamInfo1; } std::string get_livestreamInfo1() { return _livestreamInfo1; }
std::string get_livestreamInfo2() { return _livestreamInfo2; } std::string get_livestreamInfo2() { return _livestreamInfo2; }