From f47146c6ea45b15701bef36c18b9de885ce42f14 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Fri, 25 Oct 2013 17:21:00 +0200 Subject: [PATCH] revert e813d9f32b99d375ae794cccec8223ab6d6a5104 Was bad idea to rename. Other Classes can also inherit this. See CMenuTarget Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/6dd1da06280bc8edc3b632ef57c8cddaa0f4fca1 Author: Thilo Graf Date: 2013-10-25 (Fri, 25 Oct 2013) ------------------ This commit was generated by Migit --- src/driver/framebuffer.cpp | 2 +- src/driver/volume.cpp | 2 +- src/gui/audiomute.cpp | 6 ++--- src/gui/audioplayer.cpp | 8 +++--- src/gui/bedit/bouqueteditor_channels.cpp | 2 +- src/gui/channellist.cpp | 2 +- src/gui/components/cc_base.cpp | 6 ++--- src/gui/components/cc_base.h | 4 +-- src/gui/components/cc_detailsline.cpp | 2 +- src/gui/components/cc_frm.cpp | 6 ++--- src/gui/components/cc_frm.h | 2 +- src/gui/components/cc_frm_signalbars.h | 2 +- src/gui/components/cc_item.cpp | 2 +- src/gui/components/cc_item_infobox.cpp | 2 +- src/gui/components/cc_item_picture.cpp | 2 +- src/gui/components/cc_item_picture.h | 2 +- src/gui/components/cc_item_text.cpp | 4 +-- src/gui/components/cc_item_text.h | 2 +- src/gui/components/cc_item_tvpic.cpp | 4 +-- src/gui/components/cc_item_tvpic.h | 2 +- .../components/unmaintained/cc_item_box.cpp | 8 +++--- src/gui/imageinfo.cpp | 2 +- src/gui/infoviewer.cpp | 2 +- src/gui/streaminfo2.cpp | 2 +- src/gui/test_menu.cpp | 26 +++++++++---------- src/gui/widget/menue.cpp | 12 ++++----- 26 files changed, 58 insertions(+), 58 deletions(-) diff --git a/src/driver/framebuffer.cpp b/src/driver/framebuffer.cpp index 6fd4a23da..ca6649176 100644 --- a/src/driver/framebuffer.cpp +++ b/src/driver/framebuffer.cpp @@ -1924,7 +1924,7 @@ bool CFrameBuffer::_checkFbArea(int _x, int _y, int _dx, int _dy, bool prev) // waitForIdle(); fb_no_check = true; if (prev) - CAudioMute::getInstance()->hideCC(true); + CAudioMute::getInstance()->hide(true); else CAudioMute::getInstance()->paint(); fb_no_check = false; diff --git a/src/driver/volume.cpp b/src/driver/volume.cpp index 7172a46bf..73167b4b6 100644 --- a/src/driver/volume.cpp +++ b/src/driver/volume.cpp @@ -177,7 +177,7 @@ bool CVolume::hideVolscale() bool ret = false; if (volscale) { if (volscale->isPainted()) { - volscale->hideCC(); + volscale->hide(); ret = true; } delete volscale; diff --git a/src/gui/audiomute.cpp b/src/gui/audiomute.cpp index bf614b668..f5309230e 100644 --- a/src/gui/audiomute.cpp +++ b/src/gui/audiomute.cpp @@ -67,7 +67,7 @@ void CAudioMute::AudioMute(int newValue, bool isEvent) if (do_paint_mute_icon) { frameBuffer->fbNoCheck(true); - hideCC(true); + this->hide(true); frameBuffer->fbNoCheck(false); } frameBuffer->setFbArea(CFrameBuffer::FB_PAINTAREA_MUTEICON1); @@ -84,7 +84,7 @@ void CAudioMute::AudioMute(int newValue, bool isEvent) } else { if (do_paint_mute_icon) - hideCC(true); + this->hide(true); frameBuffer->setFbArea(CFrameBuffer::FB_PAINTAREA_MUTEICON1); } frameBuffer->fbNoCheck(false); @@ -112,7 +112,7 @@ void CAudioMute::enableMuteIcon(bool enable) } else { if (neutrino->isMuted()) - hideCC(true); + this->hide(true); frameBuffer->doPaintMuteIcon(false); do_paint_mute_icon = false; } diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp index 5d5d80bb2..e202f6d88 100644 --- a/src/gui/audioplayer.cpp +++ b/src/gui/audioplayer.cpp @@ -1904,11 +1904,11 @@ void CAudioPlayerGui::paintItemID3DetailsLine (int pos) // clear details line if (dline != NULL) - dline->hideCC(); + dline->hide(); // clear infobox if (ibox != NULL) - ibox->hideCC(); + ibox->hide(); // paint Line if detail info (and not valid list pos) and info box if (!m_playlist.empty() && (pos >= 0)) @@ -1956,9 +1956,9 @@ void CAudioPlayerGui::paintItemID3DetailsLine (int pos) else { if (dline != NULL) - dline->hideCC(); + dline->hide(); if (ibox != NULL) - ibox->hideCC(); + ibox->hide(); } } //------------------------------------------------------------------------ diff --git a/src/gui/bedit/bouqueteditor_channels.cpp b/src/gui/bedit/bouqueteditor_channels.cpp index d6f4a45fe..9b87c2a3b 100644 --- a/src/gui/bedit/bouqueteditor_channels.cpp +++ b/src/gui/bedit/bouqueteditor_channels.cpp @@ -242,7 +242,7 @@ void CBEChannelWidget::initItem2DetailsLine (int pos, int /*ch_index*/) ibox = new CComponentsInfoBox(); if (ibox->isPainted()) - ibox->hideCC(CC_SAVE_SCREEN_NO); + ibox->hide(CC_SAVE_SCREEN_NO); ibox->setDimensionsAll(x, ypos2, width, info_height); ibox->setFrameThickness(2); diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 2e310c8eb..6864276e2 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -132,7 +132,7 @@ CChannelList::~CChannelList() if (headerClock) { headerClock->Stop(); if (headerClock->isPainted()) - headerClock->hideCC(); + headerClock->hide(); if (headerClock->isClockRun()) headerClock->stopThread(); delete headerClock; diff --git a/src/gui/components/cc_base.cpp b/src/gui/components/cc_base.cpp index d0f15b3ae..94693d13e 100644 --- a/src/gui/components/cc_base.cpp +++ b/src/gui/components/cc_base.cpp @@ -42,7 +42,7 @@ CComponents::CComponents() CComponents::~CComponents() { - hideCC(); + hide(); clearSavedScreen(); clear(); } @@ -172,11 +172,11 @@ inline fb_pixel_t* CComponents::getScreen(int ax, int ay, int dx, int dy) } //restore screen from buffer -inline void CComponents::hideCC() +inline void CComponents::hide() { for(size_t i =0; i< v_fbdata.size() ;i++) { if (v_fbdata[i].pixbuf != NULL){ - frameBuffer->waitForIdle("CComponents::hideCC()"); + frameBuffer->waitForIdle("CComponents::hide()"); frameBuffer->RestoreScreen(v_fbdata[i].x, v_fbdata[i].y, v_fbdata[i].dx, v_fbdata[i].dy, v_fbdata[i].pixbuf); delete[] v_fbdata[i].pixbuf; v_fbdata[i].pixbuf = NULL; diff --git a/src/gui/components/cc_base.h b/src/gui/components/cc_base.h index 9df3755ed..32605b04d 100644 --- a/src/gui/components/cc_base.h +++ b/src/gui/components/cc_base.h @@ -197,7 +197,7 @@ class CComponents inline virtual void setShadowOnOff(bool has_shadow){shadow = has_shadow;}; ///hide current screen and restore background - virtual void hideCC(); + virtual void hide(); ///erase current screen without restore of background, it's similar to paintBackgroundBoxRel() from CFrameBuffer virtual void kill(); ///returns paint mode, true=item was painted @@ -251,7 +251,7 @@ class CComponentsItem : public CComponents ///abstract: paint item, arg: do_save_bg see paintInit() above virtual void paint(bool do_save_bg = CC_SAVE_SCREEN_YES) = 0; ///hides item, arg: no_restore see hideCCItem() above - virtual void hideCC(bool no_restore = false); + virtual void hide(bool no_restore = false); ///get the current item type, see attribute cc_item_type above virtual int getItemType(); diff --git a/src/gui/components/cc_detailsline.cpp b/src/gui/components/cc_detailsline.cpp index 6aea94d5b..646b0292e 100644 --- a/src/gui/components/cc_detailsline.cpp +++ b/src/gui/components/cc_detailsline.cpp @@ -80,7 +80,7 @@ void CComponentsDetailLine::initVarDline() CComponentsDetailLine::~CComponentsDetailLine() { - hideCC(); //restore background + hide(); //restore background clear(); } diff --git a/src/gui/components/cc_frm.cpp b/src/gui/components/cc_frm.cpp index fc43b7256..1d2420a56 100644 --- a/src/gui/components/cc_frm.cpp +++ b/src/gui/components/cc_frm.cpp @@ -366,14 +366,14 @@ void CComponentsForm::paintCCItems() } } -void CComponentsForm::hideCC(bool no_restore) +void CComponentsForm::hide(bool no_restore) { // hack: ensure hiding of minitv during hide of forms and inherited classes, // because the handling of minitv items are different to other item types - // and need an explizit call of hideCC() + // and need an explizit call of hide() for(size_t i=0; igetItemType() == CC_ITEMTYPE_PIP){ - v_cc_items[i]->hideCC(); + v_cc_items[i]->hide(); break; } } diff --git a/src/gui/components/cc_frm.h b/src/gui/components/cc_frm.h index e03bba024..e00ae07d0 100644 --- a/src/gui/components/cc_frm.h +++ b/src/gui/components/cc_frm.h @@ -54,7 +54,7 @@ class CComponentsForm : public CComponentsItem virtual ~CComponentsForm(); void paint(bool do_save_bg = CC_SAVE_SCREEN_YES); - void hideCC(bool no_restore = false); + void hide(bool no_restore = false); virtual void addCCItem(CComponentsItem* cc_Item); virtual void insertCCItem(const uint& cc_item_id, CComponentsItem* cc_Item); virtual void removeCCItem(const uint& cc_item_id); diff --git a/src/gui/components/cc_frm_signalbars.h b/src/gui/components/cc_frm_signalbars.h index bb2dae298..460270f12 100644 --- a/src/gui/components/cc_frm_signalbars.h +++ b/src/gui/components/cc_frm_signalbars.h @@ -225,7 +225,7 @@ void CSampleClass::hide () //other code; //Note: not required if signalbox is added to a CC-Container! - signalbox->hideCC(true); + signalbox->hide(true); delete signalbox; signalbox = NULL; diff --git a/src/gui/components/cc_item.cpp b/src/gui/components/cc_item.cpp index 6b970ba76..07d621e96 100644 --- a/src/gui/components/cc_item.cpp +++ b/src/gui/components/cc_item.cpp @@ -124,7 +124,7 @@ void CComponentsItem::hideCCItem(bool no_restore) } } -void CComponentsItem::hideCC(bool no_restore) +void CComponentsItem::hide(bool no_restore) { hideCCItem(no_restore); } diff --git a/src/gui/components/cc_item_infobox.cpp b/src/gui/components/cc_item_infobox.cpp index 7bc64f8c8..0ea76cd27 100644 --- a/src/gui/components/cc_item_infobox.cpp +++ b/src/gui/components/cc_item_infobox.cpp @@ -66,7 +66,7 @@ CComponentsInfoBox::CComponentsInfoBox(const int x_pos, const int y_pos, const i CComponentsInfoBox::~CComponentsInfoBox() { - hideCC(); + hide(); clearSavedScreen(); clearCCText(); delete pic; diff --git a/src/gui/components/cc_item_picture.cpp b/src/gui/components/cc_item_picture.cpp index 700d60609..6ccc94de6 100644 --- a/src/gui/components/cc_item_picture.cpp +++ b/src/gui/components/cc_item_picture.cpp @@ -201,7 +201,7 @@ void CComponentsPicture::paint(bool do_save_bg) paintPicture(); } -void CComponentsPicture::hideCC(bool no_restore) +void CComponentsPicture::hide(bool no_restore) { hideCCItem(no_restore); pic_painted = false; diff --git a/src/gui/components/cc_item_picture.h b/src/gui/components/cc_item_picture.h index a0958ebe9..dd45ec449 100644 --- a/src/gui/components/cc_item_picture.h +++ b/src/gui/components/cc_item_picture.h @@ -83,7 +83,7 @@ class CComponentsPicture : public CComponentsItem virtual inline bool isPicPainted(){return pic_painted;}; virtual void paint(bool do_save_bg = CC_SAVE_SCREEN_YES); - virtual void hideCC(bool no_restore = false); + virtual void hide(bool no_restore = false); virtual inline void getPictureSize(int *pwidth, int *pheight){*pwidth=pic_width; *pheight=pic_height;}; virtual void setMaxWidth(const int w_max){pic_max_w = w_max;}; virtual void setMaxHeight(const int h_max){pic_max_h = h_max;}; diff --git a/src/gui/components/cc_item_text.cpp b/src/gui/components/cc_item_text.cpp index 845f25b02..dbd94b4c2 100644 --- a/src/gui/components/cc_item_text.cpp +++ b/src/gui/components/cc_item_text.cpp @@ -77,7 +77,7 @@ CComponentsText::CComponentsText( const int x_pos, const int y_pos, const int w, CComponentsText::~CComponentsText() { - hideCC(); + hide(); clearSavedScreen(); clearCCText(); clear(); @@ -246,7 +246,7 @@ void CComponentsText::paint(bool do_save_bg) paintText(do_save_bg); } -void CComponentsText::hideCC(bool no_restore) +void CComponentsText::hide(bool no_restore) { if (ct_textbox) ct_textbox->hide(); diff --git a/src/gui/components/cc_item_text.h b/src/gui/components/cc_item_text.h index 4d56beb63..2661641eb 100644 --- a/src/gui/components/cc_item_text.h +++ b/src/gui/components/cc_item_text.h @@ -92,7 +92,7 @@ class CComponentsText : public CComponentsItem, public CBox ///default members to paint a text box and hide painted text ///hide textbox - void hideCC(bool no_restore = false); + void hide(bool no_restore = false); ///paint text box, parameter do_save_bg: default = true, causes fill of backckrond pixel buffer void paint(bool do_save_bg = CC_SAVE_SCREEN_YES); diff --git a/src/gui/components/cc_item_tvpic.cpp b/src/gui/components/cc_item_tvpic.cpp index 4d53815c0..9dc397c48 100644 --- a/src/gui/components/cc_item_tvpic.cpp +++ b/src/gui/components/cc_item_tvpic.cpp @@ -66,7 +66,7 @@ CComponentsPIP::CComponentsPIP( const int x_pos, const int y_pos, const int perc CComponentsPIP::~CComponentsPIP() { - hideCC(); + hide(); videoDecoder->Pig(-1, -1, -1, -1); clearSavedScreen(); clear(); @@ -99,7 +99,7 @@ void CComponentsPIP::paint(bool do_save_bg) } -void CComponentsPIP::hideCC(bool no_restore) +void CComponentsPIP::hide(bool no_restore) { videoDecoder->Pig(-1, -1, -1, -1); hideCCItem(no_restore); diff --git a/src/gui/components/cc_item_tvpic.h b/src/gui/components/cc_item_tvpic.h index 695bae27e..fef5a23b8 100644 --- a/src/gui/components/cc_item_tvpic.h +++ b/src/gui/components/cc_item_tvpic.h @@ -63,7 +63,7 @@ class CComponentsPIP : public CComponentsItem ///show tv box void paint(bool do_save_bg = CC_SAVE_SCREEN_YES); ///remove tv box from screen - void hideCC(bool no_restore = false); + void hide(bool no_restore = false); }; #endif diff --git a/src/gui/components/unmaintained/cc_item_box.cpp b/src/gui/components/unmaintained/cc_item_box.cpp index fe6f036ae..29140ebc2 100644 --- a/src/gui/components/unmaintained/cc_item_box.cpp +++ b/src/gui/components/unmaintained/cc_item_box.cpp @@ -43,7 +43,7 @@ CComponentsItemBox::CComponentsItemBox() CComponentsItemBox::~CComponentsItemBox() { - hideCC(); + hide(); clearElements(); clearSavedScreen(); clear(); @@ -213,7 +213,7 @@ void CComponentsItemBox::refreshElement(size_t index, const std::string& element case CC_ITEMBOX_PICTURE: pic = static_cast(v_element_data[index].handler1); if (pic != NULL) { - pic->hideCC(); + pic->hide(); delete pic; } v_element_data[index].element = element; @@ -240,7 +240,7 @@ void CComponentsItemBox::paintImage(size_t index, bool newElement) if ((newElement) || (pic == NULL)) { if (pic != NULL) { - pic->hideCC(); + pic->hide(); delete pic; pic = NULL; } @@ -287,7 +287,7 @@ void CComponentsItemBox::paintText(size_t index, bool newElement) if ((newElement) || (textbox == NULL)) { if (textbox != NULL) { - textbox->hideCC(); + textbox->hide(); delete textbox; textbox = NULL; } diff --git a/src/gui/imageinfo.cpp b/src/gui/imageinfo.cpp index 93067dafc..7254860ca 100644 --- a/src/gui/imageinfo.cpp +++ b/src/gui/imageinfo.cpp @@ -355,7 +355,7 @@ void CImageInfo::hide() { printf("[CImageInfo] [%s - %d] hide...\n", __FUNCTION__, __LINE__); if (cc_win){ - cc_win->hideCC(); + cc_win->hide(); Clean(); } } diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index 18ac9fa6b..f0f91474c 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -1824,7 +1824,7 @@ void CInfoViewer::killInfobarText() { if (infobar_txt){ if (infobar_txt->isPainted()) - infobar_txt->hideCC(); + infobar_txt->hide(); delete infobar_txt; } infobar_txt = NULL; diff --git a/src/gui/streaminfo2.cpp b/src/gui/streaminfo2.cpp index 0045970fe..fe2df548d 100644 --- a/src/gui/streaminfo2.cpp +++ b/src/gui/streaminfo2.cpp @@ -246,7 +246,7 @@ int CStreamInfo2::doSignalStrengthLoop () void CStreamInfo2::hide () { - pip->hideCC(true); + pip->hide(true); frameBuffer->paintBackgroundBoxRel (0, 0, max_width, max_height); } diff --git a/src/gui/test_menu.cpp b/src/gui/test_menu.cpp index 2815c66a3..106a8c5a4 100644 --- a/src/gui/test_menu.cpp +++ b/src/gui/test_menu.cpp @@ -369,7 +369,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey) button->setSelected(true); button->paint(); }else - button->hideCC(); + button->hide(); return res; } @@ -380,7 +380,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey) if (!circle->isPainted()) circle->paint(); else - circle->hideCC(); + circle->hide(); return res; } else if (actionKey == "square"){ @@ -390,7 +390,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey) if (!sq->isPainted()) sq->paint(); else - sq->hideCC(); + sq->hide(); return res; } else if (actionKey == "picture"){ @@ -400,7 +400,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey) if (!pic->isPainted() && !pic->isPicPainted()) pic->paint(); else - pic->hideCC(); + pic->hide(); return res; } else if (actionKey == "channellogo"){ @@ -410,7 +410,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey) if (!chnl_pic->isPainted() && !chnl_pic->isPicPainted()) chnl_pic->paint(); else - chnl_pic->hideCC(); + chnl_pic->hide(); return res; } else if (actionKey == "form"){ @@ -445,7 +445,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey) if (form->isPainted()) { - form->hideCC(); + form->hide(); delete form; form = NULL; } @@ -460,7 +460,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey) txt->setText("This is a text for testing textbox", CTextBox::NO_AUTO_LINEBREAK); if (txt->isPainted()) - txt->hideCC(); + txt->hide(); else txt->paint(); return res; @@ -504,7 +504,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey) if (!header->isPainted()) header->paint(); else - header->hideCC(); + header->hide(); return res; } else if (actionKey == "footer"){ @@ -520,7 +520,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey) if (!footer->isPainted()) footer->paint(); else - footer->hideCC(); + footer->hide(); return res; } else if (actionKey == "iconform"){ @@ -553,7 +553,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey) // iconform->setIconAlign(CComponentsIconForm::CC_ICONS_FRM_ALIGN_RIGHT); if (iconform->isPainted()) - iconform->hideCC(); + iconform->hide(); else{ iconform->paint(); } @@ -591,7 +591,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey) if (!window->isPainted()) window->paint(); else - window->hideCC(); + window->hide(); return res; } @@ -609,7 +609,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey) } else { if (clock_r->Stop()){ - clock_r->hideCC(); + clock_r->hide(); delete clock_r; clock_r = NULL; return menu_return::RETURN_EXIT_ALL; @@ -625,7 +625,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey) if (!clock->isPainted()) clock->paint(); else { - clock->hideCC(); + clock->hide(); delete clock; clock = NULL; } diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index bb25d72bd..940c4a1fa 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -1083,7 +1083,7 @@ void CMenuWidget::paintHint(int pos) if (savescreen) details_line->restore(); else - details_line->hideCC(); + details_line->hide(); } /* clear info box */ if (info_box != NULL) { @@ -1091,7 +1091,7 @@ void CMenuWidget::paintHint(int pos) if (savescreen) info_box->restore(); else - info_box->hideCC(); + info_box->hide(); } } hint_painted = false; @@ -1099,10 +1099,10 @@ void CMenuWidget::paintHint(int pos) if (hint_painted) { /* clear detailsline line */ if (details_line) - details_line->hideCC(); + details_line->hide(); /* clear info box */ if ((info_box) && (pos == -1)) - info_box->hideCC(true); + info_box->hide(true); hint_painted = false; } if (pos < 0) @@ -1116,11 +1116,11 @@ void CMenuWidget::paintHint(int pos) if (savescreen) #endif if (info_box) - info_box->hideCC(false); + info_box->hide(false); #if 0 info_box->restore(); else - info_box->hideCC(); + info_box->hide(); } #endif return;