infoviewer_bb: small renamings to get more logic in function names

showOne_CAIcon() => showIcon_CA()
paint_ca_icons() => paint_ca_icon()
showIcon_CA_Status() => paint_ca_icons()


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9389e78318
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-13 (Wed, 13 Dec 2017)

Origin message was:
------------------
- infoviewer_bb: small renamings to get more logic in function names

showOne_CAIcon()   => showIcon_CA()
paint_ca_icons()   => paint_ca_icon()
showIcon_CA_Status() => paint_ca_icons()


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-12-13 09:39:12 +01:00
parent 46e26cd20c
commit 1e6e9e9e76
3 changed files with 27 additions and 25 deletions

View File

@@ -1095,7 +1095,7 @@ void CInfoViewer::loop(bool show_dot)
ecmInfoBox_hide();
} else {
g_settings.show_ecm = 1;
infoViewerBB->showIcon_CA_Status(0);
infoViewerBB->paint_ca_icons(0);
}
}
g_RCInput->clearRCMsg();
@@ -1174,7 +1174,7 @@ void CInfoViewer::loop(bool show_dot)
showRadiotext();
infoViewerBB->showIcon_16_9();
//infoViewerBB->showIcon_CA_Status(0);
//infoViewerBB->paint_ca_icons(0);
//NI
if(file_exists("/tmp/ecm.info"))
{
@@ -1182,7 +1182,7 @@ void CInfoViewer::loop(bool show_dot)
//printf("CInfoViewer::loop() ecm.info.tmp = %s\nCInfoViewer::loop() ecm.info = %s\n",md5_ecmInfo.c_str(),md5_tmp.c_str());
if(md5_ecmInfo != md5_tmp) {
puts("CInfoViewer::loop() CA reload");
infoViewerBB->showIcon_CA_Status(0);
infoViewerBB->paint_ca_icons(0);
}
}
infoViewerBB->showIcon_Resolution();
@@ -1497,9 +1497,9 @@ int CInfoViewer::handleMsg (const neutrino_msg_t msg, neutrino_msg_data_t data)
} else if (msg == NeutrinoMessages::EVT_ZAP_GOTPIDS) {
if ((*(t_channel_id *) data) == current_channel_id) {
if (is_visible && showButtonBar) {
//infoViewerBB->paint_ca_icons(0);
infoViewerBB->showIcon_VTXT();
infoViewerBB->showIcon_SubT();
//infoViewerBB->showIcon_CA_Status(0);
infoViewerBB->showIcon_Resolution();
infoViewerBB->showIcon_Tuner();
}
@@ -1514,7 +1514,7 @@ int CInfoViewer::handleMsg (const neutrino_msg_t msg, neutrino_msg_data_t data)
//chanready = 1;
showSNR ();
if (is_visible && showButtonBar)
infoViewerBB->showIcon_CA_Status(0);
infoViewerBB->paint_ca_icons(0);
//Set_CA_Status (data);
return messages_return::handled;
} else if (msg == NeutrinoMessages::EVT_TIMER) {
@@ -2173,7 +2173,7 @@ void CInfoViewer::killTitle()
void CInfoViewer::Set_CA_Status (int /*Status*/)
{
if (is_visible && showButtonBar)
infoViewerBB->showIcon_CA_Status(1);
infoViewerBB->paint_ca_icons(1);
}
#endif
/******************************************************************************